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

Subscribers

People subscribed via source and target branches

to all changes: