Commit 89729759 authored by Script Kiddy's avatar Script Kiddy

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 d89be541
......@@ -6,7 +6,6 @@ Icon=kbruch
X-DocPath=kbruch/index.html
GenericName=Exercise Fractions
GenericName[af]=Oefen Breuke
GenericName[ast]=Exercicios con fraiciones
GenericName[be]=Практыкаванні з дробамі
GenericName[bg]=Упражнения с дроби
GenericName[bn]=ভগ্নাংশের অংক অনুশীলন করুন
......@@ -72,7 +71,6 @@ GenericName[zh_CN]=分数练习
GenericName[zh_TW]=練習分數
Comment=Practice exercises with fractions
Comment[af]=Doen oefeninge met breuke
Comment[ast]=Prautica exercicios con fraiciones
Comment[be]=Практычныя заняткі з дробамі
Comment[bg]=Практически упражнения с дроби
Comment[bn]=ভগ্নাংশের অংকের অনুশীলনী চর্চা করুন
......
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