update translations for 5.2.0 alpha1

and force-fix errors using pocheck

Change-Id: I75bca3b0cc0333302eac4d11c98ad26dfdc35fd6

12 files changed, 712 insertions, 1790 deletions

diff --git a/source/nr/sw/source/ui/app.po b/source/nr/sw/source/ui/app.po
index 018a39b3073..0c438b23758 100644
--- a/source/nr/sw/source/ui/app.po
+++ b/source/nr/sw/source/ui/app.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-11-10 19:33+0100\n"
-"PO-Revision-Date: 2015-06-26 02:24+0000\n"
+"POT-Creation-Date: 2016-04-16 21:40+0200\n"
+"PO-Revision-Date: 2015-12-11 19:01+0000\n"
 "Last-Translator: system user <>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: nr\n"
@@ -13,7 +13,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Pootle 2.7\n"
 "X-Accelerator-Marker: ~\n"
-"X-POOTLE-MTIME: 1435285498.000000\n"
+"X-POOTLE-MTIME: 1449860492.000000\n"
 
 #: app.src
 msgctxt ""
@@ -428,6 +428,24 @@ msgid "The following characters are not valid and have been removed: "
 msgstr ""
 
 #: app.src
+#, fuzzy
+msgctxt ""
+"app.src\n"
+"STR_BOOKMARK_NAME\n"
+"string.text"
+msgid "Name"
+msgstr "Amagama"
+
+#: app.src
+#, fuzzy
+msgctxt ""
+"app.src\n"
+"STR_BOOKMARK_TEXT\n"
+"string.text"
+msgid "Text"
+msgstr "Itheksithi:"
+
+#: app.src
 msgctxt ""
 "app.src\n"
 "SW_STR_NONE\n"
@@ -802,6 +820,22 @@ msgstr ""
 #: app.src
 msgctxt ""
 "app.src\n"
+"STR_DELETE_NOTE_AUTHOR\n"
+"string.text"
+msgid "Delete ~All Comments by $1"
+msgstr ""
+
+#: app.src
+msgctxt ""
+"app.src\n"
+"STR_HIDE_NOTE_AUTHOR\n"
+"string.text"
+msgid "H~ide All Comments by $1"
+msgstr ""
+
+#: app.src
+msgctxt ""
+"app.src\n"
 "STR_DONT_ASK_AGAIN\n"
 "string.text"
 msgid "~Do not show warning again"
@@ -1405,549 +1439,7 @@ msgstr ""
 #: mn.src
 msgctxt ""
 "mn.src\n"
-"MN_PAGE\n"
-"FN_FORMAT_PAGE_DLG\n"
-"menuitem.text"
-msgid "Pa~ge..."
-msgstr "Ikh~asi..."
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"_MN_EDIT_FIELD\n"
-"FN_EDIT_FIELD\n"
-"menuitem.text"
-msgid "Fields..."
-msgstr "Amaziko..."
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"_MN_EDIT_FIELD._MN_EDIT_FOOTNOTE\n"
-"FN_EDIT_FOOTNOTE\n"
-"menuitem.text"
-msgid "Footnote/Endnote~..."
-msgstr ""
-
-#: mn.src
-#, fuzzy
-msgctxt ""
-"mn.src\n"
-"_MN_EDIT_FIELD._MN_EDIT_FOOTNOTE._MN_EDIT_IDX_ENTRY_DLG\n"
-"FN_EDIT_IDX_ENTRY_DLG\n"
-"menuitem.text"
-msgid "Edit Inde~x Entry..."
-msgstr "Okufakwako kwe-inde~ksi..."
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"_MN_EDIT_BIB_ENTRY_DLG\n"
-"FN_EDIT_AUTH_ENTRY_DLG\n"
-"menuitem.text"
-msgid "~Bibliography Entry..."
-msgstr ""
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"_MN_EDIT_OPEN_HYPERLINK\n"
-"FN_EDIT_HYPERLINK\n"
-"menuitem.text"
-msgid "Edit Hyperlink..."
-msgstr ""
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"_MN_EDIT_OPEN_HYPERLINK\n"
-"FN_COPY_HYPERLINK_LOCATION\n"
-"menuitem.text"
-msgid "Copy Hyper~link"
-msgstr ""
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"_MN_EDIT_OPEN_HYPERLINK\n"
-"FN_REMOVE_HYPERLINK\n"
-"menuitem.text"
-msgid "Remo~ve Hyperlink"
-msgstr ""
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_RESET\n"
-"FN_FORMAT_RESET\n"
-"menuitem.text"
-msgid "Clear ~Direct Formatting"
-msgstr ""
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"_NUMBERING_RELATED_MENU\n"
-"FN_NUMBER_NEWSTART\n"
-"menuitem.text"
-msgid "Restart Numbering"
-msgstr "Thoma butjha Ukunambara"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"_NUMBERING_RELATED_MENU\n"
-"FN_NUM_CONTINUE\n"
-"menuitem.text"
-msgid "Continue previous numbering"
-msgstr ""
-
-#: mn.src
-#, fuzzy
-msgctxt ""
-"mn.src\n"
-"_NUMBERING_RELATED_MENU\n"
-"FN_NUM_BULLET_UP\n"
-"menuitem.text"
-msgid "Up One Level"
-msgstr ""
-"#-#-#-#-#  dlg.po (PACKAGE VERSION)  #-#-#-#-#\n"
-"Phezulu ngeleveli eyodwa\n"
-"#-#-#-#-#  dialogs.po (PACKAGE VERSION)  #-#-#-#-#\n"
-"Ukuya Phezulu Ngezinga Linye\n"
-"#-#-#-#-#  contnr.po (PACKAGE VERSION)  #-#-#-#-#\n"
-"Ukuya Phezulu Ngezinga Linye\n"
-"#-#-#-#-#  office.po (PACKAGE VERSION)  #-#-#-#-#\n"
-"Ukuphakama ngezinga linye"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"_NUMBERING_RELATED_MENU\n"
-"FN_NUM_BULLET_DOWN\n"
-"menuitem.text"
-msgid "Down One Level"
-msgstr ""
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MENU_PASTE_SPECIAL.SID_MENU_PASTE_SPECIAL\n"
-"SID_PASTE_UNFORMATTED\n"
-"menuitem.text"
-msgid "~Unformatted Text"
-msgstr ""
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MENU_PASTE_SPECIAL.SID_MENU_PASTE_SPECIAL\n"
-"SID_PASTE_SPECIAL\n"
-"menuitem.text"
-msgid "~More Options..."
-msgstr ""
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MENU_PASTE_SPECIAL\n"
-"SID_MENU_PASTE_SPECIAL\n"
-"menuitem.text"
-msgid "Paste ~Special"
-msgstr ""
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"BASE_TEXT_POPUPMENU_NOWEB\n"
-"FN_UPDATE_CUR_TOX\n"
-"menuitem.text"
-msgid "~Update Index or Table of Contents"
-msgstr ""
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"BASE_TEXT_POPUPMENU_NOWEB\n"
-"FN_EDIT_CURRENT_TOX\n"
-"menuitem.text"
-msgid "~Edit Index or Table of Contents"
-msgstr ""
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"BASE_TEXT_POPUPMENU_NOWEB\n"
-"FN_REMOVE_CUR_TOX\n"
-"menuitem.text"
-msgid "Delete Index or Table of Contents"
-msgstr ""
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_FRM_CAPTION_ITEM\n"
-"FN_INSERT_CAPTION\n"
-"menuitem.text"
-msgid "Insert ~Caption..."
-msgstr ""
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_TABLE.DUMMY\n"
-"FN_TABLE_INSERT_ROW_BEFORE\n"
-"menuitem.text"
-msgid "Rows Above"
-msgstr ""
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_TABLE.DUMMY\n"
-"FN_TABLE_INSERT_ROW_AFTER\n"
-"menuitem.text"
-msgid "Rows Below"
-msgstr ""
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_TABLE.DUMMY\n"
-"FN_TABLE_INSERT_ROW_DLG\n"
-"menuitem.text"
-msgid "~Rows..."
-msgstr ""
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_TABLE.DUMMY\n"
-"FN_TABLE_INSERT_COL_BEFORE\n"
-"menuitem.text"
-msgid "Columns Left"
-msgstr ""
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_TABLE.DUMMY\n"
-"FN_TABLE_INSERT_COL_AFTER\n"
-"menuitem.text"
-msgid "Columns Right"
-msgstr ""
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_TABLE.DUMMY\n"
-"FN_TABLE_INSERT_COL_DLG\n"
-"menuitem.text"
-msgid "~Columns..."
-msgstr ""
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_TABLE\n"
-"DUMMY\n"
-"menuitem.text"
-msgid "~Insert"
-msgstr ""
-
-#: mn.src
-#, fuzzy
-msgctxt ""
-"mn.src\n"
-"MN_TABLE.DUMMY+1\n"
-"FN_TABLE_DELETE_ROW\n"
-"menuitem.text"
-msgid "~Rows"
-msgstr "I~mida"
-
-#: mn.src
-#, fuzzy
-msgctxt ""
-"mn.src\n"
-"MN_TABLE.DUMMY+1\n"
-"FN_TABLE_DELETE_COL\n"
-"menuitem.text"
-msgid "~Columns"
-msgstr "Ikho~lomu"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_TABLE.DUMMY+1\n"
-"FN_TABLE_DELETE_TABLE\n"
-"menuitem.text"
-msgid "~Table"
-msgstr ""
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_TABLE\n"
-"DUMMY+1\n"
-"menuitem.text"
-msgid "~Delete"
-msgstr ""
-
-#: mn.src
-#, fuzzy
-msgctxt ""
-"mn.src\n"
-"MN_TABLE.DUMMY+2\n"
-"FN_TABLE_SELECT_ROW\n"
-"menuitem.text"
-msgid "~Rows"
-msgstr "I~mida"
-
-#: mn.src
-#, fuzzy
-msgctxt ""
-"mn.src\n"
-"MN_TABLE.DUMMY+2\n"
-"FN_TABLE_SELECT_COL\n"
-"menuitem.text"
-msgid "~Columns"
-msgstr "Ikho~lomu"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_TABLE.DUMMY+2\n"
-"FN_TABLE_SELECT_ALL\n"
-"menuitem.text"
-msgid "~Table"
-msgstr ""
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_TABLE.DUMMY+2\n"
-"FN_TABLE_SELECT_CELL\n"
-"menuitem.text"
-msgid "C~ell"
-msgstr ""
-
-#: mn.src
-#, fuzzy
-msgctxt ""
-"mn.src\n"
-"MN_TABLE\n"
-"DUMMY+2\n"
-"menuitem.text"
-msgid "~Select"
-msgstr "~Khetha"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_TABLE\n"
-"FN_TABLE_MERGE_CELLS\n"
-"menuitem.text"
-msgid "~Merge"
-msgstr "~Hlanganisa"
-
-#: mn.src
-#, fuzzy
-msgctxt ""
-"mn.src\n"
-"MN_TABLE.MN_FORMAT_ALGN\n"
-"SID_TABLE_VERT_NONE\n"
-"menuitem.text"
-msgid "~Top"
-msgstr "~Phezulu"
-
-#: mn.src
-#, fuzzy
-msgctxt ""
-"mn.src\n"
-"MN_TABLE.MN_FORMAT_ALGN\n"
-"SID_TABLE_VERT_CENTER\n"
-"menuitem.text"
-msgid "C~enter"
-msgstr "P~hakathi"
-
-#: mn.src
-#, fuzzy
-msgctxt ""
-"mn.src\n"
-"MN_TABLE.MN_FORMAT_ALGN\n"
-"SID_TABLE_VERT_BOTTOM\n"
-"menuitem.text"
-msgid "~Bottom"
-msgstr "~Ngaphasi"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_TABLE\n"
-"MN_FORMAT_ALGN\n"
-"menuitem.text"
-msgid "A~lignment"
-msgstr "U~kulinganisa"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_TABLE.DUMMY+4\n"
-"FN_TABLE_SET_COL_WIDTH\n"
-"menuitem.text"
-msgid "~Column Width..."
-msgstr ""
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_TABLE.DUMMY+4\n"
-"FN_TABLE_ADJUST_CELLS\n"
-"menuitem.text"
-msgid "~Optimal Column Width"
-msgstr ""
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_TABLE.DUMMY+4\n"
-"FN_TABLE_BALANCE_CELLS\n"
-"menuitem.text"
-msgid "~Distribute Columns Equally"
-msgstr ""
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_TABLE.DUMMY+4\n"
-"FN_TABLE_SET_ROW_HEIGHT\n"
-"menuitem.text"
-msgid "~Row Height..."
-msgstr ""
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_TABLE.DUMMY+4\n"
-"FN_TABLE_OPTIMAL_HEIGHT\n"
-"menuitem.text"
-msgid "Optimal Row ~Height"
-msgstr ""
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_TABLE.DUMMY+4\n"
-"FN_TABLE_BALANCE_ROWS\n"
-"menuitem.text"
-msgid "Distribute Rows ~Equally"
-msgstr ""
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_TABLE\n"
-"DUMMY+4\n"
-"menuitem.text"
-msgid "Si~ze"
-msgstr ""
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_TABLE\n"
-"FN_NUM_FORMAT_TABLE_DLG\n"
-"menuitem.text"
-msgid "N~umber Format..."
-msgstr "I~ndlela yokunambara..."
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_TABLE\n"
-"FN_FORMAT_TABLE_DLG\n"
-"menuitem.text"
-msgid "~Table Properties..."
-msgstr ""
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_DRWTXTATTR\n"
-"FN_DRAWTEXT_ATTR_DLG\n"
-"menuitem.text"
-msgid "Te~xt..."
-msgstr "The~ksti"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_NAME_SHAPE\n"
-"FN_NAME_SHAPE\n"
-"menuitem.text"
-msgid "Name..."
-msgstr ""
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_TITLE_DESCRIPTION_SHAPE\n"
-"FN_TITLE_DESCRIPTION_SHAPE\n"
-"menuitem.text"
-msgid "Description..."
-msgstr "Ihlathululo..."
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_FRM\n"
-"FN_FORMAT_FRAME_DLG\n"
-"menuitem.text"
-msgid "~Frame..."
-msgstr "~Isakhiwo..."
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_ONE_STEP\n"
-"FN_FRAME_UP\n"
-"menuitem.text"
-msgid "Bring ~Forward"
-msgstr "Letha ~Phambili"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_ONE_STEP\n"
-"FN_FRAME_DOWN\n"
-"menuitem.text"
-msgid "Send Back~ward"
-msgstr "Buyisela Em~va"
-
-#: mn.src
-#, fuzzy
-msgctxt ""
-"mn.src\n"
-"MN_DRAW5\n"
-"MN_SUB_ARRANGE\n"
-"menuitem.text"
-msgid "~Arrange"
-msgstr "~Hlela"
-
-#: mn.src
-#, fuzzy
-msgctxt ""
-"mn.src\n"
-"MN_DRAW6\n"
-"MN_SUB_ARRANGE\n"
-"menuitem.text"
-msgid "~Arrange"
-msgstr "~Hlela"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_ANNOTATIONS\n"
+"MN_ANNOTATION_BUTTON\n"
 "FN_REPLY\n"
 "menuitem.text"
 msgid "Reply"
@@ -1956,7 +1448,7 @@ msgstr ""
 #: mn.src
 msgctxt ""
 "mn.src\n"
-"MN_ANNOTATIONS\n"
+"MN_ANNOTATION_BUTTON\n"
 "FN_DELETE_COMMENT\n"
 "menuitem.text"
 msgid "Delete ~Comment"
@@ -1965,7 +1457,7 @@ msgstr ""
 #: mn.src
 msgctxt ""
 "mn.src\n"
-"MN_ANNOTATIONS\n"
+"MN_ANNOTATION_BUTTON\n"
 "FN_DELETE_NOTE_AUTHOR\n"
 "menuitem.text"
 msgid "Delete ~All Comments by $1"
@@ -1974,7 +1466,7 @@ msgstr ""
 #: mn.src
 msgctxt ""
 "mn.src\n"
-"MN_ANNOTATIONS\n"
+"MN_ANNOTATION_BUTTON\n"
 "FN_DELETE_ALL_NOTES\n"
 "menuitem.text"
 msgid "~Delete All Comments"
@@ -1983,7 +1475,7 @@ msgstr ""
 #: mn.src
 msgctxt ""
 "mn.src\n"
-"MN_ANNOTATIONS\n"
+"MN_ANNOTATION_BUTTON\n"
 "FN_FORMAT_ALL_NOTES\n"
 "menuitem.text"
 msgid "~Format All Comments..."
@@ -1993,503 +1485,6 @@ msgstr ""
 #, fuzzy
 msgctxt ""
 "mn.src\n"
-"MN_TEXT_POPUPMENU\n"
-"string.text"
-msgid "Text"
-msgstr "Itheksithi:"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_TAB_POPUPMENU\n"
-"string.text"
-msgid "Table"
-msgstr ""
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_WRAP_CONTOUR\n"
-"FN_FRAME_WRAP_CONTOUR\n"
-"menuitem.text"
-msgid "Enable ~Contour"
-msgstr ""
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_EDIT_CONTOUR\n"
-"SID_CONTOUR_DLG\n"
-"menuitem.text"
-msgid "~Edit Contour..."
-msgstr "~Ukuhlela Ilayini lomgwalo..."
-
-#: mn.src
-#, fuzzy
-msgctxt ""
-"mn.src\n"
-"MN_MOUSE_FRAME_BEGIN.MN_WRAP\n"
-"FN_FRAME_NOWRAP\n"
-"menuitem.text"
-msgid "~No Wrap"
-msgstr "Akunakudluliswa kwegama"
-
-#: mn.src
-#, fuzzy
-msgctxt ""
-"mn.src\n"
-"MN_MOUSE_FRAME_BEGIN.MN_WRAP\n"
-"FN_FRAME_WRAP\n"
-"menuitem.text"
-msgid "~Page Wrap"
-msgstr "~Ukudluliswa Kwekhasi"
-
-#: mn.src
-#, fuzzy
-msgctxt ""
-"mn.src\n"
-"MN_MOUSE_FRAME_BEGIN.MN_WRAP\n"
-"FN_FRAME_WRAP_IDEAL\n"
-"menuitem.text"
-msgid "~Optimal Page Wrap"
-msgstr "~Ukudluliswa Kwekhasi Okulingeneko"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_MOUSE_FRAME_BEGIN.MN_WRAP\n"
-"FN_FRAME_WRAP_LEFT\n"
-"menuitem.text"
-msgid "Wrap ~Before"
-msgstr ""
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_MOUSE_FRAME_BEGIN.MN_WRAP\n"
-"FN_FRAME_WRAP_RIGHT\n"
-"menuitem.text"
-msgid "Wrap ~After"
-msgstr ""
-
-#: mn.src
-#, fuzzy
-msgctxt ""
-"mn.src\n"
-"MN_MOUSE_FRAME_BEGIN.MN_WRAP\n"
-"FN_FRAME_WRAPTHRU\n"
-"menuitem.text"
-msgid "~Wrap Through"
-msgstr "~Dlulisela Phambili"
-
-#: mn.src
-#, fuzzy
-msgctxt ""
-"mn.src\n"
-"MN_MOUSE_FRAME_BEGIN.MN_WRAP\n"
-"FN_FRAME_WRAPTHRU_TRANSP\n"
-"menuitem.text"
-msgid "In ~Background"
-msgstr "E~sendlalelweni"
-
-#: mn.src
-#, fuzzy
-msgctxt ""
-"mn.src\n"
-"MN_MOUSE_FRAME_BEGIN.MN_WRAP\n"
-"FN_WRAP_ANCHOR_ONLY\n"
-"menuitem.text"
-msgid "~First Paragraph"
-msgstr "~Indima Yokuthoma"
-
-#: mn.src
-#, fuzzy
-msgctxt ""
-"mn.src\n"
-"MN_MOUSE_FRAME_BEGIN\n"
-"MN_WRAP\n"
-"menuitem.text"
-msgid "~Wrap"
-msgstr "~Dlulisa igama"
-
-#: mn.src
-#, fuzzy
-msgctxt ""
-"mn.src\n"
-"MN_DRAW_POPUPMENU\n"
-"string.text"
-msgid "Graphic"
-msgstr "imigwalo"
-
-#: mn.src
-#, fuzzy
-msgctxt ""
-"mn.src\n"
-"MN_WRAP_DRAW.MN_WRAP\n"
-"FN_FRAME_NOWRAP\n"
-"menuitem.text"
-msgid "~No Wrap"
-msgstr "Akunakudluliswa kwegama"
-
-#: mn.src
-#, fuzzy
-msgctxt ""
-"mn.src\n"
-"MN_WRAP_DRAW.MN_WRAP\n"
-"FN_FRAME_WRAP\n"
-"menuitem.text"
-msgid "~Page Wrap"
-msgstr "~Ukudluliswa Kwekhasi"
-
-#: mn.src
-#, fuzzy
-msgctxt ""
-"mn.src\n"
-"MN_WRAP_DRAW.MN_WRAP\n"
-"FN_FRAME_WRAP_IDEAL\n"
-"menuitem.text"
-msgid "~Optimal Page Wrap"
-msgstr "~Ukudluliswa Kwekhasi Okulingeneko"
-
-#: mn.src
-#, fuzzy
-msgctxt ""
-"mn.src\n"
-"MN_WRAP_DRAW.MN_WRAP\n"
-"FN_FRAME_WRAPTHRU\n"
-"menuitem.text"
-msgid "~Wrap Through"
-msgstr "~Dlulisela Phambili"
-
-#: mn.src
-#, fuzzy
-msgctxt ""
-"mn.src\n"
-"MN_WRAP_DRAW.MN_WRAP\n"
-"FN_FRAME_WRAPTHRU_TRANSP\n"
-"menuitem.text"
-msgid "In ~Background"
-msgstr "E~sendlalelweni"
-
-#: mn.src
-#, fuzzy
-msgctxt ""
-"mn.src\n"
-"MN_WRAP_DRAW.MN_WRAP\n"
-"FN_WRAP_ANCHOR_ONLY\n"
-"menuitem.text"
-msgid "~First Paragraph"
-msgstr "~Indima Yokuthoma"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_WRAP_DRAW.MN_WRAP\n"
-"FN_DRAW_WRAP_DLG\n"
-"menuitem.text"
-msgid "~Edit..."
-msgstr "~Hlela..."
-
-#: mn.src
-#, fuzzy
-msgctxt ""
-"mn.src\n"
-"MN_WRAP_DRAW\n"
-"MN_WRAP\n"
-"menuitem.text"
-msgid "~Wrap"
-msgstr "~Dlulisa igama"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_AT_FRAME\n"
-"FN_TOOL_ANCHOR_FRAME\n"
-"menuitem.text"
-msgid "To ~Frame"
-msgstr "E~sakhiweni"
-
-#: mn.src
-#, fuzzy
-msgctxt ""
-"mn.src\n"
-"MN_ANCHOR.FN_TOOL_ANCHOR\n"
-"FN_TOOL_ANCHOR_PAGE\n"
-"menuitem.text"
-msgid "To P~age"
-msgstr "Ekhasini"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_ANCHOR.FN_TOOL_ANCHOR\n"
-"FN_TOOL_ANCHOR_PARAGRAPH\n"
-"menuitem.text"
-msgid "To ~Paragraph"
-msgstr "E~ndimeni"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_ANCHOR.FN_TOOL_ANCHOR\n"
-"FN_TOOL_ANCHOR_AT_CHAR\n"
-"menuitem.text"
-msgid "To ~Character"
-msgstr "E~tshwayweni"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_ANCHOR.FN_TOOL_ANCHOR\n"
-"FN_TOOL_ANCHOR_CHAR\n"
-"menuitem.text"
-msgid "As C~haracter"
-msgstr "Njenget~shwayo"
-
-#: mn.src
-#, fuzzy
-msgctxt ""
-"mn.src\n"
-"MN_ANCHOR\n"
-"FN_TOOL_ANCHOR\n"
-"menuitem.text"
-msgid "An~chor"
-msgstr "Bamba ebujameni"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_DRAW_POPUPMENU\n"
-"FN_ADD_TEXT_BOX\n"
-"menuitem.text"
-msgid "Add Text Box"
-msgstr ""
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_DRAW_POPUPMENU\n"
-"FN_REMOVE_TEXT_BOX\n"
-"menuitem.text"
-msgid "Remove Text Box"
-msgstr ""
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_DRAWFORM_POPUPMENU\n"
-"string.text"
-msgid "Control"
-msgstr "Lawula"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_DRWTXT_POPUPMENU\n"
-"string.text"
-msgid "Draw Object text"
-msgstr ""
-
-#: mn.src
-#, fuzzy
-msgctxt ""
-"mn.src\n"
-"MN_GRF_POPUPMENU\n"
-"string.text"
-msgid "Graphic"
-msgstr "imigwalo"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_ARRANGE_FRAME\n"
-"MN_SUB_ALIGN\n"
-"menuitem.text"
-msgid "~Arrange"
-msgstr "~Hlela"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_ALIGNMENT_FRAME.MN_FORMAT_FRM_HORZ\n"
-"FN_FRAME_ALIGN_HORZ_LEFT\n"
-"menuitem.text"
-msgid "~Left"
-msgstr "~Esinceleni"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_ALIGNMENT_FRAME.MN_FORMAT_FRM_HORZ\n"
-"FN_FRAME_ALIGN_HORZ_CENTER\n"
-"menuitem.text"
-msgid "~Centered"
-msgstr "~Bekwe phakathi"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_ALIGNMENT_FRAME.MN_FORMAT_FRM_HORZ\n"
-"FN_FRAME_ALIGN_HORZ_RIGHT\n"
-"menuitem.text"
-msgid "~Right"
-msgstr "~Ngesidleni"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_ALIGNMENT_FRAME.MN_FORMAT_FRM_HORZ\n"
-"FN_FRAME_ALIGN_VERT_TOP\n"
-"menuitem.text"
-msgid "Base at ~Top"
-msgstr "Isiseko ~Ngaphezulu"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_ALIGNMENT_FRAME.MN_FORMAT_FRM_HORZ\n"
-"FN_FRAME_ALIGN_VERT_CENTER\n"
-"menuitem.text"
-msgid "Base in ~Middle"
-msgstr "Isiseko ~Phakathi"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_ALIGNMENT_FRAME.MN_FORMAT_FRM_HORZ\n"
-"FN_FRAME_ALIGN_VERT_BOTTOM\n"
-"menuitem.text"
-msgid "Base at ~Bottom"
-msgstr "Isiseko ~Ngaphasi"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_ALIGNMENT_FRAME\n"
-"MN_FORMAT_FRM_HORZ\n"
-"menuitem.text"
-msgid "A~lignment"
-msgstr "U~kulinganisa"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_ROTATE_IMAGE.SID_MENU_MANAGE_GRAPHIC\n"
-"SID_ROTATE_GRAPHIC_LEFT\n"
-"menuitem.text"
-msgid "Rotate 90° Left"
-msgstr ""
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_ROTATE_IMAGE.SID_MENU_MANAGE_GRAPHIC\n"
-"SID_ROTATE_GRAPHIC_RIGHT\n"
-"menuitem.text"
-msgid "Rotate 90° Right"
-msgstr ""
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_ROTATE_IMAGE\n"
-"SID_MENU_MANAGE_GRAPHIC\n"
-"menuitem.text"
-msgid "~Rotate"
-msgstr ""
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_GRF_POPUPMENU\n"
-"FN_FORMAT_GRAFIC_DLG\n"
-"menuitem.text"
-msgid "Format ~Image..."
-msgstr ""
-
-#: mn.src
-#, fuzzy
-msgctxt ""
-"mn.src\n"
-"MN_OLE_POPUPMENU\n"
-"string.text"
-msgid "Object"
-msgstr "~Ilwazi ledatha"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_OLE_POPUPMENU\n"
-"FN_FORMAT_FRAME_DLG\n"
-"menuitem.text"
-msgid "Object..."
-msgstr "Ilwazi ledatha..."
-
-#: mn.src
-#, fuzzy
-msgctxt ""
-"mn.src\n"
-"MN_FRM_POPUPMENU\n"
-"string.text"
-msgid "Frame"
-msgstr "~Isakhiwo"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_PPREVIEW_POPUPMENU\n"
-"string.text"
-msgid "Draw Object text"
-msgstr ""
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_PPREVIEW_POPUPMENU\n"
-"FN_PAGEUP\n"
-"menuitem.text"
-msgid "Previous Page"
-msgstr "Ikhasi Elidlulileko"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_PPREVIEW_POPUPMENU\n"
-"FN_PAGEDOWN\n"
-"menuitem.text"
-msgid "Next Page"
-msgstr "Ikhasi Elilandelako"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_PPREVIEW_POPUPMENU\n"
-"FN_PRINT_PAGEPREVIEW\n"
-"menuitem.text"
-msgid "Print"
-msgstr "Gadangisa"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_PPREVIEW_POPUPMENU\n"
-"SID_PRINTPREVIEW\n"
-"menuitem.text"
-msgid "Close Preview"
-msgstr "Vala Ibonelophambili"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_MEDIA_POPUPMENU\n"
-"string.text"
-msgid "Media object"
-msgstr "Ilwazi ledatha yeMidiya"
-
-#: mn.src
-#, fuzzy
-msgctxt ""
-"mn.src\n"
 "MN_HEADERFOOTER_BUTTON\n"
 "FN_HEADERFOOTER_BORDERBACK\n"
 "menuitem.text"
diff --git a/source/nr/sw/source/ui/config.po b/source/nr/sw/source/ui/config.po
index e05e6c4b4fd..1f7b0220bf8 100644
--- a/source/nr/sw/source/ui/config.po
+++ b/source/nr/sw/source/ui/config.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-13 05:54+0000\n"
+"POT-Creation-Date: 2016-03-09 20:49+0100\n"
+"PO-Revision-Date: 2015-12-11 19:02+0000\n"
 "Last-Translator: system user <>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: nr\n"
@@ -13,7 +13,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Pootle 2.7\n"
 "X-Accelerator-Marker: ~\n"
-"X-POOTLE-MTIME: 1431496447.000000\n"
+"X-POOTLE-MTIME: 1449860525.000000\n"
 
 #: optdlg.src
 msgctxt ""
@@ -40,119 +40,116 @@ msgid "Western"
 msgstr ""
 
 #: optdlg.src
+#, fuzzy
 msgctxt ""
 "optdlg.src\n"
-"STR_PRINTOPTUI\n"
-"%PRODUCTNAME %s\n"
-"itemlist.text"
+"STR_PRINTOPTUI_PRODUCTNAME\n"
+"string.text"
 msgid "%PRODUCTNAME %s"
 msgstr "%PRODUCTNAME Umsebenzana"
 
 #: optdlg.src
+#, fuzzy
 msgctxt ""
 "optdlg.src\n"
-"STR_PRINTOPTUI\n"
-"Contents\n"
-"itemlist.text"
+"STR_PRINTOPTUI_CONTENTS\n"
+"string.text"
 msgid "Contents"
 msgstr "Imibono"
 
 #: optdlg.src
 msgctxt ""
 "optdlg.src\n"
-"STR_PRINTOPTUI\n"
-"Page ba~ckground\n"
-"itemlist.text"
+"STR_PRINTOPTUI_PAGE_BACKGROUND\n"
+"string.text"
 msgid "Page ba~ckground"
 msgstr ""
 
 #: optdlg.src
 msgctxt ""
 "optdlg.src\n"
-"STR_PRINTOPTUI\n"
-"P~ictures and other graphic objects\n"
-"itemlist.text"
+"STR_PRINTOPTUI_PICTURES\n"
+"string.text"
 msgid "P~ictures and other graphic objects"
 msgstr ""
 
 #: optdlg.src
+#, fuzzy
 msgctxt ""
 "optdlg.src\n"
-"STR_PRINTOPTUI\n"
-"Hidden te~xt\n"
-"itemlist.text"
+"STR_PRINTOPTUI_HIDDEN\n"
+"string.text"
 msgid "Hidden te~xt"
 msgstr "Itheksithi efihlekileko"
 
 #: optdlg.src
+#, fuzzy
 msgctxt ""
 "optdlg.src\n"
-"STR_PRINTOPTUI\n"
-"~Text placeholders\n"
-"itemlist.text"
+"STR_PRINTOPTUI_TEXT_PLACEHOLDERS\n"
+"string.text"
 msgid "~Text placeholders"
 msgstr "~Iimbambindawo zetheksithi"
 
 #: optdlg.src
+#, fuzzy
 msgctxt ""
 "optdlg.src\n"
-"STR_PRINTOPTUI\n"
-"Form control~s\n"
-"itemlist.text"
+"STR_PRINTOPTUI_FORM_CONTROLS\n"
+"string.text"
 msgid "Form control~s"
 msgstr "Ukulawula ikhesa"
 
 #: optdlg.src
+#, fuzzy
 msgctxt ""
 "optdlg.src\n"
-"STR_PRINTOPTUI\n"
-"Color\n"
-"itemlist.text"
+"STR_PRINTOPTUI_COLOR\n"
+"string.text"
 msgid "Color"
 msgstr "Umbala"
 
 #: optdlg.src
+#, fuzzy
 msgctxt ""
 "optdlg.src\n"
-"STR_PRINTOPTUI\n"
-"Print text in blac~k\n"
-"itemlist.text"
+"STR_PRINTOPTUI_PRINT_BLACK\n"
+"string.text"
 msgid "Print text in blac~k"
 msgstr "Gadangisa ukufayila"
 
 #: optdlg.src
+#, fuzzy
 msgctxt ""
 "optdlg.src\n"
-"STR_PRINTOPTUI\n"
-"Pages\n"
-"itemlist.text"
+"STR_PRINTOPTUI_PAGES_TEXT\n"
+"string.text"
 msgid "Pages"
 msgstr "Amakhasi"
 
 #: optdlg.src
+#, fuzzy
 msgctxt ""
 "optdlg.src\n"
-"STR_PRINTOPTUI\n"
-"Print ~automatically inserted blank pages\n"
-"itemlist.text"
+"STR_PRINTOPTUI_PRINT_BLANK\n"
+"string.text"
 msgid "Print ~automatically inserted blank pages"
 msgstr "~Zitholele amalebula namakholomu namarhemo "
 
 #: optdlg.src
 msgctxt ""
 "optdlg.src\n"
-"STR_PRINTOPTUI\n"
-"~Use only paper tray from printer preferences\n"
-"itemlist.text"
+"STR_PRINTOPTUI_ONLY_PAPER\n"
+"string.text"
 msgid "~Use only paper tray from printer preferences"
 msgstr ""
 
 #: optdlg.src
+#, fuzzy
 msgctxt ""
 "optdlg.src\n"
-"STR_PRINTOPTUI\n"
-"Print\n"
-"itemlist.text"
+"STR_PRINTOPTUI_PRINT\n"
+"string.text"
 msgid "Print"
 msgstr ""
 "#-#-#-#-#  app.po (PACKAGE VERSION)  #-#-#-#-#\n"
@@ -169,162 +166,149 @@ msgstr ""
 #: optdlg.src
 msgctxt ""
 "optdlg.src\n"
-"STR_PRINTOPTUI\n"
-"None (document only)\n"
-"itemlist.text"
+"STR_PRINTOPTUI_NONE\n"
+"string.text"
 msgid "None (document only)"
 msgstr ""
 
 #: optdlg.src
 msgctxt ""
 "optdlg.src\n"
-"STR_PRINTOPTUI\n"
-"Comments only\n"
-"itemlist.text"
+"STR_PRINTOPTUI_COMMENTS_ONLY\n"
+"string.text"
 msgid "Comments only"
 msgstr ""
 
 #: optdlg.src
 msgctxt ""
 "optdlg.src\n"
-"STR_PRINTOPTUI\n"
-"Place at end of document\n"
-"itemlist.text"
+"STR_PRINTOPTUI_PLACE_END\n"
+"string.text"
 msgid "Place at end of document"
 msgstr ""
 
 #: optdlg.src
 msgctxt ""
 "optdlg.src\n"
-"STR_PRINTOPTUI\n"
-"Place at end of page\n"
-"itemlist.text"
+"STR_PRINTOPTUI_PLACE_PAGE\n"
+"string.text"
 msgid "Place at end of page"
 msgstr ""
 
 #: optdlg.src
+#, fuzzy
 msgctxt ""
 "optdlg.src\n"
-"STR_PRINTOPTUI\n"
-"~Comments\n"
-"itemlist.text"
+"STR_PRINTOPTUI_COMMENTS\n"
+"string.text"
 msgid "~Comments"
 msgstr "~Imibono"
 
 #: optdlg.src
 msgctxt ""
 "optdlg.src\n"
-"STR_PRINTOPTUI\n"
-"Page sides\n"
-"itemlist.text"
+"STR_PRINTOPTUI_PAGE_SIDES\n"
+"string.text"
 msgid "Page sides"
 msgstr ""
 
 #: optdlg.src
 msgctxt ""
 "optdlg.src\n"
-"STR_PRINTOPTUI\n"
-"All pages\n"
-"itemlist.text"
+"STR_PRINTOPTUI_ALL_PAGES\n"
+"string.text"
 msgid "All pages"
 msgstr ""
 
 #: optdlg.src
 msgctxt ""
 "optdlg.src\n"
-"STR_PRINTOPTUI\n"
-"Back sides / left pages\n"
-"itemlist.text"
+"STR_PRINTOPTUI_BACK_PAGES\n"
+"string.text"
 msgid "Back sides / left pages"
 msgstr ""
 
 #: optdlg.src
 msgctxt ""
 "optdlg.src\n"
-"STR_PRINTOPTUI\n"
-"Front sides / right pages\n"
-"itemlist.text"
+"STR_PRINTOPTUI_FONT_PAGES\n"
+"string.text"
 msgid "Front sides / right pages"
 msgstr ""
 
 #: optdlg.src
+#, fuzzy
 msgctxt ""
 "optdlg.src\n"
-"STR_PRINTOPTUI\n"
-"Include\n"
-"itemlist.text"
+"STR_PRINTOPTUI_INCLUDE\n"
+"string.text"
 msgid "Include"
 msgstr "Faka"
 
 #: optdlg.src
+#, fuzzy
 msgctxt ""
 "optdlg.src\n"
-"STR_PRINTOPTUI\n"
-"Broch~ure\n"
-"itemlist.text"
+"STR_PRINTOPTUI_BROCHURE\n"
+"string.text"
 msgid "Broch~ure"
 msgstr "Amabhrotjha"
 
 #: optdlg.src
 msgctxt ""
 "optdlg.src\n"
-"STR_PRINTOPTUI\n"
-"Left-to-right script\n"
-"itemlist.text"
+"STR_PRINTOPTUI_LEFT_SCRIPT\n"
+"string.text"
 msgid "Left-to-right script"
 msgstr ""
 
 #: optdlg.src
 msgctxt ""
 "optdlg.src\n"
-"STR_PRINTOPTUI\n"
-"Right-to-left script\n"
-"itemlist.text"
+"STR_PRINTOPTUI_RIGHT_SCRIPT\n"
+"string.text"
 msgid "Right-to-left script"
 msgstr ""
 
 #: optdlg.src
 msgctxt ""
 "optdlg.src\n"
-"STR_PRINTOPTUI\n"
-"Range and copies\n"
-"itemlist.text"
+"STR_PRINTOPTUI_RANGE_COPIES\n"
+"string.text"
 msgid "Range and copies"
 msgstr ""
 
 #: optdlg.src
 msgctxt ""
 "optdlg.src\n"
-"STR_PRINTOPTUI\n"
-"~All pages\n"
-"itemlist.text"
+"STR_PRINTOPTUI_ALLPAGES\n"
+"string.text"
 msgid "~All pages"
 msgstr ""
 
 #: optdlg.src
+#, fuzzy
 msgctxt ""
 "optdlg.src\n"
-"STR_PRINTOPTUI\n"
-"Pa~ges\n"
-"itemlist.text"
+"STR_PRINTOPTUI_SOMEPAGES\n"
+"string.text"
 msgid "Pa~ges"
 msgstr "Amakhasi"
 
 #: optdlg.src
+#, fuzzy
 msgctxt ""
 "optdlg.src\n"
-"STR_PRINTOPTUI\n"
-"~Selection\n"
-"itemlist.text"
+"STR_PRINTOPTUI_SELECTION\n"
+"string.text"
 msgid "~Selection"
 msgstr "~Ukukhetha"
 
 #: optdlg.src
 msgctxt ""
 "optdlg.src\n"
-"STR_PRINTOPTUI\n"
-"Place in margins\n"
-"itemlist.text"
+"STR_PRINTOPTUI_PLACE_MARGINS\n"
+"string.text"
 msgid "Place in margins"
 msgstr ""
 
diff --git a/source/nr/sw/source/ui/dbui.po b/source/nr/sw/source/ui/dbui.po
index 1555fffb23a..b71c0203b5b 100644
--- a/source/nr/sw/source/ui/dbui.po
+++ b/source/nr/sw/source/ui/dbui.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-13 05:54+0000\n"
+"POT-Creation-Date: 2016-04-16 21:40+0200\n"
+"PO-Revision-Date: 2015-12-11 19:02+0000\n"
 "Last-Translator: system user <>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: nr\n"
@@ -13,7 +13,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Pootle 2.7\n"
 "X-Accelerator-Marker: ~\n"
-"X-POOTLE-MTIME: 1431496479.000000\n"
+"X-POOTLE-MTIME: 1449860572.000000\n"
 
 #: dbui.src
 msgctxt ""
@@ -218,7 +218,7 @@ msgctxt ""
 "dbui.src\n"
 "STR_FILTER_MDB\n"
 "string.text"
-msgid "Microsoft Access (*.mdb)"
+msgid "Microsoft Access (*.mdb;*.mde)"
 msgstr ""
 
 #: dbui.src
@@ -226,7 +226,7 @@ msgctxt ""
 "dbui.src\n"
 "STR_FILTER_ACCDB\n"
 "string.text"
-msgid "Microsoft Access 2007 (*.accdb)"
+msgid "Microsoft Access 2007 (*.accdb,*.accde)"
 msgstr ""
 
 #: dbui.src
@@ -306,9 +306,10 @@ msgid "Select starting document"
 msgstr "Khetha idokhumente yokuthoma"
 
 #: mailmergewizard.src
+#, fuzzy
 msgctxt ""
 "mailmergewizard.src\n"
-"ST_DOCUMETNTYPE\n"
+"ST_DOCUMENTTYPE\n"
 "string.text"
 msgid "Select document type"
 msgstr "Khetha umhlobo wedokhumente"
@@ -348,26 +349,10 @@ msgstr "Lungisa ukuhleleka"
 #: mailmergewizard.src
 msgctxt ""
 "mailmergewizard.src\n"
-"ST_PREPAREMERGE\n"
-"string.text"
-msgid "Edit document"
-msgstr "Editha idokhumente"
-
-#: mailmergewizard.src
-msgctxt ""
-"mailmergewizard.src\n"
-"ST_MERGE\n"
+"ST_EXCLUDE\n"
 "string.text"
-msgid "Personalize document"
-msgstr "Yenza idokhumente ibe ngeyomuntu mathupha"
-
-#: mailmergewizard.src
-msgctxt ""
-"mailmergewizard.src\n"
-"ST_OUTPUT\n"
-"string.text"
-msgid "Save, print or send"
-msgstr "Bulunga, phrintha nanyana thumela"
+msgid "Exclude recipient"
+msgstr ""
 
 #: mailmergewizard.src
 msgctxt ""
diff --git a/source/nr/sw/source/ui/ribbar.po b/source/nr/sw/source/ui/ribbar.po
deleted file mode 100644
index b268f372b55..00000000000
--- a/source/nr/sw/source/ui/ribbar.po
+++ /dev/null
@@ -1,60 +0,0 @@
-#. extracted from sw/source/ui/ribbar
-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-05-02 00:02+0200\n"
-"PO-Revision-Date: 2011-04-06 01:09+0200\n"
-"Last-Translator: Anonymous Pootle User\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: nr\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: LibreOffice\n"
-"X-Accelerator-Marker: ~\n"
-
-#: tbxanchr.src
-msgctxt ""
-"tbxanchr.src\n"
-"MN_ANCHOR_POPUP\n"
-"FN_TOOL_ANCHOR_PAGE\n"
-"menuitem.text"
-msgid "To Page"
-msgstr "Ekhasini"
-
-#: tbxanchr.src
-msgctxt ""
-"tbxanchr.src\n"
-"MN_ANCHOR_POPUP\n"
-"FN_TOOL_ANCHOR_PARAGRAPH\n"
-"menuitem.text"
-msgid "To Paragraph"
-msgstr "Ukwenza Ipharagrafu"
-
-#: tbxanchr.src
-msgctxt ""
-"tbxanchr.src\n"
-"MN_ANCHOR_POPUP\n"
-"FN_TOOL_ANCHOR_AT_CHAR\n"
-"menuitem.text"
-msgid "To Character"
-msgstr "Ukwenza Ikharektha"
-
-#: tbxanchr.src
-msgctxt ""
-"tbxanchr.src\n"
-"MN_ANCHOR_POPUP\n"
-"FN_TOOL_ANCHOR_CHAR\n"
-"menuitem.text"
-msgid "As Character"
-msgstr "NjengeKharektha"
-
-#: tbxanchr.src
-msgctxt ""
-"tbxanchr.src\n"
-"MN_ANCHOR_POPUP\n"
-"FN_TOOL_ANCHOR_FRAME\n"
-"menuitem.text"
-msgid "To Frame"
-msgstr "Ukufreyimela"
diff --git a/source/nr/sw/source/ui/utlui.po b/source/nr/sw/source/ui/utlui.po
index 6a7088217a7..6ef6b9da961 100644
--- a/source/nr/sw/source/ui/utlui.po
+++ b/source/nr/sw/source/ui/utlui.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-11-20 11:58+0100\n"
+"POT-Creation-Date: 2016-04-21 12:15+0200\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"
@@ -1824,11 +1824,12 @@ msgid "Indexes"
 msgstr "~Ama-indeksi"
 
 #: utlui.src
+#, fuzzy
 msgctxt ""
 "utlui.src\n"
 "STR_CONTENT_TYPE_DRAWOBJECT\n"
 "string.text"
-msgid "Draw objects"
+msgid "Drawing objects"
 msgstr "Gwala izinto"
 
 #: utlui.src
diff --git a/source/nr/sw/source/uibase/inc.po b/source/nr/sw/source/uibase/inc.po
deleted file mode 100644
index b2bebc0dc31..00000000000
--- a/source/nr/sw/source/uibase/inc.po
+++ /dev/null
@@ -1,51 +0,0 @@
-#. extracted from sw/source/uibase/inc
-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-11-18 11:23+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"
-"Language: nr\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: LibreOffice\n"
-"X-Accelerator-Marker: ~\n"
-
-#: redline_tmpl.hrc
-msgctxt ""
-"redline_tmpl.hrc\n"
-"MN_EDIT_REDLINE\n"
-"FN_REDLINE_ACCEPT_DIRECT\n"
-"menuitem.text"
-msgid "Accept Change"
-msgstr ""
-
-#: redline_tmpl.hrc
-msgctxt ""
-"redline_tmpl.hrc\n"
-"MN_EDIT_REDLINE\n"
-"FN_REDLINE_REJECT_DIRECT\n"
-"menuitem.text"
-msgid "Reject Change"
-msgstr ""
-
-#: redline_tmpl.hrc
-msgctxt ""
-"redline_tmpl.hrc\n"
-"MN_EDIT_REDLINE\n"
-"FN_REDLINE_NEXT_CHANGE\n"
-"menuitem.text"
-msgid "Next Change"
-msgstr ""
-
-#: redline_tmpl.hrc
-msgctxt ""
-"redline_tmpl.hrc\n"
-"MN_EDIT_REDLINE\n"
-"FN_REDLINE_PREV_CHANGE\n"
-"menuitem.text"
-msgid "Previous Change"
-msgstr ""
diff --git a/source/nr/sw/source/uibase/lingu.po b/source/nr/sw/source/uibase/lingu.po
index 8c89874bc91..efad1bc1808 100644
--- a/source/nr/sw/source/uibase/lingu.po
+++ b/source/nr/sw/source/uibase/lingu.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-11-10 19:33+0100\n"
-"PO-Revision-Date: 2014-11-19 09:58+0000\n"
+"POT-Creation-Date: 2016-03-09 20:49+0100\n"
+"PO-Revision-Date: 2015-11-12 00:35+0000\n"
 "Last-Translator: system user <>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: nr\n"
@@ -13,7 +13,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Pootle 2.7\n"
 "X-Accelerator-Marker: ~\n"
-"X-POOTLE-MTIME: 1416391110.000000\n"
+"X-POOTLE-MTIME: 1447288507.000000\n"
 
 #: olmenu.src
 msgctxt ""
@@ -72,6 +72,42 @@ msgstr ""
 #: olmenu.src
 msgctxt ""
 "olmenu.src\n"
+"MN_SPELL_POPUP\n"
+"FN_REDLINE_ACCEPT_DIRECT\n"
+"menuitem.text"
+msgid "Accept Change"
+msgstr ""
+
+#: olmenu.src
+msgctxt ""
+"olmenu.src\n"
+"MN_SPELL_POPUP\n"
+"FN_REDLINE_REJECT_DIRECT\n"
+"menuitem.text"
+msgid "Reject Change"
+msgstr ""
+
+#: olmenu.src
+msgctxt ""
+"olmenu.src\n"
+"MN_SPELL_POPUP\n"
+"FN_REDLINE_NEXT_CHANGE\n"
+"menuitem.text"
+msgid "Next Change"
+msgstr ""
+
+#: olmenu.src
+msgctxt ""
+"olmenu.src\n"
+"MN_SPELL_POPUP\n"
+"FN_REDLINE_PREV_CHANGE\n"
+"menuitem.text"
+msgid "Previous Change"
+msgstr ""
+
+#: olmenu.src
+msgctxt ""
+"olmenu.src\n"
 "STR_WORD\n"
 "string.text"
 msgid "Word is "
diff --git a/source/nr/sw/source/uibase/ribbar.po b/source/nr/sw/source/uibase/ribbar.po
index 5b4f53350e3..8e60d631641 100644
--- a/source/nr/sw/source/uibase/ribbar.po
+++ b/source/nr/sw/source/uibase/ribbar.po
@@ -3,16 +3,17 @@ 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-11-18 11:23+0100\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2016-03-09 20:49+0100\n"
+"PO-Revision-Date: 2014-11-19 09:58+0000\n"
+"Last-Translator: system user <>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: nr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: LibreOffice\n"
+"X-Generator: Pootle 2.7\n"
 "X-Accelerator-Marker: ~\n"
+"X-POOTLE-MTIME: 1416391111.000000\n"
 
 #: inputwin.src
 msgctxt ""
@@ -20,7 +21,7 @@ msgctxt ""
 "RID_TBX_FORMULA\n"
 "FN_FORMULA_CALC\n"
 "toolboxitem.text"
-msgid "Formula"
+msgid "Functions"
 msgstr ""
 
 #: inputwin.src
@@ -328,78 +329,6 @@ msgstr ""
 #: workctrl.src
 msgctxt ""
 "workctrl.src\n"
-"RID_INSERT_FIELD_CTRL\n"
-"FN_INSERT_FLD_PGNUMBER\n"
-"menuitem.text"
-msgid "Page Number"
-msgstr ""
-
-#: workctrl.src
-msgctxt ""
-"workctrl.src\n"
-"RID_INSERT_FIELD_CTRL\n"
-"FN_INSERT_FLD_PGCOUNT\n"
-"menuitem.text"
-msgid "Page Count"
-msgstr ""
-
-#: workctrl.src
-msgctxt ""
-"workctrl.src\n"
-"RID_INSERT_FIELD_CTRL\n"
-"FN_INSERT_FLD_DATE\n"
-"menuitem.text"
-msgid "Date"
-msgstr ""
-
-#: workctrl.src
-msgctxt ""
-"workctrl.src\n"
-"RID_INSERT_FIELD_CTRL\n"
-"FN_INSERT_FLD_TIME\n"
-"menuitem.text"
-msgid "Time"
-msgstr ""
-
-#: workctrl.src
-msgctxt ""
-"workctrl.src\n"
-"RID_INSERT_FIELD_CTRL\n"
-"FN_INSERT_FLD_TITLE\n"
-"menuitem.text"
-msgid "Title"
-msgstr ""
-
-#: workctrl.src
-msgctxt ""
-"workctrl.src\n"
-"RID_INSERT_FIELD_CTRL\n"
-"FN_INSERT_FLD_AUTHOR\n"
-"menuitem.text"
-msgid "Author"
-msgstr ""
-
-#: workctrl.src
-msgctxt ""
-"workctrl.src\n"
-"RID_INSERT_FIELD_CTRL\n"
-"FN_INSERT_FLD_TOPIC\n"
-"menuitem.text"
-msgid "Subject"
-msgstr ""
-
-#: workctrl.src
-msgctxt ""
-"workctrl.src\n"
-"RID_INSERT_FIELD_CTRL\n"
-"FN_INSERT_FIELD\n"
-"menuitem.text"
-msgid "More Fields..."
-msgstr ""
-
-#: workctrl.src
-msgctxt ""
-"workctrl.src\n"
 "ST_TBL\n"
 "string.text"
 msgid "Table"
diff --git a/source/nr/sw/source/uibase/smartmenu.po b/source/nr/sw/source/uibase/smartmenu.po
deleted file mode 100644
index e52152ba09e..00000000000
--- a/source/nr/sw/source/uibase/smartmenu.po
+++ /dev/null
@@ -1,24 +0,0 @@
-#. extracted from sw/source/uibase/smartmenu
-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-11-18 11:23+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"
-"Language: nr\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: LibreOffice\n"
-"X-Accelerator-Marker: ~\n"
-
-#: stmenu.src
-msgctxt ""
-"stmenu.src\n"
-"MN_SMARTTAG_POPUP\n"
-"MN_SMARTTAG_OPTIONS\n"
-"menuitem.text"
-msgid "Smart Tag Options..."
-msgstr ""
diff --git a/source/nr/sw/source/uibase/uiview.po b/source/nr/sw/source/uibase/uiview.po
index 163ad3d8559..703d1ffdd78 100644
--- a/source/nr/sw/source/uibase/uiview.po
+++ b/source/nr/sw/source/uibase/uiview.po
@@ -3,16 +3,17 @@ 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-11-18 11:23+0100\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2016-03-09 20:49+0100\n"
+"PO-Revision-Date: 2014-11-19 09:58+0000\n"
+"Last-Translator: system user <>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: nr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: LibreOffice\n"
+"X-Generator: Pootle 2.7\n"
 "X-Accelerator-Marker: ~\n"
+"X-POOTLE-MTIME: 1416391111.000000\n"
 
 #: view.src
 msgctxt ""
@@ -177,24 +178,7 @@ msgstr ""
 #: view.src
 msgctxt ""
 "view.src\n"
-"MN_SRCVIEW_POPUPMENU\n"
-"string.text"
-msgid "HTML source"
-msgstr ""
-
-#: view.src
-msgctxt ""
-"view.src\n"
 "RID_PVIEW_TOOLBOX\n"
 "string.text"
 msgid "Print Preview"
 msgstr ""
-
-#: view.src
-msgctxt ""
-"view.src\n"
-"MN_SRCVIEW_POPUPMENU\n"
-"SID_SOURCEVIEW\n"
-"menuitem.text"
-msgid "HTML Source"
-msgstr ""
diff --git a/source/nr/sw/source/uibase/utlui.po b/source/nr/sw/source/uibase/utlui.po
index 3959e77ce54..d9446322b7f 100644
--- a/source/nr/sw/source/uibase/utlui.po
+++ b/source/nr/sw/source/uibase/utlui.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-11-10 19:33+0100\n"
-"PO-Revision-Date: 2015-05-13 05:55+0000\n"
+"POT-Creation-Date: 2016-04-16 21:40+0200\n"
+"PO-Revision-Date: 2015-11-12 00:36+0000\n"
 "Last-Translator: system user <>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: nr\n"
@@ -13,7 +13,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Pootle 2.7\n"
 "X-Accelerator-Marker: ~\n"
-"X-POOTLE-MTIME: 1431496516.000000\n"
+"X-POOTLE-MTIME: 1447288590.000000\n"
 
 #: attrdesc.src
 msgctxt ""
@@ -1459,24 +1459,16 @@ msgstr ""
 #: navipi.src
 msgctxt ""
 "navipi.src\n"
-"DLG_NAVIGATION_PI\n"
-"window.text"
-msgid "Navigator"
-msgstr ""
-
-#: navipi.src
-msgctxt ""
-"navipi.src\n"
-"TB_CONTENT\n"
+"DLG_NAVIGATION_PI.TB_CONTENT\n"
 "FN_GLOBAL_SWITCH\n"
 "toolboxitem.text"
-msgid "Toggle"
+msgid "Toggle Master View"
 msgstr ""
 
 #: navipi.src
 msgctxt ""
 "navipi.src\n"
-"TB_CONTENT\n"
+"DLG_NAVIGATION_PI.TB_CONTENT\n"
 "FN_CREATE_NAVIGATION\n"
 "toolboxitem.text"
 msgid "Navigation"
@@ -1485,7 +1477,7 @@ msgstr ""
 #: navipi.src
 msgctxt ""
 "navipi.src\n"
-"TB_CONTENT\n"
+"DLG_NAVIGATION_PI.TB_CONTENT\n"
 "FN_UP\n"
 "toolboxitem.text"
 msgid "Back"
@@ -1494,7 +1486,7 @@ msgstr ""
 #: navipi.src
 msgctxt ""
 "navipi.src\n"
-"TB_CONTENT\n"
+"DLG_NAVIGATION_PI.TB_CONTENT\n"
 "FN_DOWN\n"
 "toolboxitem.text"
 msgid "Forward"
@@ -1503,7 +1495,7 @@ msgstr ""
 #: navipi.src
 msgctxt ""
 "navipi.src\n"
-"TB_CONTENT\n"
+"DLG_NAVIGATION_PI.TB_CONTENT\n"
 "FN_DROP_REGION\n"
 "toolboxitem.text"
 msgid "Drag Mode"
@@ -1512,7 +1504,7 @@ msgstr ""
 #: navipi.src
 msgctxt ""
 "navipi.src\n"
-"TB_CONTENT\n"
+"DLG_NAVIGATION_PI.TB_CONTENT\n"
 "FN_ITEM_UP\n"
 "toolboxitem.text"
 msgid "Promote Chapter"
@@ -1521,7 +1513,7 @@ msgstr ""
 #: navipi.src
 msgctxt ""
 "navipi.src\n"
-"TB_CONTENT\n"
+"DLG_NAVIGATION_PI.TB_CONTENT\n"
 "FN_ITEM_DOWN\n"
 "toolboxitem.text"
 msgid "Demote Chapter"
@@ -1530,7 +1522,7 @@ msgstr ""
 #: navipi.src
 msgctxt ""
 "navipi.src\n"
-"TB_CONTENT\n"
+"DLG_NAVIGATION_PI.TB_CONTENT\n"
 "FN_SHOW_CONTENT_BOX\n"
 "toolboxitem.text"
 msgid "List Box On/Off"
@@ -1539,16 +1531,16 @@ msgstr ""
 #: navipi.src
 msgctxt ""
 "navipi.src\n"
-"TB_CONTENT\n"
+"DLG_NAVIGATION_PI.TB_CONTENT\n"
 "FN_SHOW_ROOT\n"
 "toolboxitem.text"
-msgid "Content View"
+msgid "Content Navigation View"
 msgstr ""
 
 #: navipi.src
 msgctxt ""
 "navipi.src\n"
-"TB_CONTENT\n"
+"DLG_NAVIGATION_PI.TB_CONTENT\n"
 "FN_SELECT_SET_AUTO_BOOKMARK\n"
 "toolboxitem.text"
 msgid "Set Reminder"
@@ -1557,7 +1549,7 @@ msgstr ""
 #: navipi.src
 msgctxt ""
 "navipi.src\n"
-"TB_CONTENT\n"
+"DLG_NAVIGATION_PI.TB_CONTENT\n"
 "FN_SELECT_HEADER\n"
 "toolboxitem.text"
 msgid "Header"
@@ -1566,7 +1558,7 @@ msgstr ""
 #: navipi.src
 msgctxt ""
 "navipi.src\n"
-"TB_CONTENT\n"
+"DLG_NAVIGATION_PI.TB_CONTENT\n"
 "FN_SELECT_FOOTER\n"
 "toolboxitem.text"
 msgid "Footer"
@@ -1575,7 +1567,7 @@ msgstr ""
 #: navipi.src
 msgctxt ""
 "navipi.src\n"
-"TB_CONTENT\n"
+"DLG_NAVIGATION_PI.TB_CONTENT\n"
 "FN_SELECT_FOOTNOTE\n"
 "toolboxitem.text"
 msgid "Anchor<->Text"
@@ -1584,7 +1576,7 @@ msgstr ""
 #: navipi.src
 msgctxt ""
 "navipi.src\n"
-"TB_CONTENT\n"
+"DLG_NAVIGATION_PI.TB_CONTENT\n"
 "FN_OUTLINE_LEVEL\n"
 "toolboxitem.text"
 msgid "Heading Levels Shown"
@@ -1593,7 +1585,7 @@ msgstr ""
 #: navipi.src
 msgctxt ""
 "navipi.src\n"
-"TB_CONTENT\n"
+"DLG_NAVIGATION_PI.TB_CONTENT\n"
 "FN_ITEM_LEFT\n"
 "toolboxitem.text"
 msgid "Promote Level"
@@ -1602,7 +1594,7 @@ msgstr ""
 #: navipi.src
 msgctxt ""
 "navipi.src\n"
-"TB_CONTENT\n"
+"DLG_NAVIGATION_PI.TB_CONTENT\n"
 "FN_ITEM_RIGHT\n"
 "toolboxitem.text"
 msgid "Demote Level"
@@ -1611,16 +1603,16 @@ msgstr ""
 #: navipi.src
 msgctxt ""
 "navipi.src\n"
-"TB_GLOBAL\n"
+"DLG_NAVIGATION_PI.TB_GLOBAL\n"
 "FN_GLOBAL_SWITCH\n"
 "toolboxitem.text"
-msgid "Toggle"
+msgid "Toggle Master View"
 msgstr ""
 
 #: navipi.src
 msgctxt ""
 "navipi.src\n"
-"TB_GLOBAL\n"
+"DLG_NAVIGATION_PI.TB_GLOBAL\n"
 "FN_GLOBAL_EDIT\n"
 "toolboxitem.text"
 msgid "Edit"
@@ -1629,7 +1621,7 @@ msgstr ""
 #: navipi.src
 msgctxt ""
 "navipi.src\n"
-"TB_GLOBAL\n"
+"DLG_NAVIGATION_PI.TB_GLOBAL\n"
 "FN_GLOBAL_UPDATE\n"
 "toolboxitem.text"
 msgid "Update"
@@ -1638,7 +1630,7 @@ msgstr ""
 #: navipi.src
 msgctxt ""
 "navipi.src\n"
-"TB_GLOBAL\n"
+"DLG_NAVIGATION_PI.TB_GLOBAL\n"
 "FN_GLOBAL_OPEN\n"
 "toolboxitem.text"
 msgid "Insert"
@@ -1647,7 +1639,7 @@ msgstr ""
 #: navipi.src
 msgctxt ""
 "navipi.src\n"
-"TB_GLOBAL\n"
+"DLG_NAVIGATION_PI.TB_GLOBAL\n"
 "FN_GLOBAL_SAVE_CONTENT\n"
 "toolboxitem.text"
 msgid "Save Contents as well"
@@ -1656,7 +1648,7 @@ msgstr ""
 #: navipi.src
 msgctxt ""
 "navipi.src\n"
-"TB_GLOBAL\n"
+"DLG_NAVIGATION_PI.TB_GLOBAL\n"
 "FN_ITEM_UP\n"
 "toolboxitem.text"
 msgid "Move Up"
@@ -1665,7 +1657,7 @@ msgstr ""
 #: navipi.src
 msgctxt ""
 "navipi.src\n"
-"TB_GLOBAL\n"
+"DLG_NAVIGATION_PI.TB_GLOBAL\n"
 "FN_ITEM_DOWN\n"
 "toolboxitem.text"
 msgid "Move Down"
@@ -1674,6 +1666,14 @@ msgstr ""
 #: navipi.src
 msgctxt ""
 "navipi.src\n"
+"DLG_NAVIGATION_PI\n"
+"window.text"
+msgid "Navigator"
+msgstr ""
+
+#: navipi.src
+msgctxt ""
+"navipi.src\n"
 "STR_ACCESS_TL_GLOBAL\n"
 "string.text"
 msgid "Global View"
@@ -1684,7 +1684,7 @@ msgctxt ""
 "navipi.src\n"
 "STR_ACCESS_TL_CONTENT\n"
 "string.text"
-msgid "Content View"
+msgid "Content Navigation View"
 msgstr ""
 
 #: navipi.src
diff --git a/source/nr/sw/uiconfig/swriter/ui.po b/source/nr/sw/uiconfig/swriter/ui.po
index be46482ba89..0e0310ad7f8 100644
--- a/source/nr/sw/uiconfig/swriter/ui.po
+++ b/source/nr/sw/uiconfig/swriter/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-11-10 19:33+0100\n"
-"PO-Revision-Date: 2015-08-06 23:03+0000\n"
+"POT-Creation-Date: 2016-04-16 21:40+0200\n"
+"PO-Revision-Date: 2015-12-11 19:04+0000\n"
 "Last-Translator: system user <>\n"
 "Language-Team: none\n"
 "Language: nr\n"
@@ -13,7 +13,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Pootle 2.7\n"
 "X-Accelerator-Marker: ~\n"
-"X-POOTLE-MTIME: 1438902207.000000\n"
+"X-POOTLE-MTIME: 1449860671.000000\n"
 
 #: abstractdialog.ui
 msgctxt ""
@@ -4285,21 +4285,30 @@ msgstr ""
 #, fuzzy
 msgctxt ""
 "fldrefpage.ui\n"
-"label2\n"
+"label4\n"
 "label\n"
 "string.text"
-msgid "S_election"
+msgid "Selection"
 msgstr "~Ukukhetha"
 
 #: fldrefpage.ui
+msgctxt ""
+"fldrefpage.ui\n"
+"filter\n"
+"placeholder_text\n"
+"string.text"
+msgid "Filter Selection"
+msgstr ""
+
+#: fldrefpage.ui
 #, fuzzy
 msgctxt ""
 "fldrefpage.ui\n"
-"nameft\n"
+"label2\n"
 "label\n"
 "string.text"
-msgid "Na_me"
-msgstr "Amagama"
+msgid "S_election"
+msgstr "~Ukukhetha"
 
 #: fldrefpage.ui
 msgctxt ""
@@ -4311,6 +4320,16 @@ msgid "_Value"
 msgstr ""
 
 #: fldrefpage.ui
+#, fuzzy
+msgctxt ""
+"fldrefpage.ui\n"
+"nameft\n"
+"label\n"
+"string.text"
+msgid "Na_me"
+msgstr "Amagama"
+
+#: fldrefpage.ui
 msgctxt ""
 "fldrefpage.ui\n"
 "liststore1\n"
@@ -4532,24 +4551,6 @@ msgctxt ""
 msgid "Date Time Author"
 msgstr ""
 
-#: floatingmmchild.ui
-msgctxt ""
-"floatingmmchild.ui\n"
-"FloatingMMChild\n"
-"title\n"
-"string.text"
-msgid "Mail Merge Wizard"
-msgstr ""
-
-#: floatingmmchild.ui
-msgctxt ""
-"floatingmmchild.ui\n"
-"return\n"
-"label\n"
-"string.text"
-msgid "Return to Mail Merge Wizard"
-msgstr ""
-
 #: floatingnavigation.ui
 msgctxt ""
 "floatingnavigation.ui\n"
@@ -6214,18 +6215,46 @@ msgctxt ""
 "InsertBookmarkDialog\n"
 "title\n"
 "string.text"
-msgid "Insert Bookmark"
+msgid "Bookmark"
 msgstr ""
 
 #: insertbookmark.ui
 msgctxt ""
 "insertbookmark.ui\n"
+"insert\n"
+"label\n"
+"string.text"
+msgid "Insert"
+msgstr ""
+
+#: insertbookmark.ui
+#, fuzzy
+msgctxt ""
+"insertbookmark.ui\n"
+"rename\n"
+"label\n"
+"string.text"
+msgid "Rename"
+msgstr "Thiya butjha"
+
+#: insertbookmark.ui
+msgctxt ""
+"insertbookmark.ui\n"
 "delete\n"
 "label\n"
 "string.text"
 msgid "Delete"
 msgstr ""
 
+#: insertbookmark.ui
+msgctxt ""
+"insertbookmark.ui\n"
+"goto\n"
+"label\n"
+"string.text"
+msgid "Go to"
+msgstr ""
+
 #: insertbreak.ui
 msgctxt ""
 "insertbreak.ui\n"
@@ -7443,19 +7472,19 @@ msgstr ""
 #: mailconfigpage.ui
 msgctxt ""
 "mailconfigpage.ui\n"
-"port_label\n"
+"server_label\n"
 "label\n"
 "string.text"
-msgid "_Port:"
+msgid "_Server name:"
 msgstr ""
 
 #: mailconfigpage.ui
 msgctxt ""
 "mailconfigpage.ui\n"
-"server_label\n"
+"port_label\n"
 "label\n"
 "string.text"
-msgid "_Server name:"
+msgid "_Port:"
 msgstr ""
 
 #: mailconfigpage.ui
@@ -7464,7 +7493,7 @@ msgctxt ""
 "serverauthentication\n"
 "label\n"
 "string.text"
-msgid "Server Au_thentication"
+msgid "Ser_ver Authentication…"
 msgstr ""
 
 #: mailconfigpage.ui
@@ -7482,7 +7511,7 @@ msgctxt ""
 "test\n"
 "label\n"
 "string.text"
-msgid "Test S_ettings..."
+msgid "_Test Settings"
 msgstr ""
 
 #: mailmerge.ui
@@ -8289,531 +8318,382 @@ msgctxt ""
 msgid "Insert personalized salutation"
 msgstr ""
 
-#: mmmergepage.ui
-msgctxt ""
-"mmmergepage.ui\n"
-"helplabel\n"
-"label\n"
-"string.text"
-msgid "You can personalize particular documents. Clicking '%1' will temporarily reduce the wizard to a small window so you can edit your document. After editing the document, return to the wizard by clicking 'Return to Mail Merge Wizard' in the small window."
-msgstr ""
-
-#: mmmergepage.ui
+#: mmoutputtypepage.ui
 msgctxt ""
-"mmmergepage.ui\n"
-"edit\n"
+"mmoutputtypepage.ui\n"
+"letterft\n"
 "label\n"
 "string.text"
-msgid "_Edit individual document..."
+msgid "Send letters to a group of recipients. The letters can contain an address block and a salutation. The letters can be personalized for each recipient."
 msgstr ""
 
-#: mmmergepage.ui
+#: mmoutputtypepage.ui
 msgctxt ""
-"mmmergepage.ui\n"
-"label1\n"
+"mmoutputtypepage.ui\n"
+"emailft\n"
 "label\n"
 "string.text"
-msgid "Personalize the Mail Merge Documents"
+msgid "Send e-mail messages to a group of recipients. The e-mail messages can contain a salutation. The e-mail messages can be personalized for each recipient."
 msgstr ""
 
-#: mmmergepage.ui
+#: mmoutputtypepage.ui
 msgctxt ""
-"mmmergepage.ui\n"
-"find\n"
+"mmoutputtypepage.ui\n"
+"letter\n"
 "label\n"
 "string.text"
-msgid "_Find..."
+msgid "_Letter"
 msgstr ""
 
-#: mmmergepage.ui
+#: mmoutputtypepage.ui
 msgctxt ""
-"mmmergepage.ui\n"
-"label4\n"
+"mmoutputtypepage.ui\n"
+"email\n"
 "label\n"
 "string.text"
-msgid "_Search for:"
+msgid "_E-mail message"
 msgstr ""
 
-#: mmmergepage.ui
+#: mmoutputtypepage.ui
 msgctxt ""
-"mmmergepage.ui\n"
-"wholewords\n"
+"mmoutputtypepage.ui\n"
+"label1\n"
 "label\n"
 "string.text"
-msgid "Whole wor_ds only"
+msgid "What Type of Document Do You Want to Create?"
 msgstr ""
 
-#: mmmergepage.ui
+#: mmresultemaildialog.ui
 msgctxt ""
-"mmmergepage.ui\n"
-"backwards\n"
-"label\n"
+"mmresultemaildialog.ui\n"
+"MMResultEmailDialog\n"
+"title\n"
 "string.text"
-msgid "Back_wards"
+msgid "E-Mail merged document"
 msgstr ""
 
-#: mmmergepage.ui
-#, fuzzy
-msgctxt ""
-"mmmergepage.ui\n"
-"matchcase\n"
-"label\n"
-"string.text"
-msgid "Ma_tch case"
-msgstr "~Linganisa imihlobo emibili yeledere"
-
-#: mmmergepage.ui
+#: mmresultemaildialog.ui
 msgctxt ""
-"mmmergepage.ui\n"
-"label2\n"
-"label\n"
-"string.text"
-msgid "Find"
-msgstr ""
-
-#: mmoutputpage.ui
-msgctxt ""
-"mmoutputpage.ui\n"
-"savestarting\n"
+"mmresultemaildialog.ui\n"
+"ok\n"
 "label\n"
 "string.text"
-msgid "_Save starting document"
+msgid "Send Documents"
 msgstr ""
 
-#: mmoutputpage.ui
+#: mmresultemaildialog.ui
 msgctxt ""
-"mmoutputpage.ui\n"
-"savemerged\n"
+"mmresultemaildialog.ui\n"
+"mailtoft\n"
 "label\n"
 "string.text"
-msgid "Save _merged document"
+msgid "T_o"
 msgstr ""
 
-#: mmoutputpage.ui
+#: mmresultemaildialog.ui
 msgctxt ""
-"mmoutputpage.ui\n"
-"printmerged\n"
+"mmresultemaildialog.ui\n"
+"copyto\n"
 "label\n"
 "string.text"
-msgid "_Print merged document"
+msgid "_Copy to..."
 msgstr ""
 
-#: mmoutputpage.ui
+#: mmresultemaildialog.ui
 msgctxt ""
-"mmoutputpage.ui\n"
-"sendmerged\n"
+"mmresultemaildialog.ui\n"
+"subjectft\n"
 "label\n"
 "string.text"
-msgid "Send merged document as _E-Mail"
+msgid "S_ubject"
 msgstr ""
 
-#: mmoutputpage.ui
+#: mmresultemaildialog.ui
 msgctxt ""
-"mmoutputpage.ui\n"
-"label3\n"
+"mmresultemaildialog.ui\n"
+"sendasft\n"
 "label\n"
 "string.text"
-msgid "Select one of the options below:"
+msgid "Sen_d as"
 msgstr ""
 
-#: mmoutputpage.ui
+#: mmresultemaildialog.ui
 msgctxt ""
-"mmoutputpage.ui\n"
-"label1\n"
+"mmresultemaildialog.ui\n"
+"sendassettings\n"
 "label\n"
 "string.text"
-msgid "Save, Print or Send the Document"
+msgid "Pr_operties..."
 msgstr ""
 
-#: mmoutputpage.ui
+#: mmresultemaildialog.ui
 msgctxt ""
-"mmoutputpage.ui\n"
-"savestartingdoc\n"
+"mmresultemaildialog.ui\n"
+"attachft\n"
 "label\n"
 "string.text"
-msgid "Save starting _document"
+msgid "Name of the a_ttachment"
 msgstr ""
 
-#: mmoutputpage.ui
+#: mmresultemaildialog.ui
 msgctxt ""
-"mmoutputpage.ui\n"
-"singlerb\n"
+"mmresultemaildialog.ui\n"
+"label2\n"
 "label\n"
 "string.text"
-msgid "S_ave as single document"
+msgid "E-Mail options"
 msgstr ""
 
-#: mmoutputpage.ui
+#: mmresultemaildialog.ui
 msgctxt ""
-"mmoutputpage.ui\n"
-"individualrb\n"
+"mmresultemaildialog.ui\n"
+"sendallrb\n"
 "label\n"
 "string.text"
-msgid "Sa_ve as individual documents"
+msgid "S_end all documents"
 msgstr ""
 
-#: mmoutputpage.ui
+#: mmresultemaildialog.ui
 msgctxt ""
-"mmoutputpage.ui\n"
+"mmresultemaildialog.ui\n"
 "fromrb\n"
 "label\n"
 "string.text"
 msgid "_From"
 msgstr ""
 
-#: mmoutputpage.ui
+#: mmresultemaildialog.ui
 msgctxt ""
-"mmoutputpage.ui\n"
+"mmresultemaildialog.ui\n"
 "toft\n"
 "label\n"
 "string.text"
 msgid "_To"
 msgstr ""
 
-#: mmoutputpage.ui
-msgctxt ""
-"mmoutputpage.ui\n"
-"savenow\n"
-"label\n"
-"string.text"
-msgid "Save Do_cuments"
-msgstr ""
-
-#: mmoutputpage.ui
-msgctxt ""
-"mmoutputpage.ui\n"
-"printallrb\n"
-"label\n"
-"string.text"
-msgid "Print _all documents"
-msgstr ""
-
-#: mmoutputpage.ui
+#: mmresultemaildialog.ui
 msgctxt ""
-"mmoutputpage.ui\n"
-"printnow\n"
-"label\n"
-"string.text"
-msgid "Prin_t Documents"
-msgstr ""
-
-#: mmoutputpage.ui
-msgctxt ""
-"mmoutputpage.ui\n"
-"sendallrb\n"
-"label\n"
-"string.text"
-msgid "S_end all documents"
-msgstr ""
-
-#: mmoutputpage.ui
-msgctxt ""
-"mmoutputpage.ui\n"
-"sendnow\n"
-"label\n"
-"string.text"
-msgid "Se_nd documents"
-msgstr ""
-
-#: mmoutputpage.ui
-msgctxt ""
-"mmoutputpage.ui\n"
-"mailtoft\n"
-"label\n"
-"string.text"
-msgid "T_o"
-msgstr ""
-
-#: mmoutputpage.ui
-msgctxt ""
-"mmoutputpage.ui\n"
-"subjectft\n"
-"label\n"
-"string.text"
-msgid "S_ubject"
-msgstr ""
-
-#: mmoutputpage.ui
-msgctxt ""
-"mmoutputpage.ui\n"
-"sendasft\n"
-"label\n"
-"string.text"
-msgid "Sen_d as"
-msgstr ""
-
-#: mmoutputpage.ui
-msgctxt ""
-"mmoutputpage.ui\n"
-"copyto\n"
-"label\n"
-"string.text"
-msgid "_Copy to..."
-msgstr ""
-
-#: mmoutputpage.ui
-msgctxt ""
-"mmoutputpage.ui\n"
-"sendassettings\n"
-"label\n"
-"string.text"
-msgid "Pr_operties..."
-msgstr ""
-
-#: mmoutputpage.ui
-msgctxt ""
-"mmoutputpage.ui\n"
-"printerft\n"
-"label\n"
-"string.text"
-msgid "_Printer"
-msgstr ""
-
-#: mmoutputpage.ui
-msgctxt ""
-"mmoutputpage.ui\n"
-"printersettings\n"
-"label\n"
+"mmresultemaildialog.ui\n"
+"from-nospin\n"
+"text\n"
 "string.text"
-msgid "P_roperties..."
+msgid "1"
 msgstr ""
 
-#: mmoutputpage.ui
+#: mmresultemaildialog.ui
 msgctxt ""
-"mmoutputpage.ui\n"
-"attachft\n"
+"mmresultemaildialog.ui\n"
+"label1\n"
 "label\n"
 "string.text"
-msgid "Name of the a_ttachment"
+msgid "Send records"
 msgstr ""
 
-#: mmoutputpage.ui
+#: mmresultemaildialog.ui
 msgctxt ""
-"mmoutputpage.ui\n"
+"mmresultemaildialog.ui\n"
 "liststore1\n"
 "0\n"
 "stringlist.text"
 msgid "OpenDocument Text"
 msgstr ""
 
-#: mmoutputpage.ui
+#: mmresultemaildialog.ui
 msgctxt ""
-"mmoutputpage.ui\n"
+"mmresultemaildialog.ui\n"
 "liststore1\n"
 "1\n"
 "stringlist.text"
 msgid "Adobe PDF-Document"
 msgstr ""
 
-#: mmoutputpage.ui
+#: mmresultemaildialog.ui
 msgctxt ""
-"mmoutputpage.ui\n"
+"mmresultemaildialog.ui\n"
 "liststore1\n"
 "2\n"
 "stringlist.text"
 msgid "Microsoft Word Document"
 msgstr ""
 
-#: mmoutputpage.ui
+#: mmresultemaildialog.ui
 msgctxt ""
-"mmoutputpage.ui\n"
+"mmresultemaildialog.ui\n"
 "liststore1\n"
 "3\n"
 "stringlist.text"
 msgid "HTML Message"
 msgstr ""
 
-#: mmoutputpage.ui
+#: mmresultemaildialog.ui
 msgctxt ""
-"mmoutputpage.ui\n"
+"mmresultemaildialog.ui\n"
 "liststore1\n"
 "4\n"
 "stringlist.text"
 msgid "Plain Text"
 msgstr ""
 
-#: mmoutputtypepage.ui
+#: mmresultprintdialog.ui
 msgctxt ""
-"mmoutputtypepage.ui\n"
-"letterft\n"
-"label\n"
+"mmresultprintdialog.ui\n"
+"MMResultPrintDialog\n"
+"title\n"
 "string.text"
-msgid "Send letters to a group of recipients. The letters can contain an address block and a salutation. The letters can be personalized for each recipient."
+msgid "Print merged document"
 msgstr ""
 
-#: mmoutputtypepage.ui
+#: mmresultprintdialog.ui
 msgctxt ""
-"mmoutputtypepage.ui\n"
-"emailft\n"
+"mmresultprintdialog.ui\n"
+"ok\n"
 "label\n"
 "string.text"
-msgid "Send e-mail messages to a group of recipients. The e-mail messages can contain a salutation. The e-mail messages can be personalized for each recipient."
+msgid "Print Documents"
 msgstr ""
 
-#: mmoutputtypepage.ui
+#: mmresultprintdialog.ui
 msgctxt ""
-"mmoutputtypepage.ui\n"
-"letter\n"
+"mmresultprintdialog.ui\n"
+"printerft\n"
 "label\n"
 "string.text"
-msgid "_Letter"
+msgid "_Printer"
 msgstr ""
 
-#: mmoutputtypepage.ui
+#: mmresultprintdialog.ui
 msgctxt ""
-"mmoutputtypepage.ui\n"
-"email\n"
+"mmresultprintdialog.ui\n"
+"printersettings\n"
 "label\n"
 "string.text"
-msgid "_E-mail message"
+msgid "P_roperties..."
 msgstr ""
 
-#: mmoutputtypepage.ui
+#: mmresultprintdialog.ui
 msgctxt ""
-"mmoutputtypepage.ui\n"
-"label1\n"
+"mmresultprintdialog.ui\n"
+"label2\n"
 "label\n"
 "string.text"
-msgid "What Type of Document Do You Want to Create?"
+msgid "Printer options"
 msgstr ""
 
-#: mmpreparepage.ui
+#: mmresultprintdialog.ui
 msgctxt ""
-"mmpreparepage.ui\n"
-"label3\n"
+"mmresultprintdialog.ui\n"
+"printallrb\n"
 "label\n"
 "string.text"
-msgid "The preview of a merged document is visible now. To see the preview of another document click one of the arrows."
+msgid "Print _all documents"
 msgstr ""
 
-#: mmpreparepage.ui
+#: mmresultprintdialog.ui
 msgctxt ""
-"mmpreparepage.ui\n"
-"label4\n"
+"mmresultprintdialog.ui\n"
+"fromrb\n"
 "label\n"
 "string.text"
-msgid "_Recipient"
+msgid "_From"
 msgstr ""
 
-#: mmpreparepage.ui
+#: mmresultprintdialog.ui
 msgctxt ""
-"mmpreparepage.ui\n"
-"first\n"
+"mmresultprintdialog.ui\n"
+"toft\n"
 "label\n"
 "string.text"
-msgid "|<"
+msgid "_To"
 msgstr ""
 
-#: mmpreparepage.ui
+#: mmresultprintdialog.ui
 msgctxt ""
-"mmpreparepage.ui\n"
-"first\n"
-"tooltip_text\n"
+"mmresultprintdialog.ui\n"
+"from-nospin\n"
+"text\n"
 "string.text"
-msgid "First"
+msgid "1"
 msgstr ""
 
-#: mmpreparepage.ui
+#: mmresultprintdialog.ui
 msgctxt ""
-"mmpreparepage.ui\n"
-"prev\n"
+"mmresultprintdialog.ui\n"
+"label1\n"
 "label\n"
 "string.text"
-msgid "<"
+msgid "Print records"
 msgstr ""
 
-#: mmpreparepage.ui
+#: mmresultsavedialog.ui
 msgctxt ""
-"mmpreparepage.ui\n"
-"prev\n"
-"tooltip_text\n"
+"mmresultsavedialog.ui\n"
+"MMResultSaveDialog\n"
+"title\n"
 "string.text"
-msgid "Previous"
+msgid "Save merged document"
 msgstr ""
 
-#: mmpreparepage.ui
+#: mmresultsavedialog.ui
 msgctxt ""
-"mmpreparepage.ui\n"
-"next\n"
+"mmresultsavedialog.ui\n"
+"ok\n"
 "label\n"
 "string.text"
-msgid ">"
+msgid "Save Documents"
 msgstr ""
 
-#: mmpreparepage.ui
-#, fuzzy
+#: mmresultsavedialog.ui
 msgctxt ""
-"mmpreparepage.ui\n"
-"next\n"
-"tooltip_text\n"
-"string.text"
-msgid "Next"
-msgstr "Itheksithi:"
-
-#: mmpreparepage.ui
-msgctxt ""
-"mmpreparepage.ui\n"
-"last\n"
+"mmresultsavedialog.ui\n"
+"singlerb\n"
 "label\n"
 "string.text"
-msgid ">|"
+msgid "S_ave as a single large document"
 msgstr ""
 
-#: mmpreparepage.ui
+#: mmresultsavedialog.ui
 msgctxt ""
-"mmpreparepage.ui\n"
-"last\n"
-"tooltip_text\n"
-"string.text"
-msgid "Last"
-msgstr ""
-
-#: mmpreparepage.ui
-msgctxt ""
-"mmpreparepage.ui\n"
-"exclude\n"
+"mmresultsavedialog.ui\n"
+"individualrb\n"
 "label\n"
 "string.text"
-msgid "E_xclude this recipient"
+msgid "Sa_ve as individual documents"
 msgstr ""
 
-#: mmpreparepage.ui
+#: mmresultsavedialog.ui
 msgctxt ""
-"mmpreparepage.ui\n"
-"label1\n"
+"mmresultsavedialog.ui\n"
+"fromrb\n"
 "label\n"
 "string.text"
-msgid "Preview Document"
+msgid "_From"
 msgstr ""
 
-#: mmpreparepage.ui
+#: mmresultsavedialog.ui
 msgctxt ""
-"mmpreparepage.ui\n"
-"label5\n"
+"mmresultsavedialog.ui\n"
+"toft\n"
 "label\n"
 "string.text"
-msgid ""
-"Write or edit your document now if you have not already done so. The changes will affect all merged documents.\n"
-"\n"
-"Clicking 'Edit Document...' will temporarily reduce the wizard to a small window so you can edit the mail merge document. After editing the document, return to the wizard by clicking 'Return to Mail Merge Wizard' in the small window."
+msgid "_To"
 msgstr ""
 
-#: mmpreparepage.ui
+#: mmresultsavedialog.ui
 msgctxt ""
-"mmpreparepage.ui\n"
-"edit\n"
-"label\n"
+"mmresultsavedialog.ui\n"
+"from-nospin\n"
+"text\n"
 "string.text"
-msgid "_Edit Document..."
+msgid "1"
 msgstr ""
 
-#: mmpreparepage.ui
+#: mmresultsavedialog.ui
 msgctxt ""
-"mmpreparepage.ui\n"
+"mmresultsavedialog.ui\n"
 "label2\n"
 "label\n"
 "string.text"
-msgid "Edit Document"
+msgid "Save As options"
 msgstr ""
 
 #: mmsalutationpage.ui
@@ -9144,6 +9024,268 @@ msgctxt ""
 msgid "New User Index"
 msgstr ""
 
+#: notebookbar.ui
+msgctxt ""
+"notebookbar.ui\n"
+"label9\n"
+"label\n"
+"string.text"
+msgid "File"
+msgstr ""
+
+#: notebookbar.ui
+msgctxt ""
+"notebookbar.ui\n"
+"controlcodes\n"
+"tooltip_text\n"
+"string.text"
+msgid "Indent"
+msgstr ""
+
+#: notebookbar.ui
+msgctxt ""
+"notebookbar.ui\n"
+"numberbullet\n"
+"tooltip_text\n"
+"string.text"
+msgid "Bullets and Numbering"
+msgstr ""
+
+#: notebookbar.ui
+msgctxt ""
+"notebookbar.ui\n"
+"indent\n"
+"tooltip_text\n"
+"string.text"
+msgid "Indent"
+msgstr ""
+
+#: notebookbar.ui
+msgctxt ""
+"notebookbar.ui\n"
+"increaseindent\n"
+"tooltip_text\n"
+"string.text"
+msgid "Increase Indent"
+msgstr ""
+
+#: notebookbar.ui
+msgctxt ""
+"notebookbar.ui\n"
+"decreaseindent\n"
+"tooltip_text\n"
+"string.text"
+msgid "Decrease Indent"
+msgstr ""
+
+#: notebookbar.ui
+msgctxt ""
+"notebookbar.ui\n"
+"horizontalalignment\n"
+"tooltip_text\n"
+"string.text"
+msgid "Horizontal Alignment"
+msgstr ""
+
+#: notebookbar.ui
+msgctxt ""
+"notebookbar.ui\n"
+"verticalalignment\n"
+"tooltip_text\n"
+"string.text"
+msgid "Vertical Alignment"
+msgstr ""
+
+#: notebookbar.ui
+msgctxt ""
+"notebookbar.ui\n"
+"backgroundcolor\n"
+"tooltip_text\n"
+"string.text"
+msgid "Paragraph Background Color"
+msgstr ""
+
+#: notebookbar.ui
+msgctxt ""
+"notebookbar.ui\n"
+"label1\n"
+"label\n"
+"string.text"
+msgid "Home"
+msgstr ""
+
+#: notebookbar.ui
+msgctxt ""
+"notebookbar.ui\n"
+"label3\n"
+"label\n"
+"string.text"
+msgid "Insert"
+msgstr ""
+
+#: notebookbar.ui
+msgctxt ""
+"notebookbar.ui\n"
+"aboveparaspacing\n"
+"tooltip_text\n"
+"string.text"
+msgid "Above Paragraph Spacing"
+msgstr ""
+
+#: notebookbar.ui
+msgctxt ""
+"notebookbar.ui\n"
+"belowparaspacing\n"
+"tooltip_text\n"
+"string.text"
+msgid "Below Paragraph Spacing"
+msgstr ""
+
+#: notebookbar.ui
+msgctxt ""
+"notebookbar.ui\n"
+"aftertextindent\n"
+"tooltip_text\n"
+"string.text"
+msgid "After Text Indent"
+msgstr ""
+
+#: notebookbar.ui
+msgctxt ""
+"notebookbar.ui\n"
+"beforetextindent\n"
+"tooltip_text\n"
+"string.text"
+msgid "Before Text Indent"
+msgstr ""
+
+#: notebookbar.ui
+msgctxt ""
+"notebookbar.ui\n"
+"firstlineindent\n"
+"tooltip_text\n"
+"string.text"
+msgid "First Line Indent"
+msgstr ""
+
+#: notebookbar.ui
+msgctxt ""
+"notebookbar.ui\n"
+"setlinespacing\n"
+"tooltip_text\n"
+"string.text"
+msgid "Line Spacing"
+msgstr ""
+
+#: notebookbar.ui
+#, fuzzy
+msgctxt ""
+"notebookbar.ui\n"
+"spacinglabel\n"
+"label\n"
+"string.text"
+msgid "_Spacing:"
+msgstr "Ukuhlukanisa "
+
+#: notebookbar.ui
+msgctxt ""
+"notebookbar.ui\n"
+"indentlabel\n"
+"label\n"
+"string.text"
+msgid "_Indent:"
+msgstr ""
+
+#: notebookbar.ui
+msgctxt ""
+"notebookbar.ui\n"
+"label5\n"
+"label\n"
+"string.text"
+msgid "Page layout"
+msgstr ""
+
+#: notebookbar.ui
+msgctxt ""
+"notebookbar.ui\n"
+"InsertMultiIndex\n"
+"label\n"
+"string.text"
+msgid "Table of Contents"
+msgstr ""
+
+#: notebookbar.ui
+msgctxt ""
+"notebookbar.ui\n"
+"UpdateCurIndex\n"
+"label\n"
+"string.text"
+msgid "Update Index"
+msgstr ""
+
+#: notebookbar.ui
+msgctxt ""
+"notebookbar.ui\n"
+"UpdateAllIndexes\n"
+"label\n"
+"string.text"
+msgid "Update All"
+msgstr ""
+
+#: notebookbar.ui
+msgctxt ""
+"notebookbar.ui\n"
+"label7\n"
+"label\n"
+"string.text"
+msgid "References"
+msgstr ""
+
+#: notebookbar.ui
+msgctxt ""
+"notebookbar.ui\n"
+"label8\n"
+"label\n"
+"string.text"
+msgid "Review"
+msgstr ""
+
+#: notebookbar.ui
+msgctxt ""
+"notebookbar.ui\n"
+"label4\n"
+"label\n"
+"string.text"
+msgid "View"
+msgstr ""
+
+#: notebookbar.ui
+msgctxt ""
+"notebookbar.ui\n"
+"formattable1\n"
+"tooltip_text\n"
+"string.text"
+msgid "Indent"
+msgstr ""
+
+#: notebookbar.ui
+msgctxt ""
+"notebookbar.ui\n"
+"formattable\n"
+"tooltip_text\n"
+"string.text"
+msgid "Indent"
+msgstr ""
+
+#: notebookbar.ui
+msgctxt ""
+"notebookbar.ui\n"
+"label6\n"
+"label\n"
+"string.text"
+msgid "Table"
+msgstr ""
+
 #: numberingnamedialog.ui
 msgctxt ""
 "numberingnamedialog.ui\n"
@@ -11705,7 +11847,7 @@ msgctxt ""
 "graphics\n"
 "label\n"
 "string.text"
-msgid "_Pictures and objects"
+msgid "_Images and objects"
 msgstr ""
 
 #: printoptionspage.ui
@@ -14892,7 +15034,7 @@ msgctxt ""
 "TocDialog\n"
 "title\n"
 "string.text"
-msgid "Insert Index or Table of Contents"
+msgid "Table of Contents, Index or Bibliography"
 msgstr ""
 
 #: tocdialog.ui
@@ -14905,13 +15047,14 @@ msgid "Preview"
 msgstr ""
 
 #: tocdialog.ui
+#, fuzzy
 msgctxt ""
 "tocdialog.ui\n"
 "index\n"
 "label\n"
 "string.text"
-msgid "Index or Table of Contents"
-msgstr ""
+msgid "Type"
+msgstr "Umhlobo"
 
 #: tocdialog.ui
 msgctxt ""
@@ -15998,7 +16141,7 @@ msgctxt ""
 "graphics\n"
 "label\n"
 "string.text"
-msgid "_Graphics and objects"
+msgid "_Images and objects"
 msgstr ""
 
 #: viewoptionspage.ui