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-04-03 01:15:20 +00:00
parent 260af8e610
commit 482f781b8c

View file

@ -113,6 +113,6 @@
"Name[zh_TW]": "Plasma 行動",
"Website": "https://plasma-mobile.org"
},
"X-Plasma-FallbackPackage": "org.kde.plasma.nano",
"X-Plasma-APIVersion": "2"
"X-Plasma-APIVersion": "2",
"X-Plasma-FallbackPackage": "org.kde.plasma.nano"
}