From cea4a152f6c7824ec28e27580f2086b7c3e8f87c Mon Sep 17 00:00:00 2001
From: Jeff Law <law@redhat.com>
Date: Thu, 1 May 2014 21:54:33 -0600
Subject: [PATCH] [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
---
 gcc/po/ChangeLog | 7 +++++++
 gcc/po/zh_CN.po  | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/gcc/po/ChangeLog b/gcc/po/ChangeLog
index 7526dda05bd8..a25a90eb4385 100644
--- 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 237e93033d8c..7edfcb457700 100644
--- 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
-- 
2.47.3