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

The following commit has been merged in the master branch:
commit d4aeb4a0f57742d9345f917ae94aa84726a5b02d
Author: Marcin Ziemiński <zieminn at gmail.com>
Date:   Tue Aug 19 16:40:11 2014 +0200

    OTRConfig: used -> in use for fingerprints
---
 config/otr-config.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/config/otr-config.cpp b/config/otr-config.cpp
index 500b054..23495cd 100644
--- a/config/otr-config.cpp
+++ b/config/otr-config.cpp
@@ -127,8 +127,8 @@ void OTRConfig::loadFingerprints()
     Q_FOREACH(const Tp::FingerprintInfo &fp, fingerprints) {
         ui->tbFingerprints->setItem(i, 0, new QTableWidgetItem(fp.contactName));
         ui->tbFingerprints->setItem(i, 1, new QTableWidgetItem(fp.fingerprint));
-        ui->tbFingerprints->setItem(i, 2, new QTableWidgetItem(fp.isVerified ? i18n("Yes") : i18n("No")));
-        ui->tbFingerprints->setItem(i, 3, new QTableWidgetItem(fp.inUse ? i18n("Used") : i18n("Unused")));
+        ui->tbFingerprints->setItem(i, 2, new QTableWidgetItem(fp.isVerified ? i18n("yes") : i18n("no")));
+        ui->tbFingerprints->setItem(i, 3, new QTableWidgetItem(fp.inUse ? i18n("in use") : i18n("not in use")));
 
         i++;
     }
@@ -231,7 +231,7 @@ void OTRConfig::onCurrentFpCellChanged(int currentRow, int currentColumn, int pr
     if(currentRow != -1) {
         ui->btVerify->setEnabled(true);
         fpCtxMenu->actions().at(0)->setEnabled(true);
-        if(ui->tbFingerprints->item(ui->tbFingerprints->currentRow(), 3)->text() == i18n("Unused")) {
+        if(ui->tbFingerprints->item(ui->tbFingerprints->currentRow(), 3)->text() == i18n("not in use")) {
             ui->btForget->setEnabled(true);
             fpCtxMenu->actions().at(1)->setEnabled(true);
         } else {

-- 
ktp-text-ui packaging