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-13 02:01:41 +00:00
parent f252d026d7
commit 1e8fd02c69
2 changed files with 3 additions and 0 deletions

View file

@ -16,6 +16,7 @@
"Description[nl]": "Uw apparaten verbinden en synchroniseren",
"Description[pl]": "Podłącz i zsynchronizuj swoje urządzenia",
"Description[pt]": "Ligue e sincronize os seus dispositivos",
"Description[ru]": "Подключение и синхронизация с мобильными устройствами",
"Description[sl]": "Poveži in sinhroniziraj svoje naprave",
"Description[tr]": "Aygıtlarını bağla ve eşzamanla",
"Description[uk]": "З'єднання і синхронізація ваших пристроїв",
@ -36,6 +37,7 @@
"Name[nl]": "KDE Connect",
"Name[pl]": "KDE Connect",
"Name[pt]": "KDE Connect",
"Name[ru]": "KDE Connect",
"Name[sl]": "KDE Connect",
"Name[tr]": "KDE Connect",
"Name[uk]": "KDE Connect",

View file

@ -18,6 +18,7 @@
"Name[nl]": "Yoram Bar-Haim",
"Name[pl]": "Yoram Bar-Haim",
"Name[pt]": "Yoram Bar-Haim",
"Name[ru]": "Yoram Bar-Haim",
"Name[sl]": "Yoram Bar-Haim",
"Name[tr]": "Yoram Bar-Haim",
"Name[uk]": "Йорам Бар-Хаїм",