Commit 8511397e 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 e192ea45
......@@ -6,6 +6,7 @@ Name[en_GB]=Hotspot
Name[es]=Punto de acceso
Name[et]=Pääsupunkt
Name[eu]=Berogunea
Name[fi]=Tukiasema
Name[fr]=Point d'accès
Name[ia]=Hotspot
Name[id]=Hotspot
......@@ -28,6 +29,7 @@ Comment[en_GB]=Wi-Fi Hotspots
Comment[es]=Puntos de acceso Wi-Fi
Comment[et]=WiFi pääsupunktid
Comment[eu]=Wi-Fi berogunea
Comment[fi]=Langattomat tukiasemat
Comment[fr]=Points d'accès Wi-Fi
Comment[id]=Hotspot Wi-Fi
Comment[it]=Hotspot Wi-Fi
......
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