sync with po-templates for 4.2 libreoffice-4-2-branch-point

and force-fix errors using pocheck

Change-Id: Ic842792d6ee5fe0fc5d1b41808671f8c3ae34dc6

1 files changed, 13 insertions, 85 deletions

diff --git a/source/zh-CN/readlicense_oo/docs.po b/source/zh-CN/readlicense_oo/docs.po
index ea28c89057a..6aa55638a63 100644
--- a/source/zh-CN/readlicense_oo/docs.po
+++ b/source/zh-CN/readlicense_oo/docs.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: https://bugs.freedesktop.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"
-"POT-Creation-Date: 2013-05-23 12:05+0200\n"
+"POT-Creation-Date: 2013-08-05 15:07+0200\n"
 "PO-Revision-Date: 2013-06-11 14:13+0000\n"
 "Last-Translator: Dean <xslidian@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -341,8 +341,8 @@ msgctxt ""
 "readme.xrm\n"
 "debianinstall1\n"
 "readmeitem.text"
-msgid "If you have a previous version of ${PRODUCTNAME} already installed, then you will need to de-install it before proceeding further. For instructions on how to install a language pack (after having installed the US English version of ${PRODUCTNAME}), please read the section below entitled Installing a Language Pack."
-msgstr "如果安装过先前版本的 ${PRODUCTNAME}，则需要卸载后再继续。关于如何 (在安装美式英语版 ${PRODUCTNAME} 后) 安装语言包的说明，请阅读下方题为“安装语言包”的段落。"
+msgid "For instructions on how to install a language pack (after having installed the US English version of ${PRODUCTNAME}), please read the section below entitled Installing a Language Pack."
+msgstr ""
 
 #: readme.xrm
 msgctxt ""
@@ -387,22 +387,6 @@ msgstr "sudo dpkg -i *.deb"
 #: readme.xrm
 msgctxt ""
 "readme.xrm\n"
-"debianinstall7\n"
-"readmeitem.text"
-msgid "cd desktop-integration"
-msgstr "cd desktop-integration"
-
-#: readme.xrm
-msgctxt ""
-"readme.xrm\n"
-"debianinstall8\n"
-"readmeitem.text"
-msgid "sudo dpkg -i *.deb"
-msgstr "sudo dpkg -i *.deb"
-
-#: readme.xrm
-msgctxt ""
-"readme.xrm\n"
 "debianinstall9\n"
 "readmeitem.text"
 msgid "The installation process is now completed, and you should have icons for all the ${PRODUCTNAME} applications in your desktop's Applications/Office menu."
@@ -421,8 +405,8 @@ msgctxt ""
 "readme.xrm\n"
 "rpminstall1\n"
 "readmeitem.text"
-msgid "If you have a previous version of ${PRODUCTNAME} already installed, then you will need to de-install it before proceeding further. For instructions on how to install a language pack (after having installed the US English version of ${PRODUCTNAME}), please read the section below entitled Installing a Language Pack."
-msgstr "如果安装过先前版本的 ${PRODUCTNAME}，则需要卸载后再继续。关于如何 (在安装美式英语版 ${PRODUCTNAME} 后) 安装语言包的说明，请阅读下方题为“安装语言包”的段落。"
+msgid "For instructions on how to install a language pack (after having installed the US English version of ${PRODUCTNAME}), please read the section below entitled Installing a Language Pack."
+msgstr ""
 
 #: readme.xrm
 msgctxt ""
@@ -475,74 +459,18 @@ msgstr "对于其他基于 RPM 的系统 (openSUSE 等): rpm -Uvh *.rpm"
 #: readme.xrm
 msgctxt ""
 "readme.xrm\n"
-"rpminstall7a\n"
-"readmeitem.text"
-msgid "Alternatively, you can use the 'install' script, located in the toplevel directory of this archive to perform an installation as a user. The script will set up ${PRODUCTNAME} to have its own profile for this installation, separated from your normal ${PRODUCTNAME} profile."
-msgstr ""
-
-#: readme.xrm
-msgctxt ""
-"readme.xrm\n"
-"rpminstall8\n"
-"readmeitem.text"
-msgid "The above command does the first part of the installation process. To complete the process, you also need to install the desktop integration packages. To do this, change directory to the \"desktop-integration\" directory that is within the \"RPMS\" directory, using the following command:"
-msgstr "上面的命令完成安装过程的第一部分。要完成安装，您还需要安装桌面集成软件包。要这样做，将目录更改为“RPMS”目录中的“desktop-integration”目录，然后使用下述命令:"
-
-#: readme.xrm
-msgctxt ""
-"readme.xrm\n"
-"rpminstall9\n"
-"readmeitem.text"
-msgid "cd desktop-integration"
-msgstr "cd desktop-integration"
-
-#: readme.xrm
-msgctxt ""
-"readme.xrm\n"
-"rpminstallA\n"
-"readmeitem.text"
-msgid "Now run the installation command again:"
-msgstr "再次运行安装命令:"
-
-#: readme.xrm
-msgctxt ""
-"readme.xrm\n"
-"rpminstallB\n"
-"readmeitem.text"
-msgid "For Fedora-based systems: su -c 'yum install *freedesktop*.rpm'"
-msgstr "对于基于 Fedora 的系统: su -c 'yum install *freedesktop*.rpm'"
-
-#: readme.xrm
-msgctxt ""
-"readme.xrm\n"
-"rpminstallC\n"
-"readmeitem.text"
-msgid "For Mandriva-based systems: sudo urpmi *mandriva*.rpm"
-msgstr "对于基于 Mandriva 的系统: sudo urpmi *mandriva*.rpm"
-
-#: readme.xrm
-msgctxt ""
-"readme.xrm\n"
-"rpminstallF\n"
-"readmeitem.text"
-msgid "For SUSE-based systems: rpm -Uvh *suse*.rpm"
-msgstr "基于 SUSE 的系统: rpm -Uvh *suse*.rpm"
-
-#: readme.xrm
-msgctxt ""
-"readme.xrm\n"
-"rpminstallD\n"
+"rpminstallE\n"
 "readmeitem.text"
-msgid "For other RPM-based systems: rpm -Uvh *freedesktop*.rpm"
-msgstr "其他基于 RPM 的系统: rpm -Uvh *freedesktop*.rpm"
+msgid "The installation process is now completed, and you should have icons for all the ${PRODUCTNAME} applications in your desktop's Applications/Office menu."
+msgstr "已经完成安装，您应该可以在桌面的应用程序/办公软件菜单中看到所有 ${PRODUCTNAME} 应用程序的图标了。"
 
 #: readme.xrm
 msgctxt ""
 "readme.xrm\n"
-"rpminstallE\n"
+"rpminstall7a\n"
 "readmeitem.text"
-msgid "The installation process is now completed, and you should have icons for all the ${PRODUCTNAME} applications in your desktop's Applications/Office menu."
-msgstr "已经完成安装，您应该可以在桌面的应用程序/办公软件菜单中看到所有 ${PRODUCTNAME} 应用程序的图标了。"
+msgid "Alternatively, you can use the 'install' script, located in the toplevel directory of this archive to perform an installation as a user. The script will set up ${PRODUCTNAME} to have its own profile for this installation, separated from your normal ${PRODUCTNAME} profile."
+msgstr ""
 
 #: readme.xrm
 msgctxt ""
@@ -565,8 +493,8 @@ msgctxt ""
 "readme.xrm\n"
 "otherinstall2\n"
 "readmeitem.text"
-msgid "The desktop-integration directory also contains a package named libreoffice3.3-freedesktop-menus-3.3.1.noarch.rpm (or similar). This is a package for all Linux distributions that support the Freedesktop.org specifications/recommendations (<a href=\"http://en.wikipedia.org/wiki/Freedesktop.org\">http://en.wikipedia.org/wiki/Freedesktop.org</a>), and is provided for installation on other Linux distributions not covered in the aforementioned instructions."
-msgstr "桌面集成目录中还有名为 libreoffice3.3-freedesktop-menus-3.3.1.noarch.rpm（或其他类似名称）的软件包。该软件包可供所有支持 Freedesktop.org  规范/推荐 (<a href=\"http://en.wikipedia.org/wiki/Freedesktop.org\">http://en.wikipedia.org/wiki/Freedesktop.org</a>) 的 Linux 发行版使用，也可在前文说明中未提及的其他 Linux 发行版中安装。"
+msgid "The RPMS (or DEBS, respectively) directory also contains a package named libreoffice4.1-freedesktop-menus-4.1.0-3.noarch.rpm (or libreoffice4.1-debian-menus_4.1.0-3_all.deb, respectively, or similar). This is a package for all Linux distributions that support the Freedesktop.org specifications/recommendations (<a href=\"http://en.wikipedia.org/wiki/Freedesktop.org\">http://en.wikipedia.org/wiki/Freedesktop.org</a>), and is provided for installation on other Linux distributions not covered in the aforementioned instructions."
+msgstr ""
 
 #: readme.xrm
 msgctxt ""