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
d628cc90fa
commit
c67660b0fa
1 changed files with 16 additions and 0 deletions
|
@ -20,9 +20,25 @@
|
|||
}
|
||||
],
|
||||
"Description": "The classic theme known from KDE 3",
|
||||
"Description[bg]": "Класическата тема, позната от KDE 3",
|
||||
"Description[ca]": "El tema clàssic conegut des del KDE 3",
|
||||
"Description[es]": "El clásico tema conocido desde KDE 3",
|
||||
"Description[nl]": "Het klassieke thema bekend van KDE 3",
|
||||
"Description[pt]": "O tema clássico e conhecido do KDE 3",
|
||||
"Description[tr]": "KDE 3 zamanından klasik tema",
|
||||
"Description[uk]": "Класична тема, відома з часів KDE 3",
|
||||
"Description[x-test]": "xxThe classic theme known from KDE 3xx",
|
||||
"Id": "kwin4_decoration_qml_plastik",
|
||||
"License": "GPL",
|
||||
"Name": "Plastik",
|
||||
"Name[bg]": "Plastik",
|
||||
"Name[ca]": "Plastik",
|
||||
"Name[es]": "Plastik",
|
||||
"Name[nl]": "Plastik",
|
||||
"Name[pt]": "Plastik",
|
||||
"Name[tr]": "Plastik",
|
||||
"Name[uk]": "Пластик",
|
||||
"Name[x-test]": "xxPlastikxx",
|
||||
"ServiceTypes": [
|
||||
"KWin/Decoration"
|
||||
],
|
||||
|
|
Loading…
Reference in a new issue