Commit f80a7be6 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 243d0b6d
......@@ -69,6 +69,7 @@ Name[zh_TW]=可變更頻率
[Desktop Action instructionSets]
Name=Instruction Sets
Name[ast]=Conxuntos d'instrucciones
Name[bg]=Набор инструкции
Name[bn]=ইনস্ট্রাকশন সেট
Name[bs]=Skup instrukcija
......
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