Commit c539786a 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 d5c06dfd
......@@ -520,6 +520,7 @@ Name=Limited Connectivity
Name[ca]=Connectivitat limitada
Name[en_GB]=Limited Connectivity
Name[es]=Conectividad limitada
Name[et]=Piiratud ühenduvus
Name[eu]=Konektagarritasun mugatua
Name[fr]=Connectivité limitée
Name[it]=Connettività limitata
......
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