Move mcc_mapping file to common side.

pmo-trunk-r8698

diff --git a/src/Makefile.am b/src/Makefile.am
index 069ec24..775fa65 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -213,7 +213,14 @@ modest_LDFLAGS = -export-dynamic -Wl,--version-script=export.map
 # modest_UNWANTED = -export-dynamic -Wl,--export-dynamic
 
 
 # modest_UNWANTED = -export-dynamic -Wl,--export-dynamic
 
 

-EXTRA_DIST=modest-marshal.list
+# mcc_mapping may be provided by the operator-wizard-settings package:
+# the one here is a copy, as that package is not available in chinook
+MMC_MAPPING_FILE=mcc_mapping
+mmccmappingdir=$(datadir)/modest/provider-data
+mmccmapping_DATA = $(MMC_MAPPING_FILE)
+
+EXTRA_DIST=modest-marshal.list \
+       $(MMC_MAPPING_FILE)

 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = modest-plugin-1.0.pc
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = modest-plugin-1.0.pc

diff --git a/src/hildon2/Makefile.am b/src/hildon2/Makefile.am
index 360273a..526e158 100644 (file)
--- a/src/hildon2/Makefile.am
+++ b/src/hildon2/Makefile.am
@@ -134,12 +134,6 @@ desktopentry_DATA   = modest.desktop
 backupsettings_DATA = modest.conf
 ossocudscripts_SCRIPTS = modest-clean.sh
 
 backupsettings_DATA = modest.conf
 ossocudscripts_SCRIPTS = modest-clean.sh
 

-# mcc_mapping may be provided by the operator-wizard-settings package:
-# the one here is a copy, as that package is not available in chinook
-MMC_MAPPING_FILE=mcc_mapping
-mmccmappingdir=$(datadir)/modest/provider-data
-mmccmapping_DATA = $(MMC_MAPPING_FILE)
-

 PROVIDER_DATA_FILE=maemo-provider-data.keyfile
 providerdatadir=$(datadir)/modest/provider-data
 providerdata_DATA = $(PROVIDER_DATA_FILE)
 PROVIDER_DATA_FILE=maemo-provider-data.keyfile
 providerdatadir=$(datadir)/modest/provider-data
 providerdata_DATA = $(PROVIDER_DATA_FILE)

@@ -151,5 +145,4 @@ EXTRA_DIST=\
        $(desktopentry_DATA) \
        $(backupsettings_DATA) \
        $(ossocudscripts_SCRIPTS) \
        $(desktopentry_DATA) \
        $(backupsettings_DATA) \
        $(ossocudscripts_SCRIPTS) \

-       $(MMC_MAPPING_FILE)    \

        $(PROVIDER_DATA_FILE)
        $(PROVIDER_DATA_FILE)

diff --git a/src/hildon2/mcc_mapping b/src/hildon2/mcc_mapping
deleted file mode 100644 (file)
index 3ecfa82..0000000
--- a/src/hildon2/mcc_mapping
+++ /dev/null
@@ -1,230 +0,0 @@
-412    qtn_clk_country_afghanistan\r
-276    qtn_clk_country_albania\r
-603    qtn_clk_country_algeria\r
-544    qtn_clk_country_american_samoa\r
-213    qtn_clk_country_andorra\r
-631    qtn_clk_country_angola\r
-365    qtn_clk_country_anguilla\r
-344    qtn_clk_country_antigua_and_barbuda\r
-722    qtn_clk_country_argentina\r
-283    qtn_clk_country_armenia\r
-363    qtn_clk_country_aruba\r
-505    qtn_clk_country_australia\r
-232    qtn_clk_country_austria\r
-400    qtn_clk_country_azerbaijani_republic\r
-364    qtn_clk_country_bahamas\r
-426    qtn_clk_country_bahrain\r
-470    qtn_clk_country_bangladesh\r
-342    qtn_clk_country_barbados\r
-257    qtn_clk_country_belarus\r
-206    qtn_clk_country_belgium\r
-702    qtn_clk_country_belize\r
-616    qtn_clk_country_benin\r
-350    qtn_clk_country_bermuda\r
-402    qtn_clk_country_bhutan\r
-736    qtn_clk_country_bolivia\r
-218    qtn_clk_country_bosnia_and_herzegovina\r
-652    qtn_clk_country_botswana\r
-724    qtn_clk_country_brazil\r
-348    qtn_clk_country_british_virgin_islands\r
-528    qtn_clk_country_brunei_darussalam\r
-284    qtn_clk_country_bulgaria\r
-613    qtn_clk_country_burkina_faso\r
-642    qtn_clk_country_burundi\r
-456    qtn_clk_country_cambodia\r
-624    qtn_clk_country_cameroon\r
-302    qtn_clk_country_canada\r
-625    qtn_clk_country_cape_verde\r
-346    qtn_clk_country_cayman_islands\r
-623    qtn_clk_country_central_african_republic\r
-622    qtn_clk_country_chad\r
-730    qtn_clk_country_chile\r
-461    qtn_clk_country_china\r
-460    qtn_clk_country_china\r
-732    qtn_clk_country_colombia\r
-654    qtn_clk_country_comoros\r
-629    qtn_clk_country_republic_of_the_congo\r
-548    qtn_clk_country_cook_islands\r
-712    qtn_clk_country_costa_rica\r
-612    qtn_clk_country_cote_dlvoire\r
-219    qtn_clk_country_croatia\r
-368    qtn_clk_country_cuba\r
-280    qtn_clk_country_cyprus\r
-230    qtn_clk_country_czech_republic\r
-630    qtn_clk_country_democratic_republic_of_the_congo\r
-238    qtn_clk_country_denmark\r
-638    qtn_clk_country_djibouti\r
-366    qtn_clk_country_dominica\r
-370    qtn_clk_country_dominican_republic\r
-514    qtn_clk_country_east_timor\r
-740    qtn_clk_country_ecuador\r
-602    qtn_clk_country_egypt\r
-706    qtn_clk_country_el_salvador\r
-627    qtn_clk_country_equatorial_guinea\r
-657    qtn_clk_country_eritrea\r
-248    qtn_clk_country_estonia\r
-636    qtn_clk_country_ethiopia\r
-288    qtn_clk_country_faroe_islands\r
-542    qtn_clk_country_fiji\r
-244    qtn_clk_country_finland\r
-208    qtn_clk_country_france\r
-742    qtn_clk_country_french_guiana\r
-547    qtn_clk_country_french_polynesia\r
-628    qtn_clk_country_gobonese_republic\r
-607    qtn_clk_country_gambia\r
-282    qtn_clk_country_georgia\r
-262    qtn_clk_country_germany\r
-620    qtn_clk_country_ghana\r
-266    qtn_clk_country_gibraltar\r
-202    qtn_clk_country_greece\r
-290    qtn_clk_country_greenland\r
-352    qtn_clk_country_grenada\r
-340    qtn_clk_country_guadeloupe\r
-535    qtn_clk_country_guam\r
-704    qtn_clk_country_guatemala\r
-611    qtn_clk_country_guinea\r
-632    qtn_clk_country_guinea_bissaus\r
-738    qtn_clk_country_guyana\r
-372    qtn_clk_country_haiti\r
-708    qtn_clk_country_honduras\r
-454    qtn_clk_country_hong_kong\r
-216    qtn_clk_country_hungary\r
-274    qtn_clk_country_iceland\r
-404    qtn_clk_country_india\r
-510    qtn_clk_country_indonesia\r
-432    qtn_clk_country_iran\r
-418    qtn_clk_country_iraq\r
-272    qtn_clk_country_republic_of_ireland\r
-425    qtn_clk_country_israel\r
-222    qtn_clk_country_italy\r
-338    qtn_clk_country_jamaica\r
-441    qtn_clk_country_japan\r
-440    qtn_clk_country_japan\r
-416    qtn_clk_country_jordan\r
-401    qtn_clk_country_kazakhstan\r
-639    qtn_clk_country_kenya\r
-545    qtn_clk_country_kiribati\r
-467    qtn_clk_country_korea_north\r
-450    qtn_clk_country_country_south_korea\r
-419    qtn_clk_country_kuwait\r
-437    qtn_clk_country_kyrgyz_republic\r
-457    qtn_clk_country_laos\r
-247    qtn_clk_country_latvia\r
-415    qtn_clk_country_lebanon\r
-651    qtn_clk_country_lesotho\r
-618    qtn_clk_country_liberia\r
-606    qtn_clk_country_libya\r
-295    qtn_clk_country_liechtenstein\r
-246    qtn_clk_country_lithuania\r
-270    qtn_clk_country_luxembourg\r
-455    qtn_clk_country_macao\r
-294    qtn_clk_country_the_former_yugoslav_republic_of_macedonia\r
-646    qtn_clk_country_madagascar\r
-650    qtn_clk_country_malawi\r
-502    qtn_clk_country_malaysia\r
-472    qtn_clk_country_maldives\r
-610    qtn_clk_country_mali\r
-278    qtn_clk_country_malta\r
-551    qtn_clk_country_marshall_islands\r
-340    qtn_clk_country_martinique\r
-609    qtn_clk_country_mauritania\r
-617    qtn_clk_country_mauritius\r
-334    qtn_clk_country_mexico\r
-550    qtn_clk_country_micronesia\r
-259    qtn_clk_country_republic_of_moldova\r
-212    qtn_clk_country_monaco\r
-428    qtn_clk_country_mongolia\r
-354    qtn_clk_country_montserrat\r
-604    qtn_clk_country_morocco\r
-643    qtn_clk_country_mozambique\r
-414    qtn_clk_country_myanmar\r
-649    qtn_clk_country_namibia\r
-536    qtn_clk_country_nauru\r
-429    qtn_clk_country_nepal\r
-204    qtn_clk_country_netherlands\r
-362    qtn_clk_country_netherlands_antilles\r
-546    qtn_clk_country_new_caledonia\r
-530    qtn_clk_country_new_zealand\r
-710    qtn_clk_country_nicaraqua\r
-614    qtn_clk_country_niger\r
-621    qtn_clk_country_nigeria\r
-534    qtn_clk_country_northern_mariana_islands\r
-242    qtn_clk_country_norway\r
-422    qtn_clk_country_oman\r
-410    qtn_clk_country_pakistan\r
-552    qtn_clk_country_palau\r
-714    qtn_clk_country_panama\r
-537    qtn_clk_country_papua_new_guinea\r
-744    qtn_clk_country_paraquay\r
-716    qtn_clk_country_peru\r
-515    qtn_clk_country_philippines\r
-260    qtn_clk_country_poland\r
-268    qtn_clk_country_portugal\r
-330    qtn_clk_country_puerto_rico\r
-427    qtn_clk_country_qatar\r
-647    qtn_clk_country_reunion\r
-226    qtn_clk_country_romania\r
-250    qtn_clk_country_russian_federation\r
-635    qtn_clk_country_rwandese_republic\r
-356    qtn_clk_country_saint_kitts_and_nevis\r
-358    qtn_clk_country_saint_lucia\r
-308    qtn_clk_country_saint_pierre_and_miquelon\r
-360    qtn_clk_country_saint_vincent_and_grenadines\r
-549    qtn_clk_country_samoa\r
-292    qtn_clk_country_san_marino\r
-626    qtn_clk_country_sao_tome_and_principe\r
-420    qtn_clk_country_saudi_arabia\r
-608    qtn_clk_country_senegal\r
-220    qtn_clk_country_serbia_and_montenegro\r
-633    qtn_clk_country_seychelles\r
-619    qtn_clk_country_sierra_leone\r
-525    qtn_clk_country_singapore\r
-231    qtn_clk_country_slovakia\r
-293    qtn_clk_country_slovenia\r
-540    qtn_clk_country_solomon_islands\r
-637    qtn_clk_country_somalia\r
-655    qtn_clk_country_south_africa\r
-214    qtn_clk_country_spain\r
-413    qtn_clk_country_sri_lanka\r
-634    qtn_clk_country_sudan\r
-746    qtn_clk_country_suriname\r
-653    qtn_clk_country_swaziland\r
-240    qtn_clk_country_sweden\r
-228    qtn_clk_country_switzerland\r
-417    qtn_clk_country_syrian_arab_republic\r
-466    qtn_clk_country_taiwan\r
-436    qtn_clk_country_tajikistan\r
-640    qtn_clk_country_united_republic_of_tanzania\r
-520    qtn_clk_country_thailand\r
-615    qtn_clk_country_togolese_republic\r
-539    qtn_clk_country_tonga\r
-374    qtn_clk_country_trinidad_and_tobago\r
-605    qtn_clk_country_tunisia\r
-286    qtn_clk_country_turkey\r
-438    qtn_clk_country_turkmenistan\r
-376    qtn_clk_country_turks_and_caicos_islands\r
-641    qtn_clk_country_uganda\r
-255    qtn_clk_country_ukraine\r
-424    qtn_clk_country_united_arab_emirates\r
-430    qtn_clk_country_united_arab_emirates_abu_dhabi\r
-431    qtn_clk_country_united_arab_emirates_dubai\r
-235    qtn_clk_country_united_kingdom_of_great_britain_and_northern_ireland\r
-234    qtn_clk_country_united_kingdom_of_great_britain_and_northern_ireland\r
-310    qtn_clk_country_united_states_of_america\r
-316    qtn_clk_country_united_states_of_america\r
-311    qtn_clk_country_united_states_of_america\r
-312    qtn_clk_country_united_states_of_america\r
-313    qtn_clk_country_united_states_of_america\r
-314    qtn_clk_country_united_states_of_america\r
-315    qtn_clk_country_united_states_of_america\r
-332    qtn_clk_country_unites_states_virgin_islands\r
-748    qtn_clk_country_uruguay\r
-434    qtn_clk_country_uzbekistan\r
-541    qtn_clk_country_vanuatu\r
-225    qtn_clk_country_the_vatican\r
-734    qtn_clk_country_venezuela\r
-452    qtn_clk_country_viet_nam\r
-543    qtn_clk_country_wallis_and_futuna\r
-421    qtn_clk_country_yemen\r
-645    qtn_clk_country_zambia\r
-648    qtn_clk_country_zimbabwe\r

diff --git a/src/hildon2/mcc_mapping.en_GB b/src/hildon2/mcc_mapping.en_GB
deleted file mode 100644 (file)
index 491e504..0000000
--- a/src/hildon2/mcc_mapping.en_GB
+++ /dev/null
@@ -1,107 +0,0 @@
-276    Albania\r
-213    Andorra\r
-722    Argentina\r
-363    Aruba\r
-505    Australia\r
-232    Austria\r
-400    Azerbaijan\r
-426    Bahrain\r
-470    Bangladesh\r
-257    Belarus\r
-206    Belgium\r
-736    Bolivia\r
-218    Bosnia and Herzegovina\r
-652    Botswana\r
-724    Brazil\r
-528    Brunei Darussalam\r
-284    Bulgaria\r
-456    Cambodia\r
-302    Canada\r
-730    Chile\r
-460    China\r
-732    Colombia\r
-219    Croatia\r
-280    Cyprus\r
-230    Czech Republic\r
-238    Denmark\r
-370    Dominican Republic\r
-740    Ecuador\r
-602    Egypt\r
-706    El Salvador\r
-248    Estonia\r
-244    Finland\r
-208    France\r
-282    Georgia\r
-262    Germany\r
-620    Ghana\r
-266    Gibraltar\r
-202    Greece\r
-340    Guadeloupe\r
-704    Guatemala\r
-708    Honduras\r
-454    Hong Kong, China\r
-216    Hungary\r
-274    Iceland\r
-404    India\r
-510    Indonesia\r
-272    Ireland\r
-425    Israel\r
-222    Italy\r
-338    Jamaica\r
-440    Japan\r
-416    Jordan\r
-401    Kazakhstan\r
-639    Kenya\r
-419    Kuwait\r
-247    Latvia\r
-415    Lebanon\r
-295    Liechtenstein\r
-246    Lithuania\r
-270    Luxembourg\r
-455    Macao, China\r
-294    Macedonia\r
-502    Malaysia\r
-472    Maldives\r
-278    Malta\r
-340    Martinique\r
-334    Mexico\r
-259    Moldova\r
-212    Monaco\r
-428    Mongolia\r
-220    Montenegro\r
-604    Morocco\r
-204    Netherlands\r
-530    New Zealand\r
-621    Nigeria\r
-242    Norway\r
-422    Oman\r
-410    Pakistan\r
-714    Panama\r
-744    Paraguay\r
-716    Peru\r
-515    Philippines\r
-260    Poland\r
-268    Portugal\r
-427    Qatar\r
-226    Romania\r
-250    Russian Federation\r
-420    Saudi Arabia\r
-220    Serbia\r
-525    Singapore\r
-231    Slovakia\r
-293    Slovenia\r
-655    South Africa\r
-214    Spain\r
-413    Sri Lanka\r
-240    Sweden\r
-228    Switzerland\r
-417    Syria\r
-466    Taiwan\r
-520    Thailand\r
-374    Trinidad and Tobago\r
-286    Turkey\r
-255    Ukraine\r
-234    United Kingdom\r
-748    Uruguay\r
-310    USA\r
-734    Venezuela\r

diff --git a/src/maemo/easysetup/Makefile.am b/src/maemo/easysetup/Makefile.am
index 41da587..be47377 100644 (file)
--- a/src/maemo/easysetup/Makefile.am
+++ b/src/maemo/easysetup/Makefile.am
@@ -60,16 +60,9 @@ LDADD = \
        $(MODEST_GSTUFF_LIBS) \
        $(MODEST_PLATFORM_LIBS)
 
        $(MODEST_GSTUFF_LIBS) \
        $(MODEST_PLATFORM_LIBS)
 

-# mcc_mapping may be provided by the operator-wizard-settings package:
-# the one here is a copy, as that package is not available in chinook
-MMC_MAPPING_FILE=mcc_mapping
-mmccmappingdir=$(datadir)/modest/provider-data
-mmccmapping_DATA = $(MMC_MAPPING_FILE)
-

 PROVIDER_DATA_FILE=maemo-provider-data.keyfile
 providerdatadir=$(datadir)/modest/provider-data
 providerdata_DATA = $(PROVIDER_DATA_FILE)
 
 EXTRA_DIST=\
 PROVIDER_DATA_FILE=maemo-provider-data.keyfile
 providerdatadir=$(datadir)/modest/provider-data
 providerdata_DATA = $(PROVIDER_DATA_FILE)
 
 EXTRA_DIST=\

-       $(MMC_MAPPING_FILE)    \

        $(PROVIDER_DATA_FILE)
        $(PROVIDER_DATA_FILE)

diff --git a/src/mcc_mapping b/src/mcc_mapping
new file mode 100644 (file)
index 0000000..3ecfa82
--- /dev/null
+++ b/src/mcc_mapping
@@ -0,0 +1,230 @@
+412    qtn_clk_country_afghanistan\r
+276    qtn_clk_country_albania\r
+603    qtn_clk_country_algeria\r
+544    qtn_clk_country_american_samoa\r
+213    qtn_clk_country_andorra\r
+631    qtn_clk_country_angola\r
+365    qtn_clk_country_anguilla\r
+344    qtn_clk_country_antigua_and_barbuda\r
+722    qtn_clk_country_argentina\r
+283    qtn_clk_country_armenia\r
+363    qtn_clk_country_aruba\r
+505    qtn_clk_country_australia\r
+232    qtn_clk_country_austria\r
+400    qtn_clk_country_azerbaijani_republic\r
+364    qtn_clk_country_bahamas\r
+426    qtn_clk_country_bahrain\r
+470    qtn_clk_country_bangladesh\r
+342    qtn_clk_country_barbados\r
+257    qtn_clk_country_belarus\r
+206    qtn_clk_country_belgium\r
+702    qtn_clk_country_belize\r
+616    qtn_clk_country_benin\r
+350    qtn_clk_country_bermuda\r
+402    qtn_clk_country_bhutan\r
+736    qtn_clk_country_bolivia\r
+218    qtn_clk_country_bosnia_and_herzegovina\r
+652    qtn_clk_country_botswana\r
+724    qtn_clk_country_brazil\r
+348    qtn_clk_country_british_virgin_islands\r
+528    qtn_clk_country_brunei_darussalam\r
+284    qtn_clk_country_bulgaria\r
+613    qtn_clk_country_burkina_faso\r
+642    qtn_clk_country_burundi\r
+456    qtn_clk_country_cambodia\r
+624    qtn_clk_country_cameroon\r
+302    qtn_clk_country_canada\r
+625    qtn_clk_country_cape_verde\r
+346    qtn_clk_country_cayman_islands\r
+623    qtn_clk_country_central_african_republic\r
+622    qtn_clk_country_chad\r
+730    qtn_clk_country_chile\r
+461    qtn_clk_country_china\r
+460    qtn_clk_country_china\r
+732    qtn_clk_country_colombia\r
+654    qtn_clk_country_comoros\r
+629    qtn_clk_country_republic_of_the_congo\r
+548    qtn_clk_country_cook_islands\r
+712    qtn_clk_country_costa_rica\r
+612    qtn_clk_country_cote_dlvoire\r
+219    qtn_clk_country_croatia\r
+368    qtn_clk_country_cuba\r
+280    qtn_clk_country_cyprus\r
+230    qtn_clk_country_czech_republic\r
+630    qtn_clk_country_democratic_republic_of_the_congo\r
+238    qtn_clk_country_denmark\r
+638    qtn_clk_country_djibouti\r
+366    qtn_clk_country_dominica\r
+370    qtn_clk_country_dominican_republic\r
+514    qtn_clk_country_east_timor\r
+740    qtn_clk_country_ecuador\r
+602    qtn_clk_country_egypt\r
+706    qtn_clk_country_el_salvador\r
+627    qtn_clk_country_equatorial_guinea\r
+657    qtn_clk_country_eritrea\r
+248    qtn_clk_country_estonia\r
+636    qtn_clk_country_ethiopia\r
+288    qtn_clk_country_faroe_islands\r
+542    qtn_clk_country_fiji\r
+244    qtn_clk_country_finland\r
+208    qtn_clk_country_france\r
+742    qtn_clk_country_french_guiana\r
+547    qtn_clk_country_french_polynesia\r
+628    qtn_clk_country_gobonese_republic\r
+607    qtn_clk_country_gambia\r
+282    qtn_clk_country_georgia\r
+262    qtn_clk_country_germany\r
+620    qtn_clk_country_ghana\r
+266    qtn_clk_country_gibraltar\r
+202    qtn_clk_country_greece\r
+290    qtn_clk_country_greenland\r
+352    qtn_clk_country_grenada\r
+340    qtn_clk_country_guadeloupe\r
+535    qtn_clk_country_guam\r
+704    qtn_clk_country_guatemala\r
+611    qtn_clk_country_guinea\r
+632    qtn_clk_country_guinea_bissaus\r
+738    qtn_clk_country_guyana\r
+372    qtn_clk_country_haiti\r
+708    qtn_clk_country_honduras\r
+454    qtn_clk_country_hong_kong\r
+216    qtn_clk_country_hungary\r
+274    qtn_clk_country_iceland\r
+404    qtn_clk_country_india\r
+510    qtn_clk_country_indonesia\r
+432    qtn_clk_country_iran\r
+418    qtn_clk_country_iraq\r
+272    qtn_clk_country_republic_of_ireland\r
+425    qtn_clk_country_israel\r
+222    qtn_clk_country_italy\r
+338    qtn_clk_country_jamaica\r
+441    qtn_clk_country_japan\r
+440    qtn_clk_country_japan\r
+416    qtn_clk_country_jordan\r
+401    qtn_clk_country_kazakhstan\r
+639    qtn_clk_country_kenya\r
+545    qtn_clk_country_kiribati\r
+467    qtn_clk_country_korea_north\r
+450    qtn_clk_country_country_south_korea\r
+419    qtn_clk_country_kuwait\r
+437    qtn_clk_country_kyrgyz_republic\r
+457    qtn_clk_country_laos\r
+247    qtn_clk_country_latvia\r
+415    qtn_clk_country_lebanon\r
+651    qtn_clk_country_lesotho\r
+618    qtn_clk_country_liberia\r
+606    qtn_clk_country_libya\r
+295    qtn_clk_country_liechtenstein\r
+246    qtn_clk_country_lithuania\r
+270    qtn_clk_country_luxembourg\r
+455    qtn_clk_country_macao\r
+294    qtn_clk_country_the_former_yugoslav_republic_of_macedonia\r
+646    qtn_clk_country_madagascar\r
+650    qtn_clk_country_malawi\r
+502    qtn_clk_country_malaysia\r
+472    qtn_clk_country_maldives\r
+610    qtn_clk_country_mali\r
+278    qtn_clk_country_malta\r
+551    qtn_clk_country_marshall_islands\r
+340    qtn_clk_country_martinique\r
+609    qtn_clk_country_mauritania\r
+617    qtn_clk_country_mauritius\r
+334    qtn_clk_country_mexico\r
+550    qtn_clk_country_micronesia\r
+259    qtn_clk_country_republic_of_moldova\r
+212    qtn_clk_country_monaco\r
+428    qtn_clk_country_mongolia\r
+354    qtn_clk_country_montserrat\r
+604    qtn_clk_country_morocco\r
+643    qtn_clk_country_mozambique\r
+414    qtn_clk_country_myanmar\r
+649    qtn_clk_country_namibia\r
+536    qtn_clk_country_nauru\r
+429    qtn_clk_country_nepal\r
+204    qtn_clk_country_netherlands\r
+362    qtn_clk_country_netherlands_antilles\r
+546    qtn_clk_country_new_caledonia\r
+530    qtn_clk_country_new_zealand\r
+710    qtn_clk_country_nicaraqua\r
+614    qtn_clk_country_niger\r
+621    qtn_clk_country_nigeria\r
+534    qtn_clk_country_northern_mariana_islands\r
+242    qtn_clk_country_norway\r
+422    qtn_clk_country_oman\r
+410    qtn_clk_country_pakistan\r
+552    qtn_clk_country_palau\r
+714    qtn_clk_country_panama\r
+537    qtn_clk_country_papua_new_guinea\r
+744    qtn_clk_country_paraquay\r
+716    qtn_clk_country_peru\r
+515    qtn_clk_country_philippines\r
+260    qtn_clk_country_poland\r
+268    qtn_clk_country_portugal\r
+330    qtn_clk_country_puerto_rico\r
+427    qtn_clk_country_qatar\r
+647    qtn_clk_country_reunion\r
+226    qtn_clk_country_romania\r
+250    qtn_clk_country_russian_federation\r
+635    qtn_clk_country_rwandese_republic\r
+356    qtn_clk_country_saint_kitts_and_nevis\r
+358    qtn_clk_country_saint_lucia\r
+308    qtn_clk_country_saint_pierre_and_miquelon\r
+360    qtn_clk_country_saint_vincent_and_grenadines\r
+549    qtn_clk_country_samoa\r
+292    qtn_clk_country_san_marino\r
+626    qtn_clk_country_sao_tome_and_principe\r
+420    qtn_clk_country_saudi_arabia\r
+608    qtn_clk_country_senegal\r
+220    qtn_clk_country_serbia_and_montenegro\r
+633    qtn_clk_country_seychelles\r
+619    qtn_clk_country_sierra_leone\r
+525    qtn_clk_country_singapore\r
+231    qtn_clk_country_slovakia\r
+293    qtn_clk_country_slovenia\r
+540    qtn_clk_country_solomon_islands\r
+637    qtn_clk_country_somalia\r
+655    qtn_clk_country_south_africa\r
+214    qtn_clk_country_spain\r
+413    qtn_clk_country_sri_lanka\r
+634    qtn_clk_country_sudan\r
+746    qtn_clk_country_suriname\r
+653    qtn_clk_country_swaziland\r
+240    qtn_clk_country_sweden\r
+228    qtn_clk_country_switzerland\r
+417    qtn_clk_country_syrian_arab_republic\r
+466    qtn_clk_country_taiwan\r
+436    qtn_clk_country_tajikistan\r
+640    qtn_clk_country_united_republic_of_tanzania\r
+520    qtn_clk_country_thailand\r
+615    qtn_clk_country_togolese_republic\r
+539    qtn_clk_country_tonga\r
+374    qtn_clk_country_trinidad_and_tobago\r
+605    qtn_clk_country_tunisia\r
+286    qtn_clk_country_turkey\r
+438    qtn_clk_country_turkmenistan\r
+376    qtn_clk_country_turks_and_caicos_islands\r
+641    qtn_clk_country_uganda\r
+255    qtn_clk_country_ukraine\r
+424    qtn_clk_country_united_arab_emirates\r
+430    qtn_clk_country_united_arab_emirates_abu_dhabi\r
+431    qtn_clk_country_united_arab_emirates_dubai\r
+235    qtn_clk_country_united_kingdom_of_great_britain_and_northern_ireland\r
+234    qtn_clk_country_united_kingdom_of_great_britain_and_northern_ireland\r
+310    qtn_clk_country_united_states_of_america\r
+316    qtn_clk_country_united_states_of_america\r
+311    qtn_clk_country_united_states_of_america\r
+312    qtn_clk_country_united_states_of_america\r
+313    qtn_clk_country_united_states_of_america\r
+314    qtn_clk_country_united_states_of_america\r
+315    qtn_clk_country_united_states_of_america\r
+332    qtn_clk_country_unites_states_virgin_islands\r
+748    qtn_clk_country_uruguay\r
+434    qtn_clk_country_uzbekistan\r
+541    qtn_clk_country_vanuatu\r
+225    qtn_clk_country_the_vatican\r
+734    qtn_clk_country_venezuela\r
+452    qtn_clk_country_viet_nam\r
+543    qtn_clk_country_wallis_and_futuna\r
+421    qtn_clk_country_yemen\r
+645    qtn_clk_country_zambia\r
+648    qtn_clk_country_zimbabwe\r

diff --git a/src/mcc_mapping.en_GB b/src/mcc_mapping.en_GB
new file mode 100644 (file)
index 0000000..491e504
--- /dev/null
+++ b/src/mcc_mapping.en_GB
@@ -0,0 +1,107 @@
+276    Albania\r
+213    Andorra\r
+722    Argentina\r
+363    Aruba\r
+505    Australia\r
+232    Austria\r
+400    Azerbaijan\r
+426    Bahrain\r
+470    Bangladesh\r
+257    Belarus\r
+206    Belgium\r
+736    Bolivia\r
+218    Bosnia and Herzegovina\r
+652    Botswana\r
+724    Brazil\r
+528    Brunei Darussalam\r
+284    Bulgaria\r
+456    Cambodia\r
+302    Canada\r
+730    Chile\r
+460    China\r
+732    Colombia\r
+219    Croatia\r
+280    Cyprus\r
+230    Czech Republic\r
+238    Denmark\r
+370    Dominican Republic\r
+740    Ecuador\r
+602    Egypt\r
+706    El Salvador\r
+248    Estonia\r
+244    Finland\r
+208    France\r
+282    Georgia\r
+262    Germany\r
+620    Ghana\r
+266    Gibraltar\r
+202    Greece\r
+340    Guadeloupe\r
+704    Guatemala\r
+708    Honduras\r
+454    Hong Kong, China\r
+216    Hungary\r
+274    Iceland\r
+404    India\r
+510    Indonesia\r
+272    Ireland\r
+425    Israel\r
+222    Italy\r
+338    Jamaica\r
+440    Japan\r
+416    Jordan\r
+401    Kazakhstan\r
+639    Kenya\r
+419    Kuwait\r
+247    Latvia\r
+415    Lebanon\r
+295    Liechtenstein\r
+246    Lithuania\r
+270    Luxembourg\r
+455    Macao, China\r
+294    Macedonia\r
+502    Malaysia\r
+472    Maldives\r
+278    Malta\r
+340    Martinique\r
+334    Mexico\r
+259    Moldova\r
+212    Monaco\r
+428    Mongolia\r
+220    Montenegro\r
+604    Morocco\r
+204    Netherlands\r
+530    New Zealand\r
+621    Nigeria\r
+242    Norway\r
+422    Oman\r
+410    Pakistan\r
+714    Panama\r
+744    Paraguay\r
+716    Peru\r
+515    Philippines\r
+260    Poland\r
+268    Portugal\r
+427    Qatar\r
+226    Romania\r
+250    Russian Federation\r
+420    Saudi Arabia\r
+220    Serbia\r
+525    Singapore\r
+231    Slovakia\r
+293    Slovenia\r
+655    South Africa\r
+214    Spain\r
+413    Sri Lanka\r
+240    Sweden\r
+228    Switzerland\r
+417    Syria\r
+466    Taiwan\r
+520    Thailand\r
+374    Trinidad and Tobago\r
+286    Turkey\r
+255    Ukraine\r
+234    United Kingdom\r
+748    Uruguay\r
+310    USA\r
+734    Venezuela\r