From c021a47ed79e58505533a7a7e60dfd479a79a52e Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 21 Sep 2020 09:38:42 +0200 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" --- fileitemactionplugin/kdeconnectsendfile.json | 2 ++ plugins/bigscreen/kdeconnect_bigscreen.json | 3 +++ plugins/contacts/kdeconnect_contacts.json | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/fileitemactionplugin/kdeconnectsendfile.json b/fileitemactionplugin/kdeconnectsendfile.json index cb43e1f67..66a27b37f 100644 --- a/fileitemactionplugin/kdeconnectsendfile.json +++ b/fileitemactionplugin/kdeconnectsendfile.json @@ -19,6 +19,7 @@ "Description[lt]": "Siųsti failą į kitą įrenginį naudojant KDE Connect", "Description[nl]": "Bestand naar ander apparaat versturen met KDE Connect", "Description[nn]": "Send fil til anna eining via KDE Connect", + "Description[pl]": "Przesyłaj pliki na inne urządzenia używające KDE Connect", "Description[pt]": "Envia o ficheiro para outro dispositivo através do KDE Connect", "Description[pt_BR]": "Envia o arquivo para outro dispositivo usando o KDE Connect", "Description[ro]": "Trimite fișier altui dispozitiv prin KDE Connect", @@ -53,6 +54,7 @@ "Name[lt]": "Siųsti failą per KDE Connect", "Name[nl]": "Bestand via KDE Connect versturen", "Name[nn]": "Send fil via KDE Connect", + "Name[pl]": "Wysyłanie plików poprzez KDE Connect", "Name[pt]": "Enviar o ficheiro pelo KDE Connect", "Name[pt_BR]": "Enviar arquivo via KDE Connect", "Name[ro]": "Trimite fișier prin KDE Connect", diff --git a/plugins/bigscreen/kdeconnect_bigscreen.json b/plugins/bigscreen/kdeconnect_bigscreen.json index 0bb918bdf..b780d393e 100644 --- a/plugins/bigscreen/kdeconnect_bigscreen.json +++ b/plugins/bigscreen/kdeconnect_bigscreen.json @@ -20,6 +20,7 @@ "Name[lt]": "Aditya Mehra", "Name[nl]": "Aditya Mehra", "Name[nn]": "Aditya Mehra", + "Name[pl]": "Aditya Mehra", "Name[pt]": "Aditya Mehra", "Name[pt_BR]": "Aditya Mehra", "Name[ro]": "Aditya Mehra", @@ -47,6 +48,7 @@ "Description[lt]": "Bigscreen papildinys", "Description[nl]": "Bigscreen plug-in", "Description[nn]": "Bigscreen-tillegg", + "Description[pl]": "Wtyczka Bigscreen", "Description[pt]": "'Plugin' de Ecrã Grande", "Description[pt_BR]": "Plugin de tela grande", "Description[ro]": "Extensia „ecran mare”", @@ -77,6 +79,7 @@ "Name[lt]": "Bigscreen", "Name[nl]": "Bigscreen", "Name[nn]": "Bigscreen", + "Name[pl]": "Bigscreen", "Name[pt]": "Ecrã grande", "Name[pt_BR]": "Tela grande", "Name[ro]": "Ecran mare", diff --git a/plugins/contacts/kdeconnect_contacts.json b/plugins/contacts/kdeconnect_contacts.json index 69807095c..0fa0d9e57 100644 --- a/plugins/contacts/kdeconnect_contacts.json +++ b/plugins/contacts/kdeconnect_contacts.json @@ -59,7 +59,7 @@ "Description[lt]": "Sinchronizuoti adresatus tarp darbalaukio ir prijungto įrenginio", "Description[nl]": "Contactpersonen synchroniseren tussen het bureaublad en het verbonden apparaat", "Description[nn]": "Synkroniser kontaktar mellom skrivebordet og tilkopla eining", - "Description[pl]": "Synchronizuj kontakty pomiędzy pulpitem i podłączonym urządzeniem", + "Description[pl]": "Synchronizuj kontakty pomiędzy komputerem i podłączonym urządzeniem", "Description[pt]": "Sincronizar os Contactos entre o Sistema e o Dispositivo Ligado", "Description[pt_BR]": "Sincroniza os contatos entre o sistema e o dispositivo conectado", "Description[ro]": "Sincronizare contacte între calculator și dispozitivul conectat",