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
432fb52788
commit
16b7f5729a
1 changed files with 2 additions and 0 deletions
|
@ -9,6 +9,7 @@
|
|||
"Description[es]": "Anima los cambios de estilo del sistema",
|
||||
"Description[fr]": "Anime les modifications de style du système",
|
||||
"Description[nl]": "Systeemstijl wijzigingen animeren",
|
||||
"Description[pt_BR]": "Animar alterações de estilo do sistema",
|
||||
"Description[sl]": "Animiraj spremembe sloga sistema",
|
||||
"Description[sv]": "Animerar systemets stiländringar",
|
||||
"Description[uk]": "Анімація змін у стилі системи",
|
||||
|
@ -25,6 +26,7 @@
|
|||
"Name[es]": "Mezclar cambios",
|
||||
"Name[fr]": "Modifications des mélanges",
|
||||
"Name[nl]": "Wijzigingen mengen",
|
||||
"Name[pt_BR]": "Misturar alterações",
|
||||
"Name[sl]": "Zmešaj spremembe",
|
||||
"Name[sv]": "Blanda ändringar",
|
||||
"Name[uk]": "Злиття змін",
|
||||
|
|
Loading…
Reference in a new issue