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-15 01:55:25 +00:00
parent 7d2239fc17
commit 3b5ea6e798
3 changed files with 3 additions and 0 deletions

View file

@ -52,6 +52,7 @@
"Name[ka]": "ფონის კონტრასტი",
"Name[nl]": "Contrast in achtergrond",
"Name[pt]": "Contraste do Fundo",
"Name[sl]": "Kontrast ozadja",
"Name[ta]": "பின்புல நிறமாறுபாடு",
"Name[tr]": "Arka Plan Karşıtlığı",
"Name[uk]": "Контрастність тла",

View file

@ -84,6 +84,7 @@
"Name[ka]": "ტრანსფორმირებადი მხტუნარები",
"Name[nl]": "Morphing pop-ups",
"Name[pt]": "Janelas Mutantes",
"Name[sl]": "Pogovorna okna pretvorb",
"Name[tr]": "Dönüşen Açılır Pencereler",
"Name[uk]": "Аморфні контекстні панелі",
"Name[x-test]": "xxMorphing Popupsxx",

View file

@ -52,6 +52,7 @@
"Name[ka]": "მცურავი მხტუნარები",
"Name[nl]": "Schuivende pop-ups",
"Name[pt]": "Janelas Deslizantes",
"Name[sl]": "Drsne pretvorbe",
"Name[tr]": "Kayan Açılır Pencereler",
"Name[uk]": "Ковзні контекстні вікна",
"Name[x-test]": "xxSliding Popupsxx"