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
85b614e75c
commit
a6b665006e
1 changed files with 1 additions and 1 deletions
|
@ -36,7 +36,7 @@
|
|||
}
|
||||
],
|
||||
"Description": "The classic theme known from KDE 3",
|
||||
"Description[ar]": "السّمة الكلاسيكيّة المعروفة من كدي 3",
|
||||
"Description[ar]": "السّمة الكلاسيكيّة المعروفة من كِيدِي 3",
|
||||
"Description[be]": "Класічная тэма, вядомая з KDE 3",
|
||||
"Description[bg]": "Класическата тема, позната от KDE 3",
|
||||
"Description[ca@valencia]": "El tema clàssic conegut des de KDE 3",
|
||||
|
|
Loading…
Reference in a new issue