Commit d63dbca7 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 ea82dbc2
......@@ -91,7 +91,7 @@ Comment[it]=Trasforma le persone normali in Super Sviluppatori di Kopete
Comment[ja]=普通の人を Kopete のスーパー開発者に変えます
Comment[kk]=Қарапайым адамды супер Kopete құрастырушы қылу
Comment[km]=ប្រែ​ក្លាយ​មនុស្ស​ធម្មតា​ឲ្យ​ទៅ​ជា​កំពូល​អ្នក​អភិវឌ្ឍន៍ Kopete
Comment[ko]=일반적인 사람에게 Kopete 개발을 소개합니다
Comment[ko]=일반적인 사람에게 Kopete 개발을 소개합니다
Comment[lt]=Normalius žmones paverčia Kopete super programuotojais
Comment[lv]=Pārvērš parastus cilvēkus par Kopete Superizstrādātājiem
Comment[ml]=സാധാരണ ജനങ്ങളെ കോപീറ്റ് വികസനത്തില്‍ അമാനുഷരാക്കുന്നു
......@@ -2451,7 +2451,7 @@ Comment[it]=Un contatto ti ha inviato un buzz/trillo.
Comment[kk]=Бір контакт назарыңызды аударып жатыр.
Comment[km]=ទំនាក់​ទំនង​មួយ​បាន​កេះកៀវ ឬ សន្ទនា​រក​អ្នក ។
Comment[ko]=대화 상대가 대화 창을 흔
Comment[ko]=대화 상대가 대화 창을 흔들었습니다.
Comment[lt]=Kontaktas jums skambtelėjo/kumštelėjo.
Comment[lv]=Kontakts jums nosūtīja zvanu/piebakstījienu.
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