Commit 28025de1 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 eb56541c
Pipeline #288305 skipped
......@@ -25,7 +25,7 @@ Name[pt_BR]=Strings
Name[sk]=Reťazce
Name[sl]=Nizi
Name[sv]=Strängar
Name[tr]=Dizgeler
Name[tr]=Diziler
Name[ug]=تېكىستلەر
Name[uk]=Рядки
Name[x-test]=xxStringsxx
......
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