Commit bbd178e3 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 f8645d86
......@@ -19,7 +19,7 @@ Name[he]=מודולי הגדרות דפדפן
Name[hi]=ब्राउज़र विन्यास घटक
Name[hu]=Böngésző beállítási modulok
Name[ia]=Modulos pro navigar inter preferentias
Name[id]=Modul Setelan Peramban
Name[id]=Modul Setelan Penelusur
Name[is]=Stillingaeiningar vafra
Name[it]=Moduli delle impostazioni del browser
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