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 2022-06-04 01:42:32 +00:00
parent 0f3d60b678
commit 9b26dadd5c

View file

@ -11,6 +11,7 @@
"Name[es]": "Aleix Pol i Gonzalez",
"Name[it]": "Aleix Pol i Gonzalez",
"Name[nl]": "Aleix Pol i Gonzalez",
"Name[pt]": "Aleix Pol i Gonzalez",
"Name[ro]": "Aleix Pol i Gonzalez",
"Name[sl]": "Aleix Pol i Gonzalez",
"Name[sv]": "Aleix Pol i Gonzalez",
@ -27,6 +28,7 @@
"Description[es]": "Usar sus dispositivos como monitores virtuales",
"Description[it]": "Usa i tuoi dispositivi come schermi virtuali",
"Description[nl]": "Uw apparaten als virtuele monitoren gebruiken",
"Description[pt]": "Usar os seus dispositivos como monitores virtuais",
"Description[ro]": "Folosiți-vă dispozitivele ca monitoare virtuale",
"Description[sl]": "Uporabi vaše naprave kot navidezne monitorje",
"Description[sv]": "Använd apparater som virtuella bildskärmar",
@ -45,6 +47,7 @@
"Name[es]": "Monitor virtual",
"Name[it]": "Schermo virtuale",
"Name[nl]": "Virtuele monitor",
"Name[pt]": "Monitor Virtual",
"Name[ro]": "Monitor virtual",
"Name[sl]": "Navidezni monitor",
"Name[sv]": "Virtuell bildskärm",