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

The following commit has been merged in the master branch:
commit d92f1075a07d2abfbc5b8a4c3d90bf4afbe84e58
Author: Pino Toscano <pino at kde.org>
Date:   Thu Jun 16 15:10:21 2011 +0200

    i18n fixes
    
    - replace exclamation marks with periods at the end of sentences
    - CamelCase Telepathy
    - remove contractions (don't -> do not, etc)
---
 fetch-avatar-job.cpp | 2 +-
 main-widget.cpp      | 8 ++++----
 main.cpp             | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/fetch-avatar-job.cpp b/fetch-avatar-job.cpp
index 0d82313..06a35ea 100644
--- a/fetch-avatar-job.cpp
+++ b/fetch-avatar-job.cpp
@@ -80,7 +80,7 @@ void FetchAvatarJob::start()
 void FetchAvatarJob::Private::_k_onMimeTypeDetected(KIO::Job *job, const QString &mimetype)
 {
     if (!mimetype.contains("image/")) {
-        q->setErrorText(i18n("The file you have selected doesn't seem to be an image!
"
+        q->setErrorText(i18n("The file you have selected does not seem to be an image.
"
                              "Please select an image file."));
         q->setError(1);
         q->emitResult();
diff --git a/main-widget.cpp b/main-widget.cpp
index bdec5ab..0785079 100644
--- a/main-widget.cpp
+++ b/main-widget.cpp
@@ -448,7 +448,7 @@ void MainWidget::onAccountStateChanged(bool enabled)
         findChild<AccountButton *>(account->uniqueIdentifier())->show();
     } else {
         findChild<AccountButton *>(account->uniqueIdentifier())->hide();
-        showMessageToUser(i18n("Account %1 was disabled!", account->displayName()),
+        showMessageToUser(i18n("Account %1 was disabled.", account->displayName()),
                           MainWidget::SystemMessageError);
     }
 }
@@ -458,7 +458,7 @@ void MainWidget::onAccountRemoved()
     Tp::AccountPtr account(qobject_cast<Tp::Account*>(sender()));
     delete findChild<AccountButton *>(account->uniqueIdentifier());
 
-    showMessageToUser(i18n("Account %1 was removed!", account->displayName()),
+    showMessageToUser(i18n("Account %1 was removed.", account->displayName()),
                       MainWidget::SystemMessageError);
 }
 
@@ -1177,9 +1177,9 @@ void MainWidget::handleConnectionError(const Tp::AccountPtr& account)
     Tp::ConnectionStatusReason reason = account->connectionStatusReason();
 
     if (reason == Tp::ConnectionStatusReasonAuthenticationFailed) {
-        showMessageToUser(i18n("Couldn't connect %1. Authentication failed (is your password correct?)", account->displayName()), MainWidget::SystemMessageError);
+        showMessageToUser(i18n("Could not connect %1. Authentication failed (is your password correct?)", account->displayName()), MainWidget::SystemMessageError);
     } else if (reason == Tp::ConnectionStatusReasonNetworkError) {
-        showMessageToUser(i18n("Couldn't connect %1. There was a network error, check your connection", account->displayName()), MainWidget::SystemMessageError);
+        showMessageToUser(i18n("Could not connect %1. There was a network error, check your connection", account->displayName()), MainWidget::SystemMessageError);
     } else {
         // other errors
         showMessageToUser(i18n("An unexpected error has occurred with %1: '%2'", account->displayName(), account->connectionError()), MainWidget::SystemMessageError);
diff --git a/main.cpp b/main.cpp
index c81a9b9..1b92c79 100644
--- a/main.cpp
+++ b/main.cpp
@@ -43,7 +43,7 @@ int main(int argc, char *argv[])
 
     // Add --debug as commandline option
     KCmdLineOptions options;
-    options.add("debug", ki18n("Show telepathy debugging information"));
+    options.add("debug", ki18n("Show Telepathy debugging information"));
     KCmdLineArgs::addCmdLineOptions(options);
 
     KUniqueApplication app;

-- 
ktp-contact-list packaging