Ok.  At this point, it seems unlikely that this will get into localechooser as
Christian will probably not change his opinion on this.  I respect this
decision, although I hope it can be reconsidered in the future.

Nevertheless, I think this could be useful in other distributions (including,
but not limited to, Ubuntu).  Alastair, if you have no objection, would you like
to provide this information in the package, so that those who are interested in
it can use it?

I'm attaching a new patch that includes fr_CA (Quebec) altogether.

Thanks,

-- 
Robert Millan
diff -ur iso-codes-0.51.old/iso2pot.py iso-codes-0.51/iso2pot.py
--- iso-codes-0.51.old/iso2pot.py       2005-10-28 13:57:31.000000000 +0200
+++ iso-codes-0.51/iso2pot.py   2006-05-21 12:42:36.651451216 +0200
@@ -35,6 +35,17 @@
                        self.ofile.write("\n")
                        if c != None:
                                self.ofile.write("#. " + aname + " for " + c +  
"\n")
+                       if aname == "regional_name":
+                               self.ofile.write("# This string is only used in 
very specific situations.\n")
+                               self.ofile.write("# - If your language is not 
spoken in this country, leave untranslated.\n")
+                               self.ofile.write("# - If your language is 
spoken in all regions of this country, leave untranslated.\n")
+                               self.ofile.write("# - If your language is 
spoken only in this country, and nowhere else in the world, leave 
untranslated.\n")
+                               self.ofile.write("# - If your language is 
spoken only in a region of this country, translate @region@ to the name of that 
region,\n")
+                               self.ofile.write("#   in your own language (if 
there's no such name, leave untranslated).  Translate the country name as 
well.\n")
+                               self.ofile.write("# Example: Catalan is spoken 
in a small town in Italy, the name of that town in Catalan is \"L'Alguer\".\n# 
Therefore, in ca.po we have:\n")
+                               self.ofile.write("#   msgid \"@region@ 
(Italy)\"\n")
+                               self.ofile.write("#   msgstr \"L'Alguer 
(Itàlia)\"\n")
+
                        self.ofile.write ("msgid \"" + n + "\"\n")
                        self.ofile.write ("msgstr \"\"\n")
                        self.done[n] = 'True'
diff -ur iso-codes-0.51.old/iso_3166/ca.po iso-codes-0.51/iso_3166/ca.po
--- iso-codes-0.51.old/iso_3166/ca.po   2006-04-04 18:10:41.000000000 +0200
+++ iso-codes-0.51/iso_3166/ca.po       2006-05-21 12:42:36.652451064 +0200
@@ -517,6 +517,10 @@
 msgid "French Republic"
 msgstr "República Francesa"
 
+#. regional_name for FRA
+msgid "@region@ (France)"
+msgstr "Catalunya Nord (França)"
+
 #. name for GUF
 msgid "French Guiana"
 msgstr "Guaiana Francesa"
@@ -729,6 +733,10 @@
 msgid "Italy"
 msgstr "Itàlia"
 
+#. regional_name for ITA
+msgid "@region@ (Italy)"
+msgstr "L'Alguer (Itàlia)"
+
 #. official_name for ITA
 msgid "Italian Republic"
 msgstr "República Italiana"
diff -ur iso-codes-0.51.old/iso_3166/eu.po iso-codes-0.51/iso_3166/eu.po
--- iso-codes-0.51.old/iso_3166/eu.po   2006-04-03 22:22:43.000000000 +0200
+++ iso-codes-0.51/iso_3166/eu.po       2006-05-21 12:42:36.653450912 +0200
@@ -517,6 +517,10 @@
 msgid "French Republic"
 msgstr "Frantziar Errepublika"
 
+#. regional_name for FRA
+msgid "@region@ (France)"
+msgstr "Iparralde (Frantzia)"
+
 #. name for GUF
 msgid "French Guiana"
 msgstr "Guaiana Frantsesa"
@@ -1373,6 +1377,10 @@
 msgid "Spain"
 msgstr "Espainia"
 
+#. regional_name for ESP
+msgid "@region@ (Spain)"
+msgstr "Hegoalde (Espainia)"
+
 #. official_name for ESP
 msgid "Kingdom of Spain"
 msgstr "Espaniako Erresuma"
diff -ur iso-codes-0.51.old/iso_3166/fr.po iso-codes-0.51/iso_3166/fr.po
--- iso-codes-0.51.old/iso_3166/fr.po   2006-04-03 22:45:08.000000000 +0200
+++ iso-codes-0.51/iso_3166/fr.po       2006-05-21 12:42:44.843205880 +0200
@@ -274,6 +274,10 @@
 msgid "Canada"
 msgstr "Canada"
 
+#. regional_name for CAN
+msgid "@region@ (Canada)"
+msgstr "Québec (Canada)"
+
 #. name for CPV
 msgid "Cape Verde"
 msgstr "Cap-Vert"
diff -ur iso-codes-0.51.old/iso_3166/iso_3166.xml 
iso-codes-0.51/iso_3166/iso_3166.xml
--- iso-codes-0.51.old/iso_3166/iso_3166.xml    2006-04-02 12:11:09.000000000 
+0200
+++ iso-codes-0.51/iso_3166/iso_3166.xml        2006-05-21 12:42:44.844205728 
+0200
@@ -17,6 +17,7 @@
                common_name             CDATA   #IMPLIED
                name                    CDATA   #REQUIRED
                official_name           CDATA   #IMPLIED
+               regional_name           CDATA   #IMPLIED
        >
        <!ELEMENT iso_3166_3_entry EMPTY>
        <!ATTLIST iso_3166_3_entry
@@ -248,7 +249,8 @@
                alpha_2_code="CA"
                alpha_3_code="CAN"
                numeric_code="124"
-               name="Canada" />
+               name="Canada"
+               regional_name="@region@ (Canada)" />
        <iso_3166_entry
                alpha_2_code="CV"
                alpha_3_code="CPV"
@@ -453,6 +455,7 @@
                alpha_3_code="FRA"
                numeric_code="250"
                name="France"
+               regional_name="@region@ (France)"
                official_name="French Republic" />
        <iso_3166_entry
                alpha_2_code="GF"
@@ -643,6 +646,7 @@
                alpha_3_code="ITA"
                numeric_code="380"
                name="Italy"
+               regional_name="@region@ (Italy)"
                official_name="Italian Republic" />
        <iso_3166_entry
                alpha_2_code="JM"
@@ -1180,6 +1184,7 @@
                alpha_3_code="ESP"
                numeric_code="724"
                name="Spain"
+               regional_name="@region@ (Spain)"
                official_name="Kingdom of Spain" />
        <iso_3166_entry
                alpha_2_code="LK"
diff -ur iso-codes-0.51.old/iso_3166/Makefile.am 
iso-codes-0.51/iso_3166/Makefile.am
--- iso-codes-0.51.old/iso_3166/Makefile.am     2006-04-02 12:44:07.000000000 
+0200
+++ iso-codes-0.51/iso_3166/Makefile.am 2006-05-21 12:42:36.651451216 +0200
@@ -19,7 +19,7 @@
 
 iso_3166.pot: iso_3166.xml
        ../iso2pot.py --is-version $(VERSION) --comments alpha_3_code \
-               --fields name,official_name,common_name --outfile $@ $<
+               --fields name,official_name,common_name,regional_name --outfile 
$@ $<
 
 EXTRA_DIST = \
        $(pofiles)      \

Reply via email to