[SCM] ktp-kded-integration-module packaging branch, master, updated. debian/15.12.1-2-382-gbd961c2
Maximiliano Curia
maxy at moszumanska.debian.org
Sat May 28 00:16:01 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-kded-module.git;a=commitdiff;h=8b47b89
The following commit has been merged in the master branch:
commit 8b47b89436a0aae9573e45f907f4766b4d13f4e2
Author: l10n daemon script <scripty at kde.org>
Date: Sun Jul 5 10:01:29 2015 +0000
SVN_SILENT made messages (.desktop file) - always resolve ours
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
---
ktp_integration_module.desktop | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ktp_integration_module.desktop b/ktp_integration_module.desktop
index 4918e25..225de36 100644
--- a/ktp_integration_module.desktop
+++ b/ktp_integration_module.desktop
@@ -80,7 +80,7 @@ Comment[nl]=Deze module biedt een diepere integratie van Instant Messaging met K
Comment[pa]=ਮੋਡੀਊਲ ਤੁਰੰਤ ਸੁਨੇਹੇਦਾਰ ਨੂੰ KDE ਨਾਲ ਡੂੰਘੇ ਰੂਪ ਵਿੱਚ ਜੋੜਦਾ ਹੈ।
Comment[pl]=Moduł zapewniający głębszą integrację komunikatora internetowego z KDE.
Comment[pt]=Um módulo que fornece maior integração com as Mensagens Instantâneas no KDE.
-Comment[pt_BR]=Módulo que fornece uma maior integração com as mensagens instantâneas no KDE.
+Comment[pt_BR]=Módulo que proporciona maior integração com as mensagens instantâneas no KDE.
Comment[ro]=Modul ce furnizează integrare mai profundă între mesageria instantanee și KDE.
Comment[ru]=Предоставляет интеграцию системы обмена сообщениями в KDE.
Comment[sk]=Modul poskytujúci hlbšiu integráciu instant messagingu s KDE.
--
ktp-kded-integration-module packaging
More information about the pkg-kde-commits
mailing list