[SCM] ktp-contact-runner packaging branch, master, updated. debian/16.04.2-1-47-g3973a3e

Maximiliano Curia maxy at moszumanska.debian.org
Tue Sep 12 14:08:09 UTC 2017


Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-contact-runner.git;a=commitdiff;h=796e6a4

The following commit has been merged in the master branch:
commit 796e6a4a1256c63f1696bc3379725685867e8fd6
Author: l10n daemon script <scripty at kde.org>
Date:   Fri Sep 9 09:27:48 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"
---
 plasma-runner-ktp-contact.desktop.cmake | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plasma-runner-ktp-contact.desktop.cmake b/plasma-runner-ktp-contact.desktop.cmake
index 4cf8532..403175d 100644
--- a/plasma-runner-ktp-contact.desktop.cmake
+++ b/plasma-runner-ktp-contact.desktop.cmake
@@ -47,8 +47,8 @@ Comment=Start a chat with any of your IM contacts or change your IM status
 Comment[ar]=ابدأ محادثة بأيّ من متراسلي ت‌م أو غيّر حالة ت‌م
 Comment[ast]=Anicia una charra con cualesquiera de los tos contautos de MI o camuda'l to estáu
 Comment[bs]=Pokrenite ćaskanje s bilo kojim od vaših IM kontakta ili promijenite svoj IM status
-Comment[ca]=Inicia un xat amb qualsevol dels vostres contactes de MI o canvia el vostre estat de MI
-Comment[ca at valencia]=Inicia un xat amb qualsevol dels vostres contactes de MI o canvia el vostre estat de MI
+Comment[ca]=Inicia un xat amb qualsevol dels vostres contactes de MI o canvia el vostre estat a la MI
+Comment[ca at valencia]=Inicia un xat amb qualsevol dels vostres contactes de MI o canvia el vostre estat a la MI
 Comment[cs]=Začít rozhovor s kterýmkoliv vaším kontaktem v IM nebo změnit stav na IM
 Comment[da]=Start chat med en af dine IM-kontakter eller skift din IM-status
 Comment[de]=Chats mit ihren Kontakten starten oder Ihren IM-Status ändern

-- 
ktp-contact-runner packaging



More information about the pkg-kde-commits mailing list