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

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit b88cf270174d9e8742318fcbe755ed48f7954fd0
Author: l10n daemon script <scripty at kde.org>
Date:   Mon Mar 21 11:00:42 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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ktp-send-file.desktop b/ktp-send-file.desktop
index a9f2fa3..4576b82 100644
--- a/ktp-send-file.desktop
+++ b/ktp-send-file.desktop
@@ -38,7 +38,7 @@ Name[pl]=Wyślij plik do kontaktu komunikatora internetowego
 Name[pt]=Enviar o ficheiro para o contacto MI
 Name[pt_BR]=Enviar arquivo por mensagem instantânea
 Name[ro]=Trimite fișier unui contact de MI
-Name[ru]=Отправка файла собеседнику
+Name[ru]=Отправить файл собеседнику...
 Name[sk]=Poslať súbor IM kontaktu
 Name[sl]=Pošlji datoteko stiku hipnega sporočanja
 Name[sr]=Пошаљи фајл ИМ контакту

-- 
ktp-send-file packaging