Commit 49600e1b authored by Script Kiddy's avatar Script Kiddy

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"
parent 2757986d
......@@ -4,6 +4,7 @@ Name=GeoJSON Geographic Data
Name[ca]=Dades geogràfiques GeoJSON
Name[ca@valencia]=Dades geogràfiques GeoJSON
Name[cs]=Zeměpisná data GeoJSON
Name[da]=GeoJSON geografisk data
Name[de]=GeoJSON-Geografiedaten
Name[en_GB]=GeoJSON Geographic Data
Name[es]=Datos geográficos GeoJSON
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment