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
abbaa1575b
commit
7c588d4984
1 changed files with 1 additions and 1 deletions
|
@ -490,7 +490,7 @@ Comment[sr@ijekavianlatin]=Vaša baterija je na izdisaju
|
|||
Comment[sr@latin]=Vaša baterija je na izdisaju
|
||||
Comment[sv]=Batteriet är nästan slut
|
||||
Comment[ta]=உங்கள் மின்கலத்தில் ஆற்றல் குறைவாக உள்ளது
|
||||
Comment[tr]=Pilinizin seviyesi düşük
|
||||
Comment[tr]=Pilinizin düzeyi düşük
|
||||
Comment[uk]=Рівень заряду акумулятора є низьким
|
||||
Comment[x-test]=xxYour battery is in low statexx
|
||||
Comment[zh_CN]=您的电池电量低
|
||||
|
|
Loading…
Reference in a new issue