Commit 218f6b00 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 fb1570f4
......@@ -92,6 +92,7 @@ Name[ca]=Norway
Name[ca@valencia]=Norway
Name[de]=Norwegen
Name[es]=Noruega
Name[fr]=Norvège
Name[gl]=Noruega
Name[it]=Norvegia
Name[nl]=Noorwegen
......
......@@ -109,6 +109,7 @@ Name[ca]=Oxygen
Name[ca@valencia]=Oxygen
Name[de]=Oxygen
Name[es]=Oxígeno
Name[fr]=Oxygen
Name[gl]=Osíxeno
Name[it]=Oxygen
Name[nl]=Oxygen
......
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