Commit b056c34c authored by Script Kiddy's avatar Script Kiddy
Browse files

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 acf122e2
......@@ -5,6 +5,7 @@ Name[ca]=Per l'aigua
Name[ca@valencia]=Per l'aigua
Name[da]=Ved vandet
Name[de]=Am Wasser
Name[el]=Στο νερό
Name[en_GB]=By the water
Name[es]=Junto al agua
Name[et]=Vee ääres
......
Supports Markdown
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