[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=1064fb1

The following commit has been merged in the master branch:
commit 1064fb196fe28bb080cb5c5b8c99ca50f9add6e9
Author: l10n daemon script <scripty at kde.org>
Date:   Mon Apr 27 10:19:04 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 | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/org.kde.ktpcontactlist.desktop b/org.kde.ktpcontactlist.desktop
index dd0f321..e777306 100644
--- a/org.kde.ktpcontactlist.desktop
+++ b/org.kde.ktpcontactlist.desktop
@@ -12,6 +12,7 @@ Name[es]=Contactos de MI
 Name[et]=Kiirsuhtluskontaktid
 Name[fi]=Pikaviestinkäyttäjät
 Name[fr]=Contacts de messagerie instantanée
+Name[gl]=Contactos de mensaxaría instantánea
 Name[hu]=Azonnali üzenetküldési partnerek
 Name[ia]=IM Contacts (Contactos de  IM)
 Name[it]=Contatti di MI
@@ -22,6 +23,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[ro]=Contacte de MI
 Name[ru]=Список контактов
 Name[sk]=IM kontakty
 Name[sl]=Stiki hipnega sporočanja

-- 
ktp-contact-list packaging