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-03-31 01:14:02 +00:00
parent b5c127519f
commit 20960c2fea

View file

@ -2,6 +2,7 @@
"KPlugin": {
"Category": "Accessibility",
"Description": "Hide mouse cursor on inactivity or keyboard input",
"Description[ar]": "إخفاء مؤشر الفأرة عند عدم النشاط أو كتابة بلوحة المفاتيح",
"Description[bg]": "Скриване показалеца на мишката при бездействие или при въвеждане от клавиатурата",
"Description[ca@valencia]": "Oculta el cursor del ratolí per inactivitat o per entrada de teclat",
"Description[ca]": "Oculta el cursor del ratolí per inactivitat o per entrada de teclat",
@ -27,6 +28,7 @@
"EnabledByDefault": false,
"License": "GPL",
"Name": "Hide Cursor",
"Name[ar]": "إخفاء المؤشر",
"Name[bg]": "Скриване показалеца на мишката",
"Name[ca@valencia]": "Oculta el cursor",
"Name[ca]": "Oculta el cursor",