git-ref:
e1558a226b101eaabf55e9e5f7c5943550a2e184
I am trying to complete the zh_CN.po file,
only one string left untranslated after this patch,
and no fuzzy any more. the patch includes:
* improvements
* kill the fuzzy-marked ones
the last one is a little embarassing,
I have looked up the enquiry.c in the git repo, at line 440:
> return assert_version_support(argv, &version, _("versioned
Provides"));
and then looked up the Oxford dictionary, but I still can't
make sure what it means, there were many possible meanings...
:(
So could you please describe/explain what
"versioned Provides"
exactly refers?
And just another more question:
if I do another check for it in the future,
should I open a new but or just append to this closed #765693?
On Tue, 2014-10-21 at 10:10 +0200, Guillem Jover wrote:
> Hi!
>
> On Tue, 2014-10-21 at 05:07:00 +0000, lumin wrote:
> > I forgot to change the "last-translator" field, in the former patch...
> > I added it in the patch, and there also are some little fixes.
>
> Ah, perfect, wondered about that, and the name alias, but was not sure
> if you might prefer to use that instead, so didn't ask.
>
> I've merged that now, updated the previous changelog entry with your
> name, and added a .mailmap entry to correct at least «git shortlog».
>
> > that patch is to
> > ee77bc3b16a7f3feb0658193b00d07a57c8aa673
> >
> > msgfmt OK.
>
> There are still some untranslated and fuzzy strings, could you send an
> update for those, so that we can get a fully translated .po file?
>
> Thanks,
> Guillem
--
Regards,
C.D.Luminate
--- zh_CN.po.bak 2014-10-23 14:00:58.000000000 +0000
+++ zh_CN.po 2014-10-23 15:05:22.385236399 +0000
@@ -26,9 +26,9 @@
"Plural-Forms: nplurals=1; plural=0;\n"
#: lib/dpkg/ar.c:78
-#, fuzzy, c-format
+#, c-format
msgid "invalid character '%c' in archive '%.250s' member '%.16s' size"
-msgstr "在归档 %2$.250s 的成员 %3$.16s 中发现无效的字符 '%1$c' 尺寸"
+msgstr "在归档 %2$.250s 的成员 %3$.16s 的尺寸信息中发现无效的字符 '%1$c'"
#: lib/dpkg/ar.c:99 lib/dpkg/ar.c:122 lib/dpkg/ar.c:136 lib/dpkg/ar.c:140
#: lib/dpkg/ar.c:168 utils/update-alternatives.c:1169
@@ -409,10 +409,9 @@
msgstr "次要成分为空的格式版本"
#: lib/dpkg/deb-version.c:65
-#, fuzzy
#| msgid "format version number"
msgid "format version followed by junk"
-msgstr "有多余后缀的格式版本"
+msgstr "格式版本有多余后缀"
#: lib/dpkg/dir.c:50
#, c-format
@@ -1259,10 +1258,9 @@
msgstr "无法打开/创建触发器锁文件 %.250s"
#: lib/dpkg/trigdeferred.l:141
-#, fuzzy
#| msgid "triggered"
msgid "triggers area"
-msgstr "触发区域"
+msgstr "触发器区(area)"
#: lib/dpkg/trigdeferred.l:154
#, c-format
@@ -1416,10 +1414,10 @@
msgstr "从 dpkg-deb 的管道读取数据时出错"
#: src/archives.c:259
-#, fuzzy, c-format
+#, c-format
#| msgid "can't mmap package info file `%.255s'"
msgid "cannot skip padding for file '%.255s': %s"
-msgstr "无法跳过填充文件 %.255s: %s "
+msgstr "无法跳过对文件 %.255s 的填充： %s "
#: src/archives.c:272
#, c-format
@@ -1985,7 +1983,7 @@
#: src/configure.c:241 src/configure.c:245
msgid "conffile shell"
-msgstr ""
+msgstr "conffile shell"
#: src/configure.c:403
#, c-format
@@ -2281,10 +2279,8 @@
msgstr " %.250s 提供了 %.250s 并已存在而且 %s。\n"
#: src/divertcmd.c:53
-#, fuzzy
-#| msgid "Use --help for help about querying packages."
msgid "Use --help for help about diverting files."
-msgstr "使用 --help 查看关于本地修改文件的帮助。"
+msgstr "使用 --help 查看关于分支(diverting)文件的帮助。"
#: src/divertcmd.c:69 src/statcmd.c:57 utils/update-alternatives.c:80
#, c-format
@@ -2408,10 +2404,10 @@
msgstr "改名：移除重复的旧连接 %s"
#: src/divertcmd.c:264
-#, fuzzy, c-format
+#, c-format
#| msgid "unable to open source file `%.250s'"
msgid "unable to remove copied source file '%s'"
-msgstr "无法删除拷贝过的源码文件 %s"
+msgstr "无法删除复制的源码文件 %s"
#: src/divertcmd.c:273 src/divertcmd.c:737
#, c-format
@@ -2459,10 +2455,9 @@
msgstr "--%s 需要一个参数"
#: src/divertcmd.c:436
-#, fuzzy
#| msgid "Cannot divert directories"
msgid "cannot divert directories"
-msgstr "不能本地修改目录"
+msgstr "无法将目录分支(divert)"
#: src/divertcmd.c:449
#, c-format
@@ -2517,10 +2512,10 @@
" 发现了 %s "
#: src/divertcmd.c:600
-#, fuzzy, c-format
+#, c-format
#| msgid "ignoring request to remove %.250s which isn't installed."
msgid "Ignoring request to remove shared diversion '%s'.\n"
-msgstr "忽略删除 %s 的要求，系统没有安装该软件包。\n"
+msgstr "忽略删除共享分支(diversion) %s 的要求。\n"
#: src/divertcmd.c:606
#, c-format
@@ -2718,7 +2713,7 @@
msgstr ""
#: src/enquiry.c:541
-#, fuzzy, c-format
+#, c-format
#| msgid ""
#| "dpkg: cannot see how to satisfy pre-dependency:\n"
#| " %s\n"
@@ -2871,10 +2866,10 @@
msgstr "控制文件 %s 中缺少值"
#: src/filesdb-hash.c:107
-#, fuzzy, c-format
+#, c-format
#| msgid "cannot stat file '%s'"
msgid "control file '%s' missing value separator"
-msgstr "控制文件 %s 中缺少值分隔符"
+msgstr "控制文件 %s 中缺少值之间的分隔符"
#: src/filesdb-hash.c:120
#, c-format
@@ -2948,7 +2943,7 @@
msgstr "在 PATH 环境变量中找不到 %s 或没有可执行权限"
#: src/help.c:143
-#, fuzzy, c-format
+#, c-format
#| msgid "'%s' not found in PATH or not executable."
msgid ""
"%d expected program not found in PATH or not executable\n"
@@ -2957,7 +2952,7 @@
"%d expected programs not found in PATH or not executable\n"
"%s"
msgstr[0] ""
-"%d 在PATH环境变量中找不到该程序或没有可执行权限\n"
+"%d 在环境变量 PATH 中找不到该程序，或不可执行\n"
"%s"
#: src/help.c:146
@@ -2990,10 +2985,10 @@
msgstr "试图打开 %.250s 出错"
#: src/infodb-format.c:56
-#, fuzzy, c-format
+#, c-format
#| msgid "unable to write file '%s'"
msgid "corrupt info database format file '%s'"
-msgstr "损坏的信息数据库格式文件 %s"
+msgstr "损坏的信息库格式文件 %s"
#: src/infodb-format.c:88
#, c-format
@@ -3335,10 +3330,9 @@
msgstr "一般有用的进度信息"
#: src/main.c:288
-#, fuzzy
#| msgid "unable to setenv for maintainer script"
msgid "Invocation and status of maintainer scripts"
-msgstr "维护脚本调用和状态"
+msgstr "维护者脚本的调用和状态"
#: src/main.c:289
msgid "Output for each file processed"
@@ -3370,11 +3364,11 @@
#: src/main.c:296
msgid "Lots of output regarding triggers"
-msgstr "大量关于触发器的输出"
+msgstr "许多有关触发器的输出"
#: src/main.c:297
msgid "Silly amounts of output regarding triggers"
-msgstr "无聊数量的关于触发器的输出"
+msgstr "数量惊人的有关触发器的输出"
#: src/main.c:298
msgid "Lots of drivel about eg the dpkg/info directory"
@@ -3382,7 +3376,7 @@
#: src/main.c:299
msgid "Insane amounts of drivel"
-msgstr "惊人数量的废话"
+msgstr "数量惊世骇俗的废话"
#: src/main.c:312
#, c-format
@@ -3564,10 +3558,10 @@
msgstr " 即将删除 %s。\n"
#: src/packages.c:388
-#, fuzzy, c-format
+#, c-format
#| msgid " Version of %s on system is %s.\n"
msgid " Version of %s on system, provided by %s, is %s.\n"
-msgstr "系统中 %s 的版本，由 %s 提供，是 %s 。\n"
+msgstr "系统中 %s 的版本（由 %s 提供）是 %s 。\n"
#: src/packages.c:401
#, c-format
@@ -3764,10 +3758,10 @@
msgstr "--%s 需要且仅需两个参数"
#: src/querycmd.c:767
-#, fuzzy, c-format
+#, c-format
#| msgid "cannot stat file '%s'"
msgid "control file '%s' does not exist"
-msgstr "主控文件 %s 不存在"
+msgstr "控制文件 %s 不存在"
#: src/querycmd.c:779
#, c-format
@@ -3806,7 +3800,7 @@
"\n"
#: src/querycmd.c:818
-#, fuzzy, c-format
+#, c-format
#| msgid ""
#| "Options:\n"
#| " --admindir=<directory> Use <directory> instead of %s.\n"
@@ -3821,7 +3815,7 @@
msgstr ""
"选项：\n"
" --admindir=<目录> 使用 <目录> 而非 %s。\n"
-" --load-avail 在 --show 可 --list 后使用可用的文件。\n"
+" --load-avail 在 --show 和 --list 之后使用有效文件。\n"
" -f|--showformat=<格式串> 令 --show 使用其它的格式输出。\n"
"\n"
@@ -4081,10 +4075,8 @@
"需要使用前端来进行更新"
#: src/statcmd.c:52
-#, fuzzy
-#| msgid "Use --help for help about querying packages."
msgid "Use --help for help about overriding file stat information."
-msgstr "使用 --help 查看关于凌驾文件属性信息的帮助。"
+msgstr "使用 --help 查看关于凌驾文件状态(stat)的帮助。"
#: src/statcmd.c:77
#, c-format
@@ -4316,7 +4308,7 @@
msgstr "触发器循环，放弃"
#: src/trigproc.c:349
-#, fuzzy, c-format
+#, c-format
#| msgid ""
#| "%s: dependency problems, but removing anyway as you requested:\n"
#| "%s"
@@ -4324,7 +4316,7 @@
"%s: dependency problems, but processing triggers anyway as you requested:\n"
"%s"
msgstr ""
-"%s：有依赖问题，但是如您所愿，将继续卸载：\n"
+"%s：有依赖问题，但是如您所愿，将继续处理触发器：\n"
"%s"
#: src/trigproc.c:359
@@ -4480,10 +4472,10 @@
msgstr "忽略预依赖(pre-dependency)问题！"
#: src/unpack.c:696
-#, fuzzy, c-format
+#, c-format
#| msgid "Preparing to replace %s %s (using %s) ...\n"
msgid "Preparing to unpack %s ...\n"
-msgstr "正准备解压缩 %s ...\n"
+msgstr "正准备解包 %s ...\n"
#: src/unpack.c:767
#, c-format
@@ -4496,19 +4488,18 @@
msgstr "正在反配置 %s (%s) ...\n"
#: src/unpack.c:865
-#, fuzzy, c-format
+#, c-format
#| msgid "Unpacking %s (from %s) ...\n"
msgid "Unpacking %s (%s) ...\n"
-msgstr "正在解压缩 %s (%s) ...\n"
+msgstr "正在解包 %s (%s) ...\n"
#: src/unpack.c:869
-#, fuzzy, c-format
+#, c-format
#| msgid "Unpacking %s (from %s) ...\n"
msgid "Unpacking %s (%s) over (%s) ...\n"
-msgstr "正在解压缩 %s (%s) 于 (%s) 上 ...\n"
+msgstr "正在将 %s (%s) 解包到 (%s) 上 ...\n"
#: src/unpack.c:957
-#, fuzzy
#| msgid "dpkg-deb field extraction"
msgid "package filesystem archive extraction"
msgstr "软件包文件系统归档提取"
@@ -4522,10 +4513,10 @@
msgstr "文件系统的 tar 文件已损坏 - 软件包文件已毁损"
#: src/unpack.c:978
-#, fuzzy, c-format
+#, c-format
#| msgid "dpkg-deb: zap possible trailing zeros"
msgid "cannot zap possible trailing zeros from dpkg-deb: %s"
-msgstr "无法用 dpkg-deb 截去最后的可能的零数据(zeros)：%s"
+msgstr "无法从 dpkg-deb 截去可能是尾随的零数据(zeros)部分：%s"
#: src/unpack.c:1038
#, c-format
@@ -4707,10 +4698,9 @@
msgstr "目标是一个目录 - 无法忽略主控文件的检查步骤"
#: dpkg-deb/build.c:436
-#, fuzzy
#| msgid "not checking contents of control area."
msgid "not checking contents of control area"
-msgstr "不检查控制区域的内容"
+msgstr "不检查控制区(area)的内容"
#: dpkg-deb/build.c:437
#, c-format
@@ -5174,10 +5164,10 @@
msgstr "无效的压缩参数：%s"
#: dpkg-deb/main.c:269
-#, fuzzy, c-format
+#, c-format
#| msgid "unknown compression type `%s'!"
msgid "unsupported compression type '%s' with uniform compression"
-msgstr "不支持均匀压缩的压缩类型 %s "
+msgstr "不支持均匀压缩的压缩类型 %s"
#: dpkg-split/info.c:55
#, c-format
@@ -5392,10 +5382,10 @@
msgstr "无法(重新)打开作为输入的分块文件 %.250s"
#: dpkg-split/join.c:60
-#, fuzzy, c-format
+#, c-format
#| msgid "Skipping deselected package %s.\n"
msgid "cannot skip split package header for '%s': %s"
-msgstr "无法跳过 %s 分割的软件包头: %s"
+msgstr "无法跳过分割的软件包 %s 的头部: %s"
#: dpkg-split/join.c:63
#, c-format
@@ -5477,6 +5467,10 @@
" 1 = with --auto, file is not a part\n"
" 2 = trouble\n"
msgstr ""
+"退出状态：\n"
+" 0 = ok\n"
+" 1 = 有 --auto 选项，文件不是一个分块\n"
+" 2 = 有问题\n"
#: dpkg-split/main.c:104
msgid "Type dpkg-split --help for help."
@@ -5602,10 +5596,9 @@
msgstr "已将 %s 删除。\n"
#: dpkg-split/split.c:72 dpkg-split/split.c:85
-#, fuzzy
#| msgid "dpkg-deb field extraction"
msgid "package field value extraction"
-msgstr "软件包域值释放"
+msgstr "软件包字段值提取"
#: dpkg-split/split.c:79
#, c-format
@@ -6006,28 +5999,28 @@
msgstr "正在设置 %s 的自动选择"
#: utils/update-alternatives.c:2277
-#, fuzzy, c-format
+#, c-format
#| msgid "renaming %s slave link from %s to %s."
msgid "renaming %s slave link from %s to %s"
-msgstr "正在将次要链接 %s 的名称从 %s 改成 %s"
+msgstr "正在将从链接(slave) %s 从 %s 重命名为 %s"
#: utils/update-alternatives.c:2298
-#, fuzzy, c-format
+#, c-format
#| msgid "renaming %s link from %s to %s."
msgid "renaming %s link from %s to %s"
-msgstr "正在将链接 %s 的名称从 %s 改成 %s。"
+msgstr "正在将链接 %s 从 %s 重命名为 %s"
#: utils/update-alternatives.c:2335
-#, fuzzy, c-format
+#, c-format
#| msgid "using %s to provide %s (%s) in %s"
msgid "using %s to provide %s (%s) in auto mode"
-msgstr "使用 %1$s 来在 %4$s 中提供 %2$s (%3$s)"
+msgstr "使用 %1$s 来在自动模式中提供 %2$s (%3$s)"
#: utils/update-alternatives.c:2338
-#, fuzzy, c-format
+#, c-format
#| msgid "using %s to provide %s (%s) in %s"
msgid "using %s to provide %s (%s) in manual mode"
-msgstr "使用 %1$s 来在 %4$s 中提供 %2$s (%3$s)"
+msgstr "使用 %1$s 来在手动模式中提供 %2$s (%3$s)"
#: utils/update-alternatives.c:2346
#, c-format
@@ -6061,10 +6054,10 @@
msgstr "替换路径不是绝对路径，它应该是绝对路径：%s"
#: utils/update-alternatives.c:2432
-#, fuzzy, c-format
+#, c-format
#| msgid "alternative %s can't be master: %s"
msgid "alternative %s can't be master: it is a slave of %s"
-msgstr "候选项 %s 不能是主要项：它是 %s 的从属"
+msgstr "候选项 %s 不能是主项：它是 %s 的从项"
#: utils/update-alternatives.c:2440 utils/update-alternatives.c:2476
#, c-format
@@ -6077,16 +6070,16 @@
msgstr "候选项路径 %s 不存在"
#: utils/update-alternatives.c:2463
-#, fuzzy, c-format
+#, c-format
#| msgid "alternative %s can't be slave of %s: %s"
msgid "alternative %s can't be slave of %s: it is a master alternative"
-msgstr "候选项 %s 不能作为 %s 的次要项：它是主要项 %s"
+msgstr "候选项 %s 不能作 %s 的从项：它是一个主项"
#: utils/update-alternatives.c:2467
-#, fuzzy, c-format
+#, c-format
#| msgid "alternative %s can't be master: %s"
msgid "alternative %s can't be slave of %s: it is a slave of %s"
-msgstr "候选项 %s 不能是主要项：它是 %s 的从属"
+msgstr "候选项 %s 不能作 %s 的从项：它是 %s 的从项"
#: utils/update-alternatives.c:2487
#, c-format
