diff -Nru cvs-1.12.13.old/debian/changelog cvs-1.12.13/debian/changelog
--- cvs-1.12.13.old/debian/changelog	2008-08-15 19:02:08.233554680 +0200
+++ cvs-1.12.13/debian/changelog	2008-08-28 07:53:29.233212886 +0200
@@ -1,3 +1,13 @@
+cvs (1:1.12.13-11.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * NMU to fix pending l10n issues
+  * Debconf translations:
+    - Basque. Closes: #484726
+    - Simplified Chinese. Closes: #495953
+
+ -- Christian Perrier <bubulle@debian.org>  Thu, 28 Aug 2008 07:53:19 +0200
+
 cvs (1:1.12.13-11) unstable; urgency=low
 
   * Be more aggressive about checking --allow-root; can now be used for
diff -Nru cvs-1.12.13.old/debian/po/eu.po cvs-1.12.13/debian/po/eu.po
--- cvs-1.12.13.old/debian/po/eu.po	1970-01-01 01:00:00.000000000 +0100
+++ cvs-1.12.13/debian/po/eu.po	2008-08-18 15:04:34.214203000 +0200
@@ -0,0 +1,298 @@
+# translation of eu.po to Euskara
+#
+#    Translators, if you are not familiar with the PO format, gettext
+#    documentation is worth reading, especially sections dedicated to
+#    this format, e.g. by running:
+#         info -n '(gettext)PO Files'
+#         info -n '(gettext)Header Entry'
+#    Some information specific to po-debconf are available at
+#            /usr/share/doc/po-debconf/README-trans
+#         or http://www.debian.org/intl/l10n/po-debconf/README-trans#
+#    Developers do not need to manually edit POT or PO files.
+#
+# Piarres Beobide <pi@beobide.net>, 2008.
+msgid ""
+msgstr ""
+"Project-Id-Version: eu\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-09-30 19:23+0200\n"
+"PO-Revision-Date: 2008-06-05 23:56+0200\n"
+"Last-Translator: Piarres Beobide <pi@beobide.net>\n"
+"Language-Team: Euskara <debian-l10n-basque@lists.debian.org>\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"
+
+#. Type: string
+#. Description
+#: ../cvs.templates:1001
+msgid "Repository directories:"
+msgstr "Biltegi direktorioak:"
+
+#. Type: string
+#. Description
+#: ../cvs.templates:1001
+msgid ""
+"Please list the directories that are the roots of your repositories, "
+"separated by colons."
+msgstr ""
+"Mesedez zerrendatu zure biltegien erroak diren direktorioak, bi puntuz "
+"berezirik."
+
+#. Type: string
+#. Description
+#: ../cvs.templates:1001
+msgid ""
+"These repositories can be exported by the pserver, have their history files "
+"rotated automatically every week, and general repository security checks "
+"will be performed on them."
+msgstr ""
+"Biltegi hauek pserver-ek esporta ditzake, beren historia fitxategiak astero "
+"berritu daiteke automatikoki, eta biltegi orokor segurtasun egiaztapenak "
+"egingo dira beraietan."
+
+#. Type: string
+#. Description
+#: ../cvs.templates:1001
+msgid ""
+"If you wish to create a new repository, enter the path where you wish to "
+"create it. You will then be given the option of creating it later."
+msgstr ""
+"Biltegi berri bat sortu nahi baduzu, idatzi sortu nahi duzun lekuaren bide-"
+"osoa. Aurrerago sortzeko aukera emango zaizu."
+
+#. Type: select
+#. Choices
+#: ../cvs.templates:2001
+msgid "create, ignore, reenter"
+msgstr "sortu, baztertu, birsartu"
+
+#. Type: select
+#. Description
+#: ../cvs.templates:2002
+msgid "Method to fix invalid repositories:"
+msgstr "Biltegi baliogabeak konpontzeko metodoa:"
+
+#. Type: select
+#. Description
+#: ../cvs.templates:2002
+msgid ""
+"The following items you entered are not directories or do not contain a "
+"CVSROOT subdirectory:"
+msgstr ""
+"Zuk sartutako hurrengo elementuan edo ez dira direktorioak edo ez dute "
+"CVSROOT azpidirektoriorik:"
+
+#. Type: select
+#. Description
+#: ../cvs.templates:2002
+msgid ""
+"If you have not yet created these repositories, they can be created by "
+"selecting 'create'. You could also select 'ignore' and use the 'cvs-"
+"makerepos' command to create them, or create them individually using 'cvs "
+"init'."
+msgstr ""
+"Oraindik biltegi horiek sortu ez badituzu, orain sortu daitezke 'sortu' "
+"hautatuaz. 'baztertu' hautatu eta sortzeko 'cvs-makerepos' komandoa erabili "
+"dezakezu, edo banaka sortu ditzakezu 'cvs init' erabiliaz."
+
+#. Type: select
+#. Description
+#: ../cvs.templates:2002
+msgid "You can also choose to 'reenter' your repositories list."
+msgstr "Zure biltegi zerrenda berriz sartzeko 'birsartu' hautatu."
+
+#. Type: select
+#. Choices
+#. Type: select
+#. Choices
+#: ../cvs.templates:3001 ../cvs.templates:5001
+msgid "yes, no, individual"
+msgstr "bai, ez, banaka"
+
+#. Type: select
+#. Description
+#: ../cvs.templates:3002
+msgid "Weekly rotation for history files in repositories:"
+msgstr "Biltegien historia fitxategien asteroko berritzea:"
+
+#. Type: select
+#. Description
+#: ../cvs.templates:3002
+msgid ""
+"Weekly rotation of history files is primarily useful for servers with a lot "
+"of activity. The script /etc/cron.weekly/cvs will rotate the history files. "
+"Select \"individual\" if you want to control rotation on a per-repository "
+"basis."
+msgstr ""
+"Historia fitxategien asteroko berritzea aktibitate handiko zerbitzarietan da "
+"erabilgarri batezere. /etc/cron.weekly/cvs script-ak historia fitxategiak "
+"berritzen ditu. \"banaka\" hautatu zein berrituko den biltegiz-biltegi "
+"aukeratzeko."
+
+#. Type: boolean
+#. Description
+#: ../cvs.templates:4001
+msgid "Rotate the history files of the repository in ${repos} each week?"
+msgstr "Berritu ${repos} biltegiaren historia fitxategiak astero?"
+
+#. Type: select
+#. Description
+#: ../cvs.templates:5002
+msgid "Change the number of kept history files:"
+msgstr "Aldatu mantentu behar den fitxategi kopurua:"
+
+#. Type: select
+#. Description
+#: ../cvs.templates:5002
+msgid ""
+"When rotating history files in repositories, by default the previous 7 are "
+"kept. Choosing \"yes\" will allow you to change this number globally. "
+"Choosing \"individual\" will allow you to specify the number of days to keep "
+"history files for individual repositories."
+msgstr ""
+"Biltegietako historia fitxategiak berritzean aurreko 7ak mantentzen dira "
+"lehenespen gisa. \"bai\" hautatzen baduzu kopuru hau globalki aldatzeko "
+"aukera emango dizu. \"banaka\" hautatzen baduzu biltegietako historia "
+"fitxategiak gordeko diren egun kopurua biltegiz-biltegi ezartzeko aukera "
+"izango duzu."
+
+#. Type: string
+#. Description
+#: ../cvs.templates:6001
+msgid "Number of previous history files to keep (global setting):"
+msgstr "Mantenduko diren aurreko historia fitxategiak (ezarpen orokorra):"
+
+#. Type: string
+#. Description
+#: ../cvs.templates:6001
+msgid ""
+"Please choose how many previous history files should be kept when the "
+"history files in your repositories are rotated each week."
+msgstr ""
+"Mesedez hautatu biltegietako historia fitxategiak astero berritzean zenbat "
+"aurreko historia fitxategi mantenduko diren."
+
+#. Type: string
+#. Description
+#: ../cvs.templates:7001
+msgid "Number of previous history files to keep in ${repos}:"
+msgstr ""
+"${repos} biltegiko mantenduko diren aurreko historia fitxategi kopurua:"
+
+#. Type: string
+#. Description
+#: ../cvs.templates:7001
+msgid ""
+"Please choose how many previous history files should be kept in ${repos} "
+"when the history files in your repositories are rotated each week."
+msgstr ""
+"Mesedez hautatu zenbat aurreko historia fitxategi mantenduko diren ${repos} "
+"biltegian astero zure biltegietako historia fitxategiak berritzean."
+
+#. Type: boolean
+#. Description
+#: ../cvs.templates:8001
+msgid "Should the CVS pserver be enabled?"
+msgstr "CVS pserver gaitu egin behar al da?"
+
+#. Type: boolean
+#. Description
+#: ../cvs.templates:8001
+msgid ""
+"The CVS pserver is a client-to-server mechanism which can be used by CVS as "
+"a replacement for the standard \"server\" method, which uses \"rsh\", or an "
+"rsh compatible program, such as ssh. It is more efficient than the standard "
+"server protocol, also supporting its own password files, making it more "
+"secure. However, it may be a security risk, and used to contain a security "
+"problem whereby a remote connection may have been able to read the passwd or "
+"other security-related files on the system. Read README.Debian for more "
+"details, and extra ways to secure the pserver."
+msgstr ""
+"CVS pserver \"server\" metodo estandarraren ordezko bezala CVS-ek erabili "
+"dezakeen eta \"rsh\", edo rsh-rekin bateragarri den ssh bezalako programan "
+"bat erabiltzen duen bezeroz-bezero mekanismo bat da. Berau zerbitzari "
+"protokolo estandarra baino azkarrago da eta bere pasahitz fitxategi bereziak "
+"onartzen ditu berau seguruago eginez. Hala ere segurtasun arrisku bat izan "
+"daiteke. Pserver metodoak pasahitzak edo sistemako segurtasun inguruko beste "
+"fitxategi batzuek irakurtzeko aukera ematen zuen segurtasun arazo bat izaten "
+"zuen. Irakurri README.Debian xehetasun gehiagorako eta pserver seguruago "
+"egiteko modu gehigarrietako."
+
+#. Type: boolean
+#. Description
+#: ../cvs.templates:8001
+msgid ""
+"It is not recommended to choose this option. CVS now only allows access to "
+"particular repositories specified on the command line. When chosen, it will "
+"be installed in inetd, using tcpd wrappers."
+msgstr ""
+"Ez da gomendagarria aukera hau hautzea. CVS-ek orain komando lerroan "
+"zehazturiko banakako biltegietara sarrera bakarrik onartzen du. Hauatzen "
+"denean inted-en instalatzen da tcpd zorroak erabiliaz."
+
+#. Type: select
+#. Choices
+#: ../cvs.templates:9001
+msgid "all, some"
+msgstr "dena, zenbait"
+
+#. Type: select
+#. Description
+#: ../cvs.templates:9002
+msgid "Repositories to export via the pserver:"
+msgstr "Pserver bidez esportatu behar diren biltegiak:"
+
+#. Type: boolean
+#. Description
+#: ../cvs.templates:10001
+msgid "Do you want the repository ${repos} exported via pserver?"
+msgstr "${repos} biltegia pserver bidez esportatu nahi duzu?"
+
+#. Type: boolean
+#. Description
+#: ../cvs.templates:11001
+msgid "Change the maximum pserver processes spawned in one minute?"
+msgstr ""
+"Aldatu pserver-ek minutu batetan gehienez abiaraziko dituen prozesu kopurua?"
+
+#. Type: boolean
+#. Description
+#. Type: string
+#. Description
+#: ../cvs.templates:11001 ../cvs.templates:12001
+msgid ""
+"When running a pserver, inetd's default limit of allowing 40 connections in "
+"1 minute can easily be exceeded if a script calls CVS individually on many "
+"files over a pserver connection. This limit is designed to stop system load "
+"from rising too high if the service is continually failing."
+msgstr ""
+"Pserver exekutatzen inetd-ren lehenetsiriko minutuko 40 konexioen muga erraz "
+"gainditu daiteke scipt batek pserver konexio batetan fitxategi anitzen gain "
+"CVS banaka deitzen badu. Muga hau zerbitzuak jarraian huts eginez gero "
+"sistema karga kontrolatzeko diseinatua dago."
+
+#. Type: boolean
+#. Description
+#: ../cvs.templates:11001
+msgid ""
+"Thus, a more sensible default limit for most systems is 400. However, if you "
+"are running an inetd clone which does not support the syntax \"nowait.[limit]"
+"\", you will need to not set a limit using this method."
+msgstr ""
+"Beraz sistema gehientarako lehenetsiriko muga taxuzkoagoa 400 da. Hala ere, "
+"\"nowait.[muga]\" sintaxia onartzen ez duen inetd klon bat erabiltzen baduzu "
+"ez zenuke mugarik ezarri beharko metodo honekin."
+
+#. Type: string
+#. Description
+#: ../cvs.templates:12001
+msgid "Inetd spawn limit for the CVS pserver:"
+msgstr "CVS pserver-en inetd abiarazte muga:"
+
+#. Type: string
+#. Description
+#: ../cvs.templates:12001
+msgid "Thus, a more sensible default limit for most systems is 400."
+msgstr "Beraz sistema gehientarako lehenetsiriko muga taxuzkoagoa 400 da."
diff -Nru cvs-1.12.13.old/debian/po/zh_CN.po cvs-1.12.13/debian/po/zh_CN.po
--- cvs-1.12.13.old/debian/po/zh_CN.po	2008-08-15 19:02:08.229555693 +0200
+++ cvs-1.12.13/debian/po/zh_CN.po	2008-08-21 20:31:14.632267000 +0200
@@ -16,8 +16,8 @@
 "Project-Id-Version: cvs debconf\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2006-09-30 19:23+0200\n"
-"PO-Revision-Date: 2004-02-13 01:45+1300\n"
-"Last-Translator: Carlos Z.F. Liu <carlos_liu@yahoo.com>\n"
+"PO-Revision-Date: 2008-08-21 23:03+0800\n"
+"Last-Translator: Deng Xiyue <manphiz@gmail.com>\n"
 "Language-Team: Debian Chinese [GB] <debian-chinese-gb@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -27,16 +27,15 @@
 #. Description
 #: ../cvs.templates:1001
 msgid "Repository directories:"
-msgstr ""
+msgstr "代码库目录："
 
 #. Type: string
 #. Description
 #: ../cvs.templates:1001
-#, fuzzy
 msgid ""
 "Please list the directories that are the roots of your repositories, "
 "separated by colons."
-msgstr "请列出您的代码库的根(root)目录，目录之间用英文冒号分隔。"
+msgstr "请列出您的代码库的根目录(root)，目录之间用英文冒号(:)分隔。"
 
 #. Type: string
 #. Description
@@ -68,37 +67,34 @@
 #. Type: select
 #. Description
 #: ../cvs.templates:2002
-#, fuzzy
 msgid "Method to fix invalid repositories:"
-msgstr "您希望修复无效的代码库吗？"
+msgstr "修复无效代码库的方法："
 
 #. Type: select
 #. Description
 #: ../cvs.templates:2002
-#, fuzzy
 msgid ""
 "The following items you entered are not directories or do not contain a "
 "CVSROOT subdirectory:"
-msgstr "您输入的下以项目并不是目录名或者并不包含 CVSROOT 子目录：${badreps}。"
+msgstr "您输入的下以项目并不是目录名或者并不包含 CVSROOT 子目录："
 
 #. Type: select
 #. Description
 #: ../cvs.templates:2002
-#, fuzzy
 msgid ""
 "If you have not yet created these repositories, they can be created by "
 "selecting 'create'. You could also select 'ignore' and use the 'cvs-"
 "makerepos' command to create them, or create them individually using 'cvs "
 "init'."
 msgstr ""
-"如果您还没有创建这些代码库，您可以立刻选择“创建”。您也可以选择“忽略”，然后"
-"用“cvs-makerepos”命令来创建它们，或者用“cvs init”命令来单独创建。"
+"如果您还没有创建这些代码库，您可以选择“创建”来创建它们。您也可以选择“忽略”，"
+"然后用“cvs-makerepos”命令来创建它们，或者用“cvs init”命令来单独创建它们。"
 
 #. Type: select
 #. Description
 #: ../cvs.templates:2002
 msgid "You can also choose to 'reenter' your repositories list."
-msgstr ""
+msgstr "您也可以选择“重新进入”您的代码库列表"
 
 #. Type: select
 #. Choices
@@ -111,9 +107,8 @@
 #. Type: select
 #. Description
 #: ../cvs.templates:3002
-#, fuzzy
 msgid "Weekly rotation for history files in repositories:"
-msgstr "定期处理代码库 ${repos} 中的历史文件吗？"
+msgstr "代码库中历史文件的每周滚动备份："
 
 #. Type: select
 #. Description
@@ -131,63 +126,57 @@
 #. Type: boolean
 #. Description
 #: ../cvs.templates:4001
-#, fuzzy
 msgid "Rotate the history files of the repository in ${repos} each week?"
-msgstr "定期处理代码库 ${repos} 中的历史文件吗？"
+msgstr "每周滚动备份代码库 ${repos} 中的历史文件吗？"
 
 #. Type: select
 #. Description
 #: ../cvs.templates:5002
 msgid "Change the number of kept history files:"
-msgstr ""
+msgstr "改变保存历史文件的数量："
 
 #. Type: select
 #. Description
 #: ../cvs.templates:5002
-#, fuzzy
 msgid ""
 "When rotating history files in repositories, by default the previous 7 are "
 "kept. Choosing \"yes\" will allow you to change this number globally. "
 "Choosing \"individual\" will allow you to specify the number of days to keep "
 "history files for individual repositories."
 msgstr ""
-"当在代码库中执行定期处理任务时，默认保留过去 7 个历史文件。如果您想为整个系统"
-"改变此数值，请选择“是”；或者要改变某个单独代码库的设定，请选择“单独控制”；否"
-"则，请选择“否”。"
+"当滚动备份在代码库中的历史文件时，默认保留过去 7 个。如果您想为整个系统改变此"
+"数值，请选择“是(yes)”；或者要改变某些单独代码库的设定，请选择“单独控制"
+"(individual)”。"
 
 #. Type: string
 #. Description
 #: ../cvs.templates:6001
-#, fuzzy
 msgid "Number of previous history files to keep (global setting):"
-msgstr "要保留多少过去的历史文件？(全局设置)"
+msgstr "保留过去的历史文件的数量(全局设置)："
 
 #. Type: string
 #. Description
 #: ../cvs.templates:6001
-#, fuzzy
 msgid ""
 "Please choose how many previous history files should be kept when the "
 "history files in your repositories are rotated each week."
-msgstr ""
-"当在您的代码库中每周执行定时任务时，您希望保留多少过去的历史文件？默认是 7。"
+msgstr "请选择当每周滚动备份您仓库的历史文件时您希望保留多少之前的历史文件。"
 
 #. Type: string
 #. Description
 #: ../cvs.templates:7001
-#, fuzzy
 msgid "Number of previous history files to keep in ${repos}:"
-msgstr "要在 ${repos} 中保留多少过去的历史文件？"
+msgstr "在 ${repos} 中保留过去的历史文件的数量："
 
 #. Type: string
 #. Description
 #: ../cvs.templates:7001
-#, fuzzy
 msgid ""
 "Please choose how many previous history files should be kept in ${repos} "
 "when the history files in your repositories are rotated each week."
 msgstr ""
-"当在您的代码库中每周执行定时任务时，您希望保留多少过去的历史文件？默认是 7。"
+"请选择当每周滚动备份您仓库的历史文件时您希望在 ${repos} 中保留多少之前的历史"
+"文件。"
 
 #. Type: boolean
 #. Description
@@ -198,7 +187,6 @@
 #. Type: boolean
 #. Description
 #: ../cvs.templates:8001
-#, fuzzy
 msgid ""
 "The CVS pserver is a client-to-server mechanism which can be used by CVS as "
 "a replacement for the standard \"server\" method, which uses \"rsh\", or an "
@@ -209,22 +197,22 @@
 "other security-related files on the system. Read README.Debian for more "
 "details, and extra ways to secure the pserver."
 msgstr ""
-"CVS pserver 是标准“server”模式(使用“rsh”)的替代品，它基于客户-服务器机理，可"
-"以使用“rsh”或者其它兼容程序，比如“ssh”。它比标准的 server 协议效率更高，还支"
-"持更安全的内建的密码文件。但这可能存在安全风险，曾经存在这样一个安全问题，使"
-"远程连接有可能读取密码或系统上其它与安全相关的文件。"
+"CVS pserver 基于客户-服务器机理，可被 CVS 使用作为标准“server”模式的替代品，"
+"它可以使用“rsh”或者 rsh 兼容程序，比如“ssh”。它比标准的 server 协议效率更高，"
+"还支持内建的密码文件，使其更加安全。但这可能存在安全风险，而且曾经存在这样一"
+"个安全问题，使远程连接有可能读取密码或系统上其它与安全相关的文件。请阅读 "
+"README.Debian 以获取更多细节，以及更多维护 pserver 安全的方法。"
 
 #. Type: boolean
 #. Description
 #: ../cvs.templates:8001
-#, fuzzy
 msgid ""
 "It is not recommended to choose this option. CVS now only allows access to "
 "particular repositories specified on the command line. When chosen, it will "
 "be installed in inetd, using tcpd wrappers."
 msgstr ""
-"因此，除非您清楚地知道确实需要此选项，否则建议关闭它。CVS 现在只允许访问在命"
-"令行中指定的代码库。"
+"不见一选择此选项。CVS 现在只允许访问在命令行中指定的特定代码库。如果选择此选"
+"项，它将被安装到 inetd，并使用 tcpd 包装(wrappers)。"
 
 #. Type: select
 #. Choices
@@ -235,9 +223,8 @@
 #. Type: select
 #. Description
 #: ../cvs.templates:9002
-#, fuzzy
 msgid "Repositories to export via the pserver:"
-msgstr "您是否想让所有的代码库以 pserver 方式导出？"
+msgstr "将以 pserver 方式导出的代码库："
 
 #. Type: boolean
 #. Description
@@ -269,28 +256,25 @@
 #. Type: boolean
 #. Description
 #: ../cvs.templates:11001
-#, fuzzy
 msgid ""
 "Thus, a more sensible default limit for most systems is 400. However, if you "
 "are running an inetd clone which does not support the syntax \"nowait.[limit]"
 "\", you will need to not set a limit using this method."
 msgstr ""
-"因此，对大多数的系统来说，一个更合理的上限是 400。但是，如果您的 inetd 克隆不"
-"支持语法“nowait.[limit]”，那您就不需要用此方法设置上限。"
+"因此，对大多数的系统来说，更合理的默认限制是 400。但是，如果您的 inetd 克隆不"
+"支持语法“nowait.[limit]”，那您就不需要用此方法设置限制。"
 
 #. Type: string
 #. Description
 #: ../cvs.templates:12001
-#, fuzzy
 msgid "Inetd spawn limit for the CVS pserver:"
-msgstr "CVS pserver 的 inetd 进程限制是多少？"
+msgstr "inetd 对于 CVS pserver 的进程数限制："
 
 #. Type: string
 #. Description
 #: ../cvs.templates:12001
-#, fuzzy
 msgid "Thus, a more sensible default limit for most systems is 400."
-msgstr "因此，对大多数的系统来说，一个更合理的上限是 400。"
+msgstr "因此，对大多数的系统来说，更合理的默认限制是 400。"
 
 #~ msgid "/etc/cvs.conf is no longer used."
 #~ msgstr "/etc/cvs.conf 不再被使用。"
