---- glibc-2.3.1/elf/ldconfig.c.orig Thu Jan 17 08:28:51 2002
-+++ glibc-2.3.1/elf/ldconfig.c Mon Nov 11 14:11:24 2002
-@@ -123,12 +123,12 @@
- { "verbose", 'v', NULL, 0, N_("Generate verbose messages"), 0},
- { NULL, 'N', NULL, 0, N_("Don't build cache"), 0},
- { NULL, 'X', NULL, 0, N_("Don't generate links"), 0},
-- { NULL, 'r', "ROOT", 0, N_("Change to and use ROOT as root directory"), 0},
-- { NULL, 'C', "CACHE", 0, N_("Use CACHE as cache file"), 0},
-- { NULL, 'f', "CONF", 0, N_("Use CONF as configuration file"), 0},
-+ { NULL, 'r', N_("ROOT"), 0, N_("Change to and use ROOT as root directory"), 0},
-+ { NULL, 'C', N_("CACHE"), 0, N_("Use CACHE as cache file"), 0},
-+ { NULL, 'f', N_("CONF"), 0, N_("Use CONF as configuration file"), 0},
- { NULL, 'n', NULL, 0, N_("Only process directories specified on the command line. Don't build cache."), 0},
- { NULL, 'l', NULL, 0, N_("Manually link individual libraries."), 0},
-- { "format", 'c', "FORMAT", 0, N_("Format to use: new, old or compat (default)"), 0},
-+ { "format", 'c', N_("FORMAT"), 0, N_("Format to use: new, old or compat (default)"), 0},
- { NULL, 0, NULL, 0, NULL, 0 }
- };
-
---- glibc-2.3.2/po/pl.po.orig Mon Nov 11 14:28:57 2002
-+++ glibc-2.3.2/po/pl.po Mon Nov 11 14:37:44 2002
-@@ -1690,7 +1690,7 @@
+--- glibc-2.3.6/timezone/zdump.c.orig 2005-10-17 07:14:28.000000000 +0200
++++ glibc-2.3.6/timezone/zdump.c 2005-11-05 07:33:38.167505808 +0100
+@@ -226,7 +226,7 @@
+ return;
+ (void) fflush(stdout);
+ (void) fprintf(stderr,
+- "%s: warning: zone \"%s\" abbreviation \"%s\" %s\n",
++ _("%s: warning: zone \"%s\" abbreviation \"%s\" %s\n"),
+ progname, zone, abbr, wp);
+ warned = TRUE;
+ }
+--- glibc-2.3.6/po/pl.po.orig 2004-11-27 02:09:53.487997720 +0100
++++ glibc-2.3.6/po/pl.po 2004-11-27 02:55:18.072797872 +0100
+@@ -1713,7 +1713,8 @@