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-03 01:21:57 +00:00
parent ebffcd9dc4
commit bf39cc5c19

View file

@ -7,6 +7,7 @@
"Description[es]": "Proporciona el timbre del sistema",
"Description[he]": "מספק את הפעמון",
"Description[ia]": "Forni le campana",
"Description[it]": "Fornisce la campanella",
"Description[ka]": "მოგაწოდებთ ზარს",
"Description[nl]": "Levert de bel",
"Description[nn]": "Gjev tilgang til systembjølla",
@ -15,6 +16,7 @@
"Description[tr]": "Zili çalar",
"Description[uk]": "Надає сигнал",
"Description[x-test]": "xxProvides the bellxx",
"Description[zh_CN]": "提供系统提示",
"EnabledByDefault": true,
"License": "GPL",
"Name": "System Bell",
@ -23,6 +25,7 @@
"Name[es]": "Timbre del sistema",
"Name[he]": "פעמון מערכת",
"Name[ia]": "Campana de systema",
"Name[it]": "Campanella di sistema",
"Name[ka]": "სისტემური ზარი",
"Name[nl]": "Systeembel",
"Name[nn]": "Systembjølle",
@ -30,7 +33,8 @@
"Name[sv]": "Systemalarm",
"Name[tr]": "Sistem Zili",
"Name[uk]": "Системний дзвінок",
"Name[x-test]": "xxSystem Bellxx"
"Name[x-test]": "xxSystem Bellxx",
"Name[zh_CN]": "系统提示"
},
"org.kde.kwin.effect": {
"internal": true