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-08-23 01:36:01 +00:00
parent 3f02922206
commit bf92eb9354

View file

@ -16,7 +16,8 @@
"Name[sv]": "Sebastian Kügler",
"Name[tr]": "Sebastian Kügler",
"Name[uk]": "Sebastian Kügler",
"Name[x-test]": "xxSebastian Küglerxx"
"Name[x-test]": "xxSebastian Küglerxx",
"Name[zh_CN]": "Sebastian Kügler"
}
],
"Description": "Screen setup OSD quick setting for Plasma Mobile",
@ -32,6 +33,7 @@
"Description[tr]": "Plasma Cep ekran ayarları için tez ayar",
"Description[uk]": "Параметри швидкого налаштовування екрана за допомогою панелі для Мобільної Плазми",
"Description[x-test]": "xxScreen setup OSD quick setting for Plasma Mobilexx",
"Description[zh_CN]": "Plasma Mobile 的屏幕设置 OSD 快捷设置",
"Icon": "osd-duplicate",
"Id": "org.kde.plasma.quicksetting.kscreenosd",
"License": "GPL-2.0+",
@ -48,6 +50,7 @@
"Name[tr]": "Ekran EÜGsi",
"Name[uk]": "Екранна панель",
"Name[x-test]": "xxScreen OSDxx",
"Name[zh_CN]": "屏幕 OSD",
"Website": "https://kde.org"
}
}