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 2023-01-22 02:01:44 +00:00
parent 0c1e73ce82
commit 0b291dcb36
3 changed files with 3 additions and 0 deletions

View file

@ -53,6 +53,7 @@
"Name[it]": "Contrasto dello sfondo",
"Name[ka]": "ფონის კონტრასტი",
"Name[nl]": "Contrast in achtergrond",
"Name[pl]": "Kontrast tła",
"Name[pt]": "Contraste do Fundo",
"Name[sl]": "Kontrast ozadja",
"Name[ta]": "பின்புல நிறமாறுபாடு",

View file

@ -86,6 +86,7 @@
"Name[it]": "Finestre a comparsa che si trasformano",
"Name[ka]": "ტრანსფორმირებადი მხტუნარები",
"Name[nl]": "Morphing pop-ups",
"Name[pl]": "Zmiennokształtne okna",
"Name[pt]": "Janelas Mutantes",
"Name[sl]": "Pogovorna okna pretvorb",
"Name[tr]": "Dönüşen Açılır Pencereler",

View file

@ -53,6 +53,7 @@
"Name[it]": "Finestre a comparsa che scivolano",
"Name[ka]": "მცურავი მხტუნარები",
"Name[nl]": "Schuivende pop-ups",
"Name[pl]": "Wysuwanie okien",
"Name[pt]": "Janelas Deslizantes",
"Name[sl]": "Drsne pretvorbe",
"Name[tr]": "Kayan Açılır Pencereler",