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"icc-effect-5.14.5
parent
6a4e9cbb58
commit
2281bd19d8
|
@ -14,6 +14,7 @@ Name=Touch Screen
|
||||||
Name[ca]=Pantalla tàctil
|
Name[ca]=Pantalla tàctil
|
||||||
Name[ca@valencia]=Pantalla tàctil
|
Name[ca@valencia]=Pantalla tàctil
|
||||||
Name[cs]=Dotyková obrazovka
|
Name[cs]=Dotyková obrazovka
|
||||||
|
Name[de]=Touchscreen
|
||||||
Name[es]=Pantalla táctil
|
Name[es]=Pantalla táctil
|
||||||
Name[it]=Schermo a sfioramento
|
Name[it]=Schermo a sfioramento
|
||||||
Name[nl]=Aanraakscherm
|
Name[nl]=Aanraakscherm
|
||||||
|
|
Loading…
Reference in New Issue