Mercurial > octave

changeset 22344:046ade63abc4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
libgui/languages/*.ts: update of language files for version 4.2
author Torsten <ttl@justmail.de>
date Fri, 19 Aug 2016 21:05:48 +0200
parents 029c5f4eac3a
children 752d79f86781
files libgui/languages/be_BY.ts libgui/languages/de_DE.ts libgui/languages/en_US.ts libgui/languages/es_ES.ts libgui/languages/eu_ES.ts libgui/languages/fr_FR.ts libgui/languages/it_IT.ts libgui/languages/ja_JP.ts libgui/languages/nl_NL.ts libgui/languages/pt_BR.ts libgui/languages/pt_PT.ts libgui/languages/ru_RU.ts libgui/languages/uk_UA.ts libgui/languages/zh_CN.ts
diffstat 14 files changed, 11734 insertions(+), 7670 deletions(-) [+]
line wrap: on
line diff
--- a/libgui/languages/be_BY.ts	Thu Aug 18 12:26:32 2016 -0700
+++ b/libgui/languages/be_BY.ts	Fri Aug 19 21:05:48 2016 +0200
@@ -4,7 +4,7 @@
 <context>
     <name>ListDialog</name>
     <message>
-        <location filename="../src/dialog.cc" line="+251"/>
+        <location filename="../src/dialog.cc" line="+258"/>
         <source>Select All</source>
         <translation>Вылучыць усё</translation>
     </message>
@@ -540,7 +540,7 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../src/workspace-model.cc" line="+75"/>
+        <location filename="../src/workspace-model.cc" line="+74"/>
         <source>automatic</source>
         <translation>аўта</translation>
     </message>
@@ -590,6 +590,34 @@
         <source>cursor</source>
         <translation>курсор</translation>
     </message>
+    <message>
+        <location filename="../src/settings-dialog.cc" line="+132"/>
+        <source>Difference to the default size</source>
+        <translation type="unfinished">Розніца ад стандартнага памеру</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Background color, pink (255,0,255) means default</source>
+        <translation type="unfinished">Для фону ружовы колер (255,0,255) азначае стандартны колер фону</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>b</source>
+        <comment>short form for bold</comment>
+        <translation type="unfinished">т</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>i</source>
+        <comment>short form for italic</comment>
+        <translation type="unfinished">к</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>u</source>
+        <comment>short form for underlined</comment>
+        <translation type="unfinished">п</translation>
+    </message>
 </context>
 <context>
     <name>QPPDOptionsModel</name>
@@ -1056,7 +1084,7 @@
 <context>
     <name>QTerminal</name>
     <message>
-        <location filename="../qterminal/libqterminal/QTerminal.h" line="+135"/>
+        <location filename="../qterminal/libqterminal/QTerminal.h" line="+130"/>
         <source>Copy</source>
         <translation>Капіяваць</translation>
     </message>
@@ -1071,15 +1099,20 @@
         <translation type="unfinished">Вылучыць усё</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+7"/>
         <source>Clear Window</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../qterminal/libqterminal/QTerminal.cc" line="+46"/>
+        <source>Edit %1 at line %2</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QWinTerminalImpl</name>
     <message>
-        <location filename="../qterminal/libqterminal/win32/QWinTerminalImpl.cpp" line="+1778"/>
+        <location filename="../qterminal/libqterminal/win32/QWinTerminalImpl.cpp" line="+1779"/>
         <source>copied selection to clipboard</source>
         <translation>вылучэнне скапіявана ў буфер абмену</translation>
     </message>
@@ -1753,7 +1786,7 @@
 <context>
     <name>QtHandles::Figure</name>
     <message>
-        <location filename="../graphics/Figure.cc" line="+282"/>
+        <location filename="../graphics/Figure.cc" line="+298"/>
         <source>Figure ToolBar</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1803,37 +1836,19 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Cu&amp;t</source>
-        <translation type="unfinished">Вы&amp;разаць</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>&amp;Paste</source>
-        <translation type="unfinished">&amp;Уставіць</translation>
-    </message>
-    <message>
-        <location line="+5"/>
+        <location line="+7"/>
+        <location line="+463"/>
+        <source>About Octave</source>
+        <translation type="unfinished">Пра Octave</translation>
+    </message>
+    <message>
+        <location line="-465"/>
         <source>&amp;Help</source>
         <translation type="unfinished">&amp;Даведка</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>&amp;About QtHandles</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>About &amp;Qt</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+427"/>
-        <source>About QtHandles</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+39"/>
+        <location line="+504"/>
+        <location line="+69"/>
         <source>Save Figure As</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1872,6 +1887,160 @@
     </message>
 </context>
 <context>
+    <name>annotation_dialog</name>
+    <message>
+        <location filename="../graphics/annotation-dialog.ui" line="+17"/>
+        <source>Annotation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>String</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Font</source>
+        <translation type="unfinished">Шрыфт</translation>
+    </message>
+    <message>
+        <location line="+42"/>
+        <source>bold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>b</source>
+        <translation type="unfinished">т</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>italic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>i</source>
+        <translation type="unfinished">к</translation>
+    </message>
+    <message>
+        <location line="+428"/>
+        <source>color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>Horz alignment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <location line="+29"/>
+        <source>middle</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-24"/>
+        <source>right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Vert alignment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>top</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>bottom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Position</source>
+        <translation type="unfinished">Пазіцыі</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>X</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Y</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Width</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Height</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>units</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>normalized</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Fit to box</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Box</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Background</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+444"/>
+        <source>Edge</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+133"/>
+        <source>Line style</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>none</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Line width</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>documentation_dock_widget</name>
     <message>
         <location filename="../src/documentation-dock-widget.cc" line="+34"/>
@@ -1887,17 +2056,18 @@
 <context>
     <name>file_editor</name>
     <message>
-        <location filename="../src/m-editor/file-editor.cc" line="+285"/>
-        <location line="+125"/>
+        <location filename="../src/m-editor/file-editor.cc" line="+366"/>
+        <location line="+152"/>
         <location line="+19"/>
         <location line="+25"/>
         <location line="+62"/>
         <location line="+28"/>
+        <location line="+79"/>
         <source>Octave Editor</source>
         <translation>Рэдактар Octave</translation>
     </message>
     <message>
-        <location line="-318"/>
+        <location line="-462"/>
         <source>Octave Files (*.m);;All Files (*)</source>
         <translation>Файлы Octave (*.m);;Усе файлы (*)</translation>
     </message>
@@ -1913,7 +2083,7 @@
         <translation>Назва новай функцыі:</translation>
     </message>
     <message>
-        <location line="+330"/>
+        <location line="+395"/>
         <source>File not saved! A file with the selected name
 %1
 is already open in the editor</source>
@@ -1922,12 +2092,12 @@
 ужо адкрыты ў рэдактары</translation>
     </message>
     <message>
-        <location line="+387"/>
+        <location line="+492"/>
         <source>&amp;%1 %2</source>
         <translation>&amp;%1 %2</translation>
     </message>
     <message>
-        <location line="+388"/>
+        <location line="+480"/>
         <source>&amp;Save File</source>
         <translation>&amp;Захаваць файл</translation>
     </message>
@@ -1943,41 +2113,26 @@
     </message>
     <message>
         <location line="+7"/>
-        <source>&amp;Undo</source>
-        <translation>&amp;Адрабіць</translation>
-    </message>
-    <message>
-        <location line="+3"/>
         <source>&amp;Redo</source>
         <translation>&amp;Паўтарыць</translation>
     </message>
     <message>
         <location line="+6"/>
-        <source>&amp;Copy</source>
-        <translation>&amp;Капіяваць</translation>
-    </message>
-    <message>
-        <location line="+3"/>
         <source>Cu&amp;t</source>
         <translation>Вы&amp;разаць</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Paste</source>
-        <translation>Уставіць</translation>
-    </message>
-    <message>
-        <location line="+96"/>
+        <location line="+94"/>
         <source>&amp;Next Bookmark</source>
         <translation>&amp;Наступная закладка</translation>
     </message>
     <message>
-        <location line="-2"/>
+        <location line="+2"/>
         <source>Pre&amp;vious Bookmark</source>
         <translation>Па&amp;пярэдняя закладка</translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+2"/>
         <source>Toggle &amp;Bookmark</source>
         <translation>&amp;Паставіць/прыбраць закладку</translation>
     </message>
@@ -1987,7 +2142,7 @@
         <translation>&amp;Выдаліць усе закладкі</translation>
     </message>
     <message>
-        <location line="+54"/>
+        <location line="+68"/>
         <source>&amp;Next Breakpoint</source>
         <translation>&amp;Наступны пункт спыну</translation>
     </message>
@@ -2007,7 +2162,7 @@
         <translation>&amp;Прыбраць усе пункты спыну</translation>
     </message>
     <message>
-        <location line="-104"/>
+        <location line="-118"/>
         <source>&amp;Comment</source>
         <translation>&amp;Закаментаваць</translation>
     </message>
@@ -2027,28 +2182,28 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-55"/>
+        <location line="-61"/>
         <source>&amp;Find and Replace...</source>
         <translation>&amp;Знайсці і замяніць...</translation>
     </message>
     <message>
-        <location line="+162"/>
+        <location line="+182"/>
         <source>Save File and Run</source>
         <translation>Захаваць і выканаць файл</translation>
     </message>
     <message>
-        <location line="-90"/>
+        <location line="-104"/>
         <source>Go &amp;to Line...</source>
         <translation>П&amp;ерайсці да радка...</translation>
     </message>
     <message>
-        <location line="-1126"/>
+        <location line="-1341"/>
         <source>Could not start custom file editor
 %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+148"/>
+        <location line="+175"/>
         <source>Create</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2058,7 +2213,7 @@
         <translation type="unfinished">Скасаваць</translation>
     </message>
     <message>
-        <location line="+844"/>
+        <location line="+1041"/>
         <source>&amp;Recent Editor Files</source>
         <translation>&amp;Ранейшыя файлы</translation>
     </message>
@@ -2083,12 +2238,7 @@
         <translation>Закрыць іншыя файлы</translation>
     </message>
     <message>
-        <location line="+31"/>
-        <source>Select All</source>
-        <translation type="unfinished">Вылучыць усё</translation>
-    </message>
-    <message>
-        <location line="+10"/>
+        <location line="+32"/>
         <source>&amp;Commands</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2213,17 +2363,62 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+128"/>
-        <source>Editor</source>
-        <translation type="unfinished">Рэдактар</translation>
-    </message>
-    <message>
-        <location line="-120"/>
-        <source>Show Line &amp;Endings</source>
+        <location line="+22"/>
+        <source>Show &amp;Toolbar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Show &amp;Statusbar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+4"/>
+        <source>Show &amp;Horizontal Scrollbar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+69"/>
+        <source>Recent Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+65"/>
+        <source>Editor</source>
+        <translation type="unfinished">Рэдактар</translation>
+    </message>
+    <message>
+        <location line="-156"/>
+        <source>Show Line &amp;Endings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-1467"/>
+        <source>File Encoding:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+403"/>
+        <source>%1 is a built-in function</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>Can not find function %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+911"/>
+        <source>Find &amp;Next...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Find &amp;Previous...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+118"/>
         <source>Show &amp;Indentation Guides</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2233,7 +2428,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+20"/>
         <source>Zoom &amp;In</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2268,7 +2463,7 @@
         <translation>&amp;Дакументацыя па ключавым слове</translation>
     </message>
     <message>
-        <location line="-1103"/>
+        <location line="-1305"/>
         <source>Could not open file
 %1
 for read: %2.</source>
@@ -2300,7 +2495,7 @@
         <translation>Асацыяваная картка рэдактара знікла.</translation>
     </message>
     <message>
-        <location line="+731"/>
+        <location line="+928"/>
         <source>&amp;File</source>
         <translation>&amp;Файл</translation>
     </message>
@@ -2310,12 +2505,12 @@
         <translation>&amp;Змяніць</translation>
     </message>
     <message>
-        <location line="+138"/>
+        <location line="+129"/>
         <source>Show &amp;Whitespace Characters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+42"/>
         <source>&amp;Debug</source>
         <translation>&amp;Адладка</translation>
     </message>
@@ -2328,12 +2523,12 @@
 <context>
     <name>file_editor_tab</name>
     <message>
-        <location filename="../src/m-editor/file-editor-tab.cc" line="+92"/>
+        <location filename="../src/m-editor/file-editor-tab.cc" line="+145"/>
         <source>eol:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="-17"/>
         <source>line:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2343,17 +2538,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+156"/>
-        <source>%1 is a built-in function</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+31"/>
-        <source>Can not find function %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+775"/>
+        <location line="+1146"/>
         <source>Goto line</source>
         <translation>Перайсці да радка</translation>
     </message>
@@ -2363,7 +2548,7 @@
         <translation>Нумар радка</translation>
     </message>
     <message>
-        <location line="+146"/>
+        <location line="+145"/>
         <location line="+63"/>
         <source>&lt;unnamed&gt;</source>
         <translation>&lt;без назвы&gt;</translation>
@@ -2378,12 +2563,28 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+288"/>
+        <location line="+298"/>
+        <source>Debug or Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>This file is currently being executed.
+Quit debugging and save?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+166"/>
         <source>Line Endings:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+9"/>
+        <source>File Encoding:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+28"/>
         <source>Octave Files (*.m)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2393,22 +2594,59 @@
         <translation type="unfinished">Усе файлы (*)</translation>
     </message>
     <message>
-        <location line="-322"/>
+        <location line="-513"/>
         <source>Do you want to cancel closing, save or discard the changes?</source>
         <translation>Скасаваць закрыццё, захаваць ці адкінуць змены?</translation>
     </message>
     <message>
-        <location line="-970"/>
-        <location line="+979"/>
-        <location line="+213"/>
-        <location line="+177"/>
-        <location line="+85"/>
+        <location line="-1342"/>
+        <source>encoding:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+239"/>
+        <source>Breakpoint condition</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+88"/>
+        <location line="+1024"/>
+        <location line="+372"/>
+        <location line="+215"/>
+        <location line="+21"/>
+        <location line="+83"/>
         <location line="+23"/>
         <source>Octave Editor</source>
         <translation>Рэдактар Octave</translation>
     </message>
     <message>
-        <location line="-6"/>
+        <location line="-1737"/>
+        <source>Cannot add breakpoint to modified file.
+Save and add breakpoint, or canel?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1611"/>
+        <source>&quot;%1&quot;
+is not a valid identifier.
+
+If you keep this filename, you will not be able to
+call your script using its name as an Octave command.
+
+Do you want to choose another name?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>The current editor contents can not be encoded
+with the selected codec %1.
+Using it will result in data loss!
+
+Do you want to chose another codec?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+99"/>
         <source>
 
 Warning: The contents in the editor is modified!</source>
@@ -2426,25 +2664,14 @@
 быў выдалены або пераназваны. Можа, захаваць яго зараз?%2</translation>
     </message>
     <message>
-        <location line="-285"/>
+        <location line="-342"/>
         <source>Could not open file %1 for write:
 %2.</source>
         <translation>Не выйшла адкрыць файл %1 на запіс:
 %2.</translation>
     </message>
     <message>
-        <location line="+177"/>
-        <source>&quot;%1&quot;
-is not a valid identifier.
-
-If you keep this file name, you will not be able to
-call your script using its name as an Octave command.
-
-Do you want to choose another name?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+85"/>
+        <location line="+319"/>
         <source>It seems that &apos;%1&apos; has been modified by another application. Do you want to reload it?</source>
         <translation>Выглядае на тое, што &apos;%1&apos; быў зменены іншай праграмай. Перачытаць яго?</translation>
     </message>
@@ -2457,12 +2684,7 @@
         <translation>Файлавы агляднік</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Browse your files.</source>
-        <translation>Аглядаць вашыя файлы.</translation>
-    </message>
-    <message>
-        <location line="+18"/>
+        <location line="+35"/>
         <source>Enter the path or filename</source>
         <translation>Пазначце шлях або назву файла</translation>
     </message>
@@ -2483,22 +2705,67 @@
     </message>
     <message>
         <location line="+4"/>
-        <location line="+388"/>
+        <location line="+373"/>
         <source>Find Files...</source>
         <translation>Шукаць файлы...</translation>
     </message>
     <message>
-        <location line="+364"/>
+        <location line="-26"/>
+        <source>Open in System File Explorer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Open in Text Editor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+389"/>
         <source>New Directory</source>
         <translation>Новы каталог</translation>
     </message>
     <message>
-        <location line="-784"/>
+        <location line="-773"/>
         <source>Show Octave directory</source>
         <translation>Перайсці да каталогу Octave</translation>
     </message>
     <message>
-        <location line="-4"/>
+        <location line="-49"/>
+        <source>Browse your files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Alternating row colors</source>
+        <translation type="unfinished">Колеры радкоў чаргуюцца</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>filesdockwidget/showFileSize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>filesdockwidget/showFileType</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>filesdockwidget/showLastModified</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>filesdockwidget/showHiddenFiles</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>filesdockwidget/useAlternatingRowColors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+29"/>
         <source>One directory up</source>
         <translation type="unfinished">Перайсці каталогам вышэй</translation>
     </message>
@@ -2519,53 +2786,48 @@
     </message>
     <message>
         <location line="+20"/>
-        <location line="+397"/>
+        <location line="+382"/>
         <source>New File...</source>
         <translation>Новы файл...</translation>
     </message>
     <message>
-        <location line="-394"/>
-        <location line="+397"/>
+        <location line="-379"/>
+        <location line="+382"/>
         <source>New Directory...</source>
         <translation>Новы каталог...</translation>
     </message>
     <message>
-        <location line="-335"/>
+        <location line="-329"/>
         <source>Activate to open in editor, right click for alternatives</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+236"/>
+        <location line="-136"/>
         <source>File size</source>
         <translation>Памер файла</translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+1"/>
         <source>File type</source>
         <translation>Тып файла</translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+1"/>
         <source>Date modified</source>
         <translation>Дата змянення</translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+1"/>
         <source>Show hidden</source>
         <translation>Паказваць схаваныя</translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+415"/>
         <source>Open</source>
         <translation>Адкрыць</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Open in Default Application</source>
-        <translation>Адкрыць у стандартнай праграме</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <location line="+13"/>
         <source>Copy Selection to Clipboard</source>
         <translation>Капіяваць вылучанае ў буфер</translation>
     </message>
@@ -2595,7 +2857,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+115"/>
+        <location line="+125"/>
         <source>Rename file/directory</source>
         <translation>Пераназваць файл ці каталог</translation>
     </message>
@@ -2630,7 +2892,7 @@
         <translation>Немагчыма выдаліць каталог, бо ён не пусты</translation>
     </message>
     <message>
-        <location line="+151"/>
+        <location line="+145"/>
         <source>Set directory of file browser</source>
         <translation>Задаванне каталогу файлавага аглядніка</translation>
     </message>
@@ -2669,7 +2931,7 @@
 <context>
     <name>final_page</name>
     <message>
-        <location filename="../src/welcome-wizard.cc" line="+199"/>
+        <location filename="../src/welcome-wizard.cc" line="+195"/>
         <source>Enjoy!</source>
         <translation>Прыемнага карыстання!</translation>
     </message>
@@ -2728,7 +2990,7 @@
 <context>
     <name>find_dialog</name>
     <message>
-        <location filename="../src/m-editor/find-dialog.cc" line="+74"/>
+        <location filename="../src/m-editor/find-dialog.cc" line="+85"/>
         <source>Find and Replace</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2803,7 +3065,7 @@
         <translation>Шукаць вы&amp;лучанае</translation>
     </message>
     <message>
-        <location line="+84"/>
+        <location line="+87"/>
         <source>Search from end</source>
         <translation>Шукаць ад канца</translation>
     </message>
@@ -2813,7 +3075,7 @@
         <translation>Шукаць ад пачатку</translation>
     </message>
     <message>
-        <location line="+205"/>
+        <location line="+221"/>
         <source>Replace Result</source>
         <translation>Вынік замены</translation>
     </message>
@@ -2931,7 +3193,7 @@
         <translation>Вынікі пошуку</translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+21"/>
         <source>Idle.</source>
         <translation>Idle.</translation>
     </message>
@@ -2957,8 +3219,8 @@
     </message>
     <message>
         <location line="+15"/>
-        <source>File name/location</source>
-        <translation>Назва файла ці каталогу</translation>
+        <source>Filename/location</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+17"/>
@@ -2966,7 +3228,7 @@
         <translation>Змесціва файла</translation>
     </message>
     <message>
-        <location line="+105"/>
+        <location line="+111"/>
         <source>Searching...</source>
         <translation>Ідзе пошук...</translation>
     </message>
@@ -2984,7 +3246,7 @@
 <context>
     <name>find_files_model</name>
     <message>
-        <location filename="../src/find-files-model.cc" line="+82"/>
+        <location filename="../src/find-files-model.cc" line="+83"/>
         <source>Filename</source>
         <translation>Назва файла</translation>
     </message>
@@ -3022,7 +3284,7 @@
         <translation>Гісторыя загадаў</translation>
     </message>
     <message>
-        <location line="+89"/>
+        <location line="+107"/>
         <source>Copy</source>
         <translation>Капіяваць</translation>
     </message>
@@ -3036,11 +3298,21 @@
         <source>Create script</source>
         <translation>Стварыць сцэнар</translation>
     </message>
+    <message>
+        <location line="+4"/>
+        <source>Hide filter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Show filter</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>initial_page</name>
     <message>
-        <location filename="../src/welcome-wizard.cc" line="-179"/>
+        <location filename="../src/welcome-wizard.cc" line="-176"/>
         <source>Welcome to Octave!</source>
         <translation>Вітаем у Octave!</translation>
     </message>
@@ -3071,13 +3343,13 @@
 <context>
     <name>main_window</name>
     <message>
-        <location filename="../src/main-window.cc" line="+268"/>
+        <location filename="../src/main-window.cc" line="+275"/>
         <source>Load Workspace</source>
         <translation>Загрузіць прастору зменных</translation>
     </message>
     <message>
-        <location line="+732"/>
-        <location line="+931"/>
+        <location line="+758"/>
+        <location line="+975"/>
         <source>About Octave</source>
         <translation>Пра Octave</translation>
     </message>
@@ -3087,12 +3359,12 @@
         <translation>&amp;Файл</translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+45"/>
         <source>New</source>
         <translation>Новы</translation>
     </message>
     <message>
-        <location line="-43"/>
+        <location line="-39"/>
         <source>Open...</source>
         <translation>Адкрыць...</translation>
     </message>
@@ -3102,7 +3374,7 @@
         <translation>Настаўленні...</translation>
     </message>
     <message>
-        <location line="-95"/>
+        <location line="-99"/>
         <source>Exit</source>
         <translation>Выйсці</translation>
     </message>
@@ -3117,22 +3389,22 @@
         <translation>Адрабіць</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+7"/>
         <source>Copy</source>
         <translation>Капіяваць</translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+5"/>
         <source>Paste</source>
         <translation>Уставіць</translation>
     </message>
     <message>
-        <location line="-1469"/>
+        <location line="-1537"/>
         <source>Save Workspace As</source>
         <translation>Захаваць прастору зменных як</translation>
     </message>
     <message>
-        <location line="+134"/>
+        <location line="+124"/>
         <source>The release notes file &apos;%1&apos; is empty.</source>
         <translation>Файл заўваг да выпуску &apos;%1&apos; пусты.</translation>
     </message>
@@ -3142,7 +3414,7 @@
         <translation>Файл заўваг да выпуску &apos;%1&apos; не выйшла прачытаць.</translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="+12"/>
         <source>Octave Release Notes</source>
         <translation>Заўвагі да выпуску Octave</translation>
     </message>
@@ -3152,17 +3424,17 @@
         <translation>Навіны супольнасці Octave</translation>
     </message>
     <message>
-        <location line="+187"/>
+        <location line="+206"/>
         <source>Are you sure you want to exit Octave?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+854"/>
+        <location line="+916"/>
         <source>Open an existing file in editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+48"/>
+        <location line="+44"/>
         <source>New Function...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3172,12 +3444,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+39"/>
         <source>Select All</source>
         <translation type="unfinished">Вылучыць усё</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="+4"/>
         <source>Clear Clipboard</source>
         <translation>Ачысціць буфер</translation>
     </message>
@@ -3227,17 +3499,27 @@
         <translation>Файлавы агляднік</translation>
     </message>
     <message>
-        <location line="-84"/>
+        <location line="+36"/>
+        <source>Contribute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Donate to Octave</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-123"/>
         <source>Step In</source>
         <translation>Крок наперад</translation>
     </message>
     <message>
-        <location line="-1020"/>
+        <location line="-1082"/>
         <source>Octave</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+868"/>
+        <location line="+926"/>
         <source>Load Workspace...</source>
         <translation>Загрузіць прастору зменных...</translation>
     </message>
@@ -3252,7 +3534,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+124"/>
+        <location line="+128"/>
         <source>Step Out</source>
         <translation>Крок назад</translation>
     </message>
@@ -3272,17 +3554,7 @@
         <translation>Падзяліцца кодам</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Contribute to Octave</source>
-        <translation>Палепшыць Octave</translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Octave Developer Resources</source>
-        <translation>Рэсурсы распрацоўніка Octave</translation>
-    </message>
-    <message>
-        <location line="+14"/>
+        <location line="+20"/>
         <source>On Disk</source>
         <translation>На дыску</translation>
     </message>
@@ -3327,8 +3599,8 @@
         <translation>Перайсці каталогам вышэй</translation>
     </message>
     <message>
-        <location line="-1148"/>
-        <location line="+1151"/>
+        <location line="-1198"/>
+        <location line="+1201"/>
         <source>Browse directories</source>
         <translation>Агляд каталогаў</translation>
     </message>
@@ -3407,7 +3679,7 @@
 <context>
     <name>news_reader</name>
     <message>
-        <location line="-1411"/>
+        <location line="-1492"/>
         <source>&lt;html&gt;
 &lt;body&gt;
 &lt;p&gt;
@@ -3466,18 +3738,18 @@
 <context>
     <name>octave_dock_widget</name>
     <message>
-        <location filename="../src/octave-dock-widget.cc" line="+68"/>
-        <location line="+198"/>
+        <location filename="../src/octave-dock-widget.cc" line="+67"/>
+        <location line="+201"/>
         <source>Undock widget</source>
         <translation>Адчапіць віджэт</translation>
     </message>
     <message>
-        <location line="-188"/>
+        <location line="-191"/>
         <source>Hide widget</source>
         <translation>Схаваць віджэт</translation>
     </message>
     <message>
-        <location line="+132"/>
+        <location line="+136"/>
         <source>Dock widget</source>
         <translation>Прычапіць віджэт</translation>
     </message>
@@ -3485,7 +3757,7 @@
 <context>
     <name>octave_qscintilla</name>
     <message>
-        <location filename="../src/m-editor/octave-qscintilla.cc" line="+226"/>
+        <location filename="../src/m-editor/octave-qscintilla.cc" line="+237"/>
         <source>Help on</source>
         <translation>Даведка пра</translation>
     </message>
@@ -3499,18 +3771,23 @@
         <source>Edit</source>
         <translation>Змяніць</translation>
     </message>
+    <message>
+        <location line="+15"/>
+        <source>dbstop if ...</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>octave_qt_link</name>
     <message>
-        <location filename="../src/octave-qt-link.cc" line="+111"/>
-        <location line="+6"/>
-        <location line="+7"/>
+        <location filename="../src/octave-qt-link.cc" line="+136"/>
+        <location line="+9"/>
+        <location line="+11"/>
         <source>Create</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-10"/>
+        <location line="-14"/>
         <source>File
 %1
 does not exist. Do you want to create it?</source>
@@ -3524,7 +3801,7 @@
         <translation>Рэдактар Octave</translation>
     </message>
     <message>
-        <location line="+211"/>
+        <location line="+254"/>
         <source>The file %1 does not exist in the load path.  To run or debug the function you are editing, you must either change to the directory %2 or add that directory to the load path.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3549,8 +3826,8 @@
         <translation>Дадаць каталог да дзейнага шляху</translation>
     </message>
     <message>
-        <location line="-223"/>
-        <location line="+224"/>
+        <location line="-269"/>
+        <location line="+270"/>
         <source>Cancel</source>
         <translation>Скасаваць</translation>
     </message>
@@ -3566,7 +3843,7 @@
 <context>
     <name>resource_manager</name>
     <message>
-        <location filename="../src/resource-manager.cc" line="+245"/>
+        <location filename="../src/resource-manager.cc" line="+246"/>
         <source>The settings file
 %1
 does not exist and can not be created.
@@ -3592,142 +3869,123 @@
     <name>settings_dialog</name>
     <message>
         <location filename="../src/settings-dialog.ui" line="+23"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1738"/>
         <source>Settings</source>
         <translation>Настаўленні</translation>
     </message>
     <message>
         <location line="+19"/>
         <location line="+468"/>
-        <location filename="../src/ui-settings-dialog.h" line="+25"/>
-        <location line="+1"/>
         <source>General</source>
         <translation>Агульныя</translation>
     </message>
     <message>
         <location line="-338"/>
-        <location filename="../src/ui-settings-dialog.h" line="-17"/>
         <source>Octave logo only</source>
         <translation>Толькі эмблема Octave</translation>
     </message>
     <message>
         <location line="+10"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Letter icons</source>
         <translatorcomment>не пэўны</translatorcomment>
         <translation>Літарныя значкі</translation>
     </message>
     <message>
         <location line="-111"/>
-        <location filename="../src/ui-settings-dialog.h" line="-8"/>
         <source>Dock widget title bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+53"/>
-        <location filename="../src/ui-settings-dialog.h" line="+3"/>
         <source>Small</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+17"/>
-        <location filename="../src/ui-settings-dialog.h" line="+2"/>
         <source>Large</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+168"/>
-        <location filename="../src/ui-settings-dialog.h" line="+10"/>
         <source>Custom style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+32"/>
-        <location filename="../src/ui-settings-dialog.h" line="+2"/>
         <source>3D</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+148"/>
-        <location filename="../src/ui-settings-dialog.h" line="+63"/>
         <source>Editor</source>
         <translation>Рэдактар</translation>
     </message>
     <message>
-        <location line="+151"/>
-        <location filename="../src/ui-settings-dialog.h" line="-49"/>
+        <location line="+107"/>
         <source>Color</source>
         <translation>Колер</translation>
     </message>
     <message>
-        <location line="+135"/>
-        <location filename="../src/ui-settings-dialog.h" line="+4"/>
+        <location line="-72"/>
         <source>This works well for monospaced fonts. The line is drawn at a position based on the width of a space character in the default font. It may not work very well if styles use proportional fonts or if varied font sizes or bold, italic and normal texts are used.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
-        <location filename="../src/ui-settings-dialog.h" line="+3"/>
+        <location line="+289"/>
         <source>Enable Code Folding</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+61"/>
-        <location filename="../src/ui-settings-dialog.h" line="+6"/>
+        <location line="+551"/>
         <source>Windows (CRLF)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+5"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Mac (CR)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+5"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Unix (LF)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
-        <location filename="../src/ui-settings-dialog.h" line="+2"/>
+        <location line="-532"/>
         <source>Show horizontal scroll bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+68"/>
-        <location filename="../src/ui-settings-dialog.h" line="+4"/>
+        <location line="-299"/>
+        <source>Show tool bar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+383"/>
         <source>Indentation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+24"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Indent width</source>
         <translation>Даўжыня водступу</translation>
     </message>
     <message>
         <location line="+7"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Tab indents line</source>
         <translation>Табуляцыя робіць водступ</translation>
     </message>
     <message>
         <location line="+7"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Auto indentation</source>
         <translation>Аўтаводступы</translation>
     </message>
     <message>
         <location line="+26"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Tab width</source>
         <translation>Даўжыня табуляцыі</translation>
     </message>
     <message>
         <location line="+7"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Show indentation guides</source>
         <translatorcomment>- не пэўны
 - даўжэй не трэба, не змяшчаецца!</translatorcomment>
@@ -3735,591 +3993,468 @@
     </message>
     <message>
         <location line="+23"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Backspace unindents line</source>
         <translation>Backspace прыбірае водступ</translation>
     </message>
     <message>
         <location line="+23"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Indentation uses tabs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+38"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Auto completion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+27"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Match keywords</source>
         <translation>Для ключавых словаў</translation>
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Case sensitive</source>
         <translation>Улічваць рэгістр</translation>
     </message>
     <message>
         <location line="+23"/>
-        <location filename="../src/ui-settings-dialog.h" line="+2"/>
         <source>Replace word by suggested one</source>
         <translation>Замяняць слова на прапанаванае</translation>
     </message>
     <message>
         <location line="-10"/>
-        <location filename="../src/ui-settings-dialog.h" line="-1"/>
         <source>Match words in document</source>
         <translation>Для словаў з дакумента</translation>
     </message>
     <message>
         <location line="+48"/>
-        <location filename="../src/ui-settings-dialog.h" line="+2"/>
         <source>With Octave builtins</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+10"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>With Octave functions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+64"/>
-        <location filename="../src/ui-settings-dialog.h" line="+9"/>
         <source>Show completion list automatically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+51"/>
-        <location filename="../src/ui-settings-dialog.h" line="+2"/>
+        <location line="+63"/>
         <source>Restore editor tabs from previous session on startup</source>
         <translation>Памятаць карткі папярэдняга сеансу</translation>
     </message>
     <message>
-        <location line="+20"/>
-        <location filename="../src/ui-settings-dialog.h" line="+2"/>
+        <location line="-13"/>
         <source>Reload externally changed files without prompt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-446"/>
-        <location filename="../src/ui-settings-dialog.h" line="-30"/>
+        <location line="-425"/>
         <source>Use custom file editor</source>
         <translation>Свой файлавы рэдактар</translation>
     </message>
     <message>
-        <location line="+482"/>
-        <location filename="../src/ui-settings-dialog.h" line="+33"/>
+        <location line="+518"/>
+        <source>Text encoding used for loading and saving</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+56"/>
         <source>Editor Styles</source>
         <translation>Выгляд рэдактара</translation>
     </message>
     <message>
         <location line="+209"/>
-        <location filename="../src/ui-settings-dialog.h" line="+6"/>
         <source>(Changing buffer size clears history)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+28"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>History buffer Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+34"/>
-        <location filename="../src/ui-settings-dialog.h" line="+2"/>
         <source>Print debug location in terminal window in addition to the marker in the editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+16"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Terminal Colors</source>
         <translation>Колеры тэрміналу</translation>
     </message>
     <message>
         <location line="-173"/>
-        <location filename="../src/ui-settings-dialog.h" line="-6"/>
         <source>Font</source>
         <translation>Шрыфт</translation>
     </message>
     <message>
-        <location line="-917"/>
-        <location filename="../src/ui-settings-dialog.h" line="-58"/>
+        <location line="-1007"/>
         <source>Show line numbers</source>
         <translation>Паказваць нумары радкоў</translation>
     </message>
     <message>
-        <location line="-72"/>
-        <location filename="../src/ui-settings-dialog.h" line="-3"/>
+        <location line="+81"/>
         <source>Highlight current line</source>
         <translation>Фарбаваць дзейны радок</translation>
     </message>
     <message>
-        <location line="+85"/>
-        <location filename="../src/ui-settings-dialog.h" line="+4"/>
+        <location line="+13"/>
         <source>Show complete path in window title</source>
         <translation>Паказваць поўны шлях у загалоўку акна</translation>
     </message>
     <message>
-        <location line="-549"/>
-        <location filename="../src/ui-settings-dialog.h" line="-30"/>
+        <location line="-593"/>
         <source>Interface</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+52"/>
-        <location filename="../src/ui-settings-dialog.h" line="+3"/>
         <source>Confirm before exiting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+74"/>
-        <location filename="../src/ui-settings-dialog.h" line="+7"/>
         <source>Graphic icons</source>
         <translation>Графічныя значкі</translation>
     </message>
     <message>
         <location line="+29"/>
-        <location line="+592"/>
-        <location filename="../src/ui-settings-dialog.h" line="+2"/>
-        <location line="+28"/>
+        <location line="+640"/>
         <source>Show status bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-540"/>
-        <location filename="../src/ui-settings-dialog.h" line="-26"/>
+        <location line="-588"/>
         <source>Text inactive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="-32"/>
         <location line="+45"/>
-        <location filename="../src/ui-settings-dialog.h" line="-1"/>
-        <location line="+2"/>
         <source>Active</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+39"/>
-        <location filename="../src/ui-settings-dialog.h" line="+2"/>
         <source>Background inactive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+73"/>
-        <location filename="../src/ui-settings-dialog.h" line="+2"/>
         <source>Octave Startup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+41"/>
-        <location line="+1392"/>
-        <location filename="../src/ui-settings-dialog.h" line="+2"/>
-        <location line="+82"/>
+        <location line="+1440"/>
         <source>Startup path</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1379"/>
-        <location line="+1409"/>
-        <location filename="../src/ui-settings-dialog.h" line="-81"/>
-        <location line="+83"/>
+        <location line="-1427"/>
+        <location line="+1420"/>
         <source>Browse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1322"/>
-        <location filename="../src/ui-settings-dialog.h" line="-78"/>
+        <location line="-1103"/>
         <source>After Column</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+47"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
+        <location line="-97"/>
         <source>Show whitespace</source>
         <translation>Паказваць прагальныя знакі</translation>
     </message>
     <message>
-        <location line="+39"/>
-        <location filename="../src/ui-settings-dialog.h" line="+3"/>
+        <location line="+157"/>
         <source>Do not show whitespace used for indentation</source>
         <translation>Не паказваць прагальныя знакі ў водступах</translation>
     </message>
     <message>
-        <location line="+58"/>
-        <location filename="../src/ui-settings-dialog.h" line="+2"/>
+        <location line="-135"/>
         <source>Tab width min.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+64"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>max.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+615"/>
-        <location filename="../src/ui-settings-dialog.h" line="+45"/>
+        <location line="+577"/>
         <source>Create nonexistent files without prompting</source>
         <translation>Ствараць няісныя файлы без пытанняў</translation>
     </message>
     <message>
-        <location line="-429"/>
-        <location filename="../src/ui-settings-dialog.h" line="-28"/>
+        <location line="-441"/>
         <source>command line (%f=file, %l=line):</source>
         <translation>Загад (%f=файл, %l-радок):</translation>
     </message>
     <message>
-        <location line="+521"/>
-        <location filename="../src/ui-settings-dialog.h" line="+43"/>
+        <location line="+613"/>
         <source>Terminal</source>
         <translation>Тэрмінал</translation>
     </message>
     <message>
         <location line="+51"/>
-        <location filename="../src/ui-settings-dialog.h" line="-8"/>
         <source>Cursor type:</source>
         <translation>Тып курсора:</translation>
     </message>
     <message>
         <location line="-11"/>
-        <location filename="../src/ui-settings-dialog.h" line="-1"/>
         <source>Cursor blinking</source>
         <translation>Мігценне курсора</translation>
     </message>
     <message>
         <location line="-7"/>
-        <location filename="../src/ui-settings-dialog.h" line="-1"/>
         <source>Use foreground color</source>
         <translation>Выкар. колер пярэдняга плану</translation>
     </message>
     <message>
         <location line="+59"/>
-        <location filename="../src/ui-settings-dialog.h" line="+4"/>
         <source>Font size</source>
         <translation>Памер шрыфту</translation>
     </message>
     <message>
         <location line="+123"/>
-        <location filename="../src/ui-settings-dialog.h" line="+3"/>
         <source>Set focus to terminal when running a command from within another widget</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+73"/>
-        <location filename="../src/ui-settings-dialog.h" line="+15"/>
         <source>File Browser</source>
         <translation>Файлавы агляднік</translation>
     </message>
     <message>
-        <location line="+46"/>
-        <location filename="../src/ui-settings-dialog.h" line="-8"/>
-        <source>Show file size</source>
-        <translation>Паказваць памеры файлаў</translation>
-    </message>
-    <message>
-        <location line="-14"/>
-        <location filename="../src/ui-settings-dialog.h" line="-2"/>
-        <source>Show file type</source>
-        <translation>Паказваць тыпы файлаў</translation>
-    </message>
-    <message>
-        <location line="+21"/>
-        <location filename="../src/ui-settings-dialog.h" line="+3"/>
-        <source>Show date of last modification</source>
-        <translation>Паказваць дату апошняга змянення</translation>
-    </message>
-    <message>
-        <location line="-14"/>
-        <location filename="../src/ui-settings-dialog.h" line="-2"/>
-        <source>Show hidden files</source>
-        <translation>Паказваць схаваныя файлы</translation>
-    </message>
-    <message>
-        <location line="-1647"/>
-        <location filename="../src/ui-settings-dialog.h" line="-92"/>
+        <location line="-1661"/>
         <source>Normal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+270"/>
-        <location filename="../src/ui-settings-dialog.h" line="+15"/>
         <source>These preferences are applied after any .octaverc startup files.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+55"/>
-        <location filename="../src/ui-settings-dialog.h" line="+3"/>
         <source>Restore working directory of previous session</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+322"/>
-        <location filename="../src/ui-settings-dialog.h" line="+15"/>
+        <location line="+71"/>
         <source>Draw a long line marker</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+48"/>
-        <location filename="../src/ui-settings-dialog.h" line="+3"/>
+        <location line="+155"/>
         <source>Show EOL characters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
+        <location line="+662"/>
         <source>Default EOL mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+412"/>
-        <location filename="../src/ui-settings-dialog.h" line="+26"/>
+        <location line="-136"/>
         <source>Number of characters before list is shown: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+79"/>
-        <location filename="../src/ui-settings-dialog.h" line="+9"/>
         <source>File handling</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+93"/>
-        <location filename="../src/ui-settings-dialog.h" line="+5"/>
+        <location line="+185"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Select font, font size (as a difference from the default size), font style (&lt;b&gt;b&lt;/b&gt;old, &lt;b&gt;i&lt;/b&gt;talic, &lt;b&gt;u&lt;/b&gt;nderline), text color, and background color (for the latter, the color magenta (255,0,255) is a placeholder for the default background color).&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+341"/>
-        <location filename="../src/ui-settings-dialog.h" line="+13"/>
-        <source>Display</source>
+        <source>Behavior</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+30"/>
+        <source>Restore last directory of previous session</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+54"/>
+        <source>Extensions of files to be opened in the default text editor (separated by &quot;;&quot;):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+39"/>
-        <location filename="../src/ui-settings-dialog.h" line="+5"/>
-        <source>Alternating row colors</source>
-        <translation>Колеры радкоў чаргуюцца</translation>
-    </message>
-    <message>
-        <location line="+12"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
-        <source>Behavior</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+34"/>
-        <location filename="../src/ui-settings-dialog.h" line="+3"/>
-        <source>Restore last directory of previous session</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+71"/>
-        <location filename="../src/ui-settings-dialog.h" line="+5"/>
         <source>Workspace</source>
         <translation>Прастора зменных</translation>
     </message>
     <message>
-        <location line="+42"/>
-        <location filename="../src/ui-settings-dialog.h" line="-1"/>
+        <location line="+35"/>
+        <source>Colors for variable attributes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
         <source>Hide tool tips</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+182"/>
-        <location filename="../src/ui-settings-dialog.h" line="+14"/>
+        <location line="+101"/>
+        <source>Import shortcut set</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Export current shortcut set</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Reset shortcuts to their defaults</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location line="+80"/>
+        <source>Default</source>
+        <translation type="unfinished">Стандартны</translation>
+    </message>
+    <message>
+        <location line="-71"/>
         <source>Edit a shortcut by double-clicking in a cell</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+108"/>
-        <location filename="../src/ui-settings-dialog.h" line="+20"/>
+        <location line="+76"/>
+        <source>Actual</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
         <source>Network</source>
         <translation>Сетка</translation>
     </message>
     <message>
         <location line="+23"/>
-        <location filename="../src/ui-settings-dialog.h" line="-12"/>
         <source>Allow Octave to connect to the Octave web site to display current news and information</source>
         <translation>Дазволіць Octave злучацца з вэб-сайтам Octave для адлюстравання навінаў і свежай інфармацыі</translation>
     </message>
     <message>
         <location line="+46"/>
-        <location filename="../src/ui-settings-dialog.h" line="+8"/>
         <source>Use proxy server</source>
         <translation>Выкарыстоўваць проксі-сервер</translation>
     </message>
     <message>
         <location line="-23"/>
-        <location filename="../src/ui-settings-dialog.h" line="-4"/>
         <source>HttpProxy</source>
         <translation>HttpProxy</translation>
     </message>
     <message>
-        <location line="-2083"/>
-        <location filename="../src/ui-settings-dialog.h" line="-123"/>
+        <location line="-2039"/>
         <source>Icon set for dock widgets</source>
         <translation>Набор значкоў для віджэтаў</translation>
     </message>
     <message>
         <location line="-48"/>
-        <location filename="../src/ui-settings-dialog.h" line="-4"/>
         <source>Language (requires restart)</source>
         <translation>Мова (патрэбны перазапуск)</translation>
     </message>
     <message>
         <location line="-58"/>
-        <location filename="../src/ui-settings-dialog.h" line="-5"/>
         <source>Icon size</source>
         <translation>Памер значкоў</translation>
     </message>
     <message>
-        <location line="+1714"/>
-        <location filename="../src/ui-settings-dialog.h" line="+100"/>
+        <location line="+1716"/>
         <source>Synchronize Octave working directory with file browser</source>
         <translation>Сінхранізаваць дзейны каталог Octave з файлавым агляднікам</translation>
     </message>
     <message>
-        <location line="+132"/>
-        <location filename="../src/ui-settings-dialog.h" line="+5"/>
-        <source>Colors for variable attributes </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+34"/>
-        <location filename="../src/ui-settings-dialog.h" line="+22"/>
+        <location line="+184"/>
         <source>Shortcuts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+31"/>
-        <location filename="../src/ui-settings-dialog.h" line="-18"/>
         <source>Select this option to prevent conflicts with readline shortcuts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
-        <location filename="../src/ui-settings-dialog.h" line="+2"/>
         <source>Disable global shortcuts when terminal window has focus</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
-        <location line="+28"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
-        <location line="+4"/>
-        <source>Use this set</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-21"/>
-        <location filename="../src/ui-settings-dialog.h" line="-3"/>
-        <source>Set 1:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <location line="+37"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
-        <location line="+3"/>
+        <location line="+53"/>
         <source>Export</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-30"/>
-        <location line="+37"/>
-        <location filename="../src/ui-settings-dialog.h" line="-2"/>
-        <location line="+3"/>
+        <location line="-10"/>
         <source>Import</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
-        <source>Set 2:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+86"/>
-        <location filename="../src/ui-settings-dialog.h" line="+7"/>
+        <location line="+90"/>
         <source>Action</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
-        <location filename="../src/ui-settings-dialog.h" line="-1"/>
-        <source>Set 1 Default</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <location filename="../src/ui-settings-dialog.h" line="-1"/>
-        <source>Set 1 Actual</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <location filename="../src/ui-settings-dialog.h" line="-1"/>
-        <source>Set 2 Default</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <location filename="../src/ui-settings-dialog.h" line="-1"/>
-        <source>Set 2 Actual</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+68"/>
-        <location filename="../src/ui-settings-dialog.h" line="+11"/>
+        <location line="+83"/>
         <source>Socks5Proxy</source>
         <translation>Socks5Proxy</translation>
     </message>
     <message>
         <location line="-16"/>
-        <location filename="../src/ui-settings-dialog.h" line="-4"/>
         <source>Hostname:</source>
         <translation>Назва хоста:</translation>
     </message>
     <message>
         <location line="+44"/>
-        <location filename="../src/ui-settings-dialog.h" line="+8"/>
         <source>Proxy type:</source>
         <translation>Тып проксі:</translation>
     </message>
     <message>
         <location line="+10"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Port:</source>
         <translation>Порт:</translation>
     </message>
     <message>
         <location line="-27"/>
-        <location filename="../src/ui-settings-dialog.h" line="-3"/>
         <source>Username:</source>
         <translation>Імя карыстальніка:</translation>
     </message>
     <message>
         <location line="+37"/>
-        <location filename="../src/ui-settings-dialog.h" line="+4"/>
         <source>Password:</source>
         <translation>Пароль:</translation>
     </message>
     <message>
-        <location filename="../src/settings-dialog.cc" line="+77"/>
+        <location filename="../src/settings-dialog.cc" line="+127"/>
+        <source>Octave Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Unable to save settings.  Missing settings file or unknown directory.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+18"/>
         <location line="+4"/>
-        <location line="+561"/>
+        <location line="+444"/>
         <source>System setting</source>
         <translation>Сістэмная</translation>
     </message>
     <message>
-        <location line="-355"/>
+        <location line="-232"/>
         <source>IBeam Cursor</source>
         <translation>IBeam</translation>
     </message>
@@ -4334,35 +4469,7 @@
         <translation>Падкрэсленне</translation>
     </message>
     <message>
-        <location line="+213"/>
-        <source>Difference to the default size</source>
-        <translation>Розніца ад стандартнага памеру</translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Background color, pink (255,0,255) means default</source>
-        <translation>Для фону ружовы колер (255,0,255) азначае стандартны колер фону</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>b</source>
-        <comment>short form for bold</comment>
-        <translation>т</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>i</source>
-        <comment>short form for italic</comment>
-        <translation>к</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>u</source>
-        <comment>short form for underlined</comment>
-        <translation>п</translation>
-    </message>
-    <message>
-        <location line="+497"/>
+        <location line="+503"/>
         <source>Set Octave Startup Directory</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4375,7 +4482,7 @@
 <context>
     <name>setup_community_news</name>
     <message>
-        <location filename="../src/welcome-wizard.cc" line="+44"/>
+        <location filename="../src/welcome-wizard.cc" line="+42"/>
         <source>Community News</source>
         <translation>Навіны супольнасці</translation>
     </message>
@@ -4430,7 +4537,7 @@
 <context>
     <name>shortcut_manager</name>
     <message>
-        <location filename="../src/shortcut-manager.cc" line="+109"/>
+        <location filename="../src/shortcut-manager.cc" line="+106"/>
         <source>New File</source>
         <translation type="unfinished">Новы файл</translation>
     </message>
@@ -4460,42 +4567,38 @@
         <translation type="unfinished">Захаваць прастору зменных як</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <location line="+158"/>
+        <location line="+16"/>
+        <location line="+143"/>
         <source>Preferences</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-157"/>
+        <location line="-158"/>
         <source>Exit Octave</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
-        <location line="+84"/>
         <source>Copy</source>
         <translation type="unfinished">Капіяваць</translation>
     </message>
     <message>
-        <location line="-83"/>
-        <location line="+85"/>
+        <location line="+1"/>
         <source>Paste</source>
         <translation type="unfinished">Уставіць</translation>
     </message>
     <message>
-        <location line="-84"/>
-        <location line="+80"/>
+        <location line="+1"/>
         <source>Undo</source>
         <translation type="unfinished">Адрабіць</translation>
     </message>
     <message>
-        <location line="-79"/>
-        <location line="+84"/>
+        <location line="+1"/>
         <source>Select All</source>
         <translation type="unfinished">Вылучыць усё</translation>
     </message>
     <message>
-        <location line="-83"/>
+        <location line="+1"/>
         <source>Clear Clipboard</source>
         <translation type="unfinished">Ачысціць буфер</translation>
     </message>
@@ -4520,7 +4623,7 @@
         <translation type="unfinished">Ачысціць прастору зменных</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+6"/>
         <source>Step Into</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4591,12 +4694,12 @@
     </message>
     <message>
         <location line="+2"/>
-        <location line="+216"/>
+        <location line="+234"/>
         <source>Editor</source>
         <translation type="unfinished">Рэдактар</translation>
     </message>
     <message>
-        <location line="-214"/>
+        <location line="-232"/>
         <source>Documentation</source>
         <translation type="unfinished">Дакументацыя</translation>
     </message>
@@ -4676,18 +4779,28 @@
         <translation type="unfinished">Друк</translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+3"/>
         <source>Redo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
+        <source>Cut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Find and Replace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+2"/>
-        <source>Cut</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Find and Replace</source>
+        <source>Find Next</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Find Previous</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -4813,7 +4926,68 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-145"/>
+        <location line="+48"/>
+        <source>Switch to Left Tab</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Switch to Right Tab</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Move Tab Left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Move Tab Right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+44"/>
+        <source>Global</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+38"/>
+        <source>Tabs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+98"/>
+        <source>Enter new Shortcut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+143"/>
+        <source>Overwriting Shortcuts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>You are about to overwrite all shortcuts.
+Would you like to save the current shortcut set or cancel the action?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Don&apos;t save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+39"/>
+        <source>Import shortcuts from file ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Export shortcuts into file ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-571"/>
         <source>Step</source>
         <translation type="unfinished">Крок</translation>
     </message>
@@ -4874,6 +5048,21 @@
     </message>
     <message>
         <location line="+2"/>
+        <source>Show Toolbar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Show Statusbar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Show Horizontal Scrollbar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>Zoom In</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4929,12 +5118,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+42"/>
-        <source>Main</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <location line="+57"/>
         <location line="+23"/>
         <source>File</source>
         <translation type="unfinished"></translation>
@@ -4978,12 +5162,7 @@
         <translation type="unfinished">Выканаць</translation>
     </message>
     <message>
-        <location line="+124"/>
-        <source>Enter new Shortcut for Set %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
+        <location line="+106"/>
         <source>Apply the desired shortcut or click on the right button to reset the shortcut to its default.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5008,7 +5187,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+53"/>
+        <location line="+45"/>
         <source>Double Shortcut</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5022,23 +5201,13 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+71"/>
-        <source>Import shortcut set %1 from file ...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <location line="+6"/>
+        <location line="+113"/>
+        <location line="+5"/>
         <source>Octave Shortcut Files (*.osc);;All Files (*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1"/>
-        <source>Export shortcut set %1 into file ...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+15"/>
+        <location line="+10"/>
         <source>Failed to open %1 as octave shortcut file</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5077,7 +5246,7 @@
 <context>
     <name>welcome_wizard</name>
     <message>
-        <location filename="../src/welcome-wizard.cc" line="+135"/>
+        <location filename="../src/welcome-wizard.cc" line="+133"/>
         <source>Welcome to GNU Octave</source>
         <translation>Вітаем у GNU Octave</translation>
     </message>
@@ -5085,7 +5254,7 @@
 <context>
     <name>workspace_model</name>
     <message>
-        <location filename="../src/workspace-model.cc" line="-42"/>
+        <location filename="../src/workspace-model.cc" line="-41"/>
         <source>Name</source>
         <translation>Назва</translation>
     </message>
@@ -5110,7 +5279,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+109"/>
+        <location line="+108"/>
         <source>Right click to copy, rename, or display</source>
         <translation>Правы пстрык каб капіяваць, пераназваць ці адлюстраваць</translation>
     </message>
@@ -5124,7 +5293,7 @@
 <context>
     <name>workspace_view</name>
     <message>
-        <location filename="../src/workspace-view.cc" line="+50"/>
+        <location filename="../src/workspace-view.cc" line="+51"/>
         <source>Workspace</source>
         <translation>Прастора зменных</translation>
     </message>
@@ -5144,7 +5313,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+161"/>
+        <location line="+242"/>
         <source>Copy name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5160,11 +5329,41 @@
     </message>
     <message>
         <location line="+9"/>
-        <source>Only top-level symbols may be renamed.</source>
-        <translation>Можна пераназываць толькі сімвалы найвышэйшага ўзроўню.</translation>
-    </message>
-    <message>
-        <location line="+132"/>
+        <source>Only top-level symbols may be renamed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Hide filter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Show filter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+149"/>
+        <source>Class</source>
+        <translation type="unfinished">Клас</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Dimension</source>
+        <translation type="unfinished">Памернасць</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Value</source>
+        <translation type="unfinished">Значэнне</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Attribute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-17"/>
         <source>View the variables in the active workspace.&lt;br&gt;</source>
         <translation>Выгляд зменных у актыўнай прасторы зменных.&lt;br&gt;</translation>
     </message>
--- a/libgui/languages/de_DE.ts	Thu Aug 18 12:26:32 2016 -0700
+++ b/libgui/languages/de_DE.ts	Fri Aug 19 21:05:48 2016 +0200
@@ -4,7 +4,7 @@
 <context>
     <name>ListDialog</name>
     <message>
-        <location filename="../src/dialog.cc" line="+251"/>
+        <location filename="../src/dialog.cc" line="+258"/>
         <source>Select All</source>
         <translation>Alles auswählen</translation>
     </message>
@@ -12,7 +12,7 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../src/workspace-model.cc" line="+75"/>
+        <location filename="../src/workspace-model.cc" line="+74"/>
         <source>automatic</source>
         <translation>Automatisch</translation>
     </message>
@@ -61,11 +61,39 @@
         <source>cursor</source>
         <translation>Cursor</translation>
     </message>
+    <message>
+        <location filename="../src/settings-dialog.cc" line="+132"/>
+        <source>Difference to the default size</source>
+        <translation type="unfinished">Differenz zur Standardgröße</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Background color, pink (255,0,255) means default</source>
+        <translation type="unfinished">Hintergrundfarbe, Pink (255,0,255) für Standard</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>b</source>
+        <comment>short form for bold</comment>
+        <translation type="unfinished">f</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>i</source>
+        <comment>short form for italic</comment>
+        <translation type="unfinished">k</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>u</source>
+        <comment>short form for underlined</comment>
+        <translation type="unfinished">u</translation>
+    </message>
 </context>
 <context>
     <name>QTerminal</name>
     <message>
-        <location filename="../qterminal/libqterminal/QTerminal.h" line="+135"/>
+        <location filename="../qterminal/libqterminal/QTerminal.h" line="+130"/>
         <source>Copy</source>
         <translation>Kopieren</translation>
     </message>
@@ -80,15 +108,20 @@
         <translation>Alles auswählen</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+7"/>
         <source>Clear Window</source>
         <translation>Alles löschen</translation>
     </message>
+    <message>
+        <location filename="../qterminal/libqterminal/QTerminal.cc" line="+46"/>
+        <source>Edit %1 at line %2</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QWinTerminalImpl</name>
     <message>
-        <location filename="../qterminal/libqterminal/win32/QWinTerminalImpl.cpp" line="+1778"/>
+        <location filename="../qterminal/libqterminal/win32/QWinTerminalImpl.cpp" line="+1779"/>
         <source>copied selection to clipboard</source>
         <translation>Auswahl in die Zwischenablage kopiert</translation>
     </message>
@@ -96,7 +129,7 @@
 <context>
     <name>QtHandles::Figure</name>
     <message>
-        <location filename="../graphics/Figure.cc" line="+282"/>
+        <location filename="../graphics/Figure.cc" line="+298"/>
         <source>Figure ToolBar</source>
         <translation>Werkzeugleiste</translation>
     </message>
@@ -146,37 +179,19 @@
         <translation>&amp;Kopieren</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Cu&amp;t</source>
-        <translation>&amp;Ausschneiden</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>&amp;Paste</source>
-        <translation>E&amp;infügen</translation>
-    </message>
-    <message>
-        <location line="+5"/>
+        <location line="+7"/>
+        <location line="+463"/>
+        <source>About Octave</source>
+        <translation type="unfinished">Über Octave</translation>
+    </message>
+    <message>
+        <location line="-465"/>
         <source>&amp;Help</source>
         <translation>&amp;Hilfe</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>&amp;About QtHandles</source>
-        <translation>&amp;Über QtHandles</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>About &amp;Qt</source>
-        <translation>Über &amp;Qt</translation>
-    </message>
-    <message>
-        <location line="+427"/>
-        <source>About QtHandles</source>
-        <translation>Über QtHandles</translation>
-    </message>
-    <message>
-        <location line="+39"/>
+        <location line="+504"/>
+        <location line="+69"/>
         <source>Save Figure As</source>
         <translation>Abbildung speichern unter</translation>
     </message>
@@ -215,6 +230,160 @@
     </message>
 </context>
 <context>
+    <name>annotation_dialog</name>
+    <message>
+        <location filename="../graphics/annotation-dialog.ui" line="+17"/>
+        <source>Annotation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>String</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Font</source>
+        <translation type="unfinished">Schriftart</translation>
+    </message>
+    <message>
+        <location line="+42"/>
+        <source>bold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>b</source>
+        <translation type="unfinished">f</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>italic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>i</source>
+        <translation type="unfinished">k</translation>
+    </message>
+    <message>
+        <location line="+428"/>
+        <source>color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>Horz alignment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <location line="+29"/>
+        <source>middle</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-24"/>
+        <source>right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Vert alignment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>top</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>bottom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Position</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>X</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Y</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Width</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Height</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>units</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>normalized</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Fit to box</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Box</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Background</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+444"/>
+        <source>Edge</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+133"/>
+        <source>Line style</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>none</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Line width</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>documentation_dock_widget</name>
     <message>
         <location filename="../src/documentation-dock-widget.cc" line="+34"/>
@@ -230,17 +399,18 @@
 <context>
     <name>file_editor</name>
     <message>
-        <location filename="../src/m-editor/file-editor.cc" line="+285"/>
-        <location line="+125"/>
+        <location filename="../src/m-editor/file-editor.cc" line="+366"/>
+        <location line="+152"/>
         <location line="+19"/>
         <location line="+25"/>
         <location line="+62"/>
         <location line="+28"/>
+        <location line="+79"/>
         <source>Octave Editor</source>
         <translation>Octave Editor</translation>
     </message>
     <message>
-        <location line="-318"/>
+        <location line="-462"/>
         <source>Octave Files (*.m);;All Files (*)</source>
         <translation>Octave Dateien (*.m);;Alle Dateien (*)</translation>
     </message>
@@ -257,7 +427,7 @@
 </translation>
     </message>
     <message>
-        <location line="+330"/>
+        <location line="+395"/>
         <source>File not saved! A file with the selected name
 %1
 is already open in the editor</source>
@@ -266,12 +436,12 @@
 ist im Editor bereits geöffnet</translation>
     </message>
     <message>
-        <location line="+387"/>
+        <location line="+492"/>
         <source>&amp;%1 %2</source>
         <translation>&amp;%1 %2</translation>
     </message>
     <message>
-        <location line="+388"/>
+        <location line="+480"/>
         <source>&amp;Save File</source>
         <translation>Datei &amp;speichern</translation>
     </message>
@@ -287,41 +457,26 @@
     </message>
     <message>
         <location line="+7"/>
-        <source>&amp;Undo</source>
-        <translation>&amp;Rückgängig</translation>
-    </message>
-    <message>
-        <location line="+3"/>
         <source>&amp;Redo</source>
         <translation>&amp;Wiederherstellen</translation>
     </message>
     <message>
         <location line="+6"/>
-        <source>&amp;Copy</source>
-        <translation>&amp;Kopieren</translation>
-    </message>
-    <message>
-        <location line="+3"/>
         <source>Cu&amp;t</source>
         <translation>&amp;Ausschneiden</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Paste</source>
-        <translation>Einfügen</translation>
-    </message>
-    <message>
-        <location line="+96"/>
+        <location line="+94"/>
         <source>&amp;Next Bookmark</source>
         <translation>&amp;Nächstes Lesezeichen</translation>
     </message>
     <message>
-        <location line="-2"/>
+        <location line="+2"/>
         <source>Pre&amp;vious Bookmark</source>
         <translation>&amp;Vorheriges Lesezeichen</translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+2"/>
         <source>Toggle &amp;Bookmark</source>
         <translation>&amp;Lesezeichen umschalten</translation>
     </message>
@@ -331,7 +486,7 @@
         <translation>Alle Lesezeichen &amp;entfernen</translation>
     </message>
     <message>
-        <location line="+54"/>
+        <location line="+68"/>
         <source>&amp;Next Breakpoint</source>
         <translation>&amp;Nächster Haltepunkt</translation>
     </message>
@@ -351,7 +506,7 @@
         <translation>Alle Haltepunkte entfe&amp;rnen</translation>
     </message>
     <message>
-        <location line="-104"/>
+        <location line="-118"/>
         <source>&amp;Comment</source>
         <translation>&amp;Kommentieren</translation>
     </message>
@@ -373,29 +528,29 @@
         <translation>Einz&amp;ug verringern</translation>
     </message>
     <message>
-        <location line="-55"/>
+        <location line="-61"/>
         <source>&amp;Find and Replace...</source>
         <translation>&amp;Suchen und Ersetzen...</translation>
     </message>
     <message>
-        <location line="+162"/>
+        <location line="+182"/>
         <source>Save File and Run</source>
         <translation>Datei speichern und ausführen</translation>
     </message>
     <message>
-        <location line="-90"/>
+        <location line="-104"/>
         <source>Go &amp;to Line...</source>
         <translation>&amp;Gehe zu Zeile...</translation>
     </message>
     <message>
-        <location line="-1126"/>
+        <location line="-1341"/>
         <source>Could not start custom file editor
 %1</source>
         <translation>Externer Editor kann nicht gestartet werden:
 %1</translation>
     </message>
     <message>
-        <location line="+148"/>
+        <location line="+175"/>
         <source>Create</source>
         <translation>Erzeugen</translation>
     </message>
@@ -405,7 +560,7 @@
         <translation>Abbrechen</translation>
     </message>
     <message>
-        <location line="+844"/>
+        <location line="+1041"/>
         <source>&amp;Recent Editor Files</source>
         <translation>&amp;Zuletzt bearbeitete Dateien</translation>
     </message>
@@ -430,12 +585,7 @@
         <translation>Andere Dokumente schließen</translation>
     </message>
     <message>
-        <location line="+31"/>
-        <source>Select All</source>
-        <translation>Alles auswählen</translation>
-    </message>
-    <message>
-        <location line="+10"/>
+        <location line="+32"/>
         <source>&amp;Commands</source>
         <translation>Befe&amp;hle</translation>
     </message>
@@ -562,17 +712,62 @@
         <translation>Zei&amp;lennummern anzeigen</translation>
     </message>
     <message>
-        <location line="+128"/>
-        <source>Editor</source>
-        <translation>Editor</translation>
-    </message>
-    <message>
-        <location line="-120"/>
-        <source>Show Line &amp;Endings</source>
-        <translation>Z&amp;eilenenden anzeigen</translation>
+        <location line="+22"/>
+        <source>Show &amp;Toolbar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Show &amp;Statusbar</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+4"/>
+        <source>Show &amp;Horizontal Scrollbar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+69"/>
+        <source>Recent Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+65"/>
+        <source>Editor</source>
+        <translation>Editor</translation>
+    </message>
+    <message>
+        <location line="-156"/>
+        <source>Show Line &amp;Endings</source>
+        <translation>Z&amp;eilenenden anzeigen</translation>
+    </message>
+    <message>
+        <location line="-1467"/>
+        <source>File Encoding:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+403"/>
+        <source>%1 is a built-in function</source>
+        <translation type="unfinished">Kann %1 nicht öffnen: interne Funktion</translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>Can not find function %1</source>
+        <translation type="unfinished">Kann Funktion %1 nicht finden</translation>
+    </message>
+    <message>
+        <location line="+911"/>
+        <source>Find &amp;Next...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Find &amp;Previous...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+118"/>
         <source>Show &amp;Indentation Guides</source>
         <translation>E&amp;inrückungshinweise anzeigen</translation>
     </message>
@@ -582,7 +777,7 @@
         <translation>&amp;Markierung langer Zeilen anzeigen</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+20"/>
         <source>Zoom &amp;In</source>
         <translation>Ver&amp;größern</translation>
     </message>
@@ -617,7 +812,7 @@
         <translation>&amp;Dokumentation zum Schlüsselwort</translation>
     </message>
     <message>
-        <location line="-1103"/>
+        <location line="-1305"/>
         <source>Could not open file
 %1
 for read: %2.</source>
@@ -651,7 +846,7 @@
         <translation>Der zugehörige Editor-Reiter ist nicht mehr vorhanden.</translation>
     </message>
     <message>
-        <location line="+731"/>
+        <location line="+928"/>
         <source>&amp;File</source>
         <translation>&amp;Datei</translation>
     </message>
@@ -661,12 +856,12 @@
         <translation>&amp;Bearbeiten</translation>
     </message>
     <message>
-        <location line="+138"/>
+        <location line="+129"/>
         <source>Show &amp;Whitespace Characters</source>
         <translation>Lee&amp;rzeichen anzeigen</translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+42"/>
         <source>&amp;Debug</source>
         <translation>&amp;Debuggen</translation>
     </message>
@@ -679,12 +874,12 @@
 <context>
     <name>file_editor_tab</name>
     <message>
-        <location filename="../src/m-editor/file-editor-tab.cc" line="+92"/>
+        <location filename="../src/m-editor/file-editor-tab.cc" line="+145"/>
         <source>eol:</source>
         <translation>Zeilenende:</translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="-17"/>
         <source>line:</source>
         <translation>Zeile:</translation>
     </message>
@@ -694,17 +889,7 @@
         <translation>Spalte:</translation>
     </message>
     <message>
-        <location line="+156"/>
-        <source>%1 is a built-in function</source>
-        <translation>Kann %1 nicht öffnen: interne Funktion</translation>
-    </message>
-    <message>
-        <location line="+31"/>
-        <source>Can not find function %1</source>
-        <translation>Kann Funktion %1 nicht finden</translation>
-    </message>
-    <message>
-        <location line="+775"/>
+        <location line="+1146"/>
         <source>Goto line</source>
         <translation>Gehe zu Zeile</translation>
     </message>
@@ -714,7 +899,7 @@
         <translation>Zeilennummer</translation>
     </message>
     <message>
-        <location line="+146"/>
+        <location line="+145"/>
         <location line="+63"/>
         <source>&lt;unnamed&gt;</source>
         <translation>&lt;unbenannt&gt;</translation>
@@ -733,12 +918,28 @@
 soll geschlossen werden, wurde aber modifiziert.  %2</translation>
     </message>
     <message>
-        <location line="+288"/>
+        <location line="+298"/>
+        <source>Debug or Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>This file is currently being executed.
+Quit debugging and save?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+166"/>
         <source>Line Endings:</source>
         <translation>Zeilenenden:</translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+9"/>
+        <source>File Encoding:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+28"/>
         <source>Octave Files (*.m)</source>
         <translation>Octave Skripte (*.m)</translation>
     </message>
@@ -748,22 +949,59 @@
         <translation>Alle Dateien (*)</translation>
     </message>
     <message>
-        <location line="-322"/>
+        <location line="-513"/>
         <source>Do you want to cancel closing, save or discard the changes?</source>
         <translation>Änderungen speichern, verwerfen oder Schließen abbrechen?</translation>
     </message>
     <message>
-        <location line="-970"/>
-        <location line="+979"/>
-        <location line="+213"/>
-        <location line="+177"/>
-        <location line="+85"/>
+        <location line="-1342"/>
+        <source>encoding:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+239"/>
+        <source>Breakpoint condition</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+88"/>
+        <location line="+1024"/>
+        <location line="+372"/>
+        <location line="+215"/>
+        <location line="+21"/>
+        <location line="+83"/>
         <location line="+23"/>
         <source>Octave Editor</source>
         <translation>Octave Editor</translation>
     </message>
     <message>
-        <location line="-6"/>
+        <location line="-1737"/>
+        <source>Cannot add breakpoint to modified file.
+Save and add breakpoint, or canel?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1611"/>
+        <source>&quot;%1&quot;
+is not a valid identifier.
+
+If you keep this filename, you will not be able to
+call your script using its name as an Octave command.
+
+Do you want to choose another name?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>The current editor contents can not be encoded
+with the selected codec %1.
+Using it will result in data loss!
+
+Do you want to chose another codec?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+99"/>
         <source>
 
 Warning: The contents in the editor is modified!</source>
@@ -779,31 +1017,14 @@
 wurde gelöscht oder umbenannt. Soll die Datei jetzt gespeichert werden?%2</translation>
     </message>
     <message>
-        <location line="-285"/>
+        <location line="-342"/>
         <source>Could not open file %1 for write:
 %2.</source>
         <translation>Die Datei %1 konnte nicht zum Schreiben geöffnet werden:
 %2.</translation>
     </message>
     <message>
-        <location line="+177"/>
-        <source>&quot;%1&quot;
-is not a valid identifier.
-
-If you keep this file name, you will not be able to
-call your script using its name as an Octave command.
-
-Do you want to choose another name?</source>
-        <translation>&quot;%1&quot;
-ist kein gültiger Bezeichner.
-
-Wird das Skript unter diesem Namen gespeichert, kann
-es nicht als Octave-Befehl aufgerufen werden.
-
-Einen anderen Namen wählen?</translation>
-    </message>
-    <message>
-        <location line="+85"/>
+        <location line="+319"/>
         <source>It seems that &apos;%1&apos; has been modified by another application. Do you want to reload it?</source>
         <translation>Die Datei %1 wurde von einer anderen Anwendung verändert. Soll der neue Inhalt geladen werden?</translation>
     </message>
@@ -816,12 +1037,7 @@
         <translation>Dateibrowser</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Browse your files.</source>
-        <translation>Dateien durchsuchen</translation>
-    </message>
-    <message>
-        <location line="+18"/>
+        <location line="+35"/>
         <source>Enter the path or filename</source>
         <translation>Pfad oder Dateinamen eingeben</translation>
     </message>
@@ -842,22 +1058,67 @@
     </message>
     <message>
         <location line="+4"/>
-        <location line="+388"/>
+        <location line="+373"/>
         <source>Find Files...</source>
         <translation>Dateien suchen...</translation>
     </message>
     <message>
-        <location line="+364"/>
+        <location line="-26"/>
+        <source>Open in System File Explorer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Open in Text Editor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+389"/>
         <source>New Directory</source>
         <translation>Neues Verzeichnis</translation>
     </message>
     <message>
-        <location line="-784"/>
+        <location line="-773"/>
         <source>Show Octave directory</source>
         <translation>Aktuelles Octave Verzeichnis anzeigen</translation>
     </message>
     <message>
-        <location line="-4"/>
+        <location line="-49"/>
+        <source>Browse your files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Alternating row colors</source>
+        <translation type="unfinished">Alternierende Farben für die Zeilen verwenden</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>filesdockwidget/showFileSize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>filesdockwidget/showFileType</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>filesdockwidget/showLastModified</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>filesdockwidget/showHiddenFiles</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>filesdockwidget/useAlternatingRowColors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+29"/>
         <source>One directory up</source>
         <translation>Ein Verzeichnis höher</translation>
     </message>
@@ -878,53 +1139,48 @@
     </message>
     <message>
         <location line="+20"/>
-        <location line="+397"/>
+        <location line="+382"/>
         <source>New File...</source>
         <translation>Neue Datei...</translation>
     </message>
     <message>
-        <location line="-394"/>
-        <location line="+397"/>
+        <location line="-379"/>
+        <location line="+382"/>
         <source>New Directory...</source>
         <translation>Neues Verzeichnis...</translation>
     </message>
     <message>
-        <location line="-335"/>
+        <location line="-329"/>
         <source>Activate to open in editor, right click for alternatives</source>
         <translation>Doppelklick zum Öffnen im Editor, Rechtsklick für mehr Optionen</translation>
     </message>
     <message>
-        <location line="+236"/>
+        <location line="-136"/>
         <source>File size</source>
         <translation>Dateigröße</translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+1"/>
         <source>File type</source>
         <translation>Dateityp</translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+1"/>
         <source>Date modified</source>
         <translation>Änderungsdatum</translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+1"/>
         <source>Show hidden</source>
         <translation>Verborgene Dateien anzeigen</translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+415"/>
         <source>Open</source>
         <translation>Öffnen</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Open in Default Application</source>
-        <translation>Mit Standardanwendung öffnen</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <location line="+13"/>
         <source>Copy Selection to Clipboard</source>
         <translation>Kopiere Auswahl in die Zwischenablage</translation>
     </message>
@@ -954,7 +1210,7 @@
         <translation>Löschen...</translation>
     </message>
     <message>
-        <location line="+115"/>
+        <location line="+125"/>
         <source>Rename file/directory</source>
         <translation>Datei/Verzeichnis umbenennen</translation>
     </message>
@@ -990,7 +1246,7 @@
         <translation>Verzeichnis ist nicht leer und kann daher nicht gelöscht werden</translation>
     </message>
     <message>
-        <location line="+151"/>
+        <location line="+145"/>
         <source>Set directory of file browser</source>
         <translation>Setze aktuelles Browser Verzeichnis</translation>
     </message>
@@ -1029,7 +1285,7 @@
 <context>
     <name>final_page</name>
     <message>
-        <location filename="../src/welcome-wizard.cc" line="+199"/>
+        <location filename="../src/welcome-wizard.cc" line="+195"/>
         <source>Enjoy!</source>
         <translation>Viel Spaß!</translation>
     </message>
@@ -1092,7 +1348,7 @@
 <context>
     <name>find_dialog</name>
     <message>
-        <location filename="../src/m-editor/find-dialog.cc" line="+74"/>
+        <location filename="../src/m-editor/find-dialog.cc" line="+85"/>
         <source>Find and Replace</source>
         <translation>Suchen und Ersetzen</translation>
     </message>
@@ -1167,7 +1423,7 @@
         <translation>In Auswah&amp;l suchen</translation>
     </message>
     <message>
-        <location line="+84"/>
+        <location line="+87"/>
         <source>Search from end</source>
         <translation>Vom Ende suchen</translation>
     </message>
@@ -1177,7 +1433,7 @@
         <translation>Suche vom Beginn</translation>
     </message>
     <message>
-        <location line="+205"/>
+        <location line="+221"/>
         <source>Replace Result</source>
         <translation>Ergebnis der Ersetzungen</translation>
     </message>
@@ -1295,7 +1551,7 @@
         <translation>Suchergebnisse</translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+21"/>
         <source>Idle.</source>
         <translation>Leerlauf.</translation>
     </message>
@@ -1321,8 +1577,8 @@
     </message>
     <message>
         <location line="+15"/>
-        <source>File name/location</source>
-        <translation>Dateiname und Verzeichnis</translation>
+        <source>Filename/location</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+17"/>
@@ -1330,7 +1586,7 @@
         <translation>Dateiinhalt</translation>
     </message>
     <message>
-        <location line="+105"/>
+        <location line="+111"/>
         <source>Searching...</source>
         <translation>Suche...</translation>
     </message>
@@ -1349,7 +1605,7 @@
 <context>
     <name>find_files_model</name>
     <message>
-        <location filename="../src/find-files-model.cc" line="+82"/>
+        <location filename="../src/find-files-model.cc" line="+83"/>
         <source>Filename</source>
         <translation>Dateiname</translation>
     </message>
@@ -1387,7 +1643,7 @@
         <translation>Befehlshistorie</translation>
     </message>
     <message>
-        <location line="+89"/>
+        <location line="+107"/>
         <source>Copy</source>
         <translation>Kopieren</translation>
     </message>
@@ -1401,11 +1657,21 @@
         <source>Create script</source>
         <translation>Skript erzeugen</translation>
     </message>
+    <message>
+        <location line="+4"/>
+        <source>Hide filter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Show filter</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>initial_page</name>
     <message>
-        <location filename="../src/welcome-wizard.cc" line="-179"/>
+        <location filename="../src/welcome-wizard.cc" line="-176"/>
         <source>Welcome to Octave!</source>
         <translation>Willkommen bei Octave!</translation>
     </message>
@@ -1436,13 +1702,13 @@
 <context>
     <name>main_window</name>
     <message>
-        <location filename="../src/main-window.cc" line="+268"/>
+        <location filename="../src/main-window.cc" line="+275"/>
         <source>Load Workspace</source>
         <translation>Lade Arbeitsumgebung</translation>
     </message>
     <message>
-        <location line="+732"/>
-        <location line="+931"/>
+        <location line="+758"/>
+        <location line="+975"/>
         <source>About Octave</source>
         <translation>Über Octave</translation>
     </message>
@@ -1452,12 +1718,12 @@
         <translation>&amp;Datei</translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+45"/>
         <source>New</source>
         <translation>Neu</translation>
     </message>
     <message>
-        <location line="-43"/>
+        <location line="-39"/>
         <source>Open...</source>
         <translation>Öffnen...</translation>
     </message>
@@ -1467,7 +1733,7 @@
         <translation>Einstellungen...</translation>
     </message>
     <message>
-        <location line="-95"/>
+        <location line="-99"/>
         <source>Exit</source>
         <translation>Beenden</translation>
     </message>
@@ -1482,22 +1748,22 @@
         <translation>Rückgängig</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+7"/>
         <source>Copy</source>
         <translation>Kopieren</translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+5"/>
         <source>Paste</source>
         <translation>Einfügen</translation>
     </message>
     <message>
-        <location line="-1469"/>
+        <location line="-1537"/>
         <source>Save Workspace As</source>
         <translation>Arbeitsumgebung speichern unter</translation>
     </message>
     <message>
-        <location line="+134"/>
+        <location line="+124"/>
         <source>The release notes file &apos;%1&apos; is empty.</source>
         <translation>Die Datei &apos;%1&apos; mit Versionshinweisen ist leer.</translation>
     </message>
@@ -1507,7 +1773,7 @@
         <translation>Die Datei &apos;%1&apos; mit Versionshinweisen kann nicht gelesen werden.</translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="+12"/>
         <source>Octave Release Notes</source>
         <translation>Versionshinweise zu Octave</translation>
     </message>
@@ -1517,17 +1783,17 @@
         <translation>Neuigkeiten aus der Octave Community</translation>
     </message>
     <message>
-        <location line="+187"/>
+        <location line="+206"/>
         <source>Are you sure you want to exit Octave?</source>
         <translation>Octave wirklich beenden?</translation>
     </message>
     <message>
-        <location line="+854"/>
+        <location line="+916"/>
         <source>Open an existing file in editor</source>
         <translation>Öffne eine vorhandene Datei im Editor</translation>
     </message>
     <message>
-        <location line="+48"/>
+        <location line="+44"/>
         <source>New Function...</source>
         <translation>Neue Funktion...</translation>
     </message>
@@ -1537,12 +1803,12 @@
         <translation>Neue Abbildung</translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+39"/>
         <source>Select All</source>
         <translation>Alles auswählen</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="+4"/>
         <source>Clear Clipboard</source>
         <translation>Zwischenablage leeren</translation>
     </message>
@@ -1592,17 +1858,27 @@
         <translation>Dateibrowser</translation>
     </message>
     <message>
-        <location line="-84"/>
+        <location line="+36"/>
+        <source>Contribute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Donate to Octave</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-123"/>
         <source>Step In</source>
         <translation>Hineinspringen</translation>
     </message>
     <message>
-        <location line="-1020"/>
+        <location line="-1082"/>
         <source>Octave</source>
         <translation>Octave</translation>
     </message>
     <message>
-        <location line="+868"/>
+        <location line="+926"/>
         <source>Load Workspace...</source>
         <translation>Lade Arbeitsumgebung...</translation>
     </message>
@@ -1617,7 +1893,7 @@
         <translation>Neues Skript</translation>
     </message>
     <message>
-        <location line="+124"/>
+        <location line="+128"/>
         <source>Step Out</source>
         <translation>Herausspringen</translation>
     </message>
@@ -1637,17 +1913,7 @@
         <translation>Code teilen</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Contribute to Octave</source>
-        <translation>Zu Octave beitragen</translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Octave Developer Resources</source>
-        <translation>Ressourcen für Octave Entwickler</translation>
-    </message>
-    <message>
-        <location line="+14"/>
+        <location line="+20"/>
         <source>On Disk</source>
         <translation>Auf der Festplatte</translation>
     </message>
@@ -1693,8 +1959,8 @@
         <translation>Ein Verzeichnis höher</translation>
     </message>
     <message>
-        <location line="-1148"/>
-        <location line="+1151"/>
+        <location line="-1198"/>
+        <location line="+1201"/>
         <source>Browse directories</source>
         <translation>Verzeichnis suchen</translation>
     </message>
@@ -1773,7 +2039,7 @@
 <context>
     <name>news_reader</name>
     <message>
-        <location line="-1411"/>
+        <location line="-1492"/>
         <source>&lt;html&gt;
 &lt;body&gt;
 &lt;p&gt;
@@ -1832,18 +2098,18 @@
 <context>
     <name>octave_dock_widget</name>
     <message>
-        <location filename="../src/octave-dock-widget.cc" line="+68"/>
-        <location line="+198"/>
+        <location filename="../src/octave-dock-widget.cc" line="+67"/>
+        <location line="+201"/>
         <source>Undock widget</source>
         <translation>Fenster lösen</translation>
     </message>
     <message>
-        <location line="-188"/>
+        <location line="-191"/>
         <source>Hide widget</source>
         <translation>Fenster verbergen</translation>
     </message>
     <message>
-        <location line="+132"/>
+        <location line="+136"/>
         <source>Dock widget</source>
         <translation>Fenster andocken</translation>
     </message>
@@ -1851,7 +2117,7 @@
 <context>
     <name>octave_qscintilla</name>
     <message>
-        <location filename="../src/m-editor/octave-qscintilla.cc" line="+226"/>
+        <location filename="../src/m-editor/octave-qscintilla.cc" line="+237"/>
         <source>Help on</source>
         <translation>Hilfe zu</translation>
     </message>
@@ -1865,18 +2131,23 @@
         <source>Edit</source>
         <translation>Bearbeite</translation>
     </message>
+    <message>
+        <location line="+15"/>
+        <source>dbstop if ...</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>octave_qt_link</name>
     <message>
-        <location filename="../src/octave-qt-link.cc" line="+111"/>
-        <location line="+6"/>
-        <location line="+7"/>
+        <location filename="../src/octave-qt-link.cc" line="+136"/>
+        <location line="+9"/>
+        <location line="+11"/>
         <source>Create</source>
         <translation>Erzeugen</translation>
     </message>
     <message>
-        <location line="-10"/>
+        <location line="-14"/>
         <source>File
 %1
 does not exist. Do you want to create it?</source>
@@ -1890,7 +2161,7 @@
         <translation>Octave Editor</translation>
     </message>
     <message>
-        <location line="+211"/>
+        <location line="+254"/>
         <source>The file %1 does not exist in the load path.  To run or debug the function you are editing, you must either change to the directory %2 or add that directory to the load path.</source>
         <translation>Die Datei %1 befindet sich nicht im Suchpfad. Um die momentan geöffnete Datei auszuführen oder zu debuggen, in das Verzeichnis %2 wechseln oder dieses Verzeichnis dem Suchpfad hinzufügen.</translation>
     </message>
@@ -1915,8 +2186,8 @@
         <translation>Verzeichnis zum Suchpfad hinzufügen</translation>
     </message>
     <message>
-        <location line="-223"/>
-        <location line="+224"/>
+        <location line="-269"/>
+        <location line="+270"/>
         <source>Cancel</source>
         <translation>Abbrechen</translation>
     </message>
@@ -1932,7 +2203,7 @@
 <context>
     <name>resource_manager</name>
     <message>
-        <location filename="../src/resource-manager.cc" line="+245"/>
+        <location filename="../src/resource-manager.cc" line="+246"/>
         <source>The settings file
 %1
 does not exist and can not be created.
@@ -1958,75 +2229,62 @@
     <name>settings_dialog</name>
     <message>
         <location filename="../src/settings-dialog.ui" line="+23"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1738"/>
         <source>Settings</source>
         <translation>Einstellungen</translation>
     </message>
     <message>
         <location line="+19"/>
         <location line="+468"/>
-        <location filename="../src/ui-settings-dialog.h" line="+25"/>
-        <location line="+1"/>
         <source>General</source>
         <translation>Allgemein</translation>
     </message>
     <message>
         <location line="-338"/>
-        <location filename="../src/ui-settings-dialog.h" line="-17"/>
         <source>Octave logo only</source>
         <translation>Nur Octave Logo</translation>
     </message>
     <message>
         <location line="+10"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Letter icons</source>
         <translation>Icons mit Buchstaben</translation>
     </message>
     <message>
         <location line="-111"/>
-        <location filename="../src/ui-settings-dialog.h" line="-8"/>
         <source>Dock widget title bar</source>
         <translation>Titelleisten der Unterfenster</translation>
     </message>
     <message>
         <location line="+53"/>
-        <location filename="../src/ui-settings-dialog.h" line="+3"/>
         <source>Small</source>
         <translation>Klein</translation>
     </message>
     <message>
         <location line="+17"/>
-        <location filename="../src/ui-settings-dialog.h" line="+2"/>
         <source>Large</source>
         <translation>Groß</translation>
     </message>
     <message>
         <location line="+168"/>
-        <location filename="../src/ui-settings-dialog.h" line="+10"/>
         <source>Custom style</source>
         <translation>Benutzerdefiniert</translation>
     </message>
     <message>
         <location line="+32"/>
-        <location filename="../src/ui-settings-dialog.h" line="+2"/>
         <source>3D</source>
         <translation>3D</translation>
     </message>
     <message>
         <location line="+148"/>
-        <location filename="../src/ui-settings-dialog.h" line="+63"/>
         <source>Editor</source>
         <translation>Editor</translation>
     </message>
     <message>
-        <location line="+151"/>
-        <location filename="../src/ui-settings-dialog.h" line="-49"/>
+        <location line="+107"/>
         <source>Color</source>
         <translation>Farbe</translation>
     </message>
     <message>
-        <location line="+135"/>
-        <location filename="../src/ui-settings-dialog.h" line="+4"/>
+        <location line="-72"/>
         <source>This works well for monospaced fonts. The line is drawn at a position based on the width of a space character in the default font. It may not work very well if styles use proportional fonts or if varied font sizes or bold, italic and normal texts are used.</source>
         <translation>Funktioniert gut mit Schriftarten fester Breite.
 Die Position der angezeigten Linie basiert auf der Breite eines Leerzeichens der Standardschriftart.
@@ -2034,659 +2292,530 @@
 oder wenn unterschiedliche Schriftgrößen oder -stile (fett/kursiv/normal) verwendet werden.</translation>
     </message>
     <message>
-        <location line="+19"/>
-        <location filename="../src/ui-settings-dialog.h" line="+3"/>
+        <location line="+289"/>
         <source>Enable Code Folding</source>
         <translation>Code-Faltung aktivieren</translation>
     </message>
     <message>
-        <location line="+61"/>
-        <location filename="../src/ui-settings-dialog.h" line="+6"/>
+        <location line="+551"/>
         <source>Windows (CRLF)</source>
         <translation>Windows (CRLF)</translation>
     </message>
     <message>
         <location line="+5"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Mac (CR)</source>
         <translation>Mac (CR)</translation>
     </message>
     <message>
         <location line="+5"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Unix (LF)</source>
         <translation>Unix (LF)</translation>
     </message>
     <message>
-        <location line="+32"/>
-        <location filename="../src/ui-settings-dialog.h" line="+2"/>
+        <location line="-532"/>
         <source>Show horizontal scroll bar</source>
         <translation>Horizontale Bildlaufleiste anzeigen</translation>
     </message>
     <message>
-        <location line="+68"/>
-        <location filename="../src/ui-settings-dialog.h" line="+4"/>
+        <location line="-299"/>
+        <source>Show tool bar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+383"/>
         <source>Indentation</source>
         <translation>Einrückung</translation>
     </message>
     <message>
         <location line="+24"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Indent width</source>
         <translation>Einrücken um</translation>
     </message>
     <message>
         <location line="+7"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Tab indents line</source>
         <translation>Tabulator rückt ein</translation>
     </message>
     <message>
         <location line="+7"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Auto indentation</source>
         <translation>Auto Einrückung</translation>
     </message>
     <message>
         <location line="+26"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Tab width</source>
         <translation>Tabulatorweite</translation>
     </message>
     <message>
         <location line="+7"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Show indentation guides</source>
         <translation>Einrückregeln anzeigen</translation>
     </message>
     <message>
         <location line="+23"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Backspace unindents line</source>
         <translation>Rücktaste entfernt Einrückung</translation>
     </message>
     <message>
         <location line="+23"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Indentation uses tabs</source>
         <translation>Tabulator statt Leerzeichen</translation>
     </message>
     <message>
         <location line="+38"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Auto completion</source>
         <translation>Autovervollständigung</translation>
     </message>
     <message>
         <location line="+27"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Match keywords</source>
         <translation>Schlüsselwörter berücksichtigen</translation>
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Case sensitive</source>
         <translation>Groß-/Kleinschreibung beachten</translation>
     </message>
     <message>
         <location line="+23"/>
-        <location filename="../src/ui-settings-dialog.h" line="+2"/>
         <source>Replace word by suggested one</source>
         <translation>Wort durch Vorschlag ersetzen</translation>
     </message>
     <message>
         <location line="-10"/>
-        <location filename="../src/ui-settings-dialog.h" line="-1"/>
         <source>Match words in document</source>
         <translation>Wörter im Dokument berücksichtigen</translation>
     </message>
     <message>
         <location line="+48"/>
-        <location filename="../src/ui-settings-dialog.h" line="+2"/>
         <source>With Octave builtins</source>
         <translation>Mit internen Funktionen</translation>
     </message>
     <message>
         <location line="+10"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>With Octave functions</source>
         <translation>Mit Octave-Funktionen</translation>
     </message>
     <message>
         <location line="+64"/>
-        <location filename="../src/ui-settings-dialog.h" line="+9"/>
         <source>Show completion list automatically</source>
         <translation>Liste von Vorschlägen automatisch anzeigen</translation>
     </message>
     <message>
-        <location line="+51"/>
-        <location filename="../src/ui-settings-dialog.h" line="+2"/>
+        <location line="+63"/>
         <source>Restore editor tabs from previous session on startup</source>
         <translation>Editor-Dateien der letzten Sitzung wiederherstellen</translation>
     </message>
     <message>
-        <location line="+20"/>
-        <location filename="../src/ui-settings-dialog.h" line="+2"/>
+        <location line="-13"/>
         <source>Reload externally changed files without prompt</source>
         <translation>Extern geänderte Dateien ohne Nachfrage neu laden</translation>
     </message>
     <message>
-        <location line="-446"/>
-        <location filename="../src/ui-settings-dialog.h" line="-30"/>
+        <location line="-425"/>
         <source>Use custom file editor</source>
         <translation>Externen Editor verwenden</translation>
     </message>
     <message>
-        <location line="+482"/>
-        <location filename="../src/ui-settings-dialog.h" line="+33"/>
+        <location line="+518"/>
+        <source>Text encoding used for loading and saving</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+56"/>
         <source>Editor Styles</source>
         <translation>Editor Stile</translation>
     </message>
     <message>
         <location line="+209"/>
-        <location filename="../src/ui-settings-dialog.h" line="+6"/>
         <source>(Changing buffer size clears history)</source>
         <translation>(Ändern der Puffergröße löscht Historie)</translation>
     </message>
     <message>
         <location line="+28"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>History buffer Size</source>
         <translation>Puffergröße der Befehlshistorie</translation>
     </message>
     <message>
         <location line="+34"/>
-        <location filename="../src/ui-settings-dialog.h" line="+2"/>
         <source>Print debug location in terminal window in addition to the marker in the editor</source>
         <translation>Debug-Position im Terminal ausgeben, zusätzlich zur Markierung im Editor</translation>
     </message>
     <message>
         <location line="+16"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Terminal Colors</source>
         <translation>Farben des Befehlsfensters</translation>
     </message>
     <message>
         <location line="-173"/>
-        <location filename="../src/ui-settings-dialog.h" line="-6"/>
         <source>Font</source>
         <translation>Schriftart</translation>
     </message>
     <message>
-        <location line="-917"/>
-        <location filename="../src/ui-settings-dialog.h" line="-58"/>
+        <location line="-1007"/>
         <source>Show line numbers</source>
         <translation>Zeilennummern anzeigen</translation>
     </message>
     <message>
-        <location line="-72"/>
-        <location filename="../src/ui-settings-dialog.h" line="-3"/>
+        <location line="+81"/>
         <source>Highlight current line</source>
         <translation>Aktuelle Zeile hervorheben</translation>
     </message>
     <message>
-        <location line="+85"/>
-        <location filename="../src/ui-settings-dialog.h" line="+4"/>
+        <location line="+13"/>
         <source>Show complete path in window title</source>
         <translation>Kompletten Pfad im Reiter anzeigen</translation>
     </message>
     <message>
-        <location line="-549"/>
-        <location filename="../src/ui-settings-dialog.h" line="-30"/>
+        <location line="-593"/>
         <source>Interface</source>
         <translation>Benutzeroberfläche</translation>
     </message>
     <message>
         <location line="+52"/>
-        <location filename="../src/ui-settings-dialog.h" line="+3"/>
         <source>Confirm before exiting</source>
         <translation>Vor dem Beenden nachfragen</translation>
     </message>
     <message>
         <location line="+74"/>
-        <location filename="../src/ui-settings-dialog.h" line="+7"/>
         <source>Graphic icons</source>
         <translation>Grafische Icons</translation>
     </message>
     <message>
         <location line="+29"/>
-        <location line="+592"/>
-        <location filename="../src/ui-settings-dialog.h" line="+2"/>
-        <location line="+28"/>
+        <location line="+640"/>
         <source>Show status bar</source>
         <translation>Statusleiste anzeigen</translation>
     </message>
     <message>
-        <location line="-540"/>
-        <location filename="../src/ui-settings-dialog.h" line="-26"/>
+        <location line="-588"/>
         <source>Text inactive</source>
         <translation>Text inaktiv</translation>
     </message>
     <message>
         <location line="-32"/>
         <location line="+45"/>
-        <location filename="../src/ui-settings-dialog.h" line="-1"/>
-        <location line="+2"/>
         <source>Active</source>
         <translation>Aktiv</translation>
     </message>
     <message>
         <location line="+39"/>
-        <location filename="../src/ui-settings-dialog.h" line="+2"/>
         <source>Background inactive</source>
         <translation>Hintergrund inaktiv</translation>
     </message>
     <message>
         <location line="+73"/>
-        <location filename="../src/ui-settings-dialog.h" line="+2"/>
         <source>Octave Startup</source>
         <translation>Start von Octave</translation>
     </message>
     <message>
         <location line="+41"/>
-        <location line="+1392"/>
-        <location filename="../src/ui-settings-dialog.h" line="+2"/>
-        <location line="+82"/>
+        <location line="+1440"/>
         <source>Startup path</source>
         <translation>Startpfad</translation>
     </message>
     <message>
-        <location line="-1379"/>
-        <location line="+1409"/>
-        <location filename="../src/ui-settings-dialog.h" line="-81"/>
-        <location line="+83"/>
+        <location line="-1427"/>
+        <location line="+1420"/>
         <source>Browse</source>
         <translation>Auswählen</translation>
     </message>
     <message>
-        <location line="-1322"/>
-        <location filename="../src/ui-settings-dialog.h" line="-78"/>
+        <location line="-1103"/>
         <source>After Column</source>
         <translation>Nach Spalte</translation>
     </message>
     <message>
-        <location line="+47"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
+        <location line="-97"/>
         <source>Show whitespace</source>
         <translation>Leerzeichen anzeigen</translation>
     </message>
     <message>
-        <location line="+39"/>
-        <location filename="../src/ui-settings-dialog.h" line="+3"/>
+        <location line="+157"/>
         <source>Do not show whitespace used for indentation</source>
         <translation>Leerzeichen der Einrückung nicht anzeigen</translation>
     </message>
     <message>
-        <location line="+58"/>
-        <location filename="../src/ui-settings-dialog.h" line="+2"/>
+        <location line="-135"/>
         <source>Tab width min.</source>
         <translation>Reiterbreite min.</translation>
     </message>
     <message>
         <location line="+64"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>max.</source>
         <translation>max.</translation>
     </message>
     <message>
-        <location line="+615"/>
-        <location filename="../src/ui-settings-dialog.h" line="+45"/>
+        <location line="+577"/>
         <source>Create nonexistent files without prompting</source>
         <translation>Nicht existierende Dateien ohne Nachfrage anlegen</translation>
     </message>
     <message>
-        <location line="-429"/>
-        <location filename="../src/ui-settings-dialog.h" line="-28"/>
+        <location line="-441"/>
         <source>command line (%f=file, %l=line):</source>
         <translation>Kommandozeile (%f=Datei, %l=Zeile):</translation>
     </message>
     <message>
-        <location line="+521"/>
-        <location filename="../src/ui-settings-dialog.h" line="+43"/>
+        <location line="+613"/>
         <source>Terminal</source>
         <translation>Befehlsfenster</translation>
     </message>
     <message>
         <location line="+51"/>
-        <location filename="../src/ui-settings-dialog.h" line="-8"/>
         <source>Cursor type:</source>
         <translation>Cursortyp:</translation>
     </message>
     <message>
         <location line="-11"/>
-        <location filename="../src/ui-settings-dialog.h" line="-1"/>
         <source>Cursor blinking</source>
         <translation>Blinkender Cursor</translation>
     </message>
     <message>
         <location line="-7"/>
-        <location filename="../src/ui-settings-dialog.h" line="-1"/>
         <source>Use foreground color</source>
         <translation>Vordergrundfarbe verwenden</translation>
     </message>
     <message>
         <location line="+59"/>
-        <location filename="../src/ui-settings-dialog.h" line="+4"/>
         <source>Font size</source>
         <translation>Schriftgröße</translation>
     </message>
     <message>
         <location line="+123"/>
-        <location filename="../src/ui-settings-dialog.h" line="+3"/>
         <source>Set focus to terminal when running a command from within another widget</source>
         <translation>Wechsle ins Terminalfenster, wenn ein Befehl von einem anderen Fenster aus gestartet wird</translation>
     </message>
     <message>
         <location line="+73"/>
-        <location filename="../src/ui-settings-dialog.h" line="+15"/>
         <source>File Browser</source>
         <translation>Dateibrowser</translation>
     </message>
     <message>
-        <location line="+46"/>
-        <location filename="../src/ui-settings-dialog.h" line="-8"/>
-        <source>Show file size</source>
-        <translation>Dateigröße anzeigen</translation>
-    </message>
-    <message>
-        <location line="-14"/>
-        <location filename="../src/ui-settings-dialog.h" line="-2"/>
-        <source>Show file type</source>
-        <translation>Dateityp anzeigen</translation>
-    </message>
-    <message>
-        <location line="+21"/>
-        <location filename="../src/ui-settings-dialog.h" line="+3"/>
-        <source>Show date of last modification</source>
-        <translation>Datum der letzten Änderung anzeigen</translation>
-    </message>
-    <message>
-        <location line="-14"/>
-        <location filename="../src/ui-settings-dialog.h" line="-2"/>
-        <source>Show hidden files</source>
-        <translation>Versteckte Dateien anzeigen</translation>
-    </message>
-    <message>
-        <location line="-1647"/>
-        <location filename="../src/ui-settings-dialog.h" line="-92"/>
+        <location line="-1661"/>
         <source>Normal</source>
         <translation>Normal</translation>
     </message>
     <message>
         <location line="+270"/>
-        <location filename="../src/ui-settings-dialog.h" line="+15"/>
         <source>These preferences are applied after any .octaverc startup files.</source>
         <translation>Diese Einstellungen werden nach dem Laden vorhandener .octaverc-Dateien angewendet.</translation>
     </message>
     <message>
         <location line="+55"/>
-        <location filename="../src/ui-settings-dialog.h" line="+3"/>
         <source>Restore working directory of previous session</source>
         <translation>Arbeitsverzeichnis der vorherigen Sitzung wiederherstellen</translation>
     </message>
     <message>
-        <location line="+322"/>
-        <location filename="../src/ui-settings-dialog.h" line="+15"/>
+        <location line="+71"/>
         <source>Draw a long line marker</source>
         <translatorcomment>This is a fairly loose translation which is clearer IMO.</translatorcomment>
         <translation>Vertikale Linie zeichnen</translation>
     </message>
     <message>
-        <location line="+48"/>
-        <location filename="../src/ui-settings-dialog.h" line="+3"/>
+        <location line="+155"/>
         <source>Show EOL characters</source>
         <translation>EOL-Steuerzeichen anzeigen</translation>
     </message>
     <message>
-        <location line="+9"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
+        <location line="+662"/>
         <source>Default EOL mode</source>
         <translation>Standard-EOL-Modus</translation>
     </message>
     <message>
-        <location line="+412"/>
-        <location filename="../src/ui-settings-dialog.h" line="+26"/>
+        <location line="-136"/>
         <source>Number of characters before list is shown: </source>
         <translation>Mindestanzahl Zeichen für Öffnen der Liste: </translation>
     </message>
     <message>
         <location line="+79"/>
-        <location filename="../src/ui-settings-dialog.h" line="+9"/>
         <source>File handling</source>
         <translation>Dateiverwaltung</translation>
     </message>
     <message>
-        <location line="+93"/>
-        <location filename="../src/ui-settings-dialog.h" line="+5"/>
+        <location line="+185"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Select font, font size (as a difference from the default size), font style (&lt;b&gt;b&lt;/b&gt;old, &lt;b&gt;i&lt;/b&gt;talic, &lt;b&gt;u&lt;/b&gt;nderline), text color, and background color (for the latter, the color magenta (255,0,255) is a placeholder for the default background color).&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Wähle Schriftart, Schriftgröße (als Differenz zur Standard-Schriftgröße), Schriftstil (&lt;b&gt;f&lt;/b&gt;ett, &lt;b&gt;k&lt;/b&gt;ursiv, &lt;b&gt;u&lt;/b&gt;nterstrichen), Textfarbe und Hintergrundfarbe (bei letzterer ist Magenta (255,0,255) ein Platzhalter für die Standard-Hintergrundfarbe).&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location line="+341"/>
-        <location filename="../src/ui-settings-dialog.h" line="+13"/>
-        <source>Display</source>
-        <translation>Anzeige</translation>
+        <source>Behavior</source>
+        <translation>Verhalten</translation>
+    </message>
+    <message>
+        <location line="+30"/>
+        <source>Restore last directory of previous session</source>
+        <translation>Letztes Verzeichnis der vorherigen Sitzung wiederherstellen</translation>
+    </message>
+    <message>
+        <location line="+54"/>
+        <source>Extensions of files to be opened in the default text editor (separated by &quot;;&quot;):</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+39"/>
-        <location filename="../src/ui-settings-dialog.h" line="+5"/>
-        <source>Alternating row colors</source>
-        <translation>Alternierende Farben für die Zeilen verwenden</translation>
-    </message>
-    <message>
-        <location line="+12"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
-        <source>Behavior</source>
-        <translation>Verhalten</translation>
-    </message>
-    <message>
-        <location line="+34"/>
-        <location filename="../src/ui-settings-dialog.h" line="+3"/>
-        <source>Restore last directory of previous session</source>
-        <translation>Letztes Verzeichnis der vorherigen Sitzung wiederherstellen</translation>
-    </message>
-    <message>
-        <location line="+71"/>
-        <location filename="../src/ui-settings-dialog.h" line="+5"/>
         <source>Workspace</source>
         <translation>Arbeitsumgebung</translation>
     </message>
     <message>
-        <location line="+42"/>
-        <location filename="../src/ui-settings-dialog.h" line="-1"/>
+        <location line="+35"/>
+        <source>Colors for variable attributes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
         <source>Hide tool tips</source>
         <translation>Tooltips verbergen</translation>
     </message>
     <message>
-        <location line="+182"/>
-        <location filename="../src/ui-settings-dialog.h" line="+14"/>
+        <location line="+101"/>
+        <source>Import shortcut set</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Export current shortcut set</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Reset shortcuts to their defaults</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location line="+80"/>
+        <source>Default</source>
+        <translation type="unfinished">Standard</translation>
+    </message>
+    <message>
+        <location line="-71"/>
         <source>Edit a shortcut by double-clicking in a cell</source>
         <translation>Zum Bearbeiten eines Tastenkürzels auf eine Zelle doppelklicken</translation>
     </message>
     <message>
-        <location line="+108"/>
-        <location filename="../src/ui-settings-dialog.h" line="+20"/>
+        <location line="+76"/>
+        <source>Actual</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
         <source>Network</source>
         <translation>Netzwerk</translation>
     </message>
     <message>
         <location line="+23"/>
-        <location filename="../src/ui-settings-dialog.h" line="-12"/>
         <source>Allow Octave to connect to the Octave web site to display current news and information</source>
         <translation>Octave erlauben, Neuigkeiten und Informationen von der Octave Webseite anzuzeigen</translation>
     </message>
     <message>
         <location line="+46"/>
-        <location filename="../src/ui-settings-dialog.h" line="+8"/>
         <source>Use proxy server</source>
         <translation>Proxy-Server verwenden</translation>
     </message>
     <message>
         <location line="-23"/>
-        <location filename="../src/ui-settings-dialog.h" line="-4"/>
         <source>HttpProxy</source>
         <translation>HTTP Proxy</translation>
     </message>
     <message>
-        <location line="-2083"/>
-        <location filename="../src/ui-settings-dialog.h" line="-123"/>
+        <location line="-2039"/>
         <source>Icon set for dock widgets</source>
         <translation>Icons der Unterfenster</translation>
     </message>
     <message>
         <location line="-48"/>
-        <location filename="../src/ui-settings-dialog.h" line="-4"/>
         <source>Language (requires restart)</source>
         <translation>Sprache (Neustart erforderlich)</translation>
     </message>
     <message>
         <location line="-58"/>
-        <location filename="../src/ui-settings-dialog.h" line="-5"/>
         <source>Icon size</source>
         <translation>Icon-Größe</translation>
     </message>
     <message>
-        <location line="+1714"/>
-        <location filename="../src/ui-settings-dialog.h" line="+100"/>
+        <location line="+1716"/>
         <source>Synchronize Octave working directory with file browser</source>
         <translation>Octave-Arbeitsverzeichnis und Dateibrowser synchronisieren</translation>
     </message>
     <message>
-        <location line="+132"/>
-        <location filename="../src/ui-settings-dialog.h" line="+5"/>
-        <source>Colors for variable attributes </source>
-        <translation>Farben für Variablen-Attribute</translation>
-    </message>
-    <message>
-        <location line="+34"/>
-        <location filename="../src/ui-settings-dialog.h" line="+22"/>
+        <location line="+184"/>
         <source>Shortcuts</source>
         <translation>Tastenkürzel</translation>
     </message>
     <message>
         <location line="+31"/>
-        <location filename="../src/ui-settings-dialog.h" line="-18"/>
         <source>Select this option to prevent conflicts with readline shortcuts</source>
         <translation>Wähle diese Option, um Konflikte mit den Tastenkürzeln von &quot;Readline&quot; zu verhindern</translation>
     </message>
     <message>
         <location line="+3"/>
-        <location filename="../src/ui-settings-dialog.h" line="+2"/>
         <source>Disable global shortcuts when terminal window has focus</source>
         <translation>Globale Tastenkürzel deaktivieren, solange Terminal-Fenster den Fokus hat</translation>
     </message>
     <message>
-        <location line="+31"/>
-        <location line="+28"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
-        <location line="+4"/>
-        <source>Use this set</source>
-        <translation>Diesen Satz verwenden</translation>
-    </message>
-    <message>
-        <location line="-21"/>
-        <location filename="../src/ui-settings-dialog.h" line="-3"/>
-        <source>Set 1:</source>
-        <translation>Satz 1:</translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <location line="+37"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
-        <location line="+3"/>
+        <location line="+53"/>
         <source>Export</source>
         <translation>Exportieren</translation>
     </message>
     <message>
-        <location line="-30"/>
-        <location line="+37"/>
-        <location filename="../src/ui-settings-dialog.h" line="-2"/>
-        <location line="+3"/>
+        <location line="-10"/>
         <source>Import</source>
         <translation>Importieren</translation>
     </message>
     <message>
-        <location line="+7"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
-        <source>Set 2:</source>
-        <translation>Satz 2:</translation>
-    </message>
-    <message>
-        <location line="+86"/>
-        <location filename="../src/ui-settings-dialog.h" line="+7"/>
+        <location line="+90"/>
         <source>Action</source>
         <translation>Aktion</translation>
     </message>
     <message>
-        <location line="+10"/>
-        <location filename="../src/ui-settings-dialog.h" line="-1"/>
-        <source>Set 1 Default</source>
-        <translation>Satz 1 Standard</translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <location filename="../src/ui-settings-dialog.h" line="-1"/>
-        <source>Set 1 Actual</source>
-        <translation>Satz 1 aktuell</translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <location filename="../src/ui-settings-dialog.h" line="-1"/>
-        <source>Set 2 Default</source>
-        <translation>Satz 2 Standard</translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <location filename="../src/ui-settings-dialog.h" line="-1"/>
-        <source>Set 2 Actual</source>
-        <translation>Satz 2 aktuell</translation>
-    </message>
-    <message>
-        <location line="+68"/>
-        <location filename="../src/ui-settings-dialog.h" line="+11"/>
+        <location line="+83"/>
         <source>Socks5Proxy</source>
         <translation>Socks5Proxy</translation>
     </message>
     <message>
         <location line="-16"/>
-        <location filename="../src/ui-settings-dialog.h" line="-4"/>
         <source>Hostname:</source>
         <translation>Hostname:</translation>
     </message>
     <message>
         <location line="+44"/>
-        <location filename="../src/ui-settings-dialog.h" line="+8"/>
         <source>Proxy type:</source>
         <translation>Proxy Typ:</translation>
     </message>
     <message>
         <location line="+10"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Port:</source>
         <translation>Port:</translation>
     </message>
     <message>
         <location line="-27"/>
-        <location filename="../src/ui-settings-dialog.h" line="-3"/>
         <source>Username:</source>
         <translation>Nutzername:</translation>
     </message>
     <message>
         <location line="+37"/>
-        <location filename="../src/ui-settings-dialog.h" line="+4"/>
         <source>Password:</source>
         <translation>Passwort:</translation>
     </message>
     <message>
-        <location filename="../src/settings-dialog.cc" line="+77"/>
+        <location filename="../src/settings-dialog.cc" line="+127"/>
+        <source>Octave Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Unable to save settings.  Missing settings file or unknown directory.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+18"/>
         <location line="+4"/>
-        <location line="+561"/>
+        <location line="+444"/>
         <source>System setting</source>
         <translation>Systemeinstellung</translation>
     </message>
     <message>
-        <location line="-355"/>
+        <location line="-232"/>
         <source>IBeam Cursor</source>
         <translation>IBeam-Cursor</translation>
     </message>
@@ -2701,35 +2830,7 @@
         <translation>Unterstrichener Cursor</translation>
     </message>
     <message>
-        <location line="+213"/>
-        <source>Difference to the default size</source>
-        <translation>Differenz zur Standardgröße</translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Background color, pink (255,0,255) means default</source>
-        <translation>Hintergrundfarbe, Pink (255,0,255) für Standard</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>b</source>
-        <comment>short form for bold</comment>
-        <translation>f</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>i</source>
-        <comment>short form for italic</comment>
-        <translation>k</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>u</source>
-        <comment>short form for underlined</comment>
-        <translation>u</translation>
-    </message>
-    <message>
-        <location line="+497"/>
+        <location line="+503"/>
         <source>Set Octave Startup Directory</source>
         <translation>Octave Start-Ordner festlegen</translation>
     </message>
@@ -2742,7 +2843,7 @@
 <context>
     <name>setup_community_news</name>
     <message>
-        <location filename="../src/welcome-wizard.cc" line="+44"/>
+        <location filename="../src/welcome-wizard.cc" line="+42"/>
         <source>Community News</source>
         <translation>Neuigkeiten der Community</translation>
     </message>
@@ -2797,7 +2898,7 @@
 <context>
     <name>shortcut_manager</name>
     <message>
-        <location filename="../src/shortcut-manager.cc" line="+109"/>
+        <location filename="../src/shortcut-manager.cc" line="+106"/>
         <source>New File</source>
         <translation>Neue Datei</translation>
     </message>
@@ -2827,42 +2928,38 @@
         <translation>Arbeitsumgebung speichern unter</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <location line="+158"/>
+        <location line="+16"/>
+        <location line="+143"/>
         <source>Preferences</source>
         <translation>Einstellungen</translation>
     </message>
     <message>
-        <location line="-157"/>
+        <location line="-158"/>
         <source>Exit Octave</source>
         <translation>Octave beenden</translation>
     </message>
     <message>
         <location line="+3"/>
-        <location line="+84"/>
         <source>Copy</source>
         <translation>Kopieren</translation>
     </message>
     <message>
-        <location line="-83"/>
-        <location line="+85"/>
+        <location line="+1"/>
         <source>Paste</source>
         <translation>Einfügen</translation>
     </message>
     <message>
-        <location line="-84"/>
-        <location line="+80"/>
+        <location line="+1"/>
         <source>Undo</source>
         <translation>Rückgängig</translation>
     </message>
     <message>
-        <location line="-79"/>
-        <location line="+84"/>
+        <location line="+1"/>
         <source>Select All</source>
         <translation>Alles auswählen</translation>
     </message>
     <message>
-        <location line="-83"/>
+        <location line="+1"/>
         <source>Clear Clipboard</source>
         <translation>Zwischenablage leeren</translation>
     </message>
@@ -2887,7 +2984,7 @@
         <translation>Arbeitsumgebung löschen</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+6"/>
         <source>Step Into</source>
         <translation>Hineinspringen</translation>
     </message>
@@ -2958,12 +3055,12 @@
     </message>
     <message>
         <location line="+2"/>
-        <location line="+216"/>
+        <location line="+234"/>
         <source>Editor</source>
         <translation>Editor</translation>
     </message>
     <message>
-        <location line="-214"/>
+        <location line="-232"/>
         <source>Documentation</source>
         <translation>Dokumentation</translation>
     </message>
@@ -3043,19 +3140,29 @@
         <translation>Drucken</translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+3"/>
         <source>Redo</source>
         <translation>Wiederherstellen</translation>
     </message>
     <message>
+        <location line="+1"/>
+        <source>Cut</source>
+        <translation>Ausschneiden</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Find and Replace</source>
+        <translation>Suchen und Ersetzen</translation>
+    </message>
+    <message>
         <location line="+2"/>
-        <source>Cut</source>
-        <translation>Ausschneiden</translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Find and Replace</source>
-        <translation>Suchen und Ersetzen</translation>
+        <source>Find Next</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Find Previous</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+2"/>
@@ -3157,14 +3264,75 @@
         <translation>Leerzeichen anzeigen</translation>
     </message>
     <message>
-        <location line="-22"/>
+        <location line="+46"/>
+        <source>Switch to Left Tab</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Switch to Right Tab</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Move Tab Left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Move Tab Right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+44"/>
+        <source>Global</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+38"/>
+        <source>Tabs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+98"/>
+        <source>Enter new Shortcut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+143"/>
+        <source>Overwriting Shortcuts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>You are about to overwrite all shortcuts.
+Would you like to save the current shortcut set or cancel the action?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Don&apos;t save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+39"/>
+        <source>Import shortcuts from file ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Export shortcuts into file ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-446"/>
         <source>Goto Line</source>
         <translation>Gehe zu Zeile</translation>
     </message>
     <message>
         <location line="-125"/>
         <source>Step</source>
-        <translatorcomment>Armin: Vorher "Überspringen" im Kontrast zu "Hineinspringen"</translatorcomment>
+        <translatorcomment>Armin: Vorher &quot;Überspringen&quot; im Kontrast zu &quot;Hineinspringen&quot;</translatorcomment>
         <translation>Einzelschritt</translation>
     </message>
     <message>
@@ -3245,6 +3413,21 @@
     </message>
     <message>
         <location line="+2"/>
+        <source>Show Toolbar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Show Statusbar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Show Horizontal Scrollbar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>Zoom In</source>
         <translation>Vergrößern</translation>
     </message>
@@ -3300,12 +3483,7 @@
         <translation>Dokumentation zum Schlüsselwort</translation>
     </message>
     <message>
-        <location line="+42"/>
-        <source>Main</source>
-        <translation>Hauptprogramm</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <location line="+57"/>
         <location line="+23"/>
         <source>File</source>
         <translation>Datei</translation>
@@ -3349,12 +3527,7 @@
         <translation>Ausführen</translation>
     </message>
     <message>
-        <location line="+124"/>
-        <source>Enter new Shortcut for Set %1</source>
-        <translation>Neues Tastenkürzel für Satz %1 eingeben</translation>
-    </message>
-    <message>
-        <location line="+5"/>
+        <location line="+106"/>
         <source>Apply the desired shortcut or click on the right button to reset the shortcut to its default.</source>
         <translation>Das gewünschte Tastenkürzel eingeben oder auf die Schaltfläche rechts klicken, um das Tastenkürzel auf seinen Standardwert zurückzusetzen.</translation>
     </message>
@@ -3379,7 +3552,7 @@
         <translation>Auf Standardwert setzen</translation>
     </message>
     <message>
-        <location line="+53"/>
+        <location line="+45"/>
         <source>Double Shortcut</source>
         <translation>Doppeltes Tastenkürzel</translation>
     </message>
@@ -3397,23 +3570,13 @@
 verwendet. Soll das Tastenkürzel trotzdem verwendet werden und damit von der vorgenannten Aktion entfernt werden?</translation>
     </message>
     <message>
-        <location line="+71"/>
-        <source>Import shortcut set %1 from file ...</source>
-        <translation>Tastenkürzel-Satz %1 aus Datei importieren ...</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <location line="+6"/>
+        <location line="+113"/>
+        <location line="+5"/>
         <source>Octave Shortcut Files (*.osc);;All Files (*)</source>
         <translation>Octave Tastenkürzel-Dateien (*.osc);;Alle Dateien (*)</translation>
     </message>
     <message>
-        <location line="-1"/>
-        <source>Export shortcut set %1 into file ...</source>
-        <translation>Tastenkürzel-Satz %1 in Datei exportieren ...</translation>
-    </message>
-    <message>
-        <location line="+15"/>
+        <location line="+10"/>
         <source>Failed to open %1 as octave shortcut file</source>
         <translation>Konnte %1 nicht als Octave-Tastenkürzel-Datei öffnen</translation>
     </message>
@@ -3452,7 +3615,7 @@
 <context>
     <name>welcome_wizard</name>
     <message>
-        <location filename="../src/welcome-wizard.cc" line="+135"/>
+        <location filename="../src/welcome-wizard.cc" line="+133"/>
         <source>Welcome to GNU Octave</source>
         <translation>Willkommen bei GNU Octave</translation>
     </message>
@@ -3460,7 +3623,7 @@
 <context>
     <name>workspace_model</name>
     <message>
-        <location filename="../src/workspace-model.cc" line="-42"/>
+        <location filename="../src/workspace-model.cc" line="-41"/>
         <source>Name</source>
         <translation>Bezeichner</translation>
     </message>
@@ -3485,7 +3648,7 @@
         <translation>Attribut</translation>
     </message>
     <message>
-        <location line="+109"/>
+        <location line="+108"/>
         <source>Right click to copy, rename, or display</source>
         <translation>Rechtsklick zum Kopieren, Umbenennen oder Anzeigen</translation>
     </message>
@@ -3499,7 +3662,7 @@
 <context>
     <name>workspace_view</name>
     <message>
-        <location filename="../src/workspace-view.cc" line="+50"/>
+        <location filename="../src/workspace-view.cc" line="+51"/>
         <source>Workspace</source>
         <translation>Arbeitsumgebung</translation>
     </message>
@@ -3519,7 +3682,7 @@
         <translation>Filter</translation>
     </message>
     <message>
-        <location line="+161"/>
+        <location line="+242"/>
         <source>Copy name</source>
         <translation>Namen kopieren</translation>
     </message>
@@ -3535,11 +3698,41 @@
     </message>
     <message>
         <location line="+9"/>
-        <source>Only top-level symbols may be renamed.</source>
-        <translation>Nur Variablen auf höchster Ebene können umbenannt werden.</translation>
-    </message>
-    <message>
-        <location line="+132"/>
+        <source>Only top-level symbols may be renamed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Hide filter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Show filter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+149"/>
+        <source>Class</source>
+        <translation type="unfinished">Klasse</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Dimension</source>
+        <translation type="unfinished">Dimension</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Value</source>
+        <translation type="unfinished">Wert</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Attribute</source>
+        <translation type="unfinished">Attribut</translation>
+    </message>
+    <message>
+        <location line="-17"/>
         <source>View the variables in the active workspace.&lt;br&gt;</source>
         <translation>Einsehen der Variablen der aktiven Arbeitsumgebung.&lt;br&gt;</translation>
     </message>
--- a/libgui/languages/en_US.ts	Thu Aug 18 12:26:32 2016 -0700
+++ b/libgui/languages/en_US.ts	Fri Aug 19 21:05:48 2016 +0200
@@ -4,7 +4,7 @@
 <context>
     <name>ListDialog</name>
     <message>
-        <location filename="../src/dialog.cc" line="+251"/>
+        <location filename="../src/dialog.cc" line="+258"/>
         <source>Select All</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12,7 +12,7 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../src/workspace-model.cc" line="+75"/>
+        <location filename="../src/workspace-model.cc" line="+74"/>
         <source>automatic</source>
         <translation type="unfinished"></translation>
     </message>
@@ -61,11 +61,39 @@
         <source>cursor</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../src/settings-dialog.cc" line="+132"/>
+        <source>Difference to the default size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Background color, pink (255,0,255) means default</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>b</source>
+        <comment>short form for bold</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>i</source>
+        <comment>short form for italic</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>u</source>
+        <comment>short form for underlined</comment>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QTerminal</name>
     <message>
-        <location filename="../qterminal/libqterminal/QTerminal.h" line="+135"/>
+        <location filename="../qterminal/libqterminal/QTerminal.h" line="+130"/>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
@@ -80,15 +108,20 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+7"/>
         <source>Clear Window</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../qterminal/libqterminal/QTerminal.cc" line="+46"/>
+        <source>Edit %1 at line %2</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QWinTerminalImpl</name>
     <message>
-        <location filename="../qterminal/libqterminal/win32/QWinTerminalImpl.cpp" line="+1778"/>
+        <location filename="../qterminal/libqterminal/win32/QWinTerminalImpl.cpp" line="+1779"/>
         <source>copied selection to clipboard</source>
         <translation type="unfinished"></translation>
     </message>
@@ -96,7 +129,7 @@
 <context>
     <name>QtHandles::Figure</name>
     <message>
-        <location filename="../graphics/Figure.cc" line="+282"/>
+        <location filename="../graphics/Figure.cc" line="+298"/>
         <source>Figure ToolBar</source>
         <translation type="unfinished"></translation>
     </message>
@@ -146,37 +179,19 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Cu&amp;t</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>&amp;Paste</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
+        <location line="+7"/>
+        <location line="+463"/>
+        <source>About Octave</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-465"/>
         <source>&amp;Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>&amp;About QtHandles</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>About &amp;Qt</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+427"/>
-        <source>About QtHandles</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+39"/>
+        <location line="+504"/>
+        <location line="+69"/>
         <source>Save Figure As</source>
         <translation type="unfinished"></translation>
     </message>
@@ -215,6 +230,160 @@
     </message>
 </context>
 <context>
+    <name>annotation_dialog</name>
+    <message>
+        <location filename="../graphics/annotation-dialog.ui" line="+17"/>
+        <source>Annotation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>String</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Font</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+42"/>
+        <source>bold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>b</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>italic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>i</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+428"/>
+        <source>color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>Horz alignment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <location line="+29"/>
+        <source>middle</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-24"/>
+        <source>right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Vert alignment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>top</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>bottom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Position</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>X</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Y</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Width</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Height</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>units</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>normalized</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Fit to box</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Box</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Background</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+444"/>
+        <source>Edge</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+133"/>
+        <source>Line style</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>none</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Line width</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>documentation_dock_widget</name>
     <message>
         <location filename="../src/documentation-dock-widget.cc" line="+34"/>
@@ -230,17 +399,18 @@
 <context>
     <name>file_editor</name>
     <message>
-        <location filename="../src/m-editor/file-editor.cc" line="+285"/>
-        <location line="+125"/>
+        <location filename="../src/m-editor/file-editor.cc" line="+366"/>
+        <location line="+152"/>
         <location line="+19"/>
         <location line="+25"/>
         <location line="+62"/>
         <location line="+28"/>
+        <location line="+79"/>
         <source>Octave Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-318"/>
+        <location line="-462"/>
         <source>Octave Files (*.m);;All Files (*)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -256,19 +426,19 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+330"/>
+        <location line="+395"/>
         <source>File not saved! A file with the selected name
 %1
 is already open in the editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+387"/>
+        <location line="+492"/>
         <source>&amp;%1 %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+388"/>
+        <location line="+480"/>
         <source>&amp;Save File</source>
         <translation type="unfinished"></translation>
     </message>
@@ -284,41 +454,26 @@
     </message>
     <message>
         <location line="+7"/>
-        <source>&amp;Undo</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
         <source>&amp;Redo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+6"/>
-        <source>&amp;Copy</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
         <source>Cu&amp;t</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Paste</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+96"/>
+        <location line="+94"/>
         <source>&amp;Next Bookmark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-2"/>
+        <location line="+2"/>
         <source>Pre&amp;vious Bookmark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+2"/>
         <source>Toggle &amp;Bookmark</source>
         <translation type="unfinished"></translation>
     </message>
@@ -328,7 +483,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+54"/>
+        <location line="+68"/>
         <source>&amp;Next Breakpoint</source>
         <translation type="unfinished"></translation>
     </message>
@@ -348,7 +503,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-104"/>
+        <location line="-118"/>
         <source>&amp;Comment</source>
         <translation type="unfinished"></translation>
     </message>
@@ -368,28 +523,28 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-55"/>
+        <location line="-61"/>
         <source>&amp;Find and Replace...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+162"/>
+        <location line="+182"/>
         <source>Save File and Run</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-90"/>
+        <location line="-104"/>
         <source>Go &amp;to Line...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1126"/>
+        <location line="-1341"/>
         <source>Could not start custom file editor
 %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+148"/>
+        <location line="+175"/>
         <source>Create</source>
         <translation type="unfinished"></translation>
     </message>
@@ -399,7 +554,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+844"/>
+        <location line="+1041"/>
         <source>&amp;Recent Editor Files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -424,12 +579,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
-        <source>Select All</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
+        <location line="+32"/>
         <source>&amp;Commands</source>
         <translation type="unfinished"></translation>
     </message>
@@ -554,17 +704,62 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+128"/>
-        <source>Editor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-120"/>
-        <source>Show Line &amp;Endings</source>
+        <location line="+22"/>
+        <source>Show &amp;Toolbar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Show &amp;Statusbar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+4"/>
+        <source>Show &amp;Horizontal Scrollbar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+69"/>
+        <source>Recent Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+65"/>
+        <source>Editor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-156"/>
+        <source>Show Line &amp;Endings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-1467"/>
+        <source>File Encoding:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+403"/>
+        <source>%1 is a built-in function</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>Can not find function %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+911"/>
+        <source>Find &amp;Next...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Find &amp;Previous...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+118"/>
         <source>Show &amp;Indentation Guides</source>
         <translation type="unfinished"></translation>
     </message>
@@ -574,7 +769,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+20"/>
         <source>Zoom &amp;In</source>
         <translation type="unfinished"></translation>
     </message>
@@ -609,7 +804,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1103"/>
+        <location line="-1305"/>
         <source>Could not open file
 %1
 for read: %2.</source>
@@ -635,7 +830,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+731"/>
+        <location line="+928"/>
         <source>&amp;File</source>
         <translation type="unfinished"></translation>
     </message>
@@ -645,12 +840,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+138"/>
+        <location line="+129"/>
         <source>Show &amp;Whitespace Characters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+42"/>
         <source>&amp;Debug</source>
         <translation type="unfinished"></translation>
     </message>
@@ -663,12 +858,12 @@
 <context>
     <name>file_editor_tab</name>
     <message>
-        <location filename="../src/m-editor/file-editor-tab.cc" line="+92"/>
+        <location filename="../src/m-editor/file-editor-tab.cc" line="+145"/>
         <source>eol:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="-17"/>
         <source>line:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -678,17 +873,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+156"/>
-        <source>%1 is a built-in function</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+31"/>
-        <source>Can not find function %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+775"/>
+        <location line="+1146"/>
         <source>Goto line</source>
         <translation type="unfinished"></translation>
     </message>
@@ -698,7 +883,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+146"/>
+        <location line="+145"/>
         <location line="+63"/>
         <source>&lt;unnamed&gt;</source>
         <translation type="unfinished"></translation>
@@ -713,12 +898,28 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+288"/>
+        <location line="+298"/>
+        <source>Debug or Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>This file is currently being executed.
+Quit debugging and save?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+166"/>
         <source>Line Endings:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+9"/>
+        <source>File Encoding:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+28"/>
         <source>Octave Files (*.m)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -728,22 +929,59 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-322"/>
+        <location line="-513"/>
         <source>Do you want to cancel closing, save or discard the changes?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-970"/>
-        <location line="+979"/>
-        <location line="+213"/>
-        <location line="+177"/>
-        <location line="+85"/>
+        <location line="-1342"/>
+        <source>encoding:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+239"/>
+        <source>Breakpoint condition</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+88"/>
+        <location line="+1024"/>
+        <location line="+372"/>
+        <location line="+215"/>
+        <location line="+21"/>
+        <location line="+83"/>
         <location line="+23"/>
         <source>Octave Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-6"/>
+        <location line="-1737"/>
+        <source>Cannot add breakpoint to modified file.
+Save and add breakpoint, or canel?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1611"/>
+        <source>&quot;%1&quot;
+is not a valid identifier.
+
+If you keep this filename, you will not be able to
+call your script using its name as an Octave command.
+
+Do you want to choose another name?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>The current editor contents can not be encoded
+with the selected codec %1.
+Using it will result in data loss!
+
+Do you want to chose another codec?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+99"/>
         <source>
 
 Warning: The contents in the editor is modified!</source>
@@ -757,24 +995,13 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-285"/>
+        <location line="-342"/>
         <source>Could not open file %1 for write:
 %2.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+177"/>
-        <source>&quot;%1&quot;
-is not a valid identifier.
-
-If you keep this file name, you will not be able to
-call your script using its name as an Octave command.
-
-Do you want to choose another name?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+85"/>
+        <location line="+319"/>
         <source>It seems that &apos;%1&apos; has been modified by another application. Do you want to reload it?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -787,12 +1014,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Browse your files.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+18"/>
+        <location line="+35"/>
         <source>Enter the path or filename</source>
         <translation type="unfinished"></translation>
     </message>
@@ -813,22 +1035,67 @@
     </message>
     <message>
         <location line="+4"/>
-        <location line="+388"/>
+        <location line="+373"/>
         <source>Find Files...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+364"/>
+        <location line="-26"/>
+        <source>Open in System File Explorer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Open in Text Editor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+389"/>
         <source>New Directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-784"/>
+        <location line="-773"/>
         <source>Show Octave directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-4"/>
+        <location line="-49"/>
+        <source>Browse your files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Alternating row colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>filesdockwidget/showFileSize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>filesdockwidget/showFileType</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>filesdockwidget/showLastModified</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>filesdockwidget/showHiddenFiles</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>filesdockwidget/useAlternatingRowColors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+29"/>
         <source>One directory up</source>
         <translation type="unfinished"></translation>
     </message>
@@ -849,53 +1116,48 @@
     </message>
     <message>
         <location line="+20"/>
-        <location line="+397"/>
+        <location line="+382"/>
         <source>New File...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-394"/>
-        <location line="+397"/>
+        <location line="-379"/>
+        <location line="+382"/>
         <source>New Directory...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-335"/>
+        <location line="-329"/>
         <source>Activate to open in editor, right click for alternatives</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+236"/>
+        <location line="-136"/>
         <source>File size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+1"/>
         <source>File type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+1"/>
         <source>Date modified</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+1"/>
         <source>Show hidden</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+415"/>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Open in Default Application</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <location line="+13"/>
         <source>Copy Selection to Clipboard</source>
         <translation type="unfinished"></translation>
     </message>
@@ -925,7 +1187,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+115"/>
+        <location line="+125"/>
         <source>Rename file/directory</source>
         <translation type="unfinished"></translation>
     </message>
@@ -959,7 +1221,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+151"/>
+        <location line="+145"/>
         <source>Set directory of file browser</source>
         <translation type="unfinished"></translation>
     </message>
@@ -996,7 +1258,7 @@
 <context>
     <name>final_page</name>
     <message>
-        <location filename="../src/welcome-wizard.cc" line="+199"/>
+        <location filename="../src/welcome-wizard.cc" line="+195"/>
         <source>Enjoy!</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1044,7 +1306,7 @@
 <context>
     <name>find_dialog</name>
     <message>
-        <location filename="../src/m-editor/find-dialog.cc" line="+74"/>
+        <location filename="../src/m-editor/find-dialog.cc" line="+85"/>
         <source>Find and Replace</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1119,7 +1381,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+84"/>
+        <location line="+87"/>
         <source>Search from end</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1129,7 +1391,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+205"/>
+        <location line="+221"/>
         <source>Replace Result</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1247,7 +1509,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+21"/>
         <source>Idle.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1273,7 +1535,7 @@
     </message>
     <message>
         <location line="+15"/>
-        <source>File name/location</source>
+        <source>Filename/location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1282,7 +1544,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+105"/>
+        <location line="+111"/>
         <source>Searching...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1300,7 +1562,7 @@
 <context>
     <name>find_files_model</name>
     <message>
-        <location filename="../src/find-files-model.cc" line="+82"/>
+        <location filename="../src/find-files-model.cc" line="+83"/>
         <source>Filename</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1338,7 +1600,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+89"/>
+        <location line="+107"/>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1352,11 +1614,21 @@
         <source>Create script</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+4"/>
+        <source>Hide filter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Show filter</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>initial_page</name>
     <message>
-        <location filename="../src/welcome-wizard.cc" line="-179"/>
+        <location filename="../src/welcome-wizard.cc" line="-176"/>
         <source>Welcome to Octave!</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1383,13 +1655,13 @@
 <context>
     <name>main_window</name>
     <message>
-        <location filename="../src/main-window.cc" line="+268"/>
+        <location filename="../src/main-window.cc" line="+275"/>
         <source>Load Workspace</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+732"/>
-        <location line="+931"/>
+        <location line="+758"/>
+        <location line="+975"/>
         <source>About Octave</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1399,12 +1671,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+45"/>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-43"/>
+        <location line="-39"/>
         <source>Open...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1414,7 +1686,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-95"/>
+        <location line="-99"/>
         <source>Exit</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1429,22 +1701,22 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+7"/>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+5"/>
         <source>Paste</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1469"/>
+        <location line="-1537"/>
         <source>Save Workspace As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+134"/>
+        <location line="+124"/>
         <source>The release notes file &apos;%1&apos; is empty.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1454,7 +1726,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="+12"/>
         <source>Octave Release Notes</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1464,17 +1736,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+187"/>
+        <location line="+206"/>
         <source>Are you sure you want to exit Octave?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+854"/>
+        <location line="+916"/>
         <source>Open an existing file in editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+48"/>
+        <location line="+44"/>
         <source>New Function...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1484,12 +1756,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+39"/>
         <source>Select All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="+4"/>
         <source>Clear Clipboard</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1539,17 +1811,27 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-84"/>
+        <location line="+36"/>
+        <source>Contribute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Donate to Octave</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-123"/>
         <source>Step In</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1020"/>
+        <location line="-1082"/>
         <source>Octave</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+868"/>
+        <location line="+926"/>
         <source>Load Workspace...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1564,7 +1846,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+124"/>
+        <location line="+128"/>
         <source>Step Out</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1584,17 +1866,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Contribute to Octave</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Octave Developer Resources</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+14"/>
+        <location line="+20"/>
         <source>On Disk</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1639,8 +1911,8 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1148"/>
-        <location line="+1151"/>
+        <location line="-1198"/>
+        <location line="+1201"/>
         <source>Browse directories</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1719,7 +1991,7 @@
 <context>
     <name>news_reader</name>
     <message>
-        <location line="-1411"/>
+        <location line="-1492"/>
         <source>&lt;html&gt;
 &lt;body&gt;
 &lt;p&gt;
@@ -1755,18 +2027,18 @@
 <context>
     <name>octave_dock_widget</name>
     <message>
-        <location filename="../src/octave-dock-widget.cc" line="+68"/>
-        <location line="+198"/>
+        <location filename="../src/octave-dock-widget.cc" line="+67"/>
+        <location line="+201"/>
         <source>Undock widget</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-188"/>
+        <location line="-191"/>
         <source>Hide widget</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+132"/>
+        <location line="+136"/>
         <source>Dock widget</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1774,7 +2046,7 @@
 <context>
     <name>octave_qscintilla</name>
     <message>
-        <location filename="../src/m-editor/octave-qscintilla.cc" line="+226"/>
+        <location filename="../src/m-editor/octave-qscintilla.cc" line="+237"/>
         <source>Help on</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1788,18 +2060,23 @@
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+15"/>
+        <source>dbstop if ...</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>octave_qt_link</name>
     <message>
-        <location filename="../src/octave-qt-link.cc" line="+111"/>
-        <location line="+6"/>
-        <location line="+7"/>
+        <location filename="../src/octave-qt-link.cc" line="+136"/>
+        <location line="+9"/>
+        <location line="+11"/>
         <source>Create</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-10"/>
+        <location line="-14"/>
         <source>File
 %1
 does not exist. Do you want to create it?</source>
@@ -1811,7 +2088,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+211"/>
+        <location line="+254"/>
         <source>The file %1 does not exist in the load path.  To run or debug the function you are editing, you must either change to the directory %2 or add that directory to the load path.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1836,8 +2113,8 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-223"/>
-        <location line="+224"/>
+        <location line="-269"/>
+        <location line="+270"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1853,7 +2130,7 @@
 <context>
     <name>resource_manager</name>
     <message>
-        <location filename="../src/resource-manager.cc" line="+245"/>
+        <location filename="../src/resource-manager.cc" line="+246"/>
         <source>The settings file
 %1
 does not exist and can not be created.
@@ -1873,731 +2150,589 @@
     <name>settings_dialog</name>
     <message>
         <location filename="../src/settings-dialog.ui" line="+23"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1738"/>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+19"/>
         <location line="+468"/>
-        <location filename="../src/ui-settings-dialog.h" line="+25"/>
-        <location line="+1"/>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="-338"/>
-        <location filename="../src/ui-settings-dialog.h" line="-17"/>
         <source>Octave logo only</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+10"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Letter icons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="-111"/>
-        <location filename="../src/ui-settings-dialog.h" line="-8"/>
         <source>Dock widget title bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+53"/>
-        <location filename="../src/ui-settings-dialog.h" line="+3"/>
         <source>Small</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+17"/>
-        <location filename="../src/ui-settings-dialog.h" line="+2"/>
         <source>Large</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+168"/>
-        <location filename="../src/ui-settings-dialog.h" line="+10"/>
         <source>Custom style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+32"/>
-        <location filename="../src/ui-settings-dialog.h" line="+2"/>
         <source>3D</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+148"/>
-        <location filename="../src/ui-settings-dialog.h" line="+63"/>
         <source>Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+151"/>
-        <location filename="../src/ui-settings-dialog.h" line="-49"/>
+        <location line="+107"/>
         <source>Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+135"/>
-        <location filename="../src/ui-settings-dialog.h" line="+4"/>
+        <location line="-72"/>
         <source>This works well for monospaced fonts. The line is drawn at a position based on the width of a space character in the default font. It may not work very well if styles use proportional fonts or if varied font sizes or bold, italic and normal texts are used.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
-        <location filename="../src/ui-settings-dialog.h" line="+3"/>
+        <location line="+289"/>
         <source>Enable Code Folding</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+61"/>
-        <location filename="../src/ui-settings-dialog.h" line="+6"/>
+        <location line="+551"/>
         <source>Windows (CRLF)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+5"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Mac (CR)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+5"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Unix (LF)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
-        <location filename="../src/ui-settings-dialog.h" line="+2"/>
+        <location line="-532"/>
         <source>Show horizontal scroll bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+68"/>
-        <location filename="../src/ui-settings-dialog.h" line="+4"/>
+        <location line="-299"/>
+        <source>Show tool bar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+383"/>
         <source>Indentation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+24"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Indent width</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+7"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Tab indents line</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+7"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Auto indentation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+26"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Tab width</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+7"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Show indentation guides</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+23"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Backspace unindents line</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+23"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Indentation uses tabs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+38"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Auto completion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+27"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Match keywords</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Case sensitive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+23"/>
-        <location filename="../src/ui-settings-dialog.h" line="+2"/>
         <source>Replace word by suggested one</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="-10"/>
-        <location filename="../src/ui-settings-dialog.h" line="-1"/>
         <source>Match words in document</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+48"/>
-        <location filename="../src/ui-settings-dialog.h" line="+2"/>
         <source>With Octave builtins</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+10"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>With Octave functions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+64"/>
-        <location filename="../src/ui-settings-dialog.h" line="+9"/>
         <source>Show completion list automatically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+51"/>
-        <location filename="../src/ui-settings-dialog.h" line="+2"/>
+        <location line="+63"/>
         <source>Restore editor tabs from previous session on startup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
-        <location filename="../src/ui-settings-dialog.h" line="+2"/>
+        <location line="-13"/>
         <source>Reload externally changed files without prompt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-446"/>
-        <location filename="../src/ui-settings-dialog.h" line="-30"/>
+        <location line="-425"/>
         <source>Use custom file editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+482"/>
-        <location filename="../src/ui-settings-dialog.h" line="+33"/>
+        <location line="+518"/>
+        <source>Text encoding used for loading and saving</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+56"/>
         <source>Editor Styles</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+209"/>
-        <location filename="../src/ui-settings-dialog.h" line="+6"/>
         <source>(Changing buffer size clears history)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+28"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>History buffer Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+34"/>
-        <location filename="../src/ui-settings-dialog.h" line="+2"/>
         <source>Print debug location in terminal window in addition to the marker in the editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+16"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Terminal Colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="-173"/>
-        <location filename="../src/ui-settings-dialog.h" line="-6"/>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-917"/>
-        <location filename="../src/ui-settings-dialog.h" line="-58"/>
+        <location line="-1007"/>
         <source>Show line numbers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-72"/>
-        <location filename="../src/ui-settings-dialog.h" line="-3"/>
+        <location line="+81"/>
         <source>Highlight current line</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+85"/>
-        <location filename="../src/ui-settings-dialog.h" line="+4"/>
+        <location line="+13"/>
         <source>Show complete path in window title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-549"/>
-        <location filename="../src/ui-settings-dialog.h" line="-30"/>
+        <location line="-593"/>
         <source>Interface</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+52"/>
-        <location filename="../src/ui-settings-dialog.h" line="+3"/>
         <source>Confirm before exiting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+74"/>
-        <location filename="../src/ui-settings-dialog.h" line="+7"/>
         <source>Graphic icons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+29"/>
-        <location line="+592"/>
-        <location filename="../src/ui-settings-dialog.h" line="+2"/>
-        <location line="+28"/>
+        <location line="+640"/>
         <source>Show status bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-540"/>
-        <location filename="../src/ui-settings-dialog.h" line="-26"/>
+        <location line="-588"/>
         <source>Text inactive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="-32"/>
         <location line="+45"/>
-        <location filename="../src/ui-settings-dialog.h" line="-1"/>
-        <location line="+2"/>
         <source>Active</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+39"/>
-        <location filename="../src/ui-settings-dialog.h" line="+2"/>
         <source>Background inactive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+73"/>
-        <location filename="../src/ui-settings-dialog.h" line="+2"/>
         <source>Octave Startup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+41"/>
-        <location line="+1392"/>
-        <location filename="../src/ui-settings-dialog.h" line="+2"/>
-        <location line="+82"/>
+        <location line="+1440"/>
         <source>Startup path</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1379"/>
-        <location line="+1409"/>
-        <location filename="../src/ui-settings-dialog.h" line="-81"/>
-        <location line="+83"/>
+        <location line="-1427"/>
+        <location line="+1420"/>
         <source>Browse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1322"/>
-        <location filename="../src/ui-settings-dialog.h" line="-78"/>
+        <location line="-1103"/>
         <source>After Column</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+47"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
+        <location line="-97"/>
         <source>Show whitespace</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
-        <location filename="../src/ui-settings-dialog.h" line="+3"/>
+        <location line="+157"/>
         <source>Do not show whitespace used for indentation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+58"/>
-        <location filename="../src/ui-settings-dialog.h" line="+2"/>
+        <location line="-135"/>
         <source>Tab width min.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+64"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>max.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+615"/>
-        <location filename="../src/ui-settings-dialog.h" line="+45"/>
+        <location line="+577"/>
         <source>Create nonexistent files without prompting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-429"/>
-        <location filename="../src/ui-settings-dialog.h" line="-28"/>
+        <location line="-441"/>
         <source>command line (%f=file, %l=line):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+521"/>
-        <location filename="../src/ui-settings-dialog.h" line="+43"/>
+        <location line="+613"/>
         <source>Terminal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+51"/>
-        <location filename="../src/ui-settings-dialog.h" line="-8"/>
         <source>Cursor type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="-11"/>
-        <location filename="../src/ui-settings-dialog.h" line="-1"/>
         <source>Cursor blinking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="-7"/>
-        <location filename="../src/ui-settings-dialog.h" line="-1"/>
         <source>Use foreground color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+59"/>
-        <location filename="../src/ui-settings-dialog.h" line="+4"/>
         <source>Font size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+123"/>
-        <location filename="../src/ui-settings-dialog.h" line="+3"/>
         <source>Set focus to terminal when running a command from within another widget</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+73"/>
-        <location filename="../src/ui-settings-dialog.h" line="+15"/>
         <source>File Browser</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
-        <location filename="../src/ui-settings-dialog.h" line="-8"/>
-        <source>Show file size</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-14"/>
-        <location filename="../src/ui-settings-dialog.h" line="-2"/>
-        <source>Show file type</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+21"/>
-        <location filename="../src/ui-settings-dialog.h" line="+3"/>
-        <source>Show date of last modification</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-14"/>
-        <location filename="../src/ui-settings-dialog.h" line="-2"/>
-        <source>Show hidden files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-1647"/>
-        <location filename="../src/ui-settings-dialog.h" line="-92"/>
+        <location line="-1661"/>
         <source>Normal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+270"/>
-        <location filename="../src/ui-settings-dialog.h" line="+15"/>
         <source>These preferences are applied after any .octaverc startup files.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+55"/>
-        <location filename="../src/ui-settings-dialog.h" line="+3"/>
         <source>Restore working directory of previous session</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+322"/>
-        <location filename="../src/ui-settings-dialog.h" line="+15"/>
+        <location line="+71"/>
         <source>Draw a long line marker</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+48"/>
-        <location filename="../src/ui-settings-dialog.h" line="+3"/>
+        <location line="+155"/>
         <source>Show EOL characters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
+        <location line="+662"/>
         <source>Default EOL mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+412"/>
-        <location filename="../src/ui-settings-dialog.h" line="+26"/>
+        <location line="-136"/>
         <source>Number of characters before list is shown: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+79"/>
-        <location filename="../src/ui-settings-dialog.h" line="+9"/>
         <source>File handling</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+93"/>
-        <location filename="../src/ui-settings-dialog.h" line="+5"/>
+        <location line="+185"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Select font, font size (as a difference from the default size), font style (&lt;b&gt;b&lt;/b&gt;old, &lt;b&gt;i&lt;/b&gt;talic, &lt;b&gt;u&lt;/b&gt;nderline), text color, and background color (for the latter, the color magenta (255,0,255) is a placeholder for the default background color).&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+341"/>
-        <location filename="../src/ui-settings-dialog.h" line="+13"/>
-        <source>Display</source>
+        <source>Behavior</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+30"/>
+        <source>Restore last directory of previous session</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+54"/>
+        <source>Extensions of files to be opened in the default text editor (separated by &quot;;&quot;):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+39"/>
-        <location filename="../src/ui-settings-dialog.h" line="+5"/>
-        <source>Alternating row colors</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+12"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
-        <source>Behavior</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+34"/>
-        <location filename="../src/ui-settings-dialog.h" line="+3"/>
-        <source>Restore last directory of previous session</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+71"/>
-        <location filename="../src/ui-settings-dialog.h" line="+5"/>
         <source>Workspace</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+42"/>
-        <location filename="../src/ui-settings-dialog.h" line="-1"/>
+        <location line="+35"/>
+        <source>Colors for variable attributes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
         <source>Hide tool tips</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+182"/>
-        <location filename="../src/ui-settings-dialog.h" line="+14"/>
+        <location line="+101"/>
+        <source>Import shortcut set</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Export current shortcut set</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Reset shortcuts to their defaults</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location line="+80"/>
+        <source>Default</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-71"/>
         <source>Edit a shortcut by double-clicking in a cell</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+108"/>
-        <location filename="../src/ui-settings-dialog.h" line="+20"/>
+        <location line="+76"/>
+        <source>Actual</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
         <source>Network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+23"/>
-        <location filename="../src/ui-settings-dialog.h" line="-12"/>
         <source>Allow Octave to connect to the Octave web site to display current news and information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+46"/>
-        <location filename="../src/ui-settings-dialog.h" line="+8"/>
         <source>Use proxy server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="-23"/>
-        <location filename="../src/ui-settings-dialog.h" line="-4"/>
         <source>HttpProxy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-2083"/>
-        <location filename="../src/ui-settings-dialog.h" line="-123"/>
+        <location line="-2039"/>
         <source>Icon set for dock widgets</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="-48"/>
-        <location filename="../src/ui-settings-dialog.h" line="-4"/>
         <source>Language (requires restart)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="-58"/>
-        <location filename="../src/ui-settings-dialog.h" line="-5"/>
         <source>Icon size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1714"/>
-        <location filename="../src/ui-settings-dialog.h" line="+100"/>
+        <location line="+1716"/>
         <source>Synchronize Octave working directory with file browser</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+132"/>
-        <location filename="../src/ui-settings-dialog.h" line="+5"/>
-        <source>Colors for variable attributes </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+34"/>
-        <location filename="../src/ui-settings-dialog.h" line="+22"/>
+        <location line="+184"/>
         <source>Shortcuts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+31"/>
-        <location filename="../src/ui-settings-dialog.h" line="-18"/>
         <source>Select this option to prevent conflicts with readline shortcuts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
-        <location filename="../src/ui-settings-dialog.h" line="+2"/>
         <source>Disable global shortcuts when terminal window has focus</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
-        <location line="+28"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
-        <location line="+4"/>
-        <source>Use this set</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-21"/>
-        <location filename="../src/ui-settings-dialog.h" line="-3"/>
-        <source>Set 1:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <location line="+37"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
-        <location line="+3"/>
+        <location line="+53"/>
         <source>Export</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-30"/>
-        <location line="+37"/>
-        <location filename="../src/ui-settings-dialog.h" line="-2"/>
-        <location line="+3"/>
+        <location line="-10"/>
         <source>Import</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
-        <source>Set 2:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+86"/>
-        <location filename="../src/ui-settings-dialog.h" line="+7"/>
+        <location line="+90"/>
         <source>Action</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
-        <location filename="../src/ui-settings-dialog.h" line="-1"/>
-        <source>Set 1 Default</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <location filename="../src/ui-settings-dialog.h" line="-1"/>
-        <source>Set 1 Actual</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <location filename="../src/ui-settings-dialog.h" line="-1"/>
-        <source>Set 2 Default</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <location filename="../src/ui-settings-dialog.h" line="-1"/>
-        <source>Set 2 Actual</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+68"/>
-        <location filename="../src/ui-settings-dialog.h" line="+11"/>
+        <location line="+83"/>
         <source>Socks5Proxy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="-16"/>
-        <location filename="../src/ui-settings-dialog.h" line="-4"/>
         <source>Hostname:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+44"/>
-        <location filename="../src/ui-settings-dialog.h" line="+8"/>
         <source>Proxy type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+10"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Port:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="-27"/>
-        <location filename="../src/ui-settings-dialog.h" line="-3"/>
         <source>Username:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+37"/>
-        <location filename="../src/ui-settings-dialog.h" line="+4"/>
         <source>Password:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/settings-dialog.cc" line="+77"/>
+        <location filename="../src/settings-dialog.cc" line="+127"/>
+        <source>Octave Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Unable to save settings.  Missing settings file or unknown directory.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+18"/>
         <location line="+4"/>
-        <location line="+561"/>
+        <location line="+444"/>
         <source>System setting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-355"/>
+        <location line="-232"/>
         <source>IBeam Cursor</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2612,35 +2747,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+213"/>
-        <source>Difference to the default size</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Background color, pink (255,0,255) means default</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>b</source>
-        <comment>short form for bold</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>i</source>
-        <comment>short form for italic</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>u</source>
-        <comment>short form for underlined</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+497"/>
+        <location line="+503"/>
         <source>Set Octave Startup Directory</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2653,7 +2760,7 @@
 <context>
     <name>setup_community_news</name>
     <message>
-        <location filename="../src/welcome-wizard.cc" line="+44"/>
+        <location filename="../src/welcome-wizard.cc" line="+42"/>
         <source>Community News</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2697,7 +2804,7 @@
 <context>
     <name>shortcut_manager</name>
     <message>
-        <location filename="../src/shortcut-manager.cc" line="+109"/>
+        <location filename="../src/shortcut-manager.cc" line="+106"/>
         <source>New File</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2727,42 +2834,38 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <location line="+158"/>
+        <location line="+16"/>
+        <location line="+143"/>
         <source>Preferences</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-157"/>
+        <location line="-158"/>
         <source>Exit Octave</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
-        <location line="+84"/>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-83"/>
-        <location line="+85"/>
+        <location line="+1"/>
         <source>Paste</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-84"/>
-        <location line="+80"/>
+        <location line="+1"/>
         <source>Undo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-79"/>
-        <location line="+84"/>
+        <location line="+1"/>
         <source>Select All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-83"/>
+        <location line="+1"/>
         <source>Clear Clipboard</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2787,7 +2890,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+6"/>
         <source>Step Into</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2858,12 +2961,12 @@
     </message>
     <message>
         <location line="+2"/>
-        <location line="+216"/>
+        <location line="+234"/>
         <source>Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-214"/>
+        <location line="-232"/>
         <source>Documentation</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2943,18 +3046,28 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+3"/>
         <source>Redo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
+        <source>Cut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Find and Replace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+2"/>
-        <source>Cut</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Find and Replace</source>
+        <source>Find Next</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Find Previous</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -3080,7 +3193,68 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-145"/>
+        <location line="+48"/>
+        <source>Switch to Left Tab</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Switch to Right Tab</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Move Tab Left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Move Tab Right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+44"/>
+        <source>Global</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+38"/>
+        <source>Tabs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+98"/>
+        <source>Enter new Shortcut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+143"/>
+        <source>Overwriting Shortcuts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>You are about to overwrite all shortcuts.
+Would you like to save the current shortcut set or cancel the action?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Don&apos;t save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+39"/>
+        <source>Import shortcuts from file ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Export shortcuts into file ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-571"/>
         <source>Step</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3141,6 +3315,21 @@
     </message>
     <message>
         <location line="+2"/>
+        <source>Show Toolbar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Show Statusbar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Show Horizontal Scrollbar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>Zoom In</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3196,12 +3385,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+42"/>
-        <source>Main</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <location line="+57"/>
         <location line="+23"/>
         <source>File</source>
         <translation type="unfinished"></translation>
@@ -3245,12 +3429,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+124"/>
-        <source>Enter new Shortcut for Set %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
+        <location line="+106"/>
         <source>Apply the desired shortcut or click on the right button to reset the shortcut to its default.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3275,7 +3454,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+53"/>
+        <location line="+45"/>
         <source>Double Shortcut</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3289,23 +3468,13 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+71"/>
-        <source>Import shortcut set %1 from file ...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <location line="+6"/>
+        <location line="+113"/>
+        <location line="+5"/>
         <source>Octave Shortcut Files (*.osc);;All Files (*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1"/>
-        <source>Export shortcut set %1 into file ...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+15"/>
+        <location line="+10"/>
         <source>Failed to open %1 as octave shortcut file</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3344,7 +3513,7 @@
 <context>
     <name>welcome_wizard</name>
     <message>
-        <location filename="../src/welcome-wizard.cc" line="+135"/>
+        <location filename="../src/welcome-wizard.cc" line="+133"/>
         <source>Welcome to GNU Octave</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3352,7 +3521,7 @@
 <context>
     <name>workspace_model</name>
     <message>
-        <location filename="../src/workspace-model.cc" line="-42"/>
+        <location filename="../src/workspace-model.cc" line="-41"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3377,7 +3546,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+109"/>
+        <location line="+108"/>
         <source>Right click to copy, rename, or display</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3391,7 +3560,7 @@
 <context>
     <name>workspace_view</name>
     <message>
-        <location filename="../src/workspace-view.cc" line="+50"/>
+        <location filename="../src/workspace-view.cc" line="+51"/>
         <source>Workspace</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3411,7 +3580,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+161"/>
+        <location line="+242"/>
         <source>Copy name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3427,11 +3596,41 @@
     </message>
     <message>
         <location line="+9"/>
-        <source>Only top-level symbols may be renamed.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+132"/>
+        <source>Only top-level symbols may be renamed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Hide filter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Show filter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+149"/>
+        <source>Class</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Dimension</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Value</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Attribute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-17"/>
         <source>View the variables in the active workspace.&lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
--- a/libgui/languages/es_ES.ts	Thu Aug 18 12:26:32 2016 -0700
+++ b/libgui/languages/es_ES.ts	Fri Aug 19 21:05:48 2016 +0200
@@ -4,7 +4,7 @@
 <context>
     <name>ListDialog</name>
     <message>
-        <location filename="../src/dialog.cc" line="+251"/>
+        <location filename="../src/dialog.cc" line="+258"/>
         <source>Select All</source>
         <translation>Seleccionar todo</translation>
     </message>
@@ -12,7 +12,7 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../src/workspace-model.cc" line="+75"/>
+        <location filename="../src/workspace-model.cc" line="+74"/>
         <source>automatic</source>
         <translation>automático</translation>
     </message>
@@ -62,11 +62,39 @@
         <source>cursor</source>
         <translation>cursor</translation>
     </message>
+    <message>
+        <location filename="../src/settings-dialog.cc" line="+132"/>
+        <source>Difference to the default size</source>
+        <translation type="unfinished">Diferencia con el tamaño predeterminado</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Background color, pink (255,0,255) means default</source>
+        <translation type="unfinished">Color de fondo. Rosa (255,0,255) significa predeterminado</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>b</source>
+        <comment>short form for bold</comment>
+        <translation type="unfinished">n</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>i</source>
+        <comment>short form for italic</comment>
+        <translation type="unfinished">c</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>u</source>
+        <comment>short form for underlined</comment>
+        <translation type="unfinished">s</translation>
+    </message>
 </context>
 <context>
     <name>QTerminal</name>
     <message>
-        <location filename="../qterminal/libqterminal/QTerminal.h" line="+135"/>
+        <location filename="../qterminal/libqterminal/QTerminal.h" line="+130"/>
         <source>Copy</source>
         <translation>Copiar</translation>
     </message>
@@ -81,15 +109,20 @@
         <translation>Seleccionar todo</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+7"/>
         <source>Clear Window</source>
         <translation>Limpiar ventana</translation>
     </message>
+    <message>
+        <location filename="../qterminal/libqterminal/QTerminal.cc" line="+46"/>
+        <source>Edit %1 at line %2</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QWinTerminalImpl</name>
     <message>
-        <location filename="../qterminal/libqterminal/win32/QWinTerminalImpl.cpp" line="+1778"/>
+        <location filename="../qterminal/libqterminal/win32/QWinTerminalImpl.cpp" line="+1779"/>
         <source>copied selection to clipboard</source>
         <translation>selección copiada al portapapeles</translation>
     </message>
@@ -97,7 +130,7 @@
 <context>
     <name>QtHandles::Figure</name>
     <message>
-        <location filename="../graphics/Figure.cc" line="+282"/>
+        <location filename="../graphics/Figure.cc" line="+298"/>
         <source>Figure ToolBar</source>
         <translation>Barra de herramientas de figura</translation>
     </message>
@@ -147,37 +180,19 @@
         <translation>Cop&amp;iar</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Cu&amp;t</source>
-        <translation>Cor&amp;tar</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>&amp;Paste</source>
-        <translation>&amp;Pegar</translation>
-    </message>
-    <message>
-        <location line="+5"/>
+        <location line="+7"/>
+        <location line="+463"/>
+        <source>About Octave</source>
+        <translation type="unfinished">Acerca de Octave</translation>
+    </message>
+    <message>
+        <location line="-465"/>
         <source>&amp;Help</source>
         <translation>&amp;Ayuda</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>&amp;About QtHandles</source>
-        <translation>&amp;Acerca de QtHandles</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>About &amp;Qt</source>
-        <translation>Acerca de &amp;Qt</translation>
-    </message>
-    <message>
-        <location line="+427"/>
-        <source>About QtHandles</source>
-        <translation>Acerca de QtHandles</translation>
-    </message>
-    <message>
-        <location line="+39"/>
+        <location line="+504"/>
+        <location line="+69"/>
         <source>Save Figure As</source>
         <translation>Guardar figura como</translation>
     </message>
@@ -216,6 +231,160 @@
     </message>
 </context>
 <context>
+    <name>annotation_dialog</name>
+    <message>
+        <location filename="../graphics/annotation-dialog.ui" line="+17"/>
+        <source>Annotation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>String</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Font</source>
+        <translation type="unfinished">Tipo de fuente</translation>
+    </message>
+    <message>
+        <location line="+42"/>
+        <source>bold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>b</source>
+        <translation type="unfinished">n</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>italic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>i</source>
+        <translation type="unfinished">c</translation>
+    </message>
+    <message>
+        <location line="+428"/>
+        <source>color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>Horz alignment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <location line="+29"/>
+        <source>middle</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-24"/>
+        <source>right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Vert alignment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>top</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>bottom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Position</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>X</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Y</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Width</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Height</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>units</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>normalized</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Fit to box</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Box</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Background</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+444"/>
+        <source>Edge</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+133"/>
+        <source>Line style</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>none</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Line width</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>documentation_dock_widget</name>
     <message>
         <location filename="../src/documentation-dock-widget.cc" line="+34"/>
@@ -231,17 +400,18 @@
 <context>
     <name>file_editor</name>
     <message>
-        <location filename="../src/m-editor/file-editor.cc" line="+285"/>
-        <location line="+125"/>
+        <location filename="../src/m-editor/file-editor.cc" line="+366"/>
+        <location line="+152"/>
         <location line="+19"/>
         <location line="+25"/>
         <location line="+62"/>
         <location line="+28"/>
+        <location line="+79"/>
         <source>Octave Editor</source>
         <translation>Editor de Octave</translation>
     </message>
     <message>
-        <location line="-318"/>
+        <location line="-462"/>
         <source>Octave Files (*.m);;All Files (*)</source>
         <translation>Archivos de Octave (*.m);;Todos los archivos (*)</translation>
     </message>
@@ -251,12 +421,12 @@
         <translation>Nueva función</translation>
     </message>
     <message>
-        <location line="+718"/>
+        <location line="+888"/>
         <source>&amp;%1 %2</source>
         <translation>&amp;%1 %2</translation>
     </message>
     <message>
-        <location line="+388"/>
+        <location line="+480"/>
         <source>&amp;Save File</source>
         <translation>&amp;Guardar archivo</translation>
     </message>
@@ -272,55 +442,40 @@
     </message>
     <message>
         <location line="+7"/>
-        <source>&amp;Undo</source>
-        <translation>&amp;Deshacer</translation>
-    </message>
-    <message>
-        <location line="+3"/>
         <source>&amp;Redo</source>
         <translation>&amp;Rehacer</translation>
     </message>
     <message>
         <location line="+6"/>
-        <source>&amp;Copy</source>
-        <translation>&amp;Copiar</translation>
-    </message>
-    <message>
-        <location line="+3"/>
         <source>Cu&amp;t</source>
         <translation>Cor&amp;tar</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Paste</source>
-        <translation>Pegar</translation>
-    </message>
-    <message>
-        <location line="+96"/>
+        <location line="+94"/>
         <source>&amp;Next Bookmark</source>
         <translation>Siguiente &amp;marcador</translation>
     </message>
     <message>
-        <location line="-2"/>
+        <location line="+2"/>
         <source>Pre&amp;vious Bookmark</source>
         <translation>Marcador &amp;anterior</translation>
     </message>
     <message>
-        <location line="-1237"/>
+        <location line="-1492"/>
         <source>New function name:
 </source>
         <translation>Nombre para la nueva función:
 </translation>
     </message>
     <message>
-        <location line="+99"/>
+        <location line="+137"/>
         <source>Could not start custom file editor
 %1</source>
         <translation>No se puede abrir el editor de texto personalizado
 %1</translation>
     </message>
     <message>
-        <location line="+125"/>
+        <location line="+152"/>
         <source>Could not open file
 %1
 for read: %2.</source>
@@ -338,7 +493,7 @@
 no existe. ¿Desea crearlo?</translation>
     </message>
     <message>
-        <location line="+998"/>
+        <location line="+1186"/>
         <source>Toggle &amp;Bookmark</source>
         <translation>&amp;Alternar marcadores</translation>
     </message>
@@ -353,7 +508,7 @@
         <translation>Mostrar &amp;espacios en blanco</translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+48"/>
         <source>&amp;Next Breakpoint</source>
         <translation>&amp;Siguiente punto de interrupción</translation>
     </message>
@@ -373,7 +528,7 @@
         <translation>&amp;Eliminar todos los puntos de interrupción</translation>
     </message>
     <message>
-        <location line="-104"/>
+        <location line="-118"/>
         <source>&amp;Comment</source>
         <translation>&amp;Comentar</translation>
     </message>
@@ -393,22 +548,27 @@
         <translation>&amp;Eliminar sangría</translation>
     </message>
     <message>
-        <location line="-55"/>
+        <location line="-61"/>
         <source>&amp;Find and Replace...</source>
         <translation>&amp;Buscar y reemplazar...</translation>
     </message>
     <message>
-        <location line="+162"/>
+        <location line="+182"/>
         <source>Save File and Run</source>
         <translation>Guardar archivo y ejecutar</translation>
     </message>
     <message>
-        <location line="-90"/>
+        <location line="-104"/>
         <source>Go &amp;to Line...</source>
         <translation>&amp;Ir a línea...</translation>
     </message>
     <message>
-        <location line="-978"/>
+        <location line="-1425"/>
+        <source>File Encoding:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+259"/>
         <source>Create</source>
         <translation>Crear</translation>
     </message>
@@ -436,7 +596,17 @@
 abierto en el editor</translation>
     </message>
     <message>
-        <location line="+762"/>
+        <location line="+61"/>
+        <source>%1 is a built-in function</source>
+        <translation type="unfinished">%1 es una función integrada en Octave</translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>Can not find function %1</source>
+        <translation type="unfinished">No se encuentra la función %1</translation>
+    </message>
+    <message>
+        <location line="+862"/>
         <source>&amp;Recent Editor Files</source>
         <translation>Archivos &amp;recientes</translation>
     </message>
@@ -461,12 +631,7 @@
         <translation>Cerrar otros archivos</translation>
     </message>
     <message>
-        <location line="+31"/>
-        <source>Select All</source>
-        <translation>Seleccionar todo</translation>
-    </message>
-    <message>
-        <location line="+10"/>
+        <location line="+32"/>
         <source>&amp;Commands</source>
         <translation>&amp;Comandos</translation>
     </message>
@@ -592,17 +757,47 @@
         <translation>Mostrar números de &amp;línea</translation>
     </message>
     <message>
-        <location line="+128"/>
-        <source>Editor</source>
-        <translation>Editor</translation>
-    </message>
-    <message>
-        <location line="-120"/>
-        <source>Show Line &amp;Endings</source>
-        <translation>Mostrar &amp;fines de línea</translation>
+        <location line="+22"/>
+        <source>Show &amp;Toolbar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Show &amp;Statusbar</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+4"/>
+        <source>Show &amp;Horizontal Scrollbar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+69"/>
+        <source>Recent Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+65"/>
+        <source>Editor</source>
+        <translation>Editor</translation>
+    </message>
+    <message>
+        <location line="-156"/>
+        <source>Show Line &amp;Endings</source>
+        <translation>Mostrar &amp;fines de línea</translation>
+    </message>
+    <message>
+        <location line="-117"/>
+        <source>Find &amp;Next...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Find &amp;Previous...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+118"/>
         <source>Show &amp;Indentation Guides</source>
         <translation>Mostrar guías de &amp;sangría</translation>
     </message>
@@ -612,7 +807,7 @@
         <translation>Mostrar &amp;marcador de longitud de línea</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+20"/>
         <source>Zoom &amp;In</source>
         <translation>&amp;Ampliar</translation>
     </message>
@@ -647,12 +842,12 @@
         <translation>&amp;Documentación de palabras clave</translation>
     </message>
     <message>
-        <location line="-969"/>
+        <location line="-1171"/>
         <source>The associated file editor tab has disappeared.</source>
         <translation>La pestaña del editor de texto asociado ha desaparecido.</translation>
     </message>
     <message>
-        <location line="+731"/>
+        <location line="+928"/>
         <source>&amp;File</source>
         <translation>&amp;Archivo</translation>
     </message>
@@ -662,7 +857,7 @@
         <translation>&amp;Editar</translation>
     </message>
     <message>
-        <location line="+166"/>
+        <location line="+171"/>
         <source>&amp;Debug</source>
         <translation>&amp;Depurar</translation>
     </message>
@@ -675,12 +870,12 @@
 <context>
     <name>file_editor_tab</name>
     <message>
-        <location filename="../src/m-editor/file-editor-tab.cc" line="+92"/>
+        <location filename="../src/m-editor/file-editor-tab.cc" line="+145"/>
         <source>eol:</source>
         <translation>Fin de línea:</translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="-17"/>
         <source>line:</source>
         <translation>Línea:</translation>
     </message>
@@ -690,17 +885,7 @@
         <translation>Columna:</translation>
     </message>
     <message>
-        <location line="+156"/>
-        <source>%1 is a built-in function</source>
-        <translation>%1 es una función integrada en Octave</translation>
-    </message>
-    <message>
-        <location line="+31"/>
-        <source>Can not find function %1</source>
-        <translation>No se encuentra la función %1</translation>
-    </message>
-    <message>
-        <location line="+775"/>
+        <location line="+1146"/>
         <source>Goto line</source>
         <translation>Ir a la línea</translation>
     </message>
@@ -710,7 +895,7 @@
         <translation>Número de línea</translation>
     </message>
     <message>
-        <location line="+146"/>
+        <location line="+145"/>
         <location line="+63"/>
         <source>&lt;unnamed&gt;</source>
         <translation>&lt;sin nombre&gt;</translation>
@@ -729,31 +914,14 @@
 se va a cerrar, pero ha sido modificado.  %2</translation>
     </message>
     <message>
-        <location line="+213"/>
+        <location line="+372"/>
         <source>Could not open file %1 for write:
 %2.</source>
         <translation>El fichero %1 no se puede abrir para escritura:
 %2.</translation>
     </message>
     <message>
-        <location line="+177"/>
-        <source>&quot;%1&quot;
-is not a valid identifier.
-
-If you keep this file name, you will not be able to
-call your script using its name as an Octave command.
-
-Do you want to choose another name?</source>
-        <translation>&quot;%1&quot;
-no es un identificador válido.
-
-Si mantiene este nombre para el fichero, no podrá llamar al script
-usando su nombre como un comando de Octave.
-
-¿Desea seleccionar otro nombre?</translation>
-    </message>
-    <message>
-        <location line="+101"/>
+        <location line="+335"/>
         <source>
 
 Warning: The contents in the editor is modified!</source>
@@ -771,12 +939,44 @@
 ha sido eliminado o renombrado. ¿Desea salvarlo ahora?%2</translation>
     </message>
     <message>
-        <location line="-210"/>
+        <location line="-249"/>
         <source>Line Endings:</source>
         <translation>Fin de línea:</translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="-1817"/>
+        <source>encoding:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+239"/>
+        <source>Breakpoint condition</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+89"/>
+        <source>Cannot add breakpoint to modified file.
+Save and add breakpoint, or canel?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1322"/>
+        <source>Debug or Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>This file is currently being executed.
+Quit debugging and save?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+175"/>
+        <source>File Encoding:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+28"/>
         <source>Octave Files (*.m)</source>
         <translation>Archivos de Octave (*.m)</translation>
     </message>
@@ -786,22 +986,43 @@
         <translation>Todos los archivos (*)</translation>
     </message>
     <message>
-        <location line="-322"/>
+        <location line="-513"/>
         <source>Do you want to cancel closing, save or discard the changes?</source>
         <translation>¿Desea cancelar el cierre, guardar o descartar los cambios?</translation>
     </message>
     <message>
-        <location line="-970"/>
-        <location line="+979"/>
-        <location line="+213"/>
-        <location line="+177"/>
-        <location line="+85"/>
+        <location line="-1015"/>
+        <location line="+1024"/>
+        <location line="+372"/>
+        <location line="+215"/>
+        <location line="+21"/>
+        <location line="+83"/>
         <location line="+23"/>
         <source>Octave Editor</source>
         <translation>Editor de Octave</translation>
     </message>
     <message>
-        <location line="-22"/>
+        <location line="-126"/>
+        <source>&quot;%1&quot;
+is not a valid identifier.
+
+If you keep this filename, you will not be able to
+call your script using its name as an Octave command.
+
+Do you want to choose another name?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>The current editor contents can not be encoded
+with the selected codec %1.
+Using it will result in data loss!
+
+Do you want to chose another codec?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+83"/>
         <source>It seems that &apos;%1&apos; has been modified by another application. Do you want to reload it?</source>
         <translation>Parece que el archivo &apos;%1&apos; ha sido modificado por otra aplicación. ¿Desea recargarlo?</translation>
     </message>
@@ -814,12 +1035,7 @@
         <translation>Explorador de archivos</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Browse your files.</source>
-        <translation>Explore sus archivos.</translation>
-    </message>
-    <message>
-        <location line="+18"/>
+        <location line="+35"/>
         <source>Enter the path or filename</source>
         <translation>Introduzca la dirección o el nombre del archivo</translation>
     </message>
@@ -840,12 +1056,22 @@
     </message>
     <message>
         <location line="+4"/>
-        <location line="+388"/>
+        <location line="+373"/>
         <source>Find Files...</source>
         <translation>Buscar archivos...</translation>
     </message>
     <message>
-        <location line="+123"/>
+        <location line="-26"/>
+        <source>Open in System File Explorer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Open in Text Editor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+154"/>
         <source>Rename file/directory:
 </source>
         <translation>Renombrar fichero/directorio
@@ -866,17 +1092,52 @@
 </translation>
     </message>
     <message>
-        <location line="+214"/>
+        <location line="+208"/>
         <source>New Directory</source>
         <translation>Nuevo directorio</translation>
     </message>
     <message>
-        <location line="-784"/>
+        <location line="-773"/>
         <source>Show Octave directory</source>
         <translation>Mostrar el directorio de Octave</translation>
     </message>
     <message>
-        <location line="-4"/>
+        <location line="-49"/>
+        <source>Browse your files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Alternating row colors</source>
+        <translation type="unfinished">Alternar colores de filas</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>filesdockwidget/showFileSize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>filesdockwidget/showFileType</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>filesdockwidget/showLastModified</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>filesdockwidget/showHiddenFiles</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>filesdockwidget/useAlternatingRowColors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+29"/>
         <source>One directory up</source>
         <translation>Directorio superior</translation>
     </message>
@@ -897,53 +1158,48 @@
     </message>
     <message>
         <location line="+20"/>
-        <location line="+397"/>
+        <location line="+382"/>
         <source>New File...</source>
         <translation>Nuevo archivo...</translation>
     </message>
     <message>
-        <location line="-394"/>
-        <location line="+397"/>
+        <location line="-379"/>
+        <location line="+382"/>
         <source>New Directory...</source>
         <translation>Nuevo directorio...</translation>
     </message>
     <message>
-        <location line="-335"/>
+        <location line="-329"/>
         <source>Activate to open in editor, right click for alternatives</source>
         <translation>Activar para abrir en el editor. Haga clic derecho para ver las alternativas</translation>
     </message>
     <message>
-        <location line="+236"/>
+        <location line="-136"/>
         <source>File size</source>
         <translation>Tamaño del archivo</translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+1"/>
         <source>File type</source>
         <translation>Tipo de archivo</translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+1"/>
         <source>Date modified</source>
         <translation>Fecha de modificación</translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+1"/>
         <source>Show hidden</source>
         <translation>Mostrar ocultos</translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+415"/>
         <source>Open</source>
         <translation>Abrir</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Open in Default Application</source>
-        <translation>Abrir en aplicación predeterminada</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <location line="+13"/>
         <source>Copy Selection to Clipboard</source>
         <translation>Copiar selección al portapapeles</translation>
     </message>
@@ -973,7 +1229,7 @@
         <translation>Eliminar...</translation>
     </message>
     <message>
-        <location line="+115"/>
+        <location line="+125"/>
         <source>Rename file/directory</source>
         <translation>Renombrar archivo/directorio</translation>
     </message>
@@ -989,7 +1245,7 @@
         <translation>No se puede eliminar un directorio que no esté vacío</translation>
     </message>
     <message>
-        <location line="+151"/>
+        <location line="+145"/>
         <source>Set directory of file browser</source>
         <translation>Seleccionar directorio de explorador de archivos</translation>
     </message>
@@ -1028,7 +1284,7 @@
 <context>
     <name>final_page</name>
     <message>
-        <location filename="../src/welcome-wizard.cc" line="+199"/>
+        <location filename="../src/welcome-wizard.cc" line="+195"/>
         <source>Enjoy!</source>
         <translation>¡Disfrútelo!</translation>
     </message>
@@ -1094,7 +1350,7 @@
 <context>
     <name>find_dialog</name>
     <message>
-        <location filename="../src/m-editor/find-dialog.cc" line="+74"/>
+        <location filename="../src/m-editor/find-dialog.cc" line="+85"/>
         <source>Find and Replace</source>
         <translation>Buscar y reemplazar</translation>
     </message>
@@ -1169,7 +1425,7 @@
         <translation>Buscar se&amp;lección</translation>
     </message>
     <message>
-        <location line="+84"/>
+        <location line="+87"/>
         <source>Search from end</source>
         <translation>Buscar desde el final</translation>
     </message>
@@ -1179,7 +1435,7 @@
         <translation>Buscar desde el inicio</translation>
     </message>
     <message>
-        <location line="+205"/>
+        <location line="+221"/>
         <source>Replace Result</source>
         <translation>Reemplazar resultado</translation>
     </message>
@@ -1297,7 +1553,7 @@
         <translation>Resultados de la búsqueda</translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+21"/>
         <source>Idle.</source>
         <translation>Inactivo.</translation>
     </message>
@@ -1323,8 +1579,8 @@
     </message>
     <message>
         <location line="+15"/>
-        <source>File name/location</source>
-        <translation>Nombre de archivo/ubicación</translation>
+        <source>Filename/location</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+17"/>
@@ -1332,7 +1588,7 @@
         <translation>Contenido del archivo</translation>
     </message>
     <message>
-        <location line="+105"/>
+        <location line="+111"/>
         <source>Searching...</source>
         <translation>Buscando...</translation>
     </message>
@@ -1350,7 +1606,7 @@
 <context>
     <name>find_files_model</name>
     <message>
-        <location filename="../src/find-files-model.cc" line="+82"/>
+        <location filename="../src/find-files-model.cc" line="+83"/>
         <source>Filename</source>
         <translation>Nombre de archivo</translation>
     </message>
@@ -1388,7 +1644,7 @@
         <translation>Historial de comandos</translation>
     </message>
     <message>
-        <location line="+89"/>
+        <location line="+107"/>
         <source>Copy</source>
         <translation>Copiar</translation>
     </message>
@@ -1403,11 +1659,21 @@
         <translatorcomment>Ha sido utilizada la traducción &quot;guión&quot; de script: http://es.wikipedia.org/wiki/Script#Traducci.C3.B3n</translatorcomment>
         <translation>Crear un guión (script)</translation>
     </message>
+    <message>
+        <location line="+4"/>
+        <source>Hide filter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Show filter</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>initial_page</name>
     <message>
-        <location filename="../src/welcome-wizard.cc" line="-179"/>
+        <location filename="../src/welcome-wizard.cc" line="-176"/>
         <source>Welcome to Octave!</source>
         <translation>¡Bienvenido a Octave!</translation>
     </message>
@@ -1438,13 +1704,13 @@
 <context>
     <name>main_window</name>
     <message>
-        <location filename="../src/main-window.cc" line="+268"/>
+        <location filename="../src/main-window.cc" line="+275"/>
         <source>Load Workspace</source>
         <translation>Cargar el espacio de trabajo</translation>
     </message>
     <message>
-        <location line="+732"/>
-        <location line="+931"/>
+        <location line="+758"/>
+        <location line="+975"/>
         <source>About Octave</source>
         <translation>Acerca de Octave</translation>
     </message>
@@ -1454,12 +1720,12 @@
         <translation>&amp;Archivo</translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+45"/>
         <source>New</source>
         <translation>Nuevo</translation>
     </message>
     <message>
-        <location line="-43"/>
+        <location line="-39"/>
         <source>Open...</source>
         <translation>Abrir...</translation>
     </message>
@@ -1469,7 +1735,7 @@
         <translation>Preferencias...</translation>
     </message>
     <message>
-        <location line="-95"/>
+        <location line="-99"/>
         <source>Exit</source>
         <translation>Salir</translation>
     </message>
@@ -1484,22 +1750,22 @@
         <translation>Deshacer</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+7"/>
         <source>Copy</source>
         <translation>Copiar</translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+5"/>
         <source>Paste</source>
         <translation>Pegar</translation>
     </message>
     <message>
-        <location line="-1469"/>
+        <location line="-1537"/>
         <source>Save Workspace As</source>
         <translation>Guardar el espacio de trabajo como</translation>
     </message>
     <message>
-        <location line="+134"/>
+        <location line="+124"/>
         <source>The release notes file &apos;%1&apos; is empty.</source>
         <translation>El archivo de notas de versión %1 está vacío.</translation>
     </message>
@@ -1509,7 +1775,7 @@
         <translation>El archivo de notas de versión %1 no se puede leer.</translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="+12"/>
         <source>Octave Release Notes</source>
         <translation>Notas de la versión de Octave</translation>
     </message>
@@ -1519,17 +1785,17 @@
         <translation>Noticas de la comunidad Octave</translation>
     </message>
     <message>
-        <location line="+187"/>
+        <location line="+206"/>
         <source>Are you sure you want to exit Octave?</source>
         <translation>¿Está seguro de que desea salir de Octave?</translation>
     </message>
     <message>
-        <location line="+854"/>
+        <location line="+916"/>
         <source>Open an existing file in editor</source>
         <translation>Abrir un archivo existente en el editor</translation>
     </message>
     <message>
-        <location line="+48"/>
+        <location line="+44"/>
         <source>New Function...</source>
         <translation>Nueva función...</translation>
     </message>
@@ -1539,12 +1805,12 @@
         <translation>Nueva figura</translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+39"/>
         <source>Select All</source>
         <translation>Seleccionar todo</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="+4"/>
         <source>Clear Clipboard</source>
         <translation>Limpiar el portapapeles</translation>
     </message>
@@ -1594,17 +1860,27 @@
         <translation>Explorador de archivos</translation>
     </message>
     <message>
-        <location line="-84"/>
+        <location line="+36"/>
+        <source>Contribute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Donate to Octave</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-123"/>
         <source>Step In</source>
         <translation>Iniciar</translation>
     </message>
     <message>
-        <location line="-1020"/>
+        <location line="-1082"/>
         <source>Octave</source>
         <translation>Octave</translation>
     </message>
     <message>
-        <location line="+868"/>
+        <location line="+926"/>
         <source>Load Workspace...</source>
         <translation>Cargar espacio de trabajo...</translation>
     </message>
@@ -1619,7 +1895,7 @@
         <translation>Nuevo guión (script)</translation>
     </message>
     <message>
-        <location line="+124"/>
+        <location line="+128"/>
         <source>Step Out</source>
         <translation>Terminar</translation>
     </message>
@@ -1639,17 +1915,7 @@
         <translation>Compartir código</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Contribute to Octave</source>
-        <translation>Colaborar con Octave</translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Octave Developer Resources</source>
-        <translation>Recursos para el desarrollador de Octave</translation>
-    </message>
-    <message>
-        <location line="+14"/>
+        <location line="+20"/>
         <source>On Disk</source>
         <translation>En disco</translation>
     </message>
@@ -1694,8 +1960,8 @@
         <translation>Directorio superior</translation>
     </message>
     <message>
-        <location line="-1148"/>
-        <location line="+1151"/>
+        <location line="-1198"/>
+        <location line="+1201"/>
         <source>Browse directories</source>
         <translation>Explorar directorios</translation>
     </message>
@@ -1774,7 +2040,7 @@
 <context>
     <name>news_reader</name>
     <message>
-        <location line="-1411"/>
+        <location line="-1492"/>
         <source>&lt;html&gt;
 &lt;body&gt;
 &lt;p&gt;
@@ -1834,20 +2100,20 @@
 <context>
     <name>octave_dock_widget</name>
     <message>
-        <location filename="../src/octave-dock-widget.cc" line="+68"/>
-        <location line="+198"/>
+        <location filename="../src/octave-dock-widget.cc" line="+67"/>
+        <location line="+201"/>
         <source>Undock widget</source>
         <translatorcomment>Uso &quot;widget&quot; por ser el término usual: http://es.wikipedia.org/wiki/Widget</translatorcomment>
         <translation>Desacoplar widget</translation>
     </message>
     <message>
-        <location line="-188"/>
+        <location line="-191"/>
         <source>Hide widget</source>
         <translatorcomment>Uso &quot;widget&quot; por ser el término usual: http://es.wikipedia.org/wiki/Widget</translatorcomment>
         <translation>Ocultar widget</translation>
     </message>
     <message>
-        <location line="+132"/>
+        <location line="+136"/>
         <source>Dock widget</source>
         <translatorcomment>Uso &quot;widget&quot; por ser el término usual: http://es.wikipedia.org/wiki/Widget</translatorcomment>
         <translation>Acoplar widget</translation>
@@ -1856,7 +2122,7 @@
 <context>
     <name>octave_qscintilla</name>
     <message>
-        <location filename="../src/m-editor/octave-qscintilla.cc" line="+226"/>
+        <location filename="../src/m-editor/octave-qscintilla.cc" line="+237"/>
         <source>Help on</source>
         <translation>Ayuda sobre</translation>
     </message>
@@ -1870,18 +2136,23 @@
         <source>Edit</source>
         <translation>Editar</translation>
     </message>
+    <message>
+        <location line="+15"/>
+        <source>dbstop if ...</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>octave_qt_link</name>
     <message>
-        <location filename="../src/octave-qt-link.cc" line="+111"/>
-        <location line="+6"/>
-        <location line="+7"/>
+        <location filename="../src/octave-qt-link.cc" line="+136"/>
+        <location line="+9"/>
+        <location line="+11"/>
         <source>Create</source>
         <translation>Crear</translation>
     </message>
     <message>
-        <location line="-10"/>
+        <location line="-14"/>
         <source>File
 %1
 does not exist. Do you want to create it?</source>
@@ -1895,7 +2166,7 @@
         <translation>Editor de Octave</translation>
     </message>
     <message>
-        <location line="+211"/>
+        <location line="+254"/>
         <source>The file %1 does not exist in the load path.  To run or debug the function you are editing, you must either change to the directory %2 or add that directory to the load path.</source>
         <translation>El archivo %1 no existe en las rutas de búsqueda de funciones (path). Para ejecutar o depurar la función que está editando, tiene que cambiar al directorio %2 o agregar ese directorio a las rutas de búsqueda de funciones (path).</translation>
     </message>
@@ -1921,8 +2192,8 @@
         <translation>Agregar directorio a la ruta de búsqueda de funciones (path)</translation>
     </message>
     <message>
-        <location line="-223"/>
-        <location line="+224"/>
+        <location line="-269"/>
+        <location line="+270"/>
         <source>Cancel</source>
         <translation>Cancelar</translation>
     </message>
@@ -1938,7 +2209,7 @@
 <context>
     <name>resource_manager</name>
     <message>
-        <location filename="../src/resource-manager.cc" line="+245"/>
+        <location filename="../src/resource-manager.cc" line="+246"/>
         <source>The settings file
 %1
 does not exist and can not be created.
@@ -1964,732 +2235,590 @@
     <name>settings_dialog</name>
     <message>
         <location filename="../src/settings-dialog.ui" line="+23"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1738"/>
         <source>Settings</source>
         <translation>Configuración</translation>
     </message>
     <message>
         <location line="+19"/>
         <location line="+468"/>
-        <location filename="../src/ui-settings-dialog.h" line="+25"/>
-        <location line="+1"/>
         <source>General</source>
         <translation>General</translation>
     </message>
     <message>
         <location line="-338"/>
-        <location filename="../src/ui-settings-dialog.h" line="-17"/>
         <source>Octave logo only</source>
         <translation>Sólo logo de Octave</translation>
     </message>
     <message>
         <location line="+10"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Letter icons</source>
         <translation>Iconos de texto</translation>
     </message>
     <message>
         <location line="+7"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Graphic icons</source>
         <translation>Iconos gráficos</translation>
     </message>
     <message>
         <location line="-118"/>
-        <location filename="../src/ui-settings-dialog.h" line="-9"/>
         <source>Dock widget title bar</source>
         <translation>Acoplar widget de barra de título</translation>
     </message>
     <message>
         <location line="+53"/>
-        <location filename="../src/ui-settings-dialog.h" line="+3"/>
         <source>Small</source>
         <translation>Pequeño</translation>
     </message>
     <message>
         <location line="+17"/>
-        <location filename="../src/ui-settings-dialog.h" line="+2"/>
         <source>Large</source>
         <translation>Grande</translation>
     </message>
     <message>
         <location line="+168"/>
-        <location filename="../src/ui-settings-dialog.h" line="+10"/>
         <source>Custom style</source>
         <translation>Estilo personalizado</translation>
     </message>
     <message>
         <location line="+92"/>
-        <location filename="../src/ui-settings-dialog.h" line="+4"/>
         <source>These preferences are applied after any .octaverc startup files.</source>
         <translation>Estas configuraciones se aplicarán después de la ejecución de los ficheros de inicio .octaverc</translation>
     </message>
     <message>
         <location line="+55"/>
-        <location filename="../src/ui-settings-dialog.h" line="+3"/>
         <source>Restore working directory of previous session</source>
         <translation>Restaurar el directorio de trabajo de la sesión anterior</translation>
     </message>
     <message>
         <location line="+33"/>
-        <location filename="../src/ui-settings-dialog.h" line="+58"/>
         <source>Editor</source>
         <translation>Editor</translation>
     </message>
     <message>
-        <location line="+151"/>
-        <location filename="../src/ui-settings-dialog.h" line="-49"/>
+        <location line="+107"/>
         <source>Color</source>
         <translation>Color</translation>
     </message>
     <message>
-        <location line="+138"/>
-        <location filename="../src/ui-settings-dialog.h" line="+6"/>
+        <location line="-69"/>
         <source>Draw a long line marker</source>
         <translation>Mostrar marcador de longitud de línea</translation>
     </message>
     <message>
-        <location line="+48"/>
-        <location filename="../src/ui-settings-dialog.h" line="+3"/>
+        <location line="+155"/>
         <source>Show EOL characters</source>
         <translation>Mostrar caracteres de fin de línea</translation>
     </message>
     <message>
-        <location line="+9"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
+        <location line="+662"/>
         <source>Default EOL mode</source>
         <translation>Identificador de fin de línea por defecto</translation>
     </message>
     <message>
-        <location line="+154"/>
-        <location filename="../src/ui-settings-dialog.h" line="+12"/>
+        <location line="-394"/>
         <source>Indent width</source>
         <translation>Ancho de sangría</translation>
     </message>
     <message>
         <location line="+7"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Tab indents line</source>
         <translation>Sangrar con tabulación</translation>
     </message>
     <message>
         <location line="+7"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Auto indentation</source>
         <translation>Sangría automática</translation>
     </message>
     <message>
         <location line="+26"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Tab width</source>
         <translation>Tamaño del tabulador</translation>
     </message>
     <message>
         <location line="+7"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Show indentation guides</source>
         <translation>Mostrar guías de sangría</translation>
     </message>
     <message>
         <location line="+23"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Backspace unindents line</source>
         <translation>La tecla de retroceso quita sangría</translation>
     </message>
     <message>
         <location line="+88"/>
-        <location filename="../src/ui-settings-dialog.h" line="+3"/>
         <source>Match keywords</source>
         <translation>Coincidir en palabras clave</translation>
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Case sensitive</source>
         <translation>Distinguir mayúsculas/minúsculas</translation>
     </message>
     <message>
         <location line="+23"/>
-        <location filename="../src/ui-settings-dialog.h" line="+2"/>
         <source>Replace word by suggested one</source>
         <translation>Sustituir palabra con sugerencia</translation>
     </message>
     <message>
         <location line="-10"/>
-        <location filename="../src/ui-settings-dialog.h" line="-1"/>
         <source>Match words in document</source>
         <translation>Coincidir palabras en documento</translation>
     </message>
     <message>
-        <location line="+173"/>
-        <location filename="../src/ui-settings-dialog.h" line="+14"/>
+        <location line="+185"/>
         <source>Restore editor tabs from previous session on startup</source>
         <translation>En el arranque, restaurar las pestañas del editor de la sesión anterior</translation>
     </message>
     <message>
-        <location line="-426"/>
-        <location filename="../src/ui-settings-dialog.h" line="-28"/>
+        <location line="-438"/>
         <source>Use custom file editor</source>
         <translation>Utilizar editor de archivos personalizado</translation>
     </message>
     <message>
-        <location line="+482"/>
-        <location filename="../src/ui-settings-dialog.h" line="+33"/>
+        <location line="+574"/>
         <source>Editor Styles</source>
         <translation>Estilos del editor</translation>
     </message>
     <message>
         <location line="+287"/>
-        <location filename="../src/ui-settings-dialog.h" line="+10"/>
         <source>Terminal Colors</source>
         <translatorcomment>En es_ES, terminal suele ser masculino, aunque en el español iberoamericano suele adoptarse el femenino</translatorcomment>
         <translation>Colores del terminal</translation>
     </message>
     <message>
         <location line="-173"/>
-        <location filename="../src/ui-settings-dialog.h" line="-6"/>
         <source>Font</source>
         <translation>Tipo de fuente</translation>
     </message>
     <message>
-        <location line="-917"/>
-        <location filename="../src/ui-settings-dialog.h" line="-58"/>
+        <location line="-1007"/>
         <source>Show line numbers</source>
         <translation>Mostrar numeros de línea</translation>
     </message>
     <message>
-        <location line="-72"/>
-        <location filename="../src/ui-settings-dialog.h" line="-3"/>
+        <location line="+81"/>
         <source>Highlight current line</source>
         <translation>Resaltar línea actual</translation>
     </message>
     <message>
-        <location line="+85"/>
-        <location filename="../src/ui-settings-dialog.h" line="+4"/>
+        <location line="+13"/>
         <source>Show complete path in window title</source>
         <translation>Mostrar ruta completa en el título de la ventana</translation>
     </message>
     <message>
-        <location line="-29"/>
-        <location filename="../src/ui-settings-dialog.h" line="-2"/>
+        <location line="+13"/>
         <source>Show whitespace</source>
         <translation>Mostrar espacios en blanco</translation>
     </message>
     <message>
-        <location line="+39"/>
-        <location filename="../src/ui-settings-dialog.h" line="+3"/>
+        <location line="+157"/>
         <source>Do not show whitespace used for indentation</source>
         <translation>No mostrar los espacios usados para la sangría</translation>
     </message>
     <message>
-        <location line="+625"/>
-        <location filename="../src/ui-settings-dialog.h" line="+37"/>
+        <location line="+382"/>
         <source>Number of characters before list is shown: </source>
         <translation>Número de caracteres a escribir antes de mostrar la lista</translation>
     </message>
     <message>
-        <location line="+112"/>
-        <location filename="../src/ui-settings-dialog.h" line="+11"/>
+        <location line="+124"/>
         <source>Create nonexistent files without prompting</source>
         <translation>Crear archivos no existentes sin consultar</translation>
     </message>
     <message>
-        <location line="-429"/>
-        <location filename="../src/ui-settings-dialog.h" line="-28"/>
+        <location line="-441"/>
         <source>command line (%f=file, %l=line):</source>
         <translation>línea de comando (%f=archivo, %l=linea):</translation>
     </message>
     <message>
-        <location line="+521"/>
-        <location filename="../src/ui-settings-dialog.h" line="+43"/>
+        <location line="+613"/>
         <source>Terminal</source>
         <translation>Terminal</translation>
     </message>
     <message>
         <location line="+51"/>
-        <location filename="../src/ui-settings-dialog.h" line="-8"/>
         <source>Cursor type:</source>
         <translation>Tipo de cursor:</translation>
     </message>
     <message>
         <location line="-11"/>
-        <location filename="../src/ui-settings-dialog.h" line="-1"/>
         <source>Cursor blinking</source>
         <translation>Cursor parpadeante</translation>
     </message>
     <message>
         <location line="-7"/>
-        <location filename="../src/ui-settings-dialog.h" line="-1"/>
         <source>Use foreground color</source>
         <translation>Usar color de primer plano</translation>
     </message>
     <message>
         <location line="+59"/>
-        <location filename="../src/ui-settings-dialog.h" line="+4"/>
         <source>Font size</source>
         <translation>Tamaño de fuente</translation>
     </message>
     <message>
         <location line="+123"/>
-        <location filename="../src/ui-settings-dialog.h" line="+3"/>
         <source>Set focus to terminal when running a command from within another widget</source>
         <translation>Foco al terminal cuando se ejecute un comando desde otro widget</translation>
     </message>
     <message>
         <location line="+73"/>
-        <location filename="../src/ui-settings-dialog.h" line="+15"/>
         <source>File Browser</source>
         <translation>Explorador de archivos</translation>
     </message>
     <message>
-        <location line="+46"/>
-        <location filename="../src/ui-settings-dialog.h" line="-8"/>
-        <source>Show file size</source>
-        <translation>Mostrar tamaño de archivo</translation>
-    </message>
-    <message>
-        <location line="-14"/>
-        <location filename="../src/ui-settings-dialog.h" line="-2"/>
-        <source>Show file type</source>
-        <translation>Mostrar tipo de archivo</translation>
-    </message>
-    <message>
-        <location line="+21"/>
-        <location filename="../src/ui-settings-dialog.h" line="+3"/>
-        <source>Show date of last modification</source>
-        <translation>Mostrar fecha de la última modificación</translation>
-    </message>
-    <message>
-        <location line="-14"/>
-        <location filename="../src/ui-settings-dialog.h" line="-2"/>
-        <source>Show hidden files</source>
-        <translation>Mostrar archivos ocultos</translation>
-    </message>
-    <message>
-        <location line="-1715"/>
-        <location filename="../src/ui-settings-dialog.h" line="-97"/>
+        <location line="-1729"/>
         <source>Interface</source>
         <translation>Interfaz</translation>
     </message>
     <message>
         <location line="+52"/>
-        <location filename="../src/ui-settings-dialog.h" line="+3"/>
         <source>Confirm before exiting</source>
         <translation>Confirmar antes de salir</translation>
     </message>
     <message>
         <location line="+103"/>
-        <location line="+592"/>
-        <location filename="../src/ui-settings-dialog.h" line="+9"/>
-        <location line="+28"/>
+        <location line="+640"/>
         <source>Show status bar</source>
         <translation>Mostrar barra de estado</translation>
     </message>
     <message>
-        <location line="-540"/>
-        <location filename="../src/ui-settings-dialog.h" line="-26"/>
+        <location line="-588"/>
         <source>Text inactive</source>
         <translation>Texto inactivo</translation>
     </message>
     <message>
         <location line="-32"/>
         <location line="+45"/>
-        <location filename="../src/ui-settings-dialog.h" line="-1"/>
-        <location line="+2"/>
         <source>Active</source>
         <translation>Activo</translation>
     </message>
     <message>
         <location line="-152"/>
-        <location filename="../src/ui-settings-dialog.h" line="-10"/>
         <source>Normal</source>
         <translation>Normal</translation>
     </message>
     <message>
         <location line="+191"/>
-        <location filename="../src/ui-settings-dialog.h" line="+12"/>
         <source>Background inactive</source>
         <translation>Fondo inactivo</translation>
     </message>
     <message>
         <location line="+19"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>3D</source>
         <translation>3D</translation>
     </message>
     <message>
         <location line="+54"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Octave Startup</source>
         <translation>Inicio de Octave</translation>
     </message>
     <message>
         <location line="+41"/>
-        <location line="+1392"/>
-        <location filename="../src/ui-settings-dialog.h" line="+2"/>
-        <location line="+82"/>
+        <location line="+1440"/>
         <source>Startup path</source>
         <translation>Dirección de inicio</translation>
     </message>
     <message>
-        <location line="-1379"/>
-        <location line="+1409"/>
-        <location filename="../src/ui-settings-dialog.h" line="-81"/>
-        <location line="+83"/>
+        <location line="-1427"/>
+        <location line="+1420"/>
         <source>Browse</source>
         <translation>Explorar</translation>
     </message>
     <message>
-        <location line="-1322"/>
-        <location filename="../src/ui-settings-dialog.h" line="-78"/>
+        <location line="-1103"/>
         <source>After Column</source>
         <translation>Después de la columna</translation>
     </message>
     <message>
-        <location line="+144"/>
-        <location filename="../src/ui-settings-dialog.h" line="+6"/>
+        <location line="-75"/>
         <source>Tab width min.</source>
         <translation>Anchura mínima del tabulador</translation>
     </message>
     <message>
         <location line="+64"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>max.</source>
         <translation>máx.</translation>
     </message>
     <message>
-        <location line="+31"/>
-        <location filename="../src/ui-settings-dialog.h" line="+2"/>
+        <location line="-231"/>
         <source>This works well for monospaced fonts. The line is drawn at a position based on the width of a space character in the default font. It may not work very well if styles use proportional fonts or if varied font sizes or bold, italic and normal texts are used.</source>
         <translation>Esto funciona correctamente con fuentes con espaciado fijo. Se dibuja la línea en una posición basada la anchura de un carácter de la fuente por defecto. Esto podría no funcionar correctamente si los estilos utilizan fuentes proporcionales o si se utilizan fuentes de varios tamaños, negrita, cursiva y textos normales.</translation>
     </message>
     <message>
-        <location line="+19"/>
-        <location filename="../src/ui-settings-dialog.h" line="+3"/>
+        <location line="+289"/>
         <source>Enable Code Folding</source>
         <translation>Activar plegado de código</translation>
     </message>
     <message>
-        <location line="+61"/>
-        <location filename="../src/ui-settings-dialog.h" line="+6"/>
+        <location line="+551"/>
         <source>Windows (CRLF)</source>
         <translation>Windows (CRLF)</translation>
     </message>
     <message>
         <location line="+5"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Mac (CR)</source>
         <translation>Mac (CR)</translation>
     </message>
     <message>
         <location line="+5"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Unix (LF)</source>
         <translation>Unix (LF)</translation>
     </message>
     <message>
-        <location line="+32"/>
-        <location filename="../src/ui-settings-dialog.h" line="+2"/>
+        <location line="-532"/>
         <source>Show horizontal scroll bar</source>
         <translation>Mostrar barra de desplazamiento horizontal</translation>
     </message>
     <message>
-        <location line="+68"/>
-        <location filename="../src/ui-settings-dialog.h" line="+4"/>
+        <location line="-299"/>
+        <source>Show tool bar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+383"/>
         <source>Indentation</source>
         <translation>Sangrado</translation>
     </message>
     <message>
         <location line="+117"/>
-        <location filename="../src/ui-settings-dialog.h" line="+7"/>
         <source>Indentation uses tabs</source>
         <translation>Sangrado con tabulador</translation>
     </message>
     <message>
         <location line="+38"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Auto completion</source>
         <translation>Completado automático</translation>
     </message>
     <message>
         <location line="+101"/>
-        <location filename="../src/ui-settings-dialog.h" line="+5"/>
         <source>With Octave builtins</source>
         <translation>Con funciones internas de Octave</translation>
     </message>
     <message>
         <location line="+10"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>With Octave functions</source>
         <translation>Con funciones de Octave</translation>
     </message>
     <message>
         <location line="+64"/>
-        <location filename="../src/ui-settings-dialog.h" line="+9"/>
         <source>Show completion list automatically</source>
         <translation>Mostrar lista de comandos coincidentes automáticamente</translation>
     </message>
     <message>
         <location line="+31"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>File handling</source>
         <translation>Manejo de ficheros</translation>
     </message>
     <message>
-        <location line="+40"/>
-        <location filename="../src/ui-settings-dialog.h" line="+3"/>
+        <location line="+19"/>
         <source>Reload externally changed files without prompt</source>
         <translation>Recargar los archivos modificados externamente sin consultar</translation>
     </message>
     <message>
-        <location line="+53"/>
-        <location filename="../src/ui-settings-dialog.h" line="+2"/>
+        <location line="+93"/>
+        <source>Text encoding used for loading and saving</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+73"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Select font, font size (as a difference from the default size), font style (&lt;b&gt;b&lt;/b&gt;old, &lt;b&gt;i&lt;/b&gt;talic, &lt;b&gt;u&lt;/b&gt;nderline), text color, and background color (for the latter, the color magenta (255,0,255) is a placeholder for the default background color).&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Selección de fuente, tamaño (como diferencia con respecto al tamaño por defecto), estilo (&lt;b&gt;n&lt;/b&gt;egrita, &lt;b&gt;c&lt;/b&gt;ursiva, &lt;b&gt;s&lt;/b&gt;ubrayado), color y color de fondo (para el último caso, el magenta (255,0,255) es un sustituto para el color de fondo por defecto).&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location line="+192"/>
-        <location filename="../src/ui-settings-dialog.h" line="+7"/>
         <source>(Changing buffer size clears history)</source>
         <translation>(Cambiar el tamaño del buffer elimina el historial)</translation>
     </message>
     <message>
         <location line="+28"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>History buffer Size</source>
         <translation>Tamaño del buffer para el historial</translation>
     </message>
     <message>
         <location line="+34"/>
-        <location filename="../src/ui-settings-dialog.h" line="+2"/>
         <source>Print debug location in terminal window in addition to the marker in the editor</source>
         <translation>Imprimir la ubicación de depuración en la ventana del terminal además de en el editor</translation>
     </message>
     <message>
         <location line="+87"/>
-        <location filename="../src/ui-settings-dialog.h" line="+3"/>
-        <source>Display</source>
-        <translation>Mostrar</translation>
+        <source>Behavior</source>
+        <translation>Comportamiento</translation>
+    </message>
+    <message>
+        <location line="+30"/>
+        <source>Restore last directory of previous session</source>
+        <translation>Restaurar último directorio de la sesión previa</translation>
+    </message>
+    <message>
+        <location line="+54"/>
+        <source>Extensions of files to be opened in the default text editor (separated by &quot;;&quot;):</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+39"/>
-        <location filename="../src/ui-settings-dialog.h" line="+5"/>
-        <source>Alternating row colors</source>
-        <translation>Alternar colores de filas</translation>
-    </message>
-    <message>
-        <location line="+12"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
-        <source>Behavior</source>
-        <translation>Comportamiento</translation>
-    </message>
-    <message>
-        <location line="+34"/>
-        <location filename="../src/ui-settings-dialog.h" line="+3"/>
-        <source>Restore last directory of previous session</source>
-        <translation>Restaurar último directorio de la sesión previa</translation>
-    </message>
-    <message>
-        <location line="+71"/>
-        <location filename="../src/ui-settings-dialog.h" line="+5"/>
         <source>Workspace</source>
         <translation>Espacio de trabajo</translation>
     </message>
     <message>
-        <location line="+42"/>
-        <location filename="../src/ui-settings-dialog.h" line="-1"/>
+        <location line="+35"/>
+        <source>Colors for variable attributes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
         <source>Hide tool tips</source>
         <translation>Ocultar sugerencias automáticas</translation>
     </message>
     <message>
-        <location line="+182"/>
-        <location filename="../src/ui-settings-dialog.h" line="+14"/>
+        <location line="+101"/>
+        <source>Import shortcut set</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Export current shortcut set</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Reset shortcuts to their defaults</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location line="+80"/>
+        <source>Default</source>
+        <translation type="unfinished">Por defecto</translation>
+    </message>
+    <message>
+        <location line="-71"/>
         <source>Edit a shortcut by double-clicking in a cell</source>
         <translation>Los atajos se pueden editar haciendo doble clic en la celda correspondiente</translation>
     </message>
     <message>
-        <location line="+108"/>
-        <location filename="../src/ui-settings-dialog.h" line="+20"/>
+        <location line="+76"/>
+        <source>Actual</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
         <source>Network</source>
         <translation>Red</translation>
     </message>
     <message>
         <location line="+23"/>
-        <location filename="../src/ui-settings-dialog.h" line="-12"/>
         <source>Allow Octave to connect to the Octave web site to display current news and information</source>
         <translation>Permitir a Octave la conexión al sitio web para mostrar las últimas noticias e información</translation>
     </message>
     <message>
         <location line="+46"/>
-        <location filename="../src/ui-settings-dialog.h" line="+8"/>
         <source>Use proxy server</source>
         <translation>Utilizar servidor &quot;proxy&quot;</translation>
     </message>
     <message>
         <location line="-23"/>
-        <location filename="../src/ui-settings-dialog.h" line="-4"/>
         <source>HttpProxy</source>
         <translation>HttpProxy</translation>
     </message>
     <message>
-        <location line="-2083"/>
-        <location filename="../src/ui-settings-dialog.h" line="-123"/>
+        <location line="-2039"/>
         <source>Icon set for dock widgets</source>
         <translation>Iconos para widget</translation>
     </message>
     <message>
         <location line="-48"/>
-        <location filename="../src/ui-settings-dialog.h" line="-4"/>
         <source>Language (requires restart)</source>
         <translation>Lenguaje (requiere reinicio)</translation>
     </message>
     <message>
         <location line="-58"/>
-        <location filename="../src/ui-settings-dialog.h" line="-5"/>
         <source>Icon size</source>
         <translation>Tamaño de icono</translation>
     </message>
     <message>
-        <location line="+1714"/>
-        <location filename="../src/ui-settings-dialog.h" line="+100"/>
+        <location line="+1716"/>
         <source>Synchronize Octave working directory with file browser</source>
         <translation>Sincronizar el directorio de trabajo de Octave con el explorador de archivos</translation>
     </message>
     <message>
-        <location line="+132"/>
-        <location filename="../src/ui-settings-dialog.h" line="+5"/>
-        <source>Colors for variable attributes </source>
-        <translation>Colores para los atributos de variable</translation>
-    </message>
-    <message>
-        <location line="+34"/>
-        <location filename="../src/ui-settings-dialog.h" line="+22"/>
+        <location line="+184"/>
         <source>Shortcuts</source>
         <translation>Atajos de teclado</translation>
     </message>
     <message>
         <location line="+31"/>
-        <location filename="../src/ui-settings-dialog.h" line="-18"/>
         <source>Select this option to prevent conflicts with readline shortcuts</source>
         <translation>Seleccione esta opción para evitar conflictos con los atajos de la línea de comandos</translation>
     </message>
     <message>
         <location line="+3"/>
-        <location filename="../src/ui-settings-dialog.h" line="+2"/>
         <source>Disable global shortcuts when terminal window has focus</source>
         <translation>Deshabilitar los atajos globales cuando la ventana del terminal se enfoque </translation>
     </message>
     <message>
-        <location line="+31"/>
-        <location line="+28"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
-        <location line="+4"/>
-        <source>Use this set</source>
-        <translation>Utilice este conjunto</translation>
-    </message>
-    <message>
-        <location line="-21"/>
-        <location filename="../src/ui-settings-dialog.h" line="-3"/>
-        <source>Set 1:</source>
-        <translation>Conjunto 1:</translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <location line="+37"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
-        <location line="+3"/>
+        <location line="+53"/>
         <source>Export</source>
         <translation>Exportar</translation>
     </message>
     <message>
-        <location line="-30"/>
-        <location line="+37"/>
-        <location filename="../src/ui-settings-dialog.h" line="-2"/>
-        <location line="+3"/>
+        <location line="-10"/>
         <source>Import</source>
         <translation>Importar</translation>
     </message>
     <message>
-        <location line="+7"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
-        <source>Set 2:</source>
-        <translation>Conjunto 2:</translation>
-    </message>
-    <message>
-        <location line="+86"/>
-        <location filename="../src/ui-settings-dialog.h" line="+7"/>
+        <location line="+90"/>
         <source>Action</source>
         <translation>Acción</translation>
     </message>
     <message>
-        <location line="+10"/>
-        <location filename="../src/ui-settings-dialog.h" line="-1"/>
-        <source>Set 1 Default</source>
-        <translation>Conjunto 1 por defecto</translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <location filename="../src/ui-settings-dialog.h" line="-1"/>
-        <source>Set 1 Actual</source>
-        <translation>Conjunto 1 actual</translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <location filename="../src/ui-settings-dialog.h" line="-1"/>
-        <source>Set 2 Default</source>
-        <translation>Conjunto 2 por defecto</translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <location filename="../src/ui-settings-dialog.h" line="-1"/>
-        <source>Set 2 Actual</source>
-        <translation>Conjunto 2 actual</translation>
-    </message>
-    <message>
-        <location line="+68"/>
-        <location filename="../src/ui-settings-dialog.h" line="+11"/>
+        <location line="+83"/>
         <source>Socks5Proxy</source>
         <translation>&quot;Socks5Proxy&quot;</translation>
     </message>
     <message>
         <location line="-16"/>
-        <location filename="../src/ui-settings-dialog.h" line="-4"/>
         <source>Hostname:</source>
         <translation>Nombre del host:</translation>
     </message>
     <message>
         <location line="+44"/>
-        <location filename="../src/ui-settings-dialog.h" line="+8"/>
         <source>Proxy type:</source>
         <translation>Tipo de proxy:</translation>
     </message>
     <message>
         <location line="+10"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Port:</source>
         <translation>Puerto:</translation>
     </message>
     <message>
         <location line="-27"/>
-        <location filename="../src/ui-settings-dialog.h" line="-3"/>
         <source>Username:</source>
         <translation>Nombre de usuario:</translation>
     </message>
     <message>
         <location line="+37"/>
-        <location filename="../src/ui-settings-dialog.h" line="+4"/>
         <source>Password:</source>
         <translation>Contraseña:</translation>
     </message>
     <message>
-        <location filename="../src/settings-dialog.cc" line="+77"/>
+        <location filename="../src/settings-dialog.cc" line="+127"/>
+        <source>Octave Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Unable to save settings.  Missing settings file or unknown directory.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+18"/>
         <location line="+4"/>
-        <location line="+561"/>
+        <location line="+444"/>
         <source>System setting</source>
         <translation>Configuración del sistema</translation>
     </message>
     <message>
-        <location line="-355"/>
+        <location line="-232"/>
         <source>IBeam Cursor</source>
         <translation>Cursor IBeam</translation>
     </message>
@@ -2704,35 +2833,7 @@
         <translation>Cursor de subrayado</translation>
     </message>
     <message>
-        <location line="+213"/>
-        <source>Difference to the default size</source>
-        <translation>Diferencia con el tamaño predeterminado</translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Background color, pink (255,0,255) means default</source>
-        <translation>Color de fondo. Rosa (255,0,255) significa predeterminado</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>b</source>
-        <comment>short form for bold</comment>
-        <translation>n</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>i</source>
-        <comment>short form for italic</comment>
-        <translation>c</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>u</source>
-        <comment>short form for underlined</comment>
-        <translation>s</translation>
-    </message>
-    <message>
-        <location line="+497"/>
+        <location line="+503"/>
         <source>Set Octave Startup Directory</source>
         <translation>Ajuste del directorio de inicio de Octave</translation>
     </message>
@@ -2745,7 +2846,7 @@
 <context>
     <name>setup_community_news</name>
     <message>
-        <location filename="../src/welcome-wizard.cc" line="+44"/>
+        <location filename="../src/welcome-wizard.cc" line="+42"/>
         <source>Community News</source>
         <translation>Noticias de la comunidad</translation>
     </message>
@@ -2800,7 +2901,7 @@
 <context>
     <name>shortcut_manager</name>
     <message>
-        <location filename="../src/shortcut-manager.cc" line="+109"/>
+        <location filename="../src/shortcut-manager.cc" line="+106"/>
         <source>New File</source>
         <translation>Nuevo archivo</translation>
     </message>
@@ -2830,42 +2931,38 @@
         <translation>Guardar el espacio de trabajo como</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <location line="+158"/>
+        <location line="+16"/>
+        <location line="+143"/>
         <source>Preferences</source>
         <translation>Preferencias</translation>
     </message>
     <message>
-        <location line="-157"/>
+        <location line="-158"/>
         <source>Exit Octave</source>
         <translation>Salir de Octave</translation>
     </message>
     <message>
         <location line="+3"/>
-        <location line="+84"/>
         <source>Copy</source>
         <translation>Copiar</translation>
     </message>
     <message>
-        <location line="-83"/>
-        <location line="+85"/>
+        <location line="+1"/>
         <source>Paste</source>
         <translation>Pegar</translation>
     </message>
     <message>
-        <location line="-84"/>
-        <location line="+80"/>
+        <location line="+1"/>
         <source>Undo</source>
         <translation>Deshacer</translation>
     </message>
     <message>
-        <location line="-79"/>
-        <location line="+84"/>
+        <location line="+1"/>
         <source>Select All</source>
         <translation>Seleccionar todo</translation>
     </message>
     <message>
-        <location line="-83"/>
+        <location line="+1"/>
         <source>Clear Clipboard</source>
         <translation>Limpiar el portapapeles</translation>
     </message>
@@ -2890,7 +2987,7 @@
         <translation>Limpiar el espacio de trabajo</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+6"/>
         <source>Step Into</source>
         <translation>Entrar a</translation>
     </message>
@@ -2961,12 +3058,12 @@
     </message>
     <message>
         <location line="+2"/>
-        <location line="+216"/>
+        <location line="+234"/>
         <source>Editor</source>
         <translation>Editor</translation>
     </message>
     <message>
-        <location line="-214"/>
+        <location line="-232"/>
         <source>Documentation</source>
         <translation>Documentación</translation>
     </message>
@@ -3046,19 +3143,29 @@
         <translation>Imprimir</translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+3"/>
         <source>Redo</source>
         <translation>Rehacer</translation>
     </message>
     <message>
+        <location line="+1"/>
+        <source>Cut</source>
+        <translation>Cortar</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Find and Replace</source>
+        <translation>Buscar y reemplazar</translation>
+    </message>
+    <message>
         <location line="+2"/>
-        <source>Cut</source>
-        <translation>Cortar</translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Find and Replace</source>
-        <translation>Buscar y reemplazar</translation>
+        <source>Find Next</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Find Previous</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+2"/>
@@ -3183,7 +3290,68 @@
         <translation>Mostrar numeros de línea</translation>
     </message>
     <message>
-        <location line="-145"/>
+        <location line="+48"/>
+        <source>Switch to Left Tab</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Switch to Right Tab</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Move Tab Left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Move Tab Right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+44"/>
+        <source>Global</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+38"/>
+        <source>Tabs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+98"/>
+        <source>Enter new Shortcut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+143"/>
+        <source>Overwriting Shortcuts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>You are about to overwrite all shortcuts.
+Would you like to save the current shortcut set or cancel the action?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Don&apos;t save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+39"/>
+        <source>Import shortcuts from file ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Export shortcuts into file ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-571"/>
         <source>Step</source>
         <translation>Siguiente instrucción</translation>
     </message>
@@ -3244,6 +3412,21 @@
     </message>
     <message>
         <location line="+2"/>
+        <source>Show Toolbar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Show Statusbar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Show Horizontal Scrollbar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>Zoom In</source>
         <translation>Aumentar</translation>
     </message>
@@ -3299,12 +3482,7 @@
         <translation>Documentación de palabras clave</translation>
     </message>
     <message>
-        <location line="+42"/>
-        <source>Main</source>
-        <translation>Principal</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <location line="+57"/>
         <location line="+23"/>
         <source>File</source>
         <translation>Archivo</translation>
@@ -3348,12 +3526,7 @@
         <translation>Ejecutar</translation>
     </message>
     <message>
-        <location line="+124"/>
-        <source>Enter new Shortcut for Set %1</source>
-        <translation>Introduzca nuevo atajo para el conjunto %1</translation>
-    </message>
-    <message>
-        <location line="+5"/>
+        <location line="+106"/>
         <source>Apply the desired shortcut or click on the right button to reset the shortcut to its default.</source>
         <translation>Aplique el atajo que desee o haga clic en el botón derecho para restablecer el atajo a su valor predeterminado.</translation>
     </message>
@@ -3378,7 +3551,7 @@
         <translation>Establecer como por defecto</translation>
     </message>
     <message>
-        <location line="+53"/>
+        <location line="+45"/>
         <source>Double Shortcut</source>
         <translation>Atajo de teclado doble</translation>
     </message>
@@ -3396,23 +3569,13 @@
 ¿Desea utilizar el atajo de cualquier modo suprimiendo la acción previamente asignada?</translation>
     </message>
     <message>
-        <location line="+71"/>
-        <source>Import shortcut set %1 from file ...</source>
-        <translation>Importar conjunto de atajos de teclado %1 del archivo ...</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <location line="+6"/>
+        <location line="+113"/>
+        <location line="+5"/>
         <source>Octave Shortcut Files (*.osc);;All Files (*)</source>
         <translation>Archivo de atajos de teclado de Octave (*.osc);;Todos los archivos (*)</translation>
     </message>
     <message>
-        <location line="-1"/>
-        <source>Export shortcut set %1 into file ...</source>
-        <translation>Exportar conjunto de atajos de teclado %1 al archivo ...</translation>
-    </message>
-    <message>
-        <location line="+15"/>
+        <location line="+10"/>
         <source>Failed to open %1 as octave shortcut file</source>
         <translation>No se ha podido abrir %1 como archivo de atajos de teclado de Octave</translation>
     </message>
@@ -3451,7 +3614,7 @@
 <context>
     <name>welcome_wizard</name>
     <message>
-        <location filename="../src/welcome-wizard.cc" line="+135"/>
+        <location filename="../src/welcome-wizard.cc" line="+133"/>
         <source>Welcome to GNU Octave</source>
         <translation>Bienvenido a GNU Octave</translation>
     </message>
@@ -3459,7 +3622,7 @@
 <context>
     <name>workspace_model</name>
     <message>
-        <location filename="../src/workspace-model.cc" line="-42"/>
+        <location filename="../src/workspace-model.cc" line="-41"/>
         <source>Name</source>
         <translation>Nombre</translation>
     </message>
@@ -3484,7 +3647,7 @@
         <translation>Atributo</translation>
     </message>
     <message>
-        <location line="+109"/>
+        <location line="+108"/>
         <source>Right click to copy, rename, or display</source>
         <translation>Clic derecho para copiar, renombrar o mostrar</translation>
     </message>
@@ -3498,7 +3661,7 @@
 <context>
     <name>workspace_view</name>
     <message>
-        <location filename="../src/workspace-view.cc" line="+50"/>
+        <location filename="../src/workspace-view.cc" line="+51"/>
         <source>Workspace</source>
         <translation>Espacio de trabajo</translation>
     </message>
@@ -3518,7 +3681,7 @@
         <translation>Filtrar</translation>
     </message>
     <message>
-        <location line="+161"/>
+        <location line="+242"/>
         <source>Copy name</source>
         <translation>Copiar nombre</translation>
     </message>
@@ -3534,11 +3697,41 @@
     </message>
     <message>
         <location line="+9"/>
-        <source>Only top-level symbols may be renamed.</source>
-        <translation>Sólo los símbolos de alto nivel pueden ser renombrados.</translation>
-    </message>
-    <message>
-        <location line="+132"/>
+        <source>Only top-level symbols may be renamed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Hide filter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Show filter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+149"/>
+        <source>Class</source>
+        <translation type="unfinished">Clase</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Dimension</source>
+        <translation type="unfinished">Dimensión</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Value</source>
+        <translation type="unfinished">Valor</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Attribute</source>
+        <translation type="unfinished">Atributo</translation>
+    </message>
+    <message>
+        <location line="-17"/>
         <source>View the variables in the active workspace.&lt;br&gt;</source>
         <translation>Ver las variables del espacio de trabajo activo.&lt;br&gt;</translation>
     </message>
--- a/libgui/languages/eu_ES.ts	Thu Aug 18 12:26:32 2016 -0700
+++ b/libgui/languages/eu_ES.ts	Fri Aug 19 21:05:48 2016 +0200
@@ -4,7 +4,7 @@
 <context>
     <name>ListDialog</name>
     <message>
-        <location filename="../src/dialog.cc" line="+251"/>
+        <location filename="../src/dialog.cc" line="+258"/>
         <source>Select All</source>
         <translation>Hautatu dena</translation>
     </message>
@@ -12,7 +12,7 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../src/workspace-model.cc" line="+75"/>
+        <location filename="../src/workspace-model.cc" line="+74"/>
         <source>automatic</source>
         <translation>automatikoa</translation>
     </message>
@@ -61,11 +61,39 @@
         <source>cursor</source>
         <translation>kurtsorea</translation>
     </message>
+    <message>
+        <location filename="../src/settings-dialog.cc" line="+132"/>
+        <source>Difference to the default size</source>
+        <translation type="unfinished">Lehenetsitako tamainarekiko aldea</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Background color, pink (255,0,255) means default</source>
+        <translation type="unfinished">Kolore magentak (255,0,255) lehenetsia ezan nahi du</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>b</source>
+        <comment>short form for bold</comment>
+        <translation type="unfinished">l</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>i</source>
+        <comment>short form for italic</comment>
+        <translation type="unfinished">e</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>u</source>
+        <comment>short form for underlined</comment>
+        <translation type="unfinished">a</translation>
+    </message>
 </context>
 <context>
     <name>QTerminal</name>
     <message>
-        <location filename="../qterminal/libqterminal/QTerminal.h" line="+135"/>
+        <location filename="../qterminal/libqterminal/QTerminal.h" line="+130"/>
         <source>Copy</source>
         <translation>Kopiatu</translation>
     </message>
@@ -80,23 +108,694 @@
         <translation>Hautatu dena</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+7"/>
         <source>Clear Window</source>
         <translation>Garbitu leihoa</translation>
     </message>
+    <message>
+        <location filename="../qterminal/libqterminal/QTerminal.cc" line="+46"/>
+        <source>Edit %1 at line %2</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QWinTerminalImpl</name>
     <message>
-        <location filename="../qterminal/libqterminal/win32/QWinTerminalImpl.cpp" line="+1778"/>
+        <location filename="../qterminal/libqterminal/win32/QWinTerminalImpl.cpp" line="+1779"/>
         <source>copied selection to clipboard</source>
         <translation>arbelean kopiatutako aukeraketa</translation>
     </message>
 </context>
 <context>
+    <name>QsciLexerBash</name>
+    <message>
+        <location filename="../../../qsci/qscilexerbash.cpp" line="+208"/>
+        <source>Default</source>
+        <translation type="unfinished">Lehenetsia</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Error</source>
+        <translation type="unfinished">Akatsa</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Comment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Number</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Keyword</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Double-quoted string</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Single-quoted string</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Operator</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Identifier</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Scalar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Parameter expansion</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Backticks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Here document delimiter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Single-quoted here document</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QsciLexerBatch</name>
+    <message>
+        <location filename="../../../qsci/qscilexerbatch.cpp" line="+179"/>
+        <source>Default</source>
+        <translation type="unfinished">Lehenetsia</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Comment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Keyword</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Label</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Hide command character</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>External command</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Variable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Operator</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QsciLexerCPP</name>
+    <message>
+        <location filename="../../../qsci/qscilexercpp.cpp" line="+352"/>
+        <source>Default</source>
+        <translation type="unfinished">Lehenetsia</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Inactive default</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>C comment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Inactive C comment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>C++ comment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Inactive C++ comment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>JavaDoc style C comment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Inactive JavaDoc style C comment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Number</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Inactive number</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Keyword</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Inactive keyword</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Double-quoted string</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Inactive double-quoted string</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Single-quoted string</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Inactive single-quoted string</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>IDL UUID</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Inactive IDL UUID</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Pre-processor block</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Inactive pre-processor block</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Operator</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Inactive operator</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Identifier</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Inactive identifier</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Unclosed string</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Inactive unclosed string</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>C# verbatim string</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Inactive C# verbatim string</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>JavaScript regular expression</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Inactive JavaScript regular expression</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>JavaDoc style C++ comment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Inactive JavaDoc style C++ comment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Secondary keywords and identifiers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Inactive secondary keywords and identifiers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>JavaDoc keyword</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Inactive JavaDoc keyword</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>JavaDoc keyword error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Inactive JavaDoc keyword error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Global classes and typedefs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Inactive global classes and typedefs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>C++ raw string</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Inactive C++ raw string</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QsciLexerDiff</name>
+    <message>
+        <location filename="../../../qsci/qscilexerdiff.cpp" line="+107"/>
+        <source>Default</source>
+        <translation type="unfinished">Lehenetsia</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Comment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Command</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Header</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Position</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Removed line</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Added line</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Changed line</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QsciLexerMatlab</name>
+    <message>
+        <location filename="../../../qsci/qscilexermatlab.cpp" line="+138"/>
+        <source>Default</source>
+        <translation type="unfinished">Lehenetsia</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Comment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Command</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Number</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Keyword</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Single-quoted string</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Operator</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Identifier</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Double-quoted string</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QsciLexerPerl</name>
+    <message>
+        <location filename="../../../qsci/qscilexerperl.cpp" line="+333"/>
+        <source>Default</source>
+        <translation type="unfinished">Lehenetsia</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Error</source>
+        <translation type="unfinished">Akatsa</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Comment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>POD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Number</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Keyword</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Double-quoted string</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Single-quoted string</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Operator</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Identifier</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Scalar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Array</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Hash</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Symbol table</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Regular expression</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Substitution</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Backticks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Data section</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Here document delimiter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Single-quoted here document</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Double-quoted here document</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Backtick here document</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Quoted string (q)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Quoted string (qq)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Quoted string (qx)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Quoted string (qr)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Quoted string (qw)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>POD verbatim</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Subroutine prototype</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Format identifier</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Format body</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Double-quoted string (interpolated variable)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Translation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Regular expression (interpolated variable)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Substitution (interpolated variable)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Backticks (interpolated variable)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Double-quoted here document (interpolated variable)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Backtick here document (interpolated variable)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Quoted string (qq, interpolated variable)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Quoted string (qx, interpolated variable)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Quoted string (qr, interpolated variable)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QsciScintilla</name>
+    <message>
+        <location filename="../../../qsci/qsciscintilla.cpp" line="+4201"/>
+        <source>&amp;Undo</source>
+        <translation type="unfinished">&amp;Desegin</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>&amp;Redo</source>
+        <translation type="unfinished">&amp;Berregin</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Cu&amp;t</source>
+        <translation type="unfinished">Eba&amp;ki</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>&amp;Copy</source>
+        <translation type="unfinished">&amp;Kopiatu</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>&amp;Paste</source>
+        <translation type="unfinished">&amp;Itsatsi</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Select All</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>QtHandles::Figure</name>
     <message>
-        <location filename="../graphics/Figure.cc" line="+282"/>
+        <location filename="../graphics/Figure.cc" line="+298"/>
         <source>Figure ToolBar</source>
         <translation>Irudien tresna-barra</translation>
     </message>
@@ -146,37 +845,19 @@
         <translation>Ko&amp;piatu</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Cu&amp;t</source>
-        <translation>Eba&amp;ki</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>&amp;Paste</source>
-        <translation>&amp;Itsatsi</translation>
-    </message>
-    <message>
-        <location line="+5"/>
+        <location line="+7"/>
+        <location line="+463"/>
+        <source>About Octave</source>
+        <translation type="unfinished">&quot;Octave&quot;-ri buruz</translation>
+    </message>
+    <message>
+        <location line="-465"/>
         <source>&amp;Help</source>
         <translation>&amp;Laguntza</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>&amp;About QtHandles</source>
-        <translation>&quot;QtHandles&quot;-i &amp;buruz</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>About &amp;Qt</source>
-        <translation>&quot;Qt&quot;-ri &amp;buruz</translation>
-    </message>
-    <message>
-        <location line="+427"/>
-        <source>About QtHandles</source>
-        <translation>&quot;QtHandles&quot;-i buruz</translation>
-    </message>
-    <message>
-        <location line="+39"/>
+        <location line="+504"/>
+        <location line="+69"/>
         <source>Save Figure As</source>
         <translation>Gorde irudia honela</translation>
     </message>
@@ -215,6 +896,160 @@
     </message>
 </context>
 <context>
+    <name>annotation_dialog</name>
+    <message>
+        <location filename="../graphics/annotation-dialog.ui" line="+17"/>
+        <source>Annotation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>String</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Font</source>
+        <translation type="unfinished">Letra-tipo mota</translation>
+    </message>
+    <message>
+        <location line="+42"/>
+        <source>bold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>b</source>
+        <translation type="unfinished">l</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>italic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>i</source>
+        <translation type="unfinished">e</translation>
+    </message>
+    <message>
+        <location line="+428"/>
+        <source>color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>Horz alignment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <location line="+29"/>
+        <source>middle</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-24"/>
+        <source>right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Vert alignment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>top</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>bottom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Position</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>X</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Y</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Width</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Height</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>units</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>normalized</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Fit to box</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Box</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Background</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+444"/>
+        <source>Edge</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+133"/>
+        <source>Line style</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>none</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Line width</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>documentation_dock_widget</name>
     <message>
         <location filename="../src/documentation-dock-widget.cc" line="+34"/>
@@ -230,17 +1065,18 @@
 <context>
     <name>file_editor</name>
     <message>
-        <location filename="../src/m-editor/file-editor.cc" line="+285"/>
-        <location line="+125"/>
+        <location filename="../src/m-editor/file-editor.cc" line="+366"/>
+        <location line="+152"/>
         <location line="+19"/>
         <location line="+25"/>
         <location line="+62"/>
         <location line="+28"/>
+        <location line="+79"/>
         <source>Octave Editor</source>
         <translation>Octaveren editorea</translation>
     </message>
     <message>
-        <location line="-318"/>
+        <location line="-462"/>
         <source>Octave Files (*.m);;All Files (*)</source>
         <translation>Octaveren fitxategiak (*.m);;Fitxategi guztiak (*)</translation>
     </message>
@@ -250,12 +1086,12 @@
         <translation>Beste funtzio bat sortu</translation>
     </message>
     <message>
-        <location line="+718"/>
+        <location line="+888"/>
         <source>&amp;%1 %2</source>
         <translation>&amp;%1 %2</translation>
     </message>
     <message>
-        <location line="+388"/>
+        <location line="+480"/>
         <source>&amp;Save File</source>
         <translation>&amp;Gorde fitxategia</translation>
     </message>
@@ -271,55 +1107,40 @@
     </message>
     <message>
         <location line="+7"/>
-        <source>&amp;Undo</source>
-        <translation>&amp;Desegin</translation>
-    </message>
-    <message>
-        <location line="+3"/>
         <source>&amp;Redo</source>
         <translation>&amp;Berregin</translation>
     </message>
     <message>
         <location line="+6"/>
-        <source>&amp;Copy</source>
-        <translation>&amp;Kopiatu</translation>
-    </message>
-    <message>
-        <location line="+3"/>
         <source>Cu&amp;t</source>
         <translation>Eba&amp;ki</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Paste</source>
-        <translation>Itsatsi</translation>
-    </message>
-    <message>
-        <location line="+96"/>
+        <location line="+94"/>
         <source>&amp;Next Bookmark</source>
         <translation>Hurrengo &amp;markatzailea</translation>
     </message>
     <message>
-        <location line="-2"/>
+        <location line="+2"/>
         <source>Pre&amp;vious Bookmark</source>
         <translation>Aurreko &amp;markatzailea</translation>
     </message>
     <message>
-        <location line="-1237"/>
+        <location line="-1492"/>
         <source>New function name:
 </source>
         <translation>Funtzio berriaren izena:
 </translation>
     </message>
     <message>
-        <location line="+99"/>
+        <location line="+137"/>
         <source>Could not start custom file editor
 %1</source>
         <translation>%1
 pertsonalizatutako testu-editorea ezin da ireki</translation>
     </message>
     <message>
-        <location line="+125"/>
+        <location line="+152"/>
         <source>Could not open file
 %1
 for read: %2.</source>
@@ -335,7 +1156,7 @@
 fitxategia ez dago. Sortu nahi duzu?</translation>
     </message>
     <message>
-        <location line="+998"/>
+        <location line="+1186"/>
         <source>Toggle &amp;Bookmark</source>
         <translation>&amp;Markatzaileak txandatu</translation>
     </message>
@@ -350,7 +1171,7 @@
         <translation>Erakutsi &amp;zuriuneak</translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+48"/>
         <source>&amp;Next Breakpoint</source>
         <translation>&amp;Hurrengo geldiunea</translation>
     </message>
@@ -370,7 +1191,7 @@
         <translation>&amp;Ezabatu geldiune guztiak</translation>
     </message>
     <message>
-        <location line="-104"/>
+        <location line="-118"/>
         <source>&amp;Comment</source>
         <translation>&amp;Iruzkindu</translation>
     </message>
@@ -390,22 +1211,27 @@
         <translation>Koska &amp;kendu</translation>
     </message>
     <message>
-        <location line="-55"/>
+        <location line="-61"/>
         <source>&amp;Find and Replace...</source>
         <translation>&amp;Bilatu eta ordezkatu...</translation>
     </message>
     <message>
-        <location line="+162"/>
+        <location line="+182"/>
         <source>Save File and Run</source>
         <translation>Fitxategia gorde eta exekutatu</translation>
     </message>
     <message>
-        <location line="-90"/>
+        <location line="-104"/>
         <source>Go &amp;to Line...</source>
         <translation>&amp;Lerrora joan...</translation>
     </message>
     <message>
-        <location line="-978"/>
+        <location line="-1425"/>
+        <source>File Encoding:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+259"/>
         <source>Create</source>
         <translation>Sortu</translation>
     </message>
@@ -432,7 +1258,17 @@
 Izen bera duen beste fitxategi bat irekita dago editorean</translation>
     </message>
     <message>
-        <location line="+762"/>
+        <location line="+61"/>
+        <source>%1 is a built-in function</source>
+        <translation type="unfinished">%1 Octaven integratutako funtzioa da</translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>Can not find function %1</source>
+        <translation type="unfinished">Ezin da %1 funtzioa aurkitu</translation>
+    </message>
+    <message>
+        <location line="+862"/>
         <source>&amp;Recent Editor Files</source>
         <translation>&amp;Azken fitxategiak</translation>
     </message>
@@ -457,12 +1293,7 @@
         <translation>Beste fitxategi batzuk itxi</translation>
     </message>
     <message>
-        <location line="+31"/>
-        <source>Select All</source>
-        <translation>Aukeratu dena</translation>
-    </message>
-    <message>
-        <location line="+10"/>
+        <location line="+32"/>
         <source>&amp;Commands</source>
         <translation>&amp;Aginduak</translation>
     </message>
@@ -588,17 +1419,47 @@
         <translation>Erakutsi &amp;lerroen zenbakiak</translation>
     </message>
     <message>
-        <location line="+128"/>
-        <source>Editor</source>
-        <translation>Editorea</translation>
-    </message>
-    <message>
-        <location line="-120"/>
-        <source>Show Line &amp;Endings</source>
-        <translation>Erakutsi lerro-&amp;amaierak</translation>
+        <location line="+22"/>
+        <source>Show &amp;Toolbar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Show &amp;Statusbar</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+4"/>
+        <source>Show &amp;Horizontal Scrollbar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+69"/>
+        <source>Recent Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+65"/>
+        <source>Editor</source>
+        <translation>Editorea</translation>
+    </message>
+    <message>
+        <location line="-156"/>
+        <source>Show Line &amp;Endings</source>
+        <translation>Erakutsi lerro-&amp;amaierak</translation>
+    </message>
+    <message>
+        <location line="-117"/>
+        <source>Find &amp;Next...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Find &amp;Previous...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+118"/>
         <source>Show &amp;Indentation Guides</source>
         <translation>&amp;Koska-erakusleak bistaratu</translation>
     </message>
@@ -608,7 +1469,7 @@
         <translation>Erakutsi lerroen &amp;luzera-markatzailea</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+20"/>
         <source>Zoom &amp;In</source>
         <translation>&amp;Handitu</translation>
     </message>
@@ -643,12 +1504,12 @@
         <translation>&amp;Hitz gakoen dokumentazioa</translation>
     </message>
     <message>
-        <location line="-969"/>
+        <location line="-1171"/>
         <source>The associated file editor tab has disappeared.</source>
         <translation>Atxikitako testu editorearen fitxa desagertu egin da.</translation>
     </message>
     <message>
-        <location line="+731"/>
+        <location line="+928"/>
         <source>&amp;File</source>
         <translation>&amp;Fitxategia</translation>
     </message>
@@ -658,7 +1519,7 @@
         <translation>&amp;Editatu</translation>
     </message>
     <message>
-        <location line="+166"/>
+        <location line="+171"/>
         <source>&amp;Debug</source>
         <translation>&amp;Akasgabetu</translation>
     </message>
@@ -671,12 +1532,12 @@
 <context>
     <name>file_editor_tab</name>
     <message>
-        <location filename="../src/m-editor/file-editor-tab.cc" line="+92"/>
+        <location filename="../src/m-editor/file-editor-tab.cc" line="+145"/>
         <source>eol:</source>
         <translation>Lerro-amaiera:</translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="-17"/>
         <source>line:</source>
         <translation>Lerroa:</translation>
     </message>
@@ -686,17 +1547,7 @@
         <translation>Zutabea:</translation>
     </message>
     <message>
-        <location line="+156"/>
-        <source>%1 is a built-in function</source>
-        <translation>%1 Octaven integratutako funtzioa da</translation>
-    </message>
-    <message>
-        <location line="+31"/>
-        <source>Can not find function %1</source>
-        <translation>Ezin da %1 funtzioa aurkitu</translation>
-    </message>
-    <message>
-        <location line="+775"/>
+        <location line="+1146"/>
         <source>Goto line</source>
         <translation>Lerrora joan</translation>
     </message>
@@ -706,7 +1557,7 @@
         <translation>Lerro-zenbakia</translation>
     </message>
     <message>
-        <location line="+146"/>
+        <location line="+145"/>
         <location line="+63"/>
         <source>&lt;unnamed&gt;</source>
         <translation>&lt;izen gabe&gt;</translation>
@@ -722,31 +1573,14 @@
 fitxategia itxi egingo da, baina aldaketak izan dira.  %2</translation>
     </message>
     <message>
-        <location line="+213"/>
+        <location line="+372"/>
         <source>Could not open file %1 for write:
 %2.</source>
         <translation>%1
 fitxategia ezin da irakurtzeko ireki: %2.</translation>
     </message>
     <message>
-        <location line="+177"/>
-        <source>&quot;%1&quot;
-is not a valid identifier.
-
-If you keep this file name, you will not be able to
-call your script using its name as an Octave command.
-
-Do you want to choose another name?</source>
-        <translation>&quot;%1&quot;
-ez da identifikatzaile baliagarria.
-
-Izen hori erabiltzen baduzu fitxategiarentzat, ezingo
-diozu scriptari Octaveren komando bezala deitu.
-
-Beste izen bat erabili nahi duzu?</translation>
-    </message>
-    <message>
-        <location line="+101"/>
+        <location line="+335"/>
         <source>
 
 Warning: The contents in the editor is modified!</source>
@@ -764,12 +1598,44 @@
 fitxategia ezebatu edo izenez aldatu da. Berreskuratu nahi duzu?%2</translation>
     </message>
     <message>
-        <location line="-210"/>
+        <location line="-249"/>
         <source>Line Endings:</source>
         <translation>Lerro-amaierak:</translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="-1817"/>
+        <source>encoding:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+239"/>
+        <source>Breakpoint condition</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+89"/>
+        <source>Cannot add breakpoint to modified file.
+Save and add breakpoint, or canel?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1322"/>
+        <source>Debug or Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>This file is currently being executed.
+Quit debugging and save?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+175"/>
+        <source>File Encoding:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+28"/>
         <source>Octave Files (*.m)</source>
         <translation>Octaveren fitxategiak (*.m)</translation>
     </message>
@@ -779,22 +1645,43 @@
         <translation>Fitxategi guztiak (*)</translation>
     </message>
     <message>
-        <location line="-322"/>
+        <location line="-513"/>
         <source>Do you want to cancel closing, save or discard the changes?</source>
         <translation>Ixtea galarazi, gorde edo aldaketak baztertu nahi dituzu?</translation>
     </message>
     <message>
-        <location line="-970"/>
-        <location line="+979"/>
-        <location line="+213"/>
-        <location line="+177"/>
-        <location line="+85"/>
+        <location line="-1015"/>
+        <location line="+1024"/>
+        <location line="+372"/>
+        <location line="+215"/>
+        <location line="+21"/>
+        <location line="+83"/>
         <location line="+23"/>
         <source>Octave Editor</source>
         <translation>Octaveren editorea</translation>
     </message>
     <message>
-        <location line="-22"/>
+        <location line="-126"/>
+        <source>&quot;%1&quot;
+is not a valid identifier.
+
+If you keep this filename, you will not be able to
+call your script using its name as an Octave command.
+
+Do you want to choose another name?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>The current editor contents can not be encoded
+with the selected codec %1.
+Using it will result in data loss!
+
+Do you want to chose another codec?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+83"/>
         <source>It seems that &apos;%1&apos; has been modified by another application. Do you want to reload it?</source>
         <translation>Itxuraz &apos;%1&apos; fitxategia beste aplikazio batek aldatu du. Berriro kargatu nahi duzu?</translation>
     </message>
@@ -807,12 +1694,7 @@
         <translation>Fitxategi-arakatzailea</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Browse your files.</source>
-        <translation>Arakatu zure fitxategiak.</translation>
-    </message>
-    <message>
-        <location line="+18"/>
+        <location line="+35"/>
         <source>Enter the path or filename</source>
         <translation>Sartu fitxategiaren kokagunea edo izena</translation>
     </message>
@@ -833,12 +1715,22 @@
     </message>
     <message>
         <location line="+4"/>
-        <location line="+388"/>
+        <location line="+373"/>
         <source>Find Files...</source>
         <translation>Fitxategiak bilatu...</translation>
     </message>
     <message>
-        <location line="+123"/>
+        <location line="-26"/>
+        <source>Open in System File Explorer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Open in Text Editor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+154"/>
         <source>Rename file/directory:
 </source>
         <translation>Fitxategiari/direktorioari izena aldatu:
@@ -859,17 +1751,52 @@
 </translation>
     </message>
     <message>
-        <location line="+214"/>
+        <location line="+208"/>
         <source>New Directory</source>
         <translation>Direktorio berria</translation>
     </message>
     <message>
-        <location line="-784"/>
+        <location line="-773"/>
         <source>Show Octave directory</source>
         <translation>Octaveren direktorioa erakutsi</translation>
     </message>
     <message>
-        <location line="-4"/>
+        <location line="-49"/>
+        <source>Browse your files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Alternating row colors</source>
+        <translation type="unfinished">Txandakatu lerroen koloreak</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>filesdockwidget/showFileSize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>filesdockwidget/showFileType</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>filesdockwidget/showLastModified</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>filesdockwidget/showHiddenFiles</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>filesdockwidget/useAlternatingRowColors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+29"/>
         <source>One directory up</source>
         <translation>Gorengo direktorioa</translation>
     </message>
@@ -890,53 +1817,48 @@
     </message>
     <message>
         <location line="+20"/>
-        <location line="+397"/>
+        <location line="+382"/>
         <source>New File...</source>
         <translation>Beste fitxategi bat...</translation>
     </message>
     <message>
-        <location line="-394"/>
-        <location line="+397"/>
+        <location line="-379"/>
+        <location line="+382"/>
         <source>New Directory...</source>
         <translation>Beste direktorio bat...</translation>
     </message>
     <message>
-        <location line="-335"/>
+        <location line="-329"/>
         <source>Activate to open in editor, right click for alternatives</source>
         <translation>Aktibatu editoren irekitzeko. Egin eskuin-klik aukerak bistaratzeko</translation>
     </message>
     <message>
-        <location line="+236"/>
+        <location line="-136"/>
         <source>File size</source>
         <translation>Fitxategiaren tamaina</translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+1"/>
         <source>File type</source>
         <translation>Fitxategi-mota</translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+1"/>
         <source>Date modified</source>
         <translation>Aldatze-data</translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+1"/>
         <source>Show hidden</source>
         <translation>Erakutsi ezkutukoak</translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+415"/>
         <source>Open</source>
         <translation>Ireki</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Open in Default Application</source>
-        <translation>Lehenetsitako aplikazioan ireki</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <location line="+13"/>
         <source>Copy Selection to Clipboard</source>
         <translation>Arbelean kopiatu aukeraketa</translation>
     </message>
@@ -966,7 +1888,7 @@
         <translation>Ezabatu...</translation>
     </message>
     <message>
-        <location line="+115"/>
+        <location line="+125"/>
         <source>Rename file/directory</source>
         <translation>Fitxategia/direktorioa izenez aldatu</translation>
     </message>
@@ -982,7 +1904,7 @@
         <translation>Ezin dira hutsik ez dauden direktorioak ezabatu</translation>
     </message>
     <message>
-        <location line="+151"/>
+        <location line="+145"/>
         <source>Set directory of file browser</source>
         <translation>Fitxategi-arakatzailetik direktorioa aukeratu</translation>
     </message>
@@ -1021,7 +1943,7 @@
 <context>
     <name>final_page</name>
     <message>
-        <location filename="../src/welcome-wizard.cc" line="+199"/>
+        <location filename="../src/welcome-wizard.cc" line="+195"/>
         <source>Enjoy!</source>
         <translation>Gozatu!</translation>
     </message>
@@ -1087,7 +2009,7 @@
 <context>
     <name>find_dialog</name>
     <message>
-        <location filename="../src/m-editor/find-dialog.cc" line="+74"/>
+        <location filename="../src/m-editor/find-dialog.cc" line="+85"/>
         <source>Find and Replace</source>
         <translation>Bilatu eta ordezkatu</translation>
     </message>
@@ -1162,7 +2084,7 @@
         <translation>Bilatu au&amp;keraketa</translation>
     </message>
     <message>
-        <location line="+84"/>
+        <location line="+87"/>
         <source>Search from end</source>
         <translation>Azkenetik bilatu</translation>
     </message>
@@ -1172,7 +2094,7 @@
         <translation>Hasieratik bilatu</translation>
     </message>
     <message>
-        <location line="+205"/>
+        <location line="+221"/>
         <source>Replace Result</source>
         <translation>Emaitza ordezkatu</translation>
     </message>
@@ -1290,7 +2212,7 @@
         <translation>Bilaketaren emaitzak</translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+21"/>
         <source>Idle.</source>
         <translation>Ez aktibo.</translation>
     </message>
@@ -1316,8 +2238,8 @@
     </message>
     <message>
         <location line="+15"/>
-        <source>File name/location</source>
-        <translation>Fitxategiaren izena/kokagunea</translation>
+        <source>Filename/location</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+17"/>
@@ -1325,7 +2247,7 @@
         <translation>Fitxategiaren edukia</translation>
     </message>
     <message>
-        <location line="+105"/>
+        <location line="+111"/>
         <source>Searching...</source>
         <translation>Bilatzen...</translation>
     </message>
@@ -1343,7 +2265,7 @@
 <context>
     <name>find_files_model</name>
     <message>
-        <location filename="../src/find-files-model.cc" line="+82"/>
+        <location filename="../src/find-files-model.cc" line="+83"/>
         <source>Filename</source>
         <translation>Fitxategiaren izena</translation>
     </message>
@@ -1381,7 +2303,7 @@
         <translation>Komandoen historiala</translation>
     </message>
     <message>
-        <location line="+89"/>
+        <location line="+107"/>
         <source>Copy</source>
         <translation>Kopiatu</translation>
     </message>
@@ -1395,11 +2317,21 @@
         <source>Create script</source>
         <translation>Scripta sortu</translation>
     </message>
+    <message>
+        <location line="+4"/>
+        <source>Hide filter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Show filter</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>initial_page</name>
     <message>
-        <location filename="../src/welcome-wizard.cc" line="-179"/>
+        <location filename="../src/welcome-wizard.cc" line="-176"/>
         <source>Welcome to Octave!</source>
         <translation>Ongi etorri Octavera!</translation>
     </message>
@@ -1430,13 +2362,13 @@
 <context>
     <name>main_window</name>
     <message>
-        <location filename="../src/main-window.cc" line="+268"/>
+        <location filename="../src/main-window.cc" line="+275"/>
         <source>Load Workspace</source>
         <translation>Lan-eremua kargatu</translation>
     </message>
     <message>
-        <location line="+732"/>
-        <location line="+931"/>
+        <location line="+758"/>
+        <location line="+975"/>
         <source>About Octave</source>
         <translation>&quot;Octave&quot;-ri buruz</translation>
     </message>
@@ -1446,12 +2378,12 @@
         <translation>&amp;Fitxategia</translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+45"/>
         <source>New</source>
         <translation>Beste bat sortu</translation>
     </message>
     <message>
-        <location line="-43"/>
+        <location line="-39"/>
         <source>Open...</source>
         <translation>Ireki...</translation>
     </message>
@@ -1461,7 +2393,7 @@
         <translation>Hobespenak...</translation>
     </message>
     <message>
-        <location line="-95"/>
+        <location line="-99"/>
         <source>Exit</source>
         <translation>Irten</translation>
     </message>
@@ -1476,22 +2408,22 @@
         <translation>Desegin</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+7"/>
         <source>Copy</source>
         <translation>Kopiatu</translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+5"/>
         <source>Paste</source>
         <translation>Itsatsi</translation>
     </message>
     <message>
-        <location line="-1469"/>
+        <location line="-1537"/>
         <source>Save Workspace As</source>
         <translation>Gorde honela lan-eremua</translation>
     </message>
     <message>
-        <location line="+134"/>
+        <location line="+124"/>
         <source>The release notes file &apos;%1&apos; is empty.</source>
         <translation>%1 bertsioaren noten fitxategia hutsik dago.</translation>
     </message>
@@ -1501,7 +2433,7 @@
         <translation>&apos;%1&apos; bertsioaren noten fitxategia ezin da irakurri.</translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="+12"/>
         <source>Octave Release Notes</source>
         <translation>Octave bertsioaren notak</translation>
     </message>
@@ -1511,17 +2443,17 @@
         <translation>Octave komunitatearen berriak</translation>
     </message>
     <message>
-        <location line="+187"/>
+        <location line="+206"/>
         <source>Are you sure you want to exit Octave?</source>
         <translation>Seguru zaude Octavetik irten nahi duzula?</translation>
     </message>
     <message>
-        <location line="+854"/>
+        <location line="+916"/>
         <source>Open an existing file in editor</source>
         <translation>Ireki fitxategi bat editorean</translation>
     </message>
     <message>
-        <location line="+48"/>
+        <location line="+44"/>
         <source>New Function...</source>
         <translation>Beste funtzio bat...</translation>
     </message>
@@ -1531,12 +2463,12 @@
         <translation>Beste irudi bat</translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+39"/>
         <source>Select All</source>
         <translation>Hautatu dena</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="+4"/>
         <source>Clear Clipboard</source>
         <translation>Paper-zorroa garbitu</translation>
     </message>
@@ -1586,17 +2518,27 @@
         <translation>Fitxategi-arakatzailea</translation>
     </message>
     <message>
-        <location line="-84"/>
+        <location line="+36"/>
+        <source>Contribute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Donate to Octave</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-123"/>
         <source>Step In</source>
         <translation>Hasi</translation>
     </message>
     <message>
-        <location line="-1020"/>
+        <location line="-1082"/>
         <source>Octave</source>
         <translation>Octave</translation>
     </message>
     <message>
-        <location line="+868"/>
+        <location line="+926"/>
         <source>Load Workspace...</source>
         <translation>Lan-eremua kargatu...</translation>
     </message>
@@ -1611,7 +2553,7 @@
         <translation>Beste script bat</translation>
     </message>
     <message>
-        <location line="+124"/>
+        <location line="+128"/>
         <source>Step Out</source>
         <translation>Amaitu</translation>
     </message>
@@ -1631,17 +2573,7 @@
         <translation>Kodea partekatu</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Contribute to Octave</source>
-        <translation>Octaverekin kolaboratu</translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Octave Developer Resources</source>
-        <translation>Octaveren garatzaileentzako baliabideak</translation>
-    </message>
-    <message>
-        <location line="+14"/>
+        <location line="+20"/>
         <source>On Disk</source>
         <translation>Diskoan</translation>
     </message>
@@ -1686,8 +2618,8 @@
         <translation>Gorengo direktorioa</translation>
     </message>
     <message>
-        <location line="-1148"/>
-        <location line="+1151"/>
+        <location line="-1198"/>
+        <location line="+1201"/>
         <source>Browse directories</source>
         <translation>Direktorioak arakatu</translation>
     </message>
@@ -1766,7 +2698,7 @@
 <context>
     <name>news_reader</name>
     <message>
-        <location line="-1411"/>
+        <location line="-1492"/>
         <source>&lt;html&gt;
 &lt;body&gt;
 &lt;p&gt;
@@ -1826,18 +2758,18 @@
 <context>
     <name>octave_dock_widget</name>
     <message>
-        <location filename="../src/octave-dock-widget.cc" line="+68"/>
-        <location line="+198"/>
+        <location filename="../src/octave-dock-widget.cc" line="+67"/>
+        <location line="+201"/>
         <source>Undock widget</source>
         <translation>Desakoplatu widgeta</translation>
     </message>
     <message>
-        <location line="-188"/>
+        <location line="-191"/>
         <source>Hide widget</source>
         <translation>Ezkutatu widgeta</translation>
     </message>
     <message>
-        <location line="+132"/>
+        <location line="+136"/>
         <source>Dock widget</source>
         <translation>Akoplatu widgeta</translation>
     </message>
@@ -1845,7 +2777,7 @@
 <context>
     <name>octave_qscintilla</name>
     <message>
-        <location filename="../src/m-editor/octave-qscintilla.cc" line="+226"/>
+        <location filename="../src/m-editor/octave-qscintilla.cc" line="+237"/>
         <source>Help on</source>
         <translation>Laguntza honi buruz</translation>
     </message>
@@ -1859,18 +2791,23 @@
         <source>Edit</source>
         <translation>Editatu</translation>
     </message>
+    <message>
+        <location line="+15"/>
+        <source>dbstop if ...</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>octave_qt_link</name>
     <message>
-        <location filename="../src/octave-qt-link.cc" line="+111"/>
-        <location line="+6"/>
-        <location line="+7"/>
+        <location filename="../src/octave-qt-link.cc" line="+136"/>
+        <location line="+9"/>
+        <location line="+11"/>
         <source>Create</source>
         <translation>Sortu</translation>
     </message>
     <message>
-        <location line="-10"/>
+        <location line="-14"/>
         <source>File
 %1
 does not exist. Do you want to create it?</source>
@@ -1883,7 +2820,7 @@
         <translation>Octaveren editorea</translation>
     </message>
     <message>
-        <location line="+211"/>
+        <location line="+254"/>
         <source>The file %1 does not exist in the load path.  To run or debug the function you are editing, you must either change to the directory %2 or add that directory to the load path.</source>
         <translation>%1 fitxategia ez dago kargatze-helbidean. Editatzen ari zaren funtzioa akasgabetzeko, bi aukera dituzu: %2 direktoriora aldatzea edo direktorio hori kargatze-helbidera gehitzea.</translation>
     </message>
@@ -1908,8 +2845,8 @@
         <translation>Gehitu direktorioa kargatze-helbidean</translation>
     </message>
     <message>
-        <location line="-223"/>
-        <location line="+224"/>
+        <location line="-269"/>
+        <location line="+270"/>
         <source>Cancel</source>
         <translation>Ezeztatu</translation>
     </message>
@@ -1925,7 +2862,7 @@
 <context>
     <name>resource_manager</name>
     <message>
-        <location filename="../src/resource-manager.cc" line="+245"/>
+        <location filename="../src/resource-manager.cc" line="+246"/>
         <source>The settings file
 %1
 does not exist and can not be created.
@@ -1950,401 +2887,311 @@
     <name>settings_dialog</name>
     <message>
         <location filename="../src/settings-dialog.ui" line="+23"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1738"/>
         <source>Settings</source>
         <translation>Hobespenak</translation>
     </message>
     <message>
         <location line="+19"/>
         <location line="+468"/>
-        <location filename="../src/ui-settings-dialog.h" line="+25"/>
-        <location line="+1"/>
         <source>General</source>
         <translation>Orokorra</translation>
     </message>
     <message>
         <location line="-338"/>
-        <location filename="../src/ui-settings-dialog.h" line="-17"/>
         <source>Octave logo only</source>
         <translation>Octaveren logoa bakarrik</translation>
     </message>
     <message>
         <location line="+10"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Letter icons</source>
         <translation>Letradun ikonoak</translation>
     </message>
     <message>
         <location line="+7"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Graphic icons</source>
         <translation>Ikono grafikoak</translation>
     </message>
     <message>
         <location line="-118"/>
-        <location filename="../src/ui-settings-dialog.h" line="-9"/>
         <source>Dock widget title bar</source>
         <translation>Akoplatu widgeta titulu-barrara</translation>
     </message>
     <message>
         <location line="+53"/>
-        <location filename="../src/ui-settings-dialog.h" line="+3"/>
         <source>Small</source>
         <translation>Txikia</translation>
     </message>
     <message>
         <location line="+17"/>
-        <location filename="../src/ui-settings-dialog.h" line="+2"/>
         <source>Large</source>
         <translation>Handia</translation>
     </message>
     <message>
         <location line="+168"/>
-        <location filename="../src/ui-settings-dialog.h" line="+10"/>
         <source>Custom style</source>
         <translation>Pertsonalizatutako estiloa</translation>
     </message>
     <message>
         <location line="+92"/>
-        <location filename="../src/ui-settings-dialog.h" line="+4"/>
         <source>These preferences are applied after any .octaverc startup files.</source>
         <translation>Hobespenok .octavercse hasierako fitxategiak exekutatu ondoren izango dute eragina.</translation>
     </message>
     <message>
         <location line="+55"/>
-        <location filename="../src/ui-settings-dialog.h" line="+3"/>
         <source>Restore working directory of previous session</source>
         <translation>Berreskuratu aurreko saioko lan-direktorioa</translation>
     </message>
     <message>
         <location line="+33"/>
-        <location filename="../src/ui-settings-dialog.h" line="+58"/>
         <source>Editor</source>
         <translation>Editorea</translation>
     </message>
     <message>
-        <location line="+151"/>
-        <location filename="../src/ui-settings-dialog.h" line="-49"/>
+        <location line="+107"/>
         <source>Color</source>
         <translation>Kolorea</translation>
     </message>
     <message>
-        <location line="+138"/>
-        <location filename="../src/ui-settings-dialog.h" line="+6"/>
+        <location line="-69"/>
         <source>Draw a long line marker</source>
         <translation>Erakutsi lerro-luzera markatzailea</translation>
     </message>
     <message>
-        <location line="+48"/>
-        <location filename="../src/ui-settings-dialog.h" line="+3"/>
+        <location line="+155"/>
         <source>Show EOL characters</source>
         <translation>Erakutsi lerro-bukaerako karaktereak</translation>
     </message>
     <message>
-        <location line="+9"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
+        <location line="+662"/>
         <source>Default EOL mode</source>
         <translation>Lehenetsitako lerro-bukaera adierazlea</translation>
     </message>
     <message>
-        <location line="+154"/>
-        <location filename="../src/ui-settings-dialog.h" line="+12"/>
+        <location line="-394"/>
         <source>Indent width</source>
         <translation>Koska zabalera</translation>
     </message>
     <message>
         <location line="+7"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Tab indents line</source>
         <translation>Tabulazio bidez egin koska</translation>
     </message>
     <message>
         <location line="+7"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Auto indentation</source>
         <translation>Koska automatikoa</translation>
     </message>
     <message>
         <location line="+26"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Tab width</source>
         <translation>Tabuladorearen tamaina</translation>
     </message>
     <message>
         <location line="+7"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Show indentation guides</source>
         <translation>Erakutsi koska-erakusleak</translation>
     </message>
     <message>
         <location line="+23"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Backspace unindents line</source>
         <translation>Atzera-egite teklak koska ezabatzen du</translation>
     </message>
     <message>
         <location line="+88"/>
-        <location filename="../src/ui-settings-dialog.h" line="+3"/>
         <source>Match keywords</source>
         <translation>Hitz gakoetan bat egin</translation>
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Case sensitive</source>
         <translation>Maiskulak/minuskulak bereizi</translation>
     </message>
     <message>
         <location line="+23"/>
-        <location filename="../src/ui-settings-dialog.h" line="+2"/>
         <source>Replace word by suggested one</source>
         <translation>Gomendio bidez hitza ordeztu</translation>
     </message>
     <message>
         <location line="-10"/>
-        <location filename="../src/ui-settings-dialog.h" line="-1"/>
         <source>Match words in document</source>
         <translation>Dokumentuan hitzak bat etorri</translation>
     </message>
     <message>
-        <location line="+173"/>
-        <location filename="../src/ui-settings-dialog.h" line="+14"/>
+        <location line="+185"/>
         <source>Restore editor tabs from previous session on startup</source>
         <translation>Abiaraztean berreskuratu aurreko saioko editoreko fitxak</translation>
     </message>
     <message>
-        <location line="-426"/>
-        <location filename="../src/ui-settings-dialog.h" line="-28"/>
+        <location line="-438"/>
         <source>Use custom file editor</source>
         <translation>Fitxategi-editore pertsonalizatua erabili</translation>
     </message>
     <message>
-        <location line="+482"/>
-        <location filename="../src/ui-settings-dialog.h" line="+33"/>
+        <location line="+574"/>
         <source>Editor Styles</source>
         <translation>Editorearen estiloak</translation>
     </message>
     <message>
         <location line="+287"/>
-        <location filename="../src/ui-settings-dialog.h" line="+10"/>
         <source>Terminal Colors</source>
         <translation>Terminalaren koloreak</translation>
     </message>
     <message>
         <location line="-173"/>
-        <location filename="../src/ui-settings-dialog.h" line="-6"/>
         <source>Font</source>
         <translation>Letra-tipo mota</translation>
     </message>
     <message>
-        <location line="-917"/>
-        <location filename="../src/ui-settings-dialog.h" line="-58"/>
+        <location line="-1007"/>
         <source>Show line numbers</source>
         <translation>Erakutsi lerro-zenbakiak</translation>
     </message>
     <message>
-        <location line="-72"/>
-        <location filename="../src/ui-settings-dialog.h" line="-3"/>
+        <location line="+81"/>
         <source>Highlight current line</source>
         <translation>Momentuko lerroa nabarmendu</translation>
     </message>
     <message>
-        <location line="+85"/>
-        <location filename="../src/ui-settings-dialog.h" line="+4"/>
+        <location line="+13"/>
         <source>Show complete path in window title</source>
         <translation>Erakutsi helbidea osorik leihoaren tituluan</translation>
     </message>
     <message>
-        <location line="-29"/>
-        <location filename="../src/ui-settings-dialog.h" line="-2"/>
+        <location line="+13"/>
         <source>Show whitespace</source>
         <translation>Erakutsi zuriuneak</translation>
     </message>
     <message>
-        <location line="+39"/>
-        <location filename="../src/ui-settings-dialog.h" line="+3"/>
+        <location line="+157"/>
         <source>Do not show whitespace used for indentation</source>
         <translation>Ez erakutsi koskarako tarte-libreak</translation>
     </message>
     <message>
-        <location line="+625"/>
-        <location filename="../src/ui-settings-dialog.h" line="+37"/>
+        <location line="+382"/>
         <source>Number of characters before list is shown: </source>
         <translation>Idatzitako karaktere-kopurua bistaratutako lista bete baino lehen: </translation>
     </message>
     <message>
-        <location line="+112"/>
-        <location filename="../src/ui-settings-dialog.h" line="+11"/>
+        <location line="+124"/>
         <source>Create nonexistent files without prompting</source>
         <translation>Ez dauden fitxategiak galdetu gabe sortu</translation>
     </message>
     <message>
-        <location line="-429"/>
-        <location filename="../src/ui-settings-dialog.h" line="-28"/>
+        <location line="-441"/>
         <source>command line (%f=file, %l=line):</source>
         <translation>komandoko lerroa (%f=fitxategia, %l=lerroa):</translation>
     </message>
     <message>
-        <location line="+521"/>
-        <location filename="../src/ui-settings-dialog.h" line="+43"/>
+        <location line="+613"/>
         <source>Terminal</source>
         <translation>Terminala</translation>
     </message>
     <message>
         <location line="+51"/>
-        <location filename="../src/ui-settings-dialog.h" line="-8"/>
         <source>Cursor type:</source>
         <translation>Kurtsore-mota:</translation>
     </message>
     <message>
         <location line="-11"/>
-        <location filename="../src/ui-settings-dialog.h" line="-1"/>
         <source>Cursor blinking</source>
         <translation>Kurtsore keinukaria</translation>
     </message>
     <message>
         <location line="-7"/>
-        <location filename="../src/ui-settings-dialog.h" line="-1"/>
         <source>Use foreground color</source>
         <translation>Erabili lehenengo planoko kolorea</translation>
     </message>
     <message>
         <location line="+59"/>
-        <location filename="../src/ui-settings-dialog.h" line="+4"/>
         <source>Font size</source>
         <translation>Letra-tipoaren tamaina</translation>
     </message>
     <message>
         <location line="+123"/>
-        <location filename="../src/ui-settings-dialog.h" line="+3"/>
         <source>Set focus to terminal when running a command from within another widget</source>
         <translation>Joan terminalera beste widget batetik agindu bat exekutatzen denean</translation>
     </message>
     <message>
         <location line="+73"/>
-        <location filename="../src/ui-settings-dialog.h" line="+15"/>
         <source>File Browser</source>
         <translation>Fitxategi-arakatzailea</translation>
     </message>
     <message>
-        <location line="+46"/>
-        <location filename="../src/ui-settings-dialog.h" line="-8"/>
-        <source>Show file size</source>
-        <translation>Erakutsi fitxategiaren neurria</translation>
-    </message>
-    <message>
-        <location line="-14"/>
-        <location filename="../src/ui-settings-dialog.h" line="-2"/>
-        <source>Show file type</source>
-        <translation>Erakutsi fitxategi-mota</translation>
-    </message>
-    <message>
-        <location line="+21"/>
-        <location filename="../src/ui-settings-dialog.h" line="+3"/>
-        <source>Show date of last modification</source>
-        <translation>Erakutsi azken aldaketaren data</translation>
-    </message>
-    <message>
-        <location line="-14"/>
-        <location filename="../src/ui-settings-dialog.h" line="-2"/>
-        <source>Show hidden files</source>
-        <translation>Erakutsi ezkutuko fitxategiak</translation>
-    </message>
-    <message>
-        <location line="-1715"/>
-        <location filename="../src/ui-settings-dialog.h" line="-97"/>
+        <location line="-1729"/>
         <source>Interface</source>
         <translation>Interfazea</translation>
     </message>
     <message>
         <location line="+52"/>
-        <location filename="../src/ui-settings-dialog.h" line="+3"/>
         <source>Confirm before exiting</source>
         <translation>Berretsi irten aurretik</translation>
     </message>
     <message>
         <location line="+103"/>
-        <location line="+592"/>
-        <location filename="../src/ui-settings-dialog.h" line="+9"/>
-        <location line="+28"/>
+        <location line="+640"/>
         <source>Show status bar</source>
         <translation>Erakutsi egoera-barra</translation>
     </message>
     <message>
-        <location line="-540"/>
-        <location filename="../src/ui-settings-dialog.h" line="-26"/>
+        <location line="-588"/>
         <source>Text inactive</source>
         <translation>Testua ezgaituta</translation>
     </message>
     <message>
         <location line="-32"/>
         <location line="+45"/>
-        <location filename="../src/ui-settings-dialog.h" line="-1"/>
-        <location line="+2"/>
         <source>Active</source>
         <translation>Gaituta</translation>
     </message>
     <message>
         <location line="-152"/>
-        <location filename="../src/ui-settings-dialog.h" line="-10"/>
         <source>Normal</source>
         <translation>Normala</translation>
     </message>
     <message>
         <location line="+191"/>
-        <location filename="../src/ui-settings-dialog.h" line="+12"/>
         <source>Background inactive</source>
         <translation>Atzeko planoa ezgaituta</translation>
     </message>
     <message>
         <location line="+19"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>3D</source>
         <translation>3D</translation>
     </message>
     <message>
         <location line="+54"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Octave Startup</source>
         <translation>Octaveren abiaraztea</translation>
     </message>
     <message>
         <location line="+41"/>
-        <location line="+1392"/>
-        <location filename="../src/ui-settings-dialog.h" line="+2"/>
-        <location line="+82"/>
+        <location line="+1440"/>
         <source>Startup path</source>
         <translation>Hasierako helbidea</translation>
     </message>
     <message>
-        <location line="-1379"/>
-        <location line="+1409"/>
-        <location filename="../src/ui-settings-dialog.h" line="-81"/>
-        <location line="+83"/>
+        <location line="-1427"/>
+        <location line="+1420"/>
         <source>Browse</source>
         <translation>Arakatu</translation>
     </message>
     <message>
-        <location line="-1322"/>
-        <location filename="../src/ui-settings-dialog.h" line="-78"/>
+        <location line="-1103"/>
         <source>After Column</source>
         <translation>Zutabearen ondoren</translation>
     </message>
     <message>
-        <location line="+144"/>
-        <location filename="../src/ui-settings-dialog.h" line="+6"/>
+        <location line="-75"/>
         <source>Tab width min.</source>
         <translation>Tabuladorearen gutxieneko zabalera.</translation>
     </message>
     <message>
         <location line="+64"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>max.</source>
         <translation>max.</translation>
     </message>
     <message>
-        <location line="+31"/>
-        <location filename="../src/ui-settings-dialog.h" line="+2"/>
+        <location line="-231"/>
         <source>This works well for monospaced fonts. The line is drawn at a position based on the width of a space character in the default font. It may not work very well if styles use proportional fonts or if varied font sizes or bold, italic and normal texts are used.</source>
         <translation>Tarte finkodun letra-tipoekin ibiliko da zuzen.
 
@@ -2354,332 +3201,280 @@
 letra lodiak, etzanak eta normalak.</translation>
     </message>
     <message>
-        <location line="+19"/>
-        <location filename="../src/ui-settings-dialog.h" line="+3"/>
+        <location line="+289"/>
         <source>Enable Code Folding</source>
         <translation>Gaitu kodea azpiltzea</translation>
     </message>
     <message>
-        <location line="+61"/>
-        <location filename="../src/ui-settings-dialog.h" line="+6"/>
+        <location line="+551"/>
         <source>Windows (CRLF)</source>
         <translation>Windows (CRLF)</translation>
     </message>
     <message>
         <location line="+5"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Mac (CR)</source>
         <translation>Mac (CR)</translation>
     </message>
     <message>
         <location line="+5"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Unix (LF)</source>
         <translation>Unix (LF)</translation>
     </message>
     <message>
-        <location line="+32"/>
-        <location filename="../src/ui-settings-dialog.h" line="+2"/>
+        <location line="-532"/>
         <source>Show horizontal scroll bar</source>
         <translation>Erakutsi korritze-barra horizontala</translation>
     </message>
     <message>
-        <location line="+68"/>
-        <location filename="../src/ui-settings-dialog.h" line="+4"/>
+        <location line="-299"/>
+        <source>Show tool bar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+383"/>
         <source>Indentation</source>
         <translation>Koska</translation>
     </message>
     <message>
         <location line="+117"/>
-        <location filename="../src/ui-settings-dialog.h" line="+7"/>
         <source>Indentation uses tabs</source>
         <translation>Koskak tabuladorea darabil</translation>
     </message>
     <message>
         <location line="+38"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Auto completion</source>
         <translation>Osatze automatikoa</translation>
     </message>
     <message>
         <location line="+101"/>
-        <location filename="../src/ui-settings-dialog.h" line="+5"/>
         <source>With Octave builtins</source>
         <translation>Octaveren barne funtzioekin</translation>
     </message>
     <message>
         <location line="+10"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>With Octave functions</source>
         <translation>Octaveren funtzioekin</translation>
     </message>
     <message>
         <location line="+64"/>
-        <location filename="../src/ui-settings-dialog.h" line="+9"/>
         <source>Show completion list automatically</source>
         <translation>Erakutsi automatikoki bat datozen komandoen zerrenda</translation>
     </message>
     <message>
         <location line="+31"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>File handling</source>
         <translation>Fitxategien kudeaketa</translation>
     </message>
     <message>
-        <location line="+40"/>
-        <location filename="../src/ui-settings-dialog.h" line="+3"/>
+        <location line="+19"/>
         <source>Reload externally changed files without prompt</source>
         <translation>Birkargatu beste batzuek aldatu dituzten fitxategiak ohartarazpen gabe</translation>
     </message>
     <message>
-        <location line="+53"/>
-        <location filename="../src/ui-settings-dialog.h" line="+2"/>
+        <location line="+93"/>
+        <source>Text encoding used for loading and saving</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+73"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Select font, font size (as a difference from the default size), font style (&lt;b&gt;b&lt;/b&gt;old, &lt;b&gt;i&lt;/b&gt;talic, &lt;b&gt;u&lt;/b&gt;nderline), text color, and background color (for the latter, the color magenta (255,0,255) is a placeholder for the default background color).&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Letra-tipoa aukeratu, tamaina (lehenetsitako tamainarekiko aldea), estiloa (&lt;b&gt;l&lt;/b&gt;odia, &lt;b&gt;e&lt;/b&gt;tzana, &lt;b&gt;a&lt;/b&gt;zpimarratua), testuaren kolorea eta atzeko planoaren kolorea (azken honetan, lehenetsitako kolorearentzat magenta kolorea (255,0,255) kokapen-marka da).&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location line="+192"/>
-        <location filename="../src/ui-settings-dialog.h" line="+7"/>
         <source>(Changing buffer size clears history)</source>
         <translation>(Bufferraren tamaina aldatzeak historiala ezabatzen du)</translation>
     </message>
     <message>
         <location line="+28"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>History buffer Size</source>
         <translation>Historialarentzako bufferraren tamaina</translation>
     </message>
     <message>
         <location line="+34"/>
-        <location filename="../src/ui-settings-dialog.h" line="+2"/>
         <source>Print debug location in terminal window in addition to the marker in the editor</source>
         <translation>Erakutsi akasgabetzearen lokalizazioa editorearen leihoaz gain, terminalean</translation>
     </message>
     <message>
         <location line="+87"/>
-        <location filename="../src/ui-settings-dialog.h" line="+3"/>
-        <source>Display</source>
-        <translation>Erakutsi</translation>
+        <source>Behavior</source>
+        <translation>Portaera</translation>
+    </message>
+    <message>
+        <location line="+30"/>
+        <source>Restore last directory of previous session</source>
+        <translation>Leheneratu azken direktorioa aurreko saiotik</translation>
+    </message>
+    <message>
+        <location line="+54"/>
+        <source>Extensions of files to be opened in the default text editor (separated by &quot;;&quot;):</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+39"/>
-        <location filename="../src/ui-settings-dialog.h" line="+5"/>
-        <source>Alternating row colors</source>
-        <translation>Txandakatu lerroen koloreak</translation>
-    </message>
-    <message>
-        <location line="+12"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
-        <source>Behavior</source>
-        <translation>Portaera</translation>
-    </message>
-    <message>
-        <location line="+34"/>
-        <location filename="../src/ui-settings-dialog.h" line="+3"/>
-        <source>Restore last directory of previous session</source>
-        <translation>Leheneratu azken direktorioa aurreko saiotik</translation>
-    </message>
-    <message>
-        <location line="+71"/>
-        <location filename="../src/ui-settings-dialog.h" line="+5"/>
         <source>Workspace</source>
         <translation>Lan-eremua</translation>
     </message>
     <message>
-        <location line="+42"/>
-        <location filename="../src/ui-settings-dialog.h" line="-1"/>
+        <location line="+35"/>
+        <source>Colors for variable attributes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
         <source>Hide tool tips</source>
         <translation>Ezkutatu argibide automatikoak</translation>
     </message>
     <message>
-        <location line="+182"/>
-        <location filename="../src/ui-settings-dialog.h" line="+14"/>
+        <location line="+101"/>
+        <source>Import shortcut set</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Export current shortcut set</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Reset shortcuts to their defaults</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location line="+80"/>
+        <source>Default</source>
+        <translation type="unfinished">Lehenetsia</translation>
+    </message>
+    <message>
+        <location line="-71"/>
         <source>Edit a shortcut by double-clicking in a cell</source>
         <translation>Lasterbideak dagokion gelaxkan klik bikoitza eginez edita daitezke</translation>
     </message>
     <message>
-        <location line="+108"/>
-        <location filename="../src/ui-settings-dialog.h" line="+20"/>
+        <location line="+76"/>
+        <source>Actual</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
         <source>Network</source>
         <translation>Sarea</translation>
     </message>
     <message>
         <location line="+23"/>
-        <location filename="../src/ui-settings-dialog.h" line="-12"/>
         <source>Allow Octave to connect to the Octave web site to display current news and information</source>
         <translation>Octaveri baimena eman web-gunera konekta dadin azken berriak eta informazioa eskuratzeko</translation>
     </message>
     <message>
         <location line="+46"/>
-        <location filename="../src/ui-settings-dialog.h" line="+8"/>
         <source>Use proxy server</source>
         <translation>Erabili &quot;proxy&quot; zerbitzaria</translation>
     </message>
     <message>
         <location line="-23"/>
-        <location filename="../src/ui-settings-dialog.h" line="-4"/>
         <source>HttpProxy</source>
         <translation>HttpProxy</translation>
     </message>
     <message>
-        <location line="-2083"/>
-        <location filename="../src/ui-settings-dialog.h" line="-123"/>
+        <location line="-2039"/>
         <source>Icon set for dock widgets</source>
         <translation>Aklopatutako widgetentzako ikonoak</translation>
     </message>
     <message>
         <location line="-48"/>
-        <location filename="../src/ui-settings-dialog.h" line="-4"/>
         <source>Language (requires restart)</source>
         <translation>Hizkuntza (berrabiaraztea nahitaezkoa)</translation>
     </message>
     <message>
         <location line="-58"/>
-        <location filename="../src/ui-settings-dialog.h" line="-5"/>
         <source>Icon size</source>
         <translation>Ikonoaren tamaina</translation>
     </message>
     <message>
-        <location line="+1714"/>
-        <location filename="../src/ui-settings-dialog.h" line="+100"/>
+        <location line="+1716"/>
         <source>Synchronize Octave working directory with file browser</source>
         <translation>Sinkronizatu Octaveren lan-direktorioa fitxategi-arakatzailearekin</translation>
     </message>
     <message>
-        <location line="+132"/>
-        <location filename="../src/ui-settings-dialog.h" line="+5"/>
-        <source>Colors for variable attributes </source>
-        <translation>Aldagaien atributuentzako koloreak</translation>
-    </message>
-    <message>
-        <location line="+34"/>
-        <location filename="../src/ui-settings-dialog.h" line="+22"/>
+        <location line="+184"/>
         <source>Shortcuts</source>
         <translation>Lasterbideak</translation>
     </message>
     <message>
         <location line="+31"/>
-        <location filename="../src/ui-settings-dialog.h" line="-18"/>
         <source>Select this option to prevent conflicts with readline shortcuts</source>
         <translation>Hautatu aukera hau komando-lerroko lasterbideekin gatazkak ekiditeko</translation>
     </message>
     <message>
         <location line="+3"/>
-        <location filename="../src/ui-settings-dialog.h" line="+2"/>
         <source>Disable global shortcuts when terminal window has focus</source>
         <translation>Ezgaitu lasterbide orokorrak terminala martxan dagoenean</translation>
     </message>
     <message>
-        <location line="+31"/>
-        <location line="+28"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
-        <location line="+4"/>
-        <source>Use this set</source>
-        <translation>Erabili multzo hau</translation>
-    </message>
-    <message>
-        <location line="-21"/>
-        <location filename="../src/ui-settings-dialog.h" line="-3"/>
-        <source>Set 1:</source>
-        <translation>1. multzoa:</translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <location line="+37"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
-        <location line="+3"/>
+        <location line="+53"/>
         <source>Export</source>
         <translation>Esportatu</translation>
     </message>
     <message>
-        <location line="-30"/>
-        <location line="+37"/>
-        <location filename="../src/ui-settings-dialog.h" line="-2"/>
-        <location line="+3"/>
+        <location line="-10"/>
         <source>Import</source>
         <translation>Inportatu</translation>
     </message>
     <message>
-        <location line="+7"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
-        <source>Set 2:</source>
-        <translation>2. multzoa:</translation>
-    </message>
-    <message>
-        <location line="+86"/>
-        <location filename="../src/ui-settings-dialog.h" line="+7"/>
+        <location line="+90"/>
         <source>Action</source>
         <translation>Ekintza</translation>
     </message>
     <message>
-        <location line="+10"/>
-        <location filename="../src/ui-settings-dialog.h" line="-1"/>
-        <source>Set 1 Default</source>
-        <translation>Lehenetsitako 1. multzoa</translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <location filename="../src/ui-settings-dialog.h" line="-1"/>
-        <source>Set 1 Actual</source>
-        <translation>Uneko 1. multzoa</translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <location filename="../src/ui-settings-dialog.h" line="-1"/>
-        <source>Set 2 Default</source>
-        <translation>Lehenetsitako 2. multzoa</translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <location filename="../src/ui-settings-dialog.h" line="-1"/>
-        <source>Set 2 Actual</source>
-        <translation>Uneko 2. multzoa</translation>
-    </message>
-    <message>
-        <location line="+68"/>
-        <location filename="../src/ui-settings-dialog.h" line="+11"/>
+        <location line="+83"/>
         <source>Socks5Proxy</source>
         <translation>&quot;Socks5Proxy&quot;</translation>
     </message>
     <message>
         <location line="-16"/>
-        <location filename="../src/ui-settings-dialog.h" line="-4"/>
         <source>Hostname:</source>
         <translation>Ostalari-izena:</translation>
     </message>
     <message>
         <location line="+44"/>
-        <location filename="../src/ui-settings-dialog.h" line="+8"/>
         <source>Proxy type:</source>
         <translation>Proxy-mota:</translation>
     </message>
     <message>
         <location line="+10"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Port:</source>
         <translation>Ataka:</translation>
     </message>
     <message>
         <location line="-27"/>
-        <location filename="../src/ui-settings-dialog.h" line="-3"/>
         <source>Username:</source>
         <translation>Erabiltzaile-izena:</translation>
     </message>
     <message>
         <location line="+37"/>
-        <location filename="../src/ui-settings-dialog.h" line="+4"/>
         <source>Password:</source>
         <translation>Pasahitza:</translation>
     </message>
     <message>
-        <location filename="../src/settings-dialog.cc" line="+77"/>
+        <location filename="../src/settings-dialog.cc" line="+127"/>
+        <source>Octave Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Unable to save settings.  Missing settings file or unknown directory.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+18"/>
         <location line="+4"/>
-        <location line="+561"/>
+        <location line="+444"/>
         <source>System setting</source>
         <translation>Sistemaren hobespena</translation>
     </message>
     <message>
-        <location line="-355"/>
+        <location line="-232"/>
         <source>IBeam Cursor</source>
         <translation>IBeam kurtsorea</translation>
     </message>
@@ -2694,35 +3489,7 @@
         <translation>Azpimarra-kurtsorea</translation>
     </message>
     <message>
-        <location line="+213"/>
-        <source>Difference to the default size</source>
-        <translation>Lehenetsitako tamainarekiko aldea</translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Background color, pink (255,0,255) means default</source>
-        <translation>Kolore magentak (255,0,255) lehenetsia ezan nahi du</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>b</source>
-        <comment>short form for bold</comment>
-        <translation>l</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>i</source>
-        <comment>short form for italic</comment>
-        <translation>e</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>u</source>
-        <comment>short form for underlined</comment>
-        <translation>a</translation>
-    </message>
-    <message>
-        <location line="+497"/>
+        <location line="+503"/>
         <source>Set Octave Startup Directory</source>
         <translation>Octaveren hasiera-direktorioa ezarri</translation>
     </message>
@@ -2735,7 +3502,7 @@
 <context>
     <name>setup_community_news</name>
     <message>
-        <location filename="../src/welcome-wizard.cc" line="+44"/>
+        <location filename="../src/welcome-wizard.cc" line="+42"/>
         <source>Community News</source>
         <translation>Komunitatearen berriak</translation>
     </message>
@@ -2790,7 +3557,7 @@
 <context>
     <name>shortcut_manager</name>
     <message>
-        <location filename="../src/shortcut-manager.cc" line="+109"/>
+        <location filename="../src/shortcut-manager.cc" line="+106"/>
         <source>New File</source>
         <translation>Beste fitxategi bat</translation>
     </message>
@@ -2820,42 +3587,38 @@
         <translation>Gorde lan-eremua honela</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <location line="+158"/>
+        <location line="+16"/>
+        <location line="+143"/>
         <source>Preferences</source>
         <translation>Hobespenak</translation>
     </message>
     <message>
-        <location line="-157"/>
+        <location line="-158"/>
         <source>Exit Octave</source>
         <translation>Octavetik irten</translation>
     </message>
     <message>
         <location line="+3"/>
-        <location line="+84"/>
         <source>Copy</source>
         <translation>Kopiatu</translation>
     </message>
     <message>
-        <location line="-83"/>
-        <location line="+85"/>
+        <location line="+1"/>
         <source>Paste</source>
         <translation>Itsatsi</translation>
     </message>
     <message>
-        <location line="-84"/>
-        <location line="+80"/>
+        <location line="+1"/>
         <source>Undo</source>
         <translation>Desegin</translation>
     </message>
     <message>
-        <location line="-79"/>
-        <location line="+84"/>
+        <location line="+1"/>
         <source>Select All</source>
         <translation>Hautatu dena</translation>
     </message>
     <message>
-        <location line="-83"/>
+        <location line="+1"/>
         <source>Clear Clipboard</source>
         <translation>Paper-zorroa garbitu</translation>
     </message>
@@ -2880,7 +3643,7 @@
         <translation>Lan-eremua garbitu</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+6"/>
         <source>Step Into</source>
         <translation>Sartu hona</translation>
     </message>
@@ -2951,12 +3714,12 @@
     </message>
     <message>
         <location line="+2"/>
-        <location line="+216"/>
+        <location line="+234"/>
         <source>Editor</source>
         <translation>Editorea</translation>
     </message>
     <message>
-        <location line="-214"/>
+        <location line="-232"/>
         <source>Documentation</source>
         <translation>Dokumentazioa</translation>
     </message>
@@ -3036,19 +3799,29 @@
         <translation>Imprimatu</translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+3"/>
         <source>Redo</source>
         <translation>Berregin</translation>
     </message>
     <message>
+        <location line="+1"/>
+        <source>Cut</source>
+        <translation>Ebaki</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Find and Replace</source>
+        <translation>Bilatu eta ordezkatu</translation>
+    </message>
+    <message>
         <location line="+2"/>
-        <source>Cut</source>
-        <translation>Ebaki</translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Find and Replace</source>
-        <translation>Bilatu eta ordezkatu</translation>
+        <source>Find Next</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Find Previous</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+2"/>
@@ -3173,7 +3946,68 @@
         <translation>Erakutsi lerro-zenbakiak</translation>
     </message>
     <message>
-        <location line="-145"/>
+        <location line="+48"/>
+        <source>Switch to Left Tab</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Switch to Right Tab</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Move Tab Left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Move Tab Right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+44"/>
+        <source>Global</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+38"/>
+        <source>Tabs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+98"/>
+        <source>Enter new Shortcut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+143"/>
+        <source>Overwriting Shortcuts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>You are about to overwrite all shortcuts.
+Would you like to save the current shortcut set or cancel the action?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Don&apos;t save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+39"/>
+        <source>Import shortcuts from file ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Export shortcuts into file ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-571"/>
         <source>Step</source>
         <translation>Hurrengo argibidea</translation>
     </message>
@@ -3234,6 +4068,21 @@
     </message>
     <message>
         <location line="+2"/>
+        <source>Show Toolbar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Show Statusbar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Show Horizontal Scrollbar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>Zoom In</source>
         <translation>Handitu</translation>
     </message>
@@ -3289,12 +4138,7 @@
         <translation>Hitz gakoen dokumentazioa</translation>
     </message>
     <message>
-        <location line="+42"/>
-        <source>Main</source>
-        <translation>Nagusia</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <location line="+57"/>
         <location line="+23"/>
         <source>File</source>
         <translation>Fitxategia</translation>
@@ -3338,12 +4182,7 @@
         <translation>Exekutatu</translation>
     </message>
     <message>
-        <location line="+124"/>
-        <source>Enter new Shortcut for Set %1</source>
-        <translation>Egin beste lasterbide bat %1 multzoarentzat</translation>
-    </message>
-    <message>
-        <location line="+5"/>
+        <location line="+106"/>
         <source>Apply the desired shortcut or click on the right button to reset the shortcut to its default.</source>
         <translation>Nahi duzun lasterbidea ezarri edo eskuin-klik egin lasterbidea lehenetsitako baliora bueltatzeko.</translation>
     </message>
@@ -3368,7 +4207,7 @@
         <translation>Ezarri lehenetsi gisa</translation>
     </message>
     <message>
-        <location line="+53"/>
+        <location line="+45"/>
         <source>Double Shortcut</source>
         <translation>Lasterbide bikoitza</translation>
     </message>
@@ -3386,23 +4225,13 @@
 Aurrez zehaztutako lasterbidea ezabatuko da. Jarraitu nahi duzu?</translation>
     </message>
     <message>
-        <location line="+71"/>
-        <source>Import shortcut set %1 from file ...</source>
-        <translation>Inportatu %1 lasterbide-multzoa fitxategitik ...</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <location line="+6"/>
+        <location line="+113"/>
+        <location line="+5"/>
         <source>Octave Shortcut Files (*.osc);;All Files (*)</source>
         <translation>Octavere lasterbide-fitxategiak (*.osc);;Fitxategi guztiak (*)</translation>
     </message>
     <message>
-        <location line="-1"/>
-        <source>Export shortcut set %1 into file ...</source>
-        <translation>Esportatu %1 lasterbide-multzoa fitxategira ...</translation>
-    </message>
-    <message>
-        <location line="+15"/>
+        <location line="+10"/>
         <source>Failed to open %1 as octave shortcut file</source>
         <translation>Ezin da ireki %1 Octaveren lasterbide-multzo fitxategi bezala</translation>
     </message>
@@ -3441,7 +4270,7 @@
 <context>
     <name>welcome_wizard</name>
     <message>
-        <location filename="../src/welcome-wizard.cc" line="+135"/>
+        <location filename="../src/welcome-wizard.cc" line="+133"/>
         <source>Welcome to GNU Octave</source>
         <translation>Ongi etorri GNU Octavera</translation>
     </message>
@@ -3449,7 +4278,7 @@
 <context>
     <name>workspace_model</name>
     <message>
-        <location filename="../src/workspace-model.cc" line="-42"/>
+        <location filename="../src/workspace-model.cc" line="-41"/>
         <source>Name</source>
         <translation>Izena</translation>
     </message>
@@ -3474,7 +4303,7 @@
         <translation>Atributua</translation>
     </message>
     <message>
-        <location line="+109"/>
+        <location line="+108"/>
         <source>Right click to copy, rename, or display</source>
         <translation>Eskuin-klik kopiatzeko, izena aldatzeko edo erakusteko</translation>
     </message>
@@ -3488,7 +4317,7 @@
 <context>
     <name>workspace_view</name>
     <message>
-        <location filename="../src/workspace-view.cc" line="+50"/>
+        <location filename="../src/workspace-view.cc" line="+51"/>
         <source>Workspace</source>
         <translation>Lan-eremua</translation>
     </message>
@@ -3508,7 +4337,7 @@
         <translation>Iragazi</translation>
     </message>
     <message>
-        <location line="+161"/>
+        <location line="+242"/>
         <source>Copy name</source>
         <translation>Izena kopiatu</translation>
     </message>
@@ -3524,11 +4353,41 @@
     </message>
     <message>
         <location line="+9"/>
-        <source>Only top-level symbols may be renamed.</source>
-        <translation>Maila altuko sinboloei soilik alda dakieke izena.</translation>
-    </message>
-    <message>
-        <location line="+132"/>
+        <source>Only top-level symbols may be renamed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Hide filter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Show filter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+149"/>
+        <source>Class</source>
+        <translation type="unfinished">Mota</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Dimension</source>
+        <translation type="unfinished">Dimentsioa</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Value</source>
+        <translation type="unfinished">Balioa</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Attribute</source>
+        <translation type="unfinished">Atributua</translation>
+    </message>
+    <message>
+        <location line="-17"/>
         <source>View the variables in the active workspace.&lt;br&gt;</source>
         <translation>Erakutsi aldagaiak lan-eremu aktiboan.&lt;br&gt;</translation>
     </message>
--- a/libgui/languages/fr_FR.ts	Thu Aug 18 12:26:32 2016 -0700
+++ b/libgui/languages/fr_FR.ts	Fri Aug 19 21:05:48 2016 +0200
@@ -4,7 +4,7 @@
 <context>
     <name>ListDialog</name>
     <message>
-        <location filename="../src/dialog.cc" line="+251"/>
+        <location filename="../src/dialog.cc" line="+258"/>
         <source>Select All</source>
         <translation>Tout Sélectionner</translation>
     </message>
@@ -12,7 +12,7 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../src/workspace-model.cc" line="+75"/>
+        <location filename="../src/workspace-model.cc" line="+74"/>
         <source>automatic</source>
         <translation>automatique</translation>
     </message>
@@ -61,11 +61,39 @@
         <source>cursor</source>
         <translation>curseur</translation>
     </message>
+    <message>
+        <location filename="../src/settings-dialog.cc" line="+132"/>
+        <source>Difference to the default size</source>
+        <translation type="unfinished">Différence avec la taille par défaut</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Background color, pink (255,0,255) means default</source>
+        <translation type="unfinished">Couleur de fond, rose [255,0,255] designe la valeur par défaut</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>b</source>
+        <comment>short form for bold</comment>
+        <translation type="unfinished">g</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>i</source>
+        <comment>short form for italic</comment>
+        <translation type="unfinished">i</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>u</source>
+        <comment>short form for underlined</comment>
+        <translation type="unfinished">s</translation>
+    </message>
 </context>
 <context>
     <name>QTerminal</name>
     <message>
-        <location filename="../qterminal/libqterminal/QTerminal.h" line="+135"/>
+        <location filename="../qterminal/libqterminal/QTerminal.h" line="+130"/>
         <source>Copy</source>
         <translation>Copier</translation>
     </message>
@@ -80,15 +108,20 @@
         <translation>Tout Sélectionner</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+7"/>
         <source>Clear Window</source>
         <translation>Nettoyer la Fenêtre de Commande</translation>
     </message>
+    <message>
+        <location filename="../qterminal/libqterminal/QTerminal.cc" line="+46"/>
+        <source>Edit %1 at line %2</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QWinTerminalImpl</name>
     <message>
-        <location filename="../qterminal/libqterminal/win32/QWinTerminalImpl.cpp" line="+1778"/>
+        <location filename="../qterminal/libqterminal/win32/QWinTerminalImpl.cpp" line="+1779"/>
         <source>copied selection to clipboard</source>
         <translation>sélection copiée vers le presse-papier</translation>
     </message>
@@ -96,7 +129,7 @@
 <context>
     <name>QtHandles::Figure</name>
     <message>
-        <location filename="../graphics/Figure.cc" line="+282"/>
+        <location filename="../graphics/Figure.cc" line="+298"/>
         <source>Figure ToolBar</source>
         <translatorcomment>This may be long depending on the context.</translatorcomment>
         <translation>Barre d&apos;Outils de la Figure</translation>
@@ -147,37 +180,19 @@
         <translation>&amp;Copier</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Cu&amp;t</source>
-        <translation>Co&amp;uper</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>&amp;Paste</source>
-        <translation>Co&amp;ller</translation>
-    </message>
-    <message>
-        <location line="+5"/>
+        <location line="+7"/>
+        <location line="+463"/>
+        <source>About Octave</source>
+        <translation type="unfinished">À propos d&apos;Octave</translation>
+    </message>
+    <message>
+        <location line="-465"/>
         <source>&amp;Help</source>
         <translation>&amp;Aide</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>&amp;About QtHandles</source>
-        <translation>&amp;À propos de QtHandles</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>About &amp;Qt</source>
-        <translation>À propos de &amp;Qt</translation>
-    </message>
-    <message>
-        <location line="+427"/>
-        <source>About QtHandles</source>
-        <translation>À propos de QtHandles</translation>
-    </message>
-    <message>
-        <location line="+39"/>
+        <location line="+504"/>
+        <location line="+69"/>
         <source>Save Figure As</source>
         <translation>Enregistrer la Figure Sous</translation>
     </message>
@@ -217,6 +232,160 @@
     </message>
 </context>
 <context>
+    <name>annotation_dialog</name>
+    <message>
+        <location filename="../graphics/annotation-dialog.ui" line="+17"/>
+        <source>Annotation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>String</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Font</source>
+        <translation type="unfinished">Police</translation>
+    </message>
+    <message>
+        <location line="+42"/>
+        <source>bold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>b</source>
+        <translation type="unfinished">g</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>italic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>i</source>
+        <translation type="unfinished">i</translation>
+    </message>
+    <message>
+        <location line="+428"/>
+        <source>color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>Horz alignment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <location line="+29"/>
+        <source>middle</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-24"/>
+        <source>right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Vert alignment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>top</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>bottom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Position</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>X</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Y</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Width</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Height</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>units</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>normalized</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Fit to box</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Box</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Background</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+444"/>
+        <source>Edge</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+133"/>
+        <source>Line style</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>none</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Line width</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>documentation_dock_widget</name>
     <message>
         <location filename="../src/documentation-dock-widget.cc" line="+34"/>
@@ -232,17 +401,18 @@
 <context>
     <name>file_editor</name>
     <message>
-        <location filename="../src/m-editor/file-editor.cc" line="+285"/>
-        <location line="+125"/>
+        <location filename="../src/m-editor/file-editor.cc" line="+366"/>
+        <location line="+152"/>
         <location line="+19"/>
         <location line="+25"/>
         <location line="+62"/>
         <location line="+28"/>
+        <location line="+79"/>
         <source>Octave Editor</source>
         <translation>Éditeur d&apos;Octave</translation>
     </message>
     <message>
-        <location line="-318"/>
+        <location line="-462"/>
         <source>Octave Files (*.m);;All Files (*)</source>
         <translation>Fichiers Octave (*.m);;Tous les fichiers (*)</translation>
     </message>
@@ -258,7 +428,7 @@
         <translation>Nom de la nouvelle fonction :</translation>
     </message>
     <message>
-        <location line="+330"/>
+        <location line="+395"/>
         <source>File not saved! A file with the selected name
 %1
 is already open in the editor</source>
@@ -267,12 +437,12 @@
 est déjà ouvert dans l&apos;éditeur</translation>
     </message>
     <message>
-        <location line="+387"/>
+        <location line="+492"/>
         <source>&amp;%1 %2</source>
         <translation>&amp;%1 %2</translation>
     </message>
     <message>
-        <location line="+388"/>
+        <location line="+480"/>
         <source>&amp;Save File</source>
         <translation>&amp;Enregistrer</translation>
     </message>
@@ -288,41 +458,26 @@
     </message>
     <message>
         <location line="+7"/>
-        <source>&amp;Undo</source>
-        <translation>&amp;Annuler</translation>
-    </message>
-    <message>
-        <location line="+3"/>
         <source>&amp;Redo</source>
         <translation>&amp;Rétablir</translation>
     </message>
     <message>
         <location line="+6"/>
-        <source>&amp;Copy</source>
-        <translation>&amp;Copier</translation>
-    </message>
-    <message>
-        <location line="+3"/>
         <source>Cu&amp;t</source>
         <translation>Co&amp;uper</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Paste</source>
-        <translation>Coller</translation>
-    </message>
-    <message>
-        <location line="+96"/>
+        <location line="+94"/>
         <source>&amp;Next Bookmark</source>
         <translation>Marque page &amp;suivant</translation>
     </message>
     <message>
-        <location line="-2"/>
+        <location line="+2"/>
         <source>Pre&amp;vious Bookmark</source>
         <translation>Marque page &amp;précédent</translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+2"/>
         <source>Toggle &amp;Bookmark</source>
         <translation>Basculer &amp;marque page</translation>
     </message>
@@ -332,7 +487,7 @@
         <translation>&amp;Supprimer tout marque page</translation>
     </message>
     <message>
-        <location line="+54"/>
+        <location line="+68"/>
         <source>&amp;Next Breakpoint</source>
         <translation>Point d&apos;arrêt suiva&amp;nt</translation>
     </message>
@@ -352,7 +507,7 @@
         <translation>&amp;Retirer tous les points d&apos;arrêt</translation>
     </message>
     <message>
-        <location line="-104"/>
+        <location line="-118"/>
         <source>&amp;Comment</source>
         <translation>&amp;Commenter</translation>
     </message>
@@ -372,29 +527,29 @@
         <translation>&amp;Désindenter</translation>
     </message>
     <message>
-        <location line="-55"/>
+        <location line="-61"/>
         <source>&amp;Find and Replace...</source>
         <translation>&amp;Rechercher et remplacer...</translation>
     </message>
     <message>
-        <location line="+162"/>
+        <location line="+182"/>
         <source>Save File and Run</source>
         <translation>Enregistrer et Exécuter</translation>
     </message>
     <message>
-        <location line="-90"/>
+        <location line="-104"/>
         <source>Go &amp;to Line...</source>
         <translation>&amp;Aller à la ligne...</translation>
     </message>
     <message>
-        <location line="-1126"/>
+        <location line="-1341"/>
         <source>Could not start custom file editor
 %1</source>
         <translation>Impossible de démarrer l&apos;éditeur
 %1</translation>
     </message>
     <message>
-        <location line="+148"/>
+        <location line="+175"/>
         <source>Create</source>
         <translation>Créer</translation>
     </message>
@@ -404,7 +559,7 @@
         <translation>Annuler</translation>
     </message>
     <message>
-        <location line="+844"/>
+        <location line="+1041"/>
         <source>&amp;Recent Editor Files</source>
         <translation>Fichiers &amp;récents</translation>
     </message>
@@ -429,12 +584,7 @@
         <translation>Fermer les autres fichiers</translation>
     </message>
     <message>
-        <location line="+31"/>
-        <source>Select All</source>
-        <translation>Tout Sélectionner</translation>
-    </message>
-    <message>
-        <location line="+10"/>
+        <location line="+32"/>
         <source>&amp;Commands</source>
         <translation>&amp;Commandes</translation>
     </message>
@@ -559,17 +709,62 @@
         <translation>Afficher les Numéros de &amp;Lignes</translation>
     </message>
     <message>
-        <location line="+128"/>
-        <source>Editor</source>
-        <translation>Éditeur</translation>
-    </message>
-    <message>
-        <location line="-120"/>
-        <source>Show Line &amp;Endings</source>
-        <translation>Afficher les Fins de Lign&amp;es</translation>
+        <location line="+22"/>
+        <source>Show &amp;Toolbar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Show &amp;Statusbar</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+4"/>
+        <source>Show &amp;Horizontal Scrollbar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+69"/>
+        <source>Recent Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+65"/>
+        <source>Editor</source>
+        <translation>Éditeur</translation>
+    </message>
+    <message>
+        <location line="-156"/>
+        <source>Show Line &amp;Endings</source>
+        <translation>Afficher les Fins de Lign&amp;es</translation>
+    </message>
+    <message>
+        <location line="-1467"/>
+        <source>File Encoding:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+403"/>
+        <source>%1 is a built-in function</source>
+        <translation type="unfinished">%1 est une fonction interne</translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>Can not find function %1</source>
+        <translation type="unfinished">Impossible de trouver la fonction %1</translation>
+    </message>
+    <message>
+        <location line="+911"/>
+        <source>Find &amp;Next...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Find &amp;Previous...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+118"/>
         <source>Show &amp;Indentation Guides</source>
         <translation>Afficher les Guides d&apos;&amp;Indentation</translation>
     </message>
@@ -579,7 +774,7 @@
         <translation>Afficher le &amp;Repère de Longue Ligne</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+20"/>
         <source>Zoom &amp;In</source>
         <translation>Agrand&amp;ir</translation>
     </message>
@@ -614,7 +809,7 @@
         <translation>&amp;Documentation sur le mot de clés</translation>
     </message>
     <message>
-        <location line="-1103"/>
+        <location line="-1305"/>
         <source>Could not open file
 %1
 for read: %2.</source>
@@ -646,7 +841,7 @@
         <translation>L&apos;onglet éditeur de fichier associé a disparu.</translation>
     </message>
     <message>
-        <location line="+731"/>
+        <location line="+928"/>
         <source>&amp;File</source>
         <translation>&amp;Fichier</translation>
     </message>
@@ -656,12 +851,12 @@
         <translation>&amp;Editer</translation>
     </message>
     <message>
-        <location line="+138"/>
+        <location line="+129"/>
         <source>Show &amp;Whitespace Characters</source>
         <translation>Afficher les e&amp;spaces</translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+42"/>
         <source>&amp;Debug</source>
         <translation>&amp;Débuguer</translation>
     </message>
@@ -674,12 +869,12 @@
 <context>
     <name>file_editor_tab</name>
     <message>
-        <location filename="../src/m-editor/file-editor-tab.cc" line="+92"/>
+        <location filename="../src/m-editor/file-editor-tab.cc" line="+145"/>
         <source>eol:</source>
         <translation>fin de ligne:</translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="-17"/>
         <source>line:</source>
         <translation>ligne:</translation>
     </message>
@@ -689,17 +884,7 @@
         <translation>col:</translation>
     </message>
     <message>
-        <location line="+156"/>
-        <source>%1 is a built-in function</source>
-        <translation>%1 est une fonction interne</translation>
-    </message>
-    <message>
-        <location line="+31"/>
-        <source>Can not find function %1</source>
-        <translation>Impossible de trouver la fonction %1</translation>
-    </message>
-    <message>
-        <location line="+775"/>
+        <location line="+1146"/>
         <source>Goto line</source>
         <translation>Aller à la ligne</translation>
     </message>
@@ -709,7 +894,7 @@
         <translation>Numéro de ligne</translation>
     </message>
     <message>
-        <location line="+146"/>
+        <location line="+145"/>
         <location line="+63"/>
         <source>&lt;unnamed&gt;</source>
         <translation>&lt;sans nom&gt;</translation>
@@ -728,12 +913,28 @@
 est sur le point d&apos;être fermé mais a été modifié.  %2</translation>
     </message>
     <message>
-        <location line="+288"/>
+        <location line="+298"/>
+        <source>Debug or Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>This file is currently being executed.
+Quit debugging and save?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+166"/>
         <source>Line Endings:</source>
         <translation>Fins de Lignes:</translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+9"/>
+        <source>File Encoding:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+28"/>
         <source>Octave Files (*.m)</source>
         <translation>Fichiers Octave (*.m)</translation>
     </message>
@@ -743,22 +944,59 @@
         <translation>Tous les Fichiers (*)</translation>
     </message>
     <message>
-        <location line="-322"/>
+        <location line="-513"/>
         <source>Do you want to cancel closing, save or discard the changes?</source>
         <translation>Voulez-vous annuler la fermeture, enregistrer ou supprimer les modifications ?</translation>
     </message>
     <message>
-        <location line="-970"/>
-        <location line="+979"/>
-        <location line="+213"/>
-        <location line="+177"/>
-        <location line="+85"/>
+        <location line="-1342"/>
+        <source>encoding:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+239"/>
+        <source>Breakpoint condition</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+88"/>
+        <location line="+1024"/>
+        <location line="+372"/>
+        <location line="+215"/>
+        <location line="+21"/>
+        <location line="+83"/>
         <location line="+23"/>
         <source>Octave Editor</source>
         <translation>Éditeur d&apos;Octave</translation>
     </message>
     <message>
-        <location line="-6"/>
+        <location line="-1737"/>
+        <source>Cannot add breakpoint to modified file.
+Save and add breakpoint, or canel?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1611"/>
+        <source>&quot;%1&quot;
+is not a valid identifier.
+
+If you keep this filename, you will not be able to
+call your script using its name as an Octave command.
+
+Do you want to choose another name?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>The current editor contents can not be encoded
+with the selected codec %1.
+Using it will result in data loss!
+
+Do you want to chose another codec?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+99"/>
         <source>
 
 Warning: The contents in the editor is modified!</source>
@@ -776,31 +1014,14 @@
 a été supprimé ou rénommé. Voulez-vous l&apos;enregistrer maintenant ?%2</translation>
     </message>
     <message>
-        <location line="-285"/>
+        <location line="-342"/>
         <source>Could not open file %1 for write:
 %2.</source>
         <translation>Impossible d&apos;ouvrir le fichier %1 pour écrire :
 %2.</translation>
     </message>
     <message>
-        <location line="+177"/>
-        <source>&quot;%1&quot;
-is not a valid identifier.
-
-If you keep this file name, you will not be able to
-call your script using its name as an Octave command.
-
-Do you want to choose another name?</source>
-        <translation>&quot;%1&quot;
-n&apos;est pas une identifiant valide.
-
-Si vous gardez ce nom de fichier, vous ne serez pas en mesure de 
-l&apos;exécuter en utilisant son nom en tant que commande Octave.
-
-Voulez vous choisir un autre nom ?</translation>
-    </message>
-    <message>
-        <location line="+85"/>
+        <location line="+319"/>
         <source>It seems that &apos;%1&apos; has been modified by another application. Do you want to reload it?</source>
         <translation>Il semblerait que &apos;%1&apos; a été modifié par une autre application. Voulez-vous le récharger ?</translation>
     </message>
@@ -813,12 +1034,7 @@
         <translation>Explorateur de fichiers</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Browse your files.</source>
-        <translation>Explorer vos fichiers.</translation>
-    </message>
-    <message>
-        <location line="+18"/>
+        <location line="+35"/>
         <source>Enter the path or filename</source>
         <translation>Entrez le chemin ou le nom du fichier</translation>
     </message>
@@ -839,22 +1055,67 @@
     </message>
     <message>
         <location line="+4"/>
-        <location line="+388"/>
+        <location line="+373"/>
         <source>Find Files...</source>
         <translation>Rechercher des fichiers...</translation>
     </message>
     <message>
-        <location line="+364"/>
+        <location line="-26"/>
+        <source>Open in System File Explorer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Open in Text Editor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+389"/>
         <source>New Directory</source>
         <translation>Nouveau répertoire</translation>
     </message>
     <message>
-        <location line="-784"/>
+        <location line="-773"/>
         <source>Show Octave directory</source>
         <translation>Revenir au répertoire d&apos;Octave</translation>
     </message>
     <message>
-        <location line="-4"/>
+        <location line="-49"/>
+        <source>Browse your files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Alternating row colors</source>
+        <translation type="unfinished">Alterner les couleurs des lignes</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>filesdockwidget/showFileSize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>filesdockwidget/showFileType</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>filesdockwidget/showLastModified</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>filesdockwidget/showHiddenFiles</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>filesdockwidget/useAlternatingRowColors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+29"/>
         <source>One directory up</source>
         <translation>Monter au répertoire parent</translation>
     </message>
@@ -875,53 +1136,48 @@
     </message>
     <message>
         <location line="+20"/>
-        <location line="+397"/>
+        <location line="+382"/>
         <source>New File...</source>
         <translation>Nouveau fichier...</translation>
     </message>
     <message>
-        <location line="-394"/>
-        <location line="+397"/>
+        <location line="-379"/>
+        <location line="+382"/>
         <source>New Directory...</source>
         <translation>Nouveau répertoire...</translation>
     </message>
     <message>
-        <location line="-335"/>
+        <location line="-329"/>
         <source>Activate to open in editor, right click for alternatives</source>
         <translation>Activer pour ouvrir dand l&apos;éditeur, click droit pour les alternatives</translation>
     </message>
     <message>
-        <location line="+236"/>
+        <location line="-136"/>
         <source>File size</source>
         <translation>Taille du fichier</translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+1"/>
         <source>File type</source>
         <translation>Type de fichier</translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+1"/>
         <source>Date modified</source>
         <translation>Date de modification</translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+1"/>
         <source>Show hidden</source>
         <translation>Afficher les fichiers cachés</translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+415"/>
         <source>Open</source>
         <translation>Ouvrir</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Open in Default Application</source>
-        <translation>Ouvrir dans l&apos;application par défaut</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <location line="+13"/>
         <source>Copy Selection to Clipboard</source>
         <translation>Copier la sélection vers le presse-papiers</translation>
     </message>
@@ -951,7 +1207,7 @@
         <translation>Effacer...</translation>
     </message>
     <message>
-        <location line="+115"/>
+        <location line="+125"/>
         <source>Rename file/directory</source>
         <translation>Rénommer fichier/répertoire</translation>
     </message>
@@ -988,7 +1244,7 @@
         <translation>Impossible de supprimer un répertoire qui n&apos;est pas vide</translation>
     </message>
     <message>
-        <location line="+151"/>
+        <location line="+145"/>
         <source>Set directory of file browser</source>
         <translation>Définir le répertoire de l&apos;explorateur de fichiers</translation>
     </message>
@@ -1027,7 +1283,7 @@
 <context>
     <name>final_page</name>
     <message>
-        <location filename="../src/welcome-wizard.cc" line="+199"/>
+        <location filename="../src/welcome-wizard.cc" line="+195"/>
         <source>Enjoy!</source>
         <translation>Appréciez !</translation>
     </message>
@@ -1090,7 +1346,7 @@
 <context>
     <name>find_dialog</name>
     <message>
-        <location filename="../src/m-editor/find-dialog.cc" line="+74"/>
+        <location filename="../src/m-editor/find-dialog.cc" line="+85"/>
         <source>Find and Replace</source>
         <translation>Rechercher et Remplacer</translation>
     </message>
@@ -1165,7 +1421,7 @@
         <translation>Recherche dans la sé&amp;lection</translation>
     </message>
     <message>
-        <location line="+84"/>
+        <location line="+87"/>
         <source>Search from end</source>
         <translation>Rechercher depuis la fin</translation>
     </message>
@@ -1175,7 +1431,7 @@
         <translation>Rechercher depuis le début</translation>
     </message>
     <message>
-        <location line="+205"/>
+        <location line="+221"/>
         <source>Replace Result</source>
         <translation>Résultats du remplacement</translation>
     </message>
@@ -1294,7 +1550,7 @@
         <translation>Résultats de la recherche</translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+21"/>
         <source>Idle.</source>
         <translation>Inoccupé.</translation>
     </message>
@@ -1320,8 +1576,8 @@
     </message>
     <message>
         <location line="+15"/>
-        <source>File name/location</source>
-        <translation>Nom/Chemin de fichier</translation>
+        <source>Filename/location</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+17"/>
@@ -1329,7 +1585,7 @@
         <translation>Contenu du fichier</translation>
     </message>
     <message>
-        <location line="+105"/>
+        <location line="+111"/>
         <source>Searching...</source>
         <translation>Recherche en cours...</translation>
     </message>
@@ -1347,7 +1603,7 @@
 <context>
     <name>find_files_model</name>
     <message>
-        <location filename="../src/find-files-model.cc" line="+82"/>
+        <location filename="../src/find-files-model.cc" line="+83"/>
         <source>Filename</source>
         <translation>Nom du fichier</translation>
     </message>
@@ -1385,7 +1641,7 @@
         <translation>Historique des commandes</translation>
     </message>
     <message>
-        <location line="+89"/>
+        <location line="+107"/>
         <source>Copy</source>
         <translation>Copier</translation>
     </message>
@@ -1399,11 +1655,21 @@
         <source>Create script</source>
         <translation>Créer un fichier de script</translation>
     </message>
+    <message>
+        <location line="+4"/>
+        <source>Hide filter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Show filter</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>initial_page</name>
     <message>
-        <location filename="../src/welcome-wizard.cc" line="-179"/>
+        <location filename="../src/welcome-wizard.cc" line="-176"/>
         <source>Welcome to Octave!</source>
         <translation>Bienvenue dans Octave !</translation>
     </message>
@@ -1434,13 +1700,13 @@
 <context>
     <name>main_window</name>
     <message>
-        <location filename="../src/main-window.cc" line="+268"/>
+        <location filename="../src/main-window.cc" line="+275"/>
         <source>Load Workspace</source>
         <translation>Charger l&apos;espace de travail</translation>
     </message>
     <message>
-        <location line="+732"/>
-        <location line="+931"/>
+        <location line="+758"/>
+        <location line="+975"/>
         <source>About Octave</source>
         <translation>À propos d&apos;Octave</translation>
     </message>
@@ -1450,12 +1716,12 @@
         <translation>&amp;Fichier</translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+45"/>
         <source>New</source>
         <translation>Nouveau</translation>
     </message>
     <message>
-        <location line="-43"/>
+        <location line="-39"/>
         <source>Open...</source>
         <translation>Ouvrir...</translation>
     </message>
@@ -1465,7 +1731,7 @@
         <translation>Préférences...</translation>
     </message>
     <message>
-        <location line="-95"/>
+        <location line="-99"/>
         <source>Exit</source>
         <translation>Quitter</translation>
     </message>
@@ -1480,22 +1746,22 @@
         <translation>Annuler</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+7"/>
         <source>Copy</source>
         <translation>Copier</translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+5"/>
         <source>Paste</source>
         <translation>Coller</translation>
     </message>
     <message>
-        <location line="-1469"/>
+        <location line="-1537"/>
         <source>Save Workspace As</source>
         <translation>Enregistrer l&apos;espace de travail sous</translation>
     </message>
     <message>
-        <location line="+134"/>
+        <location line="+124"/>
         <source>The release notes file &apos;%1&apos; is empty.</source>
         <translation>Le fichier de notes de version &apos;%1&apos; est vide.</translation>
     </message>
@@ -1505,7 +1771,7 @@
         <translation>Le fichier de notes de version &apos;%1&apos; est illisible.</translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="+12"/>
         <source>Octave Release Notes</source>
         <translation>Notes de la version d&apos;Octave</translation>
     </message>
@@ -1515,17 +1781,17 @@
         <translation>Nouvelles de la communauté Octave</translation>
     </message>
     <message>
-        <location line="+187"/>
+        <location line="+206"/>
         <source>Are you sure you want to exit Octave?</source>
         <translation>Voulez vous vraiment quitter Octave ?</translation>
     </message>
     <message>
-        <location line="+854"/>
+        <location line="+916"/>
         <source>Open an existing file in editor</source>
         <translation>Ouvrir un fichier existant dans l&apos;éditeur</translation>
     </message>
     <message>
-        <location line="+48"/>
+        <location line="+44"/>
         <source>New Function...</source>
         <translation>Nouvelle Fonction...</translation>
     </message>
@@ -1535,12 +1801,12 @@
         <translation>Nouvelle Figure</translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+39"/>
         <source>Select All</source>
         <translation>Tout Sélectionner</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="+4"/>
         <source>Clear Clipboard</source>
         <translation>Effacer le presse-papiers</translation>
     </message>
@@ -1590,17 +1856,27 @@
         <translation>Explorateur de fichiers</translation>
     </message>
     <message>
-        <location line="-84"/>
+        <location line="+36"/>
+        <source>Contribute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Donate to Octave</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-123"/>
         <source>Step In</source>
         <translation>Avancer d&apos;un pas avec entrée</translation>
     </message>
     <message>
-        <location line="-1020"/>
+        <location line="-1082"/>
         <source>Octave</source>
         <translation>Octave</translation>
     </message>
     <message>
-        <location line="+868"/>
+        <location line="+926"/>
         <source>Load Workspace...</source>
         <translation>Charger l&apos;espace de travail...</translation>
     </message>
@@ -1615,7 +1891,7 @@
         <translation>Nouveau Script</translation>
     </message>
     <message>
-        <location line="+124"/>
+        <location line="+128"/>
         <source>Step Out</source>
         <translation>Exécuter jusqu&apos;à l&apos;instruction de retour</translation>
     </message>
@@ -1635,17 +1911,7 @@
         <translation>Partager Code</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Contribute to Octave</source>
-        <translation>Contribuer à Octave</translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Octave Developer Resources</source>
-        <translation>Ressources développeurs d&apos;Octave</translation>
-    </message>
-    <message>
-        <location line="+14"/>
+        <location line="+20"/>
         <source>On Disk</source>
         <translation>Installée localement</translation>
     </message>
@@ -1690,8 +1956,8 @@
         <translation>Monter au répertoire parent</translation>
     </message>
     <message>
-        <location line="-1148"/>
-        <location line="+1151"/>
+        <location line="-1198"/>
+        <location line="+1201"/>
         <source>Browse directories</source>
         <translation>Naviguer dans les répertoires</translation>
     </message>
@@ -1770,7 +2036,7 @@
 <context>
     <name>news_reader</name>
     <message>
-        <location line="-1411"/>
+        <location line="-1492"/>
         <source>&lt;html&gt;
 &lt;body&gt;
 &lt;p&gt;
@@ -1829,18 +2095,18 @@
 <context>
     <name>octave_dock_widget</name>
     <message>
-        <location filename="../src/octave-dock-widget.cc" line="+68"/>
-        <location line="+198"/>
+        <location filename="../src/octave-dock-widget.cc" line="+67"/>
+        <location line="+201"/>
         <source>Undock widget</source>
         <translation>Détacher le widget</translation>
     </message>
     <message>
-        <location line="-188"/>
+        <location line="-191"/>
         <source>Hide widget</source>
         <translation>Cacher le widget</translation>
     </message>
     <message>
-        <location line="+132"/>
+        <location line="+136"/>
         <source>Dock widget</source>
         <translation>Attacher le widget</translation>
     </message>
@@ -1848,7 +2114,7 @@
 <context>
     <name>octave_qscintilla</name>
     <message>
-        <location filename="../src/m-editor/octave-qscintilla.cc" line="+226"/>
+        <location filename="../src/m-editor/octave-qscintilla.cc" line="+237"/>
         <source>Help on</source>
         <translation>Aide sur</translation>
     </message>
@@ -1862,18 +2128,23 @@
         <source>Edit</source>
         <translation>Editer</translation>
     </message>
+    <message>
+        <location line="+15"/>
+        <source>dbstop if ...</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>octave_qt_link</name>
     <message>
-        <location filename="../src/octave-qt-link.cc" line="+111"/>
-        <location line="+6"/>
-        <location line="+7"/>
+        <location filename="../src/octave-qt-link.cc" line="+136"/>
+        <location line="+9"/>
+        <location line="+11"/>
         <source>Create</source>
         <translation>Créer</translation>
     </message>
     <message>
-        <location line="-10"/>
+        <location line="-14"/>
         <source>File
 %1
 does not exist. Do you want to create it?</source>
@@ -1887,7 +2158,7 @@
         <translation>Éditeur d&apos;Octave</translation>
     </message>
     <message>
-        <location line="+211"/>
+        <location line="+254"/>
         <source>The file %1 does not exist in the load path.  To run or debug the function you are editing, you must either change to the directory %2 or add that directory to the load path.</source>
         <translation>Le fichier %1 ne se trouve pas dans les chemins accessibles.  Pour exécuter ou débuguer la function éditée, vous devez changer de dossier vers %2 ou ajouter ce dossier aux chemins accessibles.</translation>
     </message>
@@ -1912,8 +2183,8 @@
         <translation>Ajouter le répertoire aux chemins accessibles</translation>
     </message>
     <message>
-        <location line="-223"/>
-        <location line="+224"/>
+        <location line="-269"/>
+        <location line="+270"/>
         <source>Cancel</source>
         <translation>Annuler</translation>
     </message>
@@ -1929,7 +2200,7 @@
 <context>
     <name>resource_manager</name>
     <message>
-        <location filename="../src/resource-manager.cc" line="+245"/>
+        <location filename="../src/resource-manager.cc" line="+246"/>
         <source>The settings file
 %1
 does not exist and can not be created.
@@ -1955,731 +2226,589 @@
     <name>settings_dialog</name>
     <message>
         <location filename="../src/settings-dialog.ui" line="+23"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1738"/>
         <source>Settings</source>
         <translation>Configuration</translation>
     </message>
     <message>
         <location line="+19"/>
         <location line="+468"/>
-        <location filename="../src/ui-settings-dialog.h" line="+25"/>
-        <location line="+1"/>
         <source>General</source>
         <translation>Général</translation>
     </message>
     <message>
         <location line="-338"/>
-        <location filename="../src/ui-settings-dialog.h" line="-17"/>
         <source>Octave logo only</source>
         <translation>Logo d&apos;Octave seulement</translation>
     </message>
     <message>
         <location line="+10"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Letter icons</source>
         <translation>Icones textuelles</translation>
     </message>
     <message>
         <location line="+7"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Graphic icons</source>
         <translation>Icones graphiques</translation>
     </message>
     <message>
         <location line="-118"/>
-        <location filename="../src/ui-settings-dialog.h" line="-9"/>
         <source>Dock widget title bar</source>
         <translation>Titre du Dock widget</translation>
     </message>
     <message>
         <location line="+60"/>
-        <location filename="../src/ui-settings-dialog.h" line="+4"/>
         <source>Normal</source>
         <translation>Normal</translation>
     </message>
     <message>
         <location line="+178"/>
-        <location filename="../src/ui-settings-dialog.h" line="+11"/>
         <source>Custom style</source>
         <translation>Style personnalisé</translation>
     </message>
     <message>
         <location line="+92"/>
-        <location filename="../src/ui-settings-dialog.h" line="+4"/>
         <source>These preferences are applied after any .octaverc startup files.</source>
         <translation>Ces préférences sont appliquées après tout fichier de démarrage .octaverc.</translation>
     </message>
     <message>
         <location line="+55"/>
-        <location filename="../src/ui-settings-dialog.h" line="+3"/>
         <source>Restore working directory of previous session</source>
         <translation>Restaurer le répertoire de travail de la session précédente</translation>
     </message>
     <message>
         <location line="+33"/>
-        <location filename="../src/ui-settings-dialog.h" line="+58"/>
         <source>Editor</source>
         <translation>Éditeur</translation>
     </message>
     <message>
-        <location line="+151"/>
-        <location filename="../src/ui-settings-dialog.h" line="-49"/>
+        <location line="+107"/>
         <source>Color</source>
         <translation>Couleur</translation>
     </message>
     <message>
-        <location line="+138"/>
-        <location filename="../src/ui-settings-dialog.h" line="+6"/>
+        <location line="-69"/>
         <source>Draw a long line marker</source>
         <translation>Montrer le repère de longue ligne</translation>
     </message>
     <message>
-        <location line="+48"/>
-        <location filename="../src/ui-settings-dialog.h" line="+3"/>
+        <location line="+155"/>
         <source>Show EOL characters</source>
         <translation>Montrer les caratères de fin de ligne (EOL)</translation>
     </message>
     <message>
-        <location line="+9"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
+        <location line="+662"/>
         <source>Default EOL mode</source>
         <translation>Fin de lingne par défaut (EOL)</translation>
     </message>
     <message>
-        <location line="+154"/>
-        <location filename="../src/ui-settings-dialog.h" line="+12"/>
+        <location line="-394"/>
         <source>Indent width</source>
         <translation>Largeur de l&apos;indentation</translation>
     </message>
     <message>
         <location line="+7"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Tab indents line</source>
         <translation>Tab indente la ligne</translation>
     </message>
     <message>
         <location line="+7"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Auto indentation</source>
         <translation>Indentation automatique</translation>
     </message>
     <message>
         <location line="+26"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Tab width</source>
         <translation>Largeur de tabulation</translation>
     </message>
     <message>
         <location line="+7"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Show indentation guides</source>
         <translation>Afficher les guides d&apos;indentation</translation>
     </message>
     <message>
         <location line="+23"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Backspace unindents line</source>
         <translation>Backspace supprime l&apos;indentation</translation>
     </message>
     <message>
         <location line="+88"/>
-        <location filename="../src/ui-settings-dialog.h" line="+3"/>
         <source>Match keywords</source>
         <translation>Inclure les mots clés</translation>
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Case sensitive</source>
         <translation>Sensible à la casse</translation>
     </message>
     <message>
         <location line="+23"/>
-        <location filename="../src/ui-settings-dialog.h" line="+2"/>
         <source>Replace word by suggested one</source>
         <translation>Remplacer le mot par la suggestion</translation>
     </message>
     <message>
         <location line="-10"/>
-        <location filename="../src/ui-settings-dialog.h" line="-1"/>
         <source>Match words in document</source>
         <translation>Inclure les mots du document</translation>
     </message>
     <message>
-        <location line="+173"/>
-        <location filename="../src/ui-settings-dialog.h" line="+14"/>
+        <location line="+185"/>
         <source>Restore editor tabs from previous session on startup</source>
         <translation>Restaurer les onglets de la session précédente</translation>
     </message>
     <message>
-        <location line="-426"/>
-        <location filename="../src/ui-settings-dialog.h" line="-28"/>
+        <location line="-438"/>
         <source>Use custom file editor</source>
         <translation>Utiliser un éditeur externe</translation>
     </message>
     <message>
-        <location line="+482"/>
-        <location filename="../src/ui-settings-dialog.h" line="+33"/>
+        <location line="+574"/>
         <source>Editor Styles</source>
         <translation>Affichage</translation>
     </message>
     <message>
         <location line="+287"/>
-        <location filename="../src/ui-settings-dialog.h" line="+10"/>
         <source>Terminal Colors</source>
         <translation>Couleurs de la fenetre de commandes</translation>
     </message>
     <message>
         <location line="-173"/>
-        <location filename="../src/ui-settings-dialog.h" line="-6"/>
         <source>Font</source>
         <translation>Police</translation>
     </message>
     <message>
-        <location line="-917"/>
-        <location filename="../src/ui-settings-dialog.h" line="-58"/>
+        <location line="-1007"/>
         <source>Show line numbers</source>
         <translation>Afficher les numéros des lignes</translation>
     </message>
     <message>
-        <location line="-72"/>
-        <location filename="../src/ui-settings-dialog.h" line="-3"/>
+        <location line="+81"/>
         <source>Highlight current line</source>
         <translation>Surligner la ligne courante</translation>
     </message>
     <message>
-        <location line="+85"/>
-        <location filename="../src/ui-settings-dialog.h" line="+4"/>
+        <location line="+13"/>
         <source>Show complete path in window title</source>
         <translation>Afficher le chemin complet dans le titre de la fenetre</translation>
     </message>
     <message>
-        <location line="-29"/>
-        <location filename="../src/ui-settings-dialog.h" line="-2"/>
+        <location line="+13"/>
         <source>Show whitespace</source>
         <translation>Afficher les espaces</translation>
     </message>
     <message>
-        <location line="+39"/>
-        <location filename="../src/ui-settings-dialog.h" line="+3"/>
+        <location line="+157"/>
         <source>Do not show whitespace used for indentation</source>
         <translation>Ne pas afficher les espaces utilisés pour l&apos;indentation</translation>
     </message>
     <message>
-        <location line="+625"/>
-        <location filename="../src/ui-settings-dialog.h" line="+37"/>
+        <location line="+382"/>
         <source>Number of characters before list is shown: </source>
         <translation>Nombre de caractères avant affichage de la liste :</translation>
     </message>
     <message>
-        <location line="+112"/>
-        <location filename="../src/ui-settings-dialog.h" line="+11"/>
+        <location line="+124"/>
         <source>Create nonexistent files without prompting</source>
         <translation>Créer les fichiers non-existants sans prévenir</translation>
     </message>
     <message>
-        <location line="-429"/>
-        <location filename="../src/ui-settings-dialog.h" line="-28"/>
+        <location line="-441"/>
         <source>command line (%f=file, %l=line):</source>
         <translation>ligne de commande (%f=fichier, %l=ligne) :</translation>
     </message>
     <message>
-        <location line="+521"/>
-        <location filename="../src/ui-settings-dialog.h" line="+43"/>
+        <location line="+613"/>
         <source>Terminal</source>
         <translation>Terminal</translation>
     </message>
     <message>
         <location line="+51"/>
-        <location filename="../src/ui-settings-dialog.h" line="-8"/>
         <source>Cursor type:</source>
         <translation>Type de curseur :</translation>
     </message>
     <message>
         <location line="-11"/>
-        <location filename="../src/ui-settings-dialog.h" line="-1"/>
         <source>Cursor blinking</source>
         <translation>Curseur clignotant</translation>
     </message>
     <message>
         <location line="-7"/>
-        <location filename="../src/ui-settings-dialog.h" line="-1"/>
         <source>Use foreground color</source>
         <translation>Utiliser la couleur de l&apos;avant plan</translation>
     </message>
     <message>
         <location line="+59"/>
-        <location filename="../src/ui-settings-dialog.h" line="+4"/>
         <source>Font size</source>
         <translation>Taille de police</translation>
     </message>
     <message>
         <location line="+123"/>
-        <location filename="../src/ui-settings-dialog.h" line="+3"/>
         <source>Set focus to terminal when running a command from within another widget</source>
         <translation>Donner le focus au terminal en cas d&apos;exécution d&apos;une commande depuis une autre fenêtre</translation>
     </message>
     <message>
         <location line="+73"/>
-        <location filename="../src/ui-settings-dialog.h" line="+15"/>
         <source>File Browser</source>
         <translation>Explorateur de fichiers</translation>
     </message>
     <message>
-        <location line="+46"/>
-        <location filename="../src/ui-settings-dialog.h" line="-8"/>
-        <source>Show file size</source>
-        <translation>Afficher la taille des fichiers</translation>
-    </message>
-    <message>
-        <location line="-14"/>
-        <location filename="../src/ui-settings-dialog.h" line="-2"/>
-        <source>Show file type</source>
-        <translation>Afficher le type des fichiers</translation>
-    </message>
-    <message>
-        <location line="+21"/>
-        <location filename="../src/ui-settings-dialog.h" line="+3"/>
-        <source>Show date of last modification</source>
-        <translation>Afficher la date de la dernière modification</translation>
-    </message>
-    <message>
-        <location line="-14"/>
-        <location filename="../src/ui-settings-dialog.h" line="-2"/>
-        <source>Show hidden files</source>
-        <translation>Afficher les fichiers cachés</translation>
-    </message>
-    <message>
-        <location line="-1715"/>
-        <location filename="../src/ui-settings-dialog.h" line="-97"/>
+        <location line="-1729"/>
         <source>Interface</source>
         <translation>Interface</translation>
     </message>
     <message>
         <location line="+52"/>
-        <location filename="../src/ui-settings-dialog.h" line="+3"/>
         <source>Confirm before exiting</source>
         <translation>Confirmer avant de quitter</translation>
     </message>
     <message>
         <location line="+103"/>
-        <location line="+592"/>
-        <location filename="../src/ui-settings-dialog.h" line="+9"/>
-        <location line="+28"/>
+        <location line="+640"/>
         <source>Show status bar</source>
         <translation>Montrer la barre de statut</translation>
     </message>
     <message>
-        <location line="-540"/>
-        <location filename="../src/ui-settings-dialog.h" line="-26"/>
+        <location line="-588"/>
         <source>Text inactive</source>
         <translation>Texte inactif</translation>
     </message>
     <message>
         <location line="-32"/>
         <location line="+45"/>
-        <location filename="../src/ui-settings-dialog.h" line="-1"/>
-        <location line="+2"/>
         <source>Active</source>
         <translation>Actif</translation>
     </message>
     <message>
         <location line="-159"/>
-        <location filename="../src/ui-settings-dialog.h" line="-11"/>
         <source>Small</source>
         <translation>Petit</translation>
     </message>
     <message>
         <location line="+17"/>
-        <location filename="../src/ui-settings-dialog.h" line="+2"/>
         <source>Large</source>
         <translation>Grand</translation>
     </message>
     <message>
         <location line="+181"/>
-        <location filename="../src/ui-settings-dialog.h" line="+11"/>
         <source>Background inactive</source>
         <translation>Arrière-plan inactif</translation>
     </message>
     <message>
         <location line="+19"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>3D</source>
         <translation>3D</translation>
     </message>
     <message>
         <location line="+54"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Octave Startup</source>
         <translation>Démarrage d&apos;Octave</translation>
     </message>
     <message>
         <location line="+41"/>
-        <location line="+1392"/>
-        <location filename="../src/ui-settings-dialog.h" line="+2"/>
-        <location line="+82"/>
+        <location line="+1440"/>
         <source>Startup path</source>
         <translation>Répertoire au démarrage</translation>
     </message>
     <message>
-        <location line="-1379"/>
-        <location line="+1409"/>
-        <location filename="../src/ui-settings-dialog.h" line="-81"/>
-        <location line="+83"/>
+        <location line="-1427"/>
+        <location line="+1420"/>
         <source>Browse</source>
         <translation>Choisir</translation>
     </message>
     <message>
-        <location line="-1322"/>
-        <location filename="../src/ui-settings-dialog.h" line="-78"/>
+        <location line="-1103"/>
         <source>After Column</source>
         <translation>Après la colonne</translation>
     </message>
     <message>
-        <location line="+144"/>
-        <location filename="../src/ui-settings-dialog.h" line="+6"/>
+        <location line="-75"/>
         <source>Tab width min.</source>
         <translation>Largeur de l&apos;onglet: min.</translation>
     </message>
     <message>
         <location line="+64"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>max.</source>
         <translation>max.</translation>
     </message>
     <message>
-        <location line="+31"/>
-        <location filename="../src/ui-settings-dialog.h" line="+2"/>
+        <location line="-231"/>
         <source>This works well for monospaced fonts. The line is drawn at a position based on the width of a space character in the default font. It may not work very well if styles use proportional fonts or if varied font sizes or bold, italic and normal texts are used.</source>
         <translation>Ceci fonctionne bien avec les polices typographiques (monospace). La ligne est dessinée tenant compte de la largeur d&apos;un carctère de la police par défaut. Cela peut disfonctionner lors de l&apos;utilisation de polices à tailles variables ou de caractères gras et italiques.</translation>
     </message>
     <message>
-        <location line="+19"/>
-        <location filename="../src/ui-settings-dialog.h" line="+3"/>
+        <location line="+289"/>
         <source>Enable Code Folding</source>
         <translation>Activer le Masquage (repliage) de Code</translation>
     </message>
     <message>
-        <location line="+61"/>
-        <location filename="../src/ui-settings-dialog.h" line="+6"/>
+        <location line="+551"/>
         <source>Windows (CRLF)</source>
         <translation>Windows (CRLF)</translation>
     </message>
     <message>
         <location line="+5"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Mac (CR)</source>
         <translation>Mac (CR)</translation>
     </message>
     <message>
         <location line="+5"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Unix (LF)</source>
         <translation>Unix (LF)</translation>
     </message>
     <message>
-        <location line="+32"/>
-        <location filename="../src/ui-settings-dialog.h" line="+2"/>
+        <location line="-532"/>
         <source>Show horizontal scroll bar</source>
         <translation>Montrer la barre de défilement horizontal</translation>
     </message>
     <message>
-        <location line="+68"/>
-        <location filename="../src/ui-settings-dialog.h" line="+4"/>
+        <location line="-299"/>
+        <source>Show tool bar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+383"/>
         <source>Indentation</source>
         <translation>Indentation</translation>
     </message>
     <message>
         <location line="+117"/>
-        <location filename="../src/ui-settings-dialog.h" line="+7"/>
         <source>Indentation uses tabs</source>
         <translation>Indentation par tabulation</translation>
     </message>
     <message>
         <location line="+38"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Auto completion</source>
         <translation>Suggestions automatiques (completion)</translation>
     </message>
     <message>
         <location line="+101"/>
-        <location filename="../src/ui-settings-dialog.h" line="+5"/>
         <source>With Octave builtins</source>
         <translation>Les commandes internes</translation>
     </message>
     <message>
         <location line="+10"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>With Octave functions</source>
         <translation>Les fonctions Octave</translation>
     </message>
     <message>
         <location line="+64"/>
-        <location filename="../src/ui-settings-dialog.h" line="+9"/>
         <source>Show completion list automatically</source>
         <translation>Montrer la liste de suggestions automatiquement</translation>
     </message>
     <message>
         <location line="+31"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>File handling</source>
         <translation>Gestion des fichiers</translation>
     </message>
     <message>
-        <location line="+40"/>
-        <location filename="../src/ui-settings-dialog.h" line="+3"/>
+        <location line="+19"/>
         <source>Reload externally changed files without prompt</source>
         <translation>Recharger automatiquement les fichiers modifiés depuis l&apos;extérieur d&apos;Octave</translation>
     </message>
     <message>
-        <location line="+53"/>
-        <location filename="../src/ui-settings-dialog.h" line="+2"/>
+        <location line="+93"/>
+        <source>Text encoding used for loading and saving</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+73"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Select font, font size (as a difference from the default size), font style (&lt;b&gt;b&lt;/b&gt;old, &lt;b&gt;i&lt;/b&gt;talic, &lt;b&gt;u&lt;/b&gt;nderline), text color, and background color (for the latter, the color magenta (255,0,255) is a placeholder for the default background color).&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Sélectionner la taille de police (difference par rapport à la taille par défaut), son style (&lt;b&gt;g&lt;/b&gt;ras, &lt;b&gt;i&lt;/b&gt;talique, &lt;b&gt;s&lt;/b&gt;ouligné), sa colouleur et la couleur de l&apos;arière-plan (pour ce dernier, la couleur magenta (255,0,255) représente la couleur pas défaut).&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location line="+192"/>
-        <location filename="../src/ui-settings-dialog.h" line="+7"/>
         <source>(Changing buffer size clears history)</source>
         <translation>(Changer la taille du tampon efface l&apos;historique)</translation>
     </message>
     <message>
         <location line="+28"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>History buffer Size</source>
         <translation>Taille du tampon mémoire de l&apos;historique</translation>
     </message>
     <message>
         <location line="+34"/>
-        <location filename="../src/ui-settings-dialog.h" line="+2"/>
         <source>Print debug location in terminal window in addition to the marker in the editor</source>
         <translation>Afficher la localisation du débuguage dans le terminal en plus du marqueur dans l&apos;éditeur</translation>
     </message>
     <message>
         <location line="+87"/>
-        <location filename="../src/ui-settings-dialog.h" line="+3"/>
-        <source>Display</source>
-        <translation>Affichage</translation>
+        <source>Behavior</source>
+        <translation>Comportement</translation>
+    </message>
+    <message>
+        <location line="+30"/>
+        <source>Restore last directory of previous session</source>
+        <translation>Revenir au répertoire de la session precédente</translation>
+    </message>
+    <message>
+        <location line="+54"/>
+        <source>Extensions of files to be opened in the default text editor (separated by &quot;;&quot;):</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+39"/>
-        <location filename="../src/ui-settings-dialog.h" line="+5"/>
-        <source>Alternating row colors</source>
-        <translation>Alterner les couleurs des lignes</translation>
-    </message>
-    <message>
-        <location line="+12"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
-        <source>Behavior</source>
-        <translation>Comportement</translation>
-    </message>
-    <message>
-        <location line="+34"/>
-        <location filename="../src/ui-settings-dialog.h" line="+3"/>
-        <source>Restore last directory of previous session</source>
-        <translation>Revenir au répertoire de la session precédente</translation>
-    </message>
-    <message>
-        <location line="+71"/>
-        <location filename="../src/ui-settings-dialog.h" line="+5"/>
         <source>Workspace</source>
         <translation>Espace de travail</translation>
     </message>
     <message>
-        <location line="+42"/>
-        <location filename="../src/ui-settings-dialog.h" line="-1"/>
+        <location line="+35"/>
+        <source>Colors for variable attributes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
         <source>Hide tool tips</source>
         <translation>Masquer les bulles d&apos;aide</translation>
     </message>
     <message>
-        <location line="+182"/>
-        <location filename="../src/ui-settings-dialog.h" line="+14"/>
+        <location line="+101"/>
+        <source>Import shortcut set</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Export current shortcut set</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Reset shortcuts to their defaults</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location line="+80"/>
+        <source>Default</source>
+        <translation type="unfinished">Défaut</translation>
+    </message>
+    <message>
+        <location line="-71"/>
         <source>Edit a shortcut by double-clicking in a cell</source>
         <translation>Modifier un raccourci en double-cliquant sur une cellule</translation>
     </message>
     <message>
-        <location line="+108"/>
-        <location filename="../src/ui-settings-dialog.h" line="+20"/>
+        <location line="+76"/>
+        <source>Actual</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
         <source>Network</source>
         <translation>Réseau</translation>
     </message>
     <message>
         <location line="+23"/>
-        <location filename="../src/ui-settings-dialog.h" line="-12"/>
         <source>Allow Octave to connect to the Octave web site to display current news and information</source>
         <translation>Autoriser Octave à se connecter à son site internet afin d&apos;afficher les informations et nouvelle fraîches</translation>
     </message>
     <message>
         <location line="+46"/>
-        <location filename="../src/ui-settings-dialog.h" line="+8"/>
         <source>Use proxy server</source>
         <translation>Utiliser un serveur proxy</translation>
     </message>
     <message>
         <location line="-23"/>
-        <location filename="../src/ui-settings-dialog.h" line="-4"/>
         <source>HttpProxy</source>
         <translation>Proxy HTTP</translation>
     </message>
     <message>
-        <location line="-2083"/>
-        <location filename="../src/ui-settings-dialog.h" line="-123"/>
+        <location line="-2039"/>
         <source>Icon set for dock widgets</source>
         <translation>Jeu d&apos;icones pour les widgets</translation>
     </message>
     <message>
         <location line="-48"/>
-        <location filename="../src/ui-settings-dialog.h" line="-4"/>
         <source>Language (requires restart)</source>
         <translation>Langue (nécessite un redémarrage)</translation>
     </message>
     <message>
         <location line="-58"/>
-        <location filename="../src/ui-settings-dialog.h" line="-5"/>
         <source>Icon size</source>
         <translation>Taille des icones</translation>
     </message>
     <message>
-        <location line="+1714"/>
-        <location filename="../src/ui-settings-dialog.h" line="+100"/>
+        <location line="+1716"/>
         <source>Synchronize Octave working directory with file browser</source>
         <translation>Synchroniser le répertoire de travail d&apos;Octave et le navigateur de fichiers</translation>
     </message>
     <message>
-        <location line="+132"/>
-        <location filename="../src/ui-settings-dialog.h" line="+5"/>
-        <source>Colors for variable attributes </source>
-        <translation>Couleurs des variables par type</translation>
-    </message>
-    <message>
-        <location line="+34"/>
-        <location filename="../src/ui-settings-dialog.h" line="+22"/>
+        <location line="+184"/>
         <source>Shortcuts</source>
         <translation>Raccourcis</translation>
     </message>
     <message>
         <location line="+31"/>
-        <location filename="../src/ui-settings-dialog.h" line="-18"/>
         <source>Select this option to prevent conflicts with readline shortcuts</source>
         <translation>Choisir cette option pour éviter les conflits avec les raccoucis readline</translation>
     </message>
     <message>
         <location line="+3"/>
-        <location filename="../src/ui-settings-dialog.h" line="+2"/>
         <source>Disable global shortcuts when terminal window has focus</source>
         <translation>Désactiver les raccourcis globaux quand la fenêtre de commande est active</translation>
     </message>
     <message>
-        <location line="+31"/>
-        <location line="+28"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
-        <location line="+4"/>
-        <source>Use this set</source>
-        <translation>Utiliser ce jeu</translation>
-    </message>
-    <message>
-        <location line="-21"/>
-        <location filename="../src/ui-settings-dialog.h" line="-3"/>
-        <source>Set 1:</source>
-        <translation>Jeu 1:</translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <location line="+37"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
-        <location line="+3"/>
+        <location line="+53"/>
         <source>Export</source>
         <translation>Exporter</translation>
     </message>
     <message>
-        <location line="-30"/>
-        <location line="+37"/>
-        <location filename="../src/ui-settings-dialog.h" line="-2"/>
-        <location line="+3"/>
+        <location line="-10"/>
         <source>Import</source>
         <translation>Importer</translation>
     </message>
     <message>
-        <location line="+7"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
-        <source>Set 2:</source>
-        <translation>Jeu 2:</translation>
-    </message>
-    <message>
-        <location line="+86"/>
-        <location filename="../src/ui-settings-dialog.h" line="+7"/>
+        <location line="+90"/>
         <source>Action</source>
         <translation>Action</translation>
     </message>
     <message>
-        <location line="+10"/>
-        <location filename="../src/ui-settings-dialog.h" line="-1"/>
-        <source>Set 1 Default</source>
-        <translation>Défaut jeu 1</translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <location filename="../src/ui-settings-dialog.h" line="-1"/>
-        <source>Set 1 Actual</source>
-        <translation>Courant jeu 1</translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <location filename="../src/ui-settings-dialog.h" line="-1"/>
-        <source>Set 2 Default</source>
-        <translation>Défaut jeu 2</translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <location filename="../src/ui-settings-dialog.h" line="-1"/>
-        <source>Set 2 Actual</source>
-        <translation>Courant jeu 1</translation>
-    </message>
-    <message>
-        <location line="+68"/>
-        <location filename="../src/ui-settings-dialog.h" line="+11"/>
+        <location line="+83"/>
         <source>Socks5Proxy</source>
         <translation>Proxy Socks5</translation>
     </message>
     <message>
         <location line="-16"/>
-        <location filename="../src/ui-settings-dialog.h" line="-4"/>
         <source>Hostname:</source>
         <translation>Nom de l&apos;hote :</translation>
     </message>
     <message>
         <location line="+44"/>
-        <location filename="../src/ui-settings-dialog.h" line="+8"/>
         <source>Proxy type:</source>
         <translation>Type de Proxy :</translation>
     </message>
     <message>
         <location line="+10"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Port:</source>
         <translation>Port :</translation>
     </message>
     <message>
         <location line="-27"/>
-        <location filename="../src/ui-settings-dialog.h" line="-3"/>
         <source>Username:</source>
         <translation>Nom d&apos;utilisateur :</translation>
     </message>
     <message>
         <location line="+37"/>
-        <location filename="../src/ui-settings-dialog.h" line="+4"/>
         <source>Password:</source>
         <translation>Mot de passe :</translation>
     </message>
     <message>
-        <location filename="../src/settings-dialog.cc" line="+77"/>
+        <location filename="../src/settings-dialog.cc" line="+127"/>
+        <source>Octave Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Unable to save settings.  Missing settings file or unknown directory.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+18"/>
         <location line="+4"/>
-        <location line="+561"/>
+        <location line="+444"/>
         <source>System setting</source>
         <translation>Reglages système</translation>
     </message>
     <message>
-        <location line="-355"/>
+        <location line="-232"/>
         <source>IBeam Cursor</source>
         <translation>Curseur Trait Vertical</translation>
     </message>
@@ -2694,35 +2823,7 @@
         <translation>Curseur Tiret Bas</translation>
     </message>
     <message>
-        <location line="+213"/>
-        <source>Difference to the default size</source>
-        <translation>Différence avec la taille par défaut</translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Background color, pink (255,0,255) means default</source>
-        <translation>Couleur de fond, rose [255,0,255] designe la valeur par défaut</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>b</source>
-        <comment>short form for bold</comment>
-        <translation>g</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>i</source>
-        <comment>short form for italic</comment>
-        <translation>i</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>u</source>
-        <comment>short form for underlined</comment>
-        <translation>s</translation>
-    </message>
-    <message>
-        <location line="+497"/>
+        <location line="+503"/>
         <source>Set Octave Startup Directory</source>
         <translation>Choisir le répertoire de démarrage d&apos;Octave</translation>
     </message>
@@ -2735,7 +2836,7 @@
 <context>
     <name>setup_community_news</name>
     <message>
-        <location filename="../src/welcome-wizard.cc" line="+44"/>
+        <location filename="../src/welcome-wizard.cc" line="+42"/>
         <source>Community News</source>
         <translation>Nouvelles de la Communauté</translation>
     </message>
@@ -2790,7 +2891,7 @@
 <context>
     <name>shortcut_manager</name>
     <message>
-        <location filename="../src/shortcut-manager.cc" line="+109"/>
+        <location filename="../src/shortcut-manager.cc" line="+106"/>
         <source>New File</source>
         <translation>Nouveau Fichier</translation>
     </message>
@@ -2820,42 +2921,38 @@
         <translation>Enregistrer l&apos;Espace de Travail sous</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <location line="+158"/>
+        <location line="+16"/>
+        <location line="+143"/>
         <source>Preferences</source>
         <translation>Préférences</translation>
     </message>
     <message>
-        <location line="-157"/>
+        <location line="-158"/>
         <source>Exit Octave</source>
         <translation>Quitter Octave</translation>
     </message>
     <message>
         <location line="+3"/>
-        <location line="+84"/>
         <source>Copy</source>
         <translation>Copier</translation>
     </message>
     <message>
-        <location line="-83"/>
-        <location line="+85"/>
+        <location line="+1"/>
         <source>Paste</source>
         <translation>Coller</translation>
     </message>
     <message>
-        <location line="-84"/>
-        <location line="+80"/>
+        <location line="+1"/>
         <source>Undo</source>
         <translation>Annuler</translation>
     </message>
     <message>
-        <location line="-79"/>
-        <location line="+84"/>
+        <location line="+1"/>
         <source>Select All</source>
         <translation>Tout Sélectionner</translation>
     </message>
     <message>
-        <location line="-83"/>
+        <location line="+1"/>
         <source>Clear Clipboard</source>
         <translation>Effacer le Presse-Papiers</translation>
     </message>
@@ -2880,7 +2977,7 @@
         <translation>Nettoyer l&apos;Espace de Travail</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+6"/>
         <source>Step Into</source>
         <translation>Avancer d&apos;un pas avec entrée</translation>
     </message>
@@ -2951,12 +3048,12 @@
     </message>
     <message>
         <location line="+2"/>
-        <location line="+216"/>
+        <location line="+234"/>
         <source>Editor</source>
         <translation>Éditeur</translation>
     </message>
     <message>
-        <location line="-214"/>
+        <location line="-232"/>
         <source>Documentation</source>
         <translation>Documentation</translation>
     </message>
@@ -3036,19 +3133,29 @@
         <translation>Imprimer</translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+3"/>
         <source>Redo</source>
         <translation>Rétablir</translation>
     </message>
     <message>
+        <location line="+1"/>
+        <source>Cut</source>
+        <translation>Couper</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Find and Replace</source>
+        <translation>Rechercher et Remplacer</translation>
+    </message>
+    <message>
         <location line="+2"/>
-        <source>Cut</source>
-        <translation>Couper</translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Find and Replace</source>
-        <translation>Rechercher et Remplacer</translation>
+        <source>Find Next</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Find Previous</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+2"/>
@@ -3173,7 +3280,68 @@
         <translation>Afficher les Numéros des Lignes</translation>
     </message>
     <message>
-        <location line="-145"/>
+        <location line="+48"/>
+        <source>Switch to Left Tab</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Switch to Right Tab</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Move Tab Left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Move Tab Right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+44"/>
+        <source>Global</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+38"/>
+        <source>Tabs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+98"/>
+        <source>Enter new Shortcut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+143"/>
+        <source>Overwriting Shortcuts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>You are about to overwrite all shortcuts.
+Would you like to save the current shortcut set or cancel the action?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Don&apos;t save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+39"/>
+        <source>Import shortcuts from file ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Export shortcuts into file ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-571"/>
         <source>Step</source>
         <translation>Avancer d&apos;un pas</translation>
     </message>
@@ -3234,6 +3402,21 @@
     </message>
     <message>
         <location line="+2"/>
+        <source>Show Toolbar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Show Statusbar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Show Horizontal Scrollbar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>Zoom In</source>
         <translation>Agrandir</translation>
     </message>
@@ -3289,12 +3472,7 @@
         <translation>Documentation sur le Mot de Clé</translation>
     </message>
     <message>
-        <location line="+42"/>
-        <source>Main</source>
-        <translation>Général</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <location line="+57"/>
         <location line="+23"/>
         <source>File</source>
         <translation>Fichier</translation>
@@ -3338,12 +3516,7 @@
         <translation>Exécuter</translation>
     </message>
     <message>
-        <location line="+124"/>
-        <source>Enter new Shortcut for Set %1</source>
-        <translation>Entrer un Raccourci pour le Jeu %1</translation>
-    </message>
-    <message>
-        <location line="+5"/>
+        <location line="+106"/>
         <source>Apply the desired shortcut or click on the right button to reset the shortcut to its default.</source>
         <translation>Entrer le raccourci souhaité ou cliquer droit pour le réinitialiser à sa valeur par défaut.</translation>
     </message>
@@ -3368,7 +3541,7 @@
         <translation>Revenir au défaut</translation>
     </message>
     <message>
-        <location line="+53"/>
+        <location line="+45"/>
         <source>Double Shortcut</source>
         <translation>Raccourci en double</translation>
     </message>
@@ -3386,23 +3559,13 @@
 voulez l&apos;affecter à la présente action et le retirer de la précédente ?</translation>
     </message>
     <message>
-        <location line="+71"/>
-        <source>Import shortcut set %1 from file ...</source>
-        <translation>Importer le jeu de raccourcis &quot;%1&quot; depuis un fichier...</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <location line="+6"/>
+        <location line="+113"/>
+        <location line="+5"/>
         <source>Octave Shortcut Files (*.osc);;All Files (*)</source>
         <translation>Fichier de Raccourcis Octave (*.osc);;Tous les fichiers (*)</translation>
     </message>
     <message>
-        <location line="-1"/>
-        <source>Export shortcut set %1 into file ...</source>
-        <translation>Exporter le jeu de raccourcis %1 vers un fichier...</translation>
-    </message>
-    <message>
-        <location line="+15"/>
+        <location line="+10"/>
         <source>Failed to open %1 as octave shortcut file</source>
         <translation>Impossible d&apos;ouvrir %1 en tant que fichier de raccourcis</translation>
     </message>
@@ -3441,7 +3604,7 @@
 <context>
     <name>welcome_wizard</name>
     <message>
-        <location filename="../src/welcome-wizard.cc" line="+135"/>
+        <location filename="../src/welcome-wizard.cc" line="+133"/>
         <source>Welcome to GNU Octave</source>
         <translation>Bienvenu dans GNU Octave</translation>
     </message>
@@ -3449,7 +3612,7 @@
 <context>
     <name>workspace_model</name>
     <message>
-        <location filename="../src/workspace-model.cc" line="-42"/>
+        <location filename="../src/workspace-model.cc" line="-41"/>
         <source>Name</source>
         <translation>Nom</translation>
     </message>
@@ -3474,7 +3637,7 @@
         <translation>Attribut</translation>
     </message>
     <message>
-        <location line="+109"/>
+        <location line="+108"/>
         <source>Right click to copy, rename, or display</source>
         <translation>Cliquez droit pour copier, renommer ou afficher</translation>
     </message>
@@ -3488,7 +3651,7 @@
 <context>
     <name>workspace_view</name>
     <message>
-        <location filename="../src/workspace-view.cc" line="+50"/>
+        <location filename="../src/workspace-view.cc" line="+51"/>
         <source>Workspace</source>
         <translation>Espace de travail</translation>
     </message>
@@ -3508,7 +3671,7 @@
         <translation>Filtrer</translation>
     </message>
     <message>
-        <location line="+161"/>
+        <location line="+242"/>
         <source>Copy name</source>
         <translation>Copier le nom</translation>
     </message>
@@ -3524,11 +3687,41 @@
     </message>
     <message>
         <location line="+9"/>
-        <source>Only top-level symbols may be renamed.</source>
-        <translation>Seules les variables de plus haut niveau peuvent être renommées.</translation>
-    </message>
-    <message>
-        <location line="+132"/>
+        <source>Only top-level symbols may be renamed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Hide filter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Show filter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+149"/>
+        <source>Class</source>
+        <translation type="unfinished">Classe</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Dimension</source>
+        <translation type="unfinished">Dimensions</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Value</source>
+        <translation type="unfinished">Valeur</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Attribute</source>
+        <translation type="unfinished">Attribut</translation>
+    </message>
+    <message>
+        <location line="-17"/>
         <source>View the variables in the active workspace.&lt;br&gt;</source>
         <translation>Voir les variables dans l&apos;espace de travail.&lt;br&gt;</translation>
     </message>
--- a/libgui/languages/it_IT.ts	Thu Aug 18 12:26:32 2016 -0700
+++ b/libgui/languages/it_IT.ts	Fri Aug 19 21:05:48 2016 +0200
@@ -4,7 +4,7 @@
 <context>
     <name>ListDialog</name>
     <message>
-        <location filename="../src/dialog.cc" line="+251"/>
+        <location filename="../src/dialog.cc" line="+258"/>
         <source>Select All</source>
         <translation>Seleziona Tutto</translation>
     </message>
@@ -540,7 +540,7 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../src/workspace-model.cc" line="+75"/>
+        <location filename="../src/workspace-model.cc" line="+74"/>
         <source>automatic</source>
         <translation>automatico</translation>
     </message>
@@ -589,6 +589,34 @@
         <source>cursor</source>
         <translation>cursore</translation>
     </message>
+    <message>
+        <location filename="../src/settings-dialog.cc" line="+132"/>
+        <source>Difference to the default size</source>
+        <translation type="unfinished">Differenza rispetto alla dimensione di default</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Background color, pink (255,0,255) means default</source>
+        <translation type="unfinished">Colore dello sfondo; rosa (255,0,255) indica default</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>b</source>
+        <comment>short form for bold</comment>
+        <translation type="unfinished">g</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>i</source>
+        <comment>short form for italic</comment>
+        <translation type="unfinished">c</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>u</source>
+        <comment>short form for underlined</comment>
+        <translation type="unfinished">s</translation>
+    </message>
 </context>
 <context>
     <name>QPPDOptionsModel</name>
@@ -1055,7 +1083,7 @@
 <context>
     <name>QTerminal</name>
     <message>
-        <location filename="../qterminal/libqterminal/QTerminal.h" line="+135"/>
+        <location filename="../qterminal/libqterminal/QTerminal.h" line="+130"/>
         <source>Copy</source>
         <translation>Copia</translation>
     </message>
@@ -1070,15 +1098,20 @@
         <translation>Seleziona Tutto</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+7"/>
         <source>Clear Window</source>
         <translation>Svuota Finestra</translation>
     </message>
+    <message>
+        <location filename="../qterminal/libqterminal/QTerminal.cc" line="+46"/>
+        <source>Edit %1 at line %2</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QWinTerminalImpl</name>
     <message>
-        <location filename="../qterminal/libqterminal/win32/QWinTerminalImpl.cpp" line="+1778"/>
+        <location filename="../qterminal/libqterminal/win32/QWinTerminalImpl.cpp" line="+1779"/>
         <source>copied selection to clipboard</source>
         <translation>selezione copiata negli appunti</translation>
     </message>
@@ -1752,7 +1785,7 @@
 <context>
     <name>QtHandles::Figure</name>
     <message>
-        <location filename="../graphics/Figure.cc" line="+282"/>
+        <location filename="../graphics/Figure.cc" line="+298"/>
         <source>Figure ToolBar</source>
         <translation>Barra degli strumenti delle figure</translation>
     </message>
@@ -1802,37 +1835,19 @@
         <translation>Co&amp;pia</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Cu&amp;t</source>
-        <translation>&amp;Taglia</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>&amp;Paste</source>
-        <translation>&amp;Incolla</translation>
-    </message>
-    <message>
-        <location line="+5"/>
+        <location line="+7"/>
+        <location line="+463"/>
+        <source>About Octave</source>
+        <translation type="unfinished">A proposito di Octave</translation>
+    </message>
+    <message>
+        <location line="-465"/>
         <source>&amp;Help</source>
         <translation>Ai&amp;uto</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>&amp;About QtHandles</source>
-        <translation>A Proposito di Qt&amp;Handles</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>About &amp;Qt</source>
-        <translation>A Proposito di &amp;Qt</translation>
-    </message>
-    <message>
-        <location line="+427"/>
-        <source>About QtHandles</source>
-        <translation>A Proposito di QtHandles</translation>
-    </message>
-    <message>
-        <location line="+39"/>
+        <location line="+504"/>
+        <location line="+69"/>
         <source>Save Figure As</source>
         <translation>Salva Figura Come</translation>
     </message>
@@ -1882,6 +1897,160 @@
     </message>
 </context>
 <context>
+    <name>annotation_dialog</name>
+    <message>
+        <location filename="../graphics/annotation-dialog.ui" line="+17"/>
+        <source>Annotation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>String</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Font</source>
+        <translation type="unfinished">Stile di carattere</translation>
+    </message>
+    <message>
+        <location line="+42"/>
+        <source>bold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>b</source>
+        <translation type="unfinished">g</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>italic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>i</source>
+        <translation type="unfinished">c</translation>
+    </message>
+    <message>
+        <location line="+428"/>
+        <source>color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>Horz alignment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <location line="+29"/>
+        <source>middle</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-24"/>
+        <source>right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Vert alignment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>top</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>bottom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Position</source>
+        <translation type="unfinished">Posizione</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>X</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Y</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Width</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Height</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>units</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>normalized</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Fit to box</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Box</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Background</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+444"/>
+        <source>Edge</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+133"/>
+        <source>Line style</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>none</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Line width</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>documentation_dock_widget</name>
     <message>
         <location filename="../src/documentation-dock-widget.cc" line="+34"/>
@@ -1897,17 +2066,18 @@
 <context>
     <name>file_editor</name>
     <message>
-        <location filename="../src/m-editor/file-editor.cc" line="+285"/>
-        <location line="+125"/>
+        <location filename="../src/m-editor/file-editor.cc" line="+366"/>
+        <location line="+152"/>
         <location line="+19"/>
         <location line="+25"/>
         <location line="+62"/>
         <location line="+28"/>
+        <location line="+79"/>
         <source>Octave Editor</source>
         <translation>Editor di Octave</translation>
     </message>
     <message>
-        <location line="-318"/>
+        <location line="-462"/>
         <source>Octave Files (*.m);;All Files (*)</source>
         <translation>File di Octave (*.m);;Tutti i File (*)</translation>
     </message>
@@ -1923,7 +2093,7 @@
         <translation>Nome della nuova funzione:</translation>
     </message>
     <message>
-        <location line="+330"/>
+        <location line="+395"/>
         <source>File not saved! A file with the selected name
 %1
 is already open in the editor</source>
@@ -1932,12 +2102,12 @@
 è già aperto nell&apos;editor</translation>
     </message>
     <message>
-        <location line="+387"/>
+        <location line="+492"/>
         <source>&amp;%1 %2</source>
         <translation>&amp;%1 %2</translation>
     </message>
     <message>
-        <location line="+388"/>
+        <location line="+480"/>
         <source>&amp;Save File</source>
         <translation>&amp;Salva File</translation>
     </message>
@@ -1953,36 +2123,16 @@
     </message>
     <message>
         <location line="+7"/>
-        <source>&amp;Undo</source>
-        <translation>Annu&amp;lla</translation>
-    </message>
-    <message>
-        <location line="+3"/>
         <source>&amp;Redo</source>
         <translation>&amp;Ripeti</translation>
     </message>
     <message>
         <location line="+6"/>
-        <source>&amp;Copy</source>
-        <translation>&amp;Copia</translation>
-    </message>
-    <message>
-        <location line="+3"/>
         <source>Cu&amp;t</source>
         <translation>&amp;Taglia</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Paste</source>
-        <translation>Incolla</translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Select All</source>
-        <translation>Seleziona Tutto</translation>
-    </message>
-    <message>
-        <location line="+10"/>
+        <location line="+14"/>
         <source>&amp;Commands</source>
         <translation>Co&amp;mandi</translation>
     </message>
@@ -2082,22 +2232,42 @@
         <translation>Seleziona fino alla Parentesi Corrispondente</translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+5"/>
         <source>&amp;Next Bookmark</source>
         <translation>Segnalibro &amp;Successivo</translation>
     </message>
     <message>
-        <location line="+148"/>
-        <source>Editor</source>
-        <translation>Editor</translation>
-    </message>
-    <message>
-        <location line="-150"/>
-        <source>Pre&amp;vious Bookmark</source>
-        <translation>Segnalibro &amp;Precedente</translation>
+        <location line="+44"/>
+        <source>Show &amp;Toolbar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Show &amp;Statusbar</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+4"/>
+        <source>Show &amp;Horizontal Scrollbar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+69"/>
+        <source>Recent Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+65"/>
+        <source>Editor</source>
+        <translation>Editor</translation>
+    </message>
+    <message>
+        <location line="-184"/>
+        <source>Pre&amp;vious Bookmark</source>
+        <translation>Segnalibro &amp;Precedente</translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>Toggle &amp;Bookmark</source>
         <translation>Attiva/disattiva &amp;Segnalibro</translation>
     </message>
@@ -2137,7 +2307,7 @@
         <translation>Mostra &amp;Marcatori di Linea Lunga</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+20"/>
         <source>Zoom &amp;In</source>
         <translation>&amp;Ingrandisci</translation>
     </message>
@@ -2172,7 +2342,7 @@
         <translation>&amp;Rimuovi Tutti i Breakpoint</translation>
     </message>
     <message>
-        <location line="-104"/>
+        <location line="-118"/>
         <source>&amp;Comment</source>
         <translation>&amp;Commenta</translation>
     </message>
@@ -2192,29 +2362,34 @@
         <translation>&amp;Rimuovi Indentazione</translation>
     </message>
     <message>
-        <location line="-55"/>
+        <location line="-61"/>
         <source>&amp;Find and Replace...</source>
         <translation>&amp;Trova e Sostituisci...</translation>
     </message>
     <message>
-        <location line="+162"/>
+        <location line="+182"/>
         <source>Save File and Run</source>
         <translation>Salva ed Esegui</translation>
     </message>
     <message>
-        <location line="-90"/>
+        <location line="-104"/>
         <source>Go &amp;to Line...</source>
         <translation>Vai &amp;alla Riga...</translation>
     </message>
     <message>
-        <location line="-1126"/>
+        <location line="-1425"/>
+        <source>File Encoding:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+84"/>
         <source>Could not start custom file editor
 %1</source>
         <translation>Impossibile avviare l&apos;editor di file personalizzato
 %1</translation>
     </message>
     <message>
-        <location line="+148"/>
+        <location line="+175"/>
         <source>Create</source>
         <translation>Crea</translation>
     </message>
@@ -2224,7 +2399,17 @@
         <translation>Annulla</translation>
     </message>
     <message>
-        <location line="+844"/>
+        <location line="+143"/>
+        <source>%1 is a built-in function</source>
+        <translation type="unfinished">%1 è una funzione built-in</translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>Can not find function %1</source>
+        <translation type="unfinished">Impossibile trovare la funzione %1</translation>
+    </message>
+    <message>
+        <location line="+862"/>
         <source>&amp;Recent Editor Files</source>
         <translation>&amp;Documenti Recenti</translation>
     </message>
@@ -2249,7 +2434,17 @@
         <translation>Chiudi gli Altri File</translation>
     </message>
     <message>
-        <location line="+132"/>
+        <location line="+25"/>
+        <source>Find &amp;Next...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Find &amp;Previous...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+95"/>
         <source>&amp;Preferences...</source>
         <translation>&amp;Preferenze...</translation>
     </message>
@@ -2264,7 +2459,7 @@
         <translation>Mostra Spazio &amp;Bianco</translation>
     </message>
     <message>
-        <location line="+54"/>
+        <location line="+68"/>
         <source>Run &amp;Selection</source>
         <translation>Esegui &amp;Selezione</translation>
     </message>
@@ -2284,7 +2479,7 @@
         <translation>&amp;Documentazione sulla Parola Chiave</translation>
     </message>
     <message>
-        <location line="-1103"/>
+        <location line="-1305"/>
         <source>Could not open file
 %1
 for read: %2.</source>
@@ -2316,7 +2511,7 @@
         <translation>La scheda corrispondente nell&apos;editor è scomparsa.</translation>
     </message>
     <message>
-        <location line="+731"/>
+        <location line="+928"/>
         <source>&amp;File</source>
         <translation>&amp;File</translation>
     </message>
@@ -2326,7 +2521,7 @@
         <translation>&amp;Modifica</translation>
     </message>
     <message>
-        <location line="+166"/>
+        <location line="+171"/>
         <source>&amp;Debug</source>
         <translation>&amp;Debug</translation>
     </message>
@@ -2339,12 +2534,12 @@
 <context>
     <name>file_editor_tab</name>
     <message>
-        <location filename="../src/m-editor/file-editor-tab.cc" line="+92"/>
+        <location filename="../src/m-editor/file-editor-tab.cc" line="+145"/>
         <source>eol:</source>
         <translation>fine della riga:</translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="-17"/>
         <source>line:</source>
         <translation>riga:</translation>
     </message>
@@ -2354,27 +2549,18 @@
         <translation>col:</translation>
     </message>
     <message>
-        <location line="+156"/>
-        <source>%1 is a built-in function</source>
-        <translation>%1 è una funzione built-in</translation>
-    </message>
-    <message>
-        <location line="+31"/>
-        <source>Can not find function %1</source>
-        <translation>Impossibile trovare la funzione %1</translation>
-    </message>
-    <message>
-        <location line="+9"/>
-        <location line="+979"/>
-        <location line="+213"/>
-        <location line="+177"/>
-        <location line="+85"/>
+        <location line="+334"/>
+        <location line="+1024"/>
+        <location line="+372"/>
+        <location line="+215"/>
+        <location line="+21"/>
+        <location line="+83"/>
         <location line="+23"/>
         <source>Octave Editor</source>
         <translation>Editor di Octave</translation>
     </message>
     <message>
-        <location line="-711"/>
+        <location line="-926"/>
         <source>Goto line</source>
         <translation>Vai alla riga</translation>
     </message>
@@ -2384,7 +2570,7 @@
         <translation>Numero riga</translation>
     </message>
     <message>
-        <location line="+146"/>
+        <location line="+145"/>
         <location line="+63"/>
         <source>&lt;unnamed&gt;</source>
         <translation>&lt;senza nome&gt;</translation>
@@ -2408,12 +2594,44 @@
         <translation>Si desidera annullare l&apos;operazione di chiusura, salvare o annullare le modifiche?</translation>
     </message>
     <message>
-        <location line="+298"/>
+        <location line="-1342"/>
+        <source>encoding:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+239"/>
+        <source>Breakpoint condition</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+89"/>
+        <source>Cannot add breakpoint to modified file.
+Save and add breakpoint, or canel?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1322"/>
+        <source>Debug or Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>This file is currently being executed.
+Quit debugging and save?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+166"/>
         <source>Line Endings:</source>
         <translation>Terminatori di Riga:</translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+9"/>
+        <source>File Encoding:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+28"/>
         <source>Octave Files (*.m)</source>
         <translation>File di Octave (*.m)</translation>
     </message>
@@ -2423,7 +2641,27 @@
         <translation>Tutti i File (*)</translation>
     </message>
     <message>
-        <location line="+179"/>
+        <location line="+84"/>
+        <source>&quot;%1&quot;
+is not a valid identifier.
+
+If you keep this filename, you will not be able to
+call your script using its name as an Octave command.
+
+Do you want to choose another name?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>The current editor contents can not be encoded
+with the selected codec %1.
+Using it will result in data loss!
+
+Do you want to chose another codec?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+99"/>
         <source>
 
 Warning: The contents in the editor is modified!</source>
@@ -2441,31 +2679,14 @@
 sia stato rinominato o rimosso. Si desidera salvarlo ora?%2</translation>
     </message>
     <message>
-        <location line="-285"/>
+        <location line="-342"/>
         <source>Could not open file %1 for write:
 %2.</source>
         <translation>Impossibile aprire  %1 in scrittura:
 %2.</translation>
     </message>
     <message>
-        <location line="+177"/>
-        <source>&quot;%1&quot;
-is not a valid identifier.
-
-If you keep this file name, you will not be able to
-call your script using its name as an Octave command.
-
-Do you want to choose another name?</source>
-        <translation>&quot;%1&quot;
-non è un nome valido.
-
-Se lo si mantiene, non si potrà invocare
-lo script come comando Octave.
-
-Si desidera scegliere un altro nome?</translation>
-    </message>
-    <message>
-        <location line="+85"/>
+        <location line="+319"/>
         <source>It seems that &apos;%1&apos; has been modified by another application. Do you want to reload it?</source>
         <translation>Sembra che &apos;%1&apos; sia stato modificato da un&apos;altra applicazione. Si desidera ricaricarlo?</translation>
     </message>
@@ -2478,12 +2699,7 @@
         <translation>Gestore dei File</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Browse your files.</source>
-        <translation>Esplorare i propri file.</translation>
-    </message>
-    <message>
-        <location line="+18"/>
+        <location line="+35"/>
         <source>Enter the path or filename</source>
         <translation>Inserire il percorso o il nome del file</translation>
     </message>
@@ -2504,22 +2720,67 @@
     </message>
     <message>
         <location line="+4"/>
-        <location line="+388"/>
+        <location line="+373"/>
         <source>Find Files...</source>
         <translation>Cerca File...</translation>
     </message>
     <message>
-        <location line="+364"/>
+        <location line="-26"/>
+        <source>Open in System File Explorer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Open in Text Editor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+389"/>
         <source>New Directory</source>
         <translation>Nuova Cartella</translation>
     </message>
     <message>
-        <location line="-784"/>
+        <location line="-773"/>
         <source>Show Octave directory</source>
         <translation>Mostra la cartella di Octave</translation>
     </message>
     <message>
-        <location line="-4"/>
+        <location line="-49"/>
+        <source>Browse your files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Alternating row colors</source>
+        <translation type="unfinished">Colori alternati per le righe</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>filesdockwidget/showFileSize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>filesdockwidget/showFileType</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>filesdockwidget/showLastModified</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>filesdockwidget/showHiddenFiles</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>filesdockwidget/useAlternatingRowColors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+29"/>
         <source>One directory up</source>
         <translation>Livello precedente</translation>
     </message>
@@ -2540,53 +2801,48 @@
     </message>
     <message>
         <location line="+20"/>
-        <location line="+397"/>
+        <location line="+382"/>
         <source>New File...</source>
         <translation>Nuovo File...</translation>
     </message>
     <message>
-        <location line="-394"/>
-        <location line="+397"/>
+        <location line="-379"/>
+        <location line="+382"/>
         <source>New Directory...</source>
         <translation>Nuova Cartella...</translation>
     </message>
     <message>
-        <location line="-335"/>
+        <location line="-329"/>
         <source>Activate to open in editor, right click for alternatives</source>
         <translation>Attiva per aprire nell&apos;editor, tasto destro per le alternative</translation>
     </message>
     <message>
-        <location line="+236"/>
+        <location line="-136"/>
         <source>File size</source>
         <translation>Dimensione</translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+1"/>
         <source>File type</source>
         <translation>Tipo</translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+1"/>
         <source>Date modified</source>
         <translation>Data ultima modifica</translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+1"/>
         <source>Show hidden</source>
         <translation>Mostra file nascosti</translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+415"/>
         <source>Open</source>
         <translation>Apri</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Open in Default Application</source>
-        <translation>Apri con l&apos;Applicazione Predefinita</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <location line="+13"/>
         <source>Copy Selection to Clipboard</source>
         <translation>Copia Selezione negli Appunti</translation>
     </message>
@@ -2616,7 +2872,7 @@
         <translation>Elimina...</translation>
     </message>
     <message>
-        <location line="+115"/>
+        <location line="+125"/>
         <source>Rename file/directory</source>
         <translation>Rinomina file/cartella</translation>
     </message>
@@ -2653,7 +2909,7 @@
         <translation>Impossibile eliminare una cartella non vuota</translation>
     </message>
     <message>
-        <location line="+151"/>
+        <location line="+145"/>
         <source>Set directory of file browser</source>
         <translation>Seleziona la cartella del gestore di file</translation>
     </message>
@@ -2692,7 +2948,7 @@
 <context>
     <name>final_page</name>
     <message>
-        <location filename="../src/welcome-wizard.cc" line="+199"/>
+        <location filename="../src/welcome-wizard.cc" line="+195"/>
         <source>Enjoy!</source>
         <translation>Buon lavoro!</translation>
     </message>
@@ -2755,7 +3011,7 @@
 <context>
     <name>find_dialog</name>
     <message>
-        <location filename="../src/m-editor/find-dialog.cc" line="+74"/>
+        <location filename="../src/m-editor/find-dialog.cc" line="+85"/>
         <source>Find and Replace</source>
         <translation>Trova e Sostituisci</translation>
     </message>
@@ -2830,7 +3086,7 @@
         <translation>Cerca nella sele&amp;zione</translation>
     </message>
     <message>
-        <location line="+84"/>
+        <location line="+87"/>
         <source>Search from end</source>
         <translation>Cerca dalla fine</translation>
     </message>
@@ -2840,7 +3096,7 @@
         <translation>Cerca dall&apos;inizio</translation>
     </message>
     <message>
-        <location line="+205"/>
+        <location line="+221"/>
         <source>Replace Result</source>
         <translation>Sostituisci Risultato</translation>
     </message>
@@ -2958,7 +3214,7 @@
         <translation>Risultati della ricerca</translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+21"/>
         <source>Idle.</source>
         <translation>Inattivo.</translation>
     </message>
@@ -2984,8 +3240,8 @@
     </message>
     <message>
         <location line="+15"/>
-        <source>File name/location</source>
-        <translation>Nome del file/posizione</translation>
+        <source>Filename/location</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+17"/>
@@ -2993,7 +3249,7 @@
         <translation>Contenuti</translation>
     </message>
     <message>
-        <location line="+105"/>
+        <location line="+111"/>
         <source>Searching...</source>
         <translation>Ricerca in corso...</translation>
     </message>
@@ -3011,7 +3267,7 @@
 <context>
     <name>find_files_model</name>
     <message>
-        <location filename="../src/find-files-model.cc" line="+82"/>
+        <location filename="../src/find-files-model.cc" line="+83"/>
         <source>Filename</source>
         <translation>Nome del file</translation>
     </message>
@@ -3049,7 +3305,7 @@
         <translation>Storico dei comandi</translation>
     </message>
     <message>
-        <location line="+89"/>
+        <location line="+107"/>
         <source>Copy</source>
         <translation>Copia</translation>
     </message>
@@ -3063,11 +3319,21 @@
         <source>Create script</source>
         <translation>Crea script</translation>
     </message>
+    <message>
+        <location line="+4"/>
+        <source>Hide filter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Show filter</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>initial_page</name>
     <message>
-        <location filename="../src/welcome-wizard.cc" line="-179"/>
+        <location filename="../src/welcome-wizard.cc" line="-176"/>
         <source>Welcome to Octave!</source>
         <translation>Benvenuto in Octave!</translation>
     </message>
@@ -3098,13 +3364,13 @@
 <context>
     <name>main_window</name>
     <message>
-        <location filename="../src/main-window.cc" line="+268"/>
+        <location filename="../src/main-window.cc" line="+275"/>
         <source>Load Workspace</source>
         <translation>Carica lo Spazio di Lavoro</translation>
     </message>
     <message>
-        <location line="+732"/>
-        <location line="+931"/>
+        <location line="+758"/>
+        <location line="+975"/>
         <source>About Octave</source>
         <translation>A proposito di Octave</translation>
     </message>
@@ -3114,12 +3380,12 @@
         <translation>&amp;File</translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+45"/>
         <source>New</source>
         <translation>Nuovo</translation>
     </message>
     <message>
-        <location line="-43"/>
+        <location line="-39"/>
         <source>Open...</source>
         <translation>Apri...</translation>
     </message>
@@ -3129,7 +3395,7 @@
         <translation>Preferenze...</translation>
     </message>
     <message>
-        <location line="-95"/>
+        <location line="-99"/>
         <source>Exit</source>
         <translation>Esci</translation>
     </message>
@@ -3144,22 +3410,22 @@
         <translation>Annulla</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+7"/>
         <source>Copy</source>
         <translation>Copia</translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+5"/>
         <source>Paste</source>
         <translation>Incolla</translation>
     </message>
     <message>
-        <location line="-1469"/>
+        <location line="-1537"/>
         <source>Save Workspace As</source>
         <translation>Salva lo Spazio di Lavoro Come</translation>
     </message>
     <message>
-        <location line="+134"/>
+        <location line="+124"/>
         <source>The release notes file &apos;%1&apos; is empty.</source>
         <translation>Il file delle note di rilascio &apos;%1&apos; è vuoto.</translation>
     </message>
@@ -3169,7 +3435,7 @@
         <translation>Il file delle note di rilascio &apos;%1&apos; non può essere letto.</translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="+12"/>
         <source>Octave Release Notes</source>
         <translation>Note di Rilascio di Octave</translation>
     </message>
@@ -3179,12 +3445,12 @@
         <translation>Notizie dalla Comunità di Octave</translation>
     </message>
     <message>
-        <location line="+1041"/>
+        <location line="+1122"/>
         <source>Open an existing file in editor</source>
         <translation>Apri file esistente nell&apos;editor</translation>
     </message>
     <message>
-        <location line="+48"/>
+        <location line="+44"/>
         <source>New Function...</source>
         <translation>Nuova Funzione...</translation>
     </message>
@@ -3194,12 +3460,12 @@
         <translation>Nuova Figura</translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+39"/>
         <source>Select All</source>
         <translation>Seleziona Tutto</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="+4"/>
         <source>Clear Clipboard</source>
         <translation>Svuota Appunti</translation>
     </message>
@@ -3239,12 +3505,22 @@
         <translation>Continua</translation>
     </message>
     <message>
-        <location line="-1027"/>
+        <location line="+112"/>
+        <source>Contribute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Donate to Octave</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-1204"/>
         <source>Are you sure you want to exit Octave?</source>
         <translation>Si è sicuri di voler uscire da Octave?</translation>
     </message>
     <message>
-        <location line="+1083"/>
+        <location line="+1145"/>
         <source>Show File Browser</source>
         <translation>Nostra l&apos;Esploratore di Risorse</translation>
     </message>
@@ -3259,12 +3535,12 @@
         <translation>Entra</translation>
     </message>
     <message>
-        <location line="-1020"/>
+        <location line="-1082"/>
         <source>Octave</source>
         <translation>Octave</translation>
     </message>
     <message>
-        <location line="+868"/>
+        <location line="+926"/>
         <source>Load Workspace...</source>
         <translation>Apri Spazio di Lavoro...</translation>
     </message>
@@ -3279,7 +3555,7 @@
         <translation>Nuovo Script</translation>
     </message>
     <message>
-        <location line="+124"/>
+        <location line="+128"/>
         <source>Step Out</source>
         <translation>Esci</translation>
     </message>
@@ -3304,17 +3580,7 @@
         <translation>Condividi Codice (Agorà)</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Contribute to Octave</source>
-        <translation>Contribuisci</translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Octave Developer Resources</source>
-        <translation>Risorse per Sviluppatori</translation>
-    </message>
-    <message>
-        <location line="+14"/>
+        <location line="+20"/>
         <source>On Disk</source>
         <translation>Su Disco</translation>
     </message>
@@ -3359,8 +3625,8 @@
         <translation>Livello precedente</translation>
     </message>
     <message>
-        <location line="-1148"/>
-        <location line="+1151"/>
+        <location line="-1198"/>
+        <location line="+1201"/>
         <source>Browse directories</source>
         <translation>Naviga cartelle</translation>
     </message>
@@ -3434,7 +3700,7 @@
 <context>
     <name>news_reader</name>
     <message>
-        <location line="-1411"/>
+        <location line="-1492"/>
         <source>&lt;html&gt;
 &lt;body&gt;
 &lt;p&gt;
@@ -3493,18 +3759,18 @@
 <context>
     <name>octave_dock_widget</name>
     <message>
-        <location filename="../src/octave-dock-widget.cc" line="+68"/>
-        <location line="+198"/>
+        <location filename="../src/octave-dock-widget.cc" line="+67"/>
+        <location line="+201"/>
         <source>Undock widget</source>
         <translation>Rimuovi widget dal lanciatore</translation>
     </message>
     <message>
-        <location line="-188"/>
+        <location line="-191"/>
         <source>Hide widget</source>
         <translation>Nascondi widget</translation>
     </message>
     <message>
-        <location line="+132"/>
+        <location line="+136"/>
         <source>Dock widget</source>
         <translation>Ancora widget al lanciatore</translation>
     </message>
@@ -3512,7 +3778,7 @@
 <context>
     <name>octave_qscintilla</name>
     <message>
-        <location filename="../src/m-editor/octave-qscintilla.cc" line="+226"/>
+        <location filename="../src/m-editor/octave-qscintilla.cc" line="+237"/>
         <source>Help on</source>
         <translation>Aiuto su</translation>
     </message>
@@ -3526,18 +3792,23 @@
         <source>Edit</source>
         <translation>Modifica</translation>
     </message>
+    <message>
+        <location line="+15"/>
+        <source>dbstop if ...</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>octave_qt_link</name>
     <message>
-        <location filename="../src/octave-qt-link.cc" line="+111"/>
-        <location line="+6"/>
-        <location line="+7"/>
+        <location filename="../src/octave-qt-link.cc" line="+136"/>
+        <location line="+9"/>
+        <location line="+11"/>
         <source>Create</source>
         <translation>Crea</translation>
     </message>
     <message>
-        <location line="-10"/>
+        <location line="-14"/>
         <source>File
 %1
 does not exist. Do you want to create it?</source>
@@ -3551,7 +3822,7 @@
         <translation>Editor di octave</translation>
     </message>
     <message>
-        <location line="+211"/>
+        <location line="+254"/>
         <source>The file %1 does not exist in the load path.  To run or debug the function you are editing, you must either change to the directory %2 or add that directory to the load path.</source>
         <translation>Il file %1 non esiste nelle cartelle di esecuzione. Per lanciare o eseguire il debug della funzione in corso di modifica, è necessario passare alla cartella %2 o aggiungere tale cartella alle cartelle di esecuzione.</translation>
     </message>
@@ -3576,8 +3847,8 @@
         <translation>Aggiungi Cartella alle Cartelle di esecuzione</translation>
     </message>
     <message>
-        <location line="-223"/>
-        <location line="+224"/>
+        <location line="-269"/>
+        <location line="+270"/>
         <source>Cancel</source>
         <translation>Annulla</translation>
     </message>
@@ -3593,7 +3864,7 @@
 <context>
     <name>resource_manager</name>
     <message>
-        <location filename="../src/resource-manager.cc" line="+245"/>
+        <location filename="../src/resource-manager.cc" line="+246"/>
         <source>The settings file
 %1
 does not exist and can not be created.
@@ -3619,731 +3890,589 @@
     <name>settings_dialog</name>
     <message>
         <location filename="../src/settings-dialog.ui" line="+23"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1738"/>
         <source>Settings</source>
         <translation>Impostazioni</translation>
     </message>
     <message>
         <location line="+19"/>
         <location line="+468"/>
-        <location filename="../src/ui-settings-dialog.h" line="+25"/>
-        <location line="+1"/>
         <source>General</source>
         <translation>Generale</translation>
     </message>
     <message>
         <location line="-338"/>
-        <location filename="../src/ui-settings-dialog.h" line="-17"/>
         <source>Octave logo only</source>
         <translation>Logo di Octave solamente</translation>
     </message>
     <message>
         <location line="+10"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Letter icons</source>
         <translation>Icone testuali</translation>
     </message>
     <message>
         <location line="+7"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Graphic icons</source>
         <translation>Icone grafiche</translation>
     </message>
     <message>
         <location line="-118"/>
-        <location filename="../src/ui-settings-dialog.h" line="-9"/>
         <source>Dock widget title bar</source>
         <translation>Barra del titolo del lanciatore di widget</translation>
     </message>
     <message>
         <location line="+44"/>
-        <location filename="../src/ui-settings-dialog.h" line="+2"/>
         <source>Confirm before exiting</source>
         <translation>Conferma prima di uscire</translation>
     </message>
     <message>
         <location line="+194"/>
-        <location filename="../src/ui-settings-dialog.h" line="+13"/>
         <source>Custom style</source>
         <translation>Stile personalizzato</translation>
     </message>
     <message>
         <location line="-91"/>
-        <location line="+592"/>
-        <location filename="../src/ui-settings-dialog.h" line="-4"/>
-        <location line="+28"/>
+        <location line="+640"/>
         <source>Show status bar</source>
         <translation>Mostra barra di stato</translation>
     </message>
     <message>
-        <location line="-540"/>
-        <location filename="../src/ui-settings-dialog.h" line="-26"/>
+        <location line="-588"/>
         <source>Text inactive</source>
         <translation>Testo inattivo</translation>
     </message>
     <message>
         <location line="-32"/>
         <location line="+45"/>
-        <location filename="../src/ui-settings-dialog.h" line="-1"/>
-        <location line="+2"/>
         <source>Active</source>
         <translation>Attiva</translation>
     </message>
     <message>
         <location line="-152"/>
-        <location filename="../src/ui-settings-dialog.h" line="-10"/>
         <source>Normal</source>
         <translation>Normale</translation>
     </message>
     <message>
         <location line="+191"/>
-        <location filename="../src/ui-settings-dialog.h" line="+12"/>
         <source>Background inactive</source>
         <translation>Sfondo inattivo</translation>
     </message>
     <message>
         <location line="+79"/>
-        <location filename="../src/ui-settings-dialog.h" line="+3"/>
         <source>These preferences are applied after any .octaverc startup files.</source>
         <translation>Queste preferenze vengono applicate dopo tutti i file di avvio .octaverc.</translation>
     </message>
     <message>
         <location line="+55"/>
-        <location filename="../src/ui-settings-dialog.h" line="+3"/>
         <source>Restore working directory of previous session</source>
         <translation>Ripristina la cartella di lavoro della sessione precedente</translation>
     </message>
     <message>
         <location line="+33"/>
-        <location filename="../src/ui-settings-dialog.h" line="+58"/>
         <source>Editor</source>
         <translation>Editor</translation>
     </message>
     <message>
-        <location line="+47"/>
-        <location filename="../src/ui-settings-dialog.h" line="-54"/>
+        <location line="+277"/>
         <source>After Column</source>
         <translation>Numero di colonne</translation>
     </message>
     <message>
-        <location line="+104"/>
-        <location filename="../src/ui-settings-dialog.h" line="+5"/>
+        <location line="-170"/>
         <source>Color</source>
         <translation>Colore</translation>
     </message>
     <message>
-        <location line="+135"/>
-        <location filename="../src/ui-settings-dialog.h" line="+4"/>
+        <location line="-72"/>
         <source>This works well for monospaced fonts. The line is drawn at a position based on the width of a space character in the default font. It may not work very well if styles use proportional fonts or if varied font sizes or bold, italic and normal texts are used.</source>
         <translation>Questa impostazione è adatta a tipi di caratteri monospaced. La linea è posta in una posizione basata sulla larghezza di uno spazio bianco del tipo di carattere predefinito. Può non funzionare bene se gli stili usano stili di caratteri proporzionali o se diverse dimensioni di carattere, grassetto, corsivo sono utilizzati.</translation>
     </message>
     <message>
-        <location line="+19"/>
-        <location filename="../src/ui-settings-dialog.h" line="+3"/>
+        <location line="+289"/>
         <source>Enable Code Folding</source>
         <translation>Attiva espansione del codice</translation>
     </message>
     <message>
-        <location line="+61"/>
-        <location filename="../src/ui-settings-dialog.h" line="+6"/>
+        <location line="+551"/>
         <source>Windows (CRLF)</source>
         <translation>Windows (CRLF)</translation>
     </message>
     <message>
         <location line="+5"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Mac (CR)</source>
         <translation>Mac (CR)</translation>
     </message>
     <message>
         <location line="+5"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Unix (LF)</source>
         <translation>Unix (LF)</translation>
     </message>
     <message>
-        <location line="+32"/>
-        <location filename="../src/ui-settings-dialog.h" line="+2"/>
+        <location line="-532"/>
         <source>Show horizontal scroll bar</source>
         <translation>Mostra barra di scorrimento orizzontale</translation>
     </message>
     <message>
-        <location line="+92"/>
-        <location filename="../src/ui-settings-dialog.h" line="+5"/>
+        <location line="+108"/>
         <source>Indent width</source>
         <translation>Ampiezza indentazione</translation>
     </message>
     <message>
         <location line="+7"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Tab indents line</source>
         <translation>Tasto Tab per l&apos;indentazione</translation>
     </message>
     <message>
         <location line="+7"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Auto indentation</source>
         <translation>Indentazione automatica</translation>
     </message>
     <message>
         <location line="+26"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Tab width</source>
         <translation>Ampiezza tabulazione</translation>
     </message>
     <message>
         <location line="+7"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Show indentation guides</source>
         <translation>Mostra guide per l&apos;indentazione</translation>
     </message>
     <message>
         <location line="+23"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Backspace unindents line</source>
         <translation>Tasto Backspace per rimuove l&apos;indentazione</translation>
     </message>
     <message>
         <location line="+23"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Indentation uses tabs</source>
         <translation>Indenta con tabulazioni</translation>
     </message>
     <message>
         <location line="+38"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Auto completion</source>
         <translation>Completamento automatico</translation>
     </message>
     <message>
         <location line="+27"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Match keywords</source>
         <translation>Abbina parole chiave</translation>
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Case sensitive</source>
         <translation>Distinzione maiuscole/minuscole</translation>
     </message>
     <message>
         <location line="+23"/>
-        <location filename="../src/ui-settings-dialog.h" line="+2"/>
         <source>Replace word by suggested one</source>
         <translation>Sostituisci una parola con quella suggerita</translation>
     </message>
     <message>
         <location line="-10"/>
-        <location filename="../src/ui-settings-dialog.h" line="-1"/>
         <source>Match words in document</source>
         <translation>Abbina parole nel documento</translation>
     </message>
     <message>
-        <location line="+173"/>
-        <location filename="../src/ui-settings-dialog.h" line="+14"/>
+        <location line="+185"/>
         <source>Restore editor tabs from previous session on startup</source>
         <translation>Ripristina le schede dell&apos;editor dalla sessione precedente all&apos;avvio</translation>
     </message>
     <message>
-        <location line="-426"/>
-        <location filename="../src/ui-settings-dialog.h" line="-28"/>
+        <location line="-438"/>
         <source>Use custom file editor</source>
         <translation>Utilizza editor personalizzato</translation>
     </message>
     <message>
-        <location line="+482"/>
-        <location filename="../src/ui-settings-dialog.h" line="+33"/>
+        <location line="+574"/>
         <source>Editor Styles</source>
         <translation>Stili dell&apos;Editor</translation>
     </message>
     <message>
         <location line="+287"/>
-        <location filename="../src/ui-settings-dialog.h" line="+10"/>
         <source>Terminal Colors</source>
         <translation>Colori del Terminale</translation>
     </message>
     <message>
         <location line="-173"/>
-        <location filename="../src/ui-settings-dialog.h" line="-6"/>
         <source>Font</source>
         <translation>Stile di carattere</translation>
     </message>
     <message>
-        <location line="-917"/>
-        <location filename="../src/ui-settings-dialog.h" line="-58"/>
+        <location line="-1007"/>
         <source>Show line numbers</source>
         <translation>Mostra numero di riga</translation>
     </message>
     <message>
-        <location line="-72"/>
-        <location filename="../src/ui-settings-dialog.h" line="-3"/>
+        <location line="+81"/>
         <source>Highlight current line</source>
         <translation>Evidenzia la riga corrente</translation>
     </message>
     <message>
-        <location line="+85"/>
-        <location filename="../src/ui-settings-dialog.h" line="+4"/>
+        <location line="+13"/>
         <source>Show complete path in window title</source>
         <translation>Mostra il percorso completo nel titolo della finestra</translation>
     </message>
     <message>
-        <location line="-29"/>
-        <location filename="../src/ui-settings-dialog.h" line="-2"/>
+        <location line="+13"/>
         <source>Show whitespace</source>
         <translation>Mostra spazi</translation>
     </message>
     <message>
-        <location line="+39"/>
-        <location filename="../src/ui-settings-dialog.h" line="+3"/>
+        <location line="+157"/>
         <source>Do not show whitespace used for indentation</source>
         <translation>Non mostrare gli spazi utilizzati per l&apos;indentazione</translation>
     </message>
     <message>
-        <location line="+156"/>
-        <location filename="../src/ui-settings-dialog.h" line="+7"/>
+        <location line="-299"/>
         <source>Draw a long line marker</source>
         <translation>Disegna un marcatore di linea lunga</translation>
     </message>
     <message>
-        <location line="+48"/>
-        <location filename="../src/ui-settings-dialog.h" line="+3"/>
+        <location line="+155"/>
         <source>Show EOL characters</source>
         <translation>Mostra terminatori di riga</translation>
     </message>
     <message>
-        <location line="+9"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
+        <location line="+662"/>
         <source>Default EOL mode</source>
         <translation>Modalità di default per i teminatori di riga</translation>
     </message>
     <message>
-        <location line="+412"/>
-        <location filename="../src/ui-settings-dialog.h" line="+26"/>
+        <location line="-136"/>
         <source>Number of characters before list is shown: </source>
         <translation>Numero di caratteri prima che la lista sia mostrata: </translation>
     </message>
     <message>
-        <location line="+112"/>
-        <location filename="../src/ui-settings-dialog.h" line="+11"/>
+        <location line="+124"/>
         <source>Create nonexistent files without prompting</source>
         <translation>Crea file inesistenti senza chiedere conferma</translation>
     </message>
     <message>
-        <location line="-429"/>
-        <location filename="../src/ui-settings-dialog.h" line="-28"/>
+        <location line="-441"/>
         <source>command line (%f=file, %l=line):</source>
         <translation>linea di comando (%f=file, %l=riga):</translation>
     </message>
     <message>
-        <location line="+521"/>
-        <location filename="../src/ui-settings-dialog.h" line="+43"/>
+        <location line="+613"/>
         <source>Terminal</source>
         <translation>Terminale</translation>
     </message>
     <message>
         <location line="+51"/>
-        <location filename="../src/ui-settings-dialog.h" line="-8"/>
         <source>Cursor type:</source>
         <translation>Tipo di cursore:</translation>
     </message>
     <message>
         <location line="-11"/>
-        <location filename="../src/ui-settings-dialog.h" line="-1"/>
         <source>Cursor blinking</source>
         <translation>Lampeggiamento del cursore</translation>
     </message>
     <message>
         <location line="-7"/>
-        <location filename="../src/ui-settings-dialog.h" line="-1"/>
         <source>Use foreground color</source>
         <translation>Usa colore di primo piano</translation>
     </message>
     <message>
         <location line="+59"/>
-        <location filename="../src/ui-settings-dialog.h" line="+4"/>
         <source>Font size</source>
         <translation>Dimensione carattere</translation>
     </message>
     <message>
         <location line="+123"/>
-        <location filename="../src/ui-settings-dialog.h" line="+3"/>
         <source>Set focus to terminal when running a command from within another widget</source>
         <translation>Rendi il terminale la finestra attiva quando un comando è eseguito da uno widget</translation>
     </message>
     <message>
         <location line="+73"/>
-        <location filename="../src/ui-settings-dialog.h" line="+15"/>
         <source>File Browser</source>
         <translation>Gestore dei file</translation>
     </message>
     <message>
-        <location line="+46"/>
-        <location filename="../src/ui-settings-dialog.h" line="-8"/>
-        <source>Show file size</source>
-        <translation>Mostra dimensione del file</translation>
-    </message>
-    <message>
-        <location line="-14"/>
-        <location filename="../src/ui-settings-dialog.h" line="-2"/>
-        <source>Show file type</source>
-        <translation>Mostra tipo del file</translation>
-    </message>
-    <message>
-        <location line="+21"/>
-        <location filename="../src/ui-settings-dialog.h" line="+3"/>
-        <source>Show date of last modification</source>
-        <translation>Mostra la data di ultima modifica</translation>
-    </message>
-    <message>
-        <location line="-14"/>
-        <location filename="../src/ui-settings-dialog.h" line="-2"/>
-        <source>Show hidden files</source>
-        <translation>Mostra i file nascosti</translation>
-    </message>
-    <message>
-        <location line="-1715"/>
-        <location filename="../src/ui-settings-dialog.h" line="-97"/>
+        <location line="-1729"/>
         <source>Interface</source>
         <translation>Interfaccia</translation>
     </message>
     <message>
         <location line="+61"/>
-        <location filename="../src/ui-settings-dialog.h" line="+4"/>
         <source>Small</source>
         <translation>Piccolo</translation>
     </message>
     <message>
         <location line="+17"/>
-        <location filename="../src/ui-settings-dialog.h" line="+2"/>
         <source>Large</source>
         <translation>Grande</translation>
     </message>
     <message>
         <location line="+200"/>
-        <location filename="../src/ui-settings-dialog.h" line="+12"/>
         <source>3D</source>
         <translation>3D</translation>
     </message>
     <message>
         <location line="+54"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Octave Startup</source>
         <translation>Avvio di Octave</translation>
     </message>
     <message>
         <location line="+41"/>
-        <location line="+1392"/>
-        <location filename="../src/ui-settings-dialog.h" line="+2"/>
-        <location line="+82"/>
+        <location line="+1440"/>
         <source>Startup path</source>
         <translation>Percorso di avvio</translation>
     </message>
     <message>
-        <location line="-1379"/>
-        <location line="+1409"/>
-        <location filename="../src/ui-settings-dialog.h" line="-81"/>
-        <location line="+83"/>
+        <location line="-1427"/>
+        <location line="+1420"/>
         <source>Browse</source>
         <translation>Naviga</translation>
     </message>
     <message>
-        <location line="-1178"/>
-        <location filename="../src/ui-settings-dialog.h" line="-72"/>
+        <location line="-1326"/>
+        <source>Show tool bar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+148"/>
         <source>Tab width min.</source>
         <translation>Ampiezza tabulazione min.</translation>
     </message>
     <message>
         <location line="+64"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>max.</source>
         <translation>max.</translation>
     </message>
     <message>
-        <location line="+221"/>
-        <location filename="../src/ui-settings-dialog.h" line="+19"/>
+        <location line="+171"/>
         <source>Indentation</source>
         <translation>Indentazione</translation>
     </message>
     <message>
         <location line="+256"/>
-        <location filename="../src/ui-settings-dialog.h" line="+13"/>
         <source>With Octave builtins</source>
         <translation>Con built-in di Octave</translation>
     </message>
     <message>
         <location line="+10"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>With Octave functions</source>
         <translation>Con funzioni di Octave</translation>
     </message>
     <message>
         <location line="+64"/>
-        <location filename="../src/ui-settings-dialog.h" line="+9"/>
         <source>Show completion list automatically</source>
         <translation>Mostra lista di completamento automaticamente</translation>
     </message>
     <message>
         <location line="+31"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>File handling</source>
         <translation>Gestione file</translation>
     </message>
     <message>
-        <location line="+40"/>
-        <location filename="../src/ui-settings-dialog.h" line="+3"/>
+        <location line="+19"/>
         <source>Reload externally changed files without prompt</source>
         <translation>Ricarica file modificati esternamente senza chiedere</translation>
     </message>
     <message>
-        <location line="+53"/>
-        <location filename="../src/ui-settings-dialog.h" line="+2"/>
+        <location line="+93"/>
+        <source>Text encoding used for loading and saving</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+73"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Select font, font size (as a difference from the default size), font style (&lt;b&gt;b&lt;/b&gt;old, &lt;b&gt;i&lt;/b&gt;talic, &lt;b&gt;u&lt;/b&gt;nderline), text color, and background color (for the latter, the color magenta (255,0,255) is a placeholder for the default background color).&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Seleziona tipo di carattere, dimension carattere (come differenza dispetto al carattere di default), stile di carattere (&lt;b&gt;g&lt;/b&gt;rassetto, &lt;b&gt;c&lt;/b&gt;orsivo, &lt;b&gt;s&lt;/b&gt;ottolineato), colore del testo, a colore dello sfondo (per quest&apos;ultimo, il colore magenta (255,0,255) indica il colore di default per lo sfondo).&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location line="+192"/>
-        <location filename="../src/ui-settings-dialog.h" line="+7"/>
         <source>(Changing buffer size clears history)</source>
         <translation>(Il cambio della dimensione della lista svuota lo storico comandi)</translation>
     </message>
     <message>
         <location line="+28"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>History buffer Size</source>
         <translation>Dimensione storico comandi</translation>
     </message>
     <message>
         <location line="+34"/>
-        <location filename="../src/ui-settings-dialog.h" line="+2"/>
         <source>Print debug location in terminal window in addition to the marker in the editor</source>
         <translation>Stampa la posizione di debug nella finestra del terminale oltre al marcatore nell&apos;editor</translation>
     </message>
     <message>
         <location line="+87"/>
-        <location filename="../src/ui-settings-dialog.h" line="+3"/>
-        <source>Display</source>
-        <translation>Mostra</translation>
+        <source>Behavior</source>
+        <translation>Comportamento</translation>
+    </message>
+    <message>
+        <location line="+30"/>
+        <source>Restore last directory of previous session</source>
+        <translation>Ripristina l&apos;ultima cartella della sessione precedente</translation>
+    </message>
+    <message>
+        <location line="+54"/>
+        <source>Extensions of files to be opened in the default text editor (separated by &quot;;&quot;):</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+39"/>
-        <location filename="../src/ui-settings-dialog.h" line="+5"/>
-        <source>Alternating row colors</source>
-        <translation>Colori alternati per le righe</translation>
-    </message>
-    <message>
-        <location line="+12"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
-        <source>Behavior</source>
-        <translation>Comportamento</translation>
-    </message>
-    <message>
-        <location line="+34"/>
-        <location filename="../src/ui-settings-dialog.h" line="+3"/>
-        <source>Restore last directory of previous session</source>
-        <translation>Ripristina l&apos;ultima cartella della sessione precedente</translation>
-    </message>
-    <message>
-        <location line="+71"/>
-        <location filename="../src/ui-settings-dialog.h" line="+5"/>
         <source>Workspace</source>
         <translation>Spazio di lavoro</translation>
     </message>
     <message>
-        <location line="+42"/>
-        <location filename="../src/ui-settings-dialog.h" line="-1"/>
+        <location line="+35"/>
+        <source>Colors for variable attributes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
         <source>Hide tool tips</source>
         <translation>Nascondi suggerimenti</translation>
     </message>
     <message>
-        <location line="+182"/>
-        <location filename="../src/ui-settings-dialog.h" line="+14"/>
+        <location line="+101"/>
+        <source>Import shortcut set</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Export current shortcut set</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Reset shortcuts to their defaults</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location line="+80"/>
+        <source>Default</source>
+        <translation type="unfinished">Default</translation>
+    </message>
+    <message>
+        <location line="-71"/>
         <source>Edit a shortcut by double-clicking in a cell</source>
         <translation>Modifica una scorciatoia facendo doppio click in una cella</translation>
     </message>
     <message>
-        <location line="+108"/>
-        <location filename="../src/ui-settings-dialog.h" line="+20"/>
+        <location line="+76"/>
+        <source>Actual</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
         <source>Network</source>
         <translation>Rete</translation>
     </message>
     <message>
         <location line="+23"/>
-        <location filename="../src/ui-settings-dialog.h" line="-12"/>
         <source>Allow Octave to connect to the Octave web site to display current news and information</source>
         <translation>Pemetti ad Octave di connettersi al sito web di Octave per mostrare notizie ed informazioni aggiornate</translation>
     </message>
     <message>
         <location line="+46"/>
-        <location filename="../src/ui-settings-dialog.h" line="+8"/>
         <source>Use proxy server</source>
         <translation>Usa server proxy</translation>
     </message>
     <message>
         <location line="-23"/>
-        <location filename="../src/ui-settings-dialog.h" line="-4"/>
         <source>HttpProxy</source>
         <translation>HttpProxy</translation>
     </message>
     <message>
-        <location line="-2083"/>
-        <location filename="../src/ui-settings-dialog.h" line="-123"/>
+        <location line="-2039"/>
         <source>Icon set for dock widgets</source>
         <translation>Icone per il lanciatore degli widget</translation>
     </message>
     <message>
         <location line="-48"/>
-        <location filename="../src/ui-settings-dialog.h" line="-4"/>
         <source>Language (requires restart)</source>
         <translation>Lingua (richiede riavvio)</translation>
     </message>
     <message>
         <location line="-58"/>
-        <location filename="../src/ui-settings-dialog.h" line="-5"/>
         <source>Icon size</source>
         <translation>Dimensione icona</translation>
     </message>
     <message>
-        <location line="+1714"/>
-        <location filename="../src/ui-settings-dialog.h" line="+100"/>
+        <location line="+1716"/>
         <source>Synchronize Octave working directory with file browser</source>
         <translation>Sincronizza la cartella di lavoro di Octave con il gestore dei file</translation>
     </message>
     <message>
-        <location line="+132"/>
-        <location filename="../src/ui-settings-dialog.h" line="+5"/>
-        <source>Colors for variable attributes </source>
-        <translation>Colori per attributi variabili </translation>
-    </message>
-    <message>
-        <location line="+34"/>
-        <location filename="../src/ui-settings-dialog.h" line="+22"/>
+        <location line="+184"/>
         <source>Shortcuts</source>
         <translation>Scorciatoie</translation>
     </message>
     <message>
         <location line="+31"/>
-        <location filename="../src/ui-settings-dialog.h" line="-18"/>
         <source>Select this option to prevent conflicts with readline shortcuts</source>
         <translation>Seleziona questa opzione per evitrare conflitti con le scorciatoie readline</translation>
     </message>
     <message>
         <location line="+3"/>
-        <location filename="../src/ui-settings-dialog.h" line="+2"/>
         <source>Disable global shortcuts when terminal window has focus</source>
         <translation>Disabilita le scorciatoie globali quando il terminale è selezionato</translation>
     </message>
     <message>
-        <location line="+31"/>
-        <location line="+28"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
-        <location line="+4"/>
-        <source>Use this set</source>
-        <translation>Utilizza questo insieme</translation>
-    </message>
-    <message>
-        <location line="-21"/>
-        <location filename="../src/ui-settings-dialog.h" line="-3"/>
-        <source>Set 1:</source>
-        <translation>Insieme 1:</translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <location line="+37"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
-        <location line="+3"/>
+        <location line="+53"/>
         <source>Export</source>
         <translation>Esporta</translation>
     </message>
     <message>
-        <location line="-30"/>
-        <location line="+37"/>
-        <location filename="../src/ui-settings-dialog.h" line="-2"/>
-        <location line="+3"/>
+        <location line="-10"/>
         <source>Import</source>
         <translation>Importa</translation>
     </message>
     <message>
-        <location line="+7"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
-        <source>Set 2:</source>
-        <translation>Insieme 2:</translation>
-    </message>
-    <message>
-        <location line="+86"/>
-        <location filename="../src/ui-settings-dialog.h" line="+7"/>
+        <location line="+90"/>
         <source>Action</source>
         <translation>Azione</translation>
     </message>
     <message>
-        <location line="+10"/>
-        <location filename="../src/ui-settings-dialog.h" line="-1"/>
-        <source>Set 1 Default</source>
-        <translation>Insieme 1 predefinito</translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <location filename="../src/ui-settings-dialog.h" line="-1"/>
-        <source>Set 1 Actual</source>
-        <translation>Ineieme 1 attuale</translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <location filename="../src/ui-settings-dialog.h" line="-1"/>
-        <source>Set 2 Default</source>
-        <translation>Insieme 2 predefinito</translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <location filename="../src/ui-settings-dialog.h" line="-1"/>
-        <source>Set 2 Actual</source>
-        <translation>Insieme 2 attuale</translation>
-    </message>
-    <message>
-        <location line="+68"/>
-        <location filename="../src/ui-settings-dialog.h" line="+11"/>
+        <location line="+83"/>
         <source>Socks5Proxy</source>
         <translation>Socks5Proxy</translation>
     </message>
     <message>
         <location line="-16"/>
-        <location filename="../src/ui-settings-dialog.h" line="-4"/>
         <source>Hostname:</source>
         <translation>Nome host:</translation>
     </message>
     <message>
         <location line="+44"/>
-        <location filename="../src/ui-settings-dialog.h" line="+8"/>
         <source>Proxy type:</source>
         <translation>Tipo di proxy:</translation>
     </message>
     <message>
         <location line="+10"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Port:</source>
         <translation>Porta:</translation>
     </message>
     <message>
         <location line="-27"/>
-        <location filename="../src/ui-settings-dialog.h" line="-3"/>
         <source>Username:</source>
         <translation>Nome utente:</translation>
     </message>
     <message>
         <location line="+37"/>
-        <location filename="../src/ui-settings-dialog.h" line="+4"/>
         <source>Password:</source>
         <translation>Password:</translation>
     </message>
     <message>
-        <location filename="../src/settings-dialog.cc" line="+77"/>
+        <location filename="../src/settings-dialog.cc" line="+127"/>
+        <source>Octave Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Unable to save settings.  Missing settings file or unknown directory.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+18"/>
         <location line="+4"/>
-        <location line="+561"/>
+        <location line="+444"/>
         <source>System setting</source>
         <translation>Parametri di sistema</translation>
     </message>
     <message>
-        <location line="-355"/>
+        <location line="-232"/>
         <source>IBeam Cursor</source>
         <translation>Cursore IBeam</translation>
     </message>
@@ -4358,35 +4487,7 @@
         <translation>Cursore testo sottolineato</translation>
     </message>
     <message>
-        <location line="+213"/>
-        <source>Difference to the default size</source>
-        <translation>Differenza rispetto alla dimensione di default</translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Background color, pink (255,0,255) means default</source>
-        <translation>Colore dello sfondo; rosa (255,0,255) indica default</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>b</source>
-        <comment>short form for bold</comment>
-        <translation>g</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>i</source>
-        <comment>short form for italic</comment>
-        <translation>c</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>u</source>
-        <comment>short form for underlined</comment>
-        <translation>s</translation>
-    </message>
-    <message>
-        <location line="+497"/>
+        <location line="+503"/>
         <source>Set Octave Startup Directory</source>
         <translation>Scegli la Cartella di Avvio di Octave</translation>
     </message>
@@ -4399,7 +4500,7 @@
 <context>
     <name>setup_community_news</name>
     <message>
-        <location filename="../src/welcome-wizard.cc" line="+44"/>
+        <location filename="../src/welcome-wizard.cc" line="+42"/>
         <source>Community News</source>
         <translation>Notizie dalla Comunità</translation>
     </message>
@@ -4453,7 +4554,7 @@
 <context>
     <name>shortcut_manager</name>
     <message>
-        <location filename="../src/shortcut-manager.cc" line="+109"/>
+        <location filename="../src/shortcut-manager.cc" line="+106"/>
         <source>New File</source>
         <translation>Nuovo File</translation>
     </message>
@@ -4483,42 +4584,38 @@
         <translation>Salva lo Spazio di Lavoro Come</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <location line="+158"/>
+        <location line="+16"/>
+        <location line="+143"/>
         <source>Preferences</source>
         <translation>Preferenze</translation>
     </message>
     <message>
-        <location line="-157"/>
+        <location line="-158"/>
         <source>Exit Octave</source>
         <translation>Esci da Octave</translation>
     </message>
     <message>
         <location line="+3"/>
-        <location line="+84"/>
         <source>Copy</source>
         <translation>Copia</translation>
     </message>
     <message>
-        <location line="-83"/>
-        <location line="+85"/>
+        <location line="+1"/>
         <source>Paste</source>
         <translation>Incolla</translation>
     </message>
     <message>
-        <location line="-84"/>
-        <location line="+80"/>
+        <location line="+1"/>
         <source>Undo</source>
         <translation>Annulla</translation>
     </message>
     <message>
-        <location line="-79"/>
-        <location line="+84"/>
+        <location line="+1"/>
         <source>Select All</source>
         <translation>Seleziona Tutto</translation>
     </message>
     <message>
-        <location line="-83"/>
+        <location line="+1"/>
         <source>Clear Clipboard</source>
         <translation>Svuota Appunti</translation>
     </message>
@@ -4543,7 +4640,7 @@
         <translation>Svuota lo Spazio di Lavoro</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+6"/>
         <source>Step Into</source>
         <translation>Livello Successivo</translation>
     </message>
@@ -4614,12 +4711,12 @@
     </message>
     <message>
         <location line="+2"/>
-        <location line="+216"/>
+        <location line="+234"/>
         <source>Editor</source>
         <translation>Editor</translation>
     </message>
     <message>
-        <location line="-214"/>
+        <location line="-232"/>
         <source>Documentation</source>
         <translation>Documentazione</translation>
     </message>
@@ -4699,19 +4796,29 @@
         <translation>Stampa</translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+3"/>
         <source>Redo</source>
         <translation>Ripeti</translation>
     </message>
     <message>
+        <location line="+1"/>
+        <source>Cut</source>
+        <translation>Taglia</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Find and Replace</source>
+        <translation>Trova e Sostituisci</translation>
+    </message>
+    <message>
         <location line="+2"/>
-        <source>Cut</source>
-        <translation>Taglia</translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Find and Replace</source>
-        <translation>Trova e Sostituisci</translation>
+        <source>Find Next</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Find Previous</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+2"/>
@@ -4836,7 +4943,68 @@
         <translation>Mostra numeri di riga</translation>
     </message>
     <message>
-        <location line="-145"/>
+        <location line="+48"/>
+        <source>Switch to Left Tab</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Switch to Right Tab</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Move Tab Left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Move Tab Right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+44"/>
+        <source>Global</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+38"/>
+        <source>Tabs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+98"/>
+        <source>Enter new Shortcut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+143"/>
+        <source>Overwriting Shortcuts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>You are about to overwrite all shortcuts.
+Would you like to save the current shortcut set or cancel the action?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Don&apos;t save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+39"/>
+        <source>Import shortcuts from file ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Export shortcuts into file ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-571"/>
         <source>Step</source>
         <translation>Un&apos;istruzione alla volta</translation>
     </message>
@@ -4897,6 +5065,21 @@
     </message>
     <message>
         <location line="+2"/>
+        <source>Show Toolbar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Show Statusbar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Show Horizontal Scrollbar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>Zoom In</source>
         <translation>Ingrandisci</translation>
     </message>
@@ -4952,12 +5135,7 @@
         <translation>Documentazione sulla Parola Chiave</translation>
     </message>
     <message>
-        <location line="+42"/>
-        <source>Main</source>
-        <translation>Principale</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <location line="+57"/>
         <location line="+23"/>
         <source>File</source>
         <translation>File</translation>
@@ -5001,12 +5179,7 @@
         <translation>Esegui</translation>
     </message>
     <message>
-        <location line="+124"/>
-        <source>Enter new Shortcut for Set %1</source>
-        <translation>Inserisci nuova Scorciatoia per l&apos;Insieme %1</translation>
-    </message>
-    <message>
-        <location line="+5"/>
+        <location line="+106"/>
         <source>Apply the desired shortcut or click on the right button to reset the shortcut to its default.</source>
         <translation>Applica la scorciatoia desiderata o clicca con il tasto destro del mouse per ripristinare la scorciatoia predefinita.</translation>
     </message>
@@ -5031,7 +5204,7 @@
         <translation>Imposta al valore predefinito</translation>
     </message>
     <message>
-        <location line="+53"/>
+        <location line="+45"/>
         <source>Double Shortcut</source>
         <translation>Doppia Scorciatoia</translation>
     </message>
@@ -5049,23 +5222,13 @@
 Si desidera utilizzare comunque la scorciatoia rimuovendola dall&apos;azione cui era precedentemente associata?</translation>
     </message>
     <message>
-        <location line="+71"/>
-        <source>Import shortcut set %1 from file ...</source>
-        <translation>Importa l&apos;insieme di  scorciatoie %1 dal file...</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <location line="+6"/>
+        <location line="+113"/>
+        <location line="+5"/>
         <source>Octave Shortcut Files (*.osc);;All Files (*)</source>
         <translation>File Scorciatoia di Octave (*.osc);;Tutti i File (*)</translation>
     </message>
     <message>
-        <location line="-1"/>
-        <source>Export shortcut set %1 into file ...</source>
-        <translation>Esporta l&apos;insieme di  scorciatoie %1 nel file...</translation>
-    </message>
-    <message>
-        <location line="+15"/>
+        <location line="+10"/>
         <source>Failed to open %1 as octave shortcut file</source>
         <translation>Impossibile aprire il file %1 come file di scorciatoie di Octave</translation>
     </message>
@@ -5104,7 +5267,7 @@
 <context>
     <name>welcome_wizard</name>
     <message>
-        <location filename="../src/welcome-wizard.cc" line="+135"/>
+        <location filename="../src/welcome-wizard.cc" line="+133"/>
         <source>Welcome to GNU Octave</source>
         <translation>Benvenuto in GNU Octave</translation>
     </message>
@@ -5112,7 +5275,7 @@
 <context>
     <name>workspace_model</name>
     <message>
-        <location filename="../src/workspace-model.cc" line="-42"/>
+        <location filename="../src/workspace-model.cc" line="-41"/>
         <source>Name</source>
         <translation>Nome</translation>
     </message>
@@ -5137,7 +5300,7 @@
         <translation>Attributo</translation>
     </message>
     <message>
-        <location line="+109"/>
+        <location line="+108"/>
         <source>Right click to copy, rename, or display</source>
         <translation>Cliccare con il tasto destro del mouse per copiare, rinominare o mostrare</translation>
     </message>
@@ -5151,7 +5314,7 @@
 <context>
     <name>workspace_view</name>
     <message>
-        <location filename="../src/workspace-view.cc" line="+50"/>
+        <location filename="../src/workspace-view.cc" line="+51"/>
         <source>Workspace</source>
         <translation>Spazio di lavoro</translation>
     </message>
@@ -5171,7 +5334,7 @@
         <translation>Filtra</translation>
     </message>
     <message>
-        <location line="+161"/>
+        <location line="+242"/>
         <source>Copy name</source>
         <translation>Copia nome</translation>
     </message>
@@ -5187,11 +5350,41 @@
     </message>
     <message>
         <location line="+9"/>
-        <source>Only top-level symbols may be renamed.</source>
-        <translation>Solamente i simboli di primo livello possono essere rinominati.</translation>
-    </message>
-    <message>
-        <location line="+132"/>
+        <source>Only top-level symbols may be renamed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Hide filter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Show filter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+149"/>
+        <source>Class</source>
+        <translation type="unfinished">Classe</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Dimension</source>
+        <translation type="unfinished">Dimensione</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Value</source>
+        <translation type="unfinished">Valore</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Attribute</source>
+        <translation type="unfinished">Attributo</translation>
+    </message>
+    <message>
+        <location line="-17"/>
         <source>View the variables in the active workspace.&lt;br&gt;</source>
         <translation>Mostra le variabili nello spazio di lavoro attivo.&lt;br&gt;</translation>
     </message>
--- a/libgui/languages/ja_JP.ts	Thu Aug 18 12:26:32 2016 -0700
+++ b/libgui/languages/ja_JP.ts	Fri Aug 19 21:05:48 2016 +0200
@@ -4,7 +4,7 @@
 <context>
     <name>ListDialog</name>
     <message>
-        <location filename="../src/dialog.cc" line="+251"/>
+        <location filename="../src/dialog.cc" line="+258"/>
         <source>Select All</source>
         <translation>全て選択</translation>
     </message>
@@ -12,7 +12,7 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../src/workspace-model.cc" line="+75"/>
+        <location filename="../src/workspace-model.cc" line="+74"/>
         <source>automatic</source>
         <translation>自動</translation>
     </message>
@@ -61,11 +61,39 @@
         <source>cursor</source>
         <translation>カーソル</translation>
     </message>
+    <message>
+        <location filename="../src/settings-dialog.cc" line="+132"/>
+        <source>Difference to the default size</source>
+        <translation type="unfinished">既定のサイズとの差</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Background color, pink (255,0,255) means default</source>
+        <translation type="unfinished">背景色，ピンク (255,0,255) が既定を意味する</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>b</source>
+        <comment>short form for bold</comment>
+        <translation type="unfinished">b</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>i</source>
+        <comment>short form for italic</comment>
+        <translation type="unfinished">i</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>u</source>
+        <comment>short form for underlined</comment>
+        <translation type="unfinished">u</translation>
+    </message>
 </context>
 <context>
     <name>QTerminal</name>
     <message>
-        <location filename="../qterminal/libqterminal/QTerminal.h" line="+135"/>
+        <location filename="../qterminal/libqterminal/QTerminal.h" line="+130"/>
         <source>Copy</source>
         <translation>コピー</translation>
     </message>
@@ -80,15 +108,20 @@
         <translation>全てを選択</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+7"/>
         <source>Clear Window</source>
         <translation>ウィンドウをクリア</translation>
     </message>
+    <message>
+        <location filename="../qterminal/libqterminal/QTerminal.cc" line="+46"/>
+        <source>Edit %1 at line %2</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QWinTerminalImpl</name>
     <message>
-        <location filename="../qterminal/libqterminal/win32/QWinTerminalImpl.cpp" line="+1778"/>
+        <location filename="../qterminal/libqterminal/win32/QWinTerminalImpl.cpp" line="+1779"/>
         <source>copied selection to clipboard</source>
         <translation>選択範囲をクリップボードに複製</translation>
     </message>
@@ -762,7 +795,7 @@
 <context>
     <name>QtHandles::Figure</name>
     <message>
-        <location filename="../graphics/Figure.cc" line="+282"/>
+        <location filename="../graphics/Figure.cc" line="+298"/>
         <source>Figure ToolBar</source>
         <translation type="unfinished"></translation>
     </message>
@@ -812,37 +845,19 @@
         <translation>コピー (&amp;y)</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Cu&amp;t</source>
-        <translation>切り取り (&amp;T)</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>&amp;Paste</source>
-        <translation>貼り付け  (&amp;P)</translation>
-    </message>
-    <message>
-        <location line="+5"/>
+        <location line="+7"/>
+        <location line="+463"/>
+        <source>About Octave</source>
+        <translation type="unfinished">Octave について</translation>
+    </message>
+    <message>
+        <location line="-465"/>
         <source>&amp;Help</source>
         <translation>ヘルプ (&amp;H)</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>&amp;About QtHandles</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>About &amp;Qt</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+427"/>
-        <source>About QtHandles</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+39"/>
+        <location line="+504"/>
+        <location line="+69"/>
         <source>Save Figure As</source>
         <translation>図を別名で保存</translation>
     </message>
@@ -881,6 +896,160 @@
     </message>
 </context>
 <context>
+    <name>annotation_dialog</name>
+    <message>
+        <location filename="../graphics/annotation-dialog.ui" line="+17"/>
+        <source>Annotation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>String</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Font</source>
+        <translation type="unfinished">フォント</translation>
+    </message>
+    <message>
+        <location line="+42"/>
+        <source>bold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>b</source>
+        <translation type="unfinished">b</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>italic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>i</source>
+        <translation type="unfinished">i</translation>
+    </message>
+    <message>
+        <location line="+428"/>
+        <source>color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>Horz alignment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <location line="+29"/>
+        <source>middle</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-24"/>
+        <source>right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Vert alignment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>top</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>bottom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Position</source>
+        <translation type="unfinished">位置</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>X</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Y</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Width</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Height</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>units</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>normalized</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Fit to box</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Box</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Background</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+444"/>
+        <source>Edge</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+133"/>
+        <source>Line style</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>none</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Line width</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>documentation_dock_widget</name>
     <message>
         <location filename="../src/documentation-dock-widget.cc" line="+34"/>
@@ -896,17 +1065,18 @@
 <context>
     <name>file_editor</name>
     <message>
-        <location filename="../src/m-editor/file-editor.cc" line="+285"/>
-        <location line="+125"/>
+        <location filename="../src/m-editor/file-editor.cc" line="+366"/>
+        <location line="+152"/>
         <location line="+19"/>
         <location line="+25"/>
         <location line="+62"/>
         <location line="+28"/>
+        <location line="+79"/>
         <source>Octave Editor</source>
         <translation>Octave エディタ</translation>
     </message>
     <message>
-        <location line="-318"/>
+        <location line="-462"/>
         <source>Octave Files (*.m);;All Files (*)</source>
         <translation>Octave ファイル (*.m);;全てのファイル (*)</translation>
     </message>
@@ -923,7 +1093,7 @@
 </translation>
     </message>
     <message>
-        <location line="+330"/>
+        <location line="+395"/>
         <source>File not saved! A file with the selected name
 %1
 is already open in the editor</source>
@@ -932,12 +1102,12 @@
 同名のファイルがあります</translation>
     </message>
     <message>
-        <location line="+387"/>
+        <location line="+492"/>
         <source>&amp;%1 %2</source>
         <translation>&amp;%1 %2</translation>
     </message>
     <message>
-        <location line="+388"/>
+        <location line="+480"/>
         <source>&amp;Save File</source>
         <translation>ファイルの保存 (&amp;S)</translation>
     </message>
@@ -953,41 +1123,26 @@
     </message>
     <message>
         <location line="+7"/>
-        <source>&amp;Undo</source>
-        <translation>元に戻す (&amp;U) </translation>
-    </message>
-    <message>
-        <location line="+3"/>
         <source>&amp;Redo</source>
         <translation>やり直す (&amp;R)</translation>
     </message>
     <message>
         <location line="+6"/>
-        <source>&amp;Copy</source>
-        <translation>コピー (&amp;C)</translation>
-    </message>
-    <message>
-        <location line="+3"/>
         <source>Cu&amp;t</source>
         <translation>切り取り (&amp;T)</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Paste</source>
-        <translation>貼り付け</translation>
-    </message>
-    <message>
-        <location line="+96"/>
+        <location line="+94"/>
         <source>&amp;Next Bookmark</source>
         <translation>次のブックマーク (&amp;N)</translation>
     </message>
     <message>
-        <location line="-2"/>
+        <location line="+2"/>
         <source>Pre&amp;vious Bookmark</source>
         <translation>一つ前のブックマーク (&amp;V)</translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+2"/>
         <source>Toggle &amp;Bookmark</source>
         <translation>ブックマークをトグル (&amp;B)</translation>
     </message>
@@ -997,7 +1152,7 @@
         <translation>全てのブックマークを取り除く (&amp;R)</translation>
     </message>
     <message>
-        <location line="+54"/>
+        <location line="+68"/>
         <source>&amp;Next Breakpoint</source>
         <translation>次のブレークポイント (&amp;N)</translation>
     </message>
@@ -1017,7 +1172,7 @@
         <translation>全てのブレークポイントを解除 (&amp;R)</translation>
     </message>
     <message>
-        <location line="-104"/>
+        <location line="-118"/>
         <source>&amp;Comment</source>
         <translation>コメント (&amp;C)</translation>
     </message>
@@ -1027,29 +1182,29 @@
         <translation>コメントを取り消す (&amp;U)</translation>
     </message>
     <message>
-        <location line="-48"/>
+        <location line="-54"/>
         <source>&amp;Find and Replace...</source>
         <translation>検索と置換 (&amp;F) ...</translation>
     </message>
     <message>
-        <location line="+162"/>
+        <location line="+182"/>
         <source>Save File and Run</source>
         <translation>ファイルを保存して実行</translation>
     </message>
     <message>
-        <location line="-90"/>
+        <location line="-104"/>
         <source>Go &amp;to Line...</source>
         <translation>指定行 (&amp;T) ...</translation>
     </message>
     <message>
-        <location line="-1126"/>
+        <location line="-1341"/>
         <source>Could not start custom file editor
 %1</source>
         <translation>カスタムエディタからスタートできません
 %1</translation>
     </message>
     <message>
-        <location line="+148"/>
+        <location line="+175"/>
         <source>Create</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1059,7 +1214,7 @@
         <translation>キャンセル</translation>
     </message>
     <message>
-        <location line="+844"/>
+        <location line="+1041"/>
         <source>&amp;Recent Editor Files</source>
         <translation>最近開いたファイル (&amp;R)</translation>
     </message>
@@ -1084,12 +1239,7 @@
         <translation>他のファイルを閉じる</translation>
     </message>
     <message>
-        <location line="+31"/>
-        <source>Select All</source>
-        <translation>全選択</translation>
-    </message>
-    <message>
-        <location line="+10"/>
+        <location line="+32"/>
         <source>&amp;Commands</source>
         <translation>コマンド (&amp;C)</translation>
     </message>
@@ -1224,17 +1374,62 @@
         <translation>行番号の表示 (&amp;L)</translation>
     </message>
     <message>
-        <location line="+128"/>
-        <source>Editor</source>
-        <translation type="unfinished">エディタ</translation>
-    </message>
-    <message>
-        <location line="-120"/>
-        <source>Show Line &amp;Endings</source>
-        <translation>行末の表示 (&amp;E)</translation>
+        <location line="+22"/>
+        <source>Show &amp;Toolbar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Show &amp;Statusbar</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+4"/>
+        <source>Show &amp;Horizontal Scrollbar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+69"/>
+        <source>Recent Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+65"/>
+        <source>Editor</source>
+        <translation type="unfinished">エディタ</translation>
+    </message>
+    <message>
+        <location line="-156"/>
+        <source>Show Line &amp;Endings</source>
+        <translation>行末の表示 (&amp;E)</translation>
+    </message>
+    <message>
+        <location line="-1467"/>
+        <source>File Encoding:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+403"/>
+        <source>%1 is a built-in function</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>Can not find function %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+911"/>
+        <source>Find &amp;Next...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Find &amp;Previous...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+118"/>
         <source>Show &amp;Indentation Guides</source>
         <translation>インデンテーションのガイドを表示 (&amp;I)</translation>
     </message>
@@ -1244,7 +1439,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+20"/>
         <source>Zoom &amp;In</source>
         <translation>ズームイン (&amp;I)</translation>
     </message>
@@ -1279,7 +1474,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1103"/>
+        <location line="-1305"/>
         <source>Could not open file
 %1
 for read: %2.</source>
@@ -1311,7 +1506,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+731"/>
+        <location line="+928"/>
         <source>&amp;File</source>
         <translation>ファイル (&amp;F)</translation>
     </message>
@@ -1321,12 +1516,12 @@
         <translation>編集 (&amp;E)</translation>
     </message>
     <message>
-        <location line="+138"/>
+        <location line="+129"/>
         <source>Show &amp;Whitespace Characters</source>
         <translation>ホワイトスペースを表示 (&amp;W)</translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+42"/>
         <source>&amp;Debug</source>
         <translation>デバッグ (&amp;D)</translation>
     </message>
@@ -1339,12 +1534,12 @@
 <context>
     <name>file_editor_tab</name>
     <message>
-        <location filename="../src/m-editor/file-editor-tab.cc" line="+92"/>
+        <location filename="../src/m-editor/file-editor-tab.cc" line="+145"/>
         <source>eol:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="-17"/>
         <source>line:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1354,17 +1549,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+156"/>
-        <source>%1 is a built-in function</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+31"/>
-        <source>Can not find function %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+775"/>
+        <location line="+1146"/>
         <source>Goto line</source>
         <translation>指定行へ行く</translation>
     </message>
@@ -1374,7 +1559,7 @@
         <translation>行数</translation>
     </message>
     <message>
-        <location line="+146"/>
+        <location line="+145"/>
         <location line="+63"/>
         <source>&lt;unnamed&gt;</source>
         <translation type="unfinished"></translation>
@@ -1389,12 +1574,28 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+288"/>
+        <location line="+298"/>
+        <source>Debug or Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>This file is currently being executed.
+Quit debugging and save?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+166"/>
         <source>Line Endings:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+9"/>
+        <source>File Encoding:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+28"/>
         <source>Octave Files (*.m)</source>
         <translation>octave のファイル (*.m)</translation>
     </message>
@@ -1404,33 +1605,59 @@
         <translation>全てのファイル (*)</translation>
     </message>
     <message>
-        <location line="+78"/>
+        <location line="-513"/>
+        <source>Do you want to cancel closing, save or discard the changes?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-1015"/>
+        <location line="+1024"/>
+        <location line="+372"/>
+        <location line="+215"/>
+        <location line="+21"/>
+        <location line="+83"/>
+        <location line="+23"/>
+        <source>Octave Editor</source>
+        <translation>Octave 编辑器</translation>
+    </message>
+    <message>
+        <location line="-2065"/>
+        <source>encoding:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+239"/>
+        <source>Breakpoint condition</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+89"/>
+        <source>Cannot add breakpoint to modified file.
+Save and add breakpoint, or canel?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1611"/>
         <source>&quot;%1&quot;
 is not a valid identifier.
 
-If you keep this file name, you will not be able to
+If you keep this filename, you will not be able to
 call your script using its name as an Octave command.
 
 Do you want to choose another name?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-400"/>
-        <source>Do you want to cancel closing, save or discard the changes?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-970"/>
-        <location line="+979"/>
-        <location line="+213"/>
-        <location line="+177"/>
-        <location line="+85"/>
-        <location line="+23"/>
-        <source>Octave Editor</source>
-        <translation>Octave 编辑器</translation>
-    </message>
-    <message>
-        <location line="-6"/>
+        <location line="+21"/>
+        <source>The current editor contents can not be encoded
+with the selected codec %1.
+Using it will result in data loss!
+
+Do you want to chose another codec?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+99"/>
         <source>
 
 Warning: The contents in the editor is modified!</source>
@@ -1448,14 +1675,14 @@
 削除されたか名前が変更されています。ファイルを今保存しますか？%2</translation>
     </message>
     <message>
-        <location line="-285"/>
+        <location line="-342"/>
         <source>Could not open file %1 for write:
 %2.</source>
         <translation>ファイル %1 を書き込み用として開けません:
 %2.</translation>
     </message>
     <message>
-        <location line="+262"/>
+        <location line="+319"/>
         <source>It seems that &apos;%1&apos; has been modified by another application. Do you want to reload it?</source>
         <translation>&apos;%1&apos; は他のアプリケーションで変更されたいます．再読込しますか？</translation>
     </message>
@@ -1468,12 +1695,7 @@
         <translation>ファイルブラウザ</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Browse your files.</source>
-        <translation>ファイルをブラウズ</translation>
-    </message>
-    <message>
-        <location line="+18"/>
+        <location line="+35"/>
         <source>Enter the path or filename</source>
         <translation>パスまたはファイル名の入力</translation>
     </message>
@@ -1494,22 +1716,67 @@
     </message>
     <message>
         <location line="+4"/>
-        <location line="+388"/>
+        <location line="+373"/>
         <source>Find Files...</source>
         <translation>ファイルの検索...</translation>
     </message>
     <message>
-        <location line="+364"/>
+        <location line="-26"/>
+        <source>Open in System File Explorer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Open in Text Editor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+389"/>
         <source>New Directory</source>
         <translation>新しいディレクトリ</translation>
     </message>
     <message>
-        <location line="-784"/>
+        <location line="-773"/>
         <source>Show Octave directory</source>
         <translation>octave ディレクトリの表示</translation>
     </message>
     <message>
-        <location line="-4"/>
+        <location line="-49"/>
+        <source>Browse your files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Alternating row colors</source>
+        <translation type="unfinished">列の色のオルタネーション</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>filesdockwidget/showFileSize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>filesdockwidget/showFileType</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>filesdockwidget/showLastModified</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>filesdockwidget/showHiddenFiles</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>filesdockwidget/useAlternatingRowColors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+29"/>
         <source>One directory up</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1530,53 +1797,48 @@
     </message>
     <message>
         <location line="+20"/>
-        <location line="+397"/>
+        <location line="+382"/>
         <source>New File...</source>
         <translation>新規のファイル...</translation>
     </message>
     <message>
-        <location line="-394"/>
-        <location line="+397"/>
+        <location line="-379"/>
+        <location line="+382"/>
         <source>New Directory...</source>
         <translation>新規のディレクトリ...</translation>
     </message>
     <message>
-        <location line="-335"/>
+        <location line="-329"/>
         <source>Activate to open in editor, right click for alternatives</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+236"/>
+        <location line="-136"/>
         <source>File size</source>
         <translation>ファイルのサイズ</translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+1"/>
         <source>File type</source>
         <translation>ファイルのタイプ</translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+1"/>
         <source>Date modified</source>
         <translation>修正日付</translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+1"/>
         <source>Show hidden</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+415"/>
         <source>Open</source>
         <translation>開く</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Open in Default Application</source>
-        <translation>既定のアプリケーションで開く</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <location line="+13"/>
         <source>Copy Selection to Clipboard</source>
         <translation>選択部をクリップボードにコピー</translation>
     </message>
@@ -1606,7 +1868,7 @@
         <translation>削除 ...</translation>
     </message>
     <message>
-        <location line="+115"/>
+        <location line="+125"/>
         <source>Rename file/directory</source>
         <translation>ファイル名／ディレクトリ名を変更</translation>
     </message>
@@ -1643,7 +1905,7 @@
         <translation>空のディレクトリでないので削除できません</translation>
     </message>
     <message>
-        <location line="+151"/>
+        <location line="+145"/>
         <source>Set directory of file browser</source>
         <translation>ディレクトリをファイルブラウザで設定</translation>
     </message>
@@ -1682,7 +1944,7 @@
 <context>
     <name>final_page</name>
     <message>
-        <location filename="../src/welcome-wizard.cc" line="+199"/>
+        <location filename="../src/welcome-wizard.cc" line="+195"/>
         <source>Enjoy!</source>
         <translation>エンジョイ！</translation>
     </message>
@@ -1741,7 +2003,7 @@
 <context>
     <name>find_dialog</name>
     <message>
-        <location filename="../src/m-editor/find-dialog.cc" line="+74"/>
+        <location filename="../src/m-editor/find-dialog.cc" line="+85"/>
         <source>Find and Replace</source>
         <translation type="unfinished">検索と置換</translation>
     </message>
@@ -1816,7 +2078,7 @@
         <translation>選択部を検索 (&amp;L)</translation>
     </message>
     <message>
-        <location line="+84"/>
+        <location line="+87"/>
         <source>Search from end</source>
         <translation>ファイルの終わりから検索</translation>
     </message>
@@ -1826,7 +2088,7 @@
         <translation>始めから検索</translation>
     </message>
     <message>
-        <location line="+205"/>
+        <location line="+221"/>
         <source>Replace Result</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1944,7 +2206,7 @@
         <translation>検索結果</translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+21"/>
         <source>Idle.</source>
         <translation>空闲。</translation>
     </message>
@@ -1970,8 +2232,8 @@
     </message>
     <message>
         <location line="+15"/>
-        <source>File name/location</source>
-        <translation>ファイル名/位置</translation>
+        <source>Filename/location</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+17"/>
@@ -1979,7 +2241,7 @@
         <translation>ファイルの内容</translation>
     </message>
     <message>
-        <location line="+105"/>
+        <location line="+111"/>
         <source>Searching...</source>
         <translation>検索中 ...</translation>
     </message>
@@ -1997,7 +2259,7 @@
 <context>
     <name>find_files_model</name>
     <message>
-        <location filename="../src/find-files-model.cc" line="+82"/>
+        <location filename="../src/find-files-model.cc" line="+83"/>
         <source>Filename</source>
         <translation>ファイル名</translation>
     </message>
@@ -2035,7 +2297,7 @@
         <translation>コマンドヒストリ</translation>
     </message>
     <message>
-        <location line="+89"/>
+        <location line="+107"/>
         <source>Copy</source>
         <translation>コピー</translation>
     </message>
@@ -2049,11 +2311,21 @@
         <source>Create script</source>
         <translation>スクリプトの作成</translation>
     </message>
+    <message>
+        <location line="+4"/>
+        <source>Hide filter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Show filter</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>initial_page</name>
     <message>
-        <location filename="../src/welcome-wizard.cc" line="-179"/>
+        <location filename="../src/welcome-wizard.cc" line="-176"/>
         <source>Welcome to Octave!</source>
         <translation>Octaveへようこそ!</translation>
     </message>
@@ -2084,13 +2356,13 @@
 <context>
     <name>main_window</name>
     <message>
-        <location filename="../src/main-window.cc" line="+268"/>
+        <location filename="../src/main-window.cc" line="+275"/>
         <source>Load Workspace</source>
         <translation>ワークスペースのロード</translation>
     </message>
     <message>
-        <location line="+732"/>
-        <location line="+931"/>
+        <location line="+758"/>
+        <location line="+975"/>
         <source>About Octave</source>
         <translation>Octave について</translation>
     </message>
@@ -2100,12 +2372,12 @@
         <translation>ファイル (&amp;F)</translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+45"/>
         <source>New</source>
         <translation>新規</translation>
     </message>
     <message>
-        <location line="-43"/>
+        <location line="-39"/>
         <source>Open...</source>
         <translation>開く...</translation>
     </message>
@@ -2115,7 +2387,7 @@
         <translation>設定 ...</translation>
     </message>
     <message>
-        <location line="-95"/>
+        <location line="-99"/>
         <source>Exit</source>
         <translation>終了</translation>
     </message>
@@ -2130,22 +2402,22 @@
         <translation>やり直し</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+7"/>
         <source>Copy</source>
         <translation>コピー</translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+5"/>
         <source>Paste</source>
         <translation>貼り付け</translation>
     </message>
     <message>
-        <location line="-1469"/>
+        <location line="-1537"/>
         <source>Save Workspace As</source>
         <translation>ワークスペースを別名で保存</translation>
     </message>
     <message>
-        <location line="+134"/>
+        <location line="+124"/>
         <source>The release notes file &apos;%1&apos; is empty.</source>
         <translation>リリースノートファイル &apos;%1&apos; が空です．</translation>
     </message>
@@ -2155,7 +2427,7 @@
         <translation>リリースノートファイル &apos;%1&apos; が読み取れません．</translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="+12"/>
         <source>Octave Release Notes</source>
         <translation>Octave リリースノート</translation>
     </message>
@@ -2165,7 +2437,7 @@
         <translation>Octave コミュニティーニュース</translation>
     </message>
     <message>
-        <location line="+1132"/>
+        <location line="+1213"/>
         <source>Clear Clipboard</source>
         <translation>クリップボードをクリア</translation>
     </message>
@@ -2220,7 +2492,7 @@
         <translation>ステップイン</translation>
     </message>
     <message>
-        <location line="-152"/>
+        <location line="-156"/>
         <source>Load Workspace...</source>
         <translation>ワークスペースのロード...</translation>
     </message>
@@ -2230,7 +2502,7 @@
         <translation>ワークスペースを別名で保存...</translation>
     </message>
     <message>
-        <location line="+153"/>
+        <location line="+157"/>
         <source>Step Out</source>
         <translation>ステップアウト</translation>
     </message>
@@ -2250,17 +2522,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Contribute to Octave</source>
-        <translation>Octave への貢献</translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Octave Developer Resources</source>
-        <translation>Octave 開発者のリソース</translation>
-    </message>
-    <message>
-        <location line="+14"/>
+        <location line="+20"/>
         <source>On Disk</source>
         <translation>ディスク上</translation>
     </message>
@@ -2305,13 +2567,13 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1148"/>
-        <location line="+1151"/>
+        <location line="-1198"/>
+        <location line="+1201"/>
         <source>Browse directories</source>
         <translation>ディレクトリのブラウズ</translation>
     </message>
     <message>
-        <location line="-1212"/>
+        <location line="-1274"/>
         <source>Octave</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2321,12 +2583,12 @@
         <translation>本当に Octave を終了しますか？</translation>
     </message>
     <message>
-        <location line="+854"/>
+        <location line="+916"/>
         <source>Open an existing file in editor</source>
         <translation>エディタに存在するファイルを開く</translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+41"/>
         <source>New Script</source>
         <translation>新規のスクリプト</translation>
     </message>
@@ -2341,12 +2603,12 @@
         <translation>新規の図</translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+39"/>
         <source>Select All</source>
         <translation>全てを選択</translation>
     </message>
     <message>
-        <location line="+94"/>
+        <location line="+95"/>
         <source>Quit Debug Mode</source>
         <translation>デバッグモードを終了</translation>
     </message>
@@ -2416,11 +2678,21 @@
         <source>Report Bug</source>
         <translation>バグの報告</translation>
     </message>
+    <message>
+        <location line="+9"/>
+        <source>Contribute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Donate to Octave</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>news_reader</name>
     <message>
-        <location line="-1411"/>
+        <location line="-1504"/>
         <source>&lt;html&gt;
 &lt;body&gt;
 &lt;p&gt;
@@ -2478,18 +2750,18 @@
 <context>
     <name>octave_dock_widget</name>
     <message>
-        <location filename="../src/octave-dock-widget.cc" line="+68"/>
-        <location line="+198"/>
+        <location filename="../src/octave-dock-widget.cc" line="+67"/>
+        <location line="+201"/>
         <source>Undock widget</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-188"/>
+        <location line="-191"/>
         <source>Hide widget</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+132"/>
+        <location line="+136"/>
         <source>Dock widget</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2497,7 +2769,7 @@
 <context>
     <name>octave_qscintilla</name>
     <message>
-        <location filename="../src/m-editor/octave-qscintilla.cc" line="+226"/>
+        <location filename="../src/m-editor/octave-qscintilla.cc" line="+237"/>
         <source>Help on</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2511,11 +2783,16 @@
         <source>Edit</source>
         <translation>編集</translation>
     </message>
+    <message>
+        <location line="+15"/>
+        <source>dbstop if ...</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>octave_qt_link</name>
     <message>
-        <location filename="../src/octave-qt-link.cc" line="+114"/>
+        <location filename="../src/octave-qt-link.cc" line="+142"/>
         <source>File
 %1
 does not exist. Do you want to create it?</source>
@@ -2529,14 +2806,14 @@
         <translation>Octave エディタ</translation>
     </message>
     <message>
-        <location line="-6"/>
-        <location line="+6"/>
-        <location line="+7"/>
+        <location line="-9"/>
+        <location line="+9"/>
+        <location line="+11"/>
         <source>Create</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+204"/>
+        <location line="+243"/>
         <source>The file %1 does not exist in the load path.  To run or debug the function you are editing, you must either change to the directory %2 or add that directory to the load path.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2561,8 +2838,8 @@
         <translation>ロードパスへのディレクトリの追加</translation>
     </message>
     <message>
-        <location line="-223"/>
-        <location line="+224"/>
+        <location line="-269"/>
+        <location line="+270"/>
         <source>Cancel</source>
         <translation>キャンセル</translation>
     </message>
@@ -2578,7 +2855,7 @@
 <context>
     <name>resource_manager</name>
     <message>
-        <location filename="../src/resource-manager.cc" line="+245"/>
+        <location filename="../src/resource-manager.cc" line="+246"/>
         <source>The settings file
 %1
 does not exist and can not be created.
@@ -2604,731 +2881,589 @@
     <name>settings_dialog</name>
     <message>
         <location filename="../src/settings-dialog.ui" line="+23"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1738"/>
         <source>Settings</source>
         <translation>設定</translation>
     </message>
     <message>
         <location line="+19"/>
         <location line="+468"/>
-        <location filename="../src/ui-settings-dialog.h" line="+25"/>
-        <location line="+1"/>
         <source>General</source>
         <translation>一般</translation>
     </message>
     <message>
         <location line="-447"/>
-        <location filename="../src/ui-settings-dialog.h" line="-25"/>
         <source>Interface</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+8"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Dock widget title bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+44"/>
-        <location filename="../src/ui-settings-dialog.h" line="+2"/>
         <source>Confirm before exiting</source>
         <translation>終了する前に確認</translation>
     </message>
     <message>
         <location line="+57"/>
-        <location filename="../src/ui-settings-dialog.h" line="+5"/>
         <source>Octave logo only</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+10"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Letter icons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+36"/>
-        <location line="+592"/>
-        <location filename="../src/ui-settings-dialog.h" line="+3"/>
-        <location line="+28"/>
+        <location line="+640"/>
         <source>Show status bar</source>
         <translation>ステータスバーを表示</translation>
     </message>
     <message>
-        <location line="-540"/>
-        <location filename="../src/ui-settings-dialog.h" line="-26"/>
+        <location line="-588"/>
         <source>Text inactive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="-32"/>
         <location line="+45"/>
-        <location filename="../src/ui-settings-dialog.h" line="-1"/>
-        <location line="+2"/>
         <source>Active</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="-159"/>
-        <location filename="../src/ui-settings-dialog.h" line="-11"/>
         <source>Small</source>
         <translation>小さい</translation>
     </message>
     <message>
         <location line="+17"/>
-        <location filename="../src/ui-settings-dialog.h" line="+2"/>
         <source>Large</source>
         <translation>大きい</translation>
     </message>
     <message>
         <location line="+168"/>
-        <location filename="../src/ui-settings-dialog.h" line="+10"/>
         <source>Custom style</source>
         <translation>カスタムスタイル</translation>
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Background inactive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+19"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>3D</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+54"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Octave Startup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+41"/>
-        <location line="+1392"/>
-        <location filename="../src/ui-settings-dialog.h" line="+2"/>
-        <location line="+82"/>
+        <location line="+1440"/>
         <source>Startup path</source>
         <translation>起動パス</translation>
     </message>
     <message>
-        <location line="-1379"/>
-        <location line="+1409"/>
-        <location filename="../src/ui-settings-dialog.h" line="-81"/>
-        <location line="+83"/>
+        <location line="-1427"/>
+        <location line="+1420"/>
         <source>Browse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1369"/>
-        <location filename="../src/ui-settings-dialog.h" line="-24"/>
+        <location line="-1380"/>
         <source>Editor</source>
         <translation>エディタ</translation>
     </message>
     <message>
-        <location line="+47"/>
-        <location filename="../src/ui-settings-dialog.h" line="-54"/>
+        <location line="+277"/>
         <source>After Column</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+104"/>
-        <location filename="../src/ui-settings-dialog.h" line="+5"/>
+        <location line="-170"/>
         <source>Color</source>
         <translation>色</translation>
     </message>
     <message>
-        <location line="+40"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
+        <location line="+95"/>
         <source>Tab width min.</source>
         <translation>タブ幅の最小値</translation>
     </message>
     <message>
         <location line="+64"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>max.</source>
         <translation>最大値</translation>
     </message>
     <message>
-        <location line="+31"/>
-        <location filename="../src/ui-settings-dialog.h" line="+2"/>
+        <location line="-231"/>
         <source>This works well for monospaced fonts. The line is drawn at a position based on the width of a space character in the default font. It may not work very well if styles use proportional fonts or if varied font sizes or bold, italic and normal texts are used.</source>
         <translation>本機能は等幅フォントで正常動作します．既定フォントのスペースのキャラクターの幅で行は表示されます．スタイルがプロポーショナルフォントを使う場合や可変フォントサイズ，ボールド，イタリックフォントとノーマルテクストが使用された場合正常に動作しません．</translation>
     </message>
     <message>
-        <location line="+19"/>
-        <location filename="../src/ui-settings-dialog.h" line="+3"/>
+        <location line="+289"/>
         <source>Enable Code Folding</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+61"/>
-        <location filename="../src/ui-settings-dialog.h" line="+6"/>
+        <location line="+551"/>
         <source>Windows (CRLF)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+5"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Mac (CR)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+5"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Unix (LF)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
-        <location filename="../src/ui-settings-dialog.h" line="+2"/>
+        <location line="-532"/>
         <source>Show horizontal scroll bar</source>
         <translation>横方向スクロールバーの表示</translation>
     </message>
     <message>
-        <location line="+68"/>
-        <location filename="../src/ui-settings-dialog.h" line="+4"/>
+        <location line="-299"/>
+        <source>Show tool bar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+383"/>
         <source>Indentation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+24"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Indent width</source>
         <translation>インデントの幅</translation>
     </message>
     <message>
         <location line="+7"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Tab indents line</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+7"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Auto indentation</source>
         <translation>自動インデント</translation>
     </message>
     <message>
         <location line="+26"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Tab width</source>
         <translation>タブの幅</translation>
     </message>
     <message>
         <location line="+7"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Show indentation guides</source>
         <translation>インデントガイドの表示</translation>
     </message>
     <message>
         <location line="+23"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Backspace unindents line</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+23"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Indentation uses tabs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+38"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Auto completion</source>
         <translation>オートコンプリート</translation>
     </message>
     <message>
         <location line="+27"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Match keywords</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Case sensitive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+23"/>
-        <location filename="../src/ui-settings-dialog.h" line="+2"/>
         <source>Replace word by suggested one</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="-10"/>
-        <location filename="../src/ui-settings-dialog.h" line="-1"/>
         <source>Match words in document</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+48"/>
-        <location filename="../src/ui-settings-dialog.h" line="+2"/>
         <source>With Octave builtins</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+10"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>With Octave functions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+64"/>
-        <location filename="../src/ui-settings-dialog.h" line="+9"/>
         <source>Show completion list automatically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+51"/>
-        <location filename="../src/ui-settings-dialog.h" line="+2"/>
+        <location line="+63"/>
         <source>Restore editor tabs from previous session on startup</source>
         <translation>起動時に一回前のエディタタブを復元する</translation>
     </message>
     <message>
-        <location line="+20"/>
-        <location filename="../src/ui-settings-dialog.h" line="+2"/>
+        <location line="-13"/>
         <source>Reload externally changed files without prompt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-446"/>
-        <location filename="../src/ui-settings-dialog.h" line="-30"/>
+        <location line="-425"/>
         <source>Use custom file editor</source>
         <translation>外部エディタを使用する</translation>
     </message>
     <message>
-        <location line="+482"/>
-        <location filename="../src/ui-settings-dialog.h" line="+33"/>
+        <location line="+518"/>
+        <source>Text encoding used for loading and saving</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+56"/>
         <source>Editor Styles</source>
         <translation>エディタのスタイル</translation>
     </message>
     <message>
         <location line="+209"/>
-        <location filename="../src/ui-settings-dialog.h" line="+6"/>
         <source>(Changing buffer size clears history)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+28"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>History buffer Size</source>
         <translation>ヒストリのバッファサイズ</translation>
     </message>
     <message>
         <location line="+27"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Set focus to terminal when running a command from within another widget</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+7"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Print debug location in terminal window in addition to the marker in the editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+16"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Terminal Colors</source>
         <translation>端末の色</translation>
     </message>
     <message>
         <location line="-173"/>
-        <location filename="../src/ui-settings-dialog.h" line="-6"/>
         <source>Font</source>
         <translation>フォント</translation>
     </message>
     <message>
-        <location line="-917"/>
-        <location filename="../src/ui-settings-dialog.h" line="-58"/>
+        <location line="-1007"/>
         <source>Show line numbers</source>
         <translation>行番号の表示</translation>
     </message>
     <message>
-        <location line="-72"/>
-        <location filename="../src/ui-settings-dialog.h" line="-3"/>
+        <location line="+81"/>
         <source>Highlight current line</source>
         <translation>現在の行をハイライト</translation>
     </message>
     <message>
-        <location line="+85"/>
-        <location filename="../src/ui-settings-dialog.h" line="+4"/>
+        <location line="+13"/>
         <source>Show complete path in window title</source>
         <translation>ウィンドウのタイトルに完全なパス名を表示する</translation>
     </message>
     <message>
-        <location line="-423"/>
-        <location filename="../src/ui-settings-dialog.h" line="-20"/>
+        <location line="-467"/>
         <source>Graphic icons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+212"/>
-        <location filename="../src/ui-settings-dialog.h" line="+10"/>
         <source>These preferences are applied after any .octaverc startup files.</source>
         <translation>設定は .octaverc スタートアップファイルの後に適用されます</translation>
     </message>
     <message>
         <location line="+55"/>
-        <location filename="../src/ui-settings-dialog.h" line="+3"/>
         <source>Restore working directory of previous session</source>
         <translation>一つ前のセッションのワーキングディレクトリを保存する</translation>
     </message>
     <message>
-        <location line="+127"/>
-        <location filename="../src/ui-settings-dialog.h" line="+5"/>
+        <location line="+213"/>
         <source>Show whitespace</source>
         <translation>ホワイトスペースの表示</translation>
     </message>
     <message>
-        <location line="+39"/>
-        <location filename="../src/ui-settings-dialog.h" line="+3"/>
+        <location line="+157"/>
         <source>Do not show whitespace used for indentation</source>
         <translation>アイデントに使用されたホワイトスペースを表示しない</translation>
     </message>
     <message>
-        <location line="+156"/>
-        <location filename="../src/ui-settings-dialog.h" line="+7"/>
+        <location line="-299"/>
         <source>Draw a long line marker</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+48"/>
-        <location filename="../src/ui-settings-dialog.h" line="+3"/>
+        <location line="+155"/>
         <source>Show EOL characters</source>
         <translation>文末文字を表示する</translation>
     </message>
     <message>
-        <location line="+9"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
+        <location line="+662"/>
         <source>Default EOL mode</source>
         <translation>既定の文末文字モード</translation>
     </message>
     <message>
-        <location line="+412"/>
-        <location filename="../src/ui-settings-dialog.h" line="+26"/>
+        <location line="-136"/>
         <source>Number of characters before list is shown: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+112"/>
-        <location filename="../src/ui-settings-dialog.h" line="+11"/>
+        <location line="+124"/>
         <source>Create nonexistent files without prompting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-429"/>
-        <location filename="../src/ui-settings-dialog.h" line="-28"/>
+        <location line="-441"/>
         <source>command line (%f=file, %l=line):</source>
         <translation>コマンドライン(%f=ファイル名, %l=行数): </translation>
     </message>
     <message>
-        <location line="+489"/>
-        <location filename="../src/ui-settings-dialog.h" line="+31"/>
+        <location line="+581"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Select font, font size (as a difference from the default size), font style (&lt;b&gt;b&lt;/b&gt;old, &lt;b&gt;i&lt;/b&gt;talic, &lt;b&gt;u&lt;/b&gt;nderline), text color, and background color (for the latter, the color magenta (255,0,255) is a placeholder for the default background color).&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;フォントの種類, サイズ (既定のサイズからの差), フォントのスタイル (ボールド(&lt;b&gt;b&lt;/b&gt;), イタリック(&lt;b&gt;i&lt;/b&gt;), 下線(&lt;b&gt;u&lt;/b&gt;)), テキストの色, 背景色 (後者について, マジェンダ (255,0,255) は既定の背景色のプレースホルダー).&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location line="+32"/>
-        <location filename="../src/ui-settings-dialog.h" line="+12"/>
         <source>Terminal</source>
         <translation>端末</translation>
     </message>
     <message>
         <location line="+51"/>
-        <location filename="../src/ui-settings-dialog.h" line="-8"/>
         <source>Cursor type:</source>
         <translation>カーソルのタイプ: </translation>
     </message>
     <message>
         <location line="-11"/>
-        <location filename="../src/ui-settings-dialog.h" line="-1"/>
         <source>Cursor blinking</source>
         <translation>カーソルの点滅</translation>
     </message>
     <message>
         <location line="-7"/>
-        <location filename="../src/ui-settings-dialog.h" line="-1"/>
         <source>Use foreground color</source>
         <translation>前景色を使う</translation>
     </message>
     <message>
         <location line="+59"/>
-        <location filename="../src/ui-settings-dialog.h" line="+4"/>
         <source>Font size</source>
         <translation>フォントサイズ</translation>
     </message>
     <message>
         <location line="+196"/>
-        <location filename="../src/ui-settings-dialog.h" line="+18"/>
         <source>File Browser</source>
         <translation>ファイルブラウザ</translation>
     </message>
     <message>
-        <location line="+21"/>
-        <location filename="../src/ui-settings-dialog.h" line="-11"/>
-        <source>Display</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+25"/>
-        <location filename="../src/ui-settings-dialog.h" line="+3"/>
-        <source>Show file size</source>
-        <translation>ファイルサイズの表示</translation>
-    </message>
-    <message>
-        <location line="-14"/>
-        <location filename="../src/ui-settings-dialog.h" line="-2"/>
-        <source>Show file type</source>
-        <translation>ファイルタイプの表示</translation>
-    </message>
-    <message>
-        <location line="+21"/>
-        <location filename="../src/ui-settings-dialog.h" line="+3"/>
-        <source>Show date of last modification</source>
-        <translation>最後に修正した日の表示</translation>
-    </message>
-    <message>
-        <location line="-14"/>
-        <location filename="../src/ui-settings-dialog.h" line="-2"/>
-        <source>Show hidden files</source>
-        <translation>隠しファイルの表示</translation>
-    </message>
-    <message>
-        <location line="+21"/>
-        <location filename="../src/ui-settings-dialog.h" line="+3"/>
-        <source>Alternating row colors</source>
-        <translation>列の色のオルタネーション</translation>
-    </message>
-    <message>
-        <location line="+117"/>
-        <location filename="../src/ui-settings-dialog.h" line="+9"/>
+        <location line="+144"/>
         <source>Workspace</source>
         <translation>ワークスペース</translation>
     </message>
     <message>
-        <location line="+42"/>
-        <location filename="../src/ui-settings-dialog.h" line="-1"/>
+        <location line="+35"/>
+        <source>Colors for variable attributes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
         <source>Hide tool tips</source>
         <translation>ツールチップを隠す</translation>
     </message>
     <message>
-        <location line="+182"/>
-        <location filename="../src/ui-settings-dialog.h" line="+14"/>
+        <location line="+101"/>
+        <source>Import shortcut set</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Export current shortcut set</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Reset shortcuts to their defaults</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location line="+80"/>
+        <source>Default</source>
+        <translation type="unfinished">既定</translation>
+    </message>
+    <message>
+        <location line="-71"/>
         <source>Edit a shortcut by double-clicking in a cell</source>
         <translation>セルのバブルクリックでショートカットを編集する</translation>
     </message>
     <message>
-        <location line="+108"/>
-        <location filename="../src/ui-settings-dialog.h" line="+20"/>
+        <location line="+76"/>
+        <source>Actual</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
         <source>Network</source>
         <translation>ネットワーク</translation>
     </message>
     <message>
         <location line="+23"/>
-        <location filename="../src/ui-settings-dialog.h" line="-12"/>
         <source>Allow Octave to connect to the Octave web site to display current news and information</source>
         <translation>現在のニュースや情報を表示させるために Octave が Octave ウェブサイトに接続することを許可する</translation>
     </message>
     <message>
         <location line="+46"/>
-        <location filename="../src/ui-settings-dialog.h" line="+8"/>
         <source>Use proxy server</source>
         <translation>プロキシサーバーを使用する</translation>
     </message>
     <message>
         <location line="-23"/>
-        <location filename="../src/ui-settings-dialog.h" line="-4"/>
         <source>HttpProxy</source>
         <translation>HTTP Proxy</translation>
     </message>
     <message>
-        <location line="-2083"/>
-        <location filename="../src/ui-settings-dialog.h" line="-123"/>
+        <location line="-2039"/>
         <source>Icon set for dock widgets</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="-48"/>
-        <location filename="../src/ui-settings-dialog.h" line="-4"/>
         <source>Language (requires restart)</source>
         <translation>言語 (要再起動)</translation>
     </message>
     <message>
         <location line="-58"/>
-        <location filename="../src/ui-settings-dialog.h" line="-5"/>
         <source>Icon size</source>
         <translation>アイコンのサイズ</translation>
     </message>
     <message>
         <location line="+26"/>
-        <location filename="../src/ui-settings-dialog.h" line="+3"/>
         <source>Normal</source>
         <translation>標準</translation>
     </message>
     <message>
-        <location line="+1195"/>
-        <location filename="../src/ui-settings-dialog.h" line="+72"/>
+        <location line="+1156"/>
         <source>File handling</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+485"/>
-        <location filename="../src/ui-settings-dialog.h" line="+24"/>
+        <location line="+526"/>
         <source>Behavior</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+8"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Synchronize Octave working directory with file browser</source>
         <translation>Octaveのワーキングディレクトリをファイルブラウザと同期させる</translation>
     </message>
     <message>
-        <location line="+26"/>
-        <location filename="../src/ui-settings-dialog.h" line="+2"/>
+        <location line="+22"/>
         <source>Restore last directory of previous session</source>
         <translation>一つ前のセッションの最後のディレクトリを保存する</translation>
     </message>
     <message>
-        <location line="+106"/>
-        <location filename="../src/ui-settings-dialog.h" line="+3"/>
-        <source>Colors for variable attributes </source>
-        <translation>変数の属性の色</translation>
-    </message>
-    <message>
-        <location line="+34"/>
-        <location filename="../src/ui-settings-dialog.h" line="+22"/>
+        <location line="+162"/>
         <source>Shortcuts</source>
         <translation>ショートカット</translation>
     </message>
     <message>
         <location line="+31"/>
-        <location filename="../src/ui-settings-dialog.h" line="-18"/>
         <source>Select this option to prevent conflicts with readline shortcuts</source>
         <translation>Realineのショートカットとのコンフリクトを防ぐためにこのオプションを選択する</translation>
     </message>
     <message>
         <location line="+3"/>
-        <location filename="../src/ui-settings-dialog.h" line="+2"/>
         <source>Disable global shortcuts when terminal window has focus</source>
         <translation>端末のウィンドウがフォーカスされている時グローバルなショートカットを無効にする</translation>
     </message>
     <message>
-        <location line="+31"/>
-        <location line="+28"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
-        <location line="+4"/>
-        <source>Use this set</source>
-        <translation>このセットを使用する</translation>
-    </message>
-    <message>
-        <location line="-21"/>
-        <location filename="../src/ui-settings-dialog.h" line="-3"/>
-        <source>Set 1:</source>
-        <translation>セット 1</translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <location line="+37"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
-        <location line="+3"/>
+        <location line="+53"/>
         <source>Export</source>
         <translation>エクスポート</translation>
     </message>
     <message>
-        <location line="-30"/>
-        <location line="+37"/>
-        <location filename="../src/ui-settings-dialog.h" line="-2"/>
-        <location line="+3"/>
+        <location line="-10"/>
         <source>Import</source>
         <translation>インポート</translation>
     </message>
     <message>
-        <location line="+7"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
-        <source>Set 2:</source>
-        <translation>セット 2</translation>
-    </message>
-    <message>
-        <location line="+86"/>
-        <location filename="../src/ui-settings-dialog.h" line="+7"/>
+        <location line="+90"/>
         <source>Action</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
-        <location filename="../src/ui-settings-dialog.h" line="-1"/>
-        <source>Set 1 Default</source>
-        <translation>セット 1 を既定にする</translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <location filename="../src/ui-settings-dialog.h" line="-1"/>
-        <source>Set 1 Actual</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <location filename="../src/ui-settings-dialog.h" line="-1"/>
-        <source>Set 2 Default</source>
-        <translation>セット 2 を既定にする</translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <location filename="../src/ui-settings-dialog.h" line="-1"/>
-        <source>Set 2 Actual</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+68"/>
-        <location filename="../src/ui-settings-dialog.h" line="+11"/>
+        <location line="+83"/>
         <source>Socks5Proxy</source>
         <translation>Socks5Proxy</translation>
     </message>
     <message>
         <location line="-16"/>
-        <location filename="../src/ui-settings-dialog.h" line="-4"/>
         <source>Hostname:</source>
         <translation>ホスト名: </translation>
     </message>
     <message>
-        <location line="+44"/>
-        <location filename="../src/ui-settings-dialog.h" line="+8"/>
+        <location line="-342"/>
+        <source>Extensions of files to be opened in the default text editor (separated by &quot;;&quot;):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+386"/>
         <source>Proxy type:</source>
         <translation>プロキシのタイプ: </translation>
     </message>
     <message>
         <location line="+10"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Port:</source>
         <translation>ポート: </translation>
     </message>
     <message>
         <location line="-27"/>
-        <location filename="../src/ui-settings-dialog.h" line="-3"/>
         <source>Username:</source>
         <translation>ユーザー名: </translation>
     </message>
     <message>
         <location line="+37"/>
-        <location filename="../src/ui-settings-dialog.h" line="+4"/>
         <source>Password:</source>
         <translation>パスワード: </translation>
     </message>
     <message>
-        <location filename="../src/settings-dialog.cc" line="+77"/>
+        <location filename="../src/settings-dialog.cc" line="+127"/>
+        <source>Octave Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Unable to save settings.  Missing settings file or unknown directory.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+18"/>
         <location line="+4"/>
-        <location line="+561"/>
+        <location line="+444"/>
         <source>System setting</source>
         <translation>システム設定</translation>
     </message>
     <message>
-        <location line="-355"/>
+        <location line="-232"/>
         <source>IBeam Cursor</source>
         <translation>IBeam カーソル</translation>
     </message>
@@ -3343,35 +3478,7 @@
         <translation>下線カーソル</translation>
     </message>
     <message>
-        <location line="+213"/>
-        <source>Difference to the default size</source>
-        <translation>既定のサイズとの差</translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Background color, pink (255,0,255) means default</source>
-        <translation>背景色，ピンク (255,0,255) が既定を意味する</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>b</source>
-        <comment>short form for bold</comment>
-        <translation>b</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>i</source>
-        <comment>short form for italic</comment>
-        <translation>i</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>u</source>
-        <comment>short form for underlined</comment>
-        <translation>u</translation>
-    </message>
-    <message>
-        <location line="+497"/>
+        <location line="+503"/>
         <source>Set Octave Startup Directory</source>
         <translation>Octave のスタートアップディレクトリの設定</translation>
     </message>
@@ -3384,7 +3491,7 @@
 <context>
     <name>setup_community_news</name>
     <message>
-        <location filename="../src/welcome-wizard.cc" line="+44"/>
+        <location filename="../src/welcome-wizard.cc" line="+42"/>
         <source>Community News</source>
         <translation>コミュニティーニュース</translation>
     </message>
@@ -3439,7 +3546,7 @@
 <context>
     <name>shortcut_manager</name>
     <message>
-        <location filename="../src/shortcut-manager.cc" line="+109"/>
+        <location filename="../src/shortcut-manager.cc" line="+106"/>
         <source>New File</source>
         <translation type="unfinished">新規ファイル</translation>
     </message>
@@ -3469,42 +3576,38 @@
         <translation type="unfinished">ワークスペースを別名で保存</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <location line="+158"/>
+        <location line="+16"/>
+        <location line="+143"/>
         <source>Preferences</source>
         <translation>設定</translation>
     </message>
     <message>
-        <location line="-157"/>
+        <location line="-158"/>
         <source>Exit Octave</source>
         <translation>Octave の終了</translation>
     </message>
     <message>
         <location line="+3"/>
-        <location line="+84"/>
         <source>Copy</source>
         <translation>コピー</translation>
     </message>
     <message>
-        <location line="-83"/>
-        <location line="+85"/>
+        <location line="+1"/>
         <source>Paste</source>
         <translation>貼り付け</translation>
     </message>
     <message>
-        <location line="-84"/>
-        <location line="+80"/>
+        <location line="+1"/>
         <source>Undo</source>
         <translation>元に戻す</translation>
     </message>
     <message>
-        <location line="-79"/>
-        <location line="+84"/>
+        <location line="+1"/>
         <source>Select All</source>
         <translation type="unfinished">全てを選択</translation>
     </message>
     <message>
-        <location line="-83"/>
+        <location line="+1"/>
         <source>Clear Clipboard</source>
         <translation>クリップボードをクリア</translation>
     </message>
@@ -3529,14 +3632,14 @@
         <translation>ワークスペースのクリア</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+6"/>
         <source>Step Into</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Step Out</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">ステップアウト</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -3600,12 +3703,12 @@
     </message>
     <message>
         <location line="+2"/>
-        <location line="+216"/>
+        <location line="+234"/>
         <source>Editor</source>
         <translation>エディタ</translation>
     </message>
     <message>
-        <location line="-214"/>
+        <location line="-232"/>
         <source>Documentation</source>
         <translation>ドキュメント</translation>
     </message>
@@ -3685,19 +3788,29 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+3"/>
         <source>Redo</source>
         <translation>やり直し</translation>
     </message>
     <message>
+        <location line="+1"/>
+        <source>Cut</source>
+        <translation>切り取り</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Find and Replace</source>
+        <translation>検索と置換</translation>
+    </message>
+    <message>
         <location line="+2"/>
-        <source>Cut</source>
-        <translation>切り取り</translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Find and Replace</source>
-        <translation>検索と置換</translation>
+        <source>Find Next</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Find Previous</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+2"/>
@@ -3784,12 +3897,12 @@
     <message>
         <location line="+2"/>
         <source>Move to Matching Brace</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">対応する括弧に移動</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Select to Matching Brace</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">対応する括弧を選択</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -3822,7 +3935,68 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-145"/>
+        <location line="+48"/>
+        <source>Switch to Left Tab</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Switch to Right Tab</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Move Tab Left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Move Tab Right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+44"/>
+        <source>Global</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+38"/>
+        <source>Tabs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+98"/>
+        <source>Enter new Shortcut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+143"/>
+        <source>Overwriting Shortcuts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>You are about to overwrite all shortcuts.
+Would you like to save the current shortcut set or cancel the action?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Don&apos;t save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+39"/>
+        <source>Import shortcuts from file ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Export shortcuts into file ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-571"/>
         <source>Step</source>
         <translation type="unfinished">ステップ</translation>
     </message>
@@ -3883,6 +4057,21 @@
     </message>
     <message>
         <location line="+2"/>
+        <source>Show Toolbar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Show Statusbar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Show Horizontal Scrollbar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>Zoom In</source>
         <translation>ズームイン</translation>
     </message>
@@ -3938,12 +4127,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+42"/>
-        <source>Main</source>
-        <translation>メイン</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <location line="+57"/>
         <location line="+23"/>
         <source>File</source>
         <translation>ファイル</translation>
@@ -3987,12 +4171,7 @@
         <translation>実行</translation>
     </message>
     <message>
-        <location line="+124"/>
-        <source>Enter new Shortcut for Set %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
+        <location line="+106"/>
         <source>Apply the desired shortcut or click on the right button to reset the shortcut to its default.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4017,7 +4196,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+53"/>
+        <location line="+45"/>
         <source>Double Shortcut</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4031,23 +4210,13 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+71"/>
-        <source>Import shortcut set %1 from file ...</source>
-        <translation>ショートカットセット %1 をファイルからインポートする</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <location line="+6"/>
+        <location line="+113"/>
+        <location line="+5"/>
         <source>Octave Shortcut Files (*.osc);;All Files (*)</source>
         <translation>Octave ショートカットファイル (*.osc);;全てのファイル (*)</translation>
     </message>
     <message>
-        <location line="-1"/>
-        <source>Export shortcut set %1 into file ...</source>
-        <translation>ショートカットセット %1 をファイルにエクスポートする</translation>
-    </message>
-    <message>
-        <location line="+15"/>
+        <location line="+10"/>
         <source>Failed to open %1 as octave shortcut file</source>
         <translation>%1 を Octave ショートカットファイルとして開くのに失敗しました</translation>
     </message>
@@ -4086,7 +4255,7 @@
 <context>
     <name>welcome_wizard</name>
     <message>
-        <location filename="../src/welcome-wizard.cc" line="+135"/>
+        <location filename="../src/welcome-wizard.cc" line="+133"/>
         <source>Welcome to GNU Octave</source>
         <translation>GNU Octave へようこそ</translation>
     </message>
@@ -4094,7 +4263,7 @@
 <context>
     <name>workspace_model</name>
     <message>
-        <location filename="../src/workspace-model.cc" line="-42"/>
+        <location filename="../src/workspace-model.cc" line="-41"/>
         <source>Name</source>
         <translation>名前</translation>
     </message>
@@ -4119,7 +4288,7 @@
         <translation>属性</translation>
     </message>
     <message>
-        <location line="+109"/>
+        <location line="+108"/>
         <source>Right click to copy, rename, or display</source>
         <translation>右クリックでコピー，名前の変更，または表示</translation>
     </message>
@@ -4133,7 +4302,7 @@
 <context>
     <name>workspace_view</name>
     <message>
-        <location filename="../src/workspace-view.cc" line="+50"/>
+        <location filename="../src/workspace-view.cc" line="+51"/>
         <source>Workspace</source>
         <translation>ワークスペース</translation>
     </message>
@@ -4153,7 +4322,7 @@
         <translation>フィルタ</translation>
     </message>
     <message>
-        <location line="+161"/>
+        <location line="+242"/>
         <source>Copy name</source>
         <translation>名前のコピー</translation>
     </message>
@@ -4169,11 +4338,41 @@
     </message>
     <message>
         <location line="+9"/>
-        <source>Only top-level symbols may be renamed.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+132"/>
+        <source>Only top-level symbols may be renamed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Hide filter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Show filter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+149"/>
+        <source>Class</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Dimension</source>
+        <translation type="unfinished">次元</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Value</source>
+        <translation type="unfinished">値</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Attribute</source>
+        <translation type="unfinished">属性</translation>
+    </message>
+    <message>
+        <location line="-17"/>
         <source>View the variables in the active workspace.&lt;br&gt;</source>
         <translation>アクティブワークスペースの変数の表示&lt;br&gt;</translation>
     </message>
--- a/libgui/languages/nl_NL.ts	Thu Aug 18 12:26:32 2016 -0700
+++ b/libgui/languages/nl_NL.ts	Fri Aug 19 21:05:48 2016 +0200
@@ -4,7 +4,7 @@
 <context>
     <name>ListDialog</name>
     <message>
-        <location filename="../src/dialog.cc" line="+251"/>
+        <location filename="../src/dialog.cc" line="+258"/>
         <source>Select All</source>
         <translation>Alles selecteren</translation>
     </message>
@@ -540,7 +540,7 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../src/workspace-model.cc" line="+75"/>
+        <location filename="../src/workspace-model.cc" line="+74"/>
         <source>automatic</source>
         <translation>Automatisch</translation>
     </message>
@@ -589,6 +589,34 @@
         <source>cursor</source>
         <translation>Aanwijzer</translation>
     </message>
+    <message>
+        <location filename="../src/settings-dialog.cc" line="+132"/>
+        <source>Difference to the default size</source>
+        <translation type="unfinished">Verschil met standaardgrootte</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Background color, pink (255,0,255) means default</source>
+        <translation type="unfinished">Achtergrondkleur; roze (255,0,255) staat voor standaardkleur</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>b</source>
+        <comment>short form for bold</comment>
+        <translation type="unfinished">d</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>i</source>
+        <comment>short form for italic</comment>
+        <translation type="unfinished">s</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>u</source>
+        <comment>short form for underlined</comment>
+        <translation type="unfinished">o</translation>
+    </message>
 </context>
 <context>
     <name>QPPDOptionsModel</name>
@@ -1055,7 +1083,7 @@
 <context>
     <name>QTerminal</name>
     <message>
-        <location filename="../qterminal/libqterminal/QTerminal.h" line="+135"/>
+        <location filename="../qterminal/libqterminal/QTerminal.h" line="+130"/>
         <source>Copy</source>
         <translation>Kopiëren</translation>
     </message>
@@ -1070,15 +1098,20 @@
         <translation>Alles selecteren</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+7"/>
         <source>Clear Window</source>
         <translation>Veeg venster schoon</translation>
     </message>
+    <message>
+        <location filename="../qterminal/libqterminal/QTerminal.cc" line="+46"/>
+        <source>Edit %1 at line %2</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QWinTerminalImpl</name>
     <message>
-        <location filename="../qterminal/libqterminal/win32/QWinTerminalImpl.cpp" line="+1778"/>
+        <location filename="../qterminal/libqterminal/win32/QWinTerminalImpl.cpp" line="+1779"/>
         <source>copied selection to clipboard</source>
         <translation>selectie is naar klembord gekopieerd</translation>
     </message>
@@ -1752,7 +1785,7 @@
 <context>
     <name>QtHandles::Figure</name>
     <message>
-        <location filename="../graphics/Figure.cc" line="+282"/>
+        <location filename="../graphics/Figure.cc" line="+298"/>
         <source>Figure ToolBar</source>
         <translation>Figuurwerkbalk</translation>
     </message>
@@ -1802,37 +1835,19 @@
         <translation>Kopieren</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Cu&amp;t</source>
-        <translation>Knippen</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>&amp;Paste</source>
-        <translation>&amp;Plakken</translation>
-    </message>
-    <message>
-        <location line="+5"/>
+        <location line="+7"/>
+        <location line="+463"/>
+        <source>About Octave</source>
+        <translation type="unfinished">Over Octave</translation>
+    </message>
+    <message>
+        <location line="-465"/>
         <source>&amp;Help</source>
         <translation>&amp;Help</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>&amp;About QtHandles</source>
-        <translation>Over QtHandles</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>About &amp;Qt</source>
-        <translation>Over &amp;Qt</translation>
-    </message>
-    <message>
-        <location line="+427"/>
-        <source>About QtHandles</source>
-        <translation>Over QtHandles</translation>
-    </message>
-    <message>
-        <location line="+39"/>
+        <location line="+504"/>
+        <location line="+69"/>
         <source>Save Figure As</source>
         <translation>Bewaar figuur als</translation>
     </message>
@@ -1871,6 +1886,160 @@
     </message>
 </context>
 <context>
+    <name>annotation_dialog</name>
+    <message>
+        <location filename="../graphics/annotation-dialog.ui" line="+17"/>
+        <source>Annotation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>String</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Font</source>
+        <translation type="unfinished">Lettertype</translation>
+    </message>
+    <message>
+        <location line="+42"/>
+        <source>bold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>b</source>
+        <translation type="unfinished">d</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>italic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>i</source>
+        <translation type="unfinished">s</translation>
+    </message>
+    <message>
+        <location line="+428"/>
+        <source>color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>Horz alignment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <location line="+29"/>
+        <source>middle</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-24"/>
+        <source>right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Vert alignment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>top</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>bottom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Position</source>
+        <translation type="unfinished">Positie</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>X</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Y</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Width</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Height</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>units</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>normalized</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Fit to box</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Box</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Background</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+444"/>
+        <source>Edge</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+133"/>
+        <source>Line style</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>none</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Line width</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>documentation_dock_widget</name>
     <message>
         <location filename="../src/documentation-dock-widget.cc" line="+34"/>
@@ -1886,17 +2055,18 @@
 <context>
     <name>file_editor</name>
     <message>
-        <location filename="../src/m-editor/file-editor.cc" line="+285"/>
-        <location line="+125"/>
+        <location filename="../src/m-editor/file-editor.cc" line="+366"/>
+        <location line="+152"/>
         <location line="+19"/>
         <location line="+25"/>
         <location line="+62"/>
         <location line="+28"/>
+        <location line="+79"/>
         <source>Octave Editor</source>
         <translation></translation>
     </message>
     <message>
-        <location line="-318"/>
+        <location line="-462"/>
         <source>Octave Files (*.m);;All Files (*)</source>
         <translation>Octave bestanden (*.m);;Alle bestanden (*)</translation>
     </message>
@@ -1912,7 +2082,7 @@
         <translation>Naam van nieuwe functie:</translation>
     </message>
     <message>
-        <location line="+330"/>
+        <location line="+395"/>
         <source>File not saved! A file with the selected name
 %1
 is already open in the editor</source>
@@ -1921,12 +2091,12 @@
 is reeds geopend in de editor</translation>
     </message>
     <message>
-        <location line="+387"/>
+        <location line="+492"/>
         <source>&amp;%1 %2</source>
         <translation></translation>
     </message>
     <message>
-        <location line="+388"/>
+        <location line="+480"/>
         <source>&amp;Save File</source>
         <translation>Op&amp;slaan</translation>
     </message>
@@ -1942,41 +2112,26 @@
     </message>
     <message>
         <location line="+7"/>
-        <source>&amp;Undo</source>
-        <translation>Ongedaan maken</translation>
-    </message>
-    <message>
-        <location line="+3"/>
         <source>&amp;Redo</source>
         <translation>He&amp;rhalen</translation>
     </message>
     <message>
         <location line="+6"/>
-        <source>&amp;Copy</source>
-        <translation>Kopiëren</translation>
-    </message>
-    <message>
-        <location line="+3"/>
         <source>Cu&amp;t</source>
         <translation>Knippen</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Paste</source>
-        <translation>Plakken</translation>
-    </message>
-    <message>
-        <location line="+96"/>
+        <location line="+94"/>
         <source>&amp;Next Bookmark</source>
         <translation>Volge&amp;nde bladwijzer</translation>
     </message>
     <message>
-        <location line="-2"/>
+        <location line="+2"/>
         <source>Pre&amp;vious Bookmark</source>
         <translation>&amp;Vorige bladwijzer</translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+2"/>
         <source>Toggle &amp;Bookmark</source>
         <translation>&amp;Bladwijzer invoegen</translation>
     </message>
@@ -1986,7 +2141,7 @@
         <translation>Alle bladwijzers ve&amp;rwijderen</translation>
     </message>
     <message>
-        <location line="+54"/>
+        <location line="+68"/>
         <source>&amp;Next Breakpoint</source>
         <translation>Volge&amp;nd Breakpoint</translation>
     </message>
@@ -2006,7 +2161,7 @@
         <translation>Verwijde&amp;r Alle Breakpoints</translation>
     </message>
     <message>
-        <location line="-104"/>
+        <location line="-118"/>
         <source>&amp;Comment</source>
         <translation>Zet om naar &amp;commentaar</translation>
     </message>
@@ -2026,28 +2181,28 @@
         <translation>Ter&amp;ug inspringen</translation>
     </message>
     <message>
-        <location line="-55"/>
+        <location line="-61"/>
         <source>&amp;Find and Replace...</source>
         <translation>Zoek en Vervang...</translation>
     </message>
     <message>
-        <location line="+162"/>
+        <location line="+182"/>
         <source>Save File and Run</source>
         <translation>Sla Bestand op en Voer uit</translation>
     </message>
     <message>
-        <location line="-90"/>
+        <location line="-104"/>
         <source>Go &amp;to Line...</source>
         <translation>Ga naar regel...</translation>
     </message>
     <message>
-        <location line="-1126"/>
+        <location line="-1341"/>
         <source>Could not start custom file editor
 %1</source>
         <translation>Kon externe editor niet starten</translation>
     </message>
     <message>
-        <location line="+148"/>
+        <location line="+175"/>
         <source>Create</source>
         <translation>Maak nieuw</translation>
     </message>
@@ -2057,7 +2212,7 @@
         <translation>Annuleren</translation>
     </message>
     <message>
-        <location line="+844"/>
+        <location line="+1041"/>
         <source>&amp;Recent Editor Files</source>
         <translation>&amp;Recent geopend</translation>
     </message>
@@ -2082,12 +2237,7 @@
         <translation>Andere bestanden sluiten</translation>
     </message>
     <message>
-        <location line="+31"/>
-        <source>Select All</source>
-        <translation>Alles selecteren</translation>
-    </message>
-    <message>
-        <location line="+10"/>
+        <location line="+32"/>
         <source>&amp;Commands</source>
         <translation>Opdrachten</translation>
     </message>
@@ -2212,17 +2362,62 @@
         <translation>Toon rege&amp;lnummers</translation>
     </message>
     <message>
-        <location line="+128"/>
-        <source>Editor</source>
-        <translation>Editor</translation>
-    </message>
-    <message>
-        <location line="-120"/>
-        <source>Show Line &amp;Endings</source>
-        <translation>Toon regeleindes</translation>
+        <location line="+22"/>
+        <source>Show &amp;Toolbar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Show &amp;Statusbar</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+4"/>
+        <source>Show &amp;Horizontal Scrollbar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+69"/>
+        <source>Recent Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+65"/>
+        <source>Editor</source>
+        <translation>Editor</translation>
+    </message>
+    <message>
+        <location line="-156"/>
+        <source>Show Line &amp;Endings</source>
+        <translation>Toon regeleindes</translation>
+    </message>
+    <message>
+        <location line="-1467"/>
+        <source>File Encoding:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+403"/>
+        <source>%1 is a built-in function</source>
+        <translation type="unfinished">%1 is een interne functie</translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>Can not find function %1</source>
+        <translation type="unfinished">Kan functie %1 niet vinden</translation>
+    </message>
+    <message>
+        <location line="+911"/>
+        <source>Find &amp;Next...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Find &amp;Previous...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+118"/>
         <source>Show &amp;Indentation Guides</source>
         <translation>Toon &amp;inspringraster</translation>
     </message>
@@ -2232,7 +2427,7 @@
         <translation>Toon lange-regel &amp;markering</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+20"/>
         <source>Zoom &amp;In</source>
         <translation>Inzoomen</translation>
     </message>
@@ -2267,7 +2462,7 @@
         <translation>&amp;Documentatie bij sleutelwoord</translation>
     </message>
     <message>
-        <location line="-1103"/>
+        <location line="-1305"/>
         <source>Could not open file
 %1
 for read: %2.</source>
@@ -2299,7 +2494,7 @@
         <translation>Het bijbehorende tabblad in de editor is verdwenen.</translation>
     </message>
     <message>
-        <location line="+731"/>
+        <location line="+928"/>
         <source>&amp;File</source>
         <translation>Bestand</translation>
     </message>
@@ -2309,12 +2504,12 @@
         <translation>B&amp;ewerken</translation>
     </message>
     <message>
-        <location line="+138"/>
+        <location line="+129"/>
         <source>Show &amp;Whitespace Characters</source>
         <translation>Toon &amp;witruimte-tekens</translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+42"/>
         <source>&amp;Debug</source>
         <translation>&amp;Debuggen</translation>
     </message>
@@ -2327,12 +2522,12 @@
 <context>
     <name>file_editor_tab</name>
     <message>
-        <location filename="../src/m-editor/file-editor-tab.cc" line="+92"/>
+        <location filename="../src/m-editor/file-editor-tab.cc" line="+145"/>
         <source>eol:</source>
         <translation>eol:</translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="-17"/>
         <source>line:</source>
         <translation>regel:</translation>
     </message>
@@ -2342,17 +2537,7 @@
         <translation>kolom:</translation>
     </message>
     <message>
-        <location line="+156"/>
-        <source>%1 is a built-in function</source>
-        <translation>%1 is een interne functie</translation>
-    </message>
-    <message>
-        <location line="+31"/>
-        <source>Can not find function %1</source>
-        <translation>Kan functie %1 niet vinden</translation>
-    </message>
-    <message>
-        <location line="+775"/>
+        <location line="+1146"/>
         <source>Goto line</source>
         <translation>Ga naar regel</translation>
     </message>
@@ -2362,7 +2547,7 @@
         <translation>Regelnummer</translation>
     </message>
     <message>
-        <location line="+146"/>
+        <location line="+145"/>
         <location line="+63"/>
         <source>&lt;unnamed&gt;</source>
         <translation>naamloos</translation>
@@ -2381,12 +2566,28 @@
 dat zou worden gesloten is ondertussen gewijzigd.  %2</translation>
     </message>
     <message>
-        <location line="+288"/>
+        <location line="+298"/>
+        <source>Debug or Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>This file is currently being executed.
+Quit debugging and save?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+166"/>
         <source>Line Endings:</source>
         <translation>Regeleindes:</translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+9"/>
+        <source>File Encoding:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+28"/>
         <source>Octave Files (*.m)</source>
         <translation>Octave bestanden (*.m)</translation>
     </message>
@@ -2396,22 +2597,59 @@
         <translation>Alle bestanden (*)</translation>
     </message>
     <message>
-        <location line="-322"/>
+        <location line="-513"/>
         <source>Do you want to cancel closing, save or discard the changes?</source>
         <translation>Wil je niet meer afsluiten, danwel het gewijzigde of het originele bestand opslaan?</translation>
     </message>
     <message>
-        <location line="-970"/>
-        <location line="+979"/>
-        <location line="+213"/>
-        <location line="+177"/>
-        <location line="+85"/>
+        <location line="-1342"/>
+        <source>encoding:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+239"/>
+        <source>Breakpoint condition</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+88"/>
+        <location line="+1024"/>
+        <location line="+372"/>
+        <location line="+215"/>
+        <location line="+21"/>
+        <location line="+83"/>
         <location line="+23"/>
         <source>Octave Editor</source>
         <translation></translation>
     </message>
     <message>
-        <location line="-6"/>
+        <location line="-1737"/>
+        <source>Cannot add breakpoint to modified file.
+Save and add breakpoint, or canel?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1611"/>
+        <source>&quot;%1&quot;
+is not a valid identifier.
+
+If you keep this filename, you will not be able to
+call your script using its name as an Octave command.
+
+Do you want to choose another name?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>The current editor contents can not be encoded
+with the selected codec %1.
+Using it will result in data loss!
+
+Do you want to chose another codec?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+99"/>
         <source>
 
 Warning: The contents in the editor is modified!</source>
@@ -2428,31 +2666,14 @@
 is gewist of hernoemd. Wil je het nu opslaan?%2</translation>
     </message>
     <message>
-        <location line="-285"/>
+        <location line="-342"/>
         <source>Could not open file %1 for write:
 %2.</source>
         <translation>Kon bestand %1 niet openen om te schrijven:
 %2.</translation>
     </message>
     <message>
-        <location line="+177"/>
-        <source>&quot;%1&quot;
-is not a valid identifier.
-
-If you keep this file name, you will not be able to
-call your script using its name as an Octave command.
-
-Do you want to choose another name?</source>
-        <translation>&quot;%1&quot;
-is geen acceptable naam.
-
-Als je deze bestandsnaam opgeeft kun je de 
-bestandsnaam niet als Octave opdracht gebruiken.
-
-Wil je en andere naam opgeven?</translation>
-    </message>
-    <message>
-        <location line="+85"/>
+        <location line="+319"/>
         <source>It seems that &apos;%1&apos; has been modified by another application. Do you want to reload it?</source>
         <translation>Het lijkt erop dat &apos;%1&apos; is gewijzigd door een ander programma. Wil je het opnieuw laden?</translation>
     </message>
@@ -2465,12 +2686,7 @@
         <translation>Bestandsbrowser</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Browse your files.</source>
-        <translation>Blader door uw bestanden.</translation>
-    </message>
-    <message>
-        <location line="+18"/>
+        <location line="+35"/>
         <source>Enter the path or filename</source>
         <translation>Voer pad- of bestandsnaam in</translation>
     </message>
@@ -2491,22 +2707,67 @@
     </message>
     <message>
         <location line="+4"/>
-        <location line="+388"/>
+        <location line="+373"/>
         <source>Find Files...</source>
         <translation>Zoek bestanden...</translation>
     </message>
     <message>
-        <location line="+364"/>
+        <location line="-26"/>
+        <source>Open in System File Explorer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Open in Text Editor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+389"/>
         <source>New Directory</source>
         <translation>Nieuwe map</translation>
     </message>
     <message>
-        <location line="-784"/>
+        <location line="-773"/>
         <source>Show Octave directory</source>
         <translation>Toon Octave werkdirectory</translation>
     </message>
     <message>
-        <location line="-4"/>
+        <location line="-49"/>
+        <source>Browse your files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Alternating row colors</source>
+        <translation type="unfinished">Om en om andere regelkleuren</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>filesdockwidget/showFileSize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>filesdockwidget/showFileType</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>filesdockwidget/showLastModified</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>filesdockwidget/showHiddenFiles</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>filesdockwidget/useAlternatingRowColors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+29"/>
         <source>One directory up</source>
         <translation>Eén mapniveau omhoog</translation>
     </message>
@@ -2527,53 +2788,48 @@
     </message>
     <message>
         <location line="+20"/>
-        <location line="+397"/>
+        <location line="+382"/>
         <source>New File...</source>
         <translation>Nieuw bestand...</translation>
     </message>
     <message>
-        <location line="-394"/>
-        <location line="+397"/>
+        <location line="-379"/>
+        <location line="+382"/>
         <source>New Directory...</source>
         <translation>Nieuwe map...</translation>
     </message>
     <message>
-        <location line="-335"/>
+        <location line="-329"/>
         <source>Activate to open in editor, right click for alternatives</source>
         <translation>Activeer om in editor in te lezen, rechtsklikken voor alternatieven</translation>
     </message>
     <message>
-        <location line="+236"/>
+        <location line="-136"/>
         <source>File size</source>
         <translation>Bestandsgrootte</translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+1"/>
         <source>File type</source>
         <translation>Bestandstype</translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+1"/>
         <source>Date modified</source>
         <translation>Laatst gewijzigd</translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+1"/>
         <source>Show hidden</source>
         <translation>Toon verborgen bestanden</translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+415"/>
         <source>Open</source>
         <translation>Open</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Open in Default Application</source>
-        <translation>Open met bijbehorend programma</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <location line="+13"/>
         <source>Copy Selection to Clipboard</source>
         <translation>Kopieer selectie naar klembord</translation>
     </message>
@@ -2603,7 +2859,7 @@
         <translation>Weggooien...</translation>
     </message>
     <message>
-        <location line="+115"/>
+        <location line="+125"/>
         <source>Rename file/directory</source>
         <translation>Hernoem bestand/map</translation>
     </message>
@@ -2640,7 +2896,7 @@
         <translation>Kan een niet-lege map niet wissen</translation>
     </message>
     <message>
-        <location line="+151"/>
+        <location line="+145"/>
         <source>Set directory of file browser</source>
         <translation>Stel file browser map in</translation>
     </message>
@@ -2679,7 +2935,7 @@
 <context>
     <name>final_page</name>
     <message>
-        <location filename="../src/welcome-wizard.cc" line="+199"/>
+        <location filename="../src/welcome-wizard.cc" line="+195"/>
         <source>Enjoy!</source>
         <translation>Veel plezier!</translation>
     </message>
@@ -2743,7 +2999,7 @@
 <context>
     <name>find_dialog</name>
     <message>
-        <location filename="../src/m-editor/find-dialog.cc" line="+74"/>
+        <location filename="../src/m-editor/find-dialog.cc" line="+85"/>
         <source>Find and Replace</source>
         <translation>Zoek en vervang</translation>
     </message>
@@ -2818,7 +3074,7 @@
         <translation>In se&amp;lectie zoeken</translation>
     </message>
     <message>
-        <location line="+84"/>
+        <location line="+87"/>
         <source>Search from end</source>
         <translation>vanaf einde terug zoeken</translation>
     </message>
@@ -2828,7 +3084,7 @@
         <translation>Zoeken vanaf begin</translation>
     </message>
     <message>
-        <location line="+205"/>
+        <location line="+221"/>
         <source>Replace Result</source>
         <translation>Resultaat vervangen</translation>
     </message>
@@ -2946,7 +3202,7 @@
         <translation>Zoekresultaten</translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+21"/>
         <source>Idle.</source>
         <translation>Niet bezig.</translation>
     </message>
@@ -2972,8 +3228,8 @@
     </message>
     <message>
         <location line="+15"/>
-        <source>File name/location</source>
-        <translation>Bestandsnaam/lokatie</translation>
+        <source>Filename/location</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+17"/>
@@ -2981,7 +3237,7 @@
         <translation>Inhoud van bestand</translation>
     </message>
     <message>
-        <location line="+105"/>
+        <location line="+111"/>
         <source>Searching...</source>
         <translation>Bezig met zoeken...</translation>
     </message>
@@ -2999,7 +3255,7 @@
 <context>
     <name>find_files_model</name>
     <message>
-        <location filename="../src/find-files-model.cc" line="+82"/>
+        <location filename="../src/find-files-model.cc" line="+83"/>
         <source>Filename</source>
         <translation>Bestandsnaam</translation>
     </message>
@@ -3037,7 +3293,7 @@
         <translation>Opdrachtgeschiedenis</translation>
     </message>
     <message>
-        <location line="+89"/>
+        <location line="+107"/>
         <source>Copy</source>
         <translation>Kopiëren</translation>
     </message>
@@ -3051,11 +3307,21 @@
         <source>Create script</source>
         <translation>Nieuw script</translation>
     </message>
+    <message>
+        <location line="+4"/>
+        <source>Hide filter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Show filter</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>initial_page</name>
     <message>
-        <location filename="../src/welcome-wizard.cc" line="-179"/>
+        <location filename="../src/welcome-wizard.cc" line="-176"/>
         <source>Welcome to Octave!</source>
         <translation>Welkom bij Octave!</translation>
     </message>
@@ -3086,13 +3352,13 @@
 <context>
     <name>main_window</name>
     <message>
-        <location filename="../src/main-window.cc" line="+268"/>
+        <location filename="../src/main-window.cc" line="+275"/>
         <source>Load Workspace</source>
         <translation>Werkruimte laden</translation>
     </message>
     <message>
-        <location line="+732"/>
-        <location line="+931"/>
+        <location line="+758"/>
+        <location line="+975"/>
         <source>About Octave</source>
         <translation>Over Octave</translation>
     </message>
@@ -3102,12 +3368,12 @@
         <translation>Bestand</translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+45"/>
         <source>New</source>
         <translation>Nieuw</translation>
     </message>
     <message>
-        <location line="-43"/>
+        <location line="-39"/>
         <source>Open...</source>
         <translation>Open...</translation>
     </message>
@@ -3117,7 +3383,7 @@
         <translation>Voorkeuren...</translation>
     </message>
     <message>
-        <location line="-95"/>
+        <location line="-99"/>
         <source>Exit</source>
         <translation>Afsluiten</translation>
     </message>
@@ -3132,22 +3398,22 @@
         <translation>Ongedaan maken</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+7"/>
         <source>Copy</source>
         <translation>Kopiëren</translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+5"/>
         <source>Paste</source>
         <translation>Plakken</translation>
     </message>
     <message>
-        <location line="-1469"/>
+        <location line="-1537"/>
         <source>Save Workspace As</source>
         <translation>Sla Werkruimte Op Als</translation>
     </message>
     <message>
-        <location line="+134"/>
+        <location line="+124"/>
         <source>The release notes file &apos;%1&apos; is empty.</source>
         <translation>Bestand met Release Notes &apos;%1&apos; is leeg.</translation>
     </message>
@@ -3157,7 +3423,7 @@
         <translation>Bestand met Release Notes  &apos;%1&apos; kan nit worden gelezen.</translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="+12"/>
         <source>Octave Release Notes</source>
         <translation>Octave Release Notes</translation>
     </message>
@@ -3167,17 +3433,17 @@
         <translation>Octave Community Nieuws</translation>
     </message>
     <message>
-        <location line="+187"/>
+        <location line="+206"/>
         <source>Are you sure you want to exit Octave?</source>
         <translation>Zeker weten dat je Octave wil afsluiten?</translation>
     </message>
     <message>
-        <location line="+854"/>
+        <location line="+916"/>
         <source>Open an existing file in editor</source>
         <translation>Open een bestaand bestand in de editor</translation>
     </message>
     <message>
-        <location line="+48"/>
+        <location line="+44"/>
         <source>New Function...</source>
         <translation>Nieuwe functie...</translation>
     </message>
@@ -3187,12 +3453,12 @@
         <translation>Nieuwe figuur</translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+39"/>
         <source>Select All</source>
         <translation>Alles selecteren</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="+4"/>
         <source>Clear Clipboard</source>
         <translation>Wis klembord</translation>
     </message>
@@ -3242,17 +3508,27 @@
         <translation>Bestandsbrowser</translation>
     </message>
     <message>
-        <location line="-84"/>
+        <location line="+36"/>
+        <source>Contribute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Donate to Octave</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-123"/>
         <source>Step In</source>
         <translation>Stap In</translation>
     </message>
     <message>
-        <location line="-1020"/>
+        <location line="-1082"/>
         <source>Octave</source>
         <translation>Octave</translation>
     </message>
     <message>
-        <location line="+868"/>
+        <location line="+926"/>
         <source>Load Workspace...</source>
         <translation>Werkruimte laden...</translation>
     </message>
@@ -3267,7 +3543,7 @@
         <translation>Nieuw script</translation>
     </message>
     <message>
-        <location line="+124"/>
+        <location line="+128"/>
         <source>Step Out</source>
         <translation>Stap Uit</translation>
     </message>
@@ -3287,17 +3563,7 @@
         <translation>Deel code</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Contribute to Octave</source>
-        <translation>Doneer aan Octave project</translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Octave Developer Resources</source>
-        <translation>Octave Ontwikkelaar Resurces</translation>
-    </message>
-    <message>
-        <location line="+14"/>
+        <location line="+20"/>
         <source>On Disk</source>
         <translation>Op schijf</translation>
     </message>
@@ -3342,8 +3608,8 @@
         <translation>Eén mapniveau omhoog</translation>
     </message>
     <message>
-        <location line="-1148"/>
-        <location line="+1151"/>
+        <location line="-1198"/>
+        <location line="+1201"/>
         <source>Browse directories</source>
         <translation>Blader door mappen</translation>
     </message>
@@ -3422,7 +3688,7 @@
 <context>
     <name>news_reader</name>
     <message>
-        <location line="-1411"/>
+        <location line="-1492"/>
         <source>&lt;html&gt;
 &lt;body&gt;
 &lt;p&gt;
@@ -3481,18 +3747,18 @@
 <context>
     <name>octave_dock_widget</name>
     <message>
-        <location filename="../src/octave-dock-widget.cc" line="+68"/>
-        <location line="+198"/>
+        <location filename="../src/octave-dock-widget.cc" line="+67"/>
+        <location line="+201"/>
         <source>Undock widget</source>
         <translation>Widget laten zweven</translation>
     </message>
     <message>
-        <location line="-188"/>
+        <location line="-191"/>
         <source>Hide widget</source>
         <translation>Widget verbergen</translation>
     </message>
     <message>
-        <location line="+132"/>
+        <location line="+136"/>
         <source>Dock widget</source>
         <translation>Widget in venster opnemen</translation>
     </message>
@@ -3500,7 +3766,7 @@
 <context>
     <name>octave_qscintilla</name>
     <message>
-        <location filename="../src/m-editor/octave-qscintilla.cc" line="+226"/>
+        <location filename="../src/m-editor/octave-qscintilla.cc" line="+237"/>
         <source>Help on</source>
         <translation>Help over</translation>
     </message>
@@ -3514,18 +3780,23 @@
         <source>Edit</source>
         <translation>Edit</translation>
     </message>
+    <message>
+        <location line="+15"/>
+        <source>dbstop if ...</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>octave_qt_link</name>
     <message>
-        <location filename="../src/octave-qt-link.cc" line="+111"/>
-        <location line="+6"/>
-        <location line="+7"/>
+        <location filename="../src/octave-qt-link.cc" line="+136"/>
+        <location line="+9"/>
+        <location line="+11"/>
         <source>Create</source>
         <translation>Maak nieuw</translation>
     </message>
     <message>
-        <location line="-10"/>
+        <location line="-14"/>
         <source>File
 %1
 does not exist. Do you want to create it?</source>
@@ -3539,7 +3810,7 @@
         <translation></translation>
     </message>
     <message>
-        <location line="+211"/>
+        <location line="+254"/>
         <source>The file %1 does not exist in the load path.  To run or debug the function you are editing, you must either change to the directory %2 or add that directory to the load path.</source>
         <translation>Het bestand %1 bestaat niet in het zoekpad. Om de functie uit te voeren of te debuggen moet je naar de map %2 of die map aan het zoekpad toevoegen.</translation>
     </message>
@@ -3564,8 +3835,8 @@
         <translation>Voeg map toe aan zoekpad</translation>
     </message>
     <message>
-        <location line="-223"/>
-        <location line="+224"/>
+        <location line="-269"/>
+        <location line="+270"/>
         <source>Cancel</source>
         <translation>Annuleren</translation>
     </message>
@@ -3581,7 +3852,7 @@
 <context>
     <name>resource_manager</name>
     <message>
-        <location filename="../src/resource-manager.cc" line="+245"/>
+        <location filename="../src/resource-manager.cc" line="+246"/>
         <source>The settings file
 %1
 does not exist and can not be created.
@@ -3607,731 +3878,589 @@
     <name>settings_dialog</name>
     <message>
         <location filename="../src/settings-dialog.ui" line="+23"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1738"/>
         <source>Settings</source>
         <translation>Instellingen</translation>
     </message>
     <message>
         <location line="+19"/>
         <location line="+468"/>
-        <location filename="../src/ui-settings-dialog.h" line="+25"/>
-        <location line="+1"/>
         <source>General</source>
         <translation>Algemeen</translation>
     </message>
     <message>
         <location line="-338"/>
-        <location filename="../src/ui-settings-dialog.h" line="-17"/>
         <source>Octave logo only</source>
         <translation>Alleen Octave logo</translation>
     </message>
     <message>
         <location line="+10"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Letter icons</source>
         <translation>Letter iconen</translation>
     </message>
     <message>
         <location line="+7"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Graphic icons</source>
         <translation>Grafische iconen</translation>
     </message>
     <message>
         <location line="-118"/>
-        <location filename="../src/ui-settings-dialog.h" line="-9"/>
         <source>Dock widget title bar</source>
         <translation>Dock widget titelbalk</translation>
     </message>
     <message>
         <location line="+60"/>
-        <location filename="../src/ui-settings-dialog.h" line="+4"/>
         <source>Normal</source>
         <translation>Normaal</translation>
     </message>
     <message>
         <location line="+178"/>
-        <location filename="../src/ui-settings-dialog.h" line="+11"/>
         <source>Custom style</source>
         <translation>Aangepaste stijl</translation>
     </message>
     <message>
         <location line="+92"/>
-        <location filename="../src/ui-settings-dialog.h" line="+4"/>
         <source>These preferences are applied after any .octaverc startup files.</source>
         <translation>Deze voorkeuren worden toegepast na verwerking van .octaverc startup bestanden.</translation>
     </message>
     <message>
         <location line="+55"/>
-        <location filename="../src/ui-settings-dialog.h" line="+3"/>
         <source>Restore working directory of previous session</source>
         <translation>Herstel werkdirectory van vorige sessie</translation>
     </message>
     <message>
         <location line="+33"/>
-        <location filename="../src/ui-settings-dialog.h" line="+58"/>
         <source>Editor</source>
         <translation>Editor</translation>
     </message>
     <message>
-        <location line="+151"/>
-        <location filename="../src/ui-settings-dialog.h" line="-49"/>
+        <location line="+107"/>
         <source>Color</source>
         <translation>Kleur</translation>
     </message>
     <message>
-        <location line="+138"/>
-        <location filename="../src/ui-settings-dialog.h" line="+6"/>
+        <location line="-69"/>
         <source>Draw a long line marker</source>
         <translation>Toon een lange lijnmarkering</translation>
     </message>
     <message>
-        <location line="+48"/>
-        <location filename="../src/ui-settings-dialog.h" line="+3"/>
+        <location line="+155"/>
         <source>Show EOL characters</source>
         <translation>Toon EOL tekens</translation>
     </message>
     <message>
-        <location line="+9"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
+        <location line="+662"/>
         <source>Default EOL mode</source>
         <translation>Standaard EOL instelling</translation>
     </message>
     <message>
-        <location line="+154"/>
-        <location filename="../src/ui-settings-dialog.h" line="+12"/>
+        <location line="-394"/>
         <source>Indent width</source>
         <translation>Inspringafstand</translation>
     </message>
     <message>
         <location line="+7"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Tab indents line</source>
         <translation>Inspringen met tab</translation>
     </message>
     <message>
         <location line="+7"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Auto indentation</source>
         <translation>Automatisch inspringen</translation>
     </message>
     <message>
         <location line="+26"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Tab width</source>
         <translation>Tab breedte</translation>
     </message>
     <message>
         <location line="+7"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Show indentation guides</source>
         <translation>Toon inspringraster</translation>
     </message>
     <message>
         <location line="+23"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Backspace unindents line</source>
         <translation>Backspace doet terug inspringen</translation>
     </message>
     <message>
         <location line="+88"/>
-        <location filename="../src/ui-settings-dialog.h" line="+3"/>
         <source>Match keywords</source>
         <translation>Zoek overeenkomende sleutelwoorden</translation>
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Case sensitive</source>
         <translation>Hoofdlettergevoelig</translation>
     </message>
     <message>
         <location line="+23"/>
-        <location filename="../src/ui-settings-dialog.h" line="+2"/>
         <source>Replace word by suggested one</source>
         <translation>Vervang woord door suggestie</translation>
     </message>
     <message>
         <location line="-10"/>
-        <location filename="../src/ui-settings-dialog.h" line="-1"/>
         <source>Match words in document</source>
         <translation>Zoek overeenkomende woorden in document</translation>
     </message>
     <message>
-        <location line="+173"/>
-        <location filename="../src/ui-settings-dialog.h" line="+14"/>
+        <location line="+185"/>
         <source>Restore editor tabs from previous session on startup</source>
         <translation>Herstel bij opstarten de editor tabs uit de vorige sessie</translation>
     </message>
     <message>
-        <location line="-426"/>
-        <location filename="../src/ui-settings-dialog.h" line="-28"/>
+        <location line="-438"/>
         <source>Use custom file editor</source>
         <translation>Gebruik een andere editor</translation>
     </message>
     <message>
-        <location line="+482"/>
-        <location filename="../src/ui-settings-dialog.h" line="+33"/>
+        <location line="+574"/>
         <source>Editor Styles</source>
         <translation>Editorstijlen</translation>
     </message>
     <message>
         <location line="+287"/>
-        <location filename="../src/ui-settings-dialog.h" line="+10"/>
         <source>Terminal Colors</source>
         <translation>Terminalkleuren</translation>
     </message>
     <message>
         <location line="-173"/>
-        <location filename="../src/ui-settings-dialog.h" line="-6"/>
         <source>Font</source>
         <translation>Lettertype</translation>
     </message>
     <message>
-        <location line="-917"/>
-        <location filename="../src/ui-settings-dialog.h" line="-58"/>
+        <location line="-1007"/>
         <source>Show line numbers</source>
         <translation>Toon regelnummers</translation>
     </message>
     <message>
-        <location line="-72"/>
-        <location filename="../src/ui-settings-dialog.h" line="-3"/>
+        <location line="+81"/>
         <source>Highlight current line</source>
         <translation>Markeer huidige regel</translation>
     </message>
     <message>
-        <location line="+85"/>
-        <location filename="../src/ui-settings-dialog.h" line="+4"/>
+        <location line="+13"/>
         <source>Show complete path in window title</source>
         <translation>Toon hele pad in schermtitel</translation>
     </message>
     <message>
-        <location line="-29"/>
-        <location filename="../src/ui-settings-dialog.h" line="-2"/>
+        <location line="+13"/>
         <source>Show whitespace</source>
         <translation>Toon witruimte-tekens</translation>
     </message>
     <message>
-        <location line="+39"/>
-        <location filename="../src/ui-settings-dialog.h" line="+3"/>
+        <location line="+157"/>
         <source>Do not show whitespace used for indentation</source>
         <translation>Verberg voor inspringen gebruikte witruimte</translation>
     </message>
     <message>
-        <location line="+625"/>
-        <location filename="../src/ui-settings-dialog.h" line="+37"/>
+        <location line="+382"/>
         <source>Number of characters before list is shown: </source>
         <translation>Aantal tekens voordat lijst wordt getoond</translation>
     </message>
     <message>
-        <location line="+112"/>
-        <location filename="../src/ui-settings-dialog.h" line="+11"/>
+        <location line="+124"/>
         <source>Create nonexistent files without prompting</source>
         <translation>Maak niet bestaande bestanden aan zonder te vragen</translation>
     </message>
     <message>
-        <location line="-429"/>
-        <location filename="../src/ui-settings-dialog.h" line="-28"/>
+        <location line="-441"/>
         <source>command line (%f=file, %l=line):</source>
         <translation>command line (%f=bestand, %l=regel):</translation>
     </message>
     <message>
-        <location line="+521"/>
-        <location filename="../src/ui-settings-dialog.h" line="+43"/>
+        <location line="+613"/>
         <source>Terminal</source>
         <translation>Opdrachtvenster</translation>
     </message>
     <message>
         <location line="+51"/>
-        <location filename="../src/ui-settings-dialog.h" line="-8"/>
         <source>Cursor type:</source>
         <translation>Type aanwijzer:</translation>
     </message>
     <message>
         <location line="-11"/>
-        <location filename="../src/ui-settings-dialog.h" line="-1"/>
         <source>Cursor blinking</source>
         <translation>Knipperende aanwijzer</translation>
     </message>
     <message>
         <location line="-7"/>
-        <location filename="../src/ui-settings-dialog.h" line="-1"/>
         <source>Use foreground color</source>
         <translation>Gebruik voorgrondkleur</translation>
     </message>
     <message>
         <location line="+59"/>
-        <location filename="../src/ui-settings-dialog.h" line="+4"/>
         <source>Font size</source>
         <translation>Lettergrootte</translation>
     </message>
     <message>
         <location line="+123"/>
-        <location filename="../src/ui-settings-dialog.h" line="+3"/>
         <source>Set focus to terminal when running a command from within another widget</source>
         <translation>Set focus op terminal wanneer een opdracht uit een ander widget wordt uitgevoerd</translation>
     </message>
     <message>
         <location line="+73"/>
-        <location filename="../src/ui-settings-dialog.h" line="+15"/>
         <source>File Browser</source>
         <translation>Bestandsbrowser</translation>
     </message>
     <message>
-        <location line="+46"/>
-        <location filename="../src/ui-settings-dialog.h" line="-8"/>
-        <source>Show file size</source>
-        <translation>Toon bestandsgrootte</translation>
-    </message>
-    <message>
-        <location line="-14"/>
-        <location filename="../src/ui-settings-dialog.h" line="-2"/>
-        <source>Show file type</source>
-        <translation>Toon bestandstype</translation>
-    </message>
-    <message>
-        <location line="+21"/>
-        <location filename="../src/ui-settings-dialog.h" line="+3"/>
-        <source>Show date of last modification</source>
-        <translation>Toon datum van laatste wijziging</translation>
-    </message>
-    <message>
-        <location line="-14"/>
-        <location filename="../src/ui-settings-dialog.h" line="-2"/>
-        <source>Show hidden files</source>
-        <translation>Toon verborgen bestanden</translation>
-    </message>
-    <message>
-        <location line="-1715"/>
-        <location filename="../src/ui-settings-dialog.h" line="-97"/>
+        <location line="-1729"/>
         <source>Interface</source>
         <translation>Interface</translation>
     </message>
     <message>
         <location line="+52"/>
-        <location filename="../src/ui-settings-dialog.h" line="+3"/>
         <source>Confirm before exiting</source>
         <translation>Bevestigen voor afsluiten</translation>
     </message>
     <message>
         <location line="+103"/>
-        <location line="+592"/>
-        <location filename="../src/ui-settings-dialog.h" line="+9"/>
-        <location line="+28"/>
+        <location line="+640"/>
         <source>Show status bar</source>
         <translation>Toon statusbalk</translation>
     </message>
     <message>
-        <location line="-540"/>
-        <location filename="../src/ui-settings-dialog.h" line="-26"/>
+        <location line="-588"/>
         <source>Text inactive</source>
         <translation>Inactieve tekst</translation>
     </message>
     <message>
         <location line="-32"/>
         <location line="+45"/>
-        <location filename="../src/ui-settings-dialog.h" line="-1"/>
-        <location line="+2"/>
         <source>Active</source>
         <translation>Actief</translation>
     </message>
     <message>
         <location line="-159"/>
-        <location filename="../src/ui-settings-dialog.h" line="-11"/>
         <source>Small</source>
         <translation>Klein</translation>
     </message>
     <message>
         <location line="+17"/>
-        <location filename="../src/ui-settings-dialog.h" line="+2"/>
         <source>Large</source>
         <translation>Groot</translation>
     </message>
     <message>
         <location line="+181"/>
-        <location filename="../src/ui-settings-dialog.h" line="+11"/>
         <source>Background inactive</source>
         <translation>Inactieve achtergrond</translation>
     </message>
     <message>
         <location line="+19"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>3D</source>
         <translation>3D</translation>
     </message>
     <message>
         <location line="+54"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Octave Startup</source>
         <translation>Octave opstarten</translation>
     </message>
     <message>
         <location line="+41"/>
-        <location line="+1392"/>
-        <location filename="../src/ui-settings-dialog.h" line="+2"/>
-        <location line="+82"/>
+        <location line="+1440"/>
         <source>Startup path</source>
         <translation>Opstart directory</translation>
     </message>
     <message>
-        <location line="-1379"/>
-        <location line="+1409"/>
-        <location filename="../src/ui-settings-dialog.h" line="-81"/>
-        <location line="+83"/>
+        <location line="-1427"/>
+        <location line="+1420"/>
         <source>Browse</source>
         <translation>Bladeren</translation>
     </message>
     <message>
-        <location line="-1322"/>
-        <location filename="../src/ui-settings-dialog.h" line="-78"/>
+        <location line="-1103"/>
         <source>After Column</source>
         <translation>Na kolom</translation>
     </message>
     <message>
-        <location line="+144"/>
-        <location filename="../src/ui-settings-dialog.h" line="+6"/>
+        <location line="-75"/>
         <source>Tab width min.</source>
         <translation>Min. tab breedte</translation>
     </message>
     <message>
         <location line="+64"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>max.</source>
         <translation>Max.</translation>
     </message>
     <message>
-        <location line="+31"/>
-        <location filename="../src/ui-settings-dialog.h" line="+2"/>
+        <location line="-231"/>
         <source>This works well for monospaced fonts. The line is drawn at a position based on the width of a space character in the default font. It may not work very well if styles use proportional fonts or if varied font sizes or bold, italic and normal texts are used.</source>
         <translation>Dit werkt goed met monospaced fonts. De regel wordt weergegeven op een positie gebaseerd op de breedte van een spatie in de standaard-font. Het werkt mogelijk minder goed bij een stijl met proportionele fonts of als vette, schuine en normale tekst verschillende groottes hebben.</translation>
     </message>
     <message>
-        <location line="+19"/>
-        <location filename="../src/ui-settings-dialog.h" line="+3"/>
+        <location line="+289"/>
         <source>Enable Code Folding</source>
         <translation>Te lange regels afbreken</translation>
     </message>
     <message>
-        <location line="+61"/>
-        <location filename="../src/ui-settings-dialog.h" line="+6"/>
+        <location line="+551"/>
         <source>Windows (CRLF)</source>
         <translation>Windows (CRLF)</translation>
     </message>
     <message>
         <location line="+5"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Mac (CR)</source>
         <translation>Mac (CR)</translation>
     </message>
     <message>
         <location line="+5"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Unix (LF)</source>
         <translation>Unix (LF)</translation>
     </message>
     <message>
-        <location line="+32"/>
-        <location filename="../src/ui-settings-dialog.h" line="+2"/>
+        <location line="-532"/>
         <source>Show horizontal scroll bar</source>
         <translation>Toon horizontale schuifbalk</translation>
     </message>
     <message>
-        <location line="+68"/>
-        <location filename="../src/ui-settings-dialog.h" line="+4"/>
+        <location line="-299"/>
+        <source>Show tool bar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+383"/>
         <source>Indentation</source>
         <translation>Inspringen</translation>
     </message>
     <message>
         <location line="+117"/>
-        <location filename="../src/ui-settings-dialog.h" line="+7"/>
         <source>Indentation uses tabs</source>
         <translation>Inspringen m.b.v. tabs</translation>
     </message>
     <message>
         <location line="+38"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Auto completion</source>
         <translation>Automatisch aanvullen</translation>
     </message>
     <message>
         <location line="+101"/>
-        <location filename="../src/ui-settings-dialog.h" line="+5"/>
         <source>With Octave builtins</source>
-        <translation>Met Octave "builtins"</translation>
+        <translation>Met Octave &quot;builtins&quot;</translation>
     </message>
     <message>
         <location line="+10"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>With Octave functions</source>
         <translation>Met Octave functies</translation>
     </message>
     <message>
         <location line="+64"/>
-        <location filename="../src/ui-settings-dialog.h" line="+9"/>
         <source>Show completion list automatically</source>
         <translation>Toon aanvullijst automatisch</translation>
     </message>
     <message>
         <location line="+31"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>File handling</source>
         <translation>Bestandsbeheer</translation>
     </message>
     <message>
-        <location line="+40"/>
-        <location filename="../src/ui-settings-dialog.h" line="+3"/>
+        <location line="+19"/>
         <source>Reload externally changed files without prompt</source>
         <translation>Herlaad bestanden die van buitenaf zijn veranderd zonder bevestiging</translation>
     </message>
     <message>
-        <location line="+53"/>
-        <location filename="../src/ui-settings-dialog.h" line="+2"/>
+        <location line="+93"/>
+        <source>Text encoding used for loading and saving</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+73"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Select font, font size (as a difference from the default size), font style (&lt;b&gt;b&lt;/b&gt;old, &lt;b&gt;i&lt;/b&gt;talic, &lt;b&gt;u&lt;/b&gt;nderline), text color, and background color (for the latter, the color magenta (255,0,255) is a placeholder for the default background color).&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Kies font, fontgrootte (als verschil met standaardgrootte), font stijl (&lt;b&gt;v&lt;/b&gt;et, &lt;b&gt;s&lt;/b&gt;chuin, &lt;b&gt;o&lt;/b&gt;nderstreept), tekstkleur en achtergrondkleur (magenta (255,0,255) is een opvuller voor de standaard achtergrondkleur).&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location line="+192"/>
-        <location filename="../src/ui-settings-dialog.h" line="+7"/>
         <source>(Changing buffer size clears history)</source>
         <translation>(Bij aanpassen van de buffergrootte wordt de geschiedenis gewist)</translation>
     </message>
     <message>
         <location line="+28"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>History buffer Size</source>
         <translation>Grootte van geschiedenisbuffer</translation>
     </message>
     <message>
         <location line="+34"/>
-        <location filename="../src/ui-settings-dialog.h" line="+2"/>
         <source>Print debug location in terminal window in addition to the marker in the editor</source>
         <translation>Toon debug locatie ook in terminal (evenals marker in editor)</translation>
     </message>
     <message>
         <location line="+87"/>
-        <location filename="../src/ui-settings-dialog.h" line="+3"/>
-        <source>Display</source>
-        <translation>Weergave</translation>
+        <source>Behavior</source>
+        <translation>Gedrag</translation>
+    </message>
+    <message>
+        <location line="+30"/>
+        <source>Restore last directory of previous session</source>
+        <translation>Herstel laatste directory van vorige sessie</translation>
+    </message>
+    <message>
+        <location line="+54"/>
+        <source>Extensions of files to be opened in the default text editor (separated by &quot;;&quot;):</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+39"/>
-        <location filename="../src/ui-settings-dialog.h" line="+5"/>
-        <source>Alternating row colors</source>
-        <translation>Om en om andere regelkleuren</translation>
-    </message>
-    <message>
-        <location line="+12"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
-        <source>Behavior</source>
-        <translation>Gedrag</translation>
-    </message>
-    <message>
-        <location line="+34"/>
-        <location filename="../src/ui-settings-dialog.h" line="+3"/>
-        <source>Restore last directory of previous session</source>
-        <translation>Herstel laatste directory van vorige sessie</translation>
-    </message>
-    <message>
-        <location line="+71"/>
-        <location filename="../src/ui-settings-dialog.h" line="+5"/>
         <source>Workspace</source>
         <translation>Werkruimte</translation>
     </message>
     <message>
-        <location line="+42"/>
-        <location filename="../src/ui-settings-dialog.h" line="-1"/>
+        <location line="+35"/>
+        <source>Colors for variable attributes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
         <source>Hide tool tips</source>
         <translation>Verberg tool tips</translation>
     </message>
     <message>
-        <location line="+182"/>
-        <location filename="../src/ui-settings-dialog.h" line="+14"/>
+        <location line="+101"/>
+        <source>Import shortcut set</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Export current shortcut set</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Reset shortcuts to their defaults</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location line="+80"/>
+        <source>Default</source>
+        <translation type="unfinished">Standaardtekst</translation>
+    </message>
+    <message>
+        <location line="-71"/>
         <source>Edit a shortcut by double-clicking in a cell</source>
         <translation>Dubbelklik in een cel om een snelkoppelingen te bewerken</translation>
     </message>
     <message>
-        <location line="+108"/>
-        <location filename="../src/ui-settings-dialog.h" line="+20"/>
+        <location line="+76"/>
+        <source>Actual</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
         <source>Network</source>
         <translation>Netwerk</translation>
     </message>
     <message>
         <location line="+23"/>
-        <location filename="../src/ui-settings-dialog.h" line="-12"/>
         <source>Allow Octave to connect to the Octave web site to display current news and information</source>
         <translation>Sta Octave toe om naar de Octave website te gaan om recente informatie en nieuws weer te geven</translation>
     </message>
     <message>
         <location line="+46"/>
-        <location filename="../src/ui-settings-dialog.h" line="+8"/>
         <source>Use proxy server</source>
         <translation>Gebruik proxyserver</translation>
     </message>
     <message>
         <location line="-23"/>
-        <location filename="../src/ui-settings-dialog.h" line="-4"/>
         <source>HttpProxy</source>
         <translation>http proxy</translation>
     </message>
     <message>
-        <location line="-2083"/>
-        <location filename="../src/ui-settings-dialog.h" line="-123"/>
+        <location line="-2039"/>
         <source>Icon set for dock widgets</source>
         <translation>Iconenset voor dock widgets</translation>
     </message>
     <message>
         <location line="-48"/>
-        <location filename="../src/ui-settings-dialog.h" line="-4"/>
         <source>Language (requires restart)</source>
         <translation>Taal instellen (vereist herstart)</translation>
     </message>
     <message>
         <location line="-58"/>
-        <location filename="../src/ui-settings-dialog.h" line="-5"/>
         <source>Icon size</source>
         <translation>Icoongrootte</translation>
     </message>
     <message>
-        <location line="+1714"/>
-        <location filename="../src/ui-settings-dialog.h" line="+100"/>
+        <location line="+1716"/>
         <source>Synchronize Octave working directory with file browser</source>
         <translation>Synchroniseer Octave werkmap met bestandsverkenner</translation>
     </message>
     <message>
-        <location line="+132"/>
-        <location filename="../src/ui-settings-dialog.h" line="+5"/>
-        <source>Colors for variable attributes </source>
-        <translation>Kleur voor diverse eigenschappen</translation>
-    </message>
-    <message>
-        <location line="+34"/>
-        <location filename="../src/ui-settings-dialog.h" line="+22"/>
+        <location line="+184"/>
         <source>Shortcuts</source>
         <translation>Sneltoetsen</translation>
     </message>
     <message>
         <location line="+31"/>
-        <location filename="../src/ui-settings-dialog.h" line="-18"/>
         <source>Select this option to prevent conflicts with readline shortcuts</source>
         <translation>Kies deze optie om verwarring met readline sneltoetsen te vermijden</translation>
     </message>
     <message>
         <location line="+3"/>
-        <location filename="../src/ui-settings-dialog.h" line="+2"/>
         <source>Disable global shortcuts when terminal window has focus</source>
         <translation>Schakel globale sneltoetsen uit als terminal focus heeft</translation>
     </message>
     <message>
-        <location line="+31"/>
-        <location line="+28"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
-        <location line="+4"/>
-        <source>Use this set</source>
-        <translation>Deze set gebruiken</translation>
-    </message>
-    <message>
-        <location line="-21"/>
-        <location filename="../src/ui-settings-dialog.h" line="-3"/>
-        <source>Set 1:</source>
-        <translation>Set 1:</translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <location line="+37"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
-        <location line="+3"/>
+        <location line="+53"/>
         <source>Export</source>
         <translation>Exporteer</translation>
     </message>
     <message>
-        <location line="-30"/>
-        <location line="+37"/>
-        <location filename="../src/ui-settings-dialog.h" line="-2"/>
-        <location line="+3"/>
+        <location line="-10"/>
         <source>Import</source>
         <translation>Importeer</translation>
     </message>
     <message>
-        <location line="+7"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
-        <source>Set 2:</source>
-        <translation>Set 2:</translation>
-    </message>
-    <message>
-        <location line="+86"/>
-        <location filename="../src/ui-settings-dialog.h" line="+7"/>
+        <location line="+90"/>
         <source>Action</source>
         <translation>Actie</translation>
     </message>
     <message>
-        <location line="+10"/>
-        <location filename="../src/ui-settings-dialog.h" line="-1"/>
-        <source>Set 1 Default</source>
-        <translation>Standaardset 1:</translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <location filename="../src/ui-settings-dialog.h" line="-1"/>
-        <source>Set 1 Actual</source>
-        <translation>Huidige set 1</translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <location filename="../src/ui-settings-dialog.h" line="-1"/>
-        <source>Set 2 Default</source>
-        <translation>Standaardset 2</translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <location filename="../src/ui-settings-dialog.h" line="-1"/>
-        <source>Set 2 Actual</source>
-        <translation>Huidige set 2</translation>
-    </message>
-    <message>
-        <location line="+68"/>
-        <location filename="../src/ui-settings-dialog.h" line="+11"/>
+        <location line="+83"/>
         <source>Socks5Proxy</source>
         <translation></translation>
     </message>
     <message>
         <location line="-16"/>
-        <location filename="../src/ui-settings-dialog.h" line="-4"/>
         <source>Hostname:</source>
         <translation>Hostnaam:</translation>
     </message>
     <message>
         <location line="+44"/>
-        <location filename="../src/ui-settings-dialog.h" line="+8"/>
         <source>Proxy type:</source>
         <translation></translation>
     </message>
     <message>
         <location line="+10"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Port:</source>
         <translation>Poort:</translation>
     </message>
     <message>
         <location line="-27"/>
-        <location filename="../src/ui-settings-dialog.h" line="-3"/>
         <source>Username:</source>
         <translation>Gebruikersnaam:</translation>
     </message>
     <message>
         <location line="+37"/>
-        <location filename="../src/ui-settings-dialog.h" line="+4"/>
         <source>Password:</source>
         <translation>Wachtwoord:</translation>
     </message>
     <message>
-        <location filename="../src/settings-dialog.cc" line="+77"/>
+        <location filename="../src/settings-dialog.cc" line="+127"/>
+        <source>Octave Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Unable to save settings.  Missing settings file or unknown directory.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+18"/>
         <location line="+4"/>
-        <location line="+561"/>
+        <location line="+444"/>
         <source>System setting</source>
         <translation>Systeeminstelling</translation>
     </message>
     <message>
-        <location line="-355"/>
+        <location line="-232"/>
         <source>IBeam Cursor</source>
         <translation>I-balkje</translation>
     </message>
@@ -4346,35 +4475,7 @@
         <translation>Liggend streepje</translation>
     </message>
     <message>
-        <location line="+213"/>
-        <source>Difference to the default size</source>
-        <translation>Verschil met standaardgrootte</translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Background color, pink (255,0,255) means default</source>
-        <translation>Achtergrondkleur; roze (255,0,255) staat voor standaardkleur</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>b</source>
-        <comment>short form for bold</comment>
-        <translation>d</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>i</source>
-        <comment>short form for italic</comment>
-        <translation>s</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>u</source>
-        <comment>short form for underlined</comment>
-        <translation>o</translation>
-    </message>
-    <message>
-        <location line="+497"/>
+        <location line="+503"/>
         <source>Set Octave Startup Directory</source>
         <translation>Octave opstart directory</translation>
     </message>
@@ -4387,7 +4488,7 @@
 <context>
     <name>setup_community_news</name>
     <message>
-        <location filename="../src/welcome-wizard.cc" line="+44"/>
+        <location filename="../src/welcome-wizard.cc" line="+42"/>
         <source>Community News</source>
         <translation>Community Nieuws</translation>
     </message>
@@ -4442,7 +4543,7 @@
 <context>
     <name>shortcut_manager</name>
     <message>
-        <location filename="../src/shortcut-manager.cc" line="+109"/>
+        <location filename="../src/shortcut-manager.cc" line="+106"/>
         <source>New File</source>
         <translation>Nieuw bestand</translation>
     </message>
@@ -4472,42 +4573,38 @@
         <translation>Sla Werkruimte Op Als</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <location line="+158"/>
+        <location line="+16"/>
+        <location line="+143"/>
         <source>Preferences</source>
         <translation>Voorkeuren</translation>
     </message>
     <message>
-        <location line="-157"/>
+        <location line="-158"/>
         <source>Exit Octave</source>
         <translation>Verlaat Octave</translation>
     </message>
     <message>
         <location line="+3"/>
-        <location line="+84"/>
         <source>Copy</source>
         <translation>Kopiëren</translation>
     </message>
     <message>
-        <location line="-83"/>
-        <location line="+85"/>
+        <location line="+1"/>
         <source>Paste</source>
         <translation>Plakken</translation>
     </message>
     <message>
-        <location line="-84"/>
-        <location line="+80"/>
+        <location line="+1"/>
         <source>Undo</source>
         <translation>Ongedaan maken</translation>
     </message>
     <message>
-        <location line="-79"/>
-        <location line="+84"/>
+        <location line="+1"/>
         <source>Select All</source>
         <translation>Alles selecteren</translation>
     </message>
     <message>
-        <location line="-83"/>
+        <location line="+1"/>
         <source>Clear Clipboard</source>
         <translation>Wis klembord</translation>
     </message>
@@ -4532,7 +4629,7 @@
         <translation>Wis werkruimte</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+6"/>
         <source>Step Into</source>
         <translation>Stap naar binnen</translation>
     </message>
@@ -4603,12 +4700,12 @@
     </message>
     <message>
         <location line="+2"/>
-        <location line="+216"/>
+        <location line="+234"/>
         <source>Editor</source>
         <translation>Editor</translation>
     </message>
     <message>
-        <location line="-214"/>
+        <location line="-232"/>
         <source>Documentation</source>
         <translation>Documentatie</translation>
     </message>
@@ -4688,19 +4785,29 @@
         <translation>Afdrukken</translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+3"/>
         <source>Redo</source>
         <translation>Opnieuw</translation>
     </message>
     <message>
+        <location line="+1"/>
+        <source>Cut</source>
+        <translation>Knippen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Find and Replace</source>
+        <translation>Zoek en vervang</translation>
+    </message>
+    <message>
         <location line="+2"/>
-        <source>Cut</source>
-        <translation>Knippen</translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Find and Replace</source>
-        <translation>Zoek en vervang</translation>
+        <source>Find Next</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Find Previous</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+2"/>
@@ -4825,7 +4932,73 @@
         <translation>Toon regelnummers</translation>
     </message>
     <message>
-        <location line="-145"/>
+        <location line="+44"/>
+        <source>Document on Keyword</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Switch to Left Tab</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Switch to Right Tab</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Move Tab Left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Move Tab Right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+44"/>
+        <source>Global</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+38"/>
+        <source>Tabs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+98"/>
+        <source>Enter new Shortcut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+143"/>
+        <source>Overwriting Shortcuts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>You are about to overwrite all shortcuts.
+Would you like to save the current shortcut set or cancel the action?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Don&apos;t save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+39"/>
+        <source>Import shortcuts from file ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Export shortcuts into file ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-571"/>
         <source>Step</source>
         <translation>Volgende opdracht</translation>
     </message>
@@ -4886,6 +5059,21 @@
     </message>
     <message>
         <location line="+2"/>
+        <source>Show Toolbar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Show Statusbar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Show Horizontal Scrollbar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>Zoom In</source>
         <translation>Inzoomen</translation>
     </message>
@@ -4936,17 +5124,7 @@
         <translation>Hulp voor sleutelwoorden</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Documentation on Keyword</source>
-        <translation>Documentatie van sleutelwoord</translation>
-    </message>
-    <message>
-        <location line="+42"/>
-        <source>Main</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <location line="+59"/>
         <location line="+23"/>
         <source>File</source>
         <translation>Bestand</translation>
@@ -4990,12 +5168,7 @@
         <translation>Uitvoeren</translation>
     </message>
     <message>
-        <location line="+124"/>
-        <source>Enter new Shortcut for Set %1</source>
-        <translation>Geef nieuwe sneltoets voor Set %1</translation>
-    </message>
-    <message>
-        <location line="+5"/>
+        <location line="+106"/>
         <source>Apply the desired shortcut or click on the right button to reset the shortcut to its default.</source>
         <translation>Bevestig de gewenste sneltoets of rechtsklikken om de standaard-sneltoets te herstellen</translation>
     </message>
@@ -5020,7 +5193,7 @@
         <translation>Zet terug naar standaard</translation>
     </message>
     <message>
-        <location line="+53"/>
+        <location line="+45"/>
         <source>Double Shortcut</source>
         <translation>Verdubbel sneltoets</translation>
     </message>
@@ -5038,23 +5211,13 @@
 Wil je de sneltoets toch instellen door hem van de vorige ingestelde actie te wissen?</translation>
     </message>
     <message>
-        <location line="+71"/>
-        <source>Import shortcut set %1 from file ...</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <location line="+6"/>
+        <location line="+113"/>
+        <location line="+5"/>
         <source>Octave Shortcut Files (*.osc);;All Files (*)</source>
         <translation>Octave sneltoetsbestanden (*.osc);;Alle bestanden (*)</translation>
     </message>
     <message>
-        <location line="-1"/>
-        <source>Export shortcut set %1 into file ...</source>
-        <translation>Exporteer sneltoetsset %1 naar bestand ...</translation>
-    </message>
-    <message>
-        <location line="+15"/>
+        <location line="+10"/>
         <source>Failed to open %1 as octave shortcut file</source>
         <translation>Kon bestand %1 niet als Octave sneltoetsbestand openen</translation>
     </message>
@@ -5093,7 +5256,7 @@
 <context>
     <name>welcome_wizard</name>
     <message>
-        <location filename="../src/welcome-wizard.cc" line="+135"/>
+        <location filename="../src/welcome-wizard.cc" line="+133"/>
         <source>Welcome to GNU Octave</source>
         <translation>Welkom bij GNU Octave</translation>
     </message>
@@ -5101,7 +5264,7 @@
 <context>
     <name>workspace_model</name>
     <message>
-        <location filename="../src/workspace-model.cc" line="-42"/>
+        <location filename="../src/workspace-model.cc" line="-41"/>
         <source>Name</source>
         <translation>Naam</translation>
     </message>
@@ -5126,7 +5289,7 @@
         <translation>Eigenschap</translation>
     </message>
     <message>
-        <location line="+109"/>
+        <location line="+108"/>
         <source>Right click to copy, rename, or display</source>
         <translation>Klik rechts om te kopiëren, hernoemen of weergeven</translation>
     </message>
@@ -5140,7 +5303,7 @@
 <context>
     <name>workspace_view</name>
     <message>
-        <location filename="../src/workspace-view.cc" line="+50"/>
+        <location filename="../src/workspace-view.cc" line="+51"/>
         <source>Workspace</source>
         <translation>Werkruimte</translation>
     </message>
@@ -5160,7 +5323,7 @@
         <translation>Filteren</translation>
     </message>
     <message>
-        <location line="+161"/>
+        <location line="+242"/>
         <source>Copy name</source>
         <translation>Kopieer naam</translation>
     </message>
@@ -5176,11 +5339,41 @@
     </message>
     <message>
         <location line="+9"/>
-        <source>Only top-level symbols may be renamed.</source>
-        <translation>Alleen hoofdsymbolen kunnen worden hernoemd.</translation>
-    </message>
-    <message>
-        <location line="+132"/>
+        <source>Only top-level symbols may be renamed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Hide filter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Show filter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+149"/>
+        <source>Class</source>
+        <translation type="unfinished">Type (Class)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Dimension</source>
+        <translation type="unfinished">Dimensies</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Value</source>
+        <translation type="unfinished">Waarde</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Attribute</source>
+        <translation type="unfinished">Eigenschap</translation>
+    </message>
+    <message>
+        <location line="-17"/>
         <source>View the variables in the active workspace.&lt;br&gt;</source>
         <translation>Bekijk variabelen in actieve werkruimte</translation>
     </message>
--- a/libgui/languages/pt_BR.ts	Thu Aug 18 12:26:32 2016 -0700
+++ b/libgui/languages/pt_BR.ts	Fri Aug 19 21:05:48 2016 +0200
@@ -4,7 +4,7 @@
 <context>
     <name>ListDialog</name>
     <message>
-        <location filename="../src/dialog.cc" line="+251"/>
+        <location filename="../src/dialog.cc" line="+258"/>
         <source>Select All</source>
         <translation>Selecionar Tudo</translation>
     </message>
@@ -12,7 +12,7 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../src/workspace-model.cc" line="+75"/>
+        <location filename="../src/workspace-model.cc" line="+74"/>
         <source>automatic</source>
         <translation>automático(a)</translation>
     </message>
@@ -61,11 +61,39 @@
         <source>cursor</source>
         <translation>cursor</translation>
     </message>
+    <message>
+        <location filename="../src/settings-dialog.cc" line="+132"/>
+        <source>Difference to the default size</source>
+        <translation type="unfinished">Diferença com relação ao tamanho de fonte padrão</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Background color, pink (255,0,255) means default</source>
+        <translation type="unfinished">Cor de fundo rosa (255,0,255) significa padrão</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>b</source>
+        <comment>short form for bold</comment>
+        <translation type="unfinished">n</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>i</source>
+        <comment>short form for italic</comment>
+        <translation type="unfinished">i</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>u</source>
+        <comment>short form for underlined</comment>
+        <translation type="unfinished">s</translation>
+    </message>
 </context>
 <context>
     <name>QTerminal</name>
     <message>
-        <location filename="../qterminal/libqterminal/QTerminal.h" line="+135"/>
+        <location filename="../qterminal/libqterminal/QTerminal.h" line="+130"/>
         <source>Copy</source>
         <translation>Copiar</translation>
     </message>
@@ -80,15 +108,20 @@
         <translation>Selecionar Tudo</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+7"/>
         <source>Clear Window</source>
         <translation>Limpar Tudo</translation>
     </message>
+    <message>
+        <location filename="../qterminal/libqterminal/QTerminal.cc" line="+46"/>
+        <source>Edit %1 at line %2</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QWinTerminalImpl</name>
     <message>
-        <location filename="../qterminal/libqterminal/win32/QWinTerminalImpl.cpp" line="+1778"/>
+        <location filename="../qterminal/libqterminal/win32/QWinTerminalImpl.cpp" line="+1779"/>
         <source>copied selection to clipboard</source>
         <translation>seleção copiada para a área de transferência</translation>
     </message>
@@ -96,7 +129,7 @@
 <context>
     <name>QtHandles::Figure</name>
     <message>
-        <location filename="../graphics/Figure.cc" line="+282"/>
+        <location filename="../graphics/Figure.cc" line="+298"/>
         <source>Figure ToolBar</source>
         <translation>Barra de Ferramentas de Figuras</translation>
     </message>
@@ -146,37 +179,19 @@
         <translation>&amp;Copiar</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Cu&amp;t</source>
-        <translation>Recor&amp;tar</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>&amp;Paste</source>
-        <translation>&amp;Colar</translation>
-    </message>
-    <message>
-        <location line="+5"/>
+        <location line="+7"/>
+        <location line="+463"/>
+        <source>About Octave</source>
+        <translation type="unfinished">Sobre o Octave</translation>
+    </message>
+    <message>
+        <location line="-465"/>
         <source>&amp;Help</source>
         <translation>&amp;Ajuda</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>&amp;About QtHandles</source>
-        <translation>&amp;Sobre QtHandles</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>About &amp;Qt</source>
-        <translation>Sobre &amp;Qt</translation>
-    </message>
-    <message>
-        <location line="+427"/>
-        <source>About QtHandles</source>
-        <translation>Sobre QtHandles</translation>
-    </message>
-    <message>
-        <location line="+39"/>
+        <location line="+504"/>
+        <location line="+69"/>
         <source>Save Figure As</source>
         <translation>Salvar Figura Como</translation>
     </message>
@@ -215,6 +230,160 @@
     </message>
 </context>
 <context>
+    <name>annotation_dialog</name>
+    <message>
+        <location filename="../graphics/annotation-dialog.ui" line="+17"/>
+        <source>Annotation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>String</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Font</source>
+        <translation type="unfinished">Fonte</translation>
+    </message>
+    <message>
+        <location line="+42"/>
+        <source>bold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>b</source>
+        <translation type="unfinished">n</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>italic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>i</source>
+        <translation type="unfinished">i</translation>
+    </message>
+    <message>
+        <location line="+428"/>
+        <source>color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>Horz alignment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <location line="+29"/>
+        <source>middle</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-24"/>
+        <source>right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Vert alignment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>top</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>bottom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Position</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>X</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Y</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Width</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Height</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>units</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>normalized</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Fit to box</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Box</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Background</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+444"/>
+        <source>Edge</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+133"/>
+        <source>Line style</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>none</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Line width</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>documentation_dock_widget</name>
     <message>
         <location filename="../src/documentation-dock-widget.cc" line="+34"/>
@@ -230,17 +399,18 @@
 <context>
     <name>file_editor</name>
     <message>
-        <location filename="../src/m-editor/file-editor.cc" line="+285"/>
-        <location line="+125"/>
+        <location filename="../src/m-editor/file-editor.cc" line="+366"/>
+        <location line="+152"/>
         <location line="+19"/>
         <location line="+25"/>
         <location line="+62"/>
         <location line="+28"/>
+        <location line="+79"/>
         <source>Octave Editor</source>
         <translation>Editor do Octave</translation>
     </message>
     <message>
-        <location line="-318"/>
+        <location line="-462"/>
         <source>Octave Files (*.m);;All Files (*)</source>
         <translation>Arquivos do Octave (*.m);;Todos os Arquivos (*)</translation>
     </message>
@@ -256,19 +426,19 @@
         <translation>Nome da nova função:</translation>
     </message>
     <message>
-        <location line="+330"/>
+        <location line="+395"/>
         <source>File not saved! A file with the selected name
 %1
 is already open in the editor</source>
         <translation>Arquivo não foi salvo! Um arquivo com o nome selecionado %1 já está aberto no editor</translation>
     </message>
     <message>
-        <location line="+387"/>
+        <location line="+492"/>
         <source>&amp;%1 %2</source>
         <translation>&amp;%1 %2</translation>
     </message>
     <message>
-        <location line="+388"/>
+        <location line="+480"/>
         <source>&amp;Save File</source>
         <translation>&amp;Salvar Arquivo</translation>
     </message>
@@ -284,41 +454,26 @@
     </message>
     <message>
         <location line="+7"/>
-        <source>&amp;Undo</source>
-        <translation>&amp;Desfazer</translation>
-    </message>
-    <message>
-        <location line="+3"/>
         <source>&amp;Redo</source>
         <translation>&amp;Refazer</translation>
     </message>
     <message>
         <location line="+6"/>
-        <source>&amp;Copy</source>
-        <translation>&amp;Copiar</translation>
-    </message>
-    <message>
-        <location line="+3"/>
         <source>Cu&amp;t</source>
         <translation>Recor&amp;tar</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Paste</source>
-        <translation>Colar</translation>
-    </message>
-    <message>
-        <location line="+96"/>
+        <location line="+94"/>
         <source>&amp;Next Bookmark</source>
         <translation>Marcador &amp;Seguinte</translation>
     </message>
     <message>
-        <location line="-2"/>
+        <location line="+2"/>
         <source>Pre&amp;vious Bookmark</source>
         <translation>Marcardor &amp;Anterior</translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+2"/>
         <source>Toggle &amp;Bookmark</source>
         <translation>Habilitar/desabilitar &amp;Marcador</translation>
     </message>
@@ -328,7 +483,7 @@
         <translation>&amp;Remover Todos os Marcadores</translation>
     </message>
     <message>
-        <location line="+54"/>
+        <location line="+68"/>
         <source>&amp;Next Breakpoint</source>
         <translation>Ponto de Parada &amp;Seguinte</translation>
     </message>
@@ -348,7 +503,7 @@
         <translation>&amp;Remover Todos os Pontos de Parada</translation>
     </message>
     <message>
-        <location line="-104"/>
+        <location line="-118"/>
         <source>&amp;Comment</source>
         <translation>&amp;Comentar</translation>
     </message>
@@ -368,28 +523,28 @@
         <translation>&amp;Remover Indentação</translation>
     </message>
     <message>
-        <location line="-55"/>
+        <location line="-61"/>
         <source>&amp;Find and Replace...</source>
         <translation>&amp;Localizar e Substituir...</translation>
     </message>
     <message>
-        <location line="+162"/>
+        <location line="+182"/>
         <source>Save File and Run</source>
         <translation>Salvar Arquivo e Executá-lo</translation>
     </message>
     <message>
-        <location line="-90"/>
+        <location line="-104"/>
         <source>Go &amp;to Line...</source>
         <translation>Vá para &amp;Linha...</translation>
     </message>
     <message>
-        <location line="-1126"/>
+        <location line="-1341"/>
         <source>Could not start custom file editor
 %1</source>
         <translation>Não foi possível iniciar editor de arquivo externo %1</translation>
     </message>
     <message>
-        <location line="+148"/>
+        <location line="+175"/>
         <source>Create</source>
         <translation>Criar</translation>
     </message>
@@ -399,7 +554,7 @@
         <translation>Cancelar</translation>
     </message>
     <message>
-        <location line="+844"/>
+        <location line="+1041"/>
         <source>&amp;Recent Editor Files</source>
         <translation>Arquivos &amp;Recentes</translation>
     </message>
@@ -424,12 +579,7 @@
         <translation>Fechar Demais Arquivos</translation>
     </message>
     <message>
-        <location line="+31"/>
-        <source>Select All</source>
-        <translation>Selecionar Tudo</translation>
-    </message>
-    <message>
-        <location line="+10"/>
+        <location line="+32"/>
         <source>&amp;Commands</source>
         <translation>&amp;Comandos</translation>
     </message>
@@ -554,17 +704,62 @@
         <translation>Exibir &amp;Números de Linha</translation>
     </message>
     <message>
-        <location line="+128"/>
-        <source>Editor</source>
-        <translation type="unfinished">Editor</translation>
-    </message>
-    <message>
-        <location line="-120"/>
-        <source>Show Line &amp;Endings</source>
-        <translation>Exibir &amp;Finais de Linha</translation>
+        <location line="+22"/>
+        <source>Show &amp;Toolbar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Show &amp;Statusbar</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+4"/>
+        <source>Show &amp;Horizontal Scrollbar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+69"/>
+        <source>Recent Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+65"/>
+        <source>Editor</source>
+        <translation type="unfinished">Editor</translation>
+    </message>
+    <message>
+        <location line="-156"/>
+        <source>Show Line &amp;Endings</source>
+        <translation>Exibir &amp;Finais de Linha</translation>
+    </message>
+    <message>
+        <location line="-1467"/>
+        <source>File Encoding:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+403"/>
+        <source>%1 is a built-in function</source>
+        <translation type="unfinished">%1 é uma função interna</translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>Can not find function %1</source>
+        <translation type="unfinished">Não foi possível encontrar função %1</translation>
+    </message>
+    <message>
+        <location line="+911"/>
+        <source>Find &amp;Next...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Find &amp;Previous...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+118"/>
         <source>Show &amp;Indentation Guides</source>
         <translation>Exibir &amp;Guias de Indentação (à Esquerda)</translation>
     </message>
@@ -574,7 +769,7 @@
         <translation>Exibir &amp;Guia de Linhas Longas (à Direita)</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+20"/>
         <source>Zoom &amp;In</source>
         <translation>M&amp;ais Zoom</translation>
     </message>
@@ -609,7 +804,7 @@
         <translation>&amp;Documentação da Palavra-chave</translation>
     </message>
     <message>
-        <location line="-1103"/>
+        <location line="-1305"/>
         <source>Could not open file
 %1
 for read: %2.</source>
@@ -641,7 +836,7 @@
         <translation>A aba do editor associada ao arquivo desapareceu.</translation>
     </message>
     <message>
-        <location line="+731"/>
+        <location line="+928"/>
         <source>&amp;File</source>
         <translation>&amp;Arquivo</translation>
     </message>
@@ -651,12 +846,12 @@
         <translation>&amp;Editar</translation>
     </message>
     <message>
-        <location line="+138"/>
+        <location line="+129"/>
         <source>Show &amp;Whitespace Characters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+42"/>
         <source>&amp;Debug</source>
         <translation>&amp;Depurar</translation>
     </message>
@@ -669,12 +864,12 @@
 <context>
     <name>file_editor_tab</name>
     <message>
-        <location filename="../src/m-editor/file-editor-tab.cc" line="+92"/>
+        <location filename="../src/m-editor/file-editor-tab.cc" line="+145"/>
         <source>eol:</source>
         <translation>fdl:</translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="-17"/>
         <source>line:</source>
         <translation>linha:</translation>
     </message>
@@ -684,17 +879,7 @@
         <translation>col:</translation>
     </message>
     <message>
-        <location line="+156"/>
-        <source>%1 is a built-in function</source>
-        <translation>%1 é uma função interna</translation>
-    </message>
-    <message>
-        <location line="+31"/>
-        <source>Can not find function %1</source>
-        <translation>Não foi possível encontrar função %1</translation>
-    </message>
-    <message>
-        <location line="+775"/>
+        <location line="+1146"/>
         <source>Goto line</source>
         <translation>Vá para linha</translation>
     </message>
@@ -704,7 +889,7 @@
         <translation>Número da linha</translation>
     </message>
     <message>
-        <location line="+146"/>
+        <location line="+145"/>
         <location line="+63"/>
         <source>&lt;unnamed&gt;</source>
         <translation>&lt;sem_nome&gt;</translation>
@@ -723,12 +908,28 @@
 está para ser fechado mas foi modificado.  %2</translation>
     </message>
     <message>
-        <location line="+288"/>
+        <location line="+298"/>
+        <source>Debug or Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>This file is currently being executed.
+Quit debugging and save?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+166"/>
         <source>Line Endings:</source>
         <translation>Finais de Linha:</translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+9"/>
+        <source>File Encoding:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+28"/>
         <source>Octave Files (*.m)</source>
         <translation>Arquivos Octave (*.m)</translation>
     </message>
@@ -738,22 +939,59 @@
         <translation>Todos os Arquivos (*)</translation>
     </message>
     <message>
-        <location line="-322"/>
+        <location line="-513"/>
         <source>Do you want to cancel closing, save or discard the changes?</source>
         <translation>Deseja cancelar o fechamento, salvar as alterações, ou descartá-las?</translation>
     </message>
     <message>
-        <location line="-970"/>
-        <location line="+979"/>
-        <location line="+213"/>
-        <location line="+177"/>
-        <location line="+85"/>
+        <location line="-1342"/>
+        <source>encoding:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+239"/>
+        <source>Breakpoint condition</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+88"/>
+        <location line="+1024"/>
+        <location line="+372"/>
+        <location line="+215"/>
+        <location line="+21"/>
+        <location line="+83"/>
         <location line="+23"/>
         <source>Octave Editor</source>
         <translation>Editor do Octave</translation>
     </message>
     <message>
-        <location line="-6"/>
+        <location line="-1737"/>
+        <source>Cannot add breakpoint to modified file.
+Save and add breakpoint, or canel?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1611"/>
+        <source>&quot;%1&quot;
+is not a valid identifier.
+
+If you keep this filename, you will not be able to
+call your script using its name as an Octave command.
+
+Do you want to choose another name?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>The current editor contents can not be encoded
+with the selected codec %1.
+Using it will result in data loss!
+
+Do you want to chose another codec?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+99"/>
         <source>
 
 Warning: The contents in the editor is modified!</source>
@@ -771,31 +1009,14 @@
 foi deletado ou renomeado. Gostaria de salvá-lo agora?%2</translation>
     </message>
     <message>
-        <location line="-285"/>
+        <location line="-342"/>
         <source>Could not open file %1 for write:
 %2.</source>
         <translation>Não foi possível abrir arquivo %1 para escrita:
 %2.</translation>
     </message>
     <message>
-        <location line="+177"/>
-        <source>&quot;%1&quot;
-is not a valid identifier.
-
-If you keep this file name, you will not be able to
-call your script using its name as an Octave command.
-
-Do you want to choose another name?</source>
-        <translation>&quot;%1&quot;
-não é um identificador válido.
-
-Se manter esse nome de arquivo, não será possivel 
-executar esse script como um comando no Octave.
-
-Deseja escolher outro nome? </translation>
-    </message>
-    <message>
-        <location line="+85"/>
+        <location line="+319"/>
         <source>It seems that &apos;%1&apos; has been modified by another application. Do you want to reload it?</source>
         <translation>Parece que o arquivo &apos;%1&apos; foi modificado por outra aplicação. Deseja recarregá-lo?</translation>
     </message>
@@ -808,12 +1029,7 @@
         <translation>Gerenciador de Arquivos</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Browse your files.</source>
-        <translation>Gerencie seus arquivos.</translation>
-    </message>
-    <message>
-        <location line="+18"/>
+        <location line="+35"/>
         <source>Enter the path or filename</source>
         <translation>Digite o caminho ou nome de arquivo</translation>
     </message>
@@ -834,22 +1050,67 @@
     </message>
     <message>
         <location line="+4"/>
-        <location line="+388"/>
+        <location line="+373"/>
         <source>Find Files...</source>
         <translation>Buscar Arquivos...</translation>
     </message>
     <message>
-        <location line="+364"/>
+        <location line="-26"/>
+        <source>Open in System File Explorer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Open in Text Editor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+389"/>
         <source>New Directory</source>
         <translation>Novo Diretório</translation>
     </message>
     <message>
-        <location line="-784"/>
+        <location line="-773"/>
         <source>Show Octave directory</source>
         <translation>Exibir o diretório do Octave</translation>
     </message>
     <message>
-        <location line="-4"/>
+        <location line="-49"/>
+        <source>Browse your files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Alternating row colors</source>
+        <translation type="unfinished">Alternar cor das linhas</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>filesdockwidget/showFileSize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>filesdockwidget/showFileType</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>filesdockwidget/showLastModified</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>filesdockwidget/showHiddenFiles</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>filesdockwidget/useAlternatingRowColors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+29"/>
         <source>One directory up</source>
         <translation>Exibir diretório acima</translation>
     </message>
@@ -870,53 +1131,48 @@
     </message>
     <message>
         <location line="+20"/>
-        <location line="+397"/>
+        <location line="+382"/>
         <source>New File...</source>
         <translation>Novo Arquivo...</translation>
     </message>
     <message>
-        <location line="-394"/>
-        <location line="+397"/>
+        <location line="-379"/>
+        <location line="+382"/>
         <source>New Directory...</source>
         <translation>Novo Diretório...</translation>
     </message>
     <message>
-        <location line="-335"/>
+        <location line="-329"/>
         <source>Activate to open in editor, right click for alternatives</source>
         <translation>Clique-duplo para ativar, clique com botão direito para alternativas</translation>
     </message>
     <message>
-        <location line="+236"/>
+        <location line="-136"/>
         <source>File size</source>
         <translation>Tamanho do arquivo</translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+1"/>
         <source>File type</source>
         <translation>Tipo do arquivo</translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+1"/>
         <source>Date modified</source>
         <translation>Data de modificação</translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+1"/>
         <source>Show hidden</source>
         <translation>Exibir ocultos</translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+415"/>
         <source>Open</source>
         <translation>Abrir</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Open in Default Application</source>
-        <translation>Abrir na Aplicação Padrão</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <location line="+13"/>
         <source>Copy Selection to Clipboard</source>
         <translation>Copiar Seleção para Área de Transferência</translation>
     </message>
@@ -946,7 +1202,7 @@
         <translation>Deletar...</translation>
     </message>
     <message>
-        <location line="+115"/>
+        <location line="+125"/>
         <source>Rename file/directory</source>
         <translation>Renomear arquivo/diretório</translation>
     </message>
@@ -983,7 +1239,7 @@
         <translation>Não é possível deletar um diretório que não está vázio</translation>
     </message>
     <message>
-        <location line="+151"/>
+        <location line="+145"/>
         <source>Set directory of file browser</source>
         <translation>Definir diretório do gerenciador de arquivos</translation>
     </message>
@@ -1022,7 +1278,7 @@
 <context>
     <name>final_page</name>
     <message>
-        <location filename="../src/welcome-wizard.cc" line="+199"/>
+        <location filename="../src/welcome-wizard.cc" line="+195"/>
         <source>Enjoy!</source>
         <translation>Aproveite!</translation>
     </message>
@@ -1081,7 +1337,7 @@
 <context>
     <name>find_dialog</name>
     <message>
-        <location filename="../src/m-editor/find-dialog.cc" line="+74"/>
+        <location filename="../src/m-editor/find-dialog.cc" line="+85"/>
         <source>Find and Replace</source>
         <translation>Localizar e Substituir</translation>
     </message>
@@ -1156,7 +1412,7 @@
         <translation>Localizar dentro do texto &amp;selecionado</translation>
     </message>
     <message>
-        <location line="+84"/>
+        <location line="+87"/>
         <source>Search from end</source>
         <translation>Localizar a partir do final</translation>
     </message>
@@ -1166,7 +1422,7 @@
         <translation>Localizar a partir do início</translation>
     </message>
     <message>
-        <location line="+205"/>
+        <location line="+221"/>
         <source>Replace Result</source>
         <translation>Substituir Resultado</translation>
     </message>
@@ -1284,7 +1540,7 @@
         <translation>Resultados da busca</translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+21"/>
         <source>Idle.</source>
         <translation>Aguardando.</translation>
     </message>
@@ -1310,8 +1566,8 @@
     </message>
     <message>
         <location line="+15"/>
-        <source>File name/location</source>
-        <translation>Nome/local do arquivo</translation>
+        <source>Filename/location</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+17"/>
@@ -1319,7 +1575,7 @@
         <translation>Conteúdo do arquivo</translation>
     </message>
     <message>
-        <location line="+105"/>
+        <location line="+111"/>
         <source>Searching...</source>
         <translation>Buscando...</translation>
     </message>
@@ -1337,7 +1593,7 @@
 <context>
     <name>find_files_model</name>
     <message>
-        <location filename="../src/find-files-model.cc" line="+82"/>
+        <location filename="../src/find-files-model.cc" line="+83"/>
         <source>Filename</source>
         <translation>Nome do Arquivo</translation>
     </message>
@@ -1375,7 +1631,7 @@
         <translation>Histórico de Comandos</translation>
     </message>
     <message>
-        <location line="+89"/>
+        <location line="+107"/>
         <source>Copy</source>
         <translation>Copiar</translation>
     </message>
@@ -1389,11 +1645,21 @@
         <source>Create script</source>
         <translation>Criar script</translation>
     </message>
+    <message>
+        <location line="+4"/>
+        <source>Hide filter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Show filter</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>initial_page</name>
     <message>
-        <location filename="../src/welcome-wizard.cc" line="-179"/>
+        <location filename="../src/welcome-wizard.cc" line="-176"/>
         <source>Welcome to Octave!</source>
         <translation>Bem-vindo(a) ao Octave!</translation>
     </message>
@@ -1424,13 +1690,13 @@
 <context>
     <name>main_window</name>
     <message>
-        <location filename="../src/main-window.cc" line="+268"/>
+        <location filename="../src/main-window.cc" line="+275"/>
         <source>Load Workspace</source>
         <translation>Carregar Ambiente de Trabalho</translation>
     </message>
     <message>
-        <location line="+732"/>
-        <location line="+931"/>
+        <location line="+758"/>
+        <location line="+975"/>
         <source>About Octave</source>
         <translation>Sobre o Octave</translation>
     </message>
@@ -1440,12 +1706,12 @@
         <translation>&amp;Arquivo</translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+45"/>
         <source>New</source>
         <translation>Novo</translation>
     </message>
     <message>
-        <location line="-43"/>
+        <location line="-39"/>
         <source>Open...</source>
         <translation>Abrir...</translation>
     </message>
@@ -1455,7 +1721,7 @@
         <translation>Preferências...</translation>
     </message>
     <message>
-        <location line="-95"/>
+        <location line="-99"/>
         <source>Exit</source>
         <translation>Sair</translation>
     </message>
@@ -1470,22 +1736,22 @@
         <translation>Desfazer</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+7"/>
         <source>Copy</source>
         <translation>Copiar</translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+5"/>
         <source>Paste</source>
         <translation>Colar</translation>
     </message>
     <message>
-        <location line="-1469"/>
+        <location line="-1537"/>
         <source>Save Workspace As</source>
         <translation>Salvar Ambiente de Trabalho Como</translation>
     </message>
     <message>
-        <location line="+134"/>
+        <location line="+124"/>
         <source>The release notes file &apos;%1&apos; is empty.</source>
         <translation>O arquivo de notas da versão &apos;%1&apos; está vazio.</translation>
     </message>
@@ -1495,7 +1761,7 @@
         <translation>O arquivo de notas da versão &apos;%1&apos; não pode ser lido.</translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="+12"/>
         <source>Octave Release Notes</source>
         <translation>Notas da Versão do Octave</translation>
     </message>
@@ -1505,17 +1771,17 @@
         <translation>Novidades da Comunidade</translation>
     </message>
     <message>
-        <location line="+187"/>
+        <location line="+206"/>
         <source>Are you sure you want to exit Octave?</source>
         <translation>Tem certeza que deseja sair do Octave?</translation>
     </message>
     <message>
-        <location line="+854"/>
+        <location line="+916"/>
         <source>Open an existing file in editor</source>
         <translation>Abrir um arquivo existente no editor</translation>
     </message>
     <message>
-        <location line="+48"/>
+        <location line="+44"/>
         <source>New Function...</source>
         <translation>Nova Função...</translation>
     </message>
@@ -1525,12 +1791,12 @@
         <translation>Nova Figura</translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+39"/>
         <source>Select All</source>
         <translation>Selecionar Tudo</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="+4"/>
         <source>Clear Clipboard</source>
         <translation>Limpar Área de Transferência</translation>
     </message>
@@ -1580,17 +1846,27 @@
         <translation>Gerenciador de Arquivos</translation>
     </message>
     <message>
-        <location line="-84"/>
+        <location line="+36"/>
+        <source>Contribute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Donate to Octave</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-123"/>
         <source>Step In</source>
         <translation>Passo adentro</translation>
     </message>
     <message>
-        <location line="-1020"/>
+        <location line="-1082"/>
         <source>Octave</source>
         <translation>Octave</translation>
     </message>
     <message>
-        <location line="+868"/>
+        <location line="+926"/>
         <source>Load Workspace...</source>
         <translation>Carregar Ambiente de Trabalho...</translation>
     </message>
@@ -1605,7 +1881,7 @@
         <translation>Novo Script</translation>
     </message>
     <message>
-        <location line="+124"/>
+        <location line="+128"/>
         <source>Step Out</source>
         <translation>Passo afora</translation>
     </message>
@@ -1625,17 +1901,7 @@
         <translation>Compartilhar Código Fonte</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Contribute to Octave</source>
-        <translation>Contribuir com o Octave</translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Octave Developer Resources</source>
-        <translation>Recursos para Desenvolvedores</translation>
-    </message>
-    <message>
-        <location line="+14"/>
+        <location line="+20"/>
         <source>On Disk</source>
         <translation>No Disco (Em Seu Computador)</translation>
     </message>
@@ -1680,8 +1946,8 @@
         <translation>Diretório um nível acima</translation>
     </message>
     <message>
-        <location line="-1148"/>
-        <location line="+1151"/>
+        <location line="-1198"/>
+        <location line="+1201"/>
         <source>Browse directories</source>
         <translation>Escolher diretório</translation>
     </message>
@@ -1760,7 +2026,7 @@
 <context>
     <name>news_reader</name>
     <message>
-        <location line="-1411"/>
+        <location line="-1492"/>
         <source>&lt;html&gt;
 &lt;body&gt;
 &lt;p&gt;
@@ -1819,18 +2085,18 @@
 <context>
     <name>octave_dock_widget</name>
     <message>
-        <location filename="../src/octave-dock-widget.cc" line="+68"/>
-        <location line="+198"/>
+        <location filename="../src/octave-dock-widget.cc" line="+67"/>
+        <location line="+201"/>
         <source>Undock widget</source>
         <translation>Desacoplar painel</translation>
     </message>
     <message>
-        <location line="-188"/>
+        <location line="-191"/>
         <source>Hide widget</source>
         <translation>Esconder painel</translation>
     </message>
     <message>
-        <location line="+132"/>
+        <location line="+136"/>
         <source>Dock widget</source>
         <translation>Acoplar painel</translation>
     </message>
@@ -1838,7 +2104,7 @@
 <context>
     <name>octave_qscintilla</name>
     <message>
-        <location filename="../src/m-editor/octave-qscintilla.cc" line="+226"/>
+        <location filename="../src/m-editor/octave-qscintilla.cc" line="+237"/>
         <source>Help on</source>
         <translation>Ajuda sobre</translation>
     </message>
@@ -1852,18 +2118,23 @@
         <source>Edit</source>
         <translation>Editar</translation>
     </message>
+    <message>
+        <location line="+15"/>
+        <source>dbstop if ...</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>octave_qt_link</name>
     <message>
-        <location filename="../src/octave-qt-link.cc" line="+111"/>
-        <location line="+6"/>
-        <location line="+7"/>
+        <location filename="../src/octave-qt-link.cc" line="+136"/>
+        <location line="+9"/>
+        <location line="+11"/>
         <source>Create</source>
         <translation>Criar</translation>
     </message>
     <message>
-        <location line="-10"/>
+        <location line="-14"/>
         <source>File
 %1
 does not exist. Do you want to create it?</source>
@@ -1877,7 +2148,7 @@
         <translation>Editor do Octave</translation>
     </message>
     <message>
-        <location line="+211"/>
+        <location line="+254"/>
         <source>The file %1 does not exist in the load path.  To run or debug the function you are editing, you must either change to the directory %2 or add that directory to the load path.</source>
         <translation>O arquivo %1 não existe no caminho de busca. Para executar ou depurar a função que você está editando, é preciso definir o diretório atual como %2 ou adicionar aquele diretório ao caminho de busca.</translation>
     </message>
@@ -1902,8 +2173,8 @@
         <translation>Adicionar Diretório ao Caminho de Busca</translation>
     </message>
     <message>
-        <location line="-223"/>
-        <location line="+224"/>
+        <location line="-269"/>
+        <location line="+270"/>
         <source>Cancel</source>
         <translation>Cancelar</translation>
     </message>
@@ -1919,7 +2190,7 @@
 <context>
     <name>resource_manager</name>
     <message>
-        <location filename="../src/resource-manager.cc" line="+245"/>
+        <location filename="../src/resource-manager.cc" line="+246"/>
         <source>The settings file
 %1
 does not exist and can not be created.
@@ -1945,731 +2216,589 @@
     <name>settings_dialog</name>
     <message>
         <location filename="../src/settings-dialog.ui" line="+23"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1738"/>
         <source>Settings</source>
         <translation>Configurações</translation>
     </message>
     <message>
         <location line="+19"/>
         <location line="+468"/>
-        <location filename="../src/ui-settings-dialog.h" line="+25"/>
-        <location line="+1"/>
         <source>General</source>
         <translation>Geral</translation>
     </message>
     <message>
         <location line="-338"/>
-        <location filename="../src/ui-settings-dialog.h" line="-17"/>
         <source>Octave logo only</source>
         <translation>Apenas logotipo do Octave</translation>
     </message>
     <message>
         <location line="+10"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Letter icons</source>
         <translation>Ícones de texto</translation>
     </message>
     <message>
         <location line="+7"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Graphic icons</source>
         <translation>Ícones gráficos</translation>
     </message>
     <message>
         <location line="-118"/>
-        <location filename="../src/ui-settings-dialog.h" line="-9"/>
         <source>Dock widget title bar</source>
         <translation>Barra de título do painel</translation>
     </message>
     <message>
         <location line="+60"/>
-        <location filename="../src/ui-settings-dialog.h" line="+4"/>
         <source>Normal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+178"/>
-        <location filename="../src/ui-settings-dialog.h" line="+11"/>
         <source>Custom style</source>
         <translation>Estilo personalizado</translation>
     </message>
     <message>
         <location line="+92"/>
-        <location filename="../src/ui-settings-dialog.h" line="+4"/>
         <source>These preferences are applied after any .octaverc startup files.</source>
         <translation>Essas preferências são aplicadas após os arquivos de inicialização (.octaverc).</translation>
     </message>
     <message>
         <location line="+55"/>
-        <location filename="../src/ui-settings-dialog.h" line="+3"/>
         <source>Restore working directory of previous session</source>
         <translation>Restaurar diretório de trabalho da sessão anterior</translation>
     </message>
     <message>
         <location line="+33"/>
-        <location filename="../src/ui-settings-dialog.h" line="+58"/>
         <source>Editor</source>
         <translation>Editor</translation>
     </message>
     <message>
-        <location line="+151"/>
-        <location filename="../src/ui-settings-dialog.h" line="-49"/>
+        <location line="+107"/>
         <source>Color</source>
         <translation>Cor</translation>
     </message>
     <message>
-        <location line="+138"/>
-        <location filename="../src/ui-settings-dialog.h" line="+6"/>
+        <location line="-69"/>
         <source>Draw a long line marker</source>
         <translation>Desenhe uma guia vertical de linhas longas</translation>
     </message>
     <message>
-        <location line="+48"/>
-        <location filename="../src/ui-settings-dialog.h" line="+3"/>
+        <location line="+155"/>
         <source>Show EOL characters</source>
         <translation>Exibir caracteres de final de linha</translation>
     </message>
     <message>
-        <location line="+9"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
+        <location line="+662"/>
         <source>Default EOL mode</source>
         <translation>Modo padrão para final de linha</translation>
     </message>
     <message>
-        <location line="+154"/>
-        <location filename="../src/ui-settings-dialog.h" line="+12"/>
+        <location line="-394"/>
         <source>Indent width</source>
         <translation>Largura de indentação</translation>
     </message>
     <message>
         <location line="+7"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Tab indents line</source>
         <translation>Tecla Tab causa indentação na linha</translation>
     </message>
     <message>
         <location line="+7"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Auto indentation</source>
         <translation>Auto-indentação</translation>
     </message>
     <message>
         <location line="+26"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Tab width</source>
         <translation>Largura do Tab</translation>
     </message>
     <message>
         <location line="+7"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Show indentation guides</source>
         <translation>Exibir guias de indentação</translation>
     </message>
     <message>
         <location line="+23"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Backspace unindents line</source>
         <translation>Tecla Backspace remove indentação da linha</translation>
     </message>
     <message>
         <location line="+88"/>
-        <location filename="../src/ui-settings-dialog.h" line="+3"/>
         <source>Match keywords</source>
         <translation>Completar palavras-chave do Octave</translation>
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Case sensitive</source>
         <translation>Diferenciar maiúsculas/minúsculas</translation>
     </message>
     <message>
         <location line="+23"/>
-        <location filename="../src/ui-settings-dialog.h" line="+2"/>
         <source>Replace word by suggested one</source>
         <translation>Substituir palavra por aquela sugerida</translation>
     </message>
     <message>
         <location line="-10"/>
-        <location filename="../src/ui-settings-dialog.h" line="-1"/>
         <source>Match words in document</source>
         <translation>Preencher com palavras do documento</translation>
     </message>
     <message>
-        <location line="+173"/>
-        <location filename="../src/ui-settings-dialog.h" line="+14"/>
+        <location line="+185"/>
         <source>Restore editor tabs from previous session on startup</source>
         <translation>Restaurar abas de edição da sessão anterior durante a inicialização</translation>
     </message>
     <message>
-        <location line="-426"/>
-        <location filename="../src/ui-settings-dialog.h" line="-28"/>
+        <location line="-438"/>
         <source>Use custom file editor</source>
         <translation>Usar editor de texto externo</translation>
     </message>
     <message>
-        <location line="+482"/>
-        <location filename="../src/ui-settings-dialog.h" line="+33"/>
+        <location line="+574"/>
         <source>Editor Styles</source>
         <translation>Estilos de Edição</translation>
     </message>
     <message>
         <location line="+287"/>
-        <location filename="../src/ui-settings-dialog.h" line="+10"/>
         <source>Terminal Colors</source>
         <translation>Cores do Terminal</translation>
     </message>
     <message>
         <location line="-173"/>
-        <location filename="../src/ui-settings-dialog.h" line="-6"/>
         <source>Font</source>
         <translation>Fonte</translation>
     </message>
     <message>
-        <location line="-917"/>
-        <location filename="../src/ui-settings-dialog.h" line="-58"/>
+        <location line="-1007"/>
         <source>Show line numbers</source>
         <translation>Exibir números de linha</translation>
     </message>
     <message>
-        <location line="-72"/>
-        <location filename="../src/ui-settings-dialog.h" line="-3"/>
+        <location line="+81"/>
         <source>Highlight current line</source>
         <translation>Destacar linha atual</translation>
     </message>
     <message>
-        <location line="+85"/>
-        <location filename="../src/ui-settings-dialog.h" line="+4"/>
+        <location line="+13"/>
         <source>Show complete path in window title</source>
         <translation>Exibir caminho completo no título da janela</translation>
     </message>
     <message>
-        <location line="-29"/>
-        <location filename="../src/ui-settings-dialog.h" line="-2"/>
+        <location line="+13"/>
         <source>Show whitespace</source>
         <translation>Exibir espaços em branco</translation>
     </message>
     <message>
-        <location line="+39"/>
-        <location filename="../src/ui-settings-dialog.h" line="+3"/>
+        <location line="+157"/>
         <source>Do not show whitespace used for indentation</source>
         <translation>Não exibir espaços em branco usados para indentação</translation>
     </message>
     <message>
-        <location line="+625"/>
-        <location filename="../src/ui-settings-dialog.h" line="+37"/>
+        <location line="+382"/>
         <source>Number of characters before list is shown: </source>
         <translation>Número de caracteres antes da lista ser exibida: </translation>
     </message>
     <message>
-        <location line="+112"/>
-        <location filename="../src/ui-settings-dialog.h" line="+11"/>
+        <location line="+124"/>
         <source>Create nonexistent files without prompting</source>
         <translation>Criar arquivos não existentes sem confirmar</translation>
     </message>
     <message>
-        <location line="-429"/>
-        <location filename="../src/ui-settings-dialog.h" line="-28"/>
+        <location line="-441"/>
         <source>command line (%f=file, %l=line):</source>
         <translation>linha de comando (%f=arquivo, %l=linha):</translation>
     </message>
     <message>
-        <location line="+521"/>
-        <location filename="../src/ui-settings-dialog.h" line="+43"/>
+        <location line="+613"/>
         <source>Terminal</source>
         <translation>Terminal</translation>
     </message>
     <message>
         <location line="+51"/>
-        <location filename="../src/ui-settings-dialog.h" line="-8"/>
         <source>Cursor type:</source>
         <translation>Tipo de cursor:</translation>
     </message>
     <message>
         <location line="-11"/>
-        <location filename="../src/ui-settings-dialog.h" line="-1"/>
         <source>Cursor blinking</source>
         <translation>Cursor piscante</translation>
     </message>
     <message>
         <location line="-7"/>
-        <location filename="../src/ui-settings-dialog.h" line="-1"/>
         <source>Use foreground color</source>
         <translation>Usar cor de primeiro plano</translation>
     </message>
     <message>
         <location line="+59"/>
-        <location filename="../src/ui-settings-dialog.h" line="+4"/>
         <source>Font size</source>
         <translation>Tamanho de fonte</translation>
     </message>
     <message>
         <location line="+123"/>
-        <location filename="../src/ui-settings-dialog.h" line="+3"/>
         <source>Set focus to terminal when running a command from within another widget</source>
         <translation>Focar no terminal quando executar comando a partir de outro painel</translation>
     </message>
     <message>
         <location line="+73"/>
-        <location filename="../src/ui-settings-dialog.h" line="+15"/>
         <source>File Browser</source>
         <translation>Gerenciador de Arquivos</translation>
     </message>
     <message>
-        <location line="+46"/>
-        <location filename="../src/ui-settings-dialog.h" line="-8"/>
-        <source>Show file size</source>
-        <translation>Exibir tamanho do arquivo</translation>
-    </message>
-    <message>
-        <location line="-14"/>
-        <location filename="../src/ui-settings-dialog.h" line="-2"/>
-        <source>Show file type</source>
-        <translation>Exibir tipo do arquivo</translation>
-    </message>
-    <message>
-        <location line="+21"/>
-        <location filename="../src/ui-settings-dialog.h" line="+3"/>
-        <source>Show date of last modification</source>
-        <translation>Exibir data de última modificação</translation>
-    </message>
-    <message>
-        <location line="-14"/>
-        <location filename="../src/ui-settings-dialog.h" line="-2"/>
-        <source>Show hidden files</source>
-        <translation>Exibir arquivos ocultos</translation>
-    </message>
-    <message>
-        <location line="-1715"/>
-        <location filename="../src/ui-settings-dialog.h" line="-97"/>
+        <location line="-1729"/>
         <source>Interface</source>
         <translation>Interface</translation>
     </message>
     <message>
         <location line="+52"/>
-        <location filename="../src/ui-settings-dialog.h" line="+3"/>
         <source>Confirm before exiting</source>
         <translation>Confirmar antes de sair</translation>
     </message>
     <message>
         <location line="+103"/>
-        <location line="+592"/>
-        <location filename="../src/ui-settings-dialog.h" line="+9"/>
-        <location line="+28"/>
+        <location line="+640"/>
         <source>Show status bar</source>
         <translation>Exibir barra de status</translation>
     </message>
     <message>
-        <location line="-540"/>
-        <location filename="../src/ui-settings-dialog.h" line="-26"/>
+        <location line="-588"/>
         <source>Text inactive</source>
         <translation>Texto inativo</translation>
     </message>
     <message>
         <location line="-32"/>
         <location line="+45"/>
-        <location filename="../src/ui-settings-dialog.h" line="-1"/>
-        <location line="+2"/>
         <source>Active</source>
         <translation>Ativo</translation>
     </message>
     <message>
         <location line="-159"/>
-        <location filename="../src/ui-settings-dialog.h" line="-11"/>
         <source>Small</source>
         <translation>Pequeno</translation>
     </message>
     <message>
         <location line="+17"/>
-        <location filename="../src/ui-settings-dialog.h" line="+2"/>
         <source>Large</source>
         <translation>Grande</translation>
     </message>
     <message>
         <location line="+181"/>
-        <location filename="../src/ui-settings-dialog.h" line="+11"/>
         <source>Background inactive</source>
         <translation>Fundo inativo</translation>
     </message>
     <message>
         <location line="+19"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>3D</source>
         <translation>3D</translation>
     </message>
     <message>
         <location line="+54"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Octave Startup</source>
         <translation>Inicialização do Octave</translation>
     </message>
     <message>
         <location line="+41"/>
-        <location line="+1392"/>
-        <location filename="../src/ui-settings-dialog.h" line="+2"/>
-        <location line="+82"/>
+        <location line="+1440"/>
         <source>Startup path</source>
         <translation>Caminho de inicialização</translation>
     </message>
     <message>
-        <location line="-1379"/>
-        <location line="+1409"/>
-        <location filename="../src/ui-settings-dialog.h" line="-81"/>
-        <location line="+83"/>
+        <location line="-1427"/>
+        <location line="+1420"/>
         <source>Browse</source>
         <translation>Escolher</translation>
     </message>
     <message>
-        <location line="-1322"/>
-        <location filename="../src/ui-settings-dialog.h" line="-78"/>
+        <location line="-1103"/>
         <source>After Column</source>
         <translation>Após coluna</translation>
     </message>
     <message>
-        <location line="+144"/>
-        <location filename="../src/ui-settings-dialog.h" line="+6"/>
+        <location line="-75"/>
         <source>Tab width min.</source>
         <translation>Tamanho da guia: mín.</translation>
     </message>
     <message>
         <location line="+64"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>max.</source>
         <translation>máx.</translation>
     </message>
     <message>
-        <location line="+31"/>
-        <location filename="../src/ui-settings-dialog.h" line="+2"/>
+        <location line="-231"/>
         <source>This works well for monospaced fonts. The line is drawn at a position based on the width of a space character in the default font. It may not work very well if styles use proportional fonts or if varied font sizes or bold, italic and normal texts are used.</source>
         <translation>Isso funciona bem para fontes mono-espaçadas. A guia é desenhada numa posição baseada no tamanho do caractere espaço na fonte padrão. Pode não funcionar muito bem se os estilos usarem fontes proporcionais ou, no caso de fontes de tamanho variável, se negrito, itálico e texto normal forem usados também.</translation>
     </message>
     <message>
-        <location line="+19"/>
-        <location filename="../src/ui-settings-dialog.h" line="+3"/>
+        <location line="+289"/>
         <source>Enable Code Folding</source>
         <translation>Habilitar Células de Código</translation>
     </message>
     <message>
-        <location line="+61"/>
-        <location filename="../src/ui-settings-dialog.h" line="+6"/>
+        <location line="+551"/>
         <source>Windows (CRLF)</source>
         <translation>Windows (CRLF)</translation>
     </message>
     <message>
         <location line="+5"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Mac (CR)</source>
         <translation>Mac (CR)</translation>
     </message>
     <message>
         <location line="+5"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Unix (LF)</source>
         <translation>Unix (LF)</translation>
     </message>
     <message>
-        <location line="+32"/>
-        <location filename="../src/ui-settings-dialog.h" line="+2"/>
+        <location line="-532"/>
         <source>Show horizontal scroll bar</source>
         <translation>Exibir barra de rolagem horizontal</translation>
     </message>
     <message>
-        <location line="+68"/>
-        <location filename="../src/ui-settings-dialog.h" line="+4"/>
+        <location line="-299"/>
+        <source>Show tool bar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+383"/>
         <source>Indentation</source>
         <translation>Indentação</translation>
     </message>
     <message>
         <location line="+117"/>
-        <location filename="../src/ui-settings-dialog.h" line="+7"/>
         <source>Indentation uses tabs</source>
         <translation>Indentar com caracteres tab</translation>
     </message>
     <message>
         <location line="+38"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Auto completion</source>
         <translation>Auto-completar</translation>
     </message>
     <message>
         <location line="+101"/>
-        <location filename="../src/ui-settings-dialog.h" line="+5"/>
         <source>With Octave builtins</source>
         <translation>Completar Octave builtins</translation>
     </message>
     <message>
         <location line="+10"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>With Octave functions</source>
         <translation>Completar funções Octave</translation>
     </message>
     <message>
         <location line="+64"/>
-        <location filename="../src/ui-settings-dialog.h" line="+9"/>
         <source>Show completion list automatically</source>
         <translation>Exibir automaticamente lista de auto-completar</translation>
     </message>
     <message>
         <location line="+31"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>File handling</source>
         <translation>Manipulação de arquivos</translation>
     </message>
     <message>
-        <location line="+40"/>
-        <location filename="../src/ui-settings-dialog.h" line="+3"/>
+        <location line="+19"/>
         <source>Reload externally changed files without prompt</source>
         <translation>Recarregar arquivos alterados externamente sem confirmar</translation>
     </message>
     <message>
-        <location line="+53"/>
-        <location filename="../src/ui-settings-dialog.h" line="+2"/>
+        <location line="+93"/>
+        <source>Text encoding used for loading and saving</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+73"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Select font, font size (as a difference from the default size), font style (&lt;b&gt;b&lt;/b&gt;old, &lt;b&gt;i&lt;/b&gt;talic, &lt;b&gt;u&lt;/b&gt;nderline), text color, and background color (for the latter, the color magenta (255,0,255) is a placeholder for the default background color).&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Selecione a fonte: família, tamanho (variacão com relacão ao tamanho padrão), estilo (&lt;b&gt;n&lt;/b&gt;egrito, &lt;b&gt;i&lt;/b&gt;tálico, &lt;b&gt;s&lt;/b&gt;ublinhado), cor do texto e cor de fundo (a cor rosa (255,0,255) é a cor de fundo padrão).&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location line="+192"/>
-        <location filename="../src/ui-settings-dialog.h" line="+7"/>
         <source>(Changing buffer size clears history)</source>
         <translation>(Alterar o tamanho do histório apagará o seu conteúdo atual)</translation>
     </message>
     <message>
         <location line="+28"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>History buffer Size</source>
         <translation>Tamanho do Histórico de Comandos</translation>
     </message>
     <message>
         <location line="+34"/>
-        <location filename="../src/ui-settings-dialog.h" line="+2"/>
         <source>Print debug location in terminal window in addition to the marker in the editor</source>
         <translation>Exibir posição de depuração no terminal além de ressaltar no editor</translation>
     </message>
     <message>
         <location line="+87"/>
-        <location filename="../src/ui-settings-dialog.h" line="+3"/>
-        <source>Display</source>
-        <translation>Exibição</translation>
+        <source>Behavior</source>
+        <translation>Comportamento</translation>
+    </message>
+    <message>
+        <location line="+30"/>
+        <source>Restore last directory of previous session</source>
+        <translation>Restaurar diretório da sessão anterior</translation>
+    </message>
+    <message>
+        <location line="+54"/>
+        <source>Extensions of files to be opened in the default text editor (separated by &quot;;&quot;):</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+39"/>
-        <location filename="../src/ui-settings-dialog.h" line="+5"/>
-        <source>Alternating row colors</source>
-        <translation>Alternar cor das linhas</translation>
-    </message>
-    <message>
-        <location line="+12"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
-        <source>Behavior</source>
-        <translation>Comportamento</translation>
-    </message>
-    <message>
-        <location line="+34"/>
-        <location filename="../src/ui-settings-dialog.h" line="+3"/>
-        <source>Restore last directory of previous session</source>
-        <translation>Restaurar diretório da sessão anterior</translation>
-    </message>
-    <message>
-        <location line="+71"/>
-        <location filename="../src/ui-settings-dialog.h" line="+5"/>
         <source>Workspace</source>
         <translation>Ambiente de Trabalho</translation>
     </message>
     <message>
-        <location line="+42"/>
-        <location filename="../src/ui-settings-dialog.h" line="-1"/>
+        <location line="+35"/>
+        <source>Colors for variable attributes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
         <source>Hide tool tips</source>
         <translation>Ocultar ajuda de contexto</translation>
     </message>
     <message>
-        <location line="+182"/>
-        <location filename="../src/ui-settings-dialog.h" line="+14"/>
+        <location line="+101"/>
+        <source>Import shortcut set</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Export current shortcut set</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Reset shortcuts to their defaults</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location line="+80"/>
+        <source>Default</source>
+        <translation type="unfinished">Padrão</translation>
+    </message>
+    <message>
+        <location line="-71"/>
         <source>Edit a shortcut by double-clicking in a cell</source>
         <translation>Edite uma tecla de atalho clicando duas vezes na célula correspondente</translation>
     </message>
     <message>
-        <location line="+108"/>
-        <location filename="../src/ui-settings-dialog.h" line="+20"/>
+        <location line="+76"/>
+        <source>Actual</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
         <source>Network</source>
         <translation>Rede</translation>
     </message>
     <message>
         <location line="+23"/>
-        <location filename="../src/ui-settings-dialog.h" line="-12"/>
         <source>Allow Octave to connect to the Octave web site to display current news and information</source>
         <translation>Permitir Octave se conectar à Internet para exibir novidades e informações atuais</translation>
     </message>
     <message>
         <location line="+46"/>
-        <location filename="../src/ui-settings-dialog.h" line="+8"/>
         <source>Use proxy server</source>
         <translation>Usar servidor proxy</translation>
     </message>
     <message>
         <location line="-23"/>
-        <location filename="../src/ui-settings-dialog.h" line="-4"/>
         <source>HttpProxy</source>
         <translation>Proxy HTTP</translation>
     </message>
     <message>
-        <location line="-2083"/>
-        <location filename="../src/ui-settings-dialog.h" line="-123"/>
+        <location line="-2039"/>
         <source>Icon set for dock widgets</source>
         <translation>Conjunto de ícones para painéis</translation>
     </message>
     <message>
         <location line="-48"/>
-        <location filename="../src/ui-settings-dialog.h" line="-4"/>
         <source>Language (requires restart)</source>
         <translation>Idioma (alteração exige reinicialização do Octave)</translation>
     </message>
     <message>
         <location line="-58"/>
-        <location filename="../src/ui-settings-dialog.h" line="-5"/>
         <source>Icon size</source>
         <translation>Tamanho dos ícones</translation>
     </message>
     <message>
-        <location line="+1714"/>
-        <location filename="../src/ui-settings-dialog.h" line="+100"/>
+        <location line="+1716"/>
         <source>Synchronize Octave working directory with file browser</source>
         <translation>Manter diretório de trabalho sincronizado com o Gerenciador de Arquivos</translation>
     </message>
     <message>
-        <location line="+132"/>
-        <location filename="../src/ui-settings-dialog.h" line="+5"/>
-        <source>Colors for variable attributes </source>
-        <translation>Cores para atributos de variáveis</translation>
-    </message>
-    <message>
-        <location line="+34"/>
-        <location filename="../src/ui-settings-dialog.h" line="+22"/>
+        <location line="+184"/>
         <source>Shortcuts</source>
         <translation>Teclas de Atalho</translation>
     </message>
     <message>
         <location line="+31"/>
-        <location filename="../src/ui-settings-dialog.h" line="-18"/>
         <source>Select this option to prevent conflicts with readline shortcuts</source>
         <translation>Selecionar esta opção para prevenir conflitos com teclas de atalho do readline</translation>
     </message>
     <message>
         <location line="+3"/>
-        <location filename="../src/ui-settings-dialog.h" line="+2"/>
         <source>Disable global shortcuts when terminal window has focus</source>
         <translation>Desativar teclas de atalho globais quando o terminal estiver em foco</translation>
     </message>
     <message>
-        <location line="+31"/>
-        <location line="+28"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
-        <location line="+4"/>
-        <source>Use this set</source>
-        <translation>Usar este conjunto</translation>
-    </message>
-    <message>
-        <location line="-21"/>
-        <location filename="../src/ui-settings-dialog.h" line="-3"/>
-        <source>Set 1:</source>
-        <translation>Conjunto 1:</translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <location line="+37"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
-        <location line="+3"/>
+        <location line="+53"/>
         <source>Export</source>
         <translation>Exportar</translation>
     </message>
     <message>
-        <location line="-30"/>
-        <location line="+37"/>
-        <location filename="../src/ui-settings-dialog.h" line="-2"/>
-        <location line="+3"/>
+        <location line="-10"/>
         <source>Import</source>
         <translation>Importar</translation>
     </message>
     <message>
-        <location line="+7"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
-        <source>Set 2:</source>
-        <translation>Conjunto 2:</translation>
-    </message>
-    <message>
-        <location line="+86"/>
-        <location filename="../src/ui-settings-dialog.h" line="+7"/>
+        <location line="+90"/>
         <source>Action</source>
         <translation>Ação</translation>
     </message>
     <message>
-        <location line="+10"/>
-        <location filename="../src/ui-settings-dialog.h" line="-1"/>
-        <source>Set 1 Default</source>
-        <translation>Conjunto 1 Padrão</translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <location filename="../src/ui-settings-dialog.h" line="-1"/>
-        <source>Set 1 Actual</source>
-        <translation>Conjunto 1 Atual</translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <location filename="../src/ui-settings-dialog.h" line="-1"/>
-        <source>Set 2 Default</source>
-        <translation>Conjunto 2 Dadrão</translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <location filename="../src/ui-settings-dialog.h" line="-1"/>
-        <source>Set 2 Actual</source>
-        <translation>Conjunto 2 Atual</translation>
-    </message>
-    <message>
-        <location line="+68"/>
-        <location filename="../src/ui-settings-dialog.h" line="+11"/>
+        <location line="+83"/>
         <source>Socks5Proxy</source>
         <translation>Proxy Socks 5</translation>
     </message>
     <message>
         <location line="-16"/>
-        <location filename="../src/ui-settings-dialog.h" line="-4"/>
         <source>Hostname:</source>
         <translation>Endereço do servidor:</translation>
     </message>
     <message>
         <location line="+44"/>
-        <location filename="../src/ui-settings-dialog.h" line="+8"/>
         <source>Proxy type:</source>
         <translation>Tipo de proxy:</translation>
     </message>
     <message>
         <location line="+10"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Port:</source>
         <translation>Porta:</translation>
     </message>
     <message>
         <location line="-27"/>
-        <location filename="../src/ui-settings-dialog.h" line="-3"/>
         <source>Username:</source>
         <translation>Nome de usuário:</translation>
     </message>
     <message>
         <location line="+37"/>
-        <location filename="../src/ui-settings-dialog.h" line="+4"/>
         <source>Password:</source>
         <translation>Senha:</translation>
     </message>
     <message>
-        <location filename="../src/settings-dialog.cc" line="+77"/>
+        <location filename="../src/settings-dialog.cc" line="+127"/>
+        <source>Octave Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Unable to save settings.  Missing settings file or unknown directory.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+18"/>
         <location line="+4"/>
-        <location line="+561"/>
+        <location line="+444"/>
         <source>System setting</source>
         <translation>Configuração do sistema</translation>
     </message>
     <message>
-        <location line="-355"/>
+        <location line="-232"/>
         <source>IBeam Cursor</source>
         <translation>Cursor IBeam</translation>
     </message>
@@ -2684,35 +2813,7 @@
         <translation>Cursor Sublinhado</translation>
     </message>
     <message>
-        <location line="+213"/>
-        <source>Difference to the default size</source>
-        <translation>Diferença com relação ao tamanho de fonte padrão</translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Background color, pink (255,0,255) means default</source>
-        <translation>Cor de fundo rosa (255,0,255) significa padrão</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>b</source>
-        <comment>short form for bold</comment>
-        <translation>n</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>i</source>
-        <comment>short form for italic</comment>
-        <translation>i</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>u</source>
-        <comment>short form for underlined</comment>
-        <translation>s</translation>
-    </message>
-    <message>
-        <location line="+497"/>
+        <location line="+503"/>
         <source>Set Octave Startup Directory</source>
         <translation>Definir Diretório de Inicialização do Octave</translation>
     </message>
@@ -2725,7 +2826,7 @@
 <context>
     <name>setup_community_news</name>
     <message>
-        <location filename="../src/welcome-wizard.cc" line="+44"/>
+        <location filename="../src/welcome-wizard.cc" line="+42"/>
         <source>Community News</source>
         <translation>Novidades da Comunidade</translation>
     </message>
@@ -2780,7 +2881,7 @@
 <context>
     <name>shortcut_manager</name>
     <message>
-        <location filename="../src/shortcut-manager.cc" line="+109"/>
+        <location filename="../src/shortcut-manager.cc" line="+106"/>
         <source>New File</source>
         <translation>Novo Arquivo</translation>
     </message>
@@ -2810,42 +2911,38 @@
         <translation>Salvar Ambiente de Trabalho Como</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <location line="+158"/>
+        <location line="+16"/>
+        <location line="+143"/>
         <source>Preferences</source>
         <translation>Preferências</translation>
     </message>
     <message>
-        <location line="-157"/>
+        <location line="-158"/>
         <source>Exit Octave</source>
         <translation>Sair do Octave</translation>
     </message>
     <message>
         <location line="+3"/>
-        <location line="+84"/>
         <source>Copy</source>
         <translation>Copiar</translation>
     </message>
     <message>
-        <location line="-83"/>
-        <location line="+85"/>
+        <location line="+1"/>
         <source>Paste</source>
         <translation>Colar</translation>
     </message>
     <message>
-        <location line="-84"/>
-        <location line="+80"/>
+        <location line="+1"/>
         <source>Undo</source>
         <translation>Desfazer</translation>
     </message>
     <message>
-        <location line="-79"/>
-        <location line="+84"/>
+        <location line="+1"/>
         <source>Select All</source>
         <translation>Selecionar Tudo</translation>
     </message>
     <message>
-        <location line="-83"/>
+        <location line="+1"/>
         <source>Clear Clipboard</source>
         <translation>Limpar Área de Transferência</translation>
     </message>
@@ -2870,7 +2967,7 @@
         <translation>Limpar Ambiente de Trabalho</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+6"/>
         <source>Step Into</source>
         <translation>Passo adentro</translation>
     </message>
@@ -2941,12 +3038,12 @@
     </message>
     <message>
         <location line="+2"/>
-        <location line="+216"/>
+        <location line="+234"/>
         <source>Editor</source>
         <translation>Editor</translation>
     </message>
     <message>
-        <location line="-214"/>
+        <location line="-232"/>
         <source>Documentation</source>
         <translation>Documentação</translation>
     </message>
@@ -3026,19 +3123,29 @@
         <translation>Imprimir</translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+3"/>
         <source>Redo</source>
         <translation>Refazer</translation>
     </message>
     <message>
+        <location line="+1"/>
+        <source>Cut</source>
+        <translation>Recortar</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Find and Replace</source>
+        <translation>Localizar e Substituir</translation>
+    </message>
+    <message>
         <location line="+2"/>
-        <source>Cut</source>
-        <translation>Recortar</translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Find and Replace</source>
-        <translation>Localizar e Substituir</translation>
+        <source>Find Next</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Find Previous</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+2"/>
@@ -3163,7 +3270,68 @@
         <translation>Exibir Números de Linha</translation>
     </message>
     <message>
-        <location line="-145"/>
+        <location line="+48"/>
+        <source>Switch to Left Tab</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Switch to Right Tab</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Move Tab Left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Move Tab Right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+44"/>
+        <source>Global</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+38"/>
+        <source>Tabs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+98"/>
+        <source>Enter new Shortcut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+143"/>
+        <source>Overwriting Shortcuts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>You are about to overwrite all shortcuts.
+Would you like to save the current shortcut set or cancel the action?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Don&apos;t save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+39"/>
+        <source>Import shortcuts from file ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Export shortcuts into file ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-571"/>
         <source>Step</source>
         <translation type="unfinished">Passo-a-passo</translation>
     </message>
@@ -3224,6 +3392,21 @@
     </message>
     <message>
         <location line="+2"/>
+        <source>Show Toolbar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Show Statusbar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Show Horizontal Scrollbar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>Zoom In</source>
         <translation>Mais Zoom</translation>
     </message>
@@ -3279,12 +3462,7 @@
         <translation>Documentação na Palavra-chave</translation>
     </message>
     <message>
-        <location line="+42"/>
-        <source>Main</source>
-        <translation>Principal</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <location line="+57"/>
         <location line="+23"/>
         <source>File</source>
         <translation>Arquivo</translation>
@@ -3328,12 +3506,7 @@
         <translation>Executar</translation>
     </message>
     <message>
-        <location line="+124"/>
-        <source>Enter new Shortcut for Set %1</source>
-        <translation>Entre nova Tecla de atalho para Conjunto %1</translation>
-    </message>
-    <message>
-        <location line="+5"/>
+        <location line="+106"/>
         <source>Apply the desired shortcut or click on the right button to reset the shortcut to its default.</source>
         <translation>Aplicar tecla de atalho desejada ou clique no botão à direita para resetá-la para o padrão.</translation>
     </message>
@@ -3358,7 +3531,7 @@
         <translation>Usar padrão</translation>
     </message>
     <message>
-        <location line="+53"/>
+        <location line="+45"/>
         <source>Double Shortcut</source>
         <translation>Tecla de Atalho Dupla</translation>
     </message>
@@ -3376,23 +3549,13 @@
 Você quer usar a tecla de atalho de qualquer forma, removendo-a da outra ação? </translation>
     </message>
     <message>
-        <location line="+71"/>
-        <source>Import shortcut set %1 from file ...</source>
-        <translation>Importar conjunto de teclas de atalho %1 de arquivo...</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <location line="+6"/>
+        <location line="+113"/>
+        <location line="+5"/>
         <source>Octave Shortcut Files (*.osc);;All Files (*)</source>
         <translation>Arquivos de teclas de atalho do Octave (*.osc);; Todos Arquivos (*)</translation>
     </message>
     <message>
-        <location line="-1"/>
-        <source>Export shortcut set %1 into file ...</source>
-        <translation>Exportar conjunto de teclas de atalho %1 para arquivo... </translation>
-    </message>
-    <message>
-        <location line="+15"/>
+        <location line="+10"/>
         <source>Failed to open %1 as octave shortcut file</source>
         <translation>Falha ao abrir %1 como arquivo de teclas de atalho do Octave</translation>
     </message>
@@ -3431,7 +3594,7 @@
 <context>
     <name>welcome_wizard</name>
     <message>
-        <location filename="../src/welcome-wizard.cc" line="+135"/>
+        <location filename="../src/welcome-wizard.cc" line="+133"/>
         <source>Welcome to GNU Octave</source>
         <translation>Bem-vindo ao GNU Octave</translation>
     </message>
@@ -3439,7 +3602,7 @@
 <context>
     <name>workspace_model</name>
     <message>
-        <location filename="../src/workspace-model.cc" line="-42"/>
+        <location filename="../src/workspace-model.cc" line="-41"/>
         <source>Name</source>
         <translation>Nome</translation>
     </message>
@@ -3464,7 +3627,7 @@
         <translation>Atributo</translation>
     </message>
     <message>
-        <location line="+109"/>
+        <location line="+108"/>
         <source>Right click to copy, rename, or display</source>
         <translation>Clique com botão direito para copiar, renomear ou exibir</translation>
     </message>
@@ -3478,7 +3641,7 @@
 <context>
     <name>workspace_view</name>
     <message>
-        <location filename="../src/workspace-view.cc" line="+50"/>
+        <location filename="../src/workspace-view.cc" line="+51"/>
         <source>Workspace</source>
         <translation>Ambiente de Trabalho</translation>
     </message>
@@ -3498,7 +3661,7 @@
         <translation>Filtrar</translation>
     </message>
     <message>
-        <location line="+161"/>
+        <location line="+242"/>
         <source>Copy name</source>
         <translation>Copiar nome</translation>
     </message>
@@ -3514,11 +3677,41 @@
     </message>
     <message>
         <location line="+9"/>
-        <source>Only top-level symbols may be renamed.</source>
-        <translation>Somente símbolos do nível mais alto podem ser renomeados.</translation>
-    </message>
-    <message>
-        <location line="+132"/>
+        <source>Only top-level symbols may be renamed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Hide filter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Show filter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+149"/>
+        <source>Class</source>
+        <translation type="unfinished">Classe</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Dimension</source>
+        <translation type="unfinished">Dimensão</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Value</source>
+        <translation type="unfinished">Valor</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Attribute</source>
+        <translation type="unfinished">Atributo</translation>
+    </message>
+    <message>
+        <location line="-17"/>
         <source>View the variables in the active workspace.&lt;br&gt;</source>
         <translation>Visualizar as variáveis no Ambiente de Trabalho ativo.&lt;br&gt;</translation>
     </message>
--- a/libgui/languages/pt_PT.ts	Thu Aug 18 12:26:32 2016 -0700
+++ b/libgui/languages/pt_PT.ts	Fri Aug 19 21:05:48 2016 +0200
@@ -4,7 +4,7 @@
 <context>
     <name>ListDialog</name>
     <message>
-        <location filename="../src/dialog.cc" line="+251"/>
+        <location filename="../src/dialog.cc" line="+258"/>
         <source>Select All</source>
         <translation>Selecionar Tudo</translation>
     </message>
@@ -12,7 +12,7 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../src/workspace-model.cc" line="+75"/>
+        <location filename="../src/workspace-model.cc" line="+74"/>
         <source>automatic</source>
         <translation>automático(a)</translation>
     </message>
@@ -61,11 +61,39 @@
         <source>cursor</source>
         <translation>cursor</translation>
     </message>
+    <message>
+        <location filename="../src/settings-dialog.cc" line="+132"/>
+        <source>Difference to the default size</source>
+        <translation type="unfinished">Diferença em relação ao tamanho do tipo de letra default</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Background color, pink (255,0,255) means default</source>
+        <translation type="unfinished">Cor de fundo rosa (255,0,255) significa padrão</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>b</source>
+        <comment>short form for bold</comment>
+        <translation type="unfinished">n</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>i</source>
+        <comment>short form for italic</comment>
+        <translation type="unfinished">i</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>u</source>
+        <comment>short form for underlined</comment>
+        <translation type="unfinished">s</translation>
+    </message>
 </context>
 <context>
     <name>QTerminal</name>
     <message>
-        <location filename="../qterminal/libqterminal/QTerminal.h" line="+135"/>
+        <location filename="../qterminal/libqterminal/QTerminal.h" line="+130"/>
         <source>Copy</source>
         <translation>Copiar</translation>
     </message>
@@ -80,15 +108,20 @@
         <translation>Seleccionar Tudo</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+7"/>
         <source>Clear Window</source>
         <translation>Limpar Tudo</translation>
     </message>
+    <message>
+        <location filename="../qterminal/libqterminal/QTerminal.cc" line="+46"/>
+        <source>Edit %1 at line %2</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QWinTerminalImpl</name>
     <message>
-        <location filename="../qterminal/libqterminal/win32/QWinTerminalImpl.cpp" line="+1778"/>
+        <location filename="../qterminal/libqterminal/win32/QWinTerminalImpl.cpp" line="+1779"/>
         <source>copied selection to clipboard</source>
         <translation>selecção copiada para a área de transferência</translation>
     </message>
@@ -762,7 +795,7 @@
 <context>
     <name>QtHandles::Figure</name>
     <message>
-        <location filename="../graphics/Figure.cc" line="+282"/>
+        <location filename="../graphics/Figure.cc" line="+298"/>
         <source>Figure ToolBar</source>
         <translation>Barra de Ferramentas de Figuras</translation>
     </message>
@@ -812,37 +845,19 @@
         <translation>&amp;Copiar</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Cu&amp;t</source>
-        <translation>Cor&amp;tar</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>&amp;Paste</source>
-        <translation>&amp;Colar</translation>
-    </message>
-    <message>
-        <location line="+5"/>
+        <location line="+7"/>
+        <location line="+463"/>
+        <source>About Octave</source>
+        <translation type="unfinished">Sobre o Octave</translation>
+    </message>
+    <message>
+        <location line="-465"/>
         <source>&amp;Help</source>
         <translation>&amp;Ajuda</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>&amp;About QtHandles</source>
-        <translation>&amp;Sobre QtHandles</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>About &amp;Qt</source>
-        <translation>Sobre &amp;Qt</translation>
-    </message>
-    <message>
-        <location line="+427"/>
-        <source>About QtHandles</source>
-        <translation>Sobre QtHandles</translation>
-    </message>
-    <message>
-        <location line="+39"/>
+        <location line="+504"/>
+        <location line="+69"/>
         <source>Save Figure As</source>
         <translation>Guardar Figura Como</translation>
     </message>
@@ -881,6 +896,160 @@
     </message>
 </context>
 <context>
+    <name>annotation_dialog</name>
+    <message>
+        <location filename="../graphics/annotation-dialog.ui" line="+17"/>
+        <source>Annotation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>String</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Font</source>
+        <translation type="unfinished">Tipo de letra</translation>
+    </message>
+    <message>
+        <location line="+42"/>
+        <source>bold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>b</source>
+        <translation type="unfinished">n</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>italic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>i</source>
+        <translation type="unfinished">i</translation>
+    </message>
+    <message>
+        <location line="+428"/>
+        <source>color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>Horz alignment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <location line="+29"/>
+        <source>middle</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-24"/>
+        <source>right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Vert alignment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>top</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>bottom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Position</source>
+        <translation type="unfinished">Posição</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>X</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Y</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Width</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Height</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>units</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>normalized</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Fit to box</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Box</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Background</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+444"/>
+        <source>Edge</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+133"/>
+        <source>Line style</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>none</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Line width</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>documentation_dock_widget</name>
     <message>
         <location filename="../src/documentation-dock-widget.cc" line="+34"/>
@@ -896,17 +1065,18 @@
 <context>
     <name>file_editor</name>
     <message>
-        <location filename="../src/m-editor/file-editor.cc" line="+285"/>
-        <location line="+125"/>
+        <location filename="../src/m-editor/file-editor.cc" line="+366"/>
+        <location line="+152"/>
         <location line="+19"/>
         <location line="+25"/>
         <location line="+62"/>
         <location line="+28"/>
+        <location line="+79"/>
         <source>Octave Editor</source>
         <translation>Editor do Octave</translation>
     </message>
     <message>
-        <location line="-318"/>
+        <location line="-462"/>
         <source>Octave Files (*.m);;All Files (*)</source>
         <translation>Ficheiros do Octave (*.m);;Todos os Ficheiros (*)</translation>
     </message>
@@ -922,19 +1092,19 @@
         <translation>Nome da nova função:</translation>
     </message>
     <message>
-        <location line="+330"/>
+        <location line="+395"/>
         <source>File not saved! A file with the selected name
 %1
 is already open in the editor</source>
         <translation>O ficheiro não foi guardado! Um ficheiro com o nome selecionado %1 já está aberto no editor</translation>
     </message>
     <message>
-        <location line="+387"/>
+        <location line="+492"/>
         <source>&amp;%1 %2</source>
         <translation></translation>
     </message>
     <message>
-        <location line="+388"/>
+        <location line="+480"/>
         <source>&amp;Save File</source>
         <translation>&amp;Guardar Ficheiro</translation>
     </message>
@@ -950,41 +1120,26 @@
     </message>
     <message>
         <location line="+7"/>
-        <source>&amp;Undo</source>
-        <translation>&amp;Desfazer</translation>
-    </message>
-    <message>
-        <location line="+3"/>
         <source>&amp;Redo</source>
         <translation>&amp;Refazer</translation>
     </message>
     <message>
         <location line="+6"/>
-        <source>&amp;Copy</source>
-        <translation>&amp;Copiar</translation>
-    </message>
-    <message>
-        <location line="+3"/>
         <source>Cu&amp;t</source>
         <translation>Cor&amp;tar</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Paste</source>
-        <translation>Colar</translation>
-    </message>
-    <message>
-        <location line="+96"/>
+        <location line="+94"/>
         <source>&amp;Next Bookmark</source>
         <translation>Marcador &amp;Seguinte</translation>
     </message>
     <message>
-        <location line="-2"/>
+        <location line="+2"/>
         <source>Pre&amp;vious Bookmark</source>
         <translation>Marcardor &amp;Anterior</translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+2"/>
         <source>Toggle &amp;Bookmark</source>
         <translation>Activar/Desactivar &amp;Marcador</translation>
     </message>
@@ -994,7 +1149,7 @@
         <translation>&amp;Remover Todos os Marcadores</translation>
     </message>
     <message>
-        <location line="+54"/>
+        <location line="+68"/>
         <source>&amp;Next Breakpoint</source>
         <translation>Breakpoint &amp;Seguinte</translation>
     </message>
@@ -1014,7 +1169,7 @@
         <translation>&amp;Remover Todos os Breakpoints</translation>
     </message>
     <message>
-        <location line="-104"/>
+        <location line="-118"/>
         <source>&amp;Comment</source>
         <translation>&amp;Comentar</translation>
     </message>
@@ -1034,28 +1189,28 @@
         <translation>&amp;Remover Indentação</translation>
     </message>
     <message>
-        <location line="-55"/>
+        <location line="-61"/>
         <source>&amp;Find and Replace...</source>
         <translation>&amp;Localizar e Substituir...</translation>
     </message>
     <message>
-        <location line="+162"/>
+        <location line="+182"/>
         <source>Save File and Run</source>
         <translation>Guardar Ficheiro e Executá-lo</translation>
     </message>
     <message>
-        <location line="-90"/>
+        <location line="-104"/>
         <source>Go &amp;to Line...</source>
         <translation>Ir para a &amp;Linha...</translation>
     </message>
     <message>
-        <location line="-1126"/>
+        <location line="-1341"/>
         <source>Could not start custom file editor
 %1</source>
         <translation>Não foi possível iniciar o editor de ficheiro externo %1</translation>
     </message>
     <message>
-        <location line="+148"/>
+        <location line="+175"/>
         <source>Create</source>
         <translation>Criar</translation>
     </message>
@@ -1065,7 +1220,7 @@
         <translation>Cancelar</translation>
     </message>
     <message>
-        <location line="+844"/>
+        <location line="+1041"/>
         <source>&amp;Recent Editor Files</source>
         <translation>Ficheiros &amp;Recentes</translation>
     </message>
@@ -1090,12 +1245,7 @@
         <translation>Fechar Outros Ficheiros</translation>
     </message>
     <message>
-        <location line="+31"/>
-        <source>Select All</source>
-        <translation>Selecionar Tudo</translation>
-    </message>
-    <message>
-        <location line="+10"/>
+        <location line="+32"/>
         <source>&amp;Commands</source>
         <translation>&amp;Comandos</translation>
     </message>
@@ -1220,17 +1370,62 @@
         <translation>Mostrar &amp;Números de Linha</translation>
     </message>
     <message>
-        <location line="+128"/>
-        <source>Editor</source>
-        <translation>Editor</translation>
-    </message>
-    <message>
-        <location line="-120"/>
-        <source>Show Line &amp;Endings</source>
-        <translation>Mostrar &amp;Fins de Linha</translation>
+        <location line="+22"/>
+        <source>Show &amp;Toolbar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Show &amp;Statusbar</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+4"/>
+        <source>Show &amp;Horizontal Scrollbar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+69"/>
+        <source>Recent Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+65"/>
+        <source>Editor</source>
+        <translation>Editor</translation>
+    </message>
+    <message>
+        <location line="-156"/>
+        <source>Show Line &amp;Endings</source>
+        <translation>Mostrar &amp;Fins de Linha</translation>
+    </message>
+    <message>
+        <location line="-1467"/>
+        <source>File Encoding:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+403"/>
+        <source>%1 is a built-in function</source>
+        <translation type="unfinished">%1 é uma função interna</translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>Can not find function %1</source>
+        <translation type="unfinished">Não foi possível encontrar função %1</translation>
+    </message>
+    <message>
+        <location line="+911"/>
+        <source>Find &amp;Next...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Find &amp;Previous...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+118"/>
         <source>Show &amp;Indentation Guides</source>
         <translation>Mostrar &amp;Guias de Indentação</translation>
     </message>
@@ -1240,7 +1435,7 @@
         <translation>Mostrar &amp;Guia de Linhas Longas</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+20"/>
         <source>Zoom &amp;In</source>
         <translation>&amp;Aumentar</translation>
     </message>
@@ -1275,7 +1470,7 @@
         <translation>&amp;Documentação da Palavra Reservada</translation>
     </message>
     <message>
-        <location line="-1103"/>
+        <location line="-1305"/>
         <source>Could not open file
 %1
 for read: %2.</source>
@@ -1307,7 +1502,7 @@
         <translation>A aba do editor associada ao ficheiro desapareceu.</translation>
     </message>
     <message>
-        <location line="+731"/>
+        <location line="+928"/>
         <source>&amp;File</source>
         <translation>&amp;Ficheiro</translation>
     </message>
@@ -1317,12 +1512,12 @@
         <translation>&amp;Editar</translation>
     </message>
     <message>
-        <location line="+138"/>
+        <location line="+129"/>
         <source>Show &amp;Whitespace Characters</source>
         <translation>Mostrar &amp;Whitespace</translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+42"/>
         <source>&amp;Debug</source>
         <translation>&amp;Debug</translation>
     </message>
@@ -1335,12 +1530,12 @@
 <context>
     <name>file_editor_tab</name>
     <message>
-        <location filename="../src/m-editor/file-editor-tab.cc" line="+92"/>
+        <location filename="../src/m-editor/file-editor-tab.cc" line="+145"/>
         <source>eol:</source>
         <translation>eol:</translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="-17"/>
         <source>line:</source>
         <translation>linha:</translation>
     </message>
@@ -1350,17 +1545,7 @@
         <translation>col:</translation>
     </message>
     <message>
-        <location line="+156"/>
-        <source>%1 is a built-in function</source>
-        <translation>%1 é uma função interna</translation>
-    </message>
-    <message>
-        <location line="+31"/>
-        <source>Can not find function %1</source>
-        <translation>Não foi possível encontrar função %1</translation>
-    </message>
-    <message>
-        <location line="+775"/>
+        <location line="+1146"/>
         <source>Goto line</source>
         <translation>Ir para a linha</translation>
     </message>
@@ -1370,7 +1555,7 @@
         <translation>Número da linha</translation>
     </message>
     <message>
-        <location line="+146"/>
+        <location line="+145"/>
         <location line="+63"/>
         <source>&lt;unnamed&gt;</source>
         <translation>&lt;sem_nome&gt;</translation>
@@ -1389,12 +1574,28 @@
 vai ser fechado mas foi modificado.  %2</translation>
     </message>
     <message>
-        <location line="+288"/>
+        <location line="+298"/>
+        <source>Debug or Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>This file is currently being executed.
+Quit debugging and save?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+166"/>
         <source>Line Endings:</source>
         <translation>Fins de Linha:</translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+9"/>
+        <source>File Encoding:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+28"/>
         <source>Octave Files (*.m)</source>
         <translation>Ficheiros Octave (*.m)</translation>
     </message>
@@ -1404,22 +1605,59 @@
         <translation>Todos os Ficheiros (*)</translation>
     </message>
     <message>
-        <location line="-322"/>
+        <location line="-513"/>
         <source>Do you want to cancel closing, save or discard the changes?</source>
         <translation>Deseja cancelar o fecho, guardar as alterações, ou descartá-las?</translation>
     </message>
     <message>
-        <location line="-970"/>
-        <location line="+979"/>
-        <location line="+213"/>
-        <location line="+177"/>
-        <location line="+85"/>
+        <location line="-1342"/>
+        <source>encoding:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+239"/>
+        <source>Breakpoint condition</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+88"/>
+        <location line="+1024"/>
+        <location line="+372"/>
+        <location line="+215"/>
+        <location line="+21"/>
+        <location line="+83"/>
         <location line="+23"/>
         <source>Octave Editor</source>
         <translation>Editor do Octave</translation>
     </message>
     <message>
-        <location line="-6"/>
+        <location line="-1737"/>
+        <source>Cannot add breakpoint to modified file.
+Save and add breakpoint, or canel?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1611"/>
+        <source>&quot;%1&quot;
+is not a valid identifier.
+
+If you keep this filename, you will not be able to
+call your script using its name as an Octave command.
+
+Do you want to choose another name?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>The current editor contents can not be encoded
+with the selected codec %1.
+Using it will result in data loss!
+
+Do you want to chose another codec?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+99"/>
         <source>
 
 Warning: The contents in the editor is modified!</source>
@@ -1437,31 +1675,14 @@
 foi apagado ou movido. Gostaria de guardar agora?%2</translation>
     </message>
     <message>
-        <location line="-285"/>
+        <location line="-342"/>
         <source>Could not open file %1 for write:
 %2.</source>
         <translation>Não foi possível abrir ficheiro %1 para escrita:
 %2.</translation>
     </message>
     <message>
-        <location line="+177"/>
-        <source>&quot;%1&quot;
-is not a valid identifier.
-
-If you keep this file name, you will not be able to
-call your script using its name as an Octave command.
-
-Do you want to choose another name?</source>
-        <translation>&quot;%1&quot;
-não é um identificador válido.
-
-Se manter esse nome de ficheiro, não será possivel 
-executar esse script como um comando no Octave.
-
-Deseja escolher outro nome? </translation>
-    </message>
-    <message>
-        <location line="+85"/>
+        <location line="+319"/>
         <source>It seems that &apos;%1&apos; has been modified by another application. Do you want to reload it?</source>
         <translation>Parece que o ficheiro &apos;%1&apos; foi modificado por outra aplicativo. Deseja recarregá-lo?</translation>
     </message>
@@ -1474,12 +1695,7 @@
         <translation>Navegador de Ficheiros</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Browse your files.</source>
-        <translation>Navegar ficheiros.</translation>
-    </message>
-    <message>
-        <location line="+18"/>
+        <location line="+35"/>
         <source>Enter the path or filename</source>
         <translation>Introduzir o local ou nome de ficheiro</translation>
     </message>
@@ -1500,22 +1716,67 @@
     </message>
     <message>
         <location line="+4"/>
-        <location line="+388"/>
+        <location line="+373"/>
         <source>Find Files...</source>
         <translation>Localizar Ficheiros...</translation>
     </message>
     <message>
-        <location line="+364"/>
+        <location line="-26"/>
+        <source>Open in System File Explorer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Open in Text Editor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+389"/>
         <source>New Directory</source>
         <translation>Novo Directório</translation>
     </message>
     <message>
-        <location line="-784"/>
+        <location line="-773"/>
         <source>Show Octave directory</source>
         <translation>Exibir o directório do Octave</translation>
     </message>
     <message>
-        <location line="-4"/>
+        <location line="-49"/>
+        <source>Browse your files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Alternating row colors</source>
+        <translation type="unfinished">Alternar cor das linhas</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>filesdockwidget/showFileSize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>filesdockwidget/showFileType</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>filesdockwidget/showLastModified</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>filesdockwidget/showHiddenFiles</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>filesdockwidget/useAlternatingRowColors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+29"/>
         <source>One directory up</source>
         <translation>Um nível acima</translation>
     </message>
@@ -1536,53 +1797,48 @@
     </message>
     <message>
         <location line="+20"/>
-        <location line="+397"/>
+        <location line="+382"/>
         <source>New File...</source>
         <translation>Novo Ficheiro...</translation>
     </message>
     <message>
-        <location line="-394"/>
-        <location line="+397"/>
+        <location line="-379"/>
+        <location line="+382"/>
         <source>New Directory...</source>
         <translation>Novo Directório...</translation>
     </message>
     <message>
-        <location line="-335"/>
+        <location line="-329"/>
         <source>Activate to open in editor, right click for alternatives</source>
         <translation>Duplo-clique para activar, botão direito para alternativas</translation>
     </message>
     <message>
-        <location line="+236"/>
+        <location line="-136"/>
         <source>File size</source>
         <translation>Tamanho do ficheiro</translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+1"/>
         <source>File type</source>
         <translation>Tipo do ficheiro</translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+1"/>
         <source>Date modified</source>
         <translation>Data de modificação</translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+1"/>
         <source>Show hidden</source>
         <translation>Mostrar ocultos</translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+415"/>
         <source>Open</source>
         <translation>Abrir</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Open in Default Application</source>
-        <translation>Abrir no Programa Default</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <location line="+13"/>
         <source>Copy Selection to Clipboard</source>
         <translation>Copiar Selecção para Área de Transferência</translation>
     </message>
@@ -1612,7 +1868,7 @@
         <translation>Apagar...</translation>
     </message>
     <message>
-        <location line="+115"/>
+        <location line="+125"/>
         <source>Rename file/directory</source>
         <translation>Mudar nome do ficheiro/directório</translation>
     </message>
@@ -1648,7 +1904,7 @@
         <translation>Não é possível apagar um directório que não está vázio</translation>
     </message>
     <message>
-        <location line="+151"/>
+        <location line="+145"/>
         <source>Set directory of file browser</source>
         <translation>Definir directório do nagevador de ficheiros</translation>
     </message>
@@ -1687,7 +1943,7 @@
 <context>
     <name>final_page</name>
     <message>
-        <location filename="../src/welcome-wizard.cc" line="+199"/>
+        <location filename="../src/welcome-wizard.cc" line="+195"/>
         <source>Enjoy!</source>
         <translation>Aproveite!</translation>
     </message>
@@ -1750,7 +2006,7 @@
 <context>
     <name>find_dialog</name>
     <message>
-        <location filename="../src/m-editor/find-dialog.cc" line="+74"/>
+        <location filename="../src/m-editor/find-dialog.cc" line="+85"/>
         <source>Find and Replace</source>
         <translation>Localizar e Substituir</translation>
     </message>
@@ -1825,7 +2081,7 @@
         <translation>Localizar dentro do texto &amp;selecionado</translation>
     </message>
     <message>
-        <location line="+84"/>
+        <location line="+87"/>
         <source>Search from end</source>
         <translation>Localizar a partir do final</translation>
     </message>
@@ -1835,7 +2091,7 @@
         <translation>Localizar a partir do início</translation>
     </message>
     <message>
-        <location line="+205"/>
+        <location line="+221"/>
         <source>Replace Result</source>
         <translation>Substituir Resultado</translation>
     </message>
@@ -1953,7 +2209,7 @@
         <translation>Resultados da procura</translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+21"/>
         <source>Idle.</source>
         <translation>Aguardando.</translation>
     </message>
@@ -1979,8 +2235,8 @@
     </message>
     <message>
         <location line="+15"/>
-        <source>File name/location</source>
-        <translation>Nome/local do ficheiro</translation>
+        <source>Filename/location</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+17"/>
@@ -1988,7 +2244,7 @@
         <translation>Conteúdo do ficheiro</translation>
     </message>
     <message>
-        <location line="+105"/>
+        <location line="+111"/>
         <source>Searching...</source>
         <translation>A procurar...</translation>
     </message>
@@ -2006,7 +2262,7 @@
 <context>
     <name>find_files_model</name>
     <message>
-        <location filename="../src/find-files-model.cc" line="+82"/>
+        <location filename="../src/find-files-model.cc" line="+83"/>
         <source>Filename</source>
         <translation>Nome do Ficheiro</translation>
     </message>
@@ -2044,7 +2300,7 @@
         <translation>Histórico de Comandos</translation>
     </message>
     <message>
-        <location line="+89"/>
+        <location line="+107"/>
         <source>Copy</source>
         <translation>Copiar</translation>
     </message>
@@ -2058,11 +2314,21 @@
         <source>Create script</source>
         <translation>Criar script</translation>
     </message>
+    <message>
+        <location line="+4"/>
+        <source>Hide filter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Show filter</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>initial_page</name>
     <message>
-        <location filename="../src/welcome-wizard.cc" line="-179"/>
+        <location filename="../src/welcome-wizard.cc" line="-176"/>
         <source>Welcome to Octave!</source>
         <translation>Bem-vindo(a) ao Octave!</translation>
     </message>
@@ -2093,13 +2359,13 @@
 <context>
     <name>main_window</name>
     <message>
-        <location filename="../src/main-window.cc" line="+268"/>
+        <location filename="../src/main-window.cc" line="+275"/>
         <source>Load Workspace</source>
         <translation>Carregar Ambiente de Trabalho</translation>
     </message>
     <message>
-        <location line="+732"/>
-        <location line="+931"/>
+        <location line="+758"/>
+        <location line="+975"/>
         <source>About Octave</source>
         <translation>Sobre o Octave</translation>
     </message>
@@ -2109,12 +2375,12 @@
         <translation>&amp;Ficheiro</translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+45"/>
         <source>New</source>
         <translation>Novo</translation>
     </message>
     <message>
-        <location line="-43"/>
+        <location line="-39"/>
         <source>Open...</source>
         <translation>Abrir...</translation>
     </message>
@@ -2124,7 +2390,7 @@
         <translation>Preferências...</translation>
     </message>
     <message>
-        <location line="-95"/>
+        <location line="-99"/>
         <source>Exit</source>
         <translation>Sair</translation>
     </message>
@@ -2139,22 +2405,22 @@
         <translation>Desfazer</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+7"/>
         <source>Copy</source>
         <translation>Copiar</translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+5"/>
         <source>Paste</source>
         <translation>Colar</translation>
     </message>
     <message>
-        <location line="-1469"/>
+        <location line="-1537"/>
         <source>Save Workspace As</source>
         <translation>Guardar Ambiente de Trabalho Como</translation>
     </message>
     <message>
-        <location line="+134"/>
+        <location line="+124"/>
         <source>The release notes file &apos;%1&apos; is empty.</source>
         <translation>O ficheiro de notas da versão &apos;%1&apos; está vazio.</translation>
     </message>
@@ -2164,7 +2430,7 @@
         <translation>O ficheiro de notas da versão &apos;%1&apos; não pode ser lido.</translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="+12"/>
         <source>Octave Release Notes</source>
         <translation>Notas da Versão do Octave</translation>
     </message>
@@ -2174,17 +2440,17 @@
         <translation>Novidades da Comunidade</translation>
     </message>
     <message>
-        <location line="+187"/>
+        <location line="+206"/>
         <source>Are you sure you want to exit Octave?</source>
         <translation>Tem certeza que deseja sair do Octave?</translation>
     </message>
     <message>
-        <location line="+854"/>
+        <location line="+916"/>
         <source>Open an existing file in editor</source>
         <translation>Abrir um ficheiro existente no editor</translation>
     </message>
     <message>
-        <location line="+48"/>
+        <location line="+44"/>
         <source>New Function...</source>
         <translation>Nova Função...</translation>
     </message>
@@ -2194,12 +2460,12 @@
         <translation>Nova Figura</translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+39"/>
         <source>Select All</source>
         <translation>Selecionar Tudo</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="+4"/>
         <source>Clear Clipboard</source>
         <translation>Limpar Área de Transferência</translation>
     </message>
@@ -2249,17 +2515,27 @@
         <translation>Navegador de Ficheiros</translation>
     </message>
     <message>
-        <location line="-84"/>
+        <location line="+36"/>
+        <source>Contribute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Donate to Octave</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-123"/>
         <source>Step In</source>
         <translation>Passo adentro</translation>
     </message>
     <message>
-        <location line="-1020"/>
+        <location line="-1082"/>
         <source>Octave</source>
         <translation>Octave</translation>
     </message>
     <message>
-        <location line="+868"/>
+        <location line="+926"/>
         <source>Load Workspace...</source>
         <translation>Carregar Ambiente de Trabalho...</translation>
     </message>
@@ -2274,7 +2550,7 @@
         <translation>Novo Script</translation>
     </message>
     <message>
-        <location line="+124"/>
+        <location line="+128"/>
         <source>Step Out</source>
         <translation>Passo afora</translation>
     </message>
@@ -2294,17 +2570,7 @@
         <translation>Partilhar Código</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Contribute to Octave</source>
-        <translation>Contribuir para o Octave</translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Octave Developer Resources</source>
-        <translation>Recursos para Programadores</translation>
-    </message>
-    <message>
-        <location line="+14"/>
+        <location line="+20"/>
         <source>On Disk</source>
         <translation>No Disco (Em Seu Computador)</translation>
     </message>
@@ -2349,8 +2615,8 @@
         <translation>Directório um nível acima</translation>
     </message>
     <message>
-        <location line="-1148"/>
-        <location line="+1151"/>
+        <location line="-1198"/>
+        <location line="+1201"/>
         <source>Browse directories</source>
         <translation>Escolher directório</translation>
     </message>
@@ -2429,7 +2695,7 @@
 <context>
     <name>news_reader</name>
     <message>
-        <location line="-1411"/>
+        <location line="-1492"/>
         <source>&lt;html&gt;
 &lt;body&gt;
 &lt;p&gt;
@@ -2487,18 +2753,18 @@
 <context>
     <name>octave_dock_widget</name>
     <message>
-        <location filename="../src/octave-dock-widget.cc" line="+68"/>
-        <location line="+198"/>
+        <location filename="../src/octave-dock-widget.cc" line="+67"/>
+        <location line="+201"/>
         <source>Undock widget</source>
         <translation>Desacoplar painel</translation>
     </message>
     <message>
-        <location line="-188"/>
+        <location line="-191"/>
         <source>Hide widget</source>
         <translation>Ocultar painel</translation>
     </message>
     <message>
-        <location line="+132"/>
+        <location line="+136"/>
         <source>Dock widget</source>
         <translation>Acoplar painel</translation>
     </message>
@@ -2506,7 +2772,7 @@
 <context>
     <name>octave_qscintilla</name>
     <message>
-        <location filename="../src/m-editor/octave-qscintilla.cc" line="+226"/>
+        <location filename="../src/m-editor/octave-qscintilla.cc" line="+237"/>
         <source>Help on</source>
         <translation>Ajuda sobre</translation>
     </message>
@@ -2520,18 +2786,23 @@
         <source>Edit</source>
         <translation>Editar</translation>
     </message>
+    <message>
+        <location line="+15"/>
+        <source>dbstop if ...</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>octave_qt_link</name>
     <message>
-        <location filename="../src/octave-qt-link.cc" line="+111"/>
-        <location line="+6"/>
-        <location line="+7"/>
+        <location filename="../src/octave-qt-link.cc" line="+136"/>
+        <location line="+9"/>
+        <location line="+11"/>
         <source>Create</source>
         <translation>Criar</translation>
     </message>
     <message>
-        <location line="-10"/>
+        <location line="-14"/>
         <source>File
 %1
 does not exist. Do you want to create it?</source>
@@ -2545,7 +2816,7 @@
         <translation>Editor do Octave</translation>
     </message>
     <message>
-        <location line="+211"/>
+        <location line="+254"/>
         <source>The file %1 does not exist in the load path.  To run or debug the function you are editing, you must either change to the directory %2 or add that directory to the load path.</source>
         <translation type="unfinished">O ficheiro %1 não existe no caminho de procura. Para executar ou depurar a função que você está editando, é preciso definir o directório actual como %2 ou adicionar aquele directório ao caminho de busca.</translation>
     </message>
@@ -2570,8 +2841,8 @@
         <translation>Adicionar Directório ao Load Path</translation>
     </message>
     <message>
-        <location line="-223"/>
-        <location line="+224"/>
+        <location line="-269"/>
+        <location line="+270"/>
         <source>Cancel</source>
         <translation>Cancelar</translation>
     </message>
@@ -2587,7 +2858,7 @@
 <context>
     <name>resource_manager</name>
     <message>
-        <location filename="../src/resource-manager.cc" line="+245"/>
+        <location filename="../src/resource-manager.cc" line="+246"/>
         <source>The settings file
 %1
 does not exist and can not be created.
@@ -2613,731 +2884,589 @@
     <name>settings_dialog</name>
     <message>
         <location filename="../src/settings-dialog.ui" line="+23"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1738"/>
         <source>Settings</source>
         <translation>Configurações</translation>
     </message>
     <message>
         <location line="+19"/>
         <location line="+468"/>
-        <location filename="../src/ui-settings-dialog.h" line="+25"/>
-        <location line="+1"/>
         <source>General</source>
         <translation>Geral</translation>
     </message>
     <message>
         <location line="-338"/>
-        <location filename="../src/ui-settings-dialog.h" line="-17"/>
         <source>Octave logo only</source>
         <translation>Apenas logotipo do Octave</translation>
     </message>
     <message>
         <location line="+10"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Letter icons</source>
         <translation>Ícones de texto</translation>
     </message>
     <message>
         <location line="+7"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Graphic icons</source>
         <translation>Ícones gráficos</translation>
     </message>
     <message>
         <location line="-118"/>
-        <location filename="../src/ui-settings-dialog.h" line="-9"/>
         <source>Dock widget title bar</source>
         <translation>Barra de título do painel</translation>
     </message>
     <message>
         <location line="+60"/>
-        <location filename="../src/ui-settings-dialog.h" line="+4"/>
         <source>Normal</source>
         <translation>Normal</translation>
     </message>
     <message>
         <location line="+178"/>
-        <location filename="../src/ui-settings-dialog.h" line="+11"/>
         <source>Custom style</source>
         <translation>Estilo personalizado</translation>
     </message>
     <message>
         <location line="+92"/>
-        <location filename="../src/ui-settings-dialog.h" line="+4"/>
         <source>These preferences are applied after any .octaverc startup files.</source>
         <translation>Estas preferências são aplicadas depois dos ficheiros de inicialização (.octaverc).</translation>
     </message>
     <message>
         <location line="+55"/>
-        <location filename="../src/ui-settings-dialog.h" line="+3"/>
         <source>Restore working directory of previous session</source>
         <translation>Restaurar directório de trabalho da sessão anterior</translation>
     </message>
     <message>
         <location line="+33"/>
-        <location filename="../src/ui-settings-dialog.h" line="+58"/>
         <source>Editor</source>
         <translation>Editor</translation>
     </message>
     <message>
-        <location line="+151"/>
-        <location filename="../src/ui-settings-dialog.h" line="-49"/>
+        <location line="+107"/>
         <source>Color</source>
         <translation>Cor</translation>
     </message>
     <message>
-        <location line="+138"/>
-        <location filename="../src/ui-settings-dialog.h" line="+6"/>
+        <location line="-69"/>
         <source>Draw a long line marker</source>
         <translation>Desenhar guia vertical de linhas longas</translation>
     </message>
     <message>
-        <location line="+48"/>
-        <location filename="../src/ui-settings-dialog.h" line="+3"/>
+        <location line="+155"/>
         <source>Show EOL characters</source>
         <translation>Mostrar caracteres de fins de linha</translation>
     </message>
     <message>
-        <location line="+9"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
+        <location line="+662"/>
         <source>Default EOL mode</source>
         <translation>Modo padrão para final de linha</translation>
     </message>
     <message>
-        <location line="+154"/>
-        <location filename="../src/ui-settings-dialog.h" line="+12"/>
+        <location line="-394"/>
         <source>Indent width</source>
         <translation>Largura de indentação</translation>
     </message>
     <message>
         <location line="+7"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Tab indents line</source>
         <translation>Tecla Tab causa indentação na linha</translation>
     </message>
     <message>
         <location line="+7"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Auto indentation</source>
         <translation>Auto-indentação</translation>
     </message>
     <message>
         <location line="+26"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Tab width</source>
         <translation>Largura do Tab</translation>
     </message>
     <message>
         <location line="+7"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Show indentation guides</source>
         <translation>Exibir guias de indentação</translation>
     </message>
     <message>
         <location line="+23"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Backspace unindents line</source>
         <translation>Tecla Backspace remove indentação da linha</translation>
     </message>
     <message>
         <location line="+88"/>
-        <location filename="../src/ui-settings-dialog.h" line="+3"/>
         <source>Match keywords</source>
         <translation>Completar palavras-chave do Octave</translation>
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Case sensitive</source>
         <translation>Diferenciar maiúsculas/minúsculas</translation>
     </message>
     <message>
         <location line="+23"/>
-        <location filename="../src/ui-settings-dialog.h" line="+2"/>
         <source>Replace word by suggested one</source>
         <translation>Substituir palavra por aquela sugerida</translation>
     </message>
     <message>
         <location line="-10"/>
-        <location filename="../src/ui-settings-dialog.h" line="-1"/>
         <source>Match words in document</source>
         <translation>Preencher com palavras do documento</translation>
     </message>
     <message>
-        <location line="+173"/>
-        <location filename="../src/ui-settings-dialog.h" line="+14"/>
+        <location line="+185"/>
         <source>Restore editor tabs from previous session on startup</source>
         <translation>Restaurar abas de edição da sessão anterior durante a inicialização</translation>
     </message>
     <message>
-        <location line="-426"/>
-        <location filename="../src/ui-settings-dialog.h" line="-28"/>
+        <location line="-438"/>
         <source>Use custom file editor</source>
         <translation>Usar editor de texto externo</translation>
     </message>
     <message>
-        <location line="+482"/>
-        <location filename="../src/ui-settings-dialog.h" line="+33"/>
+        <location line="+574"/>
         <source>Editor Styles</source>
         <translation>Estilos do Editor</translation>
     </message>
     <message>
         <location line="+287"/>
-        <location filename="../src/ui-settings-dialog.h" line="+10"/>
         <source>Terminal Colors</source>
         <translation>Cores do Terminal</translation>
     </message>
     <message>
         <location line="-173"/>
-        <location filename="../src/ui-settings-dialog.h" line="-6"/>
         <source>Font</source>
         <translation>Tipo de letra</translation>
     </message>
     <message>
-        <location line="-917"/>
-        <location filename="../src/ui-settings-dialog.h" line="-58"/>
+        <location line="-1007"/>
         <source>Show line numbers</source>
         <translation>Mostrar números da linha</translation>
     </message>
     <message>
-        <location line="-72"/>
-        <location filename="../src/ui-settings-dialog.h" line="-3"/>
+        <location line="+81"/>
         <source>Highlight current line</source>
         <translation>Destacar linha actual</translation>
     </message>
     <message>
-        <location line="+85"/>
-        <location filename="../src/ui-settings-dialog.h" line="+4"/>
+        <location line="+13"/>
         <source>Show complete path in window title</source>
         <translation type="unfinished">Mostrar caminho completo no título da janela</translation>
     </message>
     <message>
-        <location line="-29"/>
-        <location filename="../src/ui-settings-dialog.h" line="-2"/>
+        <location line="+13"/>
         <source>Show whitespace</source>
         <translation>Mostrar whitespace</translation>
     </message>
     <message>
-        <location line="+39"/>
-        <location filename="../src/ui-settings-dialog.h" line="+3"/>
+        <location line="+157"/>
         <source>Do not show whitespace used for indentation</source>
         <translation>Não mostrar whitespace usados para indentação</translation>
     </message>
     <message>
-        <location line="+625"/>
-        <location filename="../src/ui-settings-dialog.h" line="+37"/>
+        <location line="+382"/>
         <source>Number of characters before list is shown: </source>
         <translation>Número de caracteres antes da lista ser exibida: </translation>
     </message>
     <message>
-        <location line="+112"/>
-        <location filename="../src/ui-settings-dialog.h" line="+11"/>
+        <location line="+124"/>
         <source>Create nonexistent files without prompting</source>
         <translation>Criar ficheiros não existentes sem confirmar</translation>
     </message>
     <message>
-        <location line="-429"/>
-        <location filename="../src/ui-settings-dialog.h" line="-28"/>
+        <location line="-441"/>
         <source>command line (%f=file, %l=line):</source>
         <translation>linha de comando (%f=ficheiro, %l=linha):</translation>
     </message>
     <message>
-        <location line="+521"/>
-        <location filename="../src/ui-settings-dialog.h" line="+43"/>
+        <location line="+613"/>
         <source>Terminal</source>
         <translation>Linha de comandos</translation>
     </message>
     <message>
         <location line="+51"/>
-        <location filename="../src/ui-settings-dialog.h" line="-8"/>
         <source>Cursor type:</source>
         <translation>Tipo de cursor:</translation>
     </message>
     <message>
         <location line="-11"/>
-        <location filename="../src/ui-settings-dialog.h" line="-1"/>
         <source>Cursor blinking</source>
         <translation>Cursor a piscar</translation>
     </message>
     <message>
         <location line="-7"/>
-        <location filename="../src/ui-settings-dialog.h" line="-1"/>
         <source>Use foreground color</source>
         <translation>Usar cor do primeiro plano</translation>
     </message>
     <message>
         <location line="+59"/>
-        <location filename="../src/ui-settings-dialog.h" line="+4"/>
         <source>Font size</source>
         <translation>Tamanho da letra</translation>
     </message>
     <message>
         <location line="+123"/>
-        <location filename="../src/ui-settings-dialog.h" line="+3"/>
         <source>Set focus to terminal when running a command from within another widget</source>
         <translation>Focar na linha de comandos ao executar comando a partir de um outro painel</translation>
     </message>
     <message>
         <location line="+73"/>
-        <location filename="../src/ui-settings-dialog.h" line="+15"/>
         <source>File Browser</source>
         <translation>Navegador de Ficheiros</translation>
     </message>
     <message>
-        <location line="+46"/>
-        <location filename="../src/ui-settings-dialog.h" line="-8"/>
-        <source>Show file size</source>
-        <translation>Mostrar tamanho do ficheiro</translation>
-    </message>
-    <message>
-        <location line="-14"/>
-        <location filename="../src/ui-settings-dialog.h" line="-2"/>
-        <source>Show file type</source>
-        <translation>Mostrar tipo do ficheiro</translation>
-    </message>
-    <message>
-        <location line="+21"/>
-        <location filename="../src/ui-settings-dialog.h" line="+3"/>
-        <source>Show date of last modification</source>
-        <translation>Mostrar data da última modificação</translation>
-    </message>
-    <message>
-        <location line="-14"/>
-        <location filename="../src/ui-settings-dialog.h" line="-2"/>
-        <source>Show hidden files</source>
-        <translation>Mostrar ficheiros ocultos</translation>
-    </message>
-    <message>
-        <location line="-1715"/>
-        <location filename="../src/ui-settings-dialog.h" line="-97"/>
+        <location line="-1729"/>
         <source>Interface</source>
         <translation>Interface</translation>
     </message>
     <message>
         <location line="+52"/>
-        <location filename="../src/ui-settings-dialog.h" line="+3"/>
         <source>Confirm before exiting</source>
         <translation>Confirmar antes de sair</translation>
     </message>
     <message>
         <location line="+103"/>
-        <location line="+592"/>
-        <location filename="../src/ui-settings-dialog.h" line="+9"/>
-        <location line="+28"/>
+        <location line="+640"/>
         <source>Show status bar</source>
         <translation>Mostrar barra de estado</translation>
     </message>
     <message>
-        <location line="-540"/>
-        <location filename="../src/ui-settings-dialog.h" line="-26"/>
+        <location line="-588"/>
         <source>Text inactive</source>
         <translation>Texto inactivo</translation>
     </message>
     <message>
         <location line="-32"/>
         <location line="+45"/>
-        <location filename="../src/ui-settings-dialog.h" line="-1"/>
-        <location line="+2"/>
         <source>Active</source>
         <translation>Activo</translation>
     </message>
     <message>
         <location line="-159"/>
-        <location filename="../src/ui-settings-dialog.h" line="-11"/>
         <source>Small</source>
         <translation>Pequeno</translation>
     </message>
     <message>
         <location line="+17"/>
-        <location filename="../src/ui-settings-dialog.h" line="+2"/>
         <source>Large</source>
         <translation>Grande</translation>
     </message>
     <message>
         <location line="+181"/>
-        <location filename="../src/ui-settings-dialog.h" line="+11"/>
         <source>Background inactive</source>
         <translation>Fundo inactivo</translation>
     </message>
     <message>
         <location line="+19"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>3D</source>
         <translation>3D</translation>
     </message>
     <message>
         <location line="+54"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Octave Startup</source>
         <translation>Inicialização do Octave</translation>
     </message>
     <message>
         <location line="+41"/>
-        <location line="+1392"/>
-        <location filename="../src/ui-settings-dialog.h" line="+2"/>
-        <location line="+82"/>
+        <location line="+1440"/>
         <source>Startup path</source>
         <translation>Caminho de inicialização</translation>
     </message>
     <message>
-        <location line="-1379"/>
-        <location line="+1409"/>
-        <location filename="../src/ui-settings-dialog.h" line="-81"/>
-        <location line="+83"/>
+        <location line="-1427"/>
+        <location line="+1420"/>
         <source>Browse</source>
         <translation>Navegar</translation>
     </message>
     <message>
-        <location line="-1322"/>
-        <location filename="../src/ui-settings-dialog.h" line="-78"/>
+        <location line="-1103"/>
         <source>After Column</source>
         <translation>Após coluna</translation>
     </message>
     <message>
-        <location line="+144"/>
-        <location filename="../src/ui-settings-dialog.h" line="+6"/>
+        <location line="-75"/>
         <source>Tab width min.</source>
         <translation>Tamanho da guia: mín.</translation>
     </message>
     <message>
         <location line="+64"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>max.</source>
         <translation>máx.</translation>
     </message>
     <message>
-        <location line="+31"/>
-        <location filename="../src/ui-settings-dialog.h" line="+2"/>
+        <location line="-231"/>
         <source>This works well for monospaced fonts. The line is drawn at a position based on the width of a space character in the default font. It may not work very well if styles use proportional fonts or if varied font sizes or bold, italic and normal texts are used.</source>
         <translation>Isto funciona bem para tipos de letra monospace. A guia é desenhada numa posição baseada na largura do espaço do tipo de letra default. Pode não funcionar muito bem se os estilos usarem fontes não monospace, mistura de letras com diferentes tamanhos ou estilos.</translation>
     </message>
     <message>
-        <location line="+19"/>
-        <location filename="../src/ui-settings-dialog.h" line="+3"/>
+        <location line="+289"/>
         <source>Enable Code Folding</source>
         <translation>Activar Células de Código</translation>
     </message>
     <message>
-        <location line="+61"/>
-        <location filename="../src/ui-settings-dialog.h" line="+6"/>
+        <location line="+551"/>
         <source>Windows (CRLF)</source>
         <translation>Windows (CRLF)</translation>
     </message>
     <message>
         <location line="+5"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Mac (CR)</source>
         <translation>Mac (CR)</translation>
     </message>
     <message>
         <location line="+5"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Unix (LF)</source>
         <translation>Unix (LF)</translation>
     </message>
     <message>
-        <location line="+32"/>
-        <location filename="../src/ui-settings-dialog.h" line="+2"/>
+        <location line="-532"/>
         <source>Show horizontal scroll bar</source>
         <translation>Exibir barra horizontal</translation>
     </message>
     <message>
-        <location line="+68"/>
-        <location filename="../src/ui-settings-dialog.h" line="+4"/>
+        <location line="-299"/>
+        <source>Show tool bar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+383"/>
         <source>Indentation</source>
         <translation>Indentação</translation>
     </message>
     <message>
         <location line="+117"/>
-        <location filename="../src/ui-settings-dialog.h" line="+7"/>
         <source>Indentation uses tabs</source>
         <translation>Indentar com caracteres tab</translation>
     </message>
     <message>
         <location line="+38"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Auto completion</source>
         <translation>Auto-completar</translation>
     </message>
     <message>
         <location line="+101"/>
-        <location filename="../src/ui-settings-dialog.h" line="+5"/>
         <source>With Octave builtins</source>
         <translation>Completar Octave builtins</translation>
     </message>
     <message>
         <location line="+10"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>With Octave functions</source>
         <translation>Completar funções Octave</translation>
     </message>
     <message>
         <location line="+64"/>
-        <location filename="../src/ui-settings-dialog.h" line="+9"/>
         <source>Show completion list automatically</source>
         <translation>Exibir automaticamente lista de auto-completar</translation>
     </message>
     <message>
         <location line="+31"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>File handling</source>
         <translation>Manipulação de ficheiros</translation>
     </message>
     <message>
-        <location line="+40"/>
-        <location filename="../src/ui-settings-dialog.h" line="+3"/>
+        <location line="+19"/>
         <source>Reload externally changed files without prompt</source>
         <translation>Recarregar ficheiros alterados externamente sem confirmar</translation>
     </message>
     <message>
-        <location line="+53"/>
-        <location filename="../src/ui-settings-dialog.h" line="+2"/>
+        <location line="+93"/>
+        <source>Text encoding used for loading and saving</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+73"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Select font, font size (as a difference from the default size), font style (&lt;b&gt;b&lt;/b&gt;old, &lt;b&gt;i&lt;/b&gt;talic, &lt;b&gt;u&lt;/b&gt;nderline), text color, and background color (for the latter, the color magenta (255,0,255) is a placeholder for the default background color).&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Selecione a fonte: família, tamanho (variacão com relacão ao tamanho padrão), estilo (&lt;b&gt;n&lt;/b&gt;egrito, &lt;b&gt;i&lt;/b&gt;tálico, &lt;b&gt;s&lt;/b&gt;ublinhado), cor do texto e cor de fundo (a cor rosa (255,0,255) é a cor de fundo padrão).&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location line="+192"/>
-        <location filename="../src/ui-settings-dialog.h" line="+7"/>
         <source>(Changing buffer size clears history)</source>
         <translation>(Alterar o tamanho do histório apagará o seu conteúdo actual)</translation>
     </message>
     <message>
         <location line="+28"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>History buffer Size</source>
         <translation>Tamanho do Histórico de Comandos</translation>
     </message>
     <message>
         <location line="+34"/>
-        <location filename="../src/ui-settings-dialog.h" line="+2"/>
         <source>Print debug location in terminal window in addition to the marker in the editor</source>
         <translation>Exibir posição de depuração no terminal além de ressaltar no editor</translation>
     </message>
     <message>
         <location line="+87"/>
-        <location filename="../src/ui-settings-dialog.h" line="+3"/>
-        <source>Display</source>
-        <translation>Exibição</translation>
+        <source>Behavior</source>
+        <translation>Comportamento</translation>
+    </message>
+    <message>
+        <location line="+30"/>
+        <source>Restore last directory of previous session</source>
+        <translation>Restaurar directório da sessão anterior</translation>
+    </message>
+    <message>
+        <location line="+54"/>
+        <source>Extensions of files to be opened in the default text editor (separated by &quot;;&quot;):</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+39"/>
-        <location filename="../src/ui-settings-dialog.h" line="+5"/>
-        <source>Alternating row colors</source>
-        <translation>Alternar cor das linhas</translation>
-    </message>
-    <message>
-        <location line="+12"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
-        <source>Behavior</source>
-        <translation>Comportamento</translation>
-    </message>
-    <message>
-        <location line="+34"/>
-        <location filename="../src/ui-settings-dialog.h" line="+3"/>
-        <source>Restore last directory of previous session</source>
-        <translation>Restaurar directório da sessão anterior</translation>
-    </message>
-    <message>
-        <location line="+71"/>
-        <location filename="../src/ui-settings-dialog.h" line="+5"/>
         <source>Workspace</source>
         <translation>Ambiente de Trabalho</translation>
     </message>
     <message>
-        <location line="+42"/>
-        <location filename="../src/ui-settings-dialog.h" line="-1"/>
+        <location line="+35"/>
+        <source>Colors for variable attributes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
         <source>Hide tool tips</source>
         <translation>Ocultar ajuda de contexto</translation>
     </message>
     <message>
-        <location line="+182"/>
-        <location filename="../src/ui-settings-dialog.h" line="+14"/>
+        <location line="+101"/>
+        <source>Import shortcut set</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Export current shortcut set</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Reset shortcuts to their defaults</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location line="+80"/>
+        <source>Default</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-71"/>
         <source>Edit a shortcut by double-clicking in a cell</source>
         <translation>Edite uma tecla de atalho clicando duas vezes na célula correspondente</translation>
     </message>
     <message>
-        <location line="+108"/>
-        <location filename="../src/ui-settings-dialog.h" line="+20"/>
+        <location line="+76"/>
+        <source>Actual</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
         <source>Network</source>
         <translation>Rede</translation>
     </message>
     <message>
         <location line="+23"/>
-        <location filename="../src/ui-settings-dialog.h" line="-12"/>
         <source>Allow Octave to connect to the Octave web site to display current news and information</source>
         <translation>Permitir Octave ligar-se à Internet para exibir novidades e informações</translation>
     </message>
     <message>
         <location line="+46"/>
-        <location filename="../src/ui-settings-dialog.h" line="+8"/>
         <source>Use proxy server</source>
         <translation>Usar servidor proxy</translation>
     </message>
     <message>
         <location line="-23"/>
-        <location filename="../src/ui-settings-dialog.h" line="-4"/>
         <source>HttpProxy</source>
         <translation>Proxy HTTP</translation>
     </message>
     <message>
-        <location line="-2083"/>
-        <location filename="../src/ui-settings-dialog.h" line="-123"/>
+        <location line="-2039"/>
         <source>Icon set for dock widgets</source>
         <translation>Conjunto de ícones para painéis</translation>
     </message>
     <message>
         <location line="-48"/>
-        <location filename="../src/ui-settings-dialog.h" line="-4"/>
         <source>Language (requires restart)</source>
         <translation>Idioma (alteração exige reinicialização do Octave)</translation>
     </message>
     <message>
         <location line="-58"/>
-        <location filename="../src/ui-settings-dialog.h" line="-5"/>
         <source>Icon size</source>
         <translation>Tamanho dos ícones</translation>
     </message>
     <message>
-        <location line="+1714"/>
-        <location filename="../src/ui-settings-dialog.h" line="+100"/>
+        <location line="+1716"/>
         <source>Synchronize Octave working directory with file browser</source>
         <translation>Manter directório de trabalho sincronizado com o Navegador de Ficheiros</translation>
     </message>
     <message>
-        <location line="+132"/>
-        <location filename="../src/ui-settings-dialog.h" line="+5"/>
-        <source>Colors for variable attributes </source>
-        <translation>Cores para atributos de variáveis</translation>
-    </message>
-    <message>
-        <location line="+34"/>
-        <location filename="../src/ui-settings-dialog.h" line="+22"/>
+        <location line="+184"/>
         <source>Shortcuts</source>
         <translation>Teclas de Atalho</translation>
     </message>
     <message>
         <location line="+31"/>
-        <location filename="../src/ui-settings-dialog.h" line="-18"/>
         <source>Select this option to prevent conflicts with readline shortcuts</source>
         <translation>Selecionar esta opção para prevenir conflitos com teclas de atalho do readline</translation>
     </message>
     <message>
         <location line="+3"/>
-        <location filename="../src/ui-settings-dialog.h" line="+2"/>
         <source>Disable global shortcuts when terminal window has focus</source>
         <translation>Desativar teclas de atalho globais quando o terminal estiver em foco</translation>
     </message>
     <message>
-        <location line="+31"/>
-        <location line="+28"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
-        <location line="+4"/>
-        <source>Use this set</source>
-        <translation>Usar este conjunto</translation>
-    </message>
-    <message>
-        <location line="-21"/>
-        <location filename="../src/ui-settings-dialog.h" line="-3"/>
-        <source>Set 1:</source>
-        <translation>Conjunto 1:</translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <location line="+37"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
-        <location line="+3"/>
+        <location line="+53"/>
         <source>Export</source>
         <translation>Exportar</translation>
     </message>
     <message>
-        <location line="-30"/>
-        <location line="+37"/>
-        <location filename="../src/ui-settings-dialog.h" line="-2"/>
-        <location line="+3"/>
+        <location line="-10"/>
         <source>Import</source>
         <translation>Importar</translation>
     </message>
     <message>
-        <location line="+7"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
-        <source>Set 2:</source>
-        <translation>Conjunto 2:</translation>
-    </message>
-    <message>
-        <location line="+86"/>
-        <location filename="../src/ui-settings-dialog.h" line="+7"/>
+        <location line="+90"/>
         <source>Action</source>
         <translation>Acção</translation>
     </message>
     <message>
-        <location line="+10"/>
-        <location filename="../src/ui-settings-dialog.h" line="-1"/>
-        <source>Set 1 Default</source>
-        <translation>Conjunto 1 Padrão</translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <location filename="../src/ui-settings-dialog.h" line="-1"/>
-        <source>Set 1 Actual</source>
-        <translation>Conjunto 1 Actual</translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <location filename="../src/ui-settings-dialog.h" line="-1"/>
-        <source>Set 2 Default</source>
-        <translation>Conjunto 2 Dadrão</translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <location filename="../src/ui-settings-dialog.h" line="-1"/>
-        <source>Set 2 Actual</source>
-        <translation>Conjunto 2 Actual</translation>
-    </message>
-    <message>
-        <location line="+68"/>
-        <location filename="../src/ui-settings-dialog.h" line="+11"/>
+        <location line="+83"/>
         <source>Socks5Proxy</source>
         <translation>Proxy Socks 5</translation>
     </message>
     <message>
         <location line="-16"/>
-        <location filename="../src/ui-settings-dialog.h" line="-4"/>
         <source>Hostname:</source>
         <translation>Endereço do servidor:</translation>
     </message>
     <message>
         <location line="+44"/>
-        <location filename="../src/ui-settings-dialog.h" line="+8"/>
         <source>Proxy type:</source>
         <translation>Tipo de proxy:</translation>
     </message>
     <message>
         <location line="+10"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Port:</source>
         <translation>Porta:</translation>
     </message>
     <message>
         <location line="-27"/>
-        <location filename="../src/ui-settings-dialog.h" line="-3"/>
         <source>Username:</source>
         <translation>Nome de usuário:</translation>
     </message>
     <message>
         <location line="+37"/>
-        <location filename="../src/ui-settings-dialog.h" line="+4"/>
         <source>Password:</source>
         <translation>Palavra-chave:</translation>
     </message>
     <message>
-        <location filename="../src/settings-dialog.cc" line="+77"/>
+        <location filename="../src/settings-dialog.cc" line="+127"/>
+        <source>Octave Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Unable to save settings.  Missing settings file or unknown directory.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+18"/>
         <location line="+4"/>
-        <location line="+561"/>
+        <location line="+444"/>
         <source>System setting</source>
         <translation>Configuração do sistema</translation>
     </message>
     <message>
-        <location line="-355"/>
+        <location line="-232"/>
         <source>IBeam Cursor</source>
         <translation>Cursor IBeam</translation>
     </message>
@@ -3352,35 +3481,7 @@
         <translation>Cursor Sublinhado</translation>
     </message>
     <message>
-        <location line="+213"/>
-        <source>Difference to the default size</source>
-        <translation>Diferença em relação ao tamanho do tipo de letra default</translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Background color, pink (255,0,255) means default</source>
-        <translation>Cor de fundo rosa (255,0,255) significa padrão</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>b</source>
-        <comment>short form for bold</comment>
-        <translation>n</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>i</source>
-        <comment>short form for italic</comment>
-        <translation>i</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>u</source>
-        <comment>short form for underlined</comment>
-        <translation>s</translation>
-    </message>
-    <message>
-        <location line="+497"/>
+        <location line="+503"/>
         <source>Set Octave Startup Directory</source>
         <translation>Definir Directório de Inicialização do Octave</translation>
     </message>
@@ -3393,7 +3494,7 @@
 <context>
     <name>setup_community_news</name>
     <message>
-        <location filename="../src/welcome-wizard.cc" line="+44"/>
+        <location filename="../src/welcome-wizard.cc" line="+42"/>
         <source>Community News</source>
         <translation>Novidades da Comunidade</translation>
     </message>
@@ -3448,7 +3549,7 @@
 <context>
     <name>shortcut_manager</name>
     <message>
-        <location filename="../src/shortcut-manager.cc" line="+109"/>
+        <location filename="../src/shortcut-manager.cc" line="+106"/>
         <source>New File</source>
         <translation>Novo Ficheiro</translation>
     </message>
@@ -3478,42 +3579,38 @@
         <translation>Guardar Ambiente de Trabalho Como</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <location line="+158"/>
+        <location line="+16"/>
+        <location line="+143"/>
         <source>Preferences</source>
         <translation>Preferências</translation>
     </message>
     <message>
-        <location line="-157"/>
+        <location line="-158"/>
         <source>Exit Octave</source>
         <translation>Sair do Octave</translation>
     </message>
     <message>
         <location line="+3"/>
-        <location line="+84"/>
         <source>Copy</source>
         <translation>Copiar</translation>
     </message>
     <message>
-        <location line="-83"/>
-        <location line="+85"/>
+        <location line="+1"/>
         <source>Paste</source>
         <translation>Colar</translation>
     </message>
     <message>
-        <location line="-84"/>
-        <location line="+80"/>
+        <location line="+1"/>
         <source>Undo</source>
         <translation>Desfazer</translation>
     </message>
     <message>
-        <location line="-79"/>
-        <location line="+84"/>
+        <location line="+1"/>
         <source>Select All</source>
         <translation>Selecionar Tudo</translation>
     </message>
     <message>
-        <location line="-83"/>
+        <location line="+1"/>
         <source>Clear Clipboard</source>
         <translation>Limpar Área de Transferência</translation>
     </message>
@@ -3538,7 +3635,7 @@
         <translation>Limpar Ambiente de Trabalho</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+6"/>
         <source>Step Into</source>
         <translation></translation>
     </message>
@@ -3609,12 +3706,12 @@
     </message>
     <message>
         <location line="+2"/>
-        <location line="+216"/>
+        <location line="+234"/>
         <source>Editor</source>
         <translation>Editor</translation>
     </message>
     <message>
-        <location line="-214"/>
+        <location line="-232"/>
         <source>Documentation</source>
         <translation>Documentação</translation>
     </message>
@@ -3694,19 +3791,29 @@
         <translation>Imprimir</translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+3"/>
         <source>Redo</source>
         <translation>Refazer</translation>
     </message>
     <message>
+        <location line="+1"/>
+        <source>Cut</source>
+        <translation>Cortar</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Find and Replace</source>
+        <translation>Localizar e Substituir</translation>
+    </message>
+    <message>
         <location line="+2"/>
-        <source>Cut</source>
-        <translation>Cortar</translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Find and Replace</source>
-        <translation>Localizar e Substituir</translation>
+        <source>Find Next</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Find Previous</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+2"/>
@@ -3831,7 +3938,68 @@
         <translation>Mostrar Números de Linha</translation>
     </message>
     <message>
-        <location line="-145"/>
+        <location line="+48"/>
+        <source>Switch to Left Tab</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Switch to Right Tab</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Move Tab Left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Move Tab Right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+44"/>
+        <source>Global</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+38"/>
+        <source>Tabs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+98"/>
+        <source>Enter new Shortcut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+143"/>
+        <source>Overwriting Shortcuts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>You are about to overwrite all shortcuts.
+Would you like to save the current shortcut set or cancel the action?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Don&apos;t save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+39"/>
+        <source>Import shortcuts from file ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Export shortcuts into file ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-571"/>
         <source>Step</source>
         <translation></translation>
     </message>
@@ -3892,6 +4060,21 @@
     </message>
     <message>
         <location line="+2"/>
+        <source>Show Toolbar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Show Statusbar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Show Horizontal Scrollbar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>Zoom In</source>
         <translation>Aumentar</translation>
     </message>
@@ -3947,12 +4130,7 @@
         <translation>Documentação na Palavra-chave</translation>
     </message>
     <message>
-        <location line="+42"/>
-        <source>Main</source>
-        <translation>Principal</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <location line="+57"/>
         <location line="+23"/>
         <source>File</source>
         <translation>Ficheiro</translation>
@@ -3996,12 +4174,7 @@
         <translation>Executar</translation>
     </message>
     <message>
-        <location line="+124"/>
-        <source>Enter new Shortcut for Set %1</source>
-        <translation>Entre nova Tecla de atalho para Conjunto %1</translation>
-    </message>
-    <message>
-        <location line="+5"/>
+        <location line="+106"/>
         <source>Apply the desired shortcut or click on the right button to reset the shortcut to its default.</source>
         <translation>Aplicar tecla de atalho desejada ou clique no botão à direita para voltar ao default.</translation>
     </message>
@@ -4026,7 +4199,7 @@
         <translation>Usar default</translation>
     </message>
     <message>
-        <location line="+53"/>
+        <location line="+45"/>
         <source>Double Shortcut</source>
         <translation>Atalho Duplicado</translation>
     </message>
@@ -4044,23 +4217,13 @@
 Quer usar a tecla de atalho de qualquer forma, removendo-a da outra acção? </translation>
     </message>
     <message>
-        <location line="+71"/>
-        <source>Import shortcut set %1 from file ...</source>
-        <translation>Importar conjunto de teclas de atalho %1 de ficheiro...</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <location line="+6"/>
+        <location line="+113"/>
+        <location line="+5"/>
         <source>Octave Shortcut Files (*.osc);;All Files (*)</source>
         <translation>Ficheiros de teclas de atalho do Octave (*.osc);; Todos Ficheiros (*)</translation>
     </message>
     <message>
-        <location line="-1"/>
-        <source>Export shortcut set %1 into file ...</source>
-        <translation>Exportar conjunto de teclas de atalho %1 para ficheiro... </translation>
-    </message>
-    <message>
-        <location line="+15"/>
+        <location line="+10"/>
         <source>Failed to open %1 as octave shortcut file</source>
         <translation>Falha ao abrir %1 como ficheiro de teclas de atalho do Octave</translation>
     </message>
@@ -4099,7 +4262,7 @@
 <context>
     <name>welcome_wizard</name>
     <message>
-        <location filename="../src/welcome-wizard.cc" line="+135"/>
+        <location filename="../src/welcome-wizard.cc" line="+133"/>
         <source>Welcome to GNU Octave</source>
         <translation>Bem-vindo ao GNU Octave</translation>
     </message>
@@ -4107,7 +4270,7 @@
 <context>
     <name>workspace_model</name>
     <message>
-        <location filename="../src/workspace-model.cc" line="-42"/>
+        <location filename="../src/workspace-model.cc" line="-41"/>
         <source>Name</source>
         <translation>Nome</translation>
     </message>
@@ -4132,7 +4295,7 @@
         <translation>Atributo</translation>
     </message>
     <message>
-        <location line="+109"/>
+        <location line="+108"/>
         <source>Right click to copy, rename, or display</source>
         <translation>Botão direito para copiar, mudar nome, ou mostrar</translation>
     </message>
@@ -4146,7 +4309,7 @@
 <context>
     <name>workspace_view</name>
     <message>
-        <location filename="../src/workspace-view.cc" line="+50"/>
+        <location filename="../src/workspace-view.cc" line="+51"/>
         <source>Workspace</source>
         <translation>Ambiente de Trabalho</translation>
     </message>
@@ -4166,7 +4329,7 @@
         <translation>Filtrar</translation>
     </message>
     <message>
-        <location line="+161"/>
+        <location line="+242"/>
         <source>Copy name</source>
         <translation>Copiar nome</translation>
     </message>
@@ -4182,11 +4345,41 @@
     </message>
     <message>
         <location line="+9"/>
-        <source>Only top-level symbols may be renamed.</source>
-        <translation>Apenas símbolos do nível mais alto podem ter o nome modificado.</translation>
-    </message>
-    <message>
-        <location line="+132"/>
+        <source>Only top-level symbols may be renamed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Hide filter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Show filter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+149"/>
+        <source>Class</source>
+        <translation type="unfinished">Classe</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Dimension</source>
+        <translation type="unfinished">Dimensão</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Value</source>
+        <translation type="unfinished">Valor</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Attribute</source>
+        <translation type="unfinished">Atributo</translation>
+    </message>
+    <message>
+        <location line="-17"/>
         <source>View the variables in the active workspace.&lt;br&gt;</source>
         <translation>Ver as variáveis no Ambiente de Trabalho activo.&lt;br&gt;</translation>
     </message>
--- a/libgui/languages/ru_RU.ts	Thu Aug 18 12:26:32 2016 -0700
+++ b/libgui/languages/ru_RU.ts	Fri Aug 19 21:05:48 2016 +0200
@@ -4,7 +4,7 @@
 <context>
     <name>ListDialog</name>
     <message>
-        <location filename="../src/dialog.cc" line="+251"/>
+        <location filename="../src/dialog.cc" line="+258"/>
         <source>Select All</source>
         <translation>Выбрать всё</translation>
     </message>
@@ -12,7 +12,7 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../src/workspace-model.cc" line="+75"/>
+        <location filename="../src/workspace-model.cc" line="+74"/>
         <source>automatic</source>
         <translation>автоматическая</translation>
     </message>
@@ -61,11 +61,39 @@
         <source>cursor</source>
         <translation>указатель</translation>
     </message>
+    <message>
+        <location filename="../src/settings-dialog.cc" line="+132"/>
+        <source>Difference to the default size</source>
+        <translation type="unfinished">Отличие то размера по умолчанию</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Background color, pink (255,0,255) means default</source>
+        <translation type="unfinished">Цвет заднего фона, розовый (255,0,255) по умолчанию</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>b</source>
+        <comment>short form for bold</comment>
+        <translation type="unfinished">ж</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>i</source>
+        <comment>short form for italic</comment>
+        <translation type="unfinished">к</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>u</source>
+        <comment>short form for underlined</comment>
+        <translation type="unfinished">п</translation>
+    </message>
 </context>
 <context>
     <name>QTerminal</name>
     <message>
-        <location filename="../qterminal/libqterminal/QTerminal.h" line="+135"/>
+        <location filename="../qterminal/libqterminal/QTerminal.h" line="+130"/>
         <source>Copy</source>
         <translation>Копировать</translation>
     </message>
@@ -80,23 +108,694 @@
         <translation>Выделить всё</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+7"/>
         <source>Clear Window</source>
         <translation>Очистить окно</translation>
     </message>
+    <message>
+        <location filename="../qterminal/libqterminal/QTerminal.cc" line="+46"/>
+        <source>Edit %1 at line %2</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QWinTerminalImpl</name>
     <message>
-        <location filename="../qterminal/libqterminal/win32/QWinTerminalImpl.cpp" line="+1778"/>
+        <location filename="../qterminal/libqterminal/win32/QWinTerminalImpl.cpp" line="+1779"/>
         <source>copied selection to clipboard</source>
         <translation>выделенное скопировано в буфер обмена</translation>
     </message>
 </context>
 <context>
+    <name>QsciLexerBash</name>
+    <message>
+        <location filename="../../../qsci/qscilexerbash.cpp" line="+208"/>
+        <source>Default</source>
+        <translation type="unfinished">По умолчанию</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Error</source>
+        <translation type="unfinished">Ошибка</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Comment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Number</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Keyword</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Double-quoted string</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Single-quoted string</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Operator</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Identifier</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Scalar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Parameter expansion</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Backticks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Here document delimiter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Single-quoted here document</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QsciLexerBatch</name>
+    <message>
+        <location filename="../../../qsci/qscilexerbatch.cpp" line="+179"/>
+        <source>Default</source>
+        <translation type="unfinished">По умолчанию</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Comment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Keyword</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Label</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Hide command character</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>External command</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Variable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Operator</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QsciLexerCPP</name>
+    <message>
+        <location filename="../../../qsci/qscilexercpp.cpp" line="+352"/>
+        <source>Default</source>
+        <translation type="unfinished">По умолчанию</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Inactive default</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>C comment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Inactive C comment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>C++ comment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Inactive C++ comment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>JavaDoc style C comment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Inactive JavaDoc style C comment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Number</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Inactive number</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Keyword</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Inactive keyword</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Double-quoted string</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Inactive double-quoted string</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Single-quoted string</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Inactive single-quoted string</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>IDL UUID</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Inactive IDL UUID</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Pre-processor block</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Inactive pre-processor block</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Operator</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Inactive operator</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Identifier</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Inactive identifier</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Unclosed string</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Inactive unclosed string</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>C# verbatim string</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Inactive C# verbatim string</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>JavaScript regular expression</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Inactive JavaScript regular expression</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>JavaDoc style C++ comment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Inactive JavaDoc style C++ comment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Secondary keywords and identifiers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Inactive secondary keywords and identifiers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>JavaDoc keyword</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Inactive JavaDoc keyword</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>JavaDoc keyword error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Inactive JavaDoc keyword error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Global classes and typedefs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Inactive global classes and typedefs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>C++ raw string</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Inactive C++ raw string</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QsciLexerDiff</name>
+    <message>
+        <location filename="../../../qsci/qscilexerdiff.cpp" line="+107"/>
+        <source>Default</source>
+        <translation type="unfinished">По умолчанию</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Comment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Command</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Header</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Position</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Removed line</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Added line</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Changed line</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QsciLexerMatlab</name>
+    <message>
+        <location filename="../../../qsci/qscilexermatlab.cpp" line="+138"/>
+        <source>Default</source>
+        <translation type="unfinished">По умолчанию</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Comment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Command</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Number</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Keyword</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Single-quoted string</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Operator</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Identifier</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Double-quoted string</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QsciLexerPerl</name>
+    <message>
+        <location filename="../../../qsci/qscilexerperl.cpp" line="+333"/>
+        <source>Default</source>
+        <translation type="unfinished">По умолчанию</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Error</source>
+        <translation type="unfinished">Ошибка</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Comment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>POD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Number</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Keyword</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Double-quoted string</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Single-quoted string</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Operator</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Identifier</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Scalar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Array</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Hash</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Symbol table</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Regular expression</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Substitution</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Backticks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Data section</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Here document delimiter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Single-quoted here document</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Double-quoted here document</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Backtick here document</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Quoted string (q)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Quoted string (qq)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Quoted string (qx)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Quoted string (qr)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Quoted string (qw)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>POD verbatim</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Subroutine prototype</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Format identifier</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Format body</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Double-quoted string (interpolated variable)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Translation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Regular expression (interpolated variable)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Substitution (interpolated variable)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Backticks (interpolated variable)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Double-quoted here document (interpolated variable)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Backtick here document (interpolated variable)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Quoted string (qq, interpolated variable)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Quoted string (qx, interpolated variable)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Quoted string (qr, interpolated variable)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QsciScintilla</name>
+    <message>
+        <location filename="../../../qsci/qsciscintilla.cpp" line="+4201"/>
+        <source>&amp;Undo</source>
+        <translation type="unfinished">О&amp;тменить</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>&amp;Redo</source>
+        <translation type="unfinished">&amp;Повторить</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Cu&amp;t</source>
+        <translation type="unfinished">Вы&amp;резать</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>&amp;Copy</source>
+        <translation type="unfinished">&amp;Копировать</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>&amp;Paste</source>
+        <translation type="unfinished">&amp;Вставить</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Select All</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>QtHandles::Figure</name>
     <message>
-        <location filename="../graphics/Figure.cc" line="+282"/>
+        <location filename="../graphics/Figure.cc" line="+298"/>
         <source>Figure ToolBar</source>
         <translation>Панель инструментов графического объекта</translation>
     </message>
@@ -146,37 +845,19 @@
         <translation>&amp;Копировать</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Cu&amp;t</source>
-        <translation>Вы&amp;резать</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>&amp;Paste</source>
-        <translation>&amp;Вставить</translation>
-    </message>
-    <message>
-        <location line="+5"/>
+        <location line="+7"/>
+        <location line="+463"/>
+        <source>About Octave</source>
+        <translation type="unfinished">Об Octave</translation>
+    </message>
+    <message>
+        <location line="-465"/>
         <source>&amp;Help</source>
         <translation>&amp;Помощь</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>&amp;About QtHandles</source>
-        <translation>&amp;О QtHandles</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>About &amp;Qt</source>
-        <translation>О &amp;Qt</translation>
-    </message>
-    <message>
-        <location line="+427"/>
-        <source>About QtHandles</source>
-        <translation>О QtHandles</translation>
-    </message>
-    <message>
-        <location line="+39"/>
+        <location line="+504"/>
+        <location line="+69"/>
         <source>Save Figure As</source>
         <translation>Сохранить графический объект как</translation>
     </message>
@@ -215,6 +896,160 @@
     </message>
 </context>
 <context>
+    <name>annotation_dialog</name>
+    <message>
+        <location filename="../graphics/annotation-dialog.ui" line="+17"/>
+        <source>Annotation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>String</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Font</source>
+        <translation type="unfinished">Шрифт</translation>
+    </message>
+    <message>
+        <location line="+42"/>
+        <source>bold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>b</source>
+        <translation type="unfinished">ж</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>italic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>i</source>
+        <translation type="unfinished">к</translation>
+    </message>
+    <message>
+        <location line="+428"/>
+        <source>color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>Horz alignment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <location line="+29"/>
+        <source>middle</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-24"/>
+        <source>right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Vert alignment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>top</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>bottom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Position</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>X</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Y</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Width</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Height</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>units</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>normalized</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Fit to box</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Box</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Background</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+444"/>
+        <source>Edge</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+133"/>
+        <source>Line style</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>none</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Line width</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>documentation_dock_widget</name>
     <message>
         <location filename="../src/documentation-dock-widget.cc" line="+34"/>
@@ -230,17 +1065,18 @@
 <context>
     <name>file_editor</name>
     <message>
-        <location filename="../src/m-editor/file-editor.cc" line="+285"/>
-        <location line="+125"/>
+        <location filename="../src/m-editor/file-editor.cc" line="+366"/>
+        <location line="+152"/>
         <location line="+19"/>
         <location line="+25"/>
         <location line="+62"/>
         <location line="+28"/>
+        <location line="+79"/>
         <source>Octave Editor</source>
         <translation>Редактор Octave</translation>
     </message>
     <message>
-        <location line="-318"/>
+        <location line="-462"/>
         <source>Octave Files (*.m);;All Files (*)</source>
         <translation>Файлы Octave (*.m);;Все файлы (*)</translation>
     </message>
@@ -257,7 +1093,7 @@
 </translation>
     </message>
     <message>
-        <location line="+330"/>
+        <location line="+395"/>
         <source>File not saved! A file with the selected name
 %1
 is already open in the editor</source>
@@ -266,12 +1102,12 @@
 уже открыт в редакторе</translation>
     </message>
     <message>
-        <location line="+387"/>
+        <location line="+492"/>
         <source>&amp;%1 %2</source>
         <translation>&amp;%1 %2</translation>
     </message>
     <message>
-        <location line="+388"/>
+        <location line="+480"/>
         <source>&amp;Save File</source>
         <translation>&amp;Сохранить</translation>
     </message>
@@ -287,41 +1123,26 @@
     </message>
     <message>
         <location line="+7"/>
-        <source>&amp;Undo</source>
-        <translation>О&amp;тменить</translation>
-    </message>
-    <message>
-        <location line="+3"/>
         <source>&amp;Redo</source>
         <translation>&amp;Повторить</translation>
     </message>
     <message>
         <location line="+6"/>
-        <source>&amp;Copy</source>
-        <translation>&amp;Копировать</translation>
-    </message>
-    <message>
-        <location line="+3"/>
         <source>Cu&amp;t</source>
         <translation>Вы&amp;резать</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Paste</source>
-        <translation>Вставить</translation>
-    </message>
-    <message>
-        <location line="+96"/>
+        <location line="+94"/>
         <source>&amp;Next Bookmark</source>
         <translation>С&amp;ледующая закладка</translation>
     </message>
     <message>
-        <location line="-2"/>
+        <location line="+2"/>
         <source>Pre&amp;vious Bookmark</source>
         <translation>Пр&amp;едыдущая закладка</translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+2"/>
         <source>Toggle &amp;Bookmark</source>
         <translation>&amp;Установить/снять закладку</translation>
     </message>
@@ -331,7 +1152,7 @@
         <translation>&amp;Удалить все закладки</translation>
     </message>
     <message>
-        <location line="+54"/>
+        <location line="+68"/>
         <source>&amp;Next Breakpoint</source>
         <translation>&amp;Следующая точка останова</translation>
     </message>
@@ -351,7 +1172,7 @@
         <translation>&amp;Удалить все точки останова</translation>
     </message>
     <message>
-        <location line="-104"/>
+        <location line="-118"/>
         <source>&amp;Comment</source>
         <translation>&amp;Закомментировать</translation>
     </message>
@@ -371,29 +1192,29 @@
         <translation>&amp;Убрать отступ</translation>
     </message>
     <message>
-        <location line="-55"/>
+        <location line="-61"/>
         <source>&amp;Find and Replace...</source>
         <translation>&amp;Найти и заменить...</translation>
     </message>
     <message>
-        <location line="+162"/>
+        <location line="+182"/>
         <source>Save File and Run</source>
         <translation>Сохранить файл и запустить</translation>
     </message>
     <message>
-        <location line="-90"/>
+        <location line="-104"/>
         <source>Go &amp;to Line...</source>
         <translation>&amp;Перейти к строке...</translation>
     </message>
     <message>
-        <location line="-1126"/>
+        <location line="-1341"/>
         <source>Could not start custom file editor
 %1</source>
         <translation>Невозможно запустить внешний редактор
 %1</translation>
     </message>
     <message>
-        <location line="+148"/>
+        <location line="+175"/>
         <source>Create</source>
         <translation>Создать</translation>
     </message>
@@ -403,7 +1224,7 @@
         <translation>Отмена</translation>
     </message>
     <message>
-        <location line="+844"/>
+        <location line="+1041"/>
         <source>&amp;Recent Editor Files</source>
         <translation>По&amp;следние файлы</translation>
     </message>
@@ -428,12 +1249,7 @@
         <translation>Закрыть другие файлы</translation>
     </message>
     <message>
-        <location line="+31"/>
-        <source>Select All</source>
-        <translation>Выделить всё</translation>
-    </message>
-    <message>
-        <location line="+10"/>
+        <location line="+32"/>
         <source>&amp;Commands</source>
         <translation>&amp;Команды</translation>
     </message>
@@ -558,17 +1374,62 @@
         <translation>Показывать &amp;номера строк</translation>
     </message>
     <message>
-        <location line="+128"/>
-        <source>Editor</source>
-        <translation>Редактор</translation>
-    </message>
-    <message>
-        <location line="-120"/>
-        <source>Show Line &amp;Endings</source>
-        <translation>Показывать символ &amp;конца строки</translation>
+        <location line="+22"/>
+        <source>Show &amp;Toolbar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Show &amp;Statusbar</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+4"/>
+        <source>Show &amp;Horizontal Scrollbar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+69"/>
+        <source>Recent Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+65"/>
+        <source>Editor</source>
+        <translation>Редактор</translation>
+    </message>
+    <message>
+        <location line="-156"/>
+        <source>Show Line &amp;Endings</source>
+        <translation>Показывать символ &amp;конца строки</translation>
+    </message>
+    <message>
+        <location line="-1467"/>
+        <source>File Encoding:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+403"/>
+        <source>%1 is a built-in function</source>
+        <translation type="unfinished">%1 является встроенной функцией</translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>Can not find function %1</source>
+        <translation type="unfinished">Невозможно найти функцию %1</translation>
+    </message>
+    <message>
+        <location line="+911"/>
+        <source>Find &amp;Next...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Find &amp;Previous...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+118"/>
         <source>Show &amp;Indentation Guides</source>
         <translation>Показывать линии &amp;отступов</translation>
     </message>
@@ -578,7 +1439,7 @@
         <translation>Показывать линию переноса &amp;строк</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+20"/>
         <source>Zoom &amp;In</source>
         <translation>У&amp;величить</translation>
     </message>
@@ -613,7 +1474,7 @@
         <translation>&amp;Документация по зарезервированному слову</translation>
     </message>
     <message>
-        <location line="-1103"/>
+        <location line="-1305"/>
         <source>Could not open file
 %1
 for read: %2.</source>
@@ -645,7 +1506,7 @@
         <translation></translation>
     </message>
     <message>
-        <location line="+731"/>
+        <location line="+928"/>
         <source>&amp;File</source>
         <translation>&amp;Файл</translation>
     </message>
@@ -655,12 +1516,12 @@
         <translation>&amp;Правка</translation>
     </message>
     <message>
-        <location line="+138"/>
+        <location line="+129"/>
         <source>Show &amp;Whitespace Characters</source>
         <translation>Показывать символ &amp;пробела</translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+42"/>
         <source>&amp;Debug</source>
         <translation>&amp;Отладка</translation>
     </message>
@@ -673,12 +1534,12 @@
 <context>
     <name>file_editor_tab</name>
     <message>
-        <location filename="../src/m-editor/file-editor-tab.cc" line="+92"/>
+        <location filename="../src/m-editor/file-editor-tab.cc" line="+145"/>
         <source>eol:</source>
         <translation>конец строки:</translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="-17"/>
         <source>line:</source>
         <translation>строка:</translation>
     </message>
@@ -688,17 +1549,7 @@
         <translation>столбец:</translation>
     </message>
     <message>
-        <location line="+156"/>
-        <source>%1 is a built-in function</source>
-        <translation>%1 является встроенной функцией</translation>
-    </message>
-    <message>
-        <location line="+31"/>
-        <source>Can not find function %1</source>
-        <translation>Невозможно найти функцию %1</translation>
-    </message>
-    <message>
-        <location line="+775"/>
+        <location line="+1146"/>
         <source>Goto line</source>
         <translation>Перейти к строке</translation>
     </message>
@@ -708,7 +1559,7 @@
         <translation></translation>
     </message>
     <message>
-        <location line="+146"/>
+        <location line="+145"/>
         <location line="+63"/>
         <source>&lt;unnamed&gt;</source>
         <translation>&lt;без названия&gt;</translation>
@@ -728,12 +1579,28 @@
 %2</translation>
     </message>
     <message>
-        <location line="+288"/>
+        <location line="+298"/>
+        <source>Debug or Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>This file is currently being executed.
+Quit debugging and save?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+166"/>
         <source>Line Endings:</source>
         <translation>Конец строки:</translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+9"/>
+        <source>File Encoding:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+28"/>
         <source>Octave Files (*.m)</source>
         <translation>Файлы Octave (*.m)</translation>
     </message>
@@ -743,22 +1610,59 @@
         <translation>Все файлы (*)</translation>
     </message>
     <message>
-        <location line="-322"/>
+        <location line="-513"/>
         <source>Do you want to cancel closing, save or discard the changes?</source>
         <translation>Сохранить изменения или отклонить их?</translation>
     </message>
     <message>
-        <location line="-970"/>
-        <location line="+979"/>
-        <location line="+213"/>
-        <location line="+177"/>
-        <location line="+85"/>
+        <location line="-1342"/>
+        <source>encoding:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+239"/>
+        <source>Breakpoint condition</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+88"/>
+        <location line="+1024"/>
+        <location line="+372"/>
+        <location line="+215"/>
+        <location line="+21"/>
+        <location line="+83"/>
         <location line="+23"/>
         <source>Octave Editor</source>
         <translation>Редактор Octave</translation>
     </message>
     <message>
-        <location line="-6"/>
+        <location line="-1737"/>
+        <source>Cannot add breakpoint to modified file.
+Save and add breakpoint, or canel?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1611"/>
+        <source>&quot;%1&quot;
+is not a valid identifier.
+
+If you keep this filename, you will not be able to
+call your script using its name as an Octave command.
+
+Do you want to choose another name?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>The current editor contents can not be encoded
+with the selected codec %1.
+Using it will result in data loss!
+
+Do you want to chose another codec?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+99"/>
         <source>
 
 Warning: The contents in the editor is modified!</source>
@@ -776,31 +1680,14 @@
 был удален или переименован. Вы хотите сохранить его?%2</translation>
     </message>
     <message>
-        <location line="-285"/>
+        <location line="-342"/>
         <source>Could not open file %1 for write:
 %2.</source>
         <translation>Не удалось открыть файл %1 для записи:
 %2.</translation>
     </message>
     <message>
-        <location line="+177"/>
-        <source>&quot;%1&quot;
-is not a valid identifier.
-
-If you keep this file name, you will not be able to
-call your script using its name as an Octave command.
-
-Do you want to choose another name?</source>
-        <translation>&quot;%1&quot;
-не является разрешённым идентификатором.
-
-Если Вы оставите это имя то потеряете возможность 
-запускать свой сценарий, используя имя как команду Octave.
-
-Желаете выбрать другое имя?</translation>
-    </message>
-    <message>
-        <location line="+85"/>
+        <location line="+319"/>
         <source>It seems that &apos;%1&apos; has been modified by another application. Do you want to reload it?</source>
         <translation>Кажется, файл &apos;%1&apos; был изменен другим приложением. Вы хотите обновить его содержимое?</translation>
     </message>
@@ -813,12 +1700,7 @@
         <translation>Файловый менеджер</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Browse your files.</source>
-        <translation>Просмотр файлов.</translation>
-    </message>
-    <message>
-        <location line="+18"/>
+        <location line="+35"/>
         <source>Enter the path or filename</source>
         <translation>Введите путь или имя файла</translation>
     </message>
@@ -839,22 +1721,67 @@
     </message>
     <message>
         <location line="+4"/>
-        <location line="+388"/>
+        <location line="+373"/>
         <source>Find Files...</source>
         <translation>Найти файлы...</translation>
     </message>
     <message>
-        <location line="+364"/>
+        <location line="-26"/>
+        <source>Open in System File Explorer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Open in Text Editor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+389"/>
         <source>New Directory</source>
         <translation>Новая папка</translation>
     </message>
     <message>
-        <location line="-784"/>
+        <location line="-773"/>
         <source>Show Octave directory</source>
         <translation>Перейти к текущей рабочей папке Octave</translation>
     </message>
     <message>
-        <location line="-4"/>
+        <location line="-49"/>
+        <source>Browse your files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Alternating row colors</source>
+        <translation type="unfinished">Чередующиеся цвета строк</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>filesdockwidget/showFileSize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>filesdockwidget/showFileType</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>filesdockwidget/showLastModified</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>filesdockwidget/showHiddenFiles</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>filesdockwidget/useAlternatingRowColors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+29"/>
         <source>One directory up</source>
         <translation>Перейти на одну папку вверх</translation>
     </message>
@@ -875,53 +1802,48 @@
     </message>
     <message>
         <location line="+20"/>
-        <location line="+397"/>
+        <location line="+382"/>
         <source>New File...</source>
         <translation>Новый файл...</translation>
     </message>
     <message>
-        <location line="-394"/>
-        <location line="+397"/>
+        <location line="-379"/>
+        <location line="+382"/>
         <source>New Directory...</source>
         <translation>Новая папка...</translation>
     </message>
     <message>
-        <location line="-335"/>
+        <location line="-329"/>
         <source>Activate to open in editor, right click for alternatives</source>
         <translation>Нажмите для открытия в редакторе, альтернитивные действия по нажатию правой кнопкой</translation>
     </message>
     <message>
-        <location line="+236"/>
+        <location line="-136"/>
         <source>File size</source>
         <translation></translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+1"/>
         <source>File type</source>
         <translation></translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+1"/>
         <source>Date modified</source>
         <translation></translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+1"/>
         <source>Show hidden</source>
         <translation></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+415"/>
         <source>Open</source>
         <translation>Открыть</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Open in Default Application</source>
-        <translation>Открыть в приложении по умолчанию</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <location line="+13"/>
         <source>Copy Selection to Clipboard</source>
         <translation>Скопировать выделенное в буфер обмена</translation>
     </message>
@@ -952,7 +1874,7 @@
 </translation>
     </message>
     <message>
-        <location line="+115"/>
+        <location line="+125"/>
         <source>Rename file/directory</source>
         <translation>Переименовать файл/директорию</translation>
     </message>
@@ -986,7 +1908,7 @@
         <translation>Невозможно удалить непустую директорию</translation>
     </message>
     <message>
-        <location line="+151"/>
+        <location line="+145"/>
         <source>Set directory of file browser</source>
         <translation></translation>
     </message>
@@ -1025,7 +1947,7 @@
 <context>
     <name>final_page</name>
     <message>
-        <location filename="../src/welcome-wizard.cc" line="+199"/>
+        <location filename="../src/welcome-wizard.cc" line="+195"/>
         <source>Enjoy!</source>
         <translation>Наслаждайтесь!</translation>
     </message>
@@ -1088,7 +2010,7 @@
 <context>
     <name>find_dialog</name>
     <message>
-        <location filename="../src/m-editor/find-dialog.cc" line="+74"/>
+        <location filename="../src/m-editor/find-dialog.cc" line="+85"/>
         <source>Find and Replace</source>
         <translation>Найти и заменить</translation>
     </message>
@@ -1163,7 +2085,7 @@
         <translation>Искать &amp;выделенное</translation>
     </message>
     <message>
-        <location line="+84"/>
+        <location line="+87"/>
         <source>Search from end</source>
         <translation>Искать с конца</translation>
     </message>
@@ -1173,7 +2095,7 @@
         <translation>Искать с начала</translation>
     </message>
     <message>
-        <location line="+205"/>
+        <location line="+221"/>
         <source>Replace Result</source>
         <translation>Результат замены</translation>
     </message>
@@ -1292,7 +2214,7 @@
         <translation>Результаты поиска</translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+21"/>
         <source>Idle.</source>
         <translation>Ожидание.</translation>
     </message>
@@ -1318,8 +2240,8 @@
     </message>
     <message>
         <location line="+15"/>
-        <source>File name/location</source>
-        <translation>Имя/местоположение файла</translation>
+        <source>Filename/location</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+17"/>
@@ -1327,7 +2249,7 @@
         <translation>Содержимое файла</translation>
     </message>
     <message>
-        <location line="+105"/>
+        <location line="+111"/>
         <source>Searching...</source>
         <translation>Поиск...</translation>
     </message>
@@ -1345,7 +2267,7 @@
 <context>
     <name>find_files_model</name>
     <message>
-        <location filename="../src/find-files-model.cc" line="+82"/>
+        <location filename="../src/find-files-model.cc" line="+83"/>
         <source>Filename</source>
         <translation>Имя файла</translation>
     </message>
@@ -1383,7 +2305,7 @@
         <translation>Журнал выполненных команд</translation>
     </message>
     <message>
-        <location line="+89"/>
+        <location line="+107"/>
         <source>Copy</source>
         <translation>Копировать</translation>
     </message>
@@ -1397,11 +2319,21 @@
         <source>Create script</source>
         <translation>Создать скрипт</translation>
     </message>
+    <message>
+        <location line="+4"/>
+        <source>Hide filter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Show filter</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>initial_page</name>
     <message>
-        <location filename="../src/welcome-wizard.cc" line="-179"/>
+        <location filename="../src/welcome-wizard.cc" line="-176"/>
         <source>Welcome to Octave!</source>
         <translation>Добро пожаловать в Octave!</translation>
     </message>
@@ -1432,13 +2364,13 @@
 <context>
     <name>main_window</name>
     <message>
-        <location filename="../src/main-window.cc" line="+268"/>
+        <location filename="../src/main-window.cc" line="+275"/>
         <source>Load Workspace</source>
         <translation>Загрузить область переменных</translation>
     </message>
     <message>
-        <location line="+732"/>
-        <location line="+931"/>
+        <location line="+758"/>
+        <location line="+975"/>
         <source>About Octave</source>
         <translation>Об Octave</translation>
     </message>
@@ -1448,12 +2380,12 @@
         <translation>&amp;Файл</translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+45"/>
         <source>New</source>
         <translation>Новый</translation>
     </message>
     <message>
-        <location line="-43"/>
+        <location line="-39"/>
         <source>Open...</source>
         <translation>Открыть...</translation>
     </message>
@@ -1463,7 +2395,7 @@
         <translation>Настройки...</translation>
     </message>
     <message>
-        <location line="-95"/>
+        <location line="-99"/>
         <source>Exit</source>
         <translation>Выход</translation>
     </message>
@@ -1478,22 +2410,22 @@
         <translation>Отменить</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+7"/>
         <source>Copy</source>
         <translation>Копировать</translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+5"/>
         <source>Paste</source>
         <translation>Вставить</translation>
     </message>
     <message>
-        <location line="-1469"/>
+        <location line="-1537"/>
         <source>Save Workspace As</source>
         <translation>Сохранить область переменных как</translation>
     </message>
     <message>
-        <location line="+134"/>
+        <location line="+124"/>
         <source>The release notes file &apos;%1&apos; is empty.</source>
         <translation>Файл с примечаниями к выпуску &apos;%1&apos; пустой.</translation>
     </message>
@@ -1503,7 +2435,7 @@
         <translation>Файл с примечаниями к выпуску &apos;%1&apos; не может быть прочтён.</translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="+12"/>
         <source>Octave Release Notes</source>
         <translation>Примечания к выпуску Octave</translation>
     </message>
@@ -1513,17 +2445,17 @@
         <translation>Новости сообщества Octave</translation>
     </message>
     <message>
-        <location line="+187"/>
+        <location line="+206"/>
         <source>Are you sure you want to exit Octave?</source>
         <translation>Вы уверены, что хотите выйти из Octave?</translation>
     </message>
     <message>
-        <location line="+854"/>
+        <location line="+916"/>
         <source>Open an existing file in editor</source>
         <translation>Открыть существующий файл в редакторе</translation>
     </message>
     <message>
-        <location line="+48"/>
+        <location line="+44"/>
         <source>New Function...</source>
         <translation>Новая функция...</translation>
     </message>
@@ -1533,12 +2465,12 @@
         <translation>Новый графический объект</translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+39"/>
         <source>Select All</source>
         <translation>Выделить всё</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="+4"/>
         <source>Clear Clipboard</source>
         <translation>Очистить буфер обмена</translation>
     </message>
@@ -1588,17 +2520,27 @@
         <translation>Файловый менеджер</translation>
     </message>
     <message>
-        <location line="-84"/>
+        <location line="+36"/>
+        <source>Contribute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Donate to Octave</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-123"/>
         <source>Step In</source>
         <translation>Шаг с заходом</translation>
     </message>
     <message>
-        <location line="-1020"/>
+        <location line="-1082"/>
         <source>Octave</source>
         <translation>Octave</translation>
     </message>
     <message>
-        <location line="+868"/>
+        <location line="+926"/>
         <source>Load Workspace...</source>
         <translation>Загрузить область переменных...</translation>
     </message>
@@ -1613,7 +2555,7 @@
         <translation>Новый сценарий</translation>
     </message>
     <message>
-        <location line="+124"/>
+        <location line="+128"/>
         <source>Step Out</source>
         <translation>Шаг с выходом</translation>
     </message>
@@ -1633,17 +2575,7 @@
         <translation>Поделиться кодом</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Contribute to Octave</source>
-        <translation>Внести вклад в Octave</translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Octave Developer Resources</source>
-        <translation>Ресурсы разработчика Octave</translation>
-    </message>
-    <message>
-        <location line="+14"/>
+        <location line="+20"/>
         <source>On Disk</source>
         <translation>На диске</translation>
     </message>
@@ -1688,8 +2620,8 @@
         <translation>Перейти на одну папку вверх</translation>
     </message>
     <message>
-        <location line="-1148"/>
-        <location line="+1151"/>
+        <location line="-1198"/>
+        <location line="+1201"/>
         <source>Browse directories</source>
         <translation>Выбрать папку</translation>
     </message>
@@ -1768,7 +2700,7 @@
 <context>
     <name>news_reader</name>
     <message>
-        <location line="-1411"/>
+        <location line="-1492"/>
         <source>&lt;html&gt;
 &lt;body&gt;
 &lt;p&gt;
@@ -1827,18 +2759,18 @@
 <context>
     <name>octave_dock_widget</name>
     <message>
-        <location filename="../src/octave-dock-widget.cc" line="+68"/>
-        <location line="+198"/>
+        <location filename="../src/octave-dock-widget.cc" line="+67"/>
+        <location line="+201"/>
         <source>Undock widget</source>
         <translation>Открепить виджет</translation>
     </message>
     <message>
-        <location line="-188"/>
+        <location line="-191"/>
         <source>Hide widget</source>
         <translation>Спрятать виджет</translation>
     </message>
     <message>
-        <location line="+132"/>
+        <location line="+136"/>
         <source>Dock widget</source>
         <translation>Закрепить виджет</translation>
     </message>
@@ -1846,7 +2778,7 @@
 <context>
     <name>octave_qscintilla</name>
     <message>
-        <location filename="../src/m-editor/octave-qscintilla.cc" line="+226"/>
+        <location filename="../src/m-editor/octave-qscintilla.cc" line="+237"/>
         <source>Help on</source>
         <translation>Справка по</translation>
     </message>
@@ -1860,18 +2792,23 @@
         <source>Edit</source>
         <translation>Редактировать</translation>
     </message>
+    <message>
+        <location line="+15"/>
+        <source>dbstop if ...</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>octave_qt_link</name>
     <message>
-        <location filename="../src/octave-qt-link.cc" line="+111"/>
-        <location line="+6"/>
-        <location line="+7"/>
+        <location filename="../src/octave-qt-link.cc" line="+136"/>
+        <location line="+9"/>
+        <location line="+11"/>
         <source>Create</source>
         <translation>Создать</translation>
     </message>
     <message>
-        <location line="-10"/>
+        <location line="-14"/>
         <source>File
 %1
 does not exist. Do you want to create it?</source>
@@ -1885,7 +2822,7 @@
         <translation>Редактор Octave</translation>
     </message>
     <message>
-        <location line="+211"/>
+        <location line="+254"/>
         <source>The file %1 does not exist in the load path.  To run or debug the function you are editing, you must either change to the directory %2 or add that directory to the load path.</source>
         <translation>Файл %1 не находится в загрузочном пути. Для запуска или отладки редактируемой функции необходимо перейти в папку %2 или добавить её в загрузочный путь.</translation>
     </message>
@@ -1910,8 +2847,8 @@
         <translation>Добавить папку в путь загрузки</translation>
     </message>
     <message>
-        <location line="-223"/>
-        <location line="+224"/>
+        <location line="-269"/>
+        <location line="+270"/>
         <source>Cancel</source>
         <translation>Отмена</translation>
     </message>
@@ -1927,7 +2864,7 @@
 <context>
     <name>resource_manager</name>
     <message>
-        <location filename="../src/resource-manager.cc" line="+245"/>
+        <location filename="../src/resource-manager.cc" line="+246"/>
         <source>The settings file
 %1
 does not exist and can not be created.
@@ -1953,731 +2890,589 @@
     <name>settings_dialog</name>
     <message>
         <location filename="../src/settings-dialog.ui" line="+23"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1738"/>
         <source>Settings</source>
         <translation>Параметры</translation>
     </message>
     <message>
         <location line="+19"/>
         <location line="+468"/>
-        <location filename="../src/ui-settings-dialog.h" line="+25"/>
-        <location line="+1"/>
         <source>General</source>
         <translation>Основное</translation>
     </message>
     <message>
         <location line="-338"/>
-        <location filename="../src/ui-settings-dialog.h" line="-17"/>
         <source>Octave logo only</source>
         <translation>Только логотип Octave</translation>
     </message>
     <message>
         <location line="+10"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Letter icons</source>
         <translation>Значок с буквой</translation>
     </message>
     <message>
         <location line="-111"/>
-        <location filename="../src/ui-settings-dialog.h" line="-8"/>
         <source>Dock widget title bar</source>
         <translation>Заголовки виджетов</translation>
     </message>
     <message>
         <location line="+53"/>
-        <location filename="../src/ui-settings-dialog.h" line="+3"/>
         <source>Small</source>
         <translation>Маленькие</translation>
     </message>
     <message>
         <location line="+17"/>
-        <location filename="../src/ui-settings-dialog.h" line="+2"/>
         <source>Large</source>
         <translation>Большие</translation>
     </message>
     <message>
         <location line="+168"/>
-        <location filename="../src/ui-settings-dialog.h" line="+10"/>
         <source>Custom style</source>
         <translation>Свой стиль</translation>
     </message>
     <message>
         <location line="+32"/>
-        <location filename="../src/ui-settings-dialog.h" line="+2"/>
         <source>3D</source>
         <translation>Объёмный вид</translation>
     </message>
     <message>
         <location line="+148"/>
-        <location filename="../src/ui-settings-dialog.h" line="+63"/>
         <source>Editor</source>
         <translation>Редактор</translation>
     </message>
     <message>
-        <location line="+151"/>
-        <location filename="../src/ui-settings-dialog.h" line="-49"/>
+        <location line="+107"/>
         <source>Color</source>
         <translation>Цвет</translation>
     </message>
     <message>
-        <location line="+135"/>
-        <location filename="../src/ui-settings-dialog.h" line="+4"/>
+        <location line="-72"/>
         <source>This works well for monospaced fonts. The line is drawn at a position based on the width of a space character in the default font. It may not work very well if styles use proportional fonts or if varied font sizes or bold, italic and normal texts are used.</source>
         <translation>Это хорошо работает для моноширинных шрифтов. Позиция линии зависит от ширины символа пробела. В случае использования пропорционального шрифта линия может не совпадать с реальным положением переноса.</translation>
     </message>
     <message>
-        <location line="+19"/>
-        <location filename="../src/ui-settings-dialog.h" line="+3"/>
+        <location line="+289"/>
         <source>Enable Code Folding</source>
         <translation>Разрешить сворачивание блоков</translation>
     </message>
     <message>
-        <location line="+61"/>
-        <location filename="../src/ui-settings-dialog.h" line="+6"/>
+        <location line="+551"/>
         <source>Windows (CRLF)</source>
         <translation>Windows (CRLF)</translation>
     </message>
     <message>
         <location line="+5"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Mac (CR)</source>
         <translation>Mac (CR)</translation>
     </message>
     <message>
         <location line="+5"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Unix (LF)</source>
         <translation>Unix (LF)</translation>
     </message>
     <message>
-        <location line="+32"/>
-        <location filename="../src/ui-settings-dialog.h" line="+2"/>
+        <location line="-532"/>
         <source>Show horizontal scroll bar</source>
         <translation>Показывать горизонтальную полосу прокрутки</translation>
     </message>
     <message>
-        <location line="+68"/>
-        <location filename="../src/ui-settings-dialog.h" line="+4"/>
+        <location line="-299"/>
+        <source>Show tool bar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+383"/>
         <source>Indentation</source>
         <translation>Отступы</translation>
     </message>
     <message>
         <location line="+24"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Indent width</source>
         <translation>Ширина отступа</translation>
     </message>
     <message>
         <location line="+7"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Tab indents line</source>
         <translation>Показывать линии табуляции</translation>
     </message>
     <message>
         <location line="+7"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Auto indentation</source>
         <translation>Авто-отступы</translation>
     </message>
     <message>
         <location line="+26"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Tab width</source>
         <translation>Ширина табуляции</translation>
     </message>
     <message>
         <location line="+7"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Show indentation guides</source>
         <translation>Показывать линии отступов</translation>
     </message>
     <message>
         <location line="+23"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Backspace unindents line</source>
         <translation>Уменьшение отступа клавишей backspace</translation>
     </message>
     <message>
         <location line="+23"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Indentation uses tabs</source>
         <translation>Отступы табуляцией</translation>
     </message>
     <message>
         <location line="+38"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Auto completion</source>
         <translation>Автодополнение</translation>
     </message>
     <message>
         <location line="+27"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Match keywords</source>
         <translation>Зарезервированные слова</translation>
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Case sensitive</source>
         <translation>С учётом регистра</translation>
     </message>
     <message>
         <location line="+23"/>
-        <location filename="../src/ui-settings-dialog.h" line="+2"/>
         <source>Replace word by suggested one</source>
         <translation>Заменять слово предложенным</translation>
     </message>
     <message>
         <location line="-10"/>
-        <location filename="../src/ui-settings-dialog.h" line="-1"/>
         <source>Match words in document</source>
         <translation>Слова из документа</translation>
     </message>
     <message>
         <location line="+48"/>
-        <location filename="../src/ui-settings-dialog.h" line="+2"/>
         <source>With Octave builtins</source>
         <translation>Встроенные слова Octave</translation>
     </message>
     <message>
         <location line="+10"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>With Octave functions</source>
         <translation>Функции Octave</translation>
     </message>
     <message>
         <location line="+64"/>
-        <location filename="../src/ui-settings-dialog.h" line="+9"/>
         <source>Show completion list automatically</source>
         <translation>Показать список завершения автоматически</translation>
     </message>
     <message>
-        <location line="+51"/>
-        <location filename="../src/ui-settings-dialog.h" line="+2"/>
+        <location line="+63"/>
         <source>Restore editor tabs from previous session on startup</source>
         <translation>Восстанавливать вкладки редактора с предыдущей сессии во время запуска</translation>
     </message>
     <message>
-        <location line="+20"/>
-        <location filename="../src/ui-settings-dialog.h" line="+2"/>
+        <location line="-13"/>
         <source>Reload externally changed files without prompt</source>
         <translation>Перезагружать файлы, изменённые другими программами без запроса</translation>
     </message>
     <message>
-        <location line="-446"/>
-        <location filename="../src/ui-settings-dialog.h" line="-30"/>
+        <location line="-425"/>
         <source>Use custom file editor</source>
         <translation>Использовать внешний редактор</translation>
     </message>
     <message>
-        <location line="+482"/>
-        <location filename="../src/ui-settings-dialog.h" line="+33"/>
+        <location line="+518"/>
+        <source>Text encoding used for loading and saving</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+56"/>
         <source>Editor Styles</source>
         <translation>Вид редактора</translation>
     </message>
     <message>
         <location line="+209"/>
-        <location filename="../src/ui-settings-dialog.h" line="+6"/>
         <source>(Changing buffer size clears history)</source>
         <translation>(Изменение параметра очищает историю)</translation>
     </message>
     <message>
         <location line="+28"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>History buffer Size</source>
         <translation>Длина истории выполненных команд</translation>
     </message>
     <message>
         <location line="+34"/>
-        <location filename="../src/ui-settings-dialog.h" line="+2"/>
         <source>Print debug location in terminal window in addition to the marker in the editor</source>
         <translation>Показывать отладочную информацию в командном окне в дополнение к отметкам в редакторе</translation>
     </message>
     <message>
         <location line="+16"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Terminal Colors</source>
         <translation>Цветовая схема</translation>
     </message>
     <message>
         <location line="-173"/>
-        <location filename="../src/ui-settings-dialog.h" line="-6"/>
         <source>Font</source>
         <translation>Шрифт</translation>
     </message>
     <message>
-        <location line="-917"/>
-        <location filename="../src/ui-settings-dialog.h" line="-58"/>
+        <location line="-1007"/>
         <source>Show line numbers</source>
         <translation>Показывать номера строк</translation>
     </message>
     <message>
-        <location line="-72"/>
-        <location filename="../src/ui-settings-dialog.h" line="-3"/>
+        <location line="+81"/>
         <source>Highlight current line</source>
         <translation>Подсвечивать текущую строку</translation>
     </message>
     <message>
-        <location line="+85"/>
-        <location filename="../src/ui-settings-dialog.h" line="+4"/>
+        <location line="+13"/>
         <source>Show complete path in window title</source>
         <translation>Показывать полный путь в заголовке окна</translation>
     </message>
     <message>
-        <location line="-549"/>
-        <location filename="../src/ui-settings-dialog.h" line="-30"/>
+        <location line="-593"/>
         <source>Interface</source>
         <translation>Внешний вид</translation>
     </message>
     <message>
         <location line="+52"/>
-        <location filename="../src/ui-settings-dialog.h" line="+3"/>
         <source>Confirm before exiting</source>
         <translation>Подтверждать выход</translation>
     </message>
     <message>
         <location line="+74"/>
-        <location filename="../src/ui-settings-dialog.h" line="+7"/>
         <source>Graphic icons</source>
         <translation>Графический значок</translation>
     </message>
     <message>
         <location line="+29"/>
-        <location line="+592"/>
-        <location filename="../src/ui-settings-dialog.h" line="+2"/>
-        <location line="+28"/>
+        <location line="+640"/>
         <source>Show status bar</source>
         <translation>Показывать строку состояния</translation>
     </message>
     <message>
-        <location line="-540"/>
-        <location filename="../src/ui-settings-dialog.h" line="-26"/>
+        <location line="-588"/>
         <source>Text inactive</source>
         <translation>Текст неактивный</translation>
     </message>
     <message>
         <location line="-32"/>
         <location line="+45"/>
-        <location filename="../src/ui-settings-dialog.h" line="-1"/>
-        <location line="+2"/>
         <source>Active</source>
         <translation>Активный</translation>
     </message>
     <message>
         <location line="+39"/>
-        <location filename="../src/ui-settings-dialog.h" line="+2"/>
         <source>Background inactive</source>
         <translation>Фон неактивный</translation>
     </message>
     <message>
         <location line="+73"/>
-        <location filename="../src/ui-settings-dialog.h" line="+2"/>
         <source>Octave Startup</source>
         <translation>Запуск Octave</translation>
     </message>
     <message>
         <location line="+41"/>
-        <location line="+1392"/>
-        <location filename="../src/ui-settings-dialog.h" line="+2"/>
-        <location line="+82"/>
+        <location line="+1440"/>
         <source>Startup path</source>
         <translation>Начальный путь</translation>
     </message>
     <message>
-        <location line="-1379"/>
-        <location line="+1409"/>
-        <location filename="../src/ui-settings-dialog.h" line="-81"/>
-        <location line="+83"/>
+        <location line="-1427"/>
+        <location line="+1420"/>
         <source>Browse</source>
         <translation>Выбрать</translation>
     </message>
     <message>
-        <location line="-1322"/>
-        <location filename="../src/ui-settings-dialog.h" line="-78"/>
+        <location line="-1103"/>
         <source>After Column</source>
         <translation>Показывать после </translation>
     </message>
     <message>
-        <location line="+47"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
+        <location line="-97"/>
         <source>Show whitespace</source>
         <translation>Показывать символ пробела</translation>
     </message>
     <message>
-        <location line="+39"/>
-        <location filename="../src/ui-settings-dialog.h" line="+3"/>
+        <location line="+157"/>
         <source>Do not show whitespace used for indentation</source>
         <translation>Не показывать пробелы, используемые для отступов</translation>
     </message>
     <message>
-        <location line="+58"/>
-        <location filename="../src/ui-settings-dialog.h" line="+2"/>
+        <location line="-135"/>
         <source>Tab width min.</source>
         <translation>Ширина вкладок мин.</translation>
     </message>
     <message>
         <location line="+64"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>max.</source>
         <translation>макс.</translation>
     </message>
     <message>
-        <location line="+615"/>
-        <location filename="../src/ui-settings-dialog.h" line="+45"/>
+        <location line="+577"/>
         <source>Create nonexistent files without prompting</source>
         <translation>Создавать отсутствующие файлы без запроса</translation>
     </message>
     <message>
-        <location line="-429"/>
-        <location filename="../src/ui-settings-dialog.h" line="-28"/>
+        <location line="-441"/>
         <source>command line (%f=file, %l=line):</source>
         <translation>команда (%f=файл, %l=строка):</translation>
     </message>
     <message>
-        <location line="+521"/>
-        <location filename="../src/ui-settings-dialog.h" line="+43"/>
+        <location line="+613"/>
         <source>Terminal</source>
         <translation>Командная строка</translation>
     </message>
     <message>
         <location line="+51"/>
-        <location filename="../src/ui-settings-dialog.h" line="-8"/>
         <source>Cursor type:</source>
         <translation>Тип указателя:</translation>
     </message>
     <message>
         <location line="-11"/>
-        <location filename="../src/ui-settings-dialog.h" line="-1"/>
         <source>Cursor blinking</source>
         <translation>Мигающий указатель</translation>
     </message>
     <message>
         <location line="-7"/>
-        <location filename="../src/ui-settings-dialog.h" line="-1"/>
         <source>Use foreground color</source>
         <translation>Использовать цвет текста</translation>
     </message>
     <message>
         <location line="+59"/>
-        <location filename="../src/ui-settings-dialog.h" line="+4"/>
         <source>Font size</source>
         <translation>Размер шрифта</translation>
     </message>
     <message>
         <location line="+123"/>
-        <location filename="../src/ui-settings-dialog.h" line="+3"/>
         <source>Set focus to terminal when running a command from within another widget</source>
         <translation>Устанавливать фокус на командном окне при запуске команды из другого виджета</translation>
     </message>
     <message>
         <location line="+73"/>
-        <location filename="../src/ui-settings-dialog.h" line="+15"/>
         <source>File Browser</source>
         <translation>Файловый менеджер</translation>
     </message>
     <message>
-        <location line="+46"/>
-        <location filename="../src/ui-settings-dialog.h" line="-8"/>
-        <source>Show file size</source>
-        <translation>Показывать размер файлов</translation>
-    </message>
-    <message>
-        <location line="-14"/>
-        <location filename="../src/ui-settings-dialog.h" line="-2"/>
-        <source>Show file type</source>
-        <translation>Показывать типы файлов</translation>
-    </message>
-    <message>
-        <location line="+21"/>
-        <location filename="../src/ui-settings-dialog.h" line="+3"/>
-        <source>Show date of last modification</source>
-        <translation>Показывать дату последнего изменения</translation>
-    </message>
-    <message>
-        <location line="-14"/>
-        <location filename="../src/ui-settings-dialog.h" line="-2"/>
-        <source>Show hidden files</source>
-        <translation>Показывать скрытые файлы</translation>
-    </message>
-    <message>
-        <location line="-1647"/>
-        <location filename="../src/ui-settings-dialog.h" line="-92"/>
+        <location line="-1661"/>
         <source>Normal</source>
         <translation>Обычные</translation>
     </message>
     <message>
         <location line="+270"/>
-        <location filename="../src/ui-settings-dialog.h" line="+15"/>
         <source>These preferences are applied after any .octaverc startup files.</source>
         <translation>Эти настройки применяются после конфигурационных файлов octaverc.</translation>
     </message>
     <message>
         <location line="+55"/>
-        <location filename="../src/ui-settings-dialog.h" line="+3"/>
         <source>Restore working directory of previous session</source>
         <translation>Восстанавливать рабочую папку предыдущей сессии</translation>
     </message>
     <message>
-        <location line="+322"/>
-        <location filename="../src/ui-settings-dialog.h" line="+15"/>
+        <location line="+71"/>
         <source>Draw a long line marker</source>
         <translation>Показывать линию переноса строк</translation>
     </message>
     <message>
-        <location line="+48"/>
-        <location filename="../src/ui-settings-dialog.h" line="+3"/>
+        <location line="+155"/>
         <source>Show EOL characters</source>
         <translation>Показывать символ конца строки</translation>
     </message>
     <message>
-        <location line="+9"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
+        <location line="+662"/>
         <source>Default EOL mode</source>
         <translation>Конец строки по умолчанию</translation>
     </message>
     <message>
-        <location line="+412"/>
-        <location filename="../src/ui-settings-dialog.h" line="+26"/>
+        <location line="-136"/>
         <source>Number of characters before list is shown: </source>
         <translation>Минимальная длина слова до отображения списка: </translation>
     </message>
     <message>
         <location line="+79"/>
-        <location filename="../src/ui-settings-dialog.h" line="+9"/>
         <source>File handling</source>
         <translation>Работа с файлами</translation>
     </message>
     <message>
-        <location line="+93"/>
-        <location filename="../src/ui-settings-dialog.h" line="+5"/>
+        <location line="+185"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Select font, font size (as a difference from the default size), font style (&lt;b&gt;b&lt;/b&gt;old, &lt;b&gt;i&lt;/b&gt;talic, &lt;b&gt;u&lt;/b&gt;nderline), text color, and background color (for the latter, the color magenta (255,0,255) is a placeholder for the default background color).&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Выберите шрифт, его размер (как разницу от размера по умолчанию), стиль шрифта (&lt;b&gt;ж&lt;/b&gt;ирный, &lt;b&gt;к&lt;/b&gt;урсив, &lt;b&gt;п&lt;/b&gt;одчёркнутый), цвет текста и фона (для фона пурпурный цвет (255,0,255) является обозначением фона по умолчанию).&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location line="+341"/>
-        <location filename="../src/ui-settings-dialog.h" line="+13"/>
-        <source>Display</source>
-        <translation>Внешний вид</translation>
+        <source>Behavior</source>
+        <translation>Поведение</translation>
+    </message>
+    <message>
+        <location line="+30"/>
+        <source>Restore last directory of previous session</source>
+        <translation>Открывать последнюю папку предыдущей сессии</translation>
+    </message>
+    <message>
+        <location line="+54"/>
+        <source>Extensions of files to be opened in the default text editor (separated by &quot;;&quot;):</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+39"/>
-        <location filename="../src/ui-settings-dialog.h" line="+5"/>
-        <source>Alternating row colors</source>
-        <translation>Чередующиеся цвета строк</translation>
-    </message>
-    <message>
-        <location line="+12"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
-        <source>Behavior</source>
-        <translation>Поведение</translation>
-    </message>
-    <message>
-        <location line="+34"/>
-        <location filename="../src/ui-settings-dialog.h" line="+3"/>
-        <source>Restore last directory of previous session</source>
-        <translation>Открывать последнюю папку предыдущей сессии</translation>
-    </message>
-    <message>
-        <location line="+71"/>
-        <location filename="../src/ui-settings-dialog.h" line="+5"/>
         <source>Workspace</source>
         <translation>Область переменных</translation>
     </message>
     <message>
-        <location line="+42"/>
-        <location filename="../src/ui-settings-dialog.h" line="-1"/>
+        <location line="+35"/>
+        <source>Colors for variable attributes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
         <source>Hide tool tips</source>
         <translation>Не показывать подсказку об обозначениях</translation>
     </message>
     <message>
-        <location line="+182"/>
-        <location filename="../src/ui-settings-dialog.h" line="+14"/>
+        <location line="+101"/>
+        <source>Import shortcut set</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Export current shortcut set</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Reset shortcuts to their defaults</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location line="+80"/>
+        <source>Default</source>
+        <translation type="unfinished">По умолчанию</translation>
+    </message>
+    <message>
+        <location line="-71"/>
         <source>Edit a shortcut by double-clicking in a cell</source>
         <translation>Для изменения комбинации клавиш дважды нажмите на ячейку</translation>
     </message>
     <message>
-        <location line="+108"/>
-        <location filename="../src/ui-settings-dialog.h" line="+20"/>
+        <location line="+76"/>
+        <source>Actual</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
         <source>Network</source>
         <translation>Сеть</translation>
     </message>
     <message>
         <location line="+23"/>
-        <location filename="../src/ui-settings-dialog.h" line="-12"/>
         <source>Allow Octave to connect to the Octave web site to display current news and information</source>
         <translation>Разрешить подключаться к веб-сайту Octave для отображения новостей и другой информации</translation>
     </message>
     <message>
         <location line="+46"/>
-        <location filename="../src/ui-settings-dialog.h" line="+8"/>
         <source>Use proxy server</source>
         <translation>Использовать прокси-сервер</translation>
     </message>
     <message>
         <location line="-23"/>
-        <location filename="../src/ui-settings-dialog.h" line="-4"/>
         <source>HttpProxy</source>
         <translation>HttpProxy</translation>
     </message>
     <message>
-        <location line="-2083"/>
-        <location filename="../src/ui-settings-dialog.h" line="-123"/>
+        <location line="-2039"/>
         <source>Icon set for dock widgets</source>
         <translation>Значок виджета в панели задач</translation>
     </message>
     <message>
         <location line="-48"/>
-        <location filename="../src/ui-settings-dialog.h" line="-4"/>
         <source>Language (requires restart)</source>
         <translation>Язык (требуется перезапуск)</translation>
     </message>
     <message>
         <location line="-58"/>
-        <location filename="../src/ui-settings-dialog.h" line="-5"/>
         <source>Icon size</source>
         <translation>Размер значков</translation>
     </message>
     <message>
-        <location line="+1714"/>
-        <location filename="../src/ui-settings-dialog.h" line="+100"/>
+        <location line="+1716"/>
         <source>Synchronize Octave working directory with file browser</source>
         <translation>Синхронизировать рабочую папку Octave с менеджером фалов</translation>
     </message>
     <message>
-        <location line="+132"/>
-        <location filename="../src/ui-settings-dialog.h" line="+5"/>
-        <source>Colors for variable attributes </source>
-        <translation>Цветовое обозначение переменных</translation>
-    </message>
-    <message>
-        <location line="+34"/>
-        <location filename="../src/ui-settings-dialog.h" line="+22"/>
+        <location line="+184"/>
         <source>Shortcuts</source>
         <translation>Комбинации клавиш</translation>
     </message>
     <message>
         <location line="+31"/>
-        <location filename="../src/ui-settings-dialog.h" line="-18"/>
         <source>Select this option to prevent conflicts with readline shortcuts</source>
         <translation>Используйте для предотвращения конфликтов между комбинациями клавиш</translation>
     </message>
     <message>
         <location line="+3"/>
-        <location filename="../src/ui-settings-dialog.h" line="+2"/>
         <source>Disable global shortcuts when terminal window has focus</source>
         <translation>Запретить глабальные комбинации клавиш, когда командное окно в фокусе</translation>
     </message>
     <message>
-        <location line="+31"/>
-        <location line="+28"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
-        <location line="+4"/>
-        <source>Use this set</source>
-        <translation>Использовать этот набор</translation>
-    </message>
-    <message>
-        <location line="-21"/>
-        <location filename="../src/ui-settings-dialog.h" line="-3"/>
-        <source>Set 1:</source>
-        <translation>Набор 1:</translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <location line="+37"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
-        <location line="+3"/>
+        <location line="+53"/>
         <source>Export</source>
         <translation>Экспортировать</translation>
     </message>
     <message>
-        <location line="-30"/>
-        <location line="+37"/>
-        <location filename="../src/ui-settings-dialog.h" line="-2"/>
-        <location line="+3"/>
+        <location line="-10"/>
         <source>Import</source>
         <translation>Импортировать</translation>
     </message>
     <message>
-        <location line="+7"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
-        <source>Set 2:</source>
-        <translation>Набор 2:</translation>
-    </message>
-    <message>
-        <location line="+86"/>
-        <location filename="../src/ui-settings-dialog.h" line="+7"/>
+        <location line="+90"/>
         <source>Action</source>
         <translation>Действие</translation>
     </message>
     <message>
-        <location line="+10"/>
-        <location filename="../src/ui-settings-dialog.h" line="-1"/>
-        <source>Set 1 Default</source>
-        <translation>По умолчанию из набора 1</translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <location filename="../src/ui-settings-dialog.h" line="-1"/>
-        <source>Set 1 Actual</source>
-        <translation>Текущая из набора 1</translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <location filename="../src/ui-settings-dialog.h" line="-1"/>
-        <source>Set 2 Default</source>
-        <translation>По умолчанию из набора 2</translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <location filename="../src/ui-settings-dialog.h" line="-1"/>
-        <source>Set 2 Actual</source>
-        <translation>Текущая из набора 2</translation>
-    </message>
-    <message>
-        <location line="+68"/>
-        <location filename="../src/ui-settings-dialog.h" line="+11"/>
+        <location line="+83"/>
         <source>Socks5Proxy</source>
         <translation>Socks5Proxy</translation>
     </message>
     <message>
         <location line="-16"/>
-        <location filename="../src/ui-settings-dialog.h" line="-4"/>
         <source>Hostname:</source>
         <translation>Имя хоста:</translation>
     </message>
     <message>
         <location line="+44"/>
-        <location filename="../src/ui-settings-dialog.h" line="+8"/>
         <source>Proxy type:</source>
         <translation>Тип сервера:</translation>
     </message>
     <message>
         <location line="+10"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Port:</source>
         <translation>Порт:</translation>
     </message>
     <message>
         <location line="-27"/>
-        <location filename="../src/ui-settings-dialog.h" line="-3"/>
         <source>Username:</source>
         <translation>Имя пользователя:</translation>
     </message>
     <message>
         <location line="+37"/>
-        <location filename="../src/ui-settings-dialog.h" line="+4"/>
         <source>Password:</source>
         <translation>Пароль:</translation>
     </message>
     <message>
-        <location filename="../src/settings-dialog.cc" line="+77"/>
+        <location filename="../src/settings-dialog.cc" line="+127"/>
+        <source>Octave Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Unable to save settings.  Missing settings file or unknown directory.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+18"/>
         <location line="+4"/>
-        <location line="+561"/>
+        <location line="+444"/>
         <source>System setting</source>
         <translation>Используемый в системе</translation>
     </message>
     <message>
-        <location line="-355"/>
+        <location line="-232"/>
         <source>IBeam Cursor</source>
         <translation>Вертикальная черта</translation>
     </message>
@@ -2692,35 +3487,7 @@
         <translation>Черта снизу</translation>
     </message>
     <message>
-        <location line="+213"/>
-        <source>Difference to the default size</source>
-        <translation>Отличие то размера по умолчанию</translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Background color, pink (255,0,255) means default</source>
-        <translation>Цвет заднего фона, розовый (255,0,255) по умолчанию</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>b</source>
-        <comment>short form for bold</comment>
-        <translation>ж</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>i</source>
-        <comment>short form for italic</comment>
-        <translation>к</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>u</source>
-        <comment>short form for underlined</comment>
-        <translation>п</translation>
-    </message>
-    <message>
-        <location line="+497"/>
+        <location line="+503"/>
         <source>Set Octave Startup Directory</source>
         <translation>Установить начальную рабочую папку Octave</translation>
     </message>
@@ -2733,7 +3500,7 @@
 <context>
     <name>setup_community_news</name>
     <message>
-        <location filename="../src/welcome-wizard.cc" line="+44"/>
+        <location filename="../src/welcome-wizard.cc" line="+42"/>
         <source>Community News</source>
         <translation>Новости сообщества</translation>
     </message>
@@ -2788,7 +3555,7 @@
 <context>
     <name>shortcut_manager</name>
     <message>
-        <location filename="../src/shortcut-manager.cc" line="+109"/>
+        <location filename="../src/shortcut-manager.cc" line="+106"/>
         <source>New File</source>
         <translation>Новый файл</translation>
     </message>
@@ -2818,42 +3585,38 @@
         <translation>Сохранить область переменных как</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <location line="+158"/>
+        <location line="+16"/>
+        <location line="+143"/>
         <source>Preferences</source>
         <translation>Настройки</translation>
     </message>
     <message>
-        <location line="-157"/>
+        <location line="-158"/>
         <source>Exit Octave</source>
         <translation>Выйли из Octave</translation>
     </message>
     <message>
         <location line="+3"/>
-        <location line="+84"/>
         <source>Copy</source>
         <translation>Копировать</translation>
     </message>
     <message>
-        <location line="-83"/>
-        <location line="+85"/>
+        <location line="+1"/>
         <source>Paste</source>
         <translation>Вставить</translation>
     </message>
     <message>
-        <location line="-84"/>
-        <location line="+80"/>
+        <location line="+1"/>
         <source>Undo</source>
         <translation>Отменить</translation>
     </message>
     <message>
-        <location line="-79"/>
-        <location line="+84"/>
+        <location line="+1"/>
         <source>Select All</source>
         <translation>Выделить всё</translation>
     </message>
     <message>
-        <location line="-83"/>
+        <location line="+1"/>
         <source>Clear Clipboard</source>
         <translation>Очистить буфер обмена</translation>
     </message>
@@ -2878,7 +3641,7 @@
         <translation>Очистить область переменных</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+6"/>
         <source>Step Into</source>
         <translation>Шаг с заходом</translation>
     </message>
@@ -2949,12 +3712,12 @@
     </message>
     <message>
         <location line="+2"/>
-        <location line="+216"/>
+        <location line="+234"/>
         <source>Editor</source>
         <translation>Редактор</translation>
     </message>
     <message>
-        <location line="-214"/>
+        <location line="-232"/>
         <source>Documentation</source>
         <translation>Документация</translation>
     </message>
@@ -3034,19 +3797,29 @@
         <translation>Печать</translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+3"/>
         <source>Redo</source>
         <translation></translation>
     </message>
     <message>
+        <location line="+1"/>
+        <source>Cut</source>
+        <translation>Вырезать</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Find and Replace</source>
+        <translation>Найти и заменить</translation>
+    </message>
+    <message>
         <location line="+2"/>
-        <source>Cut</source>
-        <translation>Вырезать</translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Find and Replace</source>
-        <translation>Найти и заменить</translation>
+        <source>Find Next</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Find Previous</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+2"/>
@@ -3146,7 +3919,68 @@
         <translation>Показывать символ пробела</translation>
     </message>
     <message>
-        <location line="-22"/>
+        <location line="+46"/>
+        <source>Switch to Left Tab</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Switch to Right Tab</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Move Tab Left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Move Tab Right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+44"/>
+        <source>Global</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+38"/>
+        <source>Tabs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+98"/>
+        <source>Enter new Shortcut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+143"/>
+        <source>Overwriting Shortcuts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>You are about to overwrite all shortcuts.
+Would you like to save the current shortcut set or cancel the action?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Don&apos;t save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+39"/>
+        <source>Import shortcuts from file ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Export shortcuts into file ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-446"/>
         <source>Goto Line</source>
         <translation>Перейти к строке</translation>
     </message>
@@ -3232,6 +4066,21 @@
     </message>
     <message>
         <location line="+2"/>
+        <source>Show Toolbar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Show Statusbar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Show Horizontal Scrollbar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>Zoom In</source>
         <translation>Увеличить</translation>
     </message>
@@ -3287,12 +4136,7 @@
         <translation>Документация по зарезервированному слову</translation>
     </message>
     <message>
-        <location line="+42"/>
-        <source>Main</source>
-        <translation>Основное окно</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <location line="+57"/>
         <location line="+23"/>
         <source>File</source>
         <translation>Файл</translation>
@@ -3336,12 +4180,7 @@
         <translation>Запуск</translation>
     </message>
     <message>
-        <location line="+124"/>
-        <source>Enter new Shortcut for Set %1</source>
-        <translation>Ввести новую комбинацию клавиш для набора %1</translation>
-    </message>
-    <message>
-        <location line="+5"/>
+        <location line="+106"/>
         <source>Apply the desired shortcut or click on the right button to reset the shortcut to its default.</source>
         <translation>Назначьте комбинацию клавиш или нажмине на кнопку сброса на значение по умолчанию.</translation>
     </message>
@@ -3366,7 +4205,7 @@
         <translation>Значение по умолчанию</translation>
     </message>
     <message>
-        <location line="+53"/>
+        <location line="+45"/>
         <source>Double Shortcut</source>
         <translation>Конфликт комбинаций клавиш</translation>
     </message>
@@ -3384,23 +4223,13 @@
 Вы действительно хотите использовать эту комбинацию?</translation>
     </message>
     <message>
-        <location line="+71"/>
-        <source>Import shortcut set %1 from file ...</source>
-        <translation>Импортировать набор комбинаций клавиш %1 из файла ...</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <location line="+6"/>
+        <location line="+113"/>
+        <location line="+5"/>
         <source>Octave Shortcut Files (*.osc);;All Files (*)</source>
         <translation>Файл набора комбинаций клавиш Octave (*.osc);;Все файлы (*)</translation>
     </message>
     <message>
-        <location line="-1"/>
-        <source>Export shortcut set %1 into file ...</source>
-        <translation>Экспортировать набор комбинаций клавиш %1 в файл ...</translation>
-    </message>
-    <message>
-        <location line="+15"/>
+        <location line="+10"/>
         <source>Failed to open %1 as octave shortcut file</source>
         <translation>Невозможно открыть %1 как набор комбинаций клавиш Octave</translation>
     </message>
@@ -3439,7 +4268,7 @@
 <context>
     <name>welcome_wizard</name>
     <message>
-        <location filename="../src/welcome-wizard.cc" line="+135"/>
+        <location filename="../src/welcome-wizard.cc" line="+133"/>
         <source>Welcome to GNU Octave</source>
         <translation>Добро пожаловать в GNU Octave</translation>
     </message>
@@ -3447,7 +4276,7 @@
 <context>
     <name>workspace_model</name>
     <message>
-        <location filename="../src/workspace-model.cc" line="-42"/>
+        <location filename="../src/workspace-model.cc" line="-41"/>
         <source>Name</source>
         <translation>Идентификатор</translation>
     </message>
@@ -3472,7 +4301,7 @@
         <translation>Свойство</translation>
     </message>
     <message>
-        <location line="+109"/>
+        <location line="+108"/>
         <source>Right click to copy, rename, or display</source>
         <translation>Правый щелчок для копирования, переименования или отображения</translation>
     </message>
@@ -3486,7 +4315,7 @@
 <context>
     <name>workspace_view</name>
     <message>
-        <location filename="../src/workspace-view.cc" line="+50"/>
+        <location filename="../src/workspace-view.cc" line="+51"/>
         <source>Workspace</source>
         <translation>Область переменных</translation>
     </message>
@@ -3506,7 +4335,7 @@
         <translation>Фильтр</translation>
     </message>
     <message>
-        <location line="+161"/>
+        <location line="+242"/>
         <source>Copy name</source>
         <translation>Копировать имя</translation>
     </message>
@@ -3522,11 +4351,41 @@
     </message>
     <message>
         <location line="+9"/>
-        <source>Only top-level symbols may be renamed.</source>
-        <translation>Только элементы верхнего уровня могут быть переименованы.</translation>
-    </message>
-    <message>
-        <location line="+132"/>
+        <source>Only top-level symbols may be renamed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Hide filter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Show filter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+149"/>
+        <source>Class</source>
+        <translation type="unfinished">Тип</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Dimension</source>
+        <translation type="unfinished">Размерность</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Value</source>
+        <translation type="unfinished">Значение</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Attribute</source>
+        <translation type="unfinished">Свойство</translation>
+    </message>
+    <message>
+        <location line="-17"/>
         <source>View the variables in the active workspace.&lt;br&gt;</source>
         <translation>Содержимое текущей области переменных.&lt;br&gt; </translation>
     </message>
--- a/libgui/languages/uk_UA.ts	Thu Aug 18 12:26:32 2016 -0700
+++ b/libgui/languages/uk_UA.ts	Fri Aug 19 21:05:48 2016 +0200
@@ -4,7 +4,7 @@
 <context>
     <name>ListDialog</name>
     <message>
-        <location filename="../src/dialog.cc" line="+251"/>
+        <location filename="../src/dialog.cc" line="+258"/>
         <source>Select All</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12,7 +12,7 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../src/workspace-model.cc" line="+75"/>
+        <location filename="../src/workspace-model.cc" line="+74"/>
         <source>automatic</source>
         <translation type="unfinished"></translation>
     </message>
@@ -61,11 +61,39 @@
         <source>cursor</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../src/settings-dialog.cc" line="+132"/>
+        <source>Difference to the default size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Background color, pink (255,0,255) means default</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>b</source>
+        <comment>short form for bold</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>i</source>
+        <comment>short form for italic</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>u</source>
+        <comment>short form for underlined</comment>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QTerminal</name>
     <message>
-        <location filename="../qterminal/libqterminal/QTerminal.h" line="+135"/>
+        <location filename="../qterminal/libqterminal/QTerminal.h" line="+130"/>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
@@ -80,15 +108,20 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+7"/>
         <source>Clear Window</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../qterminal/libqterminal/QTerminal.cc" line="+46"/>
+        <source>Edit %1 at line %2</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QWinTerminalImpl</name>
     <message>
-        <location filename="../qterminal/libqterminal/win32/QWinTerminalImpl.cpp" line="+1778"/>
+        <location filename="../qterminal/libqterminal/win32/QWinTerminalImpl.cpp" line="+1779"/>
         <source>copied selection to clipboard</source>
         <translation type="unfinished"></translation>
     </message>
@@ -762,7 +795,7 @@
 <context>
     <name>QtHandles::Figure</name>
     <message>
-        <location filename="../graphics/Figure.cc" line="+282"/>
+        <location filename="../graphics/Figure.cc" line="+298"/>
         <source>Figure ToolBar</source>
         <translation type="unfinished"></translation>
     </message>
@@ -812,37 +845,19 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Cu&amp;t</source>
-        <translation type="unfinished">Виріза&amp;ти</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>&amp;Paste</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
+        <location line="+7"/>
+        <location line="+463"/>
+        <source>About Octave</source>
+        <translation type="unfinished">Про Octave</translation>
+    </message>
+    <message>
+        <location line="-465"/>
         <source>&amp;Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>&amp;About QtHandles</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>About &amp;Qt</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+427"/>
-        <source>About QtHandles</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+39"/>
+        <location line="+504"/>
+        <location line="+69"/>
         <source>Save Figure As</source>
         <translation type="unfinished"></translation>
     </message>
@@ -881,6 +896,160 @@
     </message>
 </context>
 <context>
+    <name>annotation_dialog</name>
+    <message>
+        <location filename="../graphics/annotation-dialog.ui" line="+17"/>
+        <source>Annotation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>String</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Font</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+42"/>
+        <source>bold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>b</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>italic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>i</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+428"/>
+        <source>color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>Horz alignment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <location line="+29"/>
+        <source>middle</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-24"/>
+        <source>right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Vert alignment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>top</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>bottom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Position</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>X</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Y</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Width</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Height</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>units</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>normalized</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Fit to box</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Box</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Background</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+444"/>
+        <source>Edge</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+133"/>
+        <source>Line style</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>none</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Line width</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>documentation_dock_widget</name>
     <message>
         <location filename="../src/documentation-dock-widget.cc" line="+34"/>
@@ -896,17 +1065,18 @@
 <context>
     <name>file_editor</name>
     <message>
-        <location filename="../src/m-editor/file-editor.cc" line="+285"/>
-        <location line="+125"/>
+        <location filename="../src/m-editor/file-editor.cc" line="+366"/>
+        <location line="+152"/>
         <location line="+19"/>
         <location line="+25"/>
         <location line="+62"/>
         <location line="+28"/>
+        <location line="+79"/>
         <source>Octave Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-318"/>
+        <location line="-462"/>
         <source>Octave Files (*.m);;All Files (*)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -922,19 +1092,19 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+330"/>
+        <location line="+395"/>
         <source>File not saved! A file with the selected name
 %1
 is already open in the editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+387"/>
+        <location line="+492"/>
         <source>&amp;%1 %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+388"/>
+        <location line="+480"/>
         <source>&amp;Save File</source>
         <translation type="unfinished">&amp;Зберегти</translation>
     </message>
@@ -950,41 +1120,26 @@
     </message>
     <message>
         <location line="+7"/>
-        <source>&amp;Undo</source>
-        <translation type="unfinished">В&amp;ернути</translation>
-    </message>
-    <message>
-        <location line="+3"/>
         <source>&amp;Redo</source>
         <translation type="unfinished">П&amp;овторити</translation>
     </message>
     <message>
         <location line="+6"/>
-        <source>&amp;Copy</source>
-        <translation type="unfinished">&amp;Копіювати</translation>
-    </message>
-    <message>
-        <location line="+3"/>
         <source>Cu&amp;t</source>
         <translation type="unfinished">Виріза&amp;ти</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Paste</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+96"/>
+        <location line="+94"/>
         <source>&amp;Next Bookmark</source>
         <translation type="unfinished">До &amp;наступної закладки</translation>
     </message>
     <message>
-        <location line="-2"/>
+        <location line="+2"/>
         <source>Pre&amp;vious Bookmark</source>
         <translation type="unfinished">До &amp;попередньої закладки</translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+2"/>
         <source>Toggle &amp;Bookmark</source>
         <translation type="unfinished">В&amp;становити/видалити закладку</translation>
     </message>
@@ -994,7 +1149,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+54"/>
+        <location line="+68"/>
         <source>&amp;Next Breakpoint</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1014,7 +1169,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-104"/>
+        <location line="-118"/>
         <source>&amp;Comment</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1034,28 +1189,28 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-55"/>
+        <location line="-61"/>
         <source>&amp;Find and Replace...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+162"/>
+        <location line="+182"/>
         <source>Save File and Run</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-90"/>
+        <location line="-104"/>
         <source>Go &amp;to Line...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1126"/>
+        <location line="-1341"/>
         <source>Could not start custom file editor
 %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+148"/>
+        <location line="+175"/>
         <source>Create</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1065,7 +1220,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+844"/>
+        <location line="+1041"/>
         <source>&amp;Recent Editor Files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1090,12 +1245,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
-        <source>Select All</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
+        <location line="+32"/>
         <source>&amp;Commands</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1220,17 +1370,62 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+128"/>
-        <source>Editor</source>
-        <translation type="unfinished">Редактор</translation>
-    </message>
-    <message>
-        <location line="-120"/>
-        <source>Show Line &amp;Endings</source>
+        <location line="+22"/>
+        <source>Show &amp;Toolbar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Show &amp;Statusbar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+4"/>
+        <source>Show &amp;Horizontal Scrollbar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+69"/>
+        <source>Recent Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+65"/>
+        <source>Editor</source>
+        <translation type="unfinished">Редактор</translation>
+    </message>
+    <message>
+        <location line="-156"/>
+        <source>Show Line &amp;Endings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-1467"/>
+        <source>File Encoding:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+403"/>
+        <source>%1 is a built-in function</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>Can not find function %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+911"/>
+        <source>Find &amp;Next...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Find &amp;Previous...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+118"/>
         <source>Show &amp;Indentation Guides</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1240,7 +1435,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+20"/>
         <source>Zoom &amp;In</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1275,7 +1470,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1103"/>
+        <location line="-1305"/>
         <source>Could not open file
 %1
 for read: %2.</source>
@@ -1301,7 +1496,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+731"/>
+        <location line="+928"/>
         <source>&amp;File</source>
         <translation type="unfinished">&amp;Файл</translation>
     </message>
@@ -1311,12 +1506,12 @@
         <translation type="unfinished">&amp;Правка</translation>
     </message>
     <message>
-        <location line="+138"/>
+        <location line="+129"/>
         <source>Show &amp;Whitespace Characters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+42"/>
         <source>&amp;Debug</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1329,12 +1524,12 @@
 <context>
     <name>file_editor_tab</name>
     <message>
-        <location filename="../src/m-editor/file-editor-tab.cc" line="+92"/>
+        <location filename="../src/m-editor/file-editor-tab.cc" line="+145"/>
         <source>eol:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="-17"/>
         <source>line:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1344,17 +1539,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+156"/>
-        <source>%1 is a built-in function</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+31"/>
-        <source>Can not find function %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+775"/>
+        <location line="+1146"/>
         <source>Goto line</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1364,7 +1549,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+146"/>
+        <location line="+145"/>
         <location line="+63"/>
         <source>&lt;unnamed&gt;</source>
         <translation type="unfinished"></translation>
@@ -1379,12 +1564,28 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+288"/>
+        <location line="+298"/>
+        <source>Debug or Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>This file is currently being executed.
+Quit debugging and save?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+166"/>
         <source>Line Endings:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+9"/>
+        <source>File Encoding:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+28"/>
         <source>Octave Files (*.m)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1394,22 +1595,59 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-322"/>
+        <location line="-513"/>
         <source>Do you want to cancel closing, save or discard the changes?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-970"/>
-        <location line="+979"/>
-        <location line="+213"/>
-        <location line="+177"/>
-        <location line="+85"/>
+        <location line="-1342"/>
+        <source>encoding:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+239"/>
+        <source>Breakpoint condition</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+88"/>
+        <location line="+1024"/>
+        <location line="+372"/>
+        <location line="+215"/>
+        <location line="+21"/>
+        <location line="+83"/>
         <location line="+23"/>
         <source>Octave Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-6"/>
+        <location line="-1737"/>
+        <source>Cannot add breakpoint to modified file.
+Save and add breakpoint, or canel?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1611"/>
+        <source>&quot;%1&quot;
+is not a valid identifier.
+
+If you keep this filename, you will not be able to
+call your script using its name as an Octave command.
+
+Do you want to choose another name?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>The current editor contents can not be encoded
+with the selected codec %1.
+Using it will result in data loss!
+
+Do you want to chose another codec?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+99"/>
         <source>
 
 Warning: The contents in the editor is modified!</source>
@@ -1423,24 +1661,13 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-285"/>
+        <location line="-342"/>
         <source>Could not open file %1 for write:
 %2.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+177"/>
-        <source>&quot;%1&quot;
-is not a valid identifier.
-
-If you keep this file name, you will not be able to
-call your script using its name as an Octave command.
-
-Do you want to choose another name?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+85"/>
+        <location line="+319"/>
         <source>It seems that &apos;%1&apos; has been modified by another application. Do you want to reload it?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1453,12 +1680,7 @@
         <translation type="unfinished">Файловий менеджер</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Browse your files.</source>
-        <translation type="unfinished">Переглянути файли.</translation>
-    </message>
-    <message>
-        <location line="+18"/>
+        <location line="+35"/>
         <source>Enter the path or filename</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1479,22 +1701,67 @@
     </message>
     <message>
         <location line="+4"/>
-        <location line="+388"/>
+        <location line="+373"/>
         <source>Find Files...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+364"/>
+        <location line="-26"/>
+        <source>Open in System File Explorer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Open in Text Editor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+389"/>
         <source>New Directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-784"/>
+        <location line="-773"/>
         <source>Show Octave directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-4"/>
+        <location line="-49"/>
+        <source>Browse your files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Alternating row colors</source>
+        <translation type="unfinished">Чергувати колір рядків</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>filesdockwidget/showFileSize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>filesdockwidget/showFileType</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>filesdockwidget/showLastModified</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>filesdockwidget/showHiddenFiles</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>filesdockwidget/useAlternatingRowColors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+29"/>
         <source>One directory up</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1515,53 +1782,48 @@
     </message>
     <message>
         <location line="+20"/>
-        <location line="+397"/>
+        <location line="+382"/>
         <source>New File...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-394"/>
-        <location line="+397"/>
+        <location line="-379"/>
+        <location line="+382"/>
         <source>New Directory...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-335"/>
+        <location line="-329"/>
         <source>Activate to open in editor, right click for alternatives</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+236"/>
+        <location line="-136"/>
         <source>File size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+1"/>
         <source>File type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+1"/>
         <source>Date modified</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+1"/>
         <source>Show hidden</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+415"/>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Open in Default Application</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <location line="+13"/>
         <source>Copy Selection to Clipboard</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1591,7 +1853,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+115"/>
+        <location line="+125"/>
         <source>Rename file/directory</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1625,7 +1887,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+151"/>
+        <location line="+145"/>
         <source>Set directory of file browser</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1662,7 +1924,7 @@
 <context>
     <name>final_page</name>
     <message>
-        <location filename="../src/welcome-wizard.cc" line="+199"/>
+        <location filename="../src/welcome-wizard.cc" line="+195"/>
         <source>Enjoy!</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1710,7 +1972,7 @@
 <context>
     <name>find_dialog</name>
     <message>
-        <location filename="../src/m-editor/find-dialog.cc" line="+74"/>
+        <location filename="../src/m-editor/find-dialog.cc" line="+85"/>
         <source>Find and Replace</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1785,7 +2047,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+84"/>
+        <location line="+87"/>
         <source>Search from end</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1795,7 +2057,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+205"/>
+        <location line="+221"/>
         <source>Replace Result</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1913,7 +2175,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+21"/>
         <source>Idle.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1939,7 +2201,7 @@
     </message>
     <message>
         <location line="+15"/>
-        <source>File name/location</source>
+        <source>Filename/location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1948,7 +2210,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+105"/>
+        <location line="+111"/>
         <source>Searching...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1966,7 +2228,7 @@
 <context>
     <name>find_files_model</name>
     <message>
-        <location filename="../src/find-files-model.cc" line="+82"/>
+        <location filename="../src/find-files-model.cc" line="+83"/>
         <source>Filename</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2004,7 +2266,7 @@
         <translation type="unfinished">Історія виконаних команд</translation>
     </message>
     <message>
-        <location line="+89"/>
+        <location line="+107"/>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2018,11 +2280,21 @@
         <source>Create script</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+4"/>
+        <source>Hide filter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Show filter</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>initial_page</name>
     <message>
-        <location filename="../src/welcome-wizard.cc" line="-179"/>
+        <location filename="../src/welcome-wizard.cc" line="-176"/>
         <source>Welcome to Octave!</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2049,13 +2321,13 @@
 <context>
     <name>main_window</name>
     <message>
-        <location filename="../src/main-window.cc" line="+268"/>
+        <location filename="../src/main-window.cc" line="+275"/>
         <source>Load Workspace</source>
         <translation type="unfinished">Завантажити область змінних</translation>
     </message>
     <message>
-        <location line="+732"/>
-        <location line="+931"/>
+        <location line="+758"/>
+        <location line="+975"/>
         <source>About Octave</source>
         <translation type="unfinished">Про Octave</translation>
     </message>
@@ -2065,12 +2337,12 @@
         <translation type="unfinished">&amp;Файл</translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+45"/>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-43"/>
+        <location line="-39"/>
         <source>Open...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2080,7 +2352,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-95"/>
+        <location line="-99"/>
         <source>Exit</source>
         <translation type="unfinished">Вийти</translation>
     </message>
@@ -2095,22 +2367,22 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+7"/>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+5"/>
         <source>Paste</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1469"/>
+        <location line="-1537"/>
         <source>Save Workspace As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+134"/>
+        <location line="+124"/>
         <source>The release notes file &apos;%1&apos; is empty.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2120,7 +2392,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="+12"/>
         <source>Octave Release Notes</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2130,17 +2402,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+187"/>
+        <location line="+206"/>
         <source>Are you sure you want to exit Octave?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+854"/>
+        <location line="+916"/>
         <source>Open an existing file in editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+48"/>
+        <location line="+44"/>
         <source>New Function...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2150,12 +2422,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+39"/>
         <source>Select All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="+4"/>
         <source>Clear Clipboard</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2205,17 +2477,27 @@
         <translation type="unfinished">Файловий менеджер</translation>
     </message>
     <message>
-        <location line="-84"/>
+        <location line="+36"/>
+        <source>Contribute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Donate to Octave</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-123"/>
         <source>Step In</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1020"/>
+        <location line="-1082"/>
         <source>Octave</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+868"/>
+        <location line="+926"/>
         <source>Load Workspace...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2230,7 +2512,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+124"/>
+        <location line="+128"/>
         <source>Step Out</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2250,17 +2532,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Contribute to Octave</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Octave Developer Resources</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+14"/>
+        <location line="+20"/>
         <source>On Disk</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2305,8 +2577,8 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1148"/>
-        <location line="+1151"/>
+        <location line="-1198"/>
+        <location line="+1201"/>
         <source>Browse directories</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2385,7 +2657,7 @@
 <context>
     <name>news_reader</name>
     <message>
-        <location line="-1411"/>
+        <location line="-1492"/>
         <source>&lt;html&gt;
 &lt;body&gt;
 &lt;p&gt;
@@ -2421,18 +2693,18 @@
 <context>
     <name>octave_dock_widget</name>
     <message>
-        <location filename="../src/octave-dock-widget.cc" line="+68"/>
-        <location line="+198"/>
+        <location filename="../src/octave-dock-widget.cc" line="+67"/>
+        <location line="+201"/>
         <source>Undock widget</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-188"/>
+        <location line="-191"/>
         <source>Hide widget</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+132"/>
+        <location line="+136"/>
         <source>Dock widget</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2440,7 +2712,7 @@
 <context>
     <name>octave_qscintilla</name>
     <message>
-        <location filename="../src/m-editor/octave-qscintilla.cc" line="+226"/>
+        <location filename="../src/m-editor/octave-qscintilla.cc" line="+237"/>
         <source>Help on</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2454,18 +2726,23 @@
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+15"/>
+        <source>dbstop if ...</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>octave_qt_link</name>
     <message>
-        <location filename="../src/octave-qt-link.cc" line="+111"/>
-        <location line="+6"/>
-        <location line="+7"/>
+        <location filename="../src/octave-qt-link.cc" line="+136"/>
+        <location line="+9"/>
+        <location line="+11"/>
         <source>Create</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-10"/>
+        <location line="-14"/>
         <source>File
 %1
 does not exist. Do you want to create it?</source>
@@ -2477,7 +2754,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+211"/>
+        <location line="+254"/>
         <source>The file %1 does not exist in the load path.  To run or debug the function you are editing, you must either change to the directory %2 or add that directory to the load path.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2502,8 +2779,8 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-223"/>
-        <location line="+224"/>
+        <location line="-269"/>
+        <location line="+270"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2519,7 +2796,7 @@
 <context>
     <name>resource_manager</name>
     <message>
-        <location filename="../src/resource-manager.cc" line="+245"/>
+        <location filename="../src/resource-manager.cc" line="+246"/>
         <source>The settings file
 %1
 does not exist and can not be created.
@@ -2539,731 +2816,589 @@
     <name>settings_dialog</name>
     <message>
         <location filename="../src/settings-dialog.ui" line="+23"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1738"/>
         <source>Settings</source>
         <translation type="unfinished">Налаштування</translation>
     </message>
     <message>
         <location line="+19"/>
         <location line="+468"/>
-        <location filename="../src/ui-settings-dialog.h" line="+25"/>
-        <location line="+1"/>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="-338"/>
-        <location filename="../src/ui-settings-dialog.h" line="-17"/>
         <source>Octave logo only</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+10"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Letter icons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="-111"/>
-        <location filename="../src/ui-settings-dialog.h" line="-8"/>
         <source>Dock widget title bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+53"/>
-        <location filename="../src/ui-settings-dialog.h" line="+3"/>
         <source>Small</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+17"/>
-        <location filename="../src/ui-settings-dialog.h" line="+2"/>
         <source>Large</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+168"/>
-        <location filename="../src/ui-settings-dialog.h" line="+10"/>
         <source>Custom style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+32"/>
-        <location filename="../src/ui-settings-dialog.h" line="+2"/>
         <source>3D</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+148"/>
-        <location filename="../src/ui-settings-dialog.h" line="+63"/>
         <source>Editor</source>
         <translation type="unfinished">Редактор</translation>
     </message>
     <message>
-        <location line="+151"/>
-        <location filename="../src/ui-settings-dialog.h" line="-49"/>
+        <location line="+107"/>
         <source>Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+135"/>
-        <location filename="../src/ui-settings-dialog.h" line="+4"/>
+        <location line="-72"/>
         <source>This works well for monospaced fonts. The line is drawn at a position based on the width of a space character in the default font. It may not work very well if styles use proportional fonts or if varied font sizes or bold, italic and normal texts are used.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
-        <location filename="../src/ui-settings-dialog.h" line="+3"/>
+        <location line="+289"/>
         <source>Enable Code Folding</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+61"/>
-        <location filename="../src/ui-settings-dialog.h" line="+6"/>
+        <location line="+551"/>
         <source>Windows (CRLF)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+5"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Mac (CR)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+5"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Unix (LF)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
-        <location filename="../src/ui-settings-dialog.h" line="+2"/>
+        <location line="-532"/>
         <source>Show horizontal scroll bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+68"/>
-        <location filename="../src/ui-settings-dialog.h" line="+4"/>
+        <location line="-299"/>
+        <source>Show tool bar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+383"/>
         <source>Indentation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+24"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Indent width</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+7"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Tab indents line</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+7"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Auto indentation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+26"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Tab width</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+7"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Show indentation guides</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+23"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Backspace unindents line</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+23"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Indentation uses tabs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+38"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Auto completion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+27"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Match keywords</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Case sensitive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+23"/>
-        <location filename="../src/ui-settings-dialog.h" line="+2"/>
         <source>Replace word by suggested one</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="-10"/>
-        <location filename="../src/ui-settings-dialog.h" line="-1"/>
         <source>Match words in document</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+48"/>
-        <location filename="../src/ui-settings-dialog.h" line="+2"/>
         <source>With Octave builtins</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+10"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>With Octave functions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+64"/>
-        <location filename="../src/ui-settings-dialog.h" line="+9"/>
         <source>Show completion list automatically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+51"/>
-        <location filename="../src/ui-settings-dialog.h" line="+2"/>
+        <location line="+63"/>
         <source>Restore editor tabs from previous session on startup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
-        <location filename="../src/ui-settings-dialog.h" line="+2"/>
+        <location line="-13"/>
         <source>Reload externally changed files without prompt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-446"/>
-        <location filename="../src/ui-settings-dialog.h" line="-30"/>
+        <location line="-425"/>
         <source>Use custom file editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+482"/>
-        <location filename="../src/ui-settings-dialog.h" line="+33"/>
+        <location line="+518"/>
+        <source>Text encoding used for loading and saving</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+56"/>
         <source>Editor Styles</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+209"/>
-        <location filename="../src/ui-settings-dialog.h" line="+6"/>
         <source>(Changing buffer size clears history)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+28"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>History buffer Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+34"/>
-        <location filename="../src/ui-settings-dialog.h" line="+2"/>
         <source>Print debug location in terminal window in addition to the marker in the editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+16"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Terminal Colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="-173"/>
-        <location filename="../src/ui-settings-dialog.h" line="-6"/>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-917"/>
-        <location filename="../src/ui-settings-dialog.h" line="-58"/>
+        <location line="-1007"/>
         <source>Show line numbers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-72"/>
-        <location filename="../src/ui-settings-dialog.h" line="-3"/>
+        <location line="+81"/>
         <source>Highlight current line</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+85"/>
-        <location filename="../src/ui-settings-dialog.h" line="+4"/>
+        <location line="+13"/>
         <source>Show complete path in window title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-549"/>
-        <location filename="../src/ui-settings-dialog.h" line="-30"/>
+        <location line="-593"/>
         <source>Interface</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+52"/>
-        <location filename="../src/ui-settings-dialog.h" line="+3"/>
         <source>Confirm before exiting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+74"/>
-        <location filename="../src/ui-settings-dialog.h" line="+7"/>
         <source>Graphic icons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+29"/>
-        <location line="+592"/>
-        <location filename="../src/ui-settings-dialog.h" line="+2"/>
-        <location line="+28"/>
+        <location line="+640"/>
         <source>Show status bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-540"/>
-        <location filename="../src/ui-settings-dialog.h" line="-26"/>
+        <location line="-588"/>
         <source>Text inactive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="-32"/>
         <location line="+45"/>
-        <location filename="../src/ui-settings-dialog.h" line="-1"/>
-        <location line="+2"/>
         <source>Active</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+39"/>
-        <location filename="../src/ui-settings-dialog.h" line="+2"/>
         <source>Background inactive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+73"/>
-        <location filename="../src/ui-settings-dialog.h" line="+2"/>
         <source>Octave Startup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+41"/>
-        <location line="+1392"/>
-        <location filename="../src/ui-settings-dialog.h" line="+2"/>
-        <location line="+82"/>
+        <location line="+1440"/>
         <source>Startup path</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1379"/>
-        <location line="+1409"/>
-        <location filename="../src/ui-settings-dialog.h" line="-81"/>
-        <location line="+83"/>
+        <location line="-1427"/>
+        <location line="+1420"/>
         <source>Browse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1322"/>
-        <location filename="../src/ui-settings-dialog.h" line="-78"/>
+        <location line="-1103"/>
         <source>After Column</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+47"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
+        <location line="-97"/>
         <source>Show whitespace</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
-        <location filename="../src/ui-settings-dialog.h" line="+3"/>
+        <location line="+157"/>
         <source>Do not show whitespace used for indentation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+58"/>
-        <location filename="../src/ui-settings-dialog.h" line="+2"/>
+        <location line="-135"/>
         <source>Tab width min.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+64"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>max.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+615"/>
-        <location filename="../src/ui-settings-dialog.h" line="+45"/>
+        <location line="+577"/>
         <source>Create nonexistent files without prompting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-429"/>
-        <location filename="../src/ui-settings-dialog.h" line="-28"/>
+        <location line="-441"/>
         <source>command line (%f=file, %l=line):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+521"/>
-        <location filename="../src/ui-settings-dialog.h" line="+43"/>
+        <location line="+613"/>
         <source>Terminal</source>
         <translation type="unfinished">Командний рядок</translation>
     </message>
     <message>
         <location line="+51"/>
-        <location filename="../src/ui-settings-dialog.h" line="-8"/>
         <source>Cursor type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="-11"/>
-        <location filename="../src/ui-settings-dialog.h" line="-1"/>
         <source>Cursor blinking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="-7"/>
-        <location filename="../src/ui-settings-dialog.h" line="-1"/>
         <source>Use foreground color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+59"/>
-        <location filename="../src/ui-settings-dialog.h" line="+4"/>
         <source>Font size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+123"/>
-        <location filename="../src/ui-settings-dialog.h" line="+3"/>
         <source>Set focus to terminal when running a command from within another widget</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+73"/>
-        <location filename="../src/ui-settings-dialog.h" line="+15"/>
         <source>File Browser</source>
         <translation type="unfinished">Файловий менеджер</translation>
     </message>
     <message>
-        <location line="+46"/>
-        <location filename="../src/ui-settings-dialog.h" line="-8"/>
-        <source>Show file size</source>
-        <translation type="unfinished">Показувати розмір файлів</translation>
-    </message>
-    <message>
-        <location line="-14"/>
-        <location filename="../src/ui-settings-dialog.h" line="-2"/>
-        <source>Show file type</source>
-        <translation type="unfinished">Показувати типи файлів</translation>
-    </message>
-    <message>
-        <location line="+21"/>
-        <location filename="../src/ui-settings-dialog.h" line="+3"/>
-        <source>Show date of last modification</source>
-        <translation type="unfinished">Показувати дату останньої зміни</translation>
-    </message>
-    <message>
-        <location line="-14"/>
-        <location filename="../src/ui-settings-dialog.h" line="-2"/>
-        <source>Show hidden files</source>
-        <translation type="unfinished">Показувати приховані файли</translation>
-    </message>
-    <message>
-        <location line="-1647"/>
-        <location filename="../src/ui-settings-dialog.h" line="-92"/>
+        <location line="-1661"/>
         <source>Normal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+270"/>
-        <location filename="../src/ui-settings-dialog.h" line="+15"/>
         <source>These preferences are applied after any .octaverc startup files.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+55"/>
-        <location filename="../src/ui-settings-dialog.h" line="+3"/>
         <source>Restore working directory of previous session</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+322"/>
-        <location filename="../src/ui-settings-dialog.h" line="+15"/>
+        <location line="+71"/>
         <source>Draw a long line marker</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+48"/>
-        <location filename="../src/ui-settings-dialog.h" line="+3"/>
+        <location line="+155"/>
         <source>Show EOL characters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
+        <location line="+662"/>
         <source>Default EOL mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+412"/>
-        <location filename="../src/ui-settings-dialog.h" line="+26"/>
+        <location line="-136"/>
         <source>Number of characters before list is shown: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+79"/>
-        <location filename="../src/ui-settings-dialog.h" line="+9"/>
         <source>File handling</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+93"/>
-        <location filename="../src/ui-settings-dialog.h" line="+5"/>
+        <location line="+185"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Select font, font size (as a difference from the default size), font style (&lt;b&gt;b&lt;/b&gt;old, &lt;b&gt;i&lt;/b&gt;talic, &lt;b&gt;u&lt;/b&gt;nderline), text color, and background color (for the latter, the color magenta (255,0,255) is a placeholder for the default background color).&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+341"/>
-        <location filename="../src/ui-settings-dialog.h" line="+13"/>
-        <source>Display</source>
+        <source>Behavior</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+30"/>
+        <source>Restore last directory of previous session</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+54"/>
+        <source>Extensions of files to be opened in the default text editor (separated by &quot;;&quot;):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+39"/>
-        <location filename="../src/ui-settings-dialog.h" line="+5"/>
-        <source>Alternating row colors</source>
-        <translation type="unfinished">Чергувати колір рядків</translation>
-    </message>
-    <message>
-        <location line="+12"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
-        <source>Behavior</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+34"/>
-        <location filename="../src/ui-settings-dialog.h" line="+3"/>
-        <source>Restore last directory of previous session</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+71"/>
-        <location filename="../src/ui-settings-dialog.h" line="+5"/>
         <source>Workspace</source>
         <translation type="unfinished">Область змінних</translation>
     </message>
     <message>
-        <location line="+42"/>
-        <location filename="../src/ui-settings-dialog.h" line="-1"/>
+        <location line="+35"/>
+        <source>Colors for variable attributes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
         <source>Hide tool tips</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+182"/>
-        <location filename="../src/ui-settings-dialog.h" line="+14"/>
+        <location line="+101"/>
+        <source>Import shortcut set</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Export current shortcut set</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Reset shortcuts to their defaults</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location line="+80"/>
+        <source>Default</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-71"/>
         <source>Edit a shortcut by double-clicking in a cell</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+108"/>
-        <location filename="../src/ui-settings-dialog.h" line="+20"/>
+        <location line="+76"/>
+        <source>Actual</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
         <source>Network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+23"/>
-        <location filename="../src/ui-settings-dialog.h" line="-12"/>
         <source>Allow Octave to connect to the Octave web site to display current news and information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+46"/>
-        <location filename="../src/ui-settings-dialog.h" line="+8"/>
         <source>Use proxy server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="-23"/>
-        <location filename="../src/ui-settings-dialog.h" line="-4"/>
         <source>HttpProxy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-2083"/>
-        <location filename="../src/ui-settings-dialog.h" line="-123"/>
+        <location line="-2039"/>
         <source>Icon set for dock widgets</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="-48"/>
-        <location filename="../src/ui-settings-dialog.h" line="-4"/>
         <source>Language (requires restart)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="-58"/>
-        <location filename="../src/ui-settings-dialog.h" line="-5"/>
         <source>Icon size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1714"/>
-        <location filename="../src/ui-settings-dialog.h" line="+100"/>
+        <location line="+1716"/>
         <source>Synchronize Octave working directory with file browser</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+132"/>
-        <location filename="../src/ui-settings-dialog.h" line="+5"/>
-        <source>Colors for variable attributes </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+34"/>
-        <location filename="../src/ui-settings-dialog.h" line="+22"/>
+        <location line="+184"/>
         <source>Shortcuts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+31"/>
-        <location filename="../src/ui-settings-dialog.h" line="-18"/>
         <source>Select this option to prevent conflicts with readline shortcuts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
-        <location filename="../src/ui-settings-dialog.h" line="+2"/>
         <source>Disable global shortcuts when terminal window has focus</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
-        <location line="+28"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
-        <location line="+4"/>
-        <source>Use this set</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-21"/>
-        <location filename="../src/ui-settings-dialog.h" line="-3"/>
-        <source>Set 1:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <location line="+37"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
-        <location line="+3"/>
+        <location line="+53"/>
         <source>Export</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-30"/>
-        <location line="+37"/>
-        <location filename="../src/ui-settings-dialog.h" line="-2"/>
-        <location line="+3"/>
+        <location line="-10"/>
         <source>Import</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
-        <source>Set 2:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+86"/>
-        <location filename="../src/ui-settings-dialog.h" line="+7"/>
+        <location line="+90"/>
         <source>Action</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
-        <location filename="../src/ui-settings-dialog.h" line="-1"/>
-        <source>Set 1 Default</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <location filename="../src/ui-settings-dialog.h" line="-1"/>
-        <source>Set 1 Actual</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <location filename="../src/ui-settings-dialog.h" line="-1"/>
-        <source>Set 2 Default</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <location filename="../src/ui-settings-dialog.h" line="-1"/>
-        <source>Set 2 Actual</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+68"/>
-        <location filename="../src/ui-settings-dialog.h" line="+11"/>
+        <location line="+83"/>
         <source>Socks5Proxy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="-16"/>
-        <location filename="../src/ui-settings-dialog.h" line="-4"/>
         <source>Hostname:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+44"/>
-        <location filename="../src/ui-settings-dialog.h" line="+8"/>
         <source>Proxy type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+10"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Port:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="-27"/>
-        <location filename="../src/ui-settings-dialog.h" line="-3"/>
         <source>Username:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+37"/>
-        <location filename="../src/ui-settings-dialog.h" line="+4"/>
         <source>Password:</source>
         <translation type="unfinished">Пароль:</translation>
     </message>
     <message>
-        <location filename="../src/settings-dialog.cc" line="+77"/>
+        <location filename="../src/settings-dialog.cc" line="+127"/>
+        <source>Octave Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Unable to save settings.  Missing settings file or unknown directory.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+18"/>
         <location line="+4"/>
-        <location line="+561"/>
+        <location line="+444"/>
         <source>System setting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-355"/>
+        <location line="-232"/>
         <source>IBeam Cursor</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3278,35 +3413,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+213"/>
-        <source>Difference to the default size</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Background color, pink (255,0,255) means default</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>b</source>
-        <comment>short form for bold</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>i</source>
-        <comment>short form for italic</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>u</source>
-        <comment>short form for underlined</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+497"/>
+        <location line="+503"/>
         <source>Set Octave Startup Directory</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3319,7 +3426,7 @@
 <context>
     <name>setup_community_news</name>
     <message>
-        <location filename="../src/welcome-wizard.cc" line="+44"/>
+        <location filename="../src/welcome-wizard.cc" line="+42"/>
         <source>Community News</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3363,7 +3470,7 @@
 <context>
     <name>shortcut_manager</name>
     <message>
-        <location filename="../src/shortcut-manager.cc" line="+109"/>
+        <location filename="../src/shortcut-manager.cc" line="+106"/>
         <source>New File</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3393,42 +3500,38 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <location line="+158"/>
+        <location line="+16"/>
+        <location line="+143"/>
         <source>Preferences</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-157"/>
+        <location line="-158"/>
         <source>Exit Octave</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
-        <location line="+84"/>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-83"/>
-        <location line="+85"/>
+        <location line="+1"/>
         <source>Paste</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-84"/>
-        <location line="+80"/>
+        <location line="+1"/>
         <source>Undo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-79"/>
-        <location line="+84"/>
+        <location line="+1"/>
         <source>Select All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-83"/>
+        <location line="+1"/>
         <source>Clear Clipboard</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3453,7 +3556,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+6"/>
         <source>Step Into</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3524,12 +3627,12 @@
     </message>
     <message>
         <location line="+2"/>
-        <location line="+216"/>
+        <location line="+234"/>
         <source>Editor</source>
         <translation type="unfinished">Редактор</translation>
     </message>
     <message>
-        <location line="-214"/>
+        <location line="-232"/>
         <source>Documentation</source>
         <translation type="unfinished">Документація</translation>
     </message>
@@ -3609,18 +3712,28 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+3"/>
         <source>Redo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
+        <source>Cut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Find and Replace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+2"/>
-        <source>Cut</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Find and Replace</source>
+        <source>Find Next</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Find Previous</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -3746,7 +3859,68 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-145"/>
+        <location line="+48"/>
+        <source>Switch to Left Tab</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Switch to Right Tab</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Move Tab Left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Move Tab Right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+44"/>
+        <source>Global</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+38"/>
+        <source>Tabs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+98"/>
+        <source>Enter new Shortcut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+143"/>
+        <source>Overwriting Shortcuts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>You are about to overwrite all shortcuts.
+Would you like to save the current shortcut set or cancel the action?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Don&apos;t save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+39"/>
+        <source>Import shortcuts from file ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Export shortcuts into file ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-571"/>
         <source>Step</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3807,6 +3981,21 @@
     </message>
     <message>
         <location line="+2"/>
+        <source>Show Toolbar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Show Statusbar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Show Horizontal Scrollbar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>Zoom In</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3862,12 +4051,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+42"/>
-        <source>Main</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <location line="+57"/>
         <location line="+23"/>
         <source>File</source>
         <translation type="unfinished"></translation>
@@ -3911,12 +4095,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+124"/>
-        <source>Enter new Shortcut for Set %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
+        <location line="+106"/>
         <source>Apply the desired shortcut or click on the right button to reset the shortcut to its default.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3941,7 +4120,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+53"/>
+        <location line="+45"/>
         <source>Double Shortcut</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3955,23 +4134,13 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+71"/>
-        <source>Import shortcut set %1 from file ...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <location line="+6"/>
+        <location line="+113"/>
+        <location line="+5"/>
         <source>Octave Shortcut Files (*.osc);;All Files (*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1"/>
-        <source>Export shortcut set %1 into file ...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+15"/>
+        <location line="+10"/>
         <source>Failed to open %1 as octave shortcut file</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4010,7 +4179,7 @@
 <context>
     <name>welcome_wizard</name>
     <message>
-        <location filename="../src/welcome-wizard.cc" line="+135"/>
+        <location filename="../src/welcome-wizard.cc" line="+133"/>
         <source>Welcome to GNU Octave</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4018,7 +4187,7 @@
 <context>
     <name>workspace_model</name>
     <message>
-        <location filename="../src/workspace-model.cc" line="-42"/>
+        <location filename="../src/workspace-model.cc" line="-41"/>
         <source>Name</source>
         <translation type="unfinished">Ідентифікатор</translation>
     </message>
@@ -4043,7 +4212,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+109"/>
+        <location line="+108"/>
         <source>Right click to copy, rename, or display</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4057,7 +4226,7 @@
 <context>
     <name>workspace_view</name>
     <message>
-        <location filename="../src/workspace-view.cc" line="+50"/>
+        <location filename="../src/workspace-view.cc" line="+51"/>
         <source>Workspace</source>
         <translation type="unfinished">Область змінних</translation>
     </message>
@@ -4077,7 +4246,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+161"/>
+        <location line="+242"/>
         <source>Copy name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4093,11 +4262,41 @@
     </message>
     <message>
         <location line="+9"/>
-        <source>Only top-level symbols may be renamed.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+132"/>
+        <source>Only top-level symbols may be renamed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Hide filter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Show filter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+149"/>
+        <source>Class</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Dimension</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Value</source>
+        <translation type="unfinished">Значення</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Attribute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-17"/>
         <source>View the variables in the active workspace.&lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
--- a/libgui/languages/zh_CN.ts	Thu Aug 18 12:26:32 2016 -0700
+++ b/libgui/languages/zh_CN.ts	Fri Aug 19 21:05:48 2016 +0200
@@ -4,7 +4,7 @@
 <context>
     <name>ListDialog</name>
     <message>
-        <location filename="../src/dialog.cc" line="+251"/>
+        <location filename="../src/dialog.cc" line="+258"/>
         <source>Select All</source>
         <translation>全选</translation>
     </message>
@@ -12,7 +12,7 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../src/workspace-model.cc" line="+75"/>
+        <location filename="../src/workspace-model.cc" line="+74"/>
         <source>automatic</source>
         <translation>自动</translation>
     </message>
@@ -61,11 +61,39 @@
         <source>cursor</source>
         <translation>光标</translation>
     </message>
+    <message>
+        <location filename="../src/settings-dialog.cc" line="+132"/>
+        <source>Difference to the default size</source>
+        <translation type="unfinished">和默认大小的差别</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Background color, pink (255,0,255) means default</source>
+        <translation type="unfinished">背景颜色，粉红色 (255,0,255) 代表默认值</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>b</source>
+        <comment>short form for bold</comment>
+        <translation type="unfinished">b</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>i</source>
+        <comment>short form for italic</comment>
+        <translation type="unfinished">i</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>u</source>
+        <comment>short form for underlined</comment>
+        <translation type="unfinished">u</translation>
+    </message>
 </context>
 <context>
     <name>QTerminal</name>
     <message>
-        <location filename="../qterminal/libqterminal/QTerminal.h" line="+135"/>
+        <location filename="../qterminal/libqterminal/QTerminal.h" line="+130"/>
         <source>Copy</source>
         <translation>复制</translation>
     </message>
@@ -80,15 +108,20 @@
         <translation type="unfinished">全选</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+7"/>
         <source>Clear Window</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../qterminal/libqterminal/QTerminal.cc" line="+46"/>
+        <source>Edit %1 at line %2</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QWinTerminalImpl</name>
     <message>
-        <location filename="../qterminal/libqterminal/win32/QWinTerminalImpl.cpp" line="+1778"/>
+        <location filename="../qterminal/libqterminal/win32/QWinTerminalImpl.cpp" line="+1779"/>
         <source>copied selection to clipboard</source>
         <translation>复制选定区域到剪贴板</translation>
     </message>
@@ -762,7 +795,7 @@
 <context>
     <name>QtHandles::Figure</name>
     <message>
-        <location filename="../graphics/Figure.cc" line="+282"/>
+        <location filename="../graphics/Figure.cc" line="+298"/>
         <source>Figure ToolBar</source>
         <translation type="unfinished"></translation>
     </message>
@@ -812,37 +845,19 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Cu&amp;t</source>
-        <translation type="unfinished">剪切 (&amp;T)</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>&amp;Paste</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
+        <location line="+7"/>
+        <location line="+463"/>
+        <source>About Octave</source>
+        <translation type="unfinished">关于 Octave</translation>
+    </message>
+    <message>
+        <location line="-465"/>
         <source>&amp;Help</source>
         <translation type="unfinished">帮助 (&amp;H)</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>&amp;About QtHandles</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>About &amp;Qt</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+427"/>
-        <source>About QtHandles</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+39"/>
+        <location line="+504"/>
+        <location line="+69"/>
         <source>Save Figure As</source>
         <translation type="unfinished"></translation>
     </message>
@@ -881,6 +896,160 @@
     </message>
 </context>
 <context>
+    <name>annotation_dialog</name>
+    <message>
+        <location filename="../graphics/annotation-dialog.ui" line="+17"/>
+        <source>Annotation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>String</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Font</source>
+        <translation type="unfinished">字体</translation>
+    </message>
+    <message>
+        <location line="+42"/>
+        <source>bold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>b</source>
+        <translation type="unfinished">b</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>italic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>i</source>
+        <translation type="unfinished">i</translation>
+    </message>
+    <message>
+        <location line="+428"/>
+        <source>color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>Horz alignment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <location line="+29"/>
+        <source>middle</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-24"/>
+        <source>right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Vert alignment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>top</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>bottom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Position</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>X</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Y</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Width</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Height</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>units</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>normalized</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Fit to box</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Box</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Background</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+444"/>
+        <source>Edge</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+133"/>
+        <source>Line style</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>none</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Line width</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>documentation_dock_widget</name>
     <message>
         <location filename="../src/documentation-dock-widget.cc" line="+34"/>
@@ -896,17 +1065,18 @@
 <context>
     <name>file_editor</name>
     <message>
-        <location filename="../src/m-editor/file-editor.cc" line="+285"/>
-        <location line="+125"/>
+        <location filename="../src/m-editor/file-editor.cc" line="+366"/>
+        <location line="+152"/>
         <location line="+19"/>
         <location line="+25"/>
         <location line="+62"/>
         <location line="+28"/>
+        <location line="+79"/>
         <source>Octave Editor</source>
         <translation>Octave 编辑器</translation>
     </message>
     <message>
-        <location line="-318"/>
+        <location line="-462"/>
         <source>Octave Files (*.m);;All Files (*)</source>
         <translation>Octave 文件 (*.m);;所有文件 (*)</translation>
     </message>
@@ -923,7 +1093,7 @@
 </translation>
     </message>
     <message>
-        <location line="+330"/>
+        <location line="+395"/>
         <source>File not saved! A file with the selected name
 %1
 is already open in the editor</source>
@@ -932,12 +1102,12 @@
 的文件在编辑器中被打开</translation>
     </message>
     <message>
-        <location line="+387"/>
+        <location line="+492"/>
         <source>&amp;%1 %2</source>
         <translation>&amp;%1 %2</translation>
     </message>
     <message>
-        <location line="+388"/>
+        <location line="+480"/>
         <source>&amp;Save File</source>
         <translation>保存文件 (&amp;S)</translation>
     </message>
@@ -953,41 +1123,26 @@
     </message>
     <message>
         <location line="+7"/>
-        <source>&amp;Undo</source>
-        <translation>撤销 (&amp;U) </translation>
-    </message>
-    <message>
-        <location line="+3"/>
         <source>&amp;Redo</source>
         <translation>重做 (&amp;R)</translation>
     </message>
     <message>
         <location line="+6"/>
-        <source>&amp;Copy</source>
-        <translation>复制 (&amp;C)</translation>
-    </message>
-    <message>
-        <location line="+3"/>
         <source>Cu&amp;t</source>
         <translation>剪切 (&amp;T)</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Paste</source>
-        <translation>粘贴</translation>
-    </message>
-    <message>
-        <location line="+96"/>
+        <location line="+94"/>
         <source>&amp;Next Bookmark</source>
         <translation>下一个书签 (&amp;N)</translation>
     </message>
     <message>
-        <location line="-2"/>
+        <location line="+2"/>
         <source>Pre&amp;vious Bookmark</source>
         <translation>上一个书签 (&amp;V)</translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+2"/>
         <source>Toggle &amp;Bookmark</source>
         <translation>打开/关闭书签 (&amp;B)</translation>
     </message>
@@ -997,7 +1152,7 @@
         <translation>移除所有书签 (&amp;R)</translation>
     </message>
     <message>
-        <location line="+54"/>
+        <location line="+68"/>
         <source>&amp;Next Breakpoint</source>
         <translation>下一个断点 (&amp;N)</translation>
     </message>
@@ -1017,7 +1172,7 @@
         <translation>移除所有断点 (&amp;R)</translation>
     </message>
     <message>
-        <location line="-104"/>
+        <location line="-118"/>
         <source>&amp;Comment</source>
         <translation>注释 (&amp;C)</translation>
     </message>
@@ -1027,28 +1182,28 @@
         <translation>取消注释 (&amp;U)</translation>
     </message>
     <message>
-        <location line="-48"/>
+        <location line="-54"/>
         <source>&amp;Find and Replace...</source>
         <translation>查找并替换 (&amp;F) ...</translation>
     </message>
     <message>
-        <location line="+162"/>
+        <location line="+182"/>
         <source>Save File and Run</source>
         <translation>保存文件并运行</translation>
     </message>
     <message>
-        <location line="-90"/>
+        <location line="-104"/>
         <source>Go &amp;to Line...</source>
         <translation>跳至行 (&amp;T) ...</translation>
     </message>
     <message>
-        <location line="-1126"/>
+        <location line="-1341"/>
         <source>Could not start custom file editor
 %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+148"/>
+        <location line="+175"/>
         <source>Create</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1058,7 +1213,7 @@
         <translation type="unfinished">取消</translation>
     </message>
     <message>
-        <location line="+844"/>
+        <location line="+1041"/>
         <source>&amp;Recent Editor Files</source>
         <translation>最近编辑器文件 (&amp;R)</translation>
     </message>
@@ -1083,12 +1238,7 @@
         <translation>关闭其他文件</translation>
     </message>
     <message>
-        <location line="+31"/>
-        <source>Select All</source>
-        <translation type="unfinished">全选</translation>
-    </message>
-    <message>
-        <location line="+10"/>
+        <location line="+32"/>
         <source>&amp;Commands</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1223,17 +1373,62 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+128"/>
-        <source>Editor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-120"/>
-        <source>Show Line &amp;Endings</source>
+        <location line="+22"/>
+        <source>Show &amp;Toolbar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Show &amp;Statusbar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+4"/>
+        <source>Show &amp;Horizontal Scrollbar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+69"/>
+        <source>Recent Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+65"/>
+        <source>Editor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-156"/>
+        <source>Show Line &amp;Endings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-1467"/>
+        <source>File Encoding:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+403"/>
+        <source>%1 is a built-in function</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>Can not find function %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+911"/>
+        <source>Find &amp;Next...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Find &amp;Previous...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+118"/>
         <source>Show &amp;Indentation Guides</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1243,7 +1438,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+20"/>
         <source>Zoom &amp;In</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1278,7 +1473,7 @@
         <translation>文档关键字 (&amp;D)</translation>
     </message>
     <message>
-        <location line="-1103"/>
+        <location line="-1305"/>
         <source>Could not open file
 %1
 for read: %2.</source>
@@ -1310,7 +1505,7 @@
         <translation>关联文件的编辑标签消失了。</translation>
     </message>
     <message>
-        <location line="+731"/>
+        <location line="+928"/>
         <source>&amp;File</source>
         <translation>文件 (&amp;F)</translation>
     </message>
@@ -1320,12 +1515,12 @@
         <translation>编辑 (&amp;E)</translation>
     </message>
     <message>
-        <location line="+138"/>
+        <location line="+129"/>
         <source>Show &amp;Whitespace Characters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+42"/>
         <source>&amp;Debug</source>
         <translation>除错 (&amp;D)</translation>
     </message>
@@ -1338,12 +1533,12 @@
 <context>
     <name>file_editor_tab</name>
     <message>
-        <location filename="../src/m-editor/file-editor-tab.cc" line="+92"/>
+        <location filename="../src/m-editor/file-editor-tab.cc" line="+145"/>
         <source>eol:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="-17"/>
         <source>line:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1353,17 +1548,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+156"/>
-        <source>%1 is a built-in function</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+31"/>
-        <source>Can not find function %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+775"/>
+        <location line="+1146"/>
         <source>Goto line</source>
         <translation>前往行</translation>
     </message>
@@ -1373,7 +1558,7 @@
         <translation>行数</translation>
     </message>
     <message>
-        <location line="+146"/>
+        <location line="+145"/>
         <location line="+63"/>
         <source>&lt;unnamed&gt;</source>
         <translation>&lt;未命名&gt;</translation>
@@ -1388,12 +1573,28 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+288"/>
+        <location line="+298"/>
+        <source>Debug or Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>This file is currently being executed.
+Quit debugging and save?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+166"/>
         <source>Line Endings:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+9"/>
+        <source>File Encoding:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+28"/>
         <source>Octave Files (*.m)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1403,33 +1604,59 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+78"/>
+        <location line="-513"/>
+        <source>Do you want to cancel closing, save or discard the changes?</source>
+        <translation>你希望关闭，保存还是丢弃更改？</translation>
+    </message>
+    <message>
+        <location line="-1015"/>
+        <location line="+1024"/>
+        <location line="+372"/>
+        <location line="+215"/>
+        <location line="+21"/>
+        <location line="+83"/>
+        <location line="+23"/>
+        <source>Octave Editor</source>
+        <translation>Octave 编辑器</translation>
+    </message>
+    <message>
+        <location line="-2065"/>
+        <source>encoding:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+239"/>
+        <source>Breakpoint condition</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+89"/>
+        <source>Cannot add breakpoint to modified file.
+Save and add breakpoint, or canel?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1611"/>
         <source>&quot;%1&quot;
 is not a valid identifier.
 
-If you keep this file name, you will not be able to
+If you keep this filename, you will not be able to
 call your script using its name as an Octave command.
 
 Do you want to choose another name?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-400"/>
-        <source>Do you want to cancel closing, save or discard the changes?</source>
-        <translation>你希望关闭，保存还是丢弃更改？</translation>
-    </message>
-    <message>
-        <location line="-970"/>
-        <location line="+979"/>
-        <location line="+213"/>
-        <location line="+177"/>
-        <location line="+85"/>
-        <location line="+23"/>
-        <source>Octave Editor</source>
-        <translation>Octave 编辑器</translation>
-    </message>
-    <message>
-        <location line="-6"/>
+        <location line="+21"/>
+        <source>The current editor contents can not be encoded
+with the selected codec %1.
+Using it will result in data loss!
+
+Do you want to chose another codec?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+99"/>
         <source>
 
 Warning: The contents in the editor is modified!</source>
@@ -1447,14 +1674,14 @@
 已经被修改或重命名。你希望现在保存这个文件吗？%2</translation>
     </message>
     <message>
-        <location line="-285"/>
+        <location line="-342"/>
         <source>Could not open file %1 for write:
 %2.</source>
         <translation>无法打开文件 %1 以写入:
 %2.</translation>
     </message>
     <message>
-        <location line="+262"/>
+        <location line="+319"/>
         <source>It seems that &apos;%1&apos; has been modified by another application. Do you want to reload it?</source>
         <translation>看起来 &apos;%1&apos; 已经被其他应用修改。你希望重新载入这个文件吗？</translation>
     </message>
@@ -1467,12 +1694,7 @@
         <translation>文件浏览器</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Browse your files.</source>
-        <translation>浏览你的文件。</translation>
-    </message>
-    <message>
-        <location line="+18"/>
+        <location line="+35"/>
         <source>Enter the path or filename</source>
         <translation>输入路径或文件名</translation>
     </message>
@@ -1493,22 +1715,67 @@
     </message>
     <message>
         <location line="+4"/>
-        <location line="+388"/>
+        <location line="+373"/>
         <source>Find Files...</source>
         <translation>查找文件...</translation>
     </message>
     <message>
-        <location line="+364"/>
+        <location line="-26"/>
+        <source>Open in System File Explorer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Open in Text Editor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+389"/>
         <source>New Directory</source>
         <translation>新建目录</translation>
     </message>
     <message>
-        <location line="-784"/>
+        <location line="-773"/>
         <source>Show Octave directory</source>
         <translation>显示 Octave 目录</translation>
     </message>
     <message>
-        <location line="-4"/>
+        <location line="-49"/>
+        <source>Browse your files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Alternating row colors</source>
+        <translation type="unfinished">备选列颜色</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>filesdockwidget/showFileSize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>filesdockwidget/showFileType</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>filesdockwidget/showLastModified</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>filesdockwidget/showHiddenFiles</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>filesdockwidget/useAlternatingRowColors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+29"/>
         <source>One directory up</source>
         <translation type="unfinished">向上一级</translation>
     </message>
@@ -1529,53 +1796,48 @@
     </message>
     <message>
         <location line="+20"/>
-        <location line="+397"/>
+        <location line="+382"/>
         <source>New File...</source>
         <translation>新建文件...</translation>
     </message>
     <message>
-        <location line="-394"/>
-        <location line="+397"/>
+        <location line="-379"/>
+        <location line="+382"/>
         <source>New Directory...</source>
         <translation>新建目录...</translation>
     </message>
     <message>
-        <location line="-335"/>
+        <location line="-329"/>
         <source>Activate to open in editor, right click for alternatives</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+236"/>
+        <location line="-136"/>
         <source>File size</source>
         <translation>文件大小</translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+1"/>
         <source>File type</source>
         <translation>文件类型</translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+1"/>
         <source>Date modified</source>
         <translation>修改日期</translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+1"/>
         <source>Show hidden</source>
         <translation>显示隐藏文件</translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+415"/>
         <source>Open</source>
         <translation>打开</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Open in Default Application</source>
-        <translation>使用默认应用程序打开</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <location line="+13"/>
         <source>Copy Selection to Clipboard</source>
         <translation>复制选中到剪贴板</translation>
     </message>
@@ -1605,7 +1867,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+115"/>
+        <location line="+125"/>
         <source>Rename file/directory</source>
         <translation>重命名文件/目录</translation>
     </message>
@@ -1642,7 +1904,7 @@
         <translation>不能删除一个非空目录</translation>
     </message>
     <message>
-        <location line="+151"/>
+        <location line="+145"/>
         <source>Set directory of file browser</source>
         <translation>设置目录到文件浏览器</translation>
     </message>
@@ -1681,7 +1943,7 @@
 <context>
     <name>final_page</name>
     <message>
-        <location filename="../src/welcome-wizard.cc" line="+199"/>
+        <location filename="../src/welcome-wizard.cc" line="+195"/>
         <source>Enjoy!</source>
         <translation>尽情享受吧！</translation>
     </message>
@@ -1740,7 +2002,7 @@
 <context>
     <name>find_dialog</name>
     <message>
-        <location filename="../src/m-editor/find-dialog.cc" line="+74"/>
+        <location filename="../src/m-editor/find-dialog.cc" line="+85"/>
         <source>Find and Replace</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1815,7 +2077,7 @@
         <translation>搜索选中 (&amp;L)</translation>
     </message>
     <message>
-        <location line="+84"/>
+        <location line="+87"/>
         <source>Search from end</source>
         <translation>从尾部搜索</translation>
     </message>
@@ -1825,7 +2087,7 @@
         <translation>从开头搜索</translation>
     </message>
     <message>
-        <location line="+205"/>
+        <location line="+221"/>
         <source>Replace Result</source>
         <translation>替换结果</translation>
     </message>
@@ -1943,7 +2205,7 @@
         <translation>搜索结果</translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+21"/>
         <source>Idle.</source>
         <translation>空闲。</translation>
     </message>
@@ -1969,8 +2231,8 @@
     </message>
     <message>
         <location line="+15"/>
-        <source>File name/location</source>
-        <translation>文件名称/位置</translation>
+        <source>Filename/location</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+17"/>
@@ -1978,7 +2240,7 @@
         <translation>文件内容</translation>
     </message>
     <message>
-        <location line="+105"/>
+        <location line="+111"/>
         <source>Searching...</source>
         <translation>正在搜索...</translation>
     </message>
@@ -1996,7 +2258,7 @@
 <context>
     <name>find_files_model</name>
     <message>
-        <location filename="../src/find-files-model.cc" line="+82"/>
+        <location filename="../src/find-files-model.cc" line="+83"/>
         <source>Filename</source>
         <translation>文件名</translation>
     </message>
@@ -2034,7 +2296,7 @@
         <translation>命令历史</translation>
     </message>
     <message>
-        <location line="+89"/>
+        <location line="+107"/>
         <source>Copy</source>
         <translation>复制</translation>
     </message>
@@ -2048,11 +2310,21 @@
         <source>Create script</source>
         <translation>创建脚本</translation>
     </message>
+    <message>
+        <location line="+4"/>
+        <source>Hide filter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Show filter</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>initial_page</name>
     <message>
-        <location filename="../src/welcome-wizard.cc" line="-179"/>
+        <location filename="../src/welcome-wizard.cc" line="-176"/>
         <source>Welcome to Octave!</source>
         <translation>欢迎来到 Octave!</translation>
     </message>
@@ -2083,13 +2355,13 @@
 <context>
     <name>main_window</name>
     <message>
-        <location filename="../src/main-window.cc" line="+268"/>
+        <location filename="../src/main-window.cc" line="+275"/>
         <source>Load Workspace</source>
         <translation>载入工作空间</translation>
     </message>
     <message>
-        <location line="+732"/>
-        <location line="+931"/>
+        <location line="+758"/>
+        <location line="+975"/>
         <source>About Octave</source>
         <translation>关于 Octave</translation>
     </message>
@@ -2099,12 +2371,12 @@
         <translation>文件 (&amp;F)</translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+45"/>
         <source>New</source>
         <translation>新建</translation>
     </message>
     <message>
-        <location line="-43"/>
+        <location line="-39"/>
         <source>Open...</source>
         <translation>打开...</translation>
     </message>
@@ -2114,7 +2386,7 @@
         <translation>首选项...</translation>
     </message>
     <message>
-        <location line="-95"/>
+        <location line="-99"/>
         <source>Exit</source>
         <translation>退出</translation>
     </message>
@@ -2129,22 +2401,22 @@
         <translation>撤销</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+7"/>
         <source>Copy</source>
         <translation>复制</translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+5"/>
         <source>Paste</source>
         <translation>粘贴</translation>
     </message>
     <message>
-        <location line="-1469"/>
+        <location line="-1537"/>
         <source>Save Workspace As</source>
         <translation>工作空间另存为</translation>
     </message>
     <message>
-        <location line="+134"/>
+        <location line="+124"/>
         <source>The release notes file &apos;%1&apos; is empty.</source>
         <translation>发行注记文件 &apos;%1&apos; 是空的。</translation>
     </message>
@@ -2154,7 +2426,7 @@
         <translation>发行注记文件 &apos;%1&apos; 无法读取。</translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="+12"/>
         <source>Octave Release Notes</source>
         <translation>Octave 发行注记</translation>
     </message>
@@ -2164,7 +2436,7 @@
         <translation>Octave 社区新闻</translation>
     </message>
     <message>
-        <location line="+1132"/>
+        <location line="+1213"/>
         <source>Clear Clipboard</source>
         <translation>清空剪贴板</translation>
     </message>
@@ -2219,7 +2491,7 @@
         <translation>步进</translation>
     </message>
     <message>
-        <location line="-152"/>
+        <location line="-156"/>
         <source>Load Workspace...</source>
         <translation>载入工作空间...</translation>
     </message>
@@ -2229,7 +2501,7 @@
         <translation>工作空间另存为...</translation>
     </message>
     <message>
-        <location line="+153"/>
+        <location line="+157"/>
         <source>Step Out</source>
         <translation>步出</translation>
     </message>
@@ -2249,17 +2521,7 @@
         <translation>共享代码</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Contribute to Octave</source>
-        <translation>贡献 Octave</translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Octave Developer Resources</source>
-        <translation>Octave 开发者资源</translation>
-    </message>
-    <message>
-        <location line="+14"/>
+        <location line="+20"/>
         <source>On Disk</source>
         <translation>磁盘上</translation>
     </message>
@@ -2304,13 +2566,13 @@
         <translation>向上一级</translation>
     </message>
     <message>
-        <location line="-1148"/>
-        <location line="+1151"/>
+        <location line="-1198"/>
+        <location line="+1201"/>
         <source>Browse directories</source>
         <translation>浏览目录</translation>
     </message>
     <message>
-        <location line="-1212"/>
+        <location line="-1274"/>
         <source>Octave</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2320,12 +2582,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+854"/>
+        <location line="+916"/>
         <source>Open an existing file in editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+41"/>
         <source>New Script</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2340,12 +2602,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+39"/>
         <source>Select All</source>
         <translation type="unfinished">全选</translation>
     </message>
     <message>
-        <location line="+94"/>
+        <location line="+95"/>
         <source>Quit Debug Mode</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2415,11 +2677,21 @@
         <source>Report Bug</source>
         <translation>报告问题</translation>
     </message>
+    <message>
+        <location line="+9"/>
+        <source>Contribute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Donate to Octave</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>news_reader</name>
     <message>
-        <location line="-1411"/>
+        <location line="-1504"/>
         <source>&lt;html&gt;
 &lt;body&gt;
 &lt;p&gt;
@@ -2478,18 +2750,18 @@
 <context>
     <name>octave_dock_widget</name>
     <message>
-        <location filename="../src/octave-dock-widget.cc" line="+68"/>
-        <location line="+198"/>
+        <location filename="../src/octave-dock-widget.cc" line="+67"/>
+        <location line="+201"/>
         <source>Undock widget</source>
         <translation>移动挂件</translation>
     </message>
     <message>
-        <location line="-188"/>
+        <location line="-191"/>
         <source>Hide widget</source>
         <translation>隐藏挂件</translation>
     </message>
     <message>
-        <location line="+132"/>
+        <location line="+136"/>
         <source>Dock widget</source>
         <translation>停靠挂件</translation>
     </message>
@@ -2497,7 +2769,7 @@
 <context>
     <name>octave_qscintilla</name>
     <message>
-        <location filename="../src/m-editor/octave-qscintilla.cc" line="+226"/>
+        <location filename="../src/m-editor/octave-qscintilla.cc" line="+237"/>
         <source>Help on</source>
         <translation>开启帮助</translation>
     </message>
@@ -2511,11 +2783,16 @@
         <source>Edit</source>
         <translation>编辑</translation>
     </message>
+    <message>
+        <location line="+15"/>
+        <source>dbstop if ...</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>octave_qt_link</name>
     <message>
-        <location filename="../src/octave-qt-link.cc" line="+114"/>
+        <location filename="../src/octave-qt-link.cc" line="+142"/>
         <source>File
 %1
 does not exist. Do you want to create it?</source>
@@ -2529,14 +2806,14 @@
         <translation>Octave 编辑器</translation>
     </message>
     <message>
-        <location line="-6"/>
-        <location line="+6"/>
-        <location line="+7"/>
+        <location line="-9"/>
+        <location line="+9"/>
+        <location line="+11"/>
         <source>Create</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+204"/>
+        <location line="+243"/>
         <source>The file %1 does not exist in the load path.  To run or debug the function you are editing, you must either change to the directory %2 or add that directory to the load path.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2561,8 +2838,8 @@
         <translation>添加目录到载入路径</translation>
     </message>
     <message>
-        <location line="-223"/>
-        <location line="+224"/>
+        <location line="-269"/>
+        <location line="+270"/>
         <source>Cancel</source>
         <translation>取消</translation>
     </message>
@@ -2578,7 +2855,7 @@
 <context>
     <name>resource_manager</name>
     <message>
-        <location filename="../src/resource-manager.cc" line="+245"/>
+        <location filename="../src/resource-manager.cc" line="+246"/>
         <source>The settings file
 %1
 does not exist and can not be created.
@@ -2604,731 +2881,589 @@
     <name>settings_dialog</name>
     <message>
         <location filename="../src/settings-dialog.ui" line="+23"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1738"/>
         <source>Settings</source>
         <translation>设置</translation>
     </message>
     <message>
         <location line="+19"/>
         <location line="+468"/>
-        <location filename="../src/ui-settings-dialog.h" line="+25"/>
-        <location line="+1"/>
         <source>General</source>
         <translation>常规</translation>
     </message>
     <message>
         <location line="-447"/>
-        <location filename="../src/ui-settings-dialog.h" line="-25"/>
         <source>Interface</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+8"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Dock widget title bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+44"/>
-        <location filename="../src/ui-settings-dialog.h" line="+2"/>
         <source>Confirm before exiting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+57"/>
-        <location filename="../src/ui-settings-dialog.h" line="+5"/>
         <source>Octave logo only</source>
         <translation>仅 Octave 徽标</translation>
     </message>
     <message>
         <location line="+10"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Letter icons</source>
         <translation>字母图标</translation>
     </message>
     <message>
         <location line="+36"/>
-        <location line="+592"/>
-        <location filename="../src/ui-settings-dialog.h" line="+3"/>
-        <location line="+28"/>
+        <location line="+640"/>
         <source>Show status bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-540"/>
-        <location filename="../src/ui-settings-dialog.h" line="-26"/>
+        <location line="-588"/>
         <source>Text inactive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="-32"/>
         <location line="+45"/>
-        <location filename="../src/ui-settings-dialog.h" line="-1"/>
-        <location line="+2"/>
         <source>Active</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="-159"/>
-        <location filename="../src/ui-settings-dialog.h" line="-11"/>
         <source>Small</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+17"/>
-        <location filename="../src/ui-settings-dialog.h" line="+2"/>
         <source>Large</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+168"/>
-        <location filename="../src/ui-settings-dialog.h" line="+10"/>
         <source>Custom style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Background inactive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+19"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>3D</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+54"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Octave Startup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+41"/>
-        <location line="+1392"/>
-        <location filename="../src/ui-settings-dialog.h" line="+2"/>
-        <location line="+82"/>
+        <location line="+1440"/>
         <source>Startup path</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1379"/>
-        <location line="+1409"/>
-        <location filename="../src/ui-settings-dialog.h" line="-81"/>
-        <location line="+83"/>
+        <location line="-1427"/>
+        <location line="+1420"/>
         <source>Browse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1369"/>
-        <location filename="../src/ui-settings-dialog.h" line="-24"/>
+        <location line="-1380"/>
         <source>Editor</source>
         <translation> 编辑器</translation>
     </message>
     <message>
-        <location line="+47"/>
-        <location filename="../src/ui-settings-dialog.h" line="-54"/>
+        <location line="+277"/>
         <source>After Column</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+104"/>
-        <location filename="../src/ui-settings-dialog.h" line="+5"/>
+        <location line="-170"/>
         <source>Color</source>
         <translation>颜色</translation>
     </message>
     <message>
-        <location line="+40"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
+        <location line="+95"/>
         <source>Tab width min.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+64"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>max.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
-        <location filename="../src/ui-settings-dialog.h" line="+2"/>
+        <location line="-231"/>
         <source>This works well for monospaced fonts. The line is drawn at a position based on the width of a space character in the default font. It may not work very well if styles use proportional fonts or if varied font sizes or bold, italic and normal texts are used.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
-        <location filename="../src/ui-settings-dialog.h" line="+3"/>
+        <location line="+289"/>
         <source>Enable Code Folding</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+61"/>
-        <location filename="../src/ui-settings-dialog.h" line="+6"/>
+        <location line="+551"/>
         <source>Windows (CRLF)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+5"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Mac (CR)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+5"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Unix (LF)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
-        <location filename="../src/ui-settings-dialog.h" line="+2"/>
+        <location line="-532"/>
         <source>Show horizontal scroll bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+68"/>
-        <location filename="../src/ui-settings-dialog.h" line="+4"/>
+        <location line="-299"/>
+        <source>Show tool bar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+383"/>
         <source>Indentation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+24"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Indent width</source>
         <translation>缩进宽度</translation>
     </message>
     <message>
         <location line="+7"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Tab indents line</source>
         <translation>Tab 键缩进行</translation>
     </message>
     <message>
         <location line="+7"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Auto indentation</source>
         <translation>自动缩进</translation>
     </message>
     <message>
         <location line="+26"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Tab width</source>
         <translation>Tab 键宽度</translation>
     </message>
     <message>
         <location line="+7"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Show indentation guides</source>
         <translation>显示缩进参考线</translation>
     </message>
     <message>
         <location line="+23"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Backspace unindents line</source>
         <translation>退格键删除缩进符</translation>
     </message>
     <message>
         <location line="+23"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Indentation uses tabs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+38"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Auto completion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+27"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Match keywords</source>
         <translation>匹配关键字</translation>
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Case sensitive</source>
         <translation>大小写敏感</translation>
     </message>
     <message>
         <location line="+23"/>
-        <location filename="../src/ui-settings-dialog.h" line="+2"/>
         <source>Replace word by suggested one</source>
         <translation>使用建议的单词替换原有的</translation>
     </message>
     <message>
         <location line="-10"/>
-        <location filename="../src/ui-settings-dialog.h" line="-1"/>
         <source>Match words in document</source>
         <translation>在文档中匹配单词</translation>
     </message>
     <message>
         <location line="+48"/>
-        <location filename="../src/ui-settings-dialog.h" line="+2"/>
         <source>With Octave builtins</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+10"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>With Octave functions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+64"/>
-        <location filename="../src/ui-settings-dialog.h" line="+9"/>
         <source>Show completion list automatically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+51"/>
-        <location filename="../src/ui-settings-dialog.h" line="+2"/>
+        <location line="+63"/>
         <source>Restore editor tabs from previous session on startup</source>
         <translation>在启动时恢复上次会话的编辑器标签</translation>
     </message>
     <message>
-        <location line="+20"/>
-        <location filename="../src/ui-settings-dialog.h" line="+2"/>
+        <location line="-13"/>
         <source>Reload externally changed files without prompt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-446"/>
-        <location filename="../src/ui-settings-dialog.h" line="-30"/>
+        <location line="-425"/>
         <source>Use custom file editor</source>
         <translation>使用自定义文件编辑器</translation>
     </message>
     <message>
-        <location line="+482"/>
-        <location filename="../src/ui-settings-dialog.h" line="+33"/>
+        <location line="+518"/>
+        <source>Text encoding used for loading and saving</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+56"/>
         <source>Editor Styles</source>
         <translation>编辑器风格</translation>
     </message>
     <message>
         <location line="+209"/>
-        <location filename="../src/ui-settings-dialog.h" line="+6"/>
         <source>(Changing buffer size clears history)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+28"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>History buffer Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+27"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Set focus to terminal when running a command from within another widget</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+7"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Print debug location in terminal window in addition to the marker in the editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+16"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Terminal Colors</source>
         <translation>终端颜色</translation>
     </message>
     <message>
         <location line="-173"/>
-        <location filename="../src/ui-settings-dialog.h" line="-6"/>
         <source>Font</source>
         <translation>字体</translation>
     </message>
     <message>
-        <location line="-917"/>
-        <location filename="../src/ui-settings-dialog.h" line="-58"/>
+        <location line="-1007"/>
         <source>Show line numbers</source>
         <translation>显示行数</translation>
     </message>
     <message>
-        <location line="-72"/>
-        <location filename="../src/ui-settings-dialog.h" line="-3"/>
+        <location line="+81"/>
         <source>Highlight current line</source>
         <translation>高亮当前行</translation>
     </message>
     <message>
-        <location line="+85"/>
-        <location filename="../src/ui-settings-dialog.h" line="+4"/>
+        <location line="+13"/>
         <source>Show complete path in window title</source>
         <translation>在窗口标题显示完整路径</translation>
     </message>
     <message>
-        <location line="-423"/>
-        <location filename="../src/ui-settings-dialog.h" line="-20"/>
+        <location line="-467"/>
         <source>Graphic icons</source>
         <translation>图形图标</translation>
     </message>
     <message>
         <location line="+212"/>
-        <location filename="../src/ui-settings-dialog.h" line="+10"/>
         <source>These preferences are applied after any .octaverc startup files.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+55"/>
-        <location filename="../src/ui-settings-dialog.h" line="+3"/>
         <source>Restore working directory of previous session</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+127"/>
-        <location filename="../src/ui-settings-dialog.h" line="+5"/>
+        <location line="+213"/>
         <source>Show whitespace</source>
         <translation>显示空白</translation>
     </message>
     <message>
-        <location line="+39"/>
-        <location filename="../src/ui-settings-dialog.h" line="+3"/>
+        <location line="+157"/>
         <source>Do not show whitespace used for indentation</source>
         <translation>不要显示缩进的空白空间</translation>
     </message>
     <message>
-        <location line="+156"/>
-        <location filename="../src/ui-settings-dialog.h" line="+7"/>
+        <location line="-299"/>
         <source>Draw a long line marker</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+48"/>
-        <location filename="../src/ui-settings-dialog.h" line="+3"/>
+        <location line="+155"/>
         <source>Show EOL characters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
+        <location line="+662"/>
         <source>Default EOL mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+412"/>
-        <location filename="../src/ui-settings-dialog.h" line="+26"/>
+        <location line="-136"/>
         <source>Number of characters before list is shown: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+112"/>
-        <location filename="../src/ui-settings-dialog.h" line="+11"/>
+        <location line="+124"/>
         <source>Create nonexistent files without prompting</source>
         <translation>在创建不存在的文件时不提示</translation>
     </message>
     <message>
-        <location line="-429"/>
-        <location filename="../src/ui-settings-dialog.h" line="-28"/>
+        <location line="-441"/>
         <source>command line (%f=file, %l=line):</source>
         <translation>命令行 (%f=文件, %l=行数): </translation>
     </message>
     <message>
-        <location line="+489"/>
-        <location filename="../src/ui-settings-dialog.h" line="+31"/>
+        <location line="+581"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Select font, font size (as a difference from the default size), font style (&lt;b&gt;b&lt;/b&gt;old, &lt;b&gt;i&lt;/b&gt;talic, &lt;b&gt;u&lt;/b&gt;nderline), text color, and background color (for the latter, the color magenta (255,0,255) is a placeholder for the default background color).&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+32"/>
-        <location filename="../src/ui-settings-dialog.h" line="+12"/>
         <source>Terminal</source>
         <translation>终端</translation>
     </message>
     <message>
         <location line="+51"/>
-        <location filename="../src/ui-settings-dialog.h" line="-8"/>
         <source>Cursor type:</source>
         <translation>光标类型: </translation>
     </message>
     <message>
         <location line="-11"/>
-        <location filename="../src/ui-settings-dialog.h" line="-1"/>
         <source>Cursor blinking</source>
         <translation>光标闪烁</translation>
     </message>
     <message>
         <location line="-7"/>
-        <location filename="../src/ui-settings-dialog.h" line="-1"/>
         <source>Use foreground color</source>
         <translation>使用前景色</translation>
     </message>
     <message>
         <location line="+59"/>
-        <location filename="../src/ui-settings-dialog.h" line="+4"/>
         <source>Font size</source>
         <translation>字体大小</translation>
     </message>
     <message>
         <location line="+196"/>
-        <location filename="../src/ui-settings-dialog.h" line="+18"/>
         <source>File Browser</source>
         <translation>文件浏览器</translation>
     </message>
     <message>
-        <location line="+21"/>
-        <location filename="../src/ui-settings-dialog.h" line="-11"/>
-        <source>Display</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+25"/>
-        <location filename="../src/ui-settings-dialog.h" line="+3"/>
-        <source>Show file size</source>
-        <translation>显示文件大小</translation>
-    </message>
-    <message>
-        <location line="-14"/>
-        <location filename="../src/ui-settings-dialog.h" line="-2"/>
-        <source>Show file type</source>
-        <translation>显示文件类型</translation>
-    </message>
-    <message>
-        <location line="+21"/>
-        <location filename="../src/ui-settings-dialog.h" line="+3"/>
-        <source>Show date of last modification</source>
-        <translation>显示最后修改日期</translation>
-    </message>
-    <message>
-        <location line="-14"/>
-        <location filename="../src/ui-settings-dialog.h" line="-2"/>
-        <source>Show hidden files</source>
-        <translation>显示隐藏文件</translation>
-    </message>
-    <message>
-        <location line="+21"/>
-        <location filename="../src/ui-settings-dialog.h" line="+3"/>
-        <source>Alternating row colors</source>
-        <translation>备选列颜色</translation>
-    </message>
-    <message>
-        <location line="+117"/>
-        <location filename="../src/ui-settings-dialog.h" line="+9"/>
+        <location line="+144"/>
         <source>Workspace</source>
         <translation>工作空间</translation>
     </message>
     <message>
-        <location line="+42"/>
-        <location filename="../src/ui-settings-dialog.h" line="-1"/>
+        <location line="+35"/>
+        <source>Colors for variable attributes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
         <source>Hide tool tips</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+182"/>
-        <location filename="../src/ui-settings-dialog.h" line="+14"/>
+        <location line="+101"/>
+        <source>Import shortcut set</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Export current shortcut set</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Reset shortcuts to their defaults</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location line="+80"/>
+        <source>Default</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-71"/>
         <source>Edit a shortcut by double-clicking in a cell</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+108"/>
-        <location filename="../src/ui-settings-dialog.h" line="+20"/>
+        <location line="+76"/>
+        <source>Actual</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
         <source>Network</source>
         <translation>网络</translation>
     </message>
     <message>
         <location line="+23"/>
-        <location filename="../src/ui-settings-dialog.h" line="-12"/>
         <source>Allow Octave to connect to the Octave web site to display current news and information</source>
         <translation>允许 Octave 连接到 Octave 站点以显示当前新闻和信息</translation>
     </message>
     <message>
         <location line="+46"/>
-        <location filename="../src/ui-settings-dialog.h" line="+8"/>
         <source>Use proxy server</source>
         <translation>使用代理服务器</translation>
     </message>
     <message>
         <location line="-23"/>
-        <location filename="../src/ui-settings-dialog.h" line="-4"/>
         <source>HttpProxy</source>
         <translation>HTTP Proxy</translation>
     </message>
     <message>
-        <location line="-2083"/>
-        <location filename="../src/ui-settings-dialog.h" line="-123"/>
+        <location line="-2039"/>
         <source>Icon set for dock widgets</source>
         <translation>挂件的图标集</translation>
     </message>
     <message>
         <location line="-48"/>
-        <location filename="../src/ui-settings-dialog.h" line="-4"/>
         <source>Language (requires restart)</source>
         <translation>语言 (需要重启)</translation>
     </message>
     <message>
         <location line="-58"/>
-        <location filename="../src/ui-settings-dialog.h" line="-5"/>
         <source>Icon size</source>
         <translation>图标大小</translation>
     </message>
     <message>
         <location line="+26"/>
-        <location filename="../src/ui-settings-dialog.h" line="+3"/>
         <source>Normal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1195"/>
-        <location filename="../src/ui-settings-dialog.h" line="+72"/>
+        <location line="+1156"/>
         <source>File handling</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+485"/>
-        <location filename="../src/ui-settings-dialog.h" line="+24"/>
+        <location line="+526"/>
         <source>Behavior</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+8"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Synchronize Octave working directory with file browser</source>
         <translation>使用文件浏览器同步 Octave 工作目录</translation>
     </message>
     <message>
-        <location line="+26"/>
-        <location filename="../src/ui-settings-dialog.h" line="+2"/>
+        <location line="+22"/>
         <source>Restore last directory of previous session</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+106"/>
-        <location filename="../src/ui-settings-dialog.h" line="+3"/>
-        <source>Colors for variable attributes </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+34"/>
-        <location filename="../src/ui-settings-dialog.h" line="+22"/>
+        <location line="+162"/>
         <source>Shortcuts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+31"/>
-        <location filename="../src/ui-settings-dialog.h" line="-18"/>
         <source>Select this option to prevent conflicts with readline shortcuts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
-        <location filename="../src/ui-settings-dialog.h" line="+2"/>
         <source>Disable global shortcuts when terminal window has focus</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
-        <location line="+28"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
-        <location line="+4"/>
-        <source>Use this set</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-21"/>
-        <location filename="../src/ui-settings-dialog.h" line="-3"/>
-        <source>Set 1:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <location line="+37"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
-        <location line="+3"/>
+        <location line="+53"/>
         <source>Export</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-30"/>
-        <location line="+37"/>
-        <location filename="../src/ui-settings-dialog.h" line="-2"/>
-        <location line="+3"/>
+        <location line="-10"/>
         <source>Import</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
-        <source>Set 2:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+86"/>
-        <location filename="../src/ui-settings-dialog.h" line="+7"/>
+        <location line="+90"/>
         <source>Action</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
-        <location filename="../src/ui-settings-dialog.h" line="-1"/>
-        <source>Set 1 Default</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <location filename="../src/ui-settings-dialog.h" line="-1"/>
-        <source>Set 1 Actual</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <location filename="../src/ui-settings-dialog.h" line="-1"/>
-        <source>Set 2 Default</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <location filename="../src/ui-settings-dialog.h" line="-1"/>
-        <source>Set 2 Actual</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+68"/>
-        <location filename="../src/ui-settings-dialog.h" line="+11"/>
+        <location line="+83"/>
         <source>Socks5Proxy</source>
         <translation>Socks5Proxy</translation>
     </message>
     <message>
         <location line="-16"/>
-        <location filename="../src/ui-settings-dialog.h" line="-4"/>
         <source>Hostname:</source>
         <translation>主机名: </translation>
     </message>
     <message>
-        <location line="+44"/>
-        <location filename="../src/ui-settings-dialog.h" line="+8"/>
+        <location line="-342"/>
+        <source>Extensions of files to be opened in the default text editor (separated by &quot;;&quot;):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+386"/>
         <source>Proxy type:</source>
         <translation>代理类型: </translation>
     </message>
     <message>
         <location line="+10"/>
-        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Port:</source>
         <translation>端口: </translation>
     </message>
     <message>
         <location line="-27"/>
-        <location filename="../src/ui-settings-dialog.h" line="-3"/>
         <source>Username:</source>
         <translation>用户名: </translation>
     </message>
     <message>
         <location line="+37"/>
-        <location filename="../src/ui-settings-dialog.h" line="+4"/>
         <source>Password:</source>
         <translation>密码: </translation>
     </message>
     <message>
-        <location filename="../src/settings-dialog.cc" line="+77"/>
+        <location filename="../src/settings-dialog.cc" line="+127"/>
+        <source>Octave Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Unable to save settings.  Missing settings file or unknown directory.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+18"/>
         <location line="+4"/>
-        <location line="+561"/>
+        <location line="+444"/>
         <source>System setting</source>
         <translation>系统设置</translation>
     </message>
     <message>
-        <location line="-355"/>
+        <location line="-232"/>
         <source>IBeam Cursor</source>
         <translation>IBeam 光标</translation>
     </message>
@@ -3343,35 +3478,7 @@
         <translation>给光标添加下划线</translation>
     </message>
     <message>
-        <location line="+213"/>
-        <source>Difference to the default size</source>
-        <translation>和默认大小的差别</translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Background color, pink (255,0,255) means default</source>
-        <translation>背景颜色，粉红色 (255,0,255) 代表默认值</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>b</source>
-        <comment>short form for bold</comment>
-        <translation>b</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>i</source>
-        <comment>short form for italic</comment>
-        <translation>i</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>u</source>
-        <comment>short form for underlined</comment>
-        <translation>u</translation>
-    </message>
-    <message>
-        <location line="+497"/>
+        <location line="+503"/>
         <source>Set Octave Startup Directory</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3384,7 +3491,7 @@
 <context>
     <name>setup_community_news</name>
     <message>
-        <location filename="../src/welcome-wizard.cc" line="+44"/>
+        <location filename="../src/welcome-wizard.cc" line="+42"/>
         <source>Community News</source>
         <translation>社区新闻</translation>
     </message>
@@ -3439,7 +3546,7 @@
 <context>
     <name>shortcut_manager</name>
     <message>
-        <location filename="../src/shortcut-manager.cc" line="+109"/>
+        <location filename="../src/shortcut-manager.cc" line="+106"/>
         <source>New File</source>
         <translation type="unfinished">新建文件</translation>
     </message>
@@ -3469,42 +3576,38 @@
         <translation type="unfinished">工作空间另存为</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <location line="+158"/>
+        <location line="+16"/>
+        <location line="+143"/>
         <source>Preferences</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-157"/>
+        <location line="-158"/>
         <source>Exit Octave</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
-        <location line="+84"/>
         <source>Copy</source>
         <translation type="unfinished">复制</translation>
     </message>
     <message>
-        <location line="-83"/>
-        <location line="+85"/>
+        <location line="+1"/>
         <source>Paste</source>
         <translation type="unfinished">粘贴</translation>
     </message>
     <message>
-        <location line="-84"/>
-        <location line="+80"/>
+        <location line="+1"/>
         <source>Undo</source>
         <translation type="unfinished">撤销</translation>
     </message>
     <message>
-        <location line="-79"/>
-        <location line="+84"/>
+        <location line="+1"/>
         <source>Select All</source>
         <translation type="unfinished">全选</translation>
     </message>
     <message>
-        <location line="-83"/>
+        <location line="+1"/>
         <source>Clear Clipboard</source>
         <translation type="unfinished">清空剪贴板</translation>
     </message>
@@ -3529,7 +3632,7 @@
         <translation type="unfinished">清空工作空间</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+6"/>
         <source>Step Into</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3600,12 +3703,12 @@
     </message>
     <message>
         <location line="+2"/>
-        <location line="+216"/>
+        <location line="+234"/>
         <source>Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-214"/>
+        <location line="-232"/>
         <source>Documentation</source>
         <translation type="unfinished">文档</translation>
     </message>
@@ -3685,18 +3788,28 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+3"/>
         <source>Redo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
+        <source>Cut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Find and Replace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+2"/>
-        <source>Cut</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Find and Replace</source>
+        <source>Find Next</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Find Previous</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -3822,7 +3935,68 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-145"/>
+        <location line="+48"/>
+        <source>Switch to Left Tab</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Switch to Right Tab</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Move Tab Left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Move Tab Right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+44"/>
+        <source>Global</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+38"/>
+        <source>Tabs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+98"/>
+        <source>Enter new Shortcut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+143"/>
+        <source>Overwriting Shortcuts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>You are about to overwrite all shortcuts.
+Would you like to save the current shortcut set or cancel the action?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Don&apos;t save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+39"/>
+        <source>Import shortcuts from file ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Export shortcuts into file ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-571"/>
         <source>Step</source>
         <translation type="unfinished">步骤</translation>
     </message>
@@ -3883,6 +4057,21 @@
     </message>
     <message>
         <location line="+2"/>
+        <source>Show Toolbar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Show Statusbar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Show Horizontal Scrollbar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>Zoom In</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3938,12 +4127,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+42"/>
-        <source>Main</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <location line="+57"/>
         <location line="+23"/>
         <source>File</source>
         <translation type="unfinished"></translation>
@@ -3987,12 +4171,7 @@
         <translation type="unfinished">运行</translation>
     </message>
     <message>
-        <location line="+124"/>
-        <source>Enter new Shortcut for Set %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
+        <location line="+106"/>
         <source>Apply the desired shortcut or click on the right button to reset the shortcut to its default.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4017,7 +4196,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+53"/>
+        <location line="+45"/>
         <source>Double Shortcut</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4031,23 +4210,13 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+71"/>
-        <source>Import shortcut set %1 from file ...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <location line="+6"/>
+        <location line="+113"/>
+        <location line="+5"/>
         <source>Octave Shortcut Files (*.osc);;All Files (*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1"/>
-        <source>Export shortcut set %1 into file ...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+15"/>
+        <location line="+10"/>
         <source>Failed to open %1 as octave shortcut file</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4086,7 +4255,7 @@
 <context>
     <name>welcome_wizard</name>
     <message>
-        <location filename="../src/welcome-wizard.cc" line="+135"/>
+        <location filename="../src/welcome-wizard.cc" line="+133"/>
         <source>Welcome to GNU Octave</source>
         <translation>欢迎来到 GNU Octave</translation>
     </message>
@@ -4094,7 +4263,7 @@
 <context>
     <name>workspace_model</name>
     <message>
-        <location filename="../src/workspace-model.cc" line="-42"/>
+        <location filename="../src/workspace-model.cc" line="-41"/>
         <source>Name</source>
         <translation>名称</translation>
     </message>
@@ -4119,7 +4288,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+109"/>
+        <location line="+108"/>
         <source>Right click to copy, rename, or display</source>
         <translation>右击以复制，重命名或显示</translation>
     </message>
@@ -4133,7 +4302,7 @@
 <context>
     <name>workspace_view</name>
     <message>
-        <location filename="../src/workspace-view.cc" line="+50"/>
+        <location filename="../src/workspace-view.cc" line="+51"/>
         <source>Workspace</source>
         <translation>工作区</translation>
     </message>
@@ -4153,7 +4322,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+161"/>
+        <location line="+242"/>
         <source>Copy name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4169,11 +4338,41 @@
     </message>
     <message>
         <location line="+9"/>
-        <source>Only top-level symbols may be renamed.</source>
-        <translation>只有顶级符号才能被重命名。</translation>
-    </message>
-    <message>
-        <location line="+132"/>
+        <source>Only top-level symbols may be renamed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Hide filter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Show filter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+149"/>
+        <source>Class</source>
+        <translation type="unfinished">类</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Dimension</source>
+        <translation type="unfinished">维度</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Value</source>
+        <translation type="unfinished">值</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Attribute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-17"/>
         <source>View the variables in the active workspace.&lt;br&gt;</source>
         <translation>显示当前活动工作区的变量。&lt;br&gt;</translation>
     </message>