update for 4.2.3 rc1

and force-fix errors using pocheck

Change-Id: Ib0aa51688cb2bc9586f79d9ef32c99848bcdec2d

4 files changed, 588 insertions, 12 deletions

diff --git a/source/sat/cui/uiconfig/ui.po b/source/sat/cui/uiconfig/ui.po
index b4ddbcca253..dfd6715a663 100644
--- a/source/sat/cui/uiconfig/ui.po
+++ b/source/sat/cui/uiconfig/ui.po
@@ -3,7 +3,7 @@ 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: 2014-01-17 15:06+0100\n"
+"POT-Creation-Date: 2014-02-13 17:14+0100\n"
 "PO-Revision-Date: 2012-11-17 19:02+0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -8039,6 +8039,33 @@ msgstr ""
 #: opthtmlpage.ui
 msgctxt ""
 "opthtmlpage.ui\n"
+"export\n"
+"0\n"
+"stringlist.text"
+msgid "Microsoft Internet Explorer"
+msgstr ""
+
+#: opthtmlpage.ui
+msgctxt ""
+"opthtmlpage.ui\n"
+"export\n"
+"1\n"
+"stringlist.text"
+msgid "Mozilla Firefox"
+msgstr ""
+
+#: opthtmlpage.ui
+msgctxt ""
+"opthtmlpage.ui\n"
+"export\n"
+"2\n"
+"stringlist.text"
+msgid "%PRODUCTNAME Writer"
+msgstr ""
+
+#: opthtmlpage.ui
+msgctxt ""
+"opthtmlpage.ui\n"
 "label3\n"
 "label\n"
 "string.text"
diff --git a/source/sat/sc/uiconfig/scalc/ui.po b/source/sat/sc/uiconfig/scalc/ui.po
index 3e06fb748e5..147828d662b 100644
--- a/source/sat/sc/uiconfig/scalc/ui.po
+++ b/source/sat/sc/uiconfig/scalc/ui.po
@@ -3,7 +3,7 @@ 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: 2014-01-17 15:06+0100\n"
+"POT-Creation-Date: 2014-02-13 17:15+0100\n"
 "PO-Revision-Date: 2012-11-17 19:02+0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -335,6 +335,105 @@ msgstr ""
 #: consolidatedialog.ui
 msgctxt ""
 "consolidatedialog.ui\n"
+"func\n"
+"0\n"
+"stringlist.text"
+msgid "Sum"
+msgstr ""
+
+#: consolidatedialog.ui
+msgctxt ""
+"consolidatedialog.ui\n"
+"func\n"
+"1\n"
+"stringlist.text"
+msgid "Count"
+msgstr ""
+
+#: consolidatedialog.ui
+msgctxt ""
+"consolidatedialog.ui\n"
+"func\n"
+"2\n"
+"stringlist.text"
+msgid "Average"
+msgstr ""
+
+#: consolidatedialog.ui
+msgctxt ""
+"consolidatedialog.ui\n"
+"func\n"
+"3\n"
+"stringlist.text"
+msgid "Max"
+msgstr ""
+
+#: consolidatedialog.ui
+msgctxt ""
+"consolidatedialog.ui\n"
+"func\n"
+"4\n"
+"stringlist.text"
+msgid "Min"
+msgstr ""
+
+#: consolidatedialog.ui
+msgctxt ""
+"consolidatedialog.ui\n"
+"func\n"
+"5\n"
+"stringlist.text"
+msgid "Product"
+msgstr ""
+
+#: consolidatedialog.ui
+msgctxt ""
+"consolidatedialog.ui\n"
+"func\n"
+"6\n"
+"stringlist.text"
+msgid "Count (numbers only)"
+msgstr ""
+
+#: consolidatedialog.ui
+msgctxt ""
+"consolidatedialog.ui\n"
+"func\n"
+"7\n"
+"stringlist.text"
+msgid "StDev (sample)"
+msgstr ""
+
+#: consolidatedialog.ui
+msgctxt ""
+"consolidatedialog.ui\n"
+"func\n"
+"8\n"
+"stringlist.text"
+msgid "StDevP (population)"
+msgstr ""
+
+#: consolidatedialog.ui
+msgctxt ""
+"consolidatedialog.ui\n"
+"func\n"
+"9\n"
+"stringlist.text"
+msgid "Var (sample)"
+msgstr ""
+
+#: consolidatedialog.ui
+msgctxt ""
+"consolidatedialog.ui\n"
+"func\n"
+"10\n"
+"stringlist.text"
+msgid "VarP (population)"
+msgstr ""
+
+#: consolidatedialog.ui
+msgctxt ""
+"consolidatedialog.ui\n"
 "ftdataarea\n"
 "label\n"
 "string.text"
@@ -5812,6 +5911,78 @@ msgstr ""
 #: standardfilterdialog.ui
 msgctxt ""
 "standardfilterdialog.ui\n"
+"connect1\n"
+"0\n"
+"stringlist.text"
+msgid "AND"
+msgstr ""
+
+#: standardfilterdialog.ui
+msgctxt ""
+"standardfilterdialog.ui\n"
+"connect1\n"
+"1\n"
+"stringlist.text"
+msgid "OR"
+msgstr ""
+
+#: standardfilterdialog.ui
+msgctxt ""
+"standardfilterdialog.ui\n"
+"connect2\n"
+"0\n"
+"stringlist.text"
+msgid "AND"
+msgstr ""
+
+#: standardfilterdialog.ui
+msgctxt ""
+"standardfilterdialog.ui\n"
+"connect2\n"
+"1\n"
+"stringlist.text"
+msgid "OR"
+msgstr ""
+
+#: standardfilterdialog.ui
+msgctxt ""
+"standardfilterdialog.ui\n"
+"connect3\n"
+"0\n"
+"stringlist.text"
+msgid "AND"
+msgstr ""
+
+#: standardfilterdialog.ui
+msgctxt ""
+"standardfilterdialog.ui\n"
+"connect3\n"
+"1\n"
+"stringlist.text"
+msgid "OR"
+msgstr ""
+
+#: standardfilterdialog.ui
+msgctxt ""
+"standardfilterdialog.ui\n"
+"connect4\n"
+"0\n"
+"stringlist.text"
+msgid "AND"
+msgstr ""
+
+#: standardfilterdialog.ui
+msgctxt ""
+"standardfilterdialog.ui\n"
+"connect4\n"
+"1\n"
+"stringlist.text"
+msgid "OR"
+msgstr ""
+
+#: standardfilterdialog.ui
+msgctxt ""
+"standardfilterdialog.ui\n"
 "label2\n"
 "label\n"
 "string.text"
@@ -5848,6 +6019,366 @@ msgstr ""
 #: standardfilterdialog.ui
 msgctxt ""
 "standardfilterdialog.ui\n"
+"cond1\n"
+"6\n"
+"stringlist.text"
+msgid "Largest"
+msgstr ""
+
+#: standardfilterdialog.ui
+msgctxt ""
+"standardfilterdialog.ui\n"
+"cond1\n"
+"7\n"
+"stringlist.text"
+msgid "Smallest"
+msgstr ""
+
+#: standardfilterdialog.ui
+msgctxt ""
+"standardfilterdialog.ui\n"
+"cond1\n"
+"8\n"
+"stringlist.text"
+msgid "Largest %"
+msgstr ""
+
+#: standardfilterdialog.ui
+msgctxt ""
+"standardfilterdialog.ui\n"
+"cond1\n"
+"9\n"
+"stringlist.text"
+msgid "Smallest %"
+msgstr ""
+
+#: standardfilterdialog.ui
+msgctxt ""
+"standardfilterdialog.ui\n"
+"cond1\n"
+"10\n"
+"stringlist.text"
+msgid "Contains"
+msgstr ""
+
+#: standardfilterdialog.ui
+msgctxt ""
+"standardfilterdialog.ui\n"
+"cond1\n"
+"11\n"
+"stringlist.text"
+msgid "Does not contain"
+msgstr ""
+
+#: standardfilterdialog.ui
+msgctxt ""
+"standardfilterdialog.ui\n"
+"cond1\n"
+"12\n"
+"stringlist.text"
+msgid "Begins with"
+msgstr ""
+
+#: standardfilterdialog.ui
+msgctxt ""
+"standardfilterdialog.ui\n"
+"cond1\n"
+"13\n"
+"stringlist.text"
+msgid "Does not begin with"
+msgstr ""
+
+#: standardfilterdialog.ui
+msgctxt ""
+"standardfilterdialog.ui\n"
+"cond1\n"
+"14\n"
+"stringlist.text"
+msgid "Ends with"
+msgstr ""
+
+#: standardfilterdialog.ui
+msgctxt ""
+"standardfilterdialog.ui\n"
+"cond1\n"
+"15\n"
+"stringlist.text"
+msgid "Does not end with"
+msgstr ""
+
+#: standardfilterdialog.ui
+msgctxt ""
+"standardfilterdialog.ui\n"
+"cond2\n"
+"6\n"
+"stringlist.text"
+msgid "Largest"
+msgstr ""
+
+#: standardfilterdialog.ui
+msgctxt ""
+"standardfilterdialog.ui\n"
+"cond2\n"
+"7\n"
+"stringlist.text"
+msgid "Smallest"
+msgstr ""
+
+#: standardfilterdialog.ui
+msgctxt ""
+"standardfilterdialog.ui\n"
+"cond2\n"
+"8\n"
+"stringlist.text"
+msgid "Largest %"
+msgstr ""
+
+#: standardfilterdialog.ui
+msgctxt ""
+"standardfilterdialog.ui\n"
+"cond2\n"
+"9\n"
+"stringlist.text"
+msgid "Smallest %"
+msgstr ""
+
+#: standardfilterdialog.ui
+msgctxt ""
+"standardfilterdialog.ui\n"
+"cond2\n"
+"10\n"
+"stringlist.text"
+msgid "Contains"
+msgstr ""
+
+#: standardfilterdialog.ui
+msgctxt ""
+"standardfilterdialog.ui\n"
+"cond2\n"
+"11\n"
+"stringlist.text"
+msgid "Does not contain"
+msgstr ""
+
+#: standardfilterdialog.ui
+msgctxt ""
+"standardfilterdialog.ui\n"
+"cond2\n"
+"12\n"
+"stringlist.text"
+msgid "Begins with"
+msgstr ""
+
+#: standardfilterdialog.ui
+msgctxt ""
+"standardfilterdialog.ui\n"
+"cond2\n"
+"13\n"
+"stringlist.text"
+msgid "Does not begin with"
+msgstr ""
+
+#: standardfilterdialog.ui
+msgctxt ""
+"standardfilterdialog.ui\n"
+"cond2\n"
+"14\n"
+"stringlist.text"
+msgid "Ends with"
+msgstr ""
+
+#: standardfilterdialog.ui
+msgctxt ""
+"standardfilterdialog.ui\n"
+"cond2\n"
+"15\n"
+"stringlist.text"
+msgid "Does not end with"
+msgstr ""
+
+#: standardfilterdialog.ui
+msgctxt ""
+"standardfilterdialog.ui\n"
+"cond3\n"
+"6\n"
+"stringlist.text"
+msgid "Largest"
+msgstr ""
+
+#: standardfilterdialog.ui
+msgctxt ""
+"standardfilterdialog.ui\n"
+"cond3\n"
+"7\n"
+"stringlist.text"
+msgid "Smallest"
+msgstr ""
+
+#: standardfilterdialog.ui
+msgctxt ""
+"standardfilterdialog.ui\n"
+"cond3\n"
+"8\n"
+"stringlist.text"
+msgid "Largest %"
+msgstr ""
+
+#: standardfilterdialog.ui
+msgctxt ""
+"standardfilterdialog.ui\n"
+"cond3\n"
+"9\n"
+"stringlist.text"
+msgid "Smallest %"
+msgstr ""
+
+#: standardfilterdialog.ui
+msgctxt ""
+"standardfilterdialog.ui\n"
+"cond3\n"
+"10\n"
+"stringlist.text"
+msgid "Contains"
+msgstr ""
+
+#: standardfilterdialog.ui
+msgctxt ""
+"standardfilterdialog.ui\n"
+"cond3\n"
+"11\n"
+"stringlist.text"
+msgid "Does not contain"
+msgstr ""
+
+#: standardfilterdialog.ui
+msgctxt ""
+"standardfilterdialog.ui\n"
+"cond3\n"
+"12\n"
+"stringlist.text"
+msgid "Begins with"
+msgstr ""
+
+#: standardfilterdialog.ui
+msgctxt ""
+"standardfilterdialog.ui\n"
+"cond3\n"
+"13\n"
+"stringlist.text"
+msgid "Does not begin with"
+msgstr ""
+
+#: standardfilterdialog.ui
+msgctxt ""
+"standardfilterdialog.ui\n"
+"cond3\n"
+"14\n"
+"stringlist.text"
+msgid "Ends with"
+msgstr ""
+
+#: standardfilterdialog.ui
+msgctxt ""
+"standardfilterdialog.ui\n"
+"cond3\n"
+"15\n"
+"stringlist.text"
+msgid "Does not end with"
+msgstr ""
+
+#: standardfilterdialog.ui
+msgctxt ""
+"standardfilterdialog.ui\n"
+"cond4\n"
+"6\n"
+"stringlist.text"
+msgid "Largest"
+msgstr ""
+
+#: standardfilterdialog.ui
+msgctxt ""
+"standardfilterdialog.ui\n"
+"cond4\n"
+"7\n"
+"stringlist.text"
+msgid "Smallest"
+msgstr ""
+
+#: standardfilterdialog.ui
+msgctxt ""
+"standardfilterdialog.ui\n"
+"cond4\n"
+"8\n"
+"stringlist.text"
+msgid "Largest %"
+msgstr ""
+
+#: standardfilterdialog.ui
+msgctxt ""
+"standardfilterdialog.ui\n"
+"cond4\n"
+"9\n"
+"stringlist.text"
+msgid "Smallest %"
+msgstr ""
+
+#: standardfilterdialog.ui
+msgctxt ""
+"standardfilterdialog.ui\n"
+"cond4\n"
+"10\n"
+"stringlist.text"
+msgid "Contains"
+msgstr ""
+
+#: standardfilterdialog.ui
+msgctxt ""
+"standardfilterdialog.ui\n"
+"cond4\n"
+"11\n"
+"stringlist.text"
+msgid "Does not contain"
+msgstr ""
+
+#: standardfilterdialog.ui
+msgctxt ""
+"standardfilterdialog.ui\n"
+"cond4\n"
+"12\n"
+"stringlist.text"
+msgid "Begins with"
+msgstr ""
+
+#: standardfilterdialog.ui
+msgctxt ""
+"standardfilterdialog.ui\n"
+"cond4\n"
+"13\n"
+"stringlist.text"
+msgid "Does not begin with"
+msgstr ""
+
+#: standardfilterdialog.ui
+msgctxt ""
+"standardfilterdialog.ui\n"
+"cond4\n"
+"14\n"
+"stringlist.text"
+msgid "Ends with"
+msgstr ""
+
+#: standardfilterdialog.ui
+msgctxt ""
+"standardfilterdialog.ui\n"
+"cond4\n"
+"15\n"
+"stringlist.text"
+msgid "Does not end with"
+msgstr ""
+
+#: standardfilterdialog.ui
+msgctxt ""
+"standardfilterdialog.ui\n"
 "label1\n"
 "label\n"
 "string.text"
diff --git a/source/sat/sw/source/ui/inc.po b/source/sat/sw/source/ui/inc.po
index b930bb8881e..84b63d2c3b1 100644
--- a/source/sat/sw/source/ui/inc.po
+++ b/source/sat/sw/source/ui/inc.po
@@ -3,7 +3,7 @@ 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: 2014-01-17 15:06+0100\n"
+"POT-Creation-Date: 2014-02-13 17:13+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,36 +14,36 @@ msgstr ""
 "X-Generator: LibreOffice\n"
 "X-Accelerator-Marker: ~\n"
 
-#: misc.hrc
+#: redline_tmpl.hrc
 msgctxt ""
-"misc.hrc\n"
+"redline_tmpl.hrc\n"
 "MN_EDIT_REDLINE\n"
 "FN_REDLINE_ACCEPT_DIRECT\n"
 "menuitem.text"
 msgid "Accept Change"
 msgstr ""
 
-#: misc.hrc
+#: redline_tmpl.hrc
 msgctxt ""
-"misc.hrc\n"
+"redline_tmpl.hrc\n"
 "MN_EDIT_REDLINE\n"
 "FN_REDLINE_REJECT_DIRECT\n"
 "menuitem.text"
 msgid "Reject Change"
 msgstr ""
 
-#: misc.hrc
+#: redline_tmpl.hrc
 msgctxt ""
-"misc.hrc\n"
+"redline_tmpl.hrc\n"
 "MN_EDIT_REDLINE\n"
 "FN_REDLINE_NEXT_CHANGE\n"
 "menuitem.text"
 msgid "Next Change"
 msgstr ""
 
-#: misc.hrc
+#: redline_tmpl.hrc
 msgctxt ""
-"misc.hrc\n"
+"redline_tmpl.hrc\n"
 "MN_EDIT_REDLINE\n"
 "FN_REDLINE_PREV_CHANGE\n"
 "menuitem.text"
diff --git a/source/sat/sw/uiconfig/swriter/ui.po b/source/sat/sw/uiconfig/swriter/ui.po
index e69cf0966d1..1a6139c03c8 100644
--- a/source/sat/sw/uiconfig/swriter/ui.po
+++ b/source/sat/sw/uiconfig/swriter/ui.po
@@ -3,7 +3,7 @@ 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: 2014-01-17 15:06+0100\n"
+"POT-Creation-Date: 2014-02-13 17:13+0100\n"
 "PO-Revision-Date: 2013-04-15 12:16+0000\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: none\n"
@@ -5183,6 +5183,24 @@ msgstr ""
 #: frmaddpage.ui
 msgctxt ""
 "frmaddpage.ui\n"
+"prev\n"
+"0\n"
+"stringlist.text"
+msgid "<None>"
+msgstr ""
+
+#: frmaddpage.ui
+msgctxt ""
+"frmaddpage.ui\n"
+"next\n"
+"0\n"
+"stringlist.text"
+msgid "<None>"
+msgstr ""
+
+#: frmaddpage.ui
+msgctxt ""
+"frmaddpage.ui\n"
 "prev_label\n"
 "label\n"
 "string.text"