about summary refs log tree commit diff
path: root/localedata/de_DE.in
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2007-10-11 02:36:04 +0000
committerUlrich Drepper <drepper@redhat.com>2007-10-11 02:36:04 +0000
commit3a054d7ab0f7c413d65ec51899d622f8e7008fe9 (patch)
treeda1a0f232b050ea2ec8759d9c728d68cf534b32c /localedata/de_DE.in
parent069293a7e7b6b22401e0b13345fa555c7d5a878c (diff)
downloadglibc-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/de_DE.in')
-rw-r--r--localedata/de_DE.in6
1 files changed, 3 insertions, 3 deletions
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