Bug#766170: zh_CN PO update for apt

2014-10-21 Thread lumin
(likely the former ones of this email has lost, so send again)
Hi,

I just make another check on it, and made some changes additionally.
  * add translation
  * correction
So please IGNORE the first patch to zh_CN.po

Only some confusing or difficult strings are left with fuzzy mark or
left un-translated.
the patch is to original .po file of
ca3fb0039db3f87b9860618116a7ed896be576e7

msgfmt OK.

Thanks.
--
Regards,
  C.D.Luminate
--- zh_CN.po.bak	2014-10-21 08:38:53.766857208 +
+++ zh_CN.po	2014-10-21 14:00:23.071448017 +
@@ -4,6 +4,7 @@
 # Tchaikov , 2005, 2007.
 # Carlos Z.F. Liu , 2004, 2006.
 # Aron Xu , 2009, 2010.
+# Zhou Mo , 2014.
 #
 msgid ""
 msgstr ""
@@ -11,7 +12,7 @@
 "Report-Msgid-Bugs-To: APT Development Team \n"
 "POT-Creation-Date: 2014-09-09 20:35+0200\n"
 "PO-Revision-Date: 2010-08-26 14:42+0800\n"
-"Last-Translator: Aron Xu \n"
+"Last-Translator: Zhou Mo \n"
 "Language-Team: Chinese (simplified) \n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
@@ -111,7 +112,7 @@
 
 #: cmdline/apt-cache.cc:1421
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
-msgstr ""
+msgstr "该命令已废弃。请使用‘apt-mark showauto’代替。"
 
 #: cmdline/apt-cache.cc:1516 apt-pkg/cacheset.cc:596
 #, c-format
@@ -166,7 +167,6 @@
 msgstr "%s %s,用于 %s 构架,编译于 %s %s\n"
 
 #: cmdline/apt-cache.cc:1750
-#, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
 "   apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -203,15 +203,13 @@
 "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
 msgstr ""
 "用法: apt-cache [选项] 命令\n"
-"    apt-cache [选项] add 文件1 [文件2 ...]\n"
 "    apt-cache [选项] showpkg 软件包1 [软件包2 ...]\n"
 "    apt-cache [选项] showsrc 软件包1 [软件包2 ...]\n"
 "\n"
-"apt-cache 是一个底层的工具,我们用它来操纵 APT 的二进制\n"
-"缓存文件,也用来在那些文件中查询相关信息\n"
+"apt-cache 是一个底层的工具,可以用来\n"
+"在 APT 的二进制缓存文件中查询信息\n"
 "\n"
 "命令:\n"
-"   add - 向源缓存加入一个软件包文件\n"
 "   gencaches - 同时生成软件包和源代码包的缓存\n"
 "   showpkg - 显示某个软件包的全面信息\n"
 "   showsrc - 显示源文件的各项记录\n"
@@ -221,7 +219,6 @@
 "   unmet - 显示所有未满足的依赖关系\n"
 "   search - 根据正则表达式搜索软件包列表\n"
 "   show - 以便于阅读的格式介绍该软件包\n"
-"   showauto - 显示自动安装的软件包的列表\n"
 "   depends - 显示该软件包的依赖关系信息\n"
 "   rdepends - 显示所有依赖于该软件包的软件包名字\n"
 "   pkgnames - 列出所有软件包的名字\n"
@@ -259,6 +256,9 @@
 "See 'man apt-cdrom' for more information about the CD-ROM auto-detection and "
 "mount point."
 msgstr ""
+"从默认挂载点自动检测 CD-ROM 失败。\n"
+"您可以尝试用 --cdrom 选项来设置 CD-ROM 的挂载点。\n"
+"更多关于 CD-ROM 自动检测以及挂载点的信息,请参见‘man apt-cdrom’。"
 
 #: cmdline/apt-cdrom.cc:182
 msgid "Repeat this process for the rest of the CDs in your set."
@@ -292,24 +292,24 @@
 "   dump - 显示配置文件\n"
 "\n"
 "选项:\n"
-"  -h  本帮助文本。\n"
+"  -h   显示本帮助文本。\n"
 "  -c=? 读取指定的配置文件\n"
 "  -o=? 设置任意指定的配置选项,例如:-o dir::cache=/tmp\n"
 
 #: cmdline/apt-get.cc:245
-#, fuzzy, c-format
+#, c-format
 msgid "Can not find a package for architecture '%s'"
-msgstr "无法按照正则表达式 %s 找到任何软件包"
+msgstr "找不到‘%s’体系结构下的软件包"
 
 #: cmdline/apt-get.cc:327
 #, fuzzy, c-format
 msgid "Can not find a package '%s' with version '%s'"
-msgstr "无法按照正则表达式 %s 找到任何软件包"
+msgstr "找不到软件包‘%s’的‘%s’版本"
 
 #: cmdline/apt-get.cc:330
 #, fuzzy, c-format
 msgid "Can not find a package '%s' with release '%s'"
-msgstr "无法按照正则表达式 %s 找到任何软件包"
+msgstr "找不到‘%s’软件包的‘%s’发行"
 
 #: cmdline/apt-get.cc:367
 #, c-format
@@ -317,9 +317,9 @@
 msgstr "选择 %s 作为源代码包而非 %s\n"
 
 #: cmdline/apt-get.cc:423
-#, fuzzy, c-format
+#, c-format
 msgid "Can not find version '%s' of package '%s'"
-msgstr "忽略不可用的 %2$s 软件包的 %1$s 版"
+msgstr "找不到 %2$s 软件包的 %1$s 版本"
 
 #: cmdline/apt-get.cc:454
 #, c-format
@@ -342,6 +342,7 @@
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
 msgstr ""
+"该命令已废弃。请用‘apt-mark auto’或‘apt-mark manual’替代。"
 
 #: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546
 msgid "Internal error, problem resolver broke stuff"
@@ -370,20 +371,20 @@
 "%s\n"
 
 #: cmdline/apt-get.cc:791
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Please use:\n"
 "bzr branch %s\n"
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 "请使用:\n"
-"bzr get %s\n"
+"bzr branch %s\n"
 "获得该软件包的最近更新(可能尚未正式发布)。\n"
 
 #: cmdline/apt-get.cc:843
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
-msgstr "忽略已下载过的文件“%s”\n"
+msgstr "忽略已下载的文件“%s”\n"
 
 #: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872
 #: apt-private/private-install.cc:187 apt-private/private-install.cc:190
@@ -457,6 +458,8 @@
 "No architecture information available for %s. See apt.conf(5) APT::"
 "Architectures for setup"
 msgstr ""
+"找不到关于 %s 的有效体系结构信息。请参见 apt.conf(5) APT::"
+"Architectures for setup"
 
 #: cmdline/apt-get.cc:1079 cmdline/apt-get.cc:1082
 #, c-format
@@ -469,11 +472,11 @@
 msgstr " %s 没有构建依赖关系信息。\n"
 
 #: cmdline/apt-get.cc:1272
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
 "packages"
-msgstr "由于无法找到软件包 %3$s ,因此不能满足 %2$s 所要求的 %1$s 依赖关系"
+msgstr "由于 %3$s 不被软件包 %4$s 所允许,因此不能满足 %2$s 所要求的 %1$s 依赖关系"
 
 #: cmdline/apt-ge

Bug#766170: zh_CN PO update for apt

2014-10-21 Thread lumin
I have also made some help messages of apt* aligned,
so they are better to read.
see those patch.

thanks.
-- 
Regards,
  C.D.Luminate
--- apt.cc.bak	2014-10-21 14:18:47.0 +
+++ apt.cc	2014-10-21 14:18:31.982275514 +
@@ -48,17 +48,19 @@
   "\n"
   "CLI for apt.\n"
   "Basic commands: \n"
-  " list - list packages based on package names\n"
-  " search - search in package descriptions\n"
-  " show - show package details\n"
+  " list - list packages based on package names\n"
+  " search   - search in package descriptions\n"
+  " show - show package details\n"
   "\n"
-  " update - update list of available packages\n"
+  " update   - update list of available packages\n"
   "\n"
-  " install - install packages\n"
-  " remove  - remove packages\n"
+  " install  - install packages\n"
+  " remove   - remove packages\n"
   "\n"
-  " upgrade - upgrade the system by installing/upgrading packages\n"
-  " full-upgrade - upgrade the system by removing/installing/upgrading packages\n"
+  " upgrade  - upgrade the system by\n"
+  "  installing/upgrading packages\n"
+  " full-upgrade - upgrade the system by\n"
+  "  removing/installing/upgrading packages\n"
   "\n"
   " edit-sources - edit the source information file\n"
);
--- apt-cache.cc.bak	2014-10-21 14:19:49.705148700 +
+++ apt-cache.cc	2014-10-21 14:20:37.096480973 +
@@ -1756,20 +1756,20 @@
   "\n"
   "Commands:\n"
   "   gencaches - Build both the package and source cache\n"
-  "   showpkg - Show some general information for a single package\n"
-  "   showsrc - Show source records\n"
-  "   stats - Show some basic statistics\n"
-  "   dump - Show the entire file in a terse form\n"
+  "   showpkg   - Show some general information for a single package\n"
+  "   showsrc   - Show source records\n"
+  "   stats - Show some basic statistics\n"
+  "   dump  - Show the entire file in a terse form\n"
   "   dumpavail - Print an available file to stdout\n"
-  "   unmet - Show unmet dependencies\n"
-  "   search - Search the package list for a regex pattern\n"
-  "   show - Show a readable record for the package\n"
-  "   depends - Show raw dependency information for a package\n"
-  "   rdepends - Show reverse dependency information for a package\n"
-  "   pkgnames - List the names of all packages in the system\n"
-  "   dotty - Generate package graphs for GraphViz\n"
-  "   xvcg - Generate package graphs for xvcg\n"
-  "   policy - Show policy settings\n"
+  "   unmet - Show unmet dependencies\n"
+  "   search- Search the package list for a regex pattern\n"
+  "   show  - Show a readable record for the package\n"
+  "   depends   - Show raw dependency information for a package\n"
+  "   rdepends  - Show reverse dependency information for a package\n"
+  "   pkgnames  - List the names of all packages in the system\n"
+  "   dotty - Generate package graphs for GraphViz\n"
+  "   xvcg  - Generate package graphs for xvcg\n"
+  "   policy- Show policy settings\n"
   "\n"
   "Options:\n"
   "  -h   This help text.\n"
--- apt-get.cc.bak	2014-10-21 14:13:18.0 +
+++ apt-get.cc	2014-10-21 14:12:57.927732830 +
@@ -1639,21 +1639,24 @@
   "and install.\n"   
   "\n"
   "Commands:\n"
-  "   update - Retrieve new lists of packages\n"
-  "   upgrade - Perform an upgrade\n"
-  "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
-  "   remove - Remove packages\n"
-  "   autoremove - Remove automatically all unused packages\n"
-  "   purge - Remove packages and config files\n"
-  "   source - Download source archives\n"
-  "   build-dep - Configure build-dependencies for source packages\n"
-  "   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
+  "   update  - Retrieve new lists of packages\n"
+  "   upgrade - Perform an upgrade\n"
+  "   install - Install new packages\n"
+  " (pkg is libc6 not libc6.deb)\n"
+  "   remove  - Remove packages\n"
+  "   autoremove  - Remove automatically all unused packages\n"
+  "   purge   - Remove packages and config files\n"
+  "   source  - Download source archives\n"
+  "   build-dep   - Configure build-dependencies for source packages\n"
+  "   dist-upgrade- Distribution upgrade, see apt-get(8)\n"
   "   dselect-upgrade - Follow dselect selections\n"
-  "   clean - Erase downloaded archive files\n"
-  "   autoclean - Erase old downloaded archive files\n"
-  "   check - Verify that there are no broken dependencies\n"
-  "   changelog - Download and display the changelog for th

Bug#766170: zh_CN PO update for apt

2014-10-21 Thread lumin
Package: apt
Version: 1.0.9.3
Tags: patch
Severity: whishlist
X-Debbugs-CC: debian-l10n-chin...@lists.debian.org

I did some changes on zh_CN.po of apt.
  * word modification
  * translation
  * correction

The work is based on
ca3fb0039db3f87b9860618116a7ed896be576e7
The translation is not 100% done now.

And for that patch, msgfmt say it is OK.

BTW, could someone please describe what the
"Meep" is? so I can find some local word to express the meaning.
> This APT helper has Super Meep Powers.

Thanks :)
-- 
Regards,
  C.D.Luminate
--- zh_CN.po.bak	2014-10-21 08:38:53.766857208 +
+++ zh_CN.po	2014-10-21 09:46:03.024185341 +
@@ -4,6 +4,7 @@
 # Tchaikov , 2005, 2007.
 # Carlos Z.F. Liu , 2004, 2006.
 # Aron Xu , 2009, 2010.
+# Zhou Mo , 2014.
 #
 msgid ""
 msgstr ""
@@ -11,7 +12,7 @@
 "Report-Msgid-Bugs-To: APT Development Team \n"
 "POT-Creation-Date: 2014-09-09 20:35+0200\n"
 "PO-Revision-Date: 2010-08-26 14:42+0800\n"
-"Last-Translator: Aron Xu \n"
+"Last-Translator: Zhou Mo \n"
 "Language-Team: Chinese (simplified) \n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
@@ -111,7 +112,7 @@
 
 #: cmdline/apt-cache.cc:1421
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
-msgstr ""
+msgstr "该命令已废弃。请使用‘apt-mark showauto’代替。"
 
 #: cmdline/apt-cache.cc:1516 apt-pkg/cacheset.cc:596
 #, c-format
@@ -259,6 +260,9 @@
 "See 'man apt-cdrom' for more information about the CD-ROM auto-detection and "
 "mount point."
 msgstr ""
+"从默认挂载点自动检测 CD-ROM 失败。\n"
+"您可以尝试用 --cdrom 选项来设置 CD-ROM 的挂载点。\n"
+"更多关于 CD-ROM 自动检测以及挂载点的信息,请参见‘man apt-cdrom’。"
 
 #: cmdline/apt-cdrom.cc:182
 msgid "Repeat this process for the rest of the CDs in your set."
@@ -297,14 +301,14 @@
 "  -o=? 设置任意指定的配置选项,例如:-o dir::cache=/tmp\n"
 
 #: cmdline/apt-get.cc:245
-#, fuzzy, c-format
+#, c-format
 msgid "Can not find a package for architecture '%s'"
-msgstr "无法按照正则表达式 %s 找到任何软件包"
+msgstr "找不到‘%s’体系结构下的软件包"
 
 #: cmdline/apt-get.cc:327
-#, fuzzy, c-format
+#, c-format
 msgid "Can not find a package '%s' with version '%s'"
-msgstr "无法按照正则表达式 %s 找到任何软件包"
+msgstr "找不到版本为‘%s’的软件包‘%s’"
 
 #: cmdline/apt-get.cc:330
 #, fuzzy, c-format
@@ -317,9 +321,9 @@
 msgstr "选择 %s 作为源代码包而非 %s\n"
 
 #: cmdline/apt-get.cc:423
-#, fuzzy, c-format
+#, c-format
 msgid "Can not find version '%s' of package '%s'"
-msgstr "忽略不可用的 %2$s 软件包的 %1$s 版"
+msgstr "找不到 %2$s 软件包的 %1$s 版本"
 
 #: cmdline/apt-get.cc:454
 #, c-format
@@ -342,6 +346,7 @@
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
 msgstr ""
+"该命令已废弃。请用‘apt-mark auto’或‘apt-mark manual’替代。"
 
 #: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546
 msgid "Internal error, problem resolver broke stuff"
@@ -370,20 +375,20 @@
 "%s\n"
 
 #: cmdline/apt-get.cc:791
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Please use:\n"
 "bzr branch %s\n"
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 "请使用:\n"
-"bzr get %s\n"
+"bzr branch %s\n"
 "获得该软件包的最近更新(可能尚未正式发布)。\n"
 
 #: cmdline/apt-get.cc:843
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
-msgstr "忽略已下载过的文件“%s”\n"
+msgstr "忽略已下载的文件“%s”\n"
 
 #: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872
 #: apt-private/private-install.cc:187 apt-private/private-install.cc:190
@@ -457,6 +462,8 @@
 "No architecture information available for %s. See apt.conf(5) APT::"
 "Architectures for setup"
 msgstr ""
+"找不到关于 %s 的有效体系结构信息。请参见 apt.conf(5) APT::"
+"Architectures for setup"
 
 #: cmdline/apt-get.cc:1079 cmdline/apt-get.cc:1082
 #, c-format
@@ -469,11 +476,11 @@
 msgstr " %s 没有构建依赖关系信息。\n"
 
 #: cmdline/apt-get.cc:1272
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
 "packages"
-msgstr "由于无法找到软件包 %3$s ,因此不能满足 %2$s 所要求的 %1$s 依赖关系"
+msgstr "由于 %3$s 不被软件包 %4$s 所允许,因此不能满足 %2$s 所要求的 %1$s 依赖关系"
 
 #: cmdline/apt-get.cc:1290
 #, c-format
@@ -616,16 +623,15 @@
 
 #: cmdline/apt-helper.cc:36
 msgid "Need one URL as argument"
-msgstr ""
+msgstr "需要一个 URL 作为参数"
 
 #: cmdline/apt-helper.cc:49
-#, fuzzy
 msgid "Must specify at least one pair url/filename"
-msgstr "要下载源代码,必须指定至少一个对应的软件包"
+msgstr "必须指定至少一对URL或者文件名"
 
 #: cmdline/apt-helper.cc:67
 msgid "Download Failed"
-msgstr ""
+msgstr "下载失败"
 
 #: cmdline/apt-helper.cc:80
 msgid ""
@@ -640,6 +646,17 @@
 "\n"
 "   This APT helper has Super Meep Powers.\n"
 msgstr ""
+"用法: apt-helper [选项] 命令\n"
+"   apt-helper [选项] download-file uri target-path\n"
+"\n"
+"apt-helper 是一个 apt 的内部帮助程序\n"
+"\n"
+"命令:\n"
+"   download-file - 将uri指定的文件下载到指定目标目录\n"
+"   auto-detect-proxy - 用 apt.conf 检测代理设置\n"
+"\n"
+"   This APT helper has Super Meep Powers.\n"
+
 
 #: cmdline/apt-mark.cc:68
 #, fuzzy, c-format
@@ -647,14 +664,14 @@
 msgstr "但是它还没有被安装"
 
 #: cmdline/apt-mark.cc:74
-#, fuzzy, c-format
+#, c-format
 msgid "%s was already set to manually installed.\n"
-msgstr "%s 被设置为手动安装。\n"
+msgstr "%s 已经被设置为手动安装。\n"
 
 #: cmdline/apt-mark.cc:76
-#, fuz