[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=f0ebd48

The following commit has been merged in the master branch:
commit f0ebd4879a5b4b2248a741572434e3abc24a3188
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date:   Thu Dec 29 11:36:19 2011 +0100

    Use dictionary and i18n strings
    
    Reviewed-by: Martin Klapetek <martin.klapetek at gmail.com>
---
 src/KCMTelepathyAccounts/dictionary.cpp            |  4 ++-
 .../simple-profile-select-widget.cpp               | 35 +++++++++++-----------
 2 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/src/KCMTelepathyAccounts/dictionary.cpp b/src/KCMTelepathyAccounts/dictionary.cpp
index 9841895..608cc3f 100644
--- a/src/KCMTelepathyAccounts/dictionary.cpp
+++ b/src/KCMTelepathyAccounts/dictionary.cpp
@@ -58,11 +58,13 @@ Dictionary::Dictionary()
     // Protocols
     m_strings.insert("aim", i18n("AOL Instant Messenger"));
     m_strings.insert("bigbrownchunx-skype-dbus", i18n("Skype"));
+    m_strings.insert("facebook", i18n("Facebook Chat"));
     m_strings.insert("gadugadu", i18n("Gadu-Gadu"));
+    m_strings.insert("google-talk", i18n("Google Talk"));
     m_strings.insert("groupwise", i18n("Novell Groupwise"));
     m_strings.insert("icq", i18n("ICQ"));
     m_strings.insert("irc", i18n("Internet Relay Chat"));
-    m_strings.insert("jabber", i18n("Jabber/XMPP/Google Talk"));
+    m_strings.insert("jabber", i18n("Jabber/XMPP"));
     m_strings.insert("local-xmpp", i18n("Bonjour/Salut"));
     m_strings.insert("mxit", i18n("MXit"));
     m_strings.insert("msn", i18n("Windows Live Messenger"));
diff --git a/src/KCMTelepathyAccounts/simple-profile-select-widget.cpp b/src/KCMTelepathyAccounts/simple-profile-select-widget.cpp
index 228232d..1031fb9 100644
--- a/src/KCMTelepathyAccounts/simple-profile-select-widget.cpp
+++ b/src/KCMTelepathyAccounts/simple-profile-select-widget.cpp
@@ -22,6 +22,7 @@
 
 #include "profile-item.h"
 #include "profile-list-model.h"
+#include "dictionary.h"
 
 #include "ui_simple-profile-select-widget.h"
 
@@ -69,36 +70,36 @@ SimpleProfileSelectWidget::SimpleProfileSelectWidget(QWidget *parent)
     d->ui->setupUi(this);
 
     // Create the buttons for the Major Profiles
-    QCommandLinkButton *buttonJabber = new QCommandLinkButton("Jabber / XMPP");
-    buttonJabber->setIcon(KIcon("im-jabber"));
+    QCommandLinkButton *buttonJabber = new QCommandLinkButton(Dictionary::instance()->string(QLatin1String("jabber")));
+    buttonJabber->setIcon(KIcon(QLatin1String("im-jabber")));
     buttonJabber->setIconSize(QSize(32,32));
 
-    QCommandLinkButton *buttonGTalk = new QCommandLinkButton("Google Talk");
-    buttonGTalk->setIcon(KIcon("im-google-talk"));
+    QCommandLinkButton *buttonGTalk = new QCommandLinkButton(Dictionary::instance()->string(QLatin1String("google-talk")));
+    buttonGTalk->setIcon(KIcon(QLatin1String("im-google-talk")));
     buttonGTalk->setIconSize(QSize(32,32));
 
-    QCommandLinkButton *buttonFacebook = new QCommandLinkButton("Facebook Chat");
-    buttonFacebook->setIcon(KIcon("im-facebook"));
+    QCommandLinkButton *buttonFacebook = new QCommandLinkButton(Dictionary::instance()->string(QLatin1String("facebook")));
+    buttonFacebook->setIcon(KIcon(QLatin1String("im-facebook")));
     buttonFacebook->setIconSize(QSize(32,32));
 
-    QCommandLinkButton *buttonIcq = new QCommandLinkButton("ICQ");
-    buttonIcq->setIcon(KIcon("im-icq"));
+    QCommandLinkButton *buttonIcq = new QCommandLinkButton(Dictionary::instance()->string(QLatin1String("icq")));
+    buttonIcq->setIcon(KIcon(QLatin1String("im-icq")));
     buttonIcq->setIconSize(QSize(32,32));
 
-    QCommandLinkButton *buttonMsn = new QCommandLinkButton("Windows Live Messenger");
-    buttonMsn->setIcon(KIcon("im-msn"));
+    QCommandLinkButton *buttonMsn = new QCommandLinkButton(Dictionary::instance()->string(QLatin1String("msn")));
+    buttonMsn->setIcon(KIcon(QLatin1String("im-msn")));
     buttonMsn->setIconSize(QSize(32,32));
 
-    QCommandLinkButton *buttonOthers = new QCommandLinkButton("Others", "AOL, Gadu-Gadu, IRC, Yahoo and more...");
-    buttonOthers->setIcon(KIcon("go-next"));
+    QCommandLinkButton *buttonOthers = new QCommandLinkButton(i18n("Others"), i18n("AOL, Gadu-Gadu, IRC, Yahoo and more..."));
+    buttonOthers->setIcon(KIcon(QLatin1String("go-next")));
     buttonOthers->setIconSize(QSize(32,32));
 
     // Add them to the SignalMapper
-    d->signalMapper->setMapping(buttonJabber,   "jabber");
-    d->signalMapper->setMapping(buttonGTalk,    "google-talk");
-    d->signalMapper->setMapping(buttonFacebook, "facebook");
-    d->signalMapper->setMapping(buttonIcq,      "haze-icq");
-    d->signalMapper->setMapping(buttonMsn,      "haze-msn");
+    d->signalMapper->setMapping(buttonJabber,   QLatin1String("jabber"));
+    d->signalMapper->setMapping(buttonGTalk,    QLatin1String("google-talk"));
+    d->signalMapper->setMapping(buttonFacebook, QLatin1String("facebook"));
+    d->signalMapper->setMapping(buttonIcq,      QLatin1String("haze-icq"));
+    d->signalMapper->setMapping(buttonMsn,      QLatin1String("haze-msn"));
 
     // Connect them to the SignalMapper
     connect(buttonJabber,   SIGNAL(clicked()), d->signalMapper, SLOT(map()));

-- 
ktp-accounts-kcm packaging