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

The following commit has been merged in the master branch:
commit a1fbbd8a6d7f18881541abd0736c10fe5278be1c
Author: l10n daemon script <scripty at kde.org>
Date:   Wed Nov 4 17:14:42 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 b24ccf3..c4fe317 100644
--- a/org.kde.ktpcontactlist.desktop
+++ b/org.kde.ktpcontactlist.desktop
@@ -4,6 +4,7 @@ Name[ar]=متراسلون ت‌م
 Name[ast]=Contautos MI
 Name[bs]=IM kontakti
 Name[ca]=Contactes de MI
+Name[ca at valencia]=Contactes de MI
 Name[cs]=Kontakty IM
 Name[da]=IM-kontakter
 Name[de]=IM-Kontakte

-- 
ktp-contact-list packaging