Commit 28ac87bc 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 e655e898
......@@ -9,6 +9,7 @@ Name[ia]=Modo aeroplano
Name[pl]=Tryb samolotowy
Name[pt_BR]=Modo avião
Name[ru]=Режим полёта
Name[sl]=Letalski način
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