Commit c5bd2d66 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 899bf017
......@@ -12,6 +12,7 @@ Comment[nl]=In te bedden HTML-component
Comment[nn]=Innebyggbar HTML-komponent
Comment[pl]=Osadzalny składnik HTML
Comment[pt]=Componente incorporada de HTML
Comment[sk]=Vložiteľný HTML komponent
Comment[sl]=Vgradljiv sestavni del HTML
Comment[sv]=Inbäddningsbar HTML-komponent
Comment[uk]=Придатний до вбудовування компонент HTML
......@@ -30,6 +31,7 @@ Name[nl]=WebEngine
Name[pt]=Motor Web
Name[sl]=Spletni pogon
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