Commit 547e680c 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 28ec7832
...@@ -24,6 +24,7 @@ Name[pt_BR]=GCompris ...@@ -24,6 +24,7 @@ Name[pt_BR]=GCompris
Name[ro]=GCompris Name[ro]=GCompris
Name[ru]=GCompris Name[ru]=GCompris
Name[sk]=GCompris Name[sk]=GCompris
Name[sl]=GCompris
Name[sv]=GCompris Name[sv]=GCompris
Name[uk]=GCompris Name[uk]=GCompris
Name[x-test]=xxGComprisxx Name[x-test]=xxGComprisxx
......
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