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
d1f4b5322a
commit
4a97989f0f
@ -13,6 +13,7 @@
|
||||
],
|
||||
"Id": "Plasma/ContainmentActions",
|
||||
"Name": "Containment Actions",
|
||||
"Name[ast]": "Aiciones de contención",
|
||||
"Name[ca@valencia]": "Accions del contenidor",
|
||||
"Name[ca]": "Accions del contenidor",
|
||||
"Name[da]": "Beholder-handlinger",
|
||||
|
@ -13,6 +13,7 @@
|
||||
],
|
||||
"Id": "Plasma/Generic",
|
||||
"Name": "Generic",
|
||||
"Name[ast]": "Xenérico",
|
||||
"Name[ca@valencia]": "Genèric",
|
||||
"Name[ca]": "Genèric",
|
||||
"Name[cs]": "Obecné",
|
||||
|
Loading…
Reference in New Issue
Block a user