Commit b01906c7 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 8e2d8539
......@@ -76,7 +76,7 @@ Description[it]=Un tema monocromatico, nero su bianco per KGoldrunner
Description[ja]=KGoldrunner のモノクロテーマ
Description[kk]=KGoldrunner-дің ақ пен қара түсті нақышы
Description[km]=មាន​តែ​មួយ​ពណ៌​ ស្បែក​ខ្មៅ​ លើ ​ស​សម្រាប់​ KGoldrunner
Description[ko]=KGoldRunner를 위한 모노크롬 및 흑백 테마
Description[ko]=KGoldRunner 모노크롬 및 흑백 테마
Description[lv]=Monohroma, melns uz balta KGoldrunner tēma
Description[mr]=के-गोल्ड-रनर करिता पांढऱ्यावर काळा असलेली मोनोक्रोम शैली
Description[nb]=Tema i svart-hvitt for KGoldrunner
......
......@@ -77,7 +77,7 @@ Description[it]=Un tema semplice e pulito per KDE4
Description[ja]=KDE4 用の軽くてきれいなテーマ
Description[kk]=KDE4-нің жарық пен анық нақышы
Description[km]=ស្បែក​ស្អាត និង​ភ្លឺ​សម្រាប់ KDE4
Description[ko]=KDE 4를 위한 가볍고 깨끗한 테마
Description[ko]=KDE 4 가볍고 깨끗한 테마
Description[lv]=Gaiša un tīra tēma priekš KDE4
Description[mr]=केडीई४ करिता हलकी व स्वच्छ शैली
Description[nb]=Lyst og stilrent tema for KDE 4
......
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