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
70700b868a
commit
102332df00
1 changed files with 1 additions and 0 deletions
|
@ -20,6 +20,7 @@ Name[ca]=Pantalla completa
|
|||
Name[cs]=Celá obrazovka
|
||||
Name[es]=Pantalla completa
|
||||
Name[fr]=Plein écran
|
||||
Name[ia]=Schermo plen
|
||||
Name[it]=Schermo intero
|
||||
Name[ko]=전체 화면
|
||||
Name[nl]=Volledig scherm
|
||||
|
|
Loading…
Reference in a new issue