Bug#765693: Trying complete (Was: Re: Bug#765693: the last bit of this bug)

2014-10-23 Thread lumin
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 +, 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.0 +
+++ zh_CN.po	2014-10-23 15:05:22.385236399 +
@@ -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 

Bug#765693: Trying complete (Was: Re: Bug#765693: the last bit of this bug)

2014-10-23 Thread Guillem Jover
Hi!

On Thu, 2014-10-23 at 15:26:13 +, lumin wrote:
 I am trying to complete the zh_CN.po file,

Cool, thanks!

 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?

It means that the Provides field supports versioned relationships,
as in for example:

  ,---
  Provides: package (= 1.0)
  `---

Please feel free to ask questions (on debian-d...@lists.debian.org)
about any English string that seems confusing or difficult to translate,
sometimes the problem is actually in the original string.

 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?

Yes a new bug report is better, as this one has already been marked as
closed with the upload that included your updates.

Here are some comments, trying to possibly clarify what might have
possibly been confusing:

 --- zh_CN.po.bak  2014-10-23 14:00:58.0 +
 +++ zh_CN.po  2014-10-23 15:05:22.385236399 +
 @@ -26,9 +26,9 @@
  #: lib/dpkg/trigdeferred.l:141
 -#, fuzzy
  #| msgid triggered
  msgid triggers area
 -msgstr 触发区域
 +msgstr 触发器区(area)

This is the area in the dpkg database where triggers are stored.

I should probably add comments for translator in the code for several
of those.

 @@ -1985,7 +1983,7 @@
  #: src/configure.c:241 src/configure.c:245
  msgid conffile shell
 -msgstr 
 +msgstr conffile shell

Ideally, this would need to be translated too. This is the command
line shell started to deal with the conffile modifications.

 @@ -2281,10 +2279,8 @@
  #: 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)文件的帮助。

Diverting here is about dpkg-divert, and diverting files from their
original place to an alternative one so that other packages can
install a file in the same original place instead.

 @@ -2459,10 +2455,9 @@
  #: src/divertcmd.c:436
 -#, fuzzy
  #| msgid Cannot divert directories
  msgid cannot divert directories
 -msgstr 不能本地修改目录
 +msgstr 无法将目录分支(divert)

Same here.

 @@ -2517,10 +2512,10 @@
  #: 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

Ditto.

 @@ -4522,10 +4513,10 @@
  #: 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

This is about dpkg-deb output containing trailing bytes with a zero
binary value.

 @@ -4707,10 +4698,9 @@
  #: dpkg-deb/build.c:436
 -#, fuzzy
  #| msgid not checking contents of control area.
  msgid not checking contents of control area
 -msgstr 不检查控制区域的内容
 +msgstr 不检查控制区(area)的内容

This is about the control directory containing the files to be placed
in the .deb file control member.

 @@ -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

Ok here, means that everything went well.

 @@ -6006,28 +5999,28 @@
  #: 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

A slave link is one that is subject and dependant to changes to its
master link.

Thanks,
Guillem


-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



Bug#765693: the last bit of this bug

2014-10-21 Thread Guillem Jover
Hi!

On Tue, 2014-10-21 at 05:07:00 +, 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


-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



Bug#765693: the last bit of this bug

2014-10-21 Thread lumin
On Tue, 2014-10-21 at 10:09 +0200, Guillem Jover wrote:
 Hi!
 
 On Tue, 2014-10-21 at 05:07:00 +, 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».

Thanks for the changes :)

  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?

I clearly see that, and I just feel confused to some strings, i.e. hard
to understand, and some are very hard for me to translate.
So I keeped those fuzzy marks at that time and left some strings
untranslated, for those strings that I was not sure.

I'm willing to make it 100% done, but some sentences really stuck me,
:(  
so, you know ... Let me try it again in the future.

 Thanks,
 Guillem

-- 
Regards,
  C.D.Luminate


-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



Bug#765693: the last bit of this bug

2014-10-20 Thread lumin
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.

that patch is to
ee77bc3b16a7f3feb0658193b00d07a57c8aa673

msgfmt OK.

thank you.

On Mon, 2014-10-20 at 15:04 +, Guillem Jover wrote:
 tag 765693 pending
 thanks
 
 Hello,
 
 Bug #765693 reported by you has been fixed in the Git repository. You can
 see the changelog below, and you can check the diff of the fix at:
 
 http://git.debian.org/?p=dpkg/dpkg.git;a=commitdiff;h=af9a54d
 
 ---
 commit af9a54d1f985a3c513adda9a44e4cc3bf7240ab3
 Author: lumin cdlumin...@gmail.com
 Date:   Sat Oct 18 23:30:21 2014 +0200
 
 po: Update Simplified Chinese programs translation
 
 Closes: #765693
 
 Signed-off-by: Guillem Jover guil...@debian.org
 
 diff --git a/debian/changelog b/debian/changelog
 index 934c960..7b2cad6 100644
 --- a/debian/changelog
 +++ b/debian/changelog
 @@ -11,6 +11,7 @@ dpkg (1.17.19) UNRELEASED; urgency=low
[ Updated programs translations ]
* Italian (Milo Casagrande): Closes: #765748
* Turkish (Mert Dirik). Closes: #764942
 +  * Simplified Chinese (lumin). Closes: #765693
  
[ Updated scripts translations ]
* German (Helge Kreutzmann).

-- 
Regards,
  C.D.Luminate
--- zh_CN.po.bak	2014-10-21 04:50:49.0 +
+++ zh_CN.po	2014-10-21 04:59:51.339682912 +
@@ -9,6 +9,7 @@
 # Anthony Wong ypw...@debian.org.hk, 2007.
 # Deng Xiyue manphiz-gu...@users.alioth.debian.org, 2007, 2008, 2009.
 # Aron Xu happyaron...@gmail.com, 2009, 2010.
+# Zhou Mo cdlumin...@gmail.com, 2014.
 #
 msgid 
 msgstr 
@@ -16,7 +17,7 @@
 Report-Msgid-Bugs-To: debian-d...@lists.debian.org\n
 POT-Creation-Date: 2014-10-20 15:20+0200\n
 PO-Revision-Date: 2010-12-18 02:26+0100\n
-Last-Translator: Aron Xu happyaron...@gmail.com\n
+Last-Translator: Zhou Mo cdlumin...@gmail.com\n
 Language-Team: Chinese (simplified) i18n...@googlegroups.com\n
 Language: zh_CN\n
 MIME-Version: 1.0\n
@@ -1688,7 +1689,7 @@
 msgstr 好的,将反配置 %s (被 %s 破坏)。
 
 #: src/archives.c:1395 src/archives.c:1518
-#, fuzzy, c-format
+#, c-format
 #| msgid 
 #| dpkg: regarding %s containing %s:\n
 #| %s
@@ -1697,7 +1698,7 @@
 %s
 msgstr 
 关于含有 %2$s 的 %1$s:\n
-%s
+%3$s
 
 #: src/archives.c:1403
 msgid ignoring breakage, may proceed anyway!
@@ -4028,12 +4029,12 @@
 
 #: src/script.c:357
 msgid ... it looks like that went OK
-msgstr ... 看起来它没有问题
+msgstr ... 它看起来没有问题
 
 #: src/select.c:147
 #, c-format
 msgid unexpected eof in package name at line %d
-msgstr 在第 %d 行的软件包名中发现了 eof,这出乎我们的意料
+msgstr 在第 %d 行的软件包名中发现了文件结束符,这出乎我们的意料
 
 #: src/select.c:148
 #, c-format
@@ -4043,7 +4044,7 @@
 #: src/select.c:154
 #, c-format
 msgid unexpected eof after package name at line %d
-msgstr 在第 %d 行的软件包名后发现 eof,这出乎我们的意料
+msgstr 在第 %d 行的软件包名后发现文件结束符,这出乎我们的意料
 
 #: src/select.c:155
 #, c-format
@@ -4079,6 +4080,8 @@
 found unknown packages; this might mean the available database\n
 is outdated, and needs to be updated through a frontend method
 msgstr 
+发现未知的软件包;这可能意味着可用的数据库已过期,\n
+需要使用前端来进行更新
 
 #: src/statcmd.c:52
 #, fuzzy