Changeset af394e13

Timestamp:

Jun 23, 2015 8:33:38 PM (5 years ago)

Author:

zzz <zzz@…>

Branches:

master

Children:

975149d

Parents:

e3f64f6

Message:

GeoIP: Add countries and flags for Asia/Pacific?, Bonaire, St. Barts,
St. Maarten, South Sudan
AP: black flag copied from A1
BL: official flag is France, copied from FR
BQ, SX, SS: PNG files generated from public domain SVG files from Wikipedia
Shortened some other country names (remove "Republic of", etc.)
Change spelling to Macau, Vietnam

Files:

• build.xml (modified) (1 diff)
• installer/resources/countries.txt (modified) (10 diffs)
• installer/resources/icons/flags/ap.png (added)
• installer/resources/icons/flags/bl.png (added)
• installer/resources/icons/flags/bq.png (added)
• installer/resources/icons/flags/ss.png (added)
• installer/resources/icons/flags/sx.png (added)

build.xml

@@ -1262 +1262 @@
           <fileset dir="installer/resources/readme/" includes="readme*.html" />
           <fileset dir="installer/resources/proxy/" includes="*.ht" />
-          <!-- lang_ar.png added in 0.8.4; a1,a2,je, and eu.png added in 0.8.9; gg.png added in 0.8.10; im.png added in 0.8.12; cw.png added in 0.9.5 -->
-          <fileset dir="installer/resources/" includes="icons/flags/lang_ar.png icons/flags/gg.png icons/flags/je.png icons/flags/eu.png icons/flags/im.png icons/flags/a1.png icons/flags/a2.png icons/flags/cw.png" />
+          <!-- lang_ar.png added in 0.8.4; a1,a2,je, and eu.png added in 0.8.9; gg.png added in 0.8.10;
+               im.png added in 0.8.12; cw.png added in 0.9.5; ap,bl,bq,ss,sx added in 0.9.21 -->
+          <fileset dir="installer/resources/" includes="icons/flags/lang_ar.png icons/flags/gg.png icons/flags/je.png icons/flags/eu.png icons/flags/im.png icons/flags/a1.png icons/flags/a2.png icons/flags/cw.png icons/flags/ap.png icons/flags/bl.png icons/flags/bq.png icons/flags/ss.png icons/flags/sx.png" />
         </copy>
     </target>

installer/resources/countries.txt

@@ -17 +17 @@
 AN,Netherlands Antilles
 AO,Angola
+AP,Asia/Pacific Region
 AQ,Antarctica
 AR,Argentina
@@ -34 +35 @@
 BI,Burundi
 BJ,Benin
+BL,Saint Barthélemy
 BM,Bermuda
 BN,Brunei Darussalam
 BO,Bolivia
+BQ,Bonaire
 BR,Brazil
 BS,Bahamas
@@ -46 +49 @@
 CA,Canada
 CC,Cocos (Keeling) Islands
-CD,The Democratic Republic of the Congo
+CD,Congo
 CF,Central African Republic
 CG,Congo
@@ -81 +84 @@
 FJ,Fiji
 FK,Falkland Islands (Malvinas)
-FM,Federated States of Micronesia
+FM,Micronesia
 FO,Faroe Islands
 FR,France
@@ -115 +118 @@
 IO,British Indian Ocean Territory
 IQ,Iraq
-IR,Islamic Republic of Iran
+IR,Iran
 IS,Iceland
 IT,Italy
@@ -128 +131 @@
 KM,Comoros
 KN,Saint Kitts and Nevis
-KP,The Democratic People's Republic of Korea
+KP,North Korea
 KR,Republic of Korea
 KW,Kuwait
@@ -143 +146 @@
 LU,Luxembourg
 LV,Latvia
-LY,Libyan Arab Jamahiriya
+LY,Libya
 MA,Morocco
 MC,Monaco
-MD,Republic of Moldova
+MD,Moldova
 ME,Montenegro
 MF,Saint Martin
 MG,Madagascar
 MH,Marshall Islands
-MK,The Former Yugoslav Republic of Macedonia
+MK,Macedonia
 ML,Mali
 MM,Myanmar
 MN,Mongolia
-MO,Macao
+MO,Macau
 MP,Northern Mariana Islands
 MQ,Martinique
@@ -215 +218 @@
 SO,Somalia
 SR,Suriname
+SS,South Sudan
 ST,Sao Tome and Principe
 SV,El Salvador
-SY,Syrian Arab Republic
+SX,Sint Maarten
+SY,Syria
 SZ,Swaziland
 TC,Turks and Caicos Islands
@@ -234 +239 @@
 TV,Tuvalu
 TW,Taiwan
-TZ,United Republic of Tanzania
+TZ,Tanzania
 UA,Ukraine
 UG,Uganda
@@ -241 +246 @@
 UY,Uruguay
 UZ,Uzbekistan
-VA,Holy See (Vatican City State)
+VA,Vatican
 VC,Saint Vincent and the Grenadines
 VE,Venezuela
 VG,Virgin Islands
 VI,Virgin Islands
-VN,Viet Nam
+VN,Vietnam
 VU,Vanuatu
 WF,Wallis and Futuna