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
6a36c35d73
commit
4c38c0dcc3
1 changed files with 1 additions and 0 deletions
|
@ -34,6 +34,7 @@ Comment[ca@valencia]=Fa que les finestres entrin o isquen volant quan es mostren
|
|||
Comment[gl]=Facer que as xanelas crezan ou decrezan suavemente cando se mostran ou agochan
|
||||
Comment[id]=Buat jendela menskala besar atau kecil secara mulus ketika ia ditampilkan atau disembunyikan
|
||||
Comment[nl]=Laat vensters vloeiend kleiner en groter schalen als ze worden getoond of verborgen
|
||||
Comment[nn]=Skaler vindauge jamt inn og ut når dei vert viste eller gøymde
|
||||
Comment[pt]=Fazer com que as janelas apareçam/desapareçam suavemente quando aparecem ou ficam escondidas
|
||||
Comment[sv]=Gör att fönster mjukt skalas in eller ut när de visas eller döljs
|
||||
Comment[uk]=Плавне масштабування вікон при появі або приховуванні
|
||||
|
|
Loading…
Reference in a new issue