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
76c5371b57
commit
71acd12eb2
1 changed files with 1 additions and 1 deletions
|
@ -7,7 +7,7 @@ Name[da]=Minimér alle
|
|||
Name[de]=Alle minimieren
|
||||
Name[el]=ΕλαχιστοποίησηΌλων
|
||||
Name[en_GB]=MinimiseAll
|
||||
Name[es]=Maximizar todo
|
||||
Name[es]=Minimizar todo
|
||||
Name[et]=Kõigi minimeerimine
|
||||
Name[eu]=Minimizatu guztiak
|
||||
Name[fi]=Pienennä kaikki
|
||||
|
|
Loading…
Reference in a new issue