Merge lp:~lifeless/ubuntu/lucid/langpack-locales/bug-516359 into lp:ubuntu/lucid/langpack-locales

Proposed by Robert Collins
Status: Merged
Merged at revision: not available
Proposed branch: lp:~lifeless/ubuntu/lucid/langpack-locales/bug-516359
Merge into: lp:ubuntu/lucid/langpack-locales
Diff against target: 200 lines (+188/-0)
2 files modified
debian/changelog (+7/-0)
debian/patches/ubuntu-tlh_UK.patch (+181/-0)
To merge this branch: bzr merge lp:~lifeless/ubuntu/lucid/langpack-locales/bug-516359
Reviewer Review Type Date Requested Status
Ubuntu branches Pending
Review via email: mp+18496@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Robert Collins (lifeless) wrote :

For Scott. Enjoy.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2009-10-15 01:10:30 +0000
+++ debian/changelog 2010-02-03 01:31:11 +0000
@@ -1,3 +1,10 @@
1langpack-locales (2.9+git20090617-3ubuntu1) lucid; urgency=low
2
3 * Add debian/patches/ubuntu-tlh_UK.patch: Add Klingon for Scott.
4 (LP: #516359)
5
6 -- Robert Collins <robertc@robertcollins.net> Wed, 03 Feb 2010 12:17:45 +1100
7
1langpack-locales (2.9+git20090617-3) karmic; urgency=low8langpack-locales (2.9+git20090617-3) karmic; urgency=low
29
3 * Add debian/patches/ubuntu-shs_CA-accents.patch: Fix accents in shs_CA,10 * Add debian/patches/ubuntu-shs_CA-accents.patch: Fix accents in shs_CA,
411
=== added file 'debian/patches/ubuntu-tlh_UK.patch'
--- debian/patches/ubuntu-tlh_UK.patch 1970-01-01 00:00:00 +0000
+++ debian/patches/ubuntu-tlh_UK.patch 2010-02-03 01:31:11 +0000
@@ -0,0 +1,181 @@
1# Description: Add tlh_GB locale
2# Ubuntu: https://launchpad.net/bugs/516359
3diff -Nur -x '*.orig' -x '*~' langpack-locales-2.9+git20090617/locales/tlh_GB langpack-locales-2.9+git20090617.new/locales/tlh_GB
4--- langpack-locales-2.9+git20090617/locales/tlh_GB 1970-01-01 01:00:00.000000000 +0100
5+++ langpack-locales-2.9+git20090617.new/locales/tlh_GB 2009-06-17 12:20:49.948472810 +0200
6@@ -0,0 +1,163 @@
7+escape_char /
8+comment_char %
9+
10+% Klingon language locale for Britain based on the English locale
11+% Source:
12+% Address:
13+% Contact: Robert Collins
14+% Email: robert.collins@ubuntu.com
15+% Tel:
16+% Fax:
17+% Language: tlh
18+% Territory: GB
19+% Revision: 1.0
20+% Date: 2010-02-03
21+% Users: general
22+% Repertoiremap: mnemonic.ds
23+% Charset: ISO-8859-1
24+% Distribution and use is free, also
25+% for commercial purposes.
26+
27+LC_IDENTIFICATION
28+title "Klingon locale for Britain based on the English locale"
29+source ""
30+address ""
31+contact "Robert Collins"
32+email "bug-glibc-locales@gnu.org"
33+tel ""
34+fax ""
35+language "Klingon"
36+territory "Great Britain"
37+revision "1.0"
38+date "2000-02-03"
39+%
40+category "tlh_GB:2000";LC_IDENTIFICATION
41+category "tlh_GB:2000";LC_CTYPE
42+category "tlh_GB:2000";LC_COLLATE
43+category "tlh_GB:2000";LC_TIME
44+category "tlh_GB:2000";LC_NUMERIC
45+category "tlh_GB:2000";LC_MONETARY
46+category "tlh_GB:2000";LC_MESSAGES
47+category "tlh_GB:2000";LC_PAPER
48+category "tlh_GB:2000";LC_NAME
49+category "tlh_GB:2000";LC_ADDRESS
50+category "tlh_GB:2000";LC_TELEPHONE
51+
52+END LC_IDENTIFICATION
53+
54+LC_CTYPE
55+copy "i18n"
56+
57+translit_start
58+include "translit_combining";""
59+translit_end
60+END LC_CTYPE
61+
62+LC_COLLATE
63+% Copy the template from ISO/IEC 14651
64+copy "iso14651_t1"
65+END LC_COLLATE
66+
67+LC_MONETARY
68+int_curr_symbol "<U0047><U0042><U0050><U0020>"
69+currency_symbol "<U00A3>"
70+mon_decimal_point "<U002E>"
71+mon_thousands_sep "<U002C>"
72+mon_grouping 3;3
73+positive_sign ""
74+negative_sign "<U002D>"
75+int_frac_digits 2
76+frac_digits 2
77+p_cs_precedes 1
78+p_sep_by_space 0
79+n_cs_precedes 1
80+n_sep_by_space 0
81+p_sign_posn 1
82+n_sign_posn 1
83+END LC_MONETARY
84+
85+LC_NUMERIC
86+decimal_point "<U002E>"
87+thousands_sep "<U002C>"
88+grouping 3;3
89+END LC_NUMERIC
90+
91+LC_TIME
92+abday "<U0053><U0075><U006E>";"<U004D><U006F><U006E>";/
93+ "<U0054><U0075><U0065>";"<U0057><U0065><U0064>";/
94+ "<U0054><U0068><U0075>";"<U0046><U0072><U0069>";/
95+ "<U0053><U0061><U0074>"
96+day "<U0053><U0075><U006E><U0064><U0061><U0079>";/
97+ "<U004D><U006F><U006E><U0064><U0061><U0079>";/
98+ "<U0054><U0075><U0065><U0073><U0064><U0061><U0079>";/
99+ "<U0057><U0065><U0064><U006E><U0065><U0073><U0064><U0061><U0079>";/
100+ "<U0054><U0068><U0075><U0072><U0073><U0064><U0061><U0079>";/
101+ "<U0046><U0072><U0069><U0064><U0061><U0079>";/
102+ "<U0053><U0061><U0074><U0075><U0072><U0064><U0061><U0079>"
103+abmon "<U004A><U0061><U006E>";"<U0046><U0065><U0062>";/
104+ "<U004D><U0061><U0072>";"<U0041><U0070><U0072>";/
105+ "<U004D><U0061><U0079>";"<U004A><U0075><U006E>";/
106+ "<U004A><U0075><U006C>";"<U0041><U0075><U0067>";/
107+ "<U0053><U0065><U0070>";"<U004F><U0063><U0074>";/
108+ "<U004E><U006F><U0076>";"<U0044><U0065><U0063>"
109+mon "<U004A><U0061><U006E><U0075><U0061><U0072><U0079>";/
110+ "<U0046><U0065><U0062><U0072><U0075><U0061><U0072><U0079>";/
111+ "<U004D><U0061><U0072><U0063><U0068>";/
112+ "<U0041><U0070><U0072><U0069><U006C>";/
113+ "<U004D><U0061><U0079>";/
114+ "<U004A><U0075><U006E><U0065>";/
115+ "<U004A><U0075><U006C><U0079>";/
116+ "<U0041><U0075><U0067><U0075><U0073><U0074>";/
117+ "<U0053><U0065><U0070><U0074><U0065><U006D><U0062><U0065><U0072>";/
118+ "<U004F><U0063><U0074><U006F><U0062><U0065><U0072>";/
119+ "<U004E><U006F><U0076><U0065><U006D><U0062><U0065><U0072>";/
120+ "<U0044><U0065><U0063><U0065><U006D><U0062><U0065><U0072>"
121+d_t_fmt "<U0025><U0061><U0020><U0025><U0064><U0020><U0025><U0062><U0020><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U005A>"
122+d_fmt "<U0025><U0064><U002F><U0025><U006D><U002F><U0025><U0079>"
123+t_fmt "<U0025><U0054>"
124+am_pm "";""
125+t_fmt_ampm ""
126+date_fmt "<U0025><U0061><U0020><U0025><U0062><U0020><U0025><U0065>/
127+<U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/
128+<U0025><U005A><U0020><U0025><U0059>"
129+week 7;19971130;4
130+first_weekday 2
131+first_workday 2
132+END LC_TIME
133+
134+LC_MESSAGES
135+yesexpr "<U005E><U005B><U0079><U0059><U005D><U002E><U002A>"
136+noexpr "<U005E><U005B><U006E><U004E><U005D><U002E><U002A>"
137+END LC_MESSAGES
138+
139+LC_PAPER
140+height 297
141+width 210
142+END LC_PAPER
143+
144+LC_TELEPHONE
145+tel_int_fmt "<U002B><U0025><U0063><U0020><U0025><U0061><U0020><U0025>/
146+<U006C>"
147+tel_dom_fmt "<U0025><U0041><U0020><U0025><U006C>"
148+int_select "<U0030><U0030>"
149+int_prefix "<U0034><U0034>"
150+END LC_TELEPHONE
151+
152+LC_MEASUREMENT
153+measurement 1
154+END LC_MEASUREMENT
155+
156+LC_NAME
157+copy "en_US"
158+END LC_NAME
159+
160+LC_ADDRESS
161+postal_fmt "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
162+<U0025><U0064><U0025><U004E><U0025><U0062><U0025><U004E><U0025><U0073>/
163+<U0020><U0025><U0068><U0020><U0025><U0065><U0020><U0025><U0072><U0025>/
164+<U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
165+<U004E><U0025><U0063><U0025><U004E>"
166+country_ab2 "<U0047><U0042>"
167+country_ab3 "<U0047><U0042><U0052>"
168+country_num 826
169+END LC_ADDRESS
170diff -Nur -x '*.orig' -x '*~' langpack-locales-2.9+git20090617/SUPPORTED langpack-locales-2.9+git20090617.new/SUPPORTED
171--- langpack-locales-2.9+git20090617/SUPPORTED 2009-06-17 12:20:48.743474051 +0200
172+++ langpack-locales-2.9+git20090617.new/SUPPORTED 2009-06-17 12:21:03.515501562 +0200
173@@ -375,6 +375,7 @@
174 tk_TM/UTF-8 \
175 tl_PH.UTF-8/UTF-8 \
176 tl_PH/ISO-8859-1 \
177+tlh_GB.UTF-8/UTF-8 \
178 tn_ZA/UTF-8 \
179 tr_CY.UTF-8/UTF-8 \
180 tr_CY/ISO-8859-9 \
181

Subscribers

People subscribed via source and target branches

to all changes: