[SCM] ktp-contact-list packaging branch, master, updated. debian/15.12.1-2-1070-g6c56f91

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-contact-list.git;a=commitdiff;h=40159cb

The following commit has been merged in the master branch:
commit 40159cb8d0980745adc9aa8be485ec0a5da1561c
Author: l10n daemon script <scripty at kde.org>
Date:   Thu Apr 9 10:01:47 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"
---
 org.kde.ktpcontactlist.desktop | 1 +
 1 file changed, 1 insertion(+)

diff --git a/org.kde.ktpcontactlist.desktop b/org.kde.ktpcontactlist.desktop
index 1a3bf17..3e84bdd 100644
--- a/org.kde.ktpcontactlist.desktop
+++ b/org.kde.ktpcontactlist.desktop
@@ -21,6 +21,7 @@ Name[nl]=IM-contactpersonen
 Name[pl]=Kontakty komunikatorów internetowych
 Name[pt]=Contactos de MI
 Name[pt_BR]=Contatos de mensagens instantâneas
+Name[ru]=Список контактов
 Name[sk]=IM kontakty
 Name[sl]=Stiki hipnega sporočanja
 Name[sr]=ИМ контакти

-- 
ktp-contact-list packaging