Merge remote-tracking branch 'cros/upstream' into 'cros/master'
BUG=none
TEST=xmllint --valid --noout serviceproviders.xml
TEST=run unit tests
diff --git a/README b/README
index ac041d3..94205c4 100644
--- a/README
+++ b/README
@@ -23,8 +23,7 @@
The database is released under Creative Commons Public Domain (CC-PD).
for more info, see:
-http://live.gnome.org/NetworkManager/MobileBroadband/ServiceProviders
-
+https://wiki.gnome.org/Projects/NetworkManager/MobileBroadband/ServiceProviders
If you are using pkg-config, variable MOBILE_BROADBAND_PROVIDER_INFO contains
the full path to the database.
diff --git a/serviceproviders.xml b/serviceproviders.xml
index 1a54a34..579eb22 100644
--- a/serviceproviders.xml
+++ b/serviceproviders.xml
@@ -206,23 +206,20 @@
<name>Personal</name>
<gsm>
<network-id mcc="722" mnc="341"/>
+ <network-id mcc="722" mnc="34"/>
<apn value="gprs.personal.com">
<plan type="postpaid"/>
<usage type="internet"/>
+ <name>GPRS</name>
<username>gprs</username>
<password>adgj</password>
<dns>172.25.7.6</dns>
<dns>172.25.7.7</dns>
</apn>
- </gsm>
- </provider>
- <provider>
- <name>Personal</name>
- <gsm>
- <network-id mcc="722" mnc="34"/>
<apn value="datos.personal.com">
<plan type="postpaid"/>
<usage type="internet"/>
+ <name>DATOS</name>
<username>datos</username>
<password>datos</password>
</apn>
@@ -272,9 +269,17 @@
<apn value="internet.gprs.unifon.com.ar">
<plan type="postpaid"/>
<usage type="internet"/>
+ <name>WAP</name>
<username>wap</username>
<password>wap</password>
</apn>
+ <apn value="internet.gprs.unifon.com.ar">
+ <plan type="postpaid"/>
+ <usage type="internet"/>
+ <name>Internet</name>
+ <username>Internet</username>
+ <password>Internet</password>
+ </apn>
</gsm>
</provider>
</country>
@@ -2263,6 +2268,9 @@
<name>Vodafone</name>
<gsm>
<network-id mcc="230" mnc="03"/>
+ <balance-check>
+ <ussd>*22#</ussd>
+ </balance-check>
<apn value="internet">
<plan type="postpaid"/>
<usage type="internet"/>
@@ -2287,6 +2295,11 @@
<dns>160.218.10.200</dns>
<dns>160.218.43.200</dns>
</apn>
+ <apn value="internet">
+ <plan type="prepaid"/>
+ <usage type="internet"/>
+ <name>Prepaid</name>
+ </apn>
</gsm>
</provider>
<provider>
@@ -4307,6 +4320,19 @@
</provider>
</country>
+<!-- Greenland -->
+<country code="gl">
+ <!-- http://www.tele.gl/da-DK/Privat/Info/Selvbetjening/Mobilopsaetning/Sider/ManuelOpsaetning.aspx -->
+ <provider>
+ <name>Tele Greenland A/S</name>
+ <gsm>
+ <apn value="internet">
+ <usage type="internet"/>
+ </apn>
+ </gsm>
+ </provider>
+</country>
+
<!-- Greece -->
<country code="gr">
<provider>
@@ -6838,13 +6864,22 @@
</gsm>
</provider>
<provider>
- <name>Eventis</name>
+ <name>Unité</name>
<gsm>
- <network-id mcc="259" mnc="04"/>
- <apn value="internet.md">
+ <network-id mcc="259" mnc="05"/>
+ <apn value="internet.unite.md">
<plan type="postpaid"/>
<usage type="internet"/>
- <name>Internet</name>
+ <name>Internet cu abonament</name>
+ <username>gprs</username>
+ <password>gprs</password>
+ </apn>
+ <apn value="internet3g.unite.md">
+ <plan type="prepaid"/>
+ <usage type="internet"/>
+ <name>Internet fără abonament</name>
+ <username>gprs</username>
+ <password>gprs</password>
</apn>
</gsm>
</provider>
@@ -6856,6 +6891,8 @@
<plan type="postpaid"/>
<usage type="internet"/>
<name>Internet</name>
+ <username>gprs</username>
+ <password>gprs</password>
</apn>
</gsm>
</provider>
@@ -9816,6 +9853,12 @@
<name>Zain</name>
<gsm>
<network-id mcc="634" mnc="01"/>
+ <balance-check>
+ <ussd>*888#</ussd>
+ </balance-check>
+ <balance-top-up>
+ <ussd replacement="CODE">*888*CODE#</ussd>
+ </balance-top-up>
<apn value="internet">
<plan type="postpaid"/>
<usage type="internet"/>
