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

The following commit has been merged in the master branch:
commit e17559ac68ba670e2b52cd363bb9ca797fbb3385
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Mon Aug 26 12:49:30 2013 +0000

    Replace error message "This capability is not available"
    
    It generally seems to occur when a host is down so this current
    message makes little sense.
    
    REVIEW: 112286
---
 KTp/error-dictionary.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/KTp/error-dictionary.cpp b/KTp/error-dictionary.cpp
index 847cdac..a6179d3 100644
--- a/KTp/error-dictionary.cpp
+++ b/KTp/error-dictionary.cpp
@@ -100,7 +100,7 @@ QString ErrorDictionary::displayVerboseErrorMessage(const QString& dbusErrorName
     } else if (dbusErrorName == QLatin1String(TP_QT_ERROR_NO_ANSWER)) {
         return i18nc("Verbose user visible error string", "You were removed from the channel because you did not respond"); //FIXME: this sound bad
     } else if (dbusErrorName == QLatin1String(TP_QT_ERROR_NOT_AVAILABLE)) {
-        return i18nc("Verbose user visible error string", "This capability is not available");
+        return i18nc("Verbose user visible error string", "The service is not available");
     } else if (dbusErrorName == QLatin1String(TP_QT_ERROR_NOT_CAPABLE)) {
         return i18nc("Verbose user visible error string", "The contact does not have the requested capabilities");
     } else if (dbusErrorName == QLatin1String(TP_QT_ERROR_NOT_IMPLEMENTED)) {
@@ -207,7 +207,7 @@ QString ErrorDictionary::displayShortErrorMessage(const QString& dbusErrorName)
     } else if (dbusErrorName == QLatin1String(TP_QT_ERROR_NO_ANSWER)) {
         return i18nc("Short user visible error string", "Removed from channel");
     } else if (dbusErrorName == QLatin1String(TP_QT_ERROR_NOT_AVAILABLE)) {
-        return i18nc("Short user visible error string", "Capability not available");
+        return i18nc("Short user visible error string", "Service not available");
     } else if (dbusErrorName == QLatin1String(TP_QT_ERROR_NOT_CAPABLE)) {
         return i18nc("Short user visible error string", "Contact has no support");
     } else if (dbusErrorName == QLatin1String(TP_QT_ERROR_NOT_IMPLEMENTED)) {

-- 
ktp-common-internals packaging