Commit 13c540b9 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 19771d84
...@@ -125,6 +125,7 @@ Name[pt]=Oxygen Frio ...@@ -125,6 +125,7 @@ Name[pt]=Oxygen Frio
Name[pt_BR]=Oxygen Cold Name[pt_BR]=Oxygen Cold
Name[ru]=Холодная Oxygen Name[ru]=Холодная Oxygen
Name[sk]=Kyslík Studený Name[sk]=Kyslík Studený
Name[sl]=Kisik - hladna
Name[sv]=Oxygen kall Name[sv]=Oxygen kall
Name[tg]=Оксигени тиллоӣ Name[tg]=Оксигени тиллоӣ
Name[uk]=Холодна Oxygen Name[uk]=Холодна Oxygen
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