Commit 10b9226f 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 f7409845
......@@ -128,7 +128,7 @@ Comment[it]=Uno strumento di confronto e fusione di file e cartelle
Comment[ja]=ファイルやディレクトリの比較/マージを行うツール
Comment[km]=ការ​ប្រៀបធៀប​ថត និង​ឯកសារ និង​ឧបករណ៌​បញ្ចូល​គ្នា
Comment[ko]=파일과 디렉터리 비교 및 병합 도구
Comment[lt]=Failų ir Direktorijų palyginimo ir suliejimo įrankis
Comment[lt]=Failų ir katalogų palyginimo ir suliejimo įrankis
Comment[ml]=ഫയലും അറകളും താരതമ്യം ചെയ്യാനും ലയിപ്പിക്കാനുമുള്ള ഒരു ആയുധം
Comment[nb]=Et verktøy for å sammelnlikne og flette filer og mapper
Comment[nds]=En Warktüüch för't Verglieken un Tosamenföhren vun Dateien un Ornern
......
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