update translations for 5.2.0 alpha1

and force-fix errors using pocheck

Change-Id: I75bca3b0cc0333302eac4d11c98ad26dfdc35fd6

12 files changed, 857 insertions, 1812 deletions

diff --git a/source/et/sw/source/ui/app.po b/source/et/sw/source/ui/app.po
index 3167d5dea5b..172cc501a8e 100644
--- a/source/et/sw/source/ui/app.po
+++ b/source/et/sw/source/ui/app.po
@@ -3,8 +3,8 @@ msgid ""
 msgstr ""
 "Project-Id-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-08-25 22:21+0000\n"
+"POT-Creation-Date: 2016-04-16 21:40+0200\n"
+"PO-Revision-Date: 2015-12-15 21:06+0000\n"
 "Last-Translator: system user <>\n"
 "Language-Team: Estonian <none>\n"
 "Language: et\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: 1440541271.000000\n"
+"X-POOTLE-MTIME: 1450213571.000000\n"
 
 #: app.src
 msgctxt ""
@@ -426,6 +426,24 @@ msgid "The following characters are not valid and have been removed: "
 msgstr "Need märgid pole lubatud ja eemaldati: "
 
 #: app.src
+#, fuzzy
+msgctxt ""
+"app.src\n"
+"STR_BOOKMARK_NAME\n"
+"string.text"
+msgid "Name"
+msgstr "Nimi"
+
+#: 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"
@@ -794,6 +812,24 @@ msgid "Unknown Author"
 msgstr "Tundmatu autor"
 
 #: app.src
+#, fuzzy
+msgctxt ""
+"app.src\n"
+"STR_DELETE_NOTE_AUTHOR\n"
+"string.text"
+msgid "Delete ~All Comments by $1"
+msgstr "Kustuta kõik autori $1 märkused"
+
+#: app.src
+#, fuzzy
+msgctxt ""
+"app.src\n"
+"STR_HIDE_NOTE_AUTHOR\n"
+"string.text"
+msgid "H~ide All Comments by $1"
+msgstr "Kustuta kõik autori $1 märkused"
+
+#: app.src
 msgctxt ""
 "app.src\n"
 "STR_DONT_ASK_AGAIN\n"
@@ -1397,567 +1433,50 @@ msgid "Format error discovered in the file in sub-document $(ARG1) at $(ARG2)(ro
 msgstr "Faili alamdokumendis $(ARG1) kohal $(ARG2)(rida,veerg) leiti vorminguviga."
 
 #: mn.src
+#, fuzzy
 msgctxt ""
 "mn.src\n"
-"MN_PAGE\n"
-"FN_FORMAT_PAGE_DLG\n"
-"menuitem.text"
-msgid "Pa~ge..."
-msgstr "Lehekülg..."
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"_MN_EDIT_FIELD\n"
-"FN_EDIT_FIELD\n"
-"menuitem.text"
-msgid "Fields..."
-msgstr "Väljad..."
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"_MN_EDIT_FIELD._MN_EDIT_FOOTNOTE\n"
-"FN_EDIT_FOOTNOTE\n"
-"menuitem.text"
-msgid "Footnote/Endnote~..."
-msgstr "All- või lõpumärkus~..."
-
-#: 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 "Muuda registri kirjet..."
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"_MN_EDIT_BIB_ENTRY_DLG\n"
-"FN_EDIT_AUTH_ENTRY_DLG\n"
-"menuitem.text"
-msgid "~Bibliography Entry..."
-msgstr "Bibliokirje..."
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"_MN_EDIT_OPEN_HYPERLINK\n"
-"FN_EDIT_HYPERLINK\n"
-"menuitem.text"
-msgid "Edit Hyperlink..."
-msgstr "Redigeeri hüperlinki..."
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"_MN_EDIT_OPEN_HYPERLINK\n"
-"FN_COPY_HYPERLINK_LOCATION\n"
-"menuitem.text"
-msgid "Copy Hyper~link"
-msgstr "Kopeeri hüperlink"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"_MN_EDIT_OPEN_HYPERLINK\n"
-"FN_REMOVE_HYPERLINK\n"
-"menuitem.text"
-msgid "Remo~ve Hyperlink"
-msgstr "Eemalda hüperlink"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_RESET\n"
-"FN_FORMAT_RESET\n"
-"menuitem.text"
-msgid "Clear ~Direct Formatting"
-msgstr "Eemalda otsene vormindus"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"_NUMBERING_RELATED_MENU\n"
-"FN_NUMBER_NEWSTART\n"
-"menuitem.text"
-msgid "Restart Numbering"
-msgstr "Taasalusta nummerdust"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"_NUMBERING_RELATED_MENU\n"
-"FN_NUM_CONTINUE\n"
-"menuitem.text"
-msgid "Continue previous numbering"
-msgstr "Jätka eelnevat nummerdust"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"_NUMBERING_RELATED_MENU\n"
-"FN_NUM_BULLET_UP\n"
-"menuitem.text"
-msgid "Up One Level"
-msgstr "Taseme võrra üles"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"_NUMBERING_RELATED_MENU\n"
-"FN_NUM_BULLET_DOWN\n"
-"menuitem.text"
-msgid "Down One Level"
-msgstr "Taseme võrra alla"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MENU_PASTE_SPECIAL.SID_MENU_PASTE_SPECIAL\n"
-"SID_PASTE_UNFORMATTED\n"
-"menuitem.text"
-msgid "~Unformatted Text"
-msgstr "~Vormindamata 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 "~Rohkem sätteid..."
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MENU_PASTE_SPECIAL\n"
-"SID_MENU_PASTE_SPECIAL\n"
-"menuitem.text"
-msgid "Paste ~Special"
-msgstr "Aseta teisiti"
-
-#: 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 "Värskenda registrit/sisukorda"
-
-#: 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 "Muuda registrit/sisukorda"
-
-#: 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 "Kustuta register/sisukord"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_FRM_CAPTION_ITEM\n"
-"FN_INSERT_CAPTION\n"
-"menuitem.text"
-msgid "Insert ~Caption..."
-msgstr "Lisa pealdis..."
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_TABLE.DUMMY\n"
-"FN_TABLE_INSERT_ROW_BEFORE\n"
-"menuitem.text"
-msgid "Rows Above"
-msgstr "Rida ülespoole"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_TABLE.DUMMY\n"
-"FN_TABLE_INSERT_ROW_AFTER\n"
-"menuitem.text"
-msgid "Rows Below"
-msgstr "Rida allapoole"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_TABLE.DUMMY\n"
-"FN_TABLE_INSERT_ROW_DLG\n"
-"menuitem.text"
-msgid "~Rows..."
-msgstr "Read..."
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_TABLE.DUMMY\n"
-"FN_TABLE_INSERT_COL_BEFORE\n"
-"menuitem.text"
-msgid "Columns Left"
-msgstr "Veerg vasakule"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_TABLE.DUMMY\n"
-"FN_TABLE_INSERT_COL_AFTER\n"
-"menuitem.text"
-msgid "Columns Right"
-msgstr "Veerg paremale"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_TABLE.DUMMY\n"
-"FN_TABLE_INSERT_COL_DLG\n"
-"menuitem.text"
-msgid "~Columns..."
-msgstr "Veerud..."
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_TABLE\n"
-"DUMMY\n"
-"menuitem.text"
-msgid "~Insert"
-msgstr "~Lisamine"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_TABLE.DUMMY+1\n"
-"FN_TABLE_DELETE_ROW\n"
-"menuitem.text"
-msgid "~Rows"
-msgstr "Rida"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_TABLE.DUMMY+1\n"
-"FN_TABLE_DELETE_COL\n"
-"menuitem.text"
-msgid "~Columns"
-msgstr "Veerg"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_TABLE.DUMMY+1\n"
-"FN_TABLE_DELETE_TABLE\n"
-"menuitem.text"
-msgid "~Table"
-msgstr "Tabel"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_TABLE\n"
-"DUMMY+1\n"
-"menuitem.text"
-msgid "~Delete"
-msgstr "Kustutamine"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_TABLE.DUMMY+2\n"
-"FN_TABLE_SELECT_ROW\n"
-"menuitem.text"
-msgid "~Rows"
-msgstr "Rida"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_TABLE.DUMMY+2\n"
-"FN_TABLE_SELECT_COL\n"
-"menuitem.text"
-msgid "~Columns"
-msgstr "Veerg"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_TABLE.DUMMY+2\n"
-"FN_TABLE_SELECT_ALL\n"
-"menuitem.text"
-msgid "~Table"
-msgstr "Tabel"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_TABLE.DUMMY+2\n"
-"FN_TABLE_SELECT_CELL\n"
-"menuitem.text"
-msgid "C~ell"
-msgstr "Lahter"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_TABLE\n"
-"DUMMY+2\n"
-"menuitem.text"
-msgid "~Select"
-msgstr "Valimine"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_TABLE\n"
-"FN_TABLE_MERGE_CELLS\n"
-"menuitem.text"
-msgid "~Merge"
-msgstr "Ühenda"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_TABLE.MN_FORMAT_ALGN\n"
-"SID_TABLE_VERT_NONE\n"
-"menuitem.text"
-msgid "~Top"
-msgstr "Üles"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_TABLE.MN_FORMAT_ALGN\n"
-"SID_TABLE_VERT_CENTER\n"
-"menuitem.text"
-msgid "C~enter"
-msgstr "Keskele"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_TABLE.MN_FORMAT_ALGN\n"
-"SID_TABLE_VERT_BOTTOM\n"
-"menuitem.text"
-msgid "~Bottom"
-msgstr "Alla"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_TABLE\n"
-"MN_FORMAT_ALGN\n"
-"menuitem.text"
-msgid "A~lignment"
-msgstr "Joondus"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_TABLE.DUMMY+4\n"
-"FN_TABLE_SET_COL_WIDTH\n"
-"menuitem.text"
-msgid "~Column Width..."
-msgstr "Veeru laius..."
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_TABLE.DUMMY+4\n"
-"FN_TABLE_ADJUST_CELLS\n"
-"menuitem.text"
-msgid "~Optimal Column Width"
-msgstr "Optimaalne veerulaius"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_TABLE.DUMMY+4\n"
-"FN_TABLE_BALANCE_CELLS\n"
-"menuitem.text"
-msgid "~Distribute Columns Equally"
-msgstr "Veergude võrdne laius"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_TABLE.DUMMY+4\n"
-"FN_TABLE_SET_ROW_HEIGHT\n"
-"menuitem.text"
-msgid "~Row Height..."
-msgstr "Rea kõrgus..."
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_TABLE.DUMMY+4\n"
-"FN_TABLE_OPTIMAL_HEIGHT\n"
-"menuitem.text"
-msgid "Optimal Row ~Height"
-msgstr "Optimaalne reakõrgus"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_TABLE.DUMMY+4\n"
-"FN_TABLE_BALANCE_ROWS\n"
-"menuitem.text"
-msgid "Distribute Rows ~Equally"
-msgstr "Ridade võrdne kõrgus"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_TABLE\n"
-"DUMMY+4\n"
-"menuitem.text"
-msgid "Si~ze"
-msgstr "Suurus"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_TABLE\n"
-"FN_NUM_FORMAT_TABLE_DLG\n"
-"menuitem.text"
-msgid "N~umber Format..."
-msgstr "Arvu vorming..."
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_TABLE\n"
-"FN_FORMAT_TABLE_DLG\n"
-"menuitem.text"
-msgid "~Table Properties..."
-msgstr "Tabeli omadused..."
-
-#: 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 "Nimi..."
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_TITLE_DESCRIPTION_SHAPE\n"
-"FN_TITLE_DESCRIPTION_SHAPE\n"
-"menuitem.text"
-msgid "Description..."
-msgstr "Kirjeldus..."
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_FRM\n"
-"FN_FORMAT_FRAME_DLG\n"
-"menuitem.text"
-msgid "~Frame..."
-msgstr "Paneel..."
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_ONE_STEP\n"
-"FN_FRAME_UP\n"
-"menuitem.text"
-msgid "Bring ~Forward"
-msgstr "Too ettepoole"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_ONE_STEP\n"
-"FN_FRAME_DOWN\n"
-"menuitem.text"
-msgid "Send Back~ward"
-msgstr "Vii tahapoole"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_DRAW5\n"
-"MN_SUB_ARRANGE\n"
-"menuitem.text"
-msgid "~Arrange"
-msgstr "Järjestus"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_DRAW6\n"
-"MN_SUB_ARRANGE\n"
-"menuitem.text"
-msgid "~Arrange"
-msgstr "Järjestus"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_ANNOTATIONS\n"
+"MN_ANNOTATION_BUTTON\n"
 "FN_REPLY\n"
 "menuitem.text"
 msgid "Reply"
 msgstr "Vasta"
 
 #: mn.src
+#, fuzzy
 msgctxt ""
 "mn.src\n"
-"MN_ANNOTATIONS\n"
+"MN_ANNOTATION_BUTTON\n"
 "FN_DELETE_COMMENT\n"
 "menuitem.text"
 msgid "Delete ~Comment"
 msgstr "Kustuta märkus"
 
 #: 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 "Kustuta kõik autori $1 märkused"
 
 #: 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 "Kustuta kõik märkused"
 
 #: 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 +1485,6 @@ msgstr "~Vorminda kõik märkused..."
 #: 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 "Tabel"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_WRAP_CONTOUR\n"
-"FN_FRAME_WRAP_CONTOUR\n"
-"menuitem.text"
-msgid "Enable ~Contour"
-msgstr "Kontuur lubatud"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_EDIT_CONTOUR\n"
-"SID_CONTOUR_DLG\n"
-"menuitem.text"
-msgid "~Edit Contour..."
-msgstr "Redigeeri kontuuri..."
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_MOUSE_FRAME_BEGIN.MN_WRAP\n"
-"FN_FRAME_NOWRAP\n"
-"menuitem.text"
-msgid "~No Wrap"
-msgstr "Mähkimine puudub"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_MOUSE_FRAME_BEGIN.MN_WRAP\n"
-"FN_FRAME_WRAP\n"
-"menuitem.text"
-msgid "~Page Wrap"
-msgstr "Lehekülje mähkimine"
-
-#: 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 "Optimaalne lehekülje mähkimine"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_MOUSE_FRAME_BEGIN.MN_WRAP\n"
-"FN_FRAME_WRAP_LEFT\n"
-"menuitem.text"
-msgid "Wrap ~Before"
-msgstr "Mähkimine enne"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_MOUSE_FRAME_BEGIN.MN_WRAP\n"
-"FN_FRAME_WRAP_RIGHT\n"
-"menuitem.text"
-msgid "Wrap ~After"
-msgstr "Mähkimine pärast"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_MOUSE_FRAME_BEGIN.MN_WRAP\n"
-"FN_FRAME_WRAPTHRU\n"
-"menuitem.text"
-msgid "~Wrap Through"
-msgstr "Läbi objekti"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_MOUSE_FRAME_BEGIN.MN_WRAP\n"
-"FN_FRAME_WRAPTHRU_TRANSP\n"
-"menuitem.text"
-msgid "In ~Background"
-msgstr "Taustal"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_MOUSE_FRAME_BEGIN.MN_WRAP\n"
-"FN_WRAP_ANCHOR_ONLY\n"
-"menuitem.text"
-msgid "~First Paragraph"
-msgstr "Esimene lõik"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_MOUSE_FRAME_BEGIN\n"
-"MN_WRAP\n"
-"menuitem.text"
-msgid "~Wrap"
-msgstr "Mähkimine"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_DRAW_POPUPMENU\n"
-"string.text"
-msgid "Graphic"
-msgstr "Pilt"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_WRAP_DRAW.MN_WRAP\n"
-"FN_FRAME_NOWRAP\n"
-"menuitem.text"
-msgid "~No Wrap"
-msgstr "Mähkimine puudub"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_WRAP_DRAW.MN_WRAP\n"
-"FN_FRAME_WRAP\n"
-"menuitem.text"
-msgid "~Page Wrap"
-msgstr "Lehekülje mähkimine"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_WRAP_DRAW.MN_WRAP\n"
-"FN_FRAME_WRAP_IDEAL\n"
-"menuitem.text"
-msgid "~Optimal Page Wrap"
-msgstr "Optimaalne lehekülje mähkimine"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_WRAP_DRAW.MN_WRAP\n"
-"FN_FRAME_WRAPTHRU\n"
-"menuitem.text"
-msgid "~Wrap Through"
-msgstr "Läbi objekti"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_WRAP_DRAW.MN_WRAP\n"
-"FN_FRAME_WRAPTHRU_TRANSP\n"
-"menuitem.text"
-msgid "In ~Background"
-msgstr "Taustal"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_WRAP_DRAW.MN_WRAP\n"
-"FN_WRAP_ANCHOR_ONLY\n"
-"menuitem.text"
-msgid "~First Paragraph"
-msgstr "Esimene lõik"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_WRAP_DRAW.MN_WRAP\n"
-"FN_DRAW_WRAP_DLG\n"
-"menuitem.text"
-msgid "~Edit..."
-msgstr "Redigeeri..."
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_WRAP_DRAW\n"
-"MN_WRAP\n"
-"menuitem.text"
-msgid "~Wrap"
-msgstr "Mähkimine"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_AT_FRAME\n"
-"FN_TOOL_ANCHOR_FRAME\n"
-"menuitem.text"
-msgid "To ~Frame"
-msgstr "Paneelile"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_ANCHOR.FN_TOOL_ANCHOR\n"
-"FN_TOOL_ANCHOR_PAGE\n"
-"menuitem.text"
-msgid "To P~age"
-msgstr "Leheküljele"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_ANCHOR.FN_TOOL_ANCHOR\n"
-"FN_TOOL_ANCHOR_PARAGRAPH\n"
-"menuitem.text"
-msgid "To ~Paragraph"
-msgstr "Lõigule"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_ANCHOR.FN_TOOL_ANCHOR\n"
-"FN_TOOL_ANCHOR_AT_CHAR\n"
-"menuitem.text"
-msgid "To ~Character"
-msgstr "Märgile"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_ANCHOR.FN_TOOL_ANCHOR\n"
-"FN_TOOL_ANCHOR_CHAR\n"
-"menuitem.text"
-msgid "As C~haracter"
-msgstr "Märgina"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_ANCHOR\n"
-"FN_TOOL_ANCHOR\n"
-"menuitem.text"
-msgid "An~chor"
-msgstr "Ankurdamine"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_DRAW_POPUPMENU\n"
-"FN_ADD_TEXT_BOX\n"
-"menuitem.text"
-msgid "Add Text Box"
-msgstr "Lisa tekstikast"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_DRAW_POPUPMENU\n"
-"FN_REMOVE_TEXT_BOX\n"
-"menuitem.text"
-msgid "Remove Text Box"
-msgstr "Eemalda tekstikast"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_DRAWFORM_POPUPMENU\n"
-"string.text"
-msgid "Control"
-msgstr "Juhtelement"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_DRWTXT_POPUPMENU\n"
-"string.text"
-msgid "Draw Object text"
-msgstr "Joonistusobjekti tekst"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_GRF_POPUPMENU\n"
-"string.text"
-msgid "Graphic"
-msgstr "Pilt"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_ARRANGE_FRAME\n"
-"MN_SUB_ALIGN\n"
-"menuitem.text"
-msgid "~Arrange"
-msgstr "Järjestus"
-
-#: 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 "Vasakule"
-
-#: 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 "Keskele"
-
-#: 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 "Paremale"
-
-#: 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 "Baaspunkt üleval"
-
-#: 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 "Baaspunkt keskel"
-
-#: 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 "Baaspunkt all"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_ALIGNMENT_FRAME\n"
-"MN_FORMAT_FRM_HORZ\n"
-"menuitem.text"
-msgid "A~lignment"
-msgstr "Joondus"
-
-#: 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 "90° vastupäeva"
-
-#: 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 "90° päripäeva"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_ROTATE_IMAGE\n"
-"SID_MENU_MANAGE_GRAPHIC\n"
-"menuitem.text"
-msgid "~Rotate"
-msgstr "Pööramine"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_GRF_POPUPMENU\n"
-"FN_FORMAT_GRAFIC_DLG\n"
-"menuitem.text"
-msgid "Format ~Image..."
-msgstr "Vorminda pilt..."
-
-#: 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 "Paneel"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_PPREVIEW_POPUPMENU\n"
-"string.text"
-msgid "Draw Object text"
-msgstr "Joonistusobjekti tekst"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_PPREVIEW_POPUPMENU\n"
-"FN_PAGEUP\n"
-"menuitem.text"
-msgid "Previous Page"
-msgstr "Eelmine lehekülg"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_PPREVIEW_POPUPMENU\n"
-"FN_PAGEDOWN\n"
-"menuitem.text"
-msgid "Next Page"
-msgstr "Järgmine lehekülg"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_PPREVIEW_POPUPMENU\n"
-"FN_PRINT_PAGEPREVIEW\n"
-"menuitem.text"
-msgid "Print"
-msgstr "Prindi"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_PPREVIEW_POPUPMENU\n"
-"SID_PRINTPREVIEW\n"
-"menuitem.text"
-msgid "Close Preview"
-msgstr "Sulge eelvaade"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_MEDIA_POPUPMENU\n"
-"string.text"
-msgid "Media object"
-msgstr "Meediaobjekt"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
 "MN_HEADERFOOTER_BUTTON\n"
 "FN_HEADERFOOTER_BORDERBACK\n"
 "menuitem.text"
diff --git a/source/et/sw/source/ui/config.po b/source/et/sw/source/ui/config.po
index f86f7248e4e..3a5ff1e860a 100644
--- a/source/et/sw/source/ui/config.po
+++ b/source/et/sw/source/ui/config.po
@@ -3,18 +3,18 @@ msgid ""
 msgstr ""
 "Project-Id-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-30 13:08+0200\n"
-"PO-Revision-Date: 2014-06-06 00:16+0300\n"
-"Last-Translator: Mihkel Tõnnov <mihhkel@gmail.com>\n"
+"POT-Creation-Date: 2016-03-09 20:49+0100\n"
+"PO-Revision-Date: 2015-12-15 21:06+0000\n"
+"Last-Translator: system user <>\n"
 "Language-Team: Estonian <none>\n"
 "Language: et\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: 1374902588.0\n"
+"X-POOTLE-MTIME: 1450213586.000000\n"
 
 #: optdlg.src
 msgctxt ""
@@ -41,281 +41,281 @@ msgid "Western"
 msgstr "Lääne"
 
 #: 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 %s"
 
 #: optdlg.src
+#, fuzzy
 msgctxt ""
 "optdlg.src\n"
-"STR_PRINTOPTUI\n"
-"Contents\n"
-"itemlist.text"
+"STR_PRINTOPTUI_CONTENTS\n"
+"string.text"
 msgid "Contents"
 msgstr "Sisu"
 
 #: optdlg.src
+#, fuzzy
 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 "Lehe ~taust"
 
 #: optdlg.src
+#, fuzzy
 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 "~Pildid ja teised graafikaobjektid"
 
 #: 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 "Peidetud tekst"
 
 #: 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 "Teksti kohahoidjad"
 
 #: 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 "Vormide ~juhtelemendid"
 
 #: optdlg.src
+#, fuzzy
 msgctxt ""
 "optdlg.src\n"
-"STR_PRINTOPTUI\n"
-"Color\n"
-"itemlist.text"
+"STR_PRINTOPTUI_COLOR\n"
+"string.text"
 msgid "Color"
 msgstr "Värv"
 
 #: 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 "Tekst musta tindiga"
 
 #: optdlg.src
+#, fuzzy
 msgctxt ""
 "optdlg.src\n"
-"STR_PRINTOPTUI\n"
-"Pages\n"
-"itemlist.text"
+"STR_PRINTOPTUI_PAGES_TEXT\n"
+"string.text"
 msgid "Pages"
 msgstr "Leheküljed"
 
 #: 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 "Prinditakse automaatselt lisatud tühjad leheküljed"
 
 #: optdlg.src
+#, fuzzy
 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 "Kasutatakse ainult printeri sätetes määratud paberisalve"
 
 #: optdlg.src
+#, fuzzy
 msgctxt ""
 "optdlg.src\n"
-"STR_PRINTOPTUI\n"
-"Print\n"
-"itemlist.text"
+"STR_PRINTOPTUI_PRINT\n"
+"string.text"
 msgid "Print"
 msgstr "Printimine"
 
 #: optdlg.src
+#, fuzzy
 msgctxt ""
 "optdlg.src\n"
-"STR_PRINTOPTUI\n"
-"None (document only)\n"
-"itemlist.text"
+"STR_PRINTOPTUI_NONE\n"
+"string.text"
 msgid "None (document only)"
 msgstr "Puuduvad (ainult dokument)"
 
 #: optdlg.src
+#, fuzzy
 msgctxt ""
 "optdlg.src\n"
-"STR_PRINTOPTUI\n"
-"Comments only\n"
-"itemlist.text"
+"STR_PRINTOPTUI_COMMENTS_ONLY\n"
+"string.text"
 msgid "Comments only"
 msgstr "Ainult märkused"
 
 #: optdlg.src
+#, fuzzy
 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 "Dokumendi lõpus"
 
 #: optdlg.src
+#, fuzzy
 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 "Lehekülje lõpus"
 
 #: optdlg.src
+#, fuzzy
 msgctxt ""
 "optdlg.src\n"
-"STR_PRINTOPTUI\n"
-"~Comments\n"
-"itemlist.text"
+"STR_PRINTOPTUI_COMMENTS\n"
+"string.text"
 msgid "~Comments"
 msgstr "Märkused"
 
 #: optdlg.src
+#, fuzzy
 msgctxt ""
 "optdlg.src\n"
-"STR_PRINTOPTUI\n"
-"Page sides\n"
-"itemlist.text"
+"STR_PRINTOPTUI_PAGE_SIDES\n"
+"string.text"
 msgid "Page sides"
 msgstr "Leheküljed"
 
 #: optdlg.src
+#, fuzzy
 msgctxt ""
 "optdlg.src\n"
-"STR_PRINTOPTUI\n"
-"All pages\n"
-"itemlist.text"
+"STR_PRINTOPTUI_ALL_PAGES\n"
+"string.text"
 msgid "All pages"
 msgstr "Kõik leheküljed"
 
 #: optdlg.src
+#, fuzzy
 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 "Tagaküljed / vasakpoolsed"
 
 #: optdlg.src
+#, fuzzy
 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 "Esiküljed / parempoolsed"
 
 #: optdlg.src
+#, fuzzy
 msgctxt ""
 "optdlg.src\n"
-"STR_PRINTOPTUI\n"
-"Include\n"
-"itemlist.text"
+"STR_PRINTOPTUI_INCLUDE\n"
+"string.text"
 msgid "Include"
 msgstr "Prinditakse"
 
 #: 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 "Broš~üürina"
 
 #: optdlg.src
+#, fuzzy
 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 "Vasakult paremale kiri"
 
 #: optdlg.src
+#, fuzzy
 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 "Paremalt vasakule kiri"
 
 #: optdlg.src
+#, fuzzy
 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 "Vahemikud ja koopiad"
 
 #: optdlg.src
+#, fuzzy
 msgctxt ""
 "optdlg.src\n"
-"STR_PRINTOPTUI\n"
-"~All pages\n"
-"itemlist.text"
+"STR_PRINTOPTUI_ALLPAGES\n"
+"string.text"
 msgid "~All pages"
 msgstr "Kõik leheküljed"
 
 #: 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 "Leheküljed"
 
 #: optdlg.src
+#, fuzzy
 msgctxt ""
 "optdlg.src\n"
-"STR_PRINTOPTUI\n"
-"~Selection\n"
-"itemlist.text"
+"STR_PRINTOPTUI_SELECTION\n"
+"string.text"
 msgid "~Selection"
 msgstr "Valik"
 
 #: optdlg.src
+#, fuzzy
 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 "Veeristel"
 
diff --git a/source/et/sw/source/ui/dbui.po b/source/et/sw/source/ui/dbui.po
index 14a728844cd..dff27ed35b7 100644
--- a/source/et/sw/source/ui/dbui.po
+++ b/source/et/sw/source/ui/dbui.po
@@ -3,18 +3,18 @@ msgid ""
 msgstr ""
 "Project-Id-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: 2015-01-11 20:58+0000\n"
-"Last-Translator: Mihkel Tõnnov <mihhkel@gmail.com>\n"
+"POT-Creation-Date: 2016-04-16 21:40+0200\n"
+"PO-Revision-Date: 2015-12-15 21:07+0000\n"
+"Last-Translator: system user <>\n"
 "Language-Team: Estonian <none>\n"
 "Language: et\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: 1421009895.000000\n"
+"X-POOTLE-MTIME: 1450213640.000000\n"
 
 #: dbui.src
 msgctxt ""
@@ -215,19 +215,21 @@ msgid "Text Comma Separated (*.csv)"
 msgstr "Komadega eraldatud tekst (*.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
@@ -309,9 +311,10 @@ msgid "Select starting document"
 msgstr "Vali lähtedokument"
 
 #: mailmergewizard.src
+#, fuzzy
 msgctxt ""
 "mailmergewizard.src\n"
-"ST_DOCUMETNTYPE\n"
+"ST_DOCUMENTTYPE\n"
 "string.text"
 msgid "Select document type"
 msgstr "Vali dokumendi tüüp"
@@ -351,26 +354,10 @@ msgstr "Kohenda paigutust"
 #: mailmergewizard.src
 msgctxt ""
 "mailmergewizard.src\n"
-"ST_PREPAREMERGE\n"
+"ST_EXCLUDE\n"
 "string.text"
-msgid "Edit document"
-msgstr "Redigeeri dokumenti"
-
-#: mailmergewizard.src
-msgctxt ""
-"mailmergewizard.src\n"
-"ST_MERGE\n"
-"string.text"
-msgid "Personalize document"
-msgstr "Personaliseeri dokument"
-
-#: mailmergewizard.src
-msgctxt ""
-"mailmergewizard.src\n"
-"ST_OUTPUT\n"
-"string.text"
-msgid "Save, print or send"
-msgstr "Salvesta, prindi või saada"
+msgid "Exclude recipient"
+msgstr ""
 
 #: mailmergewizard.src
 msgctxt ""
diff --git a/source/et/sw/source/ui/ribbar.po b/source/et/sw/source/ui/ribbar.po
deleted file mode 100644
index 3526e29b2d5..00000000000
--- a/source/et/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: 2012-06-14 02:14+0200\n"
-"Last-Translator: Mihkel Tõnnov <mihhkel@gmail.com>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: et\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 "Leheküljele"
-
-#: tbxanchr.src
-msgctxt ""
-"tbxanchr.src\n"
-"MN_ANCHOR_POPUP\n"
-"FN_TOOL_ANCHOR_PARAGRAPH\n"
-"menuitem.text"
-msgid "To Paragraph"
-msgstr "Lõigule"
-
-#: tbxanchr.src
-msgctxt ""
-"tbxanchr.src\n"
-"MN_ANCHOR_POPUP\n"
-"FN_TOOL_ANCHOR_AT_CHAR\n"
-"menuitem.text"
-msgid "To Character"
-msgstr "Märgile"
-
-#: tbxanchr.src
-msgctxt ""
-"tbxanchr.src\n"
-"MN_ANCHOR_POPUP\n"
-"FN_TOOL_ANCHOR_CHAR\n"
-"menuitem.text"
-msgid "As Character"
-msgstr "Märgina"
-
-#: tbxanchr.src
-msgctxt ""
-"tbxanchr.src\n"
-"MN_ANCHOR_POPUP\n"
-"FN_TOOL_ANCHOR_FRAME\n"
-"menuitem.text"
-msgid "To Frame"
-msgstr "Paneelile"
diff --git a/source/et/sw/source/ui/utlui.po b/source/et/sw/source/ui/utlui.po
index 7577e7a480d..5025fd828c2 100644
--- a/source/et/sw/source/ui/utlui.po
+++ b/source/et/sw/source/ui/utlui.po
@@ -3,18 +3,18 @@ msgid ""
 msgstr ""
 "Project-Id-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: 2015-01-11 20:58+0000\n"
-"Last-Translator: Mihkel Tõnnov <mihhkel@gmail.com>\n"
+"POT-Creation-Date: 2016-04-16 21:40+0200\n"
+"PO-Revision-Date: 2015-12-15 21:07+0000\n"
+"Last-Translator: system user <>\n"
 "Language-Team: Estonian <none>\n"
 "Language: et\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: 1421009894.000000\n"
+"X-POOTLE-MTIME: 1450213620.000000\n"
 
 #: poolfmt.src
 msgctxt ""
@@ -1848,11 +1848,12 @@ msgid "Indexes"
 msgstr "Registrid"
 
 #: utlui.src
+#, fuzzy
 msgctxt ""
 "utlui.src\n"
 "STR_CONTENT_TYPE_DRAWOBJECT\n"
 "string.text"
-msgid "Draw objects"
+msgid "Drawing objects"
 msgstr "Joonistusobjektid"
 
 #: utlui.src
diff --git a/source/et/sw/source/uibase/inc.po b/source/et/sw/source/uibase/inc.po
deleted file mode 100644
index 080aceeb6c4..00000000000
--- a/source/et/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: 2015-01-11 20:58+0000\n"
-"Last-Translator: Mihkel Tõnnov <mihhkel@gmail.com>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: et\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: 1421009884.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 "Nõustu muudatusega"
-
-#: redline_tmpl.hrc
-msgctxt ""
-"redline_tmpl.hrc\n"
-"MN_EDIT_REDLINE\n"
-"FN_REDLINE_REJECT_DIRECT\n"
-"menuitem.text"
-msgid "Reject Change"
-msgstr "Hülga muudatus"
-
-#: redline_tmpl.hrc
-msgctxt ""
-"redline_tmpl.hrc\n"
-"MN_EDIT_REDLINE\n"
-"FN_REDLINE_NEXT_CHANGE\n"
-"menuitem.text"
-msgid "Next Change"
-msgstr "Järgmine muudatus"
-
-#: redline_tmpl.hrc
-msgctxt ""
-"redline_tmpl.hrc\n"
-"MN_EDIT_REDLINE\n"
-"FN_REDLINE_PREV_CHANGE\n"
-"menuitem.text"
-msgid "Previous Change"
-msgstr "Eelmine muudatus"
diff --git a/source/et/sw/source/uibase/lingu.po b/source/et/sw/source/uibase/lingu.po
index 95f64a70b68..162519047eb 100644
--- a/source/et/sw/source/uibase/lingu.po
+++ b/source/et/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: 2015-07-31 13:48+0000\n"
+"POT-Creation-Date: 2016-03-09 20:49+0100\n"
+"PO-Revision-Date: 2015-12-15 21:07+0000\n"
 "Last-Translator: system user <>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: et\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: 1438350527.000000\n"
+"X-POOTLE-MTIME: 1450213655.000000\n"
 
 #: olmenu.src
 msgctxt ""
@@ -73,6 +73,42 @@ msgstr "Lõigu keele määramine"
 #: 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/et/sw/source/uibase/ribbar.po b/source/et/sw/source/uibase/ribbar.po
index 127e47dedbc..db6b38395b8 100644
--- a/source/et/sw/source/uibase/ribbar.po
+++ b/source/et/sw/source/uibase/ribbar.po
@@ -3,27 +3,28 @@ 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: 2015-01-11 20:58+0000\n"
-"Last-Translator: Mihkel Tõnnov <mihhkel@gmail.com>\n"
+"POT-Creation-Date: 2016-03-09 20:49+0100\n"
+"PO-Revision-Date: 2015-12-15 21:07+0000\n"
+"Last-Translator: system user <>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: et\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: 1421009891.000000\n"
+"X-POOTLE-MTIME: 1450213654.000000\n"
 
 #: inputwin.src
+#, fuzzy
 msgctxt ""
 "inputwin.src\n"
 "RID_TBX_FORMULA\n"
 "FN_FORMULA_CALC\n"
 "toolboxitem.text"
-msgid "Formula"
-msgstr "Valem"
+msgid "Functions"
+msgstr "Funktsioonid"
 
 #: inputwin.src
 msgctxt ""
@@ -330,78 +331,6 @@ msgstr "Valemi tekst"
 #: workctrl.src
 msgctxt ""
 "workctrl.src\n"
-"RID_INSERT_FIELD_CTRL\n"
-"FN_INSERT_FLD_PGNUMBER\n"
-"menuitem.text"
-msgid "Page Number"
-msgstr "Leheküljenumber"
-
-#: workctrl.src
-msgctxt ""
-"workctrl.src\n"
-"RID_INSERT_FIELD_CTRL\n"
-"FN_INSERT_FLD_PGCOUNT\n"
-"menuitem.text"
-msgid "Page Count"
-msgstr "Lehekülgede arv"
-
-#: workctrl.src
-msgctxt ""
-"workctrl.src\n"
-"RID_INSERT_FIELD_CTRL\n"
-"FN_INSERT_FLD_DATE\n"
-"menuitem.text"
-msgid "Date"
-msgstr "Kuupäev"
-
-#: workctrl.src
-msgctxt ""
-"workctrl.src\n"
-"RID_INSERT_FIELD_CTRL\n"
-"FN_INSERT_FLD_TIME\n"
-"menuitem.text"
-msgid "Time"
-msgstr "Kellaaeg"
-
-#: workctrl.src
-msgctxt ""
-"workctrl.src\n"
-"RID_INSERT_FIELD_CTRL\n"
-"FN_INSERT_FLD_TITLE\n"
-"menuitem.text"
-msgid "Title"
-msgstr "Tiitel"
-
-#: workctrl.src
-msgctxt ""
-"workctrl.src\n"
-"RID_INSERT_FIELD_CTRL\n"
-"FN_INSERT_FLD_AUTHOR\n"
-"menuitem.text"
-msgid "Author"
-msgstr "Autor"
-
-#: workctrl.src
-msgctxt ""
-"workctrl.src\n"
-"RID_INSERT_FIELD_CTRL\n"
-"FN_INSERT_FLD_TOPIC\n"
-"menuitem.text"
-msgid "Subject"
-msgstr "Teema"
-
-#: workctrl.src
-msgctxt ""
-"workctrl.src\n"
-"RID_INSERT_FIELD_CTRL\n"
-"FN_INSERT_FIELD\n"
-"menuitem.text"
-msgid "More Fields..."
-msgstr "Muud väljad..."
-
-#: workctrl.src
-msgctxt ""
-"workctrl.src\n"
 "ST_TBL\n"
 "string.text"
 msgid "Table"
diff --git a/source/et/sw/source/uibase/smartmenu.po b/source/et/sw/source/uibase/smartmenu.po
deleted file mode 100644
index d97fdcec7f6..00000000000
--- a/source/et/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: 2015-01-11 20:58+0000\n"
-"Last-Translator: Mihkel Tõnnov <mihhkel@gmail.com>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: et\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: 1421009892.000000\n"
-
-#: stmenu.src
-msgctxt ""
-"stmenu.src\n"
-"MN_SMARTTAG_POPUP\n"
-"MN_SMARTTAG_OPTIONS\n"
-"menuitem.text"
-msgid "Smart Tag Options..."
-msgstr "Nutikate siltide sätted..."
diff --git a/source/et/sw/source/uibase/uiview.po b/source/et/sw/source/uibase/uiview.po
index b33a092213b..8949bc43fa8 100644
--- a/source/et/sw/source/uibase/uiview.po
+++ b/source/et/sw/source/uibase/uiview.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: 2015-01-11 20:58+0000\n"
-"Last-Translator: Mihkel Tõnnov <mihhkel@gmail.com>\n"
+"POT-Creation-Date: 2016-03-09 20:49+0100\n"
+"PO-Revision-Date: 2015-12-15 21:07+0000\n"
+"Last-Translator: system user <>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: et\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: 1421009884.000000\n"
+"X-POOTLE-MTIME: 1450213654.000000\n"
 
 #: view.src
 msgctxt ""
@@ -179,24 +179,7 @@ msgstr "~Ekspordi lähtetekst..."
 #: view.src
 msgctxt ""
 "view.src\n"
-"MN_SRCVIEW_POPUPMENU\n"
-"string.text"
-msgid "HTML source"
-msgstr "HTML-lähtetekst"
-
-#: view.src
-msgctxt ""
-"view.src\n"
 "RID_PVIEW_TOOLBOX\n"
 "string.text"
 msgid "Print Preview"
 msgstr "Printimise eelvaade"
-
-#: view.src
-msgctxt ""
-"view.src\n"
-"MN_SRCVIEW_POPUPMENU\n"
-"SID_SOURCEVIEW\n"
-"menuitem.text"
-msgid "HTML Source"
-msgstr "HTML-lähtetekst"
diff --git a/source/et/sw/source/uibase/utlui.po b/source/et/sw/source/uibase/utlui.po
index 0f6bd50926d..bef264d35b1 100644
--- a/source/et/sw/source/uibase/utlui.po
+++ b/source/et/sw/source/uibase/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-11-10 19:33+0100\n"
+"POT-Creation-Date: 2016-04-16 21:40+0200\n"
 "PO-Revision-Date: 2015-12-15 21:07+0000\n"
 "Last-Translator: system user <>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1460,78 +1460,77 @@ msgstr "ISBN"
 #: navipi.src
 msgctxt ""
 "navipi.src\n"
-"DLG_NAVIGATION_PI\n"
-"window.text"
-msgid "Navigator"
-msgstr "Navigaator"
-
-#: navipi.src
-msgctxt ""
-"navipi.src\n"
-"TB_CONTENT\n"
+"DLG_NAVIGATION_PI.TB_CONTENT\n"
 "FN_GLOBAL_SWITCH\n"
 "toolboxitem.text"
-msgid "Toggle"
-msgstr "Lülita"
+msgid "Toggle Master View"
+msgstr ""
 
 #: 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 "Liikumine"
 
 #: navipi.src
+#, fuzzy
 msgctxt ""
 "navipi.src\n"
-"TB_CONTENT\n"
+"DLG_NAVIGATION_PI.TB_CONTENT\n"
 "FN_UP\n"
 "toolboxitem.text"
 msgid "Back"
 msgstr "Tagasi"
 
 #: navipi.src
+#, fuzzy
 msgctxt ""
 "navipi.src\n"
-"TB_CONTENT\n"
+"DLG_NAVIGATION_PI.TB_CONTENT\n"
 "FN_DOWN\n"
 "toolboxitem.text"
 msgid "Forward"
 msgstr "Edasi"
 
 #: 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 "Lohistusrežiim"
 
 #: 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 "Tõsta peatükki"
 
 #: 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 "Langeta peatükki"
 
 #: 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"
@@ -1540,70 +1539,77 @@ msgstr "Loendikast sees/väljas"
 #: navipi.src
 msgctxt ""
 "navipi.src\n"
-"TB_CONTENT\n"
+"DLG_NAVIGATION_PI.TB_CONTENT\n"
 "FN_SHOW_ROOT\n"
 "toolboxitem.text"
-msgid "Content View"
-msgstr "Sisuvaade"
+msgid "Content Navigation View"
+msgstr ""
 
 #: 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 "Säti meeldetuletus"
 
 #: 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 "Päis"
 
 #: 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 "Jalus"
 
 #: 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 "Ankur<->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 "Kuvatavaid pealkirjatasemeid"
 
 #: 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 "Liigenda taseme võrra vasakule"
 
 #: 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"
@@ -1612,61 +1618,67 @@ msgstr "Liigenda taseme võrra paremale"
 #: navipi.src
 msgctxt ""
 "navipi.src\n"
-"TB_GLOBAL\n"
+"DLG_NAVIGATION_PI.TB_GLOBAL\n"
 "FN_GLOBAL_SWITCH\n"
 "toolboxitem.text"
-msgid "Toggle"
-msgstr "Lülita"
+msgid "Toggle Master View"
+msgstr ""
 
 #: 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 "Redigeerimine"
 
 #: 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 "Uuendamine"
 
 #: 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 "Lisamine"
 
 #: 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 "Salvestakse ka sisu"
 
 #: 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 "Nihuta üles"
 
 #: 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 +1687,14 @@ msgstr "Nihuta alla"
 #: navipi.src
 msgctxt ""
 "navipi.src\n"
+"DLG_NAVIGATION_PI\n"
+"window.text"
+msgid "Navigator"
+msgstr "Navigaator"
+
+#: navipi.src
+msgctxt ""
+"navipi.src\n"
 "STR_ACCESS_TL_GLOBAL\n"
 "string.text"
 msgid "Global View"
@@ -1685,8 +1705,8 @@ msgctxt ""
 "navipi.src\n"
 "STR_ACCESS_TL_CONTENT\n"
 "string.text"
-msgid "Content View"
-msgstr "Sisuvaade"
+msgid "Content Navigation View"
+msgstr ""
 
 #: navipi.src
 msgctxt ""
diff --git a/source/et/sw/uiconfig/swriter/ui.po b/source/et/sw/uiconfig/swriter/ui.po
index 00ba9eae3b5..02cd6818647 100644
--- a/source/et/sw/uiconfig/swriter/ui.po
+++ b/source/et/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-25 21:29+0000\n"
-"Last-Translator: Mihkel Tõnnov <mihhkel@gmail.com>\n"
+"POT-Creation-Date: 2016-04-16 21:40+0200\n"
+"PO-Revision-Date: 2015-12-15 21:08+0000\n"
+"Last-Translator: system user <>\n"
 "Language-Team: Estonian <none>\n"
 "Language: et\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: 1445808587.000000\n"
+"X-POOTLE-MTIME: 1450213709.000000\n"
 
 #: abstractdialog.ui
 msgctxt ""
@@ -4170,22 +4170,32 @@ msgid "Insert _reference to"
 msgstr "Viite sisu"
 
 #: fldrefpage.ui
+#, fuzzy
 msgctxt ""
 "fldrefpage.ui\n"
-"label2\n"
+"label4\n"
 "label\n"
 "string.text"
-msgid "S_election"
-msgstr "Valik"
+msgid "Selection"
+msgstr "Valikule"
 
 #: 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 "Ni_mi"
+msgid "S_election"
+msgstr "Valik"
 
 #: fldrefpage.ui
 msgctxt ""
@@ -4199,6 +4209,15 @@ msgstr "Väärtus"
 #: fldrefpage.ui
 msgctxt ""
 "fldrefpage.ui\n"
+"nameft\n"
+"label\n"
+"string.text"
+msgid "Na_me"
+msgstr "Ni_mi"
+
+#: fldrefpage.ui
+msgctxt ""
+"fldrefpage.ui\n"
 "liststore1\n"
 "0\n"
 "stringlist.text"
@@ -4412,24 +4431,6 @@ msgctxt ""
 msgid "Date Time Author"
 msgstr "Kuupäev kellaaeg autor"
 
-#: floatingmmchild.ui
-msgctxt ""
-"floatingmmchild.ui\n"
-"FloatingMMChild\n"
-"title\n"
-"string.text"
-msgid "Mail Merge Wizard"
-msgstr "Kirjakooste nõustaja"
-
-#: floatingmmchild.ui
-msgctxt ""
-"floatingmmchild.ui\n"
-"return\n"
-"label\n"
-"string.text"
-msgid "Return to Mail Merge Wizard"
-msgstr "Tagasi kirjakooste nõustajasse"
-
 #: floatingnavigation.ui
 msgctxt ""
 "floatingnavigation.ui\n"
@@ -6033,13 +6034,34 @@ msgid "Autotexts for Shortcut "
 msgstr "Kiirklahvi automaattekstid "
 
 #: insertbookmark.ui
+#, fuzzy
 msgctxt ""
 "insertbookmark.ui\n"
 "InsertBookmarkDialog\n"
 "title\n"
 "string.text"
-msgid "Insert Bookmark"
-msgstr "Järjehoidja lisamine"
+msgid "Bookmark"
+msgstr "Järjehoidjad"
+
+#: insertbookmark.ui
+#, fuzzy
+msgctxt ""
+"insertbookmark.ui\n"
+"insert\n"
+"label\n"
+"string.text"
+msgid "Insert"
+msgstr "Lisa"
+
+#: insertbookmark.ui
+#, fuzzy
+msgctxt ""
+"insertbookmark.ui\n"
+"rename\n"
+"label\n"
+"string.text"
+msgid "Rename"
+msgstr "Muuda nime"
 
 #: insertbookmark.ui
 msgctxt ""
@@ -6050,6 +6072,15 @@ msgctxt ""
 msgid "Delete"
 msgstr "Kustuta"
 
+#: insertbookmark.ui
+msgctxt ""
+"insertbookmark.ui\n"
+"goto\n"
+"label\n"
+"string.text"
+msgid "Go to"
+msgstr ""
+
 #: insertbreak.ui
 msgctxt ""
 "insertbreak.ui\n"
@@ -7223,28 +7254,29 @@ msgstr "Kasutatakse turvalist ühendust (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 "Serveri nimi:"
 
 #: mailconfigpage.ui
 msgctxt ""
 "mailconfigpage.ui\n"
-"server_label\n"
+"port_label\n"
 "label\n"
 "string.text"
-msgid "_Server name:"
-msgstr "Serveri nimi:"
+msgid "_Port:"
+msgstr "Port:"
 
 #: mailconfigpage.ui
+#, fuzzy
 msgctxt ""
 "mailconfigpage.ui\n"
 "serverauthentication\n"
 "label\n"
 "string.text"
-msgid "Server Au_thentication"
+msgid "Ser_ver Authentication…"
 msgstr "Serveris autentimine"
 
 #: mailconfigpage.ui
@@ -7262,8 +7294,8 @@ msgctxt ""
 "test\n"
 "label\n"
 "string.text"
-msgid "Test S_ettings..."
-msgstr "Testi sätteid..."
+msgid "_Test Settings"
+msgstr ""
 
 #: mailmerge.ui
 msgctxt ""
@@ -8066,533 +8098,411 @@ msgctxt ""
 msgid "Insert personalized salutation"
 msgstr "Isikustatud tervituse lisamine"
 
-#: 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 "Dokumente saab kohandada vastavalt vajadusele. Klõps nupul '%1' vähendab nõustaja akna ja laseb dokumenti redigeerida. Pärast redigeerimise lõppu saab nõustaja juurde tagasi pöörduda klõpsates vähendatud akna nupul 'Tagasi kirjakooste nõustajasse'."
-
-#: mmmergepage.ui
-msgctxt ""
-"mmmergepage.ui\n"
-"edit\n"
-"label\n"
-"string.text"
-msgid "_Edit individual document..."
-msgstr "Redigeeri üksikut dokumenti..."
-
-#: mmmergepage.ui
-msgctxt ""
-"mmmergepage.ui\n"
-"label1\n"
-"label\n"
-"string.text"
-msgid "Personalize the Mail Merge Documents"
-msgstr "Kirjakooste dokumentide kohandamine"
-
-#: mmmergepage.ui
+#: mmoutputtypepage.ui
 msgctxt ""
-"mmmergepage.ui\n"
-"find\n"
+"mmoutputtypepage.ui\n"
+"letterft\n"
 "label\n"
 "string.text"
-msgid "_Find..."
-msgstr "Otsi..."
+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 "Kirjad saadetakse saajate rühmale. Kirjad võivad sisaldada aadressikasti ja tervitust. Kirju saab iga saaja jaoks kohandada."
 
-#: mmmergepage.ui
+#: mmoutputtypepage.ui
 msgctxt ""
-"mmmergepage.ui\n"
-"label4\n"
+"mmoutputtypepage.ui\n"
+"emailft\n"
 "label\n"
 "string.text"
-msgid "_Search for:"
-msgstr "Otsitav:"
+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 "E-posti kirjad saadetakse saajate rühmale. Kirjad võivad sisaldada aadressikasti ja tervitust. Kirju saab iga saaja jaoks kohandada."
 
-#: 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 "Ainult terved sõnad"
+msgid "_Letter"
+msgstr "Kiri"
 
-#: mmmergepage.ui
+#: mmoutputtypepage.ui
 msgctxt ""
-"mmmergepage.ui\n"
-"backwards\n"
+"mmoutputtypepage.ui\n"
+"email\n"
 "label\n"
 "string.text"
-msgid "Back_wards"
-msgstr "Tagasisuunas"
+msgid "_E-mail message"
+msgstr "E-kiri"
 
-#: mmmergepage.ui
+#: mmoutputtypepage.ui
 msgctxt ""
-"mmmergepage.ui\n"
-"matchcase\n"
+"mmoutputtypepage.ui\n"
+"label1\n"
 "label\n"
 "string.text"
-msgid "Ma_tch case"
-msgstr "Tõstutundlik"
+msgid "What Type of Document Do You Want to Create?"
+msgstr "Mis tüüpi dokumenti soovid luua?"
 
-#: mmmergepage.ui
+#: mmresultemaildialog.ui
 msgctxt ""
-"mmmergepage.ui\n"
-"label2\n"
-"label\n"
+"mmresultemaildialog.ui\n"
+"MMResultEmailDialog\n"
+"title\n"
 "string.text"
-msgid "Find"
-msgstr "Otsing"
+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 "Lähtedokumendi salvestamine"
+msgid "Send Documents"
+msgstr "Saada dokumendid"
 
-#: 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 "Liidetud dokumendi salvestamine"
+msgid "T_o"
+msgstr "Saaja"
 
-#: 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 "Liidetud dokumendi printimine"
+msgid "_Copy to..."
+msgstr "Kirja koopia..."
 
-#: 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 "Liidetud dokumendi saatmine e-kirjana"
+msgid "S_ubject"
+msgstr "Teema"
 
-#: 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 "Vali üks alltoodud sätetest:"
+msgid "Sen_d as"
+msgstr "Vorming"
 
-#: 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 "Dokumendi salvestamine, printimine või saatmine"
+msgid "Pr_operties..."
+msgstr "Omadused..."
 
-#: 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 "Salvesta lähtedokument"
+msgid "Name of the a_ttachment"
+msgstr "Kaasatud dokumendi nimi"
 
-#: 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 "Salvestatakse ühe dokumendina"
+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 "Salvestatakse eraldi dokumentidena"
+msgid "S_end all documents"
+msgstr "Saadetakse kõik dokumendid"
 
-#: mmoutputpage.ui
+#: mmresultemaildialog.ui
+#, fuzzy
 msgctxt ""
-"mmoutputpage.ui\n"
+"mmresultemaildialog.ui\n"
 "fromrb\n"
 "label\n"
 "string.text"
 msgid "_From"
 msgstr "Alates"
 
-#: mmoutputpage.ui
+#: mmresultemaildialog.ui
+#, fuzzy
 msgctxt ""
-"mmoutputpage.ui\n"
+"mmresultemaildialog.ui\n"
 "toft\n"
 "label\n"
 "string.text"
 msgid "_To"
 msgstr "Kuni"
 
-#: mmoutputpage.ui
-msgctxt ""
-"mmoutputpage.ui\n"
-"savenow\n"
-"label\n"
-"string.text"
-msgid "Save Do_cuments"
-msgstr "Salvesta dokumendid"
-
-#: mmoutputpage.ui
-msgctxt ""
-"mmoutputpage.ui\n"
-"printallrb\n"
-"label\n"
-"string.text"
-msgid "Print _all documents"
-msgstr "Prinditakse kõik dokumendid"
-
-#: mmoutputpage.ui
-msgctxt ""
-"mmoutputpage.ui\n"
-"printnow\n"
-"label\n"
-"string.text"
-msgid "Prin_t Documents"
-msgstr "Prindi dokumendid"
-
-#: mmoutputpage.ui
-msgctxt ""
-"mmoutputpage.ui\n"
-"sendallrb\n"
-"label\n"
-"string.text"
-msgid "S_end all documents"
-msgstr "Saadetakse kõik dokumendid"
-
-#: mmoutputpage.ui
-msgctxt ""
-"mmoutputpage.ui\n"
-"sendnow\n"
-"label\n"
-"string.text"
-msgid "Se_nd documents"
-msgstr "Saada dokumendid"
-
-#: mmoutputpage.ui
-msgctxt ""
-"mmoutputpage.ui\n"
-"mailtoft\n"
-"label\n"
-"string.text"
-msgid "T_o"
-msgstr "Saaja"
-
-#: mmoutputpage.ui
-msgctxt ""
-"mmoutputpage.ui\n"
-"subjectft\n"
-"label\n"
-"string.text"
-msgid "S_ubject"
-msgstr "Teema"
-
-#: mmoutputpage.ui
-msgctxt ""
-"mmoutputpage.ui\n"
-"sendasft\n"
-"label\n"
-"string.text"
-msgid "Sen_d as"
-msgstr "Vorming"
-
-#: mmoutputpage.ui
-msgctxt ""
-"mmoutputpage.ui\n"
-"copyto\n"
-"label\n"
-"string.text"
-msgid "_Copy to..."
-msgstr "Kirja koopia..."
-
-#: mmoutputpage.ui
-msgctxt ""
-"mmoutputpage.ui\n"
-"sendassettings\n"
-"label\n"
-"string.text"
-msgid "Pr_operties..."
-msgstr "Omadused..."
-
-#: mmoutputpage.ui
-msgctxt ""
-"mmoutputpage.ui\n"
-"printerft\n"
-"label\n"
-"string.text"
-msgid "_Printer"
-msgstr "Printer"
-
-#: mmoutputpage.ui
+#: mmresultemaildialog.ui
 msgctxt ""
-"mmoutputpage.ui\n"
-"printersettings\n"
-"label\n"
+"mmresultemaildialog.ui\n"
+"from-nospin\n"
+"text\n"
 "string.text"
-msgid "P_roperties..."
-msgstr "Omadused..."
+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 "Kaasatud dokumendi nimi"
+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'i 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 Wordi dokument"
 
-#: mmoutputpage.ui
+#: mmresultemaildialog.ui
+#, fuzzy
 msgctxt ""
-"mmoutputpage.ui\n"
+"mmresultemaildialog.ui\n"
 "liststore1\n"
 "3\n"
 "stringlist.text"
 msgid "HTML Message"
 msgstr "HTML-kiri"
 
-#: mmoutputpage.ui
+#: mmresultemaildialog.ui
+#, fuzzy
 msgctxt ""
-"mmoutputpage.ui\n"
+"mmresultemaildialog.ui\n"
 "liststore1\n"
 "4\n"
 "stringlist.text"
 msgid "Plain Text"
 msgstr "Lihttekst"
 
-#: 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 "Kirjad saadetakse saajate rühmale. Kirjad võivad sisaldada aadressikasti ja tervitust. Kirju saab iga saaja jaoks kohandada."
+msgid "Print merged document"
+msgstr "Liidetud dokumendi printimine"
 
-#: 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 "E-posti kirjad saadetakse saajate rühmale. Kirjad võivad sisaldada aadressikasti ja tervitust. Kirju saab iga saaja jaoks kohandada."
+msgid "Print Documents"
+msgstr "Prindi dokumendid"
 
-#: mmoutputtypepage.ui
+#: mmresultprintdialog.ui
+#, fuzzy
 msgctxt ""
-"mmoutputtypepage.ui\n"
-"letter\n"
+"mmresultprintdialog.ui\n"
+"printerft\n"
 "label\n"
 "string.text"
-msgid "_Letter"
-msgstr "Kiri"
+msgid "_Printer"
+msgstr "Printer"
 
-#: 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-kiri"
+msgid "P_roperties..."
+msgstr "Omadused..."
 
-#: 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 "Mis tüüpi dokumenti soovid luua?"
+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 "Kirjale lisatud dokumendi eelvaade on nüüd nähtav. Teiste dokumentide vaatamiseks klõpsa ühel nooltest."
+msgid "Print _all documents"
+msgstr "Prinditakse kõik dokumendid"
 
-#: mmpreparepage.ui
+#: mmresultprintdialog.ui
+#, fuzzy
 msgctxt ""
-"mmpreparepage.ui\n"
-"label4\n"
+"mmresultprintdialog.ui\n"
+"fromrb\n"
 "label\n"
 "string.text"
-msgid "_Recipient"
-msgstr "Saaja"
+msgid "_From"
+msgstr "Alates"
 
-#: 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 "Kuni"
 
-#: 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 "Esimene"
+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 "Eelmine"
+msgid "Save merged document"
+msgstr "Liidetud dokumendi salvestamine"
 
-#: 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 "Järgmine"
+msgid "Save Documents"
+msgstr "Salvesta dokumendid"
 
-#: 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 "Viimane"
+msgid "S_ave as a single large document"
+msgstr "Salvestatakse ühe dokumendina"
 
-#: 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 "See adressaat jäetakse kõrvale"
+msgid "Sa_ve as individual documents"
+msgstr "Salvestatakse eraldi dokumentidena"
 
-#: mmpreparepage.ui
+#: mmresultsavedialog.ui
+#, fuzzy
 msgctxt ""
-"mmpreparepage.ui\n"
-"label1\n"
+"mmresultsavedialog.ui\n"
+"fromrb\n"
 "label\n"
 "string.text"
-msgid "Preview Document"
-msgstr "Dokumendi eelvaade"
+msgid "_From"
+msgstr "Alates"
 
-#: 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 ""
-"Kirjuta või redigeeri oma dokumenti nüüd, kui sa pole seda veel teinud. Muudatused mõjuvad kõigile liidetud dokumentidele.\n"
-"\n"
-"Klõps nupul 'Redigeeri dokumenti...' muudab nõustaja akna pisikeseks nii, et dokumenti on võimalik redigeerida. Pärast redigeerimise lõpetamist saab nõustaja uuesti nähtavaks muuta klõpsuga vähendatud aknas asuval nupul 'Tagasi kirjakooste nõustaja juurde'."
+msgid "_To"
+msgstr "Kuni"
 
-#: 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 "Redigeeri dokumenti..."
+msgid "1"
+msgstr ""
 
-#: mmpreparepage.ui
+#: mmresultsavedialog.ui
 msgctxt ""
-"mmpreparepage.ui\n"
+"mmresultsavedialog.ui\n"
 "label2\n"
 "label\n"
 "string.text"
-msgid "Edit Document"
-msgstr "Dokumendi redigeerimine"
+msgid "Save As options"
+msgstr ""
 
 #: mmsalutationpage.ui
 msgctxt ""
@@ -8918,6 +8828,281 @@ msgctxt ""
 msgid "New User Index"
 msgstr "Uus kasutaja määratud register"
 
+#: notebookbar.ui
+#, fuzzy
+msgctxt ""
+"notebookbar.ui\n"
+"label9\n"
+"label\n"
+"string.text"
+msgid "File"
+msgstr "Fail"
+
+#: notebookbar.ui
+#, fuzzy
+msgctxt ""
+"notebookbar.ui\n"
+"controlcodes\n"
+"tooltip_text\n"
+"string.text"
+msgid "Indent"
+msgstr "Taane"
+
+#: notebookbar.ui
+#, fuzzy
+msgctxt ""
+"notebookbar.ui\n"
+"numberbullet\n"
+"tooltip_text\n"
+"string.text"
+msgid "Bullets and Numbering"
+msgstr "Nummerdus ja täpid"
+
+#: notebookbar.ui
+#, fuzzy
+msgctxt ""
+"notebookbar.ui\n"
+"indent\n"
+"tooltip_text\n"
+"string.text"
+msgid "Indent"
+msgstr "Taane"
+
+#: 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 "_Vertikaalne joondus"
+
+#: 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 "Lisa"
+
+#: 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 "Vahed:"
+
+#: notebookbar.ui
+#, fuzzy
+msgctxt ""
+"notebookbar.ui\n"
+"indentlabel\n"
+"label\n"
+"string.text"
+msgid "_Indent:"
+msgstr "Taane:"
+
+#: 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 "Sisukord"
+
+#: 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 "Viited"
+
+#: 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 "Vaade"
+
+#: notebookbar.ui
+#, fuzzy
+msgctxt ""
+"notebookbar.ui\n"
+"formattable1\n"
+"tooltip_text\n"
+"string.text"
+msgid "Indent"
+msgstr "Taane"
+
+#: notebookbar.ui
+#, fuzzy
+msgctxt ""
+"notebookbar.ui\n"
+"formattable\n"
+"tooltip_text\n"
+"string.text"
+msgid "Indent"
+msgstr "Taane"
+
+#: notebookbar.ui
+#, fuzzy
+msgctxt ""
+"notebookbar.ui\n"
+"label6\n"
+"label\n"
+"string.text"
+msgid "Table"
+msgstr "Tabel"
+
 #: numberingnamedialog.ui
 msgctxt ""
 "numberingnamedialog.ui\n"
@@ -11432,8 +11617,8 @@ msgctxt ""
 "graphics\n"
 "label\n"
 "string.text"
-msgid "_Pictures and objects"
-msgstr "_Pildid ja objektid"
+msgid "_Images and objects"
+msgstr ""
 
 #: printoptionspage.ui
 msgctxt ""
@@ -14537,8 +14722,8 @@ msgctxt ""
 "TocDialog\n"
 "title\n"
 "string.text"
-msgid "Insert Index or Table of Contents"
-msgstr "Registri/sisukorra lisamine"
+msgid "Table of Contents, Index or Bibliography"
+msgstr ""
 
 #: tocdialog.ui
 msgctxt ""
@@ -14550,13 +14735,14 @@ msgid "Preview"
 msgstr "Eelvaade"
 
 #: tocdialog.ui
+#, fuzzy
 msgctxt ""
 "tocdialog.ui\n"
 "index\n"
 "label\n"
 "string.text"
-msgid "Index or Table of Contents"
-msgstr "Register/sisukord"
+msgid "Type"
+msgstr "Tüüp"
 
 #: tocdialog.ui
 msgctxt ""
@@ -15617,8 +15803,8 @@ msgctxt ""
 "graphics\n"
 "label\n"
 "string.text"
-msgid "_Graphics and objects"
-msgstr "Pildid ja objektid"
+msgid "_Images and objects"
+msgstr ""
 
 #: viewoptionspage.ui
 msgctxt ""