Commit dfaf302b 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 45f7eae4
......@@ -598,6 +598,7 @@ Name[sl]=Omejena povezljivost
Name[sv]=Begränsad anslutning
Name[uk]=Обмежене з'єднання з мережею
Name[x-test]=xxLimited Connectivityxx
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