summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruno Haible <bruno@clisp.org>2001-03-09 20:46:44 +0000
committerBruno Haible <bruno@clisp.org>2001-03-09 20:46:44 +0000
commit5e39ef46d367ed7d31144321ad8a83d7030810a2 (patch)
tree8ae64f6772e7a004446a1ed877623c5363280e92
parent7de55d4e9d37f9876071265270f1f100b22eff6d (diff)
downloadexternal_gettext-5e39ef46d367ed7d31144321ad8a83d7030810a2.zip
external_gettext-5e39ef46d367ed7d31144321ad8a83d7030810a2.tar.gz
external_gettext-5e39ef46d367ed7d31144321ad8a83d7030810a2.tar.bz2
Update.
-rw-r--r--po/da.po316
-rw-r--r--po/de.po322
-rw-r--r--po/el.po508
-rw-r--r--po/es.po392
-rw-r--r--po/fr.po325
-rw-r--r--po/gettext.pot287
-rw-r--r--po/ja.po301
-rw-r--r--po/ko.po322
-rw-r--r--po/nl.po313
-rw-r--r--po/nn.po214
-rw-r--r--po/no.po253
-rw-r--r--po/pl.po318
-rw-r--r--po/pt.po322
-rw-r--r--po/sl.po319
-rw-r--r--po/sv.po320
-rw-r--r--po/tr.po408
16 files changed, 2937 insertions, 2303 deletions
diff --git a/po/da.po b/po/da.po
index 4ad57db..d096607 100644
--- a/po/da.po
+++ b/po/da.po
@@ -4,7 +4,7 @@
msgid ""
msgstr ""
"Project-Id-Version: gettext 0.10.31\n"
-"POT-Creation-Date: 1999-10-11 23:03-0700\n"
+"POT-Creation-Date: 2001-03-09 19:56+0100\n"
"PO-Revision-Date: 1997-08-29 07:21 MDT\n"
"Last-Translator: Thorbjoern Ravn Andersen <ravn@mip.ou.dk>\n"
"Language-Team: Danish <da@li.org>\n"
@@ -12,75 +12,80 @@ msgstr ""
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: Base64\n"
-#: lib/error.c:103
+#: lib/error.c:115
msgid "Unknown system error"
msgstr "Ukendt systemfejl"
-#: lib/getopt.c:680
+#: lib/getopt.c:691
#, c-format
msgid "%s: option `%s' is ambiguous\n"
msgstr "%s: tilvalget '%s' kan betyde flere ting\n"
-#: lib/getopt.c:704
+#: lib/getopt.c:716
#, c-format
msgid "%s: option `--%s' doesn't allow an argument\n"
msgstr "%s: tilvalget '--%s' tager ikke et argument\n"
-#: lib/getopt.c:709
+#: lib/getopt.c:721
#, c-format
msgid "%s: option `%c%s' doesn't allow an argument\n"
msgstr "%s: tilvalget `%c%s' tager ikke et argument\n"
-#: lib/getopt.c:726 lib/getopt.c:899
+#: lib/getopt.c:739 lib/getopt.c:912
#, c-format
msgid "%s: option `%s' requires an argument\n"
msgstr "%s: tilvalget `%s' kræver et argument\n"
#. --option
-#: lib/getopt.c:755
+#: lib/getopt.c:768
#, c-format
msgid "%s: unrecognized option `--%s'\n"
msgstr "%s: ukendt tilvalg `--%s'\n"
#. +option or -option
-#: lib/getopt.c:759
+#: lib/getopt.c:772
#, c-format
msgid "%s: unrecognized option `%c%s'\n"
msgstr "%s: ukendt tilvalg `%c%s'\n"
#. 1003.2 specifies the format of this message.
-#: lib/getopt.c:785
+#: lib/getopt.c:798
#, c-format
msgid "%s: illegal option -- %c\n"
msgstr "%s: ulovligt tilvalg -- %c\n"
-#: lib/getopt.c:788
+#: lib/getopt.c:801
#, c-format
msgid "%s: invalid option -- %c\n"
msgstr "%s: ugyldigt tilvalg -- %c\n"
#. 1003.2 specifies the format of this message.
-#: lib/getopt.c:818 lib/getopt.c:948
+#: lib/getopt.c:831 lib/getopt.c:961
#, c-format
msgid "%s: option requires an argument -- %c\n"
msgstr "%s: tilvalget '%c' kræver et argument\n"
-#: lib/getopt.c:865
+#: lib/getopt.c:878
#, c-format
msgid "%s: option `-W %s' is ambiguous\n"
msgstr "%s: tilvalget '%s' kan betyde flere ting\n"
-#: lib/getopt.c:883
+#: lib/getopt.c:896
#, c-format
msgid "%s: option `-W %s' doesn't allow an argument\n"
msgstr "%s: tilvalget '--%s' tager ikke et argument\n"
-#: lib/xmalloc.c:82
+#: lib/obstack.c:474
+#, fuzzy
+msgid "memory exhausted"
+msgstr "ikke mere ledig hukommelse"
+
+#: lib/xmalloc.c:86
msgid "Memory exhausted"
msgstr "ikke mere ledig hukommelse"
-#: src/gettextp.c:134 src/msgcmp.c:144 src/msgcomm.c:285 src/msgfmt.c:257
-#: src/msgmerge.c:263 src/msgunfmt.c:175 src/xgettext.c:401
+#: src/gettext.c:138 src/msgcmp.c:140 src/msgcomm.c:283 src/msgfmt.c:270
+#: src/msgmerge.c:255 src/msgunfmt.c:170 src/xgettext.c:398
#, c-format, no-wrap
msgid ""
"Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -92,27 +97,27 @@ msgstr ""
"INGEN garanti -- end ikke for SALGBARHED eller VELEGNETHED TIL NOGET SÆRLIGT\n"
"FORMÅL.\n"
-#: src/gettextp.c:139 src/msgcmp.c:149 src/msgcomm.c:290 src/msgfmt.c:262
-#: src/msgmerge.c:268 src/msgunfmt.c:180 src/xgettext.c:406
+#: src/gettext.c:143 src/msgcmp.c:145 src/msgcomm.c:288 src/msgfmt.c:275
+#: src/msgmerge.c:260 src/msgunfmt.c:175 src/xgettext.c:403
#, c-format
msgid "Written by %s.\n"
msgstr "Skrevet af %s.\n"
-#: src/gettextp.c:154
+#: src/gettext.c:158
msgid "missing arguments"
msgstr "argumenter mangler"
-#: src/gettextp.c:164
+#: src/gettext.c:168
msgid "too many arguments"
msgstr "for mange argumenter"
-#: src/gettextp.c:228 src/msgcmp.c:181 src/msgcomm.c:395 src/msgfmt.c:361
-#: src/msgmerge.c:323 src/msgunfmt.c:210 src/xgettext.c:539
+#: src/gettext.c:232 src/msgcmp.c:177 src/msgcomm.c:381 src/msgfmt.c:377
+#: src/msgmerge.c:315 src/msgunfmt.c:205 src/xgettext.c:525
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "Information fås med `%s --help'\n"
-#: src/gettextp.c:233
+#: src/gettext.c:237
#, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] [[[TEXTDOMAIN] MSGID] | [-s [MSGID]...]]\n"
@@ -137,7 +142,7 @@ msgstr ""
"\n"
"(TEKSTID svarer til 'msgid' felterne)\n"
-#: src/gettextp.c:245
+#: src/gettext.c:249
#, c-format, no-wrap
msgid ""
"\n"
@@ -160,41 +165,20 @@ msgstr ""
"oversættes de tekster der findes i det valgte tekstkatalog.\n"
"Standard filkataloget for søgning er: %s\n"
-#: src/gettextp.c:255 src/msgcmp.c:200 src/msgcomm.c:442 src/msgfmt.c:388
-#: src/msgmerge.c:358 src/msgunfmt.c:234 src/xgettext.c:591
+#: src/gettext.c:259 src/msgcmp.c:196 src/msgcomm.c:428 src/msgfmt.c:404
+#: src/msgmerge.c:350 src/msgunfmt.c:229 src/xgettext.c:577
msgid "Report bugs to <bug-gnu-utils@gnu.org>.\n"
msgstr "Rapportér fejl på engelsk til <bug-gnu-utils@gnu.org>.\n"
-#: src/message.c:900
-#, c-format
-msgid ""
-"internationalized messages should not contain the `\\%c' escape sequence"
-msgstr "oversættelige tekster må ikke indeholde `\\%c' escapesekvensen"
-
-#: src/message.c:1231
-#, c-format
-msgid "cannot create output file \"%s\""
-msgstr "kan ikke oprette uddatafil '%s'"
-
-#: src/message.c:1238
-#, no-c-format
-msgid "standard output"
-msgstr "standard uddata"
-
-#: src/message.c:1298
-#, c-format
-msgid "error while writing \"%s\" file"
-msgstr "fejl ved skrivning til filen '%s'"
-
-#: src/msgcmp.c:160 src/msgmerge.c:279
+#: src/msgcmp.c:156 src/msgmerge.c:271
msgid "no input files given"
msgstr "ingen filer angivet som inddata"
-#: src/msgcmp.c:165 src/msgmerge.c:284
+#: src/msgcmp.c:161 src/msgmerge.c:276
msgid "exactly 2 input files required"
msgstr "der kræves netop to inddatafiler"
-#: src/msgcmp.c:186
+#: src/msgcmp.c:182
#, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] def.po ref.po\n"
@@ -225,57 +209,62 @@ msgstr ""
"mellem msgid-tekststrengene, benyttes en upræcis sammenligningsmetode til at\n"
"give bedre fejlretningsinformation.\n"
-#: src/msgcmp.c:259 src/msgmerge.c:746
+#: src/msgcmp.c:255 src/msgmerge.c:741
msgid "this message is used but not defined..."
msgstr "denne tekst bruges men er ikke erklæret..."
-#: src/msgcmp.c:261 src/msgmerge.c:748
+#: src/msgcmp.c:257 src/msgmerge.c:743
msgid "...but this definition is similar"
msgstr "...men denne tekst ligner"
-#: src/msgcmp.c:267 src/msgmerge.c:775
+#: src/msgcmp.c:263 src/msgmerge.c:770
#, c-format
msgid "this message is used but not defined in %s"
msgstr "denne tekst er brugt, men ikke erklæret i %s"
-#: src/msgcmp.c:281
+#: src/msgcmp.c:277
msgid "warning: this message is not used"
msgstr "advarsel: denne tekst bliver ikke brugt"
-#: src/msgcmp.c:355 src/msgfmt.c:633 src/msgmerge.c:517 src/xgettext.c:1070
+#: src/msgcmp.c:282 src/po-lex.c:102
+#, c-format
+msgid "found %d fatal errors"
+msgstr "fandt %d fatale fejl"
+
+#: src/msgcmp.c:354 src/msgfmt.c:657 src/msgmerge.c:512 src/xgettext.c:1169
msgid "duplicate message definition"
msgstr "tekst erklæret mere end en gang"
-#: src/msgcmp.c:356 src/msgfmt.c:634 src/msgmerge.c:518 src/xgettext.c:1071
+#: src/msgcmp.c:355 src/msgfmt.c:659 src/msgmerge.c:513 src/xgettext.c:1170
msgid "...this is the location of the first definition"
msgstr "... her er den første erklæring"
-#: src/msgcmp.c:396 src/msgmerge.c:566
+#: src/msgcmp.c:395 src/msgmerge.c:561
#, c-format
msgid "this message has no definition in the \"%s\" domain"
msgstr "denne besked har ingen erklæring i '%s' domænet"
#. We are about to construct the absolute path to the
#. directory for the output files but asprintf failed.
-#: src/msgcomm.c:238 src/xgettext.c:340 src/xgettext.c:1265
+#: src/msgcomm.c:236 src/xgettext.c:337 src/xgettext.c:1365
msgid "while preparing output"
msgstr "under udskriftsforberedelse"
-#: src/msgcomm.c:273 src/msgcomm.c:277 src/xgettext.c:378 src/xgettext.c:382
+#: src/msgcomm.c:271 src/msgcomm.c:275 src/xgettext.c:375 src/xgettext.c:379
#, c-format
msgid "%s and %s are mutually exclusive"
msgstr "%s og %s udelukker hinanden"
-#: src/msgcomm.c:341
+#: src/msgcomm.c:327
msgid "at least two files must be specified"
msgstr ""
-#: src/msgcomm.c:360
+#: src/msgcomm.c:346
#, c-format
msgid "impossible selection criteria specified (%d < n < %d)"
msgstr ""
-#: src/msgcomm.c:400
+#: src/msgcomm.c:386
#, fuzzy, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] INPUTFILE ...\n"
@@ -306,7 +295,7 @@ msgstr ""
" --foreign-user undlad FSF copyright i udskrift til fremmed bruger\n"
" -F, --sort-by-file sortér uddata efter filposition\n"
-#: src/msgcomm.c:412
+#: src/msgcomm.c:398
#, fuzzy
msgid ""
" -i, --indent write the .po file using indented style\n"
@@ -340,7 +329,7 @@ msgstr ""
"\n"
"Hvis INPUTFIL er -, læses fra standard inddata.\n"
-#: src/msgcomm.c:425
+#: src/msgcomm.c:411
msgid ""
" -V, --version output version information and exit\n"
" -w, --width=NUMBER set output page width\n"
@@ -360,41 +349,41 @@ msgid ""
"preserved.\n"
msgstr ""
-#: src/msgcomm.c:476 src/msgunfmt.c:357 src/po-lex.c:74 src/xget-lex.c:159
-#: src/xget-lex.c:174 src/xget-lex.c:191 src/xgettext.c:625
+#: src/msgcomm.c:462 src/msgunfmt.c:361 src/po-lex.c:86 src/xget-lex.c:157
+#: src/xget-lex.c:170 src/xget-lex.c:180 src/xgettext.c:611
#, c-format
msgid "error while opening \"%s\" for reading"
msgstr "fejl ved læse-åbning af '%s'"
-#: src/msgcomm.c:557 src/xgettext.c:667 src/xgettext.c:977
+#: src/msgcomm.c:543 src/xgettext.c:653 src/xgettext.c:1071
msgid "this file may not contain domain directives"
msgstr "denne fil må ikke indeholde 'domain' kommandoer"
-#: src/msgfmt.c:273 src/xgettext.c:417
+#: src/msgfmt.c:286 src/xgettext.c:414
msgid "no input file given"
msgstr "ingen inddatafil angivet"
-#: src/msgfmt.c:321
+#: src/msgfmt.c:337
#, c-format
msgid "error while opening \"%s\" for writing"
msgstr "fejl opstået ved skrive-åbning af '%s'"
-#: src/msgfmt.c:343
+#: src/msgfmt.c:359
#, c-format
msgid "%d translated messages"
msgstr "%d oversatte tekster"
-#: src/msgfmt.c:345
+#: src/msgfmt.c:361
#, c-format
msgid ", %d fuzzy translations"
msgstr ", %d upræcise oversættelser"
-#: src/msgfmt.c:347
+#: src/msgfmt.c:363
#, c-format
msgid ", %d untranslated messages"
msgstr ", %d uoversatte tekster"
-#: src/msgfmt.c:366
+#: src/msgfmt.c:382
#, fuzzy, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] filename.po ...\n"
@@ -439,82 +428,104 @@ msgstr ""
"Hvis inddatafilen er -, læses fra standard-input. Hvis uddatafilen er -,\n"
"skrives uddata til standard-output.\n"
-#: src/msgfmt.c:409
+#: src/msgfmt.c:425
msgid "while creating hash table"
msgstr "under oprettelsen af hashtabel"
-#: src/msgfmt.c:451
+#: src/msgfmt.c:469
#, fuzzy, c-format
-msgid "%s: warning: PO file header missing, fuzzy, or invalid"
+msgid ""
+"%s: warning: PO file header missing, fuzzy, or invalid\n"
+"%*s warning: charset conversion will not work"
msgstr "%s: advarsel: kildetekstfilen indeholder løse oversættelser (fuzzy)"
-#: src/msgfmt.c:474
+#: src/msgfmt.c:493
#, c-format
msgid "domain name \"%s\" not suitable as file name"
msgstr "domænet '%s' kan ikke bruges som filnavn"
-#: src/msgfmt.c:479
+#: src/msgfmt.c:498
#, c-format
msgid "domain name \"%s\" not suitable as file name: will use prefix"
msgstr "domænet '%s' er ikke brugbart som filnavn. Vil bruge præfiks istedet"
#. We don't change the exit status here because this is really
#. only an information.
-#: src/msgfmt.c:492
+#: src/msgfmt.c:511
#, c-format
msgid "`domain %s' directive ignored"
msgstr "`domain %s'-kommando ignoreres"
-#: src/msgfmt.c:520
+#: src/msgfmt.c:541
msgid "empty `msgstr' entry ignored"
msgstr "tom `msgstr'-kommando ignoreret"
-#: src/msgfmt.c:521
+#: src/msgfmt.c:542
msgid "fuzzy `msgstr' entry ignored"
msgstr "\"fuzzy\" `msgstr'-tekst ignoreret"
-#: src/msgfmt.c:564
+#: src/msgfmt.c:584
#, c-format
msgid "headerfield `%s' missing in header"
msgstr "feltet `%s' mangler i hovedet"
-#: src/msgfmt.c:567
+#: src/msgfmt.c:587
#, c-format
msgid "header field `%s' should start at beginning of line"
msgstr "feltet `%s' bør starte ved liniens begyndelse"
-#: src/msgfmt.c:577
+#: src/msgfmt.c:597
msgid "some header fields still have the initial default value"
msgstr "nogle felter i hovedet har stadig den oprindelige standardværdi"
-#: src/msgfmt.c:588
+#: src/msgfmt.c:608
#, c-format
msgid "field `%s' still has initial default value"
msgstr "feltet `%s' har stadig den oprindelige standardværdi"
-#: src/msgfmt.c:673
+#: src/msgfmt.c:698
#, c-format
msgid "%s: warning: source file contains fuzzy translation"
msgstr "%s: advarsel: kildetekstfilen indeholder løse oversættelser (fuzzy)"
-#: src/msgfmt.c:875
+#: src/msgfmt.c:920
+#, fuzzy
+msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
+msgstr "`msgid' og `msgstr' teksterne begynder ikke begge med '\\n'"
+
+#: src/msgfmt.c:928
+#, fuzzy, c-format
+msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
+msgstr "`msgid' og `msgstr' teksterne begynder ikke begge med '\\n'"
+
+#: src/msgfmt.c:938
msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
msgstr "`msgid' og `msgstr' teksterne begynder ikke begge med '\\n'"
-#: src/msgfmt.c:883
+#: src/msgfmt.c:953
+#, fuzzy
+msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
+msgstr "`msgid' og `msgstr' teksterne slutter ikke begge med '\\n'"
+
+#: src/msgfmt.c:961
+#, fuzzy, c-format
+msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
+msgstr "`msgid' og `msgstr' teksterne slutter ikke begge med '\\n'"
+
+#: src/msgfmt.c:971
msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
msgstr "`msgid' og `msgstr' teksterne slutter ikke begge med '\\n'"
-#: src/msgfmt.c:897
+#: src/msgfmt.c:987
msgid "number of format specifications in `msgid' and `msgstr' does not match"
msgstr "forskelligt antal formater i `msgid' og `msgstr'"
-#: src/msgfmt.c:914
+#: src/msgfmt.c:1004
#, c-format
msgid "format specifications for argument %u are not the same"
msgstr "formaterne for argument %u er forskellige"
-#: src/msgmerge.c:328
+#: src/msgmerge.c:320
#, fuzzy, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] def.po ref.po\n"
@@ -552,7 +563,7 @@ msgstr ""
" -V, --version vis versionsinformation og afslut\n"
" -w, --width=TAL\t sæt udskrivningsbredde\n"
-#: src/msgmerge.c:348
+#: src/msgmerge.c:340
#, no-wrap
msgid ""
"\n"
@@ -578,20 +589,20 @@ msgstr ""
"bedre resultater. Med mindre en uddatafil er angivet, vil resultaterne blive\n"
"skrevet til standard uddata.\n"
-#: src/msgmerge.c:804
+#: src/msgmerge.c:799
#, c-format
msgid ""
-"%sRead %d old + %d reference, merged %d, fuzzied %d, missing %d, obsolete "
-"%d.\n"
+"%sRead %d old + %d reference, merged %d, fuzzied %d, missing %d, obsolete %"
+"d.\n"
msgstr ""
"%sLæste %d gamle + %d reference, samlede %d, upræcise %d, mangler %d, "
"forældede %d.\n"
-#: src/msgmerge.c:810
+#: src/msgmerge.c:805
msgid " done.\n"
msgstr " afsluttet.\n"
-#: src/msgunfmt.c:215
+#: src/msgunfmt.c:210
#, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] [FILE]...\n"
@@ -618,7 +629,7 @@ msgstr ""
" -V, --version vis versionsinformation og afslut\n"
" -w, --width=TAL angiv udskrivningsbredde\n"
-#: src/msgunfmt.c:229
+#: src/msgunfmt.c:224
#, no-wrap
msgid ""
"\n"
@@ -632,87 +643,121 @@ msgstr ""
"og 'big-endian' .mo filer kan håndteres. Hvis inddatafilen er -,\n"
"læses standard inddata. Som standard skrives til standard uddata.\n"
-#: src/msgunfmt.c:266 src/msgunfmt.c:330 src/po-lex.c:185 src/xget-lex.c:254
+#: src/msgunfmt.c:261 src/msgunfmt.c:326 src/po-lex.c:213 src/xget-lex.c:243
#, c-format
msgid "error while reading \"%s\""
msgstr "fejl ved læsning af '%s'"
-#: src/msgunfmt.c:267 src/msgunfmt.c:331
+#: src/msgunfmt.c:262 src/msgunfmt.c:327
#, c-format
msgid "file \"%s\" truncated"
msgstr "filen '%s' blev afkortet"
-#: src/msgunfmt.c:298
+#: src/msgunfmt.c:293
#, c-format
msgid "seek \"%s\" offset %ld failed"
msgstr "seek '%s' offset %ld mislykkedes"
-#: src/msgunfmt.c:373
+#: src/msgunfmt.c:332
+#, fuzzy, c-format
+msgid "file \"%s\" contains a not NUL terminated string"
+msgstr "filen '%s' er ikke i GNU .mo format"
+
+#: src/msgunfmt.c:377
#, c-format
msgid "file \"%s\" is not in GNU .mo format"
msgstr "filen '%s' er ikke i GNU .mo format"
-#: ../../src/po-gram.y:83
+#: src/open-po.c:64
+msgid "<stdin>"
+msgstr ""
+
+#: po-gram-gen.y:87
+msgid "inconsistent use of #~"
+msgstr ""
+
+#: po-gram-gen.y:168
+#, fuzzy
+msgid "missing `msgstr[]' section"
+msgstr "`msgstr' afsnit mangler"
+
+#: po-gram-gen.y:176
+#, fuzzy
+msgid "missing `msgid_plural' section"
+msgstr "`msgstr' afsnit mangler"
+
+#: po-gram-gen.y:183
msgid "missing `msgstr' section"
msgstr "`msgstr' afsnit mangler"
-#: src/po-lex.c:84
-#, c-format
-msgid "found %d fatal errors"
-msgstr "fandt %d fatale fejl"
+#: po-gram-gen.y:228
+msgid "first plural form has nonzero index"
+msgstr ""
+
+#: po-gram-gen.y:230
+msgid "plural form has wrong index"
+msgstr ""
-#: src/po-lex.c:129 src/po-lex.c:168
+#. CAUTION: If you change this macro, you must also make identical
+#. changes to the function of the same name in src/po-lex.c
+#: src/po-lex.c:156 src/po-lex.c:195 src/po-lex.h:85 src/po-lex.h:99
+#: src/po-lex.h:115 src/po-lex.h:129
msgid "too many errors, aborting"
msgstr "afbryder kørslen på grund af for mange fejl"
-#: src/po-lex.c:241
+#: src/po-lex.c:271
#, c-format
msgid "keyword \"%s\" unknown"
msgstr "ukendt nøgleord '%s'"
-#: src/po-lex.c:335
+#: src/po-lex.c:374
#, fuzzy
msgid "invalid control sequence"
msgstr "ulovlig kontrolsekvens"
-#: src/po-lex.c:419
+#: src/po-lex.c:477
+msgid "end-of-file within string"
+msgstr "tekststreng ikke afsluttet da filens slutning blev nået"
+
+#: src/po-lex.c:482
msgid "end-of-line within string"
msgstr "tekststreng var ikke afsluttet ved linieskift"
-#: src/po-lex.c:424
-msgid "end-of-file within string"
-msgstr "tekststreng ikke afsluttet da filens slutning blev nået"
+#: src/po-lex.c:525
+#, fuzzy
+msgid "invalid multibyte sequence"
+msgstr "ulovlig kontrolsekvens"
-#: src/xget-lex.c:150
+#: src/xget-lex.c:148
msgid "standard input"
msgstr "standard inddata"
-#: src/xget-lex.c:892
+#: src/xget-lex.c:876
#, c-format
msgid "%s:%d: warning: unterminated character constant"
msgstr "%s:%d: advarsel: tegnkonstant ikke afsluttet korrekt"
-#: src/xget-lex.c:914
+#: src/xget-lex.c:898
#, c-format
msgid "%s:%d: warning: unterminated string literal"
msgstr "%s:%d: advarsel: streng'literal' ikke afsluttet"
-#: src/xgettext.c:386
+#: src/xgettext.c:383
msgid "--join-existing cannot be used when output is written to stdout"
msgstr ""
"--join-existing kan ikke benyttes når uddata sendes til standard uddata"
-#: src/xgettext.c:391
+#: src/xgettext.c:388
msgid "xgettext cannot work without keywords to look for"
msgstr ""
-#: src/xgettext.c:508
+#: src/xgettext.c:494
#, c-format
msgid "warning: file `%s' extension `%s' is unknown; will try C"
msgstr ""
"advarsel: ukendt type for fil `%s' med endelse `%s'; C benyttes i stedet"
-#: src/xgettext.c:544
+#: src/xgettext.c:530
#, fuzzy, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] INPUTFILE ...\n"
@@ -750,7 +795,7 @@ msgstr ""
" --foreign-user undlad FSF copyright i udskrift til fremmed bruger\n"
" -F, --sort-by-file sortér uddata efter filposition\n"
-#: src/xgettext.c:564
+#: src/xgettext.c:550
#, c-format, no-wrap
msgid ""
" -h, --help display this help and exit\n"
@@ -777,7 +822,7 @@ msgstr ""
" -M, --msgstr-suffix[=STRENG] brug STRENG/'' som suffiks for `msgstr' tekster\n"
" --no-location undlad skrivning af '#: filnavn:linie' linier\n"
-#: src/xgettext.c:578
+#: src/xgettext.c:564
#, no-wrap
msgid ""
" -n, --add-location generate '#: filename:line' lines (default)\n"
@@ -806,10 +851,33 @@ msgstr ""
"\n"
"Hvis INPUTFIL er -, læses fra standard inddata.\n"
-#: src/xgettext.c:1351
+#: src/xgettext.c:926
+#, fuzzy, c-format
+msgid "%s:%d: warning: keyword nested in keyword arg"
+msgstr "%s:%d: advarsel: streng'literal' ikke afsluttet"
+
+#: src/xgettext.c:936
+#, c-format
+msgid "%s:%d: warning: keyword between outer keyword and its arg"
+msgstr ""
+
+#: src/xgettext.c:1432
#, c-format
msgid "language `%s' unknown"
msgstr "ukendt sprog `%s'"
+#~ msgid ""
+#~ "internationalized messages should not contain the `\\%c' escape sequence"
+#~ msgstr "oversættelige tekster må ikke indeholde `\\%c' escapesekvensen"
+
+#~ msgid "cannot create output file \"%s\""
+#~ msgstr "kan ikke oprette uddatafil '%s'"
+
+#~ msgid "standard output"
+#~ msgstr "standard uddata"
+
+#~ msgid "error while writing \"%s\" file"
+#~ msgstr "fejl ved skrivning til filen '%s'"
+
#~ msgid "%s: warning: no header entry found"
#~ msgstr "%s: advarsel: \"header\" element ikke angivet"
diff --git a/po/de.po b/po/de.po
index 1b2c9dd..ef7dc0b 100644
--- a/po/de.po
+++ b/po/de.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: GNU gettext 0.10.35\n"
-"POT-Creation-Date: 2000-07-28 22:51+0200\n"
+"POT-Creation-Date: 2001-03-09 19:56+0100\n"
"PO-Revision-Date: 1998-04-30 23:23-0700\n"
"Last-Translator: Ulrich Drepper <drepper@gnu.org>\n"
"Language-Team: German <de@li.org>\n"
@@ -13,75 +13,80 @@ msgstr ""
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8-bit\n"
-#: lib/error.c:103
+#: lib/error.c:115
msgid "Unknown system error"
msgstr "unbekannter Systemfehler"
-#: lib/getopt.c:680
+#: lib/getopt.c:691
#, c-format
msgid "%s: option `%s' is ambiguous\n"
msgstr "%s: Option »%s« ist mehrdeutig\n"
-#: lib/getopt.c:704
+#: lib/getopt.c:716
#, c-format
msgid "%s: option `--%s' doesn't allow an argument\n"
msgstr "%s: Option »--%s« erwartet kein Argument\n"
-#: lib/getopt.c:709
+#: lib/getopt.c:721
#, c-format
msgid "%s: option `%c%s' doesn't allow an argument\n"
msgstr "%s: Option »%c%s« erwartet kein Argument\n"
-#: lib/getopt.c:726 lib/getopt.c:899
+#: lib/getopt.c:739 lib/getopt.c:912
#, c-format
msgid "%s: option `%s' requires an argument\n"
msgstr "%s: Option »%s« erwartet ein Argument\n"
#. --option
-#: lib/getopt.c:755
+#: lib/getopt.c:768
#, c-format
msgid "%s: unrecognized option `--%s'\n"
msgstr "%s: unbekannte Option »--%s«\n"
#. +option or -option
-#: lib/getopt.c:759
+#: lib/getopt.c:772
#, c-format
msgid "%s: unrecognized option `%c%s'\n"
msgstr "%s: unbekannte Option »%c%s«\n"
#. 1003.2 specifies the format of this message.
-#: lib/getopt.c:785
+#: lib/getopt.c:798
#, c-format
msgid "%s: illegal option -- %c\n"
msgstr "%s: unzulässige Option -- %c\n"
-#: lib/getopt.c:788
+#: lib/getopt.c:801
#, c-format
msgid "%s: invalid option -- %c\n"
msgstr "%s: ungültige Option -- %c\n"
#. 1003.2 specifies the format of this message.
-#: lib/getopt.c:818 lib/getopt.c:948
+#: lib/getopt.c:831 lib/getopt.c:961
#, c-format
msgid "%s: option requires an argument -- %c\n"
msgstr "%s: Option erwartet ein Argument -- %c\n"
-#: lib/getopt.c:865
+#: lib/getopt.c:878
#, c-format
msgid "%s: option `-W %s' is ambiguous\n"
msgstr "%s: Option »-W %s« ist mehrdeutig\n"
-#: lib/getopt.c:883
+#: lib/getopt.c:896
#, c-format
msgid "%s: option `-W %s' doesn't allow an argument\n"
msgstr "%s: Option »-W %s« erwartet kein Argument\n"
-#: lib/xmalloc.c:82
+#: lib/obstack.c:474
+#, fuzzy
+msgid "memory exhausted"
+msgstr "virtueller Speicher erschöpft"
+
+#: lib/xmalloc.c:86
msgid "Memory exhausted"
msgstr "virtueller Speicher erschöpft"
-#: src/gettextp.c:134 src/msgcmp.c:144 src/msgcomm.c:285 src/msgfmt.c:257
-#: src/msgmerge.c:263 src/msgunfmt.c:175 src/xgettext.c:401
+#: src/gettext.c:138 src/msgcmp.c:140 src/msgcomm.c:283 src/msgfmt.c:270
+#: src/msgmerge.c:255 src/msgunfmt.c:170 src/xgettext.c:398
#, c-format, no-wrap
msgid ""
"Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -93,27 +98,27 @@ msgstr ""
"Es gibt KEINERLEI Garantie; nicht einmal für die TAUGLICHKEIT oder\n"
"die VERWENDBARKEIT ZU EINEN ANGEGEBENEN ZWECK.\n"
-#: src/gettextp.c:139 src/msgcmp.c:149 src/msgcomm.c:290 src/msgfmt.c:262
-#: src/msgmerge.c:268 src/msgunfmt.c:180 src/xgettext.c:406
+#: src/gettext.c:143 src/msgcmp.c:145 src/msgcomm.c:288 src/msgfmt.c:275
+#: src/msgmerge.c:260 src/msgunfmt.c:175 src/xgettext.c:403
#, c-format
msgid "Written by %s.\n"
msgstr "Geschrieben von %s.\n"
-#: src/gettextp.c:154
+#: src/gettext.c:158
msgid "missing arguments"
msgstr "Argumente fehlen"
-#: src/gettextp.c:164
+#: src/gettext.c:168
msgid "too many arguments"
msgstr "zu viele Argumente"
-#: src/gettextp.c:228 src/msgcmp.c:181 src/msgcomm.c:395 src/msgfmt.c:361
-#: src/msgmerge.c:323 src/msgunfmt.c:210 src/xgettext.c:539
+#: src/gettext.c:232 src/msgcmp.c:177 src/msgcomm.c:381 src/msgfmt.c:377
+#: src/msgmerge.c:315 src/msgunfmt.c:205 src/xgettext.c:525
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "»%s --help« gibt weitere Informationen.\n"
-#: src/gettextp.c:233
+#: src/gettext.c:237
#, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] [[[TEXTDOMAIN] MSGID] | [-s [MSGID]...]]\n"
@@ -136,7 +141,7 @@ msgstr ""
" [BEREICH] SCHLÜSSEL hole die Übersetzung zu SCHLÜSSEL aus\n"
" dem Namensbereich BEREICH\n"
-#: src/gettextp.c:245
+#: src/gettext.c:249
#, c-format, no-wrap
msgid ""
"\n"
@@ -160,43 +165,20 @@ msgstr ""
"diese, falls im Namensbereich vorhanden, übersetzt.\n"
"Standardverzeichnis: %s\n"
-#: src/gettextp.c:255 src/msgcmp.c:200 src/msgcomm.c:442 src/msgfmt.c:388
-#: src/msgmerge.c:358 src/msgunfmt.c:234 src/xgettext.c:591
+#: src/gettext.c:259 src/msgcmp.c:196 src/msgcomm.c:428 src/msgfmt.c:404
+#: src/msgmerge.c:350 src/msgunfmt.c:229 src/xgettext.c:577
msgid "Report bugs to <bug-gnu-utils@gnu.org>.\n"
msgstr "Fehler bitte an <bug-gnu-utils@gnu.org> melden.\n"
-#: src/message.c:900
-#, c-format
-msgid ""
-"internationalized messages should not contain the `\\%c' escape sequence"
-msgstr ""
-"internationalisierbare Meldungen sollten nicht die Ersatzdarstellung »\\%c« "
-"enthalten"
-
-#: src/message.c:1231
-#, c-format
-msgid "cannot create output file \"%s\""
-msgstr "Ausgabedatei »%s« kann nicht erzeugt werden"
-
-#: src/message.c:1238
-#, no-c-format
-msgid "standard output"
-msgstr "Standard Ausgabe"
-
-#: src/message.c:1298
-#, c-format
-msgid "error while writing \"%s\" file"
-msgstr "Fehler beim Schreiben von Datei »%s«"
-
-#: src/msgcmp.c:160 src/msgmerge.c:279
+#: src/msgcmp.c:156 src/msgmerge.c:271
msgid "no input files given"
msgstr "keine Eingabedateien gegeben"
-#: src/msgcmp.c:165 src/msgmerge.c:284
+#: src/msgcmp.c:161 src/msgmerge.c:276
msgid "exactly 2 input files required"
msgstr "es werden genau zwei Eingabedateien benötigt"
-#: src/msgcmp.c:186
+#: src/msgcmp.c:182
#, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] def.po ref.po\n"
@@ -228,57 +210,62 @@ msgstr ""
"gefunden wurde, wird mittels inexakter Suche versucht, eine bessere\n"
"Hilfestellung zu geben.\n"
-#: src/msgcmp.c:259 src/msgmerge.c:746
+#: src/msgcmp.c:255 src/msgmerge.c:741
msgid "this message is used but not defined..."
msgstr "diese Meldung wird benutzt, wird aber nicht definiert..."
-#: src/msgcmp.c:261 src/msgmerge.c:748
+#: src/msgcmp.c:257 src/msgmerge.c:743
msgid "...but this definition is similar"
msgstr "...aber diese Definition ist ähnlich"
-#: src/msgcmp.c:267 src/msgmerge.c:775
+#: src/msgcmp.c:263 src/msgmerge.c:770
#, c-format
msgid "this message is used but not defined in %s"
msgstr "diese Meldung wird benutzt, wird aber nicht in %s definiert"
-#: src/msgcmp.c:281
+#: src/msgcmp.c:277
msgid "warning: this message is not used"
msgstr "Warnung: diese Meldung wird nicht benutzt"
-#: src/msgcmp.c:355 src/msgfmt.c:633 src/msgmerge.c:517 src/xgettext.c:1093
+#: src/msgcmp.c:282 src/po-lex.c:102
+#, c-format
+msgid "found %d fatal errors"
+msgstr "es sind %d fatale Fehler aufgetreten"
+
+#: src/msgcmp.c:354 src/msgfmt.c:657 src/msgmerge.c:512 src/xgettext.c:1169
msgid "duplicate message definition"
msgstr "Mehrfachdefinition der Meldung"
-#: src/msgcmp.c:356 src/msgfmt.c:634 src/msgmerge.c:518 src/xgettext.c:1094
+#: src/msgcmp.c:355 src/msgfmt.c:659 src/msgmerge.c:513 src/xgettext.c:1170
msgid "...this is the location of the first definition"
msgstr "...dies ist die Stelle der ersten Definition"
-#: src/msgcmp.c:396 src/msgmerge.c:566
+#: src/msgcmp.c:395 src/msgmerge.c:561
#, c-format
msgid "this message has no definition in the \"%s\" domain"
msgstr "diese Meldung hat im Bereich »%s« keine Definition"
#. We are about to construct the absolute path to the
#. directory for the output files but asprintf failed.
-#: src/msgcomm.c:238 src/xgettext.c:340 src/xgettext.c:1288
+#: src/msgcomm.c:236 src/xgettext.c:337 src/xgettext.c:1365
msgid "while preparing output"
msgstr "beim Vorbereiten der Ausgabe"
-#: src/msgcomm.c:273 src/msgcomm.c:277 src/xgettext.c:378 src/xgettext.c:382
+#: src/msgcomm.c:271 src/msgcomm.c:275 src/xgettext.c:375 src/xgettext.c:379
#, c-format
msgid "%s and %s are mutually exclusive"
msgstr "%s und %s schließen sich gegenseitig aus"
-#: src/msgcomm.c:341
+#: src/msgcomm.c:327
msgid "at least two files must be specified"
msgstr "es müssen mindestens zwei Dateien angegeben werden"
-#: src/msgcomm.c:360
+#: src/msgcomm.c:346
#, c-format
msgid "impossible selection criteria specified (%d < n < %d)"
msgstr "unmögliches Auswahlkriterium (%d < n < %d)"
-#: src/msgcomm.c:400
+#: src/msgcomm.c:386
#, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] INPUTFILE ...\n"
@@ -305,7 +292,7 @@ msgstr ""
" -F, --sort-by-file sortiere Ausgabe nach Dateivorkommen\n"
" -h, --help zeige diese Hilfe und beende\n"
-#: src/msgcomm.c:412
+#: src/msgcomm.c:398
msgid ""
" -i, --indent write the .po file using indented style\n"
" --no-location do not write '#: filename:line' lines\n"
@@ -325,8 +312,8 @@ msgid ""
msgstr ""
" -i, --indent erzeuge .po Datei mit Einrückungen\n"
" --no-location schreibe keine »#: Datei:Zeile« Zeilen\n"
-" -n, --add-location erzeuge '#: Dateiname:Zeilennummer' "
-"(default)\n"
+" -n, --add-location erzeuge '#: Dateiname:"
+"Zeilennummer' (default)\n"
" --omit-header `msgid \"\"' Eintrag in Kopfteil nicht "
"erzeugen\n"
" -o, --output=DATEI schreibe Ausgabe in DATEI\n"
@@ -339,7 +326,7 @@ msgstr ""
"Meldungen\n"
" an, die nur einmal vorkommen\n"
-#: src/msgcomm.c:425
+#: src/msgcomm.c:411
msgid ""
" -V, --version output version information and exit\n"
" -w, --width=NUMBER set output page width\n"
@@ -363,8 +350,8 @@ msgstr ""
" -<, --less-than=ANZAHL zeige Meldungen mit weniger als ANZAHL "
"Definitionen\n"
" (Standardwert: unendlich)\n"
-" ->, --more-than=ANZAHL zeige Meldungen mit mehr als ANZAH{ "
-"Definitionen\n"
+" ->, --more-than=ANZAHL zeige Meldungen mit mehr als ANZAH"
+"{ Definitionen\n"
" (Standardwert: 1)\n"
"\n"
"Suche Meldungen, die in zwei oder mehr der angegebenen PO Dateien "
@@ -379,41 +366,41 @@ msgstr ""
"die sie definiert. Positionen der Meldungen in den Quellen werden für alle\n"
"PO Dateien festgehalten.\n"
-#: src/msgcomm.c:476 src/msgunfmt.c:357 src/po-lex.c:74 src/xget-lex.c:161
-#: src/xget-lex.c:176 src/xget-lex.c:193 src/xgettext.c:625
+#: src/msgcomm.c:462 src/msgunfmt.c:361 src/po-lex.c:86 src/xget-lex.c:157
+#: src/xget-lex.c:170 src/xget-lex.c:180 src/xgettext.c:611
#, c-format
msgid "error while opening \"%s\" for reading"
msgstr "Öffnen der Datei »%s« zum Lesen fehlgeschlagen"
-#: src/msgcomm.c:557 src/xgettext.c:667 src/xgettext.c:1000
+#: src/msgcomm.c:543 src/xgettext.c:653 src/xgettext.c:1071
msgid "this file may not contain domain directives"
msgstr "diese Datei darf keine `domain' Anweisung enthalten"
-#: src/msgfmt.c:273 src/xgettext.c:417
+#: src/msgfmt.c:286 src/xgettext.c:414
msgid "no input file given"
msgstr "Eingabedatei fehlt"
-#: src/msgfmt.c:321
+#: src/msgfmt.c:337
#, c-format
msgid "error while opening \"%s\" for writing"
msgstr "Öffnen der Datei »%s« zum Schreiben fehlgeschlagen"
-#: src/msgfmt.c:343
+#: src/msgfmt.c:359
#, c-format
msgid "%d translated messages"
msgstr "%d übersetzte Meldungen"
-#: src/msgfmt.c:345
+#: src/msgfmt.c:361
#, c-format
msgid ", %d fuzzy translations"
msgstr ", %d ungenaue Übersetzungen"
-#: src/msgfmt.c:347
+#: src/msgfmt.c:363
#, c-format
msgid ", %d untranslated messages"
msgstr ", %d unübersetzte Meldungen"
-#: src/msgfmt.c:366
+#: src/msgfmt.c:382
#, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] filename.po ...\n"
@@ -458,21 +445,23 @@ msgstr ""
"Wenn die Eingabedatei - ist, wird die Eingabe von Standard Eingabe gelesen.\n"
"Ist die Ausgabedatei -, wird nach Standard Ausgabe geschrieben.\n"
-#: src/msgfmt.c:409
+#: src/msgfmt.c:425
msgid "while creating hash table"
msgstr "beim Anlegen der Hash-Tabelle"
-#: src/msgfmt.c:451
+#: src/msgfmt.c:469
#, fuzzy, c-format
-msgid "%s: warning: PO file header missing, fuzzy, or invalid"
+msgid ""
+"%s: warning: PO file header missing, fuzzy, or invalid\n"
+"%*s warning: charset conversion will not work"
msgstr "%s: Warnung: Quelldatei enthält ungenaue Übersetzungen"
-#: src/msgfmt.c:474
+#: src/msgfmt.c:493
#, c-format
msgid "domain name \"%s\" not suitable as file name"
msgstr "Bereichsname »%s« ist nicht als Dateiname geeignet"
-#: src/msgfmt.c:479
+#: src/msgfmt.c:498
#, c-format
msgid "domain name \"%s\" not suitable as file name: will use prefix"
msgstr ""
@@ -480,63 +469,83 @@ msgstr ""
#. We don't change the exit status here because this is really
#. only an information.
-#: src/msgfmt.c:492
+#: src/msgfmt.c:511
#, c-format
msgid "`domain %s' directive ignored"
msgstr "»domain %s« Anweisung wird ignoriert"
-#: src/msgfmt.c:520
+#: src/msgfmt.c:541
msgid "empty `msgstr' entry ignored"
msgstr "leerer »msgstr« Eintrag wird ignoriert"
-#: src/msgfmt.c:521
+#: src/msgfmt.c:542
msgid "fuzzy `msgstr' entry ignored"
msgstr "ungenauer »msgstr« Eintrag wird ignoriert"
-#: src/msgfmt.c:564
+#: src/msgfmt.c:584
#, c-format
msgid "headerfield `%s' missing in header"
msgstr "Im Kopfeintrag fehlt das Feld »%s«"
-#: src/msgfmt.c:567
+#: src/msgfmt.c:587
#, c-format
msgid "header field `%s' should start at beginning of line"
msgstr "Feld »%s« im Kopfeintrag sollte in der ersten Spalte anfangen"
-#: src/msgfmt.c:577
+#: src/msgfmt.c:597
msgid "some header fields still have the initial default value"
msgstr ""
"Einige Felder im Kopfeintrag haben immer noch den vorgegebenen Standardwert"
-#: src/msgfmt.c:588
+#: src/msgfmt.c:608
#, c-format
msgid "field `%s' still has initial default value"
msgstr "Feld »%s« hat immer noch den vorgegebenen Standardwert"
-#: src/msgfmt.c:673
+#: src/msgfmt.c:698
#, c-format
msgid "%s: warning: source file contains fuzzy translation"
msgstr "%s: Warnung: Quelldatei enthält ungenaue Übersetzungen"
-#: src/msgfmt.c:875
+#: src/msgfmt.c:920
+#, fuzzy
+msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
+msgstr "»msgid« und »msgstr« Eintrag beginnt nicht jeweils mit »\\n«"
+
+#: src/msgfmt.c:928
+#, fuzzy, c-format
+msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
+msgstr "»msgid« und »msgstr« Eintrag beginnt nicht jeweils mit »\\n«"
+
+#: src/msgfmt.c:938
msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
msgstr "»msgid« und »msgstr« Eintrag beginnt nicht jeweils mit »\\n«"
-#: src/msgfmt.c:883
+#: src/msgfmt.c:953
+#, fuzzy
+msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
+msgstr "»msgid« und »msgstr« Eintrag endet nicht jeweils mit »\\n«"
+
+#: src/msgfmt.c:961
+#, fuzzy, c-format
+msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
+msgstr "»msgid« und »msgstr« Eintrag endet nicht jeweils mit »\\n«"
+
+#: src/msgfmt.c:971
msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
msgstr "»msgid« und »msgstr« Eintrag endet nicht jeweils mit »\\n«"
-#: src/msgfmt.c:897
+#: src/msgfmt.c:987
msgid "number of format specifications in `msgid' and `msgstr' does not match"
msgstr ""
"Anzahl der Formatelemente in »msgid« and »msgstr« stimmen nicht überein"
-#: src/msgfmt.c:914
+#: src/msgfmt.c:1004
#, c-format
msgid "format specifications for argument %u are not the same"
msgstr "Formatelemente für Argument %u stimmen nicht überein"
-#: src/msgmerge.c:328
+#: src/msgmerge.c:320
#, fuzzy, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] def.po ref.po\n"
@@ -576,7 +585,7 @@ msgstr ""
" -V, --version zeige Versionsnummer und beende\n"
" -w, --width=ANZAHL lege Breite der Ausgabe auf ANZAHL Spalten fest\n"
-#: src/msgmerge.c:348
+#: src/msgmerge.c:340
#, no-wrap
msgid ""
"\n"
@@ -602,20 +611,20 @@ msgstr ""
"ein besseres Ergebnis zu erzielen. Solange nicht anders angegeben wird das\n"
"Ergebnis nach Standard Ausgabe geschrieben.\n"
-#: src/msgmerge.c:804
+#: src/msgmerge.c:799
#, c-format
msgid ""
-"%sRead %d old + %d reference, merged %d, fuzzied %d, missing %d, obsolete "
-"%d.\n"
+"%sRead %d old + %d reference, merged %d, fuzzied %d, missing %d, obsolete %"
+"d.\n"
msgstr ""
"%s%d alte + %d Referenzeinträge gelesen,\n"
"%d stimmen überein, %d ungefähr, %d fehlen, %d veraltet.\n"
-#: src/msgmerge.c:810
+#: src/msgmerge.c:805
msgid " done.\n"
msgstr " fertig.\n"
-#: src/msgunfmt.c:215
+#: src/msgunfmt.c:210
#, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] [FILE]...\n"
@@ -643,7 +652,7 @@ msgstr ""
" -V, --version zeige Versionsnummer und beende\n"
" -w, --width=ANZAHL lege Breite der Ausgabe auf ANZAHL Spalten fest\n"
-#: src/msgunfmt.c:229
+#: src/msgunfmt.c:224
#, no-wrap
msgid ""
"\n"
@@ -658,89 +667,123 @@ msgstr ""
"Eingabedatei - ist, wird von Standard Eingabe gelesen. Standardmäßig\n"
"wird die Ausgabe nach Standard Ausgabe geschrieben.\n"
-#: src/msgunfmt.c:266 src/msgunfmt.c:330 src/po-lex.c:185 src/xget-lex.c:256
+#: src/msgunfmt.c:261 src/msgunfmt.c:326 src/po-lex.c:213 src/xget-lex.c:243
#, c-format
msgid "error while reading \"%s\""
msgstr "Fehler beim Lesen von »%s«"
-#: src/msgunfmt.c:267 src/msgunfmt.c:331
+#: src/msgunfmt.c:262 src/msgunfmt.c:327
#, c-format
msgid "file \"%s\" truncated"
msgstr "Datei »%s« ist verstümmelt"
-#: src/msgunfmt.c:298
+#: src/msgunfmt.c:293
#, c-format
msgid "seek \"%s\" offset %ld failed"
msgstr "Positionieren in Datei »%s« auf Position %ld fehlgeschlagen"
-#: src/msgunfmt.c:373
+#: src/msgunfmt.c:332
+#, fuzzy, c-format
+msgid "file \"%s\" contains a not NUL terminated string"
+msgstr "Datei »%s« ist keine Datei im GNU .mo Format"
+
+#: src/msgunfmt.c:377
#, c-format
msgid "file \"%s\" is not in GNU .mo format"
msgstr "Datei »%s« ist keine Datei im GNU .mo Format"
-#: /home/drepper/gnu/gettext/build/src/../../src/po-gram-gen.y:129
+#: src/open-po.c:64
+msgid "<stdin>"
+msgstr ""
+
+#: po-gram-gen.y:87
+msgid "inconsistent use of #~"
+msgstr ""
+
+#: po-gram-gen.y:168
+#, fuzzy
+msgid "missing `msgstr[]' section"
+msgstr "»msgstr« Abschnitt fehlt"
+
+#: po-gram-gen.y:176
+#, fuzzy
+msgid "missing `msgid_plural' section"
+msgstr "»msgstr« Abschnitt fehlt"
+
+#: po-gram-gen.y:183
msgid "missing `msgstr' section"
msgstr "»msgstr« Abschnitt fehlt"
-#: src/po-lex.c:84
-#, c-format
-msgid "found %d fatal errors"
-msgstr "es sind %d fatale Fehler aufgetreten"
+#: po-gram-gen.y:228
+msgid "first plural form has nonzero index"
+msgstr ""
-#: src/po-lex.c:129 src/po-lex.c:168
+#: po-gram-gen.y:230
+msgid "plural form has wrong index"
+msgstr ""
+
+#. CAUTION: If you change this macro, you must also make identical
+#. changes to the function of the same name in src/po-lex.c
+#: src/po-lex.c:156 src/po-lex.c:195 src/po-lex.h:85 src/po-lex.h:99
+#: src/po-lex.h:115 src/po-lex.h:129
msgid "too many errors, aborting"
msgstr "zu viele Fehler: Abbruch"
-#: src/po-lex.c:241
+#: src/po-lex.c:271
#, c-format
msgid "keyword \"%s\" unknown"
msgstr "Schlüsselwort »%s« ist unbekannt"
-#: src/po-lex.c:335
+#: src/po-lex.c:374
#, fuzzy
msgid "invalid control sequence"
msgstr "ungültiges Kontrollzeichen"
-#: src/po-lex.c:419
+#: src/po-lex.c:477
+msgid "end-of-file within string"
+msgstr "Dateiende innerhalb einer Zeichenkette"
+
+#: src/po-lex.c:482
msgid "end-of-line within string"
msgstr "Zeilenende innerhalb einer Zeichenkette"
-#: src/po-lex.c:424
-msgid "end-of-file within string"
-msgstr "Dateiende innerhalb einer Zeichenkette"
+#: src/po-lex.c:525
+#, fuzzy
+msgid "invalid multibyte sequence"
+msgstr "ungültiges Kontrollzeichen"
-#: src/xget-lex.c:152
+#: src/xget-lex.c:148
msgid "standard input"
msgstr "Standard Eingabe"
-#: src/xget-lex.c:894
+#: src/xget-lex.c:876
#, c-format
msgid "%s:%d: warning: unterminated character constant"
msgstr "%s:%d: Warnung: Zeichenkonstante ohne korrektes Ende"
-#: src/xget-lex.c:916
+#: src/xget-lex.c:898
#, c-format
msgid "%s:%d: warning: unterminated string literal"
msgstr "%s:%d: Warnung: Zeichenkette nicht korrekt beendet"
-#: src/xgettext.c:386
+#: src/xgettext.c:383
msgid "--join-existing cannot be used when output is written to stdout"
msgstr ""
"--join-existing kann nicht benutzt werden, wenn nach Standard Ausgabe "
"geschrieben wird"
-#: src/xgettext.c:391
+#: src/xgettext.c:388
msgid "xgettext cannot work without keywords to look for"
msgstr ""
-#: src/xgettext.c:508
+#: src/xgettext.c:494
#, c-format
msgid "warning: file `%s' extension `%s' is unknown; will try C"
msgstr ""
"Warnung: Typ der Datei »%s« mit Anhängsel »%s« ist unbekannt; werde es mit C "
"versuchen"
-#: src/xgettext.c:544
+#: src/xgettext.c:530
#, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] INPUTFILE ...\n"
@@ -782,7 +825,7 @@ msgstr ""
" --foreign-user füge keine FSF Copyright Zeile in Ausgabe ein\n"
" -F, --sort-by-file sortiere Ausgabe nach Dateivorkommen\n"
-#: src/xgettext.c:564
+#: src/xgettext.c:550
#, c-format, no-wrap
msgid ""
" -h, --help display this help and exit\n"
@@ -810,7 +853,7 @@ msgstr ""
" -M, --msgstr-suffix[=KETTE] nehme KETTE oder \"\" als Suffix für msgstr\n"
" --no-location erzeuge keine '#: Dateiname:Zeile' Zeilen\n"
-#: src/xgettext.c:578
+#: src/xgettext.c:564
#, no-wrap
msgid ""
" -n, --add-location generate '#: filename:line' lines (default)\n"
@@ -839,20 +882,35 @@ msgstr ""
"\n"
"Wenn EINGABEDATEI - ist, wird von Standard Eingabe gelesen.\n"
-#: src/xgettext.c:879
+#: src/xgettext.c:926
#, fuzzy, c-format
msgid "%s:%d: warning: keyword nested in keyword arg"
msgstr "%s:%d: Warnung: Zeichenkette nicht korrekt beendet"
-#: src/xgettext.c:889
+#: src/xgettext.c:936
#, c-format
msgid "%s:%d: warning: keyword between outer keyword and its arg"
msgstr ""
-#: src/xgettext.c:1374
+#: src/xgettext.c:1432
#, c-format
msgid "language `%s' unknown"
msgstr "Programmiersprache `%s' unbekannt"
+#~ msgid ""
+#~ "internationalized messages should not contain the `\\%c' escape sequence"
+#~ msgstr ""
+#~ "internationalisierbare Meldungen sollten nicht die Ersatzdarstellung »\\%"
+#~ "c« enthalten"
+
+#~ msgid "cannot create output file \"%s\""
+#~ msgstr "Ausgabedatei »%s« kann nicht erzeugt werden"
+
+#~ msgid "standard output"
+#~ msgstr "Standard Ausgabe"
+
+#~ msgid "error while writing \"%s\" file"
+#~ msgstr "Fehler beim Schreiben von Datei »%s«"
+
#~ msgid "%s: warning: no header entry found"
#~ msgstr "%s: Warnung: kein Kopfeintrag gefunden"
diff --git a/po/el.po b/po/el.po
index 321bc28..107871c 100644
--- a/po/el.po
+++ b/po/el.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: GNU gettext 0.10.34\n"
-"POT-Creation-Date: 2000-07-28 22:51+0200\n"
+"POT-Creation-Date: 2001-03-09 19:56+0100\n"
"PO-Revision-Date: 1998-05-17 13:12+0200\n"
"Last-Translator: Simos KSenitellis <simos@teiath.gr>\n"
"Language-Team: Greek <simos@teiath.gr>\n"
@@ -14,110 +14,94 @@ msgstr ""
"Content-Transfer-Encoding: 8-bit\n"
#
-# File: lib/error.c, line: 103
-#: lib/error.c:103
+#: lib/error.c:115
msgid "Unknown system error"
msgstr "¶ãíùóôï óöÜëìá óõóôŞìáôïò"
#
-# File: lib/getopt.c, line: 680
-#: lib/getopt.c:680
+#: lib/getopt.c:691
#, c-format
msgid "%s: option `%s' is ambiguous\n"
msgstr "%s: ç åğéëïãŞ `%s' åßíáé äéöïñïıìåíç\n"
#
-# File: lib/getopt.c, line: 704
-#: lib/getopt.c:704
+#: lib/getopt.c:716
#, c-format
msgid "%s: option `--%s' doesn't allow an argument\n"
msgstr "%s: ç åğéëïãŞ `--%s' äåí åğéôñİğåé ğáñÜìåôñï\n"
#
-# File: lib/getopt.c, line: 709
-#: lib/getopt.c:709
+#: lib/getopt.c:721
#, c-format
msgid "%s: option `%c%s' doesn't allow an argument\n"
msgstr "%s: ç åğéëïãŞ `%c%s' äåí åğéôñİğåé ğáñÜìåôñï\n"
#
-# File: lib/getopt.c, line: 726
-# File: lib/getopt.c, line: 899
-#: lib/getopt.c:726 lib/getopt.c:899
+#: lib/getopt.c:739 lib/getopt.c:912
#, c-format
msgid "%s: option `%s' requires an argument\n"
msgstr "%s: ç åğéëïãŞ `%s' áğáéôåß ğáñÜìåôñï\n"
#
-# File: lib/getopt.c, line: 755
#. --option
-#: lib/getopt.c:755
+#: lib/getopt.c:768
#, c-format
msgid "%s: unrecognized option `--%s'\n"
msgstr "%s: ìç áíáãíùñßóéìç åğéëïãŞ `--%s'\n"
#
-# File: lib/getopt.c, line: 759
#. +option or -option
-#: lib/getopt.c:759
+#: lib/getopt.c:772
#, c-format
msgid "%s: unrecognized option `%c%s'\n"
msgstr "%s: ìç áíáãíùñßóéìç åğéëïãŞ `%c%s'\n"
#
-# File: lib/getopt.c, line: 785
#. 1003.2 specifies the format of this message.
-#: lib/getopt.c:785
+#: lib/getopt.c:798
#, c-format
msgid "%s: illegal option -- %c\n"
msgstr "%s: ìç áğïäåêôŞ åğéëïãŞ -- %c\n"
#
-# File: lib/getopt.c, line: 788
-#: lib/getopt.c:788
+#: lib/getopt.c:801
#, c-format
msgid "%s: invalid option -- %c\n"
msgstr "%s: ìç İãêõñç åğéëïãŞ -- %c\n"
#
-# File: lib/getopt.c, line: 818
-# File: lib/getopt.c, line: 948
#. 1003.2 specifies the format of this message.
-#: lib/getopt.c:818 lib/getopt.c:948
+#: lib/getopt.c:831 lib/getopt.c:961
#, c-format
msgid "%s: option requires an argument -- %c\n"
msgstr "%s: ç åğéëïãŞ áğáéôåß ğáñÜìåôñï -- %c\n"
#
-# File: lib/getopt.c, line: 865
-#: lib/getopt.c:865
+#: lib/getopt.c:878
#, c-format
msgid "%s: option `-W %s' is ambiguous\n"
msgstr "%s: ç åğéëïãŞ `-W %s' åßíáé äéöïñïıìåíç\n"
#
-# File: lib/getopt.c, line: 883
-#: lib/getopt.c:883
+#: lib/getopt.c:896
#, c-format
msgid "%s: option `-W %s' doesn't allow an argument\n"
msgstr "%s: ç åğéëïãŞ `-W %s' äåí åğéôñİğåé ğáñÜìåôñï\n"
#
-# File: lib/xmalloc.c, line: 82
-#: lib/xmalloc.c:82
+#: lib/obstack.c:474
+#, fuzzy
+msgid "memory exhausted"
+msgstr "H ìíŞìç åîáíôëŞèçêå"
+
+#
+#: lib/xmalloc.c:86
msgid "Memory exhausted"
msgstr "H ìíŞìç åîáíôëŞèçêå"
#
-# File: src/gettextp.c, line: 134
-# File: src/msgcmp.c, line: 144
-# File: src/msgcomm.c, line: 285
-# File: src/msgfmt.c, line: 257
-# File: src/msgmerge.c, line: 254
-# File: src/msgunfmt.c, line: 175
-# File: src/xgettext.c, line: 394
-#: src/gettextp.c:134 src/msgcmp.c:144 src/msgcomm.c:285 src/msgfmt.c:257
-#: src/msgmerge.c:263 src/msgunfmt.c:175 src/xgettext.c:401
+#: src/gettext.c:138 src/msgcmp.c:140 src/msgcomm.c:283 src/msgfmt.c:270
+#: src/msgmerge.c:255 src/msgunfmt.c:170 src/xgettext.c:398
#, c-format, no-wrap
msgid ""
"Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -130,48 +114,31 @@ msgstr ""
"ËÅÉÔÏÕÑÃÉÊÏÔÇÔÁ Ş ÊÁÔÁËËÇËÏÔÇÔÁ ÃÉÁ ÅÍÁ ÓÕÃÊÅÊÑÉÌÅÍÏ ÓÊÏĞÏ.\n"
#
-# File: src/gettextp.c, line: 139
-# File: src/msgcmp.c, line: 149
-# File: src/msgcomm.c, line: 290
-# File: src/msgfmt.c, line: 262
-# File: src/msgmerge.c, line: 259
-# File: src/msgunfmt.c, line: 180
-# File: src/xgettext.c, line: 399
-#: src/gettextp.c:139 src/msgcmp.c:149 src/msgcomm.c:290 src/msgfmt.c:262
-#: src/msgmerge.c:268 src/msgunfmt.c:180 src/xgettext.c:406
+#: src/gettext.c:143 src/msgcmp.c:145 src/msgcomm.c:288 src/msgfmt.c:275
+#: src/msgmerge.c:260 src/msgunfmt.c:175 src/xgettext.c:403
#, c-format
msgid "Written by %s.\n"
msgstr "Ãñáììİíï áğü ôïí/ôçí %s.\n"
#
-# File: src/gettextp.c, line: 154
-#: src/gettextp.c:154
+#: src/gettext.c:158
msgid "missing arguments"
msgstr "õğïëåßğïíôáé ïñßóìáôá"
#
-# File: src/gettextp.c, line: 164
-#: src/gettextp.c:164
+#: src/gettext.c:168
msgid "too many arguments"
msgstr "ğÜñá ğïëëÜ ïñßóìáôá"
#
-# File: src/gettextp.c, line: 228
-# File: src/msgcmp.c, line: 181
-# File: src/msgcomm.c, line: 395
-# File: src/msgfmt.c, line: 361
-# File: src/msgmerge.c, line: 301
-# File: src/msgunfmt.c, line: 210
-# File: src/xgettext.c, line: 532
-#: src/gettextp.c:228 src/msgcmp.c:181 src/msgcomm.c:395 src/msgfmt.c:361
-#: src/msgmerge.c:323 src/msgunfmt.c:210 src/xgettext.c:539
+#: src/gettext.c:232 src/msgcmp.c:177 src/msgcomm.c:381 src/msgfmt.c:377
+#: src/msgmerge.c:315 src/msgunfmt.c:205 src/xgettext.c:525
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "ÄïêéìÜóôå `%s --help' ãéá ğåñéóóüôåñåò ğëçñïöïñßåò.\n"
#
-# File: src/gettextp.c, line: 233
-#: src/gettextp.c:233
+#: src/gettext.c:237
#, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] [[[TEXTDOMAIN] MSGID] | [-s [MSGID]...]]\n"
@@ -196,8 +163,7 @@ msgstr ""
" óôï MSGID áğü ôï TEXTDOMAIN\n"
#
-# File: src/gettextp.c, line: 245
-#: src/gettextp.c:245
+#: src/gettext.c:249
#, c-format, no-wrap
msgid ""
"\n"
@@ -220,66 +186,23 @@ msgstr ""
"Êáèéåñùìİíïò êáôÜëïãïò áíáæŞôçóçò: %s\n"
#
-# File: src/gettextp.c, line: 255
-# File: src/msgcmp.c, line: 200
-# File: src/msgcomm.c, line: 442
-# File: src/msgfmt.c, line: 388
-# File: src/msgmerge.c, line: 334
-# File: src/msgunfmt.c, line: 234
-# File: src/xgettext.c, line: 584
-#: src/gettextp.c:255 src/msgcmp.c:200 src/msgcomm.c:442 src/msgfmt.c:388
-#: src/msgmerge.c:358 src/msgunfmt.c:234 src/xgettext.c:591
+#: src/gettext.c:259 src/msgcmp.c:196 src/msgcomm.c:428 src/msgfmt.c:404
+#: src/msgmerge.c:350 src/msgunfmt.c:229 src/xgettext.c:577
msgid "Report bugs to <bug-gnu-utils@gnu.org>.\n"
msgstr "Óôåßëôå áíáöïñİò óöáëìÜôùí óôï <bug-gnu-utils@gnu.org>.\n"
#
-# File: src/message.c, line: 784
-#: src/message.c:900
-#, c-format
-msgid ""
-"internationalized messages should not contain the `\\%c' escape sequence"
-msgstr ""
-"ôá ìçíıìáôá ğñïò ìåôÜöñáóç äåí ğñİğåé íá ğåñéİ÷ïõí ôï ÷áñáêôŞñá äéáöõãŞò "
-"`\\%c'"
-
-#
-# File: src/message.c, line: 1115
-#: src/message.c:1231
-#, c-format
-msgid "cannot create output file \"%s\""
-msgstr "áäõíáìßá äçìéïõñãßáò áñ÷åßïõ åîüäïõ \"%s\""
-
-#
-# File: src/message.c, line: 1122
-#: src/message.c:1238
-#, no-c-format
-msgid "standard output"
-msgstr "êáíïíéêŞ İîïäïò"
-
-#
-# File: src/message.c, line: 1182
-#: src/message.c:1298
-#, c-format
-msgid "error while writing \"%s\" file"
-msgstr "óöÜëìá óôçí åããñáöŞ ôïõ áñ÷åßïõ \"%s\""
-
-#
-# File: src/msgcmp.c, line: 160
-# File: src/msgmerge.c, line: 270
-#: src/msgcmp.c:160 src/msgmerge.c:279
+#: src/msgcmp.c:156 src/msgmerge.c:271
msgid "no input files given"
msgstr "äåí êáèïñßóôçêáí áñ÷åßá åéóüäïõ"
#
-# File: src/msgcmp.c, line: 165
-# File: src/msgmerge.c, line: 275
-#: src/msgcmp.c:165 src/msgmerge.c:284
+#: src/msgcmp.c:161 src/msgmerge.c:276
msgid "exactly 2 input files required"
msgstr "áğáéôïıíôáé áêñéâşò äıï áñ÷åßá åéóüäïõ"
#
-# File: src/msgcmp.c, line: 186
-#: src/msgcmp.c:186
+#: src/msgcmp.c:182
#, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] def.po ref.po\n"
@@ -312,95 +235,74 @@ msgstr ""
"ãßíåôáé åëáóôéêü ôáßñéáóìá ãéá êáëıôåñá áğïôåëİóìáôá.\n"
#
-# File: src/msgcmp.c, line: 259
-# File: src/msgmerge.c, line: 714
-#: src/msgcmp.c:259 src/msgmerge.c:746
+#: src/msgcmp.c:255 src/msgmerge.c:741
msgid "this message is used but not defined..."
msgstr "áõôü ôï ìŞíõìá ÷ñçóéìïğïåßôáé, áëëÜ äåí ïñßæåôáé..."
#
-# File: src/msgcmp.c, line: 261
-# File: src/msgmerge.c, line: 716
-#: src/msgcmp.c:261 src/msgmerge.c:748
+#: src/msgcmp.c:257 src/msgmerge.c:743
msgid "...but this definition is similar"
msgstr "...áëëÜ áõôüò ï ïñéóìüò åßíáé ğáñüìïéïò"
#
-# File: src/msgcmp.c, line: 267
-# File: src/msgmerge.c, line: 743
-#: src/msgcmp.c:267 src/msgmerge.c:775
+#: src/msgcmp.c:263 src/msgmerge.c:770
#, c-format
msgid "this message is used but not defined in %s"
msgstr "áõôü ôï ìŞíõìá ÷ñçóéìïğïåßôáé, áëëÜ äåí ïñßæåôáé óôï %s"
#
-# File: src/msgcmp.c, line: 281
-#: src/msgcmp.c:281
+#: src/msgcmp.c:277
msgid "warning: this message is not used"
msgstr "ğñïåéäïğïßçóç: áõôü ôï ìŞíõìá äåí ÷ñçóéìïğïåßôáé"
#
-# File: src/msgcmp.c, line: 355
-# File: src/msgfmt.c, line: 632
-# File: src/msgmerge.c, line: 493
-# File: src/xgettext.c, line: 1063
-#: src/msgcmp.c:355 src/msgfmt.c:633 src/msgmerge.c:517 src/xgettext.c:1093
+#: src/msgcmp.c:282 src/po-lex.c:102
+#, c-format
+msgid "found %d fatal errors"
+msgstr "âñİèçêáí %d óïâáñÜ óöÜëìáôá"
+
+#
+#: src/msgcmp.c:354 src/msgfmt.c:657 src/msgmerge.c:512 src/xgettext.c:1169
msgid "duplicate message definition"
msgstr "åğáíáëáìâáíüìåíïò ïñéóìüò ìçíıìáôïò"
#
-# File: src/msgcmp.c, line: 356
-# File: src/msgfmt.c, line: 633
-# File: src/msgmerge.c, line: 494
-# File: src/xgettext.c, line: 1064
-#: src/msgcmp.c:356 src/msgfmt.c:634 src/msgmerge.c:518 src/xgettext.c:1094
+#: src/msgcmp.c:355 src/msgfmt.c:659 src/msgmerge.c:513 src/xgettext.c:1170
msgid "...this is the location of the first definition"
msgstr "...áõôŞ åßíáé ç èİóç ôïõ ğñşôïõ ïñéóìïı"
#
-# File: src/msgcmp.c, line: 396
-# File: src/msgmerge.c, line: 542
-#: src/msgcmp.c:396 src/msgmerge.c:566
+#: src/msgcmp.c:395 src/msgmerge.c:561
#, c-format
msgid "this message has no definition in the \"%s\" domain"
msgstr "áõôü ôï ìŞíõìá äåí İ÷åé ïñéóìü óôç ğåñéï÷Ş \"%s\""
#
-# File: src/msgcomm.c, line: 238
-# File: src/xgettext.c, line: 340
-# File: src/xgettext.c, line: 1258
#. We are about to construct the absolute path to the
#. directory for the output files but asprintf failed.
-#: src/msgcomm.c:238 src/xgettext.c:340 src/xgettext.c:1288
+#: src/msgcomm.c:236 src/xgettext.c:337 src/xgettext.c:1365
msgid "while preparing output"
msgstr "êáèşò ğñïåôïéìáæüôáí ç İîïäïò"
#
-# File: src/msgcomm.c, line: 273
-# File: src/msgcomm.c, line: 277
-# File: src/xgettext.c, line: 378
-# File: src/xgettext.c, line: 382
-#: src/msgcomm.c:273 src/msgcomm.c:277 src/xgettext.c:378 src/xgettext.c:382
+#: src/msgcomm.c:271 src/msgcomm.c:275 src/xgettext.c:375 src/xgettext.c:379
#, c-format
msgid "%s and %s are mutually exclusive"
msgstr "ôá %s êáé %s åßíáé áìïéâáßá áğïêëåéşìåíá"
#
-# File: src/msgcomm.c, line: 341
-#: src/msgcomm.c:341
+#: src/msgcomm.c:327
msgid "at least two files must be specified"
msgstr "ğñİğåé íá ïñéóôïıí ôïõëÜ÷éóôïí äıï áñ÷åßá"
#
-# File: src/msgcomm.c, line: 360
-#: src/msgcomm.c:360
+#: src/msgcomm.c:346
#, c-format
msgid "impossible selection criteria specified (%d < n < %d)"
msgstr "İ÷åé åğéëå÷èåß áäıíáôï êñéôŞñéï åğéëïãŞò (%d < n < %d)"
#
-# File: src/msgcomm.c, line: 400
-#: src/msgcomm.c:400
+#: src/msgcomm.c:386
#, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] INPUTFILE ...\n"
@@ -429,8 +331,7 @@ msgstr ""
" -h, --help åìöÜíéóç áõôŞò ôçò âïŞèåéáò êáé İîïäïò\n"
#
-# File: src/msgcomm.c, line: 412
-#: src/msgcomm.c:412
+#: src/msgcomm.c:398
msgid ""
" -i, --indent write the .po file using indented style\n"
" --no-location do not write '#: filename:line' lines\n"
@@ -450,8 +351,8 @@ msgid ""
msgstr ""
" -i, --indent äçìéïõñãßá .po áñ÷åßïõ ìå ìïñöïğïéçìİíç "
"İîïäï\n"
-" --no-location áğïöõãŞ åìöÜíéóçò ãñáììşí '#: "
-"filename:line'\n"
+" --no-location áğïöõãŞ åìöÜíéóçò ãñáììşí '#: filename:"
+"line'\n"
" -n, --add-location äçìéïõñãßá ãñáììşí '#: filename:line' (åî "
"ïñéóìïı)\n"
" --omit-header íá ìç ãñáöôåß êåöáëßäá ìå åããñáöŞ `msgid "
@@ -469,8 +370,7 @@ msgstr ""
" åìöÜíéóç ìüíï ôùí ìïíáäéêşí ìçíõìÜôùí\n"
#
-# File: src/msgcomm.c, line: 425
-#: src/msgcomm.c:425
+#: src/msgcomm.c:411
msgid ""
" -V, --version output version information and exit\n"
" -w, --width=NUMBER set output page width\n"
@@ -501,8 +401,8 @@ msgstr ""
"\n"
"Åıñåóç ìçíõìÜôùí ğïõ åßíáé êïéíÜ óå äıï Ş ğåñéóóüôåñá ïñéóìİíá áñ÷åßá PO.\n"
"Ìå ôç ÷ñŞóç ôçò åğéëïãŞò --more-than option, ìğïñåß íá æçôçèåß ìåãáëıôåñç\n"
-"óõããİíåéá ğñéí åìöáíéóôïıí ôá ìçíıìáôá. Áíôßèåôá, ìå ôçí åğéëïãŞ "
-"--less-than\n"
+"óõããİíåéá ğñéí åìöáíéóôïıí ôá ìçíıìáôá. Áíôßèåôá, ìå ôçí åğéëïãŞ --less-"
+"than\n"
"ìğïñåß íá ïñéóôåß ìéêñüôåñç óõããİíåéá ğñéí åìöáíéóôïıí ôá ìçíıìáôá (ğ.÷.\n"
"ôï --less-than=2 èá åìöáíßóåé ìüíï ôá ìïíáäéêÜ ìçíıìáôá). Ïé ìåôáöñÜóåéò,\n"
"ôá ó÷üëéá êáé ôá ìçíıìáôá óå ìïñöŞ ó÷ïëßùí èá äéáôçñçèïıí, áëëÜ ìüíï áğü ôï\n"
@@ -510,65 +410,48 @@ msgstr ""
"èá äéáôçñçèïıí.\n"
#
-# File: src/msgcomm.c, line: 476
-# File: src/msgunfmt.c, line: 357
-# File: src/po-lex.c, line: 74
-# File: src/xget-lex.c, line: 159
-# File: src/xget-lex.c, line: 174
-# File: src/xget-lex.c, line: 191
-# File: src/xgettext.c, line: 618
-#: src/msgcomm.c:476 src/msgunfmt.c:357 src/po-lex.c:74 src/xget-lex.c:161
-#: src/xget-lex.c:176 src/xget-lex.c:193 src/xgettext.c:625
+#: src/msgcomm.c:462 src/msgunfmt.c:361 src/po-lex.c:86 src/xget-lex.c:157
+#: src/xget-lex.c:170 src/xget-lex.c:180 src/xgettext.c:611
#, c-format
msgid "error while opening \"%s\" for reading"
msgstr "óöÜëìá óôï Üíïéãìá ôïõ \"%s\" ãéá áíÜãíùóç"
#
-# File: src/msgcomm.c, line: 557
-# File: src/xgettext.c, line: 660
-# File: src/xgettext.c, line: 970
-#: src/msgcomm.c:557 src/xgettext.c:667 src/xgettext.c:1000
+#: src/msgcomm.c:543 src/xgettext.c:653 src/xgettext.c:1071
msgid "this file may not contain domain directives"
msgstr "áõôü ôï áñ÷åßï äåí ìğïñåß íá ğåñéİ÷åé ïäçãßåò ãéá ôç ğåñéï÷Ş"
#
-# File: src/msgfmt.c, line: 273
-# File: src/xgettext.c, line: 410
-#: src/msgfmt.c:273 src/xgettext.c:417
+#: src/msgfmt.c:286 src/xgettext.c:414
msgid "no input file given"
msgstr "äåí äüèçêå áñ÷åßï åéóüäïõ"
#
-# File: src/msgfmt.c, line: 321
-#: src/msgfmt.c:321
+#: src/msgfmt.c:337
#, c-format
msgid "error while opening \"%s\" for writing"
msgstr "óöÜëìá êáôÜ ôï Üíïéãìá ôïõ áñ÷åßïõ \"%s\" ãéá åããñáöŞ"
#
-# File: src/msgfmt.c, line: 343
-#: src/msgfmt.c:343
+#: src/msgfmt.c:359
#, c-format
msgid "%d translated messages"
msgstr "%d ìåôáöñáóìİíá ìõíŞìáôá"
#
-# File: src/msgfmt.c, line: 345
-#: src/msgfmt.c:345
+#: src/msgfmt.c:361
#, c-format
msgid ", %d fuzzy translations"
msgstr ", %d ğñïóåããéóôéêİò ìåôáöñÜóåéò"
#
-# File: src/msgfmt.c, line: 347
-#: src/msgfmt.c:347
+#: src/msgfmt.c:363
#, c-format
msgid ", %d untranslated messages"
msgstr ", %d ìç ìåôáöñáóìİíá ìçíıìáôá"
#
-# File: src/msgfmt.c, line: 366
-#: src/msgfmt.c:366
+#: src/msgfmt.c:382
#, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] filename.po ...\n"
@@ -620,29 +503,27 @@ msgstr ""
"Áí ôï áñ÷åßï åîüäïõ åßíáé -, ôüôå ç İîïäïò ãñÜöåôáé óôçí êáíïíéêŞ İîïäï.\n"
#
-# File: src/msgfmt.c, line: 409
-#: src/msgfmt.c:409
+#: src/msgfmt.c:425
msgid "while creating hash table"
msgstr "êáôÜ ôç äçìéïõñãßá ôïõ hash table"
#
-# File: src/msgfmt.c, line: 672
-#: src/msgfmt.c:451
+#: src/msgfmt.c:469
#, fuzzy, c-format
-msgid "%s: warning: PO file header missing, fuzzy, or invalid"
+msgid ""
+"%s: warning: PO file header missing, fuzzy, or invalid\n"
+"%*s warning: charset conversion will not work"
msgstr ""
"%s: ğñïåéäïğïßçóç: ôï áñ÷åßï åéóüäïõ ğåñéİ÷åé ğñïóåããéóôéêİò ìåôáöñÜóåéò"
#
-# File: src/msgfmt.c, line: 473
-#: src/msgfmt.c:474
+#: src/msgfmt.c:493
#, c-format
msgid "domain name \"%s\" not suitable as file name"
msgstr "ôï üíïìá ãéá ôç ğåñéï÷Ş \"%s\" äåí åßíáé êáôÜëëçëï ãéá üíïìá áñ÷åßïõ"
#
-# File: src/msgfmt.c, line: 478
-#: src/msgfmt.c:479
+#: src/msgfmt.c:498
#, c-format
msgid "domain name \"%s\" not suitable as file name: will use prefix"
msgstr ""
@@ -650,90 +531,101 @@ msgstr ""
"ãßíåé ÷ñŞóç ğñïèİìáôïò"
#
-# File: src/msgfmt.c, line: 491
#. We don't change the exit status here because this is really
#. only an information.
-#: src/msgfmt.c:492
+#: src/msgfmt.c:511
#, c-format
msgid "`domain %s' directive ignored"
msgstr "ç ïäçãßá `domain %s' áãíïåßôáé"
#
-# File: src/msgfmt.c, line: 519
-#: src/msgfmt.c:520
+#: src/msgfmt.c:541
msgid "empty `msgstr' entry ignored"
msgstr "ç êåíŞ åããñáöŞ `msgstr' áãíïåßôáé"
#
-# File: src/msgfmt.c, line: 520
-#: src/msgfmt.c:521
+#: src/msgfmt.c:542
msgid "fuzzy `msgstr' entry ignored"
msgstr "ç ğñïóåããéóôéêŞ åããñáöŞ `msgstr' áãíïåßôáé"
#
-# File: src/msgfmt.c, line: 563
-#: src/msgfmt.c:564
+#: src/msgfmt.c:584
#, c-format
msgid "headerfield `%s' missing in header"
msgstr "ôï ğåäßï `%s' İ÷åé ğáñáëçöèåß áğü ôç êåöáëßäá"
#
-# File: src/msgfmt.c, line: 566
-#: src/msgfmt.c:567
+#: src/msgfmt.c:587
#, c-format
msgid "header field `%s' should start at beginning of line"
msgstr "ôï ğåäßá êåöáëßäáò `%s' èá İğñåğå íá îåêéíÜ óôçí áñ÷Ş ôçò ãñáììŞò"
#
-# File: src/msgfmt.c, line: 576
-#: src/msgfmt.c:577
+#: src/msgfmt.c:597
msgid "some header fields still have the initial default value"
msgstr "ìåñéêÜ ğåäßá ôçò êåöáëßäáò İ÷ïõí áêüìá ôçí áñ÷éêŞ åî ïñéóìïı ôéìŞ"
#
-# File: src/msgfmt.c, line: 587
-#: src/msgfmt.c:588
+#: src/msgfmt.c:608
#, c-format
msgid "field `%s' still has initial default value"
msgstr "ôï ğåäßï `%s' İ÷åé áêüìá ôçí áñ÷éêŞ åî ïñéóìïı ôéìŞ"
#
-# File: src/msgfmt.c, line: 672
-#: src/msgfmt.c:673
+#: src/msgfmt.c:698
#, c-format
msgid "%s: warning: source file contains fuzzy translation"
msgstr ""
"%s: ğñïåéäïğïßçóç: ôï áñ÷åßï åéóüäïõ ğåñéİ÷åé ğñïóåããéóôéêİò ìåôáöñÜóåéò"
#
-# File: src/msgfmt.c, line: 874
-#: src/msgfmt.c:875
+#: src/msgfmt.c:920
+#, fuzzy
+msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
+msgstr "Ïé åããñáöİò `msgid' êáé `msgstr' äåí îåêéíïıí êáé ïé äıï ìå '\\n'"
+
+#
+#: src/msgfmt.c:928
+#, fuzzy, c-format
+msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
+msgstr "Ïé åããñáöİò `msgid' êáé `msgstr' äåí îåêéíïıí êáé ïé äıï ìå '\\n'"
+
+#
+#: src/msgfmt.c:938
msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
msgstr "Ïé åããñáöİò `msgid' êáé `msgstr' äåí îåêéíïıí êáé ïé äıï ìå '\\n'"
#
-# File: src/msgfmt.c, line: 882
-#: src/msgfmt.c:883
+#: src/msgfmt.c:953
+#, fuzzy
+msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
+msgstr "Ïé åããñáöİò `msgid' êáé `msgstr' äåí ôåëåéşíïõí êáé ïé äıï ìå '\\n'"
+
+#
+#: src/msgfmt.c:961
+#, fuzzy, c-format
+msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
+msgstr "Ïé åããñáöİò `msgid' êáé `msgstr' äåí ôåëåéşíïõí êáé ïé äıï ìå '\\n'"
+
+#
+#: src/msgfmt.c:971
msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
msgstr "Ïé åããñáöİò `msgid' êáé `msgstr' äåí ôåëåéşíïõí êáé ïé äıï ìå '\\n'"
#
-# File: src/msgfmt.c, line: 896
-#: src/msgfmt.c:897
+#: src/msgfmt.c:987
msgid "number of format specifications in `msgid' and `msgstr' does not match"
msgstr ""
"ï áñéèìüò ôùí áíáöïñşí óå ìïñöïğïéŞóåéò ôùí `msgid' êáé `msgstr' äå óõìğßğôåé"
#
-# File: src/msgfmt.c, line: 913
-#: src/msgfmt.c:914
+#: src/msgfmt.c:1004
#, c-format
msgid "format specifications for argument %u are not the same"
msgstr "ïé ìïñöïğïéŞóåéò ãéá ôç ğáñÜìåôñï %u äåí åßíáé ßäéåò"
#
-# File: src/msgmerge.c, line: 306
-#: src/msgmerge.c:328
+#: src/msgmerge.c:320
#, fuzzy, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] def.po ref.po\n"
@@ -775,8 +667,7 @@ msgstr ""
" -w, --width=ÁÑÉÈÌÏÓ ïñéóìüò ìåãİèïõò ğëÜôïõò óåëßäáò åîüäïõ\n"
#
-# File: src/msgmerge.c, line: 324
-#: src/msgmerge.c:348
+#: src/msgmerge.c:340
#, no-wrap
msgid ""
"\n"
@@ -804,25 +695,22 @@ msgstr ""
"êÜğïéï áñ÷åßï åîüäïõ.\n"
#
-# File: src/msgmerge.c, line: 772
-#: src/msgmerge.c:804
+#: src/msgmerge.c:799
#, c-format
msgid ""
-"%sRead %d old + %d reference, merged %d, fuzzied %d, missing %d, obsolete "
-"%d.\n"
+"%sRead %d old + %d reference, merged %d, fuzzied %d, missing %d, obsolete %"
+"d.\n"
msgstr ""
-"%sÁíáãíşóôçêáí %d ğáëáéÜ + %d áíáöïñİò, óõã÷ùíåõìİíá %d, ğñïóåããéóôéêÜ "
-"%d,İ÷ïõí ğáñáëçöèåß %d, á÷ñçóéìïğïßçôá %d.\n"
+"%sÁíáãíşóôçêáí %d ğáëáéÜ + %d áíáöïñİò, óõã÷ùíåõìİíá %d, ğñïóåããéóôéêÜ %d,"
+"İ÷ïõí ğáñáëçöèåß %d, á÷ñçóéìïğïßçôá %d.\n"
#
-# File: src/msgmerge.c, line: 778
-#: src/msgmerge.c:810
+#: src/msgmerge.c:805
msgid " done.\n"
msgstr " İãéíå.\n"
#
-# File: src/msgunfmt.c, line: 215
-#: src/msgunfmt.c:215
+#: src/msgunfmt.c:210
#, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] [FILE]...\n"
@@ -853,8 +741,7 @@ msgstr ""
" -w, --width=ÁÑÉÈÌÏÓ ïñéóìüò ìåãİèïõò ğëÜôïõò óåëßäáò åîüäïõ\n"
#
-# File: src/msgunfmt.c, line: 229
-#: src/msgunfmt.c:229
+#: src/msgunfmt.c:224
#, no-wrap
msgid ""
"\n"
@@ -871,126 +758,141 @@ msgstr ""
"ãñÜöåôáé óôçí êáíïíéêŞ İîïäï.\n"
#
-# File: src/msgunfmt.c, line: 266
-# File: src/msgunfmt.c, line: 330
-# File: src/po-lex.c, line: 185
-# File: src/xget-lex.c, line: 254
-#: src/msgunfmt.c:266 src/msgunfmt.c:330 src/po-lex.c:185 src/xget-lex.c:256
+#: src/msgunfmt.c:261 src/msgunfmt.c:326 src/po-lex.c:213 src/xget-lex.c:243
#, c-format
msgid "error while reading \"%s\""
msgstr "óöÜëìá óôçí áíÜãíùóç ôïõ \"%s\""
#
-# File: src/msgunfmt.c, line: 267
-# File: src/msgunfmt.c, line: 331
-#: src/msgunfmt.c:267 src/msgunfmt.c:331
+#: src/msgunfmt.c:262 src/msgunfmt.c:327
#, c-format
msgid "file \"%s\" truncated"
msgstr "ôï áñ÷åßï \"%s\" ìçäåíßóôçêå êáé èá ãñáöïıí äåäïìİíá óå áõôü"
#
-# File: src/msgunfmt.c, line: 298
-#: src/msgunfmt.c:298
+#: src/msgunfmt.c:293
#, c-format
msgid "seek \"%s\" offset %ld failed"
msgstr "ç ğñüóâáóç óôï áñ÷åßï \"%s\", èİóç %ld, áğİôõ÷å"
#
-# File: src/msgunfmt.c, line: 373
-#: src/msgunfmt.c:373
+#: src/msgunfmt.c:332
+#, fuzzy, c-format
+msgid "file \"%s\" contains a not NUL terminated string"
+msgstr "ôï áñ÷åßï \"%s\" äåí åßíáé óôç ìïñöŞ GNU .mo"
+
+#
+#: src/msgunfmt.c:377
#, c-format
msgid "file \"%s\" is not in GNU .mo format"
msgstr "ôï áñ÷åßï \"%s\" äåí åßíáé óôç ìïñöŞ GNU .mo"
+#: src/open-po.c:64
+msgid "<stdin>"
+msgstr ""
+
+#: po-gram-gen.y:87
+msgid "inconsistent use of #~"
+msgstr ""
+
#
-# File: ../../src/po-gram.y, line: 83
-#: /home/drepper/gnu/gettext/build/src/../../src/po-gram-gen.y:129
-msgid "missing `msgstr' section"
+#: po-gram-gen.y:168
+#, fuzzy
+msgid "missing `msgstr[]' section"
msgstr "ëåßğåé åíüôçôá `msgstr'"
#
-# File: src/po-lex.c, line: 84
-#: src/po-lex.c:84
-#, c-format
-msgid "found %d fatal errors"
-msgstr "âñİèçêáí %d óïâáñÜ óöÜëìáôá"
+#: po-gram-gen.y:176
+#, fuzzy
+msgid "missing `msgid_plural' section"
+msgstr "ëåßğåé åíüôçôá `msgstr'"
+
+#
+#: po-gram-gen.y:183
+msgid "missing `msgstr' section"
+msgstr "ëåßğåé åíüôçôá `msgstr'"
+
+#: po-gram-gen.y:228
+msgid "first plural form has nonzero index"
+msgstr ""
+
+#: po-gram-gen.y:230
+msgid "plural form has wrong index"
+msgstr ""
#
-# File: src/po-lex.c, line: 129
-# File: src/po-lex.c, line: 168
-#: src/po-lex.c:129 src/po-lex.c:168
+#. CAUTION: If you change this macro, you must also make identical
+#. changes to the function of the same name in src/po-lex.c
+#: src/po-lex.c:156 src/po-lex.c:195 src/po-lex.h:85 src/po-lex.h:99
+#: src/po-lex.h:115 src/po-lex.h:129
msgid "too many errors, aborting"
msgstr "ğÜñá ğïëëÜ óöÜëìáôá, åãêáôáëåßğù"
#
-# File: src/po-lex.c, line: 241
-#: src/po-lex.c:241
+#: src/po-lex.c:271
#, c-format
msgid "keyword \"%s\" unknown"
msgstr "Üãíùóôç åíôïëŞ \"%s\""
#
-# File: src/po-lex.c, line: 332
-#: src/po-lex.c:335
+#: src/po-lex.c:374
#, fuzzy
msgid "invalid control sequence"
msgstr "ìç áğïäåêôŞ óåéñÜ ÷áñáêôŞñùí äéáöõãŞò"
#
-# File: src/po-lex.c, line: 415
-#: src/po-lex.c:419
+#: src/po-lex.c:477
+msgid "end-of-file within string"
+msgstr "ôİëïò áñ÷åßïõ (EOF) óôï áëöáñéèìçôéêü"
+
+#
+#: src/po-lex.c:482
msgid "end-of-line within string"
msgstr "ôİñìá-ãñáììŞò (eol) óôï áëöáñéèìçôéêü"
#
-# File: src/po-lex.c, line: 420
-#: src/po-lex.c:424
-msgid "end-of-file within string"
-msgstr "ôİëïò áñ÷åßïõ (EOF) óôï áëöáñéèìçôéêü"
+#: src/po-lex.c:525
+#, fuzzy
+msgid "invalid multibyte sequence"
+msgstr "ìç áğïäåêôŞ óåéñÜ ÷áñáêôŞñùí äéáöõãŞò"
#
-# File: src/xget-lex.c, line: 150
-#: src/xget-lex.c:152
+#: src/xget-lex.c:148
msgid "standard input"
msgstr "êáíïíéêŞ åßóïäïò"
#
-# File: src/xget-lex.c, line: 892
-#: src/xget-lex.c:894
+#: src/xget-lex.c:876
#, c-format
msgid "%s:%d: warning: unterminated character constant"
msgstr "%s:%d: ğñïåéäïğïßçóç: ìç ôåñìáôéóìİíç óôáèåñÜ ÷áñáêôŞñùí"
#
-# File: src/xget-lex.c, line: 914
-#: src/xget-lex.c:916
+#: src/xget-lex.c:898
#, c-format
msgid "%s:%d: warning: unterminated string literal"
msgstr "%s:%d: ğñïåéäïğïßçóç: ìç ôåñìáôéóìİíï áëöáñéèìçôéêü"
#
-# File: src/xgettext.c, line: 386
-#: src/xgettext.c:386
+#: src/xgettext.c:383
msgid "--join-existing cannot be used when output is written to stdout"
msgstr ""
"ôï --join-existing äå ìğïñåß íá ÷ñçóéìïğïéçèåß üôáí ç İîïäïò ãñÜöåôáé óôçí "
"êáíïíéêŞ İîïäï"
-#: src/xgettext.c:391
+#: src/xgettext.c:388
msgid "xgettext cannot work without keywords to look for"
msgstr ""
#
-# File: src/xgettext.c, line: 501
-#: src/xgettext.c:508
+#: src/xgettext.c:494
#, c-format
msgid "warning: file `%s' extension `%s' is unknown; will try C"
msgstr ""
"ğñïåéäïğïßçóç: ôï áñ÷åßï `%s' ìå êáôÜëçîç `%s' åßíáé Üãíùóôï· èá äïêéìáóôåß C"
#
-# File: src/xgettext.c, line: 537
-#: src/xgettext.c:544
+#: src/xgettext.c:530
#, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] INPUTFILE ...\n"
@@ -1034,8 +936,7 @@ msgstr ""
" -F, --sort-by-file ôáîéíüìçóç åîüäïõ âÜóç ôçò èİóçò áñ÷åßïõ\n"
#
-# File: src/xgettext.c, line: 557
-#: src/xgettext.c:564
+#: src/xgettext.c:550
#, c-format, no-wrap
msgid ""
" -h, --help display this help and exit\n"
@@ -1063,8 +964,7 @@ msgstr ""
" --no-location íá ìçí ãñáöïıí ãñáììİò '#: filename:line'\n"
#
-# File: src/xgettext.c, line: 571
-#: src/xgettext.c:578
+#: src/xgettext.c:564
#, no-wrap
msgid ""
" -n, --add-location generate '#: filename:line' lines (default)\n"
@@ -1096,26 +996,42 @@ msgstr ""
"Áí ôï ÁÑ×ÅÉÏÅÉÓÏÄÏÕ åßíáé -, ãßíåôáé áíÜãíùóç ôçò êáíïíéêŞò åéóüäïõ.\n"
#
-# File: src/xget-lex.c, line: 914
-#: src/xgettext.c:879
+#: src/xgettext.c:926
#, fuzzy, c-format
msgid "%s:%d: warning: keyword nested in keyword arg"
msgstr "%s:%d: ğñïåéäïğïßçóç: ìç ôåñìáôéóìİíï áëöáñéèìçôéêü"
-#: src/xgettext.c:889
+#: src/xgettext.c:936
#, c-format
msgid "%s:%d: warning: keyword between outer keyword and its arg"
msgstr ""
#
-# File: src/xgettext.c, line: 1344
-#: src/xgettext.c:1374
+#: src/xgettext.c:1432
#, c-format
msgid "language `%s' unknown"
msgstr "ç ãëşóóá `%s' åßíáé Üãíùóôç"
#
-# File: src/msgfmt.c, line: 451
+#~ msgid ""
+#~ "internationalized messages should not contain the `\\%c' escape sequence"
+#~ msgstr ""
+#~ "ôá ìçíıìáôá ğñïò ìåôÜöñáóç äåí ğñİğåé íá ğåñéİ÷ïõí ôï ÷áñáêôŞñá äéáöõãŞò `"
+#~ "\\%c'"
+
+#
+#~ msgid "cannot create output file \"%s\""
+#~ msgstr "áäõíáìßá äçìéïõñãßáò áñ÷åßïõ åîüäïõ \"%s\""
+
+#
+#~ msgid "standard output"
+#~ msgstr "êáíïíéêŞ İîïäïò"
+
+#
+#~ msgid "error while writing \"%s\" file"
+#~ msgstr "óöÜëìá óôçí åããñáöŞ ôïõ áñ÷åßïõ \"%s\""
+
+#
#~ msgid "%s: warning: no header entry found"
#~ msgstr "%s: ğñïåéäïğïßçóç: äå âñİèçêå áñ÷Ş êåöáëßäáò"
@@ -1139,12 +1055,12 @@ msgstr "ç ãëşóóá `%s' åßíáé Üãíùóôç"
#~ " -V, --version output version information and exit\n"
#~ msgstr ""
#~ "×ñŞóç: %s [ÅĞÉËÏÃÇ] filename.mo filename.po\n"
-#~ "Ïé õğï÷ñåùôéêïß ğáñÜìåôñïé óôá ğåñéöñáóôéêÜ ïñßóìáôá åßíáé õğï÷ñåùôéêïß êáé "
-#~ "ãéá ôá óıíôïìá ïñßóìáôá.\n"
-#~ " -e, --no-escape áğïöõãŞ ÷ñŞóçò êùäéêşí äéáöõãŞò áëÜ C óôçí İîïäï "
-#~ "(åî ïñéóìïı)\n"
-#~ " -E, --escape ÷ñŞóç êùäéêşí äéáöõãŞò áëÜ C óôçí İîïäï, ü÷é üìùò "
-#~ "êáé åêôåôáìİíïõò ÷áñáêôŞñåò.\n"
+#~ "Ïé õğï÷ñåùôéêïß ğáñÜìåôñïé óôá ğåñéöñáóôéêÜ ïñßóìáôá åßíáé õğï÷ñåùôéêïß "
+#~ "êáé ãéá ôá óıíôïìá ïñßóìáôá.\n"
+#~ " -e, --no-escape áğïöõãŞ ÷ñŞóçò êùäéêşí äéáöõãŞò áëÜ C óôçí "
+#~ "İîïäï (åî ïñéóìïı)\n"
+#~ " -E, --escape ÷ñŞóç êùäéêşí äéáöõãŞò áëÜ C óôçí İîïäï, ü÷é "
+#~ "üìùò êáé åêôåôáìİíïõò ÷áñáêôŞñåò.\n"
#~ " -h, --help åìöÜíéóç áõôŞò ôçò âïŞèåéáò êáé İîïäïò\n"
#~ " -i, --indent ìïñöïğïéçìİíç İîïäïò\n"
#~ " -S, --strict ìïñöŞ åîüäïõ ôï áõóôçñü Uniforum\n"
diff --git a/po/es.po b/po/es.po
index 58428a6..fd296e0 100644
--- a/po/es.po
+++ b/po/es.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: GNU gettext 0.10.34\n"
-"POT-Creation-Date: 2000-07-28 22:51+0200\n"
+"POT-Creation-Date: 2001-03-09 19:56+0100\n"
"PO-Revision-Date: 1998-04-29 12:04-0500\n"
"Last-Translator: Max de Mendizábal <max@tirania.nuclecu.unam.mx>\n"
"Language-Team: Spanish <es@li.org>\n"
@@ -15,38 +15,38 @@ msgstr ""
# Nota: El error es del sistema, pero no se sabe cuál es el error,
# por eso es (además) desconocido.
-#: lib/error.c:103
+#: lib/error.c:115
msgid "Unknown system error"
msgstr "Error del sistema desconocido"
-#: lib/getopt.c:680
+#: lib/getopt.c:691
#, c-format
msgid "%s: option `%s' is ambiguous\n"
msgstr "%s: la opción `%s' es ambigua\n"
-#: lib/getopt.c:704
+#: lib/getopt.c:716
#, c-format
msgid "%s: option `--%s' doesn't allow an argument\n"
msgstr "%s: la opción `--%s' no admite ningún argumento\n"
-#: lib/getopt.c:709
+#: lib/getopt.c:721
#, c-format
msgid "%s: option `%c%s' doesn't allow an argument\n"
msgstr "%s: la opción `%c%s' no admite ningún argumento\n"
-#: lib/getopt.c:726 lib/getopt.c:899
+#: lib/getopt.c:739 lib/getopt.c:912
#, c-format
msgid "%s: option `%s' requires an argument\n"
msgstr "%s: la opción `%s' requiere un argumento\n"
#. --option
-#: lib/getopt.c:755
+#: lib/getopt.c:768
#, c-format
msgid "%s: unrecognized option `--%s'\n"
msgstr "%s: opción no reconocida `--%s'\n"
#. +option or -option
-#: lib/getopt.c:759
+#: lib/getopt.c:772
#, c-format
msgid "%s: unrecognized option `%c%s'\n"
msgstr "%s: opción no reconocida `%c%s'\n"
@@ -54,38 +54,43 @@ msgstr "%s: opción no reconocida `%c%s'\n"
# acepto la sugerencia de em en cuanto a que inválida parece cárcel
# o inútil pero mejor puse inválida
#. 1003.2 specifies the format of this message.
-#: lib/getopt.c:785
+#: lib/getopt.c:798
#, c-format
msgid "%s: illegal option -- %c\n"
msgstr "%s: opción inválida -- %c\n"
-#: lib/getopt.c:788
+#: lib/getopt.c:801
#, c-format
msgid "%s: invalid option -- %c\n"
msgstr "%s: opción inválida -- %c\n"
#. 1003.2 specifies the format of this message.
-#: lib/getopt.c:818 lib/getopt.c:948
+#: lib/getopt.c:831 lib/getopt.c:961
#, c-format
msgid "%s: option requires an argument -- %c\n"
msgstr "%s: la opción requiere un argumento -- %c\n"
-#: lib/getopt.c:865
+#: lib/getopt.c:878
#, c-format
msgid "%s: option `-W %s' is ambiguous\n"
msgstr "%s: la opción `-W %s' es ambigua\n"
-#: lib/getopt.c:883
+#: lib/getopt.c:896
#, c-format
msgid "%s: option `-W %s' doesn't allow an argument\n"
msgstr "%s: la opción `-W %s' no admite ningún argumento\n"
-#: lib/xmalloc.c:82
+#: lib/obstack.c:474
+#, fuzzy
+msgid "memory exhausted"
+msgstr "Memoria agotada"
+
+#: lib/xmalloc.c:86
msgid "Memory exhausted"
msgstr "Memoria agotada"
-#: src/gettextp.c:134 src/msgcmp.c:144 src/msgcomm.c:285 src/msgfmt.c:257
-#: src/msgmerge.c:263 src/msgunfmt.c:175 src/xgettext.c:401
+#: src/gettext.c:138 src/msgcmp.c:140 src/msgcomm.c:283 src/msgfmt.c:270
+#: src/msgmerge.c:255 src/msgunfmt.c:170 src/xgettext.c:398
#, c-format, no-wrap
msgid ""
"Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -97,22 +102,22 @@ msgstr ""
"No hay NINGUNA garantía; ni siquiera de COMERCIABILIDAD o IDONEIDAD PARA UN\n"
"FIN DETERMINADO.\n"
-#: src/gettextp.c:139 src/msgcmp.c:149 src/msgcomm.c:290 src/msgfmt.c:262
-#: src/msgmerge.c:268 src/msgunfmt.c:180 src/xgettext.c:406
+#: src/gettext.c:143 src/msgcmp.c:145 src/msgcomm.c:288 src/msgfmt.c:275
+#: src/msgmerge.c:260 src/msgunfmt.c:175 src/xgettext.c:403
#, c-format
msgid "Written by %s.\n"
msgstr "Escrito por %s.\n"
-#: src/gettextp.c:154
+#: src/gettext.c:158
msgid "missing arguments"
msgstr "faltan argumentos"
-#: src/gettextp.c:164
+#: src/gettext.c:168
msgid "too many arguments"
msgstr "demasiados argumentos"
-#: src/gettextp.c:228 src/msgcmp.c:181 src/msgcomm.c:395 src/msgfmt.c:361
-#: src/msgmerge.c:323 src/msgunfmt.c:210 src/xgettext.c:539
+#: src/gettext.c:232 src/msgcmp.c:177 src/msgcomm.c:381 src/msgfmt.c:377
+#: src/msgmerge.c:315 src/msgunfmt.c:205 src/xgettext.c:525
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "Pruebe `%s --help' para más información.\n"
@@ -130,7 +135,7 @@ msgstr "Pruebe `%s --help' para más información.\n"
# Prefiero que se quede como está, pues aunque se repite muestra,
# es en otra opción en donde aparece. mm
#
-#: src/gettextp.c:233
+#: src/gettext.c:237
#, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] [[[TEXTDOMAIN] MSGID] | [-s [MSGID]...]]\n"
@@ -156,7 +161,7 @@ msgstr ""
# Nota: TEXTDOMAIN y TEXTDOMAINDIR son variables de entorno, por lo tanto
# no se pueden traducir (cuando se refieren a las variables, claro está).
-#: src/gettextp.c:245
+#: src/gettext.c:249
#, c-format, no-wrap
msgid ""
"\n"
@@ -180,39 +185,16 @@ msgstr ""
"encuentre dentro del catálogo seleccionado.\n"
"Directorio de búsqueda estándar: %s\n"
-#: src/gettextp.c:255 src/msgcmp.c:200 src/msgcomm.c:442 src/msgfmt.c:388
-#: src/msgmerge.c:358 src/msgunfmt.c:234 src/xgettext.c:591
+#: src/gettext.c:259 src/msgcmp.c:196 src/msgcomm.c:428 src/msgfmt.c:404
+#: src/msgmerge.c:350 src/msgunfmt.c:229 src/xgettext.c:577
msgid "Report bugs to <bug-gnu-utils@gnu.org>.\n"
msgstr "Comunicar `bugs' a <bug-gnu-utils@gnu.org>.\n"
-#: src/message.c:900
-#, c-format
-msgid ""
-"internationalized messages should not contain the `\\%c' escape sequence"
-msgstr ""
-"Los mensajes internacionalizados no deben contener la secuencia de escape "
-"`\\%c'"
-
-#: src/message.c:1231
-#, c-format
-msgid "cannot create output file \"%s\""
-msgstr "no se puede crear el fichero de salida \"%s\""
-
-#: src/message.c:1238
-#, no-c-format
-msgid "standard output"
-msgstr "salida estándar"
-
-#: src/message.c:1298
-#, c-format
-msgid "error while writing \"%s\" file"
-msgstr "hubo un error al escribir el fichero \"%s\""
-
-#: src/msgcmp.c:160 src/msgmerge.c:279
+#: src/msgcmp.c:156 src/msgmerge.c:271
msgid "no input files given"
msgstr "no se especificaron ficheros de entrada"
-#: src/msgcmp.c:165 src/msgmerge.c:284
+#: src/msgcmp.c:161 src/msgmerge.c:276
msgid "exactly 2 input files required"
msgstr "se requieren exactamente 2 ficheros de entrada"
@@ -276,7 +258,7 @@ msgstr "se requieren exactamente 2 ficheros de entrada"
# y en otros de otra (la frase no era exactamente igual).
# 11061996mm: En particular en gettext el letrero es estándar, por lo que
# prefiero "también son" que, creo suena mejor. Homogeinizo todo.
-#: src/msgcmp.c:186
+#: src/msgcmp.c:182
#, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] def.po ref.po\n"
@@ -309,53 +291,79 @@ msgstr ""
"se encuentre un resultado exacto, se utilizará coincidencia difusa, de\n"
"tal forma que la precisión del diagnóstico sea mejor.\n"
-#: src/msgcmp.c:259 src/msgmerge.c:746
+#: src/msgcmp.c:255 src/msgmerge.c:741
msgid "this message is used but not defined..."
msgstr "este mensaje se usa pero no está definido..."
-#: src/msgcmp.c:261 src/msgmerge.c:748
+#: src/msgcmp.c:257 src/msgmerge.c:743
msgid "...but this definition is similar"
msgstr "...pero esta definición es parecida"
-#: src/msgcmp.c:267 src/msgmerge.c:775
+#: src/msgcmp.c:263 src/msgmerge.c:770
#, c-format
msgid "this message is used but not defined in %s"
msgstr "este mensaje se usa pero no está definido en %s"
-#: src/msgcmp.c:281
+#: src/msgcmp.c:277
msgid "warning: this message is not used"
msgstr "atención: este mensaje no se utiliza"
+# Jeje. Bueno , esto me recuerda a una canción de Burning, digo lo
+# de fatal. Fatal en Castellano es muy malo, o peligrosísimo ... creo que
+# habrá que dejarlo así, es más convincente. Perdona por estas 3 lineas em
+#
+# ¿Burning? Mi incultura es grave ¿quiénes son esos? mm
+#
+# Son los que cantan lo de 'qué hace una chica como tú en un sitio como este'
+# en una parte de la canción repiten: 'mujer fatal ... ' :) em+
+#
+# ¡Ah! Dirán que soy pocho pero oigo muy poca música en castellano, a lo
+# más que llego es a Sabina y a Mecano y la Orquesta Mondragón cuando
+# existía. Volviendo a la discusión, prefiero lo de fatal: tiene mucho
+# peso. Aunque ... ¿qué tal 'errores imperdonables'? mm+
+#
+# Tal y como yo lo veo, "Error fatal" es el que obliga al programa a detenerse.
+# En inglés se utiliza esta palabra con ese significado.
+# A menos que veamos un libro en español que utilice una palabra distinta
+# para referirse a lo mismo, sugiero dejarlo como está. sv
+#
+# 07061996mm: Mujer fatal es menos que mortal, menos que peligroso e incita a la
+# aventura. Quizá no sea tan malo como dice Enrique, a menos que...
+#: src/msgcmp.c:282 src/po-lex.c:102
+#, c-format
+msgid "found %d fatal errors"
+msgstr "se encontraron %d errores fatales"
+
# Nota: es la definición la que está duplicada.
-#: src/msgcmp.c:355 src/msgfmt.c:633 src/msgmerge.c:517 src/xgettext.c:1093
+#: src/msgcmp.c:354 src/msgfmt.c:657 src/msgmerge.c:512 src/xgettext.c:1169
msgid "duplicate message definition"
msgstr "definición del mensaje duplicada"
-#: src/msgcmp.c:356 src/msgfmt.c:634 src/msgmerge.c:518 src/xgettext.c:1094
+#: src/msgcmp.c:355 src/msgfmt.c:659 src/msgmerge.c:513 src/xgettext.c:1170
msgid "...this is the location of the first definition"
msgstr "...aquí está la primera definición"
-#: src/msgcmp.c:396 src/msgmerge.c:566
+#: src/msgcmp.c:395 src/msgmerge.c:561
#, c-format
msgid "this message has no definition in the \"%s\" domain"
msgstr "este mensaje no tiene definición en el dominio \"%s\""
#. We are about to construct the absolute path to the
#. directory for the output files but asprintf failed.
-#: src/msgcomm.c:238 src/xgettext.c:340 src/xgettext.c:1288
+#: src/msgcomm.c:236 src/xgettext.c:337 src/xgettext.c:1365
msgid "while preparing output"
msgstr "mientras se preparaba la salida"
-#: src/msgcomm.c:273 src/msgcomm.c:277 src/xgettext.c:378 src/xgettext.c:382
+#: src/msgcomm.c:271 src/msgcomm.c:275 src/xgettext.c:375 src/xgettext.c:379
#, c-format
msgid "%s and %s are mutually exclusive"
msgstr "%s y %s son mutuamente excluyentes"
-#: src/msgcomm.c:341
+#: src/msgcomm.c:327
msgid "at least two files must be specified"
msgstr "se deben especificar por lo menos dos ficheros"
-#: src/msgcomm.c:360
+#: src/msgcomm.c:346
#, c-format
msgid "impossible selection criteria specified (%d < n < %d)"
msgstr "se especificó un criterio de selección imposible (%d < n < %d)"
@@ -365,7 +373,7 @@ msgstr "se especificó un criterio de selección imposible (%d < n < %d)"
# opción de debug hace algo más que simplemente dar más información y es
# necesario aclarar el punto.
# 27061996sv: Me refería a lo de las 80 columnas...
-#: src/msgcomm.c:400
+#: src/msgcomm.c:386
#, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] INPUTFILE ...\n"
@@ -405,7 +413,7 @@ msgstr ""
# hay cosa más incómoda que hacer un `algo --help' y que precisamente lo que
# nos interese se haya salido de la/el terminal em+
# Ok. mm+
-#: src/msgcomm.c:412
+#: src/msgcomm.c:398
msgid ""
" -i, --indent write the .po file using indented style\n"
" --no-location do not write '#: filename:line' lines\n"
@@ -441,7 +449,7 @@ msgstr ""
" -u, --unique abreviatura de --less-than=2, solicita\n"
" que sólo los mensajes únicos sean mostrados\n"
-#: src/msgcomm.c:425
+#: src/msgcomm.c:411
msgid ""
" -V, --version output version information and exit\n"
" -w, --width=NUMBER set output page width\n"
@@ -479,8 +487,8 @@ msgstr ""
"dentro\n"
"del fichero de todos los ficheros PO se conservarán.\n"
-#: src/msgcomm.c:476 src/msgunfmt.c:357 src/po-lex.c:74 src/xget-lex.c:161
-#: src/xget-lex.c:176 src/xget-lex.c:193 src/xgettext.c:625
+#: src/msgcomm.c:462 src/msgunfmt.c:361 src/po-lex.c:86 src/xget-lex.c:157
+#: src/xget-lex.c:170 src/xget-lex.c:180 src/xgettext.c:611
#, c-format
msgid "error while opening \"%s\" for reading"
msgstr "error al abrir el fichero \"%s\" para lectura"
@@ -516,31 +524,31 @@ msgstr "error al abrir el fichero \"%s\" para lectura"
# mente el verbo poder en Castellano es mucho más flexible que en otros
# idiomas. De todas maneras siempre se puede mirar otras traducciones. em
# ok. Acepto en 'no puede' a reserva de encontrar nuevos argumentos. mm
-#: src/msgcomm.c:557 src/xgettext.c:667 src/xgettext.c:1000
+#: src/msgcomm.c:543 src/xgettext.c:653 src/xgettext.c:1071
msgid "this file may not contain domain directives"
msgstr "este fichero no puede contener instrucciones de dominio"
# acepto sugerencia de em pero agrego un "el". mm
-#: src/msgfmt.c:273 src/xgettext.c:417
+#: src/msgfmt.c:286 src/xgettext.c:414
msgid "no input file given"
msgstr "no se especificó el fichero de entrada"
-#: src/msgfmt.c:321
+#: src/msgfmt.c:337
#, c-format
msgid "error while opening \"%s\" for writing"
msgstr "error al abrir el fichero \"%s\" para escritura"
-#: src/msgfmt.c:343
+#: src/msgfmt.c:359
#, c-format
msgid "%d translated messages"
msgstr "%d mensajes traducidos"
-#: src/msgfmt.c:345
+#: src/msgfmt.c:361
#, c-format
msgid ", %d fuzzy translations"
msgstr ", %d traducciones difusas"
-#: src/msgfmt.c:347
+#: src/msgfmt.c:363
#, c-format
msgid ", %d untranslated messages"
msgstr ", %d mensajes sin traducir"
@@ -584,7 +592,7 @@ msgstr ", %d mensajes sin traducir"
#
# OJO: Si se pone un argumento superior a uno en la opción -v
# No es así, es "si se utiliza la opción -v más de una vez". sv+
-#: src/msgfmt.c:366
+#: src/msgfmt.c:382
#, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] filename.po ...\n"
@@ -636,21 +644,23 @@ msgstr ""
"de salida es -, el resultado se escribe en la salida estándar.\n"
"\n"
-#: src/msgfmt.c:409
+#: src/msgfmt.c:425
msgid "while creating hash table"
msgstr "mientras se creaba la tabla de `hash'"
-#: src/msgfmt.c:451
+#: src/msgfmt.c:469
#, fuzzy, c-format
-msgid "%s: warning: PO file header missing, fuzzy, or invalid"
+msgid ""
+"%s: warning: PO file header missing, fuzzy, or invalid\n"
+"%*s warning: charset conversion will not work"
msgstr "%s: atención: el fichero fuente contiene una traducción difusa"
-#: src/msgfmt.c:474
+#: src/msgfmt.c:493
#, c-format
msgid "domain name \"%s\" not suitable as file name"
msgstr "el nombre de dominio \"%s\" no es válido como nombre de fichero"
-#: src/msgfmt.c:479
+#: src/msgfmt.c:498
#, c-format
msgid "domain name \"%s\" not suitable as file name: will use prefix"
msgstr ""
@@ -659,7 +669,7 @@ msgstr ""
#. We don't change the exit status here because this is really
#. only an information.
-#: src/msgfmt.c:492
+#: src/msgfmt.c:511
#, c-format
msgid "`domain %s' directive ignored"
msgstr "la instrucción `domain %s' no tiene efecto"
@@ -668,36 +678,36 @@ msgstr "la instrucción `domain %s' no tiene efecto"
# Ignorar es no saber (not to know). "to ignore" es "no hacer caso".
# Sugerencia: Descartar. sv
# Excelente palabreja. Me gusta mucho. mm
-#: src/msgfmt.c:520
+#: src/msgfmt.c:541
msgid "empty `msgstr' entry ignored"
msgstr "se descarta la línea vacía `msgstr'"
# Lo mismo. sv
# Ok. mm
-#: src/msgfmt.c:521
+#: src/msgfmt.c:542
msgid "fuzzy `msgstr' entry ignored"
msgstr "se descarta la línea difusa `msgstr'"
-#: src/msgfmt.c:564
+#: src/msgfmt.c:584
#, c-format
msgid "headerfield `%s' missing in header"
msgstr "no existe el campo `%s' en la cabecera"
-#: src/msgfmt.c:567
+#: src/msgfmt.c:587
#, c-format
msgid "header field `%s' should start at beginning of line"
msgstr "el campo `%s' debe comenzar al principio de la línea"
-#: src/msgfmt.c:577
+#: src/msgfmt.c:597
msgid "some header fields still have the initial default value"
msgstr "algunos campos de cabecera aún tienen el valor inicial"
-#: src/msgfmt.c:588
+#: src/msgfmt.c:608
#, c-format
msgid "field `%s' still has initial default value"
msgstr "el campo `%s' aún tiene el valor inicial"
-#: src/msgfmt.c:673
+#: src/msgfmt.c:698
#, c-format
msgid "%s: warning: source file contains fuzzy translation"
msgstr "%s: atención: el fichero fuente contiene una traducción difusa"
@@ -718,22 +728,78 @@ msgstr "%s: atención: el fichero fuente contiene una traducción difusa"
# Sigue pareciendo que deben tenerlo las dos (y no es esa la idea).
# Si no se te ocurre nada mejor, sugerencia:
# "Una de las líneas msgid y msgstr comienza con `\\n' y la otra no" sv+
-#: src/msgfmt.c:875
+#: src/msgfmt.c:920
+#, fuzzy
+msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
+msgstr "a alguna de las líneas `msgid' y `msgstr' les falta el `\\n' inicial"
+
+# ¿qué les parece: "a `msgid' o `msgstr' les falta el `\\n' final"? cb
+# Bien. Mejora. mm
+#
+#
+# Bien, antes decía "las líneas `msgid' y `msgstr' no comienzan con `\\n'"
+# No sé qué es mejor pero no me acaba de gustar: La idea es que *no ambas*
+# comienzan por \\n, no que tengan que hacerlo las dos.
+# Si una lo hace y la otra no, puede ser que falte en una o que sobre en la
+# otra. Yo podnría aquí algo más parecido a lo de antes, pero añadiendo
+# "ambas", o algo así.
+# por ejemplo: "las líneas msgid y msgstr no comienzan ambas con \\n". sv
+# Que te parece a alguna de las líneas ... mm
+#
+# Sigue pareciendo que deben tenerlo las dos (y no es esa la idea).
+# Si no se te ocurre nada mejor, sugerencia:
+# "Una de las líneas msgid y msgstr comienza con `\\n' y la otra no" sv+
+#: src/msgfmt.c:928
+#, fuzzy, c-format
+msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
+msgstr "a alguna de las líneas `msgid' y `msgstr' les falta el `\\n' inicial"
+
+# ¿qué les parece: "a `msgid' o `msgstr' les falta el `\\n' final"? cb
+# Bien. Mejora. mm
+#
+#
+# Bien, antes decía "las líneas `msgid' y `msgstr' no comienzan con `\\n'"
+# No sé qué es mejor pero no me acaba de gustar: La idea es que *no ambas*
+# comienzan por \\n, no que tengan que hacerlo las dos.
+# Si una lo hace y la otra no, puede ser que falte en una o que sobre en la
+# otra. Yo podnría aquí algo más parecido a lo de antes, pero añadiendo
+# "ambas", o algo así.
+# por ejemplo: "las líneas msgid y msgstr no comienzan ambas con \\n". sv
+# Que te parece a alguna de las líneas ... mm
+#
+# Sigue pareciendo que deben tenerlo las dos (y no es esa la idea).
+# Si no se te ocurre nada mejor, sugerencia:
+# "Una de las líneas msgid y msgstr comienza con `\\n' y la otra no" sv+
+#: src/msgfmt.c:938
msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
msgstr "a alguna de las líneas `msgid' y `msgstr' les falta el `\\n' inicial"
# Lo mismo, no es que a una de las dos le falte, sino que una lo tiene
# y la otra no, así de sencillo. sv+
-#: src/msgfmt.c:883
+#: src/msgfmt.c:953
+#, fuzzy
+msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
+msgstr "a alguna de las líneas `msgid' y `msgstr' les falta el `\\n' final"
+
+# Lo mismo, no es que a una de las dos le falte, sino que una lo tiene
+# y la otra no, así de sencillo. sv+
+#: src/msgfmt.c:961
+#, fuzzy, c-format
+msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
+msgstr "a alguna de las líneas `msgid' y `msgstr' les falta el `\\n' final"
+
+# Lo mismo, no es que a una de las dos le falte, sino que una lo tiene
+# y la otra no, así de sencillo. sv+
+#: src/msgfmt.c:971
msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
msgstr "a alguna de las líneas `msgid' y `msgstr' les falta el `\\n' final"
-#: src/msgfmt.c:897
+#: src/msgfmt.c:987
msgid "number of format specifications in `msgid' and `msgstr' does not match"
msgstr ""
"el número de especificaciones de formato en `msgid' y 'msgstr' no coincide"
-#: src/msgfmt.c:914
+#: src/msgfmt.c:1004
#, c-format
msgid "format specifications for argument %u are not the same"
msgstr "las especificaciones de formato para el argumento %u no son las mismas"
@@ -741,7 +807,7 @@ msgstr "las especificaciones de formato para el argumento %u no son las mismas"
# Lo mismo en ' informa de la versión...' em
# Obligatorios.. obligatorios , queda un poco feo. Si lo que se pretende
# es ser fiel al original, pon 'son tambien obligatorios para...' em+
-#: src/msgmerge.c:328
+#: src/msgmerge.c:320
#, fuzzy, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] def.po ref.po\n"
@@ -782,7 +848,7 @@ msgstr ""
" -V, --version informa de la versión y finaliza\n"
" -w, --width=NÚMERO ajusta la anchura de la página de salida\n"
-#: src/msgmerge.c:348
+#: src/msgmerge.c:340
#, no-wrap
msgid ""
"\n"
@@ -808,21 +874,21 @@ msgstr ""
"para obtener mejores resultados. Los resultados se escribirán en la salida\n"
"estándar a menos que se especifique un fichero de salida.\n"
-#: src/msgmerge.c:804
+#: src/msgmerge.c:799
#, c-format
msgid ""
-"%sRead %d old + %d reference, merged %d, fuzzied %d, missing %d, obsolete "
-"%d.\n"
+"%sRead %d old + %d reference, merged %d, fuzzied %d, missing %d, obsolete %"
+"d.\n"
msgstr ""
"%sleídos %d mensajes antiguos + %d mensajes de referencia\n"
"incorporados %d, convertidos en difusos %d, faltan %d, obsoletos %d.\n"
# Porque no mejor poner simplemente 'fin'? mm++
-#: src/msgmerge.c:810
+#: src/msgmerge.c:805
msgid " done.\n"
msgstr " terminado.\n"
-#: src/msgunfmt.c:215
+#: src/msgunfmt.c:210
#, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] [FILE]...\n"
@@ -866,7 +932,7 @@ msgstr ""
# 30071996sv: Mejor que antes, sí. Pero la palabra "tantos" que César sugiere
# creo que recoge el sentido de "both" del original. ¿qué te parece? sv
#
-#: src/msgunfmt.c:229
+#: src/msgunfmt.c:224
#, no-wrap
msgid ""
"\n"
@@ -881,55 +947,60 @@ msgstr ""
"Si no se da ningún fichero de entrada o es -, se lee de la entrada estándar.\n"
"Por defecto el resultado se escribe en la salida estándar.\n"
-#: src/msgunfmt.c:266 src/msgunfmt.c:330 src/po-lex.c:185 src/xget-lex.c:256
+#: src/msgunfmt.c:261 src/msgunfmt.c:326 src/po-lex.c:213 src/xget-lex.c:243
#, c-format
msgid "error while reading \"%s\""
msgstr "error al leer \"%s\""
-#: src/msgunfmt.c:267 src/msgunfmt.c:331
+#: src/msgunfmt.c:262 src/msgunfmt.c:327
#, c-format
msgid "file \"%s\" truncated"
msgstr "el fichero \"%s\" está truncado"
-#: src/msgunfmt.c:298
+#: src/msgunfmt.c:293
#, c-format
msgid "seek \"%s\" offset %ld failed"
msgstr "fallo en la lectura \"%s\" en la posición (offset) %ld"
-#: src/msgunfmt.c:373
+#: src/msgunfmt.c:332
+#, fuzzy, c-format
+msgid "file \"%s\" contains a not NUL terminated string"
+msgstr "el fichero \"%s\" no está en el formato .mo de GNU"
+
+#: src/msgunfmt.c:377
#, c-format
msgid "file \"%s\" is not in GNU .mo format"
msgstr "el fichero \"%s\" no está en el formato .mo de GNU"
-#: /home/drepper/gnu/gettext/build/src/../../src/po-gram-gen.y:129
+#: src/open-po.c:64
+msgid "<stdin>"
+msgstr ""
+
+#: po-gram-gen.y:87
+msgid "inconsistent use of #~"
+msgstr ""
+
+#: po-gram-gen.y:168
+#, fuzzy
+msgid "missing `msgstr[]' section"
+msgstr "no hay sección `msgstr'"
+
+#: po-gram-gen.y:176
+#, fuzzy
+msgid "missing `msgid_plural' section"
+msgstr "no hay sección `msgstr'"
+
+#: po-gram-gen.y:183
msgid "missing `msgstr' section"
msgstr "no hay sección `msgstr'"
-# Jeje. Bueno , esto me recuerda a una canción de Burning, digo lo
-# de fatal. Fatal en Castellano es muy malo, o peligrosísimo ... creo que
-# habrá que dejarlo así, es más convincente. Perdona por estas 3 lineas em
-#
-# ¿Burning? Mi incultura es grave ¿quiénes son esos? mm
-#
-# Son los que cantan lo de 'qué hace una chica como tú en un sitio como este'
-# en una parte de la canción repiten: 'mujer fatal ... ' :) em+
-#
-# ¡Ah! Dirán que soy pocho pero oigo muy poca música en castellano, a lo
-# más que llego es a Sabina y a Mecano y la Orquesta Mondragón cuando
-# existía. Volviendo a la discusión, prefiero lo de fatal: tiene mucho
-# peso. Aunque ... ¿qué tal 'errores imperdonables'? mm+
-#
-# Tal y como yo lo veo, "Error fatal" es el que obliga al programa a detenerse.
-# En inglés se utiliza esta palabra con ese significado.
-# A menos que veamos un libro en español que utilice una palabra distinta
-# para referirse a lo mismo, sugiero dejarlo como está. sv
-#
-# 07061996mm: Mujer fatal es menos que mortal, menos que peligroso e incita a la
-# aventura. Quizá no sea tan malo como dice Enrique, a menos que...
-#: src/po-lex.c:84
-#, c-format
-msgid "found %d fatal errors"
-msgstr "se encontraron %d errores fatales"
+#: po-gram-gen.y:228
+msgid "first plural form has nonzero index"
+msgstr ""
+
+#: po-gram-gen.y:230
+msgid "plural form has wrong index"
+msgstr ""
# Abortando queda un poco feo. ¿qué se podría poner en su lugar?
# Aterrizaje forzoso! el programa no puede continuar. Que te parece? mm.
@@ -964,53 +1035,61 @@ msgstr "se encontraron %d errores fatales"
# 20071996sv: Eso no seguiría la regla implícita de que el programa no debe
# hablar en primera persona sino en estilo impersonal.
# (Esta regla estará en el manual de Enrique, con toda seguridad).
-#: src/po-lex.c:129 src/po-lex.c:168
+#. CAUTION: If you change this macro, you must also make identical
+#. changes to the function of the same name in src/po-lex.c
+#: src/po-lex.c:156 src/po-lex.c:195 src/po-lex.h:85 src/po-lex.h:99
+#: src/po-lex.h:115 src/po-lex.h:129
msgid "too many errors, aborting"
msgstr "demasiados errores, programa interrumpido"
-#: src/po-lex.c:241
+#: src/po-lex.c:271
#, c-format
msgid "keyword \"%s\" unknown"
msgstr "palabra clave \"%s\" desconocida"
-#: src/po-lex.c:335
+#: src/po-lex.c:374
#, fuzzy
msgid "invalid control sequence"
msgstr "secuencia de control ilegal"
-#: src/po-lex.c:419
+#: src/po-lex.c:477
+msgid "end-of-file within string"
+msgstr "fin de fichero dentro de una cadena"
+
+#: src/po-lex.c:482
msgid "end-of-line within string"
msgstr "fin de línea dentro de una cadena"
-#: src/po-lex.c:424
-msgid "end-of-file within string"
-msgstr "fin de fichero dentro de una cadena"
+#: src/po-lex.c:525
+#, fuzzy
+msgid "invalid multibyte sequence"
+msgstr "secuencia de control ilegal"
-#: src/xget-lex.c:152
+#: src/xget-lex.c:148
msgid "standard input"
msgstr "entrada estándar"
-#: src/xget-lex.c:894
+#: src/xget-lex.c:876
#, c-format
msgid "%s:%d: warning: unterminated character constant"
msgstr "%s:%d: atención: constante de tipo carácter no finalizada"
-#: src/xget-lex.c:916
+#: src/xget-lex.c:898
#, c-format
msgid "%s:%d: warning: unterminated string literal"
msgstr "%s:%d: atención: literal de cadena no finalizada"
-#: src/xgettext.c:386
+#: src/xgettext.c:383
msgid "--join-existing cannot be used when output is written to stdout"
msgstr ""
"no se puede utilizar --join-existing cuando el resultado se escribe en la\n"
"salida estándar (stdout)"
-#: src/xgettext.c:391
+#: src/xgettext.c:388
msgid "xgettext cannot work without keywords to look for"
msgstr ""
-#: src/xgettext.c:508
+#: src/xgettext.c:494
#, c-format
msgid "warning: file `%s' extension `%s' is unknown; will try C"
msgstr ""
@@ -1022,7 +1101,7 @@ msgstr ""
# opción de debug hace algo más que simplemente dar más información y es
# necesario aclarar el punto.
# 27061996sv: Me refería a lo de las 80 columnas...
-#: src/xgettext.c:544
+#: src/xgettext.c:530
#, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] INPUTFILE ...\n"
@@ -1072,7 +1151,7 @@ msgstr ""
" no ingleses\n"
" -F, --sort-by-file ordena la salida por ubicación del fichero\n"
-#: src/xgettext.c:564
+#: src/xgettext.c:550
#, c-format, no-wrap
msgid ""
" -h, --help display this help and exit\n"
@@ -1114,7 +1193,7 @@ msgstr ""
# hay cosa más incómoda que hacer un `algo --help' y que precisamente lo que
# nos interese se haya salido de la/el terminal em+
# Ok. mm+
-#: src/xgettext.c:578
+#: src/xgettext.c:564
#, no-wrap
msgid ""
" -n, --add-location generate '#: filename:line' lines (default)\n"
@@ -1145,20 +1224,35 @@ msgstr ""
"\n"
"Si el FICHERO_DE_ENTRADA es -, se lee de la entrada estándar.\n"
-#: src/xgettext.c:879
+#: src/xgettext.c:926
#, fuzzy, c-format
msgid "%s:%d: warning: keyword nested in keyword arg"
msgstr "%s:%d: atención: literal de cadena no finalizada"
-#: src/xgettext.c:889
+#: src/xgettext.c:936
#, c-format
msgid "%s:%d: warning: keyword between outer keyword and its arg"
msgstr ""
-#: src/xgettext.c:1374
+#: src/xgettext.c:1432
#, c-format
msgid "language `%s' unknown"
msgstr "lenguaje `%s' desconocido"
+#~ msgid ""
+#~ "internationalized messages should not contain the `\\%c' escape sequence"
+#~ msgstr ""
+#~ "Los mensajes internacionalizados no deben contener la secuencia de escape "
+#~ "`\\%c'"
+
+#~ msgid "cannot create output file \"%s\""
+#~ msgstr "no se puede crear el fichero de salida \"%s\""
+
+#~ msgid "standard output"
+#~ msgstr "salida estándar"
+
+#~ msgid "error while writing \"%s\" file"
+#~ msgstr "hubo un error al escribir el fichero \"%s\""
+
#~ msgid "%s: warning: no header entry found"
#~ msgstr "%s: atención: no se encontró la línea de cabecera"
diff --git a/po/fr.po b/po/fr.po
index 73850ad..b4cc53f 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: GNU gettext 0.10.35\n"
-"POT-Creation-Date: 2000-07-28 22:51+0200\n"
+"POT-Creation-Date: 2001-03-09 19:56+0100\n"
"PO-Revision-Date: 1998-05-04 10:03-04:00\n"
"Last-Translator: François Pinard <pinard@iro.umontreal.ca>\n"
"Language-Team: French <fr@li.org>\n"
@@ -13,75 +13,80 @@ msgstr ""
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8-bit\n"
-#: lib/error.c:103
+#: lib/error.c:115
msgid "Unknown system error"
msgstr "Erreur système non identifiée"
-#: lib/getopt.c:680
+#: lib/getopt.c:691
#, c-format
msgid "%s: option `%s' is ambiguous\n"
msgstr "%s: l'option « %s » est ambiguë\n"
-#: lib/getopt.c:704
+#: lib/getopt.c:716
#, c-format
msgid "%s: option `--%s' doesn't allow an argument\n"
msgstr "%s: l'option « --%s » ne tolère pas d'argument\n"
-#: lib/getopt.c:709
+#: lib/getopt.c:721
#, c-format
msgid "%s: option `%c%s' doesn't allow an argument\n"
msgstr "%s: l'option « %c%s » ne tolère pas d'argument\n"
-#: lib/getopt.c:726 lib/getopt.c:899
+#: lib/getopt.c:739 lib/getopt.c:912
#, c-format
msgid "%s: option `%s' requires an argument\n"
msgstr "%s: l'option « %s » exige un argument\n"
#. --option
-#: lib/getopt.c:755
+#: lib/getopt.c:768
#, c-format
msgid "%s: unrecognized option `--%s'\n"
msgstr "%s: l'option « --%s » n'est pas reconnue\n"
#. +option or -option
-#: lib/getopt.c:759
+#: lib/getopt.c:772
#, c-format
msgid "%s: unrecognized option `%c%s'\n"
msgstr "%s: l'option « %c%s » n'est pas reconnue\n"
#. 1003.2 specifies the format of this message.
-#: lib/getopt.c:785
+#: lib/getopt.c:798
#, c-format
msgid "%s: illegal option -- %c\n"
msgstr "%s: l'option « %c » n'est pas permise\n"
-#: lib/getopt.c:788
+#: lib/getopt.c:801
#, c-format
msgid "%s: invalid option -- %c\n"
msgstr "%s: l'option « %c » n'est pas valide\n"
#. 1003.2 specifies the format of this message.
-#: lib/getopt.c:818 lib/getopt.c:948
+#: lib/getopt.c:831 lib/getopt.c:961
#, c-format
msgid "%s: option requires an argument -- %c\n"
msgstr "%s: l'option « %c » exige un argument\n"
-#: lib/getopt.c:865
+#: lib/getopt.c:878
#, c-format
msgid "%s: option `-W %s' is ambiguous\n"
msgstr "%s: l'option « -W %s » est ambiguë\n"
-#: lib/getopt.c:883
+#: lib/getopt.c:896
#, c-format
msgid "%s: option `-W %s' doesn't allow an argument\n"
msgstr "%s: l'option « -W %s » ne tolère pas d'argument\n"
-#: lib/xmalloc.c:82
+#: lib/obstack.c:474
+#, fuzzy
+msgid "memory exhausted"
+msgstr "Mémoire entièrement consommée"
+
+#: lib/xmalloc.c:86
msgid "Memory exhausted"
msgstr "Mémoire entièrement consommée"
-#: src/gettextp.c:134 src/msgcmp.c:144 src/msgcomm.c:285 src/msgfmt.c:257
-#: src/msgmerge.c:263 src/msgunfmt.c:175 src/xgettext.c:401
+#: src/gettext.c:138 src/msgcmp.c:140 src/msgcomm.c:283 src/msgfmt.c:270
+#: src/msgmerge.c:255 src/msgunfmt.c:170 src/xgettext.c:398
#, c-format, no-wrap
msgid ""
"Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -93,27 +98,27 @@ msgstr ""
"les permissions de copie. Il est distribué SANS AUCUNE GARANTIE\n"
"de QUALITÉ LOYALE ET MARCHANDE ou d'ADÉQUATION POUR UN BUT PARTICULIER.\n"
-#: src/gettextp.c:139 src/msgcmp.c:149 src/msgcomm.c:290 src/msgfmt.c:262
-#: src/msgmerge.c:268 src/msgunfmt.c:180 src/xgettext.c:406
+#: src/gettext.c:143 src/msgcmp.c:145 src/msgcomm.c:288 src/msgfmt.c:275
+#: src/msgmerge.c:260 src/msgunfmt.c:175 src/xgettext.c:403
#, c-format
msgid "Written by %s.\n"
msgstr "Écrit par %s.\n"
-#: src/gettextp.c:154
+#: src/gettext.c:158
msgid "missing arguments"
msgstr "arguments manquants"
-#: src/gettextp.c:164
+#: src/gettext.c:168
msgid "too many arguments"
msgstr "trop d'arguments"
-#: src/gettextp.c:228 src/msgcmp.c:181 src/msgcomm.c:395 src/msgfmt.c:361
-#: src/msgmerge.c:323 src/msgunfmt.c:210 src/xgettext.c:539
+#: src/gettext.c:232 src/msgcmp.c:177 src/msgcomm.c:381 src/msgfmt.c:377
+#: src/msgmerge.c:315 src/msgunfmt.c:205 src/xgettext.c:525
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "Pour plus d'information, essayer « %s --help ».\n"
-#: src/gettextp.c:233
+#: src/gettext.c:237
#, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] [[[TEXTDOMAIN] MSGID] | [-s [MSGID]...]]\n"
@@ -135,7 +140,7 @@ msgstr ""
" -V, --version identifier le programme, puis terminer\n"
" [DOMAINE] MSGID trouver la traduction de MSGID, dans le DOMAINE donné\n"
-#: src/gettextp.c:245
+#: src/gettext.c:249
#, c-format, no-wrap
msgid ""
"\n"
@@ -159,44 +164,22 @@ msgstr ""
"\n"
"Ensemble des répertoires fouillés: %s\n"
-#: src/gettextp.c:255 src/msgcmp.c:200 src/msgcomm.c:442 src/msgfmt.c:388
-#: src/msgmerge.c:358 src/msgunfmt.c:234 src/xgettext.c:591
+#: src/gettext.c:259 src/msgcmp.c:196 src/msgcomm.c:428 src/msgfmt.c:404
+#: src/msgmerge.c:350 src/msgunfmt.c:229 src/xgettext.c:577
msgid "Report bugs to <bug-gnu-utils@gnu.org>.\n"
msgstr ""
"Rapportez tout problème fonctionnel à <bug-gnu-utils@gnu.org>.\n"
"Les erreurs de traduction doivent être dirigées vers <fr@li.org>.\n"
-#: src/message.c:900
-#, c-format
-msgid ""
-"internationalized messages should not contain the `\\%c' escape sequence"
-msgstr ""
-"un message à traduire ne doit pas contenir la séquence d'échappement `\\%c'"
-
-#: src/message.c:1231
-#, c-format
-msgid "cannot create output file \"%s\""
-msgstr "incapable de fabriquer le fichier « %s »"
-
-#: src/message.c:1238
-#, no-c-format
-msgid "standard output"
-msgstr "sortie standard"
-
-#: src/message.c:1298
-#, c-format
-msgid "error while writing \"%s\" file"
-msgstr "erreur pendant l'écriture du fichier « %s »"
-
-#: src/msgcmp.c:160 src/msgmerge.c:279
+#: src/msgcmp.c:156 src/msgmerge.c:271
msgid "no input files given"
msgstr "aucun fichier en entrée"
-#: src/msgcmp.c:165 src/msgmerge.c:284
+#: src/msgcmp.c:161 src/msgmerge.c:276
msgid "exactly 2 input files required"
msgstr "exactement deux fichiers sont requis en entrée"
-#: src/msgcmp.c:186
+#: src/msgcmp.c:182
#, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] def.po ref.po\n"
@@ -227,57 +210,62 @@ msgstr ""
"de votre programme. Lorsqu'un appariement exact n'est pas possible,\n"
"un appariement flou est utilisé pour un meilleur diagnostic.\n"
-#: src/msgcmp.c:259 src/msgmerge.c:746
+#: src/msgcmp.c:255 src/msgmerge.c:741
msgid "this message is used but not defined..."
msgstr "ce message, utilisé, n'est pas défini..."
-#: src/msgcmp.c:261 src/msgmerge.c:748
+#: src/msgcmp.c:257 src/msgmerge.c:743
msgid "...but this definition is similar"
msgstr "...mais cette définition lui est semblable"
-#: src/msgcmp.c:267 src/msgmerge.c:775
+#: src/msgcmp.c:263 src/msgmerge.c:770
#, c-format
msgid "this message is used but not defined in %s"
msgstr "ce message, utilisé, n'est pas défini dans « %s »"
-#: src/msgcmp.c:281
+#: src/msgcmp.c:277
msgid "warning: this message is not used"
msgstr "attention: ce message n'est pas utilisé"
-#: src/msgcmp.c:355 src/msgfmt.c:633 src/msgmerge.c:517 src/xgettext.c:1093
+#: src/msgcmp.c:282 src/po-lex.c:102
+#, c-format
+msgid "found %d fatal errors"
+msgstr "%d erreurs terminales"
+
+#: src/msgcmp.c:354 src/msgfmt.c:657 src/msgmerge.c:512 src/xgettext.c:1169
msgid "duplicate message definition"
msgstr "message doublement défini"
-#: src/msgcmp.c:356 src/msgfmt.c:634 src/msgmerge.c:518 src/xgettext.c:1094
+#: src/msgcmp.c:355 src/msgfmt.c:659 src/msgmerge.c:513 src/xgettext.c:1170
msgid "...this is the location of the first definition"
msgstr "...voici l'endroit de la première définition"
-#: src/msgcmp.c:396 src/msgmerge.c:566
+#: src/msgcmp.c:395 src/msgmerge.c:561
#, c-format
msgid "this message has no definition in the \"%s\" domain"
msgstr "ce message n'a pas de définition dans le domaine « %s »"
#. We are about to construct the absolute path to the
#. directory for the output files but asprintf failed.
-#: src/msgcomm.c:238 src/xgettext.c:340 src/xgettext.c:1288
+#: src/msgcomm.c:236 src/xgettext.c:337 src/xgettext.c:1365
msgid "while preparing output"
msgstr "lors de la préparation de la sortie"
-#: src/msgcomm.c:273 src/msgcomm.c:277 src/xgettext.c:378 src/xgettext.c:382
+#: src/msgcomm.c:271 src/msgcomm.c:275 src/xgettext.c:375 src/xgettext.c:379
#, c-format
msgid "%s and %s are mutually exclusive"
msgstr "%s et %s s'excluent mutuellement"
-#: src/msgcomm.c:341
+#: src/msgcomm.c:327
msgid "at least two files must be specified"
msgstr "Il faut indiquer au moins deux fichiers"
-#: src/msgcomm.c:360
+#: src/msgcomm.c:346
#, c-format
msgid "impossible selection criteria specified (%d < n < %d)"
msgstr "Critère de sélection irréalisable (%d < N < %d)"
-#: src/msgcomm.c:400
+#: src/msgcomm.c:386
#, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] INPUTFILE ...\n"
@@ -304,7 +292,7 @@ msgstr ""
" -F, --sort-by-file trier selon la position dans chaque fichier\n"
" -h, --help fournir ce message d'aide, puis terminer\n"
-#: src/msgcomm.c:412
+#: src/msgcomm.c:398
msgid ""
" -i, --indent write the .po file using indented style\n"
" --no-location do not write '#: filename:line' lines\n"
@@ -324,10 +312,10 @@ msgid ""
msgstr ""
" -i, --indent utiliser un style indenté pour le fichier "
"PO\n"
-" --no-location inhiber la production des « #: "
-"FICHIER:LIGNE »\n"
-" -n, --add-location produire les « #: FICHIER:LIGNE » "
-"(implicite)\n"
+" --no-location inhiber la production des « #: FICHIER:"
+"LIGNE »\n"
+" -n, --add-location produire les « #: FICHIER:LIGNE "
+"» (implicite)\n"
" --omit-header omettre les en-têtes pour « msgid \"\" »\n"
" -o, --output=FICHIER produire la sortie sur le FICHIER indiqué\n"
" -p, --output-dir=RÉPERTOIRE sortir le fichier produit dans tel "
@@ -339,7 +327,7 @@ msgstr ""
"entrée\n"
" -u, --unique même chose que « -< 2 »\n"
-#: src/msgcomm.c:425
+#: src/msgcomm.c:411
msgid ""
" -V, --version output version information and exit\n"
" -w, --width=NUMBER set output page width\n"
@@ -373,41 +361,41 @@ msgstr ""
"proviennent du premier fichier PO à les définir, les références sont\n"
"accumulées de tous les fichiers PO qui en fournissent.\n"
-#: src/msgcomm.c:476 src/msgunfmt.c:357 src/po-lex.c:74 src/xget-lex.c:161
-#: src/xget-lex.c:176 src/xget-lex.c:193 src/xgettext.c:625
+#: src/msgcomm.c:462 src/msgunfmt.c:361 src/po-lex.c:86 src/xget-lex.c:157
+#: src/xget-lex.c:170 src/xget-lex.c:180 src/xgettext.c:611
#, c-format
msgid "error while opening \"%s\" for reading"
msgstr "erreur lors de l'ouverture de « %s » en lecture"
-#: src/msgcomm.c:557 src/xgettext.c:667 src/xgettext.c:1000
+#: src/msgcomm.c:543 src/xgettext.c:653 src/xgettext.c:1071
msgid "this file may not contain domain directives"
msgstr "ce fichier ne peut contenir des directives de domaine"
-#: src/msgfmt.c:273 src/xgettext.c:417
+#: src/msgfmt.c:286 src/xgettext.c:414
msgid "no input file given"
msgstr "aucun fichier d'entrée fourni"
-#: src/msgfmt.c:321
+#: src/msgfmt.c:337
#, c-format
msgid "error while opening \"%s\" for writing"
msgstr "erreur lors de l'ouverture de « %s » en écriture"
-#: src/msgfmt.c:343
+#: src/msgfmt.c:359
#, c-format
msgid "%d translated messages"
msgstr "%d messages traduits"
-#: src/msgfmt.c:345
+#: src/msgfmt.c:361
#, c-format
msgid ", %d fuzzy translations"
msgstr ", %d traductions approximées"
-#: src/msgfmt.c:347
+#: src/msgfmt.c:363
#, c-format
msgid ", %d untranslated messages"
msgstr ", %d messages non-traduits"
-#: src/msgfmt.c:366
+#: src/msgfmt.c:382
#, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] filename.po ...\n"
@@ -453,85 +441,111 @@ msgstr ""
"Si FICHIER vaut « - », lit l'entrée standard. Si SORTIE vaut « - »,\n"
"écrit sur la sortie standard.\n"
-#: src/msgfmt.c:409
+#: src/msgfmt.c:425
msgid "while creating hash table"
msgstr "pendant la création de la table de dispersion"
-#: src/msgfmt.c:451
+#: src/msgfmt.c:469
#, fuzzy, c-format
-msgid "%s: warning: PO file header missing, fuzzy, or invalid"
+msgid ""
+"%s: warning: PO file header missing, fuzzy, or invalid\n"
+"%*s warning: charset conversion will not work"
msgstr "%s: attention: certaines traductions sont approximatives"
-#: src/msgfmt.c:474
+#: src/msgfmt.c:493
#, c-format
msgid "domain name \"%s\" not suitable as file name"
msgstr "« %s » n'est pas approprié comme nom de domaine"
-#: src/msgfmt.c:479
+#: src/msgfmt.c:498
#, c-format
msgid "domain name \"%s\" not suitable as file name: will use prefix"
msgstr "domaine « %s » inadéquat comme nom de fichier: utilisera un préfixe"
#. We don't change the exit status here because this is really
#. only an information.
-#: src/msgfmt.c:492
+#: src/msgfmt.c:511
#, c-format
msgid "`domain %s' directive ignored"
msgstr "la directive « domain %s » sera ignorée"
-#: src/msgfmt.c:520
+#: src/msgfmt.c:541
msgid "empty `msgstr' entry ignored"
msgstr "chaîne « msgstr » vide, entrée ignorée"
-#: src/msgfmt.c:521
+#: src/msgfmt.c:542
msgid "fuzzy `msgstr' entry ignored"
msgstr "chaîne « msgstr » approximée, entrée ignorée"
-#: src/msgfmt.c:564
+#: src/msgfmt.c:584
#, c-format
msgid "headerfield `%s' missing in header"
msgstr "Le champ « %s » est absent de l'en-tête"
-#: src/msgfmt.c:567
+#: src/msgfmt.c:587
#, c-format
msgid "header field `%s' should start at beginning of line"
msgstr "Le champ « %s » devrait s'appuyer au début de la ligne"
-#: src/msgfmt.c:577
+#: src/msgfmt.c:597
msgid "some header fields still have the initial default value"
msgstr "Quelques champs de l'en-tête ont toujours leur valeur initiale"
-#: src/msgfmt.c:588
+#: src/msgfmt.c:608
#, c-format
msgid "field `%s' still has initial default value"
msgstr "Le champ « %s » a toujours sa valeur initiale"
-#: src/msgfmt.c:673
+#: src/msgfmt.c:698
#, c-format
msgid "%s: warning: source file contains fuzzy translation"
msgstr "%s: attention: certaines traductions sont approximatives"
-#: src/msgfmt.c:875
+#: src/msgfmt.c:920
+#, fuzzy
+msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
+msgstr ""
+"l'une des chaînes « msgid » ou « msgstr » débute par « \\n », l'autre pas"
+
+#: src/msgfmt.c:928
+#, fuzzy, c-format
+msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
+msgstr ""
+"l'une des chaînes « msgid » ou « msgstr » débute par « \\n », l'autre pas"
+
+#: src/msgfmt.c:938
msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
msgstr ""
"l'une des chaînes « msgid » ou « msgstr » débute par « \\n », l'autre pas"
-#: src/msgfmt.c:883
+#: src/msgfmt.c:953
+#, fuzzy
+msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
+msgstr ""
+"l'une des chaînes « msgid » ou « msgstr » se termine par « \\n », l'autre pas"
+
+#: src/msgfmt.c:961
+#, fuzzy, c-format
+msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
+msgstr ""
+"l'une des chaînes « msgid » ou « msgstr » se termine par « \\n », l'autre pas"
+
+#: src/msgfmt.c:971
msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
msgstr ""
"l'une des chaînes « msgid » ou « msgstr » se termine par « \\n », l'autre pas"
-#: src/msgfmt.c:897
+#: src/msgfmt.c:987
msgid "number of format specifications in `msgid' and `msgstr' does not match"
msgstr ""
"nombre différent de spécifications de format entre « msgid » et « msgstr »"
-#: src/msgfmt.c:914
+#: src/msgfmt.c:1004
#, c-format
msgid "format specifications for argument %u are not the same"
msgstr "les spécifications de format pour l'argument %u ne sont pas identiques"
-#: src/msgmerge.c:328
+#: src/msgmerge.c:320
#, fuzzy, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] def.po ref.po\n"
@@ -570,7 +584,7 @@ msgstr ""
" -V, --version identifier le programme, puis terminer\n"
" -w, --width=COLONNES limiter le nombre de COLONNES en sortie\n"
-#: src/msgmerge.c:348
+#: src/msgmerge.c:340
#, no-wrap
msgid ""
"\n"
@@ -597,19 +611,19 @@ msgstr ""
"meilleurs résultats. Ceux-ci sont produits sur la sortie standard,\n"
"À moins qu'un fichier de sortie soit explicitement spécifié.\n"
-#: src/msgmerge.c:804
+#: src/msgmerge.c:799
#, c-format
msgid ""
-"%sRead %d old + %d reference, merged %d, fuzzied %d, missing %d, obsolete "
-"%d.\n"
+"%sRead %d old + %d reference, merged %d, fuzzied %d, missing %d, obsolete %"
+"d.\n"
msgstr ""
"%s%d et %d lus, %d fusionnés, %d approximés, %d manquants, %d périmés.\n"
-#: src/msgmerge.c:810
+#: src/msgmerge.c:805
msgid " done.\n"
msgstr " terminé.\n"
-#: src/msgunfmt.c:215
+#: src/msgunfmt.c:210
#, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] [FILE]...\n"
@@ -638,7 +652,7 @@ msgstr ""
" -V, --version identifier le programme, puis terminer\n"
" -w, --width=COLONNES limiter le nombre de COLONNES en sortie\n"
-#: src/msgunfmt.c:229
+#: src/msgunfmt.c:224
#, no-wrap
msgid ""
"\n"
@@ -654,86 +668,120 @@ msgstr ""
"Sans fichier d'entrée ou lorsque « - », lit l'entrée standard. Sauf\n"
"indication contraire, les résultats sont produits sur la sortie standard.\n"
-#: src/msgunfmt.c:266 src/msgunfmt.c:330 src/po-lex.c:185 src/xget-lex.c:256
+#: src/msgunfmt.c:261 src/msgunfmt.c:326 src/po-lex.c:213 src/xget-lex.c:243
#, c-format
msgid "error while reading \"%s\""
msgstr "erreur lors de la lecture de « %s »"
-#: src/msgunfmt.c:267 src/msgunfmt.c:331
+#: src/msgunfmt.c:262 src/msgunfmt.c:327
#, c-format
msgid "file \"%s\" truncated"
msgstr "le fichier « %s » est tronqué"
-#: src/msgunfmt.c:298
+#: src/msgunfmt.c:293
#, c-format
msgid "seek \"%s\" offset %ld failed"
msgstr "le repositionnement de « %s » à l'endroit %ld a échoué"
-#: src/msgunfmt.c:373
+#: src/msgunfmt.c:332
+#, fuzzy, c-format
+msgid "file \"%s\" contains a not NUL terminated string"
+msgstr "le fichier « %s » n'est pas en format .mo pour GNU"
+
+#: src/msgunfmt.c:377
#, c-format
msgid "file \"%s\" is not in GNU .mo format"
msgstr "le fichier « %s » n'est pas en format .mo pour GNU"
-#: /home/drepper/gnu/gettext/build/src/../../src/po-gram-gen.y:129
+#: src/open-po.c:64
+msgid "<stdin>"
+msgstr ""
+
+#: po-gram-gen.y:87
+msgid "inconsistent use of #~"
+msgstr ""
+
+#: po-gram-gen.y:168
+#, fuzzy
+msgid "missing `msgstr[]' section"
+msgstr "section « msgstr » absente"
+
+#: po-gram-gen.y:176
+#, fuzzy
+msgid "missing `msgid_plural' section"
+msgstr "section « msgstr » absente"
+
+#: po-gram-gen.y:183
msgid "missing `msgstr' section"
msgstr "section « msgstr » absente"
-#: src/po-lex.c:84
-#, c-format
-msgid "found %d fatal errors"
-msgstr "%d erreurs terminales"
+#: po-gram-gen.y:228
+msgid "first plural form has nonzero index"
+msgstr ""
+
+#: po-gram-gen.y:230
+msgid "plural form has wrong index"
+msgstr ""
-#: src/po-lex.c:129 src/po-lex.c:168
+#. CAUTION: If you change this macro, you must also make identical
+#. changes to the function of the same name in src/po-lex.c
+#: src/po-lex.c:156 src/po-lex.c:195 src/po-lex.h:85 src/po-lex.h:99
+#: src/po-lex.h:115 src/po-lex.h:129
msgid "too many errors, aborting"
msgstr "trop d'erreurs, j'abandonne"
-#: src/po-lex.c:241
+#: src/po-lex.c:271
#, c-format
msgid "keyword \"%s\" unknown"
msgstr "mot-clé « %s » inconnu"
-#: src/po-lex.c:335
+#: src/po-lex.c:374
#, fuzzy
msgid "invalid control sequence"
msgstr "séquence d'échappement illégale"
-#: src/po-lex.c:419
+#: src/po-lex.c:477
+msgid "end-of-file within string"
+msgstr "fin de fichier intempestive"
+
+#: src/po-lex.c:482
msgid "end-of-line within string"
msgstr "fin de ligne intempestive"
-#: src/po-lex.c:424
-msgid "end-of-file within string"
-msgstr "fin de fichier intempestive"
+#: src/po-lex.c:525
+#, fuzzy
+msgid "invalid multibyte sequence"
+msgstr "séquence d'échappement illégale"
-#: src/xget-lex.c:152
+#: src/xget-lex.c:148
msgid "standard input"
msgstr "entrée standard"
-#: src/xget-lex.c:894
+#: src/xget-lex.c:876
#, c-format
msgid "%s:%d: warning: unterminated character constant"
msgstr "%s:%d: attention: constante caractère sans terminateur"
-#: src/xget-lex.c:916
+#: src/xget-lex.c:898
#, c-format
msgid "%s:%d: warning: unterminated string literal"
msgstr "%s:%d: attention: constante chaîne sans terminateur"
-#: src/xgettext.c:386
+#: src/xgettext.c:383
msgid "--join-existing cannot be used when output is written to stdout"
msgstr "--join-existing interdit si production sur sortie standard"
-#: src/xgettext.c:391
+#: src/xgettext.c:388
msgid "xgettext cannot work without keywords to look for"
msgstr ""
-#: src/xgettext.c:508
+#: src/xgettext.c:494
#, c-format
msgid "warning: file `%s' extension `%s' is unknown; will try C"
msgstr ""
"attention: « %s » sans classification pour « %s », le langage C sera présumé"
-#: src/xgettext.c:544
+#: src/xgettext.c:530
#, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] INPUTFILE ...\n"
@@ -774,7 +822,7 @@ msgstr ""
" --foreign-user inhiber la production d'un copyright FSF\n"
" -F, --sort-by-file trier selon la position dans chaque fichier\n"
-#: src/xgettext.c:564
+#: src/xgettext.c:550
#, c-format, no-wrap
msgid ""
" -h, --help display this help and exit\n"
@@ -800,7 +848,7 @@ msgstr ""
" -M, --msgstr-suffix[=CHAÎNE] suffixer les msgstr's par CHAÎNE, sinon \\\"\\\"\n"
" --no-location ne pas produire les « #: FICHIER:LIGNE »\n"
-#: src/xgettext.c:578
+#: src/xgettext.c:564
#, no-wrap
msgid ""
" -n, --add-location generate '#: filename:line' lines (default)\n"
@@ -829,20 +877,35 @@ msgstr ""
"\n"
"Si le FICHIER est « - », lit l'entrée standard.\n"
-#: src/xgettext.c:879
+#: src/xgettext.c:926
#, fuzzy, c-format
msgid "%s:%d: warning: keyword nested in keyword arg"
msgstr "%s:%d: attention: constante chaîne sans terminateur"
-#: src/xgettext.c:889
+#: src/xgettext.c:936
#, c-format
msgid "%s:%d: warning: keyword between outer keyword and its arg"
msgstr ""
-#: src/xgettext.c:1374
+#: src/xgettext.c:1432
#, c-format
msgid "language `%s' unknown"
msgstr "langage « %s » inconnu"
+#~ msgid ""
+#~ "internationalized messages should not contain the `\\%c' escape sequence"
+#~ msgstr ""
+#~ "un message à traduire ne doit pas contenir la séquence d'échappement `\\%"
+#~ "c'"
+
+#~ msgid "cannot create output file \"%s\""
+#~ msgstr "incapable de fabriquer le fichier « %s »"
+
+#~ msgid "standard output"
+#~ msgstr "sortie standard"
+
+#~ msgid "error while writing \"%s\" file"
+#~ msgstr "erreur pendant l'écriture du fichier « %s »"
+
#~ msgid "%s: warning: no header entry found"
#~ msgstr "%s: attention: l'en-tête n'a pas été trouvé"
diff --git a/po/gettext.pot b/po/gettext.pot
index eb2b5fb..b603608 100644
--- a/po/gettext.pot
+++ b/po/gettext.pot
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-09-14 19:36+0200\n"
+"POT-Creation-Date: 2001-03-09 19:56+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,75 +14,79 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: ENCODING\n"
-#: lib/error.c:103
+#: lib/error.c:115
msgid "Unknown system error"
msgstr ""
-#: lib/getopt.c:680
+#: lib/getopt.c:691
#, c-format
msgid "%s: option `%s' is ambiguous\n"
msgstr ""
-#: lib/getopt.c:704
+#: lib/getopt.c:716
#, c-format
msgid "%s: option `--%s' doesn't allow an argument\n"
msgstr ""
-#: lib/getopt.c:709
+#: lib/getopt.c:721
#, c-format
msgid "%s: option `%c%s' doesn't allow an argument\n"
msgstr ""
-#: lib/getopt.c:726 lib/getopt.c:899
+#: lib/getopt.c:739 lib/getopt.c:912
#, c-format
msgid "%s: option `%s' requires an argument\n"
msgstr ""
#. --option
-#: lib/getopt.c:755
+#: lib/getopt.c:768
#, c-format
msgid "%s: unrecognized option `--%s'\n"
msgstr ""
#. +option or -option
-#: lib/getopt.c:759
+#: lib/getopt.c:772
#, c-format
msgid "%s: unrecognized option `%c%s'\n"
msgstr ""
#. 1003.2 specifies the format of this message.
-#: lib/getopt.c:785
+#: lib/getopt.c:798
#, c-format
msgid "%s: illegal option -- %c\n"
msgstr ""
-#: lib/getopt.c:788
+#: lib/getopt.c:801
#, c-format
msgid "%s: invalid option -- %c\n"
msgstr ""
#. 1003.2 specifies the format of this message.
-#: lib/getopt.c:818 lib/getopt.c:948
+#: lib/getopt.c:831 lib/getopt.c:961
#, c-format
msgid "%s: option requires an argument -- %c\n"
msgstr ""
-#: lib/getopt.c:865
+#: lib/getopt.c:878
#, c-format
msgid "%s: option `-W %s' is ambiguous\n"
msgstr ""
-#: lib/getopt.c:883
+#: lib/getopt.c:896
#, c-format
msgid "%s: option `-W %s' doesn't allow an argument\n"
msgstr ""
-#: lib/xmalloc.c:82
+#: lib/obstack.c:474
+msgid "memory exhausted"
+msgstr ""
+
+#: lib/xmalloc.c:86
msgid "Memory exhausted"
msgstr ""
-#: src/gettextp.c:134 src/msgcmp.c:144 src/msgcomm.c:285 src/msgfmt.c:257
-#: src/msgmerge.c:263 src/msgunfmt.c:175 src/xgettext.c:401
+#: src/gettext.c:138 src/msgcmp.c:140 src/msgcomm.c:283 src/msgfmt.c:270
+#: src/msgmerge.c:255 src/msgunfmt.c:170 src/xgettext.c:398
#, c-format, no-wrap
msgid ""
"Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -90,27 +94,27 @@ msgid ""
"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
msgstr ""
-#: src/gettextp.c:139 src/msgcmp.c:149 src/msgcomm.c:290 src/msgfmt.c:262
-#: src/msgmerge.c:268 src/msgunfmt.c:180 src/xgettext.c:406
+#: src/gettext.c:143 src/msgcmp.c:145 src/msgcomm.c:288 src/msgfmt.c:275
+#: src/msgmerge.c:260 src/msgunfmt.c:175 src/xgettext.c:403
#, c-format
msgid "Written by %s.\n"
msgstr ""
-#: src/gettextp.c:154
+#: src/gettext.c:158
msgid "missing arguments"
msgstr ""
-#: src/gettextp.c:164
+#: src/gettext.c:168
msgid "too many arguments"
msgstr ""
-#: src/gettextp.c:228 src/msgcmp.c:181 src/msgcomm.c:395 src/msgfmt.c:361
-#: src/msgmerge.c:323 src/msgunfmt.c:210 src/xgettext.c:539
+#: src/gettext.c:232 src/msgcmp.c:177 src/msgcomm.c:381 src/msgfmt.c:377
+#: src/msgmerge.c:315 src/msgunfmt.c:205 src/xgettext.c:525
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr ""
-#: src/gettextp.c:233
+#: src/gettext.c:237
#, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] [[[TEXTDOMAIN] MSGID] | [-s [MSGID]...]]\n"
@@ -124,7 +128,7 @@ msgid ""
" to MSGID from TEXTDOMAIN\n"
msgstr ""
-#: src/gettextp.c:245
+#: src/gettext.c:249
#, c-format, no-wrap
msgid ""
"\n"
@@ -138,41 +142,20 @@ msgid ""
"Standard search directory: %s\n"
msgstr ""
-#: src/gettextp.c:255 src/msgcmp.c:200 src/msgcomm.c:442 src/msgfmt.c:388
-#: src/msgmerge.c:358 src/msgunfmt.c:234 src/xgettext.c:591
+#: src/gettext.c:259 src/msgcmp.c:196 src/msgcomm.c:428 src/msgfmt.c:404
+#: src/msgmerge.c:350 src/msgunfmt.c:229 src/xgettext.c:577
msgid "Report bugs to <bug-gnu-utils@gnu.org>.\n"
msgstr ""
-#: src/message.c:900
-#, c-format
-msgid ""
-"internationalized messages should not contain the `\\%c' escape sequence"
-msgstr ""
-
-#: src/message.c:1231
-#, c-format
-msgid "cannot create output file \"%s\""
-msgstr ""
-
-#: src/message.c:1238
-#, no-c-format
-msgid "standard output"
-msgstr ""
-
-#: src/message.c:1298
-#, c-format
-msgid "error while writing \"%s\" file"
-msgstr ""
-
-#: src/msgcmp.c:160 src/msgmerge.c:279
+#: src/msgcmp.c:156 src/msgmerge.c:271
msgid "no input files given"
msgstr ""
-#: src/msgcmp.c:165 src/msgmerge.c:284
+#: src/msgcmp.c:161 src/msgmerge.c:276
msgid "exactly 2 input files required"
msgstr ""
-#: src/msgcmp.c:186
+#: src/msgcmp.c:182
#, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] def.po ref.po\n"
@@ -189,57 +172,62 @@ msgid ""
"cannot be found, fuzzy matching is used to produce better diagnostics.\n"
msgstr ""
-#: src/msgcmp.c:259 src/msgmerge.c:746
+#: src/msgcmp.c:255 src/msgmerge.c:741
msgid "this message is used but not defined..."
msgstr ""
-#: src/msgcmp.c:261 src/msgmerge.c:748
+#: src/msgcmp.c:257 src/msgmerge.c:743
msgid "...but this definition is similar"
msgstr ""
-#: src/msgcmp.c:267 src/msgmerge.c:775
+#: src/msgcmp.c:263 src/msgmerge.c:770
#, c-format
msgid "this message is used but not defined in %s"
msgstr ""
-#: src/msgcmp.c:281
+#: src/msgcmp.c:277
msgid "warning: this message is not used"
msgstr ""
-#: src/msgcmp.c:355 src/msgfmt.c:633 src/msgmerge.c:517 src/xgettext.c:1088
+#: src/msgcmp.c:282 src/po-lex.c:102
+#, c-format
+msgid "found %d fatal errors"
+msgstr ""
+
+#: src/msgcmp.c:354 src/msgfmt.c:657 src/msgmerge.c:512 src/xgettext.c:1169
msgid "duplicate message definition"
msgstr ""
-#: src/msgcmp.c:356 src/msgfmt.c:634 src/msgmerge.c:518 src/xgettext.c:1089
+#: src/msgcmp.c:355 src/msgfmt.c:659 src/msgmerge.c:513 src/xgettext.c:1170
msgid "...this is the location of the first definition"
msgstr ""
-#: src/msgcmp.c:396 src/msgmerge.c:566
+#: src/msgcmp.c:395 src/msgmerge.c:561
#, c-format
msgid "this message has no definition in the \"%s\" domain"
msgstr ""
#. We are about to construct the absolute path to the
#. directory for the output files but asprintf failed.
-#: src/msgcomm.c:238 src/xgettext.c:340 src/xgettext.c:1283
+#: src/msgcomm.c:236 src/xgettext.c:337 src/xgettext.c:1365
msgid "while preparing output"
msgstr ""
-#: src/msgcomm.c:273 src/msgcomm.c:277 src/xgettext.c:378 src/xgettext.c:382
+#: src/msgcomm.c:271 src/msgcomm.c:275 src/xgettext.c:375 src/xgettext.c:379
#, c-format
msgid "%s and %s are mutually exclusive"
msgstr ""
-#: src/msgcomm.c:341
+#: src/msgcomm.c:327
msgid "at least two files must be specified"
msgstr ""
-#: src/msgcomm.c:360
+#: src/msgcomm.c:346
#, c-format
msgid "impossible selection criteria specified (%d < n < %d)"
msgstr ""
-#: src/msgcomm.c:400
+#: src/msgcomm.c:386
#, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] INPUTFILE ...\n"
@@ -254,7 +242,7 @@ msgid ""
" -h, --help display this help and exit\n"
msgstr ""
-#: src/msgcomm.c:412
+#: src/msgcomm.c:398
msgid ""
" -i, --indent write the .po file using indented style\n"
" --no-location do not write '#: filename:line' lines\n"
@@ -273,7 +261,7 @@ msgid ""
" that only unique messages be printed\n"
msgstr ""
-#: src/msgcomm.c:425
+#: src/msgcomm.c:411
msgid ""
" -V, --version output version information and exit\n"
" -w, --width=NUMBER set output page width\n"
@@ -293,41 +281,41 @@ msgid ""
"preserved.\n"
msgstr ""
-#: src/msgcomm.c:476 src/msgunfmt.c:357 src/po-lex.c:80 src/xget-lex.c:160
-#: src/xget-lex.c:175 src/xget-lex.c:192 src/xgettext.c:625
+#: src/msgcomm.c:462 src/msgunfmt.c:361 src/po-lex.c:86 src/xget-lex.c:157
+#: src/xget-lex.c:170 src/xget-lex.c:180 src/xgettext.c:611
#, c-format
msgid "error while opening \"%s\" for reading"
msgstr ""
-#: src/msgcomm.c:557 src/xgettext.c:667 src/xgettext.c:995
+#: src/msgcomm.c:543 src/xgettext.c:653 src/xgettext.c:1071
msgid "this file may not contain domain directives"
msgstr ""
-#: src/msgfmt.c:273 src/xgettext.c:417
+#: src/msgfmt.c:286 src/xgettext.c:414
msgid "no input file given"
msgstr ""
-#: src/msgfmt.c:321
+#: src/msgfmt.c:337
#, c-format
msgid "error while opening \"%s\" for writing"
msgstr ""
-#: src/msgfmt.c:343
+#: src/msgfmt.c:359
#, c-format
msgid "%d translated messages"
msgstr ""
-#: src/msgfmt.c:345
+#: src/msgfmt.c:361
#, c-format
msgid ", %d fuzzy translations"
msgstr ""
-#: src/msgfmt.c:347
+#: src/msgfmt.c:363
#, c-format
msgid ", %d untranslated messages"
msgstr ""
-#: src/msgfmt.c:366
+#: src/msgfmt.c:382
#, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] filename.po ...\n"
@@ -352,82 +340,102 @@ msgid ""
"output is written to standard output.\n"
msgstr ""
-#: src/msgfmt.c:409
+#: src/msgfmt.c:425
msgid "while creating hash table"
msgstr ""
-#: src/msgfmt.c:451
+#: src/msgfmt.c:469
#, c-format
-msgid "%s: warning: PO file header missing, fuzzy, or invalid"
+msgid ""
+"%s: warning: PO file header missing, fuzzy, or invalid\n"
+"%*s warning: charset conversion will not work"
msgstr ""
-#: src/msgfmt.c:474
+#: src/msgfmt.c:493
#, c-format
msgid "domain name \"%s\" not suitable as file name"
msgstr ""
-#: src/msgfmt.c:479
+#: src/msgfmt.c:498
#, c-format
msgid "domain name \"%s\" not suitable as file name: will use prefix"
msgstr ""
#. We don't change the exit status here because this is really
#. only an information.
-#: src/msgfmt.c:492
+#: src/msgfmt.c:511
#, c-format
msgid "`domain %s' directive ignored"
msgstr ""
-#: src/msgfmt.c:520
+#: src/msgfmt.c:541
msgid "empty `msgstr' entry ignored"
msgstr ""
-#: src/msgfmt.c:521
+#: src/msgfmt.c:542
msgid "fuzzy `msgstr' entry ignored"
msgstr ""
-#: src/msgfmt.c:564
+#: src/msgfmt.c:584
#, c-format
msgid "headerfield `%s' missing in header"
msgstr ""
-#: src/msgfmt.c:567
+#: src/msgfmt.c:587
#, c-format
msgid "header field `%s' should start at beginning of line"
msgstr ""
-#: src/msgfmt.c:577
+#: src/msgfmt.c:597
msgid "some header fields still have the initial default value"
msgstr ""
-#: src/msgfmt.c:588
+#: src/msgfmt.c:608
#, c-format
msgid "field `%s' still has initial default value"
msgstr ""
-#: src/msgfmt.c:673
+#: src/msgfmt.c:698
#, c-format
msgid "%s: warning: source file contains fuzzy translation"
msgstr ""
-#: src/msgfmt.c:875
+#: src/msgfmt.c:920
+msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
+msgstr ""
+
+#: src/msgfmt.c:928
+#, c-format
+msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
+msgstr ""
+
+#: src/msgfmt.c:938
msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
msgstr ""
-#: src/msgfmt.c:883
+#: src/msgfmt.c:953
+msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
+msgstr ""
+
+#: src/msgfmt.c:961
+#, c-format
+msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
+msgstr ""
+
+#: src/msgfmt.c:971
msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
msgstr ""
-#: src/msgfmt.c:897
+#: src/msgfmt.c:987
msgid "number of format specifications in `msgid' and `msgstr' does not match"
msgstr ""
-#: src/msgfmt.c:914
+#: src/msgfmt.c:1004
#, c-format
msgid "format specifications for argument %u are not the same"
msgstr ""
-#: src/msgmerge.c:328
+#: src/msgmerge.c:320
#, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] def.po ref.po\n"
@@ -449,7 +457,7 @@ msgid ""
" -w, --width=NUMBER set output page width\n"
msgstr ""
-#: src/msgmerge.c:348
+#: src/msgmerge.c:340
#, no-wrap
msgid ""
"\n"
@@ -464,18 +472,18 @@ msgid ""
"results are written to stdout unless an output file is specified.\n"
msgstr ""
-#: src/msgmerge.c:804
+#: src/msgmerge.c:799
#, c-format
msgid ""
-"%sRead %d old + %d reference, merged %d, fuzzied %d, missing %d, obsolete "
-"%d.\n"
+"%sRead %d old + %d reference, merged %d, fuzzied %d, missing %d, obsolete %"
+"d.\n"
msgstr ""
-#: src/msgmerge.c:810
+#: src/msgmerge.c:805
msgid " done.\n"
msgstr ""
-#: src/msgunfmt.c:215
+#: src/msgunfmt.c:210
#, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] [FILE]...\n"
@@ -491,7 +499,7 @@ msgid ""
" -w, --width=NUMBER set output page width\n"
msgstr ""
-#: src/msgunfmt.c:229
+#: src/msgunfmt.c:224
#, no-wrap
msgid ""
"\n"
@@ -501,84 +509,115 @@ msgid ""
"By default the output is written to standard output.\n"
msgstr ""
-#: src/msgunfmt.c:266 src/msgunfmt.c:330 src/po-lex.c:191 src/xget-lex.c:255
+#: src/msgunfmt.c:261 src/msgunfmt.c:326 src/po-lex.c:213 src/xget-lex.c:243
#, c-format
msgid "error while reading \"%s\""
msgstr ""
-#: src/msgunfmt.c:267 src/msgunfmt.c:331
+#: src/msgunfmt.c:262 src/msgunfmt.c:327
#, c-format
msgid "file \"%s\" truncated"
msgstr ""
-#: src/msgunfmt.c:298
+#: src/msgunfmt.c:293
#, c-format
msgid "seek \"%s\" offset %ld failed"
msgstr ""
-#: src/msgunfmt.c:373
+#: src/msgunfmt.c:332
+#, c-format
+msgid "file \"%s\" contains a not NUL terminated string"
+msgstr ""
+
+#: src/msgunfmt.c:377
#, c-format
msgid "file \"%s\" is not in GNU .mo format"
msgstr ""
-#: /home/drepper/gnu/gettext/build/src/../../src/po-gram-gen.y:129
+#: src/open-po.c:64
+msgid "<stdin>"
+msgstr ""
+
+#: po-gram-gen.y:87
+msgid "inconsistent use of #~"
+msgstr ""
+
+#: po-gram-gen.y:168
+msgid "missing `msgstr[]' section"
+msgstr ""
+
+#: po-gram-gen.y:176
+msgid "missing `msgid_plural' section"
+msgstr ""
+
+#: po-gram-gen.y:183
msgid "missing `msgstr' section"
msgstr ""
-#: src/po-lex.c:90
-#, c-format
-msgid "found %d fatal errors"
+#: po-gram-gen.y:228
+msgid "first plural form has nonzero index"
+msgstr ""
+
+#: po-gram-gen.y:230
+msgid "plural form has wrong index"
msgstr ""
-#: src/po-lex.c:135 src/po-lex.c:174
+#. CAUTION: If you change this macro, you must also make identical
+#. changes to the function of the same name in src/po-lex.c
+#: src/po-lex.c:156 src/po-lex.c:195 src/po-lex.h:85 src/po-lex.h:99
+#: src/po-lex.h:115 src/po-lex.h:129
msgid "too many errors, aborting"
msgstr ""
-#: src/po-lex.c:247
+#: src/po-lex.c:271
#, c-format
msgid "keyword \"%s\" unknown"
msgstr ""
-#: src/po-lex.c:350
+#: src/po-lex.c:374
msgid "invalid control sequence"
msgstr ""
-#: src/po-lex.c:434
+#: src/po-lex.c:477
+msgid "end-of-file within string"
+msgstr ""
+
+#: src/po-lex.c:482
msgid "end-of-line within string"
msgstr ""
-#: src/po-lex.c:439
-msgid "end-of-file within string"
+#: src/po-lex.c:525
+msgid "invalid multibyte sequence"
msgstr ""
-#: src/xget-lex.c:151
+#: src/xget-lex.c:148
msgid "standard input"
msgstr ""
-#: src/xget-lex.c:888
+#: src/xget-lex.c:876
#, c-format
msgid "%s:%d: warning: unterminated character constant"
msgstr ""
-#: src/xget-lex.c:910
+#: src/xget-lex.c:898
#, c-format
msgid "%s:%d: warning: unterminated string literal"
msgstr ""
-#: src/xgettext.c:386
+#: src/xgettext.c:383
msgid "--join-existing cannot be used when output is written to stdout"
msgstr ""
-#: src/xgettext.c:391
+#: src/xgettext.c:388
msgid "xgettext cannot work without keywords to look for"
msgstr ""
-#: src/xgettext.c:508
+#: src/xgettext.c:494
#, c-format
msgid "warning: file `%s' extension `%s' is unknown; will try C"
msgstr ""
-#: src/xgettext.c:544
+#: src/xgettext.c:530
#, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] INPUTFILE ...\n"
@@ -600,7 +639,7 @@ msgid ""
" -F, --sort-by-file sort output by file location\n"
msgstr ""
-#: src/xgettext.c:564
+#: src/xgettext.c:550
#, c-format, no-wrap
msgid ""
" -h, --help display this help and exit\n"
@@ -616,7 +655,7 @@ msgid ""
" --no-location do not write '#: filename:line' lines\n"
msgstr ""
-#: src/xgettext.c:578
+#: src/xgettext.c:564
#, no-wrap
msgid ""
" -n, --add-location generate '#: filename:line' lines (default)\n"
@@ -633,17 +672,17 @@ msgid ""
"If INPUTFILE is -, standard input is read.\n"
msgstr ""
-#: src/xgettext.c:874
+#: src/xgettext.c:926
#, c-format
msgid "%s:%d: warning: keyword nested in keyword arg"
msgstr ""
-#: src/xgettext.c:884
+#: src/xgettext.c:936
#, c-format
msgid "%s:%d: warning: keyword between outer keyword and its arg"
msgstr ""
-#: src/xgettext.c:1351
+#: src/xgettext.c:1432
#, c-format
msgid "language `%s' unknown"
msgstr ""
diff --git a/po/ja.po b/po/ja.po
index f89f0c4..9604b29 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: GNU gettext 0.10.35\n"
-"POT-Creation-Date: 2001-02-01 20:27+0100\n"
+"POT-Creation-Date: 2001-03-09 19:56+0100\n"
"PO-Revision-Date: 1999-09-24 23:45+09:00\n"
"Last-Translator: JUN SAWATAISHI <jsawa@ibm.net>\n"
"Language-Team: \n"
@@ -13,7 +13,7 @@ msgstr ""
"Content-Type: text/plain; charset=sjis\n"
"Content-Transfer-Encoding: 8-bit\n"
-#: lib/error.c:109
+#: lib/error.c:115
msgid "Unknown system error"
msgstr "”F¯‚³‚ê‚È‚¢ƒVƒXƒeƒ€ƒGƒ‰["
@@ -77,17 +77,15 @@ msgid "%s: option `-W %s' doesn't allow an argument\n"
msgstr "%s: ƒIƒvƒVƒ‡ƒ“ -W %s ‚͈ø”‚ğ‚Æ‚è‚Ü‚¹‚ñ\n"
#: lib/obstack.c:474
-#, c-format
msgid "memory exhausted"
msgstr "ƒƒ‚ƒŠ[‚ªŒÍЉ‚µ‚Ü‚µ‚½"
#: lib/xmalloc.c:86
-#, c-format
msgid "Memory exhausted"
msgstr "ƒƒ‚ƒŠ[‚ªŒÍЉ‚µ‚Ü‚µ‚½"
-#: src/gettext.c:138 src/msgcmp.c:140 src/msgcomm.c:282 src/msgfmt.c:270
-#: src/msgmerge.c:254 src/msgunfmt.c:169 src/xgettext.c:397
+#: src/gettext.c:138 src/msgcmp.c:140 src/msgcomm.c:283 src/msgfmt.c:270
+#: src/msgmerge.c:255 src/msgunfmt.c:170 src/xgettext.c:398
#, c-format, no-wrap
msgid ""
"Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -98,8 +96,8 @@ msgstr ""
"‚±‚ê‚̓tƒŠ[ƒ\ƒtƒgƒEƒGƒA‚Å‚·BƒRƒs[‚ÌğŒ‚ɂ‚¢‚Ă̓\[ƒX‚ğQƂ̂±‚Æ\n"
"‚±‚̃\ƒtƒgƒEƒGƒA‚ɂ͑S‚­•ÛØ‚ª‚ ‚è‚Ü‚¹‚ñ.\n"
-#: src/gettext.c:143 src/msgcmp.c:145 src/msgcomm.c:287 src/msgfmt.c:275
-#: src/msgmerge.c:259 src/msgunfmt.c:174 src/xgettext.c:402
+#: src/gettext.c:143 src/msgcmp.c:145 src/msgcomm.c:288 src/msgfmt.c:275
+#: src/msgmerge.c:260 src/msgunfmt.c:175 src/xgettext.c:403
#, c-format
msgid "Written by %s.\n"
msgstr "%s ‚É‚æ‚Á‚Ä‘‚©‚ê‚Ü‚µ‚½B\n"
@@ -112,8 +110,8 @@ msgstr "ˆø”‚ªŒ‡”@"
msgid "too many arguments"
msgstr "ˆø”‚ª‘½‚·‚¬‚Ü‚·"
-#: src/gettext.c:232 src/msgcmp.c:177 src/msgcomm.c:392 src/msgfmt.c:374
-#: src/msgmerge.c:314 src/msgunfmt.c:204 src/xgettext.c:535
+#: src/gettext.c:232 src/msgcmp.c:177 src/msgcomm.c:381 src/msgfmt.c:377
+#: src/msgmerge.c:315 src/msgunfmt.c:205 src/xgettext.c:525
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "%s --help ‚Å‚æ‚葽‚­‚Ìî•ñ‚ª•\¦‚³‚ê‚Ü‚·\n"
@@ -164,38 +162,16 @@ msgstr ""
"ƒƒbƒZ[ƒW‚Í–|–󂳂ê‚Ä‚¢‚é\n"
"ŒŸõƒfƒBƒŒƒNƒgƒŠ: %s\n"
-#: src/gettext.c:259 src/msgcmp.c:196 src/msgcomm.c:439 src/msgfmt.c:401
-#: src/msgmerge.c:349 src/msgunfmt.c:228 src/xgettext.c:587
+#: src/gettext.c:259 src/msgcmp.c:196 src/msgcomm.c:428 src/msgfmt.c:404
+#: src/msgmerge.c:350 src/msgunfmt.c:229 src/xgettext.c:577
msgid "Report bugs to <bug-gnu-utils@gnu.org>.\n"
msgstr "ƒoƒOƒŒƒ|[ƒg‚Í <bug-gnu-utils@gnu.org> ‚Ü‚Å.\n"
-#: src/message.c:1006
-#, c-format
-msgid ""
-"internationalized messages should not contain the `\\%c' escape sequence"
-msgstr ""
-"‘Û‰»‚³‚ꂽƒƒbƒZ[ƒW‚̓GƒXƒP[ƒvƒV[ƒPƒ“ƒX`\\%c'‚ğ‚Ó‚­‚ñ‚ł͂Ȃè‚Ü‚¹‚ñ "
-
-#: src/message.c:1385
-#, c-format
-msgid "cannot create output file \"%s\""
-msgstr "o—̓tƒ@ƒCƒ‹ \"%s\"‚ğ쬂ł«‚È‚¢"
-
-#: src/message.c:1392
-#, no-c-format
-msgid "standard output"
-msgstr "•W€o—Í"
-
-#: src/message.c:1452
-#, c-format
-msgid "error while writing \"%s\" file"
-msgstr "ƒtƒ@ƒCƒ‹ \"%s\" ‚Ì‘‚«‚݃Gƒ‰["
-
-#: src/msgcmp.c:156 src/msgmerge.c:270
+#: src/msgcmp.c:156 src/msgmerge.c:271
msgid "no input files given"
msgstr "“ü—̓tƒ@ƒCƒ‹‚ª—^‚¦‚ç‚ê‚Ä‚¢‚Ü‚¹‚ñ"
-#: src/msgcmp.c:161 src/msgmerge.c:275
+#: src/msgcmp.c:161 src/msgmerge.c:276
msgid "exactly 2 input files required"
msgstr "2‚‚̓ü—̓tƒ@ƒCƒ‹‚ª•K—v"
@@ -229,15 +205,15 @@ msgstr ""
"—L—p‚Å‚·B³Šm‚Ƀ}ƒbƒ`‚µ‚È‚¢ê‡‚Í‚ ‚¢‚Ü‚¢‚Ȉê’v–@‚ª—p‚¢‚ç‚ê‚ÄA‚æ‚è\n"
"Ú‚µ‚¢f’fŒ‹‰Ê‚ª“¾‚ç‚ê‚Ü‚·B\n"
-#: src/msgcmp.c:255 src/msgmerge.c:740
+#: src/msgcmp.c:255 src/msgmerge.c:741
msgid "this message is used but not defined..."
msgstr "‚±‚̃ƒbƒZ[ƒW‚Íg—p‚³‚ê‚Ă܂·‚ª’è‹`‚³‚ê‚Ü‚¹‚ñ..."
-#: src/msgcmp.c:257 src/msgmerge.c:742
+#: src/msgcmp.c:257 src/msgmerge.c:743
msgid "...but this definition is similar"
msgstr "...‚±‚Ì’è‹`‚ÍŸ‚Ì‚à‚̂Ɠ¯‚¶.."
-#: src/msgcmp.c:263 src/msgmerge.c:769
+#: src/msgcmp.c:263 src/msgmerge.c:770
#, c-format
msgid "this message is used but not defined in %s"
msgstr "‚±‚̃ƒbƒZ[ƒW‚Íg—p‚³‚ê‚Ă܂·‚ª %s ‚Å’è‹`‚³‚ê‚Ă܂¹‚ñ"
@@ -246,40 +222,45 @@ msgstr "‚±‚̃ƒbƒZ[ƒW‚Íg—p‚³‚ê‚Ă܂·‚ª %s ‚Å’è‹`‚³‚ê‚Ă܂¹‚ñ"
msgid "warning: this message is not used"
msgstr "Œx: ‚±‚̃ƒbƒZ[ƒW‚Íg‚í‚ê‚Ü‚¹‚ñ"
-#: src/msgcmp.c:354 src/msgfmt.c:735 src/msgmerge.c:511 src/xgettext.c:1179
+#: src/msgcmp.c:282 src/po-lex.c:102
+#, c-format
+msgid "found %d fatal errors"
+msgstr "’v–½“I‚ȃGƒ‰[‚Ì”‚Í %d ‚Å‚·"
+
+#: src/msgcmp.c:354 src/msgfmt.c:657 src/msgmerge.c:512 src/xgettext.c:1169
msgid "duplicate message definition"
msgstr "ƒƒbƒZ[ƒW‚Ì’è‹`‚ªd•¡‚µ‚Ä‚¢‚Ü‚·"
-#: src/msgcmp.c:355 src/msgfmt.c:737 src/msgmerge.c:512 src/xgettext.c:1180
+#: src/msgcmp.c:355 src/msgfmt.c:659 src/msgmerge.c:513 src/xgettext.c:1170
msgid "...this is the location of the first definition"
msgstr "...‚±‚ê‚Íʼn‚É’è‹`‚³‚ꂽ‚Æ‚±‚ë‚Å‚·"
-#: src/msgcmp.c:395 src/msgmerge.c:560
+#: src/msgcmp.c:395 src/msgmerge.c:561
#, c-format
msgid "this message has no definition in the \"%s\" domain"
msgstr "‚±‚̃ƒbƒZ[ƒW‚Í \"%s\" domain ‚Ì’†‚Å’è‹`‚³‚ê‚Ă܂¹‚ñ"
#. We are about to construct the absolute path to the
#. directory for the output files but asprintf failed.
-#: src/msgcomm.c:235 src/xgettext.c:336 src/xgettext.c:1375
+#: src/msgcomm.c:236 src/xgettext.c:337 src/xgettext.c:1365
msgid "while preparing output"
msgstr "o—͂̀”õ’†‚É"
-#: src/msgcomm.c:270 src/msgcomm.c:274 src/xgettext.c:374 src/xgettext.c:378
+#: src/msgcomm.c:271 src/msgcomm.c:275 src/xgettext.c:375 src/xgettext.c:379
#, c-format
msgid "%s and %s are mutually exclusive"
msgstr "%s ‚Æ %s ‚݂͌¢‚É”r‘¼“I‚Å‚·"
-#: src/msgcomm.c:338
+#: src/msgcomm.c:327
msgid "at least two files must be specified"
msgstr "­‚È‚­‚Æ‚à“ñ‚‚̃tƒ@ƒCƒ‹‚ğw’肵‚ĉº‚³‚¢"
-#: src/msgcomm.c:357
+#: src/msgcomm.c:346
#, c-format
msgid "impossible selection criteria specified (%d < n < %d)"
msgstr "‘I‘ğŠî€‚ª•s³‚Å‚· (%d < n < %d)"
-#: src/msgcomm.c:397
+#: src/msgcomm.c:386
#, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] INPUTFILE ...\n"
@@ -305,7 +286,7 @@ msgstr ""
" -F, --sort-by-file ƒtƒ@ƒCƒ‹‚̈ʒu‚É‚æ‚Á‚ă\[ƒg‚·‚é\n"
" -h, --help ‚±‚̃wƒ‹ƒvƒƒbƒZ[ƒW‚ğo—Í‚µ‚ÄI—¹\n"
-#: src/msgcomm.c:409
+#: src/msgcomm.c:398
msgid ""
" -i, --indent write the .po file using indented style\n"
" --no-location do not write '#: filename:line' lines\n"
@@ -325,20 +306,20 @@ msgid ""
msgstr ""
" -i, --indent ƒCƒ“ƒfƒ“ƒg‚µ‚Äo—Í‚·‚é\n"
" --no-location '#:ƒtƒ@ƒCƒ‹–¼:s”Ô†'‚Ìs‚ğo—Í‚µ‚È‚¢\n"
-" --add-location "
-"'#:ƒtƒ@ƒCƒ‹–¼:s”Ô†'‚Ìs‚ğo—Í‚·‚é(ƒfƒtƒHƒ‹ƒg)\n"
+" --add-location '#:ƒtƒ@ƒCƒ‹–¼:s”Ô†'‚Ìs‚ğo—Í‚·‚é(ƒfƒtƒHƒ‹"
+"ƒg)\n"
" --omit-header ƒwƒbƒ_[‚É`msgid \"\"'‚ğ‘‚«‚܂Ȃ¢\n"
" -o, --output=FILE FILE‚Éo—Í‚·‚é\n"
" -p, --output-dir=DIR o—̓tƒ@ƒCƒ‹‚ğ DIR ‚É‘‚«‚Ş\n"
-" -s, --sort-output "
-"Šes‚ğƒ\[ƒg‚µ‚Äd•¡‚³‚ꂽ‚à‚Ì‚ğƒ}[ƒW‚·‚é\n"
+" -s, --sort-output Šes‚ğƒ\[ƒg‚µ‚Äd•¡‚³‚ꂽ‚à‚Ì‚ğƒ}[ƒW‚·"
+"‚é\n"
" --strict Œµ–§‚ÉUniform—l®‚É]‚Á‚Äo—Í‚·‚é\n"
" -T, --trigraphs ANSI C trigraph ‚Ì“ü—Í‚ğ—‰ğ‚·‚é\n"
-" -u, --unique --less-than=2 "
-"‚Æ“¯ˆê‚цƒj[ƒN‚ȃƒbƒZ[ƒW\n"
+" -u, --unique --less-than=2 ‚Æ“¯ˆê‚цƒj[ƒN‚ȃƒbƒZ["
+"ƒW\n"
" ‚Ì‚İo—Í‚³‚ê‚é\n"
-#: src/msgcomm.c:422
+#: src/msgcomm.c:411
msgid ""
" -V, --version output version information and exit\n"
" -w, --width=NUMBER set output page width\n"
@@ -360,8 +341,8 @@ msgstr ""
" -V, --version ƒ”ƒ@[ƒWƒ‡ƒ“î•ñ‚ğ•\¦‚µ‚ÄI—¹\n"
" -w, --width=NUMBER ƒy[ƒW•‚ğ NUMBER ‚Æİ’è‚·‚é\n"
" -<, --less-than=NUMBER NUMBER ŒÂ‚æ‚è­‚È‚¢ƒtƒ@ƒCƒ‹‚Å‹¤’Ê‚·‚é\n"
-" ƒƒbƒZ[ƒW‚Ì‚İo—Í‚·‚é(ƒfƒtƒHƒ‹ƒg: "
-"–³§ŒÀ)\n"
+" ƒƒbƒZ[ƒW‚Ì‚İo—Í‚·‚é(ƒfƒtƒHƒ‹ƒg: –³§"
+"ŒÀ)\n"
" ->, --more-than=NUMBER NUMBER ŒÂ‚æ‚葽‚¢ƒtƒ@ƒCƒ‹‚Å‹¤’Ê‚·‚é\n"
" ƒƒbƒZ[ƒW‚Ì‚İo—Í‚·‚é(ƒfƒtƒHƒ‹ƒg: 1)\n"
"\n"
@@ -372,41 +353,41 @@ msgstr ""
"o—Í‚³‚ê‚邿‚¤‚Éİ’è‚Å‚«‚Ü‚·B(—á: --less-than=2 ‚цƒj[ƒN‚ȃƒbƒZ[\n"
"ƒW‚݂̂ğo—Í‚µ‚Ü‚·)\n"
-#: src/msgcomm.c:473 src/msgunfmt.c:357 src/po-lex.c:81 src/xget-lex.c:157
-#: src/xget-lex.c:172 src/xget-lex.c:189 src/xgettext.c:621
+#: src/msgcomm.c:462 src/msgunfmt.c:361 src/po-lex.c:86 src/xget-lex.c:157
+#: src/xget-lex.c:170 src/xget-lex.c:180 src/xgettext.c:611
#, c-format
msgid "error while opening \"%s\" for reading"
msgstr "\"%s\" ‚̃I[ƒvƒ“‚ŃGƒ‰["
-#: src/msgcomm.c:554 src/xgettext.c:663 src/xgettext.c:1081
+#: src/msgcomm.c:543 src/xgettext.c:653 src/xgettext.c:1071
msgid "this file may not contain domain directives"
msgstr "‚±‚̃tƒ@ƒCƒ‹‚É‚Í domain –½—ß‚ª‚ ‚è‚Ü‚¹‚ñ"
-#: src/msgfmt.c:286 src/xgettext.c:413
+#: src/msgfmt.c:286 src/xgettext.c:414
msgid "no input file given"
msgstr "“ü—̓tƒ@ƒCƒ‹‚ªw’肳‚ê‚Ă܂¹‚ñ"
-#: src/msgfmt.c:334
+#: src/msgfmt.c:337
#, c-format
msgid "error while opening \"%s\" for writing"
msgstr "\"%s\" ‚̃I[ƒvƒ“‚ŃGƒ‰["
-#: src/msgfmt.c:356
+#: src/msgfmt.c:359
#, c-format
msgid "%d translated messages"
msgstr "%d ŒÂ‚Ì–|–󂳂ꂽƒƒbƒZ[ƒW"
-#: src/msgfmt.c:358
+#: src/msgfmt.c:361
#, c-format
msgid ", %d fuzzy translations"
msgstr ", %d ŒÂ‚ÌB–†‚È–|–ó"
-#: src/msgfmt.c:360
+#: src/msgfmt.c:363
#, c-format
msgid ", %d untranslated messages"
msgstr ", %d ŒÂ‚Ì–|–󂳂ê‚È‚¢ƒƒbƒZ[ƒW"
-#: src/msgfmt.c:379
+#: src/msgfmt.c:382
#, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] filename.po ...\n"
@@ -448,11 +429,11 @@ msgstr ""
"“ü—̓tƒ@ƒCƒ‹‚É `-' ‚ªw’肳‚ê‚邯•W€o—Í‚©‚ç“ǂ݂݂܂·B\n"
"o—̓tƒ@ƒCƒ‹‚ª `-'‚Å•W€o—͂ɑ‚«o‚µ‚Ü‚·B\n"
-#: src/msgfmt.c:422
+#: src/msgfmt.c:425
msgid "while creating hash table"
msgstr "ƒnƒbƒVƒ…ƒe[ƒuƒ‹‚ğ쬂·‚éÛ‚É"
-#: src/msgfmt.c:466
+#: src/msgfmt.c:469
#, c-format
msgid ""
"%s: warning: PO file header missing, fuzzy, or invalid\n"
@@ -461,114 +442,92 @@ msgstr ""
"%s: Œx: PO ƒtƒ@ƒCƒ‹‚̃wƒbƒ_‚ª‚È‚¢‚©AB–†‚©A‚ ‚é‚¢‚Í–³Œø‚Å‚·\n"
"%*s Œx: •¶šƒZƒbƒg‚̕ϊ·‚ª‚Å‚«‚Ü‚¹‚ñ"
-#: src/msgfmt.c:490
+#: src/msgfmt.c:493
#, c-format
msgid "domain name \"%s\" not suitable as file name"
msgstr "domain –¼ \"%s\" ‚̓tƒ@ƒCƒ‹–¼‚Æ‚µ‚Ä“K؂ł ‚è‚Ü‚¹‚ñ"
-#: src/msgfmt.c:495
+#: src/msgfmt.c:498
#, c-format
msgid "domain name \"%s\" not suitable as file name: will use prefix"
msgstr "domain –¼ \"%s\" ‚̓tƒ@ƒCƒ‹–¼‚Æ‚µ‚Ä“K؂ł ‚è‚Ü‚¹‚ñ: prefix ‚ğ—p‚¢‚Ü‚·"
#. We don't change the exit status here because this is really
#. only an information.
-#: src/msgfmt.c:508
-#, c-format
-#, fuzzy
+#: src/msgfmt.c:511
+#, fuzzy, c-format
msgid "`domain %s' directive ignored"
msgstr "`domain %s'‚Í–³‹‚³‚ê‚Ü‚µ‚½"
-#: src/msgfmt.c:538
+#: src/msgfmt.c:541
msgid "empty `msgstr' entry ignored"
msgstr "‹ó‚Ì`msgstr'ƒGƒ“ƒgƒŠ‚Í–³‹‚³‚ê‚Ü‚µ‚½"
-#: src/msgfmt.c:539
+#: src/msgfmt.c:542
msgid "fuzzy `msgstr' entry ignored"
msgstr "B–†‚È`msgstr'ƒGƒ“ƒgƒŠ‚Í–³‹‚³‚ê‚Ü‚µ‚½"
-#: src/msgfmt.c:581
+#: src/msgfmt.c:584
#, c-format
msgid "headerfield `%s' missing in header"
msgstr "ƒwƒbƒ_[ƒtƒB[ƒ‹ƒh`%s'‚ª‚ ‚è‚Ü‚¹‚ñ"
-#: src/msgfmt.c:584
+#: src/msgfmt.c:587
#, c-format
msgid "header field `%s' should start at beginning of line"
msgstr "ƒwƒbƒ_[ƒtƒB[ƒ‹ƒh`%s'‚ğs‚Ìæ“ª‚©‚çn‚߂Ă­‚¾‚³‚¢"
-#: src/msgfmt.c:594
+#: src/msgfmt.c:597
msgid "some header fields still have the initial default value"
msgstr "ƒwƒbƒ_ƒtƒB[ƒ‹ƒh‚Ì’†‚ɉŠú’l‚̂܂܂̂à‚Ì‚ª‚ ‚è‚Ü‚·"
-#: src/msgfmt.c:605
+#: src/msgfmt.c:608
#, c-format
msgid "field `%s' still has initial default value"
msgstr "ƒtƒB[ƒ‹ƒh %s ‚Í–¢‚¾‚ɉŠú’l‚̂܂܂ł·"
-#: src/msgfmt.c:677
-#, c-format
-msgid ""
-"%s: warning: charset \"%s\" is not a portable encoding name\n"
-"%*s warning: charset conversion might not work"
-msgstr ""
-"%s: Œx: •¶šƒZƒbƒg\"%s\"‚͉”À«‚̂Ȃ¢ƒGƒ“ƒR[ƒfƒBƒ“ƒO–¼‚Å‚·\n"
-"%*s Œx: •¶šƒZƒbƒg•ÏŠ·‚͂ł«‚È‚¢‚©‚à’m‚ê‚Ü‚¹‚ñ"
-
-#: src/msgfmt.c:684
-#, c-format
-msgid ""
-"%s: warning: charset missing in header\n"
-"%*s warning: charset conversion will not work"
-msgstr ""
-"%s: Œx: ƒwƒbƒ_‚É•¶šƒZƒbƒg‚Ì‹Lq‚ª‚ ‚è‚Ü‚¹‚ñ\n"
-"%*s Œx: •¶šƒZƒbƒg‚̕ϊ·‚͂ł«‚È‚¢‚Å‚µ‚傤"
-
-#: src/msgfmt.c:776
+#: src/msgfmt.c:698
#, c-format
msgid "%s: warning: source file contains fuzzy translation"
msgstr "%s: Œx: ƒ\[ƒXƒtƒ@ƒCƒ‹‚ÉB–†‚È–|–󂪂 ‚è‚Ü‚·"
-#: src/msgfmt.c:998
-#, c-format
+#: src/msgfmt.c:920
msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
msgstr "`msgid' ‚Æ `msgid_plural' ‚Ì‘o•û‚ğ \\n ‚Ån‚߂ĉº‚³‚¢"
-#: src/msgfmt.c:1006
-#, c-format
+#: src/msgfmt.c:928
+#, c-format
msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
msgstr "`msgid' ‚Æ `msgstr[%u]' ‚Ì‘o•û‚ğ \\n ‚Ån‚߂ĉº‚³‚¢"
-#: src/msgfmt.c:1016
+#: src/msgfmt.c:938
msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
msgstr "`msgid' ‚Æ `msgstr' ‚Ì‘o•û‚ğ \\n ‚Ån‚߂ĉº‚³‚¢"
-#: src/msgfmt.c:1031
+#: src/msgfmt.c:953
#, fuzzy
msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
msgstr "`msgid' ‚Æ `msgid_plural' ‚Ì‘o•û‚ğ \\n ‚ÅI—¹‚³‚¹‚ĉº‚³‚¢"
-#: src/msgfmt.c:1039
+#: src/msgfmt.c:961
#, c-format
msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
msgstr "`msgid' ‚Æ `msgstr[%u]' ‚Ì‘o•û‚ğ \\n ‚ÅI—¹‚³‚¹‚ĉº‚³‚¢"
-#: src/msgfmt.c:1049
-#, c-format
+#: src/msgfmt.c:971
msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
msgstr "`msgid' ‚Æ `msgstr' ‚Ì‘o•û‚ğ \\n ‚ÅI—¹‚³‚¹‚ĉº‚³‚¢"
-#: src/msgfmt.c:1065
-#, c-format
+#: src/msgfmt.c:987
msgid "number of format specifications in `msgid' and `msgstr' does not match"
msgstr "`msgid'‚Æ`msgstr'‚̃tƒH[ƒ}ƒbƒg—l®‚ª‡’v‚µ‚Ü‚¹‚ñ"
-#: src/msgfmt.c:1082
+#: src/msgfmt.c:1004
#, c-format
msgid "format specifications for argument %u are not the same"
msgstr "ˆø” %u ‚ɑ΂·‚éƒtƒH[ƒ}ƒbƒg—l®‚ªˆÙ‚È‚è‚Ü‚·"
-#: src/msgmerge.c:319
+#: src/msgmerge.c:320
#, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] def.po ref.po\n"
@@ -606,7 +565,7 @@ msgstr ""
" -V, --version ƒ”ƒ@[ƒWƒ‡ƒ“î•ñ‚ğ•\¦‚µ‚ÄI—¹\n"
" -w, --width=NUMBER ƒy[ƒW•‚Ìİ’è\n"
-#: src/msgmerge.c:339
+#: src/msgmerge.c:340
#, no-wrap
msgid ""
"\n"
@@ -629,18 +588,18 @@ msgstr ""
" ³Šm‚Ȉê’v‚ª‚È‚¢‚Æ‚±‚ë‚Å‚ÍA‚æ‚è‘Ó–‚ÈŒ‹‰Ê‚𓾂邽‚ß‚ÉB–†‚Ȉê’v•û–@‚ªÌ—p\n"
"‚³‚ê‚éBŒ‹‰Ê‚̓tƒ@ƒCƒ‹w’肪‚È‚¢ŒÀ‚è•W€o—͂ɑ‚«o‚³‚ê‚éB\n"
-#: src/msgmerge.c:798
+#: src/msgmerge.c:799
#, c-format
msgid ""
-"%sRead %d old + %d reference, merged %d, fuzzied %d, missing %d, obsolete "
-"%d.\n"
+"%sRead %d old + %d reference, merged %d, fuzzied %d, missing %d, obsolete %"
+"d.\n"
msgstr "%s: Šù‘¶ %d + QÆ %d, —Z‡ %d, B–† %d, Œ‡”@ %d, ”ñÌ—p %d.\n"
-#: src/msgmerge.c:804
+#: src/msgmerge.c:805
msgid " done.\n"
msgstr " Š®—¹‚µ‚Ü‚µ‚½\n"
-#: src/msgunfmt.c:209
+#: src/msgunfmt.c:210
#, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] [FILE]...\n"
@@ -668,7 +627,7 @@ msgstr ""
" -V, --version ƒ”ƒ@[ƒWƒ‡ƒ“î•ñ‚ğ•\¦‚µ‚ÄI—¹\n"
" -w, --width=NUMBER o—͂̃y[ƒW•‚ğİ’è‚·‚é\n"
-#: src/msgunfmt.c:223
+#: src/msgunfmt.c:224
#, no-wrap
msgid ""
"\n"
@@ -684,112 +643,116 @@ msgstr ""
"•W€“ü—Í‚©‚ç“ǂ݂݂܂·BƒfƒtƒHƒ‹ƒg‚Å•W€o—͂ɑ‚«o‚µ‚Ü‚·B\n"
"\n"
-#: src/msgunfmt.c:260 src/msgunfmt.c:325 src/po-lex.c:194 src/xget-lex.c:252
+#: src/msgunfmt.c:261 src/msgunfmt.c:326 src/po-lex.c:213 src/xget-lex.c:243
#, c-format
msgid "error while reading \"%s\""
msgstr " \"%s\" ‚ğ“ǂ݂ŞÛ‚ɃGƒ‰["
-#: src/msgunfmt.c:261 src/msgunfmt.c:326
+#: src/msgunfmt.c:262 src/msgunfmt.c:327
#, c-format
msgid "file \"%s\" truncated"
msgstr "ƒtƒ@ƒCƒ‹ \"%s\" ‚ÍØ‹l‚ß‚ç‚ê‚Ü‚µ‚½"
-#: src/msgunfmt.c:292
+#: src/msgunfmt.c:293
#, c-format
msgid "seek \"%s\" offset %ld failed"
msgstr "\"%s\" ‚̃IƒtƒZƒbƒgˆÊ’u %ld ‚̓ǂ݂݂ɸ”s‚µ‚Ü‚µ‚½"
-#: src/msgunfmt.c:331
+#: src/msgunfmt.c:332
#, c-format
msgid "file \"%s\" contains a not NUL terminated string"
msgstr "ƒtƒ@ƒCƒ‹\"%s\" ‚̓kƒ‹•¶š‚ÅI—¹‚µ‚È‚¢•¶š—ñ‚ğŠÜ‚ñ‚Å‚¢‚Ü‚·"
-#: src/msgunfmt.c:373
+#: src/msgunfmt.c:377
#, c-format
msgid "file \"%s\" is not in GNU .mo format"
msgstr "ƒtƒ@ƒCƒ‹\"%s\" ‚Í GNU ‚Ì MO Œ`®‚Å‚ ‚è‚Ü‚¹‚ñ"
-#: src/open-po.c:65
+#: src/open-po.c:64
msgid "<stdin>"
msgstr ""
-#: po-gram-gen.y:142
-#, c-format
+#: po-gram-gen.y:87
+msgid "inconsistent use of #~"
+msgstr ""
+
+#: po-gram-gen.y:168
msgid "missing `msgstr[]' section"
msgstr "`msgstr[]' ‚Ì€–Ú‚ªŒ‡”@‚µ‚Ä‚¢‚Ü‚·"
-#: po-gram-gen.y:148
-#, c-format
+#: po-gram-gen.y:176
msgid "missing `msgid_plural' section"
msgstr " msgid_plural ‚Ì€–Ú‚ªŒ‡”@‚µ‚Ä‚¢‚Ü‚·"
-#: po-gram-gen.y:154
+#: po-gram-gen.y:183
msgid "missing `msgstr' section"
msgstr " msgstr ‚Ì€–Ú‚ªŒ‡”@‚µ‚Ä‚¢‚Ü‚·"
-#: po-gram-gen.y:190
+#: po-gram-gen.y:228
msgid "first plural form has nonzero index"
msgstr ""
-#: po-gram-gen.y:192
+#: po-gram-gen.y:230
msgid "plural form has wrong index"
msgstr ""
-#: src/po-lex.c:92
-#, c-format
-msgid "found %d fatal errors"
-msgstr "’v–½“I‚ȃGƒ‰[‚Ì”‚Í %d ‚Å‚·"
-
-#: src/po-lex.c:137 src/po-lex.c:176
+#. CAUTION: If you change this macro, you must also make identical
+#. changes to the function of the same name in src/po-lex.c
+#: src/po-lex.c:156 src/po-lex.c:195 src/po-lex.h:85 src/po-lex.h:99
+#: src/po-lex.h:115 src/po-lex.h:129
msgid "too many errors, aborting"
msgstr "ƒGƒ‰[‚ª‘½‚·‚¬‚邽‚ßÀs‚ğ’†~‚µ‚Ü‚µ‚½"
-#: src/po-lex.c:252
+#: src/po-lex.c:271
#, c-format
msgid "keyword \"%s\" unknown"
msgstr "ƒL[ƒ[ƒh \"%s\" ‚ğ”F¯‚Å‚«‚Ü‚¹‚ñ"
-#: src/po-lex.c:355
-#, c-format
+#: src/po-lex.c:374
msgid "invalid control sequence"
msgstr "•s³‚ȃRƒ“ƒgƒ[ƒ‹ƒV[ƒPƒ“ƒX‚ªŒŸo‚³‚ê‚Ü‚µ‚½"
-#: src/po-lex.c:441
+#: src/po-lex.c:477
+msgid "end-of-file within string"
+msgstr "•¶š—ñ‚Ì’†“r‚Ńtƒ@ƒCƒ‹‚ªI—¹‚µ‚Ü‚µ‚½"
+
+#: src/po-lex.c:482
msgid "end-of-line within string"
msgstr "•¶š—ñ‚Ì’†‚ʼnüs‚µ‚Ä‚¢‚Ü‚·"
-#: src/po-lex.c:446
-msgid "end-of-file within string"
-msgstr "•¶š—ñ‚Ì’†“r‚Ńtƒ@ƒCƒ‹‚ªI—¹‚µ‚Ü‚µ‚½"
+#: src/po-lex.c:525
+#, fuzzy
+msgid "invalid multibyte sequence"
+msgstr "•s³‚ȃRƒ“ƒgƒ[ƒ‹ƒV[ƒPƒ“ƒX‚ªŒŸo‚³‚ê‚Ü‚µ‚½"
#: src/xget-lex.c:148
msgid "standard input"
msgstr "•W€“ü—Í"
-#: src/xget-lex.c:885
+#: src/xget-lex.c:876
#, c-format
msgid "%s:%d: warning: unterminated character constant"
msgstr "%s:%d: Œx: •¶š—ñ’蔂ªŠ®Œ‹‚µ‚Ä‚¢‚Ü‚¹‚ñ"
-#: src/xget-lex.c:907
+#: src/xget-lex.c:898
#, c-format
msgid "%s:%d: warning: unterminated string literal"
msgstr "%s:%d: Œx: •¶š—ñ‚ªŠ®Œ‹‚µ‚Ä‚¢‚Ü‚¹‚ñ"
-#: src/xgettext.c:382
+#: src/xgettext.c:383
msgid "--join-existing cannot be used when output is written to stdout"
msgstr "--join-existing ‚Í•W€o—Í‚Éo—Í‚·‚é‚É—p‚¢‚邱‚Ƃ͂ł«‚Ü‚¹‚ñ"
-#: src/xgettext.c:387
+#: src/xgettext.c:388
msgid "xgettext cannot work without keywords to look for"
msgstr "ŒŸõ‚·‚ׂ«ƒL[ƒ[ƒh‚È‚µ‚Å‚Í xgettext ‚Í‹@”\‚µ‚Ü‚¹‚ñ"
-#: src/xgettext.c:504
+#: src/xgettext.c:494
#, c-format
msgid "warning: file `%s' extension `%s' is unknown; will try C"
msgstr "Œx: ƒtƒ@ƒCƒ‹`%s'‚ÌŠg’£q`%s'‚ğ”F¯‚Å‚«‚Ü‚¹‚ñ; C ‚Ƃ݂Ȃµ‚Ü‚·"
-#: src/xgettext.c:540
+#: src/xgettext.c:530
#, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] INPUTFILE ...\n"
@@ -829,7 +792,7 @@ msgstr ""
" --foreign-user FSF ‚Ì’˜ìŒ •\¦‚ğo—Í‚µ‚È‚¢\n"
" -F, --sort-by-file ƒtƒ@ƒCƒ‹‚̈ʒu‚É‚æ‚Á‚ă\[ƒg‚µ‚Äo—Í‚·‚é\n"
-#: src/xgettext.c:560
+#: src/xgettext.c:550
#, c-format, no-wrap
msgid ""
" -h, --help display this help and exit\n"
@@ -856,7 +819,7 @@ msgstr ""
" -M, --msgstr-suffix[=STRING] STRING ‚È‚¢‚µ\"\"‚ğ msgstr ‚Ì suffix ‚Æ‚·‚é\n"
" --no-location '#:ƒtƒ@ƒCƒ‹–¼:s”Ô†'‚Ìs‚ğo—Í‚µ‚È‚¢\n"
-#: src/xgettext.c:574
+#: src/xgettext.c:564
#, no-wrap
msgid ""
" -n, --add-location generate '#: filename:line' lines (default)\n"
@@ -885,20 +848,48 @@ msgstr ""
"\n"
" “ü—̓tƒ@ƒCƒ‹‚ª - ‚͕̂W€“ü—Í‚ğ“ǂ݂݂܂·\n"
-#: src/xgettext.c:936
+#: src/xgettext.c:926
#, c-format
msgid "%s:%d: warning: keyword nested in keyword arg"
msgstr "%s:%d: Œx: ƒL[ƒ[ƒhˆø”‚ŃL[ƒ[ƒh‚ªƒlƒXƒg‚µ‚Ä‚¢‚Ü‚·"
-#: src/xgettext.c:946
+#: src/xgettext.c:936
#, c-format
msgid "%s:%d: warning: keyword between outer keyword and its arg"
msgstr "%s:%d: Œx: ŠO•”ƒL[ƒ[ƒh‚Æ‚»‚̈ø”‚̊ԂɃL[ƒ[ƒh‚ª‚ ‚è‚Ü‚·"
-#: src/xgettext.c:1444
+#: src/xgettext.c:1432
#, c-format
msgid "language `%s' unknown"
msgstr "Œ¾Œê %s ‚ğ”F¯‚Å‚«‚Ü‚¹‚ñ"
+#~ msgid ""
+#~ "internationalized messages should not contain the `\\%c' escape sequence"
+#~ msgstr ""
+#~ "‘Û‰»‚³‚ꂽƒƒbƒZ[ƒW‚̓GƒXƒP[ƒvƒV[ƒPƒ“ƒX`\\%c'‚ğ‚Ó‚­‚ñ‚ł͂Ȃè‚Ü‚¹‚ñ "
+
+#~ msgid "cannot create output file \"%s\""
+#~ msgstr "o—̓tƒ@ƒCƒ‹ \"%s\"‚ğ쬂ł«‚È‚¢"
+
+#~ msgid "standard output"
+#~ msgstr "•W€o—Í"
+
+#~ msgid "error while writing \"%s\" file"
+#~ msgstr "ƒtƒ@ƒCƒ‹ \"%s\" ‚Ì‘‚«‚݃Gƒ‰["
+
+#~ msgid ""
+#~ "%s: warning: charset \"%s\" is not a portable encoding name\n"
+#~ "%*s warning: charset conversion might not work"
+#~ msgstr ""
+#~ "%s: Œx: •¶šƒZƒbƒg\"%s\"‚͉”À«‚̂Ȃ¢ƒGƒ“ƒR[ƒfƒBƒ“ƒO–¼‚Å‚·\n"
+#~ "%*s Œx: •¶šƒZƒbƒg•ÏŠ·‚͂ł«‚È‚¢‚©‚à’m‚ê‚Ü‚¹‚ñ"
+
+#~ msgid ""
+#~ "%s: warning: charset missing in header\n"
+#~ "%*s warning: charset conversion will not work"
+#~ msgstr ""
+#~ "%s: Œx: ƒwƒbƒ_‚É•¶šƒZƒbƒg‚Ì‹Lq‚ª‚ ‚è‚Ü‚¹‚ñ\n"
+#~ "%*s Œx: •¶šƒZƒbƒg‚̕ϊ·‚͂ł«‚È‚¢‚Å‚µ‚傤"
+
#~ msgid "%s: warning: no header entry found"
#~ msgstr "%s: Œx: ƒwƒbƒ_[ƒGƒ“ƒgƒŠ[‚ªŒ©‚‚©‚è‚Ü‚¹‚ñ"
diff --git a/po/ko.po b/po/ko.po
index de26a6a..e3afd50 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: GNU gettext 0.10.30\n"
-"POT-Creation-Date: 2000-07-28 22:51+0200\n"
+"POT-Creation-Date: 2001-03-09 19:56+0100\n"
"PO-Revision-Date: 1997-09-03 12:52+0900\n"
"Last-Translator: Bang Jun-Young <bangjy@geocities.com>\n"
"Language-Team: Korean <ko@li.org>\n"
@@ -13,75 +13,80 @@ msgstr ""
"Content-Type: text/plain; charset=EUC-KR\n"
"Content-Transfer-Encoding: 8-bit\n"
-#: lib/error.c:103
+#: lib/error.c:115
msgid "Unknown system error"
msgstr "¾Ë ¼ö ¾ø´Â ½Ã½ºÅÛ ¿À·ù"
-#: lib/getopt.c:680
+#: lib/getopt.c:691
#, c-format
msgid "%s: option `%s' is ambiguous\n"
msgstr "%s: `%s'´Â ¸ğÈ£ÇÑ ¿É¼ÇÀÔ´Ï´Ù\n"
-#: lib/getopt.c:704
+#: lib/getopt.c:716
#, c-format
msgid "%s: option `--%s' doesn't allow an argument\n"
msgstr "%s: `--%s' ¿É¼ÇÀº Àμö¸¦ Çã¿ëÇÏÁö ¾Ê½À´Ï´Ù\n"
-#: lib/getopt.c:709
+#: lib/getopt.c:721
#, c-format
msgid "%s: option `%c%s' doesn't allow an argument\n"
msgstr "%s: `%c%s' ¿É¼ÇÀº Àμö¸¦ Çã¿ëÇÏÁö ¾Ê½À´Ï´Ù\n"
-#: lib/getopt.c:726 lib/getopt.c:899
+#: lib/getopt.c:739 lib/getopt.c:912
#, c-format
msgid "%s: option `%s' requires an argument\n"
msgstr "%s: `%s' ¿É¼ÇÀº Àμö°¡ ÇÊ¿äÇÕ´Ï´Ù\n"
#. --option
-#: lib/getopt.c:755
+#: lib/getopt.c:768
#, c-format
msgid "%s: unrecognized option `--%s'\n"
msgstr "%s: ÀνÄÇÒ ¼ö ¾ø´Â ¿É¼Ç `--%s'\n"
#. +option or -option
-#: lib/getopt.c:759
+#: lib/getopt.c:772
#, c-format
msgid "%s: unrecognized option `%c%s'\n"
msgstr "%s: ÀνÄÇÒ ¼ö ¾ø´Â ¿É¼Ç `%c%s'\n"
#. 1003.2 specifies the format of this message.
-#: lib/getopt.c:785
+#: lib/getopt.c:798
#, c-format
msgid "%s: illegal option -- %c\n"
msgstr "%s: À߸øµÈ ¿É¼Ç -- %c\n"
-#: lib/getopt.c:788
+#: lib/getopt.c:801
#, c-format
msgid "%s: invalid option -- %c\n"
msgstr "%s: ºÎÀûÀıÇÑ ¿É¼Ç -- %c\n"
#. 1003.2 specifies the format of this message.
-#: lib/getopt.c:818 lib/getopt.c:948
+#: lib/getopt.c:831 lib/getopt.c:961
#, c-format
msgid "%s: option requires an argument -- %c\n"
msgstr "%s: ÀÌ ¿É¼ÇÀº Àμö°¡ ÇÊ¿äÇÕ´Ï´Ù -- %c\n"
-#: lib/getopt.c:865
+#: lib/getopt.c:878
#, c-format
msgid "%s: option `-W %s' is ambiguous\n"
msgstr "%s: `-W %s'´Â ¸ğÈ£ÇÑ ¿É¼ÇÀÔ´Ï´Ù\n"
-#: lib/getopt.c:883
+#: lib/getopt.c:896
#, c-format
msgid "%s: option `-W %s' doesn't allow an argument\n"
msgstr "%s: `-W %s' ¿É¼ÇÀº Àμö¸¦ Çã¿ëÇÏÁö ¾Ê½À´Ï´Ù\n"
-#: lib/xmalloc.c:82
+#: lib/obstack.c:474
+#, fuzzy
+msgid "memory exhausted"
+msgstr "¸Ş¸ğ¸®°¡ ¹Ù´Ú³²"
+
+#: lib/xmalloc.c:86
msgid "Memory exhausted"
msgstr "¸Ş¸ğ¸®°¡ ¹Ù´Ú³²"
-#: src/gettextp.c:134 src/msgcmp.c:144 src/msgcomm.c:285 src/msgfmt.c:257
-#: src/msgmerge.c:263 src/msgunfmt.c:175 src/xgettext.c:401
+#: src/gettext.c:138 src/msgcmp.c:140 src/msgcomm.c:283 src/msgfmt.c:270
+#: src/msgmerge.c:255 src/msgunfmt.c:170 src/xgettext.c:398
#, c-format, no-wrap
msgid ""
"Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -92,27 +97,27 @@ msgstr ""
"ÀÌ ÇÁ·Î±×·¥Àº °ø°³ ¼ÒÇÁÆ®¿ş¾îÀÔ´Ï´Ù. º¹»ç Á¶°ÇÀº ¼Ò½º¸¦ ÂüÁ¶ÇϽʽÿÀ. »óǰ¼º\n"
"À̳ª ƯÁ¤ ¸ñÀû¿¡ ´ëÇÑ ÀûÇÕ¼ºÀ» ºñ·ÔÇÏ¿©, ¾î¶°ÇÑ º¸Áõµµ ÇÏÁö ¾Ê½À´Ï´Ù.\n"
-#: src/gettextp.c:139 src/msgcmp.c:149 src/msgcomm.c:290 src/msgfmt.c:262
-#: src/msgmerge.c:268 src/msgunfmt.c:180 src/xgettext.c:406
+#: src/gettext.c:143 src/msgcmp.c:145 src/msgcomm.c:288 src/msgfmt.c:275
+#: src/msgmerge.c:260 src/msgunfmt.c:175 src/xgettext.c:403
#, c-format
msgid "Written by %s.\n"
msgstr "%s°¡ ¸¸µé¾ú½À´Ï´Ù.\n"
-#: src/gettextp.c:154
+#: src/gettext.c:158
msgid "missing arguments"
msgstr "Àμö°¡ ºüÁ³À½"
-#: src/gettextp.c:164
+#: src/gettext.c:168
msgid "too many arguments"
msgstr "Àμö°¡ ³Ê¹« ¸¹À½"
-#: src/gettextp.c:228 src/msgcmp.c:181 src/msgcomm.c:395 src/msgfmt.c:361
-#: src/msgmerge.c:323 src/msgunfmt.c:210 src/xgettext.c:539
+#: src/gettext.c:232 src/msgcmp.c:177 src/msgcomm.c:381 src/msgfmt.c:377
+#: src/msgmerge.c:315 src/msgunfmt.c:205 src/xgettext.c:525
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "´õ ¸¹Àº Á¤º¸¸¦ º¸·Á¸é `%s --help' ÇϽʽÿÀ\n"
-#: src/gettextp.c:233
+#: src/gettext.c:237
#, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] [[[TEXTDOMAIN] MSGID] | [-s [MSGID]...]]\n"
@@ -135,7 +140,7 @@ msgstr ""
" [TEXTDOMAIN] MSGID MSGID¿¡ ´ëÀÀÇÏ´Â ¹ø¿ªµÈ ¸Ş½ÃÁö¸¦ TEXTDOMAIN¿¡¼­\n"
" ºÒ·¯¿É´Ï´Ù\n"
-#: src/gettextp.c:245
+#: src/gettext.c:249
#, c-format, no-wrap
msgid ""
"\n"
@@ -157,41 +162,20 @@ msgstr ""
"Ãâ·ÂµË´Ï´Ù.\n"
"±âº» Ž»ö µğ·ºÅ丮: %s\n"
-#: src/gettextp.c:255 src/msgcmp.c:200 src/msgcomm.c:442 src/msgfmt.c:388
-#: src/msgmerge.c:358 src/msgunfmt.c:234 src/xgettext.c:591
+#: src/gettext.c:259 src/msgcmp.c:196 src/msgcomm.c:428 src/msgfmt.c:404
+#: src/msgmerge.c:350 src/msgunfmt.c:229 src/xgettext.c:577
msgid "Report bugs to <bug-gnu-utils@gnu.org>.\n"
msgstr "<bug-gnu-utils@gnu.org>·Î ¹®Á¦Á¡À» º¸°íÇϽʽÿÀ.\n"
-#: src/message.c:900
-#, c-format
-msgid ""
-"internationalized messages should not contain the `\\%c' escape sequence"
-msgstr "±¹Á¦È­µÈ ¸Ş½ÃÁö´Â `\\%c' À̽ºÄÉÀÌÇÁ ¼ø¼­¿­À» Æ÷ÇÔÇÒ ¼ö ¾ø½À´Ï´Ù"
-
-#: src/message.c:1231
-#, c-format
-msgid "cannot create output file \"%s\""
-msgstr "Ãâ·Â ÆÄÀÏ \"%s\"À» ¸¸µé ¼ö ¾ø½À´Ï´Ù"
-
-#: src/message.c:1238
-#, no-c-format
-msgid "standard output"
-msgstr "Ç¥ÁØ Ãâ·Â"
-
-#: src/message.c:1298
-#, c-format
-msgid "error while writing \"%s\" file"
-msgstr "\"%s\" ÆÄÀÏÀ» ¾²´Â µ¿¾È ¿À·ù ¹ß»ı"
-
-#: src/msgcmp.c:160 src/msgmerge.c:279
+#: src/msgcmp.c:156 src/msgmerge.c:271
msgid "no input files given"
msgstr "ÀÔ·Â ÆÄÀÏÀÌ ÁÖ¾îÁöÁö ¾Ê¾Ò½À´Ï´Ù"
-#: src/msgcmp.c:165 src/msgmerge.c:284
+#: src/msgcmp.c:161 src/msgmerge.c:276
msgid "exactly 2 input files required"
msgstr "Á¤È®È÷ 2°³ÀÇ ÀÔ·Â ÆÄÀÏÀÌ ÇÊ¿äÇÕ´Ï´Ù"
-#: src/msgcmp.c:186
+#: src/msgcmp.c:182
#, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] def.po ref.po\n"
@@ -220,57 +204,62 @@ msgstr ""
"°¢°¢ÀÇ ¸Ş½ÃÁö¸¦ ¹ø¿ªÇß´ÂÁö È®ÀÎÇÒ ¶§ À¯¿ëÇÕ´Ï´Ù. Á¤È®ÇÑ Â¦À» ãÁö ¸øÇÒ\n"
"°æ¿ì, º¸´Ù ³ªÀº °á°ú¸¦ ¾ò±â À§ÇØ ÆÛÁö ¸ÅĪÀÌ »ç¿ëµË´Ï´Ù.\n"
-#: src/msgcmp.c:259 src/msgmerge.c:746
+#: src/msgcmp.c:255 src/msgmerge.c:741
msgid "this message is used but not defined..."
msgstr "ÀÌ ¸Ş½ÃÁö´Â »ç¿ëµÇÁö¸¸ Á¤ÀǵÇÁö ¾Ê¾Ò½À´Ï´Ù..."
-#: src/msgcmp.c:261 src/msgmerge.c:748
+#: src/msgcmp.c:257 src/msgmerge.c:743
msgid "...but this definition is similar"
msgstr "...ÇÏÁö¸¸ ÀÌ Á¤ÀÇ´Â À¯»çÇÕ´Ï´Ù"
-#: src/msgcmp.c:267 src/msgmerge.c:775
+#: src/msgcmp.c:263 src/msgmerge.c:770
#, c-format
msgid "this message is used but not defined in %s"
msgstr "ÀÌ ¸Ş½ÃÁö´Â »ç¿ëµÇÁö¸¸ %s¿¡¼­ Á¤ÀǵÇÁö ¾Ê¾Ò½À´Ï´Ù"
-#: src/msgcmp.c:281
+#: src/msgcmp.c:277
msgid "warning: this message is not used"
msgstr "°æ°í: ÀÌ ¸Ş½ÃÁö´Â »ç¿ëµÇÁö ¾Ê½À´Ï´Ù"
-#: src/msgcmp.c:355 src/msgfmt.c:633 src/msgmerge.c:517 src/xgettext.c:1093
+#: src/msgcmp.c:282 src/po-lex.c:102
+#, c-format
+msgid "found %d fatal errors"
+msgstr "%d°³ÀÇ Ä¡¸íÀûÀÎ ¿À·ù¸¦ ã¾Ò½À´Ï´Ù"
+
+#: src/msgcmp.c:354 src/msgfmt.c:657 src/msgmerge.c:512 src/xgettext.c:1169
msgid "duplicate message definition"
msgstr "Áߺ¹µÈ ¸Ş½ÃÁö Á¤ÀÇ"
-#: src/msgcmp.c:356 src/msgfmt.c:634 src/msgmerge.c:518 src/xgettext.c:1094
+#: src/msgcmp.c:355 src/msgfmt.c:659 src/msgmerge.c:513 src/xgettext.c:1170
msgid "...this is the location of the first definition"
msgstr "...¿©±â´Â ù¹øÂ° Á¤ÀÇÀÇ À§Ä¡ÀÔ´Ï´Ù"
-#: src/msgcmp.c:396 src/msgmerge.c:566
+#: src/msgcmp.c:395 src/msgmerge.c:561
#, c-format
msgid "this message has no definition in the \"%s\" domain"
msgstr "ÀÌ ¸Ş½ÃÁö´Â \"%s\" ¿µ¿ª¿¡ Á¤Àǰ¡ ¾ø½À´Ï´Ù"
#. We are about to construct the absolute path to the
#. directory for the output files but asprintf failed.
-#: src/msgcomm.c:238 src/xgettext.c:340 src/xgettext.c:1288
+#: src/msgcomm.c:236 src/xgettext.c:337 src/xgettext.c:1365
msgid "while preparing output"
msgstr "Ãâ·ÂÀ» ÁغñÇÏ´Â µ¿¾È"
-#: src/msgcomm.c:273 src/msgcomm.c:277 src/xgettext.c:378 src/xgettext.c:382
+#: src/msgcomm.c:271 src/msgcomm.c:275 src/xgettext.c:375 src/xgettext.c:379
#, c-format
msgid "%s and %s are mutually exclusive"
msgstr "%s¿Í %s´Â ¼­·Î ¹èŸÀûÀÔ´Ï´Ù"
-#: src/msgcomm.c:341
+#: src/msgcomm.c:327
msgid "at least two files must be specified"
msgstr ""
-#: src/msgcomm.c:360
+#: src/msgcomm.c:346
#, c-format
msgid "impossible selection criteria specified (%d < n < %d)"
msgstr ""
-#: src/msgcomm.c:400
+#: src/msgcomm.c:386
#, fuzzy, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] INPUTFILE ...\n"
@@ -303,7 +292,7 @@ msgstr ""
" »ı·«ÇÕ´Ï´Ù\n"
" -F, --sort-by-file ÆÄÀÏÀÇ À§Ä¡¿¡ µû¶ó Ãâ·ÂÀ» Á¤·ÄÇÕ´Ï´Ù\n"
-#: src/msgcomm.c:412
+#: src/msgcomm.c:398
#, fuzzy
msgid ""
" -i, --indent write the .po file using indented style\n"
@@ -322,14 +311,14 @@ msgid ""
" -u, --unique shorthand for --less-than=2, requests\n"
" that only unique messages be printed\n"
msgstr ""
-" -n, --add-location '#: filename:line' ÇàÀ» »ı¼ºÇÕ´Ï´Ù "
-"(³»Á¤°ª)\n"
+" -n, --add-location '#: filename:line' ÇàÀ» »ı¼ºÇÕ´Ï´Ù (³»Á¤"
+"°ª)\n"
" --omit-header Ç¥Á¦¿¡ `msgid \"\"' Ç׸ñÀ» ¾²Áö ¾Ê½À´Ï´Ù\n"
" -o, --output=FILE ÁöÁ¤µÈ ÆÄÀÏ¿¡ Ãâ·ÂÀ» ±â·ÏÇÕ´Ï´Ù\n"
" -p, --output-dir=DIR Ãâ·Â ÆÄÀÏÀ» DIR µğ·ºÅ丮¿¡ °¡Á®´Ù ³õ½À´Ï´Ù\n"
" -s, --sort-output Á¤·ÄµÈ Ãâ·ÂÀ» »ı¼ºÇÏ°í »çº»À» Áö¿ó´Ï´Ù\n"
-" --strict UniforumÀ» ¾ö°İÈ÷ µû¸£´Â .po ÆÄÀÏÀ» "
-"¸¸µì´Ï´Ù\n"
+" --strict UniforumÀ» ¾ö°İÈ÷ µû¸£´Â .po ÆÄÀÏÀ» ¸¸µì´Ï"
+"´Ù\n"
" -T, --trigraphs ÀԷ¿¡ ´ëÇØ ANSI C Æ®¸®±×¶óÇÁ¸¦ ÀνÄÇÕ´Ï´Ù\n"
" -V, --version ¹öÀü Á¤º¸¸¦ Ãâ·ÂÇϰí Á¾·áÇÕ´Ï´Ù\n"
" -w, --width=NUMBER Ãâ·Â ÆäÀÌÁö ÆøÀ» ¼³Á¤ÇÕ´Ï´Ù\n"
@@ -337,7 +326,7 @@ msgstr ""
"\n"
"ÀÔ·ÂÆÄÀÏÀÌ - À̸é Ç¥ÁØ ÀÔ·ÂÀ» ÀĞ°Ô µË´Ï´Ù.\n"
-#: src/msgcomm.c:425
+#: src/msgcomm.c:411
msgid ""
" -V, --version output version information and exit\n"
" -w, --width=NUMBER set output page width\n"
@@ -357,41 +346,41 @@ msgid ""
"preserved.\n"
msgstr ""
-#: src/msgcomm.c:476 src/msgunfmt.c:357 src/po-lex.c:74 src/xget-lex.c:161
-#: src/xget-lex.c:176 src/xget-lex.c:193 src/xgettext.c:625
+#: src/msgcomm.c:462 src/msgunfmt.c:361 src/po-lex.c:86 src/xget-lex.c:157
+#: src/xget-lex.c:170 src/xget-lex.c:180 src/xgettext.c:611
#, c-format
msgid "error while opening \"%s\" for reading"
msgstr "Àбâ À§ÇØ \"%s\"À» ¿©´Â µ¿¾È ¿À·ù ¹ß»ı"
-#: src/msgcomm.c:557 src/xgettext.c:667 src/xgettext.c:1000
+#: src/msgcomm.c:543 src/xgettext.c:653 src/xgettext.c:1071
msgid "this file may not contain domain directives"
msgstr "ÀÌ ÆÄÀÏÀº ¿µ¿ª Áö½ÃÀÚ¸¦ Æ÷ÇÔÇϰí ÀÖÁö ¾ÊÀ» ¼öµµ ÀÖ½À´Ï´Ù"
-#: src/msgfmt.c:273 src/xgettext.c:417
+#: src/msgfmt.c:286 src/xgettext.c:414
msgid "no input file given"
msgstr "ÀÔ·Â ÆÄÀÏÀÌ ÁÖ¾îÁöÁö ¾Ê¾Ò½À´Ï´Ù"
-#: src/msgfmt.c:321
+#: src/msgfmt.c:337
#, c-format
msgid "error while opening \"%s\" for writing"
msgstr "¾²±â À§ÇØ \"%s\"À» ¿©´Â µ¿¾È ¿À·ù ¹ß»ı"
-#: src/msgfmt.c:343
+#: src/msgfmt.c:359
#, c-format
msgid "%d translated messages"
msgstr "¹ø¿ªµÈ ¸Ş½ÃÁö %d°³"
-#: src/msgfmt.c:345
+#: src/msgfmt.c:361
#, c-format
msgid ", %d fuzzy translations"
msgstr ", ÆÛÁö ¹ø¿ª¹® %d°³"
-#: src/msgfmt.c:347
+#: src/msgfmt.c:363
#, c-format
msgid ", %d untranslated messages"
msgstr ", ¹ø¿ªµÇÁö ¾ÊÀº ¸Ş½ÃÁö %d°³"
-#: src/msgfmt.c:366
+#: src/msgfmt.c:382
#, fuzzy, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] filename.po ...\n"
@@ -434,21 +423,23 @@ msgstr ""
"ÀÔ·Â ÆÄÀÏÀÌ - À̸é Ç¥ÁØ ÀÔ·ÂÀ» ÀĞ°Ô µË´Ï´Ù. Ãâ·Â ÆÄÀÏÀÌ - À̸é\n"
"Ç¥ÁØ Ãâ·Â¿¡ Ãâ·ÂÇÕ´Ï´Ù.\n"
-#: src/msgfmt.c:409
+#: src/msgfmt.c:425
msgid "while creating hash table"
msgstr "ÇØ½¬ Å×À̺íÀ» ¸¸µå´Â µ¿¾È"
-#: src/msgfmt.c:451
+#: src/msgfmt.c:469
#, fuzzy, c-format
-msgid "%s: warning: PO file header missing, fuzzy, or invalid"
+msgid ""
+"%s: warning: PO file header missing, fuzzy, or invalid\n"
+"%*s warning: charset conversion will not work"
msgstr "%s: °æ°í: ¼Ò½º ÆÄÀÏÀÌ ÆÛÁö ¹ø¿ª¹®À» Æ÷ÇÔÇϰí ÀÖ½À´Ï´Ù"
-#: src/msgfmt.c:474
+#: src/msgfmt.c:493
#, c-format
msgid "domain name \"%s\" not suitable as file name"
msgstr "¿µ¿ª¸í \"%s\"´Â ÆÄÀÏ À̸§À¸·Î ¾Ë¸ÂÁö ¾Ê½À´Ï´Ù"
-#: src/msgfmt.c:479
+#: src/msgfmt.c:498
#, c-format
msgid "domain name \"%s\" not suitable as file name: will use prefix"
msgstr ""
@@ -457,61 +448,81 @@ msgstr ""
#. We don't change the exit status here because this is really
#. only an information.
-#: src/msgfmt.c:492
+#: src/msgfmt.c:511
#, c-format
msgid "`domain %s' directive ignored"
msgstr "`domain %s' Áö½ÃÀÚ´Â ¹«½ÃµÊ"
-#: src/msgfmt.c:520
+#: src/msgfmt.c:541
msgid "empty `msgstr' entry ignored"
msgstr "ºó `msgstr' Ç׸ñÀº ¹«½ÃµÊ"
-#: src/msgfmt.c:521
+#: src/msgfmt.c:542
msgid "fuzzy `msgstr' entry ignored"
msgstr "ÆÛÁö `msgstr' Ç׸ñÀº ¹«½ÃµÊ"
-#: src/msgfmt.c:564
+#: src/msgfmt.c:584
#, c-format
msgid "headerfield `%s' missing in header"
msgstr "Çì´õ¿¡ Çì´õÇʵå `%s'°¡ ºüÁ³À½"
-#: src/msgfmt.c:567
+#: src/msgfmt.c:587
#, c-format
msgid "header field `%s' should start at beginning of line"
msgstr "Çì´õ Çʵå `%s'´Â ÇàÀÇ Ã³À½ºÎÅÍ ½ÃÀÛÇØ¾ß ÇÕ´Ï´Ù"
-#: src/msgfmt.c:577
+#: src/msgfmt.c:597
msgid "some header fields still have the initial default value"
msgstr "¸î¸î Çì´õ Çʵ尡 ¾ÆÁ÷µµ ÃʱâÀÇ ³»Á¤°ªÀ» °¡Áö°í ÀÖ½À´Ï´Ù"
-#: src/msgfmt.c:588
+#: src/msgfmt.c:608
#, c-format
msgid "field `%s' still has initial default value"
msgstr "`%s' Çʵ尡 ¾ÆÁ÷µµ ÃʱâÀÇ ³»Á¤°ªÀ» °¡Áö°í ÀÖ½À´Ï´Ù"
-#: src/msgfmt.c:673
+#: src/msgfmt.c:698
#, c-format
msgid "%s: warning: source file contains fuzzy translation"
msgstr "%s: °æ°í: ¼Ò½º ÆÄÀÏÀÌ ÆÛÁö ¹ø¿ª¹®À» Æ÷ÇÔÇϰí ÀÖ½À´Ï´Ù"
-#: src/msgfmt.c:875
+#: src/msgfmt.c:920
+#, fuzzy
+msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
+msgstr "`msgid'¿Í `msgstr' Ç׸ñÀÌ ¸ğµÎ '\\n'À¸·Î ½ÃÀÛÇÏÁö ¾Ê½À´Ï´Ù"
+
+#: src/msgfmt.c:928
+#, fuzzy, c-format
+msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
+msgstr "`msgid'¿Í `msgstr' Ç׸ñÀÌ ¸ğµÎ '\\n'À¸·Î ½ÃÀÛÇÏÁö ¾Ê½À´Ï´Ù"
+
+#: src/msgfmt.c:938
msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
msgstr "`msgid'¿Í `msgstr' Ç׸ñÀÌ ¸ğµÎ '\\n'À¸·Î ½ÃÀÛÇÏÁö ¾Ê½À´Ï´Ù"
-#: src/msgfmt.c:883
+#: src/msgfmt.c:953
+#, fuzzy
+msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
+msgstr "`msgid'¿Í `msgstr' Ç׸ñÀÌ ¸ğµÎ '\\n'À¸·Î ³¡³ªÁö ¾Ê½À´Ï´Ù"
+
+#: src/msgfmt.c:961
+#, fuzzy, c-format
+msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
+msgstr "`msgid'¿Í `msgstr' Ç׸ñÀÌ ¸ğµÎ '\\n'À¸·Î ³¡³ªÁö ¾Ê½À´Ï´Ù"
+
+#: src/msgfmt.c:971
msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
msgstr "`msgid'¿Í `msgstr' Ç׸ñÀÌ ¸ğµÎ '\\n'À¸·Î ³¡³ªÁö ¾Ê½À´Ï´Ù"
-#: src/msgfmt.c:897
+#: src/msgfmt.c:987
msgid "number of format specifications in `msgid' and `msgstr' does not match"
msgstr "`msgid'¿Í `msgstr'¿¡ ¾²ÀÎ ¼­½Ä ÁöÁ¤ÀÚÀÇ °³¼ö°¡ ÀÏÄ¡ÇÏÁö ¾Ê½À´Ï´Ù"
-#: src/msgfmt.c:914
+#: src/msgfmt.c:1004
#, c-format
msgid "format specifications for argument %u are not the same"
msgstr "Àμö %u¿¡ ´ëÇÑ ¼­½Ä ÁöÁ¤ÀÚ°¡ °°Áö ¾Ê½À´Ï´Ù"
-#: src/msgmerge.c:328
+#: src/msgmerge.c:320
#, fuzzy, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] def.po ref.po\n"
@@ -549,7 +560,7 @@ msgstr ""
" -V, --version ¹öÀü Á¤º¸¸¦ Ãâ·ÂÇϰí Á¾·áÇÕ´Ï´Ù\n"
" -w, --width=NUMBER Ãâ·Â ÆäÀÌÁö ÆøÀ» ¼³Á¤ÇÕ´Ï´Ù\n"
-#: src/msgmerge.c:348
+#: src/msgmerge.c:340
#, no-wrap
msgid ""
"\n"
@@ -573,20 +584,20 @@ msgstr ""
"°á°ú¸¦ ¾ò±â À§ÇØ ÆÛÁö ¸ÅĪÀÌ »ç¿ëµË´Ï´Ù. ¸¸¾à Ãâ·Â ÆÄÀÏÀÌ ÁöÁ¤µÇÁö ¾ÊÀ¸¸é\n"
"°á°ú´Â Ç¥ÁØÃâ·Â¿¡ ¾²¿©Áı´Ï´Ù.\n"
-#: src/msgmerge.c:804
+#: src/msgmerge.c:799
#, c-format
msgid ""
-"%sRead %d old + %d reference, merged %d, fuzzied %d, missing %d, obsolete "
-"%d.\n"
+"%sRead %d old + %d reference, merged %d, fuzzied %d, missing %d, obsolete %"
+"d.\n"
msgstr ""
-"%s%d°³ÀÇ ¿¹Àü °Í + %d°³ÀÇ ÂüÁ¶¹®, °áÇÕµÈ °Í %d, ÆÛÁö %d, ºüÁø °Í %d, "
-"¾µ¸ğ¾ø´Â °Í %d°³¸¦ Àоú½À´Ï´Ù.\n"
+"%s%d°³ÀÇ ¿¹Àü °Í + %d°³ÀÇ ÂüÁ¶¹®, °áÇÕµÈ °Í %d, ÆÛÁö %d, ºüÁø °Í %d, ¾µ¸ğ¾ø"
+"´Â °Í %d°³¸¦ Àоú½À´Ï´Ù.\n"
-#: src/msgmerge.c:810
+#: src/msgmerge.c:805
msgid " done.\n"
msgstr " ¿Ï·á.\n"
-#: src/msgunfmt.c:215
+#: src/msgunfmt.c:210
#, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] [FILE]...\n"
@@ -614,7 +625,7 @@ msgstr ""
" -V, --version ¹öÀü Á¤º¸¸¦ Ãâ·ÂÇϰí Á¾·áÇÕ´Ï´Ù\n"
" -w, --width=NUMBER Ãâ·Â ÆäÀÌÁö ÆøÀ» ¼³Á¤ÇÕ´Ï´Ù\n"
-#: src/msgunfmt.c:229
+#: src/msgunfmt.c:224
#, no-wrap
msgid ""
"\n"
@@ -629,85 +640,119 @@ msgstr ""
"ÀÔ·Â ÆÄÀÏÀÌ ÁÖ¾îÁöÁö ¾Ê°Å³ª - À̸é Ç¥ÁØ ÀÔ·ÂÀ» ÀĞ°Ô µË´Ï´Ù.\n"
"³»Á¤°ªÀ¸·Î Ãâ·ÂÀº Ç¥ÁØ Ãâ·Â¿¡ ±â·ÏµË´Ï´Ù.\n"
-#: src/msgunfmt.c:266 src/msgunfmt.c:330 src/po-lex.c:185 src/xget-lex.c:256
+#: src/msgunfmt.c:261 src/msgunfmt.c:326 src/po-lex.c:213 src/xget-lex.c:243
#, c-format
msgid "error while reading \"%s\""
msgstr "\"%s\"À» ÀĞ´Â µ¿¾È ¿À·ù ¹ß»ı"
-#: src/msgunfmt.c:267 src/msgunfmt.c:331
+#: src/msgunfmt.c:262 src/msgunfmt.c:327
#, c-format
msgid "file \"%s\" truncated"
msgstr "\"%s\" ÆÄÀÏÀÌ Àß·ÈÀ½"
-#: src/msgunfmt.c:298
+#: src/msgunfmt.c:293
#, c-format
msgid "seek \"%s\" offset %ld failed"
msgstr "\"%s\" ¿É¼Â %ld Ž»ö ½ÇÆĞ"
-#: src/msgunfmt.c:373
+#: src/msgunfmt.c:332
+#, fuzzy, c-format
+msgid "file \"%s\" contains a not NUL terminated string"
+msgstr "\"%s\" ÆÄÀÏÀº GNU .mo Çü½ÄÀÌ ¾Æ´Õ´Ï´Ù"
+
+#: src/msgunfmt.c:377
#, c-format
msgid "file \"%s\" is not in GNU .mo format"
msgstr "\"%s\" ÆÄÀÏÀº GNU .mo Çü½ÄÀÌ ¾Æ´Õ´Ï´Ù"
-#: /home/drepper/gnu/gettext/build/src/../../src/po-gram-gen.y:129
+#: src/open-po.c:64
+msgid "<stdin>"
+msgstr ""
+
+#: po-gram-gen.y:87
+msgid "inconsistent use of #~"
+msgstr ""
+
+#: po-gram-gen.y:168
+#, fuzzy
+msgid "missing `msgstr[]' section"
+msgstr "`msgstr' ºÎºĞÀÌ ºüÁ³½À´Ï´Ù"
+
+#: po-gram-gen.y:176
+#, fuzzy
+msgid "missing `msgid_plural' section"
+msgstr "`msgstr' ºÎºĞÀÌ ºüÁ³½À´Ï´Ù"
+
+#: po-gram-gen.y:183
msgid "missing `msgstr' section"
msgstr "`msgstr' ºÎºĞÀÌ ºüÁ³½À´Ï´Ù"
-#: src/po-lex.c:84
-#, c-format
-msgid "found %d fatal errors"
-msgstr "%d°³ÀÇ Ä¡¸íÀûÀÎ ¿À·ù¸¦ ã¾Ò½À´Ï´Ù"
+#: po-gram-gen.y:228
+msgid "first plural form has nonzero index"
+msgstr ""
-#: src/po-lex.c:129 src/po-lex.c:168
+#: po-gram-gen.y:230
+msgid "plural form has wrong index"
+msgstr ""
+
+#. CAUTION: If you change this macro, you must also make identical
+#. changes to the function of the same name in src/po-lex.c
+#: src/po-lex.c:156 src/po-lex.c:195 src/po-lex.h:85 src/po-lex.h:99
+#: src/po-lex.h:115 src/po-lex.h:129
msgid "too many errors, aborting"
msgstr "¿À·ù°¡ ³Ê¹« ¸¹¾Æ¼­ Áß´ÜÇÕ´Ï´Ù"
-#: src/po-lex.c:241
+#: src/po-lex.c:271
#, c-format
msgid "keyword \"%s\" unknown"
msgstr "¾Ë ¼ö ¾ø´Â Ű¿öµå \"%s\""
-#: src/po-lex.c:335
+#: src/po-lex.c:374
#, fuzzy
msgid "invalid control sequence"
msgstr "À߸øµÈ Á¦¾î ¼ø¼­¿­"
-#: src/po-lex.c:419
+#: src/po-lex.c:477
+msgid "end-of-file within string"
+msgstr "¹®ÀÚ¿­ ³»ºÎ¿¡¼­ ÆÄÀÏÀÌ ³¡³²"
+
+#: src/po-lex.c:482
msgid "end-of-line within string"
msgstr "¹®ÀÚ¿­ ³»ºÎ¿¡¼­ ÇàÀÌ ³¡³²"
-#: src/po-lex.c:424
-msgid "end-of-file within string"
-msgstr "¹®ÀÚ¿­ ³»ºÎ¿¡¼­ ÆÄÀÏÀÌ ³¡³²"
+#: src/po-lex.c:525
+#, fuzzy
+msgid "invalid multibyte sequence"
+msgstr "À߸øµÈ Á¦¾î ¼ø¼­¿­"
-#: src/xget-lex.c:152
+#: src/xget-lex.c:148
msgid "standard input"
msgstr "Ç¥ÁØ ÀÔ·Â"
-#: src/xget-lex.c:894
+#: src/xget-lex.c:876
#, c-format
msgid "%s:%d: warning: unterminated character constant"
msgstr "%s:%d: °æ°í: ¿Ï°áµÇÁö ¾ÊÀº ¹®ÀÚ »ó¼ö"
-#: src/xget-lex.c:916
+#: src/xget-lex.c:898
#, c-format
msgid "%s:%d: warning: unterminated string literal"
msgstr "%s:%d: °æ°í: ¿Ï°áµÇÁö ¾ÊÀº ¹®ÀÚ¿­ »ó¼ö"
-#: src/xgettext.c:386
+#: src/xgettext.c:383
msgid "--join-existing cannot be used when output is written to stdout"
msgstr "--join-exeistingÀº Ãâ·ÂÀÌ Ç¥ÁØÃâ·Â¿¡ ¾²¿©Áú ¶§ »ç¿ëµÉ ¼ö ¾ø½À´Ï´Ù"
-#: src/xgettext.c:391
+#: src/xgettext.c:388
msgid "xgettext cannot work without keywords to look for"
msgstr ""
-#: src/xgettext.c:508
+#: src/xgettext.c:494
#, c-format
msgid "warning: file `%s' extension `%s' is unknown; will try C"
msgstr "°æ°í: `%s' ÆÄÀÏÀÇ È®ÀåÀÚ `%s'¸¦ ¾Ë ¼ö ¾ø½À´Ï´Ù; C Çü½ÄÀ¸·Î °£ÁÖÇÔ"
-#: src/xgettext.c:544
+#: src/xgettext.c:530
#, fuzzy, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] INPUTFILE ...\n"
@@ -747,7 +792,7 @@ msgstr ""
" »ı·«ÇÕ´Ï´Ù\n"
" -F, --sort-by-file ÆÄÀÏÀÇ À§Ä¡¿¡ µû¶ó Ãâ·ÂÀ» Á¤·ÄÇÕ´Ï´Ù\n"
-#: src/xgettext.c:564
+#: src/xgettext.c:550
#, c-format, no-wrap
msgid ""
" -h, --help display this help and exit\n"
@@ -777,7 +822,7 @@ msgstr ""
" »ç¿ëÇÕ´Ï´Ù\n"
" --no-location '#: filename:line' ÇàÀ» ¾²Áö ¾Ê½À´Ï´Ù\n"
-#: src/xgettext.c:578
+#: src/xgettext.c:564
#, no-wrap
msgid ""
" -n, --add-location generate '#: filename:line' lines (default)\n"
@@ -806,20 +851,33 @@ msgstr ""
"\n"
"ÀÔ·ÂÆÄÀÏÀÌ - À̸é Ç¥ÁØ ÀÔ·ÂÀ» ÀĞ°Ô µË´Ï´Ù.\n"
-#: src/xgettext.c:879
+#: src/xgettext.c:926
#, fuzzy, c-format
msgid "%s:%d: warning: keyword nested in keyword arg"
msgstr "%s:%d: °æ°í: ¿Ï°áµÇÁö ¾ÊÀº ¹®ÀÚ¿­ »ó¼ö"
-#: src/xgettext.c:889
+#: src/xgettext.c:936
#, c-format
msgid "%s:%d: warning: keyword between outer keyword and its arg"
msgstr ""
-#: src/xgettext.c:1374
+#: src/xgettext.c:1432
#, c-format
msgid "language `%s' unknown"
msgstr "`%s' ¾ğ¾î¸¦ ¾Ë ¼ö ¾øÀ½"
+#~ msgid ""
+#~ "internationalized messages should not contain the `\\%c' escape sequence"
+#~ msgstr "±¹Á¦È­µÈ ¸Ş½ÃÁö´Â `\\%c' À̽ºÄÉÀÌÇÁ ¼ø¼­¿­À» Æ÷ÇÔÇÒ ¼ö ¾ø½À´Ï´Ù"
+
+#~ msgid "cannot create output file \"%s\""
+#~ msgstr "Ãâ·Â ÆÄÀÏ \"%s\"À» ¸¸µé ¼ö ¾ø½À´Ï´Ù"
+
+#~ msgid "standard output"
+#~ msgstr "Ç¥ÁØ Ãâ·Â"
+
+#~ msgid "error while writing \"%s\" file"
+#~ msgstr "\"%s\" ÆÄÀÏÀ» ¾²´Â µ¿¾È ¿À·ù ¹ß»ı"
+
#~ msgid "%s: warning: no header entry found"
#~ msgstr "%s: °æ°í: Çì´õ Ç׸ñÀ» ãÁö ¸øÇßÀ½"
diff --git a/po/nl.po b/po/nl.po
index 39752d9..024a476 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: gettext 0.10.31\n"
-"POT-Creation-Date: 2000-07-28 22:51+0200\n"
+"POT-Creation-Date: 2001-03-09 19:56+0100\n"
"PO-Revision-Date: 1997-03-11 22:38 \n"
"Last-Translator: Erick Branderhorst <Erick.Branderhorst@asml.nl>\n"
"Language-Team: Dutch <nl@li.org>\n"
@@ -13,75 +13,80 @@ msgstr ""
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8-bit\n"
-#: lib/error.c:103
+#: lib/error.c:115
msgid "Unknown system error"
msgstr "Onbekende systeemfout"
-#: lib/getopt.c:680
+#: lib/getopt.c:691
#, c-format
msgid "%s: option `%s' is ambiguous\n"
msgstr "%s: optie `%s' is ambiguous\n"
-#: lib/getopt.c:704
+#: lib/getopt.c:716
#, c-format
msgid "%s: option `--%s' doesn't allow an argument\n"
msgstr "%s: optie `--%s' verwacht geen argument\n"
-#: lib/getopt.c:709
+#: lib/getopt.c:721
#, c-format
msgid "%s: option `%c%s' doesn't allow an argument\n"
msgstr "%s: optie `%c%s' verwacht geen argument\n"
-#: lib/getopt.c:726 lib/getopt.c:899
+#: lib/getopt.c:739 lib/getopt.c:912
#, c-format
msgid "%s: option `%s' requires an argument\n"
msgstr "%s: optie `%s' verwacht een argument\n"
#. --option
-#: lib/getopt.c:755
+#: lib/getopt.c:768
#, c-format
msgid "%s: unrecognized option `--%s'\n"
msgstr "%s: onbekende optie `--%s'\n"
#. +option or -option
-#: lib/getopt.c:759
+#: lib/getopt.c:772
#, c-format
msgid "%s: unrecognized option `%c%s'\n"
msgstr "%s: onbekende optie `%c%s'\n"
#. 1003.2 specifies the format of this message.
-#: lib/getopt.c:785
+#: lib/getopt.c:798
#, c-format
msgid "%s: illegal option -- %c\n"
msgstr "%s: ongeldige optie -- %c\n"
-#: lib/getopt.c:788
+#: lib/getopt.c:801
#, c-format
msgid "%s: invalid option -- %c\n"
msgstr "%s: ongeldige optie -- %c\n"
#. 1003.2 specifies the format of this message.
-#: lib/getopt.c:818 lib/getopt.c:948
+#: lib/getopt.c:831 lib/getopt.c:961
#, c-format
msgid "%s: option requires an argument -- %c\n"
msgstr "%s: optie verwacht een argument -- %c\n"
-#: lib/getopt.c:865
+#: lib/getopt.c:878
#, c-format
msgid "%s: option `-W %s' is ambiguous\n"
msgstr "%s: optie `-W %s' is dubbelzinnig\n"
-#: lib/getopt.c:883
+#: lib/getopt.c:896
#, c-format
msgid "%s: option `-W %s' doesn't allow an argument\n"
msgstr "%s: optie `-W %s' staat geen argument toe\n"
-#: lib/xmalloc.c:82
+#: lib/obstack.c:474
+#, fuzzy
+msgid "memory exhausted"
+msgstr "Geen geheugen meer beschikbaar"
+
+#: lib/xmalloc.c:86
msgid "Memory exhausted"
msgstr "Geen geheugen meer beschikbaar"
-#: src/gettextp.c:134 src/msgcmp.c:144 src/msgcomm.c:285 src/msgfmt.c:257
-#: src/msgmerge.c:263 src/msgunfmt.c:175 src/xgettext.c:401
+#: src/gettext.c:138 src/msgcmp.c:140 src/msgcomm.c:283 src/msgfmt.c:270
+#: src/msgmerge.c:255 src/msgunfmt.c:170 src/xgettext.c:398
#, c-format, no-wrap
msgid ""
"Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -93,27 +98,27 @@ msgstr ""
"garantie; zelfs niet voor VERKOOPBAARHEID of GESCHIKTHEID VOOR EEN\n"
"SPECIFIEK DOEL.\n"
-#: src/gettextp.c:139 src/msgcmp.c:149 src/msgcomm.c:290 src/msgfmt.c:262
-#: src/msgmerge.c:268 src/msgunfmt.c:180 src/xgettext.c:406
+#: src/gettext.c:143 src/msgcmp.c:145 src/msgcomm.c:288 src/msgfmt.c:275
+#: src/msgmerge.c:260 src/msgunfmt.c:175 src/xgettext.c:403
#, c-format
msgid "Written by %s.\n"
msgstr "Geschreven door %s.\n"
-#: src/gettextp.c:154
+#: src/gettext.c:158
msgid "missing arguments"
msgstr "ontbrekende argumenten"
-#: src/gettextp.c:164
+#: src/gettext.c:168
msgid "too many arguments"
msgstr "te veel argumenten"
-#: src/gettextp.c:228 src/msgcmp.c:181 src/msgcomm.c:395 src/msgfmt.c:361
-#: src/msgmerge.c:323 src/msgunfmt.c:210 src/xgettext.c:539
+#: src/gettext.c:232 src/msgcmp.c:177 src/msgcomm.c:381 src/msgfmt.c:377
+#: src/msgmerge.c:315 src/msgunfmt.c:205 src/xgettext.c:525
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "Probeer `%s --help' voor meer informatie.\n"
-#: src/gettextp.c:233
+#: src/gettext.c:237
#, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] [[[TEXTDOMAIN] MSGID] | [-s [MSGID]...]]\n"
@@ -136,7 +141,7 @@ msgstr ""
" [TEXTDOMEIN] MSGID ontvang vertaalde meldingen corresponderend aan\n"
" MSGID vanuit TEKSTDOMEIN\n"
-#: src/gettextp.c:245
+#: src/gettext.c:249
#, c-format, no-wrap
msgid ""
"\n"
@@ -159,42 +164,20 @@ msgstr ""
"worden de in de katalogus gevonden meldingen vertaald.\n"
"Standaard zoek directory: %s\n"
-#: src/gettextp.c:255 src/msgcmp.c:200 src/msgcomm.c:442 src/msgfmt.c:388
-#: src/msgmerge.c:358 src/msgunfmt.c:234 src/xgettext.c:591
+#: src/gettext.c:259 src/msgcmp.c:196 src/msgcomm.c:428 src/msgfmt.c:404
+#: src/msgmerge.c:350 src/msgunfmt.c:229 src/xgettext.c:577
msgid "Report bugs to <bug-gnu-utils@gnu.org>.\n"
msgstr "Meld fouten via <bug-gnu-utils@gnu.org>.\n"
-#: src/message.c:900
-#, c-format
-msgid ""
-"internationalized messages should not contain the `\\%c' escape sequence"
-msgstr ""
-"geonternationaliseerde meldingen mogen geen `\\%c' escape sequences bevatten"
-
-#: src/message.c:1231
-#, c-format
-msgid "cannot create output file \"%s\""
-msgstr "kan uitvoerbestand \"%s\" niet aanmaken"
-
-#: src/message.c:1238
-#, no-c-format
-msgid "standard output"
-msgstr "standaard uitvoer"
-
-#: src/message.c:1298
-#, c-format
-msgid "error while writing \"%s\" file"
-msgstr "fout bij schrijven bestand \"%s\""
-
-#: src/msgcmp.c:160 src/msgmerge.c:279
+#: src/msgcmp.c:156 src/msgmerge.c:271
msgid "no input files given"
msgstr "geen invoerbestanden gegeven"
-#: src/msgcmp.c:165 src/msgmerge.c:284
+#: src/msgcmp.c:161 src/msgmerge.c:276
msgid "exactly 2 input files required"
msgstr "precies 2 invoerbestanden zijn benodigd"
-#: src/msgcmp.c:186
+#: src/msgcmp.c:182
#, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] def.po ref.po\n"
@@ -225,57 +208,62 @@ msgstr ""
"overeenkomst niet gevonden kan wrden, zal fuzzy(vage) matching worden gebruikt,\n"
"ter verkrijging van een betere diagnose.\n"
-#: src/msgcmp.c:259 src/msgmerge.c:746
+#: src/msgcmp.c:255 src/msgmerge.c:741
msgid "this message is used but not defined..."
msgstr "deze melding is gebruikt maar is niet gedefinieerd..."
-#: src/msgcmp.c:261 src/msgmerge.c:748
+#: src/msgcmp.c:257 src/msgmerge.c:743
msgid "...but this definition is similar"
msgstr "...maar de definitie is gelijksoortig"
-#: src/msgcmp.c:267 src/msgmerge.c:775
+#: src/msgcmp.c:263 src/msgmerge.c:770
#, c-format
msgid "this message is used but not defined in %s"
msgstr "deze melding is gebruikt maar niet gedefinieerd in %s"
-#: src/msgcmp.c:281
+#: src/msgcmp.c:277
msgid "warning: this message is not used"
msgstr "waarschuwing: deze melding is niet gebruikt"
-#: src/msgcmp.c:355 src/msgfmt.c:633 src/msgmerge.c:517 src/xgettext.c:1093
+#: src/msgcmp.c:282 src/po-lex.c:102
+#, c-format
+msgid "found %d fatal errors"
+msgstr "%d fatale fouten gevonden"
+
+#: src/msgcmp.c:354 src/msgfmt.c:657 src/msgmerge.c:512 src/xgettext.c:1169
msgid "duplicate message definition"
msgstr "dubbele melding definitie"
-#: src/msgcmp.c:356 src/msgfmt.c:634 src/msgmerge.c:518 src/xgettext.c:1094
+#: src/msgcmp.c:355 src/msgfmt.c:659 src/msgmerge.c:513 src/xgettext.c:1170
msgid "...this is the location of the first definition"
msgstr "...dit is de lokatie van de eerste definitie"
-#: src/msgcmp.c:396 src/msgmerge.c:566
+#: src/msgcmp.c:395 src/msgmerge.c:561
#, c-format
msgid "this message has no definition in the \"%s\" domain"
msgstr "deze melding heeft geen definitie in het \"%s\" domein"
#. We are about to construct the absolute path to the
#. directory for the output files but asprintf failed.
-#: src/msgcomm.c:238 src/xgettext.c:340 src/xgettext.c:1288
+#: src/msgcomm.c:236 src/xgettext.c:337 src/xgettext.c:1365
msgid "while preparing output"
msgstr "bij voorbereiden uitvoer"
-#: src/msgcomm.c:273 src/msgcomm.c:277 src/xgettext.c:378 src/xgettext.c:382
+#: src/msgcomm.c:271 src/msgcomm.c:275 src/xgettext.c:375 src/xgettext.c:379
#, c-format
msgid "%s and %s are mutually exclusive"
msgstr "%s en %s zijn mutually exclusive"
-#: src/msgcomm.c:341
+#: src/msgcomm.c:327
msgid "at least two files must be specified"
msgstr ""
-#: src/msgcomm.c:360
+#: src/msgcomm.c:346
#, c-format
msgid "impossible selection criteria specified (%d < n < %d)"
msgstr ""
-#: src/msgcomm.c:400
+#: src/msgcomm.c:386
#, fuzzy, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] INPUTFILE ...\n"
@@ -307,7 +295,7 @@ msgstr ""
" --foreign-user laat FSF kopierecht weg voor vreemde gebruiker\n"
" -F, --sort-by-file sorteer uitvoer bij bestandslokatie\n"
-#: src/msgcomm.c:412
+#: src/msgcomm.c:398
#, fuzzy
msgid ""
" -i, --indent write the .po file using indented style\n"
@@ -342,7 +330,7 @@ msgstr ""
"\n"
"Als INVOERBESTAND - is, lees standaardinvoer.\n"
-#: src/msgcomm.c:425
+#: src/msgcomm.c:411
msgid ""
" -V, --version output version information and exit\n"
" -w, --width=NUMBER set output page width\n"
@@ -362,41 +350,41 @@ msgid ""
"preserved.\n"
msgstr ""
-#: src/msgcomm.c:476 src/msgunfmt.c:357 src/po-lex.c:74 src/xget-lex.c:161
-#: src/xget-lex.c:176 src/xget-lex.c:193 src/xgettext.c:625
+#: src/msgcomm.c:462 src/msgunfmt.c:361 src/po-lex.c:86 src/xget-lex.c:157
+#: src/xget-lex.c:170 src/xget-lex.c:180 src/xgettext.c:611
#, c-format
msgid "error while opening \"%s\" for reading"
msgstr "fout tijdens openen om te lezen van \"%s\""
-#: src/msgcomm.c:557 src/xgettext.c:667 src/xgettext.c:1000
+#: src/msgcomm.c:543 src/xgettext.c:653 src/xgettext.c:1071
msgid "this file may not contain domain directives"
msgstr "dit bestand mag geen domein directives bevatten"
-#: src/msgfmt.c:273 src/xgettext.c:417
+#: src/msgfmt.c:286 src/xgettext.c:414
msgid "no input file given"
msgstr "geen invoerbestand gegeven"
-#: src/msgfmt.c:321
+#: src/msgfmt.c:337
#, c-format
msgid "error while opening \"%s\" for writing"
msgstr "fout bij openen om te schrijven van \"%s\""
-#: src/msgfmt.c:343
+#: src/msgfmt.c:359
#, c-format
msgid "%d translated messages"
msgstr "%d vertaalde meldingen"
-#: src/msgfmt.c:345
+#: src/msgfmt.c:361
#, c-format
msgid ", %d fuzzy translations"
msgstr ", %d vage vertalingen"
-#: src/msgfmt.c:347
+#: src/msgfmt.c:363
#, c-format
msgid ", %d untranslated messages"
msgstr ", %d onvertaalde meldingen"
-#: src/msgfmt.c:366
+#: src/msgfmt.c:382
#, fuzzy, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] filename.po ...\n"
@@ -440,21 +428,23 @@ msgstr ""
"Als invoerbestand - is, lees standaardinvoer. Als uitvoerbestand -\n"
"is, schrijf uitvoer naar standaarduitvoer.\n"
-#: src/msgfmt.c:409
+#: src/msgfmt.c:425
msgid "while creating hash table"
msgstr "tijdens aanmaken hash tabel"
-#: src/msgfmt.c:451
+#: src/msgfmt.c:469
#, fuzzy, c-format
-msgid "%s: warning: PO file header missing, fuzzy, or invalid"
+msgid ""
+"%s: warning: PO file header missing, fuzzy, or invalid\n"
+"%*s warning: charset conversion will not work"
msgstr "%s: let op: broncode bevat vage vertaling"
-#: src/msgfmt.c:474
+#: src/msgfmt.c:493
#, c-format
msgid "domain name \"%s\" not suitable as file name"
msgstr "domeinnaam \"%s\" niet bruikbaar als bestandsnaam"
-#: src/msgfmt.c:479
+#: src/msgfmt.c:498
#, c-format
msgid "domain name \"%s\" not suitable as file name: will use prefix"
msgstr ""
@@ -462,62 +452,82 @@ msgstr ""
#. We don't change the exit status here because this is really
#. only an information.
-#: src/msgfmt.c:492
+#: src/msgfmt.c:511
#, c-format
msgid "`domain %s' directive ignored"
msgstr "`domein %s' directive genegeerd"
-#: src/msgfmt.c:520
+#: src/msgfmt.c:541
msgid "empty `msgstr' entry ignored"
msgstr "lege `msgstr' entry genegeerd"
-#: src/msgfmt.c:521
+#: src/msgfmt.c:542
msgid "fuzzy `msgstr' entry ignored"
msgstr "lege `msgstr' ingang genegeerd"
-#: src/msgfmt.c:564
+#: src/msgfmt.c:584
#, c-format
msgid "headerfield `%s' missing in header"
msgstr "header(??)veld `%s' ontbreekt in header(??)"
-#: src/msgfmt.c:567
+#: src/msgfmt.c:587
#, c-format
msgid "header field `%s' should start at beginning of line"
msgstr "header(??)veld `%s' moet starten aan het begin van de regel"
-#: src/msgfmt.c:577
+#: src/msgfmt.c:597
msgid "some header fields still have the initial default value"
msgstr ""
"sommige header(??)velden hebben nog de oorspronkelijke standaard waarde"
-#: src/msgfmt.c:588
+#: src/msgfmt.c:608
#, c-format
msgid "field `%s' still has initial default value"
msgstr "veld `%s' heeft nog de oorspronkelijke standaard waarde"
-#: src/msgfmt.c:673
+#: src/msgfmt.c:698
#, c-format
msgid "%s: warning: source file contains fuzzy translation"
msgstr "%s: let op: broncode bevat vage vertaling"
-#: src/msgfmt.c:875
+#: src/msgfmt.c:920
+#, fuzzy
+msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
+msgstr "`msgid' en `msgstr' ingangen beginnen niet allebei met '\\n'"
+
+#: src/msgfmt.c:928
+#, fuzzy, c-format
+msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
+msgstr "`msgid' en `msgstr' ingangen beginnen niet allebei met '\\n'"
+
+#: src/msgfmt.c:938
msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
msgstr "`msgid' en `msgstr' ingangen beginnen niet allebei met '\\n'"
-#: src/msgfmt.c:883
+#: src/msgfmt.c:953
+#, fuzzy
+msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
+msgstr "`msgid' en `msgstr' ingangen eindigen niet allebei met '\\n'"
+
+#: src/msgfmt.c:961
+#, fuzzy, c-format
+msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
+msgstr "`msgid' en `msgstr' ingangen eindigen niet allebei met '\\n'"
+
+#: src/msgfmt.c:971
msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
msgstr "`msgid' en `msgstr' ingangen eindigen niet allebei met '\\n'"
-#: src/msgfmt.c:897
+#: src/msgfmt.c:987
msgid "number of format specifications in `msgid' and `msgstr' does not match"
msgstr "aantal formaat specificaties in `msgid' en `msgstr' zijn niet gelijk"
-#: src/msgfmt.c:914
+#: src/msgfmt.c:1004
#, c-format
msgid "format specifications for argument %u are not the same"
msgstr "formaat specificaties voor argument %u zijn niet dezelfde"
-#: src/msgmerge.c:328
+#: src/msgmerge.c:320
#, fuzzy, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] def.po ref.po\n"
@@ -555,7 +565,7 @@ msgstr ""
" -V, --version toon versie-informatie en bekindig programma\n"
" -W, --width=NUMBER stel uitvoer pagina breedte in\n"
-#: src/msgmerge.c:348
+#: src/msgmerge.c:340
#, no-wrap
msgid ""
"\n"
@@ -581,20 +591,20 @@ msgstr ""
"worden om betere resultaten te verkrijgen. De resultaten worden naar \n"
"standaarduitvoer geschreven tenzij een uitvoerbestand is gespecificeerd.\n"
-#: src/msgmerge.c:804
+#: src/msgmerge.c:799
#, c-format
msgid ""
-"%sRead %d old + %d reference, merged %d, fuzzied %d, missing %d, obsolete "
-"%d.\n"
+"%sRead %d old + %d reference, merged %d, fuzzied %d, missing %d, obsolete %"
+"d.\n"
msgstr ""
"%sLees %d oud + %d referentie, samengevoegd %d, fuzzied(gevaagd) %d, "
"ontbrekend %d, overbodig %d.\n"
-#: src/msgmerge.c:810
+#: src/msgmerge.c:805
msgid " done.\n"
msgstr " done.\n"
-#: src/msgunfmt.c:215
+#: src/msgunfmt.c:210
#, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] [FILE]...\n"
@@ -623,7 +633,7 @@ msgstr ""
" -V, --version toon versie-informatie en bekindig programma\n"
" -w, --width=NUMMER stel uitvoer paginabreedte in\n"
-#: src/msgunfmt.c:229
+#: src/msgunfmt.c:224
#, no-wrap
msgid ""
"\n"
@@ -638,88 +648,122 @@ msgstr ""
"Als invoerbestand - is of leeg, lees standaardinvoer.\n"
"Standaard wordt de uitvoer gescreven naar standaarduitvoer.\n"
-#: src/msgunfmt.c:266 src/msgunfmt.c:330 src/po-lex.c:185 src/xget-lex.c:256
+#: src/msgunfmt.c:261 src/msgunfmt.c:326 src/po-lex.c:213 src/xget-lex.c:243
#, c-format
msgid "error while reading \"%s\""
msgstr "fout tijdens lezen \"%s\""
-#: src/msgunfmt.c:267 src/msgunfmt.c:331
+#: src/msgunfmt.c:262 src/msgunfmt.c:327
#, c-format
msgid "file \"%s\" truncated"
msgstr "bestand \"%s\" ingekort"
-#: src/msgunfmt.c:298
+#: src/msgunfmt.c:293
#, c-format
msgid "seek \"%s\" offset %ld failed"
msgstr "zoek \"%s\" offset %ld gefaald"
-#: src/msgunfmt.c:373
+#: src/msgunfmt.c:332
+#, fuzzy, c-format
+msgid "file \"%s\" contains a not NUL terminated string"
+msgstr "bestand \"%s\" is geen GNU .mo bestand"
+
+#: src/msgunfmt.c:377
#, c-format
msgid "file \"%s\" is not in GNU .mo format"
msgstr "bestand \"%s\" is geen GNU .mo bestand"
-#: /home/drepper/gnu/gettext/build/src/../../src/po-gram-gen.y:129
+#: src/open-po.c:64
+msgid "<stdin>"
+msgstr ""
+
+#: po-gram-gen.y:87
+msgid "inconsistent use of #~"
+msgstr ""
+
+#: po-gram-gen.y:168
+#, fuzzy
+msgid "missing `msgstr[]' section"
+msgstr "ontbrekend `msgstr' gedeelte"
+
+#: po-gram-gen.y:176
+#, fuzzy
+msgid "missing `msgid_plural' section"
+msgstr "ontbrekend `msgstr' gedeelte"
+
+#: po-gram-gen.y:183
msgid "missing `msgstr' section"
msgstr "ontbrekend `msgstr' gedeelte"
-#: src/po-lex.c:84
-#, c-format
-msgid "found %d fatal errors"
-msgstr "%d fatale fouten gevonden"
+#: po-gram-gen.y:228
+msgid "first plural form has nonzero index"
+msgstr ""
-#: src/po-lex.c:129 src/po-lex.c:168
+#: po-gram-gen.y:230
+msgid "plural form has wrong index"
+msgstr ""
+
+#. CAUTION: If you change this macro, you must also make identical
+#. changes to the function of the same name in src/po-lex.c
+#: src/po-lex.c:156 src/po-lex.c:195 src/po-lex.h:85 src/po-lex.h:99
+#: src/po-lex.h:115 src/po-lex.h:129
msgid "too many errors, aborting"
msgstr "te veel fouten, afgebroken"
-#: src/po-lex.c:241
+#: src/po-lex.c:271
#, c-format
msgid "keyword \"%s\" unknown"
msgstr "sleutelwoord \"%s\" onbekend"
-#: src/po-lex.c:335
+#: src/po-lex.c:374
#, fuzzy
msgid "invalid control sequence"
msgstr "illegale kontrol sequence"
-#: src/po-lex.c:419
+#: src/po-lex.c:477
+msgid "end-of-file within string"
+msgstr "einde-bestand-teken in string"
+
+#: src/po-lex.c:482
msgid "end-of-line within string"
msgstr "einde-regel-teken in string"
-#: src/po-lex.c:424
-msgid "end-of-file within string"
-msgstr "einde-bestand-teken in string"
+#: src/po-lex.c:525
+#, fuzzy
+msgid "invalid multibyte sequence"
+msgstr "illegale kontrol sequence"
-#: src/xget-lex.c:152
+#: src/xget-lex.c:148
msgid "standard input"
msgstr "standaard invoer"
-#: src/xget-lex.c:894
+#: src/xget-lex.c:876
#, c-format
msgid "%s:%d: warning: unterminated character constant"
msgstr "%s:%d: let op: niet getermineerde karakter konstante"
-#: src/xget-lex.c:916
+#: src/xget-lex.c:898
#, c-format
msgid "%s:%d: warning: unterminated string literal"
msgstr "%s:%d: let op: niet getermineerde string literal"
-#: src/xgettext.c:386
+#: src/xgettext.c:383
msgid "--join-existing cannot be used when output is written to stdout"
msgstr ""
"--join-existing kan niet gebruikt worden indien uitvoer naar "
"standaarduitvoer\n"
"wordt geschreven"
-#: src/xgettext.c:391
+#: src/xgettext.c:388
msgid "xgettext cannot work without keywords to look for"
msgstr ""
-#: src/xgettext.c:508
+#: src/xgettext.c:494
#, c-format
msgid "warning: file `%s' extension `%s' is unknown; will try C"
msgstr "let op: bestand `%s' extensie `%s' is onbekend; ga C proberen"
-#: src/xgettext.c:544
+#: src/xgettext.c:530
#, fuzzy, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] INPUTFILE ...\n"
@@ -758,7 +802,7 @@ msgstr ""
" --foreign-user laat FSF kopierecht weg voor vreemde gebruiker\n"
" -F, --sort-by-file sorteer uitvoer bij bestandslokatie\n"
-#: src/xgettext.c:564
+#: src/xgettext.c:550
#, c-format, no-wrap
msgid ""
" -h, --help display this help and exit\n"
@@ -786,7 +830,7 @@ msgstr ""
" msgstr ingangen\n"
" --no-location geen '#: filename:line' regels\n"
-#: src/xgettext.c:578
+#: src/xgettext.c:564
#, no-wrap
msgid ""
" -n, --add-location generate '#: filename:line' lines (default)\n"
@@ -815,20 +859,35 @@ msgstr ""
"\n"
"Als INVOERBESTAND - is, lees standaardinvoer.\n"
-#: src/xgettext.c:879
+#: src/xgettext.c:926
#, fuzzy, c-format
msgid "%s:%d: warning: keyword nested in keyword arg"
msgstr "%s:%d: let op: niet getermineerde string literal"
-#: src/xgettext.c:889
+#: src/xgettext.c:936
#, c-format
msgid "%s:%d: warning: keyword between outer keyword and its arg"
msgstr ""
-#: src/xgettext.c:1374
+#: src/xgettext.c:1432
#, c-format
msgid "language `%s' unknown"
msgstr "taal `%s' onbekend"
+#~ msgid ""
+#~ "internationalized messages should not contain the `\\%c' escape sequence"
+#~ msgstr ""
+#~ "geonternationaliseerde meldingen mogen geen `\\%c' escape sequences "
+#~ "bevatten"
+
+#~ msgid "cannot create output file \"%s\""
+#~ msgstr "kan uitvoerbestand \"%s\" niet aanmaken"
+
+#~ msgid "standard output"
+#~ msgstr "standaard uitvoer"
+
+#~ msgid "error while writing \"%s\" file"
+#~ msgstr "fout bij schrijven bestand \"%s\""
+
#~ msgid "%s: warning: no header entry found"
#~ msgstr "%s: let op: geen header ingang gevonden"
diff --git a/po/nn.po b/po/nn.po
index 5419854..e337ae1 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: GNU gettext 0.10\n"
-"POT-Creation-Date: 2001-02-06 23:59+0100\n"
+"POT-Creation-Date: 2001-03-09 19:56+0100\n"
"PO-Revision-Date: 1996-03-21 08:46 EST\n"
"Last-Translator: Karl Anders Øygard <karlo@ifi.uio.no>\n"
"Language-Team: Norwegian-nynorsk <no@li.org>\n"
@@ -84,8 +84,8 @@ msgstr ""
msgid "Memory exhausted"
msgstr ""
-#: src/gettext.c:138 src/msgcmp.c:140 src/msgcomm.c:282 src/msgfmt.c:270
-#: src/msgmerge.c:254 src/msgunfmt.c:169 src/xgettext.c:397
+#: src/gettext.c:138 src/msgcmp.c:140 src/msgcomm.c:283 src/msgfmt.c:270
+#: src/msgmerge.c:255 src/msgunfmt.c:170 src/xgettext.c:398
#, c-format, no-wrap
msgid ""
"Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -93,8 +93,8 @@ msgid ""
"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
msgstr ""
-#: src/gettext.c:143 src/msgcmp.c:145 src/msgcomm.c:287 src/msgfmt.c:275
-#: src/msgmerge.c:259 src/msgunfmt.c:174 src/xgettext.c:402
+#: src/gettext.c:143 src/msgcmp.c:145 src/msgcomm.c:288 src/msgfmt.c:275
+#: src/msgmerge.c:260 src/msgunfmt.c:175 src/xgettext.c:403
#, c-format
msgid "Written by %s.\n"
msgstr ""
@@ -108,8 +108,8 @@ msgstr "manglar argument"
msgid "too many arguments"
msgstr "manglar argument"
-#: src/gettext.c:232 src/msgcmp.c:177 src/msgcomm.c:392 src/msgfmt.c:377
-#: src/msgmerge.c:314 src/msgunfmt.c:204 src/xgettext.c:535
+#: src/gettext.c:232 src/msgcmp.c:177 src/msgcomm.c:381 src/msgfmt.c:377
+#: src/msgmerge.c:315 src/msgunfmt.c:205 src/xgettext.c:525
#, fuzzy, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "Prøv «%s --help» for meir informasjon\n"
@@ -160,39 +160,17 @@ msgstr ""
"staden vert meldingar som er funne i den valgte katalogen oversatt.\n"
"Standard søkekatalog er: %s\n"
-#: src/gettext.c:259 src/msgcmp.c:196 src/msgcomm.c:439 src/msgfmt.c:404
-#: src/msgmerge.c:349 src/msgunfmt.c:228 src/xgettext.c:587
+#: src/gettext.c:259 src/msgcmp.c:196 src/msgcomm.c:428 src/msgfmt.c:404
+#: src/msgmerge.c:350 src/msgunfmt.c:229 src/xgettext.c:577
msgid "Report bugs to <bug-gnu-utils@gnu.org>.\n"
msgstr ""
-#: src/message.c:1006
-#, c-format
-msgid ""
-"internationalized messages should not contain the `\\%c' escape sequence"
-msgstr ""
-"internasjonaliserte meldingar skal ikkje innehalde escape-sekvensen «\\%c»"
-
-#: src/message.c:1385
-#, c-format
-msgid "cannot create output file \"%s\""
-msgstr "kan ikkje skape utfila \"%s\""
-
-#: src/message.c:1392
-#, no-c-format
-msgid "standard output"
-msgstr ""
-
-#: src/message.c:1452
-#, c-format
-msgid "error while writing \"%s\" file"
-msgstr "feil under skriving av fila \"%s\""
-
-#: src/msgcmp.c:156 src/msgmerge.c:270
+#: src/msgcmp.c:156 src/msgmerge.c:271
#, fuzzy
msgid "no input files given"
msgstr "inga innfil spesifisert"
-#: src/msgcmp.c:161 src/msgmerge.c:275
+#: src/msgcmp.c:161 src/msgmerge.c:276
msgid "exactly 2 input files required"
msgstr "treng nøyaktig to innfiler"
@@ -224,15 +202,15 @@ msgstr ""
"oversett alle meldingar i programmet. Der samsvar ikkje kan finnast, vert\n"
"«fuzzy» samanlikning brukt for å få betre diagnostikk.\n"
-#: src/msgcmp.c:255 src/msgmerge.c:740
+#: src/msgcmp.c:255 src/msgmerge.c:741
msgid "this message is used but not defined..."
msgstr "denne meldinga er brukt, men ikkje definert..."
-#: src/msgcmp.c:257 src/msgmerge.c:742
+#: src/msgcmp.c:257 src/msgmerge.c:743
msgid "...but this definition is similar"
msgstr "... men denne definisjonen liknar"
-#: src/msgcmp.c:263 src/msgmerge.c:769
+#: src/msgcmp.c:263 src/msgmerge.c:770
#, c-format
msgid "this message is used but not defined in %s"
msgstr "denne meldinga er brukt, men ikkje definert i %s"
@@ -241,42 +219,47 @@ msgstr "denne meldinga er brukt, men ikkje definert i %s"
msgid "warning: this message is not used"
msgstr "advarsel: denne meldinga er ikkje brukt"
-#: src/msgcmp.c:354 src/msgfmt.c:738 src/msgmerge.c:511 src/xgettext.c:1179
+#: src/msgcmp.c:282 src/po-lex.c:102
+#, fuzzy, c-format
+msgid "found %d fatal errors"
+msgstr "%s: fann %d fatale feil"
+
+#: src/msgcmp.c:354 src/msgfmt.c:657 src/msgmerge.c:512 src/xgettext.c:1169
msgid "duplicate message definition"
msgstr ""
-#: src/msgcmp.c:355 src/msgfmt.c:740 src/msgmerge.c:512 src/xgettext.c:1180
+#: src/msgcmp.c:355 src/msgfmt.c:659 src/msgmerge.c:513 src/xgettext.c:1170
#, fuzzy
msgid "...this is the location of the first definition"
msgstr "den første definisjonen finst her"
-#: src/msgcmp.c:395 src/msgmerge.c:560
+#: src/msgcmp.c:395 src/msgmerge.c:561
#, c-format
msgid "this message has no definition in the \"%s\" domain"
msgstr "denne meldinga har ingen definisjon i \"%s\"-domenet"
#. We are about to construct the absolute path to the
#. directory for the output files but asprintf failed.
-#: src/msgcomm.c:235 src/xgettext.c:336 src/xgettext.c:1375
+#: src/msgcomm.c:236 src/xgettext.c:337 src/xgettext.c:1365
msgid "while preparing output"
msgstr "under klargjering av utdata"
-#: src/msgcomm.c:270 src/msgcomm.c:274 src/xgettext.c:374 src/xgettext.c:378
+#: src/msgcomm.c:271 src/msgcomm.c:275 src/xgettext.c:375 src/xgettext.c:379
#, c-format
msgid "%s and %s are mutually exclusive"
msgstr "%s og %s utelukker kvarandre"
-#: src/msgcomm.c:338
+#: src/msgcomm.c:327
#, fuzzy
msgid "at least two files must be specified"
msgstr "nøyaktig to filer må spesifiserast"
-#: src/msgcomm.c:357
+#: src/msgcomm.c:346
#, c-format
msgid "impossible selection criteria specified (%d < n < %d)"
msgstr ""
-#: src/msgcomm.c:397
+#: src/msgcomm.c:386
#, fuzzy, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] INPUTFILE ...\n"
@@ -308,7 +291,7 @@ msgstr ""
" -i, --indent lag indentert utdata\n"
" -j, --join-existing flett saman meldingar med eksisterande fil\n"
-#: src/msgcomm.c:409
+#: src/msgcomm.c:398
#, fuzzy
msgid ""
" -i, --indent write the .po file using indented style\n"
@@ -337,7 +320,7 @@ msgstr ""
"\n"
"Dersom INNFIL er -, vil det verte lese frå standard inn.\n"
-#: src/msgcomm.c:422
+#: src/msgcomm.c:411
msgid ""
" -V, --version output version information and exit\n"
" -w, --width=NUMBER set output page width\n"
@@ -357,17 +340,17 @@ msgid ""
"preserved.\n"
msgstr ""
-#: src/msgcomm.c:473 src/msgunfmt.c:360 src/po-lex.c:81 src/xget-lex.c:157
-#: src/xget-lex.c:172 src/xget-lex.c:189 src/xgettext.c:621
+#: src/msgcomm.c:462 src/msgunfmt.c:361 src/po-lex.c:86 src/xget-lex.c:157
+#: src/xget-lex.c:170 src/xget-lex.c:180 src/xgettext.c:611
#, fuzzy, c-format
msgid "error while opening \"%s\" for reading"
msgstr "feil under skriving av fila \"%s\""
-#: src/msgcomm.c:554 src/xgettext.c:663 src/xgettext.c:1081
+#: src/msgcomm.c:543 src/xgettext.c:653 src/xgettext.c:1071
msgid "this file may not contain domain directives"
msgstr "denne fila kan innehalde domene-nøkkelord"
-#: src/msgfmt.c:286 src/xgettext.c:413
+#: src/msgfmt.c:286 src/xgettext.c:414
msgid "no input file given"
msgstr "inga innfil spesifisert"
@@ -483,66 +466,52 @@ msgstr ""
msgid "field `%s' still has initial default value"
msgstr ""
-#: src/msgfmt.c:680
-#, c-format
-msgid ""
-"%s: warning: charset \"%s\" is not a portable encoding name\n"
-"%*s warning: charset conversion might not work"
-msgstr ""
-
-#: src/msgfmt.c:687
-#, c-format
-msgid ""
-"%s: warning: charset missing in header\n"
-"%*s warning: charset conversion will not work"
-msgstr ""
-
-#: src/msgfmt.c:779
+#: src/msgfmt.c:698
#, c-format
msgid "%s: warning: source file contains fuzzy translation"
msgstr ""
-#: src/msgfmt.c:1001
+#: src/msgfmt.c:920
#, fuzzy
msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
msgstr "«msgid»- og «msgstr»-verdiane byrjarr ikkje båe med '\\n'"
-#: src/msgfmt.c:1009
+#: src/msgfmt.c:928
#, fuzzy, c-format
msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
msgstr "«msgid»- og «msgstr»-verdiane byrjarr ikkje båe med '\\n'"
-#: src/msgfmt.c:1019
+#: src/msgfmt.c:938
#, fuzzy
msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
msgstr "«msgid»- og «msgstr»-verdiane byrjarr ikkje båe med '\\n'"
-#: src/msgfmt.c:1034
+#: src/msgfmt.c:953
#, fuzzy
msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
msgstr "«msgid»- og «msgstr»-verdiane sluttar ikkje båe med '\\n'"
-#: src/msgfmt.c:1042
+#: src/msgfmt.c:961
#, fuzzy, c-format
msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
msgstr "«msgid»- og «msgstr»-verdiane sluttar ikkje båe med '\\n'"
-#: src/msgfmt.c:1052
+#: src/msgfmt.c:971
#, fuzzy
msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
msgstr "«msgid»- og «msgstr»-verdiane sluttar ikkje båe med '\\n'"
-#: src/msgfmt.c:1068
+#: src/msgfmt.c:987
msgid "number of format specifications in `msgid' and `msgstr' does not match"
msgstr ""
"antall format-spesifiseringar i «msgid» og «msgstr» stemmer ikkje overeins"
-#: src/msgfmt.c:1085
+#: src/msgfmt.c:1004
#, c-format
msgid "format specifications for argument %u are not the same"
msgstr "format-spesifiseringane for argument %u er ulike"
-#: src/msgmerge.c:319
+#: src/msgmerge.c:320
#, fuzzy, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] def.po ref.po\n"
@@ -573,7 +542,7 @@ msgstr ""
" -S, --strict lag strengt Uniforum-konformt utdata\n"
" -V, --version vis programversjon og avslutt\n"
-#: src/msgmerge.c:339
+#: src/msgmerge.c:340
#, no-wrap
msgid ""
"\n"
@@ -599,18 +568,18 @@ msgstr ""
"resultat. Resultatet vert skrive til standard ut, med mindre ei utfil er\n"
"spesifisert.\n"
-#: src/msgmerge.c:798
+#: src/msgmerge.c:799
#, c-format
msgid ""
-"%sRead %d old + %d reference, merged %d, fuzzied %d, missing %d, obsolete "
-"%d.\n"
+"%sRead %d old + %d reference, merged %d, fuzzied %d, missing %d, obsolete %"
+"d.\n"
msgstr ""
-#: src/msgmerge.c:804
+#: src/msgmerge.c:805
msgid " done.\n"
msgstr ""
-#: src/msgunfmt.c:209
+#: src/msgunfmt.c:210
#, fuzzy, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] [FILE]...\n"
@@ -635,7 +604,7 @@ msgstr ""
" -S, --strict lag strengt Uniforum-konformt utdata\n"
" -V, --version vis programversjon og avslutt\n"
-#: src/msgunfmt.c:223
+#: src/msgunfmt.c:224
#, fuzzy, no-wrap
msgid ""
"\n"
@@ -649,112 +618,118 @@ msgstr ""
"«big-endian» .mo filer vert håndtert. Dersom innfil er -, blir standard\n"
"inn lest. Dersom utfil er -, vert det skrive til standard ut.\n"
-#: src/msgunfmt.c:260 src/msgunfmt.c:325 src/po-lex.c:194 src/xget-lex.c:252
+#: src/msgunfmt.c:261 src/msgunfmt.c:326 src/po-lex.c:213 src/xget-lex.c:243
#, fuzzy, c-format
msgid "error while reading \"%s\""
msgstr "feil under skriving av fila \"%s\""
-#: src/msgunfmt.c:261 src/msgunfmt.c:326
+#: src/msgunfmt.c:262 src/msgunfmt.c:327
#, c-format
msgid "file \"%s\" truncated"
msgstr "filen \"%s\" er avkutta"
-#: src/msgunfmt.c:292
+#: src/msgunfmt.c:293
#, c-format
msgid "seek \"%s\" offset %ld failed"
msgstr "«seek» \"%s\" posisjon %ld feila"
-#: src/msgunfmt.c:331
+#: src/msgunfmt.c:332
#, fuzzy, c-format
msgid "file \"%s\" contains a not NUL terminated string"
msgstr "fila \"%s\" er ikkje i GNU .mo-format"
-#: src/msgunfmt.c:376
+#: src/msgunfmt.c:377
#, c-format
msgid "file \"%s\" is not in GNU .mo format"
msgstr "fila \"%s\" er ikkje i GNU .mo-format"
-#: src/open-po.c:65
+#: src/open-po.c:64
msgid "<stdin>"
msgstr ""
-#: po-gram-gen.y:142
+#: po-gram-gen.y:87
+msgid "inconsistent use of #~"
+msgstr ""
+
+#: po-gram-gen.y:168
#, fuzzy
msgid "missing `msgstr[]' section"
msgstr "manglar «msgstr»-seksjon"
-#: po-gram-gen.y:148
+#: po-gram-gen.y:176
#, fuzzy
msgid "missing `msgid_plural' section"
msgstr "manglar «msgstr»-seksjon"
-#: po-gram-gen.y:154
+#: po-gram-gen.y:183
msgid "missing `msgstr' section"
msgstr "manglar «msgstr»-seksjon"
-#: po-gram-gen.y:190
+#: po-gram-gen.y:228
msgid "first plural form has nonzero index"
msgstr ""
-#: po-gram-gen.y:192
+#: po-gram-gen.y:230
msgid "plural form has wrong index"
msgstr ""
-#: src/po-lex.c:92
-#, fuzzy, c-format
-msgid "found %d fatal errors"
-msgstr "%s: fann %d fatale feil"
-
-#: src/po-lex.c:137 src/po-lex.c:176
+#. CAUTION: If you change this macro, you must also make identical
+#. changes to the function of the same name in src/po-lex.c
+#: src/po-lex.c:156 src/po-lex.c:195 src/po-lex.h:85 src/po-lex.h:99
+#: src/po-lex.h:115 src/po-lex.h:129
#, fuzzy
msgid "too many errors, aborting"
msgstr "%s: for mange feil, avsluttar"
-#: src/po-lex.c:252
+#: src/po-lex.c:271
#, c-format
msgid "keyword \"%s\" unknown"
msgstr ""
-#: src/po-lex.c:355
+#: src/po-lex.c:374
msgid "invalid control sequence"
msgstr ""
-#: src/po-lex.c:441
+#: src/po-lex.c:477
+msgid "end-of-file within string"
+msgstr ""
+
+#: src/po-lex.c:482
msgid "end-of-line within string"
msgstr ""
-#: src/po-lex.c:446
-msgid "end-of-file within string"
+#: src/po-lex.c:525
+msgid "invalid multibyte sequence"
msgstr ""
#: src/xget-lex.c:148
msgid "standard input"
msgstr ""
-#: src/xget-lex.c:885
+#: src/xget-lex.c:876
#, c-format
msgid "%s:%d: warning: unterminated character constant"
msgstr ""
-#: src/xget-lex.c:907
+#: src/xget-lex.c:898
#, c-format
msgid "%s:%d: warning: unterminated string literal"
msgstr ""
-#: src/xgettext.c:382
+#: src/xgettext.c:383
msgid "--join-existing cannot be used when output is written to stdout"
msgstr ""
-#: src/xgettext.c:387
+#: src/xgettext.c:388
msgid "xgettext cannot work without keywords to look for"
msgstr ""
-#: src/xgettext.c:504
+#: src/xgettext.c:494
#, c-format
msgid "warning: file `%s' extension `%s' is unknown; will try C"
msgstr ""
-#: src/xgettext.c:540
+#: src/xgettext.c:530
#, fuzzy, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] INPUTFILE ...\n"
@@ -793,7 +768,7 @@ msgstr ""
" -i, --indent lag indentert utdata\n"
" -j, --join-existing flett saman meldingar med eksisterande fil\n"
-#: src/xgettext.c:560
+#: src/xgettext.c:550
#, fuzzy, c-format, no-wrap
msgid ""
" -h, --help display this help and exit\n"
@@ -820,7 +795,7 @@ msgstr ""
" -n, --add-location lag «#: filenavn:linje»-linjer (forvalgt)\n"
" --omit-header ikkje lag startseksjon med «msgid \"\"»\n"
-#: src/xgettext.c:574
+#: src/xgettext.c:564
#, fuzzy, no-wrap
msgid ""
" -n, --add-location generate '#: filename:line' lines (default)\n"
@@ -846,21 +821,32 @@ msgstr ""
"\n"
"Dersom INNFIL er -, vil det verte lese frå standard inn.\n"
-#: src/xgettext.c:936
+#: src/xgettext.c:926
#, c-format
msgid "%s:%d: warning: keyword nested in keyword arg"
msgstr ""
-#: src/xgettext.c:946
+#: src/xgettext.c:936
#, c-format
msgid "%s:%d: warning: keyword between outer keyword and its arg"
msgstr ""
-#: src/xgettext.c:1444
+#: src/xgettext.c:1432
#, c-format
msgid "language `%s' unknown"
msgstr ""
+#~ msgid ""
+#~ "internationalized messages should not contain the `\\%c' escape sequence"
+#~ msgstr ""
+#~ "internasjonaliserte meldingar skal ikkje innehalde escape-sekvensen «\\%c»"
+
+#~ msgid "cannot create output file \"%s\""
+#~ msgstr "kan ikkje skape utfila \"%s\""
+
+#~ msgid "error while writing \"%s\" file"
+#~ msgstr "feil under skriving av fila \"%s\""
+
#~ msgid "this is the location of the first definition"
#~ msgstr "den første definisjonen finst her"
diff --git a/po/no.po b/po/no.po
index 89bcc00..a0de753 100644
--- a/po/no.po
+++ b/po/no.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: GNU gettext 0.10.12\n"
-"POT-Creation-Date: 2001-01-08 00:16+0100\n"
+"POT-Creation-Date: 2001-03-09 19:56+0100\n"
"PO-Revision-Date: 1999-08-06 22:38+02:00\n"
"Last-Translator: Trond Endrestøl <endrestol@hotmail.com>\n"
"Language-Team: Norwegian-bokmål <no@li.org>\n"
@@ -13,7 +13,7 @@ msgstr ""
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8-bit\n"
-#: lib/error.c:109
+#: lib/error.c:115
msgid "Unknown system error"
msgstr "Ukjent systemfeil"
@@ -87,8 +87,8 @@ msgstr "Minnet oppbrukt"
# Hva skal MERCHANTABILITY og FITNESS FOR PARTICULAR PURPOSE oversettes med?
# Er denne oversettelsen grei nok?
-#: src/gettext.c:138 src/msgcmp.c:140 src/msgcomm.c:282 src/msgfmt.c:270
-#: src/msgmerge.c:254 src/msgunfmt.c:169 src/xgettext.c:397
+#: src/gettext.c:138 src/msgcmp.c:140 src/msgcomm.c:283 src/msgfmt.c:270
+#: src/msgmerge.c:255 src/msgunfmt.c:170 src/xgettext.c:398
#, c-format, no-wrap
msgid ""
"Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -99,8 +99,8 @@ msgstr ""
"Dette er fri pogramvare; se kildekoden for kopieringsbetingelser. Det finnes\n"
"INGEN garanti; ikke engang for SALGBARHET eller SKIKKETHET FOR ET BESTEMT FORMÅL.\n"
-#: src/gettext.c:143 src/msgcmp.c:145 src/msgcomm.c:287 src/msgfmt.c:275
-#: src/msgmerge.c:259 src/msgunfmt.c:174 src/xgettext.c:402
+#: src/gettext.c:143 src/msgcmp.c:145 src/msgcomm.c:288 src/msgfmt.c:275
+#: src/msgmerge.c:260 src/msgunfmt.c:175 src/xgettext.c:403
#, c-format
msgid "Written by %s.\n"
msgstr "Skrevet av %s.\n"
@@ -113,8 +113,8 @@ msgstr "mangler argumenter"
msgid "too many arguments"
msgstr "for mange argumenter"
-#: src/gettext.c:232 src/msgcmp.c:177 src/msgcomm.c:392 src/msgfmt.c:374
-#: src/msgmerge.c:314 src/msgunfmt.c:204 src/xgettext.c:535
+#: src/gettext.c:232 src/msgcmp.c:177 src/msgcomm.c:381 src/msgfmt.c:377
+#: src/msgmerge.c:315 src/msgunfmt.c:205 src/xgettext.c:525
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "Prøv «%s --help» for mer informasjon.\n"
@@ -164,38 +164,16 @@ msgstr ""
"stedet blir meldinger i den valgte katalogen oversatt.\n"
"Standard søkekatalog er: %s\n"
-#: src/gettext.c:259 src/msgcmp.c:196 src/msgcomm.c:439 src/msgfmt.c:401
-#: src/msgmerge.c:349 src/msgunfmt.c:228 src/xgettext.c:587
+#: src/gettext.c:259 src/msgcmp.c:196 src/msgcomm.c:428 src/msgfmt.c:404
+#: src/msgmerge.c:350 src/msgunfmt.c:229 src/xgettext.c:577
msgid "Report bugs to <bug-gnu-utils@gnu.org>.\n"
msgstr "Rapporter feil til <bug-gnu-utils@gnu.org>.\n"
-#: src/message.c:1006
-#, c-format
-msgid ""
-"internationalized messages should not contain the `\\%c' escape sequence"
-msgstr ""
-"internasjonaliserte meldinger bør ikke inneholde escape-sekvensen «\\%c»"
-
-#: src/message.c:1385
-#, c-format
-msgid "cannot create output file \"%s\""
-msgstr "kan ikke opprette utfilen «%s»"
-
-#: src/message.c:1392
-#, no-c-format
-msgid "standard output"
-msgstr "standard ut"
-
-#: src/message.c:1452
-#, c-format
-msgid "error while writing \"%s\" file"
-msgstr "feil under skriving av filen «%s»"
-
-#: src/msgcmp.c:156 src/msgmerge.c:270
+#: src/msgcmp.c:156 src/msgmerge.c:271
msgid "no input files given"
msgstr "ingen innfiler angitt"
-#: src/msgcmp.c:161 src/msgmerge.c:275
+#: src/msgcmp.c:161 src/msgmerge.c:276
msgid "exactly 2 input files required"
msgstr "trenger nøyaktig to innfiler"
@@ -228,15 +206,15 @@ msgstr ""
"alle meldingene i programmet ditt. Når en eksakt overensstemmelse ikke\n"
"finnes, blir «fuzzy»-sammenligning brukt for å få en bedre diagnostikk.\n"
-#: src/msgcmp.c:255 src/msgmerge.c:740
+#: src/msgcmp.c:255 src/msgmerge.c:741
msgid "this message is used but not defined..."
msgstr "denne meldingen er brukt, men ikke definert..."
-#: src/msgcmp.c:257 src/msgmerge.c:742
+#: src/msgcmp.c:257 src/msgmerge.c:743
msgid "...but this definition is similar"
msgstr "... men denne definisjonen ligner"
-#: src/msgcmp.c:263 src/msgmerge.c:769
+#: src/msgcmp.c:263 src/msgmerge.c:770
#, c-format
msgid "this message is used but not defined in %s"
msgstr "denne meldingen er brukt, men ikke definert i %s"
@@ -245,40 +223,45 @@ msgstr "denne meldingen er brukt, men ikke definert i %s"
msgid "warning: this message is not used"
msgstr "advarsel: denne meldingen er ikke brukt"
-#: src/msgcmp.c:354 src/msgfmt.c:735 src/msgmerge.c:511 src/xgettext.c:1179
+#: src/msgcmp.c:282 src/po-lex.c:102
+#, c-format
+msgid "found %d fatal errors"
+msgstr "fant %d fatale feil"
+
+#: src/msgcmp.c:354 src/msgfmt.c:657 src/msgmerge.c:512 src/xgettext.c:1169
msgid "duplicate message definition"
msgstr "duplisert definisjon av melding"
-#: src/msgcmp.c:355 src/msgfmt.c:737 src/msgmerge.c:512 src/xgettext.c:1180
+#: src/msgcmp.c:355 src/msgfmt.c:659 src/msgmerge.c:513 src/xgettext.c:1170
msgid "...this is the location of the first definition"
msgstr "... dette er lokasjonen til den første definisjonen"
-#: src/msgcmp.c:395 src/msgmerge.c:560
+#: src/msgcmp.c:395 src/msgmerge.c:561
#, c-format
msgid "this message has no definition in the \"%s\" domain"
msgstr "denne meldingen har ingen definisjon i «%s»-domenet"
#. We are about to construct the absolute path to the
#. directory for the output files but asprintf failed.
-#: src/msgcomm.c:235 src/xgettext.c:336 src/xgettext.c:1375
+#: src/msgcomm.c:236 src/xgettext.c:337 src/xgettext.c:1365
msgid "while preparing output"
msgstr "under klargjøring av utdata"
-#: src/msgcomm.c:270 src/msgcomm.c:274 src/xgettext.c:374 src/xgettext.c:378
+#: src/msgcomm.c:271 src/msgcomm.c:275 src/xgettext.c:375 src/xgettext.c:379
#, c-format
msgid "%s and %s are mutually exclusive"
msgstr "%s og %s utelukker hverandre"
-#: src/msgcomm.c:338
+#: src/msgcomm.c:327
msgid "at least two files must be specified"
msgstr "minst to filer må angis"
-#: src/msgcomm.c:357
+#: src/msgcomm.c:346
#, c-format
msgid "impossible selection criteria specified (%d < n < %d)"
msgstr "umulig utvalgskriterie angitt (%d < n < %d)"
-#: src/msgcomm.c:397
+#: src/msgcomm.c:386
#, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] INPUTFILE ...\n"
@@ -303,7 +286,7 @@ msgstr ""
" -F, --sort-by-file sorter utdata etter fillokasjon\n"
" -h, --help vise denne hjelpen og avslutte\n"
-#: src/msgcomm.c:409
+#: src/msgcomm.c:398
#, fuzzy
msgid ""
" -i, --indent write the .po file using indented style\n"
@@ -335,7 +318,7 @@ msgstr ""
" -u, --unique kortform --less-than=2, krever\n"
" at bare unike meldinger blir skrevet ut\n"
-#: src/msgcomm.c:422
+#: src/msgcomm.c:411
msgid ""
" -V, --version output version information and exit\n"
" -w, --width=NUMBER set output page width\n"
@@ -372,41 +355,41 @@ msgstr ""
"PO-filen som definerer dem. Filposisjonene fra alle PO-filene vil\n"
"bli bevart.\n"
-#: src/msgcomm.c:473 src/msgunfmt.c:357 src/po-lex.c:81 src/xget-lex.c:157
-#: src/xget-lex.c:172 src/xget-lex.c:189 src/xgettext.c:621
+#: src/msgcomm.c:462 src/msgunfmt.c:361 src/po-lex.c:86 src/xget-lex.c:157
+#: src/xget-lex.c:170 src/xget-lex.c:180 src/xgettext.c:611
#, c-format
msgid "error while opening \"%s\" for reading"
msgstr "feil under åpning av «%s» for lesing"
-#: src/msgcomm.c:554 src/xgettext.c:663 src/xgettext.c:1081
+#: src/msgcomm.c:543 src/xgettext.c:653 src/xgettext.c:1071
msgid "this file may not contain domain directives"
msgstr "denne filen kan ikke inneholde domene-direktiver"
-#: src/msgfmt.c:286 src/xgettext.c:413
+#: src/msgfmt.c:286 src/xgettext.c:414
msgid "no input file given"
msgstr "ingen innfil angitt"
-#: src/msgfmt.c:334
+#: src/msgfmt.c:337
#, c-format
msgid "error while opening \"%s\" for writing"
msgstr "feil under åpning av «%s» for skriving"
-#: src/msgfmt.c:356
+#: src/msgfmt.c:359
#, c-format
msgid "%d translated messages"
msgstr "%d oversatte meldinger"
-#: src/msgfmt.c:358
+#: src/msgfmt.c:361
#, c-format
msgid ", %d fuzzy translations"
msgstr ", %d antatte oversettelser"
-#: src/msgfmt.c:360
+#: src/msgfmt.c:363
#, c-format
msgid ", %d untranslated messages"
msgstr ", %d uoversatte meldinger"
-#: src/msgfmt.c:379
+#: src/msgfmt.c:382
#, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] filename.po ...\n"
@@ -451,121 +434,107 @@ msgstr ""
"Dersom innfil er -, vil inndata bli lest fra standard inn. Dersom utfil er -,\n"
"vil utdata bli skrevet til standard ut.\n"
-#: src/msgfmt.c:422
+#: src/msgfmt.c:425
msgid "while creating hash table"
msgstr "mens hash-tabellen ble laget"
-#: src/msgfmt.c:466
+#: src/msgfmt.c:469
#, fuzzy, c-format
msgid ""
"%s: warning: PO file header missing, fuzzy, or invalid\n"
"%*s warning: charset conversion will not work"
msgstr "%s: advarselL: kildefil har antatte oversettelser"
-#: src/msgfmt.c:490
+#: src/msgfmt.c:493
#, c-format
msgid "domain name \"%s\" not suitable as file name"
msgstr "domenenavnet «%s» passer ikke som filnavn"
-#: src/msgfmt.c:495
+#: src/msgfmt.c:498
#, c-format
msgid "domain name \"%s\" not suitable as file name: will use prefix"
msgstr "domenenavnet «%s» passer ikke som filnavn: bruker prefiks"
#. We don't change the exit status here because this is really
#. only an information.
-#: src/msgfmt.c:508
+#: src/msgfmt.c:511
#, c-format
msgid "`domain %s' directive ignored"
msgstr "nøkkelord «domain %s» ignorert"
-#: src/msgfmt.c:538
+#: src/msgfmt.c:541
msgid "empty `msgstr' entry ignored"
msgstr "tom «msgstr»-linje ignorert"
-#: src/msgfmt.c:539
+#: src/msgfmt.c:542
msgid "fuzzy `msgstr' entry ignored"
msgstr "antatt «msgstr»-linje ignorert"
-#: src/msgfmt.c:581
+#: src/msgfmt.c:584
#, c-format
msgid "headerfield `%s' missing in header"
msgstr "filhodefelt «%s» mangler i filhode"
-#: src/msgfmt.c:584
+#: src/msgfmt.c:587
#, c-format
msgid "header field `%s' should start at beginning of line"
msgstr "filhodefelt «%s» skulle ha startet ved begynnelsen av linjen"
-#: src/msgfmt.c:594
+#: src/msgfmt.c:597
msgid "some header fields still have the initial default value"
msgstr "noen filhodefelt har fremdeles sin initielle verdi"
-#: src/msgfmt.c:605
+#: src/msgfmt.c:608
#, c-format
msgid "field `%s' still has initial default value"
msgstr "feltet «%s» har fremdeles sin forvalgte verdi"
-#: src/msgfmt.c:677
-#, c-format
-msgid ""
-"%s: warning: charset \"%s\" is not a portable encoding name\n"
-"%*s warning: charset conversion might not work"
-msgstr ""
-
-#: src/msgfmt.c:684
-#, c-format
-msgid ""
-"%s: warning: charset missing in header\n"
-"%*s warning: charset conversion will not work"
-msgstr ""
-
-#: src/msgfmt.c:776
+#: src/msgfmt.c:698
#, c-format
msgid "%s: warning: source file contains fuzzy translation"
msgstr "%s: advarselL: kildefil har antatte oversettelser"
-#: src/msgfmt.c:998
+#: src/msgfmt.c:920
#, fuzzy
msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
msgstr "«msgid»- og «msgstr»-verdiene begynner ikke begge med `\\n'"
-#: src/msgfmt.c:1006
+#: src/msgfmt.c:928
#, fuzzy, c-format
msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
msgstr "«msgid»- og «msgstr»-verdiene begynner ikke begge med `\\n'"
-#: src/msgfmt.c:1016
+#: src/msgfmt.c:938
#, fuzzy
msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
msgstr "«msgid»- og «msgstr»-verdiene begynner ikke begge med `\\n'"
-#: src/msgfmt.c:1031
+#: src/msgfmt.c:953
#, fuzzy
msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
msgstr "«msgid»- og «msgstr»-verdiene slutter ikke begge med `\\n'"
-#: src/msgfmt.c:1039
+#: src/msgfmt.c:961
#, fuzzy, c-format
msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
msgstr "«msgid»- og «msgstr»-verdiene slutter ikke begge med `\\n'"
-#: src/msgfmt.c:1049
+#: src/msgfmt.c:971
#, fuzzy
msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
msgstr "«msgid»- og «msgstr»-verdiene slutter ikke begge med `\\n'"
-#: src/msgfmt.c:1065
+#: src/msgfmt.c:987
msgid "number of format specifications in `msgid' and `msgstr' does not match"
msgstr ""
"antall format-spesifiseringer i «msgid» og «msgstr» stemmer ikke overens"
-#: src/msgfmt.c:1082
+#: src/msgfmt.c:1004
#, c-format
msgid "format specifications for argument %u are not the same"
msgstr "format-spesifiseringene for argument %u er ulike"
-#: src/msgmerge.c:319
+#: src/msgmerge.c:320
#, fuzzy, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] def.po ref.po\n"
@@ -602,7 +571,7 @@ msgstr ""
" -V, --version skriv ut programversjon og avslutt\n"
" -w, --width=ANTALL sett sidebredden i utdata\n"
-#: src/msgmerge.c:339
+#: src/msgmerge.c:340
#, no-wrap
msgid ""
"\n"
@@ -628,20 +597,20 @@ msgstr ""
"resultater. Resultatet blir skrevet til standard ut, med mindre en utfil\n"
"er spesifisert.\n"
-#: src/msgmerge.c:798
+#: src/msgmerge.c:799
#, c-format
msgid ""
-"%sRead %d old + %d reference, merged %d, fuzzied %d, missing %d, obsolete "
-"%d.\n"
+"%sRead %d old + %d reference, merged %d, fuzzied %d, missing %d, obsolete %"
+"d.\n"
msgstr ""
"%sLeste %d gamle + %d referanser, flettet %d, antok %d, mangler %d,foreldete "
"%d.\n"
-#: src/msgmerge.c:804
+#: src/msgmerge.c:805
msgid " done.\n"
msgstr " ferdig.\n"
-#: src/msgunfmt.c:209
+#: src/msgunfmt.c:210
#, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] [FILE]...\n"
@@ -668,7 +637,7 @@ msgstr ""
" -V, --version skriv ut programversjon og avslutt\n"
" -w, --width=ANTALL sett sidebredden i utdata\n"
-#: src/msgunfmt.c:223
+#: src/msgunfmt.c:224
#, no-wrap
msgid ""
"\n"
@@ -683,116 +652,120 @@ msgstr ""
"Dersom innfil er -, blir standard inn lest.\n"
"Dersom intet annet er spesifisert, blir det skrevet til standard ut.\n"
-#: src/msgunfmt.c:260 src/msgunfmt.c:325 src/po-lex.c:194 src/xget-lex.c:252
+#: src/msgunfmt.c:261 src/msgunfmt.c:326 src/po-lex.c:213 src/xget-lex.c:243
#, c-format
msgid "error while reading \"%s\""
msgstr "feil under lesing av «%s»"
-#: src/msgunfmt.c:261 src/msgunfmt.c:326
+#: src/msgunfmt.c:262 src/msgunfmt.c:327
#, c-format
msgid "file \"%s\" truncated"
msgstr "filen «%s» er avkuttet"
-#: src/msgunfmt.c:292
+#: src/msgunfmt.c:293
#, c-format
msgid "seek \"%s\" offset %ld failed"
msgstr "«seek» «%s» posisjon %ld mislyktes"
-#: src/msgunfmt.c:331
+#: src/msgunfmt.c:332
#, fuzzy, c-format
msgid "file \"%s\" contains a not NUL terminated string"
msgstr "filen «%s» er ikke i GNU .mo-format"
-#: src/msgunfmt.c:373
+#: src/msgunfmt.c:377
#, c-format
msgid "file \"%s\" is not in GNU .mo format"
msgstr "filen «%s» er ikke i GNU .mo-format"
-#: src/open-po.c:65
+#: src/open-po.c:64
msgid "<stdin>"
msgstr ""
-#: po-gram-gen.y:142
+#: po-gram-gen.y:87
+msgid "inconsistent use of #~"
+msgstr ""
+
+#: po-gram-gen.y:168
#, fuzzy
msgid "missing `msgstr[]' section"
msgstr "mangler «msgstr»-seksjon"
-#: po-gram-gen.y:148
+#: po-gram-gen.y:176
#, fuzzy
msgid "missing `msgid_plural' section"
msgstr "mangler «msgstr»-seksjon"
-#: po-gram-gen.y:154
+#: po-gram-gen.y:183
msgid "missing `msgstr' section"
msgstr "mangler «msgstr»-seksjon"
-#: po-gram-gen.y:190
+#: po-gram-gen.y:228
msgid "first plural form has nonzero index"
msgstr ""
-#: po-gram-gen.y:192
+#: po-gram-gen.y:230
msgid "plural form has wrong index"
msgstr ""
#. CAUTION: If you change this macro, you must also make identical
#. changes to the function of the same name in src/po-lex.c
-#: src/po-lex.c:137 src/po-lex.c:176 src/po-lex.h:71 src/po-lex.h:85
-#: src/po-lex.h:101 src/po-lex.h:115
+#: src/po-lex.c:156 src/po-lex.c:195 src/po-lex.h:85 src/po-lex.h:99
+#: src/po-lex.h:115 src/po-lex.h:129
msgid "too many errors, aborting"
msgstr "for mange feil, avbryter"
-#: src/po-lex.c:92
-#, c-format
-msgid "found %d fatal errors"
-msgstr "fant %d fatale feil"
-
-#: src/po-lex.c:252
+#: src/po-lex.c:271
#, c-format
msgid "keyword \"%s\" unknown"
msgstr "nøkkelord «%s» ukjent"
-#: src/po-lex.c:355
+#: src/po-lex.c:374
#, fuzzy
msgid "invalid control sequence"
msgstr "ulovlig kontrollsekvens"
-#: src/po-lex.c:441
+#: src/po-lex.c:477
+msgid "end-of-file within string"
+msgstr "slutt-på-fil inne i streng"
+
+#: src/po-lex.c:482
msgid "end-of-line within string"
msgstr "slutt-på-linje inne i streng"
-#: src/po-lex.c:446
-msgid "end-of-file within string"
-msgstr "slutt-på-fil inne i streng"
+#: src/po-lex.c:525
+#, fuzzy
+msgid "invalid multibyte sequence"
+msgstr "ulovlig kontrollsekvens"
#: src/xget-lex.c:148
msgid "standard input"
msgstr "standard inn"
-#: src/xget-lex.c:885
+#: src/xget-lex.c:876
#, c-format
msgid "%s:%d: warning: unterminated character constant"
msgstr "%s:%d: advarsel: uavsluttet tegnkonstant"
-#: src/xget-lex.c:907
+#: src/xget-lex.c:898
#, c-format
msgid "%s:%d: warning: unterminated string literal"
msgstr "%s:%d: advarsel: uavsluttet strengliteral"
-#: src/xgettext.c:382
+#: src/xgettext.c:383
msgid "--join-existing cannot be used when output is written to stdout"
msgstr ""
"--join-existing kan ikke brukes når utdata blir skrevet til standard ut"
-#: src/xgettext.c:387
+#: src/xgettext.c:388
msgid "xgettext cannot work without keywords to look for"
msgstr ""
-#: src/xgettext.c:504
+#: src/xgettext.c:494
#, c-format
msgid "warning: file `%s' extension `%s' is unknown; will try C"
msgstr "advarsel: typen til fil «%s» med utvidelsen «%s» er ukjent, forsøker C"
-#: src/xgettext.c:540
+#: src/xgettext.c:530
#, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] INPUTFILE ...\n"
@@ -831,7 +804,7 @@ msgstr ""
" --foreign-user utelat FSF-copyright i utdata for fremmede brukere\n"
" -F, --sort-by-file sorter utdata etter fillokasjon\n"
-#: src/xgettext.c:560
+#: src/xgettext.c:550
#, fuzzy, c-format, no-wrap
msgid ""
" -h, --help display this help and exit\n"
@@ -858,7 +831,7 @@ msgstr ""
" -M, --msgstr-suffix[=STRENG] bruk STRENG eller «» som suffiks for msgstr-innslag\n"
" --no-location ikke skriv ut «#: filnavn:linje»-linjer\n"
-#: src/xgettext.c:574
+#: src/xgettext.c:564
#, fuzzy, no-wrap
msgid ""
" -n, --add-location generate '#: filename:line' lines (default)\n"
@@ -887,21 +860,35 @@ msgstr ""
"\n"
"Dersom INNFIL er -, lese standard inn.\n"
-#: src/xgettext.c:936
+#: src/xgettext.c:926
#, fuzzy, c-format
msgid "%s:%d: warning: keyword nested in keyword arg"
msgstr "%s:%d: advarsel: uavsluttet strengliteral"
-#: src/xgettext.c:946
+#: src/xgettext.c:936
#, c-format
msgid "%s:%d: warning: keyword between outer keyword and its arg"
msgstr ""
-#: src/xgettext.c:1444
+#: src/xgettext.c:1432
#, c-format
msgid "language `%s' unknown"
msgstr "språket «%s» er ukjent"
+#~ msgid ""
+#~ "internationalized messages should not contain the `\\%c' escape sequence"
+#~ msgstr ""
+#~ "internasjonaliserte meldinger bør ikke inneholde escape-sekvensen «\\%c»"
+
+#~ msgid "cannot create output file \"%s\""
+#~ msgstr "kan ikke opprette utfilen «%s»"
+
+#~ msgid "standard output"
+#~ msgstr "standard ut"
+
+#~ msgid "error while writing \"%s\" file"
+#~ msgstr "feil under skriving av filen «%s»"
+
#~ msgid "%s: warning: no header entry found"
#~ msgstr "%s: advarsel: fant ikke filhode"
diff --git a/po/pl.po b/po/pl.po
index 1533aee..866b90e 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: GNU gettext 0.10.35\n"
-"POT-Creation-Date: 2000-07-28 22:51+0200\n"
+"POT-Creation-Date: 2001-03-09 19:56+0100\n"
"PO-Revision-Date: 1998-08-05 15:00+0200\n"
"Last-Translator: Rafa³ Maszkowski <rzm@pdi.net>\n"
"Language-Team: Polish <pl@li.org>\n"
@@ -14,75 +14,80 @@ msgstr ""
"Content-Type: text/plain; charset=ISO-8859-2\n"
"Content-Transfer-Encoding: 8-bit\n"
-#: lib/error.c:103
+#: lib/error.c:115
msgid "Unknown system error"
msgstr "Nieznany b³±d systemu"
-#: lib/getopt.c:680
+#: lib/getopt.c:691
#, c-format
msgid "%s: option `%s' is ambiguous\n"
msgstr "%s: opcja: `%s' jest niejednoznaczna\n"
-#: lib/getopt.c:704
+#: lib/getopt.c:716
#, c-format
msgid "%s: option `--%s' doesn't allow an argument\n"
msgstr "%s: opcja `--%s' nie mo¿e mieæ argumentu\n"
-#: lib/getopt.c:709
+#: lib/getopt.c:721
#, c-format
msgid "%s: option `%c%s' doesn't allow an argument\n"
msgstr "%s: opcja `%c%s' nie mo¿e mieæ argumentu\n"
-#: lib/getopt.c:726 lib/getopt.c:899
+#: lib/getopt.c:739 lib/getopt.c:912
#, c-format
msgid "%s: option `%s' requires an argument\n"
msgstr "%s: opcja `%s' wymaga argumentu\n"
#. --option
-#: lib/getopt.c:755
+#: lib/getopt.c:768
#, c-format
msgid "%s: unrecognized option `--%s'\n"
msgstr "%s: nieznana opcja `--%s'\n"
#. +option or -option
-#: lib/getopt.c:759
+#: lib/getopt.c:772
#, c-format
msgid "%s: unrecognized option `%c%s'\n"
msgstr "%s: nieznana opcja `%c%s'\n"
#. 1003.2 specifies the format of this message.
-#: lib/getopt.c:785
+#: lib/getopt.c:798
#, c-format
msgid "%s: illegal option -- %c\n"
msgstr "%s: niedozwolona opcja -- %c\n"
-#: lib/getopt.c:788
+#: lib/getopt.c:801
#, c-format
msgid "%s: invalid option -- %c\n"
msgstr "%s: b³êdna opcja -- %c\n"
#. 1003.2 specifies the format of this message.
-#: lib/getopt.c:818 lib/getopt.c:948
+#: lib/getopt.c:831 lib/getopt.c:961
#, c-format
msgid "%s: option requires an argument -- %c\n"
msgstr "%s: opcja wymaga argumentu -- %c\n"
-#: lib/getopt.c:865
+#: lib/getopt.c:878
#, c-format
msgid "%s: option `-W %s' is ambiguous\n"
msgstr "%s: opcja `-W %s' jest niejednoznaczna\n"
-#: lib/getopt.c:883
+#: lib/getopt.c:896
#, c-format
msgid "%s: option `-W %s' doesn't allow an argument\n"
msgstr "%s: opcja `-W %s' nie mo¿e mieæ argumentu\n"
-#: lib/xmalloc.c:82
+#: lib/obstack.c:474
+#, fuzzy
+msgid "memory exhausted"
+msgstr "pamiêæ wyczerpana"
+
+#: lib/xmalloc.c:86
msgid "Memory exhausted"
msgstr "pamiêæ wyczerpana"
-#: src/gettextp.c:134 src/msgcmp.c:144 src/msgcomm.c:285 src/msgfmt.c:257
-#: src/msgmerge.c:263 src/msgunfmt.c:175 src/xgettext.c:401
+#: src/gettext.c:138 src/msgcmp.c:140 src/msgcomm.c:283 src/msgfmt.c:270
+#: src/msgmerge.c:255 src/msgunfmt.c:170 src/xgettext.c:398
#, c-format, no-wrap
msgid ""
"Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -94,27 +99,27 @@ msgstr ""
"Autorzy nie daj± ¯ADNYCH gwarancji, w tym nawet gwarancji SPRZEDAWALNO¦CI\n"
"lub PRZYDATNO¦CI DO KONKRETNYCH CELÓW.\n"
-#: src/gettextp.c:139 src/msgcmp.c:149 src/msgcomm.c:290 src/msgfmt.c:262
-#: src/msgmerge.c:268 src/msgunfmt.c:180 src/xgettext.c:406
+#: src/gettext.c:143 src/msgcmp.c:145 src/msgcomm.c:288 src/msgfmt.c:275
+#: src/msgmerge.c:260 src/msgunfmt.c:175 src/xgettext.c:403
#, c-format
msgid "Written by %s.\n"
msgstr "Zapisane przez %s.\n"
-#: src/gettextp.c:154
+#: src/gettext.c:158
msgid "missing arguments"
msgstr "brakuj±ce argumenty"
-#: src/gettextp.c:164
+#: src/gettext.c:168
msgid "too many arguments"
msgstr "za du¿o argumentów"
-#: src/gettextp.c:228 src/msgcmp.c:181 src/msgcomm.c:395 src/msgfmt.c:361
-#: src/msgmerge.c:323 src/msgunfmt.c:210 src/xgettext.c:539
+#: src/gettext.c:232 src/msgcmp.c:177 src/msgcomm.c:381 src/msgfmt.c:377
+#: src/msgmerge.c:315 src/msgunfmt.c:205 src/xgettext.c:525
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "Spróbuj `%s --help' ¿eby otrzymaæ wiêcej informacji.\n"
-#: src/gettextp.c:233
+#: src/gettext.c:237
#, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] [[[TEXTDOMAIN] MSGID] | [-s [MSGID]...]]\n"
@@ -137,7 +142,7 @@ msgstr ""
" [TEXTDOMAIN] MSGID wydob±d¼ przet³umaczony komunikat odpowiadaj±cy\n"
" MSGID z TEXTDOMAIN\n"
-#: src/gettextp.c:245
+#: src/gettext.c:249
#, c-format, no-wrap
msgid ""
"\n"
@@ -160,41 +165,20 @@ msgstr ""
"wybranym katalogu.\n"
"Domy¶lnie przeszukiwany katalog: %s\n"
-#: src/gettextp.c:255 src/msgcmp.c:200 src/msgcomm.c:442 src/msgfmt.c:388
-#: src/msgmerge.c:358 src/msgunfmt.c:234 src/xgettext.c:591
+#: src/gettext.c:259 src/msgcmp.c:196 src/msgcomm.c:428 src/msgfmt.c:404
+#: src/msgmerge.c:350 src/msgunfmt.c:229 src/xgettext.c:577
msgid "Report bugs to <bug-gnu-utils@gnu.org>.\n"
msgstr "Raporty o b³êdach wysy³aj do bug-gnu-utils@gnu.org\n"
-#: src/message.c:900
-#, c-format
-msgid ""
-"internationalized messages should not contain the `\\%c' escape sequence"
-msgstr "umiêdzynaradawiane komunikaty nie powinny zawieraæ sekwenji `\\%c'"
-
-#: src/message.c:1231
-#, c-format
-msgid "cannot create output file \"%s\""
-msgstr "nie mogê utworzyæ pliku wyj¶ciowego \"%s\""
-
-#: src/message.c:1238
-#, no-c-format
-msgid "standard output"
-msgstr "standardowe wyj¶cie"
-
-#: src/message.c:1298
-#, c-format
-msgid "error while writing \"%s\" file"
-msgstr "b³±d podczas pisania do pliku \"%s\""
-
-#: src/msgcmp.c:160 src/msgmerge.c:279
+#: src/msgcmp.c:156 src/msgmerge.c:271
msgid "no input files given"
msgstr "nie podano nazw plików wej¶ciowych"
-#: src/msgcmp.c:165 src/msgmerge.c:284
+#: src/msgcmp.c:161 src/msgmerge.c:276
msgid "exactly 2 input files required"
msgstr "wymagane s± dok³adnie dwa pliki wej¶ciowe"
-#: src/msgcmp.c:186
+#: src/msgcmp.c:182
#, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] def.po ref.po\n"
@@ -223,57 +207,62 @@ msgstr ""
"komunikaty w programie zosta³y przet³umaczone. Tam gdzie nie mo¿na\n"
"porównaæ dok³adnie u¿ywane jest porównanie rozmyte, dla lepszej diagnostyki.\n"
-#: src/msgcmp.c:259 src/msgmerge.c:746
+#: src/msgcmp.c:255 src/msgmerge.c:741
msgid "this message is used but not defined..."
msgstr "ten komunikat jest u¿yty, ale nie zdefiniowany..."
-#: src/msgcmp.c:261 src/msgmerge.c:748
+#: src/msgcmp.c:257 src/msgmerge.c:743
msgid "...but this definition is similar"
msgstr "...ale ta definicja jest podobna"
-#: src/msgcmp.c:267 src/msgmerge.c:775
+#: src/msgcmp.c:263 src/msgmerge.c:770
#, c-format
msgid "this message is used but not defined in %s"
msgstr "ten komunikat jest u¿yty, ale nie zdefiniowany w %s"
-#: src/msgcmp.c:281
+#: src/msgcmp.c:277
msgid "warning: this message is not used"
msgstr "uwaga: ten komunikat nie jest u¿yty"
-#: src/msgcmp.c:355 src/msgfmt.c:633 src/msgmerge.c:517 src/xgettext.c:1093
+#: src/msgcmp.c:282 src/po-lex.c:102
+#, c-format
+msgid "found %d fatal errors"
+msgstr "znaleziono %d b³êdów krytycznych"
+
+#: src/msgcmp.c:354 src/msgfmt.c:657 src/msgmerge.c:512 src/xgettext.c:1169
msgid "duplicate message definition"
msgstr "podwójna definicja komunikatu"
-#: src/msgcmp.c:356 src/msgfmt.c:634 src/msgmerge.c:518 src/xgettext.c:1094
+#: src/msgcmp.c:355 src/msgfmt.c:659 src/msgmerge.c:513 src/xgettext.c:1170
msgid "...this is the location of the first definition"
msgstr "...to jest po³o¿enie pierwszej definicji"
-#: src/msgcmp.c:396 src/msgmerge.c:566
+#: src/msgcmp.c:395 src/msgmerge.c:561
#, c-format
msgid "this message has no definition in the \"%s\" domain"
msgstr "ten komunikat nie ma definicji w domenie \"%s\""
#. We are about to construct the absolute path to the
#. directory for the output files but asprintf failed.
-#: src/msgcomm.c:238 src/xgettext.c:340 src/xgettext.c:1288
+#: src/msgcomm.c:236 src/xgettext.c:337 src/xgettext.c:1365
msgid "while preparing output"
msgstr "podczas przygotowywania wyniku"
-#: src/msgcomm.c:273 src/msgcomm.c:277 src/xgettext.c:378 src/xgettext.c:382
+#: src/msgcomm.c:271 src/msgcomm.c:275 src/xgettext.c:375 src/xgettext.c:379
#, c-format
msgid "%s and %s are mutually exclusive"
msgstr "%s i %s wzajemnie siê wykluczaj±"
-#: src/msgcomm.c:341
+#: src/msgcomm.c:327
msgid "at least two files must be specified"
msgstr "musz± byæ podane przynajmniej dwa pliki"
-#: src/msgcomm.c:360
+#: src/msgcomm.c:346
#, c-format
msgid "impossible selection criteria specified (%d < n < %d)"
msgstr "podane niemo¿liwe kryteria selekcji (%d < n < %d)"
-#: src/msgcomm.c:400
+#: src/msgcomm.c:386
#, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] INPUTFILE ...\n"
@@ -298,7 +287,7 @@ msgstr ""
" -F, --sort-by-file sortuj wyniki wg po³o¿enia plików\n"
" -h, --help wy¶wietl ten opis i zakoñcz pracê\n"
-#: src/msgcomm.c:412
+#: src/msgcomm.c:398
msgid ""
" -i, --indent write the .po file using indented style\n"
" --no-location do not write '#: filename:line' lines\n"
@@ -318,8 +307,8 @@ msgid ""
msgstr ""
" -i, --indent zapisz plik .po u¿ywaj±c wciêæ\n"
" --no-location nie zapisuj linii '#: nazwa:linia'\n"
-" -n, --add-location pisz linie '#: nazwa_pliku:linia' "
-"(domy¶lnie)\n"
+" -n, --add-location pisz linie '#: nazwa_pliku:"
+"linia' (domy¶lnie)\n"
" --omit-header nie zapisuj nag³ówka z `msgid \"\"'\n"
" -o, --output=FILE zapisz do podanego pliku\n"
" -p, --output-dir=KATALOG pliki wynikowe bêd± w katalogu KATALOG\n"
@@ -330,7 +319,7 @@ msgstr ""
" -u, --unique skrót dla --less-than=2, bêd± wypisane\n"
" tylko unikalne komunikaty\n"
-#: src/msgcomm.c:425
+#: src/msgcomm.c:411
msgid ""
" -V, --version output version information and exit\n"
" -w, --width=NUMBER set output page width\n"
@@ -367,41 +356,41 @@ msgstr ""
"ale tylko w pierwszym definiuj±cym je pliku PO. Pozycje w plikach dla\n"
"wszystkich plików PO te¿ zostan± zachowane.\n"
-#: src/msgcomm.c:476 src/msgunfmt.c:357 src/po-lex.c:74 src/xget-lex.c:161
-#: src/xget-lex.c:176 src/xget-lex.c:193 src/xgettext.c:625
+#: src/msgcomm.c:462 src/msgunfmt.c:361 src/po-lex.c:86 src/xget-lex.c:157
+#: src/xget-lex.c:170 src/xget-lex.c:180 src/xgettext.c:611
#, c-format
msgid "error while opening \"%s\" for reading"
msgstr "b³±d w czasie otwierania \"%s\" do czytania"
-#: src/msgcomm.c:557 src/xgettext.c:667 src/xgettext.c:1000
+#: src/msgcomm.c:543 src/xgettext.c:653 src/xgettext.c:1071
msgid "this file may not contain domain directives"
msgstr "ten plik nie mo¿e zawieraæ dyrektyw domen"
-#: src/msgfmt.c:273 src/xgettext.c:417
+#: src/msgfmt.c:286 src/xgettext.c:414
msgid "no input file given"
msgstr "nie podano nazwy pliku wej¶ciowego"
-#: src/msgfmt.c:321
+#: src/msgfmt.c:337
#, c-format
msgid "error while opening \"%s\" for writing"
msgstr "b³±d otwarcia \"%s\" do pisania"
-#: src/msgfmt.c:343
+#: src/msgfmt.c:359
#, c-format
msgid "%d translated messages"
msgstr "%d przet³umaczonych komunikatów"
-#: src/msgfmt.c:345
+#: src/msgfmt.c:361
#, c-format
msgid ", %d fuzzy translations"
msgstr ", %d t³umaczeñ budzi w±tpliwo¶ci"
-#: src/msgfmt.c:347
+#: src/msgfmt.c:363
#, c-format
msgid ", %d untranslated messages"
msgstr ", %d nie przet³umaczonych komunikatów"
-#: src/msgfmt.c:366
+#: src/msgfmt.c:382
#, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] filename.po ...\n"
@@ -446,82 +435,104 @@ msgstr ""
"Je¿eli plik wej¶ciowy to -, czytane jest wej¶cie standardowe. Je¿eli plik\n"
"wyj¶ciowy to -, wyniki s± wysy³ane do standardowego wyj¶cia.\n"
-#: src/msgfmt.c:409
+#: src/msgfmt.c:425
msgid "while creating hash table"
msgstr "podczas tworzenia tablicy mieszaj±cej"
-#: src/msgfmt.c:451
+#: src/msgfmt.c:469
#, fuzzy, c-format
-msgid "%s: warning: PO file header missing, fuzzy, or invalid"
+msgid ""
+"%s: warning: PO file header missing, fuzzy, or invalid\n"
+"%*s warning: charset conversion will not work"
msgstr "%s: uwaga: plik ¼ród³owy zawiera t³umaczenie budz±ce w±tpliwo¶ci"
-#: src/msgfmt.c:474
+#: src/msgfmt.c:493
#, c-format
msgid "domain name \"%s\" not suitable as file name"
msgstr "nazwa domeny \"%s\" nie jest odpowiedni± nazwa pliku"
-#: src/msgfmt.c:479
+#: src/msgfmt.c:498
#, c-format
msgid "domain name \"%s\" not suitable as file name: will use prefix"
msgstr "nazwa domeny \"%s\" nie jest dobra jako nazwa pliku: u¿yjê przedrostka"
#. We don't change the exit status here because this is really
#. only an information.
-#: src/msgfmt.c:492
+#: src/msgfmt.c:511
#, c-format
msgid "`domain %s' directive ignored"
msgstr "dyrektywa `domena %s' zignorowana"
-#: src/msgfmt.c:520
+#: src/msgfmt.c:541
msgid "empty `msgstr' entry ignored"
msgstr "zignorowana pusta warto¶æ `msgstr'"
-#: src/msgfmt.c:521
+#: src/msgfmt.c:542
msgid "fuzzy `msgstr' entry ignored"
msgstr "zignorowana niepewna (fuzzy) warto¶æ `msgstr'"
-#: src/msgfmt.c:564
+#: src/msgfmt.c:584
#, c-format
msgid "headerfield `%s' missing in header"
msgstr "w nag³ówku brakuje pola `%s'"
-#: src/msgfmt.c:567
+#: src/msgfmt.c:587
#, c-format
msgid "header field `%s' should start at beginning of line"
msgstr "pole nag³ówka `%s' powinno siê zaczynaæ na pocz±tku linii"
-#: src/msgfmt.c:577
+#: src/msgfmt.c:597
msgid "some header fields still have the initial default value"
msgstr "niektóre pola nag³ówka nadal zawieraj± pocz±tkowe warto¶ci domy¶lne"
-#: src/msgfmt.c:588
+#: src/msgfmt.c:608
#, c-format
msgid "field `%s' still has initial default value"
msgstr "pole `%s' ma nadal pocz±tkow± warto¶æ domy¶ln±"
-#: src/msgfmt.c:673
+#: src/msgfmt.c:698
#, c-format
msgid "%s: warning: source file contains fuzzy translation"
msgstr "%s: uwaga: plik ¼ród³owy zawiera t³umaczenie budz±ce w±tpliwo¶ci"
-#: src/msgfmt.c:875
+#: src/msgfmt.c:920
+#, fuzzy
+msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
+msgstr "`msgid' i `msgstr' nie zaczynaj± siê oba od '\\n'`"
+
+#: src/msgfmt.c:928
+#, fuzzy, c-format
+msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
+msgstr "`msgid' i `msgstr' nie zaczynaj± siê oba od '\\n'`"
+
+#: src/msgfmt.c:938
msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
msgstr "`msgid' i `msgstr' nie zaczynaj± siê oba od '\\n'`"
-#: src/msgfmt.c:883
+#: src/msgfmt.c:953
+#, fuzzy
+msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
+msgstr "`msgid' i `msgstr' nie koñcz± siê oba na '\\n'"
+
+#: src/msgfmt.c:961
+#, fuzzy, c-format
+msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
+msgstr "`msgid' i `msgstr' nie koñcz± siê oba na '\\n'"
+
+#: src/msgfmt.c:971
msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
msgstr "`msgid' i `msgstr' nie koñcz± siê oba na '\\n'"
-#: src/msgfmt.c:897
+#: src/msgfmt.c:987
msgid "number of format specifications in `msgid' and `msgstr' does not match"
msgstr "nie zgadza siê ilo¶æ specyfikacji formatu w `msgid' i w `msgstr'"
-#: src/msgfmt.c:914
+#: src/msgfmt.c:1004
#, c-format
msgid "format specifications for argument %u are not the same"
msgstr "specyfikacje formatu dla argumentu %u nie s± takie same"
-#: src/msgmerge.c:328
+#: src/msgmerge.c:320
#, fuzzy, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] def.po ref.po\n"
@@ -558,7 +569,7 @@ msgstr ""
" -V, --version wy¶wietl informacjê o wersji i zakoñcz\n"
" -w, --width=LICZBA ustal szeroko¶æ strony\n"
-#: src/msgmerge.c:348
+#: src/msgmerge.c:340
#, no-wrap
msgid ""
"\n"
@@ -583,20 +594,20 @@ msgstr ""
"dok³adnie u¿ywane jest porównanie rozmyte, dla lepszych wyników. Wyniki s±\n"
"pisane na standardowe wyj¶cie je¿eli plik wyj¶iowy nie jest podany.\n"
-#: src/msgmerge.c:804
+#: src/msgmerge.c:799
#, c-format
msgid ""
-"%sRead %d old + %d reference, merged %d, fuzzied %d, missing %d, obsolete "
-"%d.\n"
+"%sRead %d old + %d reference, merged %d, fuzzied %d, missing %d, obsolete %"
+"d.\n"
msgstr ""
-"%sPrzeczytane %d starych + %d odno¶ników, %d do³±czonych, %d niedok³adnych, "
-"%d brakuj±cych, %d przestarza³ych.\n"
+"%sPrzeczytane %d starych + %d odno¶ników, %d do³±czonych, %d niedok³adnych, %"
+"d brakuj±cych, %d przestarza³ych.\n"
-#: src/msgmerge.c:810
+#: src/msgmerge.c:805
msgid " done.\n"
msgstr " zrobione.\n"
-#: src/msgunfmt.c:215
+#: src/msgunfmt.c:210
#, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] [FILE]...\n"
@@ -623,7 +634,7 @@ msgstr ""
" -V, --version wy¶wietl informacjê o wersji i zakoñcz\n"
" -w, --width=LICZBA ustal szeroko¶æ strony\n"
-#: src/msgunfmt.c:229
+#: src/msgunfmt.c:224
#, no-wrap
msgid ""
"\n"
@@ -638,85 +649,119 @@ msgstr ""
"Je¿eli plik wej¶ciowy to -, czytane jest wej¶cie standardowe. Jezeli plik\n"
"wyj¶ciowy to -, wyniki s± wysy³ane do standardowego wyj¶cia.\n"
-#: src/msgunfmt.c:266 src/msgunfmt.c:330 src/po-lex.c:185 src/xget-lex.c:256
+#: src/msgunfmt.c:261 src/msgunfmt.c:326 src/po-lex.c:213 src/xget-lex.c:243
#, c-format
msgid "error while reading \"%s\""
msgstr "b³±d w czasie czytania \"%s\""
-#: src/msgunfmt.c:267 src/msgunfmt.c:331
+#: src/msgunfmt.c:262 src/msgunfmt.c:327
#, c-format
msgid "file \"%s\" truncated"
msgstr "obciêty plik \"%s\""
-#: src/msgunfmt.c:298
+#: src/msgunfmt.c:293
#, c-format
msgid "seek \"%s\" offset %ld failed"
msgstr "nieudane przej¶cie do pozycji w \"%s\", ofset %ld"
-#: src/msgunfmt.c:373
+#: src/msgunfmt.c:332
+#, fuzzy, c-format
+msgid "file \"%s\" contains a not NUL terminated string"
+msgstr "plik \"%s\" nie jest w formacie .mo GNU"
+
+#: src/msgunfmt.c:377
#, c-format
msgid "file \"%s\" is not in GNU .mo format"
msgstr "plik \"%s\" nie jest w formacie .mo GNU"
-#: /home/drepper/gnu/gettext/build/src/../../src/po-gram-gen.y:129
+#: src/open-po.c:64
+msgid "<stdin>"
+msgstr ""
+
+#: po-gram-gen.y:87
+msgid "inconsistent use of #~"
+msgstr ""
+
+#: po-gram-gen.y:168
+#, fuzzy
+msgid "missing `msgstr[]' section"
+msgstr "brak czêsci `msgstr'"
+
+#: po-gram-gen.y:176
+#, fuzzy
+msgid "missing `msgid_plural' section"
+msgstr "brak czêsci `msgstr'"
+
+#: po-gram-gen.y:183
msgid "missing `msgstr' section"
msgstr "brak czêsci `msgstr'"
-#: src/po-lex.c:84
-#, c-format
-msgid "found %d fatal errors"
-msgstr "znaleziono %d b³êdów krytycznych"
+#: po-gram-gen.y:228
+msgid "first plural form has nonzero index"
+msgstr ""
-#: src/po-lex.c:129 src/po-lex.c:168
+#: po-gram-gen.y:230
+msgid "plural form has wrong index"
+msgstr ""
+
+#. CAUTION: If you change this macro, you must also make identical
+#. changes to the function of the same name in src/po-lex.c
+#: src/po-lex.c:156 src/po-lex.c:195 src/po-lex.h:85 src/po-lex.h:99
+#: src/po-lex.h:115 src/po-lex.h:129
msgid "too many errors, aborting"
msgstr "%s: za du¿o b³êdów, przerywam"
-#: src/po-lex.c:241
+#: src/po-lex.c:271
#, c-format
msgid "keyword \"%s\" unknown"
msgstr "nieznane s³owo kluczowe \"%s\""
-#: src/po-lex.c:335
+#: src/po-lex.c:374
#, fuzzy
msgid "invalid control sequence"
msgstr "niedozwolona sekwencja steruj±ca"
-#: src/po-lex.c:419
+#: src/po-lex.c:477
+msgid "end-of-file within string"
+msgstr "znak koñca pliku wewn±trz ³añcucha"
+
+#: src/po-lex.c:482
msgid "end-of-line within string"
msgstr "znak koñca wiersza wewn±trz ³añcucha"
-#: src/po-lex.c:424
-msgid "end-of-file within string"
-msgstr "znak koñca pliku wewn±trz ³añcucha"
+#: src/po-lex.c:525
+#, fuzzy
+msgid "invalid multibyte sequence"
+msgstr "niedozwolona sekwencja steruj±ca"
-#: src/xget-lex.c:152
+#: src/xget-lex.c:148
msgid "standard input"
msgstr "wej¶cie standardowe"
-#: src/xget-lex.c:894
+#: src/xget-lex.c:876
#, c-format
msgid "%s:%d: warning: unterminated character constant"
msgstr "%s:%d: uwaga: niezakoñczona sta³a znakowa"
-#: src/xget-lex.c:916
+#: src/xget-lex.c:898
#, c-format
msgid "%s:%d: warning: unterminated string literal"
msgstr "%s:%d: uwaga: niezakoñczona sta³a ³añcuchowa"
-#: src/xgettext.c:386
+#: src/xgettext.c:383
msgid "--join-existing cannot be used when output is written to stdout"
msgstr "--join-existing nie mo¿e byæ u¿yte kiedy wyniki"
-#: src/xgettext.c:391
+#: src/xgettext.c:388
msgid "xgettext cannot work without keywords to look for"
msgstr ""
-#: src/xgettext.c:508
+#: src/xgettext.c:494
#, c-format
msgid "warning: file `%s' extension `%s' is unknown; will try C"
msgstr "uwaga: typ pliku `%s' z rozszerzeniem `%s' jest nieznany; spróbujê C"
-#: src/xgettext.c:544
+#: src/xgettext.c:530
#, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] INPUTFILE ...\n"
@@ -756,7 +801,7 @@ msgstr ""
" --foreign-user omiñ informacjê o prawach autorskich FSF\n"
" -F, --sort-by-file sortuj wyniki wg po³o¿enia plików\n"
-#: src/xgettext.c:564
+#: src/xgettext.c:550
#, c-format, no-wrap
msgid ""
" -h, --help display this help and exit\n"
@@ -783,7 +828,7 @@ msgstr ""
" -M, --msgstr-suffix[=£AÑCUCH] u¿yj £AÑCUCH lub \"\" jako przyrostka msgstr\n"
" --no-location nie zapisuj linii '#: nazwa_pliku:linia'\n"
-#: src/xgettext.c:578
+#: src/xgettext.c:564
#, no-wrap
msgid ""
" -n, --add-location generate '#: filename:line' lines (default)\n"
@@ -810,20 +855,33 @@ msgstr ""
" -w, --width=LICZBA ustal szeroko¶æ strony\n"
" -x, --exclude-file=PLIK nie wydobywaj rekordów zapisanych w PLIKu\n"
-#: src/xgettext.c:879
+#: src/xgettext.c:926
#, fuzzy, c-format
msgid "%s:%d: warning: keyword nested in keyword arg"
msgstr "%s:%d: uwaga: niezakoñczona sta³a ³añcuchowa"
-#: src/xgettext.c:889
+#: src/xgettext.c:936
#, c-format
msgid "%s:%d: warning: keyword between outer keyword and its arg"
msgstr ""
-#: src/xgettext.c:1374
+#: src/xgettext.c:1432
#, c-format
msgid "language `%s' unknown"
msgstr "nieznany jêzyk `%s'"
+#~ msgid ""
+#~ "internationalized messages should not contain the `\\%c' escape sequence"
+#~ msgstr "umiêdzynaradawiane komunikaty nie powinny zawieraæ sekwenji `\\%c'"
+
+#~ msgid "cannot create output file \"%s\""
+#~ msgstr "nie mogê utworzyæ pliku wyj¶ciowego \"%s\""
+
+#~ msgid "standard output"
+#~ msgstr "standardowe wyj¶cie"
+
+#~ msgid "error while writing \"%s\" file"
+#~ msgstr "b³±d podczas pisania do pliku \"%s\""
+
#~ msgid "%s: warning: no header entry found"
#~ msgstr "%s: uwaga: nie znaleziono nag³ówka"
diff --git a/po/pt.po b/po/pt.po
index 7d84b61..4d2121b 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: gettext 0.10.23\n"
-"POT-Creation-Date: 2000-07-28 22:51+0200\n"
+"POT-Creation-Date: 2001-03-09 19:56+0100\n"
"PO-Revision-Date: 1996-09-18 20:51 WET DST\n"
"Last-Translator: Nuno Oliveira <nuno@eq.uc.pt>\n"
"Language-Team: Portuguese <pt@li.org>\n"
@@ -13,76 +13,81 @@ msgstr ""
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8-bit\n"
-#: lib/error.c:103
+#: lib/error.c:115
msgid "Unknown system error"
msgstr "Erro desconhecido do sistema"
-#: lib/getopt.c:680
+#: lib/getopt.c:691
#, c-format
msgid "%s: option `%s' is ambiguous\n"
msgstr "%s: a opção `%s' é ambígua\n"
-#: lib/getopt.c:704
+#: lib/getopt.c:716
#, c-format
msgid "%s: option `--%s' doesn't allow an argument\n"
msgstr "%s: a opção `--%s' não permite um argumento\n"
-#: lib/getopt.c:709
+#: lib/getopt.c:721
#, c-format
msgid "%s: option `%c%s' doesn't allow an argument\n"
msgstr "%s: a opção `%c%s' não permite um argumento\n"
-#: lib/getopt.c:726 lib/getopt.c:899
+#: lib/getopt.c:739 lib/getopt.c:912
#, c-format
msgid "%s: option `%s' requires an argument\n"
msgstr "%s: a opção `%s' requere um argumento\n"
#. --option
-#: lib/getopt.c:755
+#: lib/getopt.c:768
#, c-format
msgid "%s: unrecognized option `--%s'\n"
msgstr "%s: opção não reconhecida `--%s'\n"
#. +option or -option
-#: lib/getopt.c:759
+#: lib/getopt.c:772
#, c-format
msgid "%s: unrecognized option `%c%s'\n"
msgstr "%s: opção não reconhecida `%c%s'\n"
#. 1003.2 specifies the format of this message.
-#: lib/getopt.c:785
+#: lib/getopt.c:798
#, c-format
msgid "%s: illegal option -- %c\n"
msgstr "%s: opção ilegal -- %c\n"
-#: lib/getopt.c:788
+#: lib/getopt.c:801
#, c-format
msgid "%s: invalid option -- %c\n"
msgstr "%s: opção ilegal -- %c\n"
#. 1003.2 specifies the format of this message.
-#: lib/getopt.c:818 lib/getopt.c:948
+#: lib/getopt.c:831 lib/getopt.c:961
#, c-format
msgid "%s: option requires an argument -- %c\n"
msgstr "%s: opção requere um argumento -- %c\n"
-#: lib/getopt.c:865
+#: lib/getopt.c:878
#, fuzzy, c-format
msgid "%s: option `-W %s' is ambiguous\n"
msgstr "%s: a opção `%s' é ambígua\n"
-#: lib/getopt.c:883
+#: lib/getopt.c:896
#, fuzzy, c-format
msgid "%s: option `-W %s' doesn't allow an argument\n"
msgstr "%s: a opção `--%s' não permite um argumento\n"
-#: lib/xmalloc.c:82
+#: lib/obstack.c:474
+#, fuzzy
+msgid "memory exhausted"
+msgstr "memória exausta"
+
+#: lib/xmalloc.c:86
#, fuzzy
msgid "Memory exhausted"
msgstr "memória exausta"
-#: src/gettextp.c:134 src/msgcmp.c:144 src/msgcomm.c:285 src/msgfmt.c:257
-#: src/msgmerge.c:263 src/msgunfmt.c:175 src/xgettext.c:401
+#: src/gettext.c:138 src/msgcmp.c:140 src/msgcomm.c:283 src/msgfmt.c:270
+#: src/msgmerge.c:255 src/msgunfmt.c:170 src/xgettext.c:398
#, c-format, no-wrap
msgid ""
"Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -90,27 +95,27 @@ msgid ""
"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
msgstr ""
-#: src/gettextp.c:139 src/msgcmp.c:149 src/msgcomm.c:290 src/msgfmt.c:262
-#: src/msgmerge.c:268 src/msgunfmt.c:180 src/xgettext.c:406
+#: src/gettext.c:143 src/msgcmp.c:145 src/msgcomm.c:288 src/msgfmt.c:275
+#: src/msgmerge.c:260 src/msgunfmt.c:175 src/xgettext.c:403
#, c-format
msgid "Written by %s.\n"
msgstr ""
-#: src/gettextp.c:154
+#: src/gettext.c:158
msgid "missing arguments"
msgstr "argumentos insuficientes"
-#: src/gettextp.c:164
+#: src/gettext.c:168
msgid "too many arguments"
msgstr "demasiados argumentos"
-#: src/gettextp.c:228 src/msgcmp.c:181 src/msgcomm.c:395 src/msgfmt.c:361
-#: src/msgmerge.c:323 src/msgunfmt.c:210 src/xgettext.c:539
+#: src/gettext.c:232 src/msgcmp.c:177 src/msgcomm.c:381 src/msgfmt.c:377
+#: src/msgmerge.c:315 src/msgunfmt.c:205 src/xgettext.c:525
#, fuzzy, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "Tente `%s --help' para mais informação\n"
-#: src/gettextp.c:233
+#: src/gettext.c:237
#, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] [[[TEXTDOMAIN] MSGID] | [-s [MSGID]...]]\n"
@@ -133,7 +138,7 @@ msgstr ""
" [DIALECTO] MSGID obtém a mensagem traduzida correspondente a\n"
" MSGID do DIALECTO\n"
-#: src/gettextp.c:245
+#: src/gettext.c:249
#, c-format, no-wrap
msgid ""
"\n"
@@ -157,43 +162,20 @@ msgstr ""
"são traduzidas.\n"
"Directório standard de pesquisa: %s\n"
-#: src/gettextp.c:255 src/msgcmp.c:200 src/msgcomm.c:442 src/msgfmt.c:388
-#: src/msgmerge.c:358 src/msgunfmt.c:234 src/xgettext.c:591
+#: src/gettext.c:259 src/msgcmp.c:196 src/msgcomm.c:428 src/msgfmt.c:404
+#: src/msgmerge.c:350 src/msgunfmt.c:229 src/xgettext.c:577
msgid "Report bugs to <bug-gnu-utils@gnu.org>.\n"
msgstr ""
-#: src/message.c:900
-#, c-format
-msgid ""
-"internationalized messages should not contain the `\\%c' escape sequence"
-msgstr ""
-"as mensagens de internacionalização não devem conter\n"
-"a sequência de escape `\\%c'"
-
-#: src/message.c:1231
-#, c-format
-msgid "cannot create output file \"%s\""
-msgstr "impossível criar o ficheiro de saída \"%s\""
-
-#: src/message.c:1238
-#, no-c-format
-msgid "standard output"
-msgstr "canal de saída por defeito (stdout)"
-
-#: src/message.c:1298
-#, c-format
-msgid "error while writing \"%s\" file"
-msgstr "erro durante a escrita do ficheiro \"%s\""
-
-#: src/msgcmp.c:160 src/msgmerge.c:279
+#: src/msgcmp.c:156 src/msgmerge.c:271
msgid "no input files given"
msgstr "ficheiros de entrada não fornecidos"
-#: src/msgcmp.c:165 src/msgmerge.c:284
+#: src/msgcmp.c:161 src/msgmerge.c:276
msgid "exactly 2 input files required"
msgstr "são necessários exactamente 2 ficheiros"
-#: src/msgcmp.c:186
+#: src/msgcmp.c:182
#, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] def.po ref.po\n"
@@ -226,57 +208,62 @@ msgstr ""
"é usado um emparelhamento aproximado para produzir melhores\n"
"diagnósticos.\n"
-#: src/msgcmp.c:259 src/msgmerge.c:746
+#: src/msgcmp.c:255 src/msgmerge.c:741
msgid "this message is used but not defined..."
msgstr "esta mensagem é usada mas não definida..."
-#: src/msgcmp.c:261 src/msgmerge.c:748
+#: src/msgcmp.c:257 src/msgmerge.c:743
msgid "...but this definition is similar"
msgstr "...mas esta definição é semelhante"
-#: src/msgcmp.c:267 src/msgmerge.c:775
+#: src/msgcmp.c:263 src/msgmerge.c:770
#, c-format
msgid "this message is used but not defined in %s"
msgstr "esta mensagem é usada mas não definida em %s"
-#: src/msgcmp.c:281
+#: src/msgcmp.c:277
msgid "warning: this message is not used"
msgstr "atenção: esta mensagem não é usada"
-#: src/msgcmp.c:355 src/msgfmt.c:633 src/msgmerge.c:517 src/xgettext.c:1093
+#: src/msgcmp.c:282 src/po-lex.c:102
+#, c-format
+msgid "found %d fatal errors"
+msgstr "encontrados %d erros fatais"
+
+#: src/msgcmp.c:354 src/msgfmt.c:657 src/msgmerge.c:512 src/xgettext.c:1169
msgid "duplicate message definition"
msgstr "definição de mensagem duplicada"
-#: src/msgcmp.c:356 src/msgfmt.c:634 src/msgmerge.c:518 src/xgettext.c:1094
+#: src/msgcmp.c:355 src/msgfmt.c:659 src/msgmerge.c:513 src/xgettext.c:1170
msgid "...this is the location of the first definition"
msgstr "...este é o local da primeira definição"
-#: src/msgcmp.c:396 src/msgmerge.c:566
+#: src/msgcmp.c:395 src/msgmerge.c:561
#, c-format
msgid "this message has no definition in the \"%s\" domain"
msgstr "esta mensagem não tem definição no domínio \"%s\""
#. We are about to construct the absolute path to the
#. directory for the output files but asprintf failed.
-#: src/msgcomm.c:238 src/xgettext.c:340 src/xgettext.c:1288
+#: src/msgcomm.c:236 src/xgettext.c:337 src/xgettext.c:1365
msgid "while preparing output"
msgstr "durante a preparação da saída"
-#: src/msgcomm.c:273 src/msgcomm.c:277 src/xgettext.c:378 src/xgettext.c:382
+#: src/msgcomm.c:271 src/msgcomm.c:275 src/xgettext.c:375 src/xgettext.c:379
#, c-format
msgid "%s and %s are mutually exclusive"
msgstr "%s e %s são mutuamente exclusivas"
-#: src/msgcomm.c:341
+#: src/msgcomm.c:327
msgid "at least two files must be specified"
msgstr ""
-#: src/msgcomm.c:360
+#: src/msgcomm.c:346
#, c-format
msgid "impossible selection criteria specified (%d < n < %d)"
msgstr ""
-#: src/msgcomm.c:400
+#: src/msgcomm.c:386
#, fuzzy, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] INPUTFILE ...\n"
@@ -314,7 +301,7 @@ msgstr ""
" vazio\n"
" -F, --sort-by-file ordena a saída pela localização dos ficheiros\n"
-#: src/msgcomm.c:412
+#: src/msgcomm.c:398
#, fuzzy
msgid ""
" -i, --indent write the .po file using indented style\n"
@@ -335,8 +322,8 @@ msgid ""
msgstr ""
" -n, --add-location gera linhas do tipo '#: filename:line'\n"
" (opção utilizada por defeito)\n"
-" --omit-header não escreve cabeçalhos com campos "
-"`msgid\"\"'\n"
+" --omit-header não escreve cabeçalhos com campos `msgid"
+"\"\"'\n"
" -p, --output-dir=DIR os ficheiros de saída serão colocados no\n"
" directório DIR\n"
" -s, --sort-output gera resultados ordenados, removendo os\n"
@@ -351,7 +338,7 @@ msgstr ""
"Se o ficheiro de entrada for -, o canal de entrada por defeito (stdin) é\n"
"usado.\n"
-#: src/msgcomm.c:425
+#: src/msgcomm.c:411
msgid ""
" -V, --version output version information and exit\n"
" -w, --width=NUMBER set output page width\n"
@@ -371,41 +358,41 @@ msgid ""
"preserved.\n"
msgstr ""
-#: src/msgcomm.c:476 src/msgunfmt.c:357 src/po-lex.c:74 src/xget-lex.c:161
-#: src/xget-lex.c:176 src/xget-lex.c:193 src/xgettext.c:625
+#: src/msgcomm.c:462 src/msgunfmt.c:361 src/po-lex.c:86 src/xget-lex.c:157
+#: src/xget-lex.c:170 src/xget-lex.c:180 src/xgettext.c:611
#, c-format
msgid "error while opening \"%s\" for reading"
msgstr "erro durante a abertura de \"%s\" para leitura"
-#: src/msgcomm.c:557 src/xgettext.c:667 src/xgettext.c:1000
+#: src/msgcomm.c:543 src/xgettext.c:653 src/xgettext.c:1071
msgid "this file may not contain domain directives"
msgstr "este ficheiro não pode conter directivas de domínio"
-#: src/msgfmt.c:273 src/xgettext.c:417
+#: src/msgfmt.c:286 src/xgettext.c:414
msgid "no input file given"
msgstr "nenhum ficheiro de entrada fornecido"
-#: src/msgfmt.c:321
+#: src/msgfmt.c:337
#, c-format
msgid "error while opening \"%s\" for writing"
msgstr "erro durante a abertura de \"%s\" para escrita"
-#: src/msgfmt.c:343
+#: src/msgfmt.c:359
#, c-format
msgid "%d translated messages"
msgstr "%d mensagens traduzidas"
-#: src/msgfmt.c:345
+#: src/msgfmt.c:361
#, c-format
msgid ", %d fuzzy translations"
msgstr ", %d traduções aproximadas"
-#: src/msgfmt.c:347
+#: src/msgfmt.c:363
#, c-format
msgid ", %d untranslated messages"
msgstr ", %d mensagens não traduzidas"
-#: src/msgfmt.c:366
+#: src/msgfmt.c:382
#, fuzzy, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] filename.po ...\n"
@@ -451,21 +438,23 @@ msgstr ""
"Se o ficheiro de entrada é -, é usado o canal de entrada stdin. Se o\n"
"ficheiro de saída é -, a saída é escrita no canal de saída stdout.\n"
-#: src/msgfmt.c:409
+#: src/msgfmt.c:425
msgid "while creating hash table"
msgstr "durante a criação da tabela de dispersão"
-#: src/msgfmt.c:451
+#: src/msgfmt.c:469
#, fuzzy, c-format
-msgid "%s: warning: PO file header missing, fuzzy, or invalid"
+msgid ""
+"%s: warning: PO file header missing, fuzzy, or invalid\n"
+"%*s warning: charset conversion will not work"
msgstr "CUIDADO: o ficheiro fonte contém traduções aproximadas"
-#: src/msgfmt.c:474
+#: src/msgfmt.c:493
#, c-format
msgid "domain name \"%s\" not suitable as file name"
msgstr "nome de domínio \"%s\" não apropriado como nome de ficheiro"
-#: src/msgfmt.c:479
+#: src/msgfmt.c:498
#, c-format
msgid "domain name \"%s\" not suitable as file name: will use prefix"
msgstr ""
@@ -474,65 +463,85 @@ msgstr ""
#. We don't change the exit status here because this is really
#. only an information.
-#: src/msgfmt.c:492
+#: src/msgfmt.c:511
#, c-format
msgid "`domain %s' directive ignored"
msgstr "directiva `domínio %s' ignorada"
-#: src/msgfmt.c:520
+#: src/msgfmt.c:541
msgid "empty `msgstr' entry ignored"
msgstr "elemento `msgstr' vazio ignorada"
-#: src/msgfmt.c:521
+#: src/msgfmt.c:542
#, fuzzy
msgid "fuzzy `msgstr' entry ignored"
msgstr "elemento `msgstr' vazio ignorada"
-#: src/msgfmt.c:564
+#: src/msgfmt.c:584
#, c-format
msgid "headerfield `%s' missing in header"
msgstr "o campo `%s' falta no cabeçalho"
-#: src/msgfmt.c:567
+#: src/msgfmt.c:587
#, c-format
msgid "header field `%s' should start at beginning of line"
msgstr "o campo `%s' do cabeçalho deve começar no início da linha"
-#: src/msgfmt.c:577
+#: src/msgfmt.c:597
#, fuzzy
msgid "some header fields still have the initial default value"
msgstr "alguns campos do cabeçalho ainda têm o valor inicial por defeito"
-#: src/msgfmt.c:588
+#: src/msgfmt.c:608
#, c-format
msgid "field `%s' still has initial default value"
msgstr "o campo `%s' ainda tem o valor por defeito inicial"
-#: src/msgfmt.c:673
+#: src/msgfmt.c:698
#, fuzzy, c-format
msgid "%s: warning: source file contains fuzzy translation"
msgstr "CUIDADO: o ficheiro fonte contém traduções aproximadas"
-#: src/msgfmt.c:875
+#: src/msgfmt.c:920
+#, fuzzy
+msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
+msgstr "os campos `msgid' e `msgstr' não começam ambos por '\\n'"
+
+#: src/msgfmt.c:928
+#, fuzzy, c-format
+msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
+msgstr "os campos `msgid' e `msgstr' não começam ambos por '\\n'"
+
+#: src/msgfmt.c:938
#, fuzzy
msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
msgstr "os campos `msgid' e `msgstr' não começam ambos por '\\n'"
-#: src/msgfmt.c:883
+#: src/msgfmt.c:953
+#, fuzzy
+msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
+msgstr "os campos `msgid' e `msgstr' não terminam ambos por '\\n'"
+
+#: src/msgfmt.c:961
+#, fuzzy, c-format
+msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
+msgstr "os campos `msgid' e `msgstr' não terminam ambos por '\\n'"
+
+#: src/msgfmt.c:971
#, fuzzy
msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
msgstr "os campos `msgid' e `msgstr' não terminam ambos por '\\n'"
-#: src/msgfmt.c:897
+#: src/msgfmt.c:987
msgid "number of format specifications in `msgid' and `msgstr' does not match"
msgstr "o número de especificações em `msgid' e `msgstr' é diferente"
-#: src/msgfmt.c:914
+#: src/msgfmt.c:1004
#, c-format
msgid "format specifications for argument %u are not the same"
msgstr "as especificações do argumento %u são diferentes"
-#: src/msgmerge.c:328
+#: src/msgmerge.c:320
#, fuzzy, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] def.po ref.po\n"
@@ -570,7 +579,7 @@ msgstr ""
" -V, --version mostra a informação de versão e sai\n"
" -w, --width=NÚMERO especifica a largura de página na saída\n"
-#: src/msgmerge.c:348
+#: src/msgmerge.c:340
#, no-wrap
msgid ""
"\n"
@@ -598,20 +607,20 @@ msgstr ""
"resultados serão escritos no canal de saída por defeito (stdout) a\n"
"menos que seja especificado um ficheiro de saída.\n"
-#: src/msgmerge.c:804
+#: src/msgmerge.c:799
#, c-format
msgid ""
-"%sRead %d old + %d reference, merged %d, fuzzied %d, missing %d, obsolete "
-"%d.\n"
+"%sRead %d old + %d reference, merged %d, fuzzied %d, missing %d, obsolete %"
+"d.\n"
msgstr ""
-"%sLidas %d antigas + %d referências, combinadas %d, aproximadas %d, faltam "
-"%d, obsoletas %d.\n"
+"%sLidas %d antigas + %d referências, combinadas %d, aproximadas %d, faltam %"
+"d, obsoletas %d.\n"
-#: src/msgmerge.c:810
+#: src/msgmerge.c:805
msgid " done.\n"
msgstr "terminado.\n"
-#: src/msgunfmt.c:215
+#: src/msgunfmt.c:210
#, fuzzy, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] [FILE]...\n"
@@ -641,7 +650,7 @@ msgstr ""
" -V, --version mostra a informação de versão e sai\n"
" -w, --width=NÚMERO especifica a largura de página na saída\n"
-#: src/msgunfmt.c:229
+#: src/msgunfmt.c:224
#, no-wrap
msgid ""
"\n"
@@ -657,89 +666,123 @@ msgstr ""
"usado o canal de entrada stdin. Por defeito a saída é escrita no\n"
"stdout.\n"
-#: src/msgunfmt.c:266 src/msgunfmt.c:330 src/po-lex.c:185 src/xget-lex.c:256
+#: src/msgunfmt.c:261 src/msgunfmt.c:326 src/po-lex.c:213 src/xget-lex.c:243
#, c-format
msgid "error while reading \"%s\""
msgstr "erro durante a leitura de \"%s\""
-#: src/msgunfmt.c:267 src/msgunfmt.c:331
+#: src/msgunfmt.c:262 src/msgunfmt.c:327
#, c-format
msgid "file \"%s\" truncated"
msgstr "ficheiro \"%s\"truncado"
-#: src/msgunfmt.c:298
+#: src/msgunfmt.c:293
#, fuzzy, c-format
msgid "seek \"%s\" offset %ld failed"
msgstr "seek \"%s\" offset %ld falhou"
-#: src/msgunfmt.c:373
+#: src/msgunfmt.c:332
+#, fuzzy, c-format
+msgid "file \"%s\" contains a not NUL terminated string"
+msgstr "o ficheiro \"%s\" não está no formato .mo GNU"
+
+#: src/msgunfmt.c:377
#, c-format
msgid "file \"%s\" is not in GNU .mo format"
msgstr "o ficheiro \"%s\" não está no formato .mo GNU"
-#: /home/drepper/gnu/gettext/build/src/../../src/po-gram-gen.y:129
+#: src/open-po.c:64
+msgid "<stdin>"
+msgstr ""
+
+#: po-gram-gen.y:87
+msgid "inconsistent use of #~"
+msgstr ""
+
+#: po-gram-gen.y:168
+#, fuzzy
+msgid "missing `msgstr[]' section"
+msgstr "falta a secção `msgstr'"
+
+#: po-gram-gen.y:176
+#, fuzzy
+msgid "missing `msgid_plural' section"
+msgstr "falta a secção `msgstr'"
+
+#: po-gram-gen.y:183
msgid "missing `msgstr' section"
msgstr "falta a secção `msgstr'"
-#: src/po-lex.c:84
-#, c-format
-msgid "found %d fatal errors"
-msgstr "encontrados %d erros fatais"
+#: po-gram-gen.y:228
+msgid "first plural form has nonzero index"
+msgstr ""
-#: src/po-lex.c:129 src/po-lex.c:168
+#: po-gram-gen.y:230
+msgid "plural form has wrong index"
+msgstr ""
+
+#. CAUTION: If you change this macro, you must also make identical
+#. changes to the function of the same name in src/po-lex.c
+#: src/po-lex.c:156 src/po-lex.c:195 src/po-lex.h:85 src/po-lex.h:99
+#: src/po-lex.h:115 src/po-lex.h:129
msgid "too many errors, aborting"
msgstr "demasiados erros, interrompendo"
-#: src/po-lex.c:241
+#: src/po-lex.c:271
#, c-format
msgid "keyword \"%s\" unknown"
msgstr "palavra chave \"%s\" desconhecida"
-#: src/po-lex.c:335
+#: src/po-lex.c:374
#, fuzzy
msgid "invalid control sequence"
msgstr "sequência de controlo ilegal"
-#: src/po-lex.c:419
+#: src/po-lex.c:477
+msgid "end-of-file within string"
+msgstr "fim-de-ficheiro dentro da cadeia"
+
+#: src/po-lex.c:482
msgid "end-of-line within string"
msgstr "fim-de-linha dentro da cadeia"
-#: src/po-lex.c:424
-msgid "end-of-file within string"
-msgstr "fim-de-ficheiro dentro da cadeia"
+#: src/po-lex.c:525
+#, fuzzy
+msgid "invalid multibyte sequence"
+msgstr "sequência de controlo ilegal"
-#: src/xget-lex.c:152
+#: src/xget-lex.c:148
msgid "standard input"
msgstr "entrada standard"
-#: src/xget-lex.c:894
+#: src/xget-lex.c:876
#, c-format
msgid "%s:%d: warning: unterminated character constant"
msgstr ""
-#: src/xget-lex.c:916
+#: src/xget-lex.c:898
#, c-format
msgid "%s:%d: warning: unterminated string literal"
msgstr ""
-#: src/xgettext.c:386
+#: src/xgettext.c:383
msgid "--join-existing cannot be used when output is written to stdout"
msgstr ""
"--join-existing não pode ser usada quando a saída\n"
"é escrita no stdout"
-#: src/xgettext.c:391
+#: src/xgettext.c:388
msgid "xgettext cannot work without keywords to look for"
msgstr ""
-#: src/xgettext.c:508
+#: src/xgettext.c:494
#, fuzzy, c-format
msgid "warning: file `%s' extension `%s' is unknown; will try C"
msgstr ""
"cuidado: o tipo do ficheiro `%s' com a extensão `%s' é desconhecido;\n"
"será tentado C"
-#: src/xgettext.c:544
+#: src/xgettext.c:530
#, fuzzy, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] INPUTFILE ...\n"
@@ -784,7 +827,7 @@ msgstr ""
" vazio\n"
" -F, --sort-by-file ordena a saída pela localização dos ficheiros\n"
-#: src/xgettext.c:564
+#: src/xgettext.c:550
#, fuzzy, c-format, no-wrap
msgid ""
" -h, --help display this help and exit\n"
@@ -814,7 +857,7 @@ msgstr ""
" `msgstr'\n"
" --no-location não escreve linhas do tipo '#: filename:line'\n"
-#: src/xgettext.c:578
+#: src/xgettext.c:564
#, fuzzy, no-wrap
msgid ""
" -n, --add-location generate '#: filename:line' lines (default)\n"
@@ -847,21 +890,36 @@ msgstr ""
"Se o ficheiro de entrada for -, o canal de entrada por defeito (stdin) é\n"
"usado.\n"
-#: src/xgettext.c:879
+#: src/xgettext.c:926
#, c-format
msgid "%s:%d: warning: keyword nested in keyword arg"
msgstr ""
-#: src/xgettext.c:889
+#: src/xgettext.c:936
#, c-format
msgid "%s:%d: warning: keyword between outer keyword and its arg"
msgstr ""
-#: src/xgettext.c:1374
+#: src/xgettext.c:1432
#, c-format
msgid "language `%s' unknown"
msgstr ""
+#~ msgid ""
+#~ "internationalized messages should not contain the `\\%c' escape sequence"
+#~ msgstr ""
+#~ "as mensagens de internacionalização não devem conter\n"
+#~ "a sequência de escape `\\%c'"
+
+#~ msgid "cannot create output file \"%s\""
+#~ msgstr "impossível criar o ficheiro de saída \"%s\""
+
+#~ msgid "standard output"
+#~ msgstr "canal de saída por defeito (stdout)"
+
+#~ msgid "error while writing \"%s\" file"
+#~ msgstr "erro durante a escrita do ficheiro \"%s\""
+
#, fuzzy
#~ msgid "%s: warning: no header entry found"
#~ msgstr "cuidado: nenhum elemento encontrado no cabeçalho"
diff --git a/po/sl.po b/po/sl.po
index 75c80b2..db1b7cd 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -2,12 +2,12 @@
# Copyright (C) 1996 Free Software Foundation, Inc.
# Primoz Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>, 1996.
#
-# $Header: /cvs/gettext/gettext/po/sl.po,v 1.1.1.1 2000/06/16 07:49:23 drepper Exp $
+# $Header: /cvs/gettext/gettext/po/sl.po,v 1.2 2001/02/01 19:26:07 haible Exp $
#
msgid ""
msgstr ""
"Project-Id-Version: GNU gettext 0.10.24\n"
-"POT-Creation-Date: 2000-07-28 22:51+0200\n"
+"POT-Creation-Date: 2001-03-09 19:56+0100\n"
"PO-Revision-Date: 1996-09-12 21:15\n"
"Last-Translator: Primoz Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>\n"
"Language-Team: Slovenian <sl@li.org>\n"
@@ -15,77 +15,83 @@ msgstr ""
"Content-Type: text/plain; charset=ISO-8859-2\n"
"Content-Transfer-Encoding: 8-bit\n"
-#: lib/error.c:103
+#: lib/error.c:115
msgid "Unknown system error"
msgstr "Neznana sistemska napaka"
-#: lib/getopt.c:680
+#: lib/getopt.c:691
#, c-format
msgid "%s: option `%s' is ambiguous\n"
msgstr "%s: izbira ,%s' je dvoumna\n"
-#: lib/getopt.c:704
+#: lib/getopt.c:716
#, c-format
msgid "%s: option `--%s' doesn't allow an argument\n"
msgstr "%s: izbira ,--%s' ne dovoljuje argumenta\n"
-#: lib/getopt.c:709
+#: lib/getopt.c:721
#, c-format
msgid "%s: option `%c%s' doesn't allow an argument\n"
msgstr "%s: izbira ,%c%s' ne dovoljuje argumenta\n"
-#: lib/getopt.c:726 lib/getopt.c:899
+#: lib/getopt.c:739 lib/getopt.c:912
#, c-format
msgid "%s: option `%s' requires an argument\n"
msgstr "%s: izbira ,%s' zahteva argument\n"
#. --option
-#: lib/getopt.c:755
+#: lib/getopt.c:768
#, c-format
msgid "%s: unrecognized option `--%s'\n"
msgstr "%s: neprepoznana izbira ,--%s'\n"
#. +option or -option
-#: lib/getopt.c:759
+#: lib/getopt.c:772
#, c-format
msgid "%s: unrecognized option `%c%s'\n"
msgstr "%s: neprepoznana izbira ,%c%s'\n"
#. 1003.2 specifies the format of this message.
-#: lib/getopt.c:785
+#: lib/getopt.c:798
#, c-format
msgid "%s: illegal option -- %c\n"
msgstr "%s: nedovoljena izbira -- %c\n"
-#: lib/getopt.c:788
+#: lib/getopt.c:801
#, c-format
msgid "%s: invalid option -- %c\n"
msgstr "%s: neveljavna izbira -- %c\n"
#. 1003.2 specifies the format of this message.
-#: lib/getopt.c:818 lib/getopt.c:948
+#: lib/getopt.c:831 lib/getopt.c:961
#, c-format
msgid "%s: option requires an argument -- %c\n"
msgstr "%s: izbira zahteva argument -- %c\n"
-#: lib/getopt.c:865
+#: lib/getopt.c:878
#, fuzzy, c-format
msgid "%s: option `-W %s' is ambiguous\n"
msgstr "%s: izbira ,%s' je dvoumna\n"
-#: lib/getopt.c:883
+#: lib/getopt.c:896
#, fuzzy, c-format
msgid "%s: option `-W %s' doesn't allow an argument\n"
msgstr "%s: izbira ,--%s' ne dovoljuje argumenta\n"
# Morda ,,Zmanjkalo pomnilnika''?
-#: lib/xmalloc.c:82
+#: lib/obstack.c:474
+#, fuzzy
+msgid "memory exhausted"
+msgstr "pomnilnik izèrpan"
+
+# Morda ,,Zmanjkalo pomnilnika''?
+#: lib/xmalloc.c:86
#, fuzzy
msgid "Memory exhausted"
msgstr "pomnilnik izèrpan"
-#: src/gettextp.c:134 src/msgcmp.c:144 src/msgcomm.c:285 src/msgfmt.c:257
-#: src/msgmerge.c:263 src/msgunfmt.c:175 src/xgettext.c:401
+#: src/gettext.c:138 src/msgcmp.c:140 src/msgcomm.c:283 src/msgfmt.c:270
+#: src/msgmerge.c:255 src/msgunfmt.c:170 src/xgettext.c:398
#, c-format, no-wrap
msgid ""
"Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -93,27 +99,27 @@ msgid ""
"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
msgstr ""
-#: src/gettextp.c:139 src/msgcmp.c:149 src/msgcomm.c:290 src/msgfmt.c:262
-#: src/msgmerge.c:268 src/msgunfmt.c:180 src/xgettext.c:406
+#: src/gettext.c:143 src/msgcmp.c:145 src/msgcomm.c:288 src/msgfmt.c:275
+#: src/msgmerge.c:260 src/msgunfmt.c:175 src/xgettext.c:403
#, c-format
msgid "Written by %s.\n"
msgstr ""
-#: src/gettextp.c:154
+#: src/gettext.c:158
msgid "missing arguments"
msgstr "argumenti manjkajo"
-#: src/gettextp.c:164
+#: src/gettext.c:168
msgid "too many arguments"
msgstr "preveè argumentov"
-#: src/gettextp.c:228 src/msgcmp.c:181 src/msgcomm.c:395 src/msgfmt.c:361
-#: src/msgmerge.c:323 src/msgunfmt.c:210 src/xgettext.c:539
+#: src/gettext.c:232 src/msgcmp.c:177 src/msgcomm.c:381 src/msgfmt.c:377
+#: src/msgmerge.c:315 src/msgunfmt.c:205 src/xgettext.c:525
#, fuzzy, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "Poskusite ,%s --help' za izèrpnej¹a navodila\n"
-#: src/gettextp.c:233
+#: src/gettext.c:237
#, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] [[[TEXTDOMAIN] MSGID] | [-s [MSGID]...]]\n"
@@ -136,7 +142,7 @@ msgstr ""
" [TEXTDOMAIN] MSGID retrieve translated message corresponding\n"
" to MSGID from TEXTDOMAIN\n"
-#: src/gettextp.c:245
+#: src/gettext.c:249
#, c-format, no-wrap
msgid ""
"\n"
@@ -158,42 +164,20 @@ msgstr ""
"sporoèil.\n"
"Privzet imenik s katalogom sporoèil: %s\n"
-#: src/gettextp.c:255 src/msgcmp.c:200 src/msgcomm.c:442 src/msgfmt.c:388
-#: src/msgmerge.c:358 src/msgunfmt.c:234 src/xgettext.c:591
+#: src/gettext.c:259 src/msgcmp.c:196 src/msgcomm.c:428 src/msgfmt.c:404
+#: src/msgmerge.c:350 src/msgunfmt.c:229 src/xgettext.c:577
msgid "Report bugs to <bug-gnu-utils@gnu.org>.\n"
msgstr ""
-#: src/message.c:900
-#, c-format
-msgid ""
-"internationalized messages should not contain the `\\%c' escape sequence"
-msgstr ""
-"internacionalizirana sporoèila ne smejo vsebovati ube¾ne sekvence ,\\%c'"
-
-#: src/message.c:1231
-#, c-format
-msgid "cannot create output file \"%s\""
-msgstr "izhodne datoteke \"%s\" ni mogoèe ustvariti"
-
-#: src/message.c:1238
-#, no-c-format
-msgid "standard output"
-msgstr "standardni izhod"
-
-#: src/message.c:1298
-#, c-format
-msgid "error while writing \"%s\" file"
-msgstr "napaka pri pisanju na datoteko \"%s\""
-
-#: src/msgcmp.c:160 src/msgmerge.c:279
+#: src/msgcmp.c:156 src/msgmerge.c:271
msgid "no input files given"
msgstr "vhodni datoteki nista podani"
-#: src/msgcmp.c:165 src/msgmerge.c:284
+#: src/msgcmp.c:161 src/msgmerge.c:276
msgid "exactly 2 input files required"
msgstr "potrebni sta natanèno dve vhodni datoteki"
-#: src/msgcmp.c:186
+#: src/msgcmp.c:182
#, fuzzy, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] def.po ref.po\n"
@@ -222,58 +206,63 @@ msgstr ""
"v programu. Kadar ne najdemo natanènega ujemanja msgid, zaradi bolj¹e\n"
"diagnostike poskusimo z ohlapnim (fuzzy) algoritmom.\n"
-#: src/msgcmp.c:259 src/msgmerge.c:746
+#: src/msgcmp.c:255 src/msgmerge.c:741
msgid "this message is used but not defined..."
msgstr "to sporoèilo je uporabljeno, a ne definirano..."
-#: src/msgcmp.c:261 src/msgmerge.c:748
+#: src/msgcmp.c:257 src/msgmerge.c:743
msgid "...but this definition is similar"
msgstr "...a ta definicija je podobna"
-#: src/msgcmp.c:267 src/msgmerge.c:775
+#: src/msgcmp.c:263 src/msgmerge.c:770
#, c-format
msgid "this message is used but not defined in %s"
msgstr "to sporoèilo je uporabljeno, a ne definirano v %s"
-#: src/msgcmp.c:281
+#: src/msgcmp.c:277
msgid "warning: this message is not used"
msgstr "pozor: to sporoèilo ni uporabljeno"
-#: src/msgcmp.c:355 src/msgfmt.c:633 src/msgmerge.c:517 src/xgettext.c:1093
+#: src/msgcmp.c:282 src/po-lex.c:102
+#, c-format
+msgid "found %d fatal errors"
+msgstr "%d kritiènih napak"
+
+#: src/msgcmp.c:354 src/msgfmt.c:657 src/msgmerge.c:512 src/xgettext.c:1169
msgid "duplicate message definition"
msgstr "podvojena definicija sporoèila"
-#: src/msgcmp.c:356 src/msgfmt.c:634 src/msgmerge.c:518 src/xgettext.c:1094
+#: src/msgcmp.c:355 src/msgfmt.c:659 src/msgmerge.c:513 src/xgettext.c:1170
msgid "...this is the location of the first definition"
msgstr "...to je kraj prve definicije"
-#: src/msgcmp.c:396 src/msgmerge.c:566
+#: src/msgcmp.c:395 src/msgmerge.c:561
#, c-format
msgid "this message has no definition in the \"%s\" domain"
msgstr "to sporoèilo ni definirano v domeni \"%s\""
#. We are about to construct the absolute path to the
#. directory for the output files but asprintf failed.
-#: src/msgcomm.c:238 src/xgettext.c:340 src/xgettext.c:1288
+#: src/msgcomm.c:236 src/xgettext.c:337 src/xgettext.c:1365
msgid "while preparing output"
msgstr "med pripravo izpisa"
-#: src/msgcomm.c:273 src/msgcomm.c:277 src/xgettext.c:378 src/xgettext.c:382
+#: src/msgcomm.c:271 src/msgcomm.c:275 src/xgettext.c:375 src/xgettext.c:379
#, c-format
msgid "%s and %s are mutually exclusive"
msgstr "%s in %s se med seboj izkljuèujeta"
-#: src/msgcomm.c:341
+#: src/msgcomm.c:327
msgid "at least two files must be specified"
msgstr ""
-#: src/msgcomm.c:360
+#: src/msgcomm.c:346
#, c-format
msgid "impossible selection criteria specified (%d < n < %d)"
msgstr ""
# POZOR! Nepopolni prevodi
-#: src/msgcomm.c:400
+#: src/msgcomm.c:386
#, fuzzy, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] INPUTFILE ...\n"
@@ -304,7 +293,7 @@ msgstr ""
" -F, --sort-by-file izhod sortiramo po lokaciji datotek\n"
# POZOR! Nepopolni prevodi
-#: src/msgcomm.c:412
+#: src/msgcomm.c:398
#, fuzzy
msgid ""
" -i, --indent write the .po file using indented style\n"
@@ -327,8 +316,8 @@ msgstr ""
" --omit-header brez glave z ,msgid \"\"'\n"
" -p, --output-dir=IMENIK izhodne datoteke zapisane v IMENIK\n"
" -s, --sort-output sortiran izpis brez podvojenih vnosov\n"
-" --strict strogi stil Uniforum pri izpisu datoteke "
-".po\n"
+" --strict strogi stil Uniforum pri izpisu datoteke ."
+"po\n"
" -T, --trigraphs razumi trigrafe ANSI C na vhodu\n"
" -V, --version verzija programa\n"
" -w, --width=©TEVILO ¹irina vrstice pri izpisu, v znakih\n"
@@ -336,7 +325,7 @@ msgstr ""
"\n"
"Èe je ime vhodne datoteke - (minus), beremo s standardnega vhoda.\n"
-#: src/msgcomm.c:425
+#: src/msgcomm.c:411
msgid ""
" -V, --version output version information and exit\n"
" -w, --width=NUMBER set output page width\n"
@@ -356,41 +345,41 @@ msgid ""
"preserved.\n"
msgstr ""
-#: src/msgcomm.c:476 src/msgunfmt.c:357 src/po-lex.c:74 src/xget-lex.c:161
-#: src/xget-lex.c:176 src/xget-lex.c:193 src/xgettext.c:625
+#: src/msgcomm.c:462 src/msgunfmt.c:361 src/po-lex.c:86 src/xget-lex.c:157
+#: src/xget-lex.c:170 src/xget-lex.c:180 src/xgettext.c:611
#, c-format
msgid "error while opening \"%s\" for reading"
msgstr "datoteke \"%s\" ni moè odpreti za branje"
-#: src/msgcomm.c:557 src/xgettext.c:667 src/xgettext.c:1000
+#: src/msgcomm.c:543 src/xgettext.c:653 src/xgettext.c:1071
msgid "this file may not contain domain directives"
msgstr "ta datoteka morda ne vsebuje direktiv domene"
-#: src/msgfmt.c:273 src/xgettext.c:417
+#: src/msgfmt.c:286 src/xgettext.c:414
msgid "no input file given"
msgstr "vhodna datoteka ni podana"
-#: src/msgfmt.c:321
+#: src/msgfmt.c:337
#, c-format
msgid "error while opening \"%s\" for writing"
msgstr "napaka pri pisanju na \"%s\""
-#: src/msgfmt.c:343
+#: src/msgfmt.c:359
#, fuzzy, c-format
msgid "%d translated messages"
msgstr "%d prevedenih sporoèil"
-#: src/msgfmt.c:345
+#: src/msgfmt.c:361
#, c-format
msgid ", %d fuzzy translations"
msgstr ", %d ohlapnih prevodov"
-#: src/msgfmt.c:347
+#: src/msgfmt.c:363
#, fuzzy, c-format
msgid ", %d untranslated messages"
msgstr ", %d neprevedenih sporoèil"
-#: src/msgfmt.c:366
+#: src/msgfmt.c:382
#, fuzzy, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] filename.po ...\n"
@@ -432,85 +421,107 @@ msgstr ""
"vhoda. Èe je kot ime izhodne datoteke navedeno - (minus), program pi¹e na\n"
"standardni izhod.\n"
-#: src/msgfmt.c:409
+#: src/msgfmt.c:425
msgid "while creating hash table"
msgstr "med ustvarjanjem razpr¹ene tabele"
-#: src/msgfmt.c:451
+#: src/msgfmt.c:469
#, fuzzy, c-format
-msgid "%s: warning: PO file header missing, fuzzy, or invalid"
+msgid ""
+"%s: warning: PO file header missing, fuzzy, or invalid\n"
+"%*s warning: charset conversion will not work"
msgstr "POZOR: vhodna datoteka vsebuje ohlapne (fuzzy) prevode"
-#: src/msgfmt.c:474
+#: src/msgfmt.c:493
#, c-format
msgid "domain name \"%s\" not suitable as file name"
msgstr "ime domene \"%s\" ni primerno kot ime datoteke"
-#: src/msgfmt.c:479
+#: src/msgfmt.c:498
#, c-format
msgid "domain name \"%s\" not suitable as file name: will use prefix"
msgstr "ime domene \"%s\" ni primerno kot ime datoteke: uporabimo predpono"
#. We don't change the exit status here because this is really
#. only an information.
-#: src/msgfmt.c:492
+#: src/msgfmt.c:511
#, c-format
msgid "`domain %s' directive ignored"
msgstr "direktiva ,domain %s' ni bila upo¹tevana"
-#: src/msgfmt.c:520
+#: src/msgfmt.c:541
msgid "empty `msgstr' entry ignored"
msgstr "prazno polje ,msgstr' ignorirano"
-#: src/msgfmt.c:521
+#: src/msgfmt.c:542
#, fuzzy
msgid "fuzzy `msgstr' entry ignored"
msgstr "ohlapen vnos za polje ,msgstr' ignoriran"
-#: src/msgfmt.c:564
+#: src/msgfmt.c:584
#, c-format
msgid "headerfield `%s' missing in header"
msgstr "v glavi manjka polje ,%s'"
-#: src/msgfmt.c:567
+#: src/msgfmt.c:587
#, c-format
msgid "header field `%s' should start at beginning of line"
msgstr "polje ,%s' v glavi se mora zaèeti na zaèetku vrstice"
-#: src/msgfmt.c:577
+#: src/msgfmt.c:597
msgid "some header fields still have the initial default value"
msgstr "nekatera polja v glavi imajo ¹e vedno zaèetne privzete vrednosti"
-#: src/msgfmt.c:588
+#: src/msgfmt.c:608
#, c-format
msgid "field `%s' still has initial default value"
msgstr "polje ,%s' ima ¹e vedno zaèetno privzeto vrednost"
-#: src/msgfmt.c:673
+#: src/msgfmt.c:698
#, fuzzy, c-format
msgid "%s: warning: source file contains fuzzy translation"
msgstr "POZOR: vhodna datoteka vsebuje ohlapne (fuzzy) prevode"
-#: src/msgfmt.c:875
+#: src/msgfmt.c:920
+#, fuzzy
+msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
+msgstr "polji ,msgid' in ,msgstr' se ne zaèneta obe z ,\\n'"
+
+#: src/msgfmt.c:928
+#, fuzzy, c-format
+msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
+msgstr "polji ,msgid' in ,msgstr' se ne zaèneta obe z ,\\n'"
+
+#: src/msgfmt.c:938
#, fuzzy
msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
msgstr "polji ,msgid' in ,msgstr' se ne zaèneta obe z ,\\n'"
-#: src/msgfmt.c:883
+#: src/msgfmt.c:953
+#, fuzzy
+msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
+msgstr "polji ,msgid' in ,msgstr' se ne konèata obe z ,\\n'"
+
+#: src/msgfmt.c:961
+#, fuzzy, c-format
+msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
+msgstr "polji ,msgid' in ,msgstr' se ne konèata obe z ,\\n'"
+
+#: src/msgfmt.c:971
#, fuzzy
msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
msgstr "polji ,msgid' in ,msgstr' se ne konèata obe z ,\\n'"
-#: src/msgfmt.c:897
+#: src/msgfmt.c:987
msgid "number of format specifications in `msgid' and `msgstr' does not match"
msgstr "¹tevili formatnih doloèil v ,msgid' in ,msgstr' se ne ujemata"
-#: src/msgfmt.c:914
+#: src/msgfmt.c:1004
#, c-format
msgid "format specifications for argument %u are not the same"
msgstr "formatni doloèili za argument %u nista enaki"
-#: src/msgmerge.c:328
+#: src/msgmerge.c:320
#, fuzzy, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] def.po ref.po\n"
@@ -545,7 +556,7 @@ msgstr ""
" -V, --version verzija programa\n"
" -w, --width=©TEVILO ¹irina strani pri izpisu, v znakih\n"
-#: src/msgmerge.c:348
+#: src/msgmerge.c:340
#, no-wrap
msgid ""
"\n"
@@ -570,20 +581,20 @@ msgstr ""
"ni, se uporabi ohlapni (fuzzy) algoritem. Èe izhodna datoteka ni podana, gre\n"
"izpis na standardni izhod.\n"
-#: src/msgmerge.c:804
+#: src/msgmerge.c:799
#, c-format
msgid ""
-"%sRead %d old + %d reference, merged %d, fuzzied %d, missing %d, obsolete "
-"%d.\n"
+"%sRead %d old + %d reference, merged %d, fuzzied %d, missing %d, obsolete %"
+"d.\n"
msgstr ""
"%sPrebrano %d starih + %d referenènih, zdru¾enih %d, ohlapnih %d, "
"manjkajoèih %d, zastarelih %d.\n"
-#: src/msgmerge.c:810
+#: src/msgmerge.c:805
msgid " done.\n"
msgstr " opravljeno.\n"
-#: src/msgunfmt.c:215
+#: src/msgunfmt.c:210
#, fuzzy, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] [FILE]...\n"
@@ -610,7 +621,7 @@ msgstr ""
" -V, --version verzija programa\n"
" -w, --width=©TEVILO ¹irina strani pri izpisu, v znakih\n"
-#: src/msgunfmt.c:229
+#: src/msgunfmt.c:224
#, no-wrap
msgid ""
"\n"
@@ -625,86 +636,120 @@ msgstr ""
"Èe vhodna datoteka ni podana, ali pa je podano ime -, beremo standardni vhod.\n"
"Èe ni izbrano drugaèe, gre izpis na standardni izhod.\n"
-#: src/msgunfmt.c:266 src/msgunfmt.c:330 src/po-lex.c:185 src/xget-lex.c:256
+#: src/msgunfmt.c:261 src/msgunfmt.c:326 src/po-lex.c:213 src/xget-lex.c:243
#, c-format
msgid "error while reading \"%s\""
msgstr "napaka pri branju \"%s\""
-#: src/msgunfmt.c:267 src/msgunfmt.c:331
+#: src/msgunfmt.c:262 src/msgunfmt.c:327
#, c-format
msgid "file \"%s\" truncated"
msgstr "datoteka \"%s\" okrnjena"
-#: src/msgunfmt.c:298
+#: src/msgunfmt.c:293
#, c-format
msgid "seek \"%s\" offset %ld failed"
msgstr "dostop do \"%s\" ofset %ld ni mo¾en"
-#: src/msgunfmt.c:373
+#: src/msgunfmt.c:332
+#, fuzzy, c-format
+msgid "file \"%s\" contains a not NUL terminated string"
+msgstr "datoteka \"%s\" ni v obliki GNU .mo"
+
+#: src/msgunfmt.c:377
#, c-format
msgid "file \"%s\" is not in GNU .mo format"
msgstr "datoteka \"%s\" ni v obliki GNU .mo"
-#: /home/drepper/gnu/gettext/build/src/../../src/po-gram-gen.y:129
+#: src/open-po.c:64
+msgid "<stdin>"
+msgstr ""
+
+#: po-gram-gen.y:87
+msgid "inconsistent use of #~"
+msgstr ""
+
+#: po-gram-gen.y:168
+#, fuzzy
+msgid "missing `msgstr[]' section"
+msgstr "manjka ,msgstr'"
+
+#: po-gram-gen.y:176
+#, fuzzy
+msgid "missing `msgid_plural' section"
+msgstr "manjka ,msgstr'"
+
+#: po-gram-gen.y:183
msgid "missing `msgstr' section"
msgstr "manjka ,msgstr'"
-#: src/po-lex.c:84
-#, c-format
-msgid "found %d fatal errors"
-msgstr "%d kritiènih napak"
+#: po-gram-gen.y:228
+msgid "first plural form has nonzero index"
+msgstr ""
-#: src/po-lex.c:129 src/po-lex.c:168
+#: po-gram-gen.y:230
+msgid "plural form has wrong index"
+msgstr ""
+
+#. CAUTION: If you change this macro, you must also make identical
+#. changes to the function of the same name in src/po-lex.c
+#: src/po-lex.c:156 src/po-lex.c:195 src/po-lex.h:85 src/po-lex.h:99
+#: src/po-lex.h:115 src/po-lex.h:129
msgid "too many errors, aborting"
msgstr "preveè napak, nadaljevanje ni mo¾no"
-#: src/po-lex.c:241
+#: src/po-lex.c:271
#, c-format
msgid "keyword \"%s\" unknown"
msgstr "kljuèna beseda \"%s\" neprepoznana"
-#: src/po-lex.c:335
+#: src/po-lex.c:374
#, fuzzy
msgid "invalid control sequence"
msgstr "nedovoljena kontrolna sekvenca"
-#: src/po-lex.c:419
+#: src/po-lex.c:477
+msgid "end-of-file within string"
+msgstr "znak za konec datoteke sredi niza"
+
+#: src/po-lex.c:482
msgid "end-of-line within string"
msgstr "znak za konec vrstice sredi niza"
-#: src/po-lex.c:424
-msgid "end-of-file within string"
-msgstr "znak za konec datoteke sredi niza"
+#: src/po-lex.c:525
+#, fuzzy
+msgid "invalid multibyte sequence"
+msgstr "nedovoljena kontrolna sekvenca"
-#: src/xget-lex.c:152
+#: src/xget-lex.c:148
msgid "standard input"
msgstr "standardni vhod"
-#: src/xget-lex.c:894
+#: src/xget-lex.c:876
#, c-format
msgid "%s:%d: warning: unterminated character constant"
msgstr ""
-#: src/xget-lex.c:916
+#: src/xget-lex.c:898
#, c-format
msgid "%s:%d: warning: unterminated string literal"
msgstr ""
-#: src/xgettext.c:386
+#: src/xgettext.c:383
msgid "--join-existing cannot be used when output is written to stdout"
msgstr "pri izpisu na standardni izhod ne moremo uporabiti --join-existing"
-#: src/xgettext.c:391
+#: src/xgettext.c:388
msgid "xgettext cannot work without keywords to look for"
msgstr ""
-#: src/xgettext.c:508
+#: src/xgettext.c:494
#, fuzzy, c-format
msgid "warning: file `%s' extension `%s' is unknown; will try C"
msgstr "pozor: tip datoteke ,%s' s pripono ,%s' ni prepoznan; posku¹amo C"
# POZOR! Nepopolni prevodi
-#: src/xgettext.c:544
+#: src/xgettext.c:530
#, fuzzy, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] INPUTFILE ...\n"
@@ -741,7 +786,7 @@ msgstr ""
" --force-po datoteko PO zapi¹emo, èetudi je prazna\n"
" -F, --sort-by-file izhod sortiramo po lokaciji datotek\n"
-#: src/xgettext.c:564
+#: src/xgettext.c:550
#, fuzzy, c-format, no-wrap
msgid ""
" -h, --help display this help and exit\n"
@@ -768,7 +813,7 @@ msgstr ""
" --no-location brez vrstic '#: filename:line'\n"
# POZOR! Nepopolni prevodi
-#: src/xgettext.c:578
+#: src/xgettext.c:564
#, fuzzy, no-wrap
msgid ""
" -n, --add-location generate '#: filename:line' lines (default)\n"
@@ -796,21 +841,35 @@ msgstr ""
"\n"
"Èe je ime vhodne datoteke - (minus), beremo s standardnega vhoda.\n"
-#: src/xgettext.c:879
+#: src/xgettext.c:926
#, c-format
msgid "%s:%d: warning: keyword nested in keyword arg"
msgstr ""
-#: src/xgettext.c:889
+#: src/xgettext.c:936
#, c-format
msgid "%s:%d: warning: keyword between outer keyword and its arg"
msgstr ""
-#: src/xgettext.c:1374
+#: src/xgettext.c:1432
#, c-format
msgid "language `%s' unknown"
msgstr ""
+#~ msgid ""
+#~ "internationalized messages should not contain the `\\%c' escape sequence"
+#~ msgstr ""
+#~ "internacionalizirana sporoèila ne smejo vsebovati ube¾ne sekvence ,\\%c'"
+
+#~ msgid "cannot create output file \"%s\""
+#~ msgstr "izhodne datoteke \"%s\" ni mogoèe ustvariti"
+
+#~ msgid "standard output"
+#~ msgstr "standardni izhod"
+
+#~ msgid "error while writing \"%s\" file"
+#~ msgstr "napaka pri pisanju na datoteko \"%s\""
+
#, fuzzy
#~ msgid "%s: warning: no header entry found"
#~ msgstr "pozor: glava manjka"
diff --git a/po/sv.po b/po/sv.po
index 37a36df..a2a788d 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,88 +1,93 @@
# Swedish messages for gettext
# Copyright © 1996 Free Software Foundation, Inc.
# Jan Djärv <Jan.Djarv@mbox200.swipnet.se>, 1996.
-# $Revision: 1.4 $
+# $Revision: 1.5 $
#
msgid ""
msgstr ""
"Project-Id-Version: gettext 0.10.31\n"
-"POT-Creation-Date: 2000-07-28 22:51+0200\n"
-"PO-Revision-Date: $Date: 2001/03/09 19:19:21 $\n"
+"POT-Creation-Date: 2001-03-09 19:56+0100\n"
+"PO-Revision-Date: $Date: 2001/03/09 20:46:45 $\n"
"Last-Translator: Jan Djärv <Jan.Djarv@mbox200.swipnet.se>\n"
"Language-Team: Swedish <sv@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
-#: lib/error.c:103
+#: lib/error.c:115
msgid "Unknown system error"
msgstr "Okänt systemfel"
-#: lib/getopt.c:680
+#: lib/getopt.c:691
#, c-format
msgid "%s: option `%s' is ambiguous\n"
msgstr "%s: flaggan \"%s\" är tvetydig\n"
-#: lib/getopt.c:704
+#: lib/getopt.c:716
#, c-format
msgid "%s: option `--%s' doesn't allow an argument\n"
msgstr "%s: flaggan \"--%s\" tar inget argument\n"
-#: lib/getopt.c:709
+#: lib/getopt.c:721
#, c-format
msgid "%s: option `%c%s' doesn't allow an argument\n"
msgstr "%s: flaggan \"%c%s\" tar inget argument\n"
-#: lib/getopt.c:726 lib/getopt.c:899
+#: lib/getopt.c:739 lib/getopt.c:912
#, c-format
msgid "%s: option `%s' requires an argument\n"
msgstr "%s: flaggan \"%s\" behöver ett argument\n"
#. --option
-#: lib/getopt.c:755
+#: lib/getopt.c:768
#, c-format
msgid "%s: unrecognized option `--%s'\n"
msgstr "%s: okänd flagga \"--%s\"\n"
#. +option or -option
-#: lib/getopt.c:759
+#: lib/getopt.c:772
#, c-format
msgid "%s: unrecognized option `%c%s'\n"
msgstr "%s: okänd flagga \"%c%s\"\n"
#. 1003.2 specifies the format of this message.
-#: lib/getopt.c:785
+#: lib/getopt.c:798
#, c-format
msgid "%s: illegal option -- %c\n"
msgstr "%s: otillåten flagga -- %c\n"
-#: lib/getopt.c:788
+#: lib/getopt.c:801
#, c-format
msgid "%s: invalid option -- %c\n"
msgstr "%s: ogiltig flagga -- %c\n"
#. 1003.2 specifies the format of this message.
-#: lib/getopt.c:818 lib/getopt.c:948
+#: lib/getopt.c:831 lib/getopt.c:961
#, c-format
msgid "%s: option requires an argument -- %c\n"
msgstr "%s: flaggan behöver ett argument -- %c\n"
-#: lib/getopt.c:865
+#: lib/getopt.c:878
#, c-format
msgid "%s: option `-W %s' is ambiguous\n"
msgstr "%s: flaggan \"-W %s\" är tvetydig\n"
-#: lib/getopt.c:883
+#: lib/getopt.c:896
#, c-format
msgid "%s: option `-W %s' doesn't allow an argument\n"
msgstr "%s: flaggan \"-W %s\" tar inget argument\n"
-#: lib/xmalloc.c:82
+#: lib/obstack.c:474
+#, fuzzy
+msgid "memory exhausted"
+msgstr "Minnet slut"
+
+#: lib/xmalloc.c:86
msgid "Memory exhausted"
msgstr "Minnet slut"
-#: src/gettextp.c:134 src/msgcmp.c:144 src/msgcomm.c:285 src/msgfmt.c:257
-#: src/msgmerge.c:263 src/msgunfmt.c:175 src/xgettext.c:401
+#: src/gettext.c:138 src/msgcmp.c:140 src/msgcomm.c:283 src/msgfmt.c:270
+#: src/msgmerge.c:255 src/msgunfmt.c:170 src/xgettext.c:398
#, c-format, no-wrap
msgid ""
"Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -94,27 +99,27 @@ msgstr ""
"INGEN garanti; inte ens för SÄLJBARHET eller LÄMPLIGHET FÖR NÅGOT SPECIELLT\n"
"ÄNDAMÅL.\n"
-#: src/gettextp.c:139 src/msgcmp.c:149 src/msgcomm.c:290 src/msgfmt.c:262
-#: src/msgmerge.c:268 src/msgunfmt.c:180 src/xgettext.c:406
+#: src/gettext.c:143 src/msgcmp.c:145 src/msgcomm.c:288 src/msgfmt.c:275
+#: src/msgmerge.c:260 src/msgunfmt.c:175 src/xgettext.c:403
#, c-format
msgid "Written by %s.\n"
msgstr "Skriven av %s.\n"
-#: src/gettextp.c:154
+#: src/gettext.c:158
msgid "missing arguments"
msgstr "argument saknas"
-#: src/gettextp.c:164
+#: src/gettext.c:168
msgid "too many arguments"
msgstr "för många argument"
-#: src/gettextp.c:228 src/msgcmp.c:181 src/msgcomm.c:395 src/msgfmt.c:361
-#: src/msgmerge.c:323 src/msgunfmt.c:210 src/xgettext.c:539
+#: src/gettext.c:232 src/msgcmp.c:177 src/msgcomm.c:381 src/msgfmt.c:377
+#: src/msgmerge.c:315 src/msgunfmt.c:205 src/xgettext.c:525
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "Försök med \"%s --help\" för mer information.\n"
-#: src/gettextp.c:233
+#: src/gettext.c:237
#, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] [[[TEXTDOMAIN] MSGID] | [-s [MSGID]...]]\n"
@@ -137,7 +142,7 @@ msgstr ""
" [TEXTDOMÄN] MDLID hämta översatt meddelande som motsvarar\n"
" MDLID från TEXTDOMÄN\n"
-#: src/gettextp.c:245
+#: src/gettext.c:249
#, c-format, no-wrap
msgid ""
"\n"
@@ -159,44 +164,22 @@ msgstr ""
"översätts de argument som hittas i den valda meddelandekatalogen.\n"
"Normal katalog för meddelandekataloger: %s\n"
-#: src/gettextp.c:255 src/msgcmp.c:200 src/msgcomm.c:442 src/msgfmt.c:388
-#: src/msgmerge.c:358 src/msgunfmt.c:234 src/xgettext.c:591
+#: src/gettext.c:259 src/msgcmp.c:196 src/msgcomm.c:428 src/msgfmt.c:404
+#: src/msgmerge.c:350 src/msgunfmt.c:229 src/xgettext.c:577
msgid "Report bugs to <bug-gnu-utils@gnu.org>.\n"
msgstr ""
"Rapportera fel till <bug-gnu-utils@gnu.org>.\n"
"Rapportera fel på översättningen till <sv@li.org>.\n"
-#: src/message.c:900
-#, c-format
-msgid ""
-"internationalized messages should not contain the `\\%c' escape sequence"
-msgstr ""
-"internationaliserade meddelanden bör inte ha kontrollsekvensen \"\\%c\""
-
-#: src/message.c:1231
-#, c-format
-msgid "cannot create output file \"%s\""
-msgstr "kan inte skapa utfilen \"%s\""
-
-#: src/message.c:1238
-#, no-c-format
-msgid "standard output"
-msgstr "standard ut"
-
-#: src/message.c:1298
-#, c-format
-msgid "error while writing \"%s\" file"
-msgstr "fel vid skrivning till filen \"%s\""
-
-#: src/msgcmp.c:160 src/msgmerge.c:279
+#: src/msgcmp.c:156 src/msgmerge.c:271
msgid "no input files given"
msgstr "inga infiler givna"
-#: src/msgcmp.c:165 src/msgmerge.c:284
+#: src/msgcmp.c:161 src/msgmerge.c:276
msgid "exactly 2 input files required"
msgstr "exakt 2 infiler krävs"
-#: src/msgcmp.c:186
+#: src/msgcmp.c:182
#, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] def.po ref.po\n"
@@ -225,57 +208,62 @@ msgstr ""
"har översatt alla strängar i programmet. Om en exakt likhet inte kan\n"
"hittas så används luddig jämförelse för att ge bättre felmeddelanden.\n"
-#: src/msgcmp.c:259 src/msgmerge.c:746
+#: src/msgcmp.c:255 src/msgmerge.c:741
msgid "this message is used but not defined..."
msgstr "detta meddelande används men är inte definierat..."
-#: src/msgcmp.c:261 src/msgmerge.c:748
+#: src/msgcmp.c:257 src/msgmerge.c:743
msgid "...but this definition is similar"
msgstr "...men denna definition är likartad"
-#: src/msgcmp.c:267 src/msgmerge.c:775
+#: src/msgcmp.c:263 src/msgmerge.c:770
#, c-format
msgid "this message is used but not defined in %s"
msgstr "detta meddelande används men är inte definierat i %s"
-#: src/msgcmp.c:281
+#: src/msgcmp.c:277
msgid "warning: this message is not used"
msgstr "varning: detta meddelande används inte"
-#: src/msgcmp.c:355 src/msgfmt.c:633 src/msgmerge.c:517 src/xgettext.c:1093
+#: src/msgcmp.c:282 src/po-lex.c:102
+#, c-format
+msgid "found %d fatal errors"
+msgstr "%d allvarliga fel hittades"
+
+#: src/msgcmp.c:354 src/msgfmt.c:657 src/msgmerge.c:512 src/xgettext.c:1169
msgid "duplicate message definition"
msgstr "meddelandedefinitionen är duplicerad"
-#: src/msgcmp.c:356 src/msgfmt.c:634 src/msgmerge.c:518 src/xgettext.c:1094
+#: src/msgcmp.c:355 src/msgfmt.c:659 src/msgmerge.c:513 src/xgettext.c:1170
msgid "...this is the location of the first definition"
msgstr "...detta är platsen för den första definitionen"
-#: src/msgcmp.c:396 src/msgmerge.c:566
+#: src/msgcmp.c:395 src/msgmerge.c:561
#, c-format
msgid "this message has no definition in the \"%s\" domain"
msgstr "detta meddelande har ingen definition i domänen \"%s\""
#. We are about to construct the absolute path to the
#. directory for the output files but asprintf failed.
-#: src/msgcomm.c:238 src/xgettext.c:340 src/xgettext.c:1288
+#: src/msgcomm.c:236 src/xgettext.c:337 src/xgettext.c:1365
msgid "while preparing output"
msgstr "när resultatet förbereddes"
-#: src/msgcomm.c:273 src/msgcomm.c:277 src/xgettext.c:378 src/xgettext.c:382
+#: src/msgcomm.c:271 src/msgcomm.c:275 src/xgettext.c:375 src/xgettext.c:379
#, c-format
msgid "%s and %s are mutually exclusive"
msgstr "%s och %s är ömsesidigt uteslutande"
-#: src/msgcomm.c:341
+#: src/msgcomm.c:327
msgid "at least two files must be specified"
msgstr ""
-#: src/msgcomm.c:360
+#: src/msgcomm.c:346
#, c-format
msgid "impossible selection criteria specified (%d < n < %d)"
msgstr ""
-#: src/msgcomm.c:400
+#: src/msgcomm.c:386
#, fuzzy, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] INPUTFILE ...\n"
@@ -307,7 +295,7 @@ msgstr ""
" --foreign-user utelämna FSF copyright-text i resultatet\n"
" -F, --sort-by-file sortera resultatet efter filposition\n"
-#: src/msgcomm.c:412
+#: src/msgcomm.c:398
#, fuzzy
msgid ""
" -i, --indent write the .po file using indented style\n"
@@ -342,7 +330,7 @@ msgstr ""
"\n"
"Om INFIL är - så läses standard in.\n"
-#: src/msgcomm.c:425
+#: src/msgcomm.c:411
msgid ""
" -V, --version output version information and exit\n"
" -w, --width=NUMBER set output page width\n"
@@ -362,41 +350,41 @@ msgid ""
"preserved.\n"
msgstr ""
-#: src/msgcomm.c:476 src/msgunfmt.c:357 src/po-lex.c:74 src/xget-lex.c:161
-#: src/xget-lex.c:176 src/xget-lex.c:193 src/xgettext.c:625
+#: src/msgcomm.c:462 src/msgunfmt.c:361 src/po-lex.c:86 src/xget-lex.c:157
+#: src/xget-lex.c:170 src/xget-lex.c:180 src/xgettext.c:611
#, c-format
msgid "error while opening \"%s\" for reading"
msgstr "fel uppstod när \"%s\" öppnades för läsning"
-#: src/msgcomm.c:557 src/xgettext.c:667 src/xgettext.c:1000
+#: src/msgcomm.c:543 src/xgettext.c:653 src/xgettext.c:1071
msgid "this file may not contain domain directives"
msgstr "denna fil kan inte innehålla domändirektiv"
-#: src/msgfmt.c:273 src/xgettext.c:417
+#: src/msgfmt.c:286 src/xgettext.c:414
msgid "no input file given"
msgstr "inga infiler givna"
-#: src/msgfmt.c:321
+#: src/msgfmt.c:337
#, c-format
msgid "error while opening \"%s\" for writing"
msgstr "fel uppstod när \"%s\" öppnades för skrivning"
-#: src/msgfmt.c:343
+#: src/msgfmt.c:359
#, c-format
msgid "%d translated messages"
msgstr "%d översatta meddelanden"
-#: src/msgfmt.c:345
+#: src/msgfmt.c:361
#, c-format
msgid ", %d fuzzy translations"
msgstr ", %d luddiga översättningar"
-#: src/msgfmt.c:347
+#: src/msgfmt.c:363
#, c-format
msgid ", %d untranslated messages"
msgstr ", %d oöversatta meddelanden"
-#: src/msgfmt.c:366
+#: src/msgfmt.c:382
#, fuzzy, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] filename.po ...\n"
@@ -439,82 +427,104 @@ msgstr ""
"Om infilen är - så läses standard in. Om utfilen är - så skrivs resultatet\n"
"till standard ut.\n"
-#: src/msgfmt.c:409
+#: src/msgfmt.c:425
msgid "while creating hash table"
msgstr "när hashtabellen skapades"
-#: src/msgfmt.c:451
+#: src/msgfmt.c:469
#, fuzzy, c-format
-msgid "%s: warning: PO file header missing, fuzzy, or invalid"
+msgid ""
+"%s: warning: PO file header missing, fuzzy, or invalid\n"
+"%*s warning: charset conversion will not work"
msgstr "%s: varning: källfilen innehåller luddiga översättningar"
-#: src/msgfmt.c:474
+#: src/msgfmt.c:493
#, c-format
msgid "domain name \"%s\" not suitable as file name"
msgstr "domännamnet \"%s\" är inte lämpligt som filnamn"
-#: src/msgfmt.c:479
+#: src/msgfmt.c:498
#, c-format
msgid "domain name \"%s\" not suitable as file name: will use prefix"
msgstr "domännamnet \"%s\" är inte lämpligt som filnamn: använder ett prefix"
#. We don't change the exit status here because this is really
#. only an information.
-#: src/msgfmt.c:492
+#: src/msgfmt.c:511
#, c-format
msgid "`domain %s' directive ignored"
msgstr "direktivet \"domain %s\" ignoreras"
-#: src/msgfmt.c:520
+#: src/msgfmt.c:541
msgid "empty `msgstr' entry ignored"
msgstr "tom \"msgstr\"-rad ignorerad"
-#: src/msgfmt.c:521
+#: src/msgfmt.c:542
msgid "fuzzy `msgstr' entry ignored"
msgstr "luddig \"msgstr\"-rad ignorerad"
-#: src/msgfmt.c:564
+#: src/msgfmt.c:584
#, c-format
msgid "headerfield `%s' missing in header"
msgstr "fält \"%s\" saknas i huvudet"
-#: src/msgfmt.c:567
+#: src/msgfmt.c:587
#, c-format
msgid "header field `%s' should start at beginning of line"
msgstr "huvudrad \"%s\" bör ligga i början på raden"
-#: src/msgfmt.c:577
+#: src/msgfmt.c:597
msgid "some header fields still have the initial default value"
msgstr "vissa huvudrader har kvar initiala standardvärden"
-#: src/msgfmt.c:588
+#: src/msgfmt.c:608
#, c-format
msgid "field `%s' still has initial default value"
msgstr "huvudrad \"%s\" har kvar initialt standardvärde"
-#: src/msgfmt.c:673
+#: src/msgfmt.c:698
#, c-format
msgid "%s: warning: source file contains fuzzy translation"
msgstr "%s: varning: källfilen innehåller luddiga översättningar"
-#: src/msgfmt.c:875
+#: src/msgfmt.c:920
+#, fuzzy
+msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
+msgstr "\"msgid\"- och \"msgstr\"-raderna börjar inte båda med \"\\n\""
+
+#: src/msgfmt.c:928
+#, fuzzy, c-format
+msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
+msgstr "\"msgid\"- och \"msgstr\"-raderna börjar inte båda med \"\\n\""
+
+#: src/msgfmt.c:938
msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
msgstr "\"msgid\"- och \"msgstr\"-raderna börjar inte båda med \"\\n\""
-#: src/msgfmt.c:883
+#: src/msgfmt.c:953
+#, fuzzy
+msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
+msgstr "\"msgid\"- och \"msgstr\"-raderna slutar inte båda med \"\\n\""
+
+#: src/msgfmt.c:961
+#, fuzzy, c-format
+msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
+msgstr "\"msgid\"- och \"msgstr\"-raderna slutar inte båda med \"\\n\""
+
+#: src/msgfmt.c:971
msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
msgstr "\"msgid\"- och \"msgstr\"-raderna slutar inte båda med \"\\n\""
-#: src/msgfmt.c:897
+#: src/msgfmt.c:987
msgid "number of format specifications in `msgid' and `msgstr' does not match"
msgstr "antalet formateringsdirektiv i \"msgid\" och \"msgstr\" är olika"
-#: src/msgfmt.c:914
+#: src/msgfmt.c:1004
#, c-format
msgid "format specifications for argument %u are not the same"
msgstr "formateringsdirektivet för parametern %u är inte likadant"
-#: src/msgmerge.c:328
+#: src/msgmerge.c:320
#, fuzzy, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] def.po ref.po\n"
@@ -553,7 +563,7 @@ msgstr ""
" -V, --version visa versionsinformation och avsluta\n"
" -w, --width=ANTAL sätt antal kolumner i resultatet\n"
-#: src/msgmerge.c:348
+#: src/msgmerge.c:340
#, no-wrap
msgid ""
"\n"
@@ -579,20 +589,20 @@ msgstr ""
"Resultatet skrivs till standard ut om inte en utfil anges.\n"
"\n"
-#: src/msgmerge.c:804
+#: src/msgmerge.c:799
#, c-format
msgid ""
-"%sRead %d old + %d reference, merged %d, fuzzied %d, missing %d, obsolete "
-"%d.\n"
+"%sRead %d old + %d reference, merged %d, fuzzied %d, missing %d, obsolete %"
+"d.\n"
msgstr ""
-"%sLäste %d gamla + %d referenser, %d sammanslagna, %d luddiga, %d saknade, "
-"%d föråldrade.\n"
+"%sLäste %d gamla + %d referenser, %d sammanslagna, %d luddiga, %d saknade, %"
+"d föråldrade.\n"
-#: src/msgmerge.c:810
+#: src/msgmerge.c:805
msgid " done.\n"
msgstr " klar.\n"
-#: src/msgunfmt.c:215
+#: src/msgunfmt.c:210
#, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] [FILE]...\n"
@@ -621,7 +631,7 @@ msgstr ""
" -V, --version visa versionsinformation och avsluta\n"
" -w, --width=ANTAL sätt antal kolumner i resultatet\n"
-#: src/msgunfmt.c:229
+#: src/msgunfmt.c:224
#, no-wrap
msgid ""
"\n"
@@ -637,86 +647,120 @@ msgstr ""
"Om ingen infil ges eller om den är - så läses standard in.\n"
"I normalläge så skrivs resultatet till standard ut.\n"
-#: src/msgunfmt.c:266 src/msgunfmt.c:330 src/po-lex.c:185 src/xget-lex.c:256
+#: src/msgunfmt.c:261 src/msgunfmt.c:326 src/po-lex.c:213 src/xget-lex.c:243
#, c-format
msgid "error while reading \"%s\""
msgstr "fel uppstod då \"%s\" lästes"
-#: src/msgunfmt.c:267 src/msgunfmt.c:331
+#: src/msgunfmt.c:262 src/msgunfmt.c:327
#, c-format
msgid "file \"%s\" truncated"
msgstr "filen \"%s\" avkortad"
-#: src/msgunfmt.c:298
+#: src/msgunfmt.c:293
#, c-format
msgid "seek \"%s\" offset %ld failed"
msgstr "sökning \"%s\", position %ld misslyckades"
-#: src/msgunfmt.c:373
+#: src/msgunfmt.c:332
+#, fuzzy, c-format
+msgid "file \"%s\" contains a not NUL terminated string"
+msgstr "filen \"%s\" är inte på GNUs .mo-format"
+
+#: src/msgunfmt.c:377
#, c-format
msgid "file \"%s\" is not in GNU .mo format"
msgstr "filen \"%s\" är inte på GNUs .mo-format"
-#: /home/drepper/gnu/gettext/build/src/../../src/po-gram-gen.y:129
+#: src/open-po.c:64
+msgid "<stdin>"
+msgstr ""
+
+#: po-gram-gen.y:87
+msgid "inconsistent use of #~"
+msgstr ""
+
+#: po-gram-gen.y:168
+#, fuzzy
+msgid "missing `msgstr[]' section"
+msgstr "\"msgstr\"-delen saknas"
+
+#: po-gram-gen.y:176
+#, fuzzy
+msgid "missing `msgid_plural' section"
+msgstr "\"msgstr\"-delen saknas"
+
+#: po-gram-gen.y:183
msgid "missing `msgstr' section"
msgstr "\"msgstr\"-delen saknas"
-#: src/po-lex.c:84
-#, c-format
-msgid "found %d fatal errors"
-msgstr "%d allvarliga fel hittades"
+#: po-gram-gen.y:228
+msgid "first plural form has nonzero index"
+msgstr ""
-#: src/po-lex.c:129 src/po-lex.c:168
+#: po-gram-gen.y:230
+msgid "plural form has wrong index"
+msgstr ""
+
+#. CAUTION: If you change this macro, you must also make identical
+#. changes to the function of the same name in src/po-lex.c
+#: src/po-lex.c:156 src/po-lex.c:195 src/po-lex.h:85 src/po-lex.h:99
+#: src/po-lex.h:115 src/po-lex.h:129
msgid "too many errors, aborting"
msgstr "för många fel, avbryter körningen"
-#: src/po-lex.c:241
+#: src/po-lex.c:271
#, c-format
msgid "keyword \"%s\" unknown"
msgstr "nyckelordet \"%s\" är okänt"
-#: src/po-lex.c:335
+#: src/po-lex.c:374
#, fuzzy
msgid "invalid control sequence"
msgstr "otillåten kontrollsekvens"
-#: src/po-lex.c:419
+#: src/po-lex.c:477
+msgid "end-of-file within string"
+msgstr "filslut inne i en sträng"
+
+#: src/po-lex.c:482
msgid "end-of-line within string"
msgstr "radslut inne i en sträng"
-#: src/po-lex.c:424
-msgid "end-of-file within string"
-msgstr "filslut inne i en sträng"
+#: src/po-lex.c:525
+#, fuzzy
+msgid "invalid multibyte sequence"
+msgstr "otillåten kontrollsekvens"
-#: src/xget-lex.c:152
+#: src/xget-lex.c:148
msgid "standard input"
msgstr "standard in"
-#: src/xget-lex.c:894
+#: src/xget-lex.c:876
#, c-format
msgid "%s:%d: warning: unterminated character constant"
msgstr "%s:%d: varning: oavslutad teckenkonstant"
-#: src/xget-lex.c:916
+#: src/xget-lex.c:898
#, c-format
msgid "%s:%d: warning: unterminated string literal"
msgstr "%s:%d: varning: oavslutad sträng"
-#: src/xgettext.c:386
+#: src/xgettext.c:383
msgid "--join-existing cannot be used when output is written to stdout"
msgstr ""
"--join-existing kan inte användas då resultatet skrivs till standard ut"
-#: src/xgettext.c:391
+#: src/xgettext.c:388
msgid "xgettext cannot work without keywords to look for"
msgstr ""
-#: src/xgettext.c:508
+#: src/xgettext.c:494
#, c-format
msgid "warning: file `%s' extension `%s' is unknown; will try C"
msgstr "varning: filtyp \"%s\" med suffix \"%s\" är okänd; försöker med C"
-#: src/xgettext.c:544
+#: src/xgettext.c:530
#, fuzzy, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] INPUTFILE ...\n"
@@ -755,7 +799,7 @@ msgstr ""
" --foreign-user utelämna FSF copyright-text i resultatet\n"
" -F, --sort-by-file sortera resultatet efter filposition\n"
-#: src/xgettext.c:564
+#: src/xgettext.c:550
#, c-format, no-wrap
msgid ""
" -h, --help display this help and exit\n"
@@ -782,7 +826,7 @@ msgstr ""
" -M, --msgstr-suffix[=STRÄNG] avsluta översatta strängar med STRÄNG eller \"\"\n"
" --no-location skriv inte ut raderna \"#: filnamn:rad\"\n"
-#: src/xgettext.c:578
+#: src/xgettext.c:564
#, no-wrap
msgid ""
" -n, --add-location generate '#: filename:line' lines (default)\n"
@@ -812,20 +856,34 @@ msgstr ""
"\n"
"Om INFIL är - så läses standard in.\n"
-#: src/xgettext.c:879
+#: src/xgettext.c:926
#, fuzzy, c-format
msgid "%s:%d: warning: keyword nested in keyword arg"
msgstr "%s:%d: varning: oavslutad sträng"
-#: src/xgettext.c:889
+#: src/xgettext.c:936
#, c-format
msgid "%s:%d: warning: keyword between outer keyword and its arg"
msgstr ""
-#: src/xgettext.c:1374
+#: src/xgettext.c:1432
#, c-format
msgid "language `%s' unknown"
msgstr "språket \"%s\" okänt"
+#~ msgid ""
+#~ "internationalized messages should not contain the `\\%c' escape sequence"
+#~ msgstr ""
+#~ "internationaliserade meddelanden bör inte ha kontrollsekvensen \"\\%c\""
+
+#~ msgid "cannot create output file \"%s\""
+#~ msgstr "kan inte skapa utfilen \"%s\""
+
+#~ msgid "standard output"
+#~ msgstr "standard ut"
+
+#~ msgid "error while writing \"%s\" file"
+#~ msgstr "fel vid skrivning till filen \"%s\""
+
#~ msgid "%s: warning: no header entry found"
#~ msgstr "%s: varning: inga huvudrader funna"
diff --git a/po/tr.po b/po/tr.po
index a67c5a4..9b3fc61 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: gettext-0.10.35\n"
-"POT-Creation-Date: 1998-04-30 22:50-0700\n"
+"POT-Creation-Date: 2001-03-09 19:56+0100\n"
"PO-Revision-Date: 2000-11-05 23:43+200\n"
"Last-Translator: Nilgün Belma Bugüner <nilgun@technologist.com>\n"
"Language-Team: Turkish <tr@li.org>\n"
@@ -13,75 +13,80 @@ msgstr ""
"Content-Type: text/plain; charset=ISO-8859-9\n"
"Content-Transfer-Encoding: 8 bits\n"
-#: lib/error.c:103
+#: lib/error.c:115
msgid "Unknown system error"
msgstr "Bilinmeyen sistem hatası"
-#: lib/getopt.c:680
+#: lib/getopt.c:691
#, c-format
msgid "%s: option `%s' is ambiguous\n"
msgstr "%s: `%s' seçeneği belirsiz\n"
-#: lib/getopt.c:704
+#: lib/getopt.c:716
#, c-format
msgid "%s: option `--%s' doesn't allow an argument\n"
msgstr "%s: `--%s' seçeneği argümansız kullanılır\n"
-#: lib/getopt.c:709
+#: lib/getopt.c:721
#, c-format
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"
-#: lib/getopt.c:726 lib/getopt.c:899
+#: lib/getopt.c:739 lib/getopt.c:912
#, c-format
msgid "%s: option `%s' requires an argument\n"
msgstr "%s: `%s' seçeneği bir argümanla kullanılır\n"
#. --option
-#: lib/getopt.c:755
+#: lib/getopt.c:768
#, c-format
msgid "%s: unrecognized option `--%s'\n"
msgstr "%s: `--%s' seçeneği bilinmiyor\n"
#. +option or -option
-#: lib/getopt.c:759
+#: lib/getopt.c:772
#, c-format
msgid "%s: unrecognized option `%c%s'\n"
msgstr "%s: `%c%s' seçeneği bilinmiyor\n"
#. 1003.2 specifies the format of this message.
-#: lib/getopt.c:785
+#: lib/getopt.c:798
#, c-format
msgid "%s: illegal option -- %c\n"
msgstr "%s: seçeneğin bu kullanımı uygun değil -- %c\n"
-#: lib/getopt.c:788
+#: lib/getopt.c:801
#, c-format
msgid "%s: invalid option -- %c\n"
msgstr "%s: seçeneğin bu kullanımı geçersiz -- %c\n"
#. 1003.2 specifies the format of this message.
-#: lib/getopt.c:818 lib/getopt.c:948
+#: lib/getopt.c:831 lib/getopt.c:961
#, c-format
msgid "%s: option requires an argument -- %c\n"
msgstr "%s: seçenek için bir argüman gerekli -- %c\n"
-#: lib/getopt.c:865
+#: lib/getopt.c:878
#, c-format
msgid "%s: option `-W %s' is ambiguous\n"
msgstr "%s: `-W %s' seçeneği belirsiz\n"
-#: lib/getopt.c:883
+#: lib/getopt.c:896
#, c-format
msgid "%s: option `-W %s' doesn't allow an argument\n"
msgstr "%s: `-W %s' seçeneği bir argümanla kullanılmaz\n"
-#: lib/xmalloc.c:82
+#: lib/obstack.c:474
+#, fuzzy
+msgid "memory exhausted"
+msgstr "Bellek tükendi"
+
+#: lib/xmalloc.c:86
msgid "Memory exhausted"
msgstr "Bellek tükendi"
-#: src/gettextp.c:134 src/msgcmp.c:144 src/msgcomm.c:285 src/msgfmt.c:257
-#: src/msgmerge.c:254 src/msgunfmt.c:175 src/xgettext.c:394
+#: src/gettext.c:138 src/msgcmp.c:140 src/msgcomm.c:283 src/msgfmt.c:270
+#: src/msgmerge.c:255 src/msgunfmt.c:170 src/xgettext.c:398
#, c-format, no-wrap
msgid ""
"Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -93,27 +98,27 @@ msgstr ""
"Hiçbir garantisi yoktur; hatta SATILABİLİRLİĞİ veya ŞAHSİ KULLANIMINIZA\n"
"UYGUNLUĞU için bile garanti verilmez.\n"
-#: src/gettextp.c:139 src/msgcmp.c:149 src/msgcomm.c:290 src/msgfmt.c:262
-#: src/msgmerge.c:259 src/msgunfmt.c:180 src/xgettext.c:399
+#: src/gettext.c:143 src/msgcmp.c:145 src/msgcomm.c:288 src/msgfmt.c:275
+#: src/msgmerge.c:260 src/msgunfmt.c:175 src/xgettext.c:403
#, c-format
msgid "Written by %s.\n"
msgstr "%s tarafından yazıldı.\n"
-#: src/gettextp.c:154
+#: src/gettext.c:158
msgid "missing arguments"
msgstr "argümankar kayıp"
-#: src/gettextp.c:164
+#: src/gettext.c:168
msgid "too many arguments"
msgstr "çok fazla argüman"
-#: src/gettextp.c:228 src/msgcmp.c:181 src/msgcomm.c:395 src/msgfmt.c:361
-#: src/msgmerge.c:301 src/msgunfmt.c:210 src/xgettext.c:532
+#: src/gettext.c:232 src/msgcmp.c:177 src/msgcomm.c:381 src/msgfmt.c:377
+#: src/msgmerge.c:315 src/msgunfmt.c:205 src/xgettext.c:525
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "Daha fazla bilgilendirilmek için `%s --help' yazın.\n"
-#: src/gettextp.c:233
+#: src/gettext.c:237
#, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] [[[TEXTDOMAIN] MSGID] | [-s [MSGID]...]]\n"
@@ -131,16 +136,16 @@ msgstr ""
"\n"
" -d, --domain=MetinSunucu ileti çevirilerini MetinSunucu'dan alır.\n"
" -e bazı \"escape sequences\" genişletilebilmesine\n"
-" olanak sağlar\n"
+"\t\t\t olanak sağlar\n"
" -E (uyumluluk için yoksayıldı)\n"
" -h, --help bu yardım iletisini gösterir ve çıkar\n"
" -n izleyen `newline' karakterini bastırır\n"
" -V, --version sürüm bilgisini gösterir ve çıkar\n"
" [MetinSunucu] İletiKimliği\n"
-" MetinSunucu'sundan msgid ile belirtilen\n"
-" ileti çevirisini alır.\n"
+"\t\t\t MetinSunucu'sundan msgid ile belirtilen\n"
+"\t\t\t ileti çevirisini alır.\n"
-#: src/gettextp.c:245
+#: src/gettext.c:249
#, c-format, no-wrap
msgid ""
"\n"
@@ -162,41 +167,20 @@ msgstr ""
"çevrilmiş ileti kataloğunun bulunması gereken dizini aşağıdaki gibi verir:\n"
"Standard arama dizini: %s\n"
-#: src/gettextp.c:255 src/msgcmp.c:200 src/msgcomm.c:442 src/msgfmt.c:388
-#: src/msgmerge.c:334 src/msgunfmt.c:234 src/xgettext.c:584
+#: src/gettext.c:259 src/msgcmp.c:196 src/msgcomm.c:428 src/msgfmt.c:404
+#: src/msgmerge.c:350 src/msgunfmt.c:229 src/xgettext.c:577
msgid "Report bugs to <bug-gnu-utils@gnu.org>.\n"
msgstr "Hataları <bug-gnu-utils@gnu.org> adresine bildirin.\n"
-#: src/message.c:784
-#, c-format
-msgid ""
-"internationalized messages should not contain the `\\%c' escape sequence"
-msgstr ""
-"i18n iletileri `\\%c' içeremez"
-#: src/message.c:1115
-#, c-format
-msgid "cannot create output file \"%s\""
-msgstr "\"%s\" çıktı dosyası oluşturulamadı"
-
-#: src/message.c:1122
-#, no-c-format
-msgid "standard output"
-msgstr "standard çıktı"
-
-#: src/message.c:1182
-#, c-format
-msgid "error while writing \"%s\" file"
-msgstr "\"%s\" dosyasına yazarken hata"
-
-#: src/msgcmp.c:160 src/msgmerge.c:270
+#: src/msgcmp.c:156 src/msgmerge.c:271
msgid "no input files given"
msgstr "hiçbir girdi dosyası verilmemiş"
-#: src/msgcmp.c:165 src/msgmerge.c:275
+#: src/msgcmp.c:161 src/msgmerge.c:276
msgid "exactly 2 input files required"
msgstr "tam olarak 2 girdi dosyası gerekli"
-#: src/msgcmp.c:186
+#: src/msgcmp.c:182
#, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] def.po ref.po\n"
@@ -225,57 +209,62 @@ msgstr ""
"kontrol etmek için kullanışlıdır. Daha iyi bir teşhis için, zorunlu bir\n"
"eşleşme bulunamazsa, belirsiz (fuzzy) eşleşme kullanılır.\n"
-#: src/msgcmp.c:259 src/msgmerge.c:714
+#: src/msgcmp.c:255 src/msgmerge.c:741
msgid "this message is used but not defined..."
msgstr "bu ileti kullanıldı ama tanımlı değil..."
-#: src/msgcmp.c:261 src/msgmerge.c:716
+#: src/msgcmp.c:257 src/msgmerge.c:743
msgid "...but this definition is similar"
msgstr "...ama bu tanımlama benzer"
-#: src/msgcmp.c:267 src/msgmerge.c:743
+#: src/msgcmp.c:263 src/msgmerge.c:770
#, c-format
msgid "this message is used but not defined in %s"
msgstr "bu ileti kullanıldı ama %s'de tanımlı değil"
-#: src/msgcmp.c:281
+#: src/msgcmp.c:277
msgid "warning: this message is not used"
msgstr "uyarı: bu ileti kullanılmamış"
-#: src/msgcmp.c:355 src/msgfmt.c:632 src/msgmerge.c:493 src/xgettext.c:1063
+#: src/msgcmp.c:282 src/po-lex.c:102
+#, c-format
+msgid "found %d fatal errors"
+msgstr "%d ölümcül hata bulundu"
+
+#: src/msgcmp.c:354 src/msgfmt.c:657 src/msgmerge.c:512 src/xgettext.c:1169
msgid "duplicate message definition"
msgstr "ileti iki defa tanımlanmış"
-#: src/msgcmp.c:356 src/msgfmt.c:633 src/msgmerge.c:494 src/xgettext.c:1064
+#: src/msgcmp.c:355 src/msgfmt.c:659 src/msgmerge.c:513 src/xgettext.c:1170
msgid "...this is the location of the first definition"
msgstr "...bu ilk tanımlamanın konumu"
-#: src/msgcmp.c:396 src/msgmerge.c:542
+#: src/msgcmp.c:395 src/msgmerge.c:561
#, c-format
msgid "this message has no definition in the \"%s\" domain"
msgstr "\"%s\" makinasında bu ileti tanımlaması yok"
#. We are about to construct the absolute path to the
#. directory for the output files but asprintf failed.
-#: src/msgcomm.c:238 src/xgettext.c:340 src/xgettext.c:1258
+#: src/msgcomm.c:236 src/xgettext.c:337 src/xgettext.c:1365
msgid "while preparing output"
msgstr "çıktıyı hazırlarken"
-#: src/msgcomm.c:273 src/msgcomm.c:277 src/xgettext.c:378 src/xgettext.c:382
+#: src/msgcomm.c:271 src/msgcomm.c:275 src/xgettext.c:375 src/xgettext.c:379
#, c-format
msgid "%s and %s are mutually exclusive"
msgstr "%s ve %s karşılıklı olarak diğeri ile bağdaşmıyor"
-#: src/msgcomm.c:341
+#: src/msgcomm.c:327
msgid "at least two files must be specified"
msgstr "en az iki dosya belirtilmelidir"
-#: src/msgcomm.c:360
+#: src/msgcomm.c:346
#, c-format
msgid "impossible selection criteria specified (%d < n < %d)"
msgstr "belirtilen seçim kriteri mümkün değil (%d < n < %d)"
-#: src/msgcomm.c:400
+#: src/msgcomm.c:386
#, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] INPUTFILE ...\n"
@@ -292,7 +281,7 @@ msgstr ""
"Kullanımı: %s [seçenek] GirdiDosyası ...\n"
"Uzun seçeneklerdeki zorunlu argümanlar kısa seçenekler içinde zorunludur\n"
" -d, --default-domain=İSİM çıktı için İSİM.po kullanılacak\n"
-" (messages.po yerine)\n"
+"\t\t\t\t(messages.po yerine)\n"
" -D, --directory=DİZİN girdi dosyaları arama listesine DİZİN'i ekler\n"
" -e, --no-escape C escape'leri çıktıda kullanmaz (öntanımlı)\n"
" -E, --escape C escape'leri çıktıda kullanır\n"
@@ -301,7 +290,7 @@ msgstr ""
" -F, --sort-by-file dosya konumuna göre çıktıyı sıralar\n"
" -h, --help bu yardım iletisini gösterir ve çıkar\n"
-#: src/msgcomm.c:412
+#: src/msgcomm.c:398
msgid ""
" -i, --indent write the .po file using indented style\n"
" --no-location do not write '#: filename:line' lines\n"
@@ -320,20 +309,21 @@ msgid ""
" that only unique messages be printed\n"
msgstr ""
" -i, --indent satırbaşlı biçem kullanarak .po dosyasını\n"
-" yazar\n"
+"\t\t\t\tyazar\n"
" --no-location '#: dosyaismi:line' satırlarını yazmaz\n"
" -n, --add-location '#: dosyaismi:line' satırlarını üretir\n"
-" (öntanımlı)\n"
+"\t\t\t\t(öntanımlı)\n"
" --omit-header `msgid \"\"' ile başlayan başlıkları yazmaz\n"
" -o, --output=DOSYA çıktıyı belirtilen DOSYAya yazar\n"
" -p, --output-dir=DİZİN çıktı dosyalarını DİZİNe yerleştirir\n"
" -s, --sort-output tekrarları silerek çıktıyı dosyaya sıralar\n"
-" --strict Tektip .po dosyasına harfiharfine (strict) yazar\n"
+" --strict Tektip .po dosyasına harfiharfine (strict) "
+"yazar\n"
" -T, --trigraphs girdi olarak ANSI C trigraph'ları anlar\n"
" -u, --unique --less-than=2 içi kısalma, yalnız tekbaşına\n"
-" iletiler gösterildiğinde istenir\n"
+"\t\t\t\tiletiler gösterildiğinde istenir\n"
-#: src/msgcomm.c:425
+#: src/msgcomm.c:411
msgid ""
" -V, --version output version information and exit\n"
" -w, --width=NUMBER set output page width\n"
@@ -355,56 +345,60 @@ msgstr ""
" -V, --version sürüm bilgisini gösterir ve çıkar\n"
" -w, --width=SAYI sayfa genişliğini ayarlar\n"
" -<, --less-than=SAYI çok sayıda tanımlanmış iletiler arasında\n"
-" SAYIdan az tanımlanmış iletileri gösterir,\n"
-" belirtilmezse öntanımlı değer sonsuz kullanılır\n"
+"\t\t\t\tSAYIdan az tanımlanmış iletileri gösterir,\n"
+"\t\t\t\tbelirtilmezse öntanımlı değer sonsuz kullanılır\n"
" ->, --more-than=SAYI çok sayıda tanımlanmış iletiler arasında\n"
-" SAYIdan fazla tanımlanmış iletileri gösterir,\n"
-" belirtilmezse öntanımlı değer 1 kullanılır\n"
+"\t\t\t\tSAYIdan fazla tanımlanmış iletileri gösterir,\n"
+"\t\t\t\tbelirtilmezse öntanımlı değer 1 kullanılır\n"
"\n"
-"Belirtilen PO dosyalarının iki veya daha fazlasında ortak olan iletileri bulur\n"
-"--more-than seçeneği kullanılarak, iletiler basılmadan önce, dosyalarda ortak\n"
+"Belirtilen PO dosyalarının iki veya daha fazlasında ortak olan iletileri "
+"bulur\n"
+"--more-than seçeneği kullanılarak, iletiler basılmadan önce, dosyalarda "
+"ortak\n"
"olan iletilerin belirtilen miktardan fazla olanları seçilir. Tersine olarak\n"
-"--less-than seçeneği kullanılarak, iletiler basılmadan önce, dosyalarda ortak\n"
+"--less-than seçeneği kullanılarak, iletiler basılmadan önce, dosyalarda "
+"ortak\n"
"olan iletilerin belirtilen miktardan az olanları seçilir. (Örneğin\n"
"--less-than=2 ile tekbaşına-ortak olmayan iletiler basılır.) Sadece ilk PO\n"
"dosyasında tanımlandığı şekliyle çeviriler, yorumlar ve çıkarma yorumları\n"
-"korunmuş olacaktır. Tüm PO dosyalarındaki dosya konumları korunmuş olacaktır.\n"
+"korunmuş olacaktır. Tüm PO dosyalarındaki dosya konumları korunmuş "
+"olacaktır.\n"
-#: src/msgcomm.c:476 src/msgunfmt.c:357 src/po-lex.c:74 src/xget-lex.c:159
-#: src/xget-lex.c:174 src/xget-lex.c:191 src/xgettext.c:618
+#: src/msgcomm.c:462 src/msgunfmt.c:361 src/po-lex.c:86 src/xget-lex.c:157
+#: src/xget-lex.c:170 src/xget-lex.c:180 src/xgettext.c:611
#, c-format
msgid "error while opening \"%s\" for reading"
msgstr "\"%s\" okumak için açılırken hata"
-#: src/msgcomm.c:557 src/xgettext.c:660 src/xgettext.c:970
+#: src/msgcomm.c:543 src/xgettext.c:653 src/xgettext.c:1071
msgid "this file may not contain domain directives"
msgstr "bu dosya makina talimatlarını içeremez"
-#: src/msgfmt.c:273 src/xgettext.c:410
+#: src/msgfmt.c:286 src/xgettext.c:414
msgid "no input file given"
msgstr "hiç girdi dosyası verilmemiş"
-#: src/msgfmt.c:321
+#: src/msgfmt.c:337
#, c-format
msgid "error while opening \"%s\" for writing"
msgstr "\"%s\" yazmak için açılırken hata"
-#: src/msgfmt.c:343
+#: src/msgfmt.c:359
#, c-format
msgid "%d translated messages"
msgstr "%d çevrilmiş ileti"
-#: src/msgfmt.c:345
+#: src/msgfmt.c:361
#, c-format
msgid ", %d fuzzy translations"
msgstr ", %d belirsiz çeviri"
-#: src/msgfmt.c:347
+#: src/msgfmt.c:363
#, c-format
msgid ", %d untranslated messages"
msgstr ", %d çevrilmemiş ileti"
-#: src/msgfmt.c:366
+#: src/msgfmt.c:382
#, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] filename.po ...\n"
@@ -449,87 +443,112 @@ msgstr ""
"girdi dosyası olarak - verilirse standard girdi okunur. Çıktı dosyası olarak\n"
" - verilirse çıktı, standard çıktıya yazılır.\n"
-#: src/msgfmt.c:409
+#: src/msgfmt.c:425
msgid "while creating hash table"
msgstr "hash tablosu oluşturulurken"
-#: src/msgfmt.c:451
+#: src/msgfmt.c:469
#, c-format
-msgid "%s: warning: no header entry found"
-msgstr "%s: uyarı: başlık girişi bulunamadı"
+msgid ""
+"%s: warning: PO file header missing, fuzzy, or invalid\n"
+"%*s warning: charset conversion will not work"
+msgstr ""
-#: src/msgfmt.c:473
+#: src/msgfmt.c:493
#, c-format
msgid "domain name \"%s\" not suitable as file name"
msgstr "dosya ismi olarak makina ismi \"%s\" elverişli değil"
-#: src/msgfmt.c:478
+#: src/msgfmt.c:498
#, c-format
msgid "domain name \"%s\" not suitable as file name: will use prefix"
-msgstr "dosya ismi olarak makina ismi \"%s\" elverişli değil: önek kullanılacak"
+msgstr ""
+"dosya ismi olarak makina ismi \"%s\" elverişli değil: önek kullanılacak"
#. We don't change the exit status here because this is really
#. only an information.
-#: src/msgfmt.c:491
+#: src/msgfmt.c:511
#, c-format
msgid "`domain %s' directive ignored"
msgstr "`domain %s' talimatı yok sayıldı"
-#: src/msgfmt.c:519
+#: src/msgfmt.c:541
msgid "empty `msgstr' entry ignored"
msgstr "boş `msgstr' girişi yoksayıldı"
-#: src/msgfmt.c:520
+#: src/msgfmt.c:542
msgid "fuzzy `msgstr' entry ignored"
msgstr "belirsiz `msgstr' girişi yoksayıldı"
-#: src/msgfmt.c:563
+#: src/msgfmt.c:584
#, c-format
msgid "headerfield `%s' missing in header"
msgstr "`%s' başlık alanı başlıkta yok"
-#: src/msgfmt.c:566
+#: src/msgfmt.c:587
#, c-format
msgid "header field `%s' should start at beginning of line"
msgstr "`%s' başlık alanı satırın başlangıcında olmalıydı"
-#: src/msgfmt.c:576
+#: src/msgfmt.c:597
msgid "some header fields still have the initial default value"
msgstr "bazı başlık alanları hala başlangıçtaki öntanımlı değerle duruyor"
-#: src/msgfmt.c:587
+#: src/msgfmt.c:608
#, c-format
msgid "field `%s' still has initial default value"
msgstr "`%s' başlık alanı hala başlangıçtaki öntanımlı değerle duruyor"
-#: src/msgfmt.c:672
+#: src/msgfmt.c:698
#, c-format
msgid "%s: warning: source file contains fuzzy translation"
msgstr "%s: uyarı: kaynak dosya belirsiz çeviriler içeriyor"
-#: src/msgfmt.c:874
+#: src/msgfmt.c:920
+#, fuzzy
+msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
+msgstr "`msgid' ve `msgstr' girdilerinin her ikisi de '\\n' ile başlamıyor"
+
+#: src/msgfmt.c:928
+#, fuzzy, c-format
+msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
+msgstr "`msgid' ve `msgstr' girdilerinin her ikisi de '\\n' ile başlamıyor"
+
+#: src/msgfmt.c:938
msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
msgstr "`msgid' ve `msgstr' girdilerinin her ikisi de '\\n' ile başlamıyor"
-#: src/msgfmt.c:882
+#: src/msgfmt.c:953
+#, fuzzy
+msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
+msgstr "`msgid' ve `msgstr' girdilerinin her ikisi de '\\n' ile bitmiyor"
+
+#: src/msgfmt.c:961
+#, fuzzy, c-format
+msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
+msgstr "`msgid' ve `msgstr' girdilerinin her ikisi de '\\n' ile bitmiyor"
+
+#: src/msgfmt.c:971
msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
msgstr "`msgid' ve `msgstr' girdilerinin her ikisi de '\\n' ile bitmiyor"
-#: src/msgfmt.c:896
+#: src/msgfmt.c:987
msgid "number of format specifications in `msgid' and `msgstr' does not match"
msgstr ""
"`msgid' ve `msgstr' girdilerindeki biçim özelliklerinin sayısı eşleşmiyor"
-#: src/msgfmt.c:913
+#: src/msgfmt.c:1004
#, c-format
msgid "format specifications for argument %u are not the same"
-msgstr "%u argümanı için biçim özellikleri aynı değil"
+msgstr "%u argümanı için biçim özellikleri aynı değil"
-#: src/msgmerge.c:306
-#, c-format, no-wrap
+#: src/msgmerge.c:320
+#, fuzzy, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] def.po ref.po\n"
"Mandatory arguments to long options are mandatory for short options too.\n"
+" -C, --compendium=FILE additional library of message translations,\n"
+" may be specified more than once\n"
" -D, --directory=DIRECTORY add DIRECTORY to list for input files search\n"
" -e, --no-escape do not use C escapes in output (default)\n"
" -E, --escape use C escapes in output, no extended chars\n"
@@ -560,7 +579,7 @@ msgstr ""
" -V, --version sürüm bilgisini gösterir ve çıkar\n"
" -w, --width=SAYI sayfa genişliğini ayarlar\n"
-#: src/msgmerge.c:324
+#: src/msgmerge.c:340
#, no-wrap
msgid ""
"\n"
@@ -585,20 +604,20 @@ msgstr ""
"için zorunlu eşleşmeler bulunamadığında belirsiz eşleşmeler kullanılmıştır.\n"
"Bir çıktı dosyası belirtilmediği takdirde sonuçlar standard çıktıya yazılır.\n"
-#: src/msgmerge.c:772
+#: src/msgmerge.c:799
#, c-format
msgid ""
-"%sRead %d old + %d reference, merged %d, fuzzied %d, missing %d, obsolete "
-"%d.\n"
+"%sRead %d old + %d reference, merged %d, fuzzied %d, missing %d, obsolete %"
+"d.\n"
msgstr ""
"%s tarafından %d eski + %d referans, %d eklenen, %d belirsiz, %d eksik, %d "
"kullanılmayan okuma.\n"
-#: src/msgmerge.c:778
+#: src/msgmerge.c:805
msgid " done.\n"
msgstr " yapıldı.\n"
-#: src/msgunfmt.c:215
+#: src/msgunfmt.c:210
#, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] [FILE]...\n"
@@ -625,7 +644,7 @@ msgstr ""
" -V, --version sürüm bilgisini gösterir ve çıkar\n"
" -w, --width=SAYI sayfa genişliğini ayarlar\n"
-#: src/msgunfmt.c:229
+#: src/msgunfmt.c:224
#, no-wrap
msgid ""
"\n"
@@ -640,80 +659,118 @@ msgstr ""
"Girdi dosyası verilmemişse ya da - verilmişse standard input okunur.\n"
"Çıktı dosyası verilmemişse ya da - verilmişse standard çıktıya yazılır.\n"
-#: src/msgunfmt.c:266 src/msgunfmt.c:330 src/po-lex.c:185 src/xget-lex.c:254
+#: src/msgunfmt.c:261 src/msgunfmt.c:326 src/po-lex.c:213 src/xget-lex.c:243
#, c-format
msgid "error while reading \"%s\""
msgstr "\"%s\" okunurken hata"
-#: src/msgunfmt.c:267 src/msgunfmt.c:331
+#: src/msgunfmt.c:262 src/msgunfmt.c:327
#, c-format
msgid "file \"%s\" truncated"
msgstr "\"%s\" dosyası tepeden kırpılmış"
-#: src/msgunfmt.c:298
+#: src/msgunfmt.c:293
#, c-format
msgid "seek \"%s\" offset %ld failed"
msgstr "\"%s\" sıralama %ld ofset başarısız"
-#: src/msgunfmt.c:373
+#: src/msgunfmt.c:332
+#, fuzzy, c-format
+msgid "file \"%s\" contains a not NUL terminated string"
+msgstr "\"%s\" dosyası bir GNU .mo dosyası değil"
+
+#: src/msgunfmt.c:377
#, c-format
msgid "file \"%s\" is not in GNU .mo format"
msgstr "\"%s\" dosyası bir GNU .mo dosyası değil"
-#: ../../src/po-gram.y:83
+#: src/open-po.c:64
+msgid "<stdin>"
+msgstr ""
+
+#: po-gram-gen.y:87
+msgid "inconsistent use of #~"
+msgstr ""
+
+#: po-gram-gen.y:168
+#, fuzzy
+msgid "missing `msgstr[]' section"
+msgstr "`msgstr' bölümü yok"
+
+#: po-gram-gen.y:176
+#, fuzzy
+msgid "missing `msgid_plural' section"
+msgstr "`msgstr' bölümü yok"
+
+#: po-gram-gen.y:183
msgid "missing `msgstr' section"
msgstr "`msgstr' bölümü yok"
-#: src/po-lex.c:84
-#, c-format
-msgid "found %d fatal errors"
-msgstr "%d ölümcül hata bulundu"
+#: po-gram-gen.y:228
+msgid "first plural form has nonzero index"
+msgstr ""
+
+#: po-gram-gen.y:230
+msgid "plural form has wrong index"
+msgstr ""
-#: src/po-lex.c:129 src/po-lex.c:168
+#. CAUTION: If you change this macro, you must also make identical
+#. changes to the function of the same name in src/po-lex.c
+#: src/po-lex.c:156 src/po-lex.c:195 src/po-lex.h:85 src/po-lex.h:99
+#: src/po-lex.h:115 src/po-lex.h:129
msgid "too many errors, aborting"
msgstr "hatalar çok fazla, bunları düzeltince programı tekrar çalıştırın"
-#: src/po-lex.c:241
+#: src/po-lex.c:271
#, c-format
msgid "keyword \"%s\" unknown"
msgstr "anahtar-kelime \"%s\" bilinmiyor"
-#: src/po-lex.c:332
-msgid "illegal control sequence"
+#: src/po-lex.c:374
+#, fuzzy
+msgid "invalid control sequence"
msgstr "kontrol silsilesi uygun değil"
-#: src/po-lex.c:415
+#: src/po-lex.c:477
+msgid "end-of-file within string"
+msgstr "dizi içinde dosya sonu"
+
+#: src/po-lex.c:482
msgid "end-of-line within string"
msgstr "dizi içinde satır sonu"
-#: src/po-lex.c:420
-msgid "end-of-file within string"
-msgstr "dizi içinde dosya sonu"
+#: src/po-lex.c:525
+msgid "invalid multibyte sequence"
+msgstr ""
-#: src/xget-lex.c:150
+#: src/xget-lex.c:148
msgid "standard input"
msgstr "standard girdi"
-#: src/xget-lex.c:892
+#: src/xget-lex.c:876
#, c-format
msgid "%s:%d: warning: unterminated character constant"
msgstr "%s:%d: uyarı: sonlandırılmamış karakter sabiti"
-#: src/xget-lex.c:914
+#: src/xget-lex.c:898
#, c-format
msgid "%s:%d: warning: unterminated string literal"
msgstr "%s:%d: uyarı: sonlandırılmamış dizi harfi"
-#: src/xgettext.c:386
+#: src/xgettext.c:383
msgid "--join-existing cannot be used when output is written to stdout"
msgstr "standard çıktıya yazılırken --join-existing kullanılamaz"
-#: src/xgettext.c:501
+#: src/xgettext.c:388
+msgid "xgettext cannot work without keywords to look for"
+msgstr ""
+
+#: src/xgettext.c:494
#, c-format
msgid "warning: file `%s' extension `%s' is unknown; will try C"
msgstr "uyarı: `%s' dosyası `%s' uzantısı bilinmiyor; C denenecek"
-#: src/xgettext.c:537
+#: src/xgettext.c:530
#, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] INPUTFILE ...\n"
@@ -735,26 +792,25 @@ msgid ""
" -F, --sort-by-file sort output by file location\n"
msgstr ""
"Kullanımı: %s [seçenek] girdidosyası ...\n"
-"Verilen girdi dosyalarından tercüme edilebilir diziyi ayırır"
-"\n"
+"Verilen girdi dosyalarından tercüme edilebilir diziyi ayırır\n"
"Uzun seçeneklerdeki zorunlu argümanlar kısa seçenekler içinde zorunludur\n"
" -a, --extract-all tüm dizileri ayırır\n"
" -c, --add-comments[=ETİKET] çıktı dosyasında yorum blokunu ETİKET ile\n"
-" yer değiştirir\n"
+"\t\t\t\tyer değiştirir\n"
" -C, --c++ --language=C++ için kısayol\n"
" --debug daha detaylı biçimdizisi tanıma sonucu\n"
" -d, --default-domain=İSİM çıktı için NAME.po kullanılır\n"
-" (messages.po yerine)\n"
+"\t\t\t\t(messages.po yerine)\n"
" -D, --directory=DİZİN girdi dosyaları arama listesine DİZİNi ekler\n"
-" -e, --no-escape C escape'lerini çıktıda kullanmaz (öntanımlı)\n"
-" -E, --escape C escape'lerini çıktıda kullanır\n"
+" -e, --no-escape \tC escape'lerini çıktıda kullanmaz (öntanımlı)\n"
+" -E, --escape \tC escape'lerini çıktıda kullanır\n"
" -f, --files-from=DOSYA girdi dosyalarının listesini DOSYAdan alır\n"
-" --force-po boş olsa bile PO dosyasını yazar\n"
+" --force-po \tboş olsa bile PO dosyasını yazar\n"
" --foreign-user yabancı kullanıcılar için çıktıda\n"
-" FSF kopyahakkı uyarısını göstermez\n"
+"\t\t\t\tFSF kopyahakkı uyarısını göstermez\n"
" -F, --sort-by-file çıktıyı dosya konumuna göre sıralar\n"
-#: src/xgettext.c:557
+#: src/xgettext.c:550
#, c-format, no-wrap
msgid ""
" -h, --help display this help and exit\n"
@@ -770,22 +826,22 @@ msgid ""
" --no-location do not write '#: filename:line' lines\n"
msgstr ""
" -h, --help bu yardım iletisini gösterir ve çıkar\n"
-" -i, --indent .po dosyayı satırbaşlı çıktı biçemi kullanarak\n"
-" yazar\n"
+" -i, --indent \t.po dosyayı satırbaşlı çıktı biçemi kullanarak\n"
+"\t\t\t\tyazar\n"
" -j, --join-existing iletileri mevcut dosyaya bağlar\n"
-" -k, --keyword[=KELİME] ek olarak KELİME içinde bakılacak (KELİMEnin\n"
-" verilmemiş olması öntanımlı anahtar-kelimeler\n"
-" kullanılacağı manasında değildir)\n"
+" -k, --keyword[=KELİME]\tek olarak KELİME içinde bakılacak (KELİMEnin\n"
+"\t\t\t\tverilmemiş olması öntanımlı anahtar-kelimeler\n"
+"\t\t\t\tkullanılacağı manasında değildir)\n"
" -l, --string-limit=SAYI dizi uzunluğunu %u yerine SAYI ile sınırlar\n"
" -L, --language=İSİM belirtilen yazılım dilini tanır (C, C++, PO),\n"
" aksi takdirde dosya uzantısına bakar\n"
" -m, --msgstr-prefix[=DİZİ] msgstr girdileri için önek olarak \"\" ya da\n"
-" DİZİ kullanılır\n"
+"\t\t\t\tDİZİ kullanılır\n"
" -M, --msgstr-suffix[=DİZİ] msgstr girdileri için sonek olarak \"\" ya da\n"
-" DİZİ kullanılır\n"
+"\t\t\t\tDİZİ kullanılır\n"
" --no-location '#: dosyaismi:satır' satırlarını yazmaz\n"
-#: src/xgettext.c:571
+#: src/xgettext.c:564
#, no-wrap
msgid ""
" -n, --add-location generate '#: filename:line' lines (default)\n"
@@ -802,20 +858,46 @@ msgid ""
"If INPUTFILE is -, standard input is read.\n"
msgstr ""
" -n, --add-location '#: dosyaismi:satır' satırlarını üretir\n"
-" (öntanımlı)\n"
+"\t\t\t\t(öntanımlı)\n"
" --omit-header başlığı `msgid \"\"' girdisiyle yazmaz\n"
" -o, --output=DOSYA çıktıyı belirtilen DOSYAya yazar\n"
" -p, --output-dir=DİZİN çıktı dosyası DİZİN içine konulacaktır\n"
" -s, --sort-output tekrarları silerek çıktıyı sıralı üretir\n"
-" --strict harfiharfine Tektip çıktı biçemi\n"
+" --strict \tharfiharfine Tektip çıktı biçemi\n"
" -T, --trigraphs girdi olarak ANSI C trigraph'ları anlar\n"
-" -V, --version sürüm bilgisini gösterir ve çıkar\n"
-" -w, --width=SAYI sayfa genişliğini ayarlar\n"
+" -V, --version \tsürüm bilgisini gösterir ve çıkar\n"
+" -w, --width=SAYI \tsayfa genişliğini ayarlar\n"
" -x, --exclude-file=DOSYA DOSYAdaki girdiler ayrılmış olmaz\n"
"\n"
"girdidosyası olarak - verilmişse standard girdi okunur.\n"
-#: src/xgettext.c:1344
+#: src/xgettext.c:926
+#, fuzzy, c-format
+msgid "%s:%d: warning: keyword nested in keyword arg"
+msgstr "%s:%d: uyarı: sonlandırılmamış dizi harfi"
+
+#: src/xgettext.c:936
+#, c-format
+msgid "%s:%d: warning: keyword between outer keyword and its arg"
+msgstr ""
+
+#: src/xgettext.c:1432
#, c-format
msgid "language `%s' unknown"
msgstr "lisan `%s' bilinmiyor"
+
+#~ msgid ""
+#~ "internationalized messages should not contain the `\\%c' escape sequence"
+#~ msgstr "i18n iletileri `\\%c' içeremez"
+
+#~ msgid "cannot create output file \"%s\""
+#~ msgstr "\"%s\" çıktı dosyası oluşturulamadı"
+
+#~ msgid "standard output"
+#~ msgstr "standard çıktı"
+
+#~ msgid "error while writing \"%s\" file"
+#~ msgstr "\"%s\" dosyasına yazarken hata"
+
+#~ msgid "%s: warning: no header entry found"
+#~ msgstr "%s: uyarı: başlık girişi bulunamadı"