changeset 1283:38d3dce323b4

Do not include hard linebreaks in translation strings
author Andre Heinecke <andre.heinecke@intevation.de>
date Mon, 29 Sep 2014 12:29:18 +0200
parents 9e6579fff83a
children 2dc66e510fa7
files ui/administratorwindow.cpp ui/l10n/administrator_de_DE.ts
diffstat 2 files changed, 20 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/ui/administratorwindow.cpp	Mon Sep 29 12:21:26 2014 +0200
+++ b/ui/administratorwindow.cpp	Mon Sep 29 12:29:18 2014 +0200
@@ -272,10 +272,10 @@
         tr(" based on list from ") +
         listDate.toString(Qt::ISODate) +
         "#####\r\n");
-    entries.append(tr("signing certificate: \r\n"));
+    entries.append(tr("signing certificate:") + "\r\n");
     entries.append(keyFingerprint);
 
-    entries.append(tr("\r\nnew certificates:\r\n"));
+    entries.append(QString::fromLatin1("\r\n") + tr("new certificates:") +"\r\n");
 
     foreach (const Certificate& cert, list.getCertificates()) {
         if (!mCertList.getCertificates().contains(cert)) {
@@ -289,7 +289,7 @@
         }
     }
 
-    entries.append(tr("certificates marked to remove:\r\n"));
+    entries.append(tr("certificates marked to remove:") + "\r\n");
     entries.append(removeListEntries);
     entries.append("\r\n");
 
--- a/ui/l10n/administrator_de_DE.ts	Mon Sep 29 12:21:26 2014 +0200
+++ b/ui/l10n/administrator_de_DE.ts	Mon Sep 29 12:29:18 2014 +0200
@@ -179,25 +179,37 @@
     </message>
     <message>
         <location filename="../administratorwindow.cpp" line="275"/>
+        <source>signing certificate:</source>
+        <translation>Signaturzertifikat:</translation>
+    </message>
+    <message>
+        <location filename="../administratorwindow.cpp" line="278"/>
+        <source>new certificates:</source>
+        <translation>Neues Zertifikat:</translation>
+    </message>
+    <message>
+        <location filename="../administratorwindow.cpp" line="292"/>
+        <source>certificates marked to remove:</source>
+        <translation>Zertifikate zum Löschen markiert:</translation>
+    </message>
+    <message>
         <source>signing certificate: 
 </source>
-        <translation>Signaturzertifikat: 
+        <translation type="obsolete">Signaturzertifikat: 
 </translation>
     </message>
     <message>
-        <location filename="../administratorwindow.cpp" line="278"/>
         <source>
 new certificates:
 </source>
-        <translation>
+        <translation type="obsolete">
 Neues Zertifikat:
 </translation>
     </message>
     <message>
-        <location filename="../administratorwindow.cpp" line="292"/>
         <source>certificates marked to remove:
 </source>
-        <translation>Zertifikate zum Löschen markiert:
+        <translation type="obsolete">Zertifikate zum Löschen markiert:
 </translation>
     </message>
     <message>

http://wald.intevation.org/projects/trustbridge/