[multiple changes]

2014-05-01  Jeff Law  <law@redhat.com>

	* Revert:
	2014-04-24  Jincheng Miao  <jincheng.miao@gmail.com>

	* zh_CN.po: Fix typo for -mfentry.

From-SVN: r209997

diff --git a/gcc/po/ChangeLog b/gcc/po/ChangeLog
index 7526dda05bd80b5766b658c6a2e507490393e7f3..a25a90eb43858c92d50f5170df1831d9745110a6 100644 (file)
--- a/gcc/po/ChangeLog
+++ b/gcc/po/ChangeLog
@@ -1,3 +1,10 @@
+2014-05-01  Jeff Law  <law@redhat.com>
+
+       * Revert:
+       2014-04-24  Jincheng Miao  <jincheng.miao@gmail.com>
+
+       * zh_CN.po: Fix typo for -mfentry.
+
 2014-05-01  Joseph Myers  <joseph@codesourcery.com>
 
        * sv.po: Update.

diff --git a/gcc/po/zh_CN.po b/gcc/po/zh_CN.po
index 237e93033d8cbd91e1ca7e4af9cbfab165e987bc..7edfcb45770096a97874e0d9ee18365abfb9336a 100644 (file)
--- a/gcc/po/zh_CN.po
+++ b/gcc/po/zh_CN.po
@@ -24308,7 +24308,7 @@ msgstr "堆栈探针目前需要框架指针或 %saccumulate-outgoing-args%s 来
 #: config/i386/i386.c:4108
 #, gcc-internal-format
 msgid "-mfentry isn%'t supported for 32-bit in combination with -fpic"
-msgstr "-mfentry 在 32 位下不能和 -fpic 同时使用"
+msgstr "-mfentry 在 32 位下不能和 -pic 同时使用"
 
 #: config/i386/i386.c:4115
 #, gcc-internal-format