Mercurial > trustbridge
comparison ui/administratorwindow.cpp @ 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 | f1f4059ec320 |
| children | ff9cd05e861e |
comparison
equal
deleted
inserted
replaced
| 1282:9e6579fff83a | 1283:38d3dce323b4 |
|---|---|
| 270 tr(" new certificatelist ") + | 270 tr(" new certificatelist ") + |
| 271 newListDate.toString(Qt::ISODate) + | 271 newListDate.toString(Qt::ISODate) + |
| 272 tr(" based on list from ") + | 272 tr(" based on list from ") + |
| 273 listDate.toString(Qt::ISODate) + | 273 listDate.toString(Qt::ISODate) + |
| 274 "#####\r\n"); | 274 "#####\r\n"); |
| 275 entries.append(tr("signing certificate: \r\n")); | 275 entries.append(tr("signing certificate:") + "\r\n"); |
| 276 entries.append(keyFingerprint); | 276 entries.append(keyFingerprint); |
| 277 | 277 |
| 278 entries.append(tr("\r\nnew certificates:\r\n")); | 278 entries.append(QString::fromLatin1("\r\n") + tr("new certificates:") +"\r\n"); |
| 279 | 279 |
| 280 foreach (const Certificate& cert, list.getCertificates()) { | 280 foreach (const Certificate& cert, list.getCertificates()) { |
| 281 if (!mCertList.getCertificates().contains(cert)) { | 281 if (!mCertList.getCertificates().contains(cert)) { |
| 282 QString certEntry(cert.subjectCN() + ": " + cert.base64Line() + "\r\n"); | 282 QString certEntry(cert.subjectCN() + ": " + cert.base64Line() + "\r\n"); |
| 283 if (cert.isInstallCert()) { | 283 if (cert.isInstallCert()) { |
| 287 removeListEntries.append(certEntry); | 287 removeListEntries.append(certEntry); |
| 288 } | 288 } |
| 289 } | 289 } |
| 290 } | 290 } |
| 291 | 291 |
| 292 entries.append(tr("certificates marked to remove:\r\n")); | 292 entries.append(tr("certificates marked to remove:") + "\r\n"); |
| 293 entries.append(removeListEntries); | 293 entries.append(removeListEntries); |
| 294 entries.append("\r\n"); | 294 entries.append("\r\n"); |
| 295 | 295 |
| 296 return entries; | 296 return entries; |
| 297 } | 297 } |