Commit 483e35dd 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 9a728848
...@@ -78,7 +78,7 @@ Comment[it]=Dati di vocabolari per oggetti di Plasma ...@@ -78,7 +78,7 @@ Comment[it]=Dati di vocabolari per oggetti di Plasma
Comment[ja]=プラズモイド用の語彙データ Comment[ja]=プラズモイド用の語彙データ
Comment[kk]=Plasmoid-терге арналған сөздік дерегі Comment[kk]=Plasmoid-терге арналған сөздік дерегі
Comment[km]=ទិន្នន័យ​វាក្យសព្ទ​សម្រាប់ Plasmoids Comment[km]=ទិន្នន័យ​វាក្យសព្ទ​សម្រាប់ Plasmoids
Comment[ko]=Plasmoid를 위한 어휘 데이터 Comment[ko]=Plasmoid 어휘 데이터
Comment[lt]=Žodyno duomenys, skirti plazmoidams Comment[lt]=Žodyno duomenys, skirti plazmoidams
Comment[lv]=Vārdnīcas dati plazmoīdiem Comment[lv]=Vārdnīcas dati plazmoīdiem
Comment[ml]=പ്ലാസ്മോയിഡ്സിനായുള്ള വാക്പട്ടിക ഡാറ്റ Comment[ml]=പ്ലാസ്മോയിഡ്സിനായുള്ള വാക്പട്ടിക ഡാറ്റ
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