[Pkg-isocodes-devel] r830 - in trunk/iso-codes: . debian
iso_3166/iso_3166_2
LI Daobing
lidaobing-guest at alioth.debian.org
Mon Mar 5 18:01:10 CET 2007
Author: lidaobing-guest
Date: 2007-03-05 17:01:09 +0000 (Mon, 05 Mar 2007)
New Revision: 830
Modified:
trunk/iso-codes/debian/changelog
trunk/iso-codes/iso2pot.py
trunk/iso-codes/iso_3166/iso_3166_2/iso_3166_2.pot
Log:
update iso2pot.py to keep duplicate information in pot file.
Modified: trunk/iso-codes/debian/changelog
===================================================================
--- trunk/iso-codes/debian/changelog 2007-03-05 16:11:23 UTC (rev 829)
+++ trunk/iso-codes/debian/changelog 2007-03-05 17:01:09 UTC (rev 830)
@@ -49,8 +49,11 @@
- Dutch updated by Freek de Kruijf (from the TP)
- Simplified Chinese updated by LI Diaobing
- -- Christian Perrier <bubulle at debian.org> Wed, 31 Jan 2007 23:29:17 +0100
+ [ LI Daobing ]
+ * update iso2pot.py to keep duplicate information in pot file.
+ -- LI Daobing <lidaobing at gmail.com> Tue, 6 Mar 2007 00:59:59 +0800
+
iso-codes (1.0a-1) unstable; urgency=low
* Rebuild without auto-generated files to allow transition to testing
Modified: trunk/iso-codes/iso2pot.py
===================================================================
--- trunk/iso-codes/iso2pot.py 2007-03-05 16:11:23 UTC (rev 829)
+++ trunk/iso-codes/iso2pot.py 2007-03-05 17:01:09 UTC (rev 830)
@@ -20,24 +20,30 @@
self.comment = comment
self.ofile = ofile
self.done = {}
+ self.result = []
def startElement(self, name, attrs):
# Get the name attributes
for aname in self.attrnames:
- n = attrs.get(aname, None)
- c = attrs.get(self.comment, None)
- if type(n) == unicode:
- n = n.encode('UTF-8')
- if type(c) == unicode:
- c = c.encode('UTF-8')
- if n != None and not self.done.has_key(n):
- self.ofile.write("\n")
- if c != None:
- self.ofile.write("#. " + aname + " for " + c + "\n")
- self.ofile.write ("msgid \"" + n + "\"\n")
- self.ofile.write ("msgstr \"\"\n")
- self.done[n] = 'True'
+ n = attrs.get(aname, None)
+ c = attrs.get(self.comment, None)
+ if type(n) == unicode:
+ n = n.encode('UTF-8')
+ if type(c) == unicode:
+ c = c.encode('UTF-8')
+ if n != None:
+ if not self.done.has_key(n):
+ self.result.append([n])
+ self.done[n] = len(self.result)-1
+ if c != None:
+ try:
+ self.result[self.done[n]].append('%s for %s' % (aname, c))
+ except:
+ print n
+ print self.done
+ print result
+ raise
def printHeader(ofile, iso_standard, report_bugs_to, version):
"""Print the file header
@@ -129,15 +135,21 @@
p.setContentHandler(dh)
for infile in trail:
p.parse(infile)
+ for x in dh.result:
+ ofile.write("\n")
+ if len(x) > 1:
+ ofile.write("#. " + ', '.join(x[1:]) + "\n")
+ ofile.write ("msgid \"" + x[0] + "\"\n")
+ ofile.write ("msgstr \"\"\n")
except SAXParseException, e:
sys.stderr.write('%s:%s:%s: %s\n' % (e.getSystemId(),
e.getLineNumber(),
e.getColumnNumber(),
e.getMessage()))
sys.exit(1)
-except Exception, e:
- sys.stderr.write('<unknown>: %s\n' % str(e))
- sys.exit(1)
+#except Exception, e:
+# sys.stderr.write('<unknown>: %s\n' % str(e))
+# sys.exit(1)
ofile.close()
Modified: trunk/iso-codes/iso_3166/iso_3166_2/iso_3166_2.pot
===================================================================
--- trunk/iso-codes/iso_3166/iso_3166_2/iso_3166_2.pot 2007-03-05 16:11:23 UTC (rev 829)
+++ trunk/iso-codes/iso_3166/iso_3166_2/iso_3166_2.pot 2007-03-05 17:01:09 UTC (rev 830)
@@ -10,7 +10,7 @@
"Project-Id-Version: iso-codes 1.0\n"
"Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-devel at lists.alioth."
"debian.org>\n"
-"POT-Creation-Date: 2007-03-05 19:23+0800\n"
+"POT-Creation-Date: 2007-03-06 00:38+0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -406,7 +406,7 @@
msgid "Huambo"
msgstr ""
-#. name for AO-HUI
+#. name for AO-HUI, name for CO-HUI
msgid "Huila"
msgstr ""
@@ -498,7 +498,7 @@
msgid "Neuquen"
msgstr ""
-#. name for AR-R
+#. name for AR-R, name for UY-RN
msgid "Rio Negro"
msgstr ""
@@ -506,7 +506,7 @@
msgid "Salta"
msgstr ""
-#. name for AR-J
+#. name for AR-J, name for DO-22
msgid "San Juan"
msgstr ""
@@ -514,7 +514,7 @@
msgid "San Luis"
msgstr ""
-#. name for AR-Z
+#. name for AR-Z, name for BO-S, name for CV-CR
msgid "Santa Cruz"
msgstr ""
@@ -622,7 +622,7 @@
msgid "Ganca"
msgstr ""
-#. name for AZ-LA
+#. name for AZ-LA, name for AZ-LAN
msgid "Lankaran"
msgstr ""
@@ -634,7 +634,7 @@
msgid "Naftalan"
msgstr ""
-#. name for AZ-SA
+#. name for AZ-SA, name for AZ-SAK
msgid "Saki"
msgstr ""
@@ -642,7 +642,7 @@
msgid "Sumqayit"
msgstr ""
-#. name for AZ-SS
+#. name for AZ-SS, name for AZ-SUS
msgid "Susa"
msgstr ""
@@ -650,7 +650,7 @@
msgid "Xankandi"
msgstr ""
-#. name for AZ-YE
+#. name for AZ-YE, name for AZ-YEV
msgid "Yevlax"
msgstr ""
@@ -1178,11 +1178,11 @@
msgid "Liege"
msgstr ""
-#. name for BE-VLI
+#. name for BE-VLI, name for NL-LB
msgid "Limburg"
msgstr ""
-#. name for BE-WLX
+#. name for BE-WLX, name for LU-L
msgid "Luxembourg"
msgstr ""
@@ -1418,7 +1418,7 @@
msgid "Lovech"
msgstr ""
-#. name for BG-12
+#. name for BG-12, name for US-MT
msgid "Montana"
msgstr ""
@@ -1622,7 +1622,7 @@
msgid "Kouffo"
msgstr ""
-#. name for BJ-LI
+#. name for BJ-LI, name for CM-LT
msgid "Littoral"
msgstr ""
@@ -1634,7 +1634,7 @@
msgid "Oueme"
msgstr ""
-#. name for BJ-PL
+#. name for BJ-PL, name for NG-PL
msgid "Plateau"
msgstr ""
@@ -1670,7 +1670,7 @@
msgid "El Beni"
msgstr ""
-#. name for BO-L
+#. name for BO-L, name for HN-LP, name for SV-PA
msgid "La Paz"
msgstr ""
@@ -1698,7 +1698,7 @@
msgid "Alagoas"
msgstr ""
-#. name for BR-AM
+#. name for BR-AM, name for PE-AMA, name for VE-Z
msgid "Amazonas"
msgstr ""
@@ -1714,7 +1714,7 @@
msgid "Ceara"
msgstr ""
-#. name for BR-DF
+#. name for BR-DF, name for MX-DIF
msgid "Distrito Federal"
msgstr ""
@@ -1746,7 +1746,7 @@
msgid "Mato Grosso"
msgstr ""
-#. name for BR-PA
+#. name for BR-PA, name for SR-PR
msgid "Para"
msgstr ""
@@ -1786,7 +1786,7 @@
msgid "Rio Grande do Sul"
msgstr ""
-#. name for BR-SC
+#. name for BR-SC, name for CV-CA
msgid "Santa Catarina"
msgstr ""
@@ -1966,7 +1966,7 @@
msgid "Zhemgang"
msgstr ""
-#. name for BW-CE
+#. name for BW-CE, name for FJ-C, name for CENT, name for GH-CP, name for KE-200, name for PG-CPM, name for PY-11, name for SB-CE, name for ZM-02
msgid "Central"
msgstr ""
@@ -1994,7 +1994,7 @@
msgid "North-East"
msgstr ""
-#. name for BW-NW
+#. name for BW-NW, name for CM-NW, name for ZA-NW
msgid "North-West"
msgstr ""
@@ -2002,7 +2002,7 @@
msgid "South-East"
msgstr ""
-#. name for BW-SO
+#. name for BW-SO, name for SL-S, name for ZM-07
msgid "Southern"
msgstr ""
@@ -2050,7 +2050,7 @@
msgid "Stann Creek"
msgstr ""
-#. name for BZ-TOL
+#. name for BZ-TOL, name for ES-TO
msgid "Toledo"
msgstr ""
@@ -2254,7 +2254,7 @@
msgid "Niari"
msgstr ""
-#. name for CG-14
+#. name for CG-14, name for TG-P
msgid "Plateaux"
msgstr ""
@@ -2306,7 +2306,7 @@
msgid "Graubunden"
msgstr ""
-#. name for CH-JU
+#. name for CH-JU, name for FR-39
msgid "Jura"
msgstr ""
@@ -2490,7 +2490,7 @@
msgid "Adamaoua"
msgstr ""
-#. name for CM-CE
+#. name for CM-CE, name for HT-CE, name for TG-C
msgid "Centre"
msgstr ""
@@ -2702,7 +2702,7 @@
msgid "Cesar"
msgstr ""
-#. name for CO-COR
+#. name for CO-COR, name for ES-CO
msgid "Córdoba"
msgstr ""
@@ -2762,7 +2762,7 @@
msgid "Santander"
msgstr ""
-#. name for CO-SUC
+#. name for CO-SUC, name for VE-R
msgid "Sucre"
msgstr ""
@@ -2806,7 +2806,7 @@
msgid "Puntarenas"
msgstr ""
-#. name for CR-SJ
+#. name for CR-SJ, name for UY-SJ
msgid "San Jose"
msgstr ""
@@ -2818,19 +2818,19 @@
msgid "Ciego de `vila"
msgstr ""
-#. name for CU-06
+#. name for CU-06, name for CU-CF
msgid "Cienfuegos"
msgstr ""
-#. name for CU-03
+#. name for CU-03, name for CU-CH
msgid "Ciudad de La Habana"
msgstr ""
-#. name for CU-12
+#. name for CU-12, name for CU-GR
msgid "Granma"
msgstr ""
-#. name for CU-14
+#. name for CU-14, name for CU-GT
msgid "Guantanamo"
msgstr ""
@@ -2838,15 +2838,15 @@
msgid "Holquin"
msgstr ""
-#. name for CU-02
+#. name for CU-02, name for CU-HA
msgid "La Habana"
msgstr ""
-#. name for CU-10
+#. name for CU-10, name for CU-LT
msgid "Las Tunas"
msgstr ""
-#. name for CU-04
+#. name for CU-04, name for CU-MT
msgid "Matanzas"
msgstr ""
@@ -2858,11 +2858,11 @@
msgid "Sancti Spiritus"
msgstr ""
-#. name for CU-13
+#. name for CU-13, name for CU-SC
msgid "Santiago de Cuba"
msgstr ""
-#. name for CU-05
+#. name for CU-05, name for CU-VC
msgid "Villa Clara"
msgstr ""
@@ -3106,7 +3106,7 @@
msgid "Ali Sabieh"
msgstr ""
-#. name for DJ-AR
+#. name for DJ-AR, name for GR-31
msgid "Arta"
msgstr ""
@@ -3306,7 +3306,7 @@
msgid "Valverde"
msgstr ""
-#. name for DZ-01
+#. name for DZ-01, name for MR-07
msgid "Adrar"
msgstr ""
@@ -3502,7 +3502,7 @@
msgid "Azuay"
msgstr ""
-#. name for EC-B
+#. name for EC-B, name for VE-F
msgid "Bolivar"
msgstr ""
@@ -3822,7 +3822,7 @@
msgid "Cádiz"
msgstr ""
-#. name for ES-S
+#. name for ES-S, name for S
msgid "Cantabria"
msgstr ""
@@ -3842,7 +3842,7 @@
msgid "Girona [Gerona]"
msgstr ""
-#. name for ES-GR
+#. name for ES-GR, name for NI-GR
msgid "Granada"
msgstr ""
@@ -3870,7 +3870,7 @@
msgid "La Coruña"
msgstr ""
-#. name for ES-LO
+#. name for ES-LO, name for LO
msgid "La Rioja"
msgstr ""
@@ -4102,15 +4102,15 @@
msgid "Oulun lääni"
msgstr ""
-#. name for FJ-E
+#. name for FJ-E, name for GH-EP, name for KE-400, name for SL-E, name for ZM-03
msgid "Eastern"
msgstr ""
-#. name for FJ-N
+#. name for FJ-N, name for GH-NP, name for PG-NPP, name for SL-N, name for ZM-05
msgid "Northern"
msgstr ""
-#. name for FJ-W
+#. name for FJ-W, name for GH-WP, name for PG-WPD, name for SB-WE, name for ZM-01
msgid "Western"
msgstr ""
@@ -4398,7 +4398,7 @@
msgid "Nièvre"
msgstr ""
-#. name for FR-59
+#. name for FR-59, name for HT-ND
msgid "Nord"
msgstr ""
@@ -4566,7 +4566,7 @@
msgid "Bath and North East Somerset"
msgstr ""
-#. name for GB-BDF
+#. name for GB-BDF, name for BEDS
msgid "Bedfordshire"
msgstr ""
@@ -4630,7 +4630,7 @@
msgid "Bromley"
msgstr ""
-#. name for GB-BKM
+#. name for GB-BKM, name for BUCKS
msgid "Buckinghamshire"
msgstr ""
@@ -4646,7 +4646,7 @@
msgid "Calderdale"
msgstr ""
-#. name for GB-CAM
+#. name for GB-CAM, name for CAMBS
msgid "Cambridgeshire"
msgstr ""
@@ -4678,7 +4678,7 @@
msgid "Ceredigion"
msgstr ""
-#. name for GB-CHS
+#. name for GB-CHS, name for CHESH
msgid "Cheshire"
msgstr ""
@@ -4698,7 +4698,7 @@
msgid "Cookstown"
msgstr ""
-#. name for GB-CON
+#. name for GB-CON, name for CORN
msgid "Cornwall"
msgstr ""
@@ -4714,7 +4714,7 @@
msgid "Croydon"
msgstr ""
-#. name for GB-CMA
+#. name for GB-CMA, name for CUMB
msgid "Cumbria"
msgstr ""
@@ -4730,7 +4730,7 @@
msgid "Derby"
msgstr ""
-#. name for GB-DBY
+#. name for GB-DBY, name for DERBY
msgid "Derbyshire"
msgstr ""
@@ -4842,7 +4842,7 @@
msgid "Glasgow City"
msgstr ""
-#. name for GB-GLS
+#. name for GB-GLS, name for GLOUS
msgid "Gloucestershire"
msgstr ""
@@ -4854,7 +4854,7 @@
msgid "Guernsey"
msgstr ""
-#. name for GB-GWN
+#. name for GB-GWN, name for GWYNED
msgid "Gwynedd"
msgstr ""
@@ -4870,7 +4870,7 @@
msgid "Hammersmith and Fulham"
msgstr ""
-#. name for GB-HAM
+#. name for GB-HAM, name for HANTS
msgid "Hampshire"
msgstr ""
@@ -4894,11 +4894,11 @@
msgid "Herefordshire, County of"
msgstr ""
-#. name for GB-HRT
+#. name for GB-HRT, name for HERTS
msgid "Hertfordshire"
msgstr ""
-#. name for GB-HED
+#. name for GB-HED, name for HIGHL
msgid "Highland"
msgstr ""
@@ -4962,7 +4962,7 @@
msgid "Lambeth"
msgstr ""
-#. name for GB-LAN
+#. name for GB-LAN, name for LANCS
msgid "Lancashire"
msgstr ""
@@ -4978,7 +4978,7 @@
msgid "Leicester"
msgstr ""
-#. name for GB-LEC
+#. name for GB-LEC, name for LEICS
msgid "Leicestershire"
msgstr ""
@@ -5014,7 +5014,7 @@
msgid "Magherafelt"
msgstr ""
-#. name for GB-MAN
+#. name for GB-MAN, name for JM-12
msgid "Manchester"
msgstr ""
@@ -5078,7 +5078,7 @@
msgid "Newtownabbey"
msgstr ""
-#. name for GB-NFK
+#. name for GB-NFK, name for NORF
msgid "Norfolk"
msgstr ""
@@ -5114,7 +5114,7 @@
msgid "North Yorkshire"
msgstr ""
-#. name for GB-NTH
+#. name for GB-NTH, name for NHANTS
msgid "Northamptonshire"
msgstr ""
@@ -5126,7 +5126,7 @@
msgid "Nottingham"
msgstr ""
-#. name for GB-NTT
+#. name for GB-NTT, name for NOTTS
msgid "Nottinghamshire"
msgstr ""
@@ -5142,11 +5142,11 @@
msgid "Orkney Islands"
msgstr ""
-#. name for GB-OXF
+#. name for GB-OXF, name for OXON
msgid "Oxfordshire"
msgstr ""
-#. name for GB-PEM
+#. name for GB-PEM, name for PEMBS
msgid "Pembrokeshire"
msgstr ""
@@ -5238,7 +5238,7 @@
msgid "Shetland Islands"
msgstr ""
-#. name for GB-SHR
+#. name for GB-SHR, name for SHROPS
msgid "Shropshire"
msgstr ""
@@ -5282,7 +5282,7 @@
msgid "Southwark"
msgstr ""
-#. name for GB-STS
+#. name for GB-STS, name for STAFFS
msgid "Staffordshire"
msgstr ""
@@ -5306,7 +5306,7 @@
msgid "Strabane"
msgstr ""
-#. name for GB-SFK
+#. name for GB-SFK, name for SUFF
msgid "Suffolk"
msgstr ""
@@ -5386,7 +5386,7 @@
msgid "Warrington"
msgstr ""
-#. name for GB-WAR
+#. name for GB-WAR, name for WARKS
msgid "Warwickshire"
msgstr ""
@@ -5414,7 +5414,7 @@
msgid "Wigan"
msgstr ""
-#. name for GB-WIL
+#. name for GB-WIL, name for WILTS
msgid "Wiltshire"
msgstr ""
@@ -5434,7 +5434,7 @@
msgid "Wolverhampton"
msgstr ""
-#. name for GB-WOR
+#. name for GB-WOR, name for WORCS
msgid "Worcestershire"
msgstr ""
@@ -6158,7 +6158,7 @@
msgid "Atlantida"
msgstr ""
-#. name for HN-CL
+#. name for HN-CL, name for PA-3
msgid "Colon"
msgstr ""
@@ -6398,7 +6398,7 @@
msgid "Vas"
msgstr ""
-#. name for HU-VE
+#. name for HU-VE, name for HU-VM
msgid "Veszprém"
msgstr ""
@@ -6510,7 +6510,7 @@
msgid "Gorontalo"
msgstr ""
-#. name for ID-IJ
+#. name for ID-IJ, name for IJ
msgid "Irian Jaya"
msgstr ""
@@ -6534,7 +6534,7 @@
msgid "Kalimantan Barat"
msgstr ""
-#. name for ID-KT
+#. name for ID-KT, name for ID-KI
msgid "Kalimantan Timur"
msgstr ""
@@ -6550,7 +6550,7 @@
msgid "Lampung"
msgstr ""
-#. name for ID-MA
+#. name for ID-MA, name for MA
msgid "Maluku"
msgstr ""
@@ -6862,7 +6862,7 @@
msgid "Orissa"
msgstr ""
-#. name for IN-PB
+#. name for IN-PB, name for PK-PB
msgid "Punjab"
msgstr ""
@@ -7170,7 +7170,7 @@
msgid "Avellino"
msgstr ""
-#. name for IT-BA
+#. name for IT-BA, name for SO-BR
msgid "Bari"
msgstr ""
@@ -8290,7 +8290,7 @@
msgid "Zhambyl oblysy Zhambylskaya oblast'"
msgstr ""
-#. name for LA-VT
+#. name for LA-VT, name for LA-VI
msgid "Vientiane"
msgstr ""
@@ -8514,7 +8514,7 @@
msgid "Margibi"
msgstr ""
-#. name for LR-MY
+#. name for LR-MY, name for US-MD
msgid "Maryland"
msgstr ""
@@ -9098,7 +9098,7 @@
msgid "Gagauzia, Unitate Teritoriala Autonoma"
msgstr ""
-#. name for MD-CU
+#. name for MD-CU, name for MD-CH
msgid "Chisinau"
msgstr ""
@@ -9502,7 +9502,7 @@
msgid "Curepipe"
msgstr ""
-#. name for MU-PU
+#. name for MU-PU, name for MU-PL
msgid "Port Louis"
msgstr ""
@@ -9698,7 +9698,7 @@
msgid "Mulanje"
msgstr ""
-#. name for MW-MW
+#. name for MW-MW, name for TZ-18
msgid "Mwanza"
msgstr ""
@@ -9934,7 +9934,7 @@
msgid "Terengganu"
msgstr ""
-#. name for MZ-MPM
+#. name for MZ-MPM, name for MZ-L
msgid "Maputo"
msgstr ""
@@ -10474,7 +10474,7 @@
msgid "Al Wusta"
msgstr ""
-#. name for OM-SH
+#. name for OM-SH, name for SA-04
msgid "Ash Sharqlyah"
msgstr ""
@@ -10570,7 +10570,7 @@
msgid "Junin"
msgstr ""
-#. name for PE-LAL
+#. name for PE-LAL, name for SV-LI
msgid "La Libertad"
msgstr ""
@@ -10850,7 +10850,7 @@
msgid "Lanao del Sur"
msgstr ""
-#. name for PH-LUN
+#. name for PH-LUN, name for SV-UN
msgid "La Union"
msgstr ""
@@ -11866,7 +11866,7 @@
msgid "Al H,udd ash Shamallyah"
msgstr ""
-#. name for SA-12
+#. name for SA-12, name for YE-JA
msgid "Al Jawf"
msgstr ""
@@ -14586,7 +14586,7 @@
msgid "District of Columbia"
msgstr ""
-#. name for US-FL
+#. name for US-FL, name for UY-FD
msgid "Florida"
msgstr ""
More information about the Pkg-isocodes-devel
mailing list