From ac76b27af6ac16bc5711e4cf9ffe8ddac7d55592 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 27 Mar 2023 01:57:05 +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 ++ plugins/bigscreen/kdeconnect_bigscreen.json | 3 +++ .../connectivity-report/kdeconnect_connectivity_report.json | 3 +++ plugins/contacts/kdeconnect_contacts.json | 1 + plugins/kdeconnect.notifyrc | 4 ++++ plugins/mmtelephony/kdeconnect_mmtelephony.json | 2 ++ plugins/virtualmonitor/kdeconnect_virtualmonitor.json | 3 +++ 7 files changed, 18 insertions(+) diff --git a/kcm/kcm_kdeconnect.json b/kcm/kcm_kdeconnect.json index d3ba687c2..f6cb597a3 100644 --- a/kcm/kcm_kdeconnect.json +++ b/kcm/kcm_kdeconnect.json @@ -15,6 +15,7 @@ "Description[eu]": "Zure gailuak konektatu eta sinkronizatzea", "Description[fi]": "Yhdistä ja synkronoi laitteitasi", "Description[fr]": "Vous connecter à vos périphériques et se synchroniser avec eux", + "Description[gl]": "Conecte e sincronice os seus dispositivos", "Description[ia]": "Connecte e synchronisa tu dispositivos", "Description[is]": "Tengja og samstilla tækin þín", "Description[it]": "Connetti e sincronizza i tuoi dispositivi", @@ -47,6 +48,7 @@ "Name[eu]": "KDE Connect", "Name[fi]": "KDE Connect", "Name[fr]": "KDE Connect", + "Name[gl]": "KDE Connect", "Name[ia]": "KDE Connect", "Name[is]": "KDE Connect", "Name[it]": "KDE Connect", diff --git a/plugins/bigscreen/kdeconnect_bigscreen.json b/plugins/bigscreen/kdeconnect_bigscreen.json index b4846f1a2..3be30314f 100644 --- a/plugins/bigscreen/kdeconnect_bigscreen.json +++ b/plugins/bigscreen/kdeconnect_bigscreen.json @@ -19,6 +19,7 @@ "Name[eu]": "Aditya Mehra", "Name[fi]": "Aditya Mehra", "Name[fr]": "Aditya Mehra", + "Name[gl]": "Aditya Mehra", "Name[hu]": "Aditya Mehra", "Name[ia]": "Aditya Mehra", "Name[id]": "Aditya Mehra", @@ -61,6 +62,7 @@ "Description[eu]": "Bigscreen plugina", "Description[fi]": "Bigscreen-liitännäinen", "Description[fr]": "Module externe « Bigscreen »", + "Description[gl]": "Complemento de Bigscreen", "Description[hu]": "Bigscreen bővítmény", "Description[ia]": "Plugin de BigScreen", "Description[id]": "Plugin Bigscreen", @@ -104,6 +106,7 @@ "Name[eu]": "Bigscreen", "Name[fi]": "Bigscreen", "Name[fr]": "Bigscreen", + "Name[gl]": "Bigscreen", "Name[hu]": "Bigscreen", "Name[ia]": "Bigscreen (Schermo grande)", "Name[id]": "Bigscreen", diff --git a/plugins/connectivity-report/kdeconnect_connectivity_report.json b/plugins/connectivity-report/kdeconnect_connectivity_report.json index 947f3656e..f19196c6a 100644 --- a/plugins/connectivity-report/kdeconnect_connectivity_report.json +++ b/plugins/connectivity-report/kdeconnect_connectivity_report.json @@ -17,6 +17,7 @@ "Name[eu]": "David Shlemayev", "Name[fi]": "David Shlemayev", "Name[fr]": "David Shlemayev", + "Name[gl]": "David Shlemayev", "Name[hu]": "David Shlemayev", "Name[ia]": "David Shlemayev", "Name[id]": "David Shlemayev", @@ -57,6 +58,7 @@ "Description[eu]": "Erakutsi zure telefonoaren sare-seinalearen sendotasuna", "Description[fi]": "Näytä puhelimen kentän voimakkuus", "Description[fr]": "Afficher la force du signal du réseau pour votre téléphone", + "Description[gl]": "Mostrar a forza do sinal de rede do seu teléfono", "Description[hu]": "A telefon hálózati jelerősségének megjelenítése", "Description[ia]": "Monstra fortia de signal de rete de tu telephono", "Description[id]": "Tampilkan kekuatan sinyal telepon Anda", @@ -98,6 +100,7 @@ "Name[eu]": "Konektagarritasun begiralea", "Name[fi]": "Yhteysvalvonta", "Name[fr]": "Surveillance de connectivité", + "Name[gl]": "Monitor de conectividade", "Name[hu]": "Kapcsolódásfigyelő", "Name[ia]": "Controlator de connectivitate", "Name[id]": "Pemantau konektivitas", diff --git a/plugins/contacts/kdeconnect_contacts.json b/plugins/contacts/kdeconnect_contacts.json index 21b6f754c..e82c8c412 100644 --- a/plugins/contacts/kdeconnect_contacts.json +++ b/plugins/contacts/kdeconnect_contacts.json @@ -60,6 +60,7 @@ "Description[eu]": "Sinkronizatu kontaktuak konektatutako gailutik mahaigainera", "Description[fi]": "Synkronoi yhteystiedot yhdistetyltä laitteelta työpöydälle", "Description[fr]": "Synchroniser les contacts du périphérique connecté avec ceux du bureau", + "Description[gl]": "Sincronizar contactos do dispositivo conectado ao escritorio", "Description[ia]": "Synchronisa Contactos ex le dispositivo Connectite e le Scriptorio", "Description[id]": "Sinkron Kontak dari Peranti Terhubung ke Desktop", "Description[is]": "Samstilla tengiliði af tengda tækinu yfir á tölvuna", diff --git a/plugins/kdeconnect.notifyrc b/plugins/kdeconnect.notifyrc index 3c6afcb6a..00f6e126e 100644 --- a/plugins/kdeconnect.notifyrc +++ b/plugins/kdeconnect.notifyrc @@ -708,6 +708,7 @@ Name[es]=Bloqueo remoto exitoso Name[eu]=Urruneko giltzatze arrakastatsua Name[fi]=Etälukitus onnistui Name[fr]=Succès du verrouillage à distance +Name[gl]=Completouse o bloqueo remoto Name[hu]=Sikeres távoli zárolás Name[ia]=Bloco remote con successo Name[id]=Mengunci Jarak Jauh Berhasil @@ -745,6 +746,7 @@ Comment[es]=Bloqueo remoto exitoso Comment[eu]=Urruneko giltzatze arrakastatsua Comment[fi]=Etälukitus onnistui Comment[fr]=Succès du verrouillage à distance +Comment[gl]=Completouse o bloqueo remoto Comment[hu]=Sikeres távoli zárolás Comment[ia]=Bloco remote con successo Comment[id]=Mengunci jarak jauh berhasil @@ -785,6 +787,7 @@ Name[es]=Bloqueo remoto fallido Name[eu]=Urruneko giltzatze hutsegitea Name[fi]=Etälukitus epäonnistui Name[fr]=Échec du verrouillage à distance +Name[gl]=O bloqueo remoto fallou Name[hu]=Távoli zárolási hiba Name[ia]=Bloco remote con fallimento Name[id]=Kegagalan Mengunci Jarak Jauh @@ -822,6 +825,7 @@ Comment[es]=Bloqueo remoto fallido Comment[eu]=Urruneko giltzatzeak huts egin du Comment[fi]=Etälukitus epäonnistui Comment[fr]=Échec du verrouillage à distance +Comment[gl]=O bloqueo remoto fallou Comment[hu]=Sikertelen távoli zárolás Comment[ia]=Bloco remote con fallimento Comment[id]=Mengunci jarak jauh gagal diff --git a/plugins/mmtelephony/kdeconnect_mmtelephony.json b/plugins/mmtelephony/kdeconnect_mmtelephony.json index b22146071..3ad90f2f1 100644 --- a/plugins/mmtelephony/kdeconnect_mmtelephony.json +++ b/plugins/mmtelephony/kdeconnect_mmtelephony.json @@ -16,6 +16,7 @@ "Name[eu]": "Yoram Bar-Haim", "Name[fi]": "Yoram Bar-Haim", "Name[fr]": "Yoram Bar-Haim", + "Name[gl]": "Yoram Bar-Haim", "Name[ia]": "Yoram Bar-Haim", "Name[is]": "Yoram Bar-Haim", "Name[it]": "Yoram Bar-Haim", @@ -93,6 +94,7 @@ "Name[eu]": "«ModemManager» telefonia bateratzea", "Name[fi]": "ModemManagerin Telephony-integrointi", "Name[fr]": "Intégration de la téléphonie avec ModemManager ", + "Name[gl]": "Integración coa telefonía de ModemManager", "Name[ia]": "Integration de telephonia Modem Manager (Gerente de Modem)", "Name[is]": "ModemManager samþætting símaaðgerða", "Name[it]": "Integrazione telefonica di ModemManager", diff --git a/plugins/virtualmonitor/kdeconnect_virtualmonitor.json b/plugins/virtualmonitor/kdeconnect_virtualmonitor.json index 01a5066bd..5224cda1b 100644 --- a/plugins/virtualmonitor/kdeconnect_virtualmonitor.json +++ b/plugins/virtualmonitor/kdeconnect_virtualmonitor.json @@ -16,6 +16,7 @@ "Name[eu]": "Aleix Pol i Gonzalez", "Name[fi]": "Aleix Pol i Gonzalez", "Name[fr]": "Aleix Pol i Gonzalez", + "Name[gl]": "Aleix Pol i Gonzalez", "Name[ia]": "Aleix Pol i Gonzalez", "Name[id]": "Aleix Pol i Gonzalez", "Name[ie]": "Aleix Pol i Gonzalez", @@ -54,6 +55,7 @@ "Description[eu]": "Erabili zure gailuak alegiazko monitore gisa", "Description[fi]": "Käytä laitteita virtuaalinäyttöinä", "Description[fr]": "Utilisez vos périphériques comme des écrans virtuels", + "Description[gl]": "Usar os seus dispositivos como monitores virtuais", "Description[ia]": "Usa tu dispositivos como monitor virtual", "Description[id]": "Gunakan peranti Anda sebagai monitor virtual", "Description[is]": "Nota tækin þín sem sýndarskjái", @@ -93,6 +95,7 @@ "Name[eu]": "Alegiazko monitorea", "Name[fi]": "Virtuaalinäyttö", "Name[fr]": "Écran virtuel", + "Name[gl]": "Monitor virtual", "Name[ia]": "Monitor virtual", "Name[id]": "Monitor Virtual", "Name[is]": "Sýndarskjár",