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-07-14 01:49:45 +00:00
parent 06a89b15df
commit 280c0fb27f

View file

@ -15,6 +15,7 @@
"Name[fi]": "Aleix Pol i Gonzalez",
"Name[fr]": "Aleix Pol i Gonzalez",
"Name[it]": "Aleix Pol i Gonzalez",
"Name[ko]": "Aleix Pol i Gonzalez",
"Name[nl]": "Aleix Pol i Gonzalez",
"Name[nn]": "Aleix Pol i Gonzalez",
"Name[pl]": "Aleix Pol i Gonzalez",
@ -39,6 +40,7 @@
"Description[fr]": "Utilisez vos périphériques comme des écrans virtuels",
"Description[id]": "Gunakan perangkatmu sebagai monitor virtual",
"Description[it]": "Usa i tuoi dispositivi come schermi virtuali",
"Description[ko]": "내 장치를 가상 모니터로 사용",
"Description[nl]": "Uw apparaten als virtuele monitoren gebruiken",
"Description[nn]": "Bruk einingane som virtuelle avlyttarar",
"Description[pl]": "Użyj swojego urządzenia jako wyświetlacza wirtualnego",
@ -65,6 +67,7 @@
"Name[fr]": "Écran virtuel",
"Name[id]": "Monitor Virtual",
"Name[it]": "Schermo virtuale",
"Name[ko]": "가상 모니터",
"Name[nl]": "Virtuele monitor",
"Name[nn]": "Virtuell avlyttar",
"Name[pl]": "Wyświetlacz wirtualny",