From d2cb96ed28207ca554790781a36a36b59425dc55 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Mon, 1 May 2006 17:35:49 +0000 Subject: [BZ #68] * locales/hy_AM: Remove special collation rules. Fux yesexpr, noexpr, country_name, country_car, lang_name, name_fmt, name_miss, name_mr, and name_mrs. --- localedata/ChangeLog | 5 ++ localedata/locales/hy_AM | 174 +++++++---------------------------------------- 2 files changed, 29 insertions(+), 150 deletions(-) (limited to 'localedata') diff --git a/localedata/ChangeLog b/localedata/ChangeLog index ab60f1fb70..be27e3466f 100644 --- a/localedata/ChangeLog +++ b/localedata/ChangeLog @@ -1,5 +1,10 @@ 2006-05-01 Ulrich Drepper + [BZ #68] + * locales/hy_AM: Remove special collation rules. Fux yesexpr, noexpr, + country_name, country_car, lang_name, name_fmt, name_miss, name_mr, + and name_mrs. + [BZ #388] * locales/pl_PL: Don't ignore U0020 in collation. diff --git a/localedata/locales/hy_AM b/localedata/locales/hy_AM index b281499701..768f3292df 100644 --- a/localedata/locales/hy_AM +++ b/localedata/locales/hy_AM @@ -1,16 +1,16 @@ escape_char / comment_char % -% charset "ARMSCII-8" +% Charset: UTF-8 % Distribution and use is free, also for commercial purposes. LC_IDENTIFICATION title "Armenian language locale for Armenia" -source "http://moon.yerphi.am/~hovik/ArmSCII/ArmCS-005.html" +source "http://www.freenet.am/armscii" % Eugene Sevinian completed % LC_MONETARY and LC_TIME address "" contact "Pablo Saratxaga" -email "srtxg@chanae.alphanet.ch" +email "pablo@mandrakesoft.com" tel "" fax "" language "Armenian" @@ -18,17 +18,17 @@ territory "Armenia" revision "0.4" date "2001-01-26" -category hy_AM:2000;LC_IDENTIFICATION -category hy_AM:2000;LC_COLLATE -category hy_AM:2000;LC_CTYPE -category hy_AM:2000;LC_MESSAGES -category hy_AM:2000;LC_MONETARY -category hy_AM:2000;LC_NUMERIC -category hy_AM:2000;LC_TIME -category hy_AM:2000;LC_PAPER -category hy_AM:2000;LC_MEASUREMENT -category hy_AM:2000;LC_TELEPHONE -category hy_AM:2000;LC_ADDRESS +category "hy_AM:2000";LC_IDENTIFICATION +category "hy_AM:2000";LC_COLLATE +category "hy_AM:2000";LC_CTYPE +category "hy_AM:2000";LC_MESSAGES +category "hy_AM:2000";LC_MONETARY +category "hy_AM:2000";LC_NUMERIC +category "hy_AM:2000";LC_TIME +category "hy_AM:2000";LC_PAPER +category "hy_AM:2000";LC_MEASUREMENT +category "hy_AM:2000";LC_TELEPHONE +category "hy_AM:2000";LC_ADDRESS % ISO/IEC 14652: Converted comments to LC_IDENTIFICATION % added LC_PAPER, LC_MEASUREMENT, LC_TELEPHONE @@ -67,136 +67,7 @@ END LC_IDENTIFICATION %%%%%%%%%%%% LC_COLLATE - -% Armenian sorting is not yet on iso14651_t1 - -script - -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol - - copy "iso14651_t1" - -order_start ;forward;forward;forward;forward,position - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE -order_end - -reorder-sections-after - -reorder-sections-end - END LC_COLLATE LC_CTYPE @@ -277,8 +148,8 @@ END LC_TIME LC_MESSAGES yesstr "" nostr "" -yesexpr "" -noexpr "" +yesexpr "" +noexpr "" END LC_MESSAGES % Metric Measurement system (ISO 1000) @@ -303,20 +174,23 @@ LC_ADDRESS postal_fmt "/ / " -% FIXME country_name "Armenia" in Armenian +country_name "" % FIXME country_post for Armenia? country_ab2 "" country_ab3 "" country_num 51 -% FIXME country_car for Armenia ? +country_car "" country_isbn "" -% FIXME lang_name Armenian in Armenian +lang_name "" lang_ab "" lang_term "" lang_lib "" END LC_ADDRESS LC_NAME -% FIXME -name_fmt "???" +name_fmt "/ +" +name_miss "" +name_mr "" +name_mrs "" END LC_NAME -- cgit 1.4.1