[SCM] ktp-contact-list packaging branch, master, updated. debian/15.12.1-2-1070-g6c56f91

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-contact-list.git;a=commitdiff;h=6b6cb82

The following commit has been merged in the master branch:
commit 6b6cb82ca035548a29f0f7f66e6c3739bb860042
Author: Dario Freddi <dario.freddi at collabora.co.uk>
Date:   Fri Apr 22 15:21:21 2011 +0200

    Fix misuse of i18n, add some context to some calls
---
 account-button.cpp   | 16 ++++++++--------
 contact-delegate.cpp | 10 +++++-----
 main-widget.cpp      |  6 +++---
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/account-button.cpp b/account-button.cpp
index ce12e94..84ecca1 100644
--- a/account-button.cpp
+++ b/account-button.cpp
@@ -73,14 +73,14 @@ AccountButton::AccountButton(const Tp::AccountPtr &account, QWidget* parent)
     QActionGroup *presenceActions = new QActionGroup(this);
     presenceActions->setExclusive(true);
 
-    KAction *onlineAction =     new KAction(KIcon("user-online"), i18nc("@action:inmenu", "Available"), this);
-    KAction *awayAction =       new KAction(KIcon("user-away"), i18nc("@action:inmenu", "Away"), this);
-    KAction *brbAction =        new KAction(KIcon("user-busy"), i18nc("@action:inmenu", "Be right back"), this);
-    KAction *busyAction =       new KAction(KIcon("user-busy"), i18nc("@action:inmenu", "Busy"), this);
-    KAction *dndAction =        new KAction(KIcon("user-busy"), i18nc("@action:inmenu", "Do not disturb"), this);
-    KAction *xaAction =         new KAction(KIcon("user-away-extended"), i18nc("@action:inmenu", "Extended Away"), this);
-    KAction *invisibleAction =  new KAction(KIcon("user-invisible"), i18nc("@action:inmenu", "Invisible"), this);
-    KAction *offlineAction =    new KAction(KIcon("user-offline"), i18nc("@action:inmenu", "Offline"), this);
+    KAction *onlineAction =     new KAction(KIcon("user-online"), i18nc("@action:inmenu This is an IM user status", "Available"), this);
+    KAction *awayAction =       new KAction(KIcon("user-away"), i18nc("@action:inmenu This is an IM user status", "Away"), this);
+    KAction *brbAction =        new KAction(KIcon("user-busy"), i18nc("@action:inmenu This is an IM user status", "Be right back"), this);
+    KAction *busyAction =       new KAction(KIcon("user-busy"), i18nc("@action:inmenu This is an IM user status", "Busy"), this);
+    KAction *dndAction =        new KAction(KIcon("user-busy"), i18nc("@action:inmenu This is an IM user status", "Do not disturb"), this);
+    KAction *xaAction =         new KAction(KIcon("user-away-extended"), i18nc("@action:inmenu This is an IM user status", "Extended Away"), this);
+    KAction *invisibleAction =  new KAction(KIcon("user-invisible"), i18nc("@action:inmenu This is an IM user status", "Invisible"), this);
+    KAction *offlineAction =    new KAction(KIcon("user-offline"), i18nc("@action:inmenu This is an IM user status", "Offline"), this);
 
     m_presenceMessageWidget = new KLineEdit(this);
     m_presenceMessageWidget->setClearButtonShown(true);
diff --git a/contact-delegate.cpp b/contact-delegate.cpp
index d1b693f..18ae723 100644
--- a/contact-delegate.cpp
+++ b/contact-delegate.cpp
@@ -292,23 +292,23 @@ bool ContactDelegate::helpEvent(QHelpEvent *event, QAbstractItemView *view, cons
     switch (index.data(AccountsModel::PresenceTypeRole).toUInt()) {
     case Tp::ConnectionPresenceTypeAvailable:
         presenseIconPath = KIconLoader::global()->iconPath("user-online", 1);
-        presenseText = i18n("Online");
+        presenseText = i18nc("This is an IM user status", "Online");
         break;
     case Tp::ConnectionPresenceTypeAway:
         presenseIconPath = KIconLoader::global()->iconPath("user-away", 1);
-        presenseText = i18n("Away");
+        presenseText = i18nc("This is an IM user status", "Away");
         break;
     case Tp::ConnectionPresenceTypeExtendedAway:
         presenseIconPath = KIconLoader::global()->iconPath("user-away-extended", 1);
-        presenseText = i18n("Away");
+        presenseText = i18nc("This is an IM user status", "Away");
         break;
     case Tp::ConnectionPresenceTypeBusy:
         presenseIconPath = KIconLoader::global()->iconPath("user-busy", 1);
-        presenseText = i18n("Busy");
+        presenseText = i18nc("This is an IM user status", "Busy");
         break;
     case Tp::ConnectionPresenceTypeOffline:
         presenseIconPath = KIconLoader::global()->iconPath("user-offline", 1);
-        presenseText = i18n("Offline");
+        presenseText = i18nc("This is an IM user status", "Offline");
         break;
     default:
         presenseIconPath = KIconLoader::global()->iconPath("task-attention", 1);
diff --git a/main-widget.cpp b/main-widget.cpp
index 089466e..0781d41 100644
--- a/main-widget.cpp
+++ b/main-widget.cpp
@@ -398,7 +398,7 @@ void MainWidget::onAccountStateChanged(bool enabled)
         findChild<AccountButton *>(account->uniqueIdentifier())->show();
     } else {
         findChild<AccountButton *>(account->uniqueIdentifier())->hide();
-        showMessageToUser(i18n("Account %1 was disabled!").arg(account->displayName()),
+        showMessageToUser(i18n("Account %1 was disabled!", account->displayName()),
                           MainWidget::SystemMessageError);
     }
 }
@@ -408,7 +408,7 @@ void MainWidget::onAccountRemoved()
     Tp::AccountPtr account(qobject_cast<Tp::Account*>(sender()));
     delete findChild<AccountButton *>(account->uniqueIdentifier());
 
-    showMessageToUser(i18n("Account %1 was removed!").arg(account->displayName()),
+    showMessageToUser(i18n("Account %1 was removed!", account->displayName()),
                       MainWidget::SystemMessageError);
 }
 
@@ -822,7 +822,7 @@ void MainWidget::loadAvatar(const Tp::AccountPtr &account)
         avatarButton->setIcon(icon);
         avatarButton->setIconSize(QSize(48, 48));
         avatarButton->setText(i18nc("String in menu saying Use avatar from account X",
-                                    "Use from %1").arg(account->displayName()));
+                                    "Use from %1", account->displayName()));
         avatarButton->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
 
         QWidgetAction *avatarAction = new QWidgetAction(m_avatarButtonMenu);

-- 
ktp-contact-list packaging