summaryrefslogtreecommitdiff
path: root/libc/po/libc.pot
diff options
context:
space:
mode:
authorjoseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d>2006-09-29 14:03:13 +0000
committerjoseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d>2006-09-29 14:03:13 +0000
commitd6e2601562c38769f4192523e6598e1005818549 (patch)
treec49ef0ecbf5054fcd823b7acc39c2759d0204235 /libc/po/libc.pot
parent6f98bd87b527a819e1ccd4bbd0156cbd0c8fd7cd (diff)
Merge changes between r76 and r285 from /fsf/trunk.
git-svn-id: svn://svn.eglibc.org/trunk@286 7b3dc134-2b1b-0410-93df-9e9f96275f8d
Diffstat (limited to 'libc/po/libc.pot')
-rw-r--r--libc/po/libc.pot12
1 files changed, 6 insertions, 6 deletions
diff --git a/libc/po/libc.pot b/libc/po/libc.pot
index 77407a1f6..b8cfc3d20 100644
--- a/libc/po/libc.pot
+++ b/libc/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