Commit 14037450 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 ec11afe3
......@@ -25,7 +25,7 @@ Name[gl]=Buscar e substituír
Name[he]=חיפוש והחלפה
Name[hu]=Keresés és csere
Name[ia]=Cerca & Reimplacia
Name[id]=Cari & Gantikan
Name[id]=Cari & Ganti
Name[it]=Cerca e sostituisci
Name[kk]=Іздеу & Ауыстыру
Name[km]=ស្វែងរក និង​ជំនួស
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