update for 4.2.3 rc1

and force-fix errors using pocheck

Change-Id: Ib0aa51688cb2bc9586f79d9ef32c99848bcdec2d

4 files changed, 54 insertions, 23 deletions

diff --git a/source/zh-CN/desktop/source/app.po b/source/zh-CN/desktop/source/app.po
index cdb8bf49288..cf9eac71289 100644
--- a/source/zh-CN/desktop/source/app.po
+++ b/source/zh-CN/desktop/source/app.po
@@ -4,17 +4,17 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"
 "POT-Creation-Date: 2013-11-20 13:01+0100\n"
-"PO-Revision-Date: 2012-12-06 02:56+0000\n"
-"Last-Translator: Dean <xslidian@gmail.com>\n"
+"PO-Revision-Date: 2014-03-03 08:37+0000\n"
+"Last-Translator: 琨珑 <suokunlong@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: LibreOffice\n"
+"X-Generator: Pootle 2.5.0\n"
 "X-Accelerator-Marker: ~\n"
-"X-POOTLE-MTIME: 1354762580.0\n"
+"X-POOTLE-MTIME: 1393835864.0\n"
 
 #: desktop.src
 msgctxt ""
@@ -126,7 +126,7 @@ msgctxt ""
 "STR_BOOTSTRAP_ERR_USERINSTALL_FAILED\n"
 "string.text"
 msgid "User installation could not be completed. "
-msgstr ""
+msgstr "安装无法完成。"
 
 #: desktop.src
 msgctxt ""
@@ -142,7 +142,7 @@ msgctxt ""
 "STR_BOOTSTRAP_ERR_MULTISESSION\n"
 "string.text"
 msgid "You have another instance running in a different terminal session. Close that instance and then try again."
-msgstr ""
+msgstr "在另一个终端会话中有另一个实例在运行。请关闭该实例后重试。"
 
 #: desktop.src
 msgctxt ""
@@ -220,7 +220,7 @@ msgctxt ""
 "STR_LO_MUST_BE_RESTARTED\n"
 "string.text"
 msgid "LibreOffice must unfortunately be manually restarted once after installation or update."
-msgstr ""
+msgstr "在安装或更新后，LibreOffice必须得手动重启一次。"
 
 #: desktop.src
 msgctxt ""
diff --git a/source/zh-CN/desktop/source/deployment/gui.po b/source/zh-CN/desktop/source/deployment/gui.po
index 2ba087858a1..764a31f1df1 100644
--- a/source/zh-CN/desktop/source/deployment/gui.po
+++ b/source/zh-CN/desktop/source/deployment/gui.po
@@ -4,17 +4,17 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"
 "POT-Creation-Date: 2013-11-20 13:01+0100\n"
-"PO-Revision-Date: 2013-06-11 14:06+0000\n"
-"Last-Translator: Dean <xslidian@gmail.com>\n"
+"PO-Revision-Date: 2014-03-03 08:40+0000\n"
+"Last-Translator: 琨珑 <suokunlong@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: LibreOffice\n"
+"X-Generator: Pootle 2.5.0\n"
 "X-Accelerator-Marker: ~\n"
-"X-POOTLE-MTIME: 1370959618.0\n"
+"X-POOTLE-MTIME: 1393836021.0\n"
 
 #: dp_gui_dependencydialog.src
 msgctxt ""
@@ -228,7 +228,7 @@ msgctxt ""
 "FT_LICENSE_BODY_1_TXT\n"
 "fixedtext.text"
 msgid "Read the complete License Agreement. Use the scroll bar or the 'Scroll Down' button in this dialog to view the entire license text."
-msgstr ""
+msgstr "阅读完整的许可协议。要阅读完整的许可文本，请使用本对话框的滚动条或者“向下滑动“按钮。"
 
 #: dp_gui_dialog.src
 msgctxt ""
@@ -246,7 +246,7 @@ msgctxt ""
 "FT_LICENSE_BODY_2_TXT\n"
 "fixedtext.text"
 msgid "Accept the License Agreement for the extension by pressing the 'Accept' button."
-msgstr ""
+msgstr "点击”接受“按钮以接受该扩展的许可协议。"
 
 #: dp_gui_dialog.src
 msgctxt ""
@@ -310,6 +310,9 @@ msgid ""
 "Click 'OK' to proceed with the installation.\n"
 "Click 'Cancel' to stop the installation."
 msgstr ""
+"您将要安装扩展：'%NAME'.\n"
+"点击”确定“继续安装。\n"
+"点击”取消“结束安装。\n"
 
 #: dp_gui_dialog.src
 msgctxt ""
@@ -321,6 +324,9 @@ msgid ""
 "Click 'OK' to remove the extension.\n"
 "Click 'Cancel' to stop removing the extension."
 msgstr ""
+"您将要卸载扩展 '%NAME'.\n"
+"点击”确定“以卸载该扩展。\n"
+"点击\"取消\"结束卸载。"
 
 #: dp_gui_dialog.src
 msgctxt ""
@@ -783,6 +789,10 @@ msgid ""
 "Click 'OK' to replace the installed extension.\n"
 "Click 'Cancel' to stop the installation."
 msgstr ""
+"您将要安装扩展'$NAME'的$NEW版本。\n"
+"较新的版本$DEPLOYED已经安装。\n"
+"点击”确定“替换已安装的版本。\n"
+"点击”取消“结束安装。"
 
 #: dp_gui_versionboxes.src
 msgctxt ""
@@ -795,6 +805,10 @@ msgid ""
 "Click 'OK' to replace the installed extension.\n"
 "Click 'Cancel' to stop the installation."
 msgstr ""
+"您将要安装扩展'$NAME'的$NEW版本。\n"
+"名称为'$OLDNAME'的较新的版本$DEPLOYED已经安装。\n"
+"点击”确定“以替换已安装版本。\n"
+"点击”取消“结束安装。"
 
 #: dp_gui_versionboxes.src
 msgctxt ""
@@ -807,6 +821,10 @@ msgid ""
 "Click 'OK' to replace the installed extension.\n"
 "Click 'Cancel' to stop the installation."
 msgstr ""
+"您将要安装扩展'$NAME'的$NEW版本。\n"
+"该版本已经安装。\n"
+"点击”确定“以替换已安装版本。\n"
+"点击”取消“结束安装。"
 
 #: dp_gui_versionboxes.src
 msgctxt ""
@@ -819,6 +837,10 @@ msgid ""
 "Click 'OK' to replace the installed extension.\n"
 "Click 'Cancel' to stop the installation."
 msgstr ""
+"您将要安装扩展'$NAME'的$NEW版本。\n"
+"该版本（名称为'$OLDNAME'）已经安装。\n"
+"点击”确定“以替换已安装版本。\n"
+"点击”取消“结束安装。"
 
 #: dp_gui_versionboxes.src
 msgctxt ""
@@ -831,6 +853,10 @@ msgid ""
 "Click 'OK' to replace the installed extension.\n"
 "Click 'Cancel' to stop the installation."
 msgstr ""
+"您将要安装扩展'$NAME'的$NEW版本。\n"
+"更早的版本$DEPLOYED已经安装。\n"
+"点击”确定“以替换已安装的版本。\n"
+"点击”取消“结束安装。"
 
 #: dp_gui_versionboxes.src
 msgctxt ""
@@ -843,3 +869,7 @@ msgid ""
 "Click 'OK' to replace the installed extension.\n"
 "Click 'Cancel' to stop the installation."
 msgstr ""
+"您将要安装扩展'$NAME'的$NEW版本。\n"
+"更早的名称为'$OLDNAME'的版本$DEPLOYED已经安装。\n"
+"点击”确定“以替换已安装的版本。\n"
+"点击”取消“结束安装。"
diff --git a/source/zh-CN/desktop/source/deployment/unopkg.po b/source/zh-CN/desktop/source/deployment/unopkg.po
index eac1633e4e3..984f3161d5a 100644
--- a/source/zh-CN/desktop/source/deployment/unopkg.po
+++ b/source/zh-CN/desktop/source/deployment/unopkg.po
@@ -4,16 +4,17 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"
 "POT-Creation-Date: 2013-11-20 13:01+0100\n"
-"PO-Revision-Date: 2011-04-06 04:43+0200\n"
-"Last-Translator: Dean <xslidian@gmail.com>\n"
+"PO-Revision-Date: 2014-03-03 08:40+0000\n"
+"Last-Translator: 琨珑 <suokunlong@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: LibreOffice\n"
+"X-Generator: Pootle 2.5.0\n"
 "X-Accelerator-Marker: ~\n"
+"X-POOTLE-MTIME: 1393836031.0\n"
 
 #: unopkg.src
 msgctxt ""
@@ -61,7 +62,7 @@ msgctxt ""
 "RID_STR_UNOPKG_ACCEPT_LIC_Y\n"
 "string.text"
 msgid "Y"
-msgstr ""
+msgstr "Y"
 
 #: unopkg.src
 msgctxt ""
@@ -77,7 +78,7 @@ msgctxt ""
 "RID_STR_UNOPKG_ACCEPT_LIC_N\n"
 "string.text"
 msgid "N"
-msgstr ""
+msgstr "N"
 
 #: unopkg.src
 msgctxt ""
diff --git a/source/zh-CN/desktop/uiconfig/ui.po b/source/zh-CN/desktop/uiconfig/ui.po
index fb048edff71..313670b57b2 100644
--- a/source/zh-CN/desktop/uiconfig/ui.po
+++ b/source/zh-CN/desktop/uiconfig/ui.po
@@ -4,17 +4,17 @@ msgstr ""
 "Project-Id-Version: LibO 40l10n\n"
 "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"
 "POT-Creation-Date: 2013-11-20 13:01+0100\n"
-"PO-Revision-Date: 2012-12-26 11:46+0000\n"
-"Last-Translator: Dean <xslidian@gmail.com>\n"
+"PO-Revision-Date: 2014-03-03 08:40+0000\n"
+"Last-Translator: 琨珑 <suokunlong@gmail.com>\n"
 "Language-Team: none\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: LibreOffice\n"
+"X-Generator: Pootle 2.5.0\n"
 "X-Accelerator-Marker: ~\n"
-"X-POOTLE-MTIME: 1356522369.0\n"
+"X-POOTLE-MTIME: 1393836036.0\n"
 
 #: cmdlinehelp.ui
 msgctxt ""
@@ -23,7 +23,7 @@ msgctxt ""
 "title\n"
 "string.text"
 msgid "Help Message"
-msgstr ""
+msgstr "帮助信息"
 
 #: extensionmanager.ui
 msgctxt ""