Commit 068a2d3e 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 d022b400
Pipeline #19829 passed with stage
in 6 minutes and 2 seconds
......@@ -37,6 +37,7 @@ Name[nl]=Calindori
Name[pl]=Calindori
Name[pt]=Calindori
Name[pt_BR]=Calindori
Name[ru]=Calindori
Name[sk]=Calindori
Name[sv]=Calindori
Name[uk]=Calindori
......
......@@ -16,6 +16,7 @@ Name[nl]=Calindori
Name[pl]=Calindori
Name[pt]=Calindori
Name[pt_BR]=Calindori
Name[ru]=Calindori
Name[sk]=Calindori
Name[sv]=Calindori
Name[uk]=Calindori
......
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