[SCM] ktp-common-internals packaging branch, master, updated. debian/15.12.1-2-1839-gf0635e9

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-common-internals.git;a=commitdiff;h=fbfd16f

The following commit has been merged in the master branch:
commit fbfd16fdbdb2b6123addb1b636d57c5b543bee95
Author: Yuri Chornoivan <yurchor at ukr.net>
Date:   Sun Jul 22 22:51:11 2012 +0300

    Fix typo found by Krazy: occured->occurred
---
 KTp/error-dictionary.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/KTp/error-dictionary.cpp b/KTp/error-dictionary.cpp
index 1836540..847cdac 100644
--- a/KTp/error-dictionary.cpp
+++ b/KTp/error-dictionary.cpp
@@ -72,7 +72,7 @@ QString ErrorDictionary::displayVerboseErrorMessage(const QString& dbusErrorName
     } else if (dbusErrorName == QLatin1String(TP_QT_ERROR_CHANNEL_KICKED)) {
         return i18nc("Verbose user visible error string", "You have been kicked from the channel");
     } else if (dbusErrorName == QLatin1String(TP_QT_ERROR_CONFUSED)) {
-        return i18nc("Verbose user visible error string", "An unexpected error has occured");
+        return i18nc("Verbose user visible error string", "An unexpected error has occurred");
     } else if (dbusErrorName == QLatin1String(TP_QT_ERROR_CONNECTION_FAILED)) {
         return i18nc("Verbose user visible error string", "Could not establish connection");
     } else if (dbusErrorName == QLatin1String(TP_QT_ERROR_CONNECTION_LOST)) {

-- 
ktp-common-internals packaging