Merge pull request #484 from kiwix/fix_about

Better about text for better translation.
This commit is contained in:
Matthieu Gautier 2020-07-09 15:30:03 +02:00 committed by GitHub
commit 27475bfd18
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 34 additions and 33 deletions

View File

@ -65,16 +65,16 @@
"download-directory-setting":"Download directory :", "download-directory-setting":"Download directory :",
"reset":"Reset", "reset":"Reset",
"browse":"Browse", "browse":"Browse",
"kiwix-desktop-description":"Kiwix enables you to have the whole Wikipedia at hand wherever you go! On a boat, in the middle of nowhere or in jail, Kiwix gives you access to the whole human knowledge. You don't need Internet, everything is store on your computer.", "about-kiwix-desktop-title":"Kiwix Desktop",
"learn-more-about-kiwix":"Learn more about Kiwix", "about-kiwix-desktop-description":"Kiwix enables you to have the whole Wikipedia at hand wherever you go! On a boat, in the middle of nowhere or in jail, Kiwix gives you access to the whole human knowledge. You don't need Internet, everything is store on your computer.",
"release":"Release", "about-learn-more-about-kiwix":"Learn more about Kiwix",
"source-code":"This software is released under the terms of the GNU General Public License version 3. View the source code on", "about-release-title":"Release",
"version":"Version", "about-source-code":"This software is released under the terms of the GNU General Public License version 3. View the source code on <a href='{{GITHUB_URL}}'>Github</a>.",
"reporting-problem":"Reporting problem", "about-version":"Version : {{VERSION}}",
"report-issue-1/3":"To open an issue, visit", "about-reporting-problem-title":"Reporting problem",
"report-issue-2/3":"and open an issue describing your problem.", "about-report-issue":"To open an issue, visit <a href='{{TRACKER_URL}}'>Kiwix-desktop issue tracker</a> and open an issue describing your problem.",
"report-issue-3/3":"Please mention the version in the issue.", "about-report-issue-2":"Please mention the version in the issue.",
"libraries":"Libraries", "about-libraries-title":"Libraries",
"kiwix-server-running-message":"The Kiwix Server is running and can be accessed in the local network at :", "kiwix-server-running-message":"The Kiwix Server is running and can be accessed in the local network at :",
"kiwix-server-description":"Starting a server allows other computers in the local network to access your Kiwix library with a standard web browser.", "kiwix-server-description":"Starting a server allows other computers in the local network to access your Kiwix library with a standard web browser.",
"fullscreen-notification":"You are now in full screen mode. Press ESC to quit!", "fullscreen-notification":"You are now in full screen mode. Press ESC to quit!",

View File

@ -2,18 +2,16 @@
<html> <html>
<body> <body>
<img src="qrc:/icons/kiwix/app_icon.svg" height="240" width="240" style="float:right"/> <img src="qrc:/icons/kiwix/app_icon.svg" height="240" width="240" style="float:right"/>
<h1>Kiwix Desktop</h1> <h1>{{KIWIX_DESKTOP_TITLE}}</h1>
<p>%%KIWIX_DESKTOP_DESCRIPTION%%</p> <p>{{KIWIX_DESKTOP_DESCRIPTION}}</p>
<p><a href="http://kiwix.org">%%LEARN_MORE_ABOUT_KIWIX%%</a></p> <p><a href="http://kiwix.org">{{LEARN_MORE_ABOUT_KIWIX}}</a></p>
<h2>%%RELEASE%%</h2> <h2>{{RELEASE}}</h2>
<p> <p>{{SOURCE_CODE}}</p>
%%SOURCE_CODE%% <a href="https://github.com/kiwix/kiwix-desktop">Github</a>. <p>{{VERSION_TXT}}</p>
</p> <h2>{{REPORTING_PROBLEM}}</h2>
<p>%%VERSION_LABEL%% : %%VERSION%%</p> <p>{{REPORT_ISSUE}}
<h2>%%REPORTING_PROBLEM%%</h2> <p>{{REPORT_ISSUE_2}}</p>
<p>%%REPORT_ISSUE_1%% <a href="https://github.com/kiwix/kiwix-desktop/issues">Kiwix-desktop issue</a> %%REPORT_ISSUE_2%%</p> <h2>{{LIBRARIES}}</h2>
<p>%%REPORT_ISSUE_3%%</p>
<h2>%%LIBRARIES%%</h2>
<ul> <ul>
<li>Libzim - GPLv3 (<a href="http://www.openzim.org">openzim.org</a>)</li> <li>Libzim - GPLv3 (<a href="http://www.openzim.org">openzim.org</a>)</li>
<li>Libkiwix - GPLv3 (<a href="https://github.com/kiwix/kiwix-lib">https://github.com/kiwix/kiwix-lib</a>)</li> <li>Libkiwix - GPLv3 (<a href="https://github.com/kiwix/kiwix-lib">https://github.com/kiwix/kiwix-lib</a>)</li>

View File

@ -11,17 +11,20 @@ About::About(QWidget *parent) :
{ {
ui->setupUi(this); ui->setupUi(this);
auto htmlText = ui->aboutText->toHtml(); auto htmlText = ui->aboutText->toHtml();
htmlText = htmlText.replace("%%KIWIX_DESKTOP_DESCRIPTION%%", gt("kiwix-desktop-description")); htmlText = htmlText.replace("{{KIWIX_DESKTOP_TITLE}}", gt("about-kiwix-desktop-title"));
htmlText = htmlText.replace("%%LEARN_MORE_ABOUT_KIWIX%%", gt("learn-more-about-kiwix")); htmlText = htmlText.replace("{{KIWIX_DESKTOP_DESCRIPTION}}", gt("about-kiwix-desktop-description"));
htmlText = htmlText.replace("%%RELEASE%%", gt("release")); htmlText = htmlText.replace("{{LEARN_MORE_ABOUT_KIWIX}}", gt("about-learn-more-about-kiwix"));
htmlText = htmlText.replace("%%SOURCE_CODE%%", gt("source-code")); htmlText = htmlText.replace("{{RELEASE}}", gt("about-release-title"));
htmlText = htmlText.replace("%%VERSION_LABEL%%", gt("version")); htmlText = htmlText.replace("{{SOURCE_CODE}}", gt("about-source-code"));
htmlText = htmlText.replace("%%VERSION%%", STR(VERSION)); htmlText = htmlText.replace("{{VERSION_TXT}}", gt("about-version"));
htmlText = htmlText.replace("%%REPORTING_PROBLEM%%", gt("reporting-problem")); htmlText = htmlText.replace("{{REPORTING_PROBLEM}}", gt("about-reporting-problem-title"));
htmlText = htmlText.replace("%%REPORT_ISSUE_1%%", gt("report-issue-1/3")); htmlText = htmlText.replace("{{REPORT_ISSUE}}", gt("about-report-issue"));
htmlText = htmlText.replace("%%REPORT_ISSUE_2%%", gt("report-issue-2/3")); htmlText = htmlText.replace("{{REPORT_ISSUE_2}}", gt("about-report-issue-2"));
htmlText = htmlText.replace("%%REPORT_ISSUE_3%%", gt("report-issue-3/3")); htmlText = htmlText.replace("{{LIBRARIES}}", gt("about-libraries-title"));
htmlText = htmlText.replace("%%LIBRARIES%%", gt("Libraries"));
htmlText = htmlText.replace("{{GITHUB_URL}}", "https://github.com/kiwix/kiwix-desktop");
htmlText = htmlText.replace("{{VERSION}}", STR(VERSION));
htmlText = htmlText.replace("{{TRACKER_URL}}", "https://github.com/kiwix/kiwix-desktop/issues");
ui->aboutText->setHtml(htmlText); ui->aboutText->setHtml(htmlText);
} }