update translations for master

and force-fix errors using pocheck

Change-Id: I5e201f8d1c7746b1612ff10f592d611f402dc72c

2 files changed, 44 insertions, 16 deletions

diff --git a/source/en-ZA/desktop/source/deployment/gui.po b/source/en-ZA/desktop/source/deployment/gui.po
index 7273ab0fe2f..15bead6fecc 100644
--- a/source/en-ZA/desktop/source/deployment/gui.po
+++ b/source/en-ZA/desktop/source/deployment/gui.po
@@ -3,8 +3,8 @@ msgid ""
 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: 2015-04-22 23:40+0200\n"
-"PO-Revision-Date: 2015-05-12 08:06+0000\n"
+"POT-Creation-Date: 2015-08-25 12:33+0200\n"
+"PO-Revision-Date: 2015-08-25 19:32+0000\n"
 "Last-Translator: system user <>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: en_ZA\n"
@@ -14,7 +14,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 2.7\n"
 "X-Accelerator-Marker: ~\n"
-"X-POOTLE-MTIME: 1431417972.000000\n"
+"X-POOTLE-MTIME: 1440531154.000000\n"
 
 #: dp_gui_dialog.src
 msgctxt ""
@@ -167,6 +167,7 @@ msgid "Show license"
 msgstr "Show license"
 
 #: dp_gui_dialog.src
+#, fuzzy
 msgctxt ""
 "dp_gui_dialog.src\n"
 "RID_STR_WARNING_INSTALL_EXTENSION\n"
@@ -176,8 +177,12 @@ msgid ""
 "Click 'OK' to proceed with the installation.\n"
 "Click 'Cancel' to stop the installation."
 msgstr ""
+"You are about to install the extension \\'%NAME\\'.\n"
+"Click \\'OK\\' to proceed with the installation.\n"
+"Click \\'Cancel\\' to stop the installation."
 
 #: dp_gui_dialog.src
+#, fuzzy
 msgctxt ""
 "dp_gui_dialog.src\n"
 "RID_STR_WARNING_REMOVE_EXTENSION\n"
@@ -187,8 +192,12 @@ msgid ""
 "Click 'OK' to remove the extension.\n"
 "Click 'Cancel' to stop removing the extension."
 msgstr ""
+"You are about to remove the extension \\'%NAME\\'.\n"
+"Click \\'OK\\' to remove the extension.\n"
+"Click \\'Cancel\\' to stop removing the extension."
 
 #: dp_gui_dialog.src
+#, fuzzy
 msgctxt ""
 "dp_gui_dialog.src\n"
 "RID_STR_WARNING_REMOVE_SHARED_EXTENSION\n"
@@ -198,8 +207,12 @@ msgid ""
 "Click 'OK' to remove the extension.\n"
 "Click 'Cancel' to stop removing the extension."
 msgstr ""
+"Make sure that no further users are working with the same %PRODUCTNAME, when changing shared extensions in a multi user environment.\n"
+"Click \\'OK\\' to remove the extension.\n"
+"Click \\'Cancel\\' to stop removing the extension."
 
 #: dp_gui_dialog.src
+#, fuzzy
 msgctxt ""
 "dp_gui_dialog.src\n"
 "RID_STR_WARNING_ENABLE_SHARED_EXTENSION\n"
@@ -209,8 +222,12 @@ msgid ""
 "Click 'OK' to enable the extension.\n"
 "Click 'Cancel' to stop enabling the extension."
 msgstr ""
+"Make sure that no further users are working with the same %PRODUCTNAME, when changing shared extensions in a multi user environment.\n"
+"Click \\'OK\\' to enable the extension.\n"
+"Click \\'Cancel\\' to stop enabling the extension."
 
 #: dp_gui_dialog.src
+#, fuzzy
 msgctxt ""
 "dp_gui_dialog.src\n"
 "RID_STR_WARNING_DISABLE_SHARED_EXTENSION\n"
@@ -220,6 +237,9 @@ msgid ""
 "Click 'OK' to disable the extension.\n"
 "Click 'Cancel' to stop disabling the extension."
 msgstr ""
+"Make sure that no further users are working with the same %PRODUCTNAME, when changing shared extensions in a multi user environment.\n"
+"Click \\'OK\\' to disable the extension.\n"
+"Click \\'Cancel\\' to stop disabling the extension."
 
 #: dp_gui_dialog.src
 #, fuzzy
@@ -233,26 +253,19 @@ msgstr "The extension \\'%Name\\' does not work on this computer."
 #: dp_gui_updatedialog.src
 msgctxt ""
 "dp_gui_updatedialog.src\n"
-"RID_DLG_UPDATE_ERROR\n"
-"string.text"
-msgid "Error"
-msgstr "Error"
-
-#: dp_gui_updatedialog.src
-msgctxt ""
-"dp_gui_updatedialog.src\n"
 "RID_DLG_UPDATE_NONE\n"
 "string.text"
 msgid "No new updates are available."
 msgstr "No new updates are available."
 
 #: dp_gui_updatedialog.src
+#, fuzzy
 msgctxt ""
 "dp_gui_updatedialog.src\n"
 "RID_DLG_UPDATE_NOINSTALLABLE\n"
 "string.text"
 msgid "No installable updates are available. To see ignored or disabled updates, mark the check box 'Show all updates'."
-msgstr ""
+msgstr "No installable updates are available. To see all updates, mark the check box 'Show all updates'."
 
 #: dp_gui_updatedialog.src
 msgctxt ""
@@ -415,6 +428,7 @@ msgid "The extension will not be installed."
 msgstr "The extension will not be installed."
 
 #: dp_gui_versionboxes.src
+#, fuzzy
 msgctxt ""
 "dp_gui_versionboxes.src\n"
 "RID_STR_WARNING_VERSION_LESS\n"
@@ -425,6 +439,10 @@ msgid ""
 "Click 'OK' to replace the installed extension.\n"
 "Click 'Cancel' to stop the installation."
 msgstr ""
+"You are about to install version $NEW of the extension \\'$NAME\\'.\n"
+"The newer version $DEPLOYED is already installed.\n"
+"Click \\'OK\\' to replace the installed extension.\n"
+"Click \\'Cancel\\' to stop the installation."
 
 #: dp_gui_versionboxes.src
 #, fuzzy
@@ -444,6 +462,7 @@ msgstr ""
 "Click \\'Cancel\\' to stop the installation."
 
 #: dp_gui_versionboxes.src
+#, fuzzy
 msgctxt ""
 "dp_gui_versionboxes.src\n"
 "RID_STR_WARNING_VERSION_EQUAL\n"
@@ -454,6 +473,10 @@ msgid ""
 "Click 'OK' to replace the installed extension.\n"
 "Click 'Cancel' to stop the installation."
 msgstr ""
+"You are about to install version $NEW of the extension \\'$NAME\\'.\n"
+"That version is already installed.\n"
+"Click \\'OK\\' to replace the installed extension.\n"
+"Click \\'Cancel\\' to stop the installation."
 
 #: dp_gui_versionboxes.src
 #, fuzzy
@@ -473,6 +496,7 @@ msgstr ""
 "Click \\'Cancel\\' to stop the installation."
 
 #: dp_gui_versionboxes.src
+#, fuzzy
 msgctxt ""
 "dp_gui_versionboxes.src\n"
 "RID_STR_WARNING_VERSION_GREATER\n"
@@ -483,6 +507,10 @@ msgid ""
 "Click 'OK' to replace the installed extension.\n"
 "Click 'Cancel' to stop the installation."
 msgstr ""
+"You are about to install version $NEW of the extension \\'$NAME\\'.\n"
+"The older version $DEPLOYED is already installed.\n"
+"Click \\'OK\\' to replace the installed extension.\n"
+"Click \\'Cancel\\' to stop the installation."
 
 #: dp_gui_versionboxes.src
 #, fuzzy
diff --git a/source/en-ZA/desktop/uiconfig/ui.po b/source/en-ZA/desktop/uiconfig/ui.po
index bf359c825ec..2875607c574 100644
--- a/source/en-ZA/desktop/uiconfig/ui.po
+++ b/source/en-ZA/desktop/uiconfig/ui.po
@@ -3,8 +3,8 @@ msgid ""
 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: 2015-04-22 23:40+0200\n"
-"PO-Revision-Date: 2015-05-12 08:06+0000\n"
+"POT-Creation-Date: 2015-08-25 12:33+0200\n"
+"PO-Revision-Date: 2015-08-25 19:32+0000\n"
 "Last-Translator: system user <>\n"
 "Language-Team: none\n"
 "Language: en_ZA\n"
@@ -14,7 +14,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 2.7\n"
 "X-Accelerator-Marker: ~\n"
-"X-POOTLE-MTIME: 1431417973.000000\n"
+"X-POOTLE-MTIME: 1440531158.000000\n"
 
 #: cmdlinehelp.ui
 msgctxt ""
@@ -220,7 +220,7 @@ msgctxt ""
 "label4\n"
 "label\n"
 "string.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.\""
+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 ""
 
 #: licensedialog.ui