From a50607939d7121d121baadf70e51d227c1e9e562 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 9 Sep 2015 10:15:45 +0000 Subject: [PATCH] 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 11c4729c6..47ac8f342 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 8373c78f9..d56d55b16 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