[SCM] ktp-send-file packaging branch, master, updated. debian/15.12.1-2-216-g8f07cdf

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 4c1d8d8b67e909b943018e8f9143fcea51c29706
Author: l10n daemon script <scripty at kde.org>
Date:   Thu Apr 30 10:13:26 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"
---
 ktp-send-file.desktop | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ktp-send-file.desktop b/ktp-send-file.desktop
index 7284564..a9f2fa3 100644
--- a/ktp-send-file.desktop
+++ b/ktp-send-file.desktop
@@ -6,6 +6,7 @@ MimeType=all/allfiles;
 
 [Desktop Action sendFile]
 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

-- 
ktp-send-file packaging