Commit cf7b0865 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 e7ccbd41
......@@ -36,7 +36,7 @@ Name[hr]=(5) Oblici datoteka
Name[hsb]=(5) Datajowe formaty
Name[hu]=(5) Fájlformátumok
Name[ia]=(5) Formatos de File
Name[id]=(5) Format Berkas
Name[id]=(5) Format Fail
Name[is]=(5) Skráasnið
Name[it]=(5) Formati di file
Name[ja]=(5) ファイルフォーマット
......
......@@ -19,7 +19,7 @@ Name[he]=מודולי הגדרות מנהל הקבצים
Name[hi]=फ़ाइलप्रबंध विन्यास घटक
Name[hu]=Fájlkezelő beállítási modulok
Name[ia]=Modulos de Preferentias de gerente de file
Name[id]=Modul Setelan Manajer Berkas
Name[id]=Modul Setelan Pengelola Fail
Name[is]=Stillingaeiningar skráastjóra
Name[it]=Moduli delle impostazioni del gestore dei file
Name[ko]=파일 관리자 설정 모듈
......
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