am b80d9a2e: [sample] change apns-full-conf.xml in the EU countries

* commit 'b80d9a2e3d39cb227e493110fdc9132b03d223d5':
  [sample] change apns-full-conf.xml in the EU countries
diff --git a/etc/apns-full-conf.xml b/etc/apns-full-conf.xml
index 4e8789d..71b46d7 100755
--- a/etc/apns-full-conf.xml
+++ b/etc/apns-full-conf.xml
@@ -578,6 +578,42 @@
       type="mms"
   />
 
+  <apn carrier="Virgin mobile"
+      mcc="208"
+      mnc="23"
+      apn="virgin-mobile.fr"
+      proxy="10.6.10.1"
+      port="8080"
+      type="default,supl"
+  />
+
+  <apn carrier="VM MMS"
+      mcc="208"
+      mnc="23"
+      apn="virgin-mobile.fr"
+      mmsc="http://mmc.omeatelecom.fr/servlets/mms"
+      mmsproxy="10.6.10.1"
+      mmsport="8080"
+      type="mms"
+  />
+
+  <apn carrier="NRJ WEB"
+      mcc="208"
+      mnc="26"
+      apn="fnetnrj"
+      type="default,supl"
+  />
+
+  <apn carrier="NRJ MMS"
+      mcc="208"
+      mnc="26"
+      apn="mmsnrj"
+      mmsc="http://mmsnrj"
+      mmsproxy="10.143.156.5"
+      mmsport="8080"
+      type="mms"
+  />
+
   <apn carrier="Internet movil"
       mcc="214"
       mnc="01"
@@ -1265,19 +1301,6 @@
       apn="live.vodafone.com"
       user="live"
       password="vodafone"
-      proxy="193.230.161.231"
-      port="8080"
-      type="default,supl"
-  />
-
-  <apn carrier="Vodafone live! PRE"
-      mcc="226"
-      mnc="01"
-      apn="live.pre.vodafone.com"
-      user="live"
-      password="vodafone"
-      proxy="193.230.161.231"
-      port="8080"
       type="default,supl"
   />
 
@@ -1293,45 +1316,55 @@
       type="mms"
   />
 
-  <apn carrier="Vodafone MMS PRE"
+  <apn carrier="Cosmote Connect Mobile"
       mcc="226"
-      mnc="01"
-      apn="mms.pre.vodafone.ro"
+      mnc="03"
+      apn="broadband"
+      type="default,supl"
+  />
+
+  <apn carrier="Cosmote MMS"
+      mcc="226"
+      mnc="03"
+      apn="mms"
       user="mms"
-      password="vodafone"
-      mmsc="http://multimedia/servlets/mms"
-      mmsproxy="193.230.161.231"
+      password="mms"
+      mmsc="http://mmsc1.mms.cosmote.ro:8002"
+      mmsproxy="10.252.1.62"
       mmsport="8080"
       type="mms"
   />
 
-  <apn carrier="Cosmote Internet"
+  <apn carrier="web'n'walk"
       mcc="226"
       mnc="03"
+      apn="wnw"
+      user="wnw"
+      password="wnw"
+      type="default,supl"
+  />
+
+  <apn carrier="MMS"
+      mcc="226"
+      mnc="05"
+      apn="mms"
+      mmsc="http://10.10.3.133:8002"
+      mmsproxy="10.10.3.130"
+      mmsport="8080"
+      type="mms"
+  />
+
+  <apn carrier="Digi.Mobil"
+      mcc="226"
+      mnc="05"
       apn="internet"
       type="default,supl"
   />
 
-  <apn carrier="Cosmote MMS"
+  <apn carrier="Cosmote Connect Mobile"
       mcc="226"
-      mnc="03"
-      apn="mms"
-      user="mms"
-      password="mms"
-      mmsc="http://mmsc1.mms.cosmote.ro:8002"
-      mmsproxy="10.252.1.62"
-      mmsport="8080"
-      type="mms"
-  />
-
-  <apn carrier="web'n'walk"
-      mcc="226"
-      mnc="03"
-      apn="wnw"
-      user="wnw"
-      password="wnw"
-      proxy="10.252.1.62"
-      port="8080"
+      mnc="06"
+      apn="broadband"
       type="default,supl"
   />
 
@@ -1353,8 +1386,6 @@
       apn="wnw"
       user="wnw"
       password="wnw"
-      proxy="10.252.1.62"
-      port="8080"
       type="default,supl"
   />
 
@@ -1362,21 +1393,14 @@
       mcc="226"
       mnc="10"
       apn="mms"
+      user="mms"
+      password="mms"
       mmsc="http://wap.mms.orange.ro:8002"
       mmsproxy="62.217.247.252"
-      mmsport="9201"
+      mmsport="8799"
       type="mms"
   />
 
-  <apn carrier="Orange WAP"
-      mcc="226"
-      mnc="10"
-      apn="wap"
-      proxy="62.217.247.252"
-      port="8799"
-      type="default"
-  />
-
   <apn carrier="Orange Internet"
       mcc="226"
       mnc="10"
@@ -10706,7 +10730,6 @@
       mcc="425"
       mnc="01"
       apn="uwap.orange.co.il"
-      port="8080"
       type="default,supl"
   />
 
@@ -10719,7 +10742,7 @@
       type="mms"
   />
 
-  <apn carrier="Internet 3G"
+  <apn carrier="DUN"
       mcc="425"
       mnc="01"
       apn="modem.orange.net.il"
@@ -10809,7 +10832,7 @@
   <apn carrier="Cellcom MMS"
       mcc="425"
       mnc="02"
-      apn="sphone"
+      apn="mms"
       mmsc="http://mms.cellcom.co.il"
       mmsproxy="vwapm2.ain.co.il"
       mmsport="8080"
@@ -10822,6 +10845,7 @@
       apn="mms.pelephone.net.il"
       user="pcl@3g"
       password="pcl"
+      authtype="3"
       mmsc="http://mmsu.pelephone.net.il"
       mmsproxy="10.170.252.104"
       mmsport="9093"
@@ -10834,6 +10858,7 @@
       apn="sphone.pelephone.net.il"
       user="pcl@3g"
       password="pcl"
+      authtype="2"
       type="default,supl"
   />
 
@@ -10882,13 +10907,72 @@
       type="mms"
   />
 
-  <apn carrier="Internet HOT mobile"
+  <apn carrier="Net HOT mobile"
       mcc="425"
       mnc="07"
       apn="net.hotm"
+      type="default,supl"
+  />
+
+  <apn carrier="MMS HOT mobile"
+      mcc="425"
+      mnc="07"
+      apn="mms.hotm"
       mmsc="http://mms.hotmobile.co.il"
+      mmsproxy="80.246.131.99"
+      mmsport="80"
+      type="mms"
+  />
+
+  <apn carrier="PC HOT mobile"
+      mcc="425"
+      mnc="07"
+      apn="pc.hotm"
+      type="default,supl"
+  />
+
+  <apn carrier="GolanTelecom Internet"
+      mcc="425"
+      mnc="08"
+      apn="internet.golantelecom.net.il"
+      type="default,supl"
+  />
+
+  <apn carrier="GolanTelecom MMS"
+      mcc="425"
+      mnc="08"
+      apn="mms.golantelecom.net.il"
+      mmsc="http://mmsc.golantelecom.co.il"
+      mmsproxy="10.224.228.81"
+      mmsport="80"
+      type="mms"
+  />
+
+  <apn carrier="Alon Internet"
+      mcc="425"
+      mnc="14"
+      apn="data.youphone.co.il"
+      mmsc="http://192.168.220.15/servlets/mms"
       type="default,supl,mms"
   />
+
+  <apn carrier="Rami Levi 3G"
+      mcc="425"
+      mnc="16"
+      apn="internet.rl"
+      type="default,supl"
+  />
+
+  <apn carrier="Rami Levi Multimedia"
+      mcc="425"
+      mnc="16"
+      apn="mms.pelephone.net.il"
+      mmsc="http://mmsu.pelephone.net.il"
+      mmsproxy="10.170.252.104"
+      mmsport="9093"
+      type="mms"
+  />
+
   <apn carrier="Internet"
       mcc="426"
       mnc="01"
@@ -12792,83 +12876,109 @@
       type="mms"
   />
 
-  <apn carrier="Zain Mobile Internet"
+  <apn carrier="Airtel Internet"
       mcc="621"
       mnc="20"
-      apn="internet.ng.Zain.com"
+      apn="internet.ng.zain.com"
+      user="internet"
+      password="internet"
+      authtype="1"
+      port="8080"
       type="default,supl"
   />
 
-  <apn carrier="Zain MMS"
+  <apn carrier="Airtel MMS"
       mcc="621"
       mnc="20"
       apn="mms.ng.zain.com"
       user="mms"
       password="mms"
-      mmsc="http://172.23.1.12/mms/wapenc"
+      authtype="1"
+      mmsc="http://10.210.3.239:9800/mm1"
       mmsproxy="172.18.254.5"
-      mmsport="8080"
       type="mms"
   />
 
-  <apn carrier="MTN GPRS"
+  <apn carrier="Airtel WAP"
+      mcc="621"
+      mnc="20"
+      apn="wap.ng.zain.com"
+      user="wap"
+      password="wap"
+      authtype="1"
+      proxy="172.18.254.5"
+      port="8080"
+      type="default,supl"
+  />
+
+  <apn carrier="MTN WAP"
       mcc="621"
       mnc="30"
       apn="web.gprs.mtnnigeria.net"
       user="web"
       password="web"
+      authtype="1"
       proxy="10.199.212.2"
       port="8080"
       type="default,supl"
   />
 
+  <apn carrier="MTN ACESS"
+      mcc="621"
+      mnc="30"
+      apn="web.gprs.mtnnigeria.net"
+      user="web"
+      password="web"
+      authtype="1"
+      type="default,supl"
+  />
+
   <apn carrier="MTN MMS"
       mcc="621"
       mnc="30"
       apn="web.gprs.mtnnigeria.net"
-      user="web"
-      password="web"
       mmsc="http://10.199.212.8/servlets/mms"
       mmsproxy="10.199.212.2"
-      mmsport="8080"
       type="mms"
   />
 
-  <apn carrier="glo direct"
+  <apn carrier="Glo Direct"
       mcc="621"
       mnc="50"
       apn="glosecure"
       user="gprs"
       password="gprs"
+      authtype="1"
       type="default,supl"
   />
 
-  <apn carrier="glo mms"
+  <apn carrier="Glo MMS"
       mcc="621"
       mnc="50"
       apn="glomms"
       user="mms"
       password="mms"
+      authtype="1"
       mmsc="http://mms.gloworld.com/mmsc"
       mmsproxy="10.100.82.4"
-      mmsport="9201"
+      mmsport="8080"
       type="mms"
   />
 
-  <apn carrier="Etisalat Internet"
+  <apn carrier="etisalat WAP"
       mcc="621"
       mnc="60"
       apn="etisalat"
+      proxy="10.71.170.5"
+      port="8080"
       type="default,supl"
   />
 
-  <apn carrier="Etisalat MMS"
+<apn carrier="etisalat MMS"
       mcc="621"
       mnc="60"
       apn="etisalat"
       mmsc="http://10.71.170.30:38090/was"
-      mmsproxy="10.71.170.5"
-      mmsport="8080"
       type="mms"
   />
 
@@ -12995,6 +13105,13 @@
       type="mms"
   />
 
+  <apn carrier="Full Internet SRR"
+      mcc="647"
+      mnc="10"
+      apn="sl2sfr"
+      type="default,supl"
+  />
+
   <apn carrier="MMS"
       mcc="647"
       mnc="10"
@@ -14913,13 +15030,6 @@
       type="default"
   />
 
-  <apn carrier="Full Internet SRR"
-      mcc="647"
-      mnc="10"
-      apn="sl2sfr"
-      type="default,supl"
-  />
-
   <apn carrier="OnlyWap"
       mcc="647"
       mnc="02"