[SCM] ktp-accounts-kcm packaging branch, master, updated. debian/15.12.1-1-1157-gc4589c5

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-accounts-kcm.git;a=commitdiff;h=64b3a5c

The following commit has been merged in the master branch:
commit 64b3a5c8e54740fff24735dd0fd2349c543d0e84
Author: Frederik Schwarzer <schwarzerf at gmail.com>
Date:   Fri Oct 28 00:39:55 2011 +0200

    Avoid puzzle sentence.
    
    Puzzle sentences are not translatable correctly.
    
    REVIEW: 102980
---
 src/salut-enable-dialog.cpp | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/salut-enable-dialog.cpp b/src/salut-enable-dialog.cpp
index a4fef49..470f72c 100644
--- a/src/salut-enable-dialog.cpp
+++ b/src/salut-enable-dialog.cpp
@@ -192,17 +192,19 @@ void SalutEnableDialog::accept()
 
     // FIXME: Ask the user to submit a Display Name
 
-    QString displayName = values["first-name"].toString();
-    displayName += QLatin1Char(' ');
-    displayName += values["last-name"].toString();
-    displayName += QLatin1Char(' ');
+    QString displayName;
     if (values.contains("nickname")) {
-        displayName += QLatin1Char('(');
-        displayName += values["nickname"].toString();
-        displayName += QLatin1Char(')');
-        displayName += QLatin1Char(' ');
+        displayName(i18nc("%1 is the name, %2 the surname, %3 the nickname",
+                          "%1 %2 (%3) on local network",
+                          values["first-name"].toString(),
+                          values["last-name"].toString(),
+                          values["nickname"].toString()));
+    } else {
+        displayName(i18nc("%1 is the name, %2 the surname",
+                          "%1 %2 on local network",
+                          values["first-name"].toString(),
+                          values["last-name"].toString()));
     }
-    displayName += i18n("on local network");
 
     Tp::PendingAccount *pa = d->accountManager->createAccount(d->profile->cmName(),
                                                               d->profile->protocolName(),

-- 
ktp-accounts-kcm packaging