Commit d3c5596b 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 a9830b92
......@@ -36,7 +36,7 @@ Name[hr]=(4) Uređaji
Name[hsb]=(4) Graty
Name[hu]=(4) Eszközök
Name[ia]=(4) Dispositivos
Name[id]=(4) Peranti
Name[id]=(4) Perangkat
Name[is]=(4) Tæki
Name[it]=(4) Dispositivi
Name[ja]=(4) デバイス
......
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