Commit 3e9cdfb9 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 3a943be6
......@@ -59,7 +59,7 @@ Description[id]=Sebuah tema spooky untuk KMines. Jangan sampai tertangkap oleh z
Description[it]=Un tema spettrale per KMines. Non farti impressionare dagli zombie del cimitero.
Description[kk]=Сұмдық KMines нақышы. Зомбилердің қолына түспеңіз!
Description[km]=ស្បែក​គួរឲ្យ​ខ្លាច​សម្រាប់ KMines ។ កុំ​ឲ្យ​ខ្មោច​ឆៅ​ចាប់​បាន​នៅ​ទី​ប៉ាឆា​ឲ្យសោះ!
Description[ko]=KMines를 위한 유령 테마입니다. 무덤에 나타나는 좀비들을 조심하세요!
Description[ko]=KMines 유령 테마입니다. 무덤에 나타나는 좀비 조심하세요!
Description[lv]=Spokaina KMines tēma. Neļauj zombijiem sevi pieķert!
Description[ml]=കെമൈൻസിനുള്ള ഭൂതാവിഷ്‌ടമായ ഒരു തീം.ശ്മാശാനത്തിലുള്ള സോമ്പികളുക്ക് പിടികൊടുക്കരുത്!
Description[nb]=Et skummelt tema for KMines. Pass deg for zombiene på kirkegården.
......
......@@ -64,7 +64,7 @@ Description[fr]=Un thème amusant pour KMines
Description[gl]=Un tema alegre para KMines.
Description[id]=Sebuah tema lucu untuk KMines
Description[it]=Un tema buffo per KMines
Description[ko]=KMines를 위한 재미있는 테마
Description[ko]=KMines 재미있는 테마
Description[ml]=കെമൈൻസിനുള്ള രസകരമായ ഒരു തീം
Description[nl]=Een grappig thema voor KMines
Description[nn]=Artig tema for KMinesveipar
......
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