| author | Alan Coopersmith <Alan.Coopersmith@Oracle.COM> |
| Sat, 01 Oct 2016 11:18:56 -0700 | |
| changeset 7041 | f02b84458bf7 |
| permissions | -rw-r--r-- |
|
7041
f02b84458bf7
23245475 Move iso-codes 3.21 to Userland
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
1 |
# Existing set of patches from the desktop gate |
|
f02b84458bf7
23245475 Move iso-codes 3.21 to Userland
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
2 |
# Can be potentially sent upstream |
|
f02b84458bf7
23245475 Move iso-codes 3.21 to Userland
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
3 |
|
|
f02b84458bf7
23245475 Move iso-codes 3.21 to Userland
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
4 |
diff -ur iso-codes-3.21-orig/iso_3166/iso_3166.pot iso-codes-3.21/iso_3166/iso_3166.pot |
|
f02b84458bf7
23245475 Move iso-codes 3.21 to Userland
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
5 |
--- iso-codes-3.21-orig/iso_3166/iso_3166.pot Fri May 25 07:31:29 2012 |
|
f02b84458bf7
23245475 Move iso-codes 3.21 to Userland
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
6 |
+++ iso-codes-3.21/iso_3166/iso_3166.pot Fri May 25 07:32:16 2012 |
|
f02b84458bf7
23245475 Move iso-codes 3.21 to Userland
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
7 |
@@ -1455,7 +1455,7 @@ |
|
f02b84458bf7
23245475 Move iso-codes 3.21 to Userland
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
8 |
msgstr "" |
|
f02b84458bf7
23245475 Move iso-codes 3.21 to Userland
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
9 |
|
|
f02b84458bf7
23245475 Move iso-codes 3.21 to Userland
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
10 |
#. name for TWN, official_name for TWN |
|
f02b84458bf7
23245475 Move iso-codes 3.21 to Userland
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
11 |
-msgid "Taiwan, Province of China" |
|
f02b84458bf7
23245475 Move iso-codes 3.21 to Userland
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
12 |
+msgid "Taiwan" |
|
f02b84458bf7
23245475 Move iso-codes 3.21 to Userland
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
13 |
msgstr "" |
|
f02b84458bf7
23245475 Move iso-codes 3.21 to Userland
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
14 |
|
|
f02b84458bf7
23245475 Move iso-codes 3.21 to Userland
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
15 |
#. common_name for TWN |
|
f02b84458bf7
23245475 Move iso-codes 3.21 to Userland
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
16 |
diff -ur iso-codes-3.21-orig/iso_3166/iso_3166.xml iso-codes-3.21/iso_3166/iso_3166.xml |
|
f02b84458bf7
23245475 Move iso-codes 3.21 to Userland
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
17 |
--- iso-codes-3.21-orig/iso_3166/iso_3166.xml Fri May 25 07:31:29 2012 |
|
f02b84458bf7
23245475 Move iso-codes 3.21 to Userland
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
18 |
+++ iso-codes-3.21/iso_3166/iso_3166.xml Fri May 25 07:32:41 2012 |
|
f02b84458bf7
23245475 Move iso-codes 3.21 to Userland
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
19 |
@@ -1270,8 +1270,8 @@ |
|
f02b84458bf7
23245475 Move iso-codes 3.21 to Userland
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
20 |
alpha_3_code="TWN" |
|
f02b84458bf7
23245475 Move iso-codes 3.21 to Userland
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
21 |
numeric_code="158" |
|
f02b84458bf7
23245475 Move iso-codes 3.21 to Userland
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
22 |
common_name="Taiwan" |
|
f02b84458bf7
23245475 Move iso-codes 3.21 to Userland
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
23 |
- name="Taiwan, Province of China" |
|
f02b84458bf7
23245475 Move iso-codes 3.21 to Userland
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
24 |
- official_name="Taiwan, Province of China" /> |
|
f02b84458bf7
23245475 Move iso-codes 3.21 to Userland
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
25 |
+ name="Taiwan" |
|
f02b84458bf7
23245475 Move iso-codes 3.21 to Userland
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
26 |
+ official_name="Taiwan" /> |
|
f02b84458bf7
23245475 Move iso-codes 3.21 to Userland
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
27 |
<iso_3166_entry |
|
f02b84458bf7
23245475 Move iso-codes 3.21 to Userland
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
28 |
alpha_2_code="TJ" |
|
f02b84458bf7
23245475 Move iso-codes 3.21 to Userland
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
29 |
alpha_3_code="TJK" |