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 2025-04-08 01:31:46 +00:00
parent 5da7192773
commit eb918d4d99

View file

@ -59,6 +59,7 @@
"Description[ko]": "Plasma 모바일의 시스템 탐색 첫 시작 모듈",
"Description[lv]": "„Plasma Mobile“ „initialstart“ sistēmas navigācijas modulis",
"Description[nl]": "Systeemnavigatie initiële startmodule voor Plasma Mobile",
"Description[ru]": "Модуль навигации системы начального запуска для Plasma Mobile",
"Description[sl]": "Modul za začetni zagon sistemske navigacije za Plasma Mobile",
"Description[sv]": "Systemnavigeringens förstagångsstart för Plasma mobil",
"Description[tr]": "Plasma Cep için sistem dolaşımı başlangıcı modülü",
@ -81,6 +82,7 @@
"Name[ko]": "시스템 탐색",
"Name[lv]": "Sistēmas navigācija",
"Name[nl]": "Systeemnavigatie",
"Name[ru]": "Навигация системы",
"Name[sl]": "Sistemska navigacija",
"Name[sv]": "Systemnavigering",
"Name[tr]": "Sistem Dolaşımı",