Commit ecbeeca8 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 db3debeb
......@@ -29,7 +29,7 @@ GenericName[hne]=अभिलेखन औजार
GenericName[hr]=Alat za arhiviranje
GenericName[ia]=Instrumento per archivar
GenericName[id]=Perkakas Pengarsip
GenericName[id]=Alat Pengarsipan
GenericName[it]=Strumento di archiviazione
......@@ -173,6 +173,7 @@ Comment[fr]=Travailler avec des archives
Comment[gl]=Traballa con arquivos de ficheiros
Comment[he]=עבוד עם קבצי ארכיונים
Comment[ia]=Trvalia con le archivos de file
Comment[id]=Bekerja dengan arsip-arsip file
Comment[is]=Vinna með safnskrár
Comment[it]=Lavora con gli archivi di file
Comment[ko]=압축 파일로 작업하기
......@@ -25,7 +25,7 @@ Comment[hne]=करफुफल लाइब्रेरी बर अभिल
Comment[hr]=Priključak za upravljanje arhivnim formatima za biblioteku Kerfuffle
Comment[hu]=Archívumkezelő modul a Kerfuffle programkönyvtárhoz
Comment[ia]=Plugin per manear formatos de archivo per le libreria Kerfuffle
Comment[id]=Pengaya untuk menangani format arsip pustaka Kerfuffle
Comment[id]=Plugin untuk menangani format arsip untuk pustaka Kerfuffle
Comment[is]=Viðbót til meðhöndlunar á safnskráasniðum fyrir Kerfuffle aðgerðasafnið
Comment[it]=Estensione per gestire formati di archivio per la libreria Kerfuffle
Comment[ja]=Kerfuffle ライブラリのアーカイブ形式を扱うプラグイン
......@@ -102,7 +102,7 @@ Comment[hne]=अभिलेख संभाल औजार
Comment[hr]=Uslužni program za arhiviranje
Comment[ia]=Instrumento de manear archivo
Comment[id]=Perkakas Penanganan Arsip
Comment[id]=Alat Penanganan Arsip
Comment[is]=Vinna með safnskrár
Comment[it]=Gestione degli archivi
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