[SCM] ktp-send-file packaging branch, master, updated. debian/16.04.2-1-48-gd52156b

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-send-file.git;a=commitdiff;h=597991a

The following commit has been merged in the master branch:
commit 597991ae2551112f2be72c39d8f5e28a8fbec2ce
Author: l10n daemon script <scripty at kde.org>
Date:   Fri Sep 9 09:28:01 2016 +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-send-file.desktop | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ktp-send-file.desktop b/ktp-send-file.desktop
index 4576b82..ec693d5 100644
--- a/ktp-send-file.desktop
+++ b/ktp-send-file.desktop
@@ -8,8 +8,8 @@ MimeType=all/allfiles;
 Name=Send file to IM contact
 Name[ast]=Unviar ficheru al contautu
 Name[bs]=Slanje datoteke na IM kontakt
-Name[ca]=Envia fitxer a contacte de MI
-Name[ca at valencia]=Envia fitxer a contacte de MI
+Name[ca]=Envia el fitxer a un contacte de la MI
+Name[ca at valencia]=Envia el fitxer a un contacte de la MI
 Name[cs]=Poslat soubor kontaktu na IM
 Name[da]=Send fil til IM-kontakt
 Name[de]=Datei an einen Instant-Messenger-Kontakt senden

-- 
ktp-send-file packaging