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 2026-02-17 01:42:25 +00:00
parent 0f46dc92f5
commit 07784b7500

View file

@ -52,6 +52,7 @@
"Description[nl]": "Snelle instelling van OSD opzet van scherm voor Plasma Mobile",
"Description[pl]": "Szybkie ustawienia okien na ekranie dla Przenośnej Plazmy",
"Description[pt_BR]": "Configurações rápidas de tela OSD para o Plasma Mobile",
"Description[ru]": "Экранная подсказка настройки экрана для Plasma Mobile",
"Description[sl]": "Hitra nastavitev zaslona na zaslonu za Plasma Mobile",
"Description[sv]": "Snabbinställning av meddelanden på bildskärm för Plasma mobil",
"Description[tr]": "Plasma Cep ekran ayarları için tez ayar",
@ -80,6 +81,7 @@
"Name[nl]": "OSD van scherm",
"Name[pl]": "Okna na ekranie",
"Name[pt_BR]": "Tela OSD",
"Name[ru]": "Экранные подсказки",
"Name[sl]": "Zaslon na zaslonu",
"Name[sv]": "Meddelanden på bildskärm",
"Name[tr]": "Ekran EÜGsi",