From ca5c5ab333708dda313771a6e6def9760a135238 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 28 May 2023 01:40:43 +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" --- plugins/battery/kdeconnect_battery.json | 1 + plugins/bigscreen/kdeconnect_bigscreen.json | 2 ++ plugins/clipboard/kdeconnect_clipboard.json | 1 + plugins/kdeconnect.notifyrc | 2 ++ 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 + 11 files changed, 13 insertions(+) diff --git a/plugins/battery/kdeconnect_battery.json b/plugins/battery/kdeconnect_battery.json index 7ba2828c4..be9066c55 100644 --- a/plugins/battery/kdeconnect_battery.json +++ b/plugins/battery/kdeconnect_battery.json @@ -21,6 +21,7 @@ "Name[ka]": "Albert Vaca Cintora", "Name[ko]": "Albert Vaca Cintora", "Name[nl]": "Albert Vaca Cintora", + "Name[nn]": "Albert Vaca Cintora", "Name[pl]": "Albert Vaca Cintora", "Name[pt]": "Albert Vaca Cintora", "Name[sl]": "Albert Vaca Cintora", diff --git a/plugins/bigscreen/kdeconnect_bigscreen.json b/plugins/bigscreen/kdeconnect_bigscreen.json index 6d71858dd..6159d4c44 100644 --- a/plugins/bigscreen/kdeconnect_bigscreen.json +++ b/plugins/bigscreen/kdeconnect_bigscreen.json @@ -63,6 +63,7 @@ "Description[ka]": "გაუგზავნეთ თქვენს TV-ზე გაშვებულ Plasma Bigscreen-ს ხმოვანი ბრძანებები", "Description[ko]": "Plasma 큰 화면을 실행 중인 TV에 음성 명령 보내기", "Description[nl]": "Stemcommando s naar uw TV zenden bij actief Plasma Bigscreen", + "Description[nn]": "Send stemmekommandoar til fjernsyn som køyrer Plasma Bigscreen", "Description[pl]": "Wysyłaj polecenie głosowe do swojego TV, używając Dużego Ekranu Plazmy", "Description[pt]": "Enviar comandos de voz para a sua TV com o Plasma para Ecrãs Grandes", "Description[sl]": "Pošljite glasovne ukaze vašemu televizorju, kjer teče Plasma Bigscreen", @@ -91,6 +92,7 @@ "Name[ka]": "Bigscreen-ის ხმოვანი კონტროლი", "Name[ko]": "큰 화면 음성 제어", "Name[nl]": "Bigscreen stembesturing", + "Name[nn]": "Bigscreen-stemmestyring", "Name[pl]": "Sterowanie głosowe Dużym Ekranem", "Name[pt]": "Comando por voz do Ecrã Grande", "Name[sl]": "Glasovni nadzor velikega zaslona", diff --git a/plugins/clipboard/kdeconnect_clipboard.json b/plugins/clipboard/kdeconnect_clipboard.json index 9aa7e60ad..144019f8b 100644 --- a/plugins/clipboard/kdeconnect_clipboard.json +++ b/plugins/clipboard/kdeconnect_clipboard.json @@ -21,6 +21,7 @@ "Name[ka]": "Albert Vaca Cintora", "Name[ko]": "Albert Vaca Cintora", "Name[nl]": "Albert Vaca Cintora", + "Name[nn]": "Albert Vaca Cintora", "Name[pl]": "Albert Vaca Cintora", "Name[pt]": "Albert Vaca Cintora", "Name[sl]": "Albert Vaca Cintora", diff --git a/plugins/kdeconnect.notifyrc b/plugins/kdeconnect.notifyrc index 5b5060655..9fc61618a 100644 --- a/plugins/kdeconnect.notifyrc +++ b/plugins/kdeconnect.notifyrc @@ -876,6 +876,7 @@ Name[it]=Testo ricevuto Name[ka]=მიღებულია ტექსტი Name[ko]=텍스트 수신 Name[nl]=Tekst ontvangen +Name[nn]=Tekst motteke Name[pl]=Otrzymano tekst Name[pt]=Texto Recebido Name[sl]=Besedilo prejeto @@ -901,6 +902,7 @@ Comment[it]=Testo ricevuto Comment[ka]=მიღებულია რაღაც ტექსტი Comment[ko]=텍스트를 받음 Comment[nl]=Enige tekst ontvangen +Comment[nn]=Fekk noko tekst Comment[pl]=Otrzymano jakiś tekst Comment[pt]=Recebeu algum texto Comment[sl]=Prejeto nekaj besedila diff --git a/plugins/mpriscontrol/kdeconnect_mpriscontrol.json b/plugins/mpriscontrol/kdeconnect_mpriscontrol.json index ae87db24f..30fe698d7 100644 --- a/plugins/mpriscontrol/kdeconnect_mpriscontrol.json +++ b/plugins/mpriscontrol/kdeconnect_mpriscontrol.json @@ -21,6 +21,7 @@ "Name[ka]": "Albert Vaca Cintora", "Name[ko]": "Albert Vaca Cintora", "Name[nl]": "Albert Vaca Cintora", + "Name[nn]": "Albert Vaca Cintora", "Name[pl]": "Albert Vaca Cintora", "Name[pt]": "Albert Vaca Cintora", "Name[sl]": "Albert Vaca Cintora", diff --git a/plugins/notifications/kdeconnect_notifications.json b/plugins/notifications/kdeconnect_notifications.json index 561820ee4..4b81de3ab 100644 --- a/plugins/notifications/kdeconnect_notifications.json +++ b/plugins/notifications/kdeconnect_notifications.json @@ -21,6 +21,7 @@ "Name[ka]": "Albert Vaca Cintora", "Name[ko]": "Albert Vaca Cintora", "Name[nl]": "Albert Vaca Cintora", + "Name[nn]": "Albert Vaca Cintora", "Name[pl]": "Albert Vaca Cintora", "Name[pt]": "Albert Vaca Cintora", "Name[sl]": "Albert Vaca Cintora", diff --git a/plugins/pausemusic/kdeconnect_pausemusic.json b/plugins/pausemusic/kdeconnect_pausemusic.json index 7784d0ae4..b34e1b986 100644 --- a/plugins/pausemusic/kdeconnect_pausemusic.json +++ b/plugins/pausemusic/kdeconnect_pausemusic.json @@ -21,6 +21,7 @@ "Name[ka]": "Albert Vaca Cintora", "Name[ko]": "Albert Vaca Cintora", "Name[nl]": "Albert Vaca Cintora", + "Name[nn]": "Albert Vaca Cintora", "Name[pl]": "Albert Vaca Cintora", "Name[pt]": "Albert Vaca Cintora", "Name[sl]": "Albert Vaca Cintora", diff --git a/plugins/ping/kdeconnect_ping.json b/plugins/ping/kdeconnect_ping.json index 6138523d4..228c34b3a 100644 --- a/plugins/ping/kdeconnect_ping.json +++ b/plugins/ping/kdeconnect_ping.json @@ -21,6 +21,7 @@ "Name[ka]": "Albert Vaca Cintora", "Name[ko]": "Albert Vaca Cintora", "Name[nl]": "Albert Vaca Cintora", + "Name[nn]": "Albert Vaca Cintora", "Name[pl]": "Albert Vaca Cintora", "Name[pt]": "Albert Vaca Cintora", "Name[sl]": "Albert Vaca Cintora", diff --git a/plugins/runcommand/kdeconnect_runcommand.json b/plugins/runcommand/kdeconnect_runcommand.json index 983921ed8..baf75abc3 100644 --- a/plugins/runcommand/kdeconnect_runcommand.json +++ b/plugins/runcommand/kdeconnect_runcommand.json @@ -21,6 +21,7 @@ "Name[ka]": "Albert Vaca Cintora", "Name[ko]": "Albert Vaca Cintora", "Name[nl]": "Albert Vaca Cintora", + "Name[nn]": "Albert Vaca Cintora", "Name[pl]": "Albert Vaca Cintora", "Name[pt]": "Albert Vaca Cintora", "Name[sl]": "Albert Vaca Cintora", diff --git a/plugins/share/kdeconnect_share.json b/plugins/share/kdeconnect_share.json index be526278a..fb5aabb97 100644 --- a/plugins/share/kdeconnect_share.json +++ b/plugins/share/kdeconnect_share.json @@ -21,6 +21,7 @@ "Name[ka]": "Albert Vaca Cintora", "Name[ko]": "Albert Vaca Cintora", "Name[nl]": "Albert Vaca Cintora", + "Name[nn]": "Albert Vaca Cintora", "Name[pl]": "Albert Vaca Cintora", "Name[pt]": "Albert Vaca Cintora", "Name[sl]": "Albert Vaca Cintora", diff --git a/plugins/telephony/kdeconnect_telephony.json b/plugins/telephony/kdeconnect_telephony.json index a99fc19fd..2e5114cac 100644 --- a/plugins/telephony/kdeconnect_telephony.json +++ b/plugins/telephony/kdeconnect_telephony.json @@ -21,6 +21,7 @@ "Name[ka]": "Albert Vaca Cintora", "Name[ko]": "Albert Vaca Cintora", "Name[nl]": "Albert Vaca Cintora", + "Name[nn]": "Albert Vaca Cintora", "Name[pl]": "Albert Vaca Cintora", "Name[pt]": "Albert Vaca Cintora", "Name[sl]": "Albert Vaca Cintora",