diff options
| -rw-r--r-- | ChangeLog | 22 | ||||
| -rw-r--r-- | po/be.po | 24 | ||||
| -rw-r--r-- | po/bg.po | 22 | ||||
| -rw-r--r-- | po/ca.po | 22 | ||||
| -rw-r--r-- | po/cs.po | 22 | ||||
| -rw-r--r-- | po/da.po | 22 | ||||
| -rw-r--r-- | po/de.po | 22 | ||||
| -rw-r--r-- | po/es.po | 22 | ||||
| -rw-r--r-- | po/fr.po | 22 | ||||
| -rw-r--r-- | po/hr.po | 22 | ||||
| -rw-r--r-- | po/ko.po | 22 | ||||
| -rw-r--r-- | po/nl.po | 22 | ||||
| -rw-r--r-- | po/rw.po | 22 | ||||
| -rw-r--r-- | po/sk.po | 22 | ||||
| -rw-r--r-- | po/sv.po | 22 | ||||
| -rw-r--r-- | po/tr.po | 22 | ||||
| -rw-r--r-- | po/zh_CN.po | 22 | ||||
| -rw-r--r-- | po/zh_TW.po | 22 | ||||
| -rw-r--r-- | posix/getopt.c | 65 |
19 files changed, 242 insertions, 221 deletions
diff --git a/ChangeLog b/ChangeLog index 951cf3576f..911775530b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,27 @@ 2008-03-08 Ulrich Drepper <drepper@redhat.com> + [BZ #5762] + * posix/getopt.c (_getopt_internal_r): Clarify error message by + putting offending option character in quotes. Clean up error + messages. + * po/be.po: Adjust msgstr in translation file. + * po/bg.po: Likewise. + * po/ca.po: Likewise. + * po/cs.po: Likewise. + * po/da.po: Likewise. + * po/de.po: Likewise. + * po/es.po: Likewise. + * po/fr.po: Likewise. + * po/hr.po: Likewise. + * po/ko.po: Likewise. + * po/nl.po: Likewise. + * po/rw.po: Likewise. + * po/sk.po: Likewise. + * po/sv.po: Likewise. + * po/tr.po: Likewise. + * po/zh_CN.po: Likewise. + * po/zh_TW.po: Likewise. + [BZ #5760] * inet/inet6_opt.c (inet6_opt_init): Fix ip6h_len computation. Patch by Roland Bless <roland@bless.de>. diff --git a/po/be.po b/po/be.po index b69264a1ee..fb9c3e53f4 100644 --- a/po/be.po +++ b/po/be.po @@ -3448,59 +3448,59 @@ msgstr "Нераспазнаная пераменная \"%s\"" #: posix/getopt.c:692 posix/getopt.c:704 #, c-format -msgid "%s: option `%s' is ambiguous\n" +msgid "%s: option '%s' is ambiguous\n" msgstr "" #: posix/getopt.c:737 posix/getopt.c:741 #, c-format -msgid "%s: option `--%s' doesn't allow an argument\n" +msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "" #: posix/getopt.c:750 posix/getopt.c:755 #, c-format -msgid "%s: option `%c%s' doesn't allow an argument\n" +msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "" #: posix/getopt.c:791 posix/getopt.c:804 posix/getopt.c:1093 #: posix/getopt.c:1106 #, c-format -msgid "%s: option `%s' requires an argument\n" +msgid "%s: option '%s' requires an argument\n" msgstr "" #: posix/getopt.c:842 posix/getopt.c:845 #, c-format -msgid "%s: unrecognized option `--%s'\n" +msgid "%s: unrecognized option '--%s'\n" msgstr "" #: posix/getopt.c:853 posix/getopt.c:856 #, c-format -msgid "%s: unrecognized option `%c%s'\n" +msgid "%s: unrecognized option '%c%s'\n" msgstr "" #: posix/getopt.c:903 posix/getopt.c:906 #, c-format -msgid "%s: illegal option -- %c\n" -msgstr "%s: недапушчальны выраб -- %c\n" +msgid "%s: illegal option -- '%c'\n" +msgstr "%s: недапушчальны выраб -- '%c'\n" #: posix/getopt.c:912 posix/getopt.c:915 #, c-format -msgid "%s: invalid option -- %c\n" +msgid "%s: invalid option -- '%c'\n" msgstr "" #: posix/getopt.c:962 posix/getopt.c:973 posix/getopt.c:1159 #: posix/getopt.c:1172 #, c-format -msgid "%s: option requires an argument -- %c\n" +msgid "%s: option requires an argument -- '%c'\n" msgstr "" #: posix/getopt.c:1025 posix/getopt.c:1036 #, c-format -msgid "%s: option `-W %s' is ambiguous\n" +msgid "%s: option '-W %s' is ambiguous\n" msgstr "" #: posix/getopt.c:1060 posix/getopt.c:1072 #, c-format -msgid "%s: option `-W %s' doesn't allow an argument\n" +msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "" #: posix/regcomp.c:136 diff --git a/po/bg.po b/po/bg.po index 279476dd29..a8bcbb3b8d 100644 --- a/po/bg.po +++ b/po/bg.po @@ -4210,59 +4210,59 @@ msgstr "" #: posix/getopt.c:571 posix/getopt.c:587 #, c-format -msgid "%s: option `%s' is ambiguous\n" +msgid "%s: option '%s' is ambiguous\n" msgstr "" #: posix/getopt.c:620 posix/getopt.c:624 #, c-format -msgid "%s: option `--%s' doesn't allow an argument\n" +msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "" #: posix/getopt.c:633 posix/getopt.c:638 #, c-format -msgid "%s: option `%c%s' doesn't allow an argument\n" +msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "" #: posix/getopt.c:681 posix/getopt.c:700 posix/getopt.c:1016 #: posix/getopt.c:1035 #, c-format -msgid "%s: option `%s' requires an argument\n" +msgid "%s: option '%s' requires an argument\n" msgstr "" #: posix/getopt.c:738 posix/getopt.c:741 #, c-format -msgid "%s: unrecognized option `--%s'\n" +msgid "%s: unrecognized option '--%s'\n" msgstr "" #: posix/getopt.c:749 posix/getopt.c:752 #, c-format -msgid "%s: unrecognized option `%c%s'\n" +msgid "%s: unrecognized option '%c%s'\n" msgstr "" #: posix/getopt.c:804 posix/getopt.c:807 #, c-format -msgid "%s: illegal option -- %c\n" +msgid "%s: illegal option -- '%c'\n" msgstr "" #: posix/getopt.c:813 posix/getopt.c:816 #, c-format -msgid "%s: invalid option -- %c\n" +msgid "%s: invalid option -- '%c'\n" msgstr "" #: posix/getopt.c:868 posix/getopt.c:884 posix/getopt.c:1088 #: posix/getopt.c:1106 #, c-format -msgid "%s: option requires an argument -- %c\n" +msgid "%s: option requires an argument -- '%c'\n" msgstr "" #: posix/getopt.c:937 posix/getopt.c:953 #, c-format -msgid "%s: option `-W %s' is ambiguous\n" +msgid "%s: option '-W %s' is ambiguous\n" msgstr "" #: posix/getopt.c:977 posix/getopt.c:995 #, c-format -msgid "%s: option `-W %s' doesn't allow an argument\n" +msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "" #: posix/regcomp.c:135 diff --git a/po/ca.po b/po/ca.po index add3c495e7..98b9bd65ac 100644 --- a/po/ca.po +++ b/po/ca.po @@ -4497,59 +4497,59 @@ msgstr "la variable «%s» no és reconeguda" #: posix/getopt.c:571 posix/getopt.c:587 #, c-format -msgid "%s: option `%s' is ambiguous\n" +msgid "%s: option '%s' is ambiguous\n" msgstr "%s: l’opció «%s» és ambígua\n" #: posix/getopt.c:620 posix/getopt.c:624 #, c-format -msgid "%s: option `--%s' doesn't allow an argument\n" +msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s: l’opció «--%s» no admet arguments\n" #: posix/getopt.c:633 posix/getopt.c:638 #, c-format -msgid "%s: option `%c%s' doesn't allow an argument\n" +msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s: l’opció «%c%s» no admet arguments\n" #: posix/getopt.c:681 posix/getopt.c:700 posix/getopt.c:1016 #: posix/getopt.c:1035 #, c-format -msgid "%s: option `%s' requires an argument\n" +msgid "%s: option '%s' requires an argument\n" msgstr "%s: l’opció «%s» necessita un argument\n" #: posix/getopt.c:738 posix/getopt.c:741 #, c-format -msgid "%s: unrecognized option `--%s'\n" +msgid "%s: unrecognized option '--%s'\n" msgstr "%s: l’opció «--%s» no és reconeguda\n" #: posix/getopt.c:749 posix/getopt.c:752 #, c-format -msgid "%s: unrecognized option `%c%s'\n" +msgid "%s: unrecognized option '%c%s'\n" msgstr "%s: l’opció «%c%s» no és reconeguda\n" #: posix/getopt.c:804 posix/getopt.c:807 #, c-format -msgid "%s: illegal option -- %c\n" +msgid "%s: illegal option -- '%c'\n" msgstr "%s: no es permet l’opció «%c»\n" #: posix/getopt.c:813 posix/getopt.c:816 #, c-format -msgid "%s: invalid option -- %c\n" +msgid "%s: invalid option -- '%c'\n" msgstr "%s: l’opció «%c» no és vàlida\n" #: posix/getopt.c:868 posix/getopt.c:884 posix/getopt.c:1088 #: posix/getopt.c:1106 #, c-format -msgid "%s: option requires an argument -- %c\n" +msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: l’opció «%c» necessita un argument\n" #: posix/getopt.c:937 posix/getopt.c:953 #, c-format -msgid "%s: option `-W %s' is ambiguous\n" +msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s: l’opció «-W %s» és ambígua\n" #: posix/getopt.c:977 posix/getopt.c:995 #, c-format -msgid "%s: option `-W %s' doesn't allow an argument\n" +msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s: l’opció «-W %s» no admet arguments\n" #: posix/regcomp.c:135 diff --git a/po/cs.po b/po/cs.po index cd34a0349b..d1d3d72aa9 100644 --- a/po/cs.po +++ b/po/cs.po @@ -4359,35 +4359,35 @@ msgstr "Neznámá proměnná „%s“" #: posix/getopt.c:571 posix/getopt.c:587 #, c-format -msgid "%s: option `%s' is ambiguous\n" +msgid "%s: option '%s' is ambiguous\n" msgstr "%s: přepínač „%s“ není jednoznačný\n" #: posix/getopt.c:620 posix/getopt.c:624 #, c-format -msgid "%s: option `--%s' doesn't allow an argument\n" +msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s: přepínač „--%s“ musí být zadán bez argumentu\n" #: posix/getopt.c:633 posix/getopt.c:638 #, c-format -msgid "%s: option `%c%s' doesn't allow an argument\n" +msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s: přepínač „%c%s“ musí být zadán bez argumentu\n" #: posix/getopt.c:681 posix/getopt.c:700 posix/getopt.c:1016 #: posix/getopt.c:1035 #, c-format -msgid "%s: option `%s' requires an argument\n" +msgid "%s: option '%s' requires an argument\n" msgstr "%s: přepínač „%s“ vyžaduje argument\n" # Říká, že žádný přepínač takového jména nebyl nalezen. #: posix/getopt.c:738 posix/getopt.c:741 #, c-format -msgid "%s: unrecognized option `--%s'\n" +msgid "%s: unrecognized option '--%s'\n" msgstr "%s: neznámý přepínač „--%s“\n" # Říká, že žádný přepínač takového jména nebyl nalezen. #: posix/getopt.c:749 posix/getopt.c:752 #, c-format -msgid "%s: unrecognized option `%c%s'\n" +msgid "%s: unrecognized option '%c%s'\n" msgstr "%s: neznámý přepínač „%c%s“\n" # Rozdíl mezi 'illegal option' a 'invalid option' není žádný. To která zpráva @@ -4395,29 +4395,29 @@ msgstr "%s: neznámý přepínač „%c%s“\n" # 'Illegal option' je POSIXové. #: posix/getopt.c:804 posix/getopt.c:807 #, c-format -msgid "%s: illegal option -- %c\n" +msgid "%s: illegal option -- '%c'\n" msgstr "%s: neznámý přepínač -- %c\n" # Vysvětlení viz 'illegal option' #: posix/getopt.c:813 posix/getopt.c:816 #, c-format -msgid "%s: invalid option -- %c\n" +msgid "%s: invalid option -- '%c'\n" msgstr "%s: neznámý přepínač -- %c\n" #: posix/getopt.c:868 posix/getopt.c:884 posix/getopt.c:1088 #: posix/getopt.c:1106 #, c-format -msgid "%s: option requires an argument -- %c\n" +msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: přepínač vyžaduje argument – %c\n" #: posix/getopt.c:937 posix/getopt.c:953 #, c-format -msgid "%s: option `-W %s' is ambiguous\n" +msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s: přepínač „-W %s“ není jednoznačný\n" #: posix/getopt.c:977 posix/getopt.c:995 #, c-format -msgid "%s: option `-W %s' doesn't allow an argument\n" +msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s: přepínač „-W %s“ musí být zadán bez argumentu\n" # Nenalezeno diff --git a/po/da.po b/po/da.po index bf62fd54cc..73f077ec15 100644 --- a/po/da.po +++ b/po/da.po @@ -3473,59 +3473,59 @@ msgstr "Ukendt variabel '%s'" #: posix/getopt.c:692 posix/getopt.c:704 #, c-format -msgid "%s: option `%s' is ambiguous\n" +msgid "%s: option '%s' is ambiguous\n" msgstr "%s: flaget '%s' er flertydigt\n" #: posix/getopt.c:737 posix/getopt.c:741 #, c-format -msgid "%s: option `--%s' doesn't allow an argument\n" +msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s: flaget '--%s' tager ikke argumenter\n" #: posix/getopt.c:750 posix/getopt.c:755 #, c-format -msgid "%s: option `%c%s' doesn't allow an argument\n" +msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s: flaget '%c%s' tager ikke argumenter\n" #: posix/getopt.c:791 posix/getopt.c:804 posix/getopt.c:1093 #: posix/getopt.c:1106 #, c-format -msgid "%s: option `%s' requires an argument\n" +msgid "%s: option '%s' requires an argument\n" msgstr "%s: flaget '%s' skal have et argument\n" #: posix/getopt.c:842 posix/getopt.c:845 #, c-format -msgid "%s: unrecognized option `--%s'\n" +msgid "%s: unrecognized option '--%s'\n" msgstr "%s: ukendt flag '--%s'\n" #: posix/getopt.c:853 posix/getopt.c:856 #, c-format -msgid "%s: unrecognized option `%c%s'\n" +msgid "%s: unrecognized option '%c%s'\n" msgstr "%s: ukendt flag '%c%s'\n" #: posix/getopt.c:903 posix/getopt.c:906 #, c-format -msgid "%s: illegal option -- %c\n" +msgid "%s: illegal option -- '%c'\n" msgstr "%s: ulovligt flag -- %c\n" #: posix/getopt.c:912 posix/getopt.c:915 #, c-format -msgid "%s: invalid option -- %c\n" +msgid "%s: invalid option -- '%c'\n" msgstr "%s: ugyldigt flag -- %c\n" #: posix/getopt.c:962 posix/getopt.c:973 posix/getopt.c:1159 #: posix/getopt.c:1172 #, c-format -msgid "%s: option requires an argument -- %c\n" +msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: flaget skal have et argument -- %c\n" #: posix/getopt.c:1025 posix/getopt.c:1036 #, c-format -msgid "%s: option `-W %s' is ambiguous\n" +msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s: flaget '-W %s' er flertydigt\n" #: posix/getopt.c:1060 posix/getopt.c:1072 #, c-format -msgid "%s: option `-W %s' doesn't allow an argument\n" +msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s: flaget '-W %s' tager ikke argumenter\n" #: posix/regcomp.c:136 diff --git a/po/de.po b/po/de.po index 346cc8435b..b564f55894 100644 --- a/po/de.po +++ b/po/de.po @@ -3590,59 +3590,59 @@ msgstr "Unbekannte Variable »%s«" #: posix/getopt.c:692 posix/getopt.c:711 #, c-format -msgid "%s: option `%s' is ambiguous\n" +msgid "%s: option '%s' is ambiguous\n" msgstr "%s: Die Option »%s« ist nicht eindeutig\n" #: posix/getopt.c:744 posix/getopt.c:748 #, c-format -msgid "%s: option `--%s' doesn't allow an argument\n" +msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s: Die Option »--%s« erlaubt kein Argument\n" #: posix/getopt.c:757 posix/getopt.c:762 #, c-format -msgid "%s: option `%c%s' doesn't allow an argument\n" +msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s: Die Option »%c%s« erlaubt kein Argument\n" #: posix/getopt.c:807 posix/getopt.c:829 posix/getopt.c:1159 #: posix/getopt.c:1181 #, c-format -msgid "%s: option `%s' requires an argument\n" +msgid "%s: option '%s' requires an argument\n" msgstr "%s: Die Option »%s« erfordert ein Argument\n" #: posix/getopt.c:867 posix/getopt.c:870 #, c-format -msgid "%s: unrecognized option `--%s'\n" +msgid "%s: unrecognized option '--%s'\n" msgstr "%s: Unbekannte Option »--%s«\n" #: posix/getopt.c:878 posix/getopt.c:881 #, c-format -msgid "%s: unrecognized option `%c%s'\n" +msgid "%s: unrecognized option '%c%s'\n" msgstr "%s: Unbekannte Option »%c%s«\n" #: posix/getopt.c:936 posix/getopt.c:939 #, c-format -msgid "%s: illegal option -- %c\n" +msgid "%s: illegal option -- '%c'\n" msgstr "%s: Die Option ist nicht erlaubt -- »%c«\n" #: posix/getopt.c:945 posix/getopt.c:948 #, c-format -msgid "%s: invalid option -- %c\n" +msgid "%s: invalid option -- '%c'\n" msgstr "%s: Ungültige Option -- %c\n" #: posix/getopt.c:1003 posix/getopt.c:1022 posix/getopt.c:1234 #: posix/getopt.c:1255 #, c-format -msgid "%s: option requires an argument -- %c\n" +msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: Diese Option benötigt ein Argument -- »%c«\n" #: posix/getopt.c:1074 posix/getopt.c:1093 #, c-format -msgid "%s: option `-W %s' is ambiguous\n" +msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s: Die Option »-W %s« ist nicht eindeutig\n" #: posix/getopt.c:1117 posix/getopt.c:1138 #, c-format -msgid "%s: option `-W %s' doesn't allow an argument\n" +msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s: Die Option »-W %s« erlaubt kein Argument\n" #: posix/regcomp.c:150 diff --git a/po/es.po b/po/es.po index 14d547fc97..493a54c60d 100644 --- a/po/es.po +++ b/po/es.po @@ -3920,38 +3920,38 @@ msgstr "Variable no reconocida `%s'" #: posix/getopt.c:692 posix/getopt.c:711 #, c-format -msgid "%s: option `%s' is ambiguous\n" +msgid "%s: option '%s' is ambiguous\n" msgstr "%s: la opcin `%s' es ambigua\n" #: posix/getopt.c:744 posix/getopt.c:748 #, c-format -msgid "%s: option `--%s' doesn't allow an argument\n" +msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s: la opcin `--%s' no admite ningn argumento\n" #: posix/getopt.c:757 posix/getopt.c:762 #, c-format -msgid "%s: option `%c%s' doesn't allow an argument\n" +msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s: la opcin `%c%s' no admite ningn argumento\n" #: posix/getopt.c:807 posix/getopt.c:829 posix/getopt.c:1159 #: posix/getopt.c:1181 #, c-format -msgid "%s: option `%s' requires an argument\n" +msgid "%s: option '%s' requires an argument\n" msgstr "%s: la opcin `%s' requiere un argumento\n" #: posix/getopt.c:867 posix/getopt.c:870 #, c-format -msgid "%s: unrecognized option `--%s'\n" +msgid "%s: unrecognized option '--%s'\n" msgstr "%s: opcin no reconocida `--%s'\n" #: posix/getopt.c:878 posix/getopt.c:881 #, c-format -msgid "%s: unrecognized option `%c%s'\n" +msgid "%s: unrecognized option '%c%s'\n" msgstr "%s: opcin no reconocida `%c%s'\n" #: posix/getopt.c:936 posix/getopt.c:939 #, c-format -msgid "%s: illegal option -- %c\n" +msgid "%s: illegal option -- '%c'\n" msgstr "%s: opcin ilegal -- %c\n" # Qu tiene de malo "invlida"? sv @@ -3970,23 +3970,23 @@ msgstr "%s: opcin ilegal -- %c\n" # #: posix/getopt.c:945 posix/getopt.c:948 #, c-format -msgid "%s: invalid option -- %c\n" +msgid "%s: invalid option -- '%c'\n" msgstr "%s: opcin invlida -- %c\n" #: posix/getopt.c:1003 posix/getopt.c:1022 posix/getopt.c:1234 #: posix/getopt.c:1255 #, c-format -msgid "%s: option requires an argument -- %c\n" +msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: la opcin requiere un argumento --%c\n" #: posix/getopt.c:1074 posix/getopt.c:1093 #, c-format -msgid "%s: option `-W %s' is ambiguous\n" +msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s: la opcin `-W %s' es ambigua\n" #: posix/getopt.c:1117 posix/getopt.c:1138 #, c-format -msgid "%s: option `-W %s' doesn't allow an argument\n" +msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s: la opcin `-W %s' no admite ningn argumento\n" #: posix/regcomp.c:150 diff --git a/po/fr.po b/po/fr.po index deeb1821ff..f01e522cca 100644 --- a/po/fr.po +++ b/po/fr.po @@ -4330,59 +4330,59 @@ msgstr "Variable non reconnue « %s »" #: posix/getopt.c:571 posix/getopt.c:587 #, c-format -msgid "%s: option `%s' is ambiguous\n" +msgid "%s: option '%s' is ambiguous\n" msgstr "%s : l'option « %s » est ambiguë\n" #: posix/getopt.c:620 posix/getopt.c:624 #, c-format -msgid "%s: option `--%s' doesn't allow an argument\n" +msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s : l'option « --%s » ne permet pas d'argument\n" #: posix/getopt.c:633 posix/getopt.c:638 #, c-format -msgid "%s: option `%c%s' doesn't allow an argument\n" +msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s : l'option « %c%s » ne permet pas d'argument.\n" #: posix/getopt.c:681 posix/getopt.c:700 posix/getopt.c:1016 #: posix/getopt.c:1035 #, c-format -msgid "%s: option `%s' requires an argument\n" +msgid "%s: option '%s' requires an argument\n" msgstr "%s : l'option « %s » requiert un argument\n" #: posix/getopt.c:738 posix/getopt.c:741 #, c-format -msgid "%s: unrecognized option `--%s'\n" +msgid "%s: unrecognized option '--%s'\n" msgstr "%s : option non reconnue « --%s »\n" #: posix/getopt.c:749 posix/getopt.c:752 #, c-format -msgid "%s: unrecognized option `%c%s'\n" +msgid "%s: unrecognized option '%c%s'\n" msgstr "%s : option non reconnue « %c%s »\n" #: posix/getopt.c:804 posix/getopt.c:807 #, c-format -msgid "%s: illegal option -- %c\n" +msgid "%s: illegal option -- '%c'\n" msgstr "%s : option non permise -- %c\n" #: posix/getopt.c:813 posix/getopt.c:816 #, c-format -msgid "%s: invalid option -- %c\n" +msgid "%s: invalid option -- '%c'\n" msgstr "%s : option invalide -- %c\n" #: posix/getopt.c:868 posix/getopt.c:884 posix/getopt.c:1088 #: posix/getopt.c:1106 #, c-format -msgid "%s: option requires an argument -- %c\n" +msgid "%s: option requires an argument -- '%c'\n" msgstr "%s : l'option requiert un argument -- %c\n" #: posix/getopt.c:937 posix/getopt.c:953 #, c-format -msgid "%s: option `-W %s' is ambiguous\n" +msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s : l'option « -W %s » est ambiguë\n" #: posix/getopt.c:977 posix/getopt.c:995 #, c-format -msgid "%s: option `-W %s' doesn't allow an argument\n" +msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s : l'option « -W %s » ne permet pas d'argument\n" #: posix/regcomp.c:135 diff --git a/po/hr.po b/po/hr.po index 68e7c4f3f3..b36e040d75 100644 --- a/po/hr.po +++ b/po/hr.po @@ -599,7 +599,7 @@ msgstr "%s: smeće pri kraju završnog datuma u znakovnom nizu %Zd u `era' polju #: posix/getopt.c:887 posix/getopt.c:890 #, c-format -msgid "%s: illegal option -- %c\n" +msgid "%s: illegal option -- '%c'\n" msgstr "%s: nedozvoljena opcija -- %c\n" #: locale/programs/ld-address.c:578 locale/programs/ld-collate.c:3738 locale/programs/ld-ctype.c:2846 locale/programs/ld-identification.c:445 locale/programs/ld-measurement.c:234 locale/programs/ld-messages.c:329 locale/programs/ld-monetary.c:934 locale/programs/ld-name.c:303 locale/programs/ld-numeric.c:373 locale/programs/ld-paper.c:236 locale/programs/ld-telephone.c:311 locale/programs/ld-time.c:1197 @@ -629,7 +629,7 @@ msgstr "%s: neispravan broj pravila za sortiranje" #: posix/getopt.c:896 posix/getopt.c:899 #, c-format -msgid "%s: invalid option -- %c\n" +msgid "%s: invalid option -- '%c'\n" msgstr "%s: nedozvoljena opcija -- %c\n" #: locale/programs/ld-time.c:330 @@ -754,37 +754,37 @@ msgstr "%s: brojčani kod zemlje `%d' nije ispravan" #: posix/getopt.c:743 posix/getopt.c:748 #, c-format -msgid "%s: option `%c%s' doesn't allow an argument\n" +msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s: opcija `%c%s' ne dopušta argument\n" #: posix/getopt.c:688 posix/getopt.c:698 #, c-format -msgid "%s: option `%s' is ambiguous\n" +msgid "%s: option '%s' is ambiguous\n" msgstr "%s: opcija `%s' je nejednoznačna\n" #: posix/getopt.c:782 posix/getopt.c:793 posix/getopt.c:1070 posix/getopt.c:1082 #, c-format -msgid "%s: option `%s' requires an argument\n" +msgid "%s: option '%s' requires an argument\n" msgstr "%s: opcija `%s' zahtijeva argument\n" #: posix/getopt.c:730 posix/getopt.c:734 #, c-format -msgid "%s: option `--%s' doesn't allow an argument\n" +msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s: opcija `--%s' ne dopušta argument\n" #: posix/getopt.c:1038 posix/getopt.c:1049 #, c-format -msgid "%s: option `-W %s' doesn't allow an argument\n" +msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s: opcija `-W %s' ne dopušta argument\n" #: posix/getopt.c:1004 posix/getopt.c:1014 #, c-format -msgid "%s: option `-W %s' is ambiguous\n" +msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s: opcija `-W %s' je nejednoznačna\n" #: posix/getopt.c:942 posix/getopt.c:952 posix/getopt.c:1136 posix/getopt.c:1147 #, c-format -msgid "%s: option requires an argument -- %c\n" +msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: opcija zahtijeva argument -- %c\n" #: locale/programs/ld-collate.c:1327 locale/programs/ld-collate.c:3675 @@ -949,12 +949,12 @@ msgstr "" #: posix/getopt.c:841 posix/getopt.c:844 #, c-format -msgid "%s: unrecognized option `%c%s'\n" +msgid "%s: unrecognized option '%c%s'\n" msgstr "%s: neprepoznata opcija `%c%s'\n" #: posix/getopt.c:830 posix/getopt.c:833 #, c-format -msgid "%s: unrecognized option `--%s'\n" +msgid "%s: unrecognized option '--%s'\n" msgstr "%s: neprepoznata opcija `--%s'\n" #: timezone/zic.c:449 diff --git a/po/ko.po b/po/ko.po index b58238a20c..947e4a425e 100644 --- a/po/ko.po +++ b/po/ko.po @@ -4330,59 +4330,59 @@ msgstr "인식할 수 없는 변수 `%s'" #: posix/getopt.c:571 posix/getopt.c:587 #, c-format -msgid "%s: option `%s' is ambiguous\n" +msgid "%s: option '%s' is ambiguous\n" msgstr "%s: `%s' 옵션은 모호한 옵션입니다\n" #: posix/getopt.c:620 posix/getopt.c:624 #, c-format -msgid "%s: option `--%s' doesn't allow an argument\n" +msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s: `--%s' 옵션은 인수를 허용하지 않습니다\n" #: posix/getopt.c:633 posix/getopt.c:638 #, c-format -msgid "%s: option `%c%s' doesn't allow an argument\n" +msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s: `%c%s' 옵션은 인수를 허용하지 않습니다\n" #: posix/getopt.c:681 posix/getopt.c:700 posix/getopt.c:1016 #: posix/getopt.c:1035 #, c-format -msgid "%s: option `%s' requires an argument\n" +msgid "%s: option '%s' requires an argument\n" msgstr "%s: `%s' 옵션은 인수가 필요합니다\n" #: posix/getopt.c:738 posix/getopt.c:741 #, c-format -msgid "%s: unrecognized option `--%s'\n" +msgid "%s: unrecognized option '--%s'\n" msgstr "%s: 인식할 수 없는 옵션 `--%s'\n" #: posix/getopt.c:749 posix/getopt.c:752 #, c-format -msgid "%s: unrecognized option `%c%s'\n" +msgid "%s: unrecognized option '%c%s'\n" msgstr "%s: 인식할 수 없는 옵션 `%c%s'\n" #: posix/getopt.c:804 posix/getopt.c:807 #, c-format -msgid "%s: illegal option -- %c\n" +msgid "%s: illegal option -- '%c'\n" msgstr "%s: 잘못된 옵션 -- %c\n" #: posix/getopt.c:813 posix/getopt.c:816 #, c-format -msgid "%s: invalid option -- %c\n" +msgid "%s: invalid option -- '%c'\n" msgstr "%s: 부적절한 옵션 -- %c\n" #: posix/getopt.c:868 posix/getopt.c:884 posix/getopt.c:1088 #: posix/getopt.c:1106 #, c-format -msgid "%s: option requires an argument -- %c\n" +msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: 이 옵션은 인수가 필요합니다 -- %c\n" #: posix/getopt.c:937 posix/getopt.c:953 #, c-format -msgid "%s: option `-W %s' is ambiguous\n" +msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s: `-W %s' 옵션은 모호한 옵션입니다\n" #: posix/getopt.c:977 posix/getopt.c:995 #, c-format -msgid "%s: option `-W %s' doesn't allow an argument\n" +msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s: `-W %s' 옵션은 인수를 허용하지 않습니다\n" #: posix/regcomp.c:135 diff --git a/po/nl.po b/po/nl.po index 7a8b439dcb..418fe74d6b 100644 --- a/po/nl.po +++ b/po/nl.po @@ -4356,59 +4356,59 @@ msgstr "Onbekende variabele '%s'" #: posix/getopt.c:571 posix/getopt.c:587 #, c-format -msgid "%s: option `%s' is ambiguous\n" +msgid "%s: option '%s' is ambiguous\n" msgstr "%s: optie '%s' is niet eenduidig\n" #: posix/getopt.c:620 posix/getopt.c:624 #, c-format -msgid "%s: option `--%s' doesn't allow an argument\n" +msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s: optie '--%s' staat geen argument toe\n" #: posix/getopt.c:633 posix/getopt.c:638 #, c-format -msgid "%s: option `%c%s' doesn't allow an argument\n" +msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s: optie '%c%s' staat geen argument toe\n" #: posix/getopt.c:681 posix/getopt.c:700 posix/getopt.c:1016 #: posix/getopt.c:1035 #, c-format -msgid "%s: option `%s' requires an argument\n" +msgid "%s: option '%s' requires an argument\n" msgstr "%s: optie '%s' vereist een argument\n" #: posix/getopt.c:738 posix/getopt.c:741 #, c-format -msgid "%s: unrecognized option `--%s'\n" +msgid "%s: unrecognized option '--%s'\n" msgstr "%s: onbekende optie '--%s'\n" #: posix/getopt.c:749 posix/getopt.c:752 #, c-format -msgid "%s: unrecognized option `%c%s'\n" +msgid "%s: unrecognized option '%c%s'\n" msgstr "%s: onbekende optie '%c%s'\n" #: posix/getopt.c:804 posix/getopt.c:807 #, c-format -msgid "%s: illegal option -- %c\n" +msgid "%s: illegal option -- '%c'\n" msgstr "%s: ongeldige optie -- %c\n" #: posix/getopt.c:813 posix/getopt.c:816 #, c-format -msgid "%s: invalid option -- %c\n" +msgid "%s: invalid option -- '%c'\n" msgstr "%s: ongeldige optie -- %c\n" #: posix/getopt.c:868 posix/getopt.c:884 posix/getopt.c:1088 #: posix/getopt.c:1106 #, c-format -msgid "%s: option requires an argument -- %c\n" +msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: optie vereist een argument -- %c\n" #: posix/getopt.c:937 posix/getopt.c:953 #, c-format -msgid "%s: option `-W %s' is ambiguous\n" +msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s: optie '-W %s' is niet eenduidig\n" #: posix/getopt.c:977 posix/getopt.c:995 #, c-format -msgid "%s: option `-W %s' doesn't allow an argument\n" +msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s: optie '-W %s' staat geen argument toe\n" #: posix/regcomp.c:135 diff --git a/po/rw.po b/po/rw.po index 1216e74ad6..479e02f8a2 100644 --- a/po/rw.po +++ b/po/rw.po @@ -3941,59 +3941,59 @@ msgstr "IMPINDURAGACIRO" #: posix/getopt.c:692 posix/getopt.c:711 #, fuzzy, c-format -msgid "%s: option `%s' is ambiguous\n" +msgid "%s: option '%s' is ambiguous\n" msgstr "%s:Ihitamo ni" #: posix/getopt.c:744 posix/getopt.c:748 #, fuzzy, c-format -msgid "%s: option `--%s' doesn't allow an argument\n" +msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s:Ihitamo Kwemerera" #: posix/getopt.c:757 posix/getopt.c:762 #, fuzzy, c-format -msgid "%s: option `%c%s' doesn't allow an argument\n" +msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s:Ihitamo Kwemerera" #: posix/getopt.c:807 posix/getopt.c:829 posix/getopt.c:1159 #: posix/getopt.c:1181 #, fuzzy, c-format -msgid "%s: option `%s' requires an argument\n" +msgid "%s: option '%s' requires an argument\n" msgstr "%s:Ihitamo" #: posix/getopt.c:867 posix/getopt.c:870 #, fuzzy, c-format -msgid "%s: unrecognized option `--%s'\n" +msgid "%s: unrecognized option '--%s'\n" msgstr "%s:Ihitamo" #: posix/getopt.c:878 posix/getopt.c:881 #, fuzzy, c-format -msgid "%s: unrecognized option `%c%s'\n" +msgid "%s: unrecognized option '%c%s'\n" msgstr "%s:Ihitamo" #: posix/getopt.c:936 posix/getopt.c:939 #, fuzzy, c-format -msgid "%s: illegal option -- %c\n" +msgid "%s: illegal option -- '%c'\n" msgstr "%s:Ihitamo" #: posix/getopt.c:945 posix/getopt.c:948 #, fuzzy, c-format -msgid "%s: invalid option -- %c\n" +msgid "%s: invalid option -- '%c'\n" msgstr "%s:Sibyo Ihitamo" #: posix/getopt.c:1003 posix/getopt.c:1022 posix/getopt.c:1234 #: posix/getopt.c:1255 #, fuzzy, c-format -msgid "%s: option requires an argument -- %c\n" +msgid "%s: option requires an argument -- '%c'\n" msgstr "%s:Ihitamo" #: posix/getopt.c:1074 posix/getopt.c:1093 #, fuzzy, c-format -msgid "%s: option `-W %s' is ambiguous\n" +msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s:Ihitamo ni" #: posix/getopt.c:1117 posix/getopt.c:1138 #, fuzzy, c-format -msgid "%s: option `-W %s' doesn't allow an argument\n" +msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s:Ihitamo Kwemerera" #: posix/regcomp.c:150 diff --git a/po/sk.po b/po/sk.po index ca25159381..ac19325bbb 100644 --- a/po/sk.po +++ b/po/sk.po @@ -3512,59 +3512,59 @@ msgstr "Nerozpoznaná premenná `%s'" #: posix/getopt.c:692 posix/getopt.c:711 #, c-format -msgid "%s: option `%s' is ambiguous\n" +msgid "%s: option '%s' is ambiguous\n" msgstr "%s: voľba `%s' nie je jednoznačná\n" #: posix/getopt.c:744 posix/getopt.c:748 #, c-format -msgid "%s: option `--%s' doesn't allow an argument\n" +msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s: voľba `--%s' nedovoľuje použiť argument\n" #: posix/getopt.c:757 posix/getopt.c:762 #, c-format -msgid "%s: option `%c%s' doesn't allow an argument\n" +msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s: voľba `%c%s' nedovoľuje použiť argument\n" #: posix/getopt.c:807 posix/getopt.c:829 posix/getopt.c:1159 #: posix/getopt.c:1181 #, c-format -msgid "%s: option `%s' requires an argument\n" +msgid "%s: option '%s' requires an argument\n" msgstr "%s: voľba `%s' vyžaduje argument\n" #: posix/getopt.c:867 posix/getopt.c:870 #, c-format -msgid "%s: unrecognized option `--%s'\n" +msgid "%s: unrecognized option '--%s'\n" msgstr "%s: nerozpoznaná voľba `--%s'\n" #: posix/getopt.c:878 posix/getopt.c:881 #, c-format -msgid "%s: unrecognized option `%c%s'\n" +msgid "%s: unrecognized option '%c%s'\n" msgstr "%s: nerozpoznaná voľba `%c%s'\n" #: posix/getopt.c:936 posix/getopt.c:939 #, c-format -msgid "%s: illegal option -- %c\n" +msgid "%s: illegal option -- '%c'\n" msgstr "%s: neprípustná voľba -- %c\n" #: posix/getopt.c:945 posix/getopt.c:948 #, c-format -msgid "%s: invalid option -- %c\n" +msgid "%s: invalid option -- '%c'\n" msgstr "%s: chybná voľba -- %c\n" #: posix/getopt.c:1003 posix/getopt.c:1022 posix/getopt.c:1234 #: posix/getopt.c:1255 #, c-format -msgid "%s: option requires an argument -- %c\n" +msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: voľba vyžaduje argument -- %c\n" #: posix/getopt.c:1074 posix/getopt.c:1093 #, c-format -msgid "%s: option `-W %s' is ambiguous\n" +msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s: voľba `-W %s' nie je jednoznačná\n" #: posix/getopt.c:1117 posix/getopt.c:1138 #, c-format -msgid "%s: option `-W %s' doesn't allow an argument\n" +msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s: voľba `-W %s' nedovoľuje pouťiť argument\n" #: posix/regcomp.c:150 diff --git a/po/sv.po b/po/sv.po index 9464e5e6b4..0d4e308115 100644 --- a/po/sv.po +++ b/po/sv.po @@ -4328,59 +4328,59 @@ msgstr "Okänd variabel \"%s\"" #: posix/getopt.c:571 posix/getopt.c:587 #, c-format -msgid "%s: option `%s' is ambiguous\n" +msgid "%s: option '%s' is ambiguous\n" msgstr "%s: flaggan \"%s\" är tvetydig\n" #: posix/getopt.c:620 posix/getopt.c:624 #, c-format -msgid "%s: option `--%s' doesn't allow an argument\n" +msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s: flaggan \"--%s\" tar inget argument\n" #: posix/getopt.c:633 posix/getopt.c:638 #, c-format -msgid "%s: option `%c%s' doesn't allow an argument\n" +msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s: flaggan \"%c%s\" tar inget argument\n" #: posix/getopt.c:681 posix/getopt.c:700 posix/getopt.c:1016 #: posix/getopt.c:1035 #, c-format -msgid "%s: option `%s' requires an argument\n" +msgid "%s: option '%s' requires an argument\n" msgstr "%s: flaggan \"%s\" behöver ett argument\n" #: posix/getopt.c:738 posix/getopt.c:741 #, c-format -msgid "%s: unrecognized option `--%s'\n" +msgid "%s: unrecognized option '--%s'\n" msgstr "%s: okänd flagga \"--%s\"\n" #: posix/getopt.c:749 posix/getopt.c:752 #, c-format -msgid "%s: unrecognized option `%c%s'\n" +msgid "%s: unrecognized option '%c%s'\n" msgstr "%s: okänd flagga \"%c%s\"\n" #: posix/getopt.c:804 posix/getopt.c:807 #, c-format -msgid "%s: illegal option -- %c\n" +msgid "%s: illegal option -- '%c'\n" msgstr "%s: otillåten flagga -- %c\n" #: posix/getopt.c:813 posix/getopt.c:816 #, c-format -msgid "%s: invalid option -- %c\n" +msgid "%s: invalid option -- '%c'\n" msgstr "%s: ogiltig flagga -- %c\n" #: posix/getopt.c:868 posix/getopt.c:884 posix/getopt.c:1088 #: posix/getopt.c:1106 #, c-format -msgid "%s: option requires an argument -- %c\n" +msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: flaggan behöver ett argument -- %c\n" #: posix/getopt.c:937 posix/getopt.c:953 #, c-format -msgid "%s: option `-W %s' is ambiguous\n" +msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s: flaggan \"-W %s\" är tvetydig\n" #: posix/getopt.c:977 posix/getopt.c:995 #, c-format -msgid "%s: option `-W %s' doesn't allow an argument\n" +msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s: flaggan \"-W %s\" tar inget argument\n" #: posix/regcomp.c:135 diff --git a/po/tr.po b/po/tr.po index e3801d6e9f..ba3982646d 100644 --- a/po/tr.po +++ b/po/tr.po @@ -4330,59 +4330,59 @@ msgstr "Tanınmayan değişken `%s'" #: posix/getopt.c:571 posix/getopt.c:587 #, c-format -msgid "%s: option `%s' is ambiguous\n" +msgid "%s: option '%s' is ambiguous\n" msgstr "%s: `%s' seçeneği burada belirsiz\n" #: posix/getopt.c:620 posix/getopt.c:624 #, c-format -msgid "%s: option `--%s' doesn't allow an argument\n" +msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s: `--%s' seçeneği argümansız kullanılır\n" #: posix/getopt.c:633 posix/getopt.c:638 #, c-format -msgid "%s: option `%c%s' doesn't allow an argument\n" +msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s: `%c%s' seçeneği argümansız kullanılır\n" #: posix/getopt.c:681 posix/getopt.c:700 posix/getopt.c:1016 #: posix/getopt.c:1035 #, c-format -msgid "%s: option `%s' requires an argument\n" +msgid "%s: option '%s' requires an argument\n" msgstr "%s: `%s' seçeneği bir argümanla kullanılır\n" #: posix/getopt.c:738 posix/getopt.c:741 #, c-format -msgid "%s: unrecognized option `--%s'\n" +msgid "%s: unrecognized option '--%s'\n" msgstr "%s: tanınmayan seçenek `--%s'\n" #: posix/getopt.c:749 posix/getopt.c:752 #, c-format -msgid "%s: unrecognized option `%c%s'\n" +msgid "%s: unrecognized option '%c%s'\n" msgstr "%s: tanınmayan seçenek: `%c%s'\n" #: posix/getopt.c:804 posix/getopt.c:807 #, c-format -msgid "%s: illegal option -- %c\n" +msgid "%s: illegal option -- '%c'\n" msgstr "%s: kuraldışı seçenek -- %c\n" #: posix/getopt.c:813 posix/getopt.c:816 #, c-format -msgid "%s: invalid option -- %c\n" +msgid "%s: invalid option -- '%c'\n" msgstr "%s: geçersiz seçenek -- %c\n" #: posix/getopt.c:868 posix/getopt.c:884 posix/getopt.c:1088 #: posix/getopt.c:1106 #, c-format -msgid "%s: option requires an argument -- %c\n" +msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: seçenek bir argümanla kullanılır -- %c\n" #: posix/getopt.c:937 posix/getopt.c:953 #, c-format -msgid "%s: option `-W %s' is ambiguous\n" +msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s: `-W %s' seçeneği burada belirsiz\n" #: posix/getopt.c:977 posix/getopt.c:995 #, c-format -msgid "%s: option `-W %s' doesn't allow an argument\n" +msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s: `-W %s' seçeneği argümansız kullanılır\n" #: posix/regcomp.c:135 diff --git a/po/zh_CN.po b/po/zh_CN.po index b42bef9db9..14207f057a 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -4195,59 +4195,59 @@ msgstr "不可识别的变量“%s”" #: posix/getopt.c:571 posix/getopt.c:587 #, c-format -msgid "%s: option `%s' is ambiguous\n" +msgid "%s: option '%s' is ambiguous\n" msgstr "%s：选项“%s”具有二义性\n" #: posix/getopt.c:620 posix/getopt.c:624 #, c-format -msgid "%s: option `--%s' doesn't allow an argument\n" +msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s：选项“--%s”不接受任何参数\n" #: posix/getopt.c:633 posix/getopt.c:638 #, c-format -msgid "%s: option `%c%s' doesn't allow an argument\n" +msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s：选项“%c%s”不接受参数\n" #: posix/getopt.c:681 posix/getopt.c:700 posix/getopt.c:1016 #: posix/getopt.c:1035 #, c-format -msgid "%s: option `%s' requires an argument\n" +msgid "%s: option '%s' requires an argument\n" msgstr "%s：选项“%s”需要一个参数\n" #: posix/getopt.c:738 posix/getopt.c:741 #, c-format -msgid "%s: unrecognized option `--%s'\n" +msgid "%s: unrecognized option '--%s'\n" msgstr "%s：无法识别的选项“--%s”\n" #: posix/getopt.c:749 posix/getopt.c:752 #, c-format -msgid "%s: unrecognized option `%c%s'\n" +msgid "%s: unrecognized option '%c%s'\n" msgstr "%s：无法识别的选项“%c%s”\n" #: posix/getopt.c:804 posix/getopt.c:807 #, c-format -msgid "%s: illegal option -- %c\n" +msgid "%s: illegal option -- '%c'\n" msgstr "%s：无效选项 -- %c\n" #: posix/getopt.c:813 posix/getopt.c:816 #, c-format -msgid "%s: invalid option -- %c\n" +msgid "%s: invalid option -- '%c'\n" msgstr "%s：无效选项 -- %c\n" #: posix/getopt.c:868 posix/getopt.c:884 posix/getopt.c:1088 #: posix/getopt.c:1106 #, c-format -msgid "%s: option requires an argument -- %c\n" +msgid "%s: option requires an argument -- '%c'\n" msgstr "%s：选项需要一个参数 -- %c\n" #: posix/getopt.c:937 posix/getopt.c:953 #, c-format -msgid "%s: option `-W %s' is ambiguous\n" +msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s：选项“-W %s”具有二义性\n" #: posix/getopt.c:977 posix/getopt.c:995 #, c-format -msgid "%s: option `-W %s' doesn't allow an argument\n" +msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s：选项“-W %s”不接受参数\n" #: posix/regcomp.c:135 diff --git a/po/zh_TW.po b/po/zh_TW.po index 7fbf3c7118..6ccffec2bc 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -3545,59 +3545,59 @@ msgstr "無法識別的變數 `%s'" #: posix/getopt.c:692 posix/getopt.c:711 #, c-format -msgid "%s: option `%s' is ambiguous\n" +msgid "%s: option '%s' is ambiguous\n" msgstr "%s: 選項 `%s' 含義不清\n" #: posix/getopt.c:744 posix/getopt.c:748 #, c-format -msgid "%s: option `--%s' doesn't allow an argument\n" +msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s: 選項 `--%s' 不允許附加引數\n" #: posix/getopt.c:757 posix/getopt.c:762 #, c-format -msgid "%s: option `%c%s' doesn't allow an argument\n" +msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s: 選項 `%c%s' 不允許附加引數\n" #: posix/getopt.c:807 posix/getopt.c:829 posix/getopt.c:1159 #: posix/getopt.c:1181 #, c-format -msgid "%s: option `%s' requires an argument\n" +msgid "%s: option '%s' requires an argument\n" msgstr "%s: 選項 `%s' 需要一個引數\n" #: posix/getopt.c:867 posix/getopt.c:870 #, c-format -msgid "%s: unrecognized option `--%s'\n" +msgid "%s: unrecognized option '--%s'\n" msgstr "%s: 未知的選項 `--%s'\n" #: posix/getopt.c:878 posix/getopt.c:881 #, c-format -msgid "%s: unrecognized option `%c%s'\n" +msgid "%s: unrecognized option '%c%s'\n" msgstr "%s: 未知的選項 `%c%s'\n" #: posix/getopt.c:936 posix/getopt.c:939 #, c-format -msgid "%s: illegal option -- %c\n" +msgid "%s: illegal option -- '%c'\n" msgstr "%s: 不合法的選項 -- %c\n" #: posix/getopt.c:945 posix/getopt.c:948 #, c-format -msgid "%s: invalid option -- %c\n" +msgid "%s: invalid option -- '%c'\n" msgstr "%s: 不適用的選項 -- %c\n" #: posix/getopt.c:1003 posix/getopt.c:1022 posix/getopt.c:1234 #: posix/getopt.c:1255 #, c-format -msgid "%s: option requires an argument -- %c\n" +msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: 選項需要一個引數 -- %c\n" #: posix/getopt.c:1074 posix/getopt.c:1093 #, c-format -msgid "%s: option `-W %s' is ambiguous\n" +msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s: 選項 `-W %s' 含義不清\n" #: posix/getopt.c:1117 posix/getopt.c:1138 #, c-format -msgid "%s: option `-W %s' doesn't allow an argument\n" +msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s: 選項 `-W %s' 不允許附加引數\n" #: posix/regcomp.c:150 diff --git a/posix/getopt.c b/posix/getopt.c index b1cecd31aa..103f572b07 100644 --- a/posix/getopt.c +++ b/posix/getopt.c @@ -1,9 +1,8 @@ /* Getopt for GNU. - NOTE: getopt is now part of the C library, so if you don't know what + NOTE: getopt is part of the C library, so if you don't know what "Keep this file name-space clean" means, talk to drepper@gnu.org before changing it! - Copyright (C) 1987,88,89,90,91,92,93,94,95,96,98,99,2000,2001,2002,2003,2004 - Free Software Foundation, Inc. + Copyright (C) 1987-1996,1998-2004,2008 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 @@ -568,7 +567,7 @@ _getopt_internal_r (int argc, char *const *argv, const char *optstring, #if defined _LIBC && defined USE_IN_LIBIO char *buf; - if (__asprintf (&buf, _("%s: option `%s' is ambiguous\n"), + if (__asprintf (&buf, _("%s: option '%s' is ambiguous\n"), argv[0], argv[d->optind]) >= 0) { _IO_flockfile (stderr); @@ -584,7 +583,7 @@ _getopt_internal_r (int argc, char *const *argv, const char *optstring, free (buf); } #else - fprintf (stderr, _("%s: option `%s' is ambiguous\n"), + fprintf (stderr, _("%s: option '%s' is ambiguous\n"), argv[0], argv[d->optind]); #endif } @@ -618,11 +617,11 @@ _getopt_internal_r (int argc, char *const *argv, const char *optstring, /* --option */ #if defined _LIBC && defined USE_IN_LIBIO n = __asprintf (&buf, _("\ -%s: option `--%s' doesn't allow an argument\n"), +%s: option '--%s' doesn't allow an argument\n"), argv[0], pfound->name); #else fprintf (stderr, _("\ -%s: option `--%s' doesn't allow an argument\n"), +%s: option '--%s' doesn't allow an argument\n"), argv[0], pfound->name); #endif } @@ -631,12 +630,12 @@ _getopt_internal_r (int argc, char *const *argv, const char *optstring, /* +option or -option */ #if defined _LIBC && defined USE_IN_LIBIO n = __asprintf (&buf, _("\ -%s: option `%c%s' doesn't allow an argument\n"), +%s: option '%c%s' doesn't allow an argument\n"), argv[0], argv[d->optind - 1][0], pfound->name); #else fprintf (stderr, _("\ -%s: option `%c%s' doesn't allow an argument\n"), +%s: option '%c%s' doesn't allow an argument\n"), argv[0], argv[d->optind - 1][0], pfound->name); #endif @@ -679,7 +678,7 @@ _getopt_internal_r (int argc, char *const *argv, const char *optstring, char *buf; if (__asprintf (&buf, _("\ -%s: option `%s' requires an argument\n"), +%s: option '%s' requires an argument\n"), argv[0], argv[d->optind - 1]) >= 0) { _IO_flockfile (stderr); @@ -697,7 +696,7 @@ _getopt_internal_r (int argc, char *const *argv, const char *optstring, } #else fprintf (stderr, - _("%s: option `%s' requires an argument\n"), + _("%s: option '%s' requires an argument\n"), argv[0], argv[d->optind - 1]); #endif } @@ -735,10 +734,10 @@ _getopt_internal_r (int argc, char *const *argv, const char *optstring, { /* --option */ #if defined _LIBC && defined USE_IN_LIBIO - n = __asprintf (&buf, _("%s: unrecognized option `--%s'\n"), + n = __asprintf (&buf, _("%s: unrecognized option '--%s'\n"), argv[0], d->__nextchar); #else - fprintf (stderr, _("%s: unrecognized option `--%s'\n"), + fprintf (stderr, _("%s: unrecognized option '--%s'\n"), argv[0], d->__nextchar); #endif } @@ -746,10 +745,10 @@ _getopt_internal_r (int argc, char *const *argv, const char *optstring, { /* +option or -option */ #if defined _LIBC && defined USE_IN_LIBIO - n = __asprintf (&buf, _("%s: unrecognized option `%c%s'\n"), + n = __asprintf (&buf, _("%s: unrecognized option '%c%s'\n"), argv[0], argv[d->optind][0], d->__nextchar); #else - fprintf (stderr, _("%s: unrecognized option `%c%s'\n"), + fprintf (stderr, _("%s: unrecognized option '%c%s'\n"), argv[0], argv[d->optind][0], d->__nextchar); #endif } @@ -799,21 +798,22 @@ _getopt_internal_r (int argc, char *const *argv, const char *optstring, if (d->__posixly_correct) { - /* 1003.2 specifies the format of this message. */ #if defined _LIBC && defined USE_IN_LIBIO - n = __asprintf (&buf, _("%s: illegal option -- %c\n"), + n = __asprintf (&buf, _("%s: illegal option -- '%c'\n"), argv[0], c); #else - fprintf (stderr, _("%s: illegal option -- %c\n"), argv[0], c); + fprintf (stderr, _("%s: illegal option -- '%c'\n"), argv[0], + c); #endif } else { #if defined _LIBC && defined USE_IN_LIBIO - n = __asprintf (&buf, _("%s: invalid option -- %c\n"), + n = __asprintf (&buf, _("%s: invalid option -- '%c'\n"), argv[0], c); #else - fprintf (stderr, _("%s: invalid option -- %c\n"), argv[0], c); + fprintf (stderr, _("%s: invalid option -- '%c'\n"), argv[0], + c); #endif } @@ -860,12 +860,11 @@ _getopt_internal_r (int argc, char *const *argv, const char *optstring, { if (print_errors) { - /* 1003.2 specifies the format of this message. */ #if defined _LIBC && defined USE_IN_LIBIO char *buf; if (__asprintf (&buf, - _("%s: option requires an argument -- %c\n"), + _("%s: option requires an argument -- '%c'\n"), argv[0], c) >= 0) { _IO_flockfile (stderr); @@ -881,7 +880,8 @@ _getopt_internal_r (int argc, char *const *argv, const char *optstring, free (buf); } #else - fprintf (stderr, _("%s: option requires an argument -- %c\n"), + fprintf (stderr, + _("%s: option requires an argument -- '%c'\n"), argv[0], c); #endif } @@ -934,7 +934,7 @@ _getopt_internal_r (int argc, char *const *argv, const char *optstring, #if defined _LIBC && defined USE_IN_LIBIO char *buf; - if (__asprintf (&buf, _("%s: option `-W %s' is ambiguous\n"), + if (__asprintf (&buf, _("%s: option '-W %s' is ambiguous\n"), argv[0], argv[d->optind]) >= 0) { _IO_flockfile (stderr); @@ -950,7 +950,7 @@ _getopt_internal_r (int argc, char *const *argv, const char *optstring, free (buf); } #else - fprintf (stderr, _("%s: option `-W %s' is ambiguous\n"), + fprintf (stderr, _("%s: option '-W %s' is ambiguous\n"), argv[0], argv[d->optind]); #endif } @@ -975,7 +975,7 @@ _getopt_internal_r (int argc, char *const *argv, const char *optstring, char *buf; if (__asprintf (&buf, _("\ -%s: option `-W %s' doesn't allow an argument\n"), +%s: option '-W %s' doesn't allow an argument\n"), argv[0], pfound->name) >= 0) { _IO_flockfile (stderr); @@ -993,7 +993,7 @@ _getopt_internal_r (int argc, char *const *argv, const char *optstring, } #else fprintf (stderr, _("\ -%s: option `-W %s' doesn't allow an argument\n"), +%s: option '-W %s' doesn't allow an argument\n"), argv[0], pfound->name); #endif } @@ -1014,7 +1014,7 @@ _getopt_internal_r (int argc, char *const *argv, const char *optstring, char *buf; if (__asprintf (&buf, _("\ -%s: option `%s' requires an argument\n"), +%s: option '%s' requires an argument\n"), argv[0], argv[d->optind - 1]) >= 0) { _IO_flockfile (stderr); @@ -1032,7 +1032,7 @@ _getopt_internal_r (int argc, char *const *argv, const char *optstring, } #else fprintf (stderr, - _("%s: option `%s' requires an argument\n"), + _("%s: option '%s' requires an argument\n"), argv[0], argv[d->optind - 1]); #endif } @@ -1081,12 +1081,11 @@ _getopt_internal_r (int argc, char *const *argv, const char *optstring, { if (print_errors) { - /* 1003.2 specifies the format of this message. */ #if defined _LIBC && defined USE_IN_LIBIO char *buf; if (__asprintf (&buf, _("\ -%s: option requires an argument -- %c\n"), +%s: option requires an argument -- '%c'\n"), argv[0], c) >= 0) { _IO_flockfile (stderr); @@ -1103,7 +1102,7 @@ _getopt_internal_r (int argc, char *const *argv, const char *optstring, } #else fprintf (stderr, - _("%s: option requires an argument -- %c\n"), + _("%s: option requires an argument -- '%c'\n"), argv[0], c); #endif } @@ -1200,7 +1199,7 @@ main (int argc, char **argv) break; case 'c': - printf ("option c with value `%s'\n", optarg); + printf ("option c with value '%s'\n", optarg); break; case '?': |