about summary refs log tree commit diff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2006-09-22 06:07:26 +0000
committerUlrich Drepper <drepper@redhat.com>2006-09-22 06:07:26 +0000
commit4a132246b1a34c6fe5d777a810e332236977e66a (patch)
tree050ae55eddfe9707b9acf30602175dfba782b47c
parentc69136aeed1f6e7ba0649b0e0a6ec425ded37df8 (diff)
downloadglibc-4a132246b1a34c6fe5d777a810e332236977e66a.tar.gz
glibc-4a132246b1a34c6fe5d777a810e332236977e66a.tar.xz
glibc-4a132246b1a34c6fe5d777a810e332236977e66a.zip
2006-09-21  Jakub Jelinek  <jakub@redhat.com>
	[BZ #3225]
	* sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep.h (PTR_MANGLE3,
	PTR_DEMANGLE3): Define.
	* sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep.h (PTR_MANGLE3,
	PTR_DEMANGLE3): Likewise.
	* sysdeps/powerpc/powerpc32/__longjmp-common.S (__longjmp): Use them.
	* sysdeps/powerpc/powerpc32/fpu/__longjmp-common.S (__longjmp):
	Likewise.
	* sysdeps/powerpc/powerpc64/__longjmp-common.S (__longjmp): Likewise.
-rw-r--r--ChangeLog12
-rw-r--r--po/be.po12
-rw-r--r--po/ca.po12
-rw-r--r--po/cs.po4
-rw-r--r--po/da.po12
-rw-r--r--po/de.po12
-rw-r--r--po/el.po10
-rw-r--r--po/en_GB.po8
-rw-r--r--po/es.po12
-rw-r--r--po/fi.po12
-rw-r--r--po/fr.po12
-rw-r--r--po/gl.po12
-rw-r--r--po/hr.po10
-rw-r--r--po/hu.po10
-rw-r--r--po/ja.po12
-rw-r--r--po/ko.po12
-rw-r--r--po/libc.pot12
-rw-r--r--po/nb.po12
-rw-r--r--po/nl.po12
-rw-r--r--po/pl.po12
-rw-r--r--po/pt_BR.po4
-rw-r--r--po/ru.po12
-rw-r--r--po/rw.po12
-rw-r--r--po/sk.po12
-rw-r--r--po/sv.po12
-rw-r--r--po/tr.po12
-rw-r--r--po/zh_CN.po12
-rw-r--r--po/zh_TW.po12
-rw-r--r--sysdeps/powerpc/powerpc32/__longjmp-common.S8
-rw-r--r--sysdeps/powerpc/powerpc32/fpu/__longjmp-common.S8
-rw-r--r--sysdeps/powerpc/powerpc64/__longjmp-common.S6
-rw-r--r--sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep.h6
-rw-r--r--sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep.h4
33 files changed, 186 insertions, 156 deletions
diff --git a/ChangeLog b/ChangeLog
index 195686b40c..79e5908b6e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2006-09-21  Jakub Jelinek  <jakub@redhat.com>
+
+	[BZ #3225]
+	* sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep.h (PTR_MANGLE3,
+	PTR_DEMANGLE3): Define.
+	* sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep.h (PTR_MANGLE3,
+	PTR_DEMANGLE3): Likewise.
+	* sysdeps/powerpc/powerpc32/__longjmp-common.S (__longjmp): Use them.
+	* sysdeps/powerpc/powerpc32/fpu/__longjmp-common.S (__longjmp):
+	Likewise.
+	* sysdeps/powerpc/powerpc64/__longjmp-common.S (__longjmp): Likewise.
+
 2006-09-20  Jakub Jelinek  <jakub@redhat.com>
 
 	* po/libc.pot: Regenerated.
diff --git a/po/be.po b/po/be.po
index 8f1dc9eb34..b69264a1ee 100644
--- a/po/be.po
+++ b/po/be.po
@@ -260,7 +260,7 @@ msgstr "немагчыма адчыніць файл вываду"
 
 #: iconv/iconv_prog.c:241
 #, c-format
-msgid "conversion from `%s' and to `%s' are not supported"
+msgid "conversions from `%s' and to `%s' are not supported"
 msgstr ""
 
 #: iconv/iconv_prog.c:246
@@ -352,7 +352,7 @@ msgid "Prefix used for all file accesses"
 msgstr ""
 
 #: iconv/iconvconfig.c:327 locale/programs/localedef.c:292
-msgid "no output file produced because warning were issued"
+msgid "no output file produced because warnings were issued"
 msgstr ""
 
 #: iconv/iconvconfig.c:405
@@ -727,7 +727,7 @@ msgstr ""
 
 #: locale/programs/ld-collate.c:1287 locale/programs/ld-ctype.c:1467
 #, c-format
-msgid "`%s' and `%.*s' are no valid names for symbolic range"
+msgid "`%s' and `%.*s' are not valid names for symbolic range"
 msgstr ""
 
 #: locale/programs/ld-collate.c:1333 locale/programs/ld-collate.c:3712
@@ -1620,7 +1620,7 @@ msgid "no <Uxxxx> or <Uxxxxxxxx> value given"
 msgstr ""
 
 #: locale/programs/repertoire.c:332
-msgid "cannot safe new repertoire map"
+msgid "cannot save new repertoire map"
 msgstr ""
 
 #: locale/programs/repertoire.c:343
@@ -3028,7 +3028,7 @@ msgid "%s: usage is %s [ -v ] [ -c cutoff ] zonename ...\n"
 msgstr ""
 
 #: timezone/zdump.c:268
-msgid "Error writing standard output"
+msgid "Error writing to standard output"
 msgstr "Памылка запісу стандартнага вываду"
 
 #: timezone/zic.c:365
@@ -5047,7 +5047,7 @@ msgstr "немагчыма запісаць вынік: %s"
 
 #: nscd/connections.c:405 nscd/connections.c:499
 #, c-format
-msgid "error getting callers id: %s"
+msgid "error getting caller's id: %s"
 msgstr ""
 
 #: nscd/connections.c:471
diff --git a/po/ca.po b/po/ca.po
index d11a4c787e..07c0143528 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -268,7 +268,7 @@ msgstr "no s'ha pogut obrir el fitxer d'eixida"
 
 #: iconv/iconv_prog.c:243
 #, c-format
-msgid "conversion from `%s' and to `%s' are not supported"
+msgid "conversions from `%s' and to `%s' are not supported"
 msgstr "no es suporta la conversió de «%s» ni a «%s»"
 
 #: iconv/iconv_prog.c:248
@@ -373,7 +373,7 @@ msgid "Prefix used for all file accesses"
 msgstr "Prefix a usar en tots els accessos a fitxer."
 
 #: iconv/iconvconfig.c:327 locale/programs/localedef.c:292
-msgid "no output file produced because warning were issued"
+msgid "no output file produced because warnings were issued"
 msgstr "no s'ha generat el fitxer d'eixida perquè s'han produït avisos"
 
 #: iconv/iconvconfig.c:405
@@ -760,7 +760,7 @@ msgstr "%s: un rang simbòlic amb eŀlipsi no pot anar just davant d'«order_end
 
 #: locale/programs/ld-collate.c:1299 locale/programs/ld-ctype.c:1476
 #, c-format
-msgid "`%s' and `%.*s' are no valid names for symbolic range"
+msgid "`%s' and `%.*s' are not valid names for symbolic range"
 msgstr "«%s» i «%.*s» no són noms vàlids de rangs simbòlics"
 
 #: locale/programs/ld-collate.c:1348 locale/programs/ld-collate.c:3737
@@ -1695,7 +1695,7 @@ msgstr "no s'ha especificat un valor <Uxxxx> o <Uxxxxxxxx>"
 # ivb (2001/11/05)
 # ivb  Apareix quan no es troba el repertori en un arbre de repertoris.
 #: locale/programs/repertoire.c:332
-msgid "cannot safe new repertoire map"
+msgid "cannot save new repertoire map"
 msgstr "no s'ha pogut afegir el nou mapa de repertori"
 
 #: locale/programs/repertoire.c:343
@@ -3133,7 +3133,7 @@ msgid "%s: usage is %s [ --version ] [ -v ] [ -c cutoff ] zonename ...\n"
 msgstr "%s: la forma d'ús és %s [--version] [-v] [-c ANY_DE_TALL] NOM_DE_ZONA...\n"
 
 #: timezone/zdump.c:269
-msgid "Error writing standard output"
+msgid "Error writing to standard output"
 msgstr "error en escriure en l'eixida estàndard"
 
 #: timezone/zic.c:361
@@ -5234,7 +5234,7 @@ msgstr "no s'ha pogut escriure el resultat: %s"
 # ivb  «chronyc» amb «chronyd»).
 #: nscd/connections.c:392 nscd/connections.c:514
 #, c-format
-msgid "error getting callers id: %s"
+msgid "error getting caller's id: %s"
 msgstr "error en obtenir l'identificador del programa de control: %s"
 
 #: nscd/connections.c:485
diff --git a/po/cs.po b/po/cs.po
index ea45e59f51..d5dfdaec8c 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -3709,7 +3709,7 @@ msgstr "koncov bod `...' je vt ne poten"
 
 #: nscd/connections.c:357 nscd/connections.c:444
 #, c-format
-msgid "error getting callers id: %s"
+msgid "error getting caller's id: %s"
 msgstr "chyba pi zjiovn id volajcho: %s"
 
 #: iconv/iconv_prog.c:193
@@ -4144,7 +4144,7 @@ msgid "no other keyword shall be specified when `copy' is used"
 msgstr "pi pouit `copy' nen dovoleno pout dn jin klov slovo"
 
 #: locale/programs/localedef.c:331
-msgid "no output file produced because warning were issued"
+msgid "no output file produced because warnings were issued"
 msgstr "vstupn soubor nebyl vytvoen, protoe se vyskytla varovn"
 
 #: locale/programs/locfile.c:283 locale/programs/locfile.c:302
diff --git a/po/da.po b/po/da.po
index 3ccbc88cbf..bf62fd54cc 100644
--- a/po/da.po
+++ b/po/da.po
@@ -259,7 +259,7 @@ msgstr "kan ikke bne udfil"
 
 #: iconv/iconv_prog.c:241
 #, c-format
-msgid "conversion from `%s' and to `%s' are not supported"
+msgid "conversions from `%s' and to `%s' are not supported"
 msgstr "konvertering fra '%s' og til '%s' er ikke understttet"
 
 #: iconv/iconv_prog.c:246
@@ -361,7 +361,7 @@ msgid "Prefix used for all file accesses"
 msgstr "Prfiks brugt for alle filadgange"
 
 #: iconv/iconvconfig.c:327 locale/programs/localedef.c:292
-msgid "no output file produced because warning were issued"
+msgid "no output file produced because warnings were issued"
 msgstr "p grund af advarsler blev ingen udfil oprettet"
 
 #: iconv/iconvconfig.c:405
@@ -738,7 +738,7 @@ msgstr "%s: symbolsk interval-ellipse m ikke vre fulgt umiddelbart af 'order_e
 
 #: locale/programs/ld-collate.c:1287 locale/programs/ld-ctype.c:1467
 #, c-format
-msgid "`%s' and `%.*s' are no valid names for symbolic range"
+msgid "`%s' and `%.*s' are not valid names for symbolic range"
 msgstr "'%s' og '%.*s' er ikke gyldige navne for tegnomrde"
 
 #: locale/programs/ld-collate.c:1333 locale/programs/ld-collate.c:3712
@@ -1639,7 +1639,7 @@ msgid "no <Uxxxx> or <Uxxxxxxxx> value given"
 msgstr "ingen <Uxxxx>- eller <Uxxxxxxxx>-vrdi givet"
 
 #: locale/programs/repertoire.c:332
-msgid "cannot safe new repertoire map"
+msgid "cannot save new repertoire map"
 msgstr "kan ikke gemme ny repertoiretabel"
 
 #: locale/programs/repertoire.c:343
@@ -3051,7 +3051,7 @@ msgid "%s: usage is %s [ -v ] [ -c cutoff ] zonename ...\n"
 msgstr "%s: brug er %s [ -v ] [ -c grnse ] zonenavn ...\n"
 
 #: timezone/zdump.c:268
-msgid "Error writing standard output"
+msgid "Error writing to standard output"
 msgstr "Fejl ved skrivning til standard ud"
 
 #: timezone/zic.c:365
@@ -5073,7 +5073,7 @@ msgstr "kan ikke udskrive resultat: '%s'"
 
 #: nscd/connections.c:405 nscd/connections.c:499
 #, c-format
-msgid "error getting callers id: %s"
+msgid "error getting caller's id: %s"
 msgstr "fejl ved foresprgsel p opkaldets id: %s"
 
 #: nscd/connections.c:471
diff --git a/po/de.po b/po/de.po
index 9c47575ecc..346cc8435b 100644
--- a/po/de.po
+++ b/po/de.po
@@ -304,7 +304,7 @@ msgstr "Kann die Ausgabedatei nicht öffnen"
 
 #: iconv/iconv_prog.c:243
 #, c-format
-msgid "conversion from `%s' and to `%s' are not supported"
+msgid "conversions from `%s' and to `%s' are not supported"
 msgstr "Konvertierung von »%s« nach »%s« wird nicht unterstützt"
 
 #: iconv/iconv_prog.c:248
@@ -406,7 +406,7 @@ msgid "Prefix used for all file accesses"
 msgstr "Prefix für jeden Dateizugriff"
 
 #: iconv/iconvconfig.c:327 locale/programs/localedef.c:292
-msgid "no output file produced because warning were issued"
+msgid "no output file produced because warnings were issued"
 msgstr "Es wurde keine Ausgabedatei erzeugt, weil Warnungen ausgegeben wurden"
 
 #: iconv/iconvconfig.c:405
@@ -787,7 +787,7 @@ msgstr "%s: Das Symbol für Auslassungen darf nicht unmittelbar vor »order_end
 
 #: locale/programs/ld-collate.c:1299 locale/programs/ld-ctype.c:1476
 #, c-format
-msgid "`%s' and `%.*s' are no valid names for symbolic range"
+msgid "`%s' and `%.*s' are not valid names for symbolic range"
 msgstr "»%s« und »%.*s« sind ungültige Namen für eine symbolischen Zeichenbereich"
 
 #: locale/programs/ld-collate.c:1348 locale/programs/ld-collate.c:3737
@@ -1716,7 +1716,7 @@ msgid "no <Uxxxx> or <Uxxxxxxxx> value given"
 msgstr "Kein <Uxxxx> oder <Uxxxxxxxx> Wert angegeben"
 
 #: locale/programs/repertoire.c:332
-msgid "cannot safe new repertoire map"
+msgid "cannot save new repertoire map"
 msgstr "Kann die neue »repertoire«-Map »%s« nicht speichern"
 
 #: locale/programs/repertoire.c:343
@@ -3149,7 +3149,7 @@ msgid "%s: usage is %s [ --version ] [ -v ] [ -c cutoff ] zonename ...\n"
 msgstr "%s: Syntax: %s [ --version ] [ -v ] [ -c cutoff ] Zonenname ...\n"
 
 #: timezone/zdump.c:269
-msgid "Error writing standard output"
+msgid "Error writing to standard output"
 msgstr "Fehler beim Schreiben zur Standardausgabe"
 
 #: timezone/zic.c:361
@@ -5208,7 +5208,7 @@ msgstr "Das Ergebnis kann nicht geschrieben werden: %s"
 
 #: nscd/connections.c:392 nscd/connections.c:514
 #, c-format
-msgid "error getting callers id: %s"
+msgid "error getting caller's id: %s"
 msgstr "Fehler beim Feststellen der Identität des Aufrufers: %s"
 
 #: nscd/connections.c:485
diff --git a/po/el.po b/po/el.po
index ee08b7efcb..7a1c349d61 100644
--- a/po/el.po
+++ b/po/el.po
@@ -3801,7 +3801,7 @@ msgstr "  `%1$s'    `END %1$s'"
 
 #: locale/programs/ld-collate.c:1268 locale/programs/ld-ctype.c:1454
 #, fuzzy, c-format
-msgid "`%s' and `%.*s' are no valid names for symbolic range"
+msgid "`%s' and `%.*s' are not valid names for symbolic range"
 msgstr " <%s>  <%s>      "
 
 #: elf/sprof.c:762
@@ -4118,7 +4118,7 @@ msgstr "    "
 
 #: locale/programs/repertoire.c:331
 #, fuzzy
-msgid "cannot safe new repertoire map"
+msgid "cannot save new repertoire map"
 msgstr "    `%s'"
 
 #: elf/dl-load.c:776
@@ -4329,7 +4329,7 @@ msgstr "    "
 
 #: nscd/connections.c:361 nscd/connections.c:453
 #, c-format
-msgid "error getting callers id: %s"
+msgid "error getting caller's id: %s"
 msgstr "       : %s"
 
 #: locale/programs/ld-collate.c:3013
@@ -4771,7 +4771,7 @@ msgid "no output digits defined and none of the standard names in the charmap"
 msgstr ""
 
 #: locale/programs/localedef.c:236
-msgid "no output file produced because warning were issued"
+msgid "no output file produced because warnings were issued"
 msgstr "      "
 
 #: locale/programs/charmap.c:488 locale/programs/charmap.c:668 locale/programs/charmap.c:764
@@ -5587,7 +5587,7 @@ msgstr "yp_update:    \n"
 #~ msgid "while writing database file"
 #~ msgstr "     "
 
-#~ msgid "%s: Error writing standard output "
+#~ msgid "%s: Error writing to standard output "
 #~ msgstr "%s:        "
 
 #~ msgid "Cputime limit exceeded"
diff --git a/po/en_GB.po b/po/en_GB.po
index c26589be75..2470e8205a 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -3768,7 +3768,7 @@ msgstr ""
 
 #: locale/programs/ld-collate.c:1184 locale/programs/ld-ctype.c:1263
 #, c-format
-msgid "`%s' and `%.*s' are no valid names for symbolic range"
+msgid "`%s' and `%.*s' are not valid names for symbolic range"
 msgstr ""
 
 #: elf/sprof.c:763
@@ -3988,7 +3988,7 @@ msgid "cannot read statistics data"
 msgstr ""
 
 #: locale/programs/repertoire.c:331
-msgid "cannot safe new repertoire map"
+msgid "cannot save new repertoire map"
 msgstr ""
 
 #: nscd/cache.c:150 nscd/connections.c:151
@@ -4188,7 +4188,7 @@ msgstr ""
 
 #: nscd/connections.c:360 nscd/connections.c:451
 #, c-format
-msgid "error getting callers id: %s"
+msgid "error getting caller's id: %s"
 msgstr ""
 
 #: locale/programs/ld-collate.c:2787
@@ -4600,7 +4600,7 @@ msgid ""
 msgstr ""
 
 #: locale/programs/localedef.c:229
-msgid "no output file produced because warning were issued"
+msgid "no output file produced because warnings were issued"
 msgstr ""
 
 #: locale/programs/charmap.c:438 locale/programs/charmap.c:589
diff --git a/po/es.po b/po/es.po
index ba6a1fbd83..14d547fc97 100644
--- a/po/es.po
+++ b/po/es.po
@@ -302,7 +302,7 @@ msgstr "no se puede abrir el fichero de salida"
 
 #: iconv/iconv_prog.c:243
 #, c-format
-msgid "conversion from `%s' and to `%s' are not supported"
+msgid "conversions from `%s' and to `%s' are not supported"
 msgstr "no se admite la conversin de `%s' a `%s'"
 
 #: iconv/iconv_prog.c:248
@@ -411,7 +411,7 @@ msgid "Prefix used for all file accesses"
 msgstr "Prefijo utilizado para todos los accesos a ficheros"
 
 #: iconv/iconvconfig.c:327 locale/programs/localedef.c:292
-msgid "no output file produced because warning were issued"
+msgid "no output file produced because warnings were issued"
 msgstr "no se ha producido ningn fichero de salida debido a la existencia de avisos"
 
 #: iconv/iconvconfig.c:405
@@ -798,7 +798,7 @@ msgstr "%s: el rango simblico de la elipsis no debe estar directamente seguido
 
 #: locale/programs/ld-collate.c:1299 locale/programs/ld-ctype.c:1476
 #, c-format
-msgid "`%s' and `%.*s' are no valid names for symbolic range"
+msgid "`%s' and `%.*s' are not valid names for symbolic range"
 msgstr "`%s' y `%.*s' no son nombres vlidos para el rango simblico"
 
 #: locale/programs/ld-collate.c:1348 locale/programs/ld-collate.c:3737
@@ -1748,7 +1748,7 @@ msgstr "no se ha dado ningn valor <Uxxxx> o <Uxxxxxxxx>"
 # No s qu es eso del "repertoire map", pero creo que el repertoire
 # es una simple aclaracin. sv
 #: locale/programs/repertoire.c:332
-msgid "cannot safe new repertoire map"
+msgid "cannot save new repertoire map"
 msgstr "no se puede asegurar el nuevo repertorio"
 
 #: locale/programs/repertoire.c:343
@@ -3416,7 +3416,7 @@ msgid "%s: usage is %s [ --version ] [ -v ] [ -c cutoff ] zonename ...\n"
 msgstr "%s: el modo de empleo es %s [ --version ] [ -v ] [ -c cutoff ] nombrezona ...\n"
 
 #: timezone/zdump.c:269
-msgid "Error writing standard output"
+msgid "Error writing to standard output"
 msgstr "Error al escribir en la salida estndar"
 
 #: timezone/zic.c:361
@@ -5638,7 +5638,7 @@ msgstr "no se puede escribir el resultado: %s"
 
 #: nscd/connections.c:392 nscd/connections.c:514
 #, c-format
-msgid "error getting callers id: %s"
+msgid "error getting caller's id: %s"
 msgstr "error al obtener el id de los llamantes: %s"
 
 #: nscd/connections.c:485
diff --git a/po/fi.po b/po/fi.po
index 06a2fd75bd..66d9111037 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -273,7 +273,7 @@ msgstr "tulostiedostoa ei voi avata"
 
 #: iconv/iconv_prog.c:241
 #, c-format
-msgid "conversion from `%s' and to `%s' are not supported"
+msgid "conversions from `%s' and to `%s' are not supported"
 msgstr "muunnos \"%s\" <-> \"%s\" ei ole tuettu"
 
 #: iconv/iconv_prog.c:246
@@ -376,7 +376,7 @@ msgid "Prefix used for all file accesses"
 msgstr "Jokaisen tiedoston ksittelyss kytettv etuliite"
 
 #: iconv/iconvconfig.c:327 locale/programs/localedef.c:292
-msgid "no output file produced because warning were issued"
+msgid "no output file produced because warnings were issued"
 msgstr "tulostiedostoa ei tuotettu varoituksen takia"
 
 #: iconv/iconvconfig.c:405
@@ -751,7 +751,7 @@ msgstr "%s: symbolisen vlin sanankatkaisua ei saa suoraan seurata \"order_end\"
 
 #: locale/programs/ld-collate.c:1287 locale/programs/ld-ctype.c:1467
 #, c-format
-msgid "`%s' and `%.*s' are no valid names for symbolic range"
+msgid "`%s' and `%.*s' are not valid names for symbolic range"
 msgstr "\"%s\" ja \"%.*s\" eivt ole kelvollisia nimi symboliselle vlille"
 
 #: locale/programs/ld-collate.c:1333 locale/programs/ld-collate.c:3712
@@ -1652,7 +1652,7 @@ msgid "no <Uxxxx> or <Uxxxxxxxx> value given"
 msgstr "ei <Uxxxx>- tai <Uxxxxxxxx>-arvoa annettu"
 
 #: locale/programs/repertoire.c:332
-msgid "cannot safe new repertoire map"
+msgid "cannot save new repertoire map"
 msgstr "uutta valikoimakarttaa ei voi turvata"
 
 #: locale/programs/repertoire.c:343
@@ -3065,7 +3065,7 @@ msgid "%s: usage is %s [ -v ] [ -c cutoff ] zonename ...\n"
 msgstr "%s: kytt: %s [ -v ] [ -c katkaisu ] vyhykenimi ...\n"
 
 #: timezone/zdump.c:268
-msgid "Error writing standard output"
+msgid "Error writing to standard output"
 msgstr "Virhe kirjoitettaessa vakiotulosteeseen"
 
 #: timezone/zic.c:365
@@ -5086,7 +5086,7 @@ msgstr "tulosta ei voi kirjoittaa: %s"
 
 #: nscd/connections.c:405 nscd/connections.c:499
 #, c-format
-msgid "error getting callers id: %s"
+msgid "error getting caller's id: %s"
 msgstr "virhe kutsujan tunnisteen hakemisessa: %s"
 
 #: nscd/connections.c:471
diff --git a/po/fr.po b/po/fr.po
index 793f9e0b7f..c5e1d65353 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -260,7 +260,7 @@ msgstr "Ne peut ouvrir le fichier de sortie"
 
 #: iconv/iconv_prog.c:243
 #, c-format
-msgid "conversion from `%s' and to `%s' are not supported"
+msgid "conversions from `%s' and to `%s' are not supported"
 msgstr "conversions de  %s  et de , vers  %s  ne sont pas supportes"
 
 #: iconv/iconv_prog.c:248
@@ -362,7 +362,7 @@ msgid "Prefix used for all file accesses"
 msgstr "Prfixe utilis pour tous les accs fichiers"
 
 #: iconv/iconvconfig.c:327 locale/programs/localedef.c:292
-msgid "no output file produced because warning were issued"
+msgid "no output file produced because warnings were issued"
 msgstr "Aucun fichier de sortie gnr en raison d'un avertissement dj mis"
 
 #: iconv/iconvconfig.c:405
@@ -741,7 +741,7 @@ msgstr "%s: plage de l'ellipse symbolique ne doit pas tre suivie directement de
 
 #: locale/programs/ld-collate.c:1299 locale/programs/ld-ctype.c:1476
 #, c-format
-msgid "`%s' and `%.*s' are no valid names for symbolic range"
+msgid "`%s' and `%.*s' are not valid names for symbolic range"
 msgstr " %s  et  %.*s  sont des noms invalides pour un intervalle symbolique."
 
 #: locale/programs/ld-collate.c:1348 locale/programs/ld-collate.c:3737
@@ -1664,7 +1664,7 @@ msgid "no <Uxxxx> or <Uxxxxxxxx> value given"
 msgstr "Aucune valeur <Uxxxx> ou <Uxxxxxxxx> fournie"
 
 #: locale/programs/repertoire.c:332
-msgid "cannot safe new repertoire map"
+msgid "cannot save new repertoire map"
 msgstr "Ne peut sauvegarder la nouvelle table des rpertoires"
 
 #: locale/programs/repertoire.c:343
@@ -3087,7 +3087,7 @@ msgid "%s: usage is %s [ --version ] [ -v ] [ -c cutoff ] zonename ...\n"
 msgstr "%s: usage est %s [ --version ] [ -v ] [ -c seuil ] nom_du_fuseau_horaire ...\n"
 
 #: timezone/zdump.c:269
-msgid "Error writing standard output"
+msgid "Error writing to standard output"
 msgstr "ERREUR d'criture sur la sortie standard"
 
 #: timezone/zic.c:361
@@ -5131,7 +5131,7 @@ msgstr "Ne peut crire les rsultats:  %s "
 
 #: nscd/connections.c:392 nscd/connections.c:514
 #, c-format
-msgid "error getting callers id: %s"
+msgid "error getting caller's id: %s"
 msgstr "erreur lors de la recherche de l'identificateur de l'appelant: %s"
 
 #: nscd/connections.c:485
diff --git a/po/gl.po b/po/gl.po
index e5eeeb735f..9ac322e206 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -259,7 +259,7 @@ msgstr "non se pode abri-lo ficheiro de sada"
 
 #: iconv/iconv_prog.c:241
 #, c-format
-msgid "conversion from `%s' and to `%s' are not supported"
+msgid "conversions from `%s' and to `%s' are not supported"
 msgstr "as conversins de `%s' e a `%s' non estn soportadas"
 
 #: iconv/iconv_prog.c:246
@@ -360,7 +360,7 @@ msgid "Prefix used for all file accesses"
 msgstr "Prefixo a empregar para tdolos accesos a ficheiro"
 
 #: iconv/iconvconfig.c:327 locale/programs/localedef.c:292
-msgid "no output file produced because warning were issued"
+msgid "no output file produced because warnings were issued"
 msgstr "non se producu un ficheiro de sada porque se deron avisos"
 
 #: iconv/iconvconfig.c:405
@@ -735,7 +735,7 @@ msgstr "%s: os puntos suspensivos do rango simblico non deben ir seguidos direc
 
 #: locale/programs/ld-collate.c:1287 locale/programs/ld-ctype.c:1467
 #, c-format
-msgid "`%s' and `%.*s' are no valid names for symbolic range"
+msgid "`%s' and `%.*s' are not valid names for symbolic range"
 msgstr "`%s' e `%.*s' non son nomes vlidos para o rango simblico"
 
 #: locale/programs/ld-collate.c:1333 locale/programs/ld-collate.c:3712
@@ -1636,7 +1636,7 @@ msgid "no <Uxxxx> or <Uxxxxxxxx> value given"
 msgstr "non se deu un valor <Uxxxx> ou <Uxxxxxxxx>"
 
 #: locale/programs/repertoire.c:332
-msgid "cannot safe new repertoire map"
+msgid "cannot save new repertoire map"
 msgstr "non se pode grava-lo novo mapa de repertorios"
 
 #: locale/programs/repertoire.c:343
@@ -3049,7 +3049,7 @@ msgid "%s: usage is %s [ -v ] [ -c cutoff ] zonename ...\n"
 msgstr "%s: sase %s [ -v ] [ -c corte ] nomezona ...\n"
 
 #: timezone/zdump.c:268
-msgid "Error writing standard output"
+msgid "Error writing to standard output"
 msgstr "Erro ao escribir na sada estndar"
 
 #: timezone/zic.c:365
@@ -5070,7 +5070,7 @@ msgstr "non se pode escribi-lo resultado: %s"
 
 #: nscd/connections.c:405 nscd/connections.c:499
 #, c-format
-msgid "error getting callers id: %s"
+msgid "error getting caller's id: %s"
 msgstr "erro ao obte-lo identificador do chamante: %s"
 
 #: nscd/connections.c:471
diff --git a/po/hr.po b/po/hr.po
index 940bfccee4..68e7c4f3f3 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -1870,7 +1870,7 @@ msgid "Error while talking to callback proc"
 msgstr ""
 
 #: timezone/zdump.c:268
-msgid "Error writing standard output"
+msgid "Error writing to standard output"
 msgstr ""
 
 #: inet/ruserpass.c:184
@@ -3828,7 +3828,7 @@ msgstr "`%1$s' definicija ne završava sa `END %1$s'"
 
 #: locale/programs/ld-collate.c:1281 locale/programs/ld-ctype.c:1455
 #, c-format
-msgid "`%s' and `%.*s' are no valid names for symbolic range"
+msgid "`%s' and `%.*s' are not valid names for symbolic range"
 msgstr ""
 
 #: elf/sprof.c:762
@@ -4117,7 +4117,7 @@ msgid "cannot read statistics data"
 msgstr "ne moogu pročitati statistike"
 
 #: locale/programs/repertoire.c:331
-msgid "cannot safe new repertoire map"
+msgid "cannot save new repertoire map"
 msgstr ""
 
 #: elf/dl-load.c:784
@@ -4339,7 +4339,7 @@ msgstr "enkoding izvornog teksta"
 
 #: nscd/connections.c:366 nscd/connections.c:460
 #, c-format
-msgid "error getting callers id: %s"
+msgid "error getting caller's id: %s"
 msgstr "greška pri dohvatu broja pozivatelja: %s"
 
 #: locale/programs/ld-collate.c:3032
@@ -4777,7 +4777,7 @@ msgid "no output digits defined and none of the standard names in the charmap"
 msgstr ""
 
 #: iconv/iconvconfig.c:308 locale/programs/localedef.c:236
-msgid "no output file produced because warning were issued"
+msgid "no output file produced because warnings were issued"
 msgstr ""
 
 #: locale/programs/charmap.c:493 locale/programs/charmap.c:673 locale/programs/charmap.c:769 locale/programs/repertoire.c:231
diff --git a/po/hu.po b/po/hu.po
index c17fd4026d..054fadcb9e 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -1968,7 +1968,7 @@ msgid "Error while talking to callback proc"
 msgstr "Hiba amg kommunikltam a visszahv folyamattal"
 
 #: timezone/zdump.c:268
-msgid "Error writing standard output"
+msgid "Error writing to standard output"
 msgstr "Hiba az alaprtelmezett kimenetre rs sorn"
 
 #: inet/ruserpass.c:184
@@ -4025,7 +4025,7 @@ msgstr "a `%1$s' meghatrozs nem vgzdhet `END %1$s' -re"
 
 #: locale/programs/ld-collate.c:1281 locale/programs/ld-ctype.c:1455
 #, c-format
-msgid "`%s' and `%.*s' are no valid names for symbolic range"
+msgid "`%s' and `%.*s' are not valid names for symbolic range"
 msgstr "a `%s' s a `%.*s' nem rvnyesek a szimbolikus tartomnyban"
 
 #: elf/sprof.c:762
@@ -4318,7 +4318,7 @@ msgid "cannot read statistics data"
 msgstr "nem lehet olvasni a statisztikai adatokat"
 
 #: locale/programs/repertoire.c:331
-msgid "cannot safe new repertoire map"
+msgid "cannot save new repertoire map"
 msgstr "nem biztonsgos j repertor"
 
 #: elf/dl-load.c:784
@@ -4540,7 +4540,7 @@ msgstr "az eredeti szveg kdolsa"
 
 #: nscd/connections.c:366 nscd/connections.c:460
 #, c-format
-msgid "error getting callers id: %s"
+msgid "error getting caller's id: %s"
 msgstr "hiba a hv azonosts sorn: %s"
 
 #: locale/programs/ld-collate.c:3032
@@ -4984,7 +4984,7 @@ msgid "no output digits defined and none of the standard names in the charmap"
 msgstr "nincs kimeneti szm meghatrozva s nincs szabvnyos nv a karakterkszletben"
 
 #: iconv/iconvconfig.c:308 locale/programs/localedef.c:236
-msgid "no output file produced because warning were issued"
+msgid "no output file produced because warnings were issued"
 msgstr "nem jtt ltre kimeneti fjl, mert figyelmeztetst kaptam"
 
 #: locale/programs/charmap.c:493 locale/programs/charmap.c:673
diff --git a/po/ja.po b/po/ja.po
index fe9a913b5a..6a4036bc53 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -259,7 +259,7 @@ msgstr "ϥե򳫤ޤ"
 
 #: iconv/iconv_prog.c:243
 #, c-format
-msgid "conversion from `%s' and to `%s' are not supported"
+msgid "conversions from `%s' and to `%s' are not supported"
 msgstr "`%s'Ѵ`%s'ؤѴϤɤ⥵ݡȤƤޤ"
 
 #: iconv/iconv_prog.c:248
@@ -362,7 +362,7 @@ msgid "Prefix used for all file accesses"
 msgstr "եΥ˥ץեåѤޤ"
 
 #: iconv/iconvconfig.c:327 locale/programs/localedef.c:292
-msgid "no output file produced because warning were issued"
+msgid "no output file produced because warnings were issued"
 msgstr "ٹ𤬽Ф줿ե˽ϤޤǤ"
 
 #: iconv/iconvconfig.c:405
@@ -737,7 +737,7 @@ msgstr "%s: ܥϰϾά`order_end'Τ³ƤϤޤ"
 
 #: locale/programs/ld-collate.c:1299 locale/programs/ld-ctype.c:1476
 #, c-format
-msgid "`%s' and `%.*s' are no valid names for symbolic range"
+msgid "`%s' and `%.*s' are not valid names for symbolic range"
 msgstr "`%s'  `%.*s' ϥܥϰϤȤ̾Ǥ"
 
 #: locale/programs/ld-collate.c:1348 locale/programs/ld-collate.c:3737
@@ -1654,7 +1654,7 @@ msgid "no <Uxxxx> or <Uxxxxxxxx> value given"
 msgstr "<Uxxxx> ޤ <Uxxxxxxxx> ͤͿޤǤ"
 
 #: locale/programs/repertoire.c:332
-msgid "cannot safe new repertoire map"
+msgid "cannot save new repertoire map"
 msgstr "ѡȥޥåפϰǤϤޤ"
 
 #: locale/programs/repertoire.c:343
@@ -3075,7 +3075,7 @@ msgid "%s: usage is %s [ --version ] [ -v ] [ -c cutoff ] zonename ...\n"
 msgstr "%s: ˡ %s [ --version ] [ -v ] [ -c cutoff ] zonename ...\n"
 
 #: timezone/zdump.c:269
-msgid "Error writing standard output"
+msgid "Error writing to standard output"
 msgstr "顼ɸϤ˽񤭽Ф"
 
 #: timezone/zic.c:361
@@ -5112,7 +5112,7 @@ msgstr "̤񤭹ޤ: %s"
 
 #: nscd/connections.c:392 nscd/connections.c:514
 #, c-format
-msgid "error getting callers id: %s"
+msgid "error getting caller's id: %s"
 msgstr "ƤӽФIDμǥ顼: %s"
 
 #: nscd/connections.c:485
diff --git a/po/ko.po b/po/ko.po
index 0acb170c47..bb8ae322df 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -260,7 +260,7 @@ msgstr "    ϴ"
 
 #: iconv/iconv_prog.c:243
 #, c-format
-msgid "conversion from `%s' and to `%s' are not supported"
+msgid "conversions from `%s' and to `%s' are not supported"
 msgstr "`%s' ȯ  `%s' ȯ  ʽϴ"
 
 #: iconv/iconv_prog.c:248
@@ -361,7 +361,7 @@ msgid "Prefix used for all file accesses"
 msgstr "  ٿ ϴ ξ"
 
 #: iconv/iconvconfig.c:327 locale/programs/localedef.c:292
-msgid "no output file produced because warning were issued"
+msgid "no output file produced because warnings were issued"
 msgstr " Ǿ     ʾҽϴ"
 
 #: iconv/iconvconfig.c:405
@@ -739,7 +739,7 @@ msgstr "%s: ȣ  ǥ `order_end' ٷ ڿ ͼ  ˴ϴ"
 
 #: locale/programs/ld-collate.c:1299 locale/programs/ld-ctype.c:1476
 #, c-format
-msgid "`%s' and `%.*s' are no valid names for symbolic range"
+msgid "`%s' and `%.*s' are not valid names for symbolic range"
 msgstr "`%s'() `%.*s'() ȣ  밡 ̸ ƴմϴ"
 
 #: locale/programs/ld-collate.c:1348 locale/programs/ld-collate.c:3737
@@ -1667,7 +1667,7 @@ msgstr "<Uxxxx> Ȥ <Uxxxxxxxx>  ־ ʾҽϴ"
 
 # : safe  ???
 #: locale/programs/repertoire.c:332
-msgid "cannot safe new repertoire map"
+msgid "cannot save new repertoire map"
 msgstr "ο 丮     ϴ"
 
 #: locale/programs/repertoire.c:343
@@ -3096,7 +3096,7 @@ msgid "%s: usage is %s [ --version ] [ -v ] [ -c cutoff ] zonename ...\n"
 msgstr "%s:  %s [ --version ] [ -v ] [ -c  ]  ... Դϴ\n"
 
 #: timezone/zdump.c:269
-msgid "Error writing standard output"
+msgid "Error writing to standard output"
 msgstr "ǥ ¿   "
 
 #: timezone/zic.c:361
@@ -5131,7 +5131,7 @@ msgstr "   ϴ: %s"
 
 #: nscd/connections.c:392 nscd/connections.c:514
 #, c-format
-msgid "error getting callers id: %s"
+msgid "error getting caller's id: %s"
 msgstr "ȣ ID µ : %s"
 
 #: nscd/connections.c:485
diff --git a/po/libc.pot b/po/libc.pot
index 77407a1f61..b8cfc3d200 100644
--- a/po/libc.pot
+++ b/po/libc.pot
@@ -1208,7 +1208,7 @@ msgstr ""
 
 #: iconv/iconv_prog.c:241
 #, c-format
-msgid "conversion from `%s' and to `%s' are not supported"
+msgid "conversions from `%s' and to `%s' are not supported"
 msgstr ""
 
 #: iconv/iconv_prog.c:246
@@ -1295,7 +1295,7 @@ msgstr ""
 
 #: iconv/iconvconfig.c:342 locale/programs/localedef.c:290
 #, c-format
-msgid "no output file produced because warning were issued"
+msgid "no output file produced because warnings were issued"
 msgstr ""
 
 #: iconv/iconvconfig.c:428
@@ -1774,7 +1774,7 @@ msgstr ""
 
 #: locale/programs/ld-collate.c:1297 locale/programs/ld-ctype.c:1475
 #, c-format
-msgid "`%s' and `%.*s' are no valid names for symbolic range"
+msgid "`%s' and `%.*s' are not valid names for symbolic range"
 msgstr ""
 
 #: locale/programs/ld-collate.c:1346 locale/programs/ld-collate.c:3737
@@ -2720,7 +2720,7 @@ msgstr ""
 
 #: locale/programs/repertoire.c:331
 #, c-format
-msgid "cannot safe new repertoire map"
+msgid "cannot save new repertoire map"
 msgstr ""
 
 #: locale/programs/repertoire.c:342
@@ -3637,7 +3637,7 @@ msgstr ""
 
 #: nscd/connections.c:1066
 #, c-format
-msgid "error getting callers id: %s"
+msgid "error getting caller's id: %s"
 msgstr ""
 
 #: nscd/connections.c:1124 nscd/connections.c:1138
@@ -6012,7 +6012,7 @@ msgid "%s: wild -c argument %s\n"
 msgstr ""
 
 #: timezone/zdump.c:392
-msgid "Error writing standard output"
+msgid "Error writing to standard output"
 msgstr ""
 
 #: timezone/zdump.c:415
diff --git a/po/nb.po b/po/nb.po
index 5cd99940e0..9b5cfef641 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -264,7 +264,7 @@ msgstr "kan ikke pne utfil"
 
 #: iconv/iconv_prog.c:241
 #, c-format
-msgid "conversion from `%s' and to `%s' are not supported"
+msgid "conversions from `%s' and to `%s' are not supported"
 msgstr "konvertering fra %s til %s er ikke stttet"
 
 #: iconv/iconv_prog.c:246
@@ -366,7 +366,7 @@ msgid "Prefix used for all file accesses"
 msgstr "Prefiks brukt for all filaksessering"
 
 #: iconv/iconvconfig.c:327 locale/programs/localedef.c:292
-msgid "no output file produced because warning were issued"
+msgid "no output file produced because warnings were issued"
 msgstr "p grunn av advarsler ble ingen utfil opprettet"
 
 #: iconv/iconvconfig.c:405
@@ -742,7 +742,7 @@ msgstr "%s: symbolsk omrde-ellipse m ikke flges direkte av order_end"
 
 #: locale/programs/ld-collate.c:1287 locale/programs/ld-ctype.c:1467
 #, c-format
-msgid "`%s' and `%.*s' are no valid names for symbolic range"
+msgid "`%s' and `%.*s' are not valid names for symbolic range"
 msgstr "%s og %.*s er ulovlige navn for symbolsk omrde"
 
 #: locale/programs/ld-collate.c:1333 locale/programs/ld-collate.c:3712
@@ -1662,7 +1662,7 @@ msgstr "ingen <Uxxxx>- eller <Uxxxxxxxx>-verdi gitt"
 
 #: locale/programs/repertoire.c:332
 #, fuzzy
-msgid "cannot safe new repertoire map"
+msgid "cannot save new repertoire map"
 msgstr "kan ikke lese ferdighetskart %s"
 
 #: locale/programs/repertoire.c:343
@@ -3148,7 +3148,7 @@ msgstr "%s: bruk er %s [ -v ] [ -c grense ] sonenavn ...\n"
 
 #: timezone/zdump.c:268
 #, fuzzy
-msgid "Error writing standard output"
+msgid "Error writing to standard output"
 msgstr "%s: Feil ved skriving til standard ut "
 
 #: timezone/zic.c:365
@@ -5208,7 +5208,7 @@ msgstr "kan ikke skrive ut resultat: %s"
 
 #: nscd/connections.c:405 nscd/connections.c:499
 #, c-format
-msgid "error getting callers id: %s"
+msgid "error getting caller's id: %s"
 msgstr ""
 
 #: nscd/connections.c:471
diff --git a/po/nl.po b/po/nl.po
index ed8944580f..69c479514e 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -261,7 +261,7 @@ msgstr "kan uitvoerbestand niet openen"
 
 #: iconv/iconv_prog.c:243
 #, c-format
-msgid "conversion from `%s' and to `%s' are not supported"
+msgid "conversions from `%s' and to `%s' are not supported"
 msgstr "conversie van `%s' en naar `%s' wordt niet ondersteund"
 
 #: iconv/iconv_prog.c:248
@@ -367,7 +367,7 @@ msgid "Prefix used for all file accesses"
 msgstr "Voorvoegsel gebruikt voor alle bestandstoegang"
 
 #: iconv/iconvconfig.c:327 locale/programs/localedef.c:292
-msgid "no output file produced because warning were issued"
+msgid "no output file produced because warnings were issued"
 msgstr "geen uitvoerbestand gemaakt omdat waarschuwing is gegeven"
 
 #: iconv/iconvconfig.c:405
@@ -742,7 +742,7 @@ msgstr "%s: weglatingsteken van symbolisch bereik mag niet direct gevolgd worden
 
 #: locale/programs/ld-collate.c:1299 locale/programs/ld-ctype.c:1476
 #, c-format
-msgid "`%s' and `%.*s' are no valid names for symbolic range"
+msgid "`%s' and `%.*s' are not valid names for symbolic range"
 msgstr "`%s' en `%.*s' zijn geen geldige namen voor een symbolisch bereik"
 
 #: locale/programs/ld-collate.c:1348 locale/programs/ld-collate.c:3737
@@ -1659,7 +1659,7 @@ msgid "no <Uxxxx> or <Uxxxxxxxx> value given"
 msgstr "geen <Uxxxx> of <Uxxxxxxxx> waarde gegeven"
 
 #: locale/programs/repertoire.c:332
-msgid "cannot safe new repertoire map"
+msgid "cannot save new repertoire map"
 msgstr "kan nieuwe repertoire afbeelding niet opslaan"
 
 #: locale/programs/repertoire.c:343
@@ -3080,7 +3080,7 @@ msgid "%s: usage is %s [ --version ] [ -v ] [ -c cutoff ] zonename ...\n"
 msgstr "%s: gebruik is %s [ --version ] [ -v ] [ -c afkapwaarde ] zonenaam ...\n"
 
 #: timezone/zdump.c:269
-msgid "Error writing standard output"
+msgid "Error writing to standard output"
 msgstr "Fout bij schrijven naar standaard uitvoer"
 
 #: timezone/zic.c:361
@@ -5117,7 +5117,7 @@ msgstr "kan resultaat niet schrijven: %s"
 
 #: nscd/connections.c:392 nscd/connections.c:514
 #, c-format
-msgid "error getting callers id: %s"
+msgid "error getting caller's id: %s"
 msgstr "fout bij opvragen ID van aanroeper: %s"
 
 #: nscd/connections.c:485
diff --git a/po/pl.po b/po/pl.po
index 84914a140b..b4f9b29285 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -261,7 +261,7 @@ msgstr "nie mona otworzy pliku wyjciowego"
 
 #: iconv/iconv_prog.c:243
 #, c-format
-msgid "conversion from `%s' and to `%s' are not supported"
+msgid "conversions from `%s' and to `%s' are not supported"
 msgstr "konwersja z `%s' oraz do `%s' nie jest obsugiwana"
 
 #: iconv/iconv_prog.c:248
@@ -364,7 +364,7 @@ msgid "Prefix used for all file accesses"
 msgstr "Prefiks uywany przy kadym dostpie do pliku"
 
 #: iconv/iconvconfig.c:327 locale/programs/localedef.c:292
-msgid "no output file produced because warning were issued"
+msgid "no output file produced because warnings were issued"
 msgstr "nie utworzono pliku wyjciowego, poniewa wystpiy ostrzeenia"
 
 #: iconv/iconvconfig.c:405
@@ -743,7 +743,7 @@ msgstr "%s: wyrzutnia symbolicznego przedziau nie moe by bezporednio przed `
 
 #: locale/programs/ld-collate.c:1299 locale/programs/ld-ctype.c:1476
 #, c-format
-msgid "`%s' and `%.*s' are no valid names for symbolic range"
+msgid "`%s' and `%.*s' are not valid names for symbolic range"
 msgstr "`%s' i `%.*s' nie s poprawnymi nazwami dla symbolicznego przedziau"
 
 #: locale/programs/ld-collate.c:1348 locale/programs/ld-collate.c:3737
@@ -1662,7 +1662,7 @@ msgid "no <Uxxxx> or <Uxxxxxxxx> value given"
 msgstr "nie podano adnych wartoci <Uxxxx> lub <Uxxxxxxxx>"
 
 #: locale/programs/repertoire.c:332
-msgid "cannot safe new repertoire map"
+msgid "cannot save new repertoire map"
 msgstr "nie mona zachowa nowej tablicy repertuaru"
 
 #: locale/programs/repertoire.c:343
@@ -3086,7 +3086,7 @@ msgid "%s: usage is %s [ --version ] [ -v ] [ -c cutoff ] zonename ...\n"
 msgstr "%s: skadnia: %s [ --version ] [ -v ] [ -c rok ] nazwa_strefy...\n"
 
 #: timezone/zdump.c:269
-msgid "Error writing standard output"
+msgid "Error writing to standard output"
 msgstr "Bd podczas pisania na standardowe wyjcie"
 
 #: timezone/zic.c:361
@@ -5129,7 +5129,7 @@ msgstr "nie mona zapisa wyniku: %s"
 
 #: nscd/connections.c:392 nscd/connections.c:514
 #, c-format
-msgid "error getting callers id: %s"
+msgid "error getting caller's id: %s"
 msgstr "bd podczas pobierania identyfikatorw wywoujcych: %s"
 
 #: nscd/connections.c:485
diff --git a/po/pt_BR.po b/po/pt_BR.po
index d4e4e8b445..47bd0a4adc 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -323,7 +323,7 @@ msgstr "%s: Erro escrevendo %s\n"
 
 #: timezone/zdump.c:266
 #, c-format
-msgid "%s: Error writing standard output "
+msgid "%s: Error writing to standard output "
 msgstr "%s: Erro escrevendo para sada padro "
 
 #: timezone/zic.c:841
@@ -3642,7 +3642,7 @@ msgid "no other keyword shall be specified when `copy' is used"
 msgstr "nehuma outra palavra-chave deve ser especificada quando `copy'  usado"
 
 #: locale/programs/localedef.c:334
-msgid "no output file produced because warning were issued"
+msgid "no output file produced because warnings were issued"
 msgstr "nenhum arquivo de sada foi produzido porque avisos foram emitidos"
 
 #: locale/programs/locfile.c:283 locale/programs/locfile.c:301
diff --git a/po/ru.po b/po/ru.po
index bc7650b39d..d1b3efc8cb 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -259,7 +259,7 @@ msgstr "   "
 
 #: iconv/iconv_prog.c:243
 #, c-format
-msgid "conversion from `%s' and to `%s' are not supported"
+msgid "conversions from `%s' and to `%s' are not supported"
 msgstr "  `%s'   `%s'  "
 
 #: iconv/iconv_prog.c:248
@@ -361,7 +361,7 @@ msgid "Prefix used for all file accesses"
 msgstr ",      "
 
 #: iconv/iconvconfig.c:327 locale/programs/localedef.c:292
-msgid "no output file produced because warning were issued"
+msgid "no output file produced because warnings were issued"
 msgstr "   ,   "
 
 #: iconv/iconvconfig.c:405
@@ -736,7 +736,7 @@ msgstr "%s:        
 
 #: locale/programs/ld-collate.c:1299 locale/programs/ld-ctype.c:1476
 #, c-format
-msgid "`%s' and `%.*s' are no valid names for symbolic range"
+msgid "`%s' and `%.*s' are not valid names for symbolic range"
 msgstr "`%s'  `%.*s'      "
 
 #: locale/programs/ld-collate.c:1348 locale/programs/ld-collate.c:3737
@@ -1649,7 +1649,7 @@ msgid "no <Uxxxx> or <Uxxxxxxxx> value given"
 msgstr "   <Uxxxx>  <Uxxxxxxxx>"
 
 #: locale/programs/repertoire.c:332
-msgid "cannot safe new repertoire map"
+msgid "cannot save new repertoire map"
 msgstr ""
 
 #: locale/programs/repertoire.c:343
@@ -3074,7 +3074,7 @@ msgid "%s: usage is %s [ --version ] [ -v ] [ -c cutoff ] zonename ...\n"
 msgstr "%s: : %s [ --version ] [ -v ] [ -c cutoff ] - ...\n"
 
 #: timezone/zdump.c:269
-msgid "Error writing standard output"
+msgid "Error writing to standard output"
 msgstr "    "
 
 #: timezone/zic.c:361
@@ -5112,7 +5112,7 @@ msgstr "  : %s"
 
 #: nscd/connections.c:392 nscd/connections.c:514
 #, c-format
-msgid "error getting callers id: %s"
+msgid "error getting caller's id: %s"
 msgstr "     : %s"
 
 #: nscd/connections.c:485
diff --git a/po/rw.po b/po/rw.po
index 49f1b50f5a..1216e74ad6 100644
--- a/po/rw.po
+++ b/po/rw.po
@@ -302,7 +302,7 @@ msgstr "Gufungura Ibisohoka IDOSIYE"
 
 #: iconv/iconv_prog.c:243
 #, fuzzy, c-format
-msgid "conversion from `%s' and to `%s' are not supported"
+msgid "conversions from `%s' and to `%s' are not supported"
 msgstr "Ihindurangero Bivuye Na Kuri OYA"
 
 #: iconv/iconv_prog.c:248
@@ -403,7 +403,7 @@ msgstr "kugirango Byose IDOSIYE"
 
 #: iconv/iconvconfig.c:327 locale/programs/localedef.c:292
 #, fuzzy
-msgid "no output file produced because warning were issued"
+msgid "no output file produced because warnings were issued"
 msgstr "Oya Ibisohoka IDOSIYE Iburira Byasohowe"
 
 #: iconv/iconvconfig.c:405
@@ -825,7 +825,7 @@ msgstr "%s:Urutonde OYA ku"
 
 #: locale/programs/ld-collate.c:1299 locale/programs/ld-ctype.c:1476
 #, fuzzy, c-format
-msgid "`%s' and `%.*s' are no valid names for symbolic range"
+msgid "`%s' and `%.*s' are not valid names for symbolic range"
 msgstr "`%s'Na."
 
 #: locale/programs/ld-collate.c:1348 locale/programs/ld-collate.c:3737
@@ -1823,7 +1823,7 @@ msgstr "Oya Cyangwa Agaciro"
 
 #: locale/programs/repertoire.c:332
 #, fuzzy
-msgid "cannot safe new repertoire map"
+msgid "cannot save new repertoire map"
 msgstr "Gishya"
 
 #: locale/programs/repertoire.c:343
@@ -3440,7 +3440,7 @@ msgstr "%s:Ikoresha: ni Verisiyo v C"
 
 #: timezone/zdump.c:269
 #, fuzzy
-msgid "Error writing standard output"
+msgid "Error writing to standard output"
 msgstr "Bisanzwe Ibisohoka"
 
 #: timezone/zic.c:361
@@ -5785,7 +5785,7 @@ msgstr "Kwandika Igisubizo"
 
 #: nscd/connections.c:392 nscd/connections.c:514
 #, fuzzy, c-format
-msgid "error getting callers id: %s"
+msgid "error getting caller's id: %s"
 msgstr "Ikosa ID"
 
 #: nscd/connections.c:485
diff --git a/po/sk.po b/po/sk.po
index 45bb186179..ca25159381 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -260,7 +260,7 @@ msgstr "nie je možné otvoriť výstupný súbor"
 
 #: iconv/iconv_prog.c:243
 #, c-format
-msgid "conversion from `%s' and to `%s' are not supported"
+msgid "conversions from `%s' and to `%s' are not supported"
 msgstr "konverzie z `%s' a do `%s' nie sú podporované"
 
 #: iconv/iconv_prog.c:248
@@ -361,7 +361,7 @@ msgid "Prefix used for all file accesses"
 msgstr "Predpona použitá pre všetky prístupy k súborom"
 
 #: iconv/iconvconfig.c:327 locale/programs/localedef.c:292
-msgid "no output file produced because warning were issued"
+msgid "no output file produced because warnings were issued"
 msgstr "výstupný súbor nebol vytvorený kvôli výskytu varovaní"
 
 #: iconv/iconvconfig.c:405
@@ -736,7 +736,7 @@ msgstr "%s: pokračovanie symbolického rozsahu nesmie byť priamo nasledované
 
 #: locale/programs/ld-collate.c:1299 locale/programs/ld-ctype.c:1476
 #, c-format
-msgid "`%s' and `%.*s' are no valid names for symbolic range"
+msgid "`%s' and `%.*s' are not valid names for symbolic range"
 msgstr "`%s' a `%.*s' sú neprípustné názvy pre symbolický rozsah"
 
 #: locale/programs/ld-collate.c:1348 locale/programs/ld-collate.c:3737
@@ -1653,7 +1653,7 @@ msgid "no <Uxxxx> or <Uxxxxxxxx> value given"
 msgstr "nezadaná <Uxxxx> alebo <Uxxxxxxxx> hodnota"
 
 #: locale/programs/repertoire.c:332
-msgid "cannot safe new repertoire map"
+msgid "cannot save new repertoire map"
 msgstr "nie je možné uchovať mapu repertoáru"
 
 #: locale/programs/repertoire.c:343
@@ -3074,7 +3074,7 @@ msgid "%s: usage is %s [ --version ] [ -v ] [ -c cutoff ] zonename ...\n"
 msgstr "%s: použitie je %s [ --version ] [ -v ] [ -c limit ] meno_zóny ...\n"
 
 #: timezone/zdump.c:269
-msgid "Error writing standard output"
+msgid "Error writing to standard output"
 msgstr "Chyba pri zápise na štandardný výstup"
 
 #: timezone/zic.c:361
@@ -5115,7 +5115,7 @@ msgstr "nie je možné zapísať výsledok: %s"
 
 #: nscd/connections.c:392 nscd/connections.c:514
 #, c-format
-msgid "error getting callers id: %s"
+msgid "error getting caller's id: %s"
 msgstr "chyba pri získaní id volajúceho: %s"
 
 #: nscd/connections.c:485
diff --git a/po/sv.po b/po/sv.po
index 1c532b72d9..0bd2f977c6 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -260,7 +260,7 @@ msgstr "kan inte ppna utfil"
 
 #: iconv/iconv_prog.c:243
 #, c-format
-msgid "conversion from `%s' and to `%s' are not supported"
+msgid "conversions from `%s' and to `%s' are not supported"
 msgstr "konvertering frn \"%s\" och till \"%s\" stds ej"
 
 #: iconv/iconv_prog.c:248
@@ -364,7 +364,7 @@ msgid "Prefix used for all file accesses"
 msgstr "Prefix att anvnda fr alla filtkomster"
 
 #: iconv/iconvconfig.c:327 locale/programs/localedef.c:292
-msgid "no output file produced because warning were issued"
+msgid "no output file produced because warnings were issued"
 msgstr "ingen utfil skapad p grund av varningar"
 
 #: iconv/iconvconfig.c:405
@@ -741,7 +741,7 @@ msgstr "%s: symboliskt intervall kan inte omedelbart fljas av \"order_end\""
 
 #: locale/programs/ld-collate.c:1299 locale/programs/ld-ctype.c:1476
 #, c-format
-msgid "`%s' and `%.*s' are no valid names for symbolic range"
+msgid "`%s' and `%.*s' are not valid names for symbolic range"
 msgstr "\"%s\" och \"%.*s\" r otilltna namn fr symboliskt intervall"
 
 #: locale/programs/ld-collate.c:1348 locale/programs/ld-collate.c:3737
@@ -1658,7 +1658,7 @@ msgid "no <Uxxxx> or <Uxxxxxxxx> value given"
 msgstr "inget <Uxxxx> eller <Uxxxxxxxx> vrde angivet"
 
 #: locale/programs/repertoire.c:332
-msgid "cannot safe new repertoire map"
+msgid "cannot save new repertoire map"
 msgstr "kan inte skra repertoartabell"
 
 #: locale/programs/repertoire.c:343
@@ -3079,7 +3079,7 @@ msgid "%s: usage is %s [ --version ] [ -v ] [ -c cutoff ] zonename ...\n"
 msgstr "%s: anvndning r %s [ --version ] [ -v ] [ -c grns ] zonnamn ...\n"
 
 #: timezone/zdump.c:269
-msgid "Error writing standard output"
+msgid "Error writing to standard output"
 msgstr "Fel vid skrivning till standard ut"
 
 #: timezone/zic.c:361
@@ -5114,7 +5114,7 @@ msgstr "kan inte skriva resultat: %s"
 
 #: nscd/connections.c:392 nscd/connections.c:514
 #, c-format
-msgid "error getting callers id: %s"
+msgid "error getting caller's id: %s"
 msgstr "kunde inte hmta anropandes identitet: %s"
 
 #: nscd/connections.c:485
diff --git a/po/tr.po b/po/tr.po
index 9271c3c087..10e6de8f35 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -261,7 +261,7 @@ msgstr "çıktı dosyası açılamıyor"
 
 #: iconv/iconv_prog.c:243
 #, c-format
-msgid "conversion from `%s' and to `%s' are not supported"
+msgid "conversions from `%s' and to `%s' are not supported"
 msgstr "`%s'den ve `%s'e dönüşüm desteklenmiyor"
 
 #: iconv/iconv_prog.c:248
@@ -366,7 +366,7 @@ msgid "Prefix used for all file accesses"
 msgstr "Tüm dosya erişimlerinde kullanılan önek"
 
 #: iconv/iconvconfig.c:327 locale/programs/localedef.c:292
-msgid "no output file produced because warning were issued"
+msgid "no output file produced because warnings were issued"
 msgstr "uyarı yayınlandığından üretilen bir çıktı dosyası yok"
 
 #: iconv/iconvconfig.c:405
@@ -741,7 +741,7 @@ msgstr "%s: sembolik kapsam elipslerinin hemen ardından `order_end' gelmemelidi
 
 #: locale/programs/ld-collate.c:1299 locale/programs/ld-ctype.c:1476
 #, c-format
-msgid "`%s' and `%.*s' are no valid names for symbolic range"
+msgid "`%s' and `%.*s' are not valid names for symbolic range"
 msgstr "`%s' ve `%.*s' sembolik kapsam için geçerli isimler değil"
 
 #: locale/programs/ld-collate.c:1348 locale/programs/ld-collate.c:3737
@@ -1658,7 +1658,7 @@ msgid "no <Uxxxx> or <Uxxxxxxxx> value given"
 msgstr "<Uxxxx> ya da <Uxxxxxxxx> değeri verilmeliydi"
 
 #: locale/programs/repertoire.c:332
-msgid "cannot safe new repertoire map"
+msgid "cannot save new repertoire map"
 msgstr "yeni repertuvar eşlemin doğruluğundan emin olunamaz "
 
 #: locale/programs/repertoire.c:343
@@ -3084,7 +3084,7 @@ msgstr ""
 "zamanDilimiİsmi ...\n"
 
 #: timezone/zdump.c:269
-msgid "Error writing standard output"
+msgid "Error writing to standard output"
 msgstr "Standart çıktıya yazarken hata"
 
 #: timezone/zic.c:361
@@ -5122,7 +5122,7 @@ msgstr "sonuç yazılamıyor: %s"
 
 #: nscd/connections.c:392 nscd/connections.c:514
 #, c-format
-msgid "error getting callers id: %s"
+msgid "error getting caller's id: %s"
 msgstr "çağrıcı kimliği alınırken hata: %s"
 
 #: nscd/connections.c:485
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 9754fb30f5..30f2722073 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -259,7 +259,7 @@ msgstr "޷ļ"
 
 #: iconv/iconv_prog.c:241
 #, c-format
-msgid "conversion from `%s' and to `%s' are not supported"
+msgid "conversions from `%s' and to `%s' are not supported"
 msgstr "ִ֧ӡ%s%sת"
 
 #: iconv/iconv_prog.c:246
@@ -351,7 +351,7 @@ msgid "Prefix used for all file accesses"
 msgstr "ļʵǰ׺"
 
 #: iconv/iconvconfig.c:327 locale/programs/localedef.c:292
-msgid "no output file produced because warning were issued"
+msgid "no output file produced because warnings were issued"
 msgstr "ڳ־δļ"
 
 #: iconv/iconvconfig.c:405
@@ -726,7 +726,7 @@ msgstr ""
 
 #: locale/programs/ld-collate.c:1287 locale/programs/ld-ctype.c:1467
 #, c-format
-msgid "`%s' and `%.*s' are no valid names for symbolic range"
+msgid "`%s' and `%.*s' are not valid names for symbolic range"
 msgstr ""
 
 #: locale/programs/ld-collate.c:1333 locale/programs/ld-collate.c:3712
@@ -1623,7 +1623,7 @@ msgid "no <Uxxxx> or <Uxxxxxxxx> value given"
 msgstr "δ <Uxxxx> Ҳδ <Uxxxxxxxx>"
 
 #: locale/programs/repertoire.c:332
-msgid "cannot safe new repertoire map"
+msgid "cannot save new repertoire map"
 msgstr ""
 
 #: locale/programs/repertoire.c:343
@@ -3033,7 +3033,7 @@ msgid "%s: usage is %s [ -v ] [ -c cutoff ] zonename ...\n"
 msgstr "%s÷Ϊ %s [ -v ] [ -c cutoff ]  ...\n"
 
 #: timezone/zdump.c:268
-msgid "Error writing standard output"
+msgid "Error writing to standard output"
 msgstr "д׼"
 
 #: timezone/zic.c:365
@@ -5054,7 +5054,7 @@ msgstr "޷д%s"
 
 #: nscd/connections.c:405 nscd/connections.c:499
 #, c-format
-msgid "error getting callers id: %s"
+msgid "error getting caller's id: %s"
 msgstr ""
 
 #: nscd/connections.c:471
diff --git a/po/zh_TW.po b/po/zh_TW.po
index a117c9f5ff..7fbf3c7118 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -262,7 +262,7 @@ msgstr "無法開啟輸出檔"
 
 #: iconv/iconv_prog.c:243
 #, c-format
-msgid "conversion from `%s' and to `%s' are not supported"
+msgid "conversions from `%s' and to `%s' are not supported"
 msgstr "不支援從 `%s' 以及到 `%s' 的轉換"
 
 #: iconv/iconv_prog.c:248
@@ -362,7 +362,7 @@ msgid "Prefix used for all file accesses"
 msgstr "使用於所有檔案存取時的前置文字"
 
 #: iconv/iconvconfig.c:327 locale/programs/localedef.c:292
-msgid "no output file produced because warning were issued"
+msgid "no output file produced because warnings were issued"
 msgstr "因為發出過警告訊息,所以沒有製造任何輸出檔"
 
 #: iconv/iconvconfig.c:405
@@ -737,7 +737,7 @@ msgstr "%s: 符號範圍的省略不可以直接在 `order_end' 之前"
 
 #: locale/programs/ld-collate.c:1299 locale/programs/ld-ctype.c:1476
 #, c-format
-msgid "`%s' and `%.*s' are no valid names for symbolic range"
+msgid "`%s' and `%.*s' are not valid names for symbolic range"
 msgstr "`%s' 和 `%.*s' 皆非符號範圍中適用的名稱"
 
 #: locale/programs/ld-collate.c:1348 locale/programs/ld-collate.c:3737
@@ -1654,7 +1654,7 @@ msgid "no <Uxxxx> or <Uxxxxxxxx> value given"
 msgstr "沒有給定 <Uxxxx> 或 <Uxxxxxxxx> 的值"
 
 #: locale/programs/repertoire.c:332
-msgid "cannot safe new repertoire map"
+msgid "cannot save new repertoire map"
 msgstr "無法儲存新的編碼對映檔"
 
 #: locale/programs/repertoire.c:343
@@ -3107,7 +3107,7 @@ msgid "%s: usage is %s [ --version ] [ -v ] [ -c cutoff ] zonename ...\n"
 msgstr "%s: 用法是 %s [ --version ] [ -v ] [ -c 切斷 ] 地區名稱 ...\n"
 
 #: timezone/zdump.c:269
-msgid "Error writing standard output"
+msgid "Error writing to standard output"
 msgstr "寫入標準輸出時錯誤"
 
 #: timezone/zic.c:361
@@ -5142,7 +5142,7 @@ msgstr "無法寫入結果: %s"
 
 #: nscd/connections.c:392 nscd/connections.c:514
 #, c-format
-msgid "error getting callers id: %s"
+msgid "error getting caller's id: %s"
 msgstr "取得呼叫程式識別碼時發生錯誤: %s"
 
 #: nscd/connections.c:485
diff --git a/sysdeps/powerpc/powerpc32/__longjmp-common.S b/sysdeps/powerpc/powerpc32/__longjmp-common.S
index 411b6a20cb..2093b7e337 100644
--- a/sysdeps/powerpc/powerpc32/__longjmp-common.S
+++ b/sysdeps/powerpc/powerpc32/__longjmp-common.S
@@ -31,7 +31,11 @@
 ENTRY (BP_SYM (__longjmp))
 	CHECK_BOUNDS_BOTH_WIDE_LIT (r3, r8, r9, JB_SIZE)
 
+#ifdef PTR_DEMANGLE
+	lwz r24,(JB_GPR1*4)(r3)
+#else
 	lwz r1,(JB_GPR1*4)(r3)
+#endif
 	lwz r0,(JB_LR*4)(r3)
 	lwz r14,((JB_GPRS+0)*4)(r3)
 	lwz r15,((JB_GPRS+1)*4)(r3)
@@ -41,8 +45,8 @@ ENTRY (BP_SYM (__longjmp))
 	lwz r19,((JB_GPRS+5)*4)(r3)
 	lwz r20,((JB_GPRS+6)*4)(r3)
 #ifdef PTR_DEMANGLE
-	PTR_DEMANGLE (r0, r25)
-	PTR_DEMANGLE2 (r1, r25)
+	PTR_DEMANGLE3 (r1, r24, r25)
+	PTR_DEMANGLE2 (r0, r25)
 #endif
 	mtlr r0
 	lwz r21,((JB_GPRS+7)*4)(r3)
diff --git a/sysdeps/powerpc/powerpc32/fpu/__longjmp-common.S b/sysdeps/powerpc/powerpc32/fpu/__longjmp-common.S
index aa24b059d1..404f403855 100644
--- a/sysdeps/powerpc/powerpc32/fpu/__longjmp-common.S
+++ b/sysdeps/powerpc/powerpc32/fpu/__longjmp-common.S
@@ -114,7 +114,11 @@ aligned_restore_vmx:
 	lvx	v31,0,r6
 L(no_vmx):
 #endif
+#ifdef PTR_DEMANGLE
+	lwz r24,(JB_GPR1*4)(r3)
+#else
 	lwz r1,(JB_GPR1*4)(r3)
+#endif
 	lwz r0,(JB_LR*4)(r3)
 	lwz r14,((JB_GPRS+0)*4)(r3)
 	lfd fp14,((JB_FPRS+0*2)*4)(r3)
@@ -131,8 +135,8 @@ L(no_vmx):
 	lwz r20,((JB_GPRS+6)*4)(r3)
 	lfd fp20,((JB_FPRS+6*2)*4)(r3)
 #ifdef PTR_DEMANGLE
-	PTR_DEMANGLE (r0, r25)
-	PTR_DEMANGLE2 (r1, r25)
+	PTR_DEMANGLE3 (r1, r24, r25)
+	PTR_DEMANGLE2 (r0, r25)
 #endif
 	mtlr r0
 	lwz r21,((JB_GPRS+7)*4)(r3)
diff --git a/sysdeps/powerpc/powerpc64/__longjmp-common.S b/sysdeps/powerpc/powerpc64/__longjmp-common.S
index 31b1af34f9..700a2a543c 100644
--- a/sysdeps/powerpc/powerpc64/__longjmp-common.S
+++ b/sysdeps/powerpc/powerpc64/__longjmp-common.S
@@ -108,9 +108,11 @@ aligned_restore_vmx:
 	lvx	v31,0,r6
 L(no_vmx):
 #endif
-	ld r1,(JB_GPR1*8)(r3)
 #ifdef PTR_DEMANGLE
-	PTR_DEMANGLE (r1, r25)
+	ld r22,(JB_GPR1*8)(r3)
+	PTR_DEMANGLE3 (r1, r22, r25)
+#else
+	ld r1,(JB_GPR1*8)(r3)
 #endif
 	ld r2,(JB_GPR2*8)(r3)
 	ld r0,(JB_LR*8)(r3)
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep.h b/sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep.h
index 470da5aa6e..c42efbabdd 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep.h
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1992,1997-2003,2004,2005 Free Software Foundation, Inc.
+/* Copyright (C) 1992,1997-2003,2004,2005,2006 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -285,8 +285,12 @@
 	xor	reg,tmpreg,reg
 #  define PTR_MANGLE2(reg, tmpreg) \
 	xor	reg,tmpreg,reg
+#  define PTR_MANGLE3(destreg, reg, tmpreg) \
+	lwz	tmpreg,POINTER_GUARD(r2); \
+	xor	destreg,tmpreg,reg
 #  define PTR_DEMANGLE(reg, tmpreg) PTR_MANGLE (reg, tmpreg)
 #  define PTR_DEMANGLE2(reg, tmpreg) PTR_MANGLE2 (reg, tmpreg)
+#  define PTR_DEMANGLE3(destreg, reg, tmpreg) PTR_MANGLE3 (destreg, reg, tmpreg)
 # else
 #  define PTR_MANGLE(var) \
   (var) = (__typeof (var)) ((uintptr_t) (var) ^ THREAD_GET_POINTER_GUARD ())
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep.h b/sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep.h
index fd67f56983..aab4b721c0 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep.h
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep.h
@@ -299,8 +299,12 @@
 	xor	reg,tmpreg,reg
 #  define PTR_MANGLE2(reg, tmpreg) \
 	xor	reg,tmpreg,reg
+#  define PTR_MANGLE3(destreg, reg, tmpreg) \
+	ld	tmpreg,POINTER_GUARD(r13); \
+	xor	destreg,tmpreg,reg
 #  define PTR_DEMANGLE(reg, tmpreg) PTR_MANGLE (reg, tmpreg)
 #  define PTR_DEMANGLE2(reg, tmpreg) PTR_MANGLE2 (reg, tmpreg)
+#  define PTR_DEMANGLE3(destreg, reg, tmpreg) PTR_MANGLE3 (destreg, reg, tmpreg)
 # else
 #  define PTR_MANGLE(var) \
   (var) = (__typeof (var)) ((uintptr_t) (var) ^ THREAD_GET_POINTER_GUARD ())