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"
This commit is contained in:
l10n daemon script 2020-09-21 09:38:42 +02:00
parent e55de84deb
commit c021a47ed7
3 changed files with 6 additions and 1 deletions

View file

@ -19,6 +19,7 @@
"Description[lt]": "Siųsti failą į kitą įrenginį naudojant KDE Connect", "Description[lt]": "Siųsti failą į kitą įrenginį naudojant KDE Connect",
"Description[nl]": "Bestand naar ander apparaat versturen met KDE Connect", "Description[nl]": "Bestand naar ander apparaat versturen met KDE Connect",
"Description[nn]": "Send fil til anna eining via 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]": "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[pt_BR]": "Envia o arquivo para outro dispositivo usando o KDE Connect",
"Description[ro]": "Trimite fișier altui dispozitiv prin 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[lt]": "Siųsti failą per KDE Connect",
"Name[nl]": "Bestand via KDE Connect versturen", "Name[nl]": "Bestand via KDE Connect versturen",
"Name[nn]": "Send fil via KDE Connect", "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]": "Enviar o ficheiro pelo KDE Connect",
"Name[pt_BR]": "Enviar arquivo via KDE Connect", "Name[pt_BR]": "Enviar arquivo via KDE Connect",
"Name[ro]": "Trimite fișier prin KDE Connect", "Name[ro]": "Trimite fișier prin KDE Connect",

View file

@ -20,6 +20,7 @@
"Name[lt]": "Aditya Mehra", "Name[lt]": "Aditya Mehra",
"Name[nl]": "Aditya Mehra", "Name[nl]": "Aditya Mehra",
"Name[nn]": "Aditya Mehra", "Name[nn]": "Aditya Mehra",
"Name[pl]": "Aditya Mehra",
"Name[pt]": "Aditya Mehra", "Name[pt]": "Aditya Mehra",
"Name[pt_BR]": "Aditya Mehra", "Name[pt_BR]": "Aditya Mehra",
"Name[ro]": "Aditya Mehra", "Name[ro]": "Aditya Mehra",
@ -47,6 +48,7 @@
"Description[lt]": "Bigscreen papildinys", "Description[lt]": "Bigscreen papildinys",
"Description[nl]": "Bigscreen plug-in", "Description[nl]": "Bigscreen plug-in",
"Description[nn]": "Bigscreen-tillegg", "Description[nn]": "Bigscreen-tillegg",
"Description[pl]": "Wtyczka Bigscreen",
"Description[pt]": "'Plugin' de Ecrã Grande", "Description[pt]": "'Plugin' de Ecrã Grande",
"Description[pt_BR]": "Plugin de tela grande", "Description[pt_BR]": "Plugin de tela grande",
"Description[ro]": "Extensia „ecran mare”", "Description[ro]": "Extensia „ecran mare”",
@ -77,6 +79,7 @@
"Name[lt]": "Bigscreen", "Name[lt]": "Bigscreen",
"Name[nl]": "Bigscreen", "Name[nl]": "Bigscreen",
"Name[nn]": "Bigscreen", "Name[nn]": "Bigscreen",
"Name[pl]": "Bigscreen",
"Name[pt]": "Ecrã grande", "Name[pt]": "Ecrã grande",
"Name[pt_BR]": "Tela grande", "Name[pt_BR]": "Tela grande",
"Name[ro]": "Ecran mare", "Name[ro]": "Ecran mare",

View file

@ -59,7 +59,7 @@
"Description[lt]": "Sinchronizuoti adresatus tarp darbalaukio ir prijungto įrenginio", "Description[lt]": "Sinchronizuoti adresatus tarp darbalaukio ir prijungto įrenginio",
"Description[nl]": "Contactpersonen synchroniseren tussen het bureaublad en het verbonden apparaat", "Description[nl]": "Contactpersonen synchroniseren tussen het bureaublad en het verbonden apparaat",
"Description[nn]": "Synkroniser kontaktar mellom skrivebordet og tilkopla eining", "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]": "Sincronizar os Contactos entre o Sistema e o Dispositivo Ligado",
"Description[pt_BR]": "Sincroniza os contatos entre o sistema e o dispositivo conectado", "Description[pt_BR]": "Sincroniza os contatos entre o sistema e o dispositivo conectado",
"Description[ro]": "Sincronizare contacte între calculator și dispozitivul conectat", "Description[ro]": "Sincronizare contacte între calculator și dispozitivul conectat",