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
daec969720
commit
4585cec7a1
1 changed files with 50 additions and 7 deletions
|
@ -1,16 +1,59 @@
|
|||
{
|
||||
"KPlugin": {
|
||||
"License": "GPL",
|
||||
"Category": "Appearance",
|
||||
"Description": "Show screen names",
|
||||
"Name": "Output Locator",
|
||||
"EnabledByDefault": true,
|
||||
"Authors": [
|
||||
{
|
||||
"Email": "kde@david-redondo.de",
|
||||
"Name": "David Redondo"
|
||||
"Name": "David Redondo",
|
||||
"Name[ar]": "ديفيد ريدوندو",
|
||||
"Name[az]": "David Redondo",
|
||||
"Name[be]": "David Redondo",
|
||||
"Name[bg]": "David Redondo",
|
||||
"Name[ca@valencia]": "David Redondo",
|
||||
"Name[ca]": "David Redondo",
|
||||
"Name[cs]": "David Redondo",
|
||||
"Name[de]": "David Redondo",
|
||||
"Name[en_GB]": "David Redondo",
|
||||
"Name[eo]": "David Redondo",
|
||||
"Name[es]": "David Redondo",
|
||||
"Name[et]": "David Redondo",
|
||||
"Name[eu]": "David Redondo",
|
||||
"Name[fi]": "David Redondo",
|
||||
"Name[fr]": "David Redondo",
|
||||
"Name[gl]": "David Redondo",
|
||||
"Name[he]": "דיויד רדונדו",
|
||||
"Name[hu]": "David Redondo",
|
||||
"Name[ia]": "David Redondo",
|
||||
"Name[is]": "David Redondo",
|
||||
"Name[it]": "David Redondo",
|
||||
"Name[ja]": "David Redondo",
|
||||
"Name[ka]": "David Redondo",
|
||||
"Name[ko]": "David Redondo",
|
||||
"Name[lt]": "David Redondo",
|
||||
"Name[lv]": "David Redondo",
|
||||
"Name[nl]": "David Redondo",
|
||||
"Name[nn]": "David Redondo",
|
||||
"Name[pl]": "David Redondo",
|
||||
"Name[pt]": "David Redondo",
|
||||
"Name[pt_BR]": "David Redondo",
|
||||
"Name[ro]": "David Redondo",
|
||||
"Name[ru]": "David Redondo",
|
||||
"Name[sk]": "David Redondo",
|
||||
"Name[sl]": "David Redondo",
|
||||
"Name[sv]": "David Redondo",
|
||||
"Name[ta]": "டேவிட் ரிடொண்டோ",
|
||||
"Name[tr]": "David Redondo",
|
||||
"Name[uk]": "David Redondo",
|
||||
"Name[vi]": "David Redondo",
|
||||
"Name[x-test]": "xxDavid Redondoxx",
|
||||
"Name[zh_CN]": "David Redondo",
|
||||
"Name[zh_TW]": "David Redondo"
|
||||
}
|
||||
]
|
||||
],
|
||||
"Category": "Appearance",
|
||||
"Description": "Show screen names",
|
||||
"EnabledByDefault": true,
|
||||
"License": "GPL",
|
||||
"Name": "Output Locator"
|
||||
},
|
||||
"org.kde.kwin.effect": {
|
||||
"internal": true
|
||||
|
|
Loading…
Reference in a new issue