[SCM] ktp-contact-applet packaging branch, master, updated. debian/15.12.1-1-966-gde83ac5

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-desktop-applets.git;a=commitdiff;h=28b7ef4

The following commit has been merged in the master branch:
commit 28b7ef4f707cd2fc8d916d9fb47e9bf4942b655f
Author: l10n daemon script <scripty at kde.org>
Date:   Sat Jun 6 11:35:44 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"
---
 chat/org.kde.ktp-chat/metadata.desktop.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/chat/org.kde.ktp-chat/metadata.desktop.cmake b/chat/org.kde.ktp-chat/metadata.desktop.cmake
index 1d8be9d..dca6381 100644
--- a/chat/org.kde.ktp-chat/metadata.desktop.cmake
+++ b/chat/org.kde.ktp-chat/metadata.desktop.cmake
@@ -26,7 +26,7 @@ Name[nb]=Kjapp prat
 Name[nds]=Fixklönen
 Name[nl]=Snelle chat
 Name[pa]=ਤੁਰੰਤ ਗੱਲਬਾਤ
-Name[pl]=Szybka rozmowa
+Name[pl]=Szybkie rozmowy
 Name[pt]=Conversa Rápida
 Name[pt_BR]=Conversa rápida
 Name[ro]=Discuție rapidă

-- 
ktp-contact-applet packaging