[SCM] ktp-text-ui packaging branch, master, updated. debian/15.12.1-1-1918-gdf4b0ec

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-text-ui.git;a=commitdiff;h=32bac3e

The following commit has been merged in the master branch:
commit 32bac3ec7508862c89971ad5e963b89541b0313f
Author: Dominik Cermak <d.cermak at arcor.de>
Date:   Tue Dec 20 20:17:26 2011 +0100

    Krazy: Fix ambiguous translations
---
 lib/chat-search-bar.cpp | 4 ++--
 lib/chat-widget.cpp     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/chat-search-bar.cpp b/lib/chat-search-bar.cpp
index 528472f..15aa5da 100644
--- a/lib/chat-search-bar.cpp
+++ b/lib/chat-search-bar.cpp
@@ -33,8 +33,8 @@ ChatSearchBar::ChatSearchBar(QWidget* parent)
     : QWidget(parent)
     , m_searchInput(new KLineEdit(this))
     , m_closeButton(new KPushButton(this))
-    , m_nextButton(new KPushButton(KIcon(QLatin1String("go-down-search")), i18n("&Next"), this))
-    , m_previousButton(new KPushButton(KIcon(QLatin1String("go-up-search")), i18n("&Previous"), this))
+    , m_nextButton(new KPushButton(KIcon(QLatin1String("go-down-search")), i18nc("Next search result" ,"&Next"), this))
+    , m_previousButton(new KPushButton(KIcon(QLatin1String("go-up-search")), i18nc("Previous search result" ,"&Previous"), this))
     , m_caseSensitive(false)
 {
     // close button setup
diff --git a/lib/chat-widget.cpp b/lib/chat-widget.cpp
index b798312..b55b81d 100644
--- a/lib/chat-widget.cpp
+++ b/lib/chat-widget.cpp
@@ -268,7 +268,7 @@ void ChatWidget::setChatEnabled(bool enable)
     if (!enable) {
         statusMessage.setMessage(i18n("Connection closed"));
     } else {
-        statusMessage.setMessage(i18n("Connected"));
+        statusMessage.setMessage(i18nc("Connected to IM service", "Connected"));
     }
     statusMessage.setService(d->channel->connection()->protocolName());
     statusMessage.setTime(QDateTime::currentDateTime());

-- 
ktp-text-ui packaging