Browse Source

dpkg (1.10.27) unstable; urgency=low

  The "Grab your gun and bring in the cat" Release.

  * New Translations (Christian Perrier):
    - Indonesian (Arief S Fitrianto).
    - Norwegian Bokmal (Bjorn Steensrud).
  * Updated Translations (Christian Perrier):
    - Dutch (confusing option corrected by Christian Perrier).
    - Galician (Jacobo Tarrio).
    - Korean (Seo Sanghyeon).
    - Simplified Chinese (Carlos Liu).
    - Traditional Chinese (Asho Yeh).

 -- Scott James Remnant <scott@netsplit.com>  Thu, 10 Feb 2005 15:10:22 +0000
Scott James Remnant 19 years ago
parent
commit
6d4242045c
35 changed files with 11567 additions and 198 deletions
  1. 16 15
      ABOUT-NLS
  2. 42 1
      ChangeLog
  3. 1 1
      configure
  4. 2 2
      configure.in
  5. 16 0
      debian/changelog
  6. 1 0
      debian/dselect.substvars
  7. 1 1
      po/ChangeLog
  8. 1 1
      po/bs.po
  9. 1 1
      po/ca.po
  10. 1 1
      po/cs.po
  11. 1 1
      po/da.po
  12. 1 1
      po/de.po
  13. 1 1
      po/dpkg.pot
  14. 1 1
      po/el.po
  15. 1 1
      po/es.po
  16. 1 1
      po/eu.po
  17. 1 1
      po/fr.po
  18. 64 67
      po/gl.po
  19. 1 1
      po/he.po
  20. 5366 0
      po/id.po
  21. 1 1
      po/it.po
  22. 1 1
      po/ja.po
  23. 7 13
      po/ko.po
  24. 5961 0
      po/nb.po
  25. 2 2
      po/nl.po
  26. 1 1
      po/nn.po
  27. 1 1
      po/pl.po
  28. 1 1
      po/pt.po
  29. 1 1
      po/pt_BR.po
  30. 1 1
      po/ru.po
  31. 1 1
      po/sk.po
  32. 1 1
      po/sv.po
  33. 38 38
      po/zh_CN.po
  34. 29 37
      po/zh_TW.po
  35. 1 1
      version-nr

+ 16 - 15
ABOUT-NLS

@@ -3,8 +3,9 @@ Notes on the Free Translation Project
 
 Free software is going international!  The Free Translation Project is
 a way to get maintainers of free software, translators, and users all
-together, so that will gradually become able to speak many languages.
-A few packages already provide translations for their messages.
+together, so that free software will gradually become able to speak many
+languages.  A few packages already provide translations for their
+messages.
 
    If you found this `ABOUT-NLS' file inside a distribution, you may
 assume that the distributed package does use GNU `gettext' internally,
@@ -15,7 +16,7 @@ this package with messages translated.
    Installers will find here some useful hints.  These notes also
 explain how users should proceed for getting the programs to use the
 available translations.  They tell how people wanting to contribute and
-work at translations should contact the appropriate team.
+work on translations can contact the appropriate team.
 
    When reporting bugs in the `intl/' directory or bugs which may be
 related to internationalization, you should tell about the version of
@@ -55,27 +56,27 @@ internationalization, predating GNU `gettext'.
 
    By default, this package will be installed to allow translation of
 messages.  It will automatically detect whether the system already
-provides the GNU `gettext' functions.  If not, the GNU `gettext' own
-library will be used.  This library is wholly contained within this
-package, usually in the `intl/' subdirectory, so prior installation of
-the GNU `gettext' package is _not_ required.  Installers may use
-special options at configuration time for changing the default
-behaviour.  The commands:
+provides the GNU `gettext' functions.  If not, the included GNU
+`gettext' library will be used.  This library is wholly contained
+within this package, usually in the `intl/' subdirectory, so prior
+installation of the GNU `gettext' package is _not_ required.
+Installers may use special options at configuration time for changing
+the default behaviour.  The commands:
 
      ./configure --with-included-gettext
      ./configure --disable-nls
 
-will respectively bypass any pre-existing `gettext' to use the
+will, respectively, bypass any pre-existing `gettext' to use the
 internationalizing routines provided within this package, or else,
 _totally_ disable translation of messages.
 
    When you already have GNU `gettext' installed on your system and run
 configure without an option for your new package, `configure' will
 probably detect the previously built and installed `libintl.a' file and
-will decide to use this.  This might be not what is desirable.  You
-should use the more recent version of the GNU `gettext' library.  I.e.
-if the file `intl/VERSION' shows that the library which comes with this
-package is more recent, you should use
+will decide to use this.  This might not be desirable.  You should use
+the more recent version of the GNU `gettext' library.  I.e. if the file
+`intl/VERSION' shows that the library which comes with this package is
+more recent, you should use
 
      ./configure --with-included-gettext
 
@@ -86,7 +87,7 @@ and therefore it will not be used.  The reason is that even an
 emulation of `gettext' on top of `catgets' could not provide all the
 extensions of the GNU `gettext' library.
 
-   Internationalized packages have usually many `po/LL.po' files, where
+   Internationalized packages usually have many `po/LL.po' files, where
 LL gives an ISO 639 two-letter code identifying the language.  Unless
 translations have been forbidden at `configure' time by using the
 `--disable-nls' switch, all available translations are installed

+ 42 - 1
ChangeLog

@@ -1,7 +1,48 @@
-2005-01-11  gettextize  <bug-gnu-gettext@gnu.org>
+2005-02-10  gettextize  <bug-gnu-gettext@gnu.org>
 
 	* configure.in (AC_OUTPUT): Add po/Makefile.in.
 
+Thu Feb 10 15:20:27 GMT 2005 Scott James Remnant <scott@netsplit.com>
+
+  * version-nr, debian/changelog: Release 1.10.27.
+
+Thu Feb 10 15:08:44 GMT 2005 Scott James Remnant <scott@netsplit.com>
+
+  * configure.in (ALL_LINGUAS): Add forgetten 'id'.
+
+Wed Feb 09 06:30:20 CEST 2005 Christian Perrier <bubulle@debian.org>
+
+  * po/nl.po: Error corrected
+
+Sun Feb 06 19:55:54 CEST 2005 Carlos Liu <carlos_liu@yahoo.com>
+
+  * po/zh_CN.po: Fix errors
+
+Sat Feb 05 17:43:00 CEST 2005 Jacobo Tarrio <jtarrio@trasno.net>
+
+  * po/gl.po: Completed
+
+Sat Feb 05 17:33:00 CEST 2005 Asho Yeh <asho@ms44.url.com.tw>
+
+  * po/zh_TW.po: Updated
+
+Fri Jan 28 17:32:20 CEST 2005 Arief S Fitrianto <arief@gurame.fisika.ui.ac.id>
+
+  * po/id.po: First version
+
+Fri Jan 28 10:32:20 CEST 2005 Seo Sanghyeon <tinuviel@sparcs.kaist.ac.kr>
+
+  * po/ko.po: Completed
+
+Tue Jan 25 10:32:20 CEST 2005 Bjorn Steensrud <bjornst@powertech.no>
+
+  * po/nb.po: Added
+  * configure.in: Add nb to ALL_LINGUAS.
+
+Tue Jan 11 17:20:33 GMT 2005 Scott James Remnant <scott@netsplit.com>
+
+  * version-nr, debian/changelog: Bump version to 1.10.27~.
+	
 Tue Jan 11 16:33:07 GMT 2005 Scott James Remnant <scott@netsplit.com>
 
   * version-nr, debian/changelog: Release 1.10.26.

+ 1 - 1
configure

@@ -3446,7 +3446,7 @@ _ACEOF
 
 
 
-ALL_LINGUAS="bs ca cs da de el es eu fr gl he it ja ko nl nn pl pt pt_BR ru sk sv zh_CN zh_TW"
+ALL_LINGUAS="bs ca cs da de el es eu fr gl he id it ja ko nb nl nn pl pt pt_BR ru sk sv zh_CN zh_TW"
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
 # incompatible versions:

+ 2 - 2
configure.in

@@ -136,7 +136,7 @@ AC_DEFINE_UNQUOTED(ARCHITECTURE, "${dpkg_archset}", [Set this to the canonical D
 
 dnl gettext
 
-ALL_LINGUAS="bs ca cs da de el es eu fr gl he it ja ko nl nn pl pt pt_BR ru sk sv zh_CN zh_TW"
+ALL_LINGUAS="bs ca cs da de el es eu fr gl he id it ja ko nb nl nn pl pt pt_BR ru sk sv zh_CN zh_TW"
 AM_GNU_GETTEXT([external])
 AM_PO_SUBDIRS
 if test "x$HAVE_LOCALE_H" = "x"; then
@@ -487,7 +487,7 @@ void unsetenv(const char *x);
 
 ])
 
-AC_OUTPUT( po/Makefile.in
+AC_OUTPUT( po/Makefile.in 
 Makefile.conf
 Makefile
 include/Makefile

+ 16 - 0
debian/changelog

@@ -1,3 +1,19 @@
+dpkg (1.10.27) unstable; urgency=low
+
+  The "Grab your gun and bring in the cat" Release.
+
+  * New Translations (Christian Perrier):
+    - Indonesian (Arief S Fitrianto).
+    - Norwegian Bokmal (Bjorn Steensrud).
+  * Updated Translations (Christian Perrier):
+    - Dutch (confusing option corrected by Christian Perrier).
+    - Galician (Jacobo Tarrio).
+    - Korean (Seo Sanghyeon).
+    - Simplified Chinese (Carlos Liu).
+    - Traditional Chinese (Asho Yeh).
+
+ -- Scott James Remnant <scott@netsplit.com>  Thu, 10 Feb 2005 15:10:22 +0000
+
 dpkg (1.10.26) unstable; urgency=low
 
   The "Captain Tight-Pants" Release.

+ 1 - 0
debian/dselect.substvars

@@ -0,0 +1 @@
+shlibs:Depends=libc6 (>= 2.3.2.ds1-4), libgcc1 (>= 1:3.4.1-3), libncurses5 (>= 5.4-1), libstdc++5 (>= 1:3.3.4-1)

+ 1 - 1
po/ChangeLog

@@ -1,4 +1,4 @@
-2005-01-11  gettextize  <bug-gnu-gettext@gnu.org>
+2005-02-10  gettextize  <bug-gnu-gettext@gnu.org>
 
 	* Makefile.in.in: New file, from gettext-0.14.1.
 	* Rules-quot: New file, from gettext-0.14.1.

+ 1 - 1
po/bs.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-11 16:56+0000\n"
+"POT-Creation-Date: 2005-02-10 15:25+0000\n"
 "PO-Revision-Date: 2004-11-27 01:29+0100\n"
 "Last-Translator: Safir Šećerović <sapphire@linux.org.ba>\n"
 "Language-Team: Bosnian <lokal@linux.org.ba>\n"

+ 1 - 1
po/ca.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.10.25\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-11 16:56+0000\n"
+"POT-Creation-Date: 2005-02-10 15:25+0000\n"
 "PO-Revision-Date: 2005-01-09 19:53+0100\n"
 "Last-Translator: Jordi Mallach <jordi@debian.org>\n"
 "Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n"

+ 1 - 1
po/cs.po

@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-11 16:56+0000\n"
+"POT-Creation-Date: 2005-02-10 15:25+0000\n"
 "PO-Revision-Date: 2005-01-01 16:47+0100\n"
 "Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
 "Language-Team: Czech <provoz@debian.cz>\n"

+ 1 - 1
po/da.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg_1.10.19_da\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-11 16:56+0000\n"
+"POT-Creation-Date: 2005-02-10 15:25+0000\n"
 "PO-Revision-Date: 2005-01-01 22:10+0100\n"
 "Last-Translator: Claus Hindsgaul <claus_h@image.dk>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"

+ 1 - 1
po/de.po

@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Debian dpkg 1.10.26\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-11 16:56+0000\n"
+"POT-Creation-Date: 2005-02-10 15:25+0000\n"
 "PO-Revision-Date: 2005-01-03 11:24 +0100\n"
 "Last-Translator: Michael Piefel <piefel@debian.org>\n"
 "Language-Team: German <de@debian-l10n-german@lists.debian.org>\n"

+ 1 - 1
po/dpkg.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-11 16:56+0000\n"
+"POT-Creation-Date: 2005-02-10 15:25+0000\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"

+ 1 - 1
po/el.po

@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: el\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-11 16:56+0000\n"
+"POT-Creation-Date: 2005-02-10 15:25+0000\n"
 "PO-Revision-Date: 2004-10-13 17:54+0300\n"
 "Last-Translator: George Papamichelakis <debian-l10n-greek@lists.debian.org>\n"
 "Language-Team: Hellenic <debian-l10n-greek@lists.debian.org>\n"

+ 1 - 1
po/es.po

@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Debian dpkg 1.10.18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-11 16:56+0000\n"
+"POT-Creation-Date: 2005-02-10 15:25+0000\n"
 "PO-Revision-Date: 2004-12-31 12:07+0100\n"
 "Last-Translator: Javier Fernández-Sanguino <jfs@debian.org>\n"
 "Language-Team: Spanish <debian-l10n-spanish@lists.debian.org>\n"

+ 1 - 1
po/eu.po

@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg-eu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-11 16:56+0000\n"
+"POT-Creation-Date: 2005-02-10 15:25+0000\n"
 "PO-Revision-Date: 2005-01-09 20:49+0100\n"
 "Last-Translator: Piarres Beobide  <pi@beobide.net>\n"
 "Language-Team: Librezale.org <librezale@librezale.org>\n"

+ 1 - 1
po/fr.po

@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Debian dpkg 1.6.13\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-11 16:56+0000\n"
+"POT-Creation-Date: 2005-02-10 15:25+0000\n"
 "PO-Revision-Date: 2004-12-31 07:30+0100\n"
 "Last-Translator: Christian Perrier <bubulle@debian.org>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"

+ 64 - 67
po/gl.po

@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.9.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-11 16:56+0000\n"
-"PO-Revision-Date: 2004-11-13 20:45+0200\n"
+"POT-Creation-Date: 2005-02-10 15:25+0000\n"
+"PO-Revision-Date: 2005-02-05 13:10+0100\n"
 "Last-Translator: Héctor Fernández López <trorrr@yahoo.es>\n"
 "Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
 "MIME-Version: 1.0\n"
@@ -4385,24 +4385,21 @@ msgid "Help: "
 msgstr "Axuda: "
 
 #: dselect/basecmds.cc:177
-#, fuzzy
 msgid "Press ? for help menu, . for next topic, <space> to exit help."
 msgstr ""
-"Preme ? para o menú de axuda, <espacio> para o seguinte tema ou <enter>\n"
-"para saír"
+"Prema ? para o menú de axuda, . para o seguinte tema ou <espacio> para saír."
 
 #: dselect/basecmds.cc:184
 msgid "Help information is available under the following topics:"
 msgstr "A información de axuda está dispoñible baixo os seguintes temas:"
 
 #: dselect/basecmds.cc:192
-#, fuzzy
 msgid ""
 "Press a key from the list above, <space> or `q' to exit help,\n"
 "  or `.' (full stop) to read each help page in turn. "
 msgstr ""
-"Presione unha tecla da lista anterior, <entrar>, q ou Q para saír da\n"
-"axuda ou <espacio> para ler cada páxinas unha por unha. "
+"Prema unha tecla da lista anterior, <espacio> ou 'q' para saír da\n"
+"axuda ou '.' (punto) para ler as páxinas unha a unha. "
 
 #: dselect/basecmds.cc:198
 msgid "error reading keyboard in help"
@@ -5673,7 +5670,6 @@ msgid "Introduction to package selections"
 msgstr "Introducción á selección de paquetes"
 
 #: dselect/helpmsgs.cc:33
-#, fuzzy
 msgid ""
 "Welcome to dselect's main package listing.\n"
 "\n"
@@ -5703,37 +5699,36 @@ msgid ""
 "\n"
 "Press <space> to leave help and enter the list now.\n"
 msgstr ""
-"Benvido ó listado principal de paquetes.\n"
+"Benvido ao listado principal de paquetes de dselect.\n"
 "\n"
-"Presentaráselle unha lista de paquetes que están instaldos ou dispoñibles\n"
-"para a instalación. Pode navegar ó longo da lista usando as teclas do "
-"cursor,\n"
+"Háselle presentar unha lista de paquetes que están instalados ou "
+"dispoñibles\n"
+"para a instalación. Pode navegar pola lista usando as teclas do cursor,\n"
 "marcar paquetes para a instalación (usando `+') ou desinstalación (usando "
 "`-').\n"
-"Os paquetes podense marcar indivualmente ou en grupos; inicialmente\n"
+"Os paquetes pódense marcar individualmente ou en grupos; inicialmente\n"
 "verá que a liña `Tódolos paquetes' está seleccionada. `+', `-' e demáis\n"
-"afectarán a tólolos paquetes descritos pola liña resaltada.\n"
+"afectarán a tódolos paquetes descritos pola liña resaltada.\n"
 "\n"
-"Algunas das súas eleccións causarán conflictos ou problemas de dependencia;\n"
-"daráselle unha sub-lista dos paquetes relevantes para que poida solucionar\n"
-"os problemas.\n"
+"Algunhas das súas eleccións han causar conflictos ou problemas de\n"
+"dependencias; háselle dar unha sub-lista cos paquetes relevantes para que\n"
+"poida solucionar os problemas.\n"
 "\n"
-"Deberías le-la lista de teclas e as explicacións na pantalla.\n"
-"Hai dispoñible moita información en liña, úsaa - pulsa `?' en calquer\n"
-"momento se precisas axuda.\n"
+"Debería le-la lista de teclas e as explicacións na pantalla. Hai dispoñible\n"
+"moita información en liña, empréguea -- - prema `?' en calquer momento se\n"
+"precisa de axuda.\n"
 "\n"
-"Cando remates de elixi-los paquetes pulsa Intro para confirma-los cambios,\n"
-"ou `Q' para saír sen garda-los cambios. Farase unha comprobación\n"
-"final de conflictos e dependencias - aquí tamén pode ver unha sub-lista.\n"
+"Cando remate de elixi-los paquetes prema Intro para confirmar os cambios,\n"
+"ou `X' para saír sen gardar os cambios. Hase facer unha comprobación\n"
+"final de conflictos e dependencias -- aquí tamén pode ver unha sub-lista.\n"
 "\n"
-"Pulse <enter> para deixar a axuda e entrar no listado.\n"
+"Prema <espacio> para deixar a axuda e entrar no listado.\n"
 
 #: dselect/helpmsgs.cc:57
 msgid "Introduction to read-only package list browser"
 msgstr "Introducción ó navegador de paquetes de só lectura"
 
 #: dselect/helpmsgs.cc:57
-#, fuzzy
 msgid ""
 "Welcome to dselect's main package listing.\n"
 "\n"
@@ -5753,27 +5748,29 @@ msgid ""
 "\n"
 "Press <space> to leave help and enter the list now.\n"
 msgstr ""
-"Benvido ó listado principal de paquetes de dselect.\n"
-"Vaiseche presentar unha lista cos paquetes que están instalados ou\n"
-"dispoñibles para instalar.  Xa que non te-los privilexios necesarios\n"
-"para actualiza-lo estado dos paquetes estás en modo de só lectura.\n"
-"Podes navigar pola lista usando os cursores (bota un vistazo á pantalla\n"
-"de axuda `Keystrokes'), ve-lo estado dos paquetes e ler información deles\n"
+"Benvido ao listado principal de paquetes de dselect.\n"
 "\n"
-"Debería ler a lista das teclas e as explicacións sobre a visualización.\n"
-"Hai moita axuda en liña dispoñible, ¡por favor úsea! Pulse `?' para a "
+"Háselle presentar unha lista de paquetes que están instalados ou "
+"dispoñibles\n"
+"para instalar. Xa que non ten os privilexios necesarios para actualizar os\n"
+"estados dos paquetes, está nun modo de só lectura. Pode navigar pola lista\n"
+"empregando as teclas do cursor (mire a páxina de axuda 'Teclas'), observar\n"
+"o estado dos paquetes e ler información sobre eles.\n"
+"\n"
+"Debería ler a lista de teclas e as explicacións da pantalla. Hai moita "
+"axuda\n"
+"en liña dispoñible, empréguea -- prema '?' en calquera momento para a "
 "axuda.\n"
 "\n"
-"Cando remate de navegar pulse `Q' ou Intro para sair.\n"
+"Cando remate de navegar, prema 'Q' ou <intro> para saír.\n"
 "\n"
-"Pulse <enter> para abandoar a axuda e entrar na lista.\n"
+"Prema <espacio> para saír da axuda e entrar agora na lista.\n"
 
 #: dselect/helpmsgs.cc:75
 msgid "Introduction to conflict/dependency resolution sub-list"
 msgstr "Introducción á lista de resolución de conflicto/dependencia"
 
 #: dselect/helpmsgs.cc:75
-#, fuzzy
 msgid ""
 "Dependency/conflict resolution - introduction.\n"
 "\n"
@@ -5807,36 +5804,36 @@ msgid ""
 "Press <space> to leave help and enter the sub-list; remember: press `?' for "
 "help.\n"
 msgstr ""
-"Resolución de dependencia/conflicto - Introducción.\n"
-"\n"
-"Unha ou máis das súas seleccións provocaron un problema de conflicto ou de\n"
-"dependencia, algúns paquetes só se deberían instalar en conxunción con "
-"outros\n"
-"determinados, e algunhas combinacións de paquetes non se poden instalar "
-"xuntas.\n"
-"\n"
-"Verá unha sub-lista que contén os paquetes involucrados. A metade inferior\n"
-"da pantalla amosa conflictos e dependencias relevantes; use `i' para "
-"circular\n"
-"entre eso, as descripcións dos paquetes e a información de control interna.\n"
-"\n"
-"Calculouse un conxunto de paquetes `suxeridos', e as marcas iniciais nesta\n"
-"sub-lista establecéronse de acordo con ela, polo que pode simplemente "
-"pulsar\n"
-"Intro para aceptar as suxerencias se o desexa. Pode abortar o/os cambio(s)\n"
-"que causaron o/os problema(s), e volver á lista principal, pulsando a `X'\n"
-"maiúscula.\n"
-"\n"
-"Tamén pode moverse pola lista e cambiar as marcas para deixalas como desexe\n"
-"e pode `rexeitar' as suxerencias usando as maiúsculas `D' ou `R' (vexa a\n"
-"pantalla de axuda das asociacións de teclado). Pode usar a `Q' maiúscula "
-"para\n"
-"forzar a que se acepte a situación amosada actualmente en caso de que\n"
-"queira pasar por alto unha recomendación ou pense que o programa está\n"
-"trabucado.\n"
-"\n"
-"Pulse Intro para deixar a axuda e entrar na sub-lista; lembre: puse `?'\n"
-"para a axuda.\n"
+"Resolución de dependencias e conflictos - introducción.\n"
+"\n"
+"Unha ou máis de entre as súas escollas produciu un conflicto ou problema de\n"
+"dependencias -- algúns paquetes só se deberían instalar en conxunto con "
+"outros,\n"
+"e algunhas combinacións de paquetes non se poden instalar xuntas.\n"
+"\n"
+"Ha ver unha sub-lista cos paquetes involucrados. A metade inferior da "
+"pantalla\n"
+"amosa os conflictos e dependencias relevantes; empregue 'i' para pasar "
+"entre\n"
+"iso, as descricións dos paquetes e a información interna de control.\n"
+"\n"
+"Calculouse un conxunto de paquetes 'suxeridos', e estabrecéronse as marcas\n"
+"iniciais desta lista para encaixar con eles, así que pode pasar premendo só\n"
+"Intro para acepta-las suxestións se quere. Pode anular os cambios que "
+"causaron\n"
+"os problemas e voltar á lista principal premendo 'X' maiúsculo.\n"
+"\n"
+"Tamén se pode desprazar pola lista e cambiar as marcas para que se "
+"asemellen\n"
+"máis ao que desexa vostede, e pode rexeitar as suxestións empregando as "
+"teclas\n"
+"'D' ou 'R' maiúsculos (vexa a pantalla de axuda de teclas). Pode empregar o\n"
+"'Q' maiúsculo para forzar unha aceptación da situación que se amosa, se "
+"quere\n"
+"ignorar unha recomendación ou pensa que o programa está equivocado.\n"
+"\n"
+"Prema <espacio> para saír da axuda e entrar na sub-lista; lembre: prema '?'\n"
+"para obter axuda.\n"
 
 #: dselect/helpmsgs.cc:100
 msgid "Display, part 1: package listing and status chars"

+ 1 - 1
po/he.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-11 16:56+0000\n"
+"POT-Creation-Date: 2005-02-10 15:25+0000\n"
 "PO-Revision-Date: 2004-10-07 03:01+0200\n"
 "Last-Translator: Lior Kaplan <webmaster@guides.co.il>\n"
 "Language-Team: English <en@li.org>\n"

File diff suppressed because it is too large
+ 5366 - 0
po/id.po


+ 1 - 1
po/it.po

@@ -41,7 +41,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.10.22\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-11 16:56+0000\n"
+"POT-Creation-Date: 2005-02-10 15:25+0000\n"
 "PO-Revision-Date: 2005-01-06 17:59+0100\n"
 "Last-Translator: Stefano Canepa <sc@linux.it>\n"
 "Language-Team: italian <debian-l10n-italian@debian.org>\n"

+ 1 - 1
po/ja.po

@@ -19,7 +19,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 1.10.23\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-11 16:56+0000\n"
+"POT-Creation-Date: 2005-02-10 15:25+0000\n"
 "PO-Revision-Date: 2004-12-31 16:22+0900\n"
 "Last-Translator: Kenshi Muto <kmuto@debian.org>\n"
 "Language-Team: Debian Japanease List <debian-japanese@lists.debian.org>\n"

+ 7 - 13
po/ko.po

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 1.10.22\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-11 16:56+0000\n"
+"POT-Creation-Date: 2005-02-10 15:25+0000\n"
 "PO-Revision-Date: 2004-11-21 03:52+0900\n"
 "Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
 "Language-Team: Korean <cwryu@debian.org>\n"
@@ -4304,24 +4304,21 @@ msgid "Help: "
 msgstr "도움말: "
 
 #: dselect/basecmds.cc:177
-#, fuzzy
 msgid "Press ? for help menu, . for next topic, <space> to exit help."
 msgstr ""
-"도움말 메뉴는 ?, 다음 주제는 <스페이스>, 도움말을 나가려면 <enter>를 누르십시"
-"오."
+"도움말 메뉴는 ?, 다음 주제는 ., 도움말을 나가려면 <space>를 누르십시오."
 
 #: dselect/basecmds.cc:184
 msgid "Help information is available under the following topics:"
 msgstr "다음 주제에 대한 도움말 정보가 있습니다:"
 
 #: dselect/basecmds.cc:192
-#, fuzzy
 msgid ""
 "Press a key from the list above, <space> or `q' to exit help,\n"
 "  or `.' (full stop) to read each help page in turn. "
 msgstr ""
-"위의 목록에 따라 키를 누르십시오. 도움말을 나가려면 <enter>, `q', 혹은 `Q',\n"
-"  각 도움말 페이지를 순서대로 읽으려면 <스페이스> 키를 누르십시오."
+"위의 목록에 따라 키를 누르십시오. 도움말을 나가려면 <space>나 q를,\n"
+"  각 도움말 페이지를 순서대로 읽으려면 . 키를 누르십시오."
 
 #: dselect/basecmds.cc:198
 msgid "error reading keyboard in help"
@@ -5586,7 +5583,6 @@ msgid "Introduction to package selections"
 msgstr "꾸러미 선택에 관한 안내"
 
 #: dselect/helpmsgs.cc:33
-#, fuzzy
 msgid ""
 "Welcome to dselect's main package listing.\n"
 "\n"
@@ -5637,14 +5633,13 @@ msgstr ""
 "관해 마지막 검사를 하게 되고, 거기에서도 그 충돌이나 의존성에 관련된\n"
 "꾸러미 목록이 나타납니다.\n"
 "\n"
-"<enter>를 누르시면 도움말을 나가서 꾸러미 목록으로 들어갑니다.\n"
+"<space>를 누르시면 도움말을 나가서 꾸러미 목록으로 들어갑니다.\n"
 
 #: dselect/helpmsgs.cc:57
 msgid "Introduction to read-only package list browser"
 msgstr "꾸러미 목록 읽기 전용 브라우저 소개"
 
 #: dselect/helpmsgs.cc:57
-#, fuzzy
 msgid ""
 "Welcome to dselect's main package listing.\n"
 "\n"
@@ -5677,14 +5672,13 @@ msgstr ""
 "\n"
 "꾸러미 찾아보기를 마치고, 'Q'를 누르거나 <enter>를 누르면 끝납니다.\n"
 "\n"
-"도움말을 종료하고 목록으로 들아가려면 Space키를 누르십시오.\n"
+"도움말을 종료하고 목록으로 들아가려면 <space>를 누르십시오.\n"
 
 #: dselect/helpmsgs.cc:75
 msgid "Introduction to conflict/dependency resolution sub-list"
 msgstr "충돌/의존성 해결 하위 목록 소개"
 
 #: dselect/helpmsgs.cc:75
-#, fuzzy
 msgid ""
 "Dependency/conflict resolution - introduction.\n"
 "\n"
@@ -5744,7 +5738,7 @@ msgstr ""
 "됩니다.  추천한 사항이나 프로그램의 실수라고 생각되는 부분까지도 무시하려면\n"
 "`Q'를 사용하십시오.\n"
 "\n"
-"도움말에서 빠져나가서 하위 목록으로 들어가려면 <enter>를 누르십시오.\n"
+"도움말에서 빠져나가서 하위 목록으로 들어가려면 <space>를 누르십시오.\n"
 "기억하세요.  도움이 필요하면 `?'키를 누르십시오.\n"
 
 #: dselect/helpmsgs.cc:100

File diff suppressed because it is too large
+ 5961 - 0
po/nb.po


+ 2 - 2
po/nl.po

@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.9.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-11 16:56+0000\n"
+"POT-Creation-Date: 2005-02-10 15:25+0000\n"
 "PO-Revision-Date: 2005-01-06 23:41+0100\n"
 "Last-Translator: Bart Cornelis <cobaco@linux.be>\n"
 "Language-Team: Dutch <debian-l10n-dutch@debian.org>\n"
@@ -1520,7 +1520,7 @@ msgid ""
 "      Z     : background this process to examine the situation\n"
 msgstr ""
 "   Wat wilt u er aan doen ?  De volgende keuzes zijn mogelijk:\n"
-"    Y of N  : installeer de versie van de pakketbeheerder\n"
+"    Y of I  : installeer de versie van de pakketbeheerder\n"
 "    N of O  : behoudt de huidig geïnstalleerde versie\n"
 "      D     : toon de verschillen tussen de versies\n"
 "      Z     : stuur dit proces naar de achtergrond om de situatie te "

+ 1 - 1
po/nn.po

@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg_nn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-11 16:56+0000\n"
+"POT-Creation-Date: 2005-02-10 15:25+0000\n"
 "PO-Revision-Date: 2005-01-08 16:16+0100\n"
 "Last-Translator: Håvard Korsvoll <korsvoll@skulelinux.no>\n"
 "Language-Team: Norwegian (Nynorsk) <i18n-nn@lister.ping.uio.no>\n"

+ 1 - 1
po/pl.po

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.9.20\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-11 16:56+0000\n"
+"POT-Creation-Date: 2005-02-10 15:25+0000\n"
 "PO-Revision-Date: 2005-01-05 19:50+0100\n"
 "Last-Translator: Bartosz Fenski <fenio@debian.org>\n"
 "Language-Team: Polish <pddp@debian.linux.org.pl>\n"

+ 1 - 1
po/pt.po

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.14\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-11 16:56+0000\n"
+"POT-Creation-Date: 2005-02-10 15:25+0000\n"
 "PO-Revision-Date: 2005-01-09 09:20+0000\n"
 "Last-Translator: Miguel Figueiredo <elmig@debianpt.org>\n"
 "Language-Team: Portuguese <traduz@debianpt.org>\n"

+ 1 - 1
po/pt_BR.po

@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-11 16:56+0000\n"
+"POT-Creation-Date: 2005-02-10 15:25+0000\n"
 "PO-Revision-Date: 2005-01-06 16:42-0200\n"
 "Last-Translator: André Luís Lopes <andrelop@debian.org>\n"
 "Language-Team: Debian-BR Project <debian-l10n-portuguese@lists.debian.org>\n"

+ 1 - 1
po/ru.po

@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ru\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-11 16:56+0000\n"
+"POT-Creation-Date: 2005-02-10 15:25+0000\n"
 "PO-Revision-Date: 2005-01-01 11:38+0400\n"
 "Last-Translator: Yuri Kozlov <yuray@id.ru>\n"
 "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"

+ 1 - 1
po/sk.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.10\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-11 16:56+0000\n"
+"POT-Creation-Date: 2005-02-10 15:25+0000\n"
 "PO-Revision-Date: 2005-01-08 17:21-0500\n"
 "Last-Translator: Roman Benko <benco@acid.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"

+ 1 - 1
po/sv.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.10\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-11 16:56+0000\n"
+"POT-Creation-Date: 2005-02-10 15:25+0000\n"
 "PO-Revision-Date: 2005-01-01 23:52+0100\n"
 "Last-Translator: Peter Karlsson <peterk@debian.org>\n"
 "Language-Team: Peter Karlsson <peterk@debian.org>\n"

+ 38 - 38
po/zh_CN.po

@@ -3,14 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # Kov Tchai <chaisave@263.com>, 2004.
 # Hiweed Leng <hiweed@163.com>, 2004.
-# 
-# 
+# Carlos Z.F. Liu <carlosliu@users.sourceforge.net>, 2004.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: dpkg\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-11 16:56+0000\n"
-"PO-Revision-Date: 2004-10-29 03:52+1300\n"
+"POT-Creation-Date: 2005-02-10 15:25+0000\n"
+"PO-Revision-Date: 2005-02-07 05:27+1300\n"
 "Last-Translator: Tchaikov <chaisave@263.com>\n"
 "Language-Team: Chinese (simplified) <i18n-translation@lists.linux.net.cn>\n"
 "MIME-Version: 1.0\n"
@@ -4223,24 +4223,21 @@ msgid "Help: "
 msgstr "帮助:"
 
 #: dselect/basecmds.cc:177
-#, fuzzy
 msgid "Press ? for help menu, . for next topic, <space> to exit help."
 msgstr ""
-"摁 ? 可以弹出帮助菜单,用 <空格> 能进入下个主题,通过 <回车> 就能退出帮助界"
-"面。"
+"摁 ? 可以弹出帮助菜单,用 . 来进入下个主题,通过 <空格> 就能退出帮助界面。"
 
 #: dselect/basecmds.cc:184
 msgid "Help information is available under the following topics:"
 msgstr "您可获得有关下列主题的帮助信息:"
 
 #: dselect/basecmds.cc:192
-#, fuzzy
 msgid ""
 "Press a key from the list above, <space> or `q' to exit help,\n"
 "  or `.' (full stop) to read each help page in turn. "
 msgstr ""
-"请摁上面列表中所示的按键,用 <回车>、“q”或者“Q”来退出帮助界面,\n"
-"或者用 <空格> 来依次阅读帮助页面。"
+"请摁上面列表中所示的按键,用 <空格> 或者“q”来退出帮助界面,\n"
+"或者用“.”(英文句点)来依次阅读帮助页面。"
 
 #: dselect/basecmds.cc:198
 msgid "error reading keyboard in help"
@@ -5496,7 +5493,6 @@ msgid "Introduction to package selections"
 msgstr "软件包自选界面简介"
 
 #: dselect/helpmsgs.cc:33
-#, fuzzy
 msgid ""
 "Welcome to dselect's main package listing.\n"
 "\n"
@@ -5529,7 +5525,7 @@ msgstr ""
 "欢迎来到 dselect 的软件包主列表界面。\n"
 "\n"
 "展现在您面前的是已经安装的或可以安装的软件包列表。\n"
-"您若要想安装的话,可以使用方向键徜徉于这个列表中,\n"
+"您若要想安装的话,可以使用方向键在这个列表中浏览,\n"
 "为要安装的软件包作上记号(用“+”),也可以为希望卸载\n"
 "的软件包作记号(用“-”)。\n"
 "作记号时,不仅可以对单个软件包作记号,还可以为成组\n"
@@ -5538,22 +5534,25 @@ msgstr ""
 "所指的所有软件包。\n"
 "\n"
 "您作的一些选择可能会导致软件包间的冲突或依赖问题,\n"
-"这时软件会把一份该问题的相关软件列表交给你,这样,\n"
-"您就能解决这个问题了。\n"
+"这时程序会向您提交一份相关软件的子列表,这样,您就\n"
+"能解决该问题。\n"
+"\n"
+"您应当看看按键的列表,以及有关屏幕上显示信息的解释。\n"
+"还有许多在线的帮助文档,只要在需要帮助的时候摁“?”\n"
+"就可调阅它们。\n"
 "\n"
 "一旦您选完软件包,请摁 <回车> 键来确认刚才的修改,\n"
-"或者用“Q”退出同时不保存。在这时,会最后作一次冲突\n"
-"和依赖性的检查 - 对,您在这里可能还会看一次相关软件\n"
-"列表。\n"
+"或者用“X”退出且不保存修改内容。在这时,程序会最后\n"
+"作一次冲突和依赖性检查 - 对,您在这里可能还会看一\n"
+"次相关软件的子列表。\n"
 "\n"
-"现在您可以通过摁 <回车> 键离开帮助界面,进入列表界面了。\n"
+"现在您可以通过摁 <空格> 键离开帮助并进入列表界面。\n"
 
 #: dselect/helpmsgs.cc:57
 msgid "Introduction to read-only package list browser"
 msgstr "只读软件包列表浏览界面简介"
 
 #: dselect/helpmsgs.cc:57
-#, fuzzy
 msgid ""
 "Welcome to dselect's main package listing.\n"
 "\n"
@@ -5576,23 +5575,24 @@ msgstr ""
 "欢迎来到 dselect 的软件包主列表界面。\n"
 "\n"
 "展现在您面前的是已经安装的或可以安装的软件包列表。\n"
-"由于您没有权限修改软件包的状态,就只能以只读模式操作了。\n"
-"您可以使用方向键在本列表中(请参考帮助界面中的“按键操作”一节)\n"
-"移动,还可以查看软件包的状态并获知软件包的相关信息。\n"
+"由于您没有权限修改软件包的状态,就只能以只读模式操\n"
+"作了。您可以使用方向键在本列表中移动(请参考帮助界\n"
+"面中的“按键操作”一节),并查看软件包的状态以及获得\n"
+"软件包的相关信息。\n"
 "\n"
 "您应当看看按键的列表,以及有关屏幕上显示信息的解释。\n"
-"您可以访问许多在线的帮助文档,无论何时只要摁“?”就可\n"
-"调阅它们。\n"
-"一旦您看完,请摁“Q”或者 <回车> 键来退出软件。\n"
+"还有许多在线的帮助文档,只要在需要帮助的时候摁“?”\n"
+"就可调阅它们。\n"
+"\n"
+"您看完后,请摁“Q”或者 <回车> 键来退出软件。\n"
 "\n"
-"现在您可以通过摁 <回车> 键离开帮助界面,进入列表界面了。\n"
+"现在您可以通过摁 <空格> 键离开帮助系统并进入列表界面了。\n"
 
 #: dselect/helpmsgs.cc:75
 msgid "Introduction to conflict/dependency resolution sub-list"
 msgstr "用于解决冲突/依赖问题的子列表的简介"
 
 #: dselect/helpmsgs.cc:75
-#, fuzzy
 msgid ""
 "Dependency/conflict resolution - introduction.\n"
 "\n"
@@ -5626,23 +5626,23 @@ msgid ""
 "Press <space> to leave help and enter the sub-list; remember: press `?' for "
 "help.\n"
 msgstr ""
-"用于解决冲突/依赖问题的子列表的简介。\n"
+"依赖/冲突问题的解决办法 - 简介。\n"
 "\n"
-"您作的选择中有些引起了冲突或依赖问题,即,\n"
+"您作的选择中有些引起了冲突或依赖问题,即,\n"
 "有些软件包必须与某些其它软件包一同安装,\n"
 "而有的软件包的特定组合是不能同时安装的。\n"
 "\n"
-"您将会见到一个子列表,它囊括了波及到的\n"
-"软件包。显示内容的下半部分会告诉您相关\n"
+"您将会见到一个子列表,它包含了被波及到的\n"
+"软件包。屏幕显示的下半部分会告诉您相关\n"
 "的冲突和依赖关系。请使用“i”来浏览软件包\n"
 "的简介和内部控制信息。\n"
 "\n"
-"有一组被“建议”的软件包已被统计出来了,\n"
-"而且这个子列表中的对应软件包的状态也被\n"
-"标记成了“建议”的状态。这样,如果您愿意\n"
-"的话,只需摁一下回车来接受软件的建议。\n"
-"您还可以摁大写的“X”来取消这个导致问题\n"
-"的更改,并回到主列表界面。\n"
+"这里已经分析并“建议”了一组软件包,并且\n"
+"本子列表中的软件包的初始状态都已经被标记为\n"
+"对应的“建议”状态。这样,如果您愿意的话,\n"
+"只需摁一下回车来接受该建议。您也可以摁大写\n"
+"的“X”来取消这个导致问题的更改,并回到主\n"
+"列表界面。\n"
 "\n"
 "您也可以按照自己的需求修改列表中软件包\n"
 "的状态。同时,您也可以摁大写的“D”或“R”\n"
@@ -5651,7 +5651,7 @@ msgstr ""
 "本软件出错时,您还可以摁大写的“Q”来强制\n"
 "我接受当前显示的设定。\n"
 "\n"
-"请摁<回车>离开帮助界面,进入子列表。\n"
+"请摁 <空格> 离开帮助系统并进入子列表。\n"
 "请记住:需要帮助时,摁“?”键。\n"
 
 #: dselect/helpmsgs.cc:100

+ 29 - 37
po/zh_TW.po

@@ -1,16 +1,14 @@
-# Simplified Chinese translation to dpkg.
+# Traditional Chinese translation to dpkg.
 # Copyright (C) 2004 THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# Kov Tchai <chaisave@263.com>, 2004.
-# Hiweed Leng <hiweed@163.com>, 2004.
 # 
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: dpkg\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-11 16:56+0000\n"
-"PO-Revision-Date: 2004-12-10 21:25+0800\n"
+"POT-Creation-Date: 2005-02-10 15:25+0000\n"
+"PO-Revision-Date: 2005-02-05 19:54+0800\n"
 "Last-Translator: Asho Yeh <asho@debian.org.tw>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
 "MIME-Version: 1.0\n"
@@ -4213,24 +4211,20 @@ msgid "Help: "
 msgstr "幫助:"
 
 #: dselect/basecmds.cc:177
-#, fuzzy
 msgid "Press ? for help menu, . for next topic, <space> to exit help."
-msgstr ""
-"按 ? 可以彈出幫助選單,用 <空格> 能進入下個主題,通過 <enter> 就能退出幫助界"
-"面。"
+msgstr "按 ? 可以彈出幫助選單,用 <space> 能進入下個主題並離開幫助畫面。"
 
 #: dselect/basecmds.cc:184
 msgid "Help information is available under the following topics:"
 msgstr "您可獲得有關下列主題的幫助訊息:"
 
 #: dselect/basecmds.cc:192
-#, fuzzy
 msgid ""
 "Press a key from the list above, <space> or `q' to exit help,\n"
 "  or `.' (full stop) to read each help page in turn. "
 msgstr ""
-"請按上面列表中所示的按鍵,用 <enter>、“q”或者“Q”來退出幫助界面,\n"
-"或者用 <space> 來依次閱讀幫助頁面。"
+"請按上面列表中的按鍵,<space> 或“q”可退出幫助界面,\n"
+"或者用“.”(full stop)來依次閱讀幫助頁面。"
 
 #: dselect/basecmds.cc:198
 msgid "error reading keyboard in help"
@@ -5486,7 +5480,6 @@ msgid "Introduction to package selections"
 msgstr "套件選擇界面簡介"
 
 #: dselect/helpmsgs.cc:33
-#, fuzzy
 msgid ""
 "Welcome to dselect's main package listing.\n"
 "\n"
@@ -5519,31 +5512,32 @@ msgstr ""
 "歡迎來到 dselect 的套件主列表界面。\n"
 "\n"
 "展現在您面前的是已經安裝的或可以安裝的套件列表。\n"
-"您若要想安裝的話,可以使用方向鍵瀏覽於這個列表中,\n"
-"為要安裝的套件作上記號(用 `+'),也可以為希望移除\n"
+"想要安裝時,可以使用方向鍵瀏覽這個列表,\n"
+"將安裝的套件作上記號(用 `+'),也可以將想要移除\n"
 "的套件作記號(用“`-')。\n"
 "作記號時,不僅可以對單個套件作記號,還可以為成組\n"
-"的套件作記號。剛開始時您會看到“所有套件”一行被\n"
-"選中了,那麼用`+'和`-'等鍵就可以操控被高亮顯示的行\n"
+"的套件作記號。剛開始時您會看到“所有套件”一行被\n"
+"選中那麼用`+'和`-'等鍵就可以操控被高亮顯示的行\n"
 "所指的所有套件。\n"
 "\n"
 "您作的一些選擇可能會導致套件間的衝突或相依問題,\n"
-"這時軟體會把一份問題的相關軟體列表交給你,這樣,\n"
+"這時軟體會把一份問題的相關軟體列表交給你,這樣,\n"
 "您就能解決這個問題了。\n"
 "\n"
+"您必須閱讀這些列出的按鍵以及展開說明。\n"
+"在您尋求幫助時只要按下`?'就能取得許多線上說明。\n"
+"\n"
 "一旦您選完套件,請按 <enter> 鍵來確認剛才的修改,\n"
-"或者用`Q'退出同時不保存。在這時,會最後作一次衝突\n"
-"和相依性的檢查 - 對,您在這裡可能還會看一次相關軟體\n"
-"列表。\n"
+"或者用`X'退出同時不儲存任何改變。最後作一次衝突和\n"
+"相依性的檢查 - 您在這裡可能還會看一次相關軟體列表。\n"
 "\n"
-"現在您可以藉由按 <enter> 鍵離開幫助界面,進入列表界面了。\n"
+"現在您可以按 <enter> 鍵離開幫助界面,進入列表界面了。\n"
 
 #: dselect/helpmsgs.cc:57
 msgid "Introduction to read-only package list browser"
 msgstr "唯讀的套件列表瀏覽界面簡介"
 
 #: dselect/helpmsgs.cc:57
-#, fuzzy
 msgid ""
 "Welcome to dselect's main package listing.\n"
 "\n"
@@ -5573,6 +5567,7 @@ msgstr ""
 "您應當看看按鍵的列表,以及有關螢幕上顯示訊息的解釋。\n"
 "您可以閱讀許多線上的幫助文檔,無論何時只要按“?”就可\n"
 "調閱它們。\n"
+"\n"
 "一旦您看完,請按“Q”或者 <enter> 鍵來退出軟體。\n"
 "\n"
 "現在您可以通過按 <enter> 鍵離開幫助界面,進入列表界面了。\n"
@@ -5582,7 +5577,6 @@ msgid "Introduction to conflict/dependency resolution sub-list"
 msgstr "用於解決衝突/相依問題的子列表的簡介"
 
 #: dselect/helpmsgs.cc:75
-#, fuzzy
 msgid ""
 "Dependency/conflict resolution - introduction.\n"
 "\n"
@@ -5628,21 +5622,19 @@ msgstr ""
 "的簡介和內部控制訊息。\n"
 "\n"
 "有一組被“建議”的套件已被統計出來了,\n"
-"而且這個子列表中的對應套件的狀態也被\n"
-"標記成了“建議”的狀態。這樣,如果您願意\n"
-"的話,只需按一下enter來接受軟體的建議。\n"
-"您還可以按大寫的“X”來取消導致問題\n"
-"的更動,並回到主列表界面。\n"
-"\n"
-"您也可以按照自己的需求修改列表中套件\n"
-"的狀態。同時,您也可以按大寫的“D”或“R”\n"
-"鍵(參考快速鍵的幫助界面),來“拒絕”我\n"
-"提出的建議。當您希望忽略我的建議或是認為\n"
-"本軟體出錯時,您還可以按大寫的“Q”來強制\n"
-"我接受當前顯示的設定。\n"
+"而且這個子列表中的對應套件的狀態也被標記成了“建議”的狀態。這樣,如果您願意的"
+"話,\n"
+"只需按一下enter來接受軟體的建議。\n"
+"您還可以按大寫的“X”來取消導致問題的更動,並回到主列表界面。\n"
+"\n"
+"您也可以按照自己的需求修改列表中套件的狀態。\n"
+"同時,您也可以按大寫的“D”或“R”\n"
+"鍵(參考快速鍵的幫助界面),來“拒絕”我提出的建議。\n"
+"當您希望忽略我的建議或是認為本軟體出錯時,\n"
+"您還可以按大寫的“Q”來強制接受當前顯示的設定。\n"
 "\n"
 "請按<enter>離開幫助界面,進入子列表。\n"
-"請記住:需要幫助時,按“?”鍵。\n"
+"需要幫助時,按“?”鍵。\n"
 
 #: dselect/helpmsgs.cc:100
 msgid "Display, part 1: package listing and status chars"

+ 1 - 1
version-nr

@@ -1 +1 @@
-1.10.26
+1.10.27