mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-01-19 22:35:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove HTML from translated strings

Browse source 
In some strings that won't be possible as the translation needs to be
aware of line breaks, etc. But for these strings it seems like the right
thing to do.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2014-07-09 10:26:43 -07:00
parent dae02d5fd2
commit d818dc1a84
3 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
qt-ui/updatemanager.cpp
View file

@ -33,13 +33,13 @@ void UpdateManager::requestReceived(QNetworkReply *reply)
{
QMessageBox msgbox;
QString msgTitle = tr("Check for updates.");
QString msgText = tr("<h3>Subsurface was unable to check for updates.</h3>");
QString msgText = "<h3>" + tr("Subsurface was unable to check for updates.") + "</h3>";
if (reply->error() != QNetworkReply::NoError) {
//Network Error
msgText = msgText + tr("<br/><b>The following error occurred:</b><br/>") + reply->errorString()
+ tr("<br/><br/><b>Please check your internet connection.</b>");
msgText = msgText + "<br/><b>" + tr("The following error occurred:") + "</b><br/>" + reply->errorString()
+ "<br/><br/><b>" + tr("Please check your internet connection.") + "</b>";
} else {
//No network error
QString response(reply->readAll());

6
qt-ui/usersurvey.cpp
View file

@ -93,13 +93,13 @@ void UserSurvey::requestReceived(QNetworkReply *reply)
{
QMessageBox msgbox;
QString msgTitle = tr("Submit User Survey.");
QString msgText = tr("<h3>Subsurface was unable to submit the user survey.</h3>");
QString msgText = "<h3>" + tr("Subsurface was unable to submit the user survey.") + "</h3>";
if (reply->error() != QNetworkReply::NoError) {
//Network Error
msgText = msgText + tr("<br/><b>The following error occurred:</b><br/>") + reply->errorString()
+ tr("<br/><br/><b>Please check your internet connection.</b>");
msgText = msgText + "<br/><b>" + tr("The following error occurred:") + "</b><br/>" + reply->errorString()
+ "<br/><br/><b>" + tr("Please check your internet connection.") + "</b>";
} else {
//No network error
QString response(reply->readAll());

12
translations/subsurface_source.ts
View file

@ -2856,17 +2856,17 @@ p, li { white-space: pre-wrap; }
</message>
<message>
<location filename="../qt-ui/updatemanager.cpp" line="36"/>
<source>&lt;h3&gt;Subsurface was unable to check for updates.&lt;/h3&gt;</source>
<source>Subsurface was unable to check for updates.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qt-ui/updatemanager.cpp" line="41"/>
<source>&lt;br/&gt;&lt;b&gt;The following error occurred:&lt;/b&gt;&lt;br/&gt;</source>
<source>The following error occurred:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qt-ui/updatemanager.cpp" line="42"/>
<source>&lt;br/&gt;&lt;br/&gt;&lt;b&gt;Please check your internet connection.&lt;/b&gt;</source>
<source>Please check your internet connection.</source>
<translation type="unfinished"></translation>
</message>
<message>
@ -3017,17 +3017,17 @@ Language: %1</source>
</message>
<message>
<location filename="../qt-ui/usersurvey.cpp" line="96"/>
<source>&lt;h3&gt;Subsurface was unable to submit the user survey.&lt;/h3&gt;</source>
<source>Subsurface was unable to submit the user survey.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qt-ui/usersurvey.cpp" line="101"/>
<source>&lt;br/&gt;&lt;b&gt;The following error occurred:&lt;/b&gt;&lt;br/&gt;</source>
<source>The following error occurred:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qt-ui/usersurvey.cpp" line="102"/>
<source>&lt;br/&gt;&lt;br/&gt;&lt;b&gt;Please check your internet connection.&lt;/b&gt;</source>
<source>Please check your internet connection.</source>
<translation type="unfinished"></translation>
</message>
<message>