Bug#958437: dpkg: [INTL:zh_CN] Simplified Chinese translation update (rebased)

2020-06-15 Thread Boyuan Yang
Hi,

在 2020-06-15星期一的 05:08 +0200,Guillem Jover写道:
> Hi!
> 
> On Sun, 2020-06-14 at 21:51:46 -0400, Boyuan Yang wrote:
> > On Tue, 21 Apr 2020 21:44:40 -0400 Boyuan Yang wrote:
> > > (With my Debian Chinese Team member hat on) Please find the updated
> > Simplified
> > > Chinese translation for dpkg in the attachment. This updated PO file
> > should be
> > > applied in the "master" branch (i.e. the trunk development branch
> > following
> > > 1.20.0 tag).
> > 
> > In 
> > https://git.dpkg.org/cgit/dpkg/dpkg.git/commit/?id=23aea35bc12fbfe3cf49057c7fc4f942fc355708
> >  I found that the PO files in dpkg master branch has been refreshed
> > again. As a result, I'm preparing a rebased PO file against current
> > dpkg HEAD. Please find the updated file in the attachment.
> 
> Oh sorry about that! I had lost track of this one I'm afraid. :`(
> (Even though I then tend to check for any such l10n bug just before a
> release.) I've merged this now locally, will be included in my next push.

Thanks for the quick response!

> > Could this file be merged in dpkg repo soon? If the POT/PO files get
> > updated again, I will have to rebase all my previous work against the
> > new PO file again, which is quite troublesome.
> 
> Please let me know in the future if I ever miss something like this
> again, and I'll gladly do the merge myself. I do hope you didn't do the
> bulk of the merge manually though and used something like msgmerge to
> do that (at least that's what I'd have used)?

I used msgmerge but also manually diff-ed and reviewed again. A double review
would always be good :) Thanks!

-- 
Regards,
Boyuan Yang


signature.asc
Description: This is a digitally signed message part


Bug#958437: dpkg: [INTL:zh_CN] Simplified Chinese translation update (rebased)

2020-06-15 Thread Guillem Jover
Hi!

On Sun, 2020-06-14 at 21:51:46 -0400, Boyuan Yang wrote:
> On Tue, 21 Apr 2020 21:44:40 -0400 Boyuan Yang wrote:
> > (With my Debian Chinese Team member hat on) Please find the updated
> Simplified
> > Chinese translation for dpkg in the attachment. This updated PO file
> should be
> > applied in the "master" branch (i.e. the trunk development branch
> following
> > 1.20.0 tag).
> 
> In 
> https://git.dpkg.org/cgit/dpkg/dpkg.git/commit/?id=23aea35bc12fbfe3cf49057c7fc4f942fc355708
>  I found that the PO files in dpkg master branch has been refreshed
> again. As a result, I'm preparing a rebased PO file against current
> dpkg HEAD. Please find the updated file in the attachment.

Oh sorry about that! I had lost track of this one I'm afraid. :`(
(Even though I then tend to check for any such l10n bug just before a
release.) I've merged this now locally, will be included in my next push.

> Could this file be merged in dpkg repo soon? If the POT/PO files get
> updated again, I will have to rebase all my previous work against the
> new PO file again, which is quite troublesome.

Please let me know in the future if I ever miss something like this
again, and I'll gladly do the merge myself. I do hope you didn't do the
bulk of the merge manually though and used something like msgmerge to
do that (at least that's what I'd have used)?

Thanks,
Guillem