Commit 029b056e 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 3cd2d211
......@@ -216,6 +216,7 @@ Name[hne]=काम गलती
Name[hr]=Pogreška u procesu
Name[hsb]=Zmylk procesa
Name[hu]=A művelet során hiba történt
Name[ia]=Error de processo
Name[id]=Proses error
Name[is]=Villa í ferli
Name[it]=Errore del processo
......@@ -462,6 +463,7 @@ Name[fr]=Occupé
Name[gl]=Ocupado
Name[hr]=Zauzet
Name[hu]=Foglalt
Name[ia]=Occupate
Name[id]=Sibuk
Name[is]=Upptekið
Name[it]=Occupato
......
Supports Markdown
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