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
b4441cd502
commit
98951840ca
1 changed files with 4 additions and 0 deletions
|
@ -2,12 +2,14 @@
|
|||
"KPlugin": {
|
||||
"Category": "Window Management",
|
||||
"Description": "Editor for the tiling areas",
|
||||
"Description[bg]": "Редактиране на зоните на плочковидно разпределяне",
|
||||
"Description[ca@valencia]": "Editor per a les àrees de mosaic",
|
||||
"Description[ca]": "Editor per a les àrees de mosaic",
|
||||
"Description[es]": "Editor para las áreas de mosaico",
|
||||
"Description[eu]": "Eremu lauzatuen editorea",
|
||||
"Description[nl]": "Bewerker voor de gebieden waar tegels worden geplaatst",
|
||||
"Description[pl]": "Edytor dla obszarów kafelkowanych",
|
||||
"Description[pt]": "Editor das áreas com padrões",
|
||||
"Description[tr]": "Döşeme alanları için düzenleyici",
|
||||
"Description[uk]": "Редактор для мозаїчних областей",
|
||||
"Description[x-test]": "xxEditor for the tiling areasxx",
|
||||
|
@ -15,12 +17,14 @@
|
|||
"Id": "tileseditor",
|
||||
"License": "GPL",
|
||||
"Name": "Tiling Editor",
|
||||
"Name[bg]": "Редактор на разпределяне",
|
||||
"Name[ca@valencia]": "Editor de mosaic",
|
||||
"Name[ca]": "Editor de mosaic",
|
||||
"Name[es]": "Editor de mosaico",
|
||||
"Name[eu]": "Lauzadura editorea",
|
||||
"Name[nl]": "Bewerker voor tegels plaatsen",
|
||||
"Name[pl]": "Edytor kafelków",
|
||||
"Name[pt]": "Editor de Padrões",
|
||||
"Name[tr]": "Döşeme Düzenleyici",
|
||||
"Name[uk]": "Редактор мозаїк",
|
||||
"Name[x-test]": "xxTiling Editorxx"
|
||||
|
|
Loading…
Reference in a new issue