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 2024-05-15 01:18:23 +00:00
parent 63e228237f
commit ec8e5139e6

View file

@ -73,7 +73,7 @@
"Description[tr]": "Plasma Cep gece rengi tez ayarı",
"Description[uk]": "Швидке налаштовування нічних кольорів для Мобільної Плазми",
"Description[x-test]": "xxNight color quick setting for Plasma Mobilexx",
"Description[zh_CN]": "Plasma Mobile 的夜间色快捷设置",
"Description[zh_CN]": "Plasma Mobile 的夜间快捷设置",
"Description[zh_TW]": "Plasma 行動的夜色模式快速設定",
"Icon": "redshift-status-on",
"Id": "org.kde.plasma.quicksetting.nightcolor",
@ -117,7 +117,7 @@
"Name[tr]": "Gece Rengi",
"Name[uk]": "Нічні кольори",
"Name[x-test]": "xxNight Colorxx",
"Name[zh_CN]": "夜间色",
"Name[zh_CN]": "夜间",
"Name[zh_TW]": "夜色",
"Website": "https://kde.org"
}