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
6f722954a0
commit
2538243765
1 changed files with 1 additions and 0 deletions
|
@ -104,6 +104,7 @@
|
|||
"Name[pt_BR]": "Mensagens com mudança de forma",
|
||||
"Name[ru]": "Анимация преобразования всплывающих окон",
|
||||
"Name[sl]": "Pogovorna okna pretvorb",
|
||||
"Name[ta]": "தெரித்தெழுபவை திரிவது",
|
||||
"Name[tr]": "Dönüşen Açılır Pencereler",
|
||||
"Name[uk]": "Аморфні контекстні панелі",
|
||||
"Name[vi]": "Ô bật lên biến dạng",
|
||||
|
|
Loading…
Reference in a new issue