Commit 1b52b812 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 b03b3bf4
......@@ -524,6 +524,7 @@ Name[eu]=Konektagarritasun mugatua
Name[fr]=Connectivité limitée
Name[nl]=Beperkte connectiviteit
Name[pt]=Conectividade Limitada
Name[pt_BR]=Conexão limitada
Name[sk]=Obmedzené pripojenie
Name[sv]=Begränsad anslutning
Name[uk]=Обмежене з'єднання з мережею
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