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
352e92e32f
commit
d6002c2631
1 changed files with 1 additions and 0 deletions
|
@ -6,6 +6,7 @@
|
|||
"Description[az]": "Ekranda toxunan nöqtələri canlandırır",
|
||||
"Description[ca@valencia]": "Visualitza els punts de contacte",
|
||||
"Description[ca]": "Visualitza els punts de contacte",
|
||||
"Description[cs]": "Vizualizovat dotekové body",
|
||||
"Description[en_GB]": "Visualise touch points",
|
||||
"Description[es]": "Visualizar los puntos de contacto",
|
||||
"Description[fi]": "Korosta kosketuspisteet",
|
||||
|
|
Loading…
Reference in a new issue