update translations for 5.2.0 alpha1

and force-fix errors using pocheck

Change-Id: I75bca3b0cc0333302eac4d11c98ad26dfdc35fd6

12 files changed, 826 insertions, 1815 deletions

diff --git a/source/nn/sw/source/ui/app.po b/source/nn/sw/source/ui/app.po
index db1eb67402c..9000beae00a 100644
--- a/source/nn/sw/source/ui/app.po
+++ b/source/nn/sw/source/ui/app.po
@@ -3,9 +3,9 @@ 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-11-14 15:23+0000\n"
-"Last-Translator: Kolbjørn Stuestøl <kolbjoern@stuestoel.no>\n"
+"POT-Creation-Date: 2016-04-16 21:40+0200\n"
+"PO-Revision-Date: 2016-03-20 11:09+0000\n"
+"Last-Translator: system user <>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: nn\n"
 "MIME-Version: 1.0\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: 1447514605.000000\n"
+"X-POOTLE-MTIME: 1458472193.000000\n"
 
 #: app.src
 msgctxt ""
@@ -426,6 +426,24 @@ msgid "The following characters are not valid and have been removed: "
 msgstr "Følgjande teikn er ugyldige og er fjerna: "
 
 #: app.src
+#, fuzzy
+msgctxt ""
+"app.src\n"
+"STR_BOOKMARK_NAME\n"
+"string.text"
+msgid "Name"
+msgstr "Namn"
+
+#: app.src
+#, fuzzy
+msgctxt ""
+"app.src\n"
+"STR_BOOKMARK_TEXT\n"
+"string.text"
+msgid "Text"
+msgstr "Tekst"
+
+#: app.src
 msgctxt ""
 "app.src\n"
 "SW_STR_NONE\n"
@@ -796,6 +814,22 @@ msgstr "Ukjend forfattar"
 #: app.src
 msgctxt ""
 "app.src\n"
+"STR_DELETE_NOTE_AUTHOR\n"
+"string.text"
+msgid "Delete ~All Comments by $1"
+msgstr "Slett ~alle merknadar av $1"
+
+#: app.src
+msgctxt ""
+"app.src\n"
+"STR_HIDE_NOTE_AUTHOR\n"
+"string.text"
+msgid "H~ide All Comments by $1"
+msgstr "~Gøym alle merknadar av $1"
+
+#: app.src
+msgctxt ""
+"app.src\n"
 "STR_DONT_ASK_AGAIN\n"
 "string.text"
 msgid "~Do not show warning again"
@@ -1397,567 +1431,50 @@ msgid "Format error discovered in the file in sub-document $(ARG1) at $(ARG2)(ro
 msgstr "Fann formatfeil i fila i underdokumentet $(ARG1) ved $(ARG2)(row,col)."
 
 #: mn.src
+#, fuzzy
 msgctxt ""
 "mn.src\n"
-"MN_PAGE\n"
-"FN_FORMAT_PAGE_DLG\n"
-"menuitem.text"
-msgid "Pa~ge..."
-msgstr "~Sidestil …"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"_MN_EDIT_FIELD\n"
-"FN_EDIT_FIELD\n"
-"menuitem.text"
-msgid "Fields..."
-msgstr "Felt …"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"_MN_EDIT_FIELD._MN_EDIT_FOOTNOTE\n"
-"FN_EDIT_FOOTNOTE\n"
-"menuitem.text"
-msgid "Footnote/Endnote~..."
-msgstr "Fo~tnote/sluttnote …"
-
-#: mn.src
-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 "Rediger ~indeksoppføring …"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"_MN_EDIT_BIB_ENTRY_DLG\n"
-"FN_EDIT_AUTH_ENTRY_DLG\n"
-"menuitem.text"
-msgid "~Bibliography Entry..."
-msgstr "~Kjelde …"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"_MN_EDIT_OPEN_HYPERLINK\n"
-"FN_EDIT_HYPERLINK\n"
-"menuitem.text"
-msgid "Edit Hyperlink..."
-msgstr "Rediger hyperlenkje …"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"_MN_EDIT_OPEN_HYPERLINK\n"
-"FN_COPY_HYPERLINK_LOCATION\n"
-"menuitem.text"
-msgid "Copy Hyper~link"
-msgstr "Kopier hyper~lenkje"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"_MN_EDIT_OPEN_HYPERLINK\n"
-"FN_REMOVE_HYPERLINK\n"
-"menuitem.text"
-msgid "Remo~ve Hyperlink"
-msgstr "~Fjern hyperlenkje"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_RESET\n"
-"FN_FORMAT_RESET\n"
-"menuitem.text"
-msgid "Clear ~Direct Formatting"
-msgstr "Fjern ~direkte formatering"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"_NUMBERING_RELATED_MENU\n"
-"FN_NUMBER_NEWSTART\n"
-"menuitem.text"
-msgid "Restart Numbering"
-msgstr "Start nummereringa på nytt"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"_NUMBERING_RELATED_MENU\n"
-"FN_NUM_CONTINUE\n"
-"menuitem.text"
-msgid "Continue previous numbering"
-msgstr "Hald fram med den førre nummereringa"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"_NUMBERING_RELATED_MENU\n"
-"FN_NUM_BULLET_UP\n"
-"menuitem.text"
-msgid "Up One Level"
-msgstr "Eitt nivå opp"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"_NUMBERING_RELATED_MENU\n"
-"FN_NUM_BULLET_DOWN\n"
-"menuitem.text"
-msgid "Down One Level"
-msgstr "Eitt nivå ned"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MENU_PASTE_SPECIAL.SID_MENU_PASTE_SPECIAL\n"
-"SID_PASTE_UNFORMATTED\n"
-"menuitem.text"
-msgid "~Unformatted Text"
-msgstr "~Uformatert tekst"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MENU_PASTE_SPECIAL.SID_MENU_PASTE_SPECIAL\n"
-"SID_PASTE_SPECIAL\n"
-"menuitem.text"
-msgid "~More Options..."
-msgstr "~Fleire val …"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MENU_PASTE_SPECIAL\n"
-"SID_MENU_PASTE_SPECIAL\n"
-"menuitem.text"
-msgid "Paste ~Special"
-msgstr "~Lim inn utval"
-
-#: 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 "~Oppdater innhaldsliste eller register"
-
-#: 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 "~Rediger innhaldsliste eller register"
-
-#: 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 "Slett innhaldsliste eller register"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_FRM_CAPTION_ITEM\n"
-"FN_INSERT_CAPTION\n"
-"menuitem.text"
-msgid "Insert ~Caption..."
-msgstr "Set inn ~bilettekst …"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_TABLE.DUMMY\n"
-"FN_TABLE_INSERT_ROW_BEFORE\n"
-"menuitem.text"
-msgid "Rows Above"
-msgstr "Rader over"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_TABLE.DUMMY\n"
-"FN_TABLE_INSERT_ROW_AFTER\n"
-"menuitem.text"
-msgid "Rows Below"
-msgstr "Rader under"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_TABLE.DUMMY\n"
-"FN_TABLE_INSERT_ROW_DLG\n"
-"menuitem.text"
-msgid "~Rows..."
-msgstr "~Rader …"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_TABLE.DUMMY\n"
-"FN_TABLE_INSERT_COL_BEFORE\n"
-"menuitem.text"
-msgid "Columns Left"
-msgstr "Kolonnar til venstre"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_TABLE.DUMMY\n"
-"FN_TABLE_INSERT_COL_AFTER\n"
-"menuitem.text"
-msgid "Columns Right"
-msgstr "Kolonnar til høgre"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_TABLE.DUMMY\n"
-"FN_TABLE_INSERT_COL_DLG\n"
-"menuitem.text"
-msgid "~Columns..."
-msgstr "~Kolonnar …"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_TABLE\n"
-"DUMMY\n"
-"menuitem.text"
-msgid "~Insert"
-msgstr "~Set inn"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_TABLE.DUMMY+1\n"
-"FN_TABLE_DELETE_ROW\n"
-"menuitem.text"
-msgid "~Rows"
-msgstr "~Rader"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_TABLE.DUMMY+1\n"
-"FN_TABLE_DELETE_COL\n"
-"menuitem.text"
-msgid "~Columns"
-msgstr "~Kolonnar"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_TABLE.DUMMY+1\n"
-"FN_TABLE_DELETE_TABLE\n"
-"menuitem.text"
-msgid "~Table"
-msgstr "~Tabell"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_TABLE\n"
-"DUMMY+1\n"
-"menuitem.text"
-msgid "~Delete"
-msgstr "~Slett"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_TABLE.DUMMY+2\n"
-"FN_TABLE_SELECT_ROW\n"
-"menuitem.text"
-msgid "~Rows"
-msgstr "~Rader"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_TABLE.DUMMY+2\n"
-"FN_TABLE_SELECT_COL\n"
-"menuitem.text"
-msgid "~Columns"
-msgstr "~Kolonnar"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_TABLE.DUMMY+2\n"
-"FN_TABLE_SELECT_ALL\n"
-"menuitem.text"
-msgid "~Table"
-msgstr "~Tabell"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_TABLE.DUMMY+2\n"
-"FN_TABLE_SELECT_CELL\n"
-"menuitem.text"
-msgid "C~ell"
-msgstr "C~elle"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_TABLE\n"
-"DUMMY+2\n"
-"menuitem.text"
-msgid "~Select"
-msgstr "~Vel"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_TABLE\n"
-"FN_TABLE_MERGE_CELLS\n"
-"menuitem.text"
-msgid "~Merge"
-msgstr "~Slå saman"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_TABLE.MN_FORMAT_ALGN\n"
-"SID_TABLE_VERT_NONE\n"
-"menuitem.text"
-msgid "~Top"
-msgstr "Øv~st"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_TABLE.MN_FORMAT_ALGN\n"
-"SID_TABLE_VERT_CENTER\n"
-"menuitem.text"
-msgid "C~enter"
-msgstr "M~idt på"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_TABLE.MN_FORMAT_ALGN\n"
-"SID_TABLE_VERT_BOTTOM\n"
-"menuitem.text"
-msgid "~Bottom"
-msgstr "~Nedst"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_TABLE\n"
-"MN_FORMAT_ALGN\n"
-"menuitem.text"
-msgid "A~lignment"
-msgstr "J~ustering"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_TABLE.DUMMY+4\n"
-"FN_TABLE_SET_COL_WIDTH\n"
-"menuitem.text"
-msgid "~Column Width..."
-msgstr "~Kolonnebreidd …"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_TABLE.DUMMY+4\n"
-"FN_TABLE_ADJUST_CELLS\n"
-"menuitem.text"
-msgid "~Optimal Column Width"
-msgstr "~Beste kolonnebreidd"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_TABLE.DUMMY+4\n"
-"FN_TABLE_BALANCE_CELLS\n"
-"menuitem.text"
-msgid "~Distribute Columns Equally"
-msgstr "~Fordel kolonnane jamt"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_TABLE.DUMMY+4\n"
-"FN_TABLE_SET_ROW_HEIGHT\n"
-"menuitem.text"
-msgid "~Row Height..."
-msgstr "Rad~høgd …"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_TABLE.DUMMY+4\n"
-"FN_TABLE_OPTIMAL_HEIGHT\n"
-"menuitem.text"
-msgid "Optimal Row ~Height"
-msgstr "~Beste radhøgd"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_TABLE.DUMMY+4\n"
-"FN_TABLE_BALANCE_ROWS\n"
-"menuitem.text"
-msgid "Distribute Rows ~Equally"
-msgstr "Fordel radene ~jamt"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_TABLE\n"
-"DUMMY+4\n"
-"menuitem.text"
-msgid "Si~ze"
-msgstr "~Storleik"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_TABLE\n"
-"FN_NUM_FORMAT_TABLE_DLG\n"
-"menuitem.text"
-msgid "N~umber Format..."
-msgstr "Ta~lformat …"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_TABLE\n"
-"FN_FORMAT_TABLE_DLG\n"
-"menuitem.text"
-msgid "~Table Properties..."
-msgstr "Tabell~eigenskapar …"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_DRWTXTATTR\n"
-"FN_DRAWTEXT_ATTR_DLG\n"
-"menuitem.text"
-msgid "Te~xt..."
-msgstr "~Tekst …"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_NAME_SHAPE\n"
-"FN_NAME_SHAPE\n"
-"menuitem.text"
-msgid "Name..."
-msgstr "~Namn …"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_TITLE_DESCRIPTION_SHAPE\n"
-"FN_TITLE_DESCRIPTION_SHAPE\n"
-"menuitem.text"
-msgid "Description..."
-msgstr "Skildring …"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_FRM\n"
-"FN_FORMAT_FRAME_DLG\n"
-"menuitem.text"
-msgid "~Frame..."
-msgstr "~Ramme …"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_ONE_STEP\n"
-"FN_FRAME_UP\n"
-"menuitem.text"
-msgid "Bring ~Forward"
-msgstr "Flytt ~framover"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_ONE_STEP\n"
-"FN_FRAME_DOWN\n"
-"menuitem.text"
-msgid "Send Back~ward"
-msgstr "Flytt ~bakover"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_DRAW5\n"
-"MN_SUB_ARRANGE\n"
-"menuitem.text"
-msgid "~Arrange"
-msgstr "~Still opp"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_DRAW6\n"
-"MN_SUB_ARRANGE\n"
-"menuitem.text"
-msgid "~Arrange"
-msgstr "~Still opp"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_ANNOTATIONS\n"
+"MN_ANNOTATION_BUTTON\n"
 "FN_REPLY\n"
 "menuitem.text"
 msgid "Reply"
 msgstr "Svar"
 
 #: mn.src
+#, fuzzy
 msgctxt ""
 "mn.src\n"
-"MN_ANNOTATIONS\n"
+"MN_ANNOTATION_BUTTON\n"
 "FN_DELETE_COMMENT\n"
 "menuitem.text"
 msgid "Delete ~Comment"
 msgstr "Slett ~merknad"
 
 #: mn.src
+#, fuzzy
 msgctxt ""
 "mn.src\n"
-"MN_ANNOTATIONS\n"
+"MN_ANNOTATION_BUTTON\n"
 "FN_DELETE_NOTE_AUTHOR\n"
 "menuitem.text"
 msgid "Delete ~All Comments by $1"
 msgstr "Slett ~alle merknadar av $1"
 
 #: mn.src
+#, fuzzy
 msgctxt ""
 "mn.src\n"
-"MN_ANNOTATIONS\n"
+"MN_ANNOTATION_BUTTON\n"
 "FN_DELETE_ALL_NOTES\n"
 "menuitem.text"
 msgid "~Delete All Comments"
 msgstr "~Slett alle merknadar"
 
 #: mn.src
+#, fuzzy
 msgctxt ""
 "mn.src\n"
-"MN_ANNOTATIONS\n"
+"MN_ANNOTATION_BUTTON\n"
 "FN_FORMAT_ALL_NOTES\n"
 "menuitem.text"
 msgid "~Format All Comments..."
@@ -1966,482 +1483,6 @@ msgstr "~Formater alle merknadar …"
 #: mn.src
 msgctxt ""
 "mn.src\n"
-"MN_TEXT_POPUPMENU\n"
-"string.text"
-msgid "Text"
-msgstr "Tekst"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_TAB_POPUPMENU\n"
-"string.text"
-msgid "Table"
-msgstr "Tabell"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_WRAP_CONTOUR\n"
-"FN_FRAME_WRAP_CONTOUR\n"
-"menuitem.text"
-msgid "Enable ~Contour"
-msgstr "Slå på ~omriss"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_EDIT_CONTOUR\n"
-"SID_CONTOUR_DLG\n"
-"menuitem.text"
-msgid "~Edit Contour..."
-msgstr "~Rediger omriss …"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_MOUSE_FRAME_BEGIN.MN_WRAP\n"
-"FN_FRAME_NOWRAP\n"
-"menuitem.text"
-msgid "~No Wrap"
-msgstr "~Inga tekstbryting"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_MOUSE_FRAME_BEGIN.MN_WRAP\n"
-"FN_FRAME_WRAP\n"
-"menuitem.text"
-msgid "~Page Wrap"
-msgstr "Tekstbryting på ~sida"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_MOUSE_FRAME_BEGIN.MN_WRAP\n"
-"FN_FRAME_WRAP_IDEAL\n"
-"menuitem.text"
-msgid "~Optimal Page Wrap"
-msgstr "~Best tekstbryting"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_MOUSE_FRAME_BEGIN.MN_WRAP\n"
-"FN_FRAME_WRAP_LEFT\n"
-"menuitem.text"
-msgid "Wrap ~Before"
-msgstr "Bryt ~før"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_MOUSE_FRAME_BEGIN.MN_WRAP\n"
-"FN_FRAME_WRAP_RIGHT\n"
-"menuitem.text"
-msgid "Wrap ~After"
-msgstr "Bryt ~etter"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_MOUSE_FRAME_BEGIN.MN_WRAP\n"
-"FN_FRAME_WRAPTHRU\n"
-"menuitem.text"
-msgid "~Wrap Through"
-msgstr "~Tekstflyt"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_MOUSE_FRAME_BEGIN.MN_WRAP\n"
-"FN_FRAME_WRAPTHRU_TRANSP\n"
-"menuitem.text"
-msgid "In ~Background"
-msgstr "I b~akgrunnen"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_MOUSE_FRAME_BEGIN.MN_WRAP\n"
-"FN_WRAP_ANCHOR_ONLY\n"
-"menuitem.text"
-msgid "~First Paragraph"
-msgstr "~Første avsnitt"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_MOUSE_FRAME_BEGIN\n"
-"MN_WRAP\n"
-"menuitem.text"
-msgid "~Wrap"
-msgstr "T~ekstbryting"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_DRAW_POPUPMENU\n"
-"string.text"
-msgid "Graphic"
-msgstr "Bilete"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_WRAP_DRAW.MN_WRAP\n"
-"FN_FRAME_NOWRAP\n"
-"menuitem.text"
-msgid "~No Wrap"
-msgstr "~Inga tekstbryting"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_WRAP_DRAW.MN_WRAP\n"
-"FN_FRAME_WRAP\n"
-"menuitem.text"
-msgid "~Page Wrap"
-msgstr "Tekstbryting på ~sida"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_WRAP_DRAW.MN_WRAP\n"
-"FN_FRAME_WRAP_IDEAL\n"
-"menuitem.text"
-msgid "~Optimal Page Wrap"
-msgstr "~Best tekstbryting"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_WRAP_DRAW.MN_WRAP\n"
-"FN_FRAME_WRAPTHRU\n"
-"menuitem.text"
-msgid "~Wrap Through"
-msgstr "~Tekstflyt"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_WRAP_DRAW.MN_WRAP\n"
-"FN_FRAME_WRAPTHRU_TRANSP\n"
-"menuitem.text"
-msgid "In ~Background"
-msgstr "I b~akgrunnen"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_WRAP_DRAW.MN_WRAP\n"
-"FN_WRAP_ANCHOR_ONLY\n"
-"menuitem.text"
-msgid "~First Paragraph"
-msgstr "~Første avsnitt"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_WRAP_DRAW.MN_WRAP\n"
-"FN_DRAW_WRAP_DLG\n"
-"menuitem.text"
-msgid "~Edit..."
-msgstr "~Rediger …"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_WRAP_DRAW\n"
-"MN_WRAP\n"
-"menuitem.text"
-msgid "~Wrap"
-msgstr "T~ekstbryting"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_AT_FRAME\n"
-"FN_TOOL_ANCHOR_FRAME\n"
-"menuitem.text"
-msgid "To ~Frame"
-msgstr "Til ~ramme"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_ANCHOR.FN_TOOL_ANCHOR\n"
-"FN_TOOL_ANCHOR_PAGE\n"
-"menuitem.text"
-msgid "To P~age"
-msgstr "Til si~de"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_ANCHOR.FN_TOOL_ANCHOR\n"
-"FN_TOOL_ANCHOR_PARAGRAPH\n"
-"menuitem.text"
-msgid "To ~Paragraph"
-msgstr "Til ~avsnitt"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_ANCHOR.FN_TOOL_ANCHOR\n"
-"FN_TOOL_ANCHOR_AT_CHAR\n"
-"menuitem.text"
-msgid "To ~Character"
-msgstr "Til ~teikn"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_ANCHOR.FN_TOOL_ANCHOR\n"
-"FN_TOOL_ANCHOR_CHAR\n"
-"menuitem.text"
-msgid "As C~haracter"
-msgstr "Som t~eikn"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_ANCHOR\n"
-"FN_TOOL_ANCHOR\n"
-"menuitem.text"
-msgid "An~chor"
-msgstr "For~ankring "
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_DRAW_POPUPMENU\n"
-"FN_ADD_TEXT_BOX\n"
-"menuitem.text"
-msgid "Add Text Box"
-msgstr "Legg til tekstboks"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_DRAW_POPUPMENU\n"
-"FN_REMOVE_TEXT_BOX\n"
-"menuitem.text"
-msgid "Remove Text Box"
-msgstr "Fjern tekstboks"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_DRAWFORM_POPUPMENU\n"
-"string.text"
-msgid "Control"
-msgstr "Kontroll"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_DRWTXT_POPUPMENU\n"
-"string.text"
-msgid "Draw Object text"
-msgstr "Tekst til teikneobjektet"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_GRF_POPUPMENU\n"
-"string.text"
-msgid "Graphic"
-msgstr "Bilete"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_ARRANGE_FRAME\n"
-"MN_SUB_ALIGN\n"
-"menuitem.text"
-msgid "~Arrange"
-msgstr "~Still opp"
-
-#: 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 "~Venstrejustert"
-
-#: 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 "~Midtstilt"
-
-#: 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 "~Høgrejustert"
-
-#: 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 "Skriv frå ~toppen"
-
-#: 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 "Skriv frå ~midten"
-
-#: 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 "Skriv frå ~botnen"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_ALIGNMENT_FRAME\n"
-"MN_FORMAT_FRM_HORZ\n"
-"menuitem.text"
-msgid "A~lignment"
-msgstr "J~ustering"
-
-#: 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 "Roter 90° til venstre"
-
-#: 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 "Roter 90° til høgre"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_ROTATE_IMAGE\n"
-"SID_MENU_MANAGE_GRAPHIC\n"
-"menuitem.text"
-msgid "~Rotate"
-msgstr "~Roter"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_GRF_POPUPMENU\n"
-"FN_FORMAT_GRAFIC_DLG\n"
-"menuitem.text"
-msgid "Format ~Image..."
-msgstr "Formater ~bilete …"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_OLE_POPUPMENU\n"
-"string.text"
-msgid "Object"
-msgstr "Objekt"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_OLE_POPUPMENU\n"
-"FN_FORMAT_FRAME_DLG\n"
-"menuitem.text"
-msgid "Object..."
-msgstr "Objekt …"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_FRM_POPUPMENU\n"
-"string.text"
-msgid "Frame"
-msgstr "Ramme"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_PPREVIEW_POPUPMENU\n"
-"string.text"
-msgid "Draw Object text"
-msgstr "Tekst til teikneobjektet"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_PPREVIEW_POPUPMENU\n"
-"FN_PAGEUP\n"
-"menuitem.text"
-msgid "Previous Page"
-msgstr "Førre side"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_PPREVIEW_POPUPMENU\n"
-"FN_PAGEDOWN\n"
-"menuitem.text"
-msgid "Next Page"
-msgstr "Neste side"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_PPREVIEW_POPUPMENU\n"
-"FN_PRINT_PAGEPREVIEW\n"
-"menuitem.text"
-msgid "Print"
-msgstr "Skriv ut"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_PPREVIEW_POPUPMENU\n"
-"SID_PRINTPREVIEW\n"
-"menuitem.text"
-msgid "Close Preview"
-msgstr "Lukk førehandsvising"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_MEDIA_POPUPMENU\n"
-"string.text"
-msgid "Media object"
-msgstr "Medieobjekt"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
 "MN_HEADERFOOTER_BUTTON\n"
 "FN_HEADERFOOTER_BORDERBACK\n"
 "menuitem.text"
diff --git a/source/nn/sw/source/ui/config.po b/source/nn/sw/source/ui/config.po
index 755b0c0828b..1c85117aa1f 100644
--- a/source/nn/sw/source/ui/config.po
+++ b/source/nn/sw/source/ui/config.po
@@ -3,9 +3,9 @@ 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-07-24 18:28+0000\n"
-"Last-Translator: Kolbjørn Stuestøl <kolbjoern@stuestoel.no>\n"
+"POT-Creation-Date: 2016-03-09 20:49+0100\n"
+"PO-Revision-Date: 2016-03-20 11:17+0000\n"
+"Last-Translator: system user <>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: nn\n"
 "MIME-Version: 1.0\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: 1437762488.000000\n"
+"X-POOTLE-MTIME: 1458472660.000000\n"
 
 #: optdlg.src
 msgctxt ""
@@ -43,279 +43,248 @@ msgstr "Vestleg"
 #: optdlg.src
 msgctxt ""
 "optdlg.src\n"
-"STR_PRINTOPTUI\n"
-"%PRODUCTNAME %s\n"
-"itemlist.text"
+"STR_PRINTOPTUI_PRODUCTNAME\n"
+"string.text"
 msgid "%PRODUCTNAME %s"
 msgstr "%PRODUCTNAME %s"
 
 #: optdlg.src
 msgctxt ""
 "optdlg.src\n"
-"STR_PRINTOPTUI\n"
-"Contents\n"
-"itemlist.text"
+"STR_PRINTOPTUI_CONTENTS\n"
+"string.text"
 msgid "Contents"
 msgstr "Innhald"
 
 #: 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 "~Bakgrunn"
+msgstr "Side~bakgrunn"
 
 #: 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 "~Bilete og andre grafiske objekt"
 
 #: optdlg.src
 msgctxt ""
 "optdlg.src\n"
-"STR_PRINTOPTUI\n"
-"Hidden te~xt\n"
-"itemlist.text"
+"STR_PRINTOPTUI_HIDDEN\n"
+"string.text"
 msgid "Hidden te~xt"
 msgstr "~Gøymd tekst"
 
 #: optdlg.src
 msgctxt ""
 "optdlg.src\n"
-"STR_PRINTOPTUI\n"
-"~Text placeholders\n"
-"itemlist.text"
+"STR_PRINTOPTUI_TEXT_PLACEHOLDERS\n"
+"string.text"
 msgid "~Text placeholders"
 msgstr "~Plasshaldar for tekst"
 
 #: optdlg.src
 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 "~Kontrollar"
+msgstr "~Kontrollelement for skjema"
 
 #: optdlg.src
 msgctxt ""
 "optdlg.src\n"
-"STR_PRINTOPTUI\n"
-"Color\n"
-"itemlist.text"
+"STR_PRINTOPTUI_COLOR\n"
+"string.text"
 msgid "Color"
 msgstr "Farge"
 
 #: optdlg.src
 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 "Utskrift i s~vart"
 
 #: optdlg.src
 msgctxt ""
 "optdlg.src\n"
-"STR_PRINTOPTUI\n"
-"Pages\n"
-"itemlist.text"
+"STR_PRINTOPTUI_PAGES_TEXT\n"
+"string.text"
 msgid "Pages"
 msgstr "Sider"
 
 #: optdlg.src
 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 "Skriv ut ~automatisk innsette tomme sider"
 
 #: 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 "~Bruk same ~papirskuffe som i skrivaroppsettet"
+msgstr "~Bruk same papirskuff som i skrivaroppsettet"
 
 #: optdlg.src
 msgctxt ""
 "optdlg.src\n"
-"STR_PRINTOPTUI\n"
-"Print\n"
-"itemlist.text"
+"STR_PRINTOPTUI_PRINT\n"
+"string.text"
 msgid "Print"
 msgstr "Skriv ut"
 
 #: 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 "Ingen (berre dokumentet)"
 
 #: 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 "Be~rre merknadar"
+msgstr "Berre merknadar"
 
 #: 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 "Plasser sist i dokumentet"
+msgstr "Set sist i dokumentet"
 
 #: 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 "Plasser nedst på sida"
+msgstr "Set nedst på sida"
 
 #: optdlg.src
 msgctxt ""
 "optdlg.src\n"
-"STR_PRINTOPTUI\n"
-"~Comments\n"
-"itemlist.text"
+"STR_PRINTOPTUI_COMMENTS\n"
+"string.text"
 msgid "~Comments"
 msgstr "~Merknadar"
 
 #: 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 "Sider"
 
 #: 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 "Alle sider"
 
 #: 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 "Baksider/venstresider"
 
 #: 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 "Forsider/høgresider"
 
 #: optdlg.src
 msgctxt ""
 "optdlg.src\n"
-"STR_PRINTOPTUI\n"
-"Include\n"
-"itemlist.text"
+"STR_PRINTOPTUI_INCLUDE\n"
+"string.text"
 msgid "Include"
 msgstr "Inkluder"
 
 #: optdlg.src
 msgctxt ""
 "optdlg.src\n"
-"STR_PRINTOPTUI\n"
-"Broch~ure\n"
-"itemlist.text"
+"STR_PRINTOPTUI_BROCHURE\n"
+"string.text"
 msgid "Broch~ure"
 msgstr "Br~osjyre"
 
 #: 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 "Venstre-til-høgre-skript"
 
 #: 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 "Frå høgre til venstre"
+msgstr "Høgre-til-venstre-skript"
 
 #: 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 "Område og kopiar"
 
 #: optdlg.src
 msgctxt ""
 "optdlg.src\n"
-"STR_PRINTOPTUI\n"
-"~All pages\n"
-"itemlist.text"
+"STR_PRINTOPTUI_ALLPAGES\n"
+"string.text"
 msgid "~All pages"
 msgstr "~Alle sider"
 
 #: optdlg.src
 msgctxt ""
 "optdlg.src\n"
-"STR_PRINTOPTUI\n"
-"Pa~ges\n"
-"itemlist.text"
+"STR_PRINTOPTUI_SOMEPAGES\n"
+"string.text"
 msgid "Pa~ges"
-msgstr "Sider"
+msgstr "~Sider"
 
 #: optdlg.src
 msgctxt ""
 "optdlg.src\n"
-"STR_PRINTOPTUI\n"
-"~Selection\n"
-"itemlist.text"
+"STR_PRINTOPTUI_SELECTION\n"
+"string.text"
 msgid "~Selection"
 msgstr "~Utval"
 
 #: 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 "Plasser i margane"
 
diff --git a/source/nn/sw/source/ui/dbui.po b/source/nn/sw/source/ui/dbui.po
index 8ce41c410af..8abaf6869a7 100644
--- a/source/nn/sw/source/ui/dbui.po
+++ b/source/nn/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-07-25 15:25+0000\n"
+"POT-Creation-Date: 2016-04-16 21:40+0200\n"
+"PO-Revision-Date: 2016-03-20 11:17+0000\n"
 "Last-Translator: Kolbjørn Stuestøl <kolbjoern@stuestoel.no>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: nn\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: 1437837936.000000\n"
+"X-POOTLE-MTIME: 1458472669.000000\n"
 
 #: dbui.src
 msgctxt ""
@@ -215,19 +215,21 @@ msgid "Text Comma Separated (*.csv)"
 msgstr "Tekst, kommadelt (*.csv)"
 
 #: dbui.src
+#, fuzzy
 msgctxt ""
 "dbui.src\n"
 "STR_FILTER_MDB\n"
 "string.text"
-msgid "Microsoft Access (*.mdb)"
+msgid "Microsoft Access (*.mdb;*.mde)"
 msgstr "Microsoft Access (*.mdb)"
 
 #: dbui.src
+#, fuzzy
 msgctxt ""
 "dbui.src\n"
 "STR_FILTER_ACCDB\n"
 "string.text"
-msgid "Microsoft Access 2007 (*.accdb)"
+msgid "Microsoft Access 2007 (*.accdb,*.accde)"
 msgstr "Microsoft Access 2007 (*.accdb)"
 
 #: dbui.src
@@ -311,7 +313,7 @@ msgstr "Vel startdokument"
 #: mailmergewizard.src
 msgctxt ""
 "mailmergewizard.src\n"
-"ST_DOCUMETNTYPE\n"
+"ST_DOCUMENTTYPE\n"
 "string.text"
 msgid "Select document type"
 msgstr "Vel dokumenttype"
@@ -351,26 +353,10 @@ msgstr "Tilpass utforming"
 #: mailmergewizard.src
 msgctxt ""
 "mailmergewizard.src\n"
-"ST_PREPAREMERGE\n"
+"ST_EXCLUDE\n"
 "string.text"
-msgid "Edit document"
-msgstr "Rediger dokument"
-
-#: mailmergewizard.src
-msgctxt ""
-"mailmergewizard.src\n"
-"ST_MERGE\n"
-"string.text"
-msgid "Personalize document"
-msgstr "Personleggjer dokument"
-
-#: mailmergewizard.src
-msgctxt ""
-"mailmergewizard.src\n"
-"ST_OUTPUT\n"
-"string.text"
-msgid "Save, print or send"
-msgstr "Lagra, skriv ut eller send"
+msgid "Exclude recipient"
+msgstr ""
 
 #: mailmergewizard.src
 msgctxt ""
diff --git a/source/nn/sw/source/ui/ribbar.po b/source/nn/sw/source/ui/ribbar.po
deleted file mode 100644
index 6bcc671f8ce..00000000000
--- a/source/nn/sw/source/ui/ribbar.po
+++ /dev/null
@@ -1,61 +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:01+0200\n"
-"Last-Translator: Anonymous Pootle User\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: nn\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\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 "Til side"
-
-#: tbxanchr.src
-msgctxt ""
-"tbxanchr.src\n"
-"MN_ANCHOR_POPUP\n"
-"FN_TOOL_ANCHOR_PARAGRAPH\n"
-"menuitem.text"
-msgid "To Paragraph"
-msgstr "Til avsnitt"
-
-#: tbxanchr.src
-msgctxt ""
-"tbxanchr.src\n"
-"MN_ANCHOR_POPUP\n"
-"FN_TOOL_ANCHOR_AT_CHAR\n"
-"menuitem.text"
-msgid "To Character"
-msgstr "Til teikn"
-
-#: tbxanchr.src
-msgctxt ""
-"tbxanchr.src\n"
-"MN_ANCHOR_POPUP\n"
-"FN_TOOL_ANCHOR_CHAR\n"
-"menuitem.text"
-msgid "As Character"
-msgstr "Som teikn"
-
-#: tbxanchr.src
-msgctxt ""
-"tbxanchr.src\n"
-"MN_ANCHOR_POPUP\n"
-"FN_TOOL_ANCHOR_FRAME\n"
-"menuitem.text"
-msgid "To Frame"
-msgstr "Til ramme"
diff --git a/source/nn/sw/source/ui/utlui.po b/source/nn/sw/source/ui/utlui.po
index 68285b6bf37..efb69b44994 100644
--- a/source/nn/sw/source/ui/utlui.po
+++ b/source/nn/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: 2015-08-12 13:26+0200\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"
@@ -1828,11 +1828,12 @@ msgid "Indexes"
 msgstr "Register"
 
 #: utlui.src
+#, fuzzy
 msgctxt ""
 "utlui.src\n"
 "STR_CONTENT_TYPE_DRAWOBJECT\n"
 "string.text"
-msgid "Draw objects"
+msgid "Drawing objects"
 msgstr "Teikneobjekt"
 
 #: utlui.src
diff --git a/source/nn/sw/source/uibase/inc.po b/source/nn/sw/source/uibase/inc.po
deleted file mode 100644
index b625f59a5d4..00000000000
--- a/source/nn/sw/source/uibase/inc.po
+++ /dev/null
@@ -1,53 +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: 2014-11-27 21:12+0000\n"
-"Last-Translator: Kolbjørn <kolbjoern@stuestoel.no>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: nn\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: LibreOffice\n"
-"X-Accelerator-Marker: ~\n"
-"X-POOTLE-MTIME: 1417122728.000000\n"
-
-#: redline_tmpl.hrc
-msgctxt ""
-"redline_tmpl.hrc\n"
-"MN_EDIT_REDLINE\n"
-"FN_REDLINE_ACCEPT_DIRECT\n"
-"menuitem.text"
-msgid "Accept Change"
-msgstr "Godta endring"
-
-#: redline_tmpl.hrc
-msgctxt ""
-"redline_tmpl.hrc\n"
-"MN_EDIT_REDLINE\n"
-"FN_REDLINE_REJECT_DIRECT\n"
-"menuitem.text"
-msgid "Reject Change"
-msgstr "Avvis endring"
-
-#: redline_tmpl.hrc
-msgctxt ""
-"redline_tmpl.hrc\n"
-"MN_EDIT_REDLINE\n"
-"FN_REDLINE_NEXT_CHANGE\n"
-"menuitem.text"
-msgid "Next Change"
-msgstr "Neste endring"
-
-#: redline_tmpl.hrc
-msgctxt ""
-"redline_tmpl.hrc\n"
-"MN_EDIT_REDLINE\n"
-"FN_REDLINE_PREV_CHANGE\n"
-"menuitem.text"
-msgid "Previous Change"
-msgstr "Førre endring"
diff --git a/source/nn/sw/source/uibase/lingu.po b/source/nn/sw/source/uibase/lingu.po
index 1921fa95619..519c51069f7 100644
--- a/source/nn/sw/source/uibase/lingu.po
+++ b/source/nn/sw/source/uibase/lingu.po
@@ -3,9 +3,9 @@ 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-11-14 15:23+0000\n"
-"Last-Translator: Kolbjørn Stuestøl <kolbjoern@stuestoel.no>\n"
+"POT-Creation-Date: 2016-03-09 20:49+0100\n"
+"PO-Revision-Date: 2016-03-20 11:18+0000\n"
+"Last-Translator: system user <>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: nn\n"
 "MIME-Version: 1.0\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: 1447514616.000000\n"
+"X-POOTLE-MTIME: 1458472736.000000\n"
 
 #: olmenu.src
 msgctxt ""
@@ -73,6 +73,42 @@ msgstr "Vel språk for avsnittet"
 #: olmenu.src
 msgctxt ""
 "olmenu.src\n"
+"MN_SPELL_POPUP\n"
+"FN_REDLINE_ACCEPT_DIRECT\n"
+"menuitem.text"
+msgid "Accept Change"
+msgstr "Godta endringa"
+
+#: olmenu.src
+msgctxt ""
+"olmenu.src\n"
+"MN_SPELL_POPUP\n"
+"FN_REDLINE_REJECT_DIRECT\n"
+"menuitem.text"
+msgid "Reject Change"
+msgstr "Avvis endringa"
+
+#: olmenu.src
+msgctxt ""
+"olmenu.src\n"
+"MN_SPELL_POPUP\n"
+"FN_REDLINE_NEXT_CHANGE\n"
+"menuitem.text"
+msgid "Next Change"
+msgstr "Neste endring"
+
+#: olmenu.src
+msgctxt ""
+"olmenu.src\n"
+"MN_SPELL_POPUP\n"
+"FN_REDLINE_PREV_CHANGE\n"
+"menuitem.text"
+msgid "Previous Change"
+msgstr "Førre endring"
+
+#: olmenu.src
+msgctxt ""
+"olmenu.src\n"
 "STR_WORD\n"
 "string.text"
 msgid "Word is "
diff --git a/source/nn/sw/source/uibase/ribbar.po b/source/nn/sw/source/uibase/ribbar.po
index 8111f6fc9b5..9a7d2a615d3 100644
--- a/source/nn/sw/source/uibase/ribbar.po
+++ b/source/nn/sw/source/uibase/ribbar.po
@@ -3,18 +3,18 @@ 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: 2014-11-27 21:38+0000\n"
-"Last-Translator: Kolbjørn <kolbjoern@stuestoel.no>\n"
+"POT-Creation-Date: 2016-03-09 20:49+0100\n"
+"PO-Revision-Date: 2016-03-20 11:19+0000\n"
+"Last-Translator: Kolbjørn Stuestøl <kolbjoern@stuestoel.no>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: nn\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: LibreOffice\n"
+"X-Generator: Pootle 2.7\n"
 "X-Accelerator-Marker: ~\n"
-"X-POOTLE-MTIME: 1417124310.000000\n"
+"X-POOTLE-MTIME: 1458472742.000000\n"
 
 #: inputwin.src
 msgctxt ""
@@ -22,8 +22,8 @@ msgctxt ""
 "RID_TBX_FORMULA\n"
 "FN_FORMULA_CALC\n"
 "toolboxitem.text"
-msgid "Formula"
-msgstr "Formel"
+msgid "Functions"
+msgstr "Funksjonar"
 
 #: inputwin.src
 msgctxt ""
@@ -330,78 +330,6 @@ msgstr "Formeltekst"
 #: workctrl.src
 msgctxt ""
 "workctrl.src\n"
-"RID_INSERT_FIELD_CTRL\n"
-"FN_INSERT_FLD_PGNUMBER\n"
-"menuitem.text"
-msgid "Page Number"
-msgstr "Sidenummer"
-
-#: workctrl.src
-msgctxt ""
-"workctrl.src\n"
-"RID_INSERT_FIELD_CTRL\n"
-"FN_INSERT_FLD_PGCOUNT\n"
-"menuitem.text"
-msgid "Page Count"
-msgstr "Tal på sider"
-
-#: workctrl.src
-msgctxt ""
-"workctrl.src\n"
-"RID_INSERT_FIELD_CTRL\n"
-"FN_INSERT_FLD_DATE\n"
-"menuitem.text"
-msgid "Date"
-msgstr "Dato"
-
-#: workctrl.src
-msgctxt ""
-"workctrl.src\n"
-"RID_INSERT_FIELD_CTRL\n"
-"FN_INSERT_FLD_TIME\n"
-"menuitem.text"
-msgid "Time"
-msgstr "Klokkeslett"
-
-#: workctrl.src
-msgctxt ""
-"workctrl.src\n"
-"RID_INSERT_FIELD_CTRL\n"
-"FN_INSERT_FLD_TITLE\n"
-"menuitem.text"
-msgid "Title"
-msgstr "Tittel"
-
-#: workctrl.src
-msgctxt ""
-"workctrl.src\n"
-"RID_INSERT_FIELD_CTRL\n"
-"FN_INSERT_FLD_AUTHOR\n"
-"menuitem.text"
-msgid "Author"
-msgstr "Forfattar"
-
-#: workctrl.src
-msgctxt ""
-"workctrl.src\n"
-"RID_INSERT_FIELD_CTRL\n"
-"FN_INSERT_FLD_TOPIC\n"
-"menuitem.text"
-msgid "Subject"
-msgstr "Emne"
-
-#: workctrl.src
-msgctxt ""
-"workctrl.src\n"
-"RID_INSERT_FIELD_CTRL\n"
-"FN_INSERT_FIELD\n"
-"menuitem.text"
-msgid "More Fields..."
-msgstr "Fleire felt …"
-
-#: workctrl.src
-msgctxt ""
-"workctrl.src\n"
 "ST_TBL\n"
 "string.text"
 msgid "Table"
diff --git a/source/nn/sw/source/uibase/smartmenu.po b/source/nn/sw/source/uibase/smartmenu.po
deleted file mode 100644
index 600830692bd..00000000000
--- a/source/nn/sw/source/uibase/smartmenu.po
+++ /dev/null
@@ -1,26 +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: 2014-11-27 20:56+0000\n"
-"Last-Translator: Kolbjørn <kolbjoern@stuestoel.no>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: nn\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: LibreOffice\n"
-"X-Accelerator-Marker: ~\n"
-"X-POOTLE-MTIME: 1417121813.000000\n"
-
-#: stmenu.src
-msgctxt ""
-"stmenu.src\n"
-"MN_SMARTTAG_POPUP\n"
-"MN_SMARTTAG_OPTIONS\n"
-"menuitem.text"
-msgid "Smart Tag Options..."
-msgstr "Innstillingar for smarte taggar …"
diff --git a/source/nn/sw/source/uibase/uiview.po b/source/nn/sw/source/uibase/uiview.po
index c93ee165d35..c2ec04c2b5a 100644
--- a/source/nn/sw/source/uibase/uiview.po
+++ b/source/nn/sw/source/uibase/uiview.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: 2015-04-22 23:40+0200\n"
+"POT-Creation-Date: 2016-03-09 20:49+0100\n"
 "PO-Revision-Date: 2015-07-16 19:39+0000\n"
 "Last-Translator: Kolbjørn Stuestøl <kolbjoern@stuestoel.no>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -179,24 +179,7 @@ msgstr "~Eksporter kjelde …"
 #: view.src
 msgctxt ""
 "view.src\n"
-"MN_SRCVIEW_POPUPMENU\n"
-"string.text"
-msgid "HTML source"
-msgstr "HTML-kjelde"
-
-#: view.src
-msgctxt ""
-"view.src\n"
 "RID_PVIEW_TOOLBOX\n"
 "string.text"
 msgid "Print Preview"
 msgstr "Førehandsvising av utskrift"
-
-#: view.src
-msgctxt ""
-"view.src\n"
-"MN_SRCVIEW_POPUPMENU\n"
-"SID_SOURCEVIEW\n"
-"menuitem.text"
-msgid "HTML Source"
-msgstr "HTML-kjelde"
diff --git a/source/nn/sw/source/uibase/utlui.po b/source/nn/sw/source/uibase/utlui.po
index b9f92f153bf..e440e3e6ba8 100644
--- a/source/nn/sw/source/uibase/utlui.po
+++ b/source/nn/sw/source/uibase/utlui.po
@@ -3,9 +3,9 @@ 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-11-14 15:28+0000\n"
-"Last-Translator: Kolbjørn Stuestøl <kolbjoern@stuestoel.no>\n"
+"POT-Creation-Date: 2016-04-16 21:40+0200\n"
+"PO-Revision-Date: 2016-03-20 11:21+0000\n"
+"Last-Translator: system user <>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: nn\n"
 "MIME-Version: 1.0\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: 1447514888.000000\n"
+"X-POOTLE-MTIME: 1458472862.000000\n"
 
 #: attrdesc.src
 msgctxt ""
@@ -1458,215 +1458,230 @@ msgid "ISBN"
 msgstr "ISBN"
 
 #: navipi.src
+#, fuzzy
 msgctxt ""
 "navipi.src\n"
-"DLG_NAVIGATION_PI\n"
-"window.text"
-msgid "Navigator"
-msgstr "Dokumentstruktur"
-
-#: navipi.src
-msgctxt ""
-"navipi.src\n"
-"TB_CONTENT\n"
+"DLG_NAVIGATION_PI.TB_CONTENT\n"
 "FN_GLOBAL_SWITCH\n"
 "toolboxitem.text"
-msgid "Toggle"
-msgstr "Slå av/på"
+msgid "Toggle Master View"
+msgstr "Slå på/av hovudutforminga"
 
 #: navipi.src
+#, fuzzy
 msgctxt ""
 "navipi.src\n"
-"TB_CONTENT\n"
+"DLG_NAVIGATION_PI.TB_CONTENT\n"
 "FN_CREATE_NAVIGATION\n"
 "toolboxitem.text"
 msgid "Navigation"
 msgstr "Navigering"
 
 #: navipi.src
+#, fuzzy
 msgctxt ""
 "navipi.src\n"
-"TB_CONTENT\n"
+"DLG_NAVIGATION_PI.TB_CONTENT\n"
 "FN_UP\n"
 "toolboxitem.text"
 msgid "Back"
 msgstr "Tilbake"
 
 #: navipi.src
+#, fuzzy
 msgctxt ""
 "navipi.src\n"
-"TB_CONTENT\n"
+"DLG_NAVIGATION_PI.TB_CONTENT\n"
 "FN_DOWN\n"
 "toolboxitem.text"
 msgid "Forward"
 msgstr "Framover"
 
 #: navipi.src
+#, fuzzy
 msgctxt ""
 "navipi.src\n"
-"TB_CONTENT\n"
+"DLG_NAVIGATION_PI.TB_CONTENT\n"
 "FN_DROP_REGION\n"
 "toolboxitem.text"
 msgid "Drag Mode"
 msgstr "Dra-modus"
 
 #: navipi.src
+#, fuzzy
 msgctxt ""
 "navipi.src\n"
-"TB_CONTENT\n"
+"DLG_NAVIGATION_PI.TB_CONTENT\n"
 "FN_ITEM_UP\n"
 "toolboxitem.text"
 msgid "Promote Chapter"
 msgstr "Flytt kapittel opp"
 
 #: navipi.src
+#, fuzzy
 msgctxt ""
 "navipi.src\n"
-"TB_CONTENT\n"
+"DLG_NAVIGATION_PI.TB_CONTENT\n"
 "FN_ITEM_DOWN\n"
 "toolboxitem.text"
 msgid "Demote Chapter"
 msgstr "Flytt kapittel ned"
 
 #: navipi.src
+#, fuzzy
 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"
 msgstr "Vis/gøym liste"
 
 #: navipi.src
+#, fuzzy
 msgctxt ""
 "navipi.src\n"
-"TB_CONTENT\n"
+"DLG_NAVIGATION_PI.TB_CONTENT\n"
 "FN_SHOW_ROOT\n"
 "toolboxitem.text"
-msgid "Content View"
-msgstr "Innhaldsvising"
+msgid "Content Navigation View"
+msgstr "Innhald i navigeringsvisinga"
 
 #: navipi.src
+#, fuzzy
 msgctxt ""
 "navipi.src\n"
-"TB_CONTENT\n"
+"DLG_NAVIGATION_PI.TB_CONTENT\n"
 "FN_SELECT_SET_AUTO_BOOKMARK\n"
 "toolboxitem.text"
 msgid "Set Reminder"
 msgstr "Vel påminning"
 
 #: navipi.src
+#, fuzzy
 msgctxt ""
 "navipi.src\n"
-"TB_CONTENT\n"
+"DLG_NAVIGATION_PI.TB_CONTENT\n"
 "FN_SELECT_HEADER\n"
 "toolboxitem.text"
 msgid "Header"
 msgstr "Topptekst"
 
 #: navipi.src
+#, fuzzy
 msgctxt ""
 "navipi.src\n"
-"TB_CONTENT\n"
+"DLG_NAVIGATION_PI.TB_CONTENT\n"
 "FN_SELECT_FOOTER\n"
 "toolboxitem.text"
 msgid "Footer"
 msgstr "Botntekst"
 
 #: navipi.src
+#, fuzzy
 msgctxt ""
 "navipi.src\n"
-"TB_CONTENT\n"
+"DLG_NAVIGATION_PI.TB_CONTENT\n"
 "FN_SELECT_FOOTNOTE\n"
 "toolboxitem.text"
 msgid "Anchor<->Text"
 msgstr "Anker ↔ tekst"
 
 #: navipi.src
+#, fuzzy
 msgctxt ""
 "navipi.src\n"
-"TB_CONTENT\n"
+"DLG_NAVIGATION_PI.TB_CONTENT\n"
 "FN_OUTLINE_LEVEL\n"
 "toolboxitem.text"
 msgid "Heading Levels Shown"
 msgstr "Vis overskriftsnivå"
 
 #: navipi.src
+#, fuzzy
 msgctxt ""
 "navipi.src\n"
-"TB_CONTENT\n"
+"DLG_NAVIGATION_PI.TB_CONTENT\n"
 "FN_ITEM_LEFT\n"
 "toolboxitem.text"
 msgid "Promote Level"
 msgstr "Flytt nivå opp"
 
 #: navipi.src
+#, fuzzy
 msgctxt ""
 "navipi.src\n"
-"TB_CONTENT\n"
+"DLG_NAVIGATION_PI.TB_CONTENT\n"
 "FN_ITEM_RIGHT\n"
 "toolboxitem.text"
 msgid "Demote Level"
 msgstr "Flytt eitt nivå ned"
 
 #: navipi.src
+#, fuzzy
 msgctxt ""
 "navipi.src\n"
-"TB_GLOBAL\n"
+"DLG_NAVIGATION_PI.TB_GLOBAL\n"
 "FN_GLOBAL_SWITCH\n"
 "toolboxitem.text"
-msgid "Toggle"
-msgstr "Slå av/på"
+msgid "Toggle Master View"
+msgstr "Slå på/av hovudutforminga"
 
 #: navipi.src
+#, fuzzy
 msgctxt ""
 "navipi.src\n"
-"TB_GLOBAL\n"
+"DLG_NAVIGATION_PI.TB_GLOBAL\n"
 "FN_GLOBAL_EDIT\n"
 "toolboxitem.text"
 msgid "Edit"
 msgstr "Rediger"
 
 #: navipi.src
+#, fuzzy
 msgctxt ""
 "navipi.src\n"
-"TB_GLOBAL\n"
+"DLG_NAVIGATION_PI.TB_GLOBAL\n"
 "FN_GLOBAL_UPDATE\n"
 "toolboxitem.text"
 msgid "Update"
 msgstr "Oppdater"
 
 #: navipi.src
+#, fuzzy
 msgctxt ""
 "navipi.src\n"
-"TB_GLOBAL\n"
+"DLG_NAVIGATION_PI.TB_GLOBAL\n"
 "FN_GLOBAL_OPEN\n"
 "toolboxitem.text"
 msgid "Insert"
 msgstr "Set inn"
 
 #: navipi.src
+#, fuzzy
 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"
 msgstr "Lagra med innhald"
 
 #: navipi.src
+#, fuzzy
 msgctxt ""
 "navipi.src\n"
-"TB_GLOBAL\n"
+"DLG_NAVIGATION_PI.TB_GLOBAL\n"
 "FN_ITEM_UP\n"
 "toolboxitem.text"
 msgid "Move Up"
 msgstr "Flytt opp"
 
 #: navipi.src
+#, fuzzy
 msgctxt ""
 "navipi.src\n"
-"TB_GLOBAL\n"
+"DLG_NAVIGATION_PI.TB_GLOBAL\n"
 "FN_ITEM_DOWN\n"
 "toolboxitem.text"
 msgid "Move Down"
@@ -1675,6 +1690,14 @@ msgstr "Flytt ned"
 #: navipi.src
 msgctxt ""
 "navipi.src\n"
+"DLG_NAVIGATION_PI\n"
+"window.text"
+msgid "Navigator"
+msgstr "Dokumentstruktur"
+
+#: navipi.src
+msgctxt ""
+"navipi.src\n"
 "STR_ACCESS_TL_GLOBAL\n"
 "string.text"
 msgid "Global View"
@@ -1685,8 +1708,8 @@ msgctxt ""
 "navipi.src\n"
 "STR_ACCESS_TL_CONTENT\n"
 "string.text"
-msgid "Content View"
-msgstr "Innhaldsvising"
+msgid "Content Navigation View"
+msgstr "Innhald i navigeringsvisinga"
 
 #: navipi.src
 msgctxt ""
diff --git a/source/nn/sw/uiconfig/swriter/ui.po b/source/nn/sw/uiconfig/swriter/ui.po
index 6dfee662711..19240e59e6a 100644
--- a/source/nn/sw/uiconfig/swriter/ui.po
+++ b/source/nn/sw/uiconfig/swriter/ui.po
@@ -3,9 +3,9 @@ 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-10-31 21:39+0000\n"
-"Last-Translator: Kolbjørn Stuestøl <kolbjoern@stuestoel.no>\n"
+"POT-Creation-Date: 2016-04-16 21:40+0200\n"
+"PO-Revision-Date: 2016-03-20 11:22+0000\n"
+"Last-Translator: system user <>\n"
 "Language-Team: none\n"
 "Language: nn\n"
 "MIME-Version: 1.0\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: 1446327563.000000\n"
+"X-POOTLE-MTIME: 1458472959.000000\n"
 
 #: abstractdialog.ui
 msgctxt ""
@@ -4172,20 +4172,29 @@ msgstr "Set inn _referanse til"
 #: fldrefpage.ui
 msgctxt ""
 "fldrefpage.ui\n"
-"label2\n"
+"label4\n"
 "label\n"
 "string.text"
-msgid "S_election"
-msgstr "_Utval"
+msgid "Selection"
+msgstr "Utval"
 
 #: fldrefpage.ui
 msgctxt ""
 "fldrefpage.ui\n"
-"nameft\n"
+"filter\n"
+"placeholder_text\n"
+"string.text"
+msgid "Filter Selection"
+msgstr ""
+
+#: fldrefpage.ui
+msgctxt ""
+"fldrefpage.ui\n"
+"label2\n"
 "label\n"
 "string.text"
-msgid "Na_me"
-msgstr "_Namn"
+msgid "S_election"
+msgstr "_Utval"
 
 #: fldrefpage.ui
 msgctxt ""
@@ -4199,6 +4208,15 @@ msgstr "_Verdi"
 #: fldrefpage.ui
 msgctxt ""
 "fldrefpage.ui\n"
+"nameft\n"
+"label\n"
+"string.text"
+msgid "Na_me"
+msgstr "_Namn"
+
+#: fldrefpage.ui
+msgctxt ""
+"fldrefpage.ui\n"
 "liststore1\n"
 "0\n"
 "stringlist.text"
@@ -4412,24 +4430,6 @@ msgctxt ""
 msgid "Date Time Author"
 msgstr "Dato Klokkeslett Forfattar"
 
-#: floatingmmchild.ui
-msgctxt ""
-"floatingmmchild.ui\n"
-"FloatingMMChild\n"
-"title\n"
-"string.text"
-msgid "Mail Merge Wizard"
-msgstr "Vegvisar for brevfletting"
-
-#: floatingmmchild.ui
-msgctxt ""
-"floatingmmchild.ui\n"
-"return\n"
-"label\n"
-"string.text"
-msgid "Return to Mail Merge Wizard"
-msgstr "Gå tilbake til vegvisaren for brevfletting"
-
 #: floatingnavigation.ui
 msgctxt ""
 "floatingnavigation.ui\n"
@@ -6033,13 +6033,34 @@ msgid "Autotexts for Shortcut "
 msgstr "Autotekst for snarvegar "
 
 #: insertbookmark.ui
+#, fuzzy
 msgctxt ""
 "insertbookmark.ui\n"
 "InsertBookmarkDialog\n"
 "title\n"
 "string.text"
-msgid "Insert Bookmark"
-msgstr "Set inn bokmerke"
+msgid "Bookmark"
+msgstr "Bokmerke"
+
+#: insertbookmark.ui
+#, fuzzy
+msgctxt ""
+"insertbookmark.ui\n"
+"insert\n"
+"label\n"
+"string.text"
+msgid "Insert"
+msgstr "Set inn"
+
+#: insertbookmark.ui
+#, fuzzy
+msgctxt ""
+"insertbookmark.ui\n"
+"rename\n"
+"label\n"
+"string.text"
+msgid "Rename"
+msgstr "Endra namn"
 
 #: insertbookmark.ui
 msgctxt ""
@@ -6050,6 +6071,15 @@ msgctxt ""
 msgid "Delete"
 msgstr "Slett"
 
+#: insertbookmark.ui
+msgctxt ""
+"insertbookmark.ui\n"
+"goto\n"
+"label\n"
+"string.text"
+msgid "Go to"
+msgstr ""
+
 #: insertbreak.ui
 msgctxt ""
 "insertbreak.ui\n"
@@ -7223,20 +7253,20 @@ msgstr "Bruk _sikker tilkopling (SSL)"
 #: mailconfigpage.ui
 msgctxt ""
 "mailconfigpage.ui\n"
-"port_label\n"
+"server_label\n"
 "label\n"
 "string.text"
-msgid "_Port:"
-msgstr "_Port:"
+msgid "_Server name:"
+msgstr "_Tenarnamn:"
 
 #: mailconfigpage.ui
 msgctxt ""
 "mailconfigpage.ui\n"
-"server_label\n"
+"port_label\n"
 "label\n"
 "string.text"
-msgid "_Server name:"
-msgstr "_Tenarnamn:"
+msgid "_Port:"
+msgstr "_Port:"
 
 #: mailconfigpage.ui
 msgctxt ""
@@ -7244,8 +7274,8 @@ msgctxt ""
 "serverauthentication\n"
 "label\n"
 "string.text"
-msgid "Server Au_thentication"
-msgstr "Tenar_autentisering"
+msgid "Ser_ver Authentication…"
+msgstr "_Tenarautentisering …"
 
 #: mailconfigpage.ui
 msgctxt ""
@@ -7262,8 +7292,8 @@ msgctxt ""
 "test\n"
 "label\n"
 "string.text"
-msgid "Test S_ettings..."
-msgstr "_Testinnstillingar …"
+msgid "_Test Settings"
+msgstr "_Testinnstillingar"
 
 #: mailmerge.ui
 msgctxt ""
@@ -8066,533 +8096,411 @@ msgctxt ""
 msgid "Insert personalized salutation"
 msgstr "Set inn personleg helsing"
 
-#: 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 "Du kan gjera bestemte dokument personlege. Klikk på «%1» for å redusera vegvisaren til eit lite vindauge slik at du kan redigera dokumentet. Når du er ferdig med redigeringa, trykk på «Tilbake til brevflettingsvegvisaren» i det vesle vindauget."
-
-#: mmmergepage.ui
-msgctxt ""
-"mmmergepage.ui\n"
-"edit\n"
-"label\n"
-"string.text"
-msgid "_Edit individual document..."
-msgstr "_Rediger enkeltdokument …"
-
-#: mmmergepage.ui
-msgctxt ""
-"mmmergepage.ui\n"
-"label1\n"
-"label\n"
-"string.text"
-msgid "Personalize the Mail Merge Documents"
-msgstr "Gjer brevflettingsdokumenta personlege"
-
-#: mmmergepage.ui
+#: mmoutputtypepage.ui
 msgctxt ""
-"mmmergepage.ui\n"
-"find\n"
+"mmoutputtypepage.ui\n"
+"letterft\n"
 "label\n"
 "string.text"
-msgid "_Find..."
-msgstr "_Finn …"
+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 "Send brev til ei mottakargruppe. Breva kan innehalda ei adresseblokk og ei helsing. Breva kan gjerast personlege for kvar mottakar."
 
-#: mmmergepage.ui
+#: mmoutputtypepage.ui
 msgctxt ""
-"mmmergepage.ui\n"
-"label4\n"
+"mmoutputtypepage.ui\n"
+"emailft\n"
 "label\n"
 "string.text"
-msgid "_Search for:"
-msgstr "_Søk etter:"
+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 "Send e-post til ei motakargruppe. Meldinga kan innehalda ei helsing og kan gjerast personleg for kvar mottakar."
 
-#: mmmergepage.ui
+#: mmoutputtypepage.ui
 msgctxt ""
-"mmmergepage.ui\n"
-"wholewords\n"
+"mmoutputtypepage.ui\n"
+"letter\n"
 "label\n"
 "string.text"
-msgid "Whole wor_ds only"
-msgstr "Berre _heile ord"
+msgid "_Letter"
+msgstr "_Brev"
 
-#: mmmergepage.ui
+#: mmoutputtypepage.ui
 msgctxt ""
-"mmmergepage.ui\n"
-"backwards\n"
+"mmoutputtypepage.ui\n"
+"email\n"
 "label\n"
 "string.text"
-msgid "Back_wards"
-msgstr "_Bakover"
+msgid "_E-mail message"
+msgstr "_E-postmelding"
 
-#: mmmergepage.ui
+#: mmoutputtypepage.ui
 msgctxt ""
-"mmmergepage.ui\n"
-"matchcase\n"
+"mmoutputtypepage.ui\n"
+"label1\n"
 "label\n"
 "string.text"
-msgid "Ma_tch case"
-msgstr "_Skil mellom små/store bokstavar"
+msgid "What Type of Document Do You Want to Create?"
+msgstr "Kva slag dokument ønskjer du å laga?"
 
-#: mmmergepage.ui
+#: mmresultemaildialog.ui
 msgctxt ""
-"mmmergepage.ui\n"
-"label2\n"
-"label\n"
+"mmresultemaildialog.ui\n"
+"MMResultEmailDialog\n"
+"title\n"
 "string.text"
-msgid "Find"
-msgstr "Finn"
+msgid "E-Mail merged document"
+msgstr ""
 
-#: mmoutputpage.ui
+#: mmresultemaildialog.ui
+#, fuzzy
 msgctxt ""
-"mmoutputpage.ui\n"
-"savestarting\n"
+"mmresultemaildialog.ui\n"
+"ok\n"
 "label\n"
 "string.text"
-msgid "_Save starting document"
-msgstr "_Lagra startdokument"
+msgid "Send Documents"
+msgstr "Se_nd dokumenta"
 
-#: mmoutputpage.ui
+#: mmresultemaildialog.ui
+#, fuzzy
 msgctxt ""
-"mmoutputpage.ui\n"
-"savemerged\n"
+"mmresultemaildialog.ui\n"
+"mailtoft\n"
 "label\n"
 "string.text"
-msgid "Save _merged document"
-msgstr "Lagra _fletta dokument"
+msgid "T_o"
+msgstr "_Til"
 
-#: mmoutputpage.ui
+#: mmresultemaildialog.ui
+#, fuzzy
 msgctxt ""
-"mmoutputpage.ui\n"
-"printmerged\n"
+"mmresultemaildialog.ui\n"
+"copyto\n"
 "label\n"
 "string.text"
-msgid "_Print merged document"
-msgstr "Skriv _ut fletta dokument"
+msgid "_Copy to..."
+msgstr "_Kopi til …"
 
-#: mmoutputpage.ui
+#: mmresultemaildialog.ui
+#, fuzzy
 msgctxt ""
-"mmoutputpage.ui\n"
-"sendmerged\n"
+"mmresultemaildialog.ui\n"
+"subjectft\n"
 "label\n"
 "string.text"
-msgid "Send merged document as _E-Mail"
-msgstr "Send fletta dokument som _e-post"
+msgid "S_ubject"
+msgstr "_Emne"
 
-#: mmoutputpage.ui
+#: mmresultemaildialog.ui
+#, fuzzy
 msgctxt ""
-"mmoutputpage.ui\n"
-"label3\n"
+"mmresultemaildialog.ui\n"
+"sendasft\n"
 "label\n"
 "string.text"
-msgid "Select one of the options below:"
-msgstr "Vel eitt av alternativa nedanfor:"
+msgid "Sen_d as"
+msgstr "_Send som"
 
-#: mmoutputpage.ui
+#: mmresultemaildialog.ui
+#, fuzzy
 msgctxt ""
-"mmoutputpage.ui\n"
-"label1\n"
+"mmresultemaildialog.ui\n"
+"sendassettings\n"
 "label\n"
 "string.text"
-msgid "Save, Print or Send the Document"
-msgstr "Lagra, skriva ut eller sende dokumentet"
+msgid "Pr_operties..."
+msgstr "_Eigenskapar …"
 
-#: mmoutputpage.ui
+#: mmresultemaildialog.ui
+#, fuzzy
 msgctxt ""
-"mmoutputpage.ui\n"
-"savestartingdoc\n"
+"mmresultemaildialog.ui\n"
+"attachft\n"
 "label\n"
 "string.text"
-msgid "Save starting _document"
-msgstr "Lagra _startdokumentet"
+msgid "Name of the a_ttachment"
+msgstr "Namn på _vedlegget"
 
-#: 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"
-msgstr "Lagra som eit _enkelt dokument"
+msgid "E-Mail options"
+msgstr ""
 
-#: mmoutputpage.ui
+#: mmresultemaildialog.ui
+#, fuzzy
 msgctxt ""
-"mmoutputpage.ui\n"
-"individualrb\n"
+"mmresultemaildialog.ui\n"
+"sendallrb\n"
 "label\n"
 "string.text"
-msgid "Sa_ve as individual documents"
-msgstr "Lagra som _individuelle dokument"
+msgid "S_end all documents"
+msgstr "S_end alle dokumenta"
 
-#: mmoutputpage.ui
+#: mmresultemaildialog.ui
+#, fuzzy
 msgctxt ""
-"mmoutputpage.ui\n"
+"mmresultemaildialog.ui\n"
 "fromrb\n"
 "label\n"
 "string.text"
 msgid "_From"
 msgstr "_Frå"
 
-#: mmoutputpage.ui
+#: mmresultemaildialog.ui
+#, fuzzy
 msgctxt ""
-"mmoutputpage.ui\n"
+"mmresultemaildialog.ui\n"
 "toft\n"
 "label\n"
 "string.text"
 msgid "_To"
 msgstr "_Til"
 
-#: mmoutputpage.ui
-msgctxt ""
-"mmoutputpage.ui\n"
-"savenow\n"
-"label\n"
-"string.text"
-msgid "Save Do_cuments"
-msgstr "Lagra _dokumenta"
-
-#: mmoutputpage.ui
-msgctxt ""
-"mmoutputpage.ui\n"
-"printallrb\n"
-"label\n"
-"string.text"
-msgid "Print _all documents"
-msgstr "Skriv ut _alle dokumenta"
-
-#: mmoutputpage.ui
-msgctxt ""
-"mmoutputpage.ui\n"
-"printnow\n"
-"label\n"
-"string.text"
-msgid "Prin_t Documents"
-msgstr "_Skriv ut dokumenta"
-
-#: mmoutputpage.ui
+#: mmresultemaildialog.ui
 msgctxt ""
-"mmoutputpage.ui\n"
-"sendallrb\n"
-"label\n"
-"string.text"
-msgid "S_end all documents"
-msgstr "S_end alle dokumenta"
-
-#: mmoutputpage.ui
-msgctxt ""
-"mmoutputpage.ui\n"
-"sendnow\n"
-"label\n"
-"string.text"
-msgid "Se_nd documents"
-msgstr "Se_nd dokumenta"
-
-#: mmoutputpage.ui
-msgctxt ""
-"mmoutputpage.ui\n"
-"mailtoft\n"
-"label\n"
-"string.text"
-msgid "T_o"
-msgstr "_Til"
-
-#: mmoutputpage.ui
-msgctxt ""
-"mmoutputpage.ui\n"
-"subjectft\n"
-"label\n"
-"string.text"
-msgid "S_ubject"
-msgstr "_Emne"
-
-#: mmoutputpage.ui
-msgctxt ""
-"mmoutputpage.ui\n"
-"sendasft\n"
-"label\n"
-"string.text"
-msgid "Sen_d as"
-msgstr "_Send som"
-
-#: mmoutputpage.ui
-msgctxt ""
-"mmoutputpage.ui\n"
-"copyto\n"
-"label\n"
-"string.text"
-msgid "_Copy to..."
-msgstr "_Kopi til …"
-
-#: mmoutputpage.ui
-msgctxt ""
-"mmoutputpage.ui\n"
-"sendassettings\n"
-"label\n"
-"string.text"
-msgid "Pr_operties..."
-msgstr "_Eigenskapar …"
-
-#: mmoutputpage.ui
-msgctxt ""
-"mmoutputpage.ui\n"
-"printerft\n"
-"label\n"
-"string.text"
-msgid "_Printer"
-msgstr "_Skrivar"
-
-#: mmoutputpage.ui
-msgctxt ""
-"mmoutputpage.ui\n"
-"printersettings\n"
-"label\n"
+"mmresultemaildialog.ui\n"
+"from-nospin\n"
+"text\n"
 "string.text"
-msgid "P_roperties..."
-msgstr "_Eigenskapar …"
+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"
-msgstr "Namn på _vedlegget"
+msgid "Send records"
+msgstr ""
 
-#: mmoutputpage.ui
+#: mmresultemaildialog.ui
+#, fuzzy
 msgctxt ""
-"mmoutputpage.ui\n"
+"mmresultemaildialog.ui\n"
 "liststore1\n"
 "0\n"
 "stringlist.text"
 msgid "OpenDocument Text"
 msgstr "OpenDocument-tekst"
 
-#: mmoutputpage.ui
+#: mmresultemaildialog.ui
+#, fuzzy
 msgctxt ""
-"mmoutputpage.ui\n"
+"mmresultemaildialog.ui\n"
 "liststore1\n"
 "1\n"
 "stringlist.text"
 msgid "Adobe PDF-Document"
 msgstr "Adobe PDF-dokument"
 
-#: mmoutputpage.ui
+#: mmresultemaildialog.ui
+#, fuzzy
 msgctxt ""
-"mmoutputpage.ui\n"
+"mmresultemaildialog.ui\n"
 "liststore1\n"
 "2\n"
 "stringlist.text"
 msgid "Microsoft Word Document"
 msgstr "Microsoft Word-dokument"
 
-#: mmoutputpage.ui
+#: mmresultemaildialog.ui
+#, fuzzy
 msgctxt ""
-"mmoutputpage.ui\n"
+"mmresultemaildialog.ui\n"
 "liststore1\n"
 "3\n"
 "stringlist.text"
 msgid "HTML Message"
 msgstr "HTML-melding"
 
-#: mmoutputpage.ui
+#: mmresultemaildialog.ui
+#, fuzzy
 msgctxt ""
-"mmoutputpage.ui\n"
+"mmresultemaildialog.ui\n"
 "liststore1\n"
 "4\n"
 "stringlist.text"
 msgid "Plain Text"
 msgstr "Rein tekst"
 
-#: mmoutputtypepage.ui
+#: mmresultprintdialog.ui
+#, fuzzy
 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."
-msgstr "Send brev til ei mottakargruppe. Breva kan innehalda ei adresseblokk og ei helsing. Breva kan gjerast personlege for kvar mottakar."
+msgid "Print merged document"
+msgstr "Skriv _ut fletta dokument"
 
-#: mmoutputtypepage.ui
+#: mmresultprintdialog.ui
+#, fuzzy
 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."
-msgstr "Send e-post til ei motakargruppe. Meldinga kan innehalda ei helsing og kan gjerast personleg for kvar mottakar."
+msgid "Print Documents"
+msgstr "_Skriv ut dokumenta"
 
-#: mmoutputtypepage.ui
+#: mmresultprintdialog.ui
+#, fuzzy
 msgctxt ""
-"mmoutputtypepage.ui\n"
-"letter\n"
+"mmresultprintdialog.ui\n"
+"printerft\n"
 "label\n"
 "string.text"
-msgid "_Letter"
-msgstr "_Brev"
+msgid "_Printer"
+msgstr "_Skrivar"
 
-#: mmoutputtypepage.ui
+#: mmresultprintdialog.ui
+#, fuzzy
 msgctxt ""
-"mmoutputtypepage.ui\n"
-"email\n"
+"mmresultprintdialog.ui\n"
+"printersettings\n"
 "label\n"
 "string.text"
-msgid "_E-mail message"
-msgstr "_E-postmelding"
+msgid "P_roperties..."
+msgstr "_Eigenskapar …"
 
-#: 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?"
-msgstr "Kva slag dokument ønskjer du å laga?"
+msgid "Printer options"
+msgstr ""
 
-#: mmpreparepage.ui
+#: mmresultprintdialog.ui
+#, fuzzy
 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."
-msgstr "Førehandsvisinga av det fletta dokumentet er no synleg. Klikk på ei av pilene for å sjå førehandsvisinga av andre dokument."
+msgid "Print _all documents"
+msgstr "Skriv ut _alle dokumenta"
 
-#: mmpreparepage.ui
+#: mmresultprintdialog.ui
+#, fuzzy
 msgctxt ""
-"mmpreparepage.ui\n"
-"label4\n"
+"mmresultprintdialog.ui\n"
+"fromrb\n"
 "label\n"
 "string.text"
-msgid "_Recipient"
-msgstr "_Mottakar"
+msgid "_From"
+msgstr "_Frå"
 
-#: mmpreparepage.ui
+#: mmresultprintdialog.ui
+#, fuzzy
 msgctxt ""
-"mmpreparepage.ui\n"
-"first\n"
+"mmresultprintdialog.ui\n"
+"toft\n"
 "label\n"
 "string.text"
-msgid "|<"
-msgstr "|<"
+msgid "_To"
+msgstr "_Til"
 
-#: 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"
-msgstr "Første"
+msgid "1"
+msgstr ""
 
-#: mmpreparepage.ui
+#: mmresultprintdialog.ui
 msgctxt ""
-"mmpreparepage.ui\n"
-"prev\n"
+"mmresultprintdialog.ui\n"
+"label1\n"
 "label\n"
 "string.text"
-msgid "<"
-msgstr "<"
+msgid "Print records"
+msgstr ""
 
-#: mmpreparepage.ui
+#: mmresultsavedialog.ui
+#, fuzzy
 msgctxt ""
-"mmpreparepage.ui\n"
-"prev\n"
-"tooltip_text\n"
+"mmresultsavedialog.ui\n"
+"MMResultSaveDialog\n"
+"title\n"
 "string.text"
-msgid "Previous"
-msgstr "Førre"
+msgid "Save merged document"
+msgstr "Lagra _fletta dokument"
 
-#: mmpreparepage.ui
+#: mmresultsavedialog.ui
+#, fuzzy
 msgctxt ""
-"mmpreparepage.ui\n"
-"next\n"
+"mmresultsavedialog.ui\n"
+"ok\n"
 "label\n"
 "string.text"
-msgid ">"
-msgstr ">"
-
-#: mmpreparepage.ui
-msgctxt ""
-"mmpreparepage.ui\n"
-"next\n"
-"tooltip_text\n"
-"string.text"
-msgid "Next"
-msgstr "Neste"
+msgid "Save Documents"
+msgstr "Lagra _dokumenta"
 
-#: mmpreparepage.ui
+#: mmresultsavedialog.ui
+#, fuzzy
 msgctxt ""
-"mmpreparepage.ui\n"
-"last\n"
+"mmresultsavedialog.ui\n"
+"singlerb\n"
 "label\n"
 "string.text"
-msgid ">|"
-msgstr ">|"
-
-#: mmpreparepage.ui
-msgctxt ""
-"mmpreparepage.ui\n"
-"last\n"
-"tooltip_text\n"
-"string.text"
-msgid "Last"
-msgstr "Siste"
+msgid "S_ave as a single large document"
+msgstr "Lagra som eit _enkelt dokument"
 
-#: mmpreparepage.ui
+#: mmresultsavedialog.ui
+#, fuzzy
 msgctxt ""
-"mmpreparepage.ui\n"
-"exclude\n"
+"mmresultsavedialog.ui\n"
+"individualrb\n"
 "label\n"
 "string.text"
-msgid "E_xclude this recipient"
-msgstr "_Utelat denne mottakaren"
+msgid "Sa_ve as individual documents"
+msgstr "Lagra som _individuelle dokument"
 
-#: mmpreparepage.ui
+#: mmresultsavedialog.ui
+#, fuzzy
 msgctxt ""
-"mmpreparepage.ui\n"
-"label1\n"
+"mmresultsavedialog.ui\n"
+"fromrb\n"
 "label\n"
 "string.text"
-msgid "Preview Document"
-msgstr "Førehandsvis dokumentet"
+msgid "_From"
+msgstr "_Frå"
 
-#: mmpreparepage.ui
+#: mmresultsavedialog.ui
+#, fuzzy
 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."
-msgstr ""
-"Dersom du ikkje alt har gjort det, kan du no skriva eller redigera dokumentet. Endringane vil koma med i alle dei fletta dokumenta.\n"
-"\n"
-"Når du trykkjer på «Rediger dokument», vert vegvisaren forminska til eit lite vindauge slik at du kan redigera dokumentet. Etter at du har redigert ferdig, kan du gå tilbake til vegvisaren ved å trykkja på «Gå tilbake til brevflettingsvegvisaren» i det vesle vindauget."
+msgid "_To"
+msgstr "_Til"
 
-#: 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..."
-msgstr "_Rediger dokument …"
+msgid "1"
+msgstr ""
 
-#: mmpreparepage.ui
+#: mmresultsavedialog.ui
 msgctxt ""
-"mmpreparepage.ui\n"
+"mmresultsavedialog.ui\n"
 "label2\n"
 "label\n"
 "string.text"
-msgid "Edit Document"
-msgstr "Rediger dokumentet"
+msgid "Save As options"
+msgstr ""
 
 #: mmsalutationpage.ui
 msgctxt ""
@@ -8918,6 +8826,281 @@ msgctxt ""
 msgid "New User Index"
 msgstr "Nytt brukar-register"
 
+#: notebookbar.ui
+#, fuzzy
+msgctxt ""
+"notebookbar.ui\n"
+"label9\n"
+"label\n"
+"string.text"
+msgid "File"
+msgstr "Fil"
+
+#: notebookbar.ui
+#, fuzzy
+msgctxt ""
+"notebookbar.ui\n"
+"controlcodes\n"
+"tooltip_text\n"
+"string.text"
+msgid "Indent"
+msgstr "Innrykk"
+
+#: notebookbar.ui
+#, fuzzy
+msgctxt ""
+"notebookbar.ui\n"
+"numberbullet\n"
+"tooltip_text\n"
+"string.text"
+msgid "Bullets and Numbering"
+msgstr "Punkt og nummerering"
+
+#: notebookbar.ui
+#, fuzzy
+msgctxt ""
+"notebookbar.ui\n"
+"indent\n"
+"tooltip_text\n"
+"string.text"
+msgid "Indent"
+msgstr "Innrykk"
+
+#: 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
+#, fuzzy
+msgctxt ""
+"notebookbar.ui\n"
+"verticalalignment\n"
+"tooltip_text\n"
+"string.text"
+msgid "Vertical Alignment"
+msgstr "_Loddrett justering"
+
+#: 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
+#, fuzzy
+msgctxt ""
+"notebookbar.ui\n"
+"label3\n"
+"label\n"
+"string.text"
+msgid "Insert"
+msgstr "Set inn"
+
+#: 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 "Avstand:"
+
+#: notebookbar.ui
+#, fuzzy
+msgctxt ""
+"notebookbar.ui\n"
+"indentlabel\n"
+"label\n"
+"string.text"
+msgid "_Indent:"
+msgstr "Innrykk:"
+
+#: notebookbar.ui
+msgctxt ""
+"notebookbar.ui\n"
+"label5\n"
+"label\n"
+"string.text"
+msgid "Page layout"
+msgstr ""
+
+#: notebookbar.ui
+#, fuzzy
+msgctxt ""
+"notebookbar.ui\n"
+"InsertMultiIndex\n"
+"label\n"
+"string.text"
+msgid "Table of Contents"
+msgstr "Innhaldsliste"
+
+#: 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
+#, fuzzy
+msgctxt ""
+"notebookbar.ui\n"
+"label7\n"
+"label\n"
+"string.text"
+msgid "References"
+msgstr "Referansar"
+
+#: notebookbar.ui
+msgctxt ""
+"notebookbar.ui\n"
+"label8\n"
+"label\n"
+"string.text"
+msgid "Review"
+msgstr ""
+
+#: notebookbar.ui
+#, fuzzy
+msgctxt ""
+"notebookbar.ui\n"
+"label4\n"
+"label\n"
+"string.text"
+msgid "View"
+msgstr "Vis"
+
+#: notebookbar.ui
+#, fuzzy
+msgctxt ""
+"notebookbar.ui\n"
+"formattable1\n"
+"tooltip_text\n"
+"string.text"
+msgid "Indent"
+msgstr "Innrykk"
+
+#: notebookbar.ui
+#, fuzzy
+msgctxt ""
+"notebookbar.ui\n"
+"formattable\n"
+"tooltip_text\n"
+"string.text"
+msgid "Indent"
+msgstr "Innrykk"
+
+#: notebookbar.ui
+#, fuzzy
+msgctxt ""
+"notebookbar.ui\n"
+"label6\n"
+"label\n"
+"string.text"
+msgid "Table"
+msgstr "Tabell"
+
 #: numberingnamedialog.ui
 msgctxt ""
 "numberingnamedialog.ui\n"
@@ -11434,8 +11617,8 @@ msgctxt ""
 "graphics\n"
 "label\n"
 "string.text"
-msgid "_Pictures and objects"
-msgstr "_Bilete og objekt"
+msgid "_Images and objects"
+msgstr "Bilete og _objekt"
 
 #: printoptionspage.ui
 msgctxt ""
@@ -14539,8 +14722,8 @@ msgctxt ""
 "TocDialog\n"
 "title\n"
 "string.text"
-msgid "Insert Index or Table of Contents"
-msgstr "Set inn register eller innhaldsliste"
+msgid "Table of Contents, Index or Bibliography"
+msgstr ""
 
 #: tocdialog.ui
 msgctxt ""
@@ -14552,13 +14735,14 @@ msgid "Preview"
 msgstr "Førehandsvising"
 
 #: tocdialog.ui
+#, fuzzy
 msgctxt ""
 "tocdialog.ui\n"
 "index\n"
 "label\n"
 "string.text"
-msgid "Index or Table of Contents"
-msgstr "Register eller innhaldsliste"
+msgid "Type"
+msgstr "Type"
 
 #: tocdialog.ui
 msgctxt ""
@@ -15619,8 +15803,8 @@ msgctxt ""
 "graphics\n"
 "label\n"
 "string.text"
-msgid "_Graphics and objects"
-msgstr "_Bilete og objekt"
+msgid "_Images and objects"
+msgstr "Bilete og _objekt "
 
 #: viewoptionspage.ui
 msgctxt ""