Commit 1a1217bf 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 42fea0bf
......@@ -2,6 +2,7 @@
Name=Hotspot
Name[ca]=Punt d'accés
Name[cs]=Hotspot
Name[da]=Internetdeling
Name[de]=Hotspot
Name[en_GB]=Hotspot
Name[es]=Punto de acceso
......@@ -28,6 +29,7 @@ Name[zh_TW]=熱點
Comment=Wi-Fi Hotspots
Comment[ca]=Punts d'accés Wi-Fi
Comment[cs]=Hostpoty Wi-Fi
Comment[da]=Deling af wi-fi
Comment[de]=Wi-Fi-Hotspots
Comment[en_GB]=Wi-Fi Hotspots
Comment[es]=Puntos de acceso Wi-Fi
......
......@@ -4,7 +4,7 @@ Name[ast]=Wi-Fi
Name[ca]=Wi-Fi
Name[ca@valencia]=Wi-Fi
Name[cs]=Wi-Fi
Name[da]=Wi-Fi
Name[da]=Wi-fi
Name[de]=Wi-Fi
Name[en_GB]=Wi-Fi
Name[es]=Wi-Fi
......
......@@ -4,7 +4,7 @@ Name[ast]=Wi-Fi
Name[ca]=Wi-Fi
Name[ca@valencia]=Wi-Fi
Name[cs]=Wi-Fi
Name[da]=Wi-Fi
Name[da]=Wi-fi
Name[de]=Wi-Fi
Name[en_GB]=Wi-Fi
Name[es]=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