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-04 01:21:53 +00:00
parent 2890dd6d2e
commit 44956f6b9c

View file

@ -4,37 +4,45 @@
"Description": "Provides the bell", "Description": "Provides the bell",
"Description[ca@valencia]": "Proporciona el timbre", "Description[ca@valencia]": "Proporciona el timbre",
"Description[ca]": "Proporciona el timbre", "Description[ca]": "Proporciona el timbre",
"Description[eo]": "Provizas la pepon",
"Description[es]": "Proporciona el timbre del sistema", "Description[es]": "Proporciona el timbre del sistema",
"Description[eu]": "Txirrina hornitzen du",
"Description[he]": "מספק את הפעמון", "Description[he]": "מספק את הפעמון",
"Description[ia]": "Forni le campana", "Description[ia]": "Forni le campana",
"Description[it]": "Fornisce la campanella", "Description[it]": "Fornisce la campanella",
"Description[ka]": "მოგაწოდებთ ზარს", "Description[ka]": "მოგაწოდებთ ზარს",
"Description[nl]": "Levert de bel", "Description[nl]": "Levert de bel",
"Description[nn]": "Gjev tilgang til systembjølla", "Description[nn]": "Gjev tilgang til systembjølla",
"Description[pl]": "Dostarcza dzwonek",
"Description[sl]": "Zagotavlja zvonec", "Description[sl]": "Zagotavlja zvonec",
"Description[sv]": "Tillhandahåller alarmet", "Description[sv]": "Tillhandahåller alarmet",
"Description[tr]": "Zili çalar", "Description[tr]": "Zili çalar",
"Description[uk]": "Надає сигнал", "Description[uk]": "Надає сигнал",
"Description[x-test]": "xxProvides the bellxx", "Description[x-test]": "xxProvides the bellxx",
"Description[zh_CN]": "提供系统提示", "Description[zh_CN]": "提供系统提示",
"Description[zh_TW]": "提供系統響鈴",
"EnabledByDefault": true, "EnabledByDefault": true,
"License": "GPL", "License": "GPL",
"Name": "System Bell", "Name": "System Bell",
"Name[ca@valencia]": "Timbre del sistema", "Name[ca@valencia]": "Timbre del sistema",
"Name[ca]": "Timbre del sistema", "Name[ca]": "Timbre del sistema",
"Name[eo]": "Sistempepo",
"Name[es]": "Timbre del sistema", "Name[es]": "Timbre del sistema",
"Name[eu]": "Sistemaren txirrina",
"Name[he]": "פעמון מערכת", "Name[he]": "פעמון מערכת",
"Name[ia]": "Campana de systema", "Name[ia]": "Campana de systema",
"Name[it]": "Campanella di sistema", "Name[it]": "Campanella di sistema",
"Name[ka]": "სისტემური ზარი", "Name[ka]": "სისტემური ზარი",
"Name[nl]": "Systeembel", "Name[nl]": "Systeembel",
"Name[nn]": "Systembjølle", "Name[nn]": "Systembjølle",
"Name[pl]": "Dzwonek systemowy",
"Name[sl]": "Sistemski zvonec", "Name[sl]": "Sistemski zvonec",
"Name[sv]": "Systemalarm", "Name[sv]": "Systemalarm",
"Name[tr]": "Sistem Zili", "Name[tr]": "Sistem Zili",
"Name[uk]": "Системний дзвінок", "Name[uk]": "Системний дзвінок",
"Name[x-test]": "xxSystem Bellxx", "Name[x-test]": "xxSystem Bellxx",
"Name[zh_CN]": "系统提示" "Name[zh_CN]": "系统提示",
"Name[zh_TW]": "系統響鈴"
}, },
"org.kde.kwin.effect": { "org.kde.kwin.effect": {
"internal": true "internal": true