[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[SCM] GNU libidn branch, master, updated. libidn-1-22-4-gdf400d4
|
From: |
Simon Josefsson |
|
Subject: |
[SCM] GNU libidn branch, master, updated. libidn-1-22-4-gdf400d4 |
|
Date: |
Thu, 05 May 2011 05:58:13 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU libidn".
http://git.savannah.gnu.org/cgit/libidn.git/commit/?id=df400d4501e3ce89e86812fd49da64a1f62bbffc
The branch, master has been updated
via df400d4501e3ce89e86812fd49da64a1f62bbffc (commit)
via ce5c0cc0b1239ca9f324819d2cc364fd38693d93 (commit)
from acba907a5861ae21dd72f3cd330407cadf8d1440 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit df400d4501e3ce89e86812fd49da64a1f62bbffc
Author: Simon Josefsson <address@hidden>
Date: Thu May 5 07:58:01 2011 +0200
Update translations.
commit ce5c0cc0b1239ca9f324819d2cc364fd38693d93
Author: Simon Josefsson <address@hidden>
Date: Thu May 5 07:56:56 2011 +0200
Sync with TP.
-----------------------------------------------------------------------
Summary of changes:
NEWS | 2 +
po/LINGUAS | 1 +
po/cs.po.in | 208 +++++++++++++++++------------------
po/de.po.in | 178 +++++++++++++++---------------
po/fi.po.in | 198 ++++++++++++++++-----------------
po/nl.po.in | 208 ++++++++++++++++++-----------------
po/pl.po.in | 183 +++++++++++++++----------------
po/uk.po.in | 332 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
po/zh_CN.po.in | 190 ++++++++++++++++----------------
9 files changed, 909 insertions(+), 591 deletions(-)
create mode 100644 po/uk.po.in
diff --git a/NEWS b/NEWS
index 999b4e6..2023144 100644
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,8 @@ See the end for copying conditions.
* Version 1.23 (unreleased) [?]
+** Update translations.
+
** API and ABI is backwards compatible with the previous version.
* Version 1.22 (released 2011-05-04) [stable]
diff --git a/po/LINGUAS b/po/LINGUAS
index 7d6b991..27686a9 100644
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -13,5 +13,6 @@ nl
pl
ro
sr
+uk
vi
zh_CN
diff --git a/po/cs.po.in b/po/cs.po.in
index dce0ce1..f3cf89e 100644
--- a/po/cs.po.in
+++ b/po/cs.po.in
@@ -1,163 +1,150 @@
# Czech translation for libidn.
# Copyright (C) 2007 Free Software Foundation, Inc.
# This file is distributed under the same license as the libidn package.
-# Petr Pisar <address@hidden>, 2007, 2008
+# Petr Pisar <address@hidden>, 2007, 2008, 2011.
#
msgid ""
msgstr ""
-"Project-Id-Version: libidn 1.9\n"
+"Project-Id-Version: libidn 1.21\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2008-07-01 18:15+0200\n"
-"PO-Revision-Date: 2008-07-03 08:28+0200\n"
+"POT-Creation-Date: 2011-04-24 17:12+0200\n"
+"PO-Revision-Date: 2011-04-28 20:24+0200\n"
"Last-Translator: Petr Pisar <address@hidden>\n"
"Language-Team: Czech <address@hidden>\n"
+"Language: cs\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: lib/strerror-idna.c:74 lib/strerror-pr29.c:58 lib/strerror-punycode.c:58
-#: lib/strerror-stringprep.c:78 lib/strerror-tld.c:60
+#: lib/strerror-idna.c:75 lib/strerror-pr29.c:59 lib/strerror-punycode.c:59
+#: lib/strerror-stringprep.c:79 lib/strerror-tld.c:61
msgid "Success"
msgstr "ÃspÄch"
-#: lib/strerror-idna.c:78 lib/strerror-pr29.c:66
+#: lib/strerror-idna.c:79 lib/strerror-pr29.c:67
msgid "String preparation failed"
msgstr "PÅÃprava ÅetÄzce selhala"
-#: lib/strerror-idna.c:82
+#: lib/strerror-idna.c:83
msgid "Punycode failed"
msgstr "Punycode selhal"
-#: lib/strerror-idna.c:86
+#: lib/strerror-idna.c:87
msgid "Non-digit/letter/hyphen in input"
msgstr "Znak jiný než ÄÃslice/pÃsmeno/spojovnÃk na vstupu"
-#: lib/strerror-idna.c:90
+#: lib/strerror-idna.c:91
msgid "Forbidden leading or trailing minus sign (`-')"
msgstr "Zakázaný úvodnà nebo závÄreÄný spojovnÃk (â-â)"
-#: lib/strerror-idna.c:94
+#: lib/strerror-idna.c:95
msgid "Output would be too large or too small"
msgstr "Výstup by byl pÅÃliÅ¡ dlouhý nebo pÅÃliÅ¡ krátký"
-#: lib/strerror-idna.c:98
+#: lib/strerror-idna.c:99
msgid "Input does not start with ACE prefix (`xn--')"
-msgstr "Vstup nezaÄÃná pÅedponou ACEâ¯(âxn--â)"
+msgstr "Vstup nezaÄÃná pÅedponou ACE (âxn--â)"
-#: lib/strerror-idna.c:102
+#: lib/strerror-idna.c:103
msgid "String not idempotent under ToASCII"
msgstr "ÅetÄzec nenà po ToASCII idempotentnÃ"
-#: lib/strerror-idna.c:106
+#: lib/strerror-idna.c:107
msgid "Input already contain ACE prefix (`xn--')"
-msgstr "Vstup již obsahuje pÅedponu ACEâ¯(âxn--â)"
+msgstr "Vstup již obsahuje pÅedponu ACE (âxn--â)"
-#: lib/strerror-idna.c:110 lib/strerror-tld.c:76
+#: lib/strerror-idna.c:111 lib/strerror-tld.c:77
msgid "System iconv failed"
msgstr "Selhal systémový iconv"
-#: lib/strerror-idna.c:114 lib/strerror-stringprep.c:122 lib/strerror-tld.c:72
+#: lib/strerror-idna.c:115 lib/strerror-stringprep.c:123 lib/strerror-tld.c:73
msgid "Cannot allocate memory"
msgstr "Nelze vyhradit pamÄÅ¥"
-#: lib/strerror-idna.c:118
+#: lib/strerror-idna.c:119
msgid "System dlopen failed"
msgstr "Selhalo volánà systému dlopen"
-#: lib/strerror-idna.c:122 lib/strerror-pr29.c:70 lib/strerror-punycode.c:74
-#: lib/strerror-stringprep.c:126 lib/strerror-tld.c:84
+#: lib/strerror-idna.c:123 lib/strerror-pr29.c:71 lib/strerror-punycode.c:75
+#: lib/strerror-stringprep.c:127 lib/strerror-tld.c:85
msgid "Unknown error"
msgstr "Neznámá chyba"
-#: lib/strerror-pr29.c:62
+#: lib/strerror-pr29.c:63
msgid "String not idempotent under Unicode NFKC normalization"
-msgstr "ÅetÄzec nenà po unicodové NFKCâ¯normalizaci idempotentnÃ"
+msgstr "ÅetÄzec nenà po unicodové NFKC normalizaci idempotentnÃ"
-#: lib/strerror-punycode.c:62
+#: lib/strerror-punycode.c:63
msgid "Invalid input"
msgstr "Neplatný vstup"
-#: lib/strerror-punycode.c:66 lib/strerror-stringprep.c:102
+#: lib/strerror-punycode.c:67 lib/strerror-stringprep.c:103
msgid "Output would exceed the buffer space provided"
msgstr "Výstup by se neveÅ¡el do poskytnuté vyrovnávacà pamÄti"
-#: lib/strerror-punycode.c:70
+#: lib/strerror-punycode.c:71
msgid "String size limit exceeded"
msgstr "Omezenà délky ÅetÄzce bylo pÅekonáno"
-#: lib/strerror-stringprep.c:82
+#: lib/strerror-stringprep.c:83
msgid "Forbidden unassigned code points in input"
msgstr "Na vstupu zakázaná nepÅiÅazená ordinárnà ÄÃsla"
-#: lib/strerror-stringprep.c:86
+#: lib/strerror-stringprep.c:87
msgid "Prohibited code points in input"
msgstr "Na vstupu zakázaná ordinárnà ÄÃsla"
-#: lib/strerror-stringprep.c:90
+#: lib/strerror-stringprep.c:91
msgid "Conflicting bidirectional properties in input"
msgstr "Na vstupu rozporné pÅÃkazy pro smÄr textu"
-#: lib/strerror-stringprep.c:94
+#: lib/strerror-stringprep.c:95
msgid "Malformed bidirectional string"
msgstr "ChybnÄ utvoÅený obousmÄrný ÅetÄzec"
-#: lib/strerror-stringprep.c:98
+#: lib/strerror-stringprep.c:99
msgid "Prohibited bidirectional code points in input"
msgstr "Na vstupu zakázaná ordinárnà ÄÃsla pro obousmÄrný text"
-#: lib/strerror-stringprep.c:106
+#: lib/strerror-stringprep.c:107
msgid "Error in stringprep profile definition"
msgstr "Chyba v definici profilu pro stringprep"
-#: lib/strerror-stringprep.c:110
+#: lib/strerror-stringprep.c:111
msgid "Flag conflict with profile"
msgstr "PÅÃznak nesluÄitelný s profilem"
-#: lib/strerror-stringprep.c:114
+#: lib/strerror-stringprep.c:115
msgid "Unknown profile"
msgstr "Neznámý profil"
-#: lib/strerror-stringprep.c:118
+#: lib/strerror-stringprep.c:119
msgid "Unicode normalization failed (internal error)"
msgstr "Unicodová normalizace selhala (vnitÅnà chyba)"
-#: lib/strerror-tld.c:64
+#: lib/strerror-tld.c:65
msgid "Code points prohibited by top-level domain"
msgstr "Ordinárnà ÄÃsla zakázaná vrcholovou doménou"
-#: lib/strerror-tld.c:68
+#: lib/strerror-tld.c:69
msgid "Missing input"
msgstr "Postrádám vstup"
-#: lib/strerror-tld.c:80
+#: lib/strerror-tld.c:81
msgid "No top-level domain found in input"
msgstr "Ve vstupu chybà vrcholová doména"
-#. TRANSLATORS: The placeholder indicates the bug-reporting address
-#. for this package. Please add _another line_ saying
-#. "Report translation bugs to <...>\n" with the address for translation
-#. bugs (typically your translation team's web or email address).
#: src/idn.c:68
#, c-format
-msgid ""
-"\n"
-"Report bugs to <%s>.\n"
-msgstr ""
-"\n"
-"Chyby programu hlaste na <%s> (pouze anglicky),\n"
-"chyby pÅekladu na <address@hidden> (Äesky).\n"
-
-#: src/idn.c:75
-#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "DalÅ¡Ã informace zÃskáte pÅÃkazem â%s --helpâ.\n"
-#: src/idn.c:79
+#: src/idn.c:72
#, c-format
msgid "Usage: %s [OPTION]... [STRINGS]...\n"
msgstr "PoužitÃ: %s [PÅEPÃNAÄ]⦠[ÅETÄZEC]â¦\n"
-#: src/idn.c:82
+#: src/idn.c:75
msgid ""
"Internationalized Domain Name (IDN) convert STRINGS, or standard input.\n"
"\n"
@@ -165,7 +152,7 @@ msgstr ""
"IDN (internacionalizovaná doménová jména) pÅevádà ÅETÄZCE nebo
standardnà vstup.\n"
"\n"
-#: src/idn.c:86
+#: src/idn.c:79
msgid ""
"Command line interface to the internationalized domain name library.\n"
"\n"
@@ -191,7 +178,7 @@ msgstr ""
"Povinné argumenty dlouhých pÅepÃnaÄů jsou rovnÄž povinné u
odpovÃdajÃcÃch\n"
"krátkých pÅepÃnaÄů.\n"
-#: src/idn.c:98
+#: src/idn.c:91
msgid ""
" -h, --help Print help and exit\n"
" -V, --version Print version and exit\n"
@@ -199,7 +186,7 @@ msgstr ""
" -h, --help VypÃÅ¡e nápovÄdu a skonÄÃ\n"
" -V, --version VypÃÅ¡e verzi a skonÄÃ\n"
-#: src/idn.c:102
+#: src/idn.c:95
msgid ""
" -s, --stringprep Prepare string according to nameprep profile\n"
" -d, --punycode-decode Decode Punycode\n"
@@ -213,27 +200,29 @@ msgstr ""
" -a, --idna-to-ascii PÅevede do ACE podle IDNA (implicitnà režim)\n"
" -u, --idna-to-unicode PÅevede z ACE podle IDNA\n"
-#: src/idn.c:109
+#: src/idn.c:102
msgid ""
-" --allow-unassigned Toggle IDNA AllowUnassigned flag\n"
-" --usestd3asciirules Toggle IDNA UseSTD3ASCIIRules flag\n"
+" --allow-unassigned Toggle IDNA AllowUnassigned flag (default off)\n"
+" --usestd3asciirules Toggle IDNA UseSTD3ASCIIRules flag (default off)\n"
msgstr ""
-" --allow-unassigned PÅepne pÅÃznak IDNA AllowUnassigned\n"
-" --usestd3asciirules PÅepne pÅÃznak IDNA UseSTD3ASCIIRules\n"
+" --allow-unassigned PÅepne pÅÃznak IDNA AllowUnassigned
(implicitnÄ\n"
+" vypnut)\n"
+" --usestd3asciirules PÅepne pÅÃznak IDNA UseSTD3ASCIIRules
(implicitnÄ\n"
+" vypnut)\n"
-#: src/idn.c:113
+#: src/idn.c:106
msgid ""
-" -t, --tld Check string for TLD specific rules\n"
+" --no-tld Don't check string for TLD specific rules\n"
" Only for --idna-to-ascii and --idna-to-unicode\n"
msgstr ""
-" -t, --tld Zkontroluje ÅetÄzec podle pravidel pro TLD.\n"
+" --no-tld Nekontroluje ÅetÄzec podle pravidel dané TLD.\n"
" Jen u --idna-to-ascii a --idna-to-unicode\n"
-#: src/idn.c:117
+#: src/idn.c:110
msgid " -n, --nfkc Normalize string according to Unicode v3.2
NFKC\n"
msgstr " -n, --nfkc Normalizuje ÅetÄzec podle Unicode v3.2
NFKC\n"
-#: src/idn.c:120
+#: src/idn.c:113
msgid ""
" -p, --profile=STRING Use specified stringprep profile instead\n"
" Valid stringprep profiles: `Nameprep',\n"
@@ -245,7 +234,7 @@ msgstr ""
" âiSCSIâ, âNodeprepâ, âResourceprepâ,
âtraceâ a \n"
" âSASLprepâ\n"
-#: src/idn.c:126
+#: src/idn.c:119
msgid ""
" --debug Print debugging information\n"
" --quiet Silent operation\n"
@@ -253,91 +242,103 @@ msgstr ""
" --debug VypÃÅ¡e ladicà informace\n"
" --quiet Pracuje potichu\n"
-#: src/idn.c:176
+#: src/idn.c:175
#, c-format
-msgid "Only one of -s, -e, -d, -a, -u or -n can be specified."
-msgstr "Pouze jeden pÅepÃnaÄ z -s, -e, -d, -a, -u nebo -n smà být zadán."
+msgid "only one of -s, -e, -d, -a, -u or -n can be specified"
+msgstr "Pouze jeden pÅepÃnaÄ z -s, -e, -d, -a, -u nebo -n smà být
zadán."
-#: src/idn.c:184
+#: src/idn.c:185
#, c-format
msgid "Charset `%s'.\n"
msgstr "Znaková sada â%sâ.\n"
-#: src/idn.c:187
+#: src/idn.c:190
#, c-format
msgid "Type each input string on a line by itself, terminated by a newline
character.\n"
msgstr "PiÅ¡te po jednom vstupnÃm ÅetÄzci na jednom Åádku zakonÄeným
znakem nového Åádku.\n"
-#: src/idn.c:202
+#: src/idn.c:205
#, c-format
-msgid "Input error"
-msgstr "Chyba na vstupu"
+msgid "input error"
+msgstr "chyba na vstupu"
-#: src/idn.c:212 src/idn.c:274 src/idn.c:357 src/idn.c:434 src/idn.c:515
+#: src/idn.c:215 src/idn.c:277 src/idn.c:360 src/idn.c:437 src/idn.c:518
#, c-format
-msgid "Could not convert from %s to UTF-8."
-msgstr "Nelze pÅevést z %s do UTF-8."
+msgid "could not convert from %s to UTF-8"
+msgstr "nelze pÅevést z %s do UTF-8"
-#: src/idn.c:220 src/idn.c:245 src/idn.c:281 src/idn.c:498 src/idn.c:527
-#: src/idn.c:551
+#: src/idn.c:223 src/idn.c:248 src/idn.c:284 src/idn.c:501 src/idn.c:530
+#: src/idn.c:554
#, c-format
-msgid "Could not convert from UTF-8 to UCS-4."
-msgstr "Nelze pÅevést z UTF-8 do UCS-4."
+msgid "could not convert from UTF-8 to UCS-4"
+msgstr "nelze pÅevést z UTF-8 do UCS-4"
-#: src/idn.c:237
+#: src/idn.c:240
#, c-format
msgid "stringprep_profile: %s"
msgstr "stringprep_profile (profil pro pÅÃpravu ÅetÄzce): %s"
-#: src/idn.c:260 src/idn.c:302 src/idn.c:345 src/idn.c:503 src/idn.c:564
+#: src/idn.c:263 src/idn.c:305 src/idn.c:348 src/idn.c:506 src/idn.c:567
#, c-format
-msgid "Could not convert from UTF-8 to %s."
-msgstr "Z UTF-8â¯do %s nelze pÅevést."
+msgid "could not convert from UTF-8 to %s"
+msgstr "nelze pÅevést z UTF-8 do %s"
-#: src/idn.c:295
+#: src/idn.c:298
#, c-format
msgid "punycode_encode: %s"
-msgstr "punycode_encode (zakódovánà do Punycodu):â¯%s"
+msgstr "punycode_encode (zakódovánà do Punycodu): %s"
+
+#: src/idn.c:320
+msgid "malloc"
+msgstr "malloc"
-#: src/idn.c:323
+#: src/idn.c:326
#, c-format
msgid "punycode_decode: %s"
-msgstr "punycode_decode (dekódovánà Punycodu):â¯%s"
+msgstr "punycode_decode (dekódovánà Punycodu): %s"
-#: src/idn.c:340 src/idn.c:364 src/idn.c:442
+#: src/idn.c:343 src/idn.c:367 src/idn.c:445
#, c-format
-msgid "Could not convert from UCS-4 to UTF-8."
-msgstr "Nelze pÅevést z UCS-4 do UTF-8."
+msgid "could not convert from UCS-4 to UTF-8"
+msgstr "nelze pÅevést z UCS-4 do UTF-8"
-#: src/idn.c:381
+#: src/idn.c:384
#, c-format
msgid "idna_to_ascii_4z: %s"
msgstr "idna_to_ascii_4z: %s"
-#: src/idn.c:395
+#: src/idn.c:398
#, c-format
msgid "idna_to_unicode_8z4z (TLD): %s"
msgstr "idna_to_unicode_8z4z (TLD): %s"
-#: src/idn.c:409 src/idn.c:482
+#: src/idn.c:412 src/idn.c:485
#, c-format
msgid "tld_check_4z (position %lu): %s"
msgstr "tld_check_4z (pozice %lu): %s"
-#: src/idn.c:412 src/idn.c:488
+#: src/idn.c:415 src/idn.c:491
#, c-format
msgid "tld_check_4z: %s"
msgstr "tld_check_4z: %s"
-#: src/idn.c:461
+#: src/idn.c:464
#, c-format
msgid "idna_to_unicode_8z4z: %s"
msgstr "idna_to_unicode_8z4z: %s"
-#: src/idn.c:540
+#: src/idn.c:543
#, c-format
-msgid "Could not do NFKC normalization."
-msgstr "Normalizaci do NFKC nebylo možné provézt"
+msgid "could not do NFKC normalization"
+msgstr "nebylo možné znormalizovat do NFKC"
+
+#~ msgid ""
+#~ "\n"
+#~ "Report bugs to <%s>.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Chyby programu hlaste na <%s> (pouze anglicky),\n"
+#~ "chyby pÅekladu na <address@hidden> (Äesky).\n"
#~ msgid "input[%lu] = U+%04x\n"
#~ msgstr "vstup[%lu] = U+%04x\n"
@@ -345,9 +346,6 @@ msgstr "Normalizaci do NFKC nebylo možné provézt"
#~ msgid "output[%lu] = U+%04x\n"
#~ msgstr "výstup[%lu] = U+%04x\n"
-#~ msgid "malloc"
-#~ msgstr "malloc"
-
#~ msgid "tld[%lu] = U+%04x\n"
#~ msgstr "vrcholová_doména[%lu] = U+%04x\n"
diff --git a/po/de.po.in b/po/de.po.in
index 7cf0c25..7135419 100644
--- a/po/de.po.in
+++ b/po/de.po.in
@@ -3,162 +3,150 @@
# This file is distributed under the same license as the libidn package.
# Roland Illig <address@hidden>, 2004.
# Roland Illig <address@hidden>, 2009.
+# Roland Illig <address@hidden>, 2011.
#
msgid ""
msgstr ""
-"Project-Id-Version: libidn 1.9\n"
+"Project-Id-Version: libidn 1.21\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2008-07-01 18:15+0200\n"
-"PO-Revision-Date: 2009-11-08 23:34+0100\n"
+"POT-Creation-Date: 2011-04-24 17:12+0200\n"
+"PO-Revision-Date: 2011-05-02 18:51+0100\n"
"Last-Translator: Roland Illig <address@hidden>\n"
"Language-Team: German <address@hidden>\n"
+"Language: de\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: lib/strerror-idna.c:74 lib/strerror-pr29.c:58 lib/strerror-punycode.c:58
-#: lib/strerror-stringprep.c:78 lib/strerror-tld.c:60
+#: lib/strerror-idna.c:75 lib/strerror-pr29.c:59 lib/strerror-punycode.c:59
+#: lib/strerror-stringprep.c:79 lib/strerror-tld.c:61
msgid "Success"
msgstr "Erfolg"
-#: lib/strerror-idna.c:78 lib/strerror-pr29.c:66
+#: lib/strerror-idna.c:79 lib/strerror-pr29.c:67
msgid "String preparation failed"
msgstr "String-Vorbereitung fehlgeschlagen"
-#: lib/strerror-idna.c:82
+#: lib/strerror-idna.c:83
msgid "Punycode failed"
msgstr "Punycode fehlgeschlagen"
-#: lib/strerror-idna.c:86
+#: lib/strerror-idna.c:87
msgid "Non-digit/letter/hyphen in input"
msgstr "Unerlaubtes Zeichen in der Eingabe"
-#: lib/strerror-idna.c:90
+#: lib/strerror-idna.c:91
msgid "Forbidden leading or trailing minus sign (`-')"
msgstr "Verbotenes Minuszeichen am Anfang oder am Ende"
-#: lib/strerror-idna.c:94
+#: lib/strerror-idna.c:95
msgid "Output would be too large or too small"
msgstr "Ergebnis wäre zu groà oder zu klein"
-#: lib/strerror-idna.c:98
+#: lib/strerror-idna.c:99
msgid "Input does not start with ACE prefix (`xn--')"
msgstr "Eingabe beginnt nicht mit dem ACE-Präfix (»xn--«)"
-#: lib/strerror-idna.c:102
+#: lib/strerror-idna.c:103
msgid "String not idempotent under ToASCII"
msgstr "String verändert sich durch ToASCII"
-#: lib/strerror-idna.c:106
+#: lib/strerror-idna.c:107
msgid "Input already contain ACE prefix (`xn--')"
msgstr "Eingabe enthält bereits das ACE-Präfix (»xn--«)"
-#: lib/strerror-idna.c:110 lib/strerror-tld.c:76
+#: lib/strerror-idna.c:111 lib/strerror-tld.c:77
msgid "System iconv failed"
msgstr "System-iconv fehlgeschlagen"
-#: lib/strerror-idna.c:114 lib/strerror-stringprep.c:122 lib/strerror-tld.c:72
+#: lib/strerror-idna.c:115 lib/strerror-stringprep.c:123 lib/strerror-tld.c:73
msgid "Cannot allocate memory"
msgstr "Nicht genug Speicher"
-#: lib/strerror-idna.c:118
+#: lib/strerror-idna.c:119
msgid "System dlopen failed"
msgstr "System-dlopen fehlgeschlagen"
-#: lib/strerror-idna.c:122 lib/strerror-pr29.c:70 lib/strerror-punycode.c:74
-#: lib/strerror-stringprep.c:126 lib/strerror-tld.c:84
+#: lib/strerror-idna.c:123 lib/strerror-pr29.c:71 lib/strerror-punycode.c:75
+#: lib/strerror-stringprep.c:127 lib/strerror-tld.c:85
msgid "Unknown error"
msgstr "Unbekannter Fehler"
-#: lib/strerror-pr29.c:62
+#: lib/strerror-pr29.c:63
msgid "String not idempotent under Unicode NFKC normalization"
msgstr "String verändert sich durch Unicode-NFKC-Normalisierung"
-#: lib/strerror-punycode.c:62
+#: lib/strerror-punycode.c:63
msgid "Invalid input"
msgstr "Ungültige Eingabe"
-#: lib/strerror-punycode.c:66 lib/strerror-stringprep.c:102
+#: lib/strerror-punycode.c:67 lib/strerror-stringprep.c:103
msgid "Output would exceed the buffer space provided"
msgstr "Ausgabe würde den vorhandenen Pufferspeicher überfluten"
-#: lib/strerror-punycode.c:70
+#: lib/strerror-punycode.c:71
msgid "String size limit exceeded"
msgstr "String-GröÃenbegrenzung überschritten"
-#: lib/strerror-stringprep.c:82
+#: lib/strerror-stringprep.c:83
msgid "Forbidden unassigned code points in input"
msgstr "Verbotene unzugeordnete Codepunkte in der Eingabe"
-#: lib/strerror-stringprep.c:86
+#: lib/strerror-stringprep.c:87
msgid "Prohibited code points in input"
msgstr "Verbotene Codepunkte in der Eingabe"
-#: lib/strerror-stringprep.c:90
+#: lib/strerror-stringprep.c:91
msgid "Conflicting bidirectional properties in input"
msgstr "Widersprüchliche bidirektional-Eigenschaften in der Eingabe"
-#: lib/strerror-stringprep.c:94
+#: lib/strerror-stringprep.c:95
msgid "Malformed bidirectional string"
msgstr "Ungültiger Bidirektional-String"
-#: lib/strerror-stringprep.c:98
+#: lib/strerror-stringprep.c:99
msgid "Prohibited bidirectional code points in input"
msgstr "Verbotene bidirektionale Codepunkte in der Eingabe"
-#: lib/strerror-stringprep.c:106
+#: lib/strerror-stringprep.c:107
msgid "Error in stringprep profile definition"
msgstr "Fehler in der Stringprep-Profildefinition"
-#: lib/strerror-stringprep.c:110
+#: lib/strerror-stringprep.c:111
msgid "Flag conflict with profile"
msgstr "Flag-Konflikt mit dem Profil"
-#: lib/strerror-stringprep.c:114
+#: lib/strerror-stringprep.c:115
msgid "Unknown profile"
msgstr "Unbekanntes Profil"
-#: lib/strerror-stringprep.c:118
+#: lib/strerror-stringprep.c:119
msgid "Unicode normalization failed (internal error)"
msgstr "Unicode-Normalisierung fehlgeschlagen (Interner Fehler)"
-#: lib/strerror-tld.c:64
+#: lib/strerror-tld.c:65
msgid "Code points prohibited by top-level domain"
msgstr "Codepunkte sind von der Top-Level-Domain verboten"
-#: lib/strerror-tld.c:68
+#: lib/strerror-tld.c:69
msgid "Missing input"
msgstr "Fehlende Eingabe"
-#: lib/strerror-tld.c:80
+#: lib/strerror-tld.c:81
msgid "No top-level domain found in input"
msgstr "Keine Top-Level-Domain in der Eingabe gefunden"
-#. TRANSLATORS: The placeholder indicates the bug-reporting address
-#. for this package. Please add _another line_ saying
-#. "Report translation bugs to <...>\n" with the address for translation
-#. bugs (typically your translation team's web or email address).
#: src/idn.c:68
#, c-format
-msgid ""
-"\n"
-"Report bugs to <%s>.\n"
-msgstr ""
-"\n"
-"Melden Sie Fehler an <%s>.\n"
-"Melden Sie Ãbersetzungsfehler an <address@hidden>.\n"
-
-#: src/idn.c:75
-#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "Versuchen Sie »%s --help« für mehr Informationen.\n"
-#: src/idn.c:79
+#: src/idn.c:72
#, c-format
msgid "Usage: %s [OPTION]... [STRINGS]...\n"
msgstr "Aufruf: %s [OPTION]... [STRINGS]...\n"
-#: src/idn.c:82
+#: src/idn.c:75
msgid ""
"Internationalized Domain Name (IDN) convert STRINGS, or standard input.\n"
"\n"
@@ -166,7 +154,7 @@ msgstr ""
"Internationalized Domain Name (IDN) konvertiert STRINGS oder die
Standardeingabe.\n"
"\n"
-#: src/idn.c:86
+#: src/idn.c:79
msgid ""
"Command line interface to the internationalized domain name library.\n"
"\n"
@@ -193,7 +181,7 @@ msgstr ""
"Notwendige Argumente für die langen Optionen gelten genau so für die\n"
"kurzen Optionen.\n"
-#: src/idn.c:98
+#: src/idn.c:91
msgid ""
" -h, --help Print help and exit\n"
" -V, --version Print version and exit\n"
@@ -201,7 +189,7 @@ msgstr ""
" -h, --help Hilfe ausgeben und beenden\n"
" -V, --version Version ausgeben und beenden\n"
-#: src/idn.c:102
+#: src/idn.c:95
msgid ""
" -s, --stringprep Prepare string according to nameprep profile\n"
" -d, --punycode-decode Decode Punycode\n"
@@ -215,27 +203,27 @@ msgstr ""
" -a, --idna-to-ascii Gemäà IDNA in ACE konvertieren (Standardmodus)\n"
" -u, --idna-to-unicode Gemäà IDNA aus ACE heraus konvertieren\n"
-#: src/idn.c:109
+#: src/idn.c:102
msgid ""
-" --allow-unassigned Toggle IDNA AllowUnassigned flag\n"
-" --usestd3asciirules Toggle IDNA UseSTD3ASCIIRules flag\n"
+" --allow-unassigned Toggle IDNA AllowUnassigned flag (default off)\n"
+" --usestd3asciirules Toggle IDNA UseSTD3ASCIIRules flag (default off)\n"
msgstr ""
-" --allow-unassigned Option \"IDNA AllowUnassigned\" umschalten\n"
-" --usestd3asciirules Option \"IDNA UseSTD3ASCIIRules\" umschalten\n"
+" --allow-unassigned Option \"IDNA AllowUnassigned\" umschalten
(Vorgabe: aus)\n"
+" --usestd3asciirules Option \"IDNA UseSTD3ASCIIRules\" umschalten
(Vorgabe: aus)\n"
-#: src/idn.c:113
+#: src/idn.c:106
msgid ""
-" -t, --tld Check string for TLD specific rules\n"
+" --no-tld Don't check string for TLD specific rules\n"
" Only for --idna-to-ascii and --idna-to-unicode\n"
msgstr ""
-" -t, --tld String auf TLD-spezifische Regeln überprüfen\n"
+" --no-tld String nicht auf TLD-spezifische Regeln
überprüfen\n"
" Nur für --idna-to-ascii und --idna-to-unicode\n"
-#: src/idn.c:117
+#: src/idn.c:110
msgid " -n, --nfkc Normalize string according to Unicode v3.2
NFKC\n"
msgstr " -n, --nfkc String gemäà Unicode v3.2 NFKC
normalisieren\n"
-#: src/idn.c:120
+#: src/idn.c:113
msgid ""
" -p, --profile=STRING Use specified stringprep profile instead\n"
" Valid stringprep profiles: `Nameprep',\n"
@@ -247,7 +235,7 @@ msgstr ""
" `iSCSI', `Nodeprep', `Resourceprep', \n"
" `trace', `SASLprep'\n"
-#: src/idn.c:126
+#: src/idn.c:119
msgid ""
" --debug Print debugging information\n"
" --quiet Silent operation\n"
@@ -255,92 +243,104 @@ msgstr ""
" --debug Debugging-Informationen ausgeben\n"
" --quiet Ruhig arbeiten\n"
-#: src/idn.c:176
+#: src/idn.c:175
#, c-format
-msgid "Only one of -s, -e, -d, -a, -u or -n can be specified."
+msgid "only one of -s, -e, -d, -a, -u or -n can be specified"
msgstr "Nur eins von »-s«, »-e«, »-d«, »-a«, »-u« oder »-n« kann
angegeben werden."
-#: src/idn.c:184
+#: src/idn.c:185
#, c-format
msgid "Charset `%s'.\n"
msgstr "Zeichensatz »%s«.\n"
-#: src/idn.c:187
+#: src/idn.c:190
#, c-format
msgid "Type each input string on a line by itself, terminated by a newline
character.\n"
msgstr "Geben Sie jede Eingabezeichenkette in einer eigenen Zeile ein, durch
einen Zeilenumbruch abgeschlossen.\n"
-#: src/idn.c:202
+#: src/idn.c:205
#, c-format
-msgid "Input error"
+msgid "input error"
msgstr "Eingabefehler"
-#: src/idn.c:212 src/idn.c:274 src/idn.c:357 src/idn.c:434 src/idn.c:515
+#: src/idn.c:215 src/idn.c:277 src/idn.c:360 src/idn.c:437 src/idn.c:518
#, c-format
-msgid "Could not convert from %s to UTF-8."
+msgid "could not convert from %s to UTF-8"
msgstr "Konnte nicht von %s nach UTF-8 konvertieren."
-#: src/idn.c:220 src/idn.c:245 src/idn.c:281 src/idn.c:498 src/idn.c:527
-#: src/idn.c:551
+#: src/idn.c:223 src/idn.c:248 src/idn.c:284 src/idn.c:501 src/idn.c:530
+#: src/idn.c:554
#, c-format
-msgid "Could not convert from UTF-8 to UCS-4."
+msgid "could not convert from UTF-8 to UCS-4"
msgstr "Konnte nicht von UTF-8 nach UCS-4 konvertieren."
-#: src/idn.c:237
+#: src/idn.c:240
#, c-format
msgid "stringprep_profile: %s"
msgstr "stringprep_profile: %s"
-#: src/idn.c:260 src/idn.c:302 src/idn.c:345 src/idn.c:503 src/idn.c:564
+#: src/idn.c:263 src/idn.c:305 src/idn.c:348 src/idn.c:506 src/idn.c:567
#, c-format
-msgid "Could not convert from UTF-8 to %s."
+msgid "could not convert from UTF-8 to %s"
msgstr "Konnte nicht von UTF-8 nach %s konvertieren."
-#: src/idn.c:295
+#: src/idn.c:298
#, c-format
msgid "punycode_encode: %s"
msgstr "punycode_encode: %s"
-#: src/idn.c:323
+#: src/idn.c:320
+msgid "malloc"
+msgstr "malloc"
+
+#: src/idn.c:326
#, c-format
msgid "punycode_decode: %s"
msgstr "punycode_decode: %s"
-#: src/idn.c:340 src/idn.c:364 src/idn.c:442
+#: src/idn.c:343 src/idn.c:367 src/idn.c:445
#, c-format
-msgid "Could not convert from UCS-4 to UTF-8."
+msgid "could not convert from UCS-4 to UTF-8"
msgstr "Konnte nicht von UCS-4 nach UTF-8 konvertieren."
-#: src/idn.c:381
+#: src/idn.c:384
#, c-format
msgid "idna_to_ascii_4z: %s"
msgstr "idna_to_ascii_4z: %s"
-#: src/idn.c:395
+#: src/idn.c:398
#, c-format
msgid "idna_to_unicode_8z4z (TLD): %s"
msgstr "idna_to_unicode_8z4z (TLD): %s"
-#: src/idn.c:409 src/idn.c:482
+#: src/idn.c:412 src/idn.c:485
#, c-format
msgid "tld_check_4z (position %lu): %s"
msgstr "tld_check_4z (position %lu): %s"
-#: src/idn.c:412 src/idn.c:488
+#: src/idn.c:415 src/idn.c:491
#, c-format
msgid "tld_check_4z: %s"
msgstr "tld_check_4z: %s"
-#: src/idn.c:461
+#: src/idn.c:464
#, c-format
msgid "idna_to_unicode_8z4z: %s"
msgstr "idna_to_unicode_8z4z: %s"
-#: src/idn.c:540
+#: src/idn.c:543
#, c-format
-msgid "Could not do NFKC normalization."
+msgid "could not do NFKC normalization"
msgstr "Konnte die NFKC-Normalisierung nicht ausführen."
+#~ msgid ""
+#~ "\n"
+#~ "Report bugs to <%s>.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Melden Sie Fehler an <%s>.\n"
+#~ "Melden Sie Ãbersetzungsfehler an <address@hidden>.\n"
+
#~ msgid "%s: fgets() failed: "
#~ msgstr "%s: fgets() fehlgeschlagen: "
diff --git a/po/fi.po.in b/po/fi.po.in
index 7725124..9caadca 100644
--- a/po/fi.po.in
+++ b/po/fi.po.in
@@ -1,171 +1,158 @@
# translation of libidn-1.9.pot to Finnish
-# Copyright © 2008, 2009 Free Software Foundation, Inc.
+# Copyright © 2008, 2009, 2011 Free Software Foundation, Inc.
# Copyright © 2007 Simon Josefsson
# This file is distributed under the same license as the libidn package.
# Jorma Karvonen <address@hidden>, 2008.
-# Jorma Karvonen <address@hidden>, 2009
+# Jorma Karvonen <address@hidden>, 2009-2011.
#
msgid ""
msgstr ""
-"Project-Id-Version: libidn 1.9\n"
+"Project-Id-Version: libidn 1.21\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2008-07-01 18:15+0200\n"
-"PO-Revision-Date: 2009-09-30 00:44+0200\n"
+"POT-Creation-Date: 2011-04-24 17:12+0200\n"
+"PO-Revision-Date: 2011-04-30 15:25+0200\n"
"Last-Translator: Jorma Karvonen <address@hidden>\n"
"Language-Team: Finnish <address@hidden>\n"
+"Language: fi\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: KBabel 1.11.4\n"
-#: lib/strerror-idna.c:74 lib/strerror-pr29.c:58 lib/strerror-punycode.c:58
-#: lib/strerror-stringprep.c:78 lib/strerror-tld.c:60
+#: lib/strerror-idna.c:75 lib/strerror-pr29.c:59 lib/strerror-punycode.c:59
+#: lib/strerror-stringprep.c:79 lib/strerror-tld.c:61
msgid "Success"
msgstr "Onnistui"
-#: lib/strerror-idna.c:78 lib/strerror-pr29.c:66
+#: lib/strerror-idna.c:79 lib/strerror-pr29.c:67
msgid "String preparation failed"
msgstr "Merkkijonon valmistelu ei onnistunut"
# Wikipedia: Punycode is a computer programming encoding syntax by which a
Unicode string of characters can be translated into the more-limited character
set permitted in network host names.
-#: lib/strerror-idna.c:82
+#: lib/strerror-idna.c:83
msgid "Punycode failed"
msgstr "Punycode-koodaus ei onnistunut"
-#: lib/strerror-idna.c:86
+#: lib/strerror-idna.c:87
msgid "Non-digit/letter/hyphen in input"
msgstr "Syötteessä on merkki, joka ei ole numero/kirjain/tavuviiva"
-#: lib/strerror-idna.c:90
+#: lib/strerror-idna.c:91
msgid "Forbidden leading or trailing minus sign (`-')"
msgstr "Ei saa alkaa tai loppua miinusmerkillä (â-â)"
-#: lib/strerror-idna.c:94
+#: lib/strerror-idna.c:95
msgid "Output would be too large or too small"
msgstr "Tuloste olisi liian suuri tai liian pieni"
-#: lib/strerror-idna.c:98
+#: lib/strerror-idna.c:99
msgid "Input does not start with ACE prefix (`xn--')"
msgstr "Syöte ei ala ACE-prefiksillä (âxn--â)"
# Yksinkertaisesti selitettynä idempotentti on matemaattinen termi, joka
tarkoittaa, että jonkun toiminnon tulos on aina sama kun toiminto toistetaan
kahdesti (tai useammin).
-#: lib/strerror-idna.c:102
+#: lib/strerror-idna.c:103
msgid "String not idempotent under ToASCII"
msgstr "Merkkijono ei ole idempotentti ToASCII-toiminnon aikana"
-#: lib/strerror-idna.c:106
+#: lib/strerror-idna.c:107
msgid "Input already contain ACE prefix (`xn--')"
msgstr "Syöte jo sisältää ACE-prefiksin (âxn--â)"
-#: lib/strerror-idna.c:110 lib/strerror-tld.c:76
+#: lib/strerror-idna.c:111 lib/strerror-tld.c:77
msgid "System iconv failed"
msgstr "Järjestelmän iconv-käsky ei onnistunut"
-#: lib/strerror-idna.c:114 lib/strerror-stringprep.c:122 lib/strerror-tld.c:72
+#: lib/strerror-idna.c:115 lib/strerror-stringprep.c:123 lib/strerror-tld.c:73
msgid "Cannot allocate memory"
msgstr "Ei voida varata muistia"
-#: lib/strerror-idna.c:118
+#: lib/strerror-idna.c:119
msgid "System dlopen failed"
msgstr "Järjestelmän dlopen-käsky ei onnistunut"
-#: lib/strerror-idna.c:122 lib/strerror-pr29.c:70 lib/strerror-punycode.c:74
-#: lib/strerror-stringprep.c:126 lib/strerror-tld.c:84
+#: lib/strerror-idna.c:123 lib/strerror-pr29.c:71 lib/strerror-punycode.c:75
+#: lib/strerror-stringprep.c:127 lib/strerror-tld.c:85
msgid "Unknown error"
msgstr "Tuntematon virhe"
-#: lib/strerror-pr29.c:62
+#: lib/strerror-pr29.c:63
msgid "String not idempotent under Unicode NFKC normalization"
msgstr "Merkkijono ei ole idempotentti Unicode NFKC-normeerauksen aikana"
-#: lib/strerror-punycode.c:62
+#: lib/strerror-punycode.c:63
msgid "Invalid input"
msgstr "Virheellinen syöte"
-#: lib/strerror-punycode.c:66 lib/strerror-stringprep.c:102
+#: lib/strerror-punycode.c:67 lib/strerror-stringprep.c:103
msgid "Output would exceed the buffer space provided"
msgstr "Tuloste ylittäisi varatun puskurin tilan"
-#: lib/strerror-punycode.c:70
+#: lib/strerror-punycode.c:71
msgid "String size limit exceeded"
msgstr "Merkkijonon koko ylitettiin"
# Code point is any value in the Unicode codespace; that is, the range of
integers from 0 to hexadecimal 10FFFF.
-#: lib/strerror-stringprep.c:82
+#: lib/strerror-stringprep.c:83
msgid "Forbidden unassigned code points in input"
msgstr "Kiellettyjä määräämättömiä code points-skalaariarvoja
syötteessä"
-#: lib/strerror-stringprep.c:86
+#: lib/strerror-stringprep.c:87
msgid "Prohibited code points in input"
msgstr "Kiellettyjä code points-skalaariarvoja syötteessä"
-#: lib/strerror-stringprep.c:90
+#: lib/strerror-stringprep.c:91
msgid "Conflicting bidirectional properties in input"
msgstr "Ristiriitaisia kaksisuuntaisia ominaisuuksia syötteessä"
-#: lib/strerror-stringprep.c:94
+#: lib/strerror-stringprep.c:95
msgid "Malformed bidirectional string"
msgstr "Väärän muotoinen kaksisuuntainen merkkijono"
-#: lib/strerror-stringprep.c:98
+#: lib/strerror-stringprep.c:99
msgid "Prohibited bidirectional code points in input"
msgstr "Kiellettyjä kaksisuuntaisia code points-skalaariarvoja syötteessä"
-#: lib/strerror-stringprep.c:106
+#: lib/strerror-stringprep.c:107
msgid "Error in stringprep profile definition"
msgstr "Virhe strngprep-profiilimäärittelyssä"
-#: lib/strerror-stringprep.c:110
+#: lib/strerror-stringprep.c:111
msgid "Flag conflict with profile"
msgstr "Lippu ristiriidassa profiilin kanssa"
-#: lib/strerror-stringprep.c:114
+#: lib/strerror-stringprep.c:115
msgid "Unknown profile"
msgstr "Tuntematon profiili"
-#: lib/strerror-stringprep.c:118
+#: lib/strerror-stringprep.c:119
msgid "Unicode normalization failed (internal error)"
msgstr "Unicode-normeeraus ei onnistunut (sisäinen virhe)"
-#: lib/strerror-tld.c:64
+#: lib/strerror-tld.c:65
msgid "Code points prohibited by top-level domain"
msgstr "Code points-skalaariarvot kiellettyjä ylätason toimialueessa"
-#: lib/strerror-tld.c:68
+#: lib/strerror-tld.c:69
msgid "Missing input"
msgstr "Syöte puuttuu"
-#: lib/strerror-tld.c:80
+#: lib/strerror-tld.c:81
msgid "No top-level domain found in input"
msgstr "Syötteestä ei löytynyt ylätason toimialuetta"
-#. TRANSLATORS: The placeholder indicates the bug-reporting address
-#. for this package. Please add _another line_ saying
-#. "Report translation bugs to <...>\n" with the address for translation
-#. bugs (typically your translation team's web or email address).
#: src/idn.c:68
#, c-format
-msgid ""
-"\n"
-"Report bugs to <%s>.\n"
-msgstr ""
-"\n"
-"Ilmoita virheistä osoitteeseen <%s>.\n"
-"Ilmoita käännösvirheistä osoitteeseen <address@hidden>.\n"
-
-#: src/idn.c:75
-#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "Lisätietoja käskyllä â%s --helpâ.\n"
-#: src/idn.c:79
+#: src/idn.c:72
#, c-format
msgid "Usage: %s [OPTION]... [STRINGS]...\n"
msgstr "Käyttö: %s [VALITSIN]... [MERKKIJONOT]...\n"
# convert -> converts ?
-#: src/idn.c:82
+#: src/idn.c:75
msgid ""
"Internationalized Domain Name (IDN) convert STRINGS, or standard input.\n"
"\n"
@@ -173,7 +160,7 @@ msgstr ""
"Kansainvälistetty verkkotunnus (IDN) muuntaa MERKKIJONOT tai
vakiosyötteen.\n"
"\n"
-#: src/idn.c:86
+#: src/idn.c:79
msgid ""
"Command line interface to the internationalized domain name library.\n"
"\n"
@@ -200,7 +187,7 @@ msgstr ""
"Pakolliset argumentit pitkille valitsimille ovat pakollisia myös lyhyille\n"
"valitsimille.\n"
-#: src/idn.c:98
+#: src/idn.c:91
msgid ""
" -h, --help Print help and exit\n"
" -V, --version Print version and exit\n"
@@ -208,7 +195,7 @@ msgstr ""
" -h, --help Tulosta ohje ja poistu\n"
" -V, --version Tulosta versio ja poistu\n"
-#: src/idn.c:102
+#: src/idn.c:95
msgid ""
" -s, --stringprep Prepare string according to nameprep profile\n"
" -d, --punycode-decode Decode Punycode\n"
@@ -222,27 +209,27 @@ msgstr ""
" -a, --idna-to-ascii Muunna ACE-koodiksi IDNA-koodista (oletustila)\n"
" -u, --idna-to-unicode Muunna ACE-koodista IDNA-koodiksi\n"
-#: src/idn.c:109
+#: src/idn.c:102
msgid ""
-" --allow-unassigned Toggle IDNA AllowUnassigned flag\n"
-" --usestd3asciirules Toggle IDNA UseSTD3ASCIIRules flag\n"
+" --allow-unassigned Toggle IDNA AllowUnassigned flag (default off)\n"
+" --usestd3asciirules Toggle IDNA UseSTD3ASCIIRules flag (default off)\n"
msgstr ""
-" --allow-unassigned Vaihda âIDNA AllowUnassignedâ-lipun tilaa\n"
-" --usestd3asciirules Vaihda âIDNA UseSTD3ASCIIRulesâ-lipun tilaa\n"
+" --allow-unassigned Vaihda âIDNA AllowUnassignedâ-lipun tilaa
(oletus off)\n"
+" --usestd3asciirules Vaihda âIDNA UseSTD3ASCIIRulesâ-lipun tilaa
(oletus off)\n"
-#: src/idn.c:113
+#: src/idn.c:106
msgid ""
-" -t, --tld Check string for TLD specific rules\n"
+" --no-tld Don't check string for TLD specific rules\n"
" Only for --idna-to-ascii and --idna-to-unicode\n"
msgstr ""
-" -t, --tld Etsi merkkijonosta TLD-kohtaisia sääntöjä\n"
+" --no-tld Ãlä etsi merkkijonosta TLD-kohtaisia
sääntöjä\n"
" Vain valitsimille â--idna-to-asciiâ ja
â--idna-to-unicodeâ\n"
-#: src/idn.c:117
+#: src/idn.c:110
msgid " -n, --nfkc Normalize string according to Unicode v3.2
NFKC\n"
msgstr " -n, --nfkc Normeeraa merkkijono âUnicode v3.2
NFKCâ-koodauksen mukaisesti\n"
-#: src/idn.c:120
+#: src/idn.c:113
msgid ""
" -p, --profile=STRING Use specified stringprep profile instead\n"
" Valid stringprep profiles: `Nameprep',\n"
@@ -254,7 +241,7 @@ msgstr ""
" âiSCSIâ, âNodeprepâ, âResourceprepâ,
\n"
" âtraceâ, âSASLprepâ\n"
-#: src/idn.c:126
+#: src/idn.c:119
msgid ""
" --debug Print debugging information\n"
" --quiet Silent operation\n"
@@ -262,91 +249,103 @@ msgstr ""
" --debug Tulosta virheenjäljitystiedot\n"
" --quiet Hiljainen toiminta\n"
-#: src/idn.c:176
+#: src/idn.c:175
#, c-format
-msgid "Only one of -s, -e, -d, -a, -u or -n can be specified."
-msgstr "Vain yksi valitsimista -s, -e, -d, -a, -u tai -n voidaan määritellä"
+msgid "only one of -s, -e, -d, -a, -u or -n can be specified"
+msgstr "vain yksi valitsimista -s, -e, -d, -a, -u tai -n voidaan määritellä"
-#: src/idn.c:184
+#: src/idn.c:185
#, c-format
msgid "Charset `%s'.\n"
msgstr "Merkistö â%sâ\n"
-#: src/idn.c:187
+#: src/idn.c:190
#, c-format
msgid "Type each input string on a line by itself, terminated by a newline
character.\n"
msgstr "Kirjoita jokainen merkkijono omalle rivilleen ja lopeta rivi
rivinvaihdolla.\n"
-#: src/idn.c:202
+#: src/idn.c:205
#, c-format
-msgid "Input error"
-msgstr "Syötevirhe"
+msgid "input error"
+msgstr "syötevirhe"
-#: src/idn.c:212 src/idn.c:274 src/idn.c:357 src/idn.c:434 src/idn.c:515
+#: src/idn.c:215 src/idn.c:277 src/idn.c:360 src/idn.c:437 src/idn.c:518
#, c-format
-msgid "Could not convert from %s to UTF-8."
-msgstr "Ei voitu muuntaa %s-merkistöstä UTF-8-merkistöön"
+msgid "could not convert from %s to UTF-8"
+msgstr "ei voitu muuntaa %s-merkistöstä UTF-8-merkistöön"
-#: src/idn.c:220 src/idn.c:245 src/idn.c:281 src/idn.c:498 src/idn.c:527
-#: src/idn.c:551
+#: src/idn.c:223 src/idn.c:248 src/idn.c:284 src/idn.c:501 src/idn.c:530
+#: src/idn.c:554
#, c-format
-msgid "Could not convert from UTF-8 to UCS-4."
-msgstr "Ei voitu muuntaa UTF-8-merkistöstä UCS-4-merkistöön"
+msgid "could not convert from UTF-8 to UCS-4"
+msgstr "ei voitu muuntaa UTF-8-merkistöstä UCS-4-merkistöön"
-#: src/idn.c:237
+#: src/idn.c:240
#, c-format
msgid "stringprep_profile: %s"
msgstr "stringprep_profile: %s"
-#: src/idn.c:260 src/idn.c:302 src/idn.c:345 src/idn.c:503 src/idn.c:564
+#: src/idn.c:263 src/idn.c:305 src/idn.c:348 src/idn.c:506 src/idn.c:567
#, c-format
-msgid "Could not convert from UTF-8 to %s."
-msgstr "Ei voitu muuntaa UTF-8-merkistöstä %s-merkistöön."
+msgid "could not convert from UTF-8 to %s"
+msgstr "ei voitu muuntaa UTF-8-merkistöstä %s-merkistöön."
-#: src/idn.c:295
+#: src/idn.c:298
#, c-format
msgid "punycode_encode: %s"
msgstr "punycode_encode: %s"
-#: src/idn.c:323
+#: src/idn.c:320
+msgid "malloc"
+msgstr "malloc-käsky"
+
+#: src/idn.c:326
#, c-format
msgid "punycode_decode: %s"
msgstr "punycode_decode: %s"
-#: src/idn.c:340 src/idn.c:364 src/idn.c:442
+#: src/idn.c:343 src/idn.c:367 src/idn.c:445
#, c-format
-msgid "Could not convert from UCS-4 to UTF-8."
-msgstr "Ei voitu muuntaa UCS-4-merkistöstä UTF-8-merkistöön."
+msgid "could not convert from UCS-4 to UTF-8"
+msgstr "ei voitu muuntaa UCS-4-merkistöstä UTF-8-merkistöön."
-#: src/idn.c:381
+#: src/idn.c:384
#, c-format
msgid "idna_to_ascii_4z: %s"
msgstr "idna_to_ascii_4z: %s"
-#: src/idn.c:395
+#: src/idn.c:398
#, c-format
msgid "idna_to_unicode_8z4z (TLD): %s"
msgstr "idna_to_unicode_8z4z (TLD): %s"
-#: src/idn.c:409 src/idn.c:482
+#: src/idn.c:412 src/idn.c:485
#, c-format
msgid "tld_check_4z (position %lu): %s"
msgstr "tld_check_4z (sijainti %lu): %s"
-#: src/idn.c:412 src/idn.c:488
+#: src/idn.c:415 src/idn.c:491
#, c-format
msgid "tld_check_4z: %s"
msgstr "tld_check_4z: %s"
-#: src/idn.c:461
+#: src/idn.c:464
#, c-format
msgid "idna_to_unicode_8z4z: %s"
msgstr "idna_to_unicode_8z4z: %s"
-#: src/idn.c:540
+#: src/idn.c:543
#, c-format
-msgid "Could not do NFKC normalization."
-msgstr "Ei voitu tehdä NFKC-normeerausta."
+msgid "could not do NFKC normalization"
+msgstr "ei voitu tehdä NFKC-normeerausta."
+
+#~ msgid ""
+#~ "\n"
+#~ "Report bugs to <%s>.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Ilmoita virheistä osoitteeseen <%s>.\n"
+#~ "Ilmoita käännösvirheistä osoitteeseen <address@hidden>.\n"
#~ msgid "input[%lu] = U+%04x\n"
#~ msgstr "syöte[%lu] = U+%04x\n"
@@ -354,8 +353,5 @@ msgstr "Ei voitu tehdä NFKC-normeerausta."
#~ msgid "output[%lu] = U+%04x\n"
#~ msgstr "tuloste[%lu] = U+%04x\n"
-#~ msgid "malloc"
-#~ msgstr "malloc-käsky"
-
#~ msgid "tld[%lu] = U+%04x\n"
#~ msgstr "tld[%lu] = U+%04x\n"
diff --git a/po/nl.po.in b/po/nl.po.in
index 77bb0d7..8b0f8f2 100644
--- a/po/nl.po.in
+++ b/po/nl.po.in
@@ -1,178 +1,168 @@
-# Dutch translations for libidn.
-# Copyright (C) 2008 Free Software Foundation, Inc.
+# Dutch translations for GNU libidn.
+# Copyright (C) 2011 Free Software Foundation, Inc.
# This file is distributed under the same license as the libidn package.
#
+# De vertalingen die beginnen met "## " zijn debug-tekstjes
+# die eigenlijk niet in dit bestand thuishoren.
+#
+# Benno Schulenberg <address@hidden>, 2005, 2007, 2008, 2011.
# Elros Cyriatan <address@hidden>, 2004.
-# Benno Schulenberg <address@hidden>, 2005, 2007, 2008.
msgid ""
msgstr ""
-"Project-Id-Version: libidn-1.9\n"
+"Project-Id-Version: libidn-1.21\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2008-07-01 18:15+0200\n"
-"PO-Revision-Date: 2008-07-02 22:58+0200\n"
+"POT-Creation-Date: 2011-04-24 17:12+0200\n"
+"PO-Revision-Date: 2011-04-28 11:27+0200\n"
"Last-Translator: Benno Schulenberg <address@hidden>\n"
"Language-Team: Dutch <address@hidden>\n"
+"Language: nl\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
+"X-Generator: Lokalize 1.0\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: lib/strerror-idna.c:74 lib/strerror-pr29.c:58 lib/strerror-punycode.c:58
-#: lib/strerror-stringprep.c:78 lib/strerror-tld.c:60
+#: lib/strerror-idna.c:75 lib/strerror-pr29.c:59 lib/strerror-punycode.c:59
+#: lib/strerror-stringprep.c:79 lib/strerror-tld.c:61
msgid "Success"
msgstr "Gelukt"
-#: lib/strerror-idna.c:78 lib/strerror-pr29.c:66
+#: lib/strerror-idna.c:79 lib/strerror-pr29.c:67
msgid "String preparation failed"
msgstr "Voorbewerken van tekenreeks is mislukt"
-#: lib/strerror-idna.c:82
+#: lib/strerror-idna.c:83
msgid "Punycode failed"
msgstr "Punycodering is mislukt"
-#: lib/strerror-idna.c:86
+#: lib/strerror-idna.c:87
msgid "Non-digit/letter/hyphen in input"
msgstr "Iets anders dan cijfer/letter/verbindingsstreepje in invoer"
-#: lib/strerror-idna.c:90
+#: lib/strerror-idna.c:91
msgid "Forbidden leading or trailing minus sign (`-')"
msgstr "Ongeoorloofd minteken ('-') aan begin of eind"
-#: lib/strerror-idna.c:94
+#: lib/strerror-idna.c:95
msgid "Output would be too large or too small"
msgstr "Uitvoer zou te groot of te klein worden"
-#: lib/strerror-idna.c:98
+#: lib/strerror-idna.c:99
msgid "Input does not start with ACE prefix (`xn--')"
msgstr "Invoer begint niet met een ACE-voorvoegsel ('xn--')"
-#: lib/strerror-idna.c:102
+#: lib/strerror-idna.c:103
msgid "String not idempotent under ToASCII"
msgstr "Tekenreeks is niet hetzelfde na retourconversie (van ASCII naar
Unicode en terug)"
-#: lib/strerror-idna.c:106
+#: lib/strerror-idna.c:107
msgid "Input already contain ACE prefix (`xn--')"
msgstr "Invoer bevat al een ACE-voorvoegsel ('xn--')"
-#: lib/strerror-idna.c:110 lib/strerror-tld.c:76
+#: lib/strerror-idna.c:111 lib/strerror-tld.c:77
msgid "System iconv failed"
msgstr "De iconv()-systeemfunctie is mislukt"
-#: lib/strerror-idna.c:114 lib/strerror-stringprep.c:122 lib/strerror-tld.c:72
+#: lib/strerror-idna.c:115 lib/strerror-stringprep.c:123 lib/strerror-tld.c:73
msgid "Cannot allocate memory"
msgstr "Onvoldoende geheugen beschikbaar"
-#: lib/strerror-idna.c:118
+#: lib/strerror-idna.c:119
msgid "System dlopen failed"
msgstr "De dlopen()-systeemfunctie is mislukt"
-#: lib/strerror-idna.c:122 lib/strerror-pr29.c:70 lib/strerror-punycode.c:74
-#: lib/strerror-stringprep.c:126 lib/strerror-tld.c:84
+#: lib/strerror-idna.c:123 lib/strerror-pr29.c:71 lib/strerror-punycode.c:75
+#: lib/strerror-stringprep.c:127 lib/strerror-tld.c:85
msgid "Unknown error"
msgstr "Onbekende fout"
-#: lib/strerror-pr29.c:62
+#: lib/strerror-pr29.c:63
msgid "String not idempotent under Unicode NFKC normalization"
msgstr ""
"Tekenreeks is problematisch bij normalisering volgens Unicode-NFKC:\n"
"er zijn verschillende mogelijkheden"
-#: lib/strerror-punycode.c:62
+#: lib/strerror-punycode.c:63
msgid "Invalid input"
msgstr "Ongeldige invoer"
-#: lib/strerror-punycode.c:66 lib/strerror-stringprep.c:102
+#: lib/strerror-punycode.c:67 lib/strerror-stringprep.c:103
msgid "Output would exceed the buffer space provided"
msgstr "Uitvoer zou niet in toegewezen bufferruimte passen"
-#: lib/strerror-punycode.c:70
+#: lib/strerror-punycode.c:71
msgid "String size limit exceeded"
msgstr "Tekenreeks is te lang"
-#: lib/strerror-stringprep.c:82
+#: lib/strerror-stringprep.c:83
msgid "Forbidden unassigned code points in input"
msgstr "Ongeoorloofde niet-toegewezen tekencodes in invoer"
-#: lib/strerror-stringprep.c:86
+#: lib/strerror-stringprep.c:87
msgid "Prohibited code points in input"
msgstr "Ongeoorloofde tekencodes in invoer"
-#: lib/strerror-stringprep.c:90
+#: lib/strerror-stringprep.c:91
msgid "Conflicting bidirectional properties in input"
msgstr "Tegenstrijdige eigenschappen voor tweerichtingentekst in invoer"
-#: lib/strerror-stringprep.c:94
+#: lib/strerror-stringprep.c:95
msgid "Malformed bidirectional string"
msgstr "Ongeldige tekenreeks voor tweerichtingentekst"
-#: lib/strerror-stringprep.c:98
+#: lib/strerror-stringprep.c:99
msgid "Prohibited bidirectional code points in input"
msgstr "Ongeoorloofde tekencodes (bij tweerichtingentekst) in invoer"
-#: lib/strerror-stringprep.c:106
+#: lib/strerror-stringprep.c:107
msgid "Error in stringprep profile definition"
msgstr "Fout in profieldefinitie voor 'stringprep'"
-#: lib/strerror-stringprep.c:110
+#: lib/strerror-stringprep.c:111
msgid "Flag conflict with profile"
msgstr "Vlag botst met profiel"
-#: lib/strerror-stringprep.c:114
+#: lib/strerror-stringprep.c:115
msgid "Unknown profile"
msgstr "Onbekend profiel"
-#: lib/strerror-stringprep.c:118
+#: lib/strerror-stringprep.c:119
msgid "Unicode normalization failed (internal error)"
msgstr "Normalisatie van Unicode is mislukt (*interne fout*)"
-#: lib/strerror-tld.c:64
+#: lib/strerror-tld.c:65
msgid "Code points prohibited by top-level domain"
msgstr "Ongeoorloofde tekencodes voor gegeven topdomein"
-#: lib/strerror-tld.c:68
+#: lib/strerror-tld.c:69
msgid "Missing input"
msgstr "Ontbrekende invoer"
-#: lib/strerror-tld.c:80
+#: lib/strerror-tld.c:81
msgid "No top-level domain found in input"
msgstr "Geen topdomein gevonden in de invoer"
-#. TRANSLATORS: The placeholder indicates the bug-reporting address
-#. for this package. Please add _another line_ saying
-#. "Report translation bugs to <...>\n" with the address for translation
-#. bugs (typically your translation team's web or email address).
#: src/idn.c:68
#, c-format
-msgid ""
-"\n"
-"Report bugs to <%s>.\n"
-msgstr ""
-"\n"
-"Rapporteer gebreken in het programma aan <%s>;\n"
-"meld fouten in de vertaling aan <address@hidden>.\n"
-
-#: src/idn.c:75
-#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "Typ '%s --help' voor meer informatie.\n"
-#: src/idn.c:79
+#: src/idn.c:72
#, c-format
msgid "Usage: %s [OPTION]... [STRINGS]...\n"
msgstr "Gebruik: %s [OPTIE]... [TEKENREEKS]...\n"
-#: src/idn.c:82
+#: src/idn.c:75
msgid ""
"Internationalized Domain Name (IDN) convert STRINGS, or standard input.\n"
"\n"
msgstr ""
" \n"
"De gegeven TEKENREEKS (of standaardinvoer) omzetten volgens de regels\n"
-"die gelden voor geïnternationaliseerde domeinnamen.\n"
+"die gelden voor geïnternationaliseerde domeinnamen (IDN).\n"
"\n"
-#: src/idn.c:86
+#: src/idn.c:79
msgid ""
"Command line interface to the internationalized domain name library.\n"
"\n"
@@ -194,7 +184,7 @@ msgstr ""
"\n"
"(Een verplicht argument bij een lange optie geldt ook voor de korte vorm.)\n"
-#: src/idn.c:98
+#: src/idn.c:91
msgid ""
" -h, --help Print help and exit\n"
" -V, --version Print version and exit\n"
@@ -202,7 +192,7 @@ msgstr ""
" -h, --help deze hulptekst tonen en stoppen\n"
" -V, --version programmaversie tonen en stoppen\n"
-#: src/idn.c:102
+#: src/idn.c:95
msgid ""
" -s, --stringprep Prepare string according to nameprep profile\n"
" -d, --punycode-decode Decode Punycode\n"
@@ -216,27 +206,27 @@ msgstr ""
" -a, --idna-to-ascii naar ACE omzetten volgens IDNA (standaardmodus)\n"
" -u, --idna-to-unicode uit ACE omzetten volgens IDNA\n"
-#: src/idn.c:109
+#: src/idn.c:102
msgid ""
-" --allow-unassigned Toggle IDNA AllowUnassigned flag\n"
-" --usestd3asciirules Toggle IDNA UseSTD3ASCIIRules flag\n"
+" --allow-unassigned Toggle IDNA AllowUnassigned flag (default off)\n"
+" --usestd3asciirules Toggle IDNA UseSTD3ASCIIRules flag (default off)\n"
msgstr ""
-" --allow-unassigned de IDNA-vlag 'AllowUnassigned' omschakelen\n"
-" --usestd3asciirules de IDNA-vlag 'UseSTD3ASCIIRules' omschakelen\n"
+" --allow-unassigned de IDNA-vlag 'AllowUnassigned' inschakelen\n"
+" --usestd3asciirules de IDNA-vlag 'UseSTD3ASCIIRules' inschakelen\n"
-#: src/idn.c:113
+#: src/idn.c:106
msgid ""
-" -t, --tld Check string for TLD specific rules\n"
+" --no-tld Don't check string for TLD specific rules\n"
" Only for --idna-to-ascii and --idna-to-unicode\n"
msgstr ""
-" -t, --tld tekst aan topleveldomein-specifieke regels
toetsen;\n"
-" alleen bij --idna-to-ascii en
--idna-to-unicode\n"
+" --no-tld tekst niet aan TLD-specifieke regels toetsen;\n"
+" alleen bij '--idna-to-ascii' en
'--idna-to-unicode'\n"
-#: src/idn.c:117
+#: src/idn.c:110
msgid " -n, --nfkc Normalize string according to Unicode v3.2
NFKC\n"
msgstr " -n, --nfkc tekenreeks normaliseren volgens
Unicode-NFKC ver3.2\n"
-#: src/idn.c:120
+#: src/idn.c:113
msgid ""
" -p, --profile=STRING Use specified stringprep profile instead\n"
" Valid stringprep profiles: `Nameprep',\n"
@@ -247,96 +237,108 @@ msgstr ""
" geldige profielnamen zijn: 'Nameprep',
'iSCSI',\n"
" 'Nodeprep', 'Resourceprep', 'trace',
'SASLprep'\n"
-#: src/idn.c:126
+#: src/idn.c:119
msgid ""
" --debug Print debugging information\n"
" --quiet Silent operation\n"
msgstr ""
-" --debug debuginformatie weergeven\n"
+" --debug debug-informatie weergeven\n"
" --quiet geen meldingen produceren\n"
-#: src/idn.c:176
+#: src/idn.c:175
#, c-format
-msgid "Only one of -s, -e, -d, -a, -u or -n can be specified."
-msgstr "Slechts één van de opties '-s', '-e', '-d', '-a', '-u' of '-n' is
mogelijk."
+msgid "only one of -s, -e, -d, -a, -u or -n can be specified"
+msgstr "slechts één van de opties '-s', '-e', '-d', '-a', '-u' of '-n' is
mogelijk"
-#: src/idn.c:184
+#: src/idn.c:185
#, c-format
msgid "Charset `%s'.\n"
msgstr "Tekenset '%s'.\n"
-#: src/idn.c:187
+#: src/idn.c:190
#, c-format
msgid "Type each input string on a line by itself, terminated by a newline
character.\n"
msgstr "Typ elke invoertekenreeks op een afzonderlijke regel, afgesloten met
Enter.\n"
-#: src/idn.c:202
+#: src/idn.c:205
#, c-format
-msgid "Input error"
-msgstr "Invoerfout"
+msgid "input error"
+msgstr "invoerfout"
-#: src/idn.c:212 src/idn.c:274 src/idn.c:357 src/idn.c:434 src/idn.c:515
+#: src/idn.c:215 src/idn.c:277 src/idn.c:360 src/idn.c:437 src/idn.c:518
#, c-format
-msgid "Could not convert from %s to UTF-8."
-msgstr "Conversie van %s naar UTF-8 is mislukt."
+msgid "could not convert from %s to UTF-8"
+msgstr "conversie van %s naar UTF-8 is mislukt"
-#: src/idn.c:220 src/idn.c:245 src/idn.c:281 src/idn.c:498 src/idn.c:527
-#: src/idn.c:551
+#: src/idn.c:223 src/idn.c:248 src/idn.c:284 src/idn.c:501 src/idn.c:530
+#: src/idn.c:554
#, c-format
-msgid "Could not convert from UTF-8 to UCS-4."
-msgstr "Conversie van UTF-8 naar UCS-4 is mislukt."
+msgid "could not convert from UTF-8 to UCS-4"
+msgstr "conversie van UTF-8 naar UCS-4 is mislukt"
-#: src/idn.c:237
+#: src/idn.c:240
#, c-format
msgid "stringprep_profile: %s"
msgstr "## stringprep_profile(): %s"
-#: src/idn.c:260 src/idn.c:302 src/idn.c:345 src/idn.c:503 src/idn.c:564
+#: src/idn.c:263 src/idn.c:305 src/idn.c:348 src/idn.c:506 src/idn.c:567
#, c-format
-msgid "Could not convert from UTF-8 to %s."
-msgstr "Conversie van UTF-8 naar %s is mislukt."
+msgid "could not convert from UTF-8 to %s"
+msgstr "conversie van UTF-8 naar %s is mislukt"
-#: src/idn.c:295
+#: src/idn.c:298
#, c-format
msgid "punycode_encode: %s"
msgstr "## punycode_encode(): %s"
-#: src/idn.c:323
+#: src/idn.c:320
+msgid "malloc"
+msgstr "onvoldoende geheugen beschikbaar"
+
+#: src/idn.c:326
#, c-format
msgid "punycode_decode: %s"
msgstr "## punycode_decode(): %s"
-#: src/idn.c:340 src/idn.c:364 src/idn.c:442
+#: src/idn.c:343 src/idn.c:367 src/idn.c:445
#, c-format
-msgid "Could not convert from UCS-4 to UTF-8."
-msgstr "Conversie van UCS-4 naar UTF-8 is mislukt."
+msgid "could not convert from UCS-4 to UTF-8"
+msgstr "conversie van UCS-4 naar UTF-8 is mislukt"
-#: src/idn.c:381
+#: src/idn.c:384
#, c-format
msgid "idna_to_ascii_4z: %s"
msgstr "## idna_to_ascii_4z(): %s"
-#: src/idn.c:395
+#: src/idn.c:398
#, c-format
msgid "idna_to_unicode_8z4z (TLD): %s"
msgstr "## idna_to_unicode_8z4z (TLD): %s"
-#: src/idn.c:409 src/idn.c:482
+#: src/idn.c:412 src/idn.c:485
#, c-format
msgid "tld_check_4z (position %lu): %s"
msgstr "## tld_check_4z (positie %lu): %s"
-#: src/idn.c:412 src/idn.c:488
+#: src/idn.c:415 src/idn.c:491
#, c-format
msgid "tld_check_4z: %s"
msgstr "## tld_check_4z(): %s"
-#: src/idn.c:461
+#: src/idn.c:464
#, c-format
msgid "idna_to_unicode_8z4z: %s"
msgstr "## idna_to_unicode_8z4z(): %s"
-#: src/idn.c:540
+#: src/idn.c:543
#, c-format
-msgid "Could not do NFKC normalization."
-msgstr "Kan NFKC-normalisering niet uitvoeren."
+msgid "could not do NFKC normalization"
+msgstr "kan NFKC-normalisering niet uitvoeren"
+
+#~ msgid ""
+#~ "\n"
+#~ "Report bugs to <%s>.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Rapporteer gebreken in het programma aan <%s>;\n"
+#~ "meld fouten in de vertaling aan <address@hidden>.\n"
diff --git a/po/pl.po.in b/po/pl.po.in
index d1a3ac7..c225c03 100644
--- a/po/pl.po.in
+++ b/po/pl.po.in
@@ -1,163 +1,150 @@
# Polish translation for libidn.
-# Copyright (C) 2004, 2007, 2008 Free Software Foundation, Inc.
+# Copyright (C) 2004, 2007, 2008, 2011 Free Software Foundation, Inc.
# This file is distributed under the same license as the libidn package.
-# Jakub Bogusz <address@hidden>, 2004-2008.
+# Jakub Bogusz <address@hidden>, 2004-2011.
#
msgid ""
msgstr ""
-"Project-Id-Version: libidn 1.9\n"
+"Project-Id-Version: libidn 1.21\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2008-07-01 18:15+0200\n"
-"PO-Revision-Date: 2008-07-02 22:10+0200\n"
+"POT-Creation-Date: 2011-04-24 17:12+0200\n"
+"PO-Revision-Date: 2011-04-28 20:02+0200\n"
"Last-Translator: Jakub Bogusz <address@hidden>\n"
"Language-Team: Polish <address@hidden>\n"
+"Language: pl\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-2\n"
"Content-Transfer-Encoding: 8bit\n"
-#: lib/strerror-idna.c:74 lib/strerror-pr29.c:58 lib/strerror-punycode.c:58
-#: lib/strerror-stringprep.c:78 lib/strerror-tld.c:60
+#: lib/strerror-idna.c:75 lib/strerror-pr29.c:59 lib/strerror-punycode.c:59
+#: lib/strerror-stringprep.c:79 lib/strerror-tld.c:61
msgid "Success"
msgstr "Sukces"
-#: lib/strerror-idna.c:78 lib/strerror-pr29.c:66
+#: lib/strerror-idna.c:79 lib/strerror-pr29.c:67
msgid "String preparation failed"
msgstr "Przygotowanie ³añcucha nie powiod³o siê"
-#: lib/strerror-idna.c:82
+#: lib/strerror-idna.c:83
msgid "Punycode failed"
msgstr "Punycode zawiod³o"
-#: lib/strerror-idna.c:86
+#: lib/strerror-idna.c:87
msgid "Non-digit/letter/hyphen in input"
msgstr "Znak nie bêd±cy cyfr±, liter± ani kresk± na wej¶ciu"
-#: lib/strerror-idna.c:90
+#: lib/strerror-idna.c:91
msgid "Forbidden leading or trailing minus sign (`-')"
msgstr "Zabroniony wiod±cy lub koñcz±cy znak minus (`-')"
-#: lib/strerror-idna.c:94
+#: lib/strerror-idna.c:95
msgid "Output would be too large or too small"
msgstr "Wyj¶cie mo¿e byæ zbyt du¿e lub zbyt ma³e"
-#: lib/strerror-idna.c:98
+#: lib/strerror-idna.c:99
msgid "Input does not start with ACE prefix (`xn--')"
msgstr "Wej¶cie nie zaczyna siê przedrostkiem ACE (`xn--')"
-#: lib/strerror-idna.c:102
+#: lib/strerror-idna.c:103
msgid "String not idempotent under ToASCII"
msgstr "£añcuch nie idempotentny wzglêdem ToASCII"
-#: lib/strerror-idna.c:106
+#: lib/strerror-idna.c:107
msgid "Input already contain ACE prefix (`xn--')"
msgstr "Wej¶cie ju¿ zawiera przedrostek ACE (`xn--')"
-#: lib/strerror-idna.c:110 lib/strerror-tld.c:76
+#: lib/strerror-idna.c:111 lib/strerror-tld.c:77
msgid "System iconv failed"
msgstr "Systemowa funkcja iconv nie powiod³a siê"
-#: lib/strerror-idna.c:114 lib/strerror-stringprep.c:122 lib/strerror-tld.c:72
+#: lib/strerror-idna.c:115 lib/strerror-stringprep.c:123 lib/strerror-tld.c:73
msgid "Cannot allocate memory"
msgstr "Nie mo¿na przydzieliæ pamiêci"
-#: lib/strerror-idna.c:118
+#: lib/strerror-idna.c:119
msgid "System dlopen failed"
msgstr "Systemowa funkcja dlopen nie powiod³a siê"
-#: lib/strerror-idna.c:122 lib/strerror-pr29.c:70 lib/strerror-punycode.c:74
-#: lib/strerror-stringprep.c:126 lib/strerror-tld.c:84
+#: lib/strerror-idna.c:123 lib/strerror-pr29.c:71 lib/strerror-punycode.c:75
+#: lib/strerror-stringprep.c:127 lib/strerror-tld.c:85
msgid "Unknown error"
msgstr "Nieznany b³±d"
-#: lib/strerror-pr29.c:62
+#: lib/strerror-pr29.c:63
msgid "String not idempotent under Unicode NFKC normalization"
msgstr "£añcuch nie idempotentny wzglêdem normalizacji Unikodu NFKC"
-#: lib/strerror-punycode.c:62
+#: lib/strerror-punycode.c:63
msgid "Invalid input"
msgstr "B³êdne wej¶cie"
-#: lib/strerror-punycode.c:66 lib/strerror-stringprep.c:102
+#: lib/strerror-punycode.c:67 lib/strerror-stringprep.c:103
msgid "Output would exceed the buffer space provided"
msgstr "Wyj¶cie przekroczy³oby dostarczone miejsce w buforze"
-#: lib/strerror-punycode.c:70
+#: lib/strerror-punycode.c:71
msgid "String size limit exceeded"
msgstr "Przekroczony limit rozmiaru ³añcucha"
-#: lib/strerror-stringprep.c:82
+#: lib/strerror-stringprep.c:83
msgid "Forbidden unassigned code points in input"
msgstr "Zabronione nieprzypisane znaki na wej¶ciu"
-#: lib/strerror-stringprep.c:86
+#: lib/strerror-stringprep.c:87
msgid "Prohibited code points in input"
msgstr "Zabronione znaki na wej¶ciu"
-#: lib/strerror-stringprep.c:90
+#: lib/strerror-stringprep.c:91
msgid "Conflicting bidirectional properties in input"
msgstr "Konfliktowe w³asno¶ci dwukierunkowego pisma na wej¶ciu"
-#: lib/strerror-stringprep.c:94
+#: lib/strerror-stringprep.c:95
msgid "Malformed bidirectional string"
msgstr "¬le sformu³owany ³añcuch dwukierunkowy"
-#: lib/strerror-stringprep.c:98
+#: lib/strerror-stringprep.c:99
msgid "Prohibited bidirectional code points in input"
msgstr "Zabronione znaki dwukierunkowe na wej¶ciu"
-#: lib/strerror-stringprep.c:106
+#: lib/strerror-stringprep.c:107
msgid "Error in stringprep profile definition"
msgstr "B³±d w definicji profilu stringprep"
-#: lib/strerror-stringprep.c:110
+#: lib/strerror-stringprep.c:111
msgid "Flag conflict with profile"
msgstr "Konflikt flag z profilem"
-#: lib/strerror-stringprep.c:114
+#: lib/strerror-stringprep.c:115
msgid "Unknown profile"
msgstr "Nieznany profil"
-#: lib/strerror-stringprep.c:118
+#: lib/strerror-stringprep.c:119
msgid "Unicode normalization failed (internal error)"
msgstr "Normalizacja Unikodu nie powiod³a siê (b³±d wewnêtrzny)"
-#: lib/strerror-tld.c:64
+#: lib/strerror-tld.c:65
msgid "Code points prohibited by top-level domain"
msgstr "Znaki zabronione przez domenê najwy¿szego poziomu"
-#: lib/strerror-tld.c:68
+#: lib/strerror-tld.c:69
msgid "Missing input"
msgstr "Brak wej¶cia"
-#: lib/strerror-tld.c:80
+#: lib/strerror-tld.c:81
msgid "No top-level domain found in input"
msgstr "Nie znaleziono domeny najwy¿szego poziomu na wej¶ciu"
-#. TRANSLATORS: The placeholder indicates the bug-reporting address
-#. for this package. Please add _another line_ saying
-#. "Report translation bugs to <...>\n" with the address for translation
-#. bugs (typically your translation team's web or email address).
#: src/idn.c:68
#, c-format
-msgid ""
-"\n"
-"Report bugs to <%s>.\n"
-msgstr ""
-"\n"
-"Prosimy zg³aszaæ b³êdy na adres <%s>.\n"
-"B³êdy w t³umaczeniu prosimy zg³aszaæ na adres <address@hidden>.\n"
-
-#: src/idn.c:75
-#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "Polecenie `%s --help' pozwoli uzyskaæ wiêcej informacji.\n"
-#: src/idn.c:79
+#: src/idn.c:72
#, c-format
msgid "Usage: %s [OPTION]... [STRINGS]...\n"
msgstr "Sk³adnia: %s [OPCJA]... [£AÑCUCHY]...\n"
-#: src/idn.c:82
+#: src/idn.c:75
msgid ""
"Internationalized Domain Name (IDN) convert STRINGS, or standard input.\n"
"\n"
@@ -166,7 +153,7 @@ msgstr ""
"dla umiêdzynarodowionych nazw domen (IDN - Internationalized Domain Name).\n"
"\n"
-#: src/idn.c:86
+#: src/idn.c:79
msgid ""
"Command line interface to the internationalized domain name library.\n"
"\n"
@@ -191,7 +178,7 @@ msgstr ""
"Argumenty obowi±zkowe dla d³ugich opcji s± równie¿ obowi±zkowe dla
odpowiednich\n"
"krótkich opcji.\n"
-#: src/idn.c:98
+#: src/idn.c:91
msgid ""
" -h, --help Print help and exit\n"
" -V, --version Print version and exit\n"
@@ -199,7 +186,7 @@ msgstr ""
" -h, --help Wypisanie opisu i zakoñczenie\n"
" -V, --version Wypisanie wersji i zakoñczenie\n"
-#: src/idn.c:102
+#: src/idn.c:95
msgid ""
" -s, --stringprep Prepare string according to nameprep profile\n"
" -d, --punycode-decode Decode Punycode\n"
@@ -213,28 +200,28 @@ msgstr ""
" -a, --idna-to-ascii Konwersja do ACE zgodnie z IDNA (tryb domy¶lny)\n"
" -u, --idna-to-unicode Konwersja z ACE zgodnie z IDNA\n"
-#: src/idn.c:109
+#: src/idn.c:102
msgid ""
-" --allow-unassigned Toggle IDNA AllowUnassigned flag\n"
-" --usestd3asciirules Toggle IDNA UseSTD3ASCIIRules flag\n"
+" --allow-unassigned Toggle IDNA AllowUnassigned flag (default off)\n"
+" --usestd3asciirules Toggle IDNA UseSTD3ASCIIRules flag (default off)\n"
msgstr ""
" --allow-unassigned W³±czenie flagi IDNA AllowUnassigned\n"
" --usestd3asciirules W³±czenie flagi IDNA UseSTD3ASCIIRules\n"
-#: src/idn.c:113
+#: src/idn.c:106
msgid ""
-" -t, --tld Check string for TLD specific rules\n"
+" --no-tld Don't check string for TLD specific rules\n"
" Only for --idna-to-ascii and --idna-to-unicode\n"
msgstr ""
-" -t, --tld Sprawdzenie ³añcucha pod k±tem regu³
specyficznych\n"
+" --no-tld Niesprawdzenie ³añcucha pod k±tem regu³
specyficznych\n"
" dla TLD;\n"
" tylko dla --idna-to-ascii and
--idna-to-unicode\n"
-#: src/idn.c:117
+#: src/idn.c:110
msgid " -n, --nfkc Normalize string according to Unicode v3.2
NFKC\n"
msgstr " -n, --nfkc Normalizacja ³añcucha zgodnie z Unicode
v3.2 NFKC\n"
-#: src/idn.c:120
+#: src/idn.c:113
msgid ""
" -p, --profile=STRING Use specified stringprep profile instead\n"
" Valid stringprep profiles: `Nameprep',\n"
@@ -246,7 +233,7 @@ msgstr ""
" `iSCSI', `Nodeprep', `Resourceprep',\n"
" `trace', `SASLprep'\n"
-#: src/idn.c:126
+#: src/idn.c:119
msgid ""
" --debug Print debugging information\n"
" --quiet Silent operation\n"
@@ -254,88 +241,92 @@ msgstr ""
" --debug Wypisywanie informacji diagnostycznych\n"
" --quiet Dzia³enie po cichu\n"
-#: src/idn.c:176
+#: src/idn.c:175
#, c-format
-msgid "Only one of -s, -e, -d, -a, -u or -n can be specified."
-msgstr "Mo¿na podaæ tylko jedno z -s, -e, -d, -a, -u lub -n."
+msgid "only one of -s, -e, -d, -a, -u or -n can be specified"
+msgstr "Mo¿na podaæ tylko jedno z -s, -e, -d, -a, -u lub -n"
-#: src/idn.c:184
+#: src/idn.c:185
#, c-format
msgid "Charset `%s'.\n"
msgstr "Zestaw znaków `%s'.\n"
-#: src/idn.c:187
+#: src/idn.c:190
#, c-format
msgid "Type each input string on a line by itself, terminated by a newline
character.\n"
msgstr "Nale¿y podaæ ka¿dy ³añcuch w osobnej linii, zakoñczony znakiem nowej
linii.\n"
-#: src/idn.c:202
+#: src/idn.c:205
#, c-format
-msgid "Input error"
-msgstr "B³±d wej¶cia"
+msgid "input error"
+msgstr "b³±d wej¶cia"
-#: src/idn.c:212 src/idn.c:274 src/idn.c:357 src/idn.c:434 src/idn.c:515
+#: src/idn.c:215 src/idn.c:277 src/idn.c:360 src/idn.c:437 src/idn.c:518
#, c-format
-msgid "Could not convert from %s to UTF-8."
-msgstr "Nie mo¿na przekonwertowaæ z %s na UTF-8."
+msgid "could not convert from %s to UTF-8"
+msgstr "nie mo¿na przekonwertowaæ z %s na UTF-8"
-#: src/idn.c:220 src/idn.c:245 src/idn.c:281 src/idn.c:498 src/idn.c:527
-#: src/idn.c:551
+#: src/idn.c:223 src/idn.c:248 src/idn.c:284 src/idn.c:501 src/idn.c:530
+#: src/idn.c:554
#, c-format
-msgid "Could not convert from UTF-8 to UCS-4."
-msgstr "Nie mo¿na przekonwertowaæ z UTF-8 na UCS-4."
+msgid "could not convert from UTF-8 to UCS-4"
+msgstr "nie mo¿na przekonwertowaæ z UTF-8 na UCS-4"
-#: src/idn.c:237
+#: src/idn.c:240
#, c-format
msgid "stringprep_profile: %s"
msgstr "stringprep_profile: %s"
-#: src/idn.c:260 src/idn.c:302 src/idn.c:345 src/idn.c:503 src/idn.c:564
+#: src/idn.c:263 src/idn.c:305 src/idn.c:348 src/idn.c:506 src/idn.c:567
#, c-format
-msgid "Could not convert from UTF-8 to %s."
-msgstr "Nie mo¿na przekonwertowaæ z UTF-8 na %s."
+msgid "could not convert from UTF-8 to %s"
+msgstr "nie mo¿na przekonwertowaæ z UTF-8 na %s"
-#: src/idn.c:295
+#: src/idn.c:298
#, c-format
msgid "punycode_encode: %s"
msgstr "punycode_encode: %s"
-#: src/idn.c:323
+#: src/idn.c:320
+msgid "malloc"
+msgstr "malloc"
+
+#: src/idn.c:326
#, c-format
msgid "punycode_decode: %s"
msgstr "punycode_decode: %s"
-#: src/idn.c:340 src/idn.c:364 src/idn.c:442
+#: src/idn.c:343 src/idn.c:367 src/idn.c:445
#, c-format
-msgid "Could not convert from UCS-4 to UTF-8."
-msgstr "Nie mo¿na przekonwertowaæ z UCS-4 na UTF-8."
+msgid "could not convert from UCS-4 to UTF-8"
+msgstr "nie mo¿na przekonwertowaæ z UCS-4 na UTF-8"
-#: src/idn.c:381
+#: src/idn.c:384
#, c-format
msgid "idna_to_ascii_4z: %s"
msgstr "idna_to_ascii_4z: %s"
-#: src/idn.c:395
+#: src/idn.c:398
#, c-format
msgid "idna_to_unicode_8z4z (TLD): %s"
msgstr "idna_to_unicode_8z4z (TLD): %s"
-#: src/idn.c:409 src/idn.c:482
+#: src/idn.c:412 src/idn.c:485
#, c-format
msgid "tld_check_4z (position %lu): %s"
msgstr "tld_check_4z (pozycja %lu): %s"
-#: src/idn.c:412 src/idn.c:488
+#: src/idn.c:415 src/idn.c:491
#, c-format
msgid "tld_check_4z: %s"
msgstr "tld_check_4z: %s"
-#: src/idn.c:461
+#: src/idn.c:464
#, c-format
msgid "idna_to_unicode_8z4z: %s"
msgstr "idna_to_unicode_8z4z: %s"
-#: src/idn.c:540
+#: src/idn.c:543
#, c-format
-msgid "Could not do NFKC normalization."
-msgstr "Normalizacja NFKC nie powiod³a siê."
+msgid "could not do NFKC normalization"
+msgstr "normalizacja NFKC nie powiod³a siê"
diff --git a/po/uk.po.in b/po/uk.po.in
new file mode 100644
index 0000000..f0203b3
--- /dev/null
+++ b/po/uk.po.in
@@ -0,0 +1,332 @@
+# Ukrainian translation of libidn.
+# Copyright (C) 2011 Free Software Foundation, Inc.
+# This file is distributed under the same license as the libidn package.
+#
+# Yuri Chornoivan <address@hidden>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: libidn 1.21\n"
+"Report-Msgid-Bugs-To: address@hidden"
+"POT-Creation-Date: 2011-04-24 17:12+0200\n"
+"PO-Revision-Date: 2011-04-30 13:44+0300\n"
+"Last-Translator: Yuri Chornoivan <address@hidden>\n"
+"Language-Team: Ukrainian <address@hidden>\n"
+"Language: uk\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Lokalize 1.2\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: lib/strerror-idna.c:75 lib/strerror-pr29.c:59 lib/strerror-punycode.c:59
+#: lib/strerror-stringprep.c:79 lib/strerror-tld.c:61
+msgid "Success"
+msgstr "Ðиконано"
+
+#: lib/strerror-idna.c:79 lib/strerror-pr29.c:67
+msgid "String preparation failed"
+msgstr "Ðомилка пÑд ÑÐ°Ñ ÑпÑоби пÑигоÑÑваннÑ
ÑÑдка"
+
+#: lib/strerror-idna.c:83
+msgid "Punycode failed"
+msgstr "Ðомилка punycode"
+
+#: lib/strerror-idna.c:87
+msgid "Non-digit/letter/hyphen in input"
+msgstr "Символ, вÑдмÑнний вÑд ÑиÑÑи, лÑÑеÑи
або деÑÑÑа Ñ Ð²Ñ
ÑдниÑ
даниÑ
"
+
+#: lib/strerror-idna.c:91
+msgid "Forbidden leading or trailing minus sign (`-')"
+msgstr "ÐекоÑекÑний поÑаÑковий або кÑнÑевий
деÑÑÑ («-»)"
+
+#: lib/strerror-idna.c:95
+msgid "Output would be too large or too small"
+msgstr "ÐÐ¸Ð²ÐµÐ´ÐµÐ½Ñ Ð´Ð°Ð½Ñ Ð±ÑдÑÑÑ Ð·Ð°Ð½Ð°Ð´Ñо
обâÑмними або занадÑо малими"
+
+#: lib/strerror-idna.c:99
+msgid "Input does not start with ACE prefix (`xn--')"
+msgstr "ÐÑ
ÑÐ´Ð½Ñ Ð´Ð°Ð½Ñ Ð½Ðµ поÑинаÑÑÑÑÑ Ð· пÑеÑÑкÑа
ACE («xn--»)"
+
+#: lib/strerror-idna.c:103
+msgid "String not idempotent under ToASCII"
+msgstr "Ð Ñдок не Ñ ÑдемпоÑенÑним Ñ ToASCII"
+
+#: lib/strerror-idna.c:107
+msgid "Input already contain ACE prefix (`xn--')"
+msgstr "ÐÑ
ÑÐ´Ð½Ñ Ð´Ð°Ð½Ñ Ð²Ð¶Ðµ мÑÑÑÑÑÑ Ð¿ÑеÑÑÐºÑ ACE
(«xn--»)"
+
+#: lib/strerror-idna.c:111 lib/strerror-tld.c:77
+msgid "System iconv failed"
+msgstr "Ðомилка ÑиÑÑемного iconv"
+
+#: lib/strerror-idna.c:115 lib/strerror-stringprep.c:123 lib/strerror-tld.c:73
+msgid "Cannot allocate memory"
+msgstr "Ðе вдалоÑÑ Ð²Ð¸Ð´ÑлиÑи памâÑÑÑ"
+
+#: lib/strerror-idna.c:119
+msgid "System dlopen failed"
+msgstr "Ðомилка ÑиÑÑемного dlopen"
+
+#: lib/strerror-idna.c:123 lib/strerror-pr29.c:71 lib/strerror-punycode.c:75
+#: lib/strerror-stringprep.c:127 lib/strerror-tld.c:85
+msgid "Unknown error"
+msgstr "ÐевÑдома помилка"
+
+#: lib/strerror-pr29.c:63
+msgid "String not idempotent under Unicode NFKC normalization"
+msgstr "Ð Ñдок не Ñ ÑдемпоÑенÑним пÑÑлÑ
NFKC-ноÑмалÑзаÑÑÑ Unicode"
+
+#: lib/strerror-punycode.c:63
+msgid "Invalid input"
+msgstr "ÐекоÑекÑÐ½Ñ Ð²Ñ
ÑÐ´Ð½Ñ Ð´Ð°Ð½Ñ"
+
+#: lib/strerror-punycode.c:67 lib/strerror-stringprep.c:103
+msgid "Output would exceed the buffer space provided"
+msgstr "ÐбâÑм виведениÑ
даниÑ
пеÑевиÑÑÑ
наданий обâÑм бÑÑеÑа"
+
+#: lib/strerror-punycode.c:71
+msgid "String size limit exceeded"
+msgstr "ÐеÑевиÑено Ð¾Ð±Ð¼ÐµÐ¶ÐµÐ½Ð½Ñ Ð½Ð° Ð´Ð¾Ð²Ð¶Ð¸Ð½Ñ ÑÑдка"
+
+#: lib/strerror-stringprep.c:83
+msgid "Forbidden unassigned code points in input"
+msgstr "ÐекоÑекÑÐ½Ñ Ð½ÐµÐ¿Ð¾Ð²âÑÐ·Ð°Ð½Ñ Ñимволи кодÑ
Ñ Ð²Ñ
ÑдниÑ
даниÑ
"
+
+#: lib/strerror-stringprep.c:87
+msgid "Prohibited code points in input"
+msgstr "ÐекоÑекÑÐ½Ñ Ñимволи ÐºÐ¾Ð´Ñ Ñ Ð²Ñ
ÑдниÑ
даниÑ
"
+
+#: lib/strerror-stringprep.c:91
+msgid "Conflicting bidirectional properties in input"
+msgstr "СÑпеÑеÑÐ»Ð¸Ð²Ñ Ð´Ð²Ð¾Ð½Ð°Ð¿ÑÑÐ¼Ð½Ñ Ð²Ð»Ð°ÑÑивоÑÑÑ
Ñ Ð²Ñ
ÑдниÑ
даниÑ
"
+
+#: lib/strerror-stringprep.c:95
+msgid "Malformed bidirectional string"
+msgstr "Ðомилка Ñ ÑоÑмаÑÑваннÑ
двонапÑавленого ÑÑдка"
+
+#: lib/strerror-stringprep.c:99
+msgid "Prohibited bidirectional code points in input"
+msgstr "ÐекоÑекÑÐ½Ñ Ð´Ð²Ð¾Ð½Ð°Ð¿ÑÑÐ¼Ð½Ñ Ñимволи ÐºÐ¾Ð´Ñ Ñ
вÑ
ÑдниÑ
даниÑ
"
+
+#: lib/strerror-stringprep.c:107
+msgid "Error in stringprep profile definition"
+msgstr "Ðомилка Ñ Ð²Ð¸Ð·Ð½Ð°ÑÐµÐ½Ñ Ð¿ÑоÑÑÐ»Ñ stringprep"
+
+#: lib/strerror-stringprep.c:111
+msgid "Flag conflict with profile"
+msgstr "ÐÑапоÑеÑÑ ÐºÐ¾Ð½ÑлÑкÑÑÑ Ð· пÑоÑÑлем"
+
+#: lib/strerror-stringprep.c:115
+msgid "Unknown profile"
+msgstr "ÐевÑдомий пÑоÑÑлÑ"
+
+#: lib/strerror-stringprep.c:119
+msgid "Unicode normalization failed (internal error)"
+msgstr "Ðомилка пÑд ÑÐ°Ñ ÑпÑоби ноÑмалÑзаÑÑÑ
Unicode (внÑÑÑÑÑÐ½Ñ Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ°)"
+
+#: lib/strerror-tld.c:65
+msgid "Code points prohibited by top-level domain"
+msgstr "Символи кодÑ, забоÑÐ¾Ð½ÐµÐ½Ñ Ð´Ð¾Ð¼ÐµÐ½Ð¾Ð¼
виÑого ÑÑвнÑ"
+
+#: lib/strerror-tld.c:69
+msgid "Missing input"
+msgstr "Ðе вказано вÑ
ÑдниÑ
даниÑ
"
+
+#: lib/strerror-tld.c:81
+msgid "No top-level domain found in input"
+msgstr "У вÑ
ÑдниÑ
даниÑ
не знайдено доменÑ
виÑого ÑÑвнÑ"
+
+#: src/idn.c:68
+#, c-format
+msgid "Try `%s --help' for more information.\n"
+msgstr "ÐиконайÑе ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ Â«%s --help», Ñоб
дÑзнаÑиÑÑ Ð±ÑлÑÑе.\n"
+
+#: src/idn.c:72
+#, c-format
+msgid "Usage: %s [OPTION]... [STRINGS]...\n"
+msgstr "ÐикоÑиÑÑаннÑ: %s [ÐÐÐ ÐÐÐТР]... [РЯÐÐÐ]...\n"
+
+#: src/idn.c:75
+msgid ""
+"Internationalized Domain Name (IDN) convert STRINGS, or standard input.\n"
+"\n"
+msgstr ""
+"ÐеÑеÑвоÑÐµÐ½Ð½Ñ Internationalized Domain Name (IDN) РЯÐÐÐÐ
або даниÑ
Ð·Ñ ÑÑандаÑÑного джеÑела вÑ
ÑдниÑ
даниÑ
.\n"
+"\n"
+
+#: src/idn.c:79
+msgid ""
+"Command line interface to the internationalized domain name library.\n"
+"\n"
+"All strings are expected to be encoded in the preferred charset used\n"
+"by your locale. Use `--debug' to find out what this charset is. You\n"
+"can override the charset used by setting environment variable CHARSET.\n"
+"\n"
+"To process a string that starts with `-', for example `-foo', use `--'\n"
+"to signal the end of parameters, as in `idn --quiet -a -- -foo'.\n"
+"\n"
+"Mandatory arguments to long options are mandatory for short options too.\n"
+msgstr ""
+"ÐнÑеÑÑÐµÐ¹Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð½Ð¾Ð³Ð¾ ÑÑдка до бÑблÑоÑеки
ÑнÑеÑнаÑÑоналÑзованиÑ
назв доменÑв.\n"
+"\n"
+"ÐÑогÑама вважаÑ, Ñо кодÑваннÑм вÑÑÑ
ÑÑдкÑв Ñ Ð¾Ñновне кодÑÐ²Ð°Ð½Ð½Ñ Ð²Ð°ÑоÑ\n"
+"локалÑ. СкоÑиÑÑайÑеÑÑ Ð¿Ð°ÑамеÑÑом «--debug»,
Ñоб пеÑеглÑнÑÑи Ð´Ð°Ð½Ñ Ñодо кодÑваннÑ.\n"
+"ÐмÑниÑи набÑÑ ÑимволÑв можна за допомогоÑ
змÑÐ½Ð½Ð¾Ñ ÑеÑедовиÑа CHARSET.\n"
+"\n"
+"ÐÐ»Ñ Ð¾Ð±Ñобки ÑÑдка, Ñо поÑинаÑÑÑÑÑ Ð· «-»,
напÑиклад, «-foo» додайÑе Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ Â«--»\n"
+"Ð´Ð»Ñ Ð¿Ð¾Ð·Ð½Ð°ÑÐµÐ½Ð½Ñ Ð·Ð°Ð²ÐµÑÑÐµÐ½Ð½Ñ Ð¿Ð°ÑамеÑÑÑв.
ÐÑиклад: «idn --quiet -a -- -foo».\n"
+"\n"
+"ÐбовâÑÐ·ÐºÐ¾Ð²Ñ Ð°ÑгÑменÑи Ð´Ð»Ñ Ð¿Ð°ÑамеÑÑÑв Ñ
ÑозгоÑнÑÑÐ¾Ð¼Ñ Ð·Ð°Ð¿Ð¸ÑÑв Ñ Ð¾Ð±Ð¾Ð²âÑзковими Ñ
длÑ\n"
+"ÑкоÑоÑениÑ
ÑоÑм запиÑÑ.\n"
+
+#: src/idn.c:91
+msgid ""
+" -h, --help Print help and exit\n"
+" -V, --version Print version and exit\n"
+msgstr ""
+" -h, --help вивеÑÑи довÑÐ´ÐºÐ¾Ð²Ñ Ð´Ð°Ð½Ñ Ñ
завеÑÑиÑи ÑобоÑÑ\n"
+" -V, --version вивеÑÑи Ð´Ð°Ð½Ñ Ñодо веÑÑÑÑ Ñ
завеÑÑиÑи ÑобоÑÑ\n"
+
+#: src/idn.c:95
+msgid ""
+" -s, --stringprep Prepare string according to nameprep profile\n"
+" -d, --punycode-decode Decode Punycode\n"
+" -e, --punycode-encode Encode Punycode\n"
+" -a, --idna-to-ascii Convert to ACE according to IDNA (default mode)\n"
+" -u, --idna-to-unicode Convert from ACE according to IDNA\n"
+msgstr ""
+" -s, --stringprep обÑобиÑи ÑÑдок вÑдповÑдно
до пÑоÑÑÐ»Ñ nameprep\n"
+" -d, --punycode-decode декодÑваÑи Punycode\n"
+" -e, --punycode-encode закодÑваÑи Ñ Punycode\n"
+" -a, --idna-to-ascii пеÑеÑвоÑиÑи на ACE
вÑдповÑдно до IDNA (Ñиповий Ñежим)\n"
+" -u, --idna-to-unicode пеÑеÑвоÑиÑи з ACE вÑдповÑдно
до IDNA\n"
+
+#: src/idn.c:102
+msgid ""
+" --allow-unassigned Toggle IDNA AllowUnassigned flag (default off)\n"
+" --usestd3asciirules Toggle IDNA UseSTD3ASCIIRules flag (default off)\n"
+msgstr ""
+" --allow-unassigned ÑвÑмкнÑÑи або вимкнÑÑи
пÑапоÑеÑÑ AllowUnassigned IDNA (Ñипово вимкнено)\n"
+" --usestd3asciirules ÑвÑмкнÑÑи або вимкнÑÑи
пÑапоÑеÑÑ UseSTD3ASCIIRules IDNA (Ñипово вимкнено)\n"
+
+#: src/idn.c:106
+msgid ""
+" --no-tld Don't check string for TLD specific rules\n"
+" Only for --idna-to-ascii and --idna-to-unicode\n"
+msgstr ""
+" --no-tld не пеÑевÑÑÑÑи ÑÑдок на
викоÑиÑÑÐ°Ð½Ð½Ñ ÑпеÑиÑÑÑниÑ
пÑавил TLD\n"
+" ÐиÑе Ð´Ð»Ñ Ð¿Ð°ÑамеÑÑÑв
--idna-to-ascii Ñ --idna-to-unicode\n"
+
+#: src/idn.c:110
+msgid " -n, --nfkc Normalize string according to Unicode v3.2
NFKC\n"
+msgstr " -n, --nfkc ноÑмалÑзÑваÑи ÑÑдок
вÑдповÑдно до NFKC Unicode веÑÑÑÑ 3.2\n"
+
+#: src/idn.c:113
+msgid ""
+" -p, --profile=STRING Use specified stringprep profile instead\n"
+" Valid stringprep profiles: `Nameprep',\n"
+" `iSCSI', `Nodeprep', `Resourceprep', \n"
+" `trace', `SASLprep'\n"
+msgstr ""
+" -p, --profile=РЯÐÐРвикоÑиÑÑовÑваÑи
вказаний пÑоÑÑÐ»Ñ stringprep profile instead\n"
+" ÐÐ¾Ð¶Ð»Ð¸Ð²Ñ Ð·Ð½Ð°ÑÐµÐ½Ð½Ñ Ð¿ÑоÑÑлÑв
stringprep: «Nameprep»,\n"
+" «iSCSI», «Nodeprep», «Resourceprep», \n"
+" «trace», «SASLprep»\n"
+
+#: src/idn.c:119
+msgid ""
+" --debug Print debugging information\n"
+" --quiet Silent operation\n"
+msgstr ""
+" --debug вивеÑÑи дÑагноÑÑиÑÐ½Ñ Ð´Ð°Ð½Ñ\n"
+" --quiet обÑобка без додаÑковиÑ
повÑдомленÑ\n"
+
+#: src/idn.c:175
+#, c-format
+msgid "only one of -s, -e, -d, -a, -u or -n can be specified"
+msgstr "можна викоÑиÑÑовÑваÑи лиÑе один з
паÑамеÑÑÑв -s, -e, -d, -a, -u або -n"
+
+#: src/idn.c:185
+#, c-format
+msgid "Charset `%s'.\n"
+msgstr "ÐабÑÑ ÑимволÑв «%s».\n"
+
+#: src/idn.c:190
+#, c-format
+msgid "Type each input string on a line by itself, terminated by a newline
character.\n"
+msgstr "ÐиводиÑи кожен ÑÑдок Ñ Ð¾ÐºÑÐµÐ¼Ð¾Ð¼Ñ ÑÑдкÑ,
ÑоздÑлÑÑи ÑÑдки Ñимволом нового ÑÑдка.\n"
+
+#: src/idn.c:205
+#, c-format
+msgid "input error"
+msgstr "помилка Ñ Ð²Ñ
ÑдниÑ
даниÑ
"
+
+#: src/idn.c:215 src/idn.c:277 src/idn.c:360 src/idn.c:437 src/idn.c:518
+#, c-format
+msgid "could not convert from %s to UTF-8"
+msgstr "не вдалоÑÑ Ð¿ÐµÑеÑвоÑиÑи Ð´Ð°Ð½Ñ Ð· ÑоÑмаÑÑ
%s на UTF-8"
+
+#: src/idn.c:223 src/idn.c:248 src/idn.c:284 src/idn.c:501 src/idn.c:530
+#: src/idn.c:554
+#, c-format
+msgid "could not convert from UTF-8 to UCS-4"
+msgstr "не вдалоÑÑ Ð¿ÐµÑеÑвоÑиÑи Ð´Ð°Ð½Ñ Ð· ÑоÑмаÑÑ
UTF-8 на UCS-4"
+
+#: src/idn.c:240
+#, c-format
+msgid "stringprep_profile: %s"
+msgstr "stringprep_profile: %s"
+
+#: src/idn.c:263 src/idn.c:305 src/idn.c:348 src/idn.c:506 src/idn.c:567
+#, c-format
+msgid "could not convert from UTF-8 to %s"
+msgstr "не вдалоÑÑ Ð¿ÐµÑеÑвоÑиÑи Ð´Ð°Ð½Ñ Ð· ÑоÑмаÑÑ
UTF-8 на %s"
+
+#: src/idn.c:298
+#, c-format
+msgid "punycode_encode: %s"
+msgstr "punycode_encode: %s"
+
+#: src/idn.c:320
+msgid "malloc"
+msgstr "malloc"
+
+#: src/idn.c:326
+#, c-format
+msgid "punycode_decode: %s"
+msgstr "punycode_decode: %s"
+
+#: src/idn.c:343 src/idn.c:367 src/idn.c:445
+#, c-format
+msgid "could not convert from UCS-4 to UTF-8"
+msgstr "не вдалоÑÑ Ð¿ÐµÑеÑвоÑиÑи Ð´Ð°Ð½Ñ Ð· ÑоÑмаÑÑ
UCS-4 на UTF-8"
+
+#: src/idn.c:384
+#, c-format
+msgid "idna_to_ascii_4z: %s"
+msgstr "idna_to_ascii_4z: %s"
+
+#: src/idn.c:398
+#, c-format
+msgid "idna_to_unicode_8z4z (TLD): %s"
+msgstr "idna_to_unicode_8z4z (TLD): %s"
+
+#: src/idn.c:412 src/idn.c:485
+#, c-format
+msgid "tld_check_4z (position %lu): %s"
+msgstr "tld_check_4z (позиÑÑÑ %lu): %s"
+
+#: src/idn.c:415 src/idn.c:491
+#, c-format
+msgid "tld_check_4z: %s"
+msgstr "tld_check_4z: %s"
+
+#: src/idn.c:464
+#, c-format
+msgid "idna_to_unicode_8z4z: %s"
+msgstr "idna_to_unicode_8z4z: %s"
+
+#: src/idn.c:543
+#, c-format
+msgid "could not do NFKC normalization"
+msgstr "не вдалоÑÑ Ð²Ð¸ÐºÐ¾Ð½Ð°Ñи NFKC-ноÑмалÑзаÑÑÑ"
diff --git a/po/zh_CN.po.in b/po/zh_CN.po.in
index f6d61d8..4c587b6 100644
--- a/po/zh_CN.po.in
+++ b/po/zh_CN.po.in
@@ -2,162 +2,150 @@
# Copyright (C) 2008 Free Software Foundation, Inc.
# This file is distributed under the same license as the libidn package.
# Meng Jie <address@hidden>, 2005.
-# Ji ZhengYu <address@hidden>, 2008.
+# Ji ZhengYu <address@hidden>, 2011
#
msgid ""
msgstr ""
-"Project-Id-Version: libidn 1.9\n"
+"Project-Id-Version: libidn 1.21\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2008-07-01 18:15+0200\n"
-"PO-Revision-Date: 2008-07-06 09:28ä¸å½æ åæ¶é´\n"
+"POT-Creation-Date: 2011-04-24 17:12+0200\n"
+"PO-Revision-Date: 2011-04-28 20:17+0800\n"
"Last-Translator: Ji ZhengYu <address@hidden>\n"
"Language-Team: Chinese (simplified) <address@hidden>\n"
+"Language: zh_CN\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: lib/strerror-idna.c:74 lib/strerror-pr29.c:58 lib/strerror-punycode.c:58
-#: lib/strerror-stringprep.c:78 lib/strerror-tld.c:60
+#: lib/strerror-idna.c:75 lib/strerror-pr29.c:59 lib/strerror-punycode.c:59
+#: lib/strerror-stringprep.c:79 lib/strerror-tld.c:61
msgid "Success"
msgstr "æå"
-#: lib/strerror-idna.c:78 lib/strerror-pr29.c:66
+#: lib/strerror-idna.c:79 lib/strerror-pr29.c:67
msgid "String preparation failed"
msgstr "é¢å¤å符串失败"
-#: lib/strerror-idna.c:82
+#: lib/strerror-idna.c:83
msgid "Punycode failed"
msgstr "Punycode 失败"
-#: lib/strerror-idna.c:86
+#: lib/strerror-idna.c:87
msgid "Non-digit/letter/hyphen in input"
msgstr "è¾å
¥ä¸åºç°éæ°å/åæ¯/è¿å符"
-#: lib/strerror-idna.c:90
+#: lib/strerror-idna.c:91
msgid "Forbidden leading or trailing minus sign (`-')"
msgstr "ä¸è½ä½¿ç¨â-âä½ä¸ºèµ·å§æç»æ¢ç¬¦"
-#: lib/strerror-idna.c:94
+#: lib/strerror-idna.c:95
msgid "Output would be too large or too small"
msgstr "è¾åºå¤ªå¤§æ太å°"
-#: lib/strerror-idna.c:98
+#: lib/strerror-idna.c:99
msgid "Input does not start with ACE prefix (`xn--')"
msgstr "è¾å
¥æªä»¥ ACE åç¼(âxn--â)å¼å¤´"
-#: lib/strerror-idna.c:102
+#: lib/strerror-idna.c:103
msgid "String not idempotent under ToASCII"
msgstr "ToASCII ä¸å符串ä¸æ¯å¹çç"
-#: lib/strerror-idna.c:106
+#: lib/strerror-idna.c:107
msgid "Input already contain ACE prefix (`xn--')"
msgstr "è¾å
¥å·²ç»å
å« ACEåç¼(âxn--â)"
-#: lib/strerror-idna.c:110 lib/strerror-tld.c:76
+#: lib/strerror-idna.c:111 lib/strerror-tld.c:77
msgid "System iconv failed"
msgstr "ç³»ç» iconv 失败"
-#: lib/strerror-idna.c:114 lib/strerror-stringprep.c:122 lib/strerror-tld.c:72
+#: lib/strerror-idna.c:115 lib/strerror-stringprep.c:123 lib/strerror-tld.c:73
msgid "Cannot allocate memory"
msgstr "æ æ³åé
å
å"
-#: lib/strerror-idna.c:118
+#: lib/strerror-idna.c:119
msgid "System dlopen failed"
msgstr "ç³»ç» dlopen 失败"
-#: lib/strerror-idna.c:122 lib/strerror-pr29.c:70 lib/strerror-punycode.c:74
-#: lib/strerror-stringprep.c:126 lib/strerror-tld.c:84
+#: lib/strerror-idna.c:123 lib/strerror-pr29.c:71 lib/strerror-punycode.c:75
+#: lib/strerror-stringprep.c:127 lib/strerror-tld.c:85
msgid "Unknown error"
msgstr "æªç¥é误"
-#: lib/strerror-pr29.c:62
+#: lib/strerror-pr29.c:63
msgid "String not idempotent under Unicode NFKC normalization"
msgstr "Unicode NFKC æ£è§åè¿ç¨ä¸å符串ä¸æ¯å¹çç"
-#: lib/strerror-punycode.c:62
+#: lib/strerror-punycode.c:63
msgid "Invalid input"
msgstr "æ æè¾å
¥"
-#: lib/strerror-punycode.c:66 lib/strerror-stringprep.c:102
+#: lib/strerror-punycode.c:67 lib/strerror-stringprep.c:103
msgid "Output would exceed the buffer space provided"
msgstr "è¾å
¥å°æº¢åºææä¾çç¼å²åº"
-#: lib/strerror-punycode.c:70
+#: lib/strerror-punycode.c:71
msgid "String size limit exceeded"
msgstr "å符串大å°è¶ç"
-#: lib/strerror-stringprep.c:82
+#: lib/strerror-stringprep.c:83
msgid "Forbidden unassigned code points in input"
msgstr "è¾å
¥ä¸ä¸è½åºç°æªèµå¼ç代ç ç¹"
-#: lib/strerror-stringprep.c:86
+#: lib/strerror-stringprep.c:87
msgid "Prohibited code points in input"
msgstr "è¾å
¥ä¸ä¸è½åºç°ä»£ç ç¹"
-#: lib/strerror-stringprep.c:90
+#: lib/strerror-stringprep.c:91
msgid "Conflicting bidirectional properties in input"
msgstr "è¾å
¥ä¸åºç°ç¸äºå²çªçååå±æ§"
-#: lib/strerror-stringprep.c:94
+#: lib/strerror-stringprep.c:95
msgid "Malformed bidirectional string"
msgstr "åååç¬¦ä¸²æ ¼å¼é误"
-#: lib/strerror-stringprep.c:98
+#: lib/strerror-stringprep.c:99
msgid "Prohibited bidirectional code points in input"
msgstr "è¾å
¥ä¸ä¸è½åºç°ååç代ç ç¹"
-#: lib/strerror-stringprep.c:106
+#: lib/strerror-stringprep.c:107
msgid "Error in stringprep profile definition"
msgstr "Stringpref é
ç½®æ件å®ä¹åºé"
-#: lib/strerror-stringprep.c:110
+#: lib/strerror-stringprep.c:111
msgid "Flag conflict with profile"
msgstr "æ è¯ä¸é
ç½®æ件å²çª"
-#: lib/strerror-stringprep.c:114
+#: lib/strerror-stringprep.c:115
msgid "Unknown profile"
msgstr "æªç¥çé
ç½®æ件"
-#: lib/strerror-stringprep.c:118
+#: lib/strerror-stringprep.c:119
msgid "Unicode normalization failed (internal error)"
msgstr "Unicode æ£è§å失败(å
é¨é误)"
-#: lib/strerror-tld.c:64
+#: lib/strerror-tld.c:65
msgid "Code points prohibited by top-level domain"
msgstr "顶级åä¸æ¥å代ç ç¹"
-#: lib/strerror-tld.c:68
+#: lib/strerror-tld.c:69
msgid "Missing input"
msgstr "è¾å
¥ç¼ºå¤±"
-#: lib/strerror-tld.c:80
+#: lib/strerror-tld.c:81
msgid "No top-level domain found in input"
msgstr "è¾å
¥ä¸æªåç°é¡¶çº§å"
-#. TRANSLATORS: The placeholder indicates the bug-reporting address
-#. for this package. Please add _another line_ saying
-#. "Report translation bugs to <...>\n" with the address for translation
-#. bugs (typically your translation team's web or email address).
#: src/idn.c:68
#, c-format
-msgid ""
-"\n"
-"Report bugs to <%s>.\n"
-msgstr ""
-"\n"
-"åéé误æ¥åè³ <%s>ãåéç¿»è¯éè¯¯è³ Chinese (simplified)
<address@hidden>\n"
-
-#: src/idn.c:75
-#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "å°è¯ç¨â%s --helpâè·åæ´å¤ä¿¡æ¯ã\n"
-#: src/idn.c:79
+#: src/idn.c:72
#, c-format
msgid "Usage: %s [OPTION]... [STRINGS]...\n"
msgstr "ç¨æ³: %s [é项]... [å符串]...\n"
-#: src/idn.c:82
+#: src/idn.c:75
msgid ""
"Internationalized Domain Name (IDN) convert STRINGS, or standard input.\n"
"\n"
@@ -165,7 +153,7 @@ msgstr ""
"å符串ææ¯æ åè¾å
¥çå½é
ååå(IDN)转åã\n"
"\n"
-#: src/idn.c:86
+#: src/idn.c:79
msgid ""
"Command line interface to the internationalized domain name library.\n"
"\n"
@@ -189,7 +177,7 @@ msgstr ""
"\n"
"é¿é项æå¿
éçåæ°å¯¹äºçé项æ¥è¯´ä¹æ¯å¿
éçã\n"
-#: src/idn.c:98
+#: src/idn.c:91
msgid ""
" -h, --help Print help and exit\n"
" -V, --version Print version and exit\n"
@@ -197,7 +185,7 @@ msgstr ""
" -h, --help æå°æ¤å¸®å©å¹¶éåº\n"
" -V, --version æå°ç¨åºçæ¬å¹¶éåº\n"
-#: src/idn.c:102
+#: src/idn.c:95
msgid ""
" -s, --stringprep Prepare string according to nameprep profile\n"
" -d, --punycode-decode Decode Punycode\n"
@@ -211,27 +199,27 @@ msgstr ""
" -a, --idna-to-ascii æ IDNA 转æ¢ä¸º ACE (é»è®¤æ¹å¼)\n"
" -u, --idna-to-unicode æ IDNA ä» ACE 转æ¢\n"
-#: src/idn.c:109
+#: src/idn.c:102
msgid ""
-" --allow-unassigned Toggle IDNA AllowUnassigned flag\n"
-" --usestd3asciirules Toggle IDNA UseSTD3ASCIIRules flag\n"
+" --allow-unassigned Toggle IDNA AllowUnassigned flag (default off)\n"
+" --usestd3asciirules Toggle IDNA UseSTD3ASCIIRules flag (default off)\n"
msgstr ""
-" --allow-unassigned åæ¢ IDNA AllowUnassigned æ è¯\n"
-" --usestd3asciirules åæ¢ IDNA UseSTD3ASCIIRules æ è¯\n"
+" --allow-unassigned åæ¢ IDNA AllowUnassigned æ è¯(é»è®¤å
³é)\n"
+" --usestd3asciirules åæ¢ IDNA UseSTD3ASCIIRules æ è¯(é»è®¤å
³é)\n"
-#: src/idn.c:113
+#: src/idn.c:106
msgid ""
-" -t, --tld Check string for TLD specific rules\n"
+" --no-tld Don't check string for TLD specific rules\n"
" Only for --idna-to-ascii and --idna-to-unicode\n"
msgstr ""
-" -t, --tld æ TLD æå®çè§åæ£æ¥å符串\n"
+" --no-tld ä¸æ TLD æå®çè§åæ£æ¥å符串\n"
" ä»
对 --idna-to-ascii å --idna-to-unicode
ææ\n"
-#: src/idn.c:117
+#: src/idn.c:110
msgid " -n, --nfkc Normalize string according to Unicode v3.2
NFKC\n"
msgstr " -n, --nfkc æ Unicode v3.2 NFKC æ£è§åå符串\n"
-#: src/idn.c:120
+#: src/idn.c:113
msgid ""
" -p, --profile=STRING Use specified stringprep profile instead\n"
" Valid stringprep profiles: `Nameprep',\n"
@@ -243,7 +231,7 @@ msgstr ""
" `iSCSI', `Nodeprep', `Resourceprep', \n"
" `trace', `SASLprep'\n"
-#: src/idn.c:126
+#: src/idn.c:119
msgid ""
" --debug Print debugging information\n"
" --quiet Silent operation\n"
@@ -251,100 +239,108 @@ msgstr ""
" --debug æå°è°è¯ä¿¡æ¯\n"
" --quiet å¤çæ¶ä¸æ¾ç¤ºä¿¡æ¯\n"
-#: src/idn.c:176
+#: src/idn.c:175
#, c-format
-msgid "Only one of -s, -e, -d, -a, -u or -n can be specified."
-msgstr "åªè½æå® -sï¼-eï¼-dï¼-aï¼-u æ -n ä¸çä¸ä¸ªã"
+msgid "only one of -s, -e, -d, -a, -u or -n can be specified"
+msgstr "åªè½æå® -s, -e, -d, -a, -u ææ¯ -n ä¸çä¸ä¸ª"
-#: src/idn.c:184
+#: src/idn.c:185
#, c-format
msgid "Charset `%s'.\n"
msgstr "å符éâ%sâã\n"
-#: src/idn.c:187
+#: src/idn.c:190
#, c-format
msgid "Type each input string on a line by itself, terminated by a newline
character.\n"
msgstr "è¾å
¥æ¶ï¼æ¯ä¸ªå符串åå ä¸è¡ã\n"
-#: src/idn.c:202
+#: src/idn.c:205
#, c-format
-msgid "Input error"
+msgid "input error"
msgstr "è¾å
¥é误"
-#: src/idn.c:212 src/idn.c:274 src/idn.c:357 src/idn.c:434 src/idn.c:515
+#: src/idn.c:215 src/idn.c:277 src/idn.c:360 src/idn.c:437 src/idn.c:518
#, c-format
-msgid "Could not convert from %s to UTF-8."
+msgid "could not convert from %s to UTF-8"
msgstr "æ æ³å° %s 转为 UTF-8"
-#: src/idn.c:220 src/idn.c:245 src/idn.c:281 src/idn.c:498 src/idn.c:527
-#: src/idn.c:551
+#: src/idn.c:223 src/idn.c:248 src/idn.c:284 src/idn.c:501 src/idn.c:530
+#: src/idn.c:554
#, c-format
-msgid "Could not convert from UTF-8 to UCS-4."
-msgstr "æ æ³å° UTF-8 转为 UCS-4ã"
+msgid "could not convert from UTF-8 to UCS-4"
+msgstr "æ æ³å° UTF-8 转为 UCS-4"
-#: src/idn.c:237
+#: src/idn.c:240
#, c-format
msgid "stringprep_profile: %s"
msgstr "stringprep_profileï¼%s"
-#: src/idn.c:260 src/idn.c:302 src/idn.c:345 src/idn.c:503 src/idn.c:564
+#: src/idn.c:263 src/idn.c:305 src/idn.c:348 src/idn.c:506 src/idn.c:567
#, c-format
-msgid "Could not convert from UTF-8 to %s."
-msgstr "æ æ³å° UTF-8 转为 %sã"
+msgid "could not convert from UTF-8 to %s"
+msgstr "æ æ³å° UTF-8 转为 %s"
-#: src/idn.c:295
+#: src/idn.c:298
#, c-format
msgid "punycode_encode: %s"
msgstr "punycode_encodeï¼%s"
-#: src/idn.c:323
+#: src/idn.c:320
+msgid "malloc"
+msgstr "malloc"
+
+#: src/idn.c:326
#, c-format
msgid "punycode_decode: %s"
msgstr "punycode_decode: %s"
-#: src/idn.c:340 src/idn.c:364 src/idn.c:442
+#: src/idn.c:343 src/idn.c:367 src/idn.c:445
#, c-format
-msgid "Could not convert from UCS-4 to UTF-8."
-msgstr "æ æ³å° UCS-4 转为 UTF-8ã"
+msgid "could not convert from UCS-4 to UTF-8"
+msgstr "æ æ³å° UCS-4 转为 UTF-8"
-#: src/idn.c:381
+#: src/idn.c:384
#, c-format
msgid "idna_to_ascii_4z: %s"
msgstr "idna_to_ascii_4zï¼%s"
-#: src/idn.c:395
+#: src/idn.c:398
#, c-format
msgid "idna_to_unicode_8z4z (TLD): %s"
msgstr "idna_to_unicode_8z4z (TLD)ï¼%s"
-#: src/idn.c:409 src/idn.c:482
+#: src/idn.c:412 src/idn.c:485
#, c-format
msgid "tld_check_4z (position %lu): %s"
msgstr "tld_check_4z (ä½ç½® %lu)ï¼%s"
-#: src/idn.c:412 src/idn.c:488
+#: src/idn.c:415 src/idn.c:491
#, c-format
msgid "tld_check_4z: %s"
msgstr "tld_check_4zï¼%s"
-#: src/idn.c:461
+#: src/idn.c:464
#, c-format
msgid "idna_to_unicode_8z4z: %s"
msgstr "idna_to_unicode_8z4zï¼%s"
-#: src/idn.c:540
-#, c-format
-msgid "Could not do NFKC normalization."
+#: src/idn.c:543
+#, fuzzy, c-format
+msgid "could not do NFKC normalization"
msgstr "ä¸è½è¿è¡ NFKC æ£è§åè¿ç¨ã"
+#~ msgid ""
+#~ "\n"
+#~ "Report bugs to <%s>.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "åéé误æ¥åè³ <%s>ãåéç¿»è¯éè¯¯è³ Chinese (simplified)
<address@hidden>\n"
+
#~ msgid "input[%lu] = U+%04x\n"
#~ msgstr "è¾å
¥[%lu] = U+%04x\n"
#~ msgid "output[%lu] = U+%04x\n"
#~ msgstr "è¾åº[%lu] = U+%04x\n"
-#~ msgid "malloc"
-#~ msgstr "malloc"
-
#~ msgid "tld[%lu] = U+%04x\n"
#~ msgstr "tld[%lu] = U+%04x\n"
hooks/post-receive
--
GNU libidn
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [SCM] GNU libidn branch, master, updated. libidn-1-22-4-gdf400d4,
Simon Josefsson <=