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:
parent
2890dd6d2e
commit
44956f6b9c
1 changed files with 9 additions and 1 deletions
|
@ -4,37 +4,45 @@
|
|||
"Description": "Provides the bell",
|
||||
"Description[ca@valencia]": "Proporciona el timbre",
|
||||
"Description[ca]": "Proporciona el timbre",
|
||||
"Description[eo]": "Provizas la pepon",
|
||||
"Description[es]": "Proporciona el timbre del sistema",
|
||||
"Description[eu]": "Txirrina hornitzen du",
|
||||
"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",
|
||||
"Description[pl]": "Dostarcza dzwonek",
|
||||
"Description[sl]": "Zagotavlja zvonec",
|
||||
"Description[sv]": "Tillhandahåller alarmet",
|
||||
"Description[tr]": "Zili çalar",
|
||||
"Description[uk]": "Надає сигнал",
|
||||
"Description[x-test]": "xxProvides the bellxx",
|
||||
"Description[zh_CN]": "提供系统提示",
|
||||
"Description[zh_TW]": "提供系統響鈴",
|
||||
"EnabledByDefault": true,
|
||||
"License": "GPL",
|
||||
"Name": "System Bell",
|
||||
"Name[ca@valencia]": "Timbre del sistema",
|
||||
"Name[ca]": "Timbre del sistema",
|
||||
"Name[eo]": "Sistempepo",
|
||||
"Name[es]": "Timbre del sistema",
|
||||
"Name[eu]": "Sistemaren txirrina",
|
||||
"Name[he]": "פעמון מערכת",
|
||||
"Name[ia]": "Campana de systema",
|
||||
"Name[it]": "Campanella di sistema",
|
||||
"Name[ka]": "სისტემური ზარი",
|
||||
"Name[nl]": "Systeembel",
|
||||
"Name[nn]": "Systembjølle",
|
||||
"Name[pl]": "Dzwonek systemowy",
|
||||
"Name[sl]": "Sistemski zvonec",
|
||||
"Name[sv]": "Systemalarm",
|
||||
"Name[tr]": "Sistem Zili",
|
||||
"Name[uk]": "Системний дзвінок",
|
||||
"Name[x-test]": "xxSystem Bellxx",
|
||||
"Name[zh_CN]": "系统提示"
|
||||
"Name[zh_CN]": "系统提示",
|
||||
"Name[zh_TW]": "系統響鈴"
|
||||
},
|
||||
"org.kde.kwin.effect": {
|
||||
"internal": true
|
||||
|
|
Loading…
Reference in a new issue