Commit b3d365c3 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 b05b084f
......@@ -56,7 +56,7 @@ Name[tg]=Эҷоди плагин
Name[tr]=Derleme Eklentisi
Name[ug]=قىستۇرما قۇر
Name[uk]=Додаток для збирання
Name[vi]=Phần cài cắm xây
Name[vi]=Phần cài cắm "xây"
Name[wa]=Tchôke-divins d' bastixhaedje
Name[x-test]=xxBuild Pluginxx
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