[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=10e3a32

The following commit has been merged in the master branch:
commit 10e3a3260a986fbccfb571167968981a3e3a9094
Author: Pino Toscano <pino at kde.org>
Date:   Sat Dec 17 17:04:16 2011 +0100

    i18n fixes
    
    - fix punctuation
    - fix use of placeholder
    - do not use contractions
---
 dialogs/custom-presence-dialog.cpp |  8 ++++----
 main-widget.cpp                    | 10 +++++-----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/dialogs/custom-presence-dialog.cpp b/dialogs/custom-presence-dialog.cpp
index 2c1ad4f..62a0413 100644
--- a/dialogs/custom-presence-dialog.cpp
+++ b/dialogs/custom-presence-dialog.cpp
@@ -86,10 +86,10 @@ void CustomPresenceDialog::setupDialog()
 
     m_statusMessage = new KComboBox(true, mainDialogWidget);
 
-    m_statusMessage->addItem(KIcon("user-online"), i18n("Set custom available message ..."),qVariantFromValue(Tp::Presence::available()));
-    m_statusMessage->addItem(KIcon("user-busy"), i18n("Set custom busy message ..."), qVariantFromValue(Tp::Presence::busy()));
-    m_statusMessage->addItem(KIcon("user-away"), i18n("Set custom away message ..."), qVariantFromValue(Tp::Presence::away()));
-    m_statusMessage->addItem(KIcon("user-away-extended"), i18n("Set custom extended away message ..."), qVariantFromValue(Tp::Presence::xa()));
+    m_statusMessage->addItem(KIcon("user-online"), i18n("Set custom available message..."),qVariantFromValue(Tp::Presence::available()));
+    m_statusMessage->addItem(KIcon("user-busy"), i18n("Set custom busy message..."), qVariantFromValue(Tp::Presence::busy()));
+    m_statusMessage->addItem(KIcon("user-away"), i18n("Set custom away message..."), qVariantFromValue(Tp::Presence::away()));
+    m_statusMessage->addItem(KIcon("user-away-extended"), i18n("Set custom extended away message..."), qVariantFromValue(Tp::Presence::xa()));
 
     m_statusMessage->setAutoCompletion(false);
     m_statusMessage->show();
diff --git a/main-widget.cpp b/main-widget.cpp
index 59830a5..94050a7 100644
--- a/main-widget.cpp
+++ b/main-widget.cpp
@@ -115,7 +115,7 @@ MainWidget::MainWidget(QWidget *parent)
 
     m_toolBar->setToolButtonStyle(Qt::ToolButtonIconOnly);
 
-    m_addContactAction = new KAction(KIcon("list-add-user"), i18n("Add new contacts.."), this);
+    m_addContactAction = new KAction(KIcon("list-add-user"), i18n("Add new contacts..."), this);
 
     m_toolBar->addAction(m_addContactAction);
 
@@ -566,7 +566,7 @@ void MainWidget::startFileTransferChannel(ContactModelItem *contactItem)
     QStringList filenames = KFileDialog::getOpenFileNames(KUrl("kfiledialog:///FileTransferLastDirectory"),
                                                     QString(),
                                                     this,
-                                                    i18n("Choose files to send to %1").arg(contact->alias()));
+                                                    i18n("Choose files to send to %1", contact->alias()));
 
     if (filenames.isEmpty()) { // User hit cancel button
         return;
@@ -694,12 +694,12 @@ void MainWidget::onAddContactRequest() {
         Tp::AccountPtr account = dialog.data()->account();
         if (account.isNull()) {
             KMessageBox::error(this,
-                               i18n("Seems like you forgot to select an account. Also don't forget to connect it first."),
+                               i18n("Seems like you forgot to select an account. Also do not forget to connect it first."),
                                i18n("No Account Selected"));
         }
         else if (account->connection().isNull()) {
             KMessageBox::error(this,
-                               i18n("An error we didn't anticipate just happened and so the contact couldn't be added. Sorry."),
+                               i18n("An error we did not anticipate just happened and so the contact could not be added. Sorry."),
                                i18n("Account Error"));
         } else {
             QStringList identifiers = QStringList() << dialog.data()->screenName();
@@ -1208,7 +1208,7 @@ void MainWidget::showSettingsKCM()
 
     if (!tpAccKcm) {
         KMessageBox::error(this,
-                           i18n("It appears you don't have the IM Accounts control module installed. Please install telepathy-accounts-kcm package."),
+                           i18n("It appears you do not have the IM Accounts control module installed. Please install telepathy-accounts-kcm package."),
                            i18n("IM Accounts KCM Plugin Is Not Installed"));
     }
 

-- 
ktp-contact-list packaging