Commit 186f6487 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 4f9cbe43
......@@ -51,6 +51,7 @@ Comment[sv]=Behåll skrivbordets bakgrund levande under utloggning till slutet
Comment[uk]=Не вимикати тло стільниці до кінця процедури виходу із облікового запису
Comment[x-test]=xxKeep the desktop background alive during logout until the endxx
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