From e8344f4298987e6b4e764acb6772ca19fefb6175 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 13 Feb 2022 02:45:15 +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/contacts/kdeconnect_contacts.json | 4 ++-- plugins/share/kdeconnect_share.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/contacts/kdeconnect_contacts.json b/plugins/contacts/kdeconnect_contacts.json index d4a7b9872..c66a5d4cd 100644 --- a/plugins/contacts/kdeconnect_contacts.json +++ b/plugins/contacts/kdeconnect_contacts.json @@ -66,7 +66,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]": "Synchronizuje kontakty między tym a innym urządzeniem", + "Description[pl]": "Współdzieli kontakty między urządzeniami", "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", @@ -107,7 +107,7 @@ "Name[lt]": "Adresatai", "Name[nl]": "Contactpersonen", "Name[nn]": "Kontaktar", - "Name[pl]": "Kontakty", + "Name[pl]": "Współdzielenie kontaktów", "Name[pt]": "Contactos", "Name[pt_BR]": "Contatos", "Name[ro]": "Contacte", diff --git a/plugins/share/kdeconnect_share.json b/plugins/share/kdeconnect_share.json index c4214aa4e..cdc8b2d75 100644 --- a/plugins/share/kdeconnect_share.json +++ b/plugins/share/kdeconnect_share.json @@ -73,7 +73,7 @@ "Description[lt]": "Lengvai gauti ir siųsti failus, URL adresus ar gryną tekstą", "Description[nl]": "Bestanden, URL's of platte tekst gemakkelijk ontvangen en verzenden", "Description[nn]": "Ta imot og send filer, nettadresser og tekst på ein enkel måte", - "Description[pl]": "Pobiera i wysyła pliki, adresy URL i zwykły tekst pomiędzy urządzeniami", + "Description[pl]": "Udostępnia pliki, adresy URL i zwykły tekst pomiędzy urządzeniami", "Description[pt]": "Receber e enviar ficheiros, URL's ou texto normal de forma simples", "Description[pt_BR]": "Recebe e envia facilmente arquivos, URLs ou texto simples", "Description[ro]": "Primește și trimite fișiere, URL-uri sau text simplu cu ușurință",