[SCM] kdeconnect packaging branch, master, updated. debian/0.9g-1-1183-g9d69498

Maximiliano Curia maxy at moszumanska.debian.org
Fri Oct 14 14:29:00 UTC 2016


Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kdeconnect.git;a=commitdiff;h=a506079

The following commit has been merged in the master branch:
commit a50607939d7121d121baadf70e51d227c1e9e562
Author: l10n daemon script <scripty at kde.org>
Date:   Wed Sep 9 10:15:45 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"
---
 kcm/kdeconnect.desktop        | 1 +
 kdeconnect-non-plasma.desktop | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/kcm/kdeconnect.desktop b/kcm/kdeconnect.desktop
index 11c4729..47ac8f3 100755
--- a/kcm/kdeconnect.desktop
+++ b/kcm/kdeconnect.desktop
@@ -8,6 +8,7 @@ Name[nl]=Instellingen van KDE Connect
 Name[pt]=Configuração do KDE Connect
 Name[pt_BR]=Configurações do KDE Connect
 Name[sv]=Inställning av KDE-anslut
+Name[tr]=KDE Bağlantı Ayarları
 Name[uk]=Параметри KDE Connect
 Name[x-test]=xxKDE Connect Settingsxx
 GenericName=Connect and sync your devices
diff --git a/kdeconnect-non-plasma.desktop b/kdeconnect-non-plasma.desktop
index 8373c78..d56d55b 100755
--- a/kdeconnect-non-plasma.desktop
+++ b/kdeconnect-non-plasma.desktop
@@ -4,6 +4,7 @@ Name[nl]=KDE-Connectmonitor
 Name[pt]=Monitor do KDE Connect
 Name[pt_BR]=Monitor do KDE Connect
 Name[sv]=KDE-anslut övervakning
+Name[tr]=KDE Bağlantı İzleyicisi
 Name[uk]=Монітор KDE Connect
 Name[x-test]=xxKDE Connect Monitorxx
 Comment=Display information about your devices
@@ -11,6 +12,7 @@ Comment[nl]=Toon informatie over uw apparaten
 Comment[pt]=Mostrar informações sobre os seus dispositivos
 Comment[pt_BR]=Mostra informações sobre seus dispositivos
 Comment[sv]=Visa information om enheter
+Comment[tr]=Aygıtlarınız hakkında bilgi görüntüleyin
 Comment[uk]=Показати дані щодо ваших пристроїв
 Comment[x-test]=xxDisplay information about your devicesxx
 Exec=plasmawindowed org.kde.kdeconnect --statusnotifier

-- 
kdeconnect packaging



More information about the pkg-kde-commits mailing list