diff mbox

Fix a typo in Chinese msg

Message ID 535968CE.7090000@net-b.de
State New
Headers show

Commit Message

Tobias Burnus April 24, 2014, 7:41 p.m. UTC
Jeff Law wrote:
> On 04/24/14 01:23, Jincheng Miao wrote:
>> There is a minor typo in zh_CN.po, should change '-pic' to '-fpic'.

Thanks for the patch

> Thanks.  Applied to the trunk.

Jeff, are you sure that this will not be overridden? I think the 
translations are always synced from 
http://translationproject.org/team/zh_CN.html ?

In any case, I have now CCed the zn_CN translators.

Tobias


PS: Miao Jincheng's patch fixes the typo "-pic" → "-fpic":

Comments

Joseph Myers May 1, 2014, 11:59 p.m. UTC | #1
On Thu, 24 Apr 2014, Tobias Burnus wrote:

> Jeff, are you sure that this will not be overridden? I think the translations
> are always synced from http://translationproject.org/team/zh_CN.html ?

Yes.  This should be reverted; we shouldn't make any local changes to 
these files.  When there's a new zh_CN.po from the TP (whether resulting 
from changes by translators, or an automatic merge with a new .pot file), 
that will be imported verbatim (to both trunk and 4.9 branch), whether or 
not it includes this change.
Jeff Law May 2, 2014, 3:55 a.m. UTC | #2
On 05/01/14 17:59, Joseph S. Myers wrote:
> On Thu, 24 Apr 2014, Tobias Burnus wrote:
>
>> Jeff, are you sure that this will not be overridden? I think the translations
>> are always synced from http://translationproject.org/team/zh_CN.html ?
>
> Yes.  This should be reverted; we shouldn't make any local changes to
> these files.  When there's a new zh_CN.po from the TP (whether resulting
> from changes by translators, or an automatic merge with a new .pot file),
> that will be imported verbatim (to both trunk and 4.9 branch), whether or
> not it includes this change.
OK.  Sorry about that.  Reverted.

What's the procedure to contact the translators so they can fix this?

jeff
Joseph Myers May 2, 2014, 5:50 p.m. UTC | #3
On Thu, 1 May 2014, Jeff Law wrote:

> On 05/01/14 17:59, Joseph S. Myers wrote:
> > On Thu, 24 Apr 2014, Tobias Burnus wrote:
> > 
> > > Jeff, are you sure that this will not be overridden? I think the
> > > translations
> > > are always synced from http://translationproject.org/team/zh_CN.html ?
> > 
> > Yes.  This should be reverted; we shouldn't make any local changes to
> > these files.  When there's a new zh_CN.po from the TP (whether resulting
> > from changes by translators, or an automatic merge with a new .pot file),
> > that will be imported verbatim (to both trunk and 4.9 branch), whether or
> > not it includes this change.
> OK.  Sorry about that.  Reverted.
> 
> What's the procedure to contact the translators so they can fix this?

Contact the address for the translation team given in the .po file.  
Unfortunately I got a bounce message in Chinese; maybe it indicates it's a 
subscriber-posting-only mailing list, which seems unfortunate.
diff mbox

Patch

Index: gcc/po/zh_CN.po
===================================================================
--- gcc/po/zh_CN.po (revision 209734)
+++ gcc/po/zh_CN.po (working copy)
@@ -24308,7 +24308,7 @@  msgstr "堆栈探针目前需要框架æ
  #: config/i386/i386.c:4108
  #, gcc-internal-format
  msgid "-mfentry isn%'t supported for 32-bit in combination with -fpic"
-msgstr "-mfentry 在 32 位下不能和 -pic 同时使用"
+msgstr "-mfentry 在 32 位下不能和 -fpic 同时使用"

  #: config/i386/i386.c:4115
  #, gcc-internal-format