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

and force-fix errors using pocheck

Change-Id: Ic842792d6ee5fe0fc5d1b41808671f8c3ae34dc6

1 files changed, 9 insertions, 81 deletions

diff --git a/source/am/readlicense_oo/docs.po b/source/am/readlicense_oo/docs.po
index 3396cac80d7..cee3dc828ec 100644
--- a/source/am/readlicense_oo/docs.po
+++ b/source/am/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-08 00:57+0000\n"
 "Last-Translator: Samson <sambelet@yahoo.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -341,7 +341,7 @@ 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."
+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
@@ -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,7 +405,7 @@ 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."
+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
@@ -475,78 +459,22 @@ msgstr "For other RPM-based systems (openSUSE, etc.): rpm -Uvh *.rpm"
 #: readme.xrm
 msgctxt ""
 "readme.xrm\n"
-"rpminstall7a\n"
+"rpminstallE\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 ""
+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"
-"rpminstall8\n"
+"rpminstall7a\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:"
+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"
-"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 "For Fedora-based systems: 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 "For Mandriva-based systems: sudo urpmi *mandriva*.rpm"
-
-#: readme.xrm
-msgctxt ""
-"readme.xrm\n"
-"rpminstallF\n"
-"readmeitem.text"
-msgid "For SUSE-based systems: rpm -Uvh *suse*.rpm"
-msgstr "For SUSE-based systems: rpm -Uvh *suse*.rpm"
-
-#: readme.xrm
-msgctxt ""
-"readme.xrm\n"
-"rpminstallD\n"
-"readmeitem.text"
-msgid "For other RPM-based systems: rpm -Uvh *freedesktop*.rpm"
-msgstr "For other RPM-based systems: rpm -Uvh *freedesktop*.rpm"
-
-#: readme.xrm
-msgctxt ""
-"readme.xrm\n"
-"rpminstallE\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} ለሁሉም የቢሮ ዝርዝር/መተግበሪያዎች"
-
-#: readme.xrm
-msgctxt ""
-"readme.xrm\n"
 "sdfsdfgf42t2\n"
 "readmeitem.text"
 msgid "Notes Concerning Desktop Integration for Linux Distributions Not Covered in the Above Installation Instructions"
@@ -565,7 +493,7 @@ 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."
+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