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

The following commit has been merged in the master branch:
commit 7e5d52d2f7b2e253e442aee17f7c324fefca78fb
Author: l10n daemon script <scripty at kde.org>
Date:   Tue Dec 20 13:10:54 2016 +0100

    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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ktp-send-file.desktop b/ktp-send-file.desktop
index 2065561..99f3e0f 100644
--- a/ktp-send-file.desktop
+++ b/ktp-send-file.desktop
@@ -6,7 +6,7 @@ MimeType=all/allfiles;
 
 [Desktop Action sendFile]
 Name=Send file to IM contact
-Name[ast]=Unviar ficheru al contautu
+Name[ast]=Unviar ficheru a contautu MI
 Name[bs]=Slanje datoteke na IM kontakt
 Name[ca]=Envia el fitxer a un contacte de la MI
 Name[ca at valencia]=Envia el fitxer a un contacte de la MI

-- 
ktp-send-file packaging