Mostly replaced.

1 files changed, 156 insertions, 34 deletions

diff --git a/localedata/locales/uz_UZ b/localedata/locales/uz_UZ
index b98746ae97..d003bc6811 100644
--- a/localedata/locales/uz_UZ
+++ b/localedata/locales/uz_UZ
@@ -1,33 +1,46 @@
 escape_char  /
 comment_char  %
 
-% Uzbek language locale for Uzbekistan
+% Uzbek (latin) language locale for Uzbekistan
 % Source: Bobir Ismailov
-% Contact: Bobir Ismailov, Pablo Saratxaga
-% Email: bobir_is@yahoo.com, pablo@mandrakesoft.com
+% Contact: Bobir Ismailov, Pablo Saratxaga, Mashrab Kuvatov
+% Email: bobir_is@yahoo.com, pablo@mandrakesoft.com, kmashrab@uni-bremen.de
 % Tel:
 % Fax:
 % Language: uz
 % Territory: UZ
-% Revision: 0.1
-% Date: 2001-01-27
+% Revision: 0.5
+% Date: 2003-06-27
 % Users: general
-% Charset: ISO-8859-1
+% Charset: UTF-8
 % Distribution and use is free, also
 % for commercial purposes.
+% History:
+% 2002-09-09 Mashrab Kuvatov <kmashrab@uni-bremen.de>
+% LC_TIME-day: Changed the first letter of all day names to upper case.
+% LC_TIME-mon: Changed the first letter of all month names to upper case.
+%              Fixed a typo. September is not Senyabr, but Sentyabr.
+% LC_TIME-abmon: Corrected "Yav" (Yanvar) to "Yan".
+%
+% 2003-02-24 Mashrab Kuvatov <kmashrab@uni-bremen.de>
+% Changed charset to UTF-8
+%
+% ?????????? Pablo Saratxaga <pablo@mandrakesoft.com>
+% LC_CTYPE: Added transliteration from cyrillic to latin.
+% LC_COLLATE: Added reodering definition.
 
 LC_IDENTIFICATION
-title      "Uzbek locale for Uzbekistan"
+title      "Uzbek (latin) locale for Uzbekistan"
 source     "Bobir Ismailov"
 address    ""
-contact    "Bobir Ismailov, Pablo Saratxaga"
-email      "bobir_is@yahoo.com, pablo@mandrakesoft.com"
+contact    "Bobir Ismailov, Pablo Saratxaga, Mashrab Kuvatov"
+email      "bobir_is@yahoo.com, pablo@mandrakesoft.com, kmashrab@uni-bremen.de"
 tel        ""
 fax        ""
 language   "Uzbek"
 territory  "Uzbekistan"
-revision   "0.1"
-date       "2001-01-27"
+revision   "0.5"
+date       "2003-06-27"
 %
 category  "uz_UZ:2000";LC_IDENTIFICATION
 category  "uz_UZ:2000";LC_CTYPE
@@ -46,12 +59,100 @@ END LC_IDENTIFICATION
 
 LC_CTYPE
 copy "i18n"
+
+translit_start
+include "translit_combining";""
+
+% cyrillic -> latin
+% lower case letters
+
+<U0430> "<U0061>" % a= -> a
+<U0431> "<U0062>" % b= -> b
+<U0432> "<U0076>" % v= -> v
+<U0433> "<U0067>" % g= -> g
+<U0434> "<U0064>" % d= -> d
+<U0435> "<U0065>" % e= -> e (ye also, but context dependent)
+<U0451> "<U0079><U006F>" % io -> yo
+<U0436> "<U006A>" % z% -> j
+<U0437> "<U007A>" % z= -> z
+<U0438> "<U0069>" % i= -> i
+<U0439> "<U0079>" % j= -> y
+<U043A> "<U006B>" % k= -> k
+<U043B> "<U006C>" % l= -> l
+<U043C> "<U006D>" % m= -> m
+<U043D> "<U006E>" % n= -> n
+<U043E> "<U006F>" % o= -> o
+<U043F> "<U0070>" % p= -> p
+<U0440> "<U0072>" % r= -> r
+<U0441> "<U0073>" % s= -> s
+<U0442> "<U0074>" % t= -> t
+<U0443> "<U0075>" % u= -> u
+<U0444> "<U0066>" % f= -> f
+<U0445> "<U0078>" % h= -> x
+<U0446> "<U0074><U0073>" % c= -> ts
+<U0447> "<U0063><U0068>" % c% -> ch
+<U0448> "<U0073><U0068>" % s% -> sh
+<U0449> "<U0073><U0068>" % shcha -> sh
+<U044A> "<U0027>"        % hard sign= -> ' 
+<U044B> "<U0069>"        % yeru -> 1
+<U044C> ""               % soft sign omitted. not in latin-uzbek alphabet. stupid, but it is a fact.
+<U044D> "<U0065>"        % je= -> e 
+<U044E> "<U0079><U0075>" % ju -> yu
+<U044F> "<U0079><U0061>" % ja -> ya
+<U045E> "<U006F><U0027>" % v% -> o'
+<U049B> "<U0071>"        % k,= -> q
+<U0493> "<U0067><U0027>" % g-= -> g'
+<U04B3> "<U0068>"        % h,= -> h
+
+% upper case letters
+
+<U0410> "<U0041>" % a= -> a
+<U0411> "<U0042>" % b= -> b
+<U0412> "<U0056>" % v= -> v
+<U0413> "<U0047>" % g= -> g
+<U0414> "<U0044>" % d= -> d
+<U0415> "<U0045>" % e= -> e (ye also, but context dependent)
+<U0401> "<U0059><U006F>" % io -> yo
+<U0416> "<U004A>" % z% -> j
+<U0417> "<U005A>" % z= -> z
+<U0418> "<U0049>" % i= -> i
+<U0419> "<U0059>" % j= -> y
+<U041A> "<U004B>" % k= -> k
+<U041B> "<U004C>" % l= -> l
+<U041C> "<U004D>" % m= -> m
+<U041D> "<U004E>" % n= -> n
+<U041E> "<U004F>" % o= -> o
+<U041F> "<U0050>" % p= -> p
+<U0420> "<U0052>" % r= -> r
+<U0421> "<U0053>" % s= -> s
+<U0422> "<U0054>" % t= -> t
+<U0423> "<U0055>" % u= -> u
+<U0424> "<U0046>" % f= -> f
+<U0425> "<U0058>" % h= -> x
+<U0426> "<U0054><U0073>" % c= -> ts
+<U0427> "<U0043><U0068>" % c% -> ch
+<U0428> "<U0053><U0068>" % s% -> sh
+<U0429> "<U0053><U0068>" % shcha -> sh
+<U042A> "<U0027>"        % hard sign= -> '
+<U042B> "<U0049>"        % yeru -> i
+<U042C> ""               % soft sign omitted. not in latin-uzbek alphabet. stupid, but it is a fact.
+<U042D> "<U0045>"        % je -> e
+<U042E> "<U0059><U0075>" % ju -> yu
+<U042F> "<U0059><U0061>" % ja -> ya
+<U040E> "<U004F><U0027>" % v% -> o'
+<U049A> "<U0051>"        % k,= -> q
+<U0492> "<U0047><U0027>" % g-= -> g'
+<U04B2> "<U0048>"        % h,= -> h
+translit_end
 END LC_CTYPE
 
 LC_COLLATE
 copy "iso14651_t1"
 
 %% a b c d e f g g' h i j k l m n o o' p q r s t u v x y z
+%% cyr: a=, b=, v=, g=, d=, e=, io, z%, z=, i=, j=, k=, l=, m=, n=, o=,
+%%	p=, r=, s=, t=, u=, f=, h=, c=, c%, s%, sc, =' , y=, je, ju, ja,
+%%	v%, k,=, g-=, h,=
 collating-symbol  <g-'-uz>
 collating-element <g-'> from "<U0067><U0027>"
 collating-element <G-'> from "<U0047><U0027>"
@@ -59,11 +160,19 @@ collating-symbol  <o-'-uz>
 collating-element <o-'> from "<U006F><U0027>"
 collating-element <O-'> from "<U004F><U0027>"
 
+collating-symbol <k,=>
+collating-symbol <g-=>
+collating-symbol <h,=>
+
 reorder-after <g>
 <g-'-uz>
-
 reorder-after <o>
 <o-'-uz>
+reorder-after <CYR-YA>
+<CYR-OUBRE>
+<k,=>
+<g-=>
+<h,=>
 
 reorder-after <U0067>
 <g-'>	<g-'-uz>;<PCL>;<MIN>;IGNORE
@@ -75,6 +184,18 @@ reorder-after <U006F>
 reorder-after <U004F>
 <O-'>	<o-'-uz>;<PCL>;<CAP>;IGNORE
 
+reorder-after <U044F>
+<U045E> <CYR-OUBRE>;<PCL>;<MIN>;IGNORE
+<U049B> <k,=>;<PCL>;<MIN>;IGNORE
+<U0493> <g-=>;<PCL>;<MIN>;IGNORE
+<U04B3> <h,=>;<PCL>;<MIN>;IGNORE
+
+reorder-after <U042F>
+<U040E> <CYR-OUBRE>;<PCL>;<CAP>;IGNORE
+<U049A> <k,=>;<PCL>;<CAP>;IGNORE
+<U0492> <g-=>;<PCL>;<CAP>;IGNORE
+<U04B2> <h,=>;<PCL>;<CAP>;IGNORE
+
 reorder-end
 
 END LC_COLLATE
@@ -108,31 +229,31 @@ abday       "<U0059><U0061><U006B>";"<U0044><U0075>";/
             "<U0053><U0065>";"<U0043><U0068><U006F>";/
             "<U0050><U0061><U0079>";"<U004A><U0075>";/
             "<U0053><U0068><U0061>"
-day         "<U0079><U0061><U006B><U0073><U0068><U0061><U006E><U0062><U0061>";/
-            "<U0064><U0075><U0073><U0068><U0061><U006E><U0062><U0061>";/
-            "<U0073><U0065><U0073><U0068><U0061><U006E><U0062><U0061>";/
-            "<U0063><U0068><U006F><U0072><U0073><U0068><U0061><U006E><U0062><U0061>";/
-            "<U0070><U0061><U0079><U0073><U0068><U0061><U006E><U0062><U0061>";/
-            "<U006A><U0075><U006D><U0061>";/
-            "<U0073><U0068><U0061><U006E><U0062><U0061>"
-abmon       "<U0059><U0061><U0076>";"<U0046><U0065><U0076>";/
+day         "<U0059><U0061><U006B><U0073><U0068><U0061><U006E><U0062><U0061>";/
+            "<U0044><U0075><U0073><U0068><U0061><U006E><U0062><U0061>";/
+            "<U0053><U0065><U0073><U0068><U0061><U006E><U0062><U0061>";/
+            "<U0043><U0068><U006F><U0072><U0073><U0068><U0061><U006E><U0062><U0061>";/
+            "<U0050><U0061><U0079><U0073><U0068><U0061><U006E><U0062><U0061>";/
+            "<U004A><U0075><U006D><U0061>";/
+            "<U0053><U0068><U0061><U006E><U0062><U0061>"
+abmon       "<U0059><U0061><U006E>";"<U0046><U0065><U0076>";/
             "<U004D><U0061><U0072>";"<U0041><U0070><U0072>";/
             "<U004D><U0061><U0079>";"<U0049><U0079><U006E>";/
             "<U0049><U0079><U006C>";"<U0041><U0076><U0067>";/
             "<U0053><U0065><U006E>";"<U004F><U006B><U0074>";/
             "<U004E><U006F><U0079>";"<U0044><U0065><U006B>"
-mon         "<U0079><U0061><U006E><U0076><U0061><U0072>";/
-            "<U0066><U0065><U0076><U0072><U0061><U006C>";/
-            "<U006D><U0061><U0072><U0074>";/
-            "<U0061><U0070><U0072><U0065><U006C>";/
-            "<U006D><U0061><U0079>";/
-            "<U0069><U0079><U0075><U006E>";/
-            "<U0069><U0079><U0075><U006C>";/
-            "<U0061><U0076><U0067><U0075><U0073><U0074>";/
-            "<U0073><U0065><U006E><U0079><U0061><U0062><U0072>";/
-            "<U006F><U006B><U0074><U0079><U0061><U0062><U0072>";/
-            "<U006E><U006F><U0079><U0061><U0062><U0072>";/
-            "<U0064><U0065><U006B><U0061><U0062><U0072>"
+mon         "<U0059><U0061><U006E><U0076><U0061><U0072>";/
+            "<U0046><U0065><U0076><U0072><U0061><U006C>";/
+            "<U004D><U0061><U0072><U0074>";/
+            "<U0041><U0070><U0072><U0065><U006C>";/
+            "<U004D><U0061><U0079>";/
+            "<U0049><U0079><U0075><U006E>";/
+            "<U0049><U0079><U0075><U006C>";/
+            "<U0041><U0076><U0067><U0075><U0073><U0074>";/
+            "<U0053><U0065><U006E><U0074><U0079><U0061><U0062><U0072>";/
+            "<U004F><U006B><U0074><U0079><U0061><U0062><U0072>";/
+            "<U004E><U006F><U0079><U0061><U0062><U0072>";/
+            "<U0044><U0065><U006B><U0061><U0062><U0072>"
 d_t_fmt  "<U0025><U0054><U002C><U0020><U0025><U0064><U0020><U0025><U0042><U002C><U0020><U0025><U0059><U0020><U0079><U0069><U006C><U002C><U0020><U0025><U0041>"
 d_fmt       "<U0025><U0064><U002F><U0025><U006D><U002F><U0025><U0079>"
 t_fmt       "<U0025><U0054>"
@@ -170,8 +291,9 @@ name_fmt    "<U0025><U0064><U0025><U0074><U0025><U0066><U0025><U0074>/
 <U0025><U0067><U0025><U0074><U0025><U006D>"
 name_gen    "Hurmatli"
 name_mr     "Janob"
-name_mrs    "Aziz"
-name_miss   "Xonim"
+name_mrs    "Xonim"
+% FIXME: what is miss ?
+name_miss   ""
 % FIXME: what is ms ?
 name_ms     ""
 END LC_NAME