[SCM] ktp-kded-integration-module packaging branch, master, updated. debian/0.4.0-1-27-gaf06779
Mark Purcell
msp at alioth.debian.org
Sun Aug 11 00:57:27 UTC 2013
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kde-telepathy/ktp-kded-integration-module.git;a=commitdiff;h=94ffdc1
The following commit has been merged in the master branch:
commit 94ffdc1d31a190c4ef8c4dfdeab299778ff858d2
Author: Mark Purcell <msp at debian.org>
Date: Sun Aug 11 10:52:07 2013 +1000
Imported Upstream version 0.6.3
---
config/kcm_ktp_integration_module.desktop | 2 +-
error-handler.cpp | 14 ++++++--------
po/ca/kded_ktp_integration_module.po | 2 +-
po/fr/kded_ktp_integration_module.po | 11 +++++++----
po/ro/kded_ktp_integration_module.po | 10 +++++-----
po/ru/kded_ktp_integration_module.po | 6 +++---
po/sr/kded_ktp_integration_module.po | 4 ++--
po/sr at ijekavian/kded_ktp_integration_module.po | 4 ++--
po/sr at ijekavianlatin/kded_ktp_integration_module.po | 4 ++--
po/sr at latin/kded_ktp_integration_module.po | 4 ++--
10 files changed, 31 insertions(+), 30 deletions(-)
diff --git a/config/kcm_ktp_integration_module.desktop b/config/kcm_ktp_integration_module.desktop
index c804fbe..9f4cbbc 100644
--- a/config/kcm_ktp_integration_module.desktop
+++ b/config/kcm_ktp_integration_module.desktop
@@ -81,7 +81,7 @@ Comment[pl]=Ogólne ustawienia dla komunikatora internetowego i VoIP
Comment[pt]=Configuração geral das Mensagens Instantâneas e VoIP
Comment[pt_BR]=Configurações gerais de mensagens instantâneas e VoIP
Comment[ro]=Configurări generale pentru mesageria instantanee și VoIP
-Comment[ru]=Основные параметры системы обмена сообщениями и VoIP
+Comment[ru]=Основные параметры системы обмена сообщениями
Comment[sk]=Všeobecné nastavenia pre Instant Messaging a VoIP
Comment[sl]=Splošne nastavitve za hipno sporočanje in VoIP
Comment[sr]=Опште поставке брзог гласништва и ВоИП‑а
diff --git a/error-handler.cpp b/error-handler.cpp
index 0be2970..2b84784 100644
--- a/error-handler.cpp
+++ b/error-handler.cpp
@@ -139,16 +139,16 @@ void ErrorHandler::showErrorNotification()
if (!error.shown() && error.errorTime().secsTo(QDateTime::currentDateTime()) > 20) {
switch (error.connectionStatusReason()) {
case Tp::ConnectionStatusReasonNetworkError:
- errorMessage += i18nc("%1 is the account name", "Could not connect %1. There was a network error, check your connection", account->displayName()) + QLatin1Char('
');
+ errorMessage += i18nc("%1 is the account name", "Could not connect %1. There was a network error, check your connection", account->displayName()) + QLatin1String("<br>");
break;
default:
if (error.connectionError() == QLatin1String(TP_QT_ERROR_CANCELLED)) {
break;
}
if (error.connectionErrorDetails().hasServerMessage()) {
- errorMessage += i18nc("%1 is the account name, %2 the error message", "There was a problem while trying to connect %1 - %2", account->displayName(), error.connectionErrorDetails().serverMessage()) + QLatin1Char('
');
+ errorMessage += i18nc("%1 is the account name, %2 the error message", "There was a problem while trying to connect %1 - %2", account->displayName(), error.connectionErrorDetails().serverMessage()) + QLatin1String("<br>");
} else {
- errorMessage += i18nc("%1 is the account name, %2 the error message", "There was a problem while trying to connect %1 - %2", account->displayName(), KTp::ErrorDictionary::displayVerboseErrorMessage(error.connectionError())) + QLatin1Char('
');
+ errorMessage += i18nc("%1 is the account name, %2 the error message", "There was a problem while trying to connect %1 - %2", account->displayName(), KTp::ErrorDictionary::displayVerboseErrorMessage(error.connectionError())) + QLatin1String("<br>");
}
break;
}
@@ -158,8 +158,8 @@ void ErrorHandler::showErrorNotification()
}
if (!errorMessage.isEmpty()) {
- if (errorMessage.endsWith(QLatin1Char('
'))) {
- errorMessage.chop(1);
+ if (errorMessage.endsWith(QLatin1String("<br>"))) {
+ errorMessage.chop(4);
}
showMessageToUser(errorMessage, ErrorHandler::SystemMessageError);
@@ -179,9 +179,7 @@ void ErrorHandler::onConnectionStatusChanged(const Tp::ConnectionStatus status)
//if this is the first error for this account, store the details of the error to show
if (account->connectionStatusReason() == Tp::ConnectionStatusReasonRequested) {
m_errorMap.remove(account);
- }
-
- if (!m_errorMap.contains(account)) {
+ } else if (!m_errorMap.contains(account)) {
m_errorMap.insert(account, ConnectionError(account->connectionStatusReason(), account->connectionError(), account->connectionErrorDetails()));
QTimer::singleShot(30 * 1000, this, SLOT(showErrorNotification())); //a timer is kept per account because we want to show 30 seconds after the first still valid error.
}
diff --git a/po/ca/kded_ktp_integration_module.po b/po/ca/kded_ktp_integration_module.po
index dac0fe1..33d57db 100644
--- a/po/ca/kded_ktp_integration_module.po
+++ b/po/ca/kded_ktp_integration_module.po
@@ -1,5 +1,5 @@
# Translation of kded_ktp_integration_module.po to Catalan
-# Copyright (C) 2012 This_file_is_part_of_KDE
+# Copyright (C) 2012-2013 This_file_is_part_of_KDE
# This file is distributed under the license LGPL version 2.1 or
# version 3 or later versions approved by the membership of KDE e.V.
#
diff --git a/po/fr/kded_ktp_integration_module.po b/po/fr/kded_ktp_integration_module.po
index 9e1938e..f53fcdc 100644
--- a/po/fr/kded_ktp_integration_module.po
+++ b/po/fr/kded_ktp_integration_module.po
@@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: kded_ktp_integration_module
"
"Report-Msgid-Bugs-To: http://bugs.kde.org
"
"POT-Creation-Date: 2013-04-16 19:06+0200
"
-"PO-Revision-Date: 2013-04-15 16:45+0200
"
+"PO-Revision-Date: 2013-07-23 16:14+0200
"
"Last-Translator: Joëlle Cornavin <jcorn at free.fr>
"
"Language-Team: French <kde-francophone at kde.org>
"
"Language: fr
"
@@ -16,7 +16,10 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8
"
"Content-Transfer-Encoding: 8bit
"
"Plural-Forms: nplurals=2; plural=(n > 1);
"
-"X-Generator: Lokalize 1.4
"
+"X-Generator: Lokalize 1.5
"
+"X-Environment: kde
"
+"X-Accelerator-Marker: &
"
+"X-Text-Markup: kde4
"
msgctxt "NAME OF TRANSLATORS"
msgid "Your names"
@@ -276,8 +279,8 @@ msgstr "%1 est maintenant %2"
msgctxt "%1 is the account name"
msgid "Could not connect %1. There was a network error, check your connection"
msgstr ""
-"Impossible de connecter %1. Un problème de réseau est survenu, vérifiez "
-"votre connexion"
+"Il est impossible de connecter %1. Un problème de réseau est survenu, "
+"vérifiez votre connexion"
#: error-handler.cpp:149 error-handler.cpp:151
#, kde-format
diff --git a/po/ro/kded_ktp_integration_module.po b/po/ro/kded_ktp_integration_module.po
index 9d61ab1..0f3107d 100644
--- a/po/ro/kded_ktp_integration_module.po
+++ b/po/ro/kded_ktp_integration_module.po
@@ -7,7 +7,7 @@ msgstr ""
"Project-Id-Version:
"
"Report-Msgid-Bugs-To: http://bugs.kde.org
"
"POT-Creation-Date: 2013-04-16 19:06+0200
"
-"PO-Revision-Date: 2013-01-10 17:06+0200
"
+"PO-Revision-Date: 2013-05-25 09:48+0300
"
"Last-Translator: Sergiu Bivol <sergiu at ase.md>
"
"Language-Team: Romanian <kde-i18n-ro at kde.org>
"
"Language: ro
"
@@ -184,7 +184,7 @@ msgstr "Cerere nouă de contact"
#: contact-request-handler.cpp:178
#, kde-format
msgid "The contact %1 wants to be able to chat with you."
-msgstr ""
+msgstr "Contactul %1 vrea să poată comunica cu dumneavoastră."
#: contact-request-handler.cpp:195
msgid "Error adding contact"
@@ -262,9 +262,9 @@ msgstr "Respinge"
#, kde-format
msgid "You have 1 contact wanting to chat with you"
msgid_plural "You have %1 contacts wanting to chat with you"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "Aveți 1 contact care dorește să discute cu dumneavoastră"
+msgstr[1] "Aveți %1 contacte care doresc să discute cu dumneavoastră"
+msgstr[2] "Aveți de %1 contacte care doresc să discute cu dumneavoastră"
#: contactnotify.cpp:74
#, kde-format
diff --git a/po/ru/kded_ktp_integration_module.po b/po/ru/kded_ktp_integration_module.po
index ee4f7a0..8acea50 100644
--- a/po/ru/kded_ktp_integration_module.po
+++ b/po/ru/kded_ktp_integration_module.po
@@ -7,7 +7,7 @@ msgstr ""
"Project-Id-Version:
"
"Report-Msgid-Bugs-To: http://bugs.kde.org
"
"POT-Creation-Date: 2013-04-16 19:06+0200
"
-"PO-Revision-Date: 2013-03-09 12:43+0400
"
+"PO-Revision-Date: 2013-06-09 01:29+0400
"
"Last-Translator: Yuri Efremov <yur.arh at gmail.com>
"
"Language-Team: Russian <kde-russian at lists.kde.ru>
"
"Language: ru
"
@@ -153,12 +153,12 @@ msgstr "Недоступен"
#. i18n: ectx: property (title), widget (QGroupBox, nowPlayingGroupBox)
#: config/telepathy-kded-config.ui:289
msgid "Now playing"
-msgstr "Сейчас проигрывается"
+msgstr "Статус «Сейчас слушаю…»"
#. i18n: ectx: property (text), widget (QLabel, m_nowPlayingLabel)
#: config/telepathy-kded-config.ui:301
msgid "'Now playing...' presence:"
-msgstr "Сообщение «Сейчас проигрывается…»:"
+msgstr "Использование статуса"
#. i18n: ectx: property (title), widget (QGroupBox, autoConnectGroupBox)
#: config/telepathy-kded-config.ui:350
diff --git a/po/sr/kded_ktp_integration_module.po b/po/sr/kded_ktp_integration_module.po
index 40089d8..b538f8a 100644
--- a/po/sr/kded_ktp_integration_module.po
+++ b/po/sr/kded_ktp_integration_module.po
@@ -6,7 +6,7 @@ msgstr ""
"Project-Id-Version: kded_ktp_integration_module
"
"Report-Msgid-Bugs-To: http://bugs.kde.org
"
"POT-Creation-Date: 2013-04-16 19:06+0200
"
-"PO-Revision-Date: 2013-03-10 14:32+0100
"
+"PO-Revision-Date: 2013-05-21 14:22+0200
"
"Last-Translator: Chusslove Illich <caslav.ilic at gmx.net>
"
"Language-Team: Serbian <kde-i18n-sr at kde.org>
"
"Language: sr
"
@@ -99,7 +99,7 @@ msgstr "Фасцикла у коју ће се уписивати примљен
#. i18n: ectx: property (text), widget (QLabel, m_autoAcceptLabel)
#: config/telepathy-kded-config.ui:49
msgid "Auto-accept file transfers:"
-msgstr "Аутоматско прихватање преноса фајлова:"
+msgstr "Аутоматски прихватај преносе фајлова:"
# >! Why this at all? Checked box means "enabled".
#. i18n: ectx: property (text), widget (QCheckBox, m_autoAcceptCheckBox)
diff --git a/po/sr at ijekavian/kded_ktp_integration_module.po b/po/sr at ijekavian/kded_ktp_integration_module.po
index 9336928..c7f1352 100644
--- a/po/sr at ijekavian/kded_ktp_integration_module.po
+++ b/po/sr at ijekavian/kded_ktp_integration_module.po
@@ -6,7 +6,7 @@ msgstr ""
"Project-Id-Version: kded_ktp_integration_module
"
"Report-Msgid-Bugs-To: http://bugs.kde.org
"
"POT-Creation-Date: 2013-04-16 19:06+0200
"
-"PO-Revision-Date: 2013-03-10 14:32+0100
"
+"PO-Revision-Date: 2013-05-21 14:22+0200
"
"Last-Translator: Chusslove Illich <caslav.ilic at gmx.net>
"
"Language-Team: Serbian <kde-i18n-sr at kde.org>
"
"Language: sr at ijekavian
"
@@ -99,7 +99,7 @@ msgstr "Фасцикла у коју ће се уписивати примљен
#. i18n: ectx: property (text), widget (QLabel, m_autoAcceptLabel)
#: config/telepathy-kded-config.ui:49
msgid "Auto-accept file transfers:"
-msgstr "Аутоматско прихватање преноса фајлова:"
+msgstr "Аутоматски прихватај преносе фајлова:"
# >! Why this at all? Checked box means "enabled".
#. i18n: ectx: property (text), widget (QCheckBox, m_autoAcceptCheckBox)
diff --git a/po/sr at ijekavianlatin/kded_ktp_integration_module.po b/po/sr at ijekavianlatin/kded_ktp_integration_module.po
index be9d6ef..5021754 100644
--- a/po/sr at ijekavianlatin/kded_ktp_integration_module.po
+++ b/po/sr at ijekavianlatin/kded_ktp_integration_module.po
@@ -6,7 +6,7 @@ msgstr ""
"Project-Id-Version: kded_ktp_integration_module
"
"Report-Msgid-Bugs-To: http://bugs.kde.org
"
"POT-Creation-Date: 2013-04-16 19:06+0200
"
-"PO-Revision-Date: 2013-03-10 14:32+0100
"
+"PO-Revision-Date: 2013-05-21 14:22+0200
"
"Last-Translator: Chusslove Illich <caslav.ilic at gmx.net>
"
"Language-Team: Serbian <kde-i18n-sr at kde.org>
"
"Language: sr at ijekavianlatin
"
@@ -99,7 +99,7 @@ msgstr "Fascikla u koju će se upisivati primljeni fajlovi."
#. i18n: ectx: property (text), widget (QLabel, m_autoAcceptLabel)
#: config/telepathy-kded-config.ui:49
msgid "Auto-accept file transfers:"
-msgstr "Automatsko prihvatanje prenosa fajlova:"
+msgstr "Automatski prihvataj prenose fajlova:"
# >! Why this at all? Checked box means "enabled".
#. i18n: ectx: property (text), widget (QCheckBox, m_autoAcceptCheckBox)
diff --git a/po/sr at latin/kded_ktp_integration_module.po b/po/sr at latin/kded_ktp_integration_module.po
index cf78838..05b7cc3 100644
--- a/po/sr at latin/kded_ktp_integration_module.po
+++ b/po/sr at latin/kded_ktp_integration_module.po
@@ -6,7 +6,7 @@ msgstr ""
"Project-Id-Version: kded_ktp_integration_module
"
"Report-Msgid-Bugs-To: http://bugs.kde.org
"
"POT-Creation-Date: 2013-04-16 19:06+0200
"
-"PO-Revision-Date: 2013-03-10 14:32+0100
"
+"PO-Revision-Date: 2013-05-21 14:22+0200
"
"Last-Translator: Chusslove Illich <caslav.ilic at gmx.net>
"
"Language-Team: Serbian <kde-i18n-sr at kde.org>
"
"Language: sr at latin
"
@@ -99,7 +99,7 @@ msgstr "Fascikla u koju će se upisivati primljeni fajlovi."
#. i18n: ectx: property (text), widget (QLabel, m_autoAcceptLabel)
#: config/telepathy-kded-config.ui:49
msgid "Auto-accept file transfers:"
-msgstr "Automatsko prihvatanje prenosa fajlova:"
+msgstr "Automatski prihvataj prenose fajlova:"
# >! Why this at all? Checked box means "enabled".
#. i18n: ectx: property (text), widget (QCheckBox, m_autoAcceptCheckBox)
--
ktp-kded-integration-module packaging
More information about the pkg-kde-commits
mailing list