[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=1e71ca6

The following commit has been merged in the master branch:
commit 1e71ca6b3e5c1f5d284cf447fc20debaa2f27aa6
Author: Dario Freddi <dario.freddi at collabora.com>
Date:   Thu Dec 15 16:58:45 2011 +0100

    fix-krazy: Fix typos
---
 plugins/rakia/rakia-account-ui.cpp                   | 2 +-
 plugins/sunshine/sunshine-account-ui.cpp             | 2 +-
 plugins/sunshine/sunshine-advanced-options-widget.ui | 2 +-
 src/account-item.cpp                                 | 2 +-
 src/salut-message-widget.cpp                         | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/plugins/rakia/rakia-account-ui.cpp b/plugins/rakia/rakia-account-ui.cpp
index bfc455e..6b03d78 100644
--- a/plugins/rakia/rakia-account-ui.cpp
+++ b/plugins/rakia/rakia-account-ui.cpp
@@ -70,7 +70,7 @@ RakiaAccountUi::RakiaAccountUi(QObject *parent)
     /**< keepalive interval in seconds */
     registerSupportedParameter("keepalive-interval", QVariant::UInt);
 
-//  Parameters, we know about their existance but don't expose them to the user
+//  Parameters, we know about their existence but don't expose them to the user
 //  for eventual later usage, we keep them documented here:
 
 //  immuteable-streams: if set to True, you can't add video to an already running voice call.
diff --git a/plugins/sunshine/sunshine-account-ui.cpp b/plugins/sunshine/sunshine-account-ui.cpp
index deace76..9b2cc2c 100644
--- a/plugins/sunshine/sunshine-account-ui.cpp
+++ b/plugins/sunshine/sunshine-account-ui.cpp
@@ -44,7 +44,7 @@ SunshineAccountUi::SunshineAccountUi(QObject *parent)
     // People using telepathy-sunshine from master (past 0.1.8 versions) will need this line insead
     // of export-contacts. See the commit for further details:
     // http://git.collabora.co.uk/?p=telepathy-sunshine.git;a=commit;h=83963893c34c6069f7202cf7d55add2d334581b5
-    // registerSupportedParameter("synchronise-contacts-with-server", QVariant::Bool);
+    // registerSupportedParameter("synchronize-contacts-with-server", QVariant::Bool);
 }
 
 SunshineAccountUi::~SunshineAccountUi()
diff --git a/plugins/sunshine/sunshine-advanced-options-widget.ui b/plugins/sunshine/sunshine-advanced-options-widget.ui
index aaf5ad7..0985089 100644
--- a/plugins/sunshine/sunshine-advanced-options-widget.ui
+++ b/plugins/sunshine/sunshine-advanced-options-widget.ui
@@ -76,7 +76,7 @@
       <item row="6" column="1">
        <widget class="QCheckBox" name="exportContactsCheckBox">
         <property name="text">
-         <string>Synchronise your contacts with the Gadu-Gadu server</string>
+         <string>Synchronize your contacts with the Gadu-Gadu server</string>
         </property>
        </widget>
       </item>
diff --git a/src/account-item.cpp b/src/account-item.cpp
index fc68bac..9992cb0 100644
--- a/src/account-item.cpp
+++ b/src/account-item.cpp
@@ -149,7 +149,7 @@ void AccountItem::generateIcon()
 
     QString iconPath = account()->iconName();
 
-    //if the icon has not been setted, we use the protocol icon
+    //if the icon has not been set, we use the protocol icon
     if(iconPath.isEmpty()) {
         iconPath = QString("im-%1").arg(account()->protocolName());
     }
diff --git a/src/salut-message-widget.cpp b/src/salut-message-widget.cpp
index 0ab5c1a..f419486 100644
--- a/src/salut-message-widget.cpp
+++ b/src/salut-message-widget.cpp
@@ -70,7 +70,7 @@ SalutMessageWidget::~SalutMessageWidget()
 {
 }
 
-///these params always comes from KUser with first & last name splitted manualy by the last space
+///these params always comes from KUser with first & last name split manually by the last space
 void SalutMessageWidget::setParams(const QString& firstname, const QString& lastname, const QString& nick)
 {
     QString displayName;

-- 
ktp-accounts-kcm packaging