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-08-01 01:23:23 +00:00
parent 398cf8df1b
commit 1fb8b25fe6

View file

@ -2,9 +2,29 @@
"KPlugin": {
"Category": "Accessibility",
"Description": "Provides the bell",
"Description[ca@valencia]": "Proporciona el timbre",
"Description[ca]": "Proporciona el timbre",
"Description[ia]": "Forni le campana",
"Description[ka]": "მოგაწოდებთ ზარს",
"Description[nl]": "Levert de bel",
"Description[sl]": "Zagotavlja zvonec",
"Description[sv]": "Tillhandahåller alarmet",
"Description[tr]": "Zili çalar",
"Description[uk]": "Надає сигнал",
"Description[x-test]": "xxProvides the bellxx",
"EnabledByDefault": true,
"License": "GPL",
"Name": "System Bell"
"Name": "System Bell",
"Name[ca@valencia]": "Timbre del sistema",
"Name[ca]": "Timbre del sistema",
"Name[ia]": "Campana de systema",
"Name[ka]": "სისტემური ზარი",
"Name[nl]": "Systeembel",
"Name[sl]": "Sistemski zvonec",
"Name[sv]": "Systemalarm",
"Name[tr]": "Sistem Zili",
"Name[uk]": "Системний дзвінок",
"Name[x-test]": "xxSystem Bellxx"
},
"org.kde.kwin.effect": {
"internal": true