Commit 293e1b35 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 7f0652aa
......@@ -8,6 +8,7 @@ Name[eu]=Sare-kudeaketa
Name[fr]=Gestion du réseau
Name[it]=Gestione della rete
Name[pt]=Gestão de Rede
Name[pt_BR]=Gerenciamento de redes
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