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
baf3ddea72
commit
213c98213a
1 changed files with 1 additions and 0 deletions
|
@ -35,6 +35,7 @@ Comment[es]=Seleccionar el teclado virtual a usar
|
|||
Comment[it]=Seleziona quale tastiera virtuale utilizzare
|
||||
Comment[nl]=Het te gebruiken virtuele toetsenbord selecteren
|
||||
Comment[pl]=Wybierz której klawiatury ekranowej użyć
|
||||
Comment[pt]=Seleccionar qual o teclado virtual a usar
|
||||
Comment[sl]=Izberite virtualno tipkovnico za uporabo
|
||||
Comment[sv]=Välj vilket virtuellt tangentbord som ska användas
|
||||
Comment[uk]=Вибір віртуальної клавіатури
|
||||
|
|
Loading…
Reference in a new issue