From 597758332e594f9a3dc9043c5893b56557e5a8f9 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 14 Feb 2024 02:56:33 +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/kcm_kdeconnect.json | 2 ++ plasmoid/package/metadata.json | 3 +++ plugins/battery/kdeconnect_battery.json | 1 + plugins/clipboard/kdeconnect_clipboard.json | 1 + plugins/mmtelephony/kdeconnect_mmtelephony.json | 1 + plugins/mpriscontrol/kdeconnect_mpriscontrol.json | 1 + plugins/notifications/kdeconnect_notifications.json | 1 + plugins/pausemusic/kdeconnect_pausemusic.json | 1 + plugins/ping/kdeconnect_ping.json | 1 + plugins/runcommand/kdeconnect_runcommand.json | 1 + plugins/share/kdeconnect_share.json | 1 + plugins/telephony/kdeconnect_telephony.json | 1 + 12 files changed, 15 insertions(+) diff --git a/kcm/kcm_kdeconnect.json b/kcm/kcm_kdeconnect.json index b172cf2ee..011eb041c 100644 --- a/kcm/kcm_kdeconnect.json +++ b/kcm/kcm_kdeconnect.json @@ -32,6 +32,7 @@ "Description[pt_BR]": "Conecta e sincroniza seus dispositivos", "Description[ro]": "Conectați-vă și sincronizați-vă dispozitivele", "Description[ru]": "Подключение и синхронизация с мобильными устройствами", + "Description[sk]": "Pripojiť a synchronizovať vaše zariadenia", "Description[sl]": "Poveži in sinhroniziraj svoje naprave", "Description[sv]": "Anslut och synkronisera dina apparater", "Description[tr]": "Aygıtlarını bağla ve eşzamanla", @@ -71,6 +72,7 @@ "Name[pt_BR]": "KDE Connect", "Name[ro]": "KDE Connect", "Name[ru]": "KDE Connect", + "Name[sk]": "KDE Connect", "Name[sl]": "KDE Connect", "Name[sv]": "KDE-anslut", "Name[tr]": "KDE Bağlan", diff --git a/plasmoid/package/metadata.json b/plasmoid/package/metadata.json index 81336801e..376bd10b7 100644 --- a/plasmoid/package/metadata.json +++ b/plasmoid/package/metadata.json @@ -34,6 +34,7 @@ "Name[pt_BR]": "Albert Vaca Cintora", "Name[ro]": "Albert Vaca Cintora", "Name[ru]": "Albert Vaca Cintora", + "Name[sk]": "Albert Vaca Cintora", "Name[sl]": "Albert Vaca Cintora", "Name[sv]": "Albert Vaca Cintora", "Name[tr]": "Albert Vaca Cintora", @@ -72,6 +73,7 @@ "Description[pt_BR]": "Mostrar notificações dos seus dispositivos usando o KDE Connect", "Description[ro]": "Arată notificări de pe dispozitivele dumneavoastră folosind KDE Connect", "Description[ru]": "Просмотр уведомлений с мобильных устройств с помощью KDE Connect", + "Description[sk]": "Odoslať súbor do iného zariadenia pomocou KDE Connect", "Description[sl]": "Pošljite obvestila iz drugih naprav s pomočjo KDE Connect", "Description[sv]": "Visa underrättelser från apparater med KDE anslut", "Description[tr]": "KDE Bağlan'ı kullanarak aygıttan gelen bildirimleri göster", @@ -114,6 +116,7 @@ "Name[pt_BR]": "KDE Connect", "Name[ro]": "KDE Connect", "Name[ru]": "KDE Connect", + "Name[sk]": "KDE Connect", "Name[sl]": "KDE Connect", "Name[sv]": "KDE-anslut", "Name[tr]": "KDE Bağlan", diff --git a/plugins/battery/kdeconnect_battery.json b/plugins/battery/kdeconnect_battery.json index 87354dde6..3d6ccc3a2 100644 --- a/plugins/battery/kdeconnect_battery.json +++ b/plugins/battery/kdeconnect_battery.json @@ -33,6 +33,7 @@ "Name[pt_BR]": "Albert Vaca Cintora", "Name[ro]": "Albert Vaca Cintora", "Name[ru]": "Albert Vaca Cintora", + "Name[sk]": "Albert Vaca Cintora", "Name[sl]": "Albert Vaca Cintora", "Name[sv]": "Albert Vaca Cintora", "Name[tr]": "Albert Vaca Cintora", diff --git a/plugins/clipboard/kdeconnect_clipboard.json b/plugins/clipboard/kdeconnect_clipboard.json index 178737fe4..09f51c6ef 100644 --- a/plugins/clipboard/kdeconnect_clipboard.json +++ b/plugins/clipboard/kdeconnect_clipboard.json @@ -33,6 +33,7 @@ "Name[pt_BR]": "Albert Vaca Cintora", "Name[ro]": "Albert Vaca Cintora", "Name[ru]": "Albert Vaca Cintora", + "Name[sk]": "Albert Vaca Cintora", "Name[sl]": "Albert Vaca Cintora", "Name[sv]": "Albert Vaca Cintora", "Name[tr]": "Albert Vaca Cintora", diff --git a/plugins/mmtelephony/kdeconnect_mmtelephony.json b/plugins/mmtelephony/kdeconnect_mmtelephony.json index f6fdb18b4..a6efbf196 100644 --- a/plugins/mmtelephony/kdeconnect_mmtelephony.json +++ b/plugins/mmtelephony/kdeconnect_mmtelephony.json @@ -34,6 +34,7 @@ "Name[pt_BR]": "Yoram Bar-Haim", "Name[ro]": "Yoram Bar-Haim", "Name[ru]": "Yoram Bar-Haim", + "Name[sk]": "Yoram Bar-Haim", "Name[sl]": "Yoram Bar-Haim", "Name[sv]": "Yoram Bar-Haim", "Name[tr]": "Yoram Bar-Haim", diff --git a/plugins/mpriscontrol/kdeconnect_mpriscontrol.json b/plugins/mpriscontrol/kdeconnect_mpriscontrol.json index edb1b8313..2cfac350f 100644 --- a/plugins/mpriscontrol/kdeconnect_mpriscontrol.json +++ b/plugins/mpriscontrol/kdeconnect_mpriscontrol.json @@ -33,6 +33,7 @@ "Name[pt_BR]": "Albert Vaca Cintora", "Name[ro]": "Albert Vaca Cintora", "Name[ru]": "Albert Vaca Cintora", + "Name[sk]": "Albert Vaca Cintora", "Name[sl]": "Albert Vaca Cintora", "Name[sv]": "Albert Vaca Cintora", "Name[tr]": "Albert Vaca Cintora", diff --git a/plugins/notifications/kdeconnect_notifications.json b/plugins/notifications/kdeconnect_notifications.json index 84172dccf..41d8e4f5d 100644 --- a/plugins/notifications/kdeconnect_notifications.json +++ b/plugins/notifications/kdeconnect_notifications.json @@ -33,6 +33,7 @@ "Name[pt_BR]": "Albert Vaca Cintora", "Name[ro]": "Albert Vaca Cintora", "Name[ru]": "Albert Vaca Cintora", + "Name[sk]": "Albert Vaca Cintora", "Name[sl]": "Albert Vaca Cintora", "Name[sv]": "Albert Vaca Cintora", "Name[tr]": "Albert Vaca Cintora", diff --git a/plugins/pausemusic/kdeconnect_pausemusic.json b/plugins/pausemusic/kdeconnect_pausemusic.json index af9e01944..06075c9e1 100644 --- a/plugins/pausemusic/kdeconnect_pausemusic.json +++ b/plugins/pausemusic/kdeconnect_pausemusic.json @@ -33,6 +33,7 @@ "Name[pt_BR]": "Albert Vaca Cintora", "Name[ro]": "Albert Vaca Cintora", "Name[ru]": "Albert Vaca Cintora", + "Name[sk]": "Albert Vaca Cintora", "Name[sl]": "Albert Vaca Cintora", "Name[sv]": "Albert Vaca Cintora", "Name[tr]": "Albert Vaca Cintora", diff --git a/plugins/ping/kdeconnect_ping.json b/plugins/ping/kdeconnect_ping.json index f0f7219d9..174d4eda4 100644 --- a/plugins/ping/kdeconnect_ping.json +++ b/plugins/ping/kdeconnect_ping.json @@ -33,6 +33,7 @@ "Name[pt_BR]": "Albert Vaca Cintora", "Name[ro]": "Albert Vaca Cintora", "Name[ru]": "Albert Vaca Cintora", + "Name[sk]": "Albert Vaca Cintora", "Name[sl]": "Albert Vaca Cintora", "Name[sv]": "Albert Vaca Cintora", "Name[tr]": "Albert Vaca Cintora", diff --git a/plugins/runcommand/kdeconnect_runcommand.json b/plugins/runcommand/kdeconnect_runcommand.json index c47a1aecd..8f85f7737 100644 --- a/plugins/runcommand/kdeconnect_runcommand.json +++ b/plugins/runcommand/kdeconnect_runcommand.json @@ -33,6 +33,7 @@ "Name[pt_BR]": "Albert Vaca Cintora", "Name[ro]": "Albert Vaca Cintora", "Name[ru]": "Albert Vaca Cintora", + "Name[sk]": "Albert Vaca Cintora", "Name[sl]": "Albert Vaca Cintora", "Name[sv]": "Albert Vaca Cintora", "Name[tr]": "Albert Vaca Cintora", diff --git a/plugins/share/kdeconnect_share.json b/plugins/share/kdeconnect_share.json index e66d16a66..b985cb559 100644 --- a/plugins/share/kdeconnect_share.json +++ b/plugins/share/kdeconnect_share.json @@ -33,6 +33,7 @@ "Name[pt_BR]": "Albert Vaca Cintora", "Name[ro]": "Albert Vaca Cintora", "Name[ru]": "Albert Vaca Cintora", + "Name[sk]": "Albert Vaca Cintora", "Name[sl]": "Albert Vaca Cintora", "Name[sv]": "Albert Vaca Cintora", "Name[tr]": "Albert Vaca Cintora", diff --git a/plugins/telephony/kdeconnect_telephony.json b/plugins/telephony/kdeconnect_telephony.json index 526c8e058..3d12a5e06 100644 --- a/plugins/telephony/kdeconnect_telephony.json +++ b/plugins/telephony/kdeconnect_telephony.json @@ -33,6 +33,7 @@ "Name[pt_BR]": "Albert Vaca Cintora", "Name[ro]": "Albert Vaca Cintora", "Name[ru]": "Albert Vaca Cintora", + "Name[sk]": "Albert Vaca Cintora", "Name[sl]": "Albert Vaca Cintora", "Name[sv]": "Albert Vaca Cintora", "Name[tr]": "Albert Vaca Cintora",