Commit 306513a9 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 e72c359d
......@@ -13,6 +13,7 @@ Name[nl]=GeoJSON Geografische gegevens
Name[pl]=Dane geograficzne GeoJSON
Name[pt]=Dados Geográficos em GeoJSON
Name[pt_BR]=Dados geográficos em
Name[sk]=Zemepisné dáta GeoJSON
Name[sl]=Geografski podatki GeoJSON
Name[sv]=GeoJSON geografisk data
Name[uk]=географічні дані 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