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
398cf8df1b
commit
1fb8b25fe6
1 changed files with 21 additions and 1 deletions
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue