From 7634e826371bc534107902602877771954deec5e Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 15 Feb 2019 05:34:24 +0100 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" --- plugins/battery/kdeconnect_battery.json | 2 +- .../findmyphone/plasma-runner-kdeconnect-findmyphone.desktop | 2 ++ .../plasma-runner-kdeconnect-remotecommands.desktop | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/plugins/battery/kdeconnect_battery.json b/plugins/battery/kdeconnect_battery.json index 30d5561e3..2645350ff 100644 --- a/plugins/battery/kdeconnect_battery.json +++ b/plugins/battery/kdeconnect_battery.json @@ -94,7 +94,7 @@ "Name[eu]": "Bateriaren monitorea", "Name[fi]": "Akkuvalvonta", "Name[fr]": "Moniteur de batterie", - "Name[gl]": "Vixilante da batería", + "Name[gl]": "Monitor da batería", "Name[hu]": "Akkumulátorfigyelő", "Name[ia]": "Controlator de batteria", "Name[id]": "Battery monitor", diff --git a/runners/findmyphone/plasma-runner-kdeconnect-findmyphone.desktop b/runners/findmyphone/plasma-runner-kdeconnect-findmyphone.desktop index 7c9f2f0ce..b6e33d365 100644 --- a/runners/findmyphone/plasma-runner-kdeconnect-findmyphone.desktop +++ b/runners/findmyphone/plasma-runner-kdeconnect-findmyphone.desktop @@ -10,6 +10,7 @@ Name[pt]= Procurar o meu dispositivo Name[sv]=Hitta min apparat Name[uk]=Знайти пристрій Name[x-test]=xx Find my devicexx +Name[zh_TW]= 尋找我的裝置 Comment=Ring connected devices Comment[ca]=Fa sonar als dispositius connectats Comment[ca@valencia]=Fa sonar als dispositius connectats @@ -21,6 +22,7 @@ Comment[pt]=Tocar os dispositivos ligados Comment[sv]=Ring anslutna apparater Comment[uk]=Дзвінок на з'єднаних пристроях Comment[x-test]=xxRing connected devicesxx +Comment[zh_TW]=讓連結的裝置發出鈴聲 Icon=kdeconnect Type=Service X-KDE-ServiceTypes=Plasma/Runner diff --git a/runners/remotecommands/plasma-runner-kdeconnect-remotecommands.desktop b/runners/remotecommands/plasma-runner-kdeconnect-remotecommands.desktop index ad264ebd3..25aeb1639 100644 --- a/runners/remotecommands/plasma-runner-kdeconnect-remotecommands.desktop +++ b/runners/remotecommands/plasma-runner-kdeconnect-remotecommands.desktop @@ -10,6 +10,7 @@ Name[pt]=Executar um comando Name[sv]=Kör kommando Name[uk]=Виконати команду Name[x-test]=xxRun commandxx +Name[zh_TW]=執行指令 Comment=Run commands on connected devices Comment[ca]=Executa les ordres als dispositius connectats Comment[ca@valencia]=Executa les ordres als dispositius connectats @@ -21,6 +22,7 @@ Comment[pt]=Executar comandos nos dispositivos ligados Comment[sv]=Kör kommando på anslutna apparater Comment[uk]=Виконання команд на з'єднаних пристроях Comment[x-test]=xxRun commands on connected devicesxx +Comment[zh_TW]=在連結的裝置上執行指令 Icon=kdeconnect Type=Service X-KDE-ServiceTypes=Plasma/Runner