Commit 92533062 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 4cedc791
......@@ -19,7 +19,6 @@ Name[sv]=Minuet
Name[uk]=Minuet
Name[x-test]=xxMinuetxx
Name[zh_CN]=Minuet
Name[zh_TW]=Minuet
Exec=minuet
Icon=minuet
Type=Application
......@@ -42,6 +41,5 @@ GenericName[sv]=Programvara för musikutbildning
GenericName[uk]=Програмне забезпечення для навчання музики
GenericName[x-test]=xxMusic Education Softwarexx
GenericName[zh_CN]=音乐教育软件
GenericName[zh_TW]=音樂教育軟體
Terminal=false
Categories=Qt;KDE;Education;X-KDE-Edu-Misc;
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