summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Dirk Hohndel <dirk@hohndel.org>2014-07-09 10:26:43 -0700
committerGravatar Dirk Hohndel <dirk@hohndel.org>2014-07-09 10:34:51 -0700
commitd818dc1a84c382742a1f694503b8f856446313a6 (patch)
tree455a1471418f62689d110ddc2f1c14ad94c6a22d
parentdae02d5fd2b8972cf82ce3777e142da85adaa75e (diff)
downloadsubsurface-d818dc1a84c382742a1f694503b8f856446313a6.tar.gz
Remove HTML from translated strings
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>
-rw-r--r--qt-ui/updatemanager.cpp6
-rw-r--r--qt-ui/usersurvey.cpp6
-rw-r--r--translations/subsurface_source.ts12
3 files changed, 12 insertions, 12 deletions
diff --git a/qt-ui/updatemanager.cpp b/qt-ui/updatemanager.cpp
index 75f454795..51292fcbd 100644
--- a/qt-ui/updatemanager.cpp
+++ b/qt-ui/updatemanager.cpp
@@ -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());
diff --git a/qt-ui/usersurvey.cpp b/qt-ui/usersurvey.cpp
index 0a97fdb78..e1153c42f 100644
--- a/qt-ui/usersurvey.cpp
+++ b/qt-ui/usersurvey.cpp
@@ -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());
diff --git a/translations/subsurface_source.ts b/translations/subsurface_source.ts
index 6bd96ab7d..623a1c659 100644
--- a/translations/subsurface_source.ts
+++ b/translations/subsurface_source.ts
@@ -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>