diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2007-10-11 02:36:04 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2007-10-11 02:36:04 +0000 |
| commit | 3a054d7ab0f7c413d65ec51899d622f8e7008fe9 (patch) | |
| tree | da1a0f232b050ea2ec8759d9c728d68cf534b32c /localedata | |
| parent | 069293a7e7b6b22401e0b13345fa555c7d5a878c (diff) | |
| download | glibc-3a054d7ab0f7c413d65ec51899d622f8e7008fe9.tar.gz glibc-3a054d7ab0f7c413d65ec51899d622f8e7008fe9.tar.xz glibc-3a054d7ab0f7c413d65ec51899d622f8e7008fe9.zip | |
* locale/programs/locfile-token.h: Remove tok_elif, add tok_elifdef
and tok_elifndef. * locale/programs/locfile-kw.gperf: Likewise. * locale/programs/ld-collate.c: Implement primitive preprocessor.
Diffstat (limited to 'localedata')
| -rw-r--r-- | localedata/ChangeLog | 7 | ||||
| -rw-r--r-- | localedata/de_DE.in | 6 | ||||
| -rw-r--r-- | localedata/locales/de_DE | 2 | ||||
| -rw-r--r-- | localedata/locales/iso14651_t1_common | 4 |
4 files changed, 16 insertions, 3 deletions
diff --git a/localedata/ChangeLog b/localedata/ChangeLog index a14908d5a2..934f5d4ee4 100644 --- a/localedata/ChangeLog +++ b/localedata/ChangeLog @@ -1,3 +1,10 @@ +2007-10-10 Ulrich Drepper <drepper@redhat.com> + + * locales/iso14651_t1_common: If DIACRIT_FORWARD is defined, define + second level of <LATIN> script as forward. + * locales/de_DE: Define DIACRIT_FORWARD. + * de_DE.in: Revert last change. + 2007-10-10 Jakub Jelinek <jakub@redhat.com> * locales/en_US: Add first_weekday and first_workday. diff --git a/localedata/de_DE.in b/localedata/de_DE.in index b3b0dac29e..c56f401f64 100644 --- a/localedata/de_DE.in +++ b/localedata/de_DE.in @@ -40,8 +40,8 @@ Füße (pl. of "Fuß") : feet Fussel : fluff fusseln : to wear of fluff füßeln : play footsie [under the table] -Füssen : Füssen (town) fußen : to be based [on] +Füssen : Füssen (town) Füßen (dat. pl. of "Fuß") : [to the] feet in Massen : in large numbers in Maßen : moderately @@ -49,9 +49,9 @@ Masern : measels Mass. (Massachusetts) : Massachusetts (state) Maß : measure Masse : mass +Massé : (particular billard stroke) Maße (pl. of "Maß") : measures mäße (pres. conj. of "messen") : take measure (e.g. in indirect speech) -Massé : (particular billard stroke) Massen- : mass; wholesale; bulk (in compound nouns) massig : massive mäßig : moderate; modest @@ -60,8 +60,8 @@ Miß : Miss Passe : yoke (of dress) passé : over, gone Schlagerforderung : claim, demanded in a pop song -Schlägerforderung : demand of a hooligan Schlagerförderung : promotion of pop music +Schlägerforderung : demand of a hooligan Schlägerförderung : promotion of hooliganism :-) Schurz : apron Schürze : apron diff --git a/localedata/locales/de_DE b/localedata/locales/de_DE index 1298854b01..a694dc2888 100644 --- a/localedata/locales/de_DE +++ b/localedata/locales/de_DE @@ -76,6 +76,8 @@ END LC_CTYPE LC_COLLATE +define DIACRIT_FORWARD + % Copy the template from ISO/IEC 14651 copy "iso14651_t1" diff --git a/localedata/locales/iso14651_t1_common b/localedata/locales/iso14651_t1_common index 14b290c666..b5951f9e8c 100644 --- a/localedata/locales/iso14651_t1_common +++ b/localedata/locales/iso14651_t1_common @@ -1121,7 +1121,11 @@ order_start <SPECIAL>;forward;backward;forward;forward,position <U009E> IGNORE;IGNORE;IGNORE;<U009E> <U009F> IGNORE;IGNORE;IGNORE;<U009F> +ifdef DIACRIT_FORWARD +order_start <LATIN>;forward;forward;forward;forward,position +else order_start <LATIN>;forward;backward;forward;forward,position +endif # <U00A0> <U0020>;<BAS>;<MIN>;IGNORE # 170<NBSP> # |