Author: ankry Date: Wed Dec 7 13:07:43 2005 GMT Module: SOURCES Tag: DEVEL ---- Log message: - merged with ZA-locales.patch
---- Files affected: SOURCES: glibc-morelocales.patch (1.35.4.7 -> 1.35.4.8) ---- Diffs: ================================================================ Index: SOURCES/glibc-morelocales.patch diff -u SOURCES/glibc-morelocales.patch:1.35.4.7 SOURCES/glibc-morelocales.patch:1.35.4.8 --- SOURCES/glibc-morelocales.patch:1.35.4.7 Wed Dec 7 06:46:09 2005 +++ SOURCES/glibc-morelocales.patch Wed Dec 7 14:07:38 2005 @@ -183,8 +183,14 @@ ne_NP/UTF-8 \ nl_BE.UTF-8/UTF-8 \ nl_BE/ISO-8859-1 \ -@@ -265,10 +313,16 @@ +@@ -263,13 +311,22 @@ + [EMAIL PROTECTED]/ISO-8859-15 \ + nn_NO.UTF-8/UTF-8 \ nn_NO/ISO-8859-1 \ ++nr_ZA.ISO-8859-1/ISO-8859-1 \ ++nr_ZA/UTF-8 \ ++nso_ZA.ISO-8859-10/ISO-8859-10 \ + nso_ZA/UTF-8 \ oc_FR.UTF-8/UTF-8 \ oc_FR/ISO-8859-1 \ [EMAIL PROTECTED]/ISO-8859-15 \ @@ -200,7 +206,7 @@ pl_PL.UTF-8/UTF-8 \ pl_PL/ISO-8859-2 \ pt_BR.UTF-8/UTF-8 \ -@@ -277,6 +331,9 @@ +@@ -277,6 +334,9 @@ pt_PT.UTF-8/UTF-8 \ pt_PT/ISO-8859-1 \ [EMAIL PROTECTED]/ISO-8859-15 \ @@ -210,7 +216,7 @@ ro_RO.UTF-8/UTF-8 \ ro_RO/ISO-8859-2 \ ru_RU.KOI8-R/KOI8-R \ -@@ -284,12 +341,18 @@ +@@ -284,12 +344,18 @@ ru_RU/ISO-8859-5 \ ru_UA.UTF-8/UTF-8 \ ru_UA/KOI8-U \ @@ -229,7 +235,7 @@ sl_SI.UTF-8/UTF-8 \ sl_SI/ISO-8859-2 \ so_DJ.UTF-8/UTF-8 \ -@@ -303,8 +366,10 @@ +@@ -303,8 +369,11 @@ sq_AL/ISO-8859-1 \ sr_CS.UTF-8/UTF-8 \ [EMAIL PROTECTED]/UTF-8 \ @@ -237,10 +243,11 @@ sr_CS/ISO-8859-5 \ [EMAIL PROTECTED]/ISO-8859-2 \ [EMAIL PROTECTED]/ISO-8859-5 \ ++ss_ZA.ISO-8859-1/ISO-8859-1 \ ss_ZA/UTF-8 \ st_ZA.UTF-8/UTF-8 \ st_ZA/ISO-8859-1 \ -@@ -313,10 +378,17 @@ +@@ -313,10 +382,17 @@ [EMAIL PROTECTED]/ISO-8859-15 \ sv_SE.UTF-8/UTF-8 \ sv_SE/ISO-8859-1 \ @@ -258,14 +265,17 @@ th_TH.UTF-8/UTF-8 \ th_TH/TIS-620 \ ti_ER/UTF-8 \ -@@ -325,13 +397,19 @@ +@@ -324,14 +400,22 @@ + tig_ER/UTF-8 \ tl_PH.UTF-8/UTF-8 \ tl_PH/ISO-8859-1 \ ++tn_ZA.ISO-8859-10/ISO-8859-10 \ tn_ZA/UTF-8 \ +tr_CY.UTF-8/UTF-8 \ +tr_CY/ISO-8859-9 \ tr_TR.UTF-8/UTF-8 \ tr_TR/ISO-8859-9 \ ++ts_ZA.ISO-8859-1/ISO-8859-1 \ ts_ZA/UTF-8 \ +tt_RU.KOI8-K/KOI8-K \ tt_RU.UTF-8/UTF-8 \ @@ -278,7 +288,7 @@ uz_UZ/ISO-8859-1 \ [EMAIL PROTECTED]/UTF-8 \ ve_ZA/UTF-8 \ -@@ -340,6 +418,8 @@ +@@ -340,6 +424,8 @@ wa_BE/ISO-8859-1 \ [EMAIL PROTECTED]/ISO-8859-15 \ wa_BE.UTF-8/UTF-8 \ @@ -6290,6 +6300,283 @@ +am_pm "";"" +t_fmt_ampm "" +END LC_TIME +diff -uNr libc.orig/localedata/locales/nr_ZA libc/localedata/locales/nr_ZA +--- libc.orig/localedata/locales/nr_ZA 1970-01-01 01:00:00.000000000 +0100 ++++ libc/localedata/locales/nr_ZA 2004-11-09 22:04:05.000000000 +0100 +@@ -0,0 +1,273 @@ ++escape_char / ++comment_char % ++ ++% ChangeLog ++% 0.2 (2004-11-09): ++% 2004-11-09 Dwayne Bailey <[EMAIL PROTECTED]> ++% - <UNNNN> escape everything ++% - Update all contact information ++% - Change %d to %-e for d_t_fmt and date_fmt ++% - Reset yes/noexpr to English ++% - set all abmon, mon, abday, day to English until correct defintions ++% are available. ++% 2004-03-30 Dwayne Bailey <[EMAIL PROTECTED]> ++% - Added country_ab2/3, country_num ++% 2004-02-27 Dwayne Bailey <[EMAIL PROTECTED]> ++% - Correct capatilisation of lang_name ++% 0.1 (2004-02-24): ++% - Initial Southern Ndebele locale for South Africa ++% by Zuza Software Foundation ++ ++LC_IDENTIFICATION ++title "Southern Ndebele locale for South Africa" ++source "Zuza Software Foundation (Translate.org.za)" ++address "PO Box 28364, Sunnyside, 0132, South Africa" ++contact "Dwayne Bailey" ++email "[EMAIL PROTECTED]" ++tel "+27 12 343 0389" ++fax "+27 12 343 0389" ++language "Southern Ndebele" ++territory "South Africa" ++revision "0.2" ++date "2004-11-09" ++% ++category "nr_ZA:2004";LC_IDENTIFICATION ++category "nr_ZA:2004";LC_CTYPE ++category "nr_ZA:2004";LC_COLLATE ++category "nr_ZA:2004";LC_TIME ++category "nr_ZA:2004";LC_NUMERIC ++category "nr_ZA:2004";LC_MONETARY ++category "nr_ZA:2004";LC_MESSAGES ++category "nr_ZA:2004";LC_PAPER ++category "nr_ZA:2004";LC_NAME ++category "nr_ZA:2004";LC_ADDRESS ++category "nr_ZA:2004";LC_TELEPHONE ++category "nr_ZA:2004";LC_MEASUREMENT ++ ++END LC_IDENTIFICATION ++ ++LC_CTYPE ++% Use the characters described in the charmap file "i18n.tgz" ++copy "i18n" ++END LC_CTYPE ++ ++LC_COLLATE ++% Copy the template from ISO/IEC 14651 i.e. ++% use the rules there when making ordered lists of words. ++copy "iso14651_t1" ++END LC_COLLATE ++ ++LC_MONETARY ++copy "en_ZA" ++END LC_MONETARY ++ ++LC_NUMERIC ++copy "en_ZA" ++END LC_NUMERIC ++ ++LC_TIME ++ ++% abday - The abbreviations for the week days: ++% - Sun, Mon, Tue, Wed, Thu, Fri, Sat ++abday "<U0053><U0075><U006E>";"<U004D><U006F><U006E>";/ ++ "<U0054><U0075><U0065>";"<U0057><U0065><U0064>";/ ++ "<U0054><U0068><U0075>";"<U0046><U0072><U0069>";/ ++ "<U0053><U0061><U0074>" ++ ++% day - The full names of the week days: ++% - Sunday, Monday, Tuesday, Wednesday, Thursday, Friday, Saturday ++day "<U0053><U0075><U006E><U0064><U0061><U0079>";/ ++ "<U004D><U006F><U006E><U0064><U0061><U0079>";/ ++ "<U0054><U0075><U0065><U0073><U0064><U0061><U0079>";/ ++ "<U0057><U0065><U0064><U006E><U0065><U0073><U0064><U0061><U0079>";/ ++ "<U0054><U0068><U0075><U0072><U0073><U0064><U0061><U0079>";/ ++ "<U0046><U0072><U0069><U0064><U0061><U0079>";/ ++ "<U0053><U0061><U0074><U0075><U0072><U0064><U0061><U0079>" ++ ++% abmon - The abbreviations for the months ++% - Jan, Feb, Mar, Apr, May, Jun, Jul, Aug, Sep, Oct, Nov, Dec ++abmon "<U004A><U0061><U006E>";"<U0046><U0065><U0062>";/ ++ "<U004D><U0061><U0072>";"<U0041><U0070><U0072>";/ ++ "<U004D><U0061><U0079>";"<U004A><U0075><U006E>";/ ++ "<U004A><U0075><U006C>";"<U0041><U0075><U0067>";/ ++ "<U0053><U0065><U0070>";"<U004F><U0063><U0074>";/ ++ "<U004E><U006F><U0076>";"<U0044><U0065><U0063>" ++ ++% mon - The full names of the months - ++% - January, February, March, April, May, June ++% July, August, September, October, November, December ++mon "<U004A><U0061><U006E><U0075><U0061><U0072><U0079>";/ ++ "<U0046><U0065><U0062><U0072><U0075><U0061><U0072><U0079>";/ ++ "<U004D><U0061><U0072><U0063><U0068>";/ ++ "<U0041><U0070><U0072><U0069><U006C>";/ ++ "<U004D><U0061><U0079>";/ ++ "<U004A><U0075><U006E><U0065>";/ ++ "<U004A><U0075><U006C><U0079>";/ ++ "<U0041><U0075><U0067><U0075><U0073><U0074>";/ ++ "<U0053><U0065><U0070><U0074><U0065><U006D><U0062><U0065><U0072>";/ ++ "<U004F><U0063><U0074><U006F><U0062><U0065><U0072>";/ ++ "<U004E><U006F><U0076><U0065><U006D><U0062><U0065><U0072>";/ ++ "<U0044><U0065><U0063><U0065><U006D><U0062><U0065><U0072>" ++ ++% Abreviated date and time representation to be referenced by the "%c" field descriptor - ++d_t_fmt "<U0025><U0061><U0020><U0025><U002D><U0065><U0020><U0025><U0062><U0020><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U005A>" ++% ++% "%a" (short weekday name), ++% "%-e" (day of month as a decimal number), ++% "%b" (short month name), ++% "%Y" (year with century as a decimal number), ++% "%T" (24-hour clock time in format HH:MM:SS), ++% "%Z" (Time zone name) ++ ++% Date representation to be referenced by the "%x" field descriptor - ++d_fmt "<U0025><U0064><U002F><U0025><U006D><U002F><U0025><U0059>" ++% "%d/%m/%Y", day/month/year as decimal numbers (01/01/2000). ++ ++% Time representation to be referenced by the "%X" field descriptor - ++t_fmt "<U0025><U0054>" ++% "%T" (24-hour clock time in format HH:MM:SS) ++ ++% Define representation of ante meridiem and post meridiem strings - ++am_pm "";"" ++% The "" mean 'default to "AM" and "PM". ++ ++% Define time representation in 12-hour format with "am_pm", to be referenced by the "%r" ++t_fmt_ampm "" ++% The "" means that this format is not supported. ++ ++% Date representation not described in ISO/IEC 14652. Comes out as - ++% "%a %b %-e %H:%M:%S %Z %Y" which is default "date" command output ++date_fmt "<U0025><U0061><U0020><U0025><U0062><U0020><U0025><U002D><U0065>/ ++<U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/ ++<U0025><U005A><U0020><U0025><U0059>" ++% ++% %a - abbreviated weekday name, ++% %b - abreviated month name, ++% %-e - day of month as a decimal number with leading space (1 to 31), ++% %H - hour (24-hour clock) as a decimal number (00 to 23), ++% %M - minute as a decimal number (00 to 59), ++% %S - seconds as a decimal number (00 to 59), ++% %Z - time-zone name, ++% %Y - year with century as a decimal number,e.g. 2001. ++ ++END LC_TIME ++ ++LC_MESSAGES ++% FIXME: Check both of these ++% The affirmative response - TODO ++% "^[yY]" ++yesexpr "<U005E><U005B><U0079><U0059><U005D>" ++ ++% The negative response - TODO ++% "^[nN]" ++noexpr "<U005E><U005B><U006E><U004E><U005D>" ++END LC_MESSAGES ++ ++LC_PAPER ++copy "en_ZA" ++END LC_PAPER ++ ++LC_TELEPHONE ++copy "en_ZA" ++END LC_TELEPHONE ++ ++LC_MEASUREMENT ++copy "en_ZA" ++END LC_MEASUREMENT ++ ++LC_NAME ++% Format for addressing a person. ++name_fmt "<U0025><U0064><U0025><U0074><U0025><U0067><U0025><U0074>/ ++<U0025><U006D><U0025><U0074><U0025><U0066>" ++% "%d%t%g%t%m%t%f" ++% "Salutation", ++% "Empty string, or <Space>", ++% "First given name", ++% "Empty string, or <Space>", ++% "Middle names", ++% "Empty string, or <Space>", ++% "Clan names" ++ ++% FIXME - define all the following name_* ++% General salutation for any sex ++% name_gen "" ++ ++% Salutation for unmarried females - "" ++% name_miss "" ++ ++% Salutation for males - "" ++% name_mr "" ++ ++% Salutation for married females - "" ++% name_mrs "" ++ ++% Salutation valid for all females - "" (no term) ++% name_ms "" ++ ++END LC_NAME ++ ++LC_ADDRESS ++% Country name in Southern Ndebele - "iSewula Afrika" ++country_name "<U0069><U0053><U0065><U0077><U0075><U006C><U0061><U0020><U0041><U0066><U0072><U0069><U006B><U0061>" ++ ++% Abbreviated country postal name - "ZA" ++country_post "<U005A><U0041>" ++ ++% UN Geneve 1949:68 Distinguishing signs of vehicles in international traffic ++% http://www.unece.org/trans/conventn/disting-signs-5-2001.pdf ++% "ZA" ++country_car "<U005A><U0041>" ++ ++% FIXME define the following correctly ++% country_isbn "" ++% country_num ++ ++% Language name in Southern Ndebele - "IsiNdebele" ++lang_name "<U0049><U0073><U0069><U004E><U0064><U0065><U0062><U0065><U006C><U0065>" ++ ++% ISO 639 two and three letter language names ++% see http://www.loc.gov/standards/iso639-2/englangn.html ++% "nr", "nbl" ++lang_ab "<U006E><U0072>" ++lang_term "<U006E><U0062><U006C>" ++ ++% Representation of postal addresses (minus the addressee's name) in South ++% Africa. (Ignored for now) ++postal_fmt "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/ ++<U0025><U0064><U0025><U004E><U0025><U0062><U0025><U004E><U0025><U0073>/ ++<U0020><U0025><U0068><U0020><U0025><U0065><U0020><U0025><U0072><U0025>/ ++<U004E><U0025><U0025><U007A><U0020><U0025><U0054><U0025>/ ++<U004E><U0025><U0063><U0025><U004E>" ++% "%f%N%a%N%d%N%b%N%s %h %e %r%N%%z %T%N%c%N", which gives - ++% "firm name", ++% "end of line", ++% "C/O address", ++% "end of line", ++% "department name", ++% "Building name", ++% "end of line", ++% "street or block name", ++% "space", ++% "house number or designation", ++% "space", ++% "floor number", ++% "space", ++% "room number, door designation", ++% "end of line", ++% "postal code", ++% "space", ++% "town, city", ++% "end of line", ++% "country designation for the <country_post> keyword", ++% "end of line ++% ++ ++% ISO 3166 country number and 2 and 3 letter abreviations ++% http://www.unicode.org/onlinedat/countries.html ++% "ZA", "ZAF" ++country_num 710 ++country_ab2 "<U005A><U0041>" ++country_ab3 "<U005A><U0041><U0046>" ++ ++END LC_ADDRESS ++ diff -uNr libc.orig/localedata/locales/[EMAIL PROTECTED] libc/localedata/locales/[EMAIL PROTECTED] --- libc.orig/localedata/locales/[EMAIL PROTECTED] 2004-07-16 04:05:52.000000000 +0200 +++ libc/localedata/locales/[EMAIL PROTECTED] 2004-11-23 22:12:42.000000000 +0100 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/glibc-morelocales.patch?r1=1.35.4.7&r2=1.35.4.8&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
