changeset 15927:c4556b986704

gui: updated and renamed translation files, added belarusian from Mihas Varantsou * be_BY.ts, be_BY.qm: added belarusian translation from Mihas Vrantsou and updated to new strings in sources * xx-yy.ts,.qm: renamed into xx_YY.ts,.qm and updated to new strings in sources * generic.ts,.qm: updated to new strings in sources * transloators: added translator for belarusian translation * ressource-manager.cc(find-translator-file): change search path for testing the translation files
author Torsten <ttl@justmail.de>
date Fri, 11 Jan 2013 23:48:38 +0100
parents 1fbeccd44271
children 67d0a59708d1
files libgui/languages/be_BY.qm libgui/languages/be_BY.ts libgui/languages/de-de.qm libgui/languages/de-de.ts libgui/languages/de_DE.qm libgui/languages/de_DE.ts libgui/languages/es-es.qm libgui/languages/es-es.ts libgui/languages/es_ES.qm libgui/languages/es_ES.ts libgui/languages/generic.ts libgui/languages/pt-br.qm libgui/languages/pt-br.ts libgui/languages/pt_BR.qm libgui/languages/pt_BR.ts libgui/languages/ru-ru.qm libgui/languages/ru-ru.ts libgui/languages/ru_RU.qm libgui/languages/ru_RU.ts libgui/languages/translators libgui/languages/uk-ua.qm libgui/languages/uk-ua.ts libgui/languages/uk_UA.qm libgui/languages/uk_UA.ts libgui/src/resource-manager.cc
diffstat 20 files changed, 5809 insertions(+), 1850 deletions(-) [+]
line wrap: on
line diff
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..a35ad51bdced45d06f08300f4c0ec4c2af9e8ab8
GIT binary patch
literal 6215
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
LdmX)VpRetI4T83F
new file mode 100644
--- /dev/null
+++ b/libgui/languages/be_BY.ts
@@ -0,0 +1,1066 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.0" language="be_BY">
+<context>
+    <name>documentation_dock_widget</name>
+    <message>
+        <location filename="../src/documentation-dockwidget.cc" line="+34"/>
+        <source>Documentation</source>
+        <translation type="unfinished">Дакументацыя</translation>
+    </message>
+</context>
+<context>
+    <name>file_editor</name>
+    <message>
+        <location filename="../src/m-editor/file-editor.cc" line="+146"/>
+        <location line="+38"/>
+        <location line="+43"/>
+        <location line="+26"/>
+        <source>Octave Editor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-106"/>
+        <source>File %1 is already open in the editor.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+38"/>
+        <source>Could not open file %1 for read:
+%2.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+43"/>
+        <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="+26"/>
+        <source>The associated file editor tab has disappeared.  It was likely closed by some means.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+141"/>
+        <source>&amp;%1 %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+130"/>
+        <source>&amp;New File</source>
+        <translation type="unfinished">&amp;Новы файл</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>&amp;Open File</source>
+        <translation type="unfinished">&amp;Адкрыць файл</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>&amp;Save File</source>
+        <translation type="unfinished">&amp;Захаваць файл</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Save File &amp;As</source>
+        <translation type="unfinished">Захаваць файл &amp;як</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <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="+3"/>
+        <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="+4"/>
+        <source>Paste</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;Next Bookmark</source>
+        <translation type="unfinished">&amp;Наступная закладка</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Pre&amp;vious Bookmark</source>
+        <translation type="unfinished">Па&amp;пярэдняя закладка</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Toggle &amp;Bookmark</source>
+        <translation type="unfinished">&amp;Паставіць/прыбраць закладку</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;Remove All Bookmarks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>&amp;Next breakpoint</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Pre&amp;vious breakpoint</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Toggle &amp;breakpoint</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>&amp;Remove All breakpoints</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>&amp;Comment Selected Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;Uncomment Selected Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>&amp;Find and Replace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Save File And Run</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+51"/>
+        <source>&amp;File</source>
+        <translation type="unfinished">&amp;Файл</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Open &amp;Recent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>&amp;Edit</source>
+        <translation type="unfinished">&amp;Змяніць</translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>&amp;Debug</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>&amp;Run</source>
+        <translation type="unfinished">&amp;Запусціць</translation>
+    </message>
+</context>
+<context>
+    <name>file_editor_tab</name>
+    <message>
+        <location filename="../src/m-editor/file-editor-tab.cc" line="+687"/>
+        <location line="+102"/>
+        <location line="+98"/>
+        <location line="+63"/>
+        <location line="+14"/>
+        <source>Octave Editor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-276"/>
+        <source>The file &apos;%1&apos; has been modified. Do you want to save the changes?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+102"/>
+        <source>Could not open file %1 for write:
+%2.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+98"/>
+        <source>File not saved!  You&apos;ve selected a file name
+
+     %1
+
+which is the same as the current file name.  Use Save to overwrite.  (Could allow overwriting, with message, if that is what folks want.)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+63"/>
+        <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>
+    <message>
+        <location line="+14"/>
+        <source>It seems that &apos;%1&apos; has been deleted or renamed. Do you want to save it now?</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>files_dock_widget</name>
+    <message>
+        <location filename="../src/files-dockwidget.cc" line="+43"/>
+        <source>Current Directory</source>
+        <translation type="unfinished">Бягучы каталог</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Move up one directory.</source>
+        <translation type="unfinished">Пасунуцца да ўзроўню вышэй.</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Enter the path or filename.</source>
+        <translation type="unfinished">Увядзіце шлях ці назву файла.</translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>Doubleclick a file to open it.</source>
+        <translation type="unfinished">Двойчы пстрык па файле адкрые яго.</translation>
+    </message>
+</context>
+<context>
+    <name>find_dialog</name>
+    <message>
+        <location filename="../src/m-editor/find-dialog.cc" line="+58"/>
+        <source>Find &amp;what:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Re&amp;place with:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Match &amp;case</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Search from &amp;start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;Wrap while searching</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>&amp;Find Next</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>&amp;Replace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Replace &amp;All</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>&amp;More</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>&amp;Whole words</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Regular E&amp;xpressions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Search &amp;backward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Search se&amp;lection</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>history_dock_widget</name>
+    <message>
+        <location filename="../src/history-dockwidget.cc" line="+55"/>
+        <source>Doubleclick a command to transfer it to the terminal.</source>
+        <translation type="unfinished">Двойчы пстрык па загадзе перадасць яго ў тэрмінал.</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Enter text to filter the command history.</source>
+        <translation type="unfinished">Увядзіце тэкст для фільтравання гісторыі загадаў.</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Command History</source>
+        <translation type="unfinished">Гісторыя загадаў</translation>
+    </message>
+    <message>
+        <location line="+42"/>
+        <source>Copy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Evaluate</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>lexer_octave_gui</name>
+    <message>
+        <location filename="../src/m-editor/lexer-octave-gui.cc" line="+145"/>
+        <source>Default</source>
+        <translation type="unfinished">Па змоўчванні</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Comment</source>
+        <translation type="unfinished">Каментар</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Command</source>
+        <translation type="unfinished">Загад</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Number</source>
+        <translation type="unfinished">Нумар</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Keyword</source>
+        <translation type="unfinished">Ключаслова</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Single-quoted string</source>
+        <translation type="unfinished">Радок у аднакоссі</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Operator</source>
+        <translation type="unfinished">Аператар</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Identifier</source>
+        <translation type="unfinished">Ідэнтыфікатар</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Double-quoted string</source>
+        <translation type="unfinished">Радок у двукоссі</translation>
+    </message>
+</context>
+<context>
+    <name>main_window</name>
+    <message>
+        <location filename="../src/main-window.cc" line="+135"/>
+        <source>Save Workspace</source>
+        <translation type="unfinished">Захаваць прастору зменных</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Load Workspace</source>
+        <translation type="unfinished">Загрузіць прастору зменных</translation>
+    </message>
+    <message>
+        <location line="+155"/>
+        <source>Set working direcotry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+186"/>
+        <location line="+381"/>
+        <source>About Octave</source>
+        <translation type="unfinished">Пра Octave</translation>
+    </message>
+    <message>
+        <location line="-290"/>
+        <source>View the variables in the active workspace.</source>
+        <translation type="unfinished">Прагляд зменных бягучай прасторы.</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Browse and search the command history.</source>
+        <translation type="unfinished">Агляд і пошук па гісторыі загадаў.</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Browse your files.</source>
+        <translation type="unfinished">Агляд файлаў.</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>See the documentation for help.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+39"/>
+        <source>&amp;File</source>
+        <translation type="unfinished">&amp;Файл</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>New</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Script</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Function</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Class</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Enumeration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Figure</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Variable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Model</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>GUI</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Open...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Close Command Window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Import Data...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Save Workspace...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Preferences...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Page Setup...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Print</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Print Selection...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Exit</source>
+        <translation type="unfinished">Выйсці</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>&amp;Edit</source>
+        <translation type="unfinished">&amp;Змяніць</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Undo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Redo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Cut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Copy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Paste</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Paste To Workspace...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Select All</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Find...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Find Files...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Clear Command Window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Clear Command History</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Clear Workspace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>De&amp;bug</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Step</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Step in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Step out</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Continue</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Exit Debug Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>&amp;Desktop</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Load workspace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>&amp;Window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Show Command Window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Show Command History</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Show Current Directory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Show Workspace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Show Editor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Show Documentation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Command Window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Command History</source>
+        <translation type="unfinished">Гісторыя загадаў</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Current Directory</source>
+        <translation type="unfinished">Бягучы каталог</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Workspace</source>
+        <translation type="unfinished">Прастора зменных</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Editor</source>
+        <translation type="unfinished">Рэдактар</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Documentation</source>
+        <translation type="unfinished">Дакументацыя</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Reset Windows</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>&amp;Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Report Bug</source>
+        <translation type="unfinished">Паведаміць пра хібу</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Visit Agora</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Visit Octave Forge</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Current Directory:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>settings_dialog</name>
+    <message>
+        <location filename="../src/settings-dialog.ui" line="+29"/>
+        <location filename="../src/ui-settings-dialog.h" line="+461"/>
+        <source>Settings</source>
+        <translation type="unfinished">Настаўленні</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <location filename="../src/ui-settings-dialog.h" line="+5"/>
+        <source>General</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <location filename="../src/ui-settings-dialog.h" line="-4"/>
+        <source>Icon set for dock widget</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <location filename="../src/ui-settings-dialog.h" line="+1"/>
+        <source>Octave logo only</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <location filename="../src/ui-settings-dialog.h" line="+1"/>
+        <source>Letter icons</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <location filename="../src/ui-settings-dialog.h" line="+1"/>
+        <source>Graphic  icons</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location filename="../src/ui-settings-dialog.h" line="+11"/>
+        <source>Editor</source>
+        <translation type="unfinished">Рэдактар</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <location line="+147"/>
+        <location filename="../src/ui-settings-dialog.h" line="-9"/>
+        <location line="+10"/>
+        <source>Font</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-130"/>
+        <location line="+147"/>
+        <location filename="../src/ui-settings-dialog.h" line="-9"/>
+        <location line="+10"/>
+        <source>Font Size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-109"/>
+        <location filename="../src/ui-settings-dialog.h" line="-9"/>
+        <source>Show line numbers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <location filename="../src/ui-settings-dialog.h" line="+1"/>
+        <source>Highlight current line</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <location filename="../src/ui-settings-dialog.h" line="+1"/>
+        <source>Code completion</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <location filename="../src/ui-settings-dialog.h" line="+1"/>
+        <source>Show complete path in window title</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location filename="../src/ui-settings-dialog.h" line="+1"/>
+        <source>Restore tabs from previous session on startup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+27"/>
+        <location filename="../src/ui-settings-dialog.h" line="+1"/>
+        <source>Use custom file editor:</source>
+        <translation type="unfinished">Вызначыць ўласны рэдактар:</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <location filename="../src/ui-settings-dialog.h" line="+1"/>
+        <source>emacs</source>
+        <translation type="unfinished">emacs</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <location filename="../src/ui-settings-dialog.h" line="+6"/>
+        <source>Terminal</source>
+        <translation type="unfinished">Тэрмінал</translation>
+    </message>
+    <message>
+        <location line="+62"/>
+        <location filename="../src/ui-settings-dialog.h" line="-2"/>
+        <source>Cursor type:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+27"/>
+        <location filename="../src/ui-settings-dialog.h" line="+1"/>
+        <source>Cursor blinking</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <location filename="../src/ui-settings-dialog.h" line="+8"/>
+        <source>File Browser</source>
+        <translation type="unfinished">Файлавы аглядальнік</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <location filename="../src/ui-settings-dialog.h" line="-6"/>
+        <source>Show filenames</source>
+        <translation type="unfinished">Паказваць назвы файлаў</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location filename="../src/ui-settings-dialog.h" line="+1"/>
+        <source>Show file size</source>
+        <translation type="unfinished">Паказваць памеры файлаў</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location filename="../src/ui-settings-dialog.h" line="+1"/>
+        <source>Show file type</source>
+        <translation type="unfinished">Паказваць тыпы файлаў</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location filename="../src/ui-settings-dialog.h" line="+1"/>
+        <source>Show date of last modification</source>
+        <translation type="unfinished">Паказваць дату апошняга змянення</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location filename="../src/ui-settings-dialog.h" line="+1"/>
+        <source>Show hidden files</source>
+        <translation type="unfinished">Паказваць схаваныя файлы</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location filename="../src/ui-settings-dialog.h" line="+1"/>
+        <source>Alternating row colors</source>
+        <translation type="unfinished">Колеры радкоў чаргуюцца</translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <location filename="../src/ui-settings-dialog.h" line="+13"/>
+        <source>Network</source>
+        <translation type="unfinished">Сетка</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <location filename="../src/ui-settings-dialog.h" line="-11"/>
+        <source>Use proxy server</source>
+        <translation type="unfinished">Выкарыстоўваць проксі-сервер</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <location filename="../src/ui-settings-dialog.h" line="+1"/>
+        <source>Proxy Type:</source>
+        <translation type="unfinished">Тып проксі:</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <location filename="../src/ui-settings-dialog.h" line="+3"/>
+        <source>HttpProxy</source>
+        <translation type="unfinished">HttpProxy</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <location filename="../src/ui-settings-dialog.h" line="+1"/>
+        <source>Socks5Proxy</source>
+        <translation type="unfinished">Socks5Proxy</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <location filename="../src/ui-settings-dialog.h" line="+2"/>
+        <source>Hostname:</source>
+        <translation type="unfinished">Назва хоста:</translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <location filename="../src/ui-settings-dialog.h" line="+1"/>
+        <source>Port:</source>
+        <translation type="unfinished">Порт:</translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <location filename="../src/ui-settings-dialog.h" line="+1"/>
+        <source>Username:</source>
+        <translation type="unfinished">Імя карыстальніка:</translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <location filename="../src/ui-settings-dialog.h" line="+1"/>
+        <source>Password:</source>
+        <translation type="unfinished">Пароль:</translation>
+    </message>
+</context>
+<context>
+    <name>terminal_dock_widget</name>
+    <message>
+        <location filename="../src/terminal-dockwidget.cc" line="+34"/>
+        <source>Command Window</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>webinfo</name>
+    <message>
+        <location filename="../src/qtinfo/webinfo.cc" line="+74"/>
+        <source>Type here and press &apos;Return&apos; to search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Global search</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>welcome_wizard</name>
+    <message>
+        <location filename="../src/welcome-wizard.ui" line="+26"/>
+        <location filename="../src/ui-welcome-wizard.h" line="+286"/>
+        <source>Welcome to GNU Octave</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <location filename="../src/ui-welcome-wizard.h" line="+1"/>
+        <source>It appears that you have launched Octave GUI for the first time on this computer, since no configuration file could be found at &apos;~/.octave-gui&apos;. This wizard will guide you through the essential settings you should make before you can start using Octave GUI. If you want to transfer your settings you have previously made just close this dialog and copy over the settings file to your home folder. The presence of that file will automatically be detected and will skip this wizard. IMPORTANT: This wizard is not fully functional yet. Just click your way to the end and it will create a standard settings file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+41"/>
+        <location line="+50"/>
+        <location line="+52"/>
+        <location line="+52"/>
+        <location filename="../src/ui-welcome-wizard.h" line="+1"/>
+        <location line="+2"/>
+        <location line="+2"/>
+        <location line="+2"/>
+        <source>Next</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-124"/>
+        <location line="+52"/>
+        <location line="+52"/>
+        <location line="+87"/>
+        <location filename="../src/ui-welcome-wizard.h" line="-5"/>
+        <location line="+2"/>
+        <location line="+2"/>
+        <location line="+5"/>
+        <source>Previous</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-45"/>
+        <location filename="../src/ui-welcome-wizard.h" line="-3"/>
+        <source>Welcome to Octave!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location filename="../src/ui-welcome-wizard.h" line="+1"/>
+        <source>This is the development version of Octave with the first official GUI.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <location filename="../src/ui-welcome-wizard.h" line="+1"/>
+        <source>You seem to run Octave GUI for the first time on this computer. This assistant will help you to configure this software installation. Click &apos;Finish&apos; to write a configuration file and launch Octave GUI.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+48"/>
+        <location filename="../src/ui-welcome-wizard.h" line="+2"/>
+        <source>Finish</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>workspace_model</name>
+    <message>
+        <location filename="../src/workspace-model.cc" line="+42"/>
+        <source>Name</source>
+        <translation type="unfinished">Ідэнтыфікатар</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Class</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Dimension</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Value</source>
+        <translation type="unfinished">Значэнне</translation>
+    </message>
+</context>
+<context>
+    <name>workspace_view</name>
+    <message>
+        <location filename="../src/workspace-view.cc" line="+39"/>
+        <source>Workspace</source>
+        <translation type="unfinished">Прастора зменных</translation>
+    </message>
+</context>
+</TS>
deleted file mode 100644
index a701c3df75595c1b14d890e84c3577aa8d342474..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..8e57ee6fe4548f8e16f7319ea374c252cb7fa9c2
GIT binary patch
literal 6098
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
rename from libgui/languages/de-de.ts
rename to libgui/languages/de_DE.ts
--- a/libgui/languages/de-de.ts
+++ b/libgui/languages/de_DE.ts
@@ -2,641 +2,1065 @@
 <!DOCTYPE TS>
 <TS version="2.0" language="de_DE">
 <context>
-    <name>FileEditorMdiSubWindow</name>
+    <name>documentation_dock_widget</name>
     <message>
-        <location filename="../src/FileEditorMdiSubWindow.cpp" line="114"/>
-        <location filename="../src/FileEditorMdiSubWindow.cpp" line="207"/>
-        <source>File Editor</source>
-        <translation>Dateieditor</translation>
+        <location filename="../src/documentation-dockwidget.cc" line="+34"/>
+        <source>Documentation</source>
+        <translation type="unfinished">Dokumentation</translation>
+    </message>
+</context>
+<context>
+    <name>file_editor</name>
+    <message>
+        <location filename="../src/m-editor/file-editor.cc" line="+146"/>
+        <location line="+38"/>
+        <location line="+43"/>
+        <location line="+26"/>
+        <source>Octave Editor</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/FileEditorMdiSubWindow.cpp" line="115"/>
-        <source>Cannot read file %1:
+        <location line="-106"/>
+        <source>File %1 is already open in the editor.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+38"/>
+        <source>Could not open file %1 for read:
 %2.</source>
-        <translation>Konnte Datei %1 nicht lesen:
-%2.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/FileEditorMdiSubWindow.cpp" line="127"/>
-        <source>File loaded.</source>
-        <translation>Datei geladen.</translation>
+        <location line="+43"/>
+        <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 filename="../src/FileEditorMdiSubWindow.cpp" line="153"/>
-        <source>Do you want to save the current file
-%1 ?</source>
-        <translation>Möchten Sie die Datei %1 sichern ?</translation>
+        <location line="+26"/>
+        <source>The associated file editor tab has disappeared.  It was likely closed by some means.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/FileEditorMdiSubWindow.cpp" line="208"/>
-        <source>Cannot write file %1:
-%2.</source>
-        <translation>Konnte Datei %1 nicht schreiben:
-%2.</translation>
+        <location line="+141"/>
+        <source>&amp;%1 %2</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/FileEditorMdiSubWindow.cpp" line="220"/>
-        <source>File %1 saved</source>
-        <translation>Datei %1 gesichert</translation>
+        <location line="+130"/>
+        <source>&amp;New File</source>
+        <translation type="unfinished">&amp;Neue Datei</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>&amp;Open File</source>
+        <translation type="unfinished">&amp;Öffne Datei</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>&amp;Save File</source>
+        <translation type="unfinished">&amp;Sichere Datei</translation>
     </message>
     <message>
-        <location filename="../src/FileEditorMdiSubWindow.cpp" line="383"/>
-        <source>&amp;Close File</source>
-        <translation>&amp;Datei schließen</translation>
+        <location line="+4"/>
+        <source>Save File &amp;As</source>
+        <translation type="unfinished">Sichere Datei &amp;als</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>&amp;Undo</source>
+        <translation type="unfinished">&amp;Rückgängig</translation>
     </message>
     <message>
-        <location filename="../src/FileEditorMdiSubWindow.cpp" line="386"/>
-        <source>&amp;New File</source>
-        <translation>&amp;Neue Datei</translation>
+        <location line="+3"/>
+        <source>&amp;Redo</source>
+        <translation type="unfinished">&amp;Wiederholen</translation>
     </message>
     <message>
-        <location filename="../src/FileEditorMdiSubWindow.cpp" line="389"/>
-        <source>&amp;Open File</source>
-        <translation>&amp;Öffne Datei</translation>
+        <location line="+3"/>
+        <source>&amp;Copy</source>
+        <translation type="unfinished">&amp;Kopieren</translation>
     </message>
     <message>
-        <location filename="../src/FileEditorMdiSubWindow.cpp" line="392"/>
-        <source>&amp;Save File</source>
-        <translation>&amp;Sichere Datei</translation>
+        <location line="+3"/>
+        <source>Cu&amp;t</source>
+        <translation type="unfinished">&amp;Ausschneiden</translation>
     </message>
     <message>
-        <location filename="../src/FileEditorMdiSubWindow.cpp" line="395"/>
-        <source>Save File &amp;As</source>
-        <translation>Sichere Datei &amp;als</translation>
+        <location line="+4"/>
+        <source>Paste</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/FileEditorMdiSubWindow.cpp" line="398"/>
-        <source>&amp;Undo</source>
-        <translation>&amp;Rückgängig</translation>
+        <location line="+1"/>
+        <source>&amp;Next Bookmark</source>
+        <translation type="unfinished">&amp;Nächstes Bookmark</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Pre&amp;vious Bookmark</source>
+        <translation type="unfinished">&amp;Voriges Bookmark</translation>
     </message>
     <message>
-        <location filename="../src/FileEditorMdiSubWindow.cpp" line="401"/>
-        <source>&amp;Redo</source>
-        <translation>&amp;Wiederholen</translation>
+        <location line="+1"/>
+        <source>Toggle &amp;Bookmark</source>
+        <translation type="unfinished">&amp;Bookmark setzen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;Remove All Bookmarks</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/FileEditorMdiSubWindow.cpp" line="402"/>
-        <source>&amp;Copy</source>
-        <translation>&amp;Kopieren</translation>
+        <location line="+4"/>
+        <source>&amp;Next breakpoint</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/FileEditorMdiSubWindow.cpp" line="403"/>
-        <source>Cu&amp;t</source>
-        <translation>&amp;Ausschneiden</translation>
+        <location line="+3"/>
+        <source>Pre&amp;vious breakpoint</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/FileEditorMdiSubWindow.cpp" line="404"/>
-        <source>&amp;Paste</source>
-        <translation>&amp;Einfügen</translation>
+        <location line="+3"/>
+        <source>Toggle &amp;breakpoint</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/FileEditorMdiSubWindow.cpp" line="405"/>
-        <source>&amp;Next Bookmark</source>
-        <translation>&amp;Nächstes Bookmark</translation>
+        <location line="+3"/>
+        <source>&amp;Remove All breakpoints</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/FileEditorMdiSubWindow.cpp" line="406"/>
-        <source>Pre&amp;vious Bookmark</source>
-        <translation>&amp;Voriges Bookmark</translation>
+        <location line="+2"/>
+        <source>&amp;Comment Selected Text</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/FileEditorMdiSubWindow.cpp" line="407"/>
-        <source>Toggle &amp;Bookmark</source>
-        <translation>&amp;Bookmark setzen</translation>
+        <location line="+1"/>
+        <source>&amp;Uncomment Selected Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>&amp;Find and Replace</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/FileEditorMdiSubWindow.cpp" line="410"/>
-        <source>&amp;Run File</source>
-        <translation>&amp;Ausführen</translation>
+        <location line="+3"/>
+        <source>Save File And Run</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+51"/>
+        <source>&amp;File</source>
+        <translation type="unfinished">&amp;Datei</translation>
     </message>
     <message>
-        <location filename="../src/FileEditorMdiSubWindow.cpp" line="449"/>
-        <source>&amp;File</source>
-        <translation>&amp;Datei</translation>
+        <location line="+6"/>
+        <source>Open &amp;Recent</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/FileEditorMdiSubWindow.cpp" line="457"/>
+        <location line="+8"/>
         <source>&amp;Edit</source>
-        <translation>&amp;Editieren</translation>
+        <translation type="unfinished">&amp;Editieren</translation>
     </message>
     <message>
-        <location filename="../src/FileEditorMdiSubWindow.cpp" line="469"/>
+        <location line="+19"/>
+        <source>&amp;Debug</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
         <source>&amp;Run</source>
-        <translation>&amp;Ausführen</translation>
+        <translation type="unfinished">&amp;Ausführen</translation>
     </message>
 </context>
 <context>
-    <name>FilesDockWidget</name>
+    <name>file_editor_tab</name>
     <message>
-        <source>Current Folder</source>
-        <translation type="obsolete">Aktuelles Verzeichnis</translation>
+        <location filename="../src/m-editor/file-editor-tab.cc" line="+687"/>
+        <location line="+102"/>
+        <location line="+98"/>
+        <location line="+63"/>
+        <location line="+14"/>
+        <source>Octave Editor</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/FilesDockWidget.cpp" line="32"/>
-        <source>Current Directory</source>
-        <translation>Aktuelles Verzeichnis</translation>
+        <location line="-276"/>
+        <source>The file &apos;%1&apos; has been modified. Do you want to save the changes?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+102"/>
+        <source>Could not open file %1 for write:
+%2.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+98"/>
+        <source>File not saved!  You&apos;ve selected a file name
+
+     %1
+
+which is the same as the current file name.  Use Save to overwrite.  (Could allow overwriting, with message, if that is what folks want.)</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/FilesDockWidget.cpp" line="46"/>
-        <source>Move up one directory.</source>
-        <translation>Ein Verzeichnis höher wechseln.</translation>
+        <location line="+63"/>
+        <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>
     <message>
-        <location filename="../src/FilesDockWidget.cpp" line="49"/>
-        <source>Enter the path or filename.</source>
-        <translation>Geben Sie einen Pfad oder Dateinamen ein.</translation>
+        <location line="+14"/>
+        <source>It seems that &apos;%1&apos; has been deleted or renamed. Do you want to save it now?</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>files_dock_widget</name>
+    <message>
+        <location filename="../src/files-dockwidget.cc" line="+43"/>
+        <source>Current Directory</source>
+        <translation type="unfinished">Aktuelles Verzeichnis</translation>
     </message>
     <message>
-        <location filename="../src/FilesDockWidget.cpp" line="78"/>
+        <location line="+11"/>
+        <source>Move up one directory.</source>
+        <translation type="unfinished">Ein Verzeichnis höher wechseln.</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Enter the path or filename.</source>
+        <translation type="unfinished">Geben Sie einen Pfad oder Dateinamen ein.</translation>
+    </message>
+    <message>
+        <location line="+26"/>
         <source>Doubleclick a file to open it.</source>
-        <translation>Führen Sie einen Doppelklick aus, um eine Datei zu öffnen.</translation>
+        <translation type="unfinished">Führen Sie einen Doppelklick aus, um eine Datei zu öffnen.</translation>
     </message>
 </context>
 <context>
-    <name>HistoryDockWidget</name>
+    <name>find_dialog</name>
+    <message>
+        <location filename="../src/m-editor/find-dialog.cc" line="+58"/>
+        <source>Find &amp;what:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Re&amp;place with:</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
-        <location filename="../src/HistoryDockWidget.cpp" line="36"/>
-        <source>Doubleclick a command to transfer it to the terminal.</source>
-        <translation>Führen Sie einen Doppelklick aus, um den Befehl in das Terminal zu übertragen.</translation>
+        <location line="+4"/>
+        <source>Match &amp;case</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Search from &amp;start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;Wrap while searching</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>&amp;Find Next</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/HistoryDockWidget.cpp" line="38"/>
-        <source>Enter text to filter the command history.</source>
-        <translation>Geben Sie Text ein, um die Befehlshistorie zu filtern.</translation>
+        <location line="+2"/>
+        <source>&amp;Replace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Replace &amp;All</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>&amp;More</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/HistoryDockWidget.cpp" line="41"/>
-        <source>Command History</source>
-        <translation>Befehlshistorie</translation>
+        <location line="+11"/>
+        <source>&amp;Whole words</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>History updated.</source>
-        <translation type="obsolete">Befehlshistorie aktualisiert.</translation>
+        <location line="+1"/>
+        <source>Regular E&amp;xpressions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Search &amp;backward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Search se&amp;lection</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>LexerOctaveGui</name>
+    <name>history_dock_widget</name>
+    <message>
+        <location filename="../src/history-dockwidget.cc" line="+55"/>
+        <source>Doubleclick a command to transfer it to the terminal.</source>
+        <translation type="unfinished">Führen Sie einen Doppelklick aus, um den Befehl in das Terminal zu übertragen.</translation>
+    </message>
     <message>
-        <location filename="../src/lexer/lexeroctavegui.cpp" line="111"/>
-        <source>Default</source>
-        <translation>Standard</translation>
+        <location line="+6"/>
+        <source>Enter text to filter the command history.</source>
+        <translation type="unfinished">Geben Sie Text ein, um die Befehlshistorie zu filtern.</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Command History</source>
+        <translation type="unfinished">Befehlshistorie</translation>
     </message>
     <message>
-        <location filename="../src/lexer/lexeroctavegui.cpp" line="113"/>
-        <source>Comment</source>
-        <translation>Kommentar</translation>
+        <location line="+42"/>
+        <source>Copy</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/lexer/lexeroctavegui.cpp" line="115"/>
-        <source>Command</source>
-        <translation>Befehl</translation>
+        <location line="+1"/>
+        <source>Evaluate</source>
+        <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>lexer_octave_gui</name>
     <message>
-        <location filename="../src/lexer/lexeroctavegui.cpp" line="117"/>
-        <source>Number</source>
-        <translation>Zahl</translation>
+        <location filename="../src/m-editor/lexer-octave-gui.cc" line="+145"/>
+        <source>Default</source>
+        <translation type="unfinished">Standard</translation>
     </message>
     <message>
-        <location filename="../src/lexer/lexeroctavegui.cpp" line="119"/>
-        <source>Keyword</source>
-        <translation>Schlüsselwort</translation>
+        <location line="+2"/>
+        <source>Comment</source>
+        <translation type="unfinished">Kommentar</translation>
     </message>
     <message>
-        <location filename="../src/lexer/lexeroctavegui.cpp" line="121"/>
-        <source>Single-quoted string</source>
-        <translation>Zeichenkette in einfachen Hochkommata</translation>
+        <location line="+2"/>
+        <source>Command</source>
+        <translation type="unfinished">Befehl</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Number</source>
+        <translation type="unfinished">Zahl</translation>
     </message>
     <message>
-        <location filename="../src/lexer/lexeroctavegui.cpp" line="123"/>
-        <source>Operator</source>
-        <translation>Operator</translation>
+        <location line="+2"/>
+        <source>Keyword</source>
+        <translation type="unfinished">Schlüsselwort</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Single-quoted string</source>
+        <translation type="unfinished">Zeichenkette in einfachen Hochkommata</translation>
     </message>
     <message>
-        <location filename="../src/lexer/lexeroctavegui.cpp" line="125"/>
-        <source>Identifier</source>
-        <translation>Bezeichner</translation>
+        <location line="+2"/>
+        <source>Operator</source>
+        <translation type="unfinished">Operator</translation>
     </message>
     <message>
-        <location filename="../src/lexer/lexeroctavegui.cpp" line="127"/>
+        <location line="+2"/>
+        <source>Identifier</source>
+        <translation type="unfinished">Bezeichner</translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>Double-quoted string</source>
-        <translation>Zeichenkette in doppelten Hochkommata</translation>
+        <translation type="unfinished">Zeichenkette in doppelten Hochkommata</translation>
     </message>
 </context>
 <context>
-    <name>MainWindow</name>
+    <name>main_window</name>
+    <message>
+        <location filename="../src/main-window.cc" line="+135"/>
+        <source>Save Workspace</source>
+        <translation type="unfinished">Speichere Arbeitsumgebung</translation>
+    </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="47"/>
-        <source>Opening file.</source>
-        <translation>Öffne Datei.</translation>
+        <location line="+11"/>
+        <source>Load Workspace</source>
+        <translation type="unfinished">Lade Arbeitsumgebung</translation>
+    </message>
+    <message>
+        <location line="+155"/>
+        <source>Set working direcotry</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="124"/>
-        <source>Save Workspace</source>
-        <translation>Speichere Arbeitsumgebung</translation>
+        <location line="+186"/>
+        <location line="+381"/>
+        <source>About Octave</source>
+        <translation type="unfinished">Über Octave</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="134"/>
-        <source>Load Workspace</source>
-        <translation>Lade Arbeitsumgebung</translation>
+        <location line="-290"/>
+        <source>View the variables in the active workspace.</source>
+        <translation type="unfinished">Sehen Sie die Variablen ein, die sich in der aktiven Arbeitsumgebung befinden.</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Browse and search the command history.</source>
+        <translation type="unfinished">Durchsuchen Sie die Befehlshistorie.</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Browse your files.</source>
+        <translation type="unfinished">Durchsuchen Sie Ihre Dateien.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="226"/>
-        <location filename="../src/MainWindow.cpp" line="362"/>
-        <source>About Octave</source>
-        <translation>Über Octave</translation>
+        <location line="+2"/>
+        <source>See the documentation for help.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="238"/>
-        <source>Saving data and shutting down.</source>
-        <translation>Speichere Daten und schließe.</translation>
+        <location line="+39"/>
+        <source>&amp;File</source>
+        <translation type="unfinished">&amp;Datei</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>New</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Script</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="276"/>
-        <source>View the variables in the active workspace.</source>
-        <translation>Sehen Sie die Variablen ein, die sich in der aktiven Arbeitsumgebung befinden.</translation>
+        <location line="+3"/>
+        <source>Function</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Class</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="278"/>
-        <source>Browse and search the command history.</source>
-        <translation>Durchsuchen Sie die Befehlshistorie.</translation>
+        <location line="+2"/>
+        <source>Enumeration</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="280"/>
-        <source>Browse your files.</source>
-        <translation>Durchsuchen Sie Ihre Dateien.</translation>
+        <location line="+2"/>
+        <source>Figure</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Variable</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="294"/>
-        <source>Terminal</source>
-        <translation>Terminal</translation>
+        <location line="+2"/>
+        <source>Model</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>GUI</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Open...</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="298"/>
-        <source>Enter your commands into the Octave terminal.</source>
-        <translation>Geben Sie Ihre Befehle in das Octave Terminal ein.</translation>
+        <location line="+4"/>
+        <source>Close Command Window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Import Data...</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="311"/>
-        <source>Browse the Octave documentation for help.</source>
-        <translation>Durchsuchen Sie die Octave Dokumentation, um Hilfe zu erhalten.</translation>
+        <location line="+4"/>
+        <source>Save Workspace...</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="320"/>
-        <source>Chat</source>
-        <translation>Chat</translation>
+        <location line="+6"/>
+        <source>Preferences...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Page Setup...</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="323"/>
-        <source>Instantly chat with other Octave users for help.</source>
-        <translation>Tauschen Sie sich direkt mit anderen Octave Benutzern aus, um Hilfe zu erhalten.</translation>
+        <location line="+3"/>
+        <source>Print</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="330"/>
-        <source>Octave</source>
-        <translation>Octave</translation>
+        <location line="+4"/>
+        <source>Print Selection...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Exit</source>
+        <translation type="unfinished">Beenden</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>&amp;Edit</source>
+        <translation type="unfinished">&amp;Editieren</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="331"/>
-        <source>Settings</source>
-        <translation>Einstellungen</translation>
+        <location line="+2"/>
+        <source>Undo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Redo</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="333"/>
-        <source>Exit</source>
-        <translation>Beenden</translation>
+        <location line="+5"/>
+        <source>Cut</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="335"/>
-        <source>Interface</source>
-        <translation>Oberfläche</translation>
+        <location line="+4"/>
+        <source>Copy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Paste</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="337"/>
-        <source>Align Windows</source>
-        <translation>Fenster ausrichten</translation>
+        <location line="+4"/>
+        <source>Paste To Workspace...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Select All</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="339"/>
-        <location filename="../src/MainWindow.cpp" line="351"/>
-        <source>Workspace</source>
-        <translation>Arbeitsumgebung</translation>
+        <location line="+6"/>
+        <source>Find...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Find Files...</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="342"/>
-        <source>History</source>
-        <translation>Befehlshistorie</translation>
+        <location line="+7"/>
+        <source>Clear Command Window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Clear Command History</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Clear Workspace</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="345"/>
-        <source>File Browser</source>
-        <translation>Dateibrowser</translation>
+        <location line="+2"/>
+        <source>De&amp;bug</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="349"/>
-        <source>Open New Editor Window</source>
-        <translation>Neues Editorfenster öffnen</translation>
+        <location line="+2"/>
+        <source>Step</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Step in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Step out</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="352"/>
-        <source>Load</source>
-        <translation>Laden</translation>
+        <location line="+8"/>
+        <source>Continue</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Exit Debug Mode</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="353"/>
-        <source>Save</source>
-        <translation>Sichern</translation>
+        <location line="+10"/>
+        <source>&amp;Desktop</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="355"/>
-        <source>Clear</source>
-        <translation>Löschen</translation>
+        <location line="+1"/>
+        <source>Load workspace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>&amp;Window</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="357"/>
-        <source>Community</source>
-        <translation>Gemeinschaft</translation>
+        <location line="+2"/>
+        <source>Show Command Window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Show Command History</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Show Current Directory</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="358"/>
-        <source>Report Bug</source>
-        <translation>Fehler melden</translation>
+        <location line="+6"/>
+        <source>Show Workspace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Show Editor</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="359"/>
-        <source>Agora</source>
-        <translation>Agora</translation>
+        <location line="+5"/>
+        <source>Show Documentation</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="360"/>
-        <source>Octave Forge</source>
-        <translation>Octave Forge</translation>
+        <location line="+7"/>
+        <source>Command Window</source>
+        <translation type="unfinished">Konsolenfenster</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Command History</source>
+        <translation type="unfinished">Befehlshistorie</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="363"/>
-        <source>About Qt</source>
-        <translation>Über Qt</translation>
+        <location line="+4"/>
+        <source>Current Directory</source>
+        <translation type="unfinished">Aktuelles Verzeichnis</translation>
     </message>
     <message>
-        <source>Octave Toolbar</source>
-        <translation type="obsolete">Octave Werkzeugleiste</translation>
+        <location line="+4"/>
+        <source>Workspace</source>
+        <translation type="unfinished">Arbeitsumgebung</translation>
     </message>
     <message>
-        <source>Command Window</source>
-        <translation type="obsolete">Konsolenfenster</translation>
+        <location line="+4"/>
+        <source>Editor</source>
+        <translation type="unfinished">Editor</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Documentation</source>
+        <translation type="unfinished">Dokumentation</translation>
     </message>
     <message>
-        <source>File Editor</source>
-        <translation type="obsolete">Dateieditor</translation>
+        <location line="+5"/>
+        <source>Reset Windows</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>&amp;Help</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="307"/>
-        <source>Documentation</source>
-        <translation>Dokumentation</translation>
+        <location line="+2"/>
+        <source>Report Bug</source>
+        <translation type="unfinished">Fehler melden</translation>
     </message>
     <message>
-        <source>Service</source>
-        <translation type="obsolete">Service</translation>
+        <location line="+2"/>
+        <source>Visit Agora</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Established link to Octave.</source>
-        <translation type="obsolete">Verbindung zu Octave hergestellt.</translation>
+        <location line="+2"/>
+        <source>Visit Octave Forge</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Current Directory:</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>NumberBar</name>
+    <name>settings_dialog</name>
     <message>
-        <source>Stop Here</source>
-        <translation type="obsolete">Stoppe hier</translation>
+        <location filename="../src/settings-dialog.ui" line="+29"/>
+        <location filename="../src/ui-settings-dialog.h" line="+461"/>
+        <source>Settings</source>
+        <translation type="unfinished">Einstellungen</translation>
     </message>
     <message>
-        <source>Current Line</source>
-        <translation type="obsolete">Aktuelle Zeile</translation>
+        <location line="+13"/>
+        <location filename="../src/ui-settings-dialog.h" line="+5"/>
+        <source>General</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Error Line</source>
-        <translation type="obsolete">Fehlerzeile</translation>
-    </message>
-</context>
-<context>
-    <name>NumberedCodeEdit</name>
-    <message>
-        <source>This file name is not valid.</source>
-        <translation type="obsolete">Dieser Dateiname ist nicht gültig.</translation>
+        <location line="+18"/>
+        <location filename="../src/ui-settings-dialog.h" line="-4"/>
+        <source>Icon set for dock widget</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Octave doesn&apos;t understand this file name:
-</source>
-        <translation type="obsolete">Octave versteht diesen Dateityp nicht:</translation>
+        <location line="+21"/>
+        <location filename="../src/ui-settings-dialog.h" line="+1"/>
+        <source>Octave logo only</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <location filename="../src/ui-settings-dialog.h" line="+1"/>
+        <source>Letter icons</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <location filename="../src/ui-settings-dialog.h" line="+1"/>
+        <source>Graphic  icons</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>
-Please, change it.
- Do you want to save your changes?</source>
-        <translation type="obsolete">Bitte ändern Sie dies. Möchten Sie Ihre Änderungen sichern?</translation>
+        <location line="+7"/>
+        <location filename="../src/ui-settings-dialog.h" line="+11"/>
+        <source>Editor</source>
+        <translation type="unfinished">Editor</translation>
     </message>
-</context>
-<context>
-    <name>SettingsDialog</name>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="29"/>
-        <source>Settings</source>
-        <translation>Einstellungen</translation>
+        <location line="+10"/>
+        <location line="+147"/>
+        <location filename="../src/ui-settings-dialog.h" line="-9"/>
+        <location line="+10"/>
+        <source>Font</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="39"/>
-        <source>Chat</source>
-        <translation>Char</translation>
+        <location line="-130"/>
+        <location line="+147"/>
+        <location filename="../src/ui-settings-dialog.h" line="-9"/>
+        <location line="+10"/>
+        <source>Font Size</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="47"/>
-        <source>Connect to #octave on startup</source>
-        <translation>Beim Start mit #octave verbinden</translation>
+        <location line="-109"/>
+        <location filename="../src/ui-settings-dialog.h" line="-9"/>
+        <source>Show line numbers</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="57"/>
-        <source>Show message of the day</source>
-        <translation>Nachricht des Tages anzeigen (MOTD)</translation>
+        <location line="+10"/>
+        <location filename="../src/ui-settings-dialog.h" line="+1"/>
+        <source>Highlight current line</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="64"/>
-        <source>Show topic</source>
-        <translation>Thema des Chatkanals anzeigen</translation>
+        <location line="+10"/>
+        <location filename="../src/ui-settings-dialog.h" line="+1"/>
+        <source>Code completion</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="71"/>
-        <source>Automatically identify on NickServ</source>
-        <translation>Automatisch bei NickServ identifizieren</translation>
+        <location line="+10"/>
+        <location filename="../src/ui-settings-dialog.h" line="+1"/>
+        <source>Show complete path in window title</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="78"/>
-        <source>Warning: Your password will be stored in ~/.octavegui in human-readable format. Do not enter your password if you worry about security issues.</source>
-        <translation>Warnung: Ihre Passwort wird unter ~/.octave-gui in einem menschenlesbaren Format gesichert. Hinterlegen Sie nicht Ihr Password, wenn Sie Bedenken über die Sicherheit haben.</translation>
+        <location line="+7"/>
+        <location filename="../src/ui-settings-dialog.h" line="+1"/>
+        <source>Restore tabs from previous session on startup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+27"/>
+        <location filename="../src/ui-settings-dialog.h" line="+1"/>
+        <source>Use custom file editor:</source>
+        <translation type="unfinished">Benutzerdefinierten Editor verwenden:</translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="103"/>
-        <location filename="../src/SettingsDialog.ui" line="311"/>
-        <source>Password:</source>
-        <translation>Passwort:</translation>
+        <location line="+10"/>
+        <location filename="../src/ui-settings-dialog.h" line="+1"/>
+        <source>emacs</source>
+        <translation type="unfinished">emacs</translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="125"/>
-        <source>Editor</source>
-        <translation>Editor</translation>
+        <location line="+10"/>
+        <location filename="../src/ui-settings-dialog.h" line="+6"/>
+        <source>Terminal</source>
+        <translation type="unfinished">Terminal</translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="133"/>
-        <source>Use custom file editor:</source>
-        <translation>Benutzerdefinierten Editor verwenden:</translation>
+        <location line="+62"/>
+        <location filename="../src/ui-settings-dialog.h" line="-2"/>
+        <source>Cursor type:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="143"/>
-        <source>emacs</source>
-        <translation>emacs</translation>
+        <location line="+27"/>
+        <location filename="../src/ui-settings-dialog.h" line="+1"/>
+        <source>Cursor blinking</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="166"/>
+        <location line="+36"/>
+        <location filename="../src/ui-settings-dialog.h" line="+8"/>
         <source>File Browser</source>
-        <translation>Dateibrowser</translation>
+        <translation type="unfinished">Dateibrowser</translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="172"/>
+        <location line="+6"/>
+        <location filename="../src/ui-settings-dialog.h" line="-6"/>
         <source>Show filenames</source>
-        <translation>Dateinamen anzeigen</translation>
+        <translation type="unfinished">Dateinamen anzeigen</translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="179"/>
+        <location line="+7"/>
+        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Show file size</source>
-        <translation>Dateigröße anzeigen</translation>
+        <translation type="unfinished">Dateigröße anzeigen</translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="186"/>
+        <location line="+7"/>
+        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Show file type</source>
-        <translation>Dateityp anzeigen</translation>
+        <translation type="unfinished">Dateityp anzeigen</translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="193"/>
+        <location line="+7"/>
+        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Show date of last modification</source>
-        <translation>Datum der letzten Änderung anzeigen</translation>
+        <translation type="unfinished">Datum der letzten Änderung anzeigen</translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="200"/>
+        <location line="+7"/>
+        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Show hidden files</source>
-        <translation>Versteckte Dateien anzeigen</translation>
+        <translation type="unfinished">Versteckte Dateien anzeigen</translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="207"/>
+        <location line="+7"/>
+        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Alternating row colors</source>
-        <translation>Alternierende Farben verwenden</translation>
+        <translation type="unfinished">Alternierende Farben verwenden</translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="215"/>
+        <location line="+21"/>
+        <location filename="../src/ui-settings-dialog.h" line="+13"/>
         <source>Network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="221"/>
+        <location line="+6"/>
+        <location filename="../src/ui-settings-dialog.h" line="-11"/>
         <source>Use proxy server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="233"/>
+        <location line="+12"/>
+        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Proxy Type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="244"/>
+        <location line="+11"/>
+        <location filename="../src/ui-settings-dialog.h" line="+3"/>
         <source>HttpProxy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="249"/>
+        <location line="+5"/>
+        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Socks5Proxy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="260"/>
+        <location line="+11"/>
+        <location filename="../src/ui-settings-dialog.h" line="+2"/>
         <source>Hostname:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="277"/>
+        <location line="+17"/>
+        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Port:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="294"/>
+        <location line="+17"/>
+        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Username:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="339"/>
-        <source>Reset to defaults</source>
-        <translation>Standardeinstellungen wiederherstellen</translation>
+        <location line="+17"/>
+        <location filename="../src/ui-settings-dialog.h" line="+1"/>
+        <source>Password:</source>
+        <translation type="unfinished">Passwort:</translation>
+    </message>
+</context>
+<context>
+    <name>terminal_dock_widget</name>
+    <message>
+        <location filename="../src/terminal-dockwidget.cc" line="+34"/>
+        <source>Command Window</source>
+        <translation type="unfinished">Konsolenfenster</translation>
+    </message>
+</context>
+<context>
+    <name>webinfo</name>
+    <message>
+        <location filename="../src/qtinfo/webinfo.cc" line="+74"/>
+        <source>Type here and press &apos;Return&apos; to search</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="362"/>
-        <source>Export</source>
-        <translation>Exportieren</translation>
-    </message>
-    <message>
-        <location filename="../src/SettingsDialog.ui" line="372"/>
-        <source>Import</source>
-        <translation>Importieren</translation>
+        <location line="+4"/>
+        <source>Global search</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>VariablesDockWidget</name>
+    <name>welcome_wizard</name>
     <message>
-        <location filename="../src/VariablesDockWidget.cpp" line="40"/>
-        <source>Name</source>
-        <translation>Bezeichner</translation>
+        <location filename="../src/welcome-wizard.ui" line="+26"/>
+        <location filename="../src/ui-welcome-wizard.h" line="+286"/>
+        <source>Welcome to GNU Octave</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/VariablesDockWidget.cpp" line="40"/>
-        <source>Type</source>
-        <translation>Typ</translation>
+        <location line="+13"/>
+        <location filename="../src/ui-welcome-wizard.h" line="+1"/>
+        <source>It appears that you have launched Octave GUI for the first time on this computer, since no configuration file could be found at &apos;~/.octave-gui&apos;. This wizard will guide you through the essential settings you should make before you can start using Octave GUI. If you want to transfer your settings you have previously made just close this dialog and copy over the settings file to your home folder. The presence of that file will automatically be detected and will skip this wizard. IMPORTANT: This wizard is not fully functional yet. Just click your way to the end and it will create a standard settings file.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/VariablesDockWidget.cpp" line="40"/>
-        <source>Value</source>
-        <translation>Wert</translation>
+        <location line="+41"/>
+        <location line="+50"/>
+        <location line="+52"/>
+        <location line="+52"/>
+        <location filename="../src/ui-welcome-wizard.h" line="+1"/>
+        <location line="+2"/>
+        <location line="+2"/>
+        <location line="+2"/>
+        <source>Next</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/VariablesDockWidget.cpp" line="36"/>
-        <source>Workspace</source>
-        <translation>Arbeitsumgebung</translation>
+        <location line="-124"/>
+        <location line="+52"/>
+        <location line="+52"/>
+        <location line="+87"/>
+        <location filename="../src/ui-welcome-wizard.h" line="-5"/>
+        <location line="+2"/>
+        <location line="+2"/>
+        <location line="+5"/>
+        <source>Previous</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Save</source>
-        <translation type="obsolete">Sichern</translation>
+        <location line="-45"/>
+        <location filename="../src/ui-welcome-wizard.h" line="-3"/>
+        <source>Welcome to Octave!</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Load</source>
-        <translation type="obsolete">Laden</translation>
+        <location line="+7"/>
+        <location filename="../src/ui-welcome-wizard.h" line="+1"/>
+        <source>This is the development version of Octave with the first official GUI.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Clear</source>
-        <translation type="obsolete">Löschen</translation>
-    </message>
-    <message>
-        <location filename="../src/VariablesDockWidget.cpp" line="52"/>
-        <source>Local</source>
-        <translation>Lokal</translation>
+        <location line="+10"/>
+        <location filename="../src/ui-welcome-wizard.h" line="+1"/>
+        <source>You seem to run Octave GUI for the first time on this computer. This assistant will help you to configure this software installation. Click &apos;Finish&apos; to write a configuration file and launch Octave GUI.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/VariablesDockWidget.cpp" line="56"/>
-        <source>Global</source>
-        <translation>Global</translation>
+        <location line="+48"/>
+        <location filename="../src/ui-welcome-wizard.h" line="+2"/>
+        <source>Finish</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>workspace_model</name>
+    <message>
+        <location filename="../src/workspace-model.cc" line="+42"/>
+        <source>Name</source>
+        <translation type="unfinished">Bezeichner</translation>
     </message>
     <message>
-        <location filename="../src/VariablesDockWidget.cpp" line="60"/>
-        <source>Persistent</source>
-        <translation>Persistent</translation>
+        <location line="+0"/>
+        <source>Class</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Dimension</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/VariablesDockWidget.cpp" line="64"/>
-        <source>Hidden</source>
-        <translation>Versteckt</translation>
+        <location line="+0"/>
+        <source>Value</source>
+        <translation type="unfinished">Wert</translation>
+    </message>
+</context>
+<context>
+    <name>workspace_view</name>
+    <message>
+        <location filename="../src/workspace-view.cc" line="+39"/>
+        <source>Workspace</source>
+        <translation type="unfinished">Arbeitsumgebung</translation>
     </message>
 </context>
 </TS>
deleted file mode 100644
index 7fbf74ee61166c382a369dbfe80f7d2796451295..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..f9805860aa6acb5f9432c6b05b899e4ad66f32d7
GIT binary patch
literal 5409
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
Y!V0oYK2J|ACxFXn?YVpLZXlQYFZTnRt^fc4
rename from libgui/languages/es-es.ts
rename to libgui/languages/es_ES.ts
--- a/libgui/languages/es-es.ts
+++ b/libgui/languages/es_ES.ts
@@ -2,575 +2,1065 @@
 <!DOCTYPE TS>
 <TS version="2.0" language="es_MX">
 <context>
-    <name>FileEditorMdiSubWindow</name>
-    <message>
-        <location filename="../src/FileEditorMdiSubWindow.cpp" line="114"/>
-        <location filename="../src/FileEditorMdiSubWindow.cpp" line="207"/>
-        <source>File Editor</source>
-        <translation>Editor de archivos</translation>
-    </message>
+    <name>documentation_dock_widget</name>
     <message>
-        <location filename="../src/FileEditorMdiSubWindow.cpp" line="115"/>
-        <source>Cannot read file %1:
-%2.</source>
-        <translation>No se puede leer archivo %1:
-%2.</translation>
+        <location filename="../src/documentation-dockwidget.cc" line="+34"/>
+        <source>Documentation</source>
+        <translation type="unfinished">Documentación</translation>
     </message>
+</context>
+<context>
+    <name>file_editor</name>
     <message>
-        <location filename="../src/FileEditorMdiSubWindow.cpp" line="127"/>
-        <source>File loaded.</source>
-        <translation>Archivo cargado.</translation>
+        <location filename="../src/m-editor/file-editor.cc" line="+146"/>
+        <location line="+38"/>
+        <location line="+43"/>
+        <location line="+26"/>
+        <source>Octave Editor</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/FileEditorMdiSubWindow.cpp" line="153"/>
-        <source>Do you want to save the current file
-%1 ?</source>
-        <translation>¿Desea guardar archivo actual
-%1 ?</translation>
+        <location line="-106"/>
+        <source>File %1 is already open in the editor.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+38"/>
+        <source>Could not open file %1 for read:
+%2.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/FileEditorMdiSubWindow.cpp" line="208"/>
-        <source>Cannot write file %1:
-%2.</source>
-        <translation>No se puede escribir archivo %1:
-%2.</translation>
+        <location line="+43"/>
+        <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 filename="../src/FileEditorMdiSubWindow.cpp" line="220"/>
-        <source>File %1 saved</source>
-        <translation>Archivo %1 guardado</translation>
+        <location line="+26"/>
+        <source>The associated file editor tab has disappeared.  It was likely closed by some means.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/FileEditorMdiSubWindow.cpp" line="383"/>
-        <source>&amp;Close File</source>
-        <translation>&amp;Cerrar archivo</translation>
+        <location line="+141"/>
+        <source>&amp;%1 %2</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/FileEditorMdiSubWindow.cpp" line="386"/>
+        <location line="+130"/>
         <source>&amp;New File</source>
-        <translation>Archivo &amp;nuevo</translation>
-    </message>
-    <message>
-        <location filename="../src/FileEditorMdiSubWindow.cpp" line="389"/>
-        <source>&amp;Open File</source>
-        <translation>&amp;Abrir archivo</translation>
+        <translation type="unfinished">Archivo &amp;nuevo</translation>
     </message>
     <message>
-        <location filename="../src/FileEditorMdiSubWindow.cpp" line="392"/>
-        <source>&amp;Save File</source>
-        <translation>&amp;Guardar archivo</translation>
+        <location line="+3"/>
+        <source>&amp;Open File</source>
+        <translation type="unfinished">&amp;Abrir archivo</translation>
     </message>
     <message>
-        <location filename="../src/FileEditorMdiSubWindow.cpp" line="395"/>
+        <location line="+3"/>
+        <source>&amp;Save File</source>
+        <translation type="unfinished">&amp;Guardar archivo</translation>
+    </message>
+    <message>
+        <location line="+4"/>
         <source>Save File &amp;As</source>
-        <translatorcomment>Search for proper shortcut for this command</translatorcomment>
-        <translation>Guardar archivo &amp;como</translation>
+        <translation type="unfinished">Guardar archivo &amp;como</translation>
     </message>
     <message>
-        <location filename="../src/FileEditorMdiSubWindow.cpp" line="398"/>
+        <location line="+3"/>
         <source>&amp;Undo</source>
-        <translation>&amp;Deshacer</translation>
+        <translation type="unfinished">&amp;Deshacer</translation>
     </message>
     <message>
-        <location filename="../src/FileEditorMdiSubWindow.cpp" line="401"/>
+        <location line="+3"/>
         <source>&amp;Redo</source>
-        <translation>&amp;Rehacer</translation>
+        <translation type="unfinished">&amp;Rehacer</translation>
     </message>
     <message>
-        <location filename="../src/FileEditorMdiSubWindow.cpp" line="402"/>
+        <location line="+3"/>
         <source>&amp;Copy</source>
-        <translation>&amp;Copiar</translation>
+        <translation type="unfinished">&amp;Copiar</translation>
     </message>
     <message>
-        <location filename="../src/FileEditorMdiSubWindow.cpp" line="403"/>
+        <location line="+3"/>
         <source>Cu&amp;t</source>
-        <translation>Cor&amp;tar</translation>
+        <translation type="unfinished">Cor&amp;tar</translation>
     </message>
     <message>
-        <location filename="../src/FileEditorMdiSubWindow.cpp" line="404"/>
-        <source>&amp;Paste</source>
-        <translation>&amp;Pegar</translation>
+        <location line="+4"/>
+        <source>Paste</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/FileEditorMdiSubWindow.cpp" line="405"/>
+        <location line="+1"/>
         <source>&amp;Next Bookmark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/FileEditorMdiSubWindow.cpp" line="406"/>
+        <location line="+1"/>
         <source>Pre&amp;vious Bookmark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/FileEditorMdiSubWindow.cpp" line="407"/>
+        <location line="+1"/>
         <source>Toggle &amp;Bookmark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/FileEditorMdiSubWindow.cpp" line="410"/>
-        <source>&amp;Run File</source>
-        <translation>&amp;Ejecutar archivo</translation>
+        <location line="+1"/>
+        <source>&amp;Remove All Bookmarks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>&amp;Next breakpoint</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Pre&amp;vious breakpoint</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Toggle &amp;breakpoint</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>&amp;Remove All breakpoints</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>&amp;Comment Selected Text</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/FileEditorMdiSubWindow.cpp" line="449"/>
-        <source>&amp;File</source>
-        <translation>&amp;Archivo</translation>
+        <location line="+1"/>
+        <source>&amp;Uncomment Selected Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>&amp;Find and Replace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Save File And Run</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/FileEditorMdiSubWindow.cpp" line="457"/>
-        <source>&amp;Edit</source>
-        <translation>&amp;Editar</translation>
+        <location line="+51"/>
+        <source>&amp;File</source>
+        <translation type="unfinished">&amp;Archivo</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Open &amp;Recent</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/FileEditorMdiSubWindow.cpp" line="469"/>
+        <location line="+8"/>
+        <source>&amp;Edit</source>
+        <translation type="unfinished">&amp;Editar</translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>&amp;Debug</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
         <source>&amp;Run</source>
-        <translation>&amp;Ejecutar</translation>
+        <translation type="unfinished">&amp;Ejecutar</translation>
     </message>
 </context>
 <context>
-    <name>FilesDockWidget</name>
+    <name>file_editor_tab</name>
     <message>
-        <source>Current Folder</source>
-        <translation type="obsolete">Carpeta actual</translation>
+        <location filename="../src/m-editor/file-editor-tab.cc" line="+687"/>
+        <location line="+102"/>
+        <location line="+98"/>
+        <location line="+63"/>
+        <location line="+14"/>
+        <source>Octave Editor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-276"/>
+        <source>The file &apos;%1&apos; has been modified. Do you want to save the changes?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+102"/>
+        <source>Could not open file %1 for write:
+%2.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/FilesDockWidget.cpp" line="32"/>
+        <location line="+98"/>
+        <source>File not saved!  You&apos;ve selected a file name
+
+     %1
+
+which is the same as the current file name.  Use Save to overwrite.  (Could allow overwriting, with message, if that is what folks want.)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+63"/>
+        <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>
+    <message>
+        <location line="+14"/>
+        <source>It seems that &apos;%1&apos; has been deleted or renamed. Do you want to save it now?</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>files_dock_widget</name>
+    <message>
+        <location filename="../src/files-dockwidget.cc" line="+43"/>
         <source>Current Directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/FilesDockWidget.cpp" line="46"/>
+        <location line="+11"/>
         <source>Move up one directory.</source>
-        <translation>Subir un directorio.</translation>
-    </message>
-    <message>
-        <location filename="../src/FilesDockWidget.cpp" line="49"/>
-        <source>Enter the path or filename.</source>
-        <translation>Introduzca dirección o nombre de archivo.</translation>
+        <translation type="unfinished">Subir un directorio.</translation>
     </message>
     <message>
-        <location filename="../src/FilesDockWidget.cpp" line="78"/>
-        <source>Doubleclick a file to open it.</source>
-        <translation>Haga doble clic para abir archivo.</translation>
-    </message>
-</context>
-<context>
-    <name>HistoryDockWidget</name>
-    <message>
-        <location filename="../src/HistoryDockWidget.cpp" line="36"/>
-        <source>Doubleclick a command to transfer it to the terminal.</source>
-        <translation>Haga doble clic para transferir el comando a la terminal.</translation>
+        <location line="+4"/>
+        <source>Enter the path or filename.</source>
+        <translation type="unfinished">Introduzca dirección o nombre de archivo.</translation>
     </message>
     <message>
-        <location filename="../src/HistoryDockWidget.cpp" line="38"/>
-        <source>Enter text to filter the command history.</source>
-        <translation>Introduzca texto para filtrar el historial de comandos.</translation>
-    </message>
-    <message>
-        <location filename="../src/HistoryDockWidget.cpp" line="41"/>
-        <source>Command History</source>
-        <translation>Historial de comandos</translation>
+        <location line="+26"/>
+        <source>Doubleclick a file to open it.</source>
+        <translation type="unfinished">Haga doble clic para abir archivo.</translation>
     </message>
 </context>
 <context>
-    <name>LexerOctaveGui</name>
+    <name>find_dialog</name>
+    <message>
+        <location filename="../src/m-editor/find-dialog.cc" line="+58"/>
+        <source>Find &amp;what:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Re&amp;place with:</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
-        <location filename="../src/lexer/lexeroctavegui.cpp" line="111"/>
-        <source>Default</source>
-        <translation>Valores predeterminados</translation>
+        <location line="+4"/>
+        <source>Match &amp;case</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Search from &amp;start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;Wrap while searching</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/lexer/lexeroctavegui.cpp" line="113"/>
-        <source>Comment</source>
-        <translation>Comentario</translation>
+        <location line="+2"/>
+        <source>&amp;Find Next</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>&amp;Replace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Replace &amp;All</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/lexer/lexeroctavegui.cpp" line="115"/>
-        <source>Command</source>
-        <translation>Comando</translation>
+        <location line="+2"/>
+        <source>&amp;More</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/lexer/lexeroctavegui.cpp" line="117"/>
-        <source>Number</source>
-        <translation>Número</translation>
+        <location line="+11"/>
+        <source>&amp;Whole words</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Regular E&amp;xpressions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Search &amp;backward</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/lexer/lexeroctavegui.cpp" line="119"/>
-        <source>Keyword</source>
-        <translation>Contraseña</translation>
+        <location line="+1"/>
+        <source>Search se&amp;lection</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>history_dock_widget</name>
+    <message>
+        <location filename="../src/history-dockwidget.cc" line="+55"/>
+        <source>Doubleclick a command to transfer it to the terminal.</source>
+        <translation type="unfinished">Haga doble clic para transferir el comando a la terminal.</translation>
     </message>
     <message>
-        <location filename="../src/lexer/lexeroctavegui.cpp" line="121"/>
-        <source>Single-quoted string</source>
-        <translation>Cadena entre comillas simples</translation>
+        <location line="+6"/>
+        <source>Enter text to filter the command history.</source>
+        <translation type="unfinished">Introduzca texto para filtrar el historial de comandos.</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Command History</source>
+        <translation type="unfinished">Historial de comandos</translation>
+    </message>
+    <message>
+        <location line="+42"/>
+        <source>Copy</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/lexer/lexeroctavegui.cpp" line="123"/>
-        <source>Operator</source>
-        <translation>Operador</translation>
+        <location line="+1"/>
+        <source>Evaluate</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>lexer_octave_gui</name>
+    <message>
+        <location filename="../src/m-editor/lexer-octave-gui.cc" line="+145"/>
+        <source>Default</source>
+        <translation type="unfinished">Valores predeterminados</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Comment</source>
+        <translation type="unfinished">Comentario</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Command</source>
+        <translation type="unfinished">Comando</translation>
     </message>
     <message>
-        <location filename="../src/lexer/lexeroctavegui.cpp" line="125"/>
-        <source>Identifier</source>
-        <translation>Identificador</translation>
+        <location line="+2"/>
+        <source>Number</source>
+        <translation type="unfinished">Número</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Keyword</source>
+        <translation type="unfinished">Contraseña</translation>
     </message>
     <message>
-        <location filename="../src/lexer/lexeroctavegui.cpp" line="127"/>
+        <location line="+2"/>
+        <source>Single-quoted string</source>
+        <translation type="unfinished">Cadena entre comillas simples</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Operator</source>
+        <translation type="unfinished">Operador</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Identifier</source>
+        <translation type="unfinished">Identificador</translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>Double-quoted string</source>
-        <translation>Cadena entre comillas dobles</translation>
+        <translation type="unfinished">Cadena entre comillas dobles</translation>
     </message>
 </context>
 <context>
-    <name>MainWindow</name>
+    <name>main_window</name>
+    <message>
+        <location filename="../src/main-window.cc" line="+135"/>
+        <source>Save Workspace</source>
+        <translation type="unfinished">Guardar espacio de trabajo</translation>
+    </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="47"/>
-        <source>Opening file.</source>
-        <translation>Abriendo archivo.</translation>
+        <location line="+11"/>
+        <source>Load Workspace</source>
+        <translation type="unfinished">Cargar espacio de trabajo</translation>
+    </message>
+    <message>
+        <location line="+155"/>
+        <source>Set working direcotry</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="124"/>
-        <source>Save Workspace</source>
-        <translation>Guardar espacio de trabajo</translation>
+        <location line="+186"/>
+        <location line="+381"/>
+        <source>About Octave</source>
+        <translation type="unfinished">Acerca de Octave</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="134"/>
-        <source>Load Workspace</source>
-        <translation>Cargar espacio de trabajo</translation>
+        <location line="-290"/>
+        <source>View the variables in the active workspace.</source>
+        <translation type="unfinished">Ver variables en el espacio de trabajo activo.</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Browse and search the command history.</source>
+        <translation type="unfinished">Navegar y buscar en el historial de comandos.</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Browse your files.</source>
+        <translation type="unfinished">Explorar sus archivos.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="226"/>
-        <location filename="../src/MainWindow.cpp" line="362"/>
-        <source>About Octave</source>
-        <translation>Acerca de Octave</translation>
+        <location line="+2"/>
+        <source>See the documentation for help.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+39"/>
+        <source>&amp;File</source>
+        <translation type="unfinished">&amp;Archivo</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>New</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Script</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="238"/>
-        <source>Saving data and shutting down.</source>
-        <translation>Guardando datos y cerrando el sistema.</translation>
+        <location line="+3"/>
+        <source>Function</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Class</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="276"/>
-        <source>View the variables in the active workspace.</source>
-        <translation>Ver variables en el espacio de trabajo activo.</translation>
+        <location line="+2"/>
+        <source>Enumeration</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="278"/>
-        <source>Browse and search the command history.</source>
-        <translation>Navegar y buscar en el historial de comandos.</translation>
+        <location line="+2"/>
+        <source>Figure</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Variable</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="280"/>
-        <source>Browse your files.</source>
-        <translation>Explorar sus archivos.</translation>
+        <location line="+2"/>
+        <source>Model</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>GUI</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Open...</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="294"/>
-        <source>Terminal</source>
-        <translation>Terminal</translation>
+        <location line="+4"/>
+        <source>Close Command Window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Import Data...</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="298"/>
-        <source>Enter your commands into the Octave terminal.</source>
-        <translation>Introducir su comando a la terminal de Octave.</translation>
+        <location line="+4"/>
+        <source>Save Workspace...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Preferences...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Page Setup...</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="307"/>
-        <source>Documentation</source>
-        <translation>Documentación</translation>
+        <location line="+3"/>
+        <source>Print</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="311"/>
-        <source>Browse the Octave documentation for help.</source>
-        <translation>Consultar la documentación de Octave para obtener ayuda.</translation>
+        <location line="+4"/>
+        <source>Print Selection...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Exit</source>
+        <translation type="unfinished">Salir</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>&amp;Edit</source>
+        <translation type="unfinished">&amp;Editar</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="320"/>
-        <source>Chat</source>
-        <translation>Chat/conversación instantanea</translation>
+        <location line="+2"/>
+        <source>Undo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Redo</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="323"/>
-        <source>Instantly chat with other Octave users for help.</source>
-        <translation>Coversación instantanea con otros usuarios de octave para obtener ayuda.</translation>
+        <location line="+5"/>
+        <source>Cut</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="330"/>
-        <source>Octave</source>
-        <translation>Octave</translation>
+        <location line="+4"/>
+        <source>Copy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Paste</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="331"/>
-        <source>Settings</source>
-        <translation>Configuración</translation>
+        <location line="+4"/>
+        <source>Paste To Workspace...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Select All</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="333"/>
-        <source>Exit</source>
-        <translation>Salir</translation>
+        <location line="+6"/>
+        <source>Find...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Find Files...</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="335"/>
-        <source>Interface</source>
-        <translation>Interfase</translation>
+        <location line="+7"/>
+        <source>Clear Command Window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Clear Command History</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Clear Workspace</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="337"/>
-        <source>Align Windows</source>
-        <translation>Alinear ventanas</translation>
+        <location line="+2"/>
+        <source>De&amp;bug</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Step</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Step in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Step out</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="339"/>
-        <location filename="../src/MainWindow.cpp" line="351"/>
-        <source>Workspace</source>
-        <translation>Espacio de trabajo</translation>
+        <location line="+8"/>
+        <source>Continue</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Exit Debug Mode</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="342"/>
-        <source>History</source>
-        <translation>Historial</translation>
+        <location line="+10"/>
+        <source>&amp;Desktop</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="345"/>
-        <source>File Browser</source>
-        <translation>Explorador de archivos</translation>
+        <location line="+1"/>
+        <source>Load workspace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>&amp;Window</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="349"/>
-        <source>Open New Editor Window</source>
-        <translation>Abrir nueva ventana de editor</translation>
+        <location line="+2"/>
+        <source>Show Command Window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Show Command History</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Show Current Directory</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="352"/>
-        <source>Load</source>
-        <translation>Cargar</translation>
+        <location line="+6"/>
+        <source>Show Workspace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Show Editor</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="353"/>
-        <source>Save</source>
-        <translation>Guardar</translation>
+        <location line="+5"/>
+        <source>Show Documentation</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="355"/>
-        <source>Clear</source>
-        <translation>Limpiar</translation>
+        <location line="+7"/>
+        <source>Command Window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Command History</source>
+        <translation type="unfinished">Historial de comandos</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="357"/>
-        <source>Community</source>
-        <translation>Comunidad</translation>
+        <location line="+4"/>
+        <source>Current Directory</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="358"/>
-        <source>Report Bug</source>
-        <translation>Reportar error de software/Bug</translation>
+        <location line="+4"/>
+        <source>Workspace</source>
+        <translation type="unfinished">Espacio de trabajo</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Editor</source>
+        <translation type="unfinished">Editor</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Documentation</source>
+        <translation type="unfinished">Documentación</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="359"/>
-        <source>Agora</source>
-        <translation>Ágora</translation>
+        <location line="+5"/>
+        <source>Reset Windows</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>&amp;Help</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="360"/>
-        <source>Octave Forge</source>
-        <translation>Octave Forge</translation>
+        <location line="+2"/>
+        <source>Report Bug</source>
+        <translation type="unfinished">Reportar error de software/Bug</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="363"/>
-        <source>About Qt</source>
-        <translation>Acerca de Qt</translation>
+        <location line="+2"/>
+        <source>Visit Agora</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Visit Octave Forge</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Current Directory:</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>SettingsDialog</name>
+    <name>settings_dialog</name>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="29"/>
+        <location filename="../src/settings-dialog.ui" line="+29"/>
+        <location filename="../src/ui-settings-dialog.h" line="+461"/>
         <source>Settings</source>
-        <translation>Configuración</translation>
+        <translation type="unfinished">Configuración</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <location filename="../src/ui-settings-dialog.h" line="+5"/>
+        <source>General</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="39"/>
-        <source>Chat</source>
-        <translation>Chat/conversación instantanea</translation>
+        <location line="+18"/>
+        <location filename="../src/ui-settings-dialog.h" line="-4"/>
+        <source>Icon set for dock widget</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="47"/>
-        <source>Connect to #octave on startup</source>
-        <translation>Conectar a #octave en el arranque</translation>
+        <location line="+21"/>
+        <location filename="../src/ui-settings-dialog.h" line="+1"/>
+        <source>Octave logo only</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <location filename="../src/ui-settings-dialog.h" line="+1"/>
+        <source>Letter icons</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <location filename="../src/ui-settings-dialog.h" line="+1"/>
+        <source>Graphic  icons</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="57"/>
-        <source>Show message of the day</source>
-        <translation>Mostrar mensaje del día</translation>
+        <location line="+7"/>
+        <location filename="../src/ui-settings-dialog.h" line="+11"/>
+        <source>Editor</source>
+        <translation type="unfinished">Editor</translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="64"/>
-        <source>Show topic</source>
-        <translation>Mostrar tema</translation>
+        <location line="+10"/>
+        <location line="+147"/>
+        <location filename="../src/ui-settings-dialog.h" line="-9"/>
+        <location line="+10"/>
+        <source>Font</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="71"/>
-        <source>Automatically identify on NickServ</source>
-        <translation>Identificar automáticamente el NickServ</translation>
+        <location line="-130"/>
+        <location line="+147"/>
+        <location filename="../src/ui-settings-dialog.h" line="-9"/>
+        <location line="+10"/>
+        <source>Font Size</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="78"/>
-        <source>Warning: Your password will be stored in ~/.octavegui in human-readable format. Do not enter your password if you worry about security issues.</source>
-        <translatorcomment>Advertencia: La contraseña se guarda en ~ / octavegui en formato legible. No introduzca su contraseña en caso de que le preocupen los aspectos de seguridad.</translatorcomment>
-        <translation></translation>
+        <location line="-109"/>
+        <location filename="../src/ui-settings-dialog.h" line="-9"/>
+        <source>Show line numbers</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="103"/>
-        <location filename="../src/SettingsDialog.ui" line="311"/>
-        <source>Password:</source>
-        <translation>Contraseña:</translation>
+        <location line="+10"/>
+        <location filename="../src/ui-settings-dialog.h" line="+1"/>
+        <source>Highlight current line</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <location filename="../src/ui-settings-dialog.h" line="+1"/>
+        <source>Code completion</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="125"/>
-        <source>Editor</source>
-        <translation>Editor</translation>
+        <location line="+10"/>
+        <location filename="../src/ui-settings-dialog.h" line="+1"/>
+        <source>Show complete path in window title</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="133"/>
+        <location line="+7"/>
+        <location filename="../src/ui-settings-dialog.h" line="+1"/>
+        <source>Restore tabs from previous session on startup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+27"/>
+        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Use custom file editor:</source>
-        <translation>Usar editor de archivos personalizados:</translation>
+        <translation type="unfinished">Usar editor de archivos personalizados:</translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="143"/>
+        <location line="+10"/>
+        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>emacs</source>
-        <translation>emacs</translation>
+        <translation type="unfinished">emacs</translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="166"/>
-        <source>File Browser</source>
-        <translation>Explorador de archivos</translation>
+        <location line="+10"/>
+        <location filename="../src/ui-settings-dialog.h" line="+6"/>
+        <source>Terminal</source>
+        <translation type="unfinished">Terminal</translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="172"/>
-        <source>Show filenames</source>
-        <translation>Mostrar nombres de archivos</translation>
+        <location line="+62"/>
+        <location filename="../src/ui-settings-dialog.h" line="-2"/>
+        <source>Cursor type:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+27"/>
+        <location filename="../src/ui-settings-dialog.h" line="+1"/>
+        <source>Cursor blinking</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="179"/>
-        <source>Show file size</source>
-        <translation>Mostrar tamaño de archivo</translation>
+        <location line="+36"/>
+        <location filename="../src/ui-settings-dialog.h" line="+8"/>
+        <source>File Browser</source>
+        <translation type="unfinished">Explorador de archivos</translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="186"/>
-        <source>Show file type</source>
-        <translation>Mostrar tipo de archivo</translation>
+        <location line="+6"/>
+        <location filename="../src/ui-settings-dialog.h" line="-6"/>
+        <source>Show filenames</source>
+        <translation type="unfinished">Mostrar nombres de archivos</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location filename="../src/ui-settings-dialog.h" line="+1"/>
+        <source>Show file size</source>
+        <translation type="unfinished">Mostrar tamaño de archivo</translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="193"/>
+        <location line="+7"/>
+        <location filename="../src/ui-settings-dialog.h" line="+1"/>
+        <source>Show file type</source>
+        <translation type="unfinished">Mostrar tipo de archivo</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Show date of last modification</source>
-        <translation>Mostrar fecha de la última modificación</translation>
+        <translation type="unfinished">Mostrar fecha de la última modificación</translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="200"/>
+        <location line="+7"/>
+        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Show hidden files</source>
-        <translation>Mostrar archivos ocultos</translation>
+        <translation type="unfinished">Mostrar archivos ocultos</translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="207"/>
+        <location line="+7"/>
+        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Alternating row colors</source>
-        <translation>Colores alternos de filas</translation>
+        <translation type="unfinished">Colores alternos de filas</translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="215"/>
+        <location line="+21"/>
+        <location filename="../src/ui-settings-dialog.h" line="+13"/>
         <source>Network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="221"/>
+        <location line="+6"/>
+        <location filename="../src/ui-settings-dialog.h" line="-11"/>
         <source>Use proxy server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="233"/>
+        <location line="+12"/>
+        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Proxy Type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="244"/>
+        <location line="+11"/>
+        <location filename="../src/ui-settings-dialog.h" line="+3"/>
         <source>HttpProxy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="249"/>
+        <location line="+5"/>
+        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Socks5Proxy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="260"/>
+        <location line="+11"/>
+        <location filename="../src/ui-settings-dialog.h" line="+2"/>
         <source>Hostname:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="277"/>
+        <location line="+17"/>
+        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Port:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="294"/>
+        <location line="+17"/>
+        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Username:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="339"/>
-        <source>Reset to defaults</source>
-        <translation>Restaurar los valores predeterminados</translation>
+        <location line="+17"/>
+        <location filename="../src/ui-settings-dialog.h" line="+1"/>
+        <source>Password:</source>
+        <translation type="unfinished">Contraseña:</translation>
+    </message>
+</context>
+<context>
+    <name>terminal_dock_widget</name>
+    <message>
+        <location filename="../src/terminal-dockwidget.cc" line="+34"/>
+        <source>Command Window</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>webinfo</name>
+    <message>
+        <location filename="../src/qtinfo/webinfo.cc" line="+74"/>
+        <source>Type here and press &apos;Return&apos; to search</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="362"/>
-        <source>Export</source>
-        <translation>Exportar</translation>
-    </message>
-    <message>
-        <location filename="../src/SettingsDialog.ui" line="372"/>
-        <source>Import</source>
-        <translation>Importar</translation>
+        <location line="+4"/>
+        <source>Global search</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>VariablesDockWidget</name>
+    <name>welcome_wizard</name>
     <message>
-        <location filename="../src/VariablesDockWidget.cpp" line="36"/>
-        <source>Workspace</source>
-        <translation>Espacio de trabajo</translation>
+        <location filename="../src/welcome-wizard.ui" line="+26"/>
+        <location filename="../src/ui-welcome-wizard.h" line="+286"/>
+        <source>Welcome to GNU Octave</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <location filename="../src/ui-welcome-wizard.h" line="+1"/>
+        <source>It appears that you have launched Octave GUI for the first time on this computer, since no configuration file could be found at &apos;~/.octave-gui&apos;. This wizard will guide you through the essential settings you should make before you can start using Octave GUI. If you want to transfer your settings you have previously made just close this dialog and copy over the settings file to your home folder. The presence of that file will automatically be detected and will skip this wizard. IMPORTANT: This wizard is not fully functional yet. Just click your way to the end and it will create a standard settings file.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/VariablesDockWidget.cpp" line="40"/>
-        <source>Name</source>
-        <translation>Nombre</translation>
+        <location line="+41"/>
+        <location line="+50"/>
+        <location line="+52"/>
+        <location line="+52"/>
+        <location filename="../src/ui-welcome-wizard.h" line="+1"/>
+        <location line="+2"/>
+        <location line="+2"/>
+        <location line="+2"/>
+        <source>Next</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/VariablesDockWidget.cpp" line="40"/>
-        <source>Type</source>
-        <translation>Tipo</translation>
+        <location line="-124"/>
+        <location line="+52"/>
+        <location line="+52"/>
+        <location line="+87"/>
+        <location filename="../src/ui-welcome-wizard.h" line="-5"/>
+        <location line="+2"/>
+        <location line="+2"/>
+        <location line="+5"/>
+        <source>Previous</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-45"/>
+        <location filename="../src/ui-welcome-wizard.h" line="-3"/>
+        <source>Welcome to Octave!</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/VariablesDockWidget.cpp" line="40"/>
-        <source>Value</source>
-        <translation>Valor</translation>
+        <location line="+7"/>
+        <location filename="../src/ui-welcome-wizard.h" line="+1"/>
+        <source>This is the development version of Octave with the first official GUI.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/VariablesDockWidget.cpp" line="52"/>
-        <source>Local</source>
-        <translation>Local</translation>
+        <location line="+10"/>
+        <location filename="../src/ui-welcome-wizard.h" line="+1"/>
+        <source>You seem to run Octave GUI for the first time on this computer. This assistant will help you to configure this software installation. Click &apos;Finish&apos; to write a configuration file and launch Octave GUI.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/VariablesDockWidget.cpp" line="56"/>
-        <source>Global</source>
-        <translation>Global</translation>
+        <location line="+48"/>
+        <location filename="../src/ui-welcome-wizard.h" line="+2"/>
+        <source>Finish</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>workspace_model</name>
+    <message>
+        <location filename="../src/workspace-model.cc" line="+42"/>
+        <source>Name</source>
+        <translation type="unfinished">Nombre</translation>
     </message>
     <message>
-        <location filename="../src/VariablesDockWidget.cpp" line="60"/>
-        <source>Persistent</source>
-        <translation>Persistente</translation>
+        <location line="+0"/>
+        <source>Class</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Dimension</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/VariablesDockWidget.cpp" line="64"/>
-        <source>Hidden</source>
-        <translation>Oculto</translation>
+        <location line="+0"/>
+        <source>Value</source>
+        <translation type="unfinished">Valor</translation>
+    </message>
+</context>
+<context>
+    <name>workspace_view</name>
+    <message>
+        <location filename="../src/workspace-view.cc" line="+39"/>
+        <source>Workspace</source>
+        <translation type="unfinished">Espacio de trabajo</translation>
     </message>
 </context>
 </TS>
--- a/libgui/languages/generic.ts
+++ b/libgui/languages/generic.ts
@@ -2,565 +2,1064 @@
 <!DOCTYPE TS>
 <TS version="2.0">
 <context>
-    <name>FileEditorMdiSubWindow</name>
+    <name>documentation_dock_widget</name>
     <message>
-        <location filename="../src/FileEditorMdiSubWindow.cpp" line="114"/>
-        <location filename="../src/FileEditorMdiSubWindow.cpp" line="207"/>
-        <source>File Editor</source>
+        <location filename="../src/documentation-dockwidget.cc" line="+34"/>
+        <source>Documentation</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>file_editor</name>
+    <message>
+        <location filename="../src/m-editor/file-editor.cc" line="+146"/>
+        <location line="+38"/>
+        <location line="+43"/>
+        <location line="+26"/>
+        <source>Octave Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/FileEditorMdiSubWindow.cpp" line="115"/>
-        <source>Cannot read file %1:
+        <location line="-106"/>
+        <source>File %1 is already open in the editor.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+38"/>
+        <source>Could not open file %1 for read:
 %2.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/FileEditorMdiSubWindow.cpp" line="127"/>
-        <source>File loaded.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/FileEditorMdiSubWindow.cpp" line="153"/>
-        <source>Do you want to save the current file
-%1 ?</source>
+        <location line="+43"/>
+        <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 filename="../src/FileEditorMdiSubWindow.cpp" line="208"/>
-        <source>Cannot write file %1:
-%2.</source>
+        <location line="+26"/>
+        <source>The associated file editor tab has disappeared.  It was likely closed by some means.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/FileEditorMdiSubWindow.cpp" line="220"/>
-        <source>File %1 saved</source>
+        <location line="+141"/>
+        <source>&amp;%1 %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/FileEditorMdiSubWindow.cpp" line="383"/>
-        <source>&amp;Close File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/FileEditorMdiSubWindow.cpp" line="386"/>
+        <location line="+130"/>
         <source>&amp;New File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/FileEditorMdiSubWindow.cpp" line="389"/>
+        <location line="+3"/>
         <source>&amp;Open File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/FileEditorMdiSubWindow.cpp" line="392"/>
+        <location line="+3"/>
         <source>&amp;Save File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/FileEditorMdiSubWindow.cpp" line="395"/>
+        <location line="+4"/>
         <source>Save File &amp;As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/FileEditorMdiSubWindow.cpp" line="398"/>
+        <location line="+3"/>
         <source>&amp;Undo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/FileEditorMdiSubWindow.cpp" line="401"/>
+        <location line="+3"/>
         <source>&amp;Redo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/FileEditorMdiSubWindow.cpp" line="402"/>
+        <location line="+3"/>
         <source>&amp;Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/FileEditorMdiSubWindow.cpp" line="403"/>
+        <location line="+3"/>
         <source>Cu&amp;t</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/FileEditorMdiSubWindow.cpp" line="404"/>
-        <source>&amp;Paste</source>
+        <location line="+4"/>
+        <source>Paste</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/FileEditorMdiSubWindow.cpp" line="405"/>
+        <location line="+1"/>
         <source>&amp;Next Bookmark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/FileEditorMdiSubWindow.cpp" line="406"/>
+        <location line="+1"/>
         <source>Pre&amp;vious Bookmark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/FileEditorMdiSubWindow.cpp" line="407"/>
+        <location line="+1"/>
         <source>Toggle &amp;Bookmark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/FileEditorMdiSubWindow.cpp" line="410"/>
-        <source>&amp;Run File</source>
+        <location line="+1"/>
+        <source>&amp;Remove All Bookmarks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>&amp;Next breakpoint</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Pre&amp;vious breakpoint</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Toggle &amp;breakpoint</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/FileEditorMdiSubWindow.cpp" line="449"/>
+        <location line="+3"/>
+        <source>&amp;Remove All breakpoints</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>&amp;Comment Selected Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;Uncomment Selected Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>&amp;Find and Replace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Save File And Run</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+51"/>
         <source>&amp;File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/FileEditorMdiSubWindow.cpp" line="457"/>
+        <location line="+6"/>
+        <source>Open &amp;Recent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
         <source>&amp;Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/FileEditorMdiSubWindow.cpp" line="469"/>
+        <location line="+19"/>
+        <source>&amp;Debug</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
         <source>&amp;Run</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>FilesDockWidget</name>
+    <name>file_editor_tab</name>
+    <message>
+        <location filename="../src/m-editor/file-editor-tab.cc" line="+687"/>
+        <location line="+102"/>
+        <location line="+98"/>
+        <location line="+63"/>
+        <location line="+14"/>
+        <source>Octave Editor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-276"/>
+        <source>The file &apos;%1&apos; has been modified. Do you want to save the changes?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+102"/>
+        <source>Could not open file %1 for write:
+%2.</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
-        <location filename="../src/FilesDockWidget.cpp" line="32"/>
+        <location line="+98"/>
+        <source>File not saved!  You&apos;ve selected a file name
+
+     %1
+
+which is the same as the current file name.  Use Save to overwrite.  (Could allow overwriting, with message, if that is what folks want.)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+63"/>
+        <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>
+    <message>
+        <location line="+14"/>
+        <source>It seems that &apos;%1&apos; has been deleted or renamed. Do you want to save it now?</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>files_dock_widget</name>
+    <message>
+        <location filename="../src/files-dockwidget.cc" line="+43"/>
         <source>Current Directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/FilesDockWidget.cpp" line="46"/>
+        <location line="+11"/>
         <source>Move up one directory.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/FilesDockWidget.cpp" line="49"/>
+        <location line="+4"/>
         <source>Enter the path or filename.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/FilesDockWidget.cpp" line="78"/>
+        <location line="+26"/>
         <source>Doubleclick a file to open it.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>HistoryDockWidget</name>
+    <name>find_dialog</name>
+    <message>
+        <location filename="../src/m-editor/find-dialog.cc" line="+58"/>
+        <source>Find &amp;what:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Re&amp;place with:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Match &amp;case</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Search from &amp;start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;Wrap while searching</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>&amp;Find Next</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
-        <location filename="../src/HistoryDockWidget.cpp" line="36"/>
+        <location line="+2"/>
+        <source>&amp;Replace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Replace &amp;All</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>&amp;More</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>&amp;Whole words</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Regular E&amp;xpressions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Search &amp;backward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Search se&amp;lection</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>history_dock_widget</name>
+    <message>
+        <location filename="../src/history-dockwidget.cc" line="+55"/>
         <source>Doubleclick a command to transfer it to the terminal.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/HistoryDockWidget.cpp" line="38"/>
+        <location line="+6"/>
         <source>Enter text to filter the command history.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/HistoryDockWidget.cpp" line="41"/>
+        <location line="+4"/>
         <source>Command History</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+42"/>
+        <source>Copy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Evaluate</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
-    <name>LexerOctaveGui</name>
+    <name>lexer_octave_gui</name>
     <message>
-        <location filename="../src/lexer/lexeroctavegui.cpp" line="111"/>
+        <location filename="../src/m-editor/lexer-octave-gui.cc" line="+145"/>
         <source>Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/lexer/lexeroctavegui.cpp" line="113"/>
+        <location line="+2"/>
         <source>Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/lexer/lexeroctavegui.cpp" line="115"/>
+        <location line="+2"/>
         <source>Command</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/lexer/lexeroctavegui.cpp" line="117"/>
+        <location line="+2"/>
         <source>Number</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/lexer/lexeroctavegui.cpp" line="119"/>
+        <location line="+2"/>
         <source>Keyword</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/lexer/lexeroctavegui.cpp" line="121"/>
+        <location line="+2"/>
         <source>Single-quoted string</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/lexer/lexeroctavegui.cpp" line="123"/>
+        <location line="+2"/>
         <source>Operator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/lexer/lexeroctavegui.cpp" line="125"/>
+        <location line="+2"/>
         <source>Identifier</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/lexer/lexeroctavegui.cpp" line="127"/>
+        <location line="+2"/>
         <source>Double-quoted string</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>MainWindow</name>
+    <name>main_window</name>
     <message>
-        <location filename="../src/MainWindow.cpp" line="47"/>
-        <source>Opening file.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.cpp" line="124"/>
+        <location filename="../src/main-window.cc" line="+135"/>
         <source>Save Workspace</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="134"/>
+        <location line="+11"/>
         <source>Load Workspace</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="226"/>
-        <location filename="../src/MainWindow.cpp" line="362"/>
+        <location line="+155"/>
+        <source>Set working direcotry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+186"/>
+        <location line="+381"/>
         <source>About Octave</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="238"/>
-        <source>Saving data and shutting down.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.cpp" line="276"/>
+        <location line="-290"/>
         <source>View the variables in the active workspace.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="278"/>
+        <location line="+2"/>
         <source>Browse and search the command history.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="280"/>
+        <location line="+2"/>
         <source>Browse your files.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="294"/>
-        <source>Terminal</source>
+        <location line="+2"/>
+        <source>See the documentation for help.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+39"/>
+        <source>&amp;File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>New</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Script</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Function</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Class</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Enumeration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Figure</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Variable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Model</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>GUI</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Open...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Close Command Window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Import Data...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Save Workspace...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Preferences...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Page Setup...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Print</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Print Selection...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Exit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>&amp;Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Undo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Redo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Cut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Copy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Paste</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Paste To Workspace...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="298"/>
-        <source>Enter your commands into the Octave terminal.</source>
+        <location line="+5"/>
+        <source>Select All</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Find...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Find Files...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Clear Command Window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Clear Command History</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Clear Workspace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>De&amp;bug</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Step</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Step in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Step out</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Continue</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Exit Debug Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="307"/>
+        <location line="+10"/>
+        <source>&amp;Desktop</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Load workspace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>&amp;Window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Show Command Window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Show Command History</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Show Current Directory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Show Workspace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Show Editor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Show Documentation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Command Window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Command History</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Current Directory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Workspace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Editor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
         <source>Documentation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="311"/>
-        <source>Browse the Octave documentation for help.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.cpp" line="320"/>
-        <source>Chat</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.cpp" line="323"/>
-        <source>Instantly chat with other Octave users for help.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.cpp" line="330"/>
-        <source>Octave</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.cpp" line="331"/>
-        <source>Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.cpp" line="333"/>
-        <source>Exit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.cpp" line="335"/>
-        <source>Interface</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.cpp" line="337"/>
-        <source>Align Windows</source>
+        <location line="+5"/>
+        <source>Reset Windows</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="339"/>
-        <location filename="../src/MainWindow.cpp" line="351"/>
-        <source>Workspace</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.cpp" line="342"/>
-        <source>History</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.cpp" line="345"/>
-        <source>File Browser</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.cpp" line="349"/>
-        <source>Open New Editor Window</source>
+        <location line="+4"/>
+        <source>&amp;Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="352"/>
-        <source>Load</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.cpp" line="353"/>
-        <source>Save</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.cpp" line="355"/>
-        <source>Clear</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.cpp" line="357"/>
-        <source>Community</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.cpp" line="358"/>
+        <location line="+2"/>
         <source>Report Bug</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="359"/>
-        <source>Agora</source>
+        <location line="+2"/>
+        <source>Visit Agora</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="360"/>
-        <source>Octave Forge</source>
+        <location line="+2"/>
+        <source>Visit Octave Forge</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="363"/>
-        <source>About Qt</source>
+        <location line="+20"/>
+        <source>Current Directory:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>SettingsDialog</name>
+    <name>settings_dialog</name>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="29"/>
+        <location filename="../src/settings-dialog.ui" line="+29"/>
+        <location filename="../src/ui-settings-dialog.h" line="+461"/>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="39"/>
-        <source>Chat</source>
+        <location line="+13"/>
+        <location filename="../src/ui-settings-dialog.h" line="+5"/>
+        <source>General</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="47"/>
-        <source>Connect to #octave on startup</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/SettingsDialog.ui" line="57"/>
-        <source>Show message of the day</source>
+        <location line="+18"/>
+        <location filename="../src/ui-settings-dialog.h" line="-4"/>
+        <source>Icon set for dock widget</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="64"/>
-        <source>Show topic</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/SettingsDialog.ui" line="71"/>
-        <source>Automatically identify on NickServ</source>
+        <location line="+21"/>
+        <location filename="../src/ui-settings-dialog.h" line="+1"/>
+        <source>Octave logo only</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="78"/>
-        <source>Warning: Your password will be stored in ~/.octavegui in human-readable format. Do not enter your password if you worry about security issues.</source>
+        <location line="+16"/>
+        <location filename="../src/ui-settings-dialog.h" line="+1"/>
+        <source>Letter icons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="103"/>
-        <location filename="../src/SettingsDialog.ui" line="311"/>
-        <source>Password:</source>
+        <location line="+13"/>
+        <location filename="../src/ui-settings-dialog.h" line="+1"/>
+        <source>Graphic  icons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="125"/>
+        <location line="+7"/>
+        <location filename="../src/ui-settings-dialog.h" line="+11"/>
         <source>Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="133"/>
+        <location line="+10"/>
+        <location line="+147"/>
+        <location filename="../src/ui-settings-dialog.h" line="-9"/>
+        <location line="+10"/>
+        <source>Font</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-130"/>
+        <location line="+147"/>
+        <location filename="../src/ui-settings-dialog.h" line="-9"/>
+        <location line="+10"/>
+        <source>Font Size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-109"/>
+        <location filename="../src/ui-settings-dialog.h" line="-9"/>
+        <source>Show line numbers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <location filename="../src/ui-settings-dialog.h" line="+1"/>
+        <source>Highlight current line</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <location filename="../src/ui-settings-dialog.h" line="+1"/>
+        <source>Code completion</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <location filename="../src/ui-settings-dialog.h" line="+1"/>
+        <source>Show complete path in window title</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location filename="../src/ui-settings-dialog.h" line="+1"/>
+        <source>Restore tabs from previous session on startup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+27"/>
+        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Use custom file editor:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="143"/>
+        <location line="+10"/>
+        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>emacs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="166"/>
+        <location line="+10"/>
+        <location filename="../src/ui-settings-dialog.h" line="+6"/>
+        <source>Terminal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+62"/>
+        <location filename="../src/ui-settings-dialog.h" line="-2"/>
+        <source>Cursor type:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+27"/>
+        <location filename="../src/ui-settings-dialog.h" line="+1"/>
+        <source>Cursor blinking</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <location filename="../src/ui-settings-dialog.h" line="+8"/>
         <source>File Browser</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="172"/>
+        <location line="+6"/>
+        <location filename="../src/ui-settings-dialog.h" line="-6"/>
         <source>Show filenames</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="179"/>
+        <location line="+7"/>
+        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Show file size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="186"/>
+        <location line="+7"/>
+        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Show file type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="193"/>
+        <location line="+7"/>
+        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Show date of last modification</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="200"/>
+        <location line="+7"/>
+        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Show hidden files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="207"/>
+        <location line="+7"/>
+        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Alternating row colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="215"/>
+        <location line="+21"/>
+        <location filename="../src/ui-settings-dialog.h" line="+13"/>
         <source>Network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="221"/>
+        <location line="+6"/>
+        <location filename="../src/ui-settings-dialog.h" line="-11"/>
         <source>Use proxy server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="233"/>
+        <location line="+12"/>
+        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Proxy Type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="244"/>
+        <location line="+11"/>
+        <location filename="../src/ui-settings-dialog.h" line="+3"/>
         <source>HttpProxy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="249"/>
+        <location line="+5"/>
+        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Socks5Proxy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="260"/>
+        <location line="+11"/>
+        <location filename="../src/ui-settings-dialog.h" line="+2"/>
         <source>Hostname:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="277"/>
+        <location line="+17"/>
+        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Port:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="294"/>
+        <location line="+17"/>
+        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Username:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="339"/>
-        <source>Reset to defaults</source>
+        <location line="+17"/>
+        <location filename="../src/ui-settings-dialog.h" line="+1"/>
+        <source>Password:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>terminal_dock_widget</name>
+    <message>
+        <location filename="../src/terminal-dockwidget.cc" line="+34"/>
+        <source>Command Window</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>webinfo</name>
+    <message>
+        <location filename="../src/qtinfo/webinfo.cc" line="+74"/>
+        <source>Type here and press &apos;Return&apos; to search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="362"/>
-        <source>Export</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/SettingsDialog.ui" line="372"/>
-        <source>Import</source>
+        <location line="+4"/>
+        <source>Global search</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>VariablesDockWidget</name>
+    <name>welcome_wizard</name>
+    <message>
+        <location filename="../src/welcome-wizard.ui" line="+26"/>
+        <location filename="../src/ui-welcome-wizard.h" line="+286"/>
+        <source>Welcome to GNU Octave</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
-        <location filename="../src/VariablesDockWidget.cpp" line="36"/>
-        <source>Workspace</source>
+        <location line="+13"/>
+        <location filename="../src/ui-welcome-wizard.h" line="+1"/>
+        <source>It appears that you have launched Octave GUI for the first time on this computer, since no configuration file could be found at &apos;~/.octave-gui&apos;. This wizard will guide you through the essential settings you should make before you can start using Octave GUI. If you want to transfer your settings you have previously made just close this dialog and copy over the settings file to your home folder. The presence of that file will automatically be detected and will skip this wizard. IMPORTANT: This wizard is not fully functional yet. Just click your way to the end and it will create a standard settings file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+41"/>
+        <location line="+50"/>
+        <location line="+52"/>
+        <location line="+52"/>
+        <location filename="../src/ui-welcome-wizard.h" line="+1"/>
+        <location line="+2"/>
+        <location line="+2"/>
+        <location line="+2"/>
+        <source>Next</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/VariablesDockWidget.cpp" line="40"/>
+        <location line="-124"/>
+        <location line="+52"/>
+        <location line="+52"/>
+        <location line="+87"/>
+        <location filename="../src/ui-welcome-wizard.h" line="-5"/>
+        <location line="+2"/>
+        <location line="+2"/>
+        <location line="+5"/>
+        <source>Previous</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-45"/>
+        <location filename="../src/ui-welcome-wizard.h" line="-3"/>
+        <source>Welcome to Octave!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location filename="../src/ui-welcome-wizard.h" line="+1"/>
+        <source>This is the development version of Octave with the first official GUI.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <location filename="../src/ui-welcome-wizard.h" line="+1"/>
+        <source>You seem to run Octave GUI for the first time on this computer. This assistant will help you to configure this software installation. Click &apos;Finish&apos; to write a configuration file and launch Octave GUI.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+48"/>
+        <location filename="../src/ui-welcome-wizard.h" line="+2"/>
+        <source>Finish</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>workspace_model</name>
+    <message>
+        <location filename="../src/workspace-model.cc" line="+42"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/VariablesDockWidget.cpp" line="40"/>
-        <source>Type</source>
+        <location line="+0"/>
+        <source>Class</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/VariablesDockWidget.cpp" line="40"/>
-        <source>Value</source>
+        <location line="+0"/>
+        <source>Dimension</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/VariablesDockWidget.cpp" line="52"/>
-        <source>Local</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/VariablesDockWidget.cpp" line="56"/>
-        <source>Global</source>
+        <location line="+0"/>
+        <source>Value</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>workspace_view</name>
     <message>
-        <location filename="../src/VariablesDockWidget.cpp" line="60"/>
-        <source>Persistent</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/VariablesDockWidget.cpp" line="64"/>
-        <source>Hidden</source>
+        <location filename="../src/workspace-view.cc" line="+39"/>
+        <source>Workspace</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
deleted file mode 100644
index 83d512baa96d8ad07afa2ef66532922ed0ddcb01..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..204461ebb4eb0630b0bdc0139df5be07b9be8968
GIT binary patch
literal 4862
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
b+1;iSri=X7x>>A)PNIZo?!no-`I)}~T6{Uu
rename from libgui/languages/pt-br.ts
rename to libgui/languages/pt_BR.ts
--- a/libgui/languages/pt-br.ts
+++ b/libgui/languages/pt_BR.ts
@@ -2,570 +2,1065 @@
 <!DOCTYPE TS>
 <TS version="2.0" language="pt_BR" sourcelanguage="en">
 <context>
-    <name>FileEditorMdiSubWindow</name>
+    <name>documentation_dock_widget</name>
     <message>
-        <location filename="../src/FileEditorMdiSubWindow.cpp" line="114"/>
-        <location filename="../src/FileEditorMdiSubWindow.cpp" line="207"/>
-        <source>File Editor</source>
-        <translation>Editor de Arquivos</translation>
+        <location filename="../src/documentation-dockwidget.cc" line="+34"/>
+        <source>Documentation</source>
+        <translation type="unfinished">Documentação</translation>
     </message>
+</context>
+<context>
+    <name>file_editor</name>
     <message>
-        <location filename="../src/FileEditorMdiSubWindow.cpp" line="115"/>
-        <source>Cannot read file %1:
-%2.</source>
-        <translation>Não foi possível ler o arquivo %1: %2.</translation>
+        <location filename="../src/m-editor/file-editor.cc" line="+146"/>
+        <location line="+38"/>
+        <location line="+43"/>
+        <location line="+26"/>
+        <source>Octave Editor</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/FileEditorMdiSubWindow.cpp" line="127"/>
-        <source>File loaded.</source>
-        <translation>Arquivo carregado.</translation>
+        <location line="-106"/>
+        <source>File %1 is already open in the editor.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/FileEditorMdiSubWindow.cpp" line="153"/>
-        <source>Do you want to save the current file
-%1 ?</source>
-        <translation>Você deseja salvar o arquivo atual %1 ?</translation>
+        <location line="+38"/>
+        <source>Could not open file %1 for read:
+%2.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/FileEditorMdiSubWindow.cpp" line="208"/>
-        <source>Cannot write file %1:
-%2.</source>
-        <translation>Não foi possível escrever no arquivo %1: %2.</translation>
-    </message>
-    <message>
-        <location filename="../src/FileEditorMdiSubWindow.cpp" line="220"/>
-        <source>File %1 saved</source>
-        <translation>Arquivo %1 salvo</translation>
+        <location line="+43"/>
+        <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 filename="../src/FileEditorMdiSubWindow.cpp" line="383"/>
-        <source>&amp;Close File</source>
-        <translation>&amp;Fechar Arquivo</translation>
+        <location line="+26"/>
+        <source>The associated file editor tab has disappeared.  It was likely closed by some means.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/FileEditorMdiSubWindow.cpp" line="386"/>
-        <source>&amp;New File</source>
-        <translation>&amp;Novo Arquivo</translation>
+        <location line="+141"/>
+        <source>&amp;%1 %2</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/FileEditorMdiSubWindow.cpp" line="389"/>
+        <location line="+130"/>
+        <source>&amp;New File</source>
+        <translation type="unfinished">&amp;Novo Arquivo</translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source>&amp;Open File</source>
-        <translation>&amp;Abrir Arquivo</translation>
+        <translation type="unfinished">&amp;Abrir Arquivo</translation>
     </message>
     <message>
-        <location filename="../src/FileEditorMdiSubWindow.cpp" line="392"/>
+        <location line="+3"/>
         <source>&amp;Save File</source>
-        <translation>&amp;Salvar Arquivo</translation>
+        <translation type="unfinished">&amp;Salvar Arquivo</translation>
     </message>
     <message>
-        <location filename="../src/FileEditorMdiSubWindow.cpp" line="395"/>
+        <location line="+4"/>
         <source>Save File &amp;As</source>
-        <translation>Salvar Arquivo &amp;Como</translation>
+        <translation type="unfinished">Salvar Arquivo &amp;Como</translation>
     </message>
     <message>
-        <location filename="../src/FileEditorMdiSubWindow.cpp" line="398"/>
+        <location line="+3"/>
         <source>&amp;Undo</source>
-        <translation>&amp;Desfazer</translation>
+        <translation type="unfinished">&amp;Desfazer</translation>
     </message>
     <message>
-        <location filename="../src/FileEditorMdiSubWindow.cpp" line="401"/>
+        <location line="+3"/>
         <source>&amp;Redo</source>
-        <translation>&amp;Refazer</translation>
+        <translation type="unfinished">&amp;Refazer</translation>
     </message>
     <message>
-        <location filename="../src/FileEditorMdiSubWindow.cpp" line="402"/>
+        <location line="+3"/>
         <source>&amp;Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/FileEditorMdiSubWindow.cpp" line="403"/>
+        <location line="+3"/>
         <source>Cu&amp;t</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/FileEditorMdiSubWindow.cpp" line="404"/>
-        <source>&amp;Paste</source>
+        <location line="+4"/>
+        <source>Paste</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/FileEditorMdiSubWindow.cpp" line="405"/>
+        <location line="+1"/>
         <source>&amp;Next Bookmark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/FileEditorMdiSubWindow.cpp" line="406"/>
+        <location line="+1"/>
         <source>Pre&amp;vious Bookmark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/FileEditorMdiSubWindow.cpp" line="407"/>
+        <location line="+1"/>
         <source>Toggle &amp;Bookmark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/FileEditorMdiSubWindow.cpp" line="410"/>
-        <source>&amp;Run File</source>
+        <location line="+1"/>
+        <source>&amp;Remove All Bookmarks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>&amp;Next breakpoint</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Pre&amp;vious breakpoint</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Toggle &amp;breakpoint</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/FileEditorMdiSubWindow.cpp" line="449"/>
+        <location line="+3"/>
+        <source>&amp;Remove All breakpoints</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>&amp;Comment Selected Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;Uncomment Selected Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>&amp;Find and Replace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Save File And Run</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+51"/>
         <source>&amp;File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/FileEditorMdiSubWindow.cpp" line="457"/>
+        <location line="+6"/>
+        <source>Open &amp;Recent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
         <source>&amp;Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/FileEditorMdiSubWindow.cpp" line="469"/>
+        <location line="+19"/>
+        <source>&amp;Debug</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
         <source>&amp;Run</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>FilesDockWidget</name>
+    <name>file_editor_tab</name>
     <message>
-        <source>Current Folder</source>
-        <translation type="obsolete">Diretório Atual</translation>
+        <location filename="../src/m-editor/file-editor-tab.cc" line="+687"/>
+        <location line="+102"/>
+        <location line="+98"/>
+        <location line="+63"/>
+        <location line="+14"/>
+        <source>Octave Editor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-276"/>
+        <source>The file &apos;%1&apos; has been modified. Do you want to save the changes?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+102"/>
+        <source>Could not open file %1 for write:
+%2.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/FilesDockWidget.cpp" line="32"/>
+        <location line="+98"/>
+        <source>File not saved!  You&apos;ve selected a file name
+
+     %1
+
+which is the same as the current file name.  Use Save to overwrite.  (Could allow overwriting, with message, if that is what folks want.)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+63"/>
+        <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>
+    <message>
+        <location line="+14"/>
+        <source>It seems that &apos;%1&apos; has been deleted or renamed. Do you want to save it now?</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>files_dock_widget</name>
+    <message>
+        <location filename="../src/files-dockwidget.cc" line="+43"/>
         <source>Current Directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/FilesDockWidget.cpp" line="46"/>
+        <location line="+11"/>
         <source>Move up one directory.</source>
-        <translation>Subir um diretório.</translation>
-    </message>
-    <message>
-        <location filename="../src/FilesDockWidget.cpp" line="49"/>
-        <source>Enter the path or filename.</source>
-        <translation>Digite o caminho ou o nome do arquivo.</translation>
+        <translation type="unfinished">Subir um diretório.</translation>
     </message>
     <message>
-        <location filename="../src/FilesDockWidget.cpp" line="78"/>
-        <source>Doubleclick a file to open it.</source>
-        <translation>Clique duas vezes num arquivo para abrí-lo.</translation>
-    </message>
-</context>
-<context>
-    <name>HistoryDockWidget</name>
-    <message>
-        <location filename="../src/HistoryDockWidget.cpp" line="36"/>
-        <source>Doubleclick a command to transfer it to the terminal.</source>
-        <translation>Clique duas vezes num comando para transferí-lo ao terminal.</translation>
+        <location line="+4"/>
+        <source>Enter the path or filename.</source>
+        <translation type="unfinished">Digite o caminho ou o nome do arquivo.</translation>
     </message>
     <message>
-        <location filename="../src/HistoryDockWidget.cpp" line="38"/>
-        <source>Enter text to filter the command history.</source>
-        <translation>Digite um texto para filtrar o hitórico de comandos.</translation>
-    </message>
-    <message>
-        <location filename="../src/HistoryDockWidget.cpp" line="41"/>
-        <source>Command History</source>
-        <translation>Histórico de Comandos</translation>
+        <location line="+26"/>
+        <source>Doubleclick a file to open it.</source>
+        <translation type="unfinished">Clique duas vezes num arquivo para abrí-lo.</translation>
     </message>
 </context>
 <context>
-    <name>LexerOctaveGui</name>
+    <name>find_dialog</name>
+    <message>
+        <location filename="../src/m-editor/find-dialog.cc" line="+58"/>
+        <source>Find &amp;what:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Re&amp;place with:</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
-        <location filename="../src/lexer/lexeroctavegui.cpp" line="111"/>
-        <source>Default</source>
-        <translation>Padrão</translation>
+        <location line="+4"/>
+        <source>Match &amp;case</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Search from &amp;start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;Wrap while searching</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/lexer/lexeroctavegui.cpp" line="113"/>
-        <source>Comment</source>
-        <translation>Comentário</translation>
+        <location line="+2"/>
+        <source>&amp;Find Next</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>&amp;Replace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Replace &amp;All</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/lexer/lexeroctavegui.cpp" line="115"/>
-        <source>Command</source>
-        <translation>Comando</translation>
+        <location line="+2"/>
+        <source>&amp;More</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/lexer/lexeroctavegui.cpp" line="117"/>
-        <source>Number</source>
-        <translation>Número</translation>
+        <location line="+11"/>
+        <source>&amp;Whole words</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Regular E&amp;xpressions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Search &amp;backward</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/lexer/lexeroctavegui.cpp" line="119"/>
-        <source>Keyword</source>
-        <translation>Palavra-Chave</translation>
+        <location line="+1"/>
+        <source>Search se&amp;lection</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>history_dock_widget</name>
+    <message>
+        <location filename="../src/history-dockwidget.cc" line="+55"/>
+        <source>Doubleclick a command to transfer it to the terminal.</source>
+        <translation type="unfinished">Clique duas vezes num comando para transferí-lo ao terminal.</translation>
     </message>
     <message>
-        <location filename="../src/lexer/lexeroctavegui.cpp" line="121"/>
-        <source>Single-quoted string</source>
-        <translation>String com aspas simples</translation>
+        <location line="+6"/>
+        <source>Enter text to filter the command history.</source>
+        <translation type="unfinished">Digite um texto para filtrar o hitórico de comandos.</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Command History</source>
+        <translation type="unfinished">Histórico de Comandos</translation>
+    </message>
+    <message>
+        <location line="+42"/>
+        <source>Copy</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/lexer/lexeroctavegui.cpp" line="123"/>
-        <source>Operator</source>
-        <translation>Operador</translation>
+        <location line="+1"/>
+        <source>Evaluate</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>lexer_octave_gui</name>
+    <message>
+        <location filename="../src/m-editor/lexer-octave-gui.cc" line="+145"/>
+        <source>Default</source>
+        <translation type="unfinished">Padrão</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Comment</source>
+        <translation type="unfinished">Comentário</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Command</source>
+        <translation type="unfinished">Comando</translation>
     </message>
     <message>
-        <location filename="../src/lexer/lexeroctavegui.cpp" line="125"/>
-        <source>Identifier</source>
-        <translation>Identificador</translation>
+        <location line="+2"/>
+        <source>Number</source>
+        <translation type="unfinished">Número</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Keyword</source>
+        <translation type="unfinished">Palavra-Chave</translation>
     </message>
     <message>
-        <location filename="../src/lexer/lexeroctavegui.cpp" line="127"/>
+        <location line="+2"/>
+        <source>Single-quoted string</source>
+        <translation type="unfinished">String com aspas simples</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Operator</source>
+        <translation type="unfinished">Operador</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Identifier</source>
+        <translation type="unfinished">Identificador</translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>Double-quoted string</source>
-        <translation>String com aspas duplas</translation>
+        <translation type="unfinished">String com aspas duplas</translation>
     </message>
 </context>
 <context>
-    <name>MainWindow</name>
+    <name>main_window</name>
+    <message>
+        <location filename="../src/main-window.cc" line="+135"/>
+        <source>Save Workspace</source>
+        <translation type="unfinished">Salvar ambiente de trabalho</translation>
+    </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="47"/>
-        <source>Opening file.</source>
-        <translation>Abrindo arquivo.</translation>
+        <location line="+11"/>
+        <source>Load Workspace</source>
+        <translation type="unfinished">Carregar ambiente de trabalho</translation>
+    </message>
+    <message>
+        <location line="+155"/>
+        <source>Set working direcotry</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="124"/>
-        <source>Save Workspace</source>
-        <translation>Salvar ambiente de trabalho</translation>
+        <location line="+186"/>
+        <location line="+381"/>
+        <source>About Octave</source>
+        <translation type="unfinished">Sobre o Octave</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="134"/>
-        <source>Load Workspace</source>
-        <translation>Carregar ambiente de trabalho</translation>
+        <location line="-290"/>
+        <source>View the variables in the active workspace.</source>
+        <translation type="unfinished">Visualizar variáveis no ambiente de trabalho.</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Browse and search the command history.</source>
+        <translation type="unfinished">Pesquise no histórico de comandos.</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Browse your files.</source>
+        <translation type="unfinished">Procure seus arquivos.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="226"/>
-        <location filename="../src/MainWindow.cpp" line="362"/>
-        <source>About Octave</source>
-        <translation>Sobre o Octave</translation>
+        <location line="+2"/>
+        <source>See the documentation for help.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+39"/>
+        <source>&amp;File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>New</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Script</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="238"/>
-        <source>Saving data and shutting down.</source>
-        <translation>Salvando dados e encerrando a sessão.</translation>
+        <location line="+3"/>
+        <source>Function</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Class</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="276"/>
-        <source>View the variables in the active workspace.</source>
-        <translation>Visualizar variáveis no ambiente de trabalho.</translation>
+        <location line="+2"/>
+        <source>Enumeration</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="278"/>
-        <source>Browse and search the command history.</source>
-        <translation>Pesquise no histórico de comandos.</translation>
+        <location line="+2"/>
+        <source>Figure</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Variable</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="280"/>
-        <source>Browse your files.</source>
-        <translation>Procure seus arquivos.</translation>
+        <location line="+2"/>
+        <source>Model</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>GUI</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Open...</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="294"/>
-        <source>Terminal</source>
-        <translation>Terminal</translation>
+        <location line="+4"/>
+        <source>Close Command Window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Import Data...</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="298"/>
-        <source>Enter your commands into the Octave terminal.</source>
-        <translation>Digite seus comandos no terminal do Octave.</translation>
+        <location line="+4"/>
+        <source>Save Workspace...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Preferences...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Page Setup...</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="307"/>
-        <source>Documentation</source>
-        <translation>Documentação</translation>
+        <location line="+3"/>
+        <source>Print</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="311"/>
-        <source>Browse the Octave documentation for help.</source>
-        <translation>Procure na documentação do Octave.</translation>
+        <location line="+4"/>
+        <source>Print Selection...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Exit</source>
+        <translation type="unfinished">Sair</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>&amp;Edit</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="320"/>
-        <source>Chat</source>
-        <translation>Chat</translation>
+        <location line="+2"/>
+        <source>Undo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Redo</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="323"/>
-        <source>Instantly chat with other Octave users for help.</source>
-        <translation>Converse instantaneamente com outros usuários do Octave para pedir ajuda.</translation>
+        <location line="+5"/>
+        <source>Cut</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="330"/>
-        <source>Octave</source>
-        <translation>Octave</translation>
+        <location line="+4"/>
+        <source>Copy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Paste</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="331"/>
-        <source>Settings</source>
-        <translation>Configurações</translation>
+        <location line="+4"/>
+        <source>Paste To Workspace...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Select All</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="333"/>
-        <source>Exit</source>
-        <translation>Sair</translation>
+        <location line="+6"/>
+        <source>Find...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Find Files...</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="335"/>
-        <source>Interface</source>
-        <translation>Interface</translation>
+        <location line="+7"/>
+        <source>Clear Command Window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Clear Command History</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Clear Workspace</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="337"/>
-        <source>Align Windows</source>
-        <translation>Alinhar Janelas</translation>
+        <location line="+2"/>
+        <source>De&amp;bug</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Step</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Step in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Step out</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="339"/>
-        <location filename="../src/MainWindow.cpp" line="351"/>
-        <source>Workspace</source>
-        <translation>Ambiente de trabalho</translation>
+        <location line="+8"/>
+        <source>Continue</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Exit Debug Mode</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="342"/>
-        <source>History</source>
-        <translation>Histórico</translation>
+        <location line="+10"/>
+        <source>&amp;Desktop</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="345"/>
-        <source>File Browser</source>
-        <translation>Navegador de Arquivos</translation>
+        <location line="+1"/>
+        <source>Load workspace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>&amp;Window</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="349"/>
-        <source>Open New Editor Window</source>
-        <translation>Abrir nova janela de edição</translation>
+        <location line="+2"/>
+        <source>Show Command Window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Show Command History</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Show Current Directory</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="352"/>
-        <source>Load</source>
-        <translation>Carregar</translation>
+        <location line="+6"/>
+        <source>Show Workspace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Show Editor</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="353"/>
-        <source>Save</source>
-        <translation>Salvar</translation>
+        <location line="+5"/>
+        <source>Show Documentation</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="355"/>
-        <source>Clear</source>
-        <translation>Limpar</translation>
+        <location line="+7"/>
+        <source>Command Window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Command History</source>
+        <translation type="unfinished">Histórico de Comandos</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="357"/>
-        <source>Community</source>
-        <translation>Comunidade</translation>
+        <location line="+4"/>
+        <source>Current Directory</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="358"/>
-        <source>Report Bug</source>
-        <translation>Reportar Bug</translation>
+        <location line="+4"/>
+        <source>Workspace</source>
+        <translation type="unfinished">Ambiente de trabalho</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Editor</source>
+        <translation type="unfinished">Editor</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Documentation</source>
+        <translation type="unfinished">Documentação</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="359"/>
-        <source>Agora</source>
-        <translation>Agora</translation>
+        <location line="+5"/>
+        <source>Reset Windows</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>&amp;Help</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="360"/>
-        <source>Octave Forge</source>
-        <translation>Octave Forge</translation>
+        <location line="+2"/>
+        <source>Report Bug</source>
+        <translation type="unfinished">Reportar Bug</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="363"/>
-        <source>About Qt</source>
-        <translation>Sobre o Qt</translation>
+        <location line="+2"/>
+        <source>Visit Agora</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Visit Octave Forge</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Current Directory:</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>SettingsDialog</name>
+    <name>settings_dialog</name>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="29"/>
+        <location filename="../src/settings-dialog.ui" line="+29"/>
+        <location filename="../src/ui-settings-dialog.h" line="+461"/>
         <source>Settings</source>
-        <translation>Configurações</translation>
+        <translation type="unfinished">Configurações</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <location filename="../src/ui-settings-dialog.h" line="+5"/>
+        <source>General</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="39"/>
-        <source>Chat</source>
-        <translation>Chat</translation>
+        <location line="+18"/>
+        <location filename="../src/ui-settings-dialog.h" line="-4"/>
+        <source>Icon set for dock widget</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="47"/>
-        <source>Connect to #octave on startup</source>
-        <translation>Conectar ao #octave ao iniciar</translation>
+        <location line="+21"/>
+        <location filename="../src/ui-settings-dialog.h" line="+1"/>
+        <source>Octave logo only</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <location filename="../src/ui-settings-dialog.h" line="+1"/>
+        <source>Letter icons</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <location filename="../src/ui-settings-dialog.h" line="+1"/>
+        <source>Graphic  icons</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="57"/>
-        <source>Show message of the day</source>
-        <translation>Mostrar mensagem do dia</translation>
+        <location line="+7"/>
+        <location filename="../src/ui-settings-dialog.h" line="+11"/>
+        <source>Editor</source>
+        <translation type="unfinished">Editor</translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="64"/>
-        <source>Show topic</source>
-        <translation>Mostrar tópico</translation>
+        <location line="+10"/>
+        <location line="+147"/>
+        <location filename="../src/ui-settings-dialog.h" line="-9"/>
+        <location line="+10"/>
+        <source>Font</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="71"/>
-        <source>Automatically identify on NickServ</source>
-        <translation>Identificar-se automaticamente com o NickServ</translation>
+        <location line="-130"/>
+        <location line="+147"/>
+        <location filename="../src/ui-settings-dialog.h" line="-9"/>
+        <location line="+10"/>
+        <source>Font Size</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="78"/>
-        <source>Warning: Your password will be stored in ~/.octavegui in human-readable format. Do not enter your password if you worry about security issues.</source>
-        <translation>Aviso: Sua senha será salva em ~/.octavegui em um formato legível. Não digite sua senha se você tem problemas com segurança.</translation>
+        <location line="-109"/>
+        <location filename="../src/ui-settings-dialog.h" line="-9"/>
+        <source>Show line numbers</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="103"/>
-        <location filename="../src/SettingsDialog.ui" line="311"/>
-        <source>Password:</source>
-        <translation>Senha:</translation>
+        <location line="+10"/>
+        <location filename="../src/ui-settings-dialog.h" line="+1"/>
+        <source>Highlight current line</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <location filename="../src/ui-settings-dialog.h" line="+1"/>
+        <source>Code completion</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="125"/>
-        <source>Editor</source>
-        <translation>Editor</translation>
+        <location line="+10"/>
+        <location filename="../src/ui-settings-dialog.h" line="+1"/>
+        <source>Show complete path in window title</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="133"/>
+        <location line="+7"/>
+        <location filename="../src/ui-settings-dialog.h" line="+1"/>
+        <source>Restore tabs from previous session on startup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+27"/>
+        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Use custom file editor:</source>
-        <translation>Usar editor de arquivos personalizado:</translation>
+        <translation type="unfinished">Usar editor de arquivos personalizado:</translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="143"/>
+        <location line="+10"/>
+        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>emacs</source>
-        <translation>emacs</translation>
+        <translation type="unfinished">emacs</translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="166"/>
-        <source>File Browser</source>
-        <translation>Navegador de Arquivos</translation>
+        <location line="+10"/>
+        <location filename="../src/ui-settings-dialog.h" line="+6"/>
+        <source>Terminal</source>
+        <translation type="unfinished">Terminal</translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="172"/>
-        <source>Show filenames</source>
-        <translation>Mostrar nomes de arquivo</translation>
+        <location line="+62"/>
+        <location filename="../src/ui-settings-dialog.h" line="-2"/>
+        <source>Cursor type:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+27"/>
+        <location filename="../src/ui-settings-dialog.h" line="+1"/>
+        <source>Cursor blinking</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="179"/>
-        <source>Show file size</source>
-        <translation>Mostrar tamanho do arquivo</translation>
+        <location line="+36"/>
+        <location filename="../src/ui-settings-dialog.h" line="+8"/>
+        <source>File Browser</source>
+        <translation type="unfinished">Navegador de Arquivos</translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="186"/>
-        <source>Show file type</source>
-        <translation>Mostrar tipo do arquivo</translation>
+        <location line="+6"/>
+        <location filename="../src/ui-settings-dialog.h" line="-6"/>
+        <source>Show filenames</source>
+        <translation type="unfinished">Mostrar nomes de arquivo</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location filename="../src/ui-settings-dialog.h" line="+1"/>
+        <source>Show file size</source>
+        <translation type="unfinished">Mostrar tamanho do arquivo</translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="193"/>
+        <location line="+7"/>
+        <location filename="../src/ui-settings-dialog.h" line="+1"/>
+        <source>Show file type</source>
+        <translation type="unfinished">Mostrar tipo do arquivo</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Show date of last modification</source>
-        <translation>Mostrar data de última modificação</translation>
+        <translation type="unfinished">Mostrar data de última modificação</translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="200"/>
+        <location line="+7"/>
+        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Show hidden files</source>
-        <translation>Mostrar arquivos ocultos</translation>
+        <translation type="unfinished">Mostrar arquivos ocultos</translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="207"/>
+        <location line="+7"/>
+        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Alternating row colors</source>
-        <translation>Alternar cores das linhas</translation>
+        <translation type="unfinished">Alternar cores das linhas</translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="215"/>
+        <location line="+21"/>
+        <location filename="../src/ui-settings-dialog.h" line="+13"/>
         <source>Network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="221"/>
+        <location line="+6"/>
+        <location filename="../src/ui-settings-dialog.h" line="-11"/>
         <source>Use proxy server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="233"/>
+        <location line="+12"/>
+        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Proxy Type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="244"/>
+        <location line="+11"/>
+        <location filename="../src/ui-settings-dialog.h" line="+3"/>
         <source>HttpProxy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="249"/>
+        <location line="+5"/>
+        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Socks5Proxy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="260"/>
+        <location line="+11"/>
+        <location filename="../src/ui-settings-dialog.h" line="+2"/>
         <source>Hostname:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="277"/>
+        <location line="+17"/>
+        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Port:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="294"/>
+        <location line="+17"/>
+        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Username:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="339"/>
-        <source>Reset to defaults</source>
-        <translation>Resetar ao padrão</translation>
+        <location line="+17"/>
+        <location filename="../src/ui-settings-dialog.h" line="+1"/>
+        <source>Password:</source>
+        <translation type="unfinished">Senha:</translation>
+    </message>
+</context>
+<context>
+    <name>terminal_dock_widget</name>
+    <message>
+        <location filename="../src/terminal-dockwidget.cc" line="+34"/>
+        <source>Command Window</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>webinfo</name>
+    <message>
+        <location filename="../src/qtinfo/webinfo.cc" line="+74"/>
+        <source>Type here and press &apos;Return&apos; to search</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="362"/>
-        <source>Export</source>
-        <translation>Exportar</translation>
-    </message>
-    <message>
-        <location filename="../src/SettingsDialog.ui" line="372"/>
-        <source>Import</source>
-        <translation>Importar</translation>
+        <location line="+4"/>
+        <source>Global search</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>VariablesDockWidget</name>
+    <name>welcome_wizard</name>
     <message>
-        <location filename="../src/VariablesDockWidget.cpp" line="36"/>
-        <source>Workspace</source>
-        <translation>Ambiente de trabalho</translation>
+        <location filename="../src/welcome-wizard.ui" line="+26"/>
+        <location filename="../src/ui-welcome-wizard.h" line="+286"/>
+        <source>Welcome to GNU Octave</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <location filename="../src/ui-welcome-wizard.h" line="+1"/>
+        <source>It appears that you have launched Octave GUI for the first time on this computer, since no configuration file could be found at &apos;~/.octave-gui&apos;. This wizard will guide you through the essential settings you should make before you can start using Octave GUI. If you want to transfer your settings you have previously made just close this dialog and copy over the settings file to your home folder. The presence of that file will automatically be detected and will skip this wizard. IMPORTANT: This wizard is not fully functional yet. Just click your way to the end and it will create a standard settings file.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/VariablesDockWidget.cpp" line="40"/>
-        <source>Name</source>
-        <translation>Nome</translation>
+        <location line="+41"/>
+        <location line="+50"/>
+        <location line="+52"/>
+        <location line="+52"/>
+        <location filename="../src/ui-welcome-wizard.h" line="+1"/>
+        <location line="+2"/>
+        <location line="+2"/>
+        <location line="+2"/>
+        <source>Next</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/VariablesDockWidget.cpp" line="40"/>
-        <source>Type</source>
-        <translation>Tipo</translation>
+        <location line="-124"/>
+        <location line="+52"/>
+        <location line="+52"/>
+        <location line="+87"/>
+        <location filename="../src/ui-welcome-wizard.h" line="-5"/>
+        <location line="+2"/>
+        <location line="+2"/>
+        <location line="+5"/>
+        <source>Previous</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-45"/>
+        <location filename="../src/ui-welcome-wizard.h" line="-3"/>
+        <source>Welcome to Octave!</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/VariablesDockWidget.cpp" line="40"/>
-        <source>Value</source>
-        <translation>Valor</translation>
+        <location line="+7"/>
+        <location filename="../src/ui-welcome-wizard.h" line="+1"/>
+        <source>This is the development version of Octave with the first official GUI.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/VariablesDockWidget.cpp" line="52"/>
-        <source>Local</source>
-        <translation>Local</translation>
+        <location line="+10"/>
+        <location filename="../src/ui-welcome-wizard.h" line="+1"/>
+        <source>You seem to run Octave GUI for the first time on this computer. This assistant will help you to configure this software installation. Click &apos;Finish&apos; to write a configuration file and launch Octave GUI.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/VariablesDockWidget.cpp" line="56"/>
-        <source>Global</source>
-        <translation>Global</translation>
+        <location line="+48"/>
+        <location filename="../src/ui-welcome-wizard.h" line="+2"/>
+        <source>Finish</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>workspace_model</name>
+    <message>
+        <location filename="../src/workspace-model.cc" line="+42"/>
+        <source>Name</source>
+        <translation type="unfinished">Nome</translation>
     </message>
     <message>
-        <location filename="../src/VariablesDockWidget.cpp" line="60"/>
-        <source>Persistent</source>
-        <translation>Persistente</translation>
+        <location line="+0"/>
+        <source>Class</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Dimension</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/VariablesDockWidget.cpp" line="64"/>
-        <source>Hidden</source>
-        <translation>Oculto</translation>
+        <location line="+0"/>
+        <source>Value</source>
+        <translation type="unfinished">Valor</translation>
+    </message>
+</context>
+<context>
+    <name>workspace_view</name>
+    <message>
+        <location filename="../src/workspace-view.cc" line="+39"/>
+        <source>Workspace</source>
+        <translation type="unfinished">Ambiente de trabalho</translation>
     </message>
 </context>
 </TS>
deleted file mode 100644
index de3a769e3f6ba4f834ed1e7a6066bb9c0e6beeee..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..e4c60b51c6231f4a48b5812f57dace6d635fc28a
GIT binary patch
literal 5746
zc$}?RZERcB89ojtZsIs@l4fn`P<mU6OVTcL+_-U^*p2O^O_wgA4U}oBn%>wq$yIFM
z?B467LE4|OO_M+fi6W3-)3$0wTBY^}AYdI#8?a9m5FbMO{Iwx%6B^qzF%2R1ocCV)
z+K#Uq#(u=d_vF6M`@A3Lec$8JXR|wh`M1X(zP{&{AD#Qo^S@6q=6R1bJ@*2w{E0Ui
zYkGw7S2<(;zq97a2xHssV||y_8Dq1o?;7^m1J>#bv%c4E!}E`=)u*rn_gw|fGwi@i
zSewqVGxt6X`Rgn<bP?+p*f;+@&6wBYx%H**;r$Dq*WQ7?miImHCKSfn-)Q>o2mOo%
zhMTUQ{S|O}`K9p9jNSC6wfgt-Yi;vbuUYHX$C`WlA7HG_Y(5kH31h7%n=eP2fOp0F
z(91sq-q*Z8e-O{DU-$mzg?}>E^|>vV&u#<W{ubXG-^cR@Etj7C7Guo^TYmli9~k4k
zt$oA)g8n~RYqz)cDbL%$OZ#@ca|L`~_hqB7d&|AP>}WUE=Y3Za|6#0Szwd|ln|S`H
zE&PM$fcL1iw*A!ay=MY;eA&Oc278<K`oH?bU!i}+f5G!R=)dZ}@F&>K-t%Ac7{Hlt
z@A>nm80);heYdZOwXgk)mtVpDx7!z9`3mfPtNp34@Zan0@Af^3|NkX$Ch;=t+#S%L
zgdh0Rfr~A$yY<Du#b0Fb{y^X#xwF7$*6Lr~db;zs;Bj4rai?#>KX&qNp5QT_=A%5q
z<2=Pf{3ws|nHC}D#b5ilmMP|yf+?G-R@j1_o3oWWb9h>wTT`=(is=!M+gXtB0_YLI
zjA0D}GR04n0h@zqZDm~mwJoSQWlqVerlyl<0HV7g6oOEUhblxS@KRk7A4K*+V3?0o
zynYmK)qTB#?*XMDJ_xaDTCKrpWleGw4Dvnr8-bGs;jC$X9O5%f0#pc8NANjVML7Vt
z^QM&2wB@|4FV`mn#2%1{!Q`nbGQQx<ic)ZA(@l;NzD?nC44$s`@F^v$xq5g9$R2?a
zNggYU@ZhOp!Bv&;*#yNUUZctvoRwD<ccNXq2l6R9yJ~6PRdAu%#k=?v1jisYR1+wk
zE(Yu8!tEk?ASGfnMRB@Ol)CQFmEfwX6^+J`x@Dsam;_BRf$JQVvM;1y(x?k0^6pl6
zK1DzxfEL(iu@~nv7H|#SbXh^io!a7}KyOI4hwp_8Vq|`l4+AeoE(`%N!4H+uI@3j6
z$1#@1Rb9zInhs^BfHO9n>PZxeFvN$6wg5d2B_sTpC?9w_!V~x$w@xBY<9ou+>;&FR
z;W@$&;hp}n`kryEIG<B8IW@B^$&yejnVO`D#8=J!23!s!JHixY;k*cGPus4GLVJ|f
zQHp$tQK&-mrzZ-gqD$tIBCW{glBDURy&&h6MruPyuLz~&Fq8=;allGYZIwBZ;etXK
z$u|jFj>7Gq*N_;+6-g^7QnuvnM!Ld$JK@Gf)ND++7>2}2PaMw^6xjp}6}dE6*0wdR
z<@0hOD^03KDXQC+tnV8XnVX7hg&N!6mLmk2BtL1#_oN_N^LAWROYDi1AG2Cbg<~Ss
zIgqi5BMnSlE*J}ll4{Z;VuhIH)q<SsZ)niD4at$B(~u;RgD}lX3y~-%h?LdwqMP$_
z1^He(jYORXMFg^xRV6!Yj*STis9To&<<zDvb{K_lM@~7f=yO`eM1`4KEUH$gwI!X_
zEjqz)H3AN}JHk%UMJR<w$?RixeVcYL#+3!Rm}`I$Mr|y`He_eOU^%Bs4h)fVkI}b@
zGJ3Za|Id7>sF_MuGE7}9EV`@O#dnGXBx9o#L#wi(1v(w+cortB3#y{K1NBoAw7QGP
z<Z#8T5~q_8p`0C|y@cb9DP?_4(;LLZ$M*w^B+F9X>0*Aq5uFZ<0oIYKwWbAgfG#6%
z+=UO<@qdESKTbB@Fb1>m`Q~G=i5V>~s|92@n)}*jX0+PZF*EQ1wAUGyVJ4H=DpSg0
z{^Yz?G^H8hR9E^8u}dHXqtt@NL^H4o83iV0yXde}Un$rh@9YOty0&I0k~rmtBI}tY
z*Mq--p;U)qsZAl>DztRjTGq9q)uN30i2v_yu|dHn8!0xx{V%tU4Imv{qB1W=rRqcD
zouFZ;elCj15|dn_!UcTdyi4XrsZJb%YtyI{_S^^A0UFMd_H(HljyleE?g1w>IV;_*
z>C487oT;C(`)IlpsK+aH(B~v}24G>tDR8Hh6-~$0qPXb7xz4Qm@i@~Q+nDpYI!T<Q
zx+8E8)BKg7iLcav(==HO*Kmo}=TdP94xCnTF%ze2Rn}D*?ZS}M0&U0{Qw7tt64Uyp
zW1pxen>N0+vE3omcT2c*4~)_bB!-HkG<c+_3YX^{X9!G+`JjM=E-Xqo*C-Y_O{Z(Z
zRzoqxHs(N8&S{IA&+odDdrQ@py4Mu>eAJ%S1`(S`1(u(#D^{IxM+_j^A+iTU6LV~8
zy+bw((GX*<qFuIVh$slBOgY_c))sJ;o}_E8C^kbd#QrIP1`P2nZP)dreKC*Qmkcrf
z50y=hS5=mt*(LZsE1Qa>El4@pFr~bf#k`OymzugvLM}|kXh-O(spA#LNob_|jiKJ7
zxN11)qCw0$M{pg!A-cJ~;*Q?$f*!T~6uKe4xF5Mk%FRE?^3NMn)MraNoGj=h4NGbk
zgPYamT$M;wvvS<N-8**+XB=s{)4nY<I3=PJ4A?`L70RmfR*~mB?m`#N6wx5_maDDn
zwtLq5n8NayT{6sYMjj<EXWVVu%y7%65d%Uf*StAouadJX#t!nyF+1s<p3!_-&K2DS
gKS_lQIDo4t)ShpM?%nD6u($1_?k4`>LEpCj0@Xc7C;$Ke
rename from libgui/languages/ru-ru.ts
rename to libgui/languages/ru_RU.ts
--- a/libgui/languages/ru-ru.ts
+++ b/libgui/languages/ru_RU.ts
@@ -2,573 +2,1065 @@
 <!DOCTYPE TS>
 <TS version="2.0" language="ru_RU">
 <context>
-    <name>FileEditorMdiSubWindow</name>
+    <name>documentation_dock_widget</name>
     <message>
-        <location filename="../src/FileEditorMdiSubWindow.cpp" line="114"/>
-        <location filename="../src/FileEditorMdiSubWindow.cpp" line="207"/>
-        <source>File Editor</source>
-        <translation>Редактор файлов</translation>
+        <location filename="../src/documentation-dockwidget.cc" line="+34"/>
+        <source>Documentation</source>
+        <translation type="unfinished">Документация</translation>
+    </message>
+</context>
+<context>
+    <name>file_editor</name>
+    <message>
+        <location filename="../src/m-editor/file-editor.cc" line="+146"/>
+        <location line="+38"/>
+        <location line="+43"/>
+        <location line="+26"/>
+        <source>Octave Editor</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/FileEditorMdiSubWindow.cpp" line="115"/>
-        <source>Cannot read file %1:
+        <location line="-106"/>
+        <source>File %1 is already open in the editor.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+38"/>
+        <source>Could not open file %1 for read:
 %2.</source>
-        <translation>Не удалось прочитать файл %1:
-%2.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/FileEditorMdiSubWindow.cpp" line="127"/>
-        <source>File loaded.</source>
-        <translation>Файл загружен.</translation>
+        <location line="+43"/>
+        <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 filename="../src/FileEditorMdiSubWindow.cpp" line="153"/>
-        <source>Do you want to save the current file
-%1 ?</source>
-        <translation>Сохранить текущий файл
-%1?</translation>
+        <location line="+26"/>
+        <source>The associated file editor tab has disappeared.  It was likely closed by some means.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/FileEditorMdiSubWindow.cpp" line="208"/>
-        <source>Cannot write file %1:
-%2.</source>
-        <translation>Не удалось сохранить файл %1:
-%2.</translation>
+        <location line="+141"/>
+        <source>&amp;%1 %2</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/FileEditorMdiSubWindow.cpp" line="220"/>
-        <source>File %1 saved</source>
-        <translation>Файл %1 сохранён</translation>
+        <location line="+130"/>
+        <source>&amp;New File</source>
+        <translation type="unfinished">Созд&amp;ать</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>&amp;Open File</source>
+        <translation type="unfinished">&amp;Открыть</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>&amp;Save File</source>
+        <translation type="unfinished">&amp;Сохранить</translation>
     </message>
     <message>
-        <location filename="../src/FileEditorMdiSubWindow.cpp" line="383"/>
-        <source>&amp;Close File</source>
-        <translation>&amp;Закрыть</translation>
+        <location line="+4"/>
+        <source>Save File &amp;As</source>
+        <translation type="unfinished">Сохранить &amp;как</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>&amp;Undo</source>
+        <translation type="unfinished">О&amp;тменить</translation>
     </message>
     <message>
-        <location filename="../src/FileEditorMdiSubWindow.cpp" line="386"/>
-        <source>&amp;New File</source>
-        <translation>Созд&amp;ать</translation>
+        <location line="+3"/>
+        <source>&amp;Redo</source>
+        <translation type="unfinished">&amp;Повторить</translation>
     </message>
     <message>
-        <location filename="../src/FileEditorMdiSubWindow.cpp" line="389"/>
-        <source>&amp;Open File</source>
-        <translation>&amp;Открыть</translation>
+        <location line="+3"/>
+        <source>&amp;Copy</source>
+        <translation type="unfinished">&amp;Копировать</translation>
     </message>
     <message>
-        <location filename="../src/FileEditorMdiSubWindow.cpp" line="392"/>
-        <source>&amp;Save File</source>
-        <translation>&amp;Сохранить</translation>
+        <location line="+3"/>
+        <source>Cu&amp;t</source>
+        <translation type="unfinished">Вы&amp;резать</translation>
     </message>
     <message>
-        <location filename="../src/FileEditorMdiSubWindow.cpp" line="395"/>
-        <source>Save File &amp;As</source>
-        <translation>Сохранить &amp;как</translation>
+        <location line="+4"/>
+        <source>Paste</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/FileEditorMdiSubWindow.cpp" line="398"/>
-        <source>&amp;Undo</source>
-        <translation>О&amp;тменить</translation>
+        <location line="+1"/>
+        <source>&amp;Next Bookmark</source>
+        <translation type="unfinished">С&amp;ледующая закладка</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Pre&amp;vious Bookmark</source>
+        <translation type="unfinished">Пр&amp;едыдущая закладка</translation>
     </message>
     <message>
-        <location filename="../src/FileEditorMdiSubWindow.cpp" line="401"/>
-        <source>&amp;Redo</source>
-        <translation>&amp;Повторить</translation>
+        <location line="+1"/>
+        <source>Toggle &amp;Bookmark</source>
+        <translation type="unfinished">&amp;Установить/снять закладку</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;Remove All Bookmarks</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/FileEditorMdiSubWindow.cpp" line="402"/>
-        <source>&amp;Copy</source>
-        <translation>&amp;Копировать</translation>
+        <location line="+4"/>
+        <source>&amp;Next breakpoint</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/FileEditorMdiSubWindow.cpp" line="403"/>
-        <source>Cu&amp;t</source>
-        <translation>Вы&amp;резать</translation>
+        <location line="+3"/>
+        <source>Pre&amp;vious breakpoint</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/FileEditorMdiSubWindow.cpp" line="404"/>
-        <source>&amp;Paste</source>
-        <translation>&amp;Вставить</translation>
+        <location line="+3"/>
+        <source>Toggle &amp;breakpoint</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/FileEditorMdiSubWindow.cpp" line="405"/>
-        <source>&amp;Next Bookmark</source>
-        <translation>С&amp;ледующая закладка</translation>
+        <location line="+3"/>
+        <source>&amp;Remove All breakpoints</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/FileEditorMdiSubWindow.cpp" line="406"/>
-        <source>Pre&amp;vious Bookmark</source>
-        <translation>Пр&amp;едыдущая закладка</translation>
+        <location line="+2"/>
+        <source>&amp;Comment Selected Text</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/FileEditorMdiSubWindow.cpp" line="407"/>
-        <source>Toggle &amp;Bookmark</source>
-        <translation>&amp;Установить/снять закладку</translation>
+        <location line="+1"/>
+        <source>&amp;Uncomment Selected Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>&amp;Find and Replace</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/FileEditorMdiSubWindow.cpp" line="410"/>
-        <source>&amp;Run File</source>
-        <translation>&amp;Запустить файл</translation>
+        <location line="+3"/>
+        <source>Save File And Run</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+51"/>
+        <source>&amp;File</source>
+        <translation type="unfinished">&amp;Файл</translation>
     </message>
     <message>
-        <location filename="../src/FileEditorMdiSubWindow.cpp" line="449"/>
-        <source>&amp;File</source>
-        <translation>&amp;Файл</translation>
+        <location line="+6"/>
+        <source>Open &amp;Recent</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/FileEditorMdiSubWindow.cpp" line="457"/>
+        <location line="+8"/>
         <source>&amp;Edit</source>
-        <translation>&amp;Правка</translation>
+        <translation type="unfinished">&amp;Правка</translation>
     </message>
     <message>
-        <location filename="../src/FileEditorMdiSubWindow.cpp" line="469"/>
+        <location line="+19"/>
+        <source>&amp;Debug</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
         <source>&amp;Run</source>
-        <translation>&amp;Запуск</translation>
+        <translation type="unfinished">&amp;Запуск</translation>
     </message>
 </context>
 <context>
-    <name>FilesDockWidget</name>
+    <name>file_editor_tab</name>
     <message>
-        <source>Current Folder</source>
-        <translation type="obsolete">Текущий каталог</translation>
+        <location filename="../src/m-editor/file-editor-tab.cc" line="+687"/>
+        <location line="+102"/>
+        <location line="+98"/>
+        <location line="+63"/>
+        <location line="+14"/>
+        <source>Octave Editor</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/FilesDockWidget.cpp" line="32"/>
-        <source>Current Directory</source>
-        <translation>Текущий каталог</translation>
+        <location line="-276"/>
+        <source>The file &apos;%1&apos; has been modified. Do you want to save the changes?</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/FilesDockWidget.cpp" line="46"/>
-        <source>Move up one directory.</source>
-        <translation>Перейти на уровень выше.</translation>
+        <location line="+102"/>
+        <source>Could not open file %1 for write:
+%2.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/FilesDockWidget.cpp" line="49"/>
-        <source>Enter the path or filename.</source>
-        <translation>Введите путь или имя файла.</translation>
+        <location line="+98"/>
+        <source>File not saved!  You&apos;ve selected a file name
+
+     %1
+
+which is the same as the current file name.  Use Save to overwrite.  (Could allow overwriting, with message, if that is what folks want.)</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/FilesDockWidget.cpp" line="78"/>
-        <source>Doubleclick a file to open it.</source>
-        <translation>Двойной щелчок по файлу откроет его.</translation>
+        <location line="+63"/>
+        <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>
+    <message>
+        <location line="+14"/>
+        <source>It seems that &apos;%1&apos; has been deleted or renamed. Do you want to save it now?</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>HistoryDockWidget</name>
+    <name>files_dock_widget</name>
     <message>
-        <location filename="../src/HistoryDockWidget.cpp" line="36"/>
-        <source>Doubleclick a command to transfer it to the terminal.</source>
-        <translation>Двойной щелчок по команде перенесёт её в командную строку.</translation>
+        <location filename="../src/files-dockwidget.cc" line="+43"/>
+        <source>Current Directory</source>
+        <translation type="unfinished">Текущий каталог</translation>
     </message>
     <message>
-        <location filename="../src/HistoryDockWidget.cpp" line="38"/>
-        <source>Enter text to filter the command history.</source>
-        <translation>Введите текст для фильтрации выполненных команд.</translation>
+        <location line="+11"/>
+        <source>Move up one directory.</source>
+        <translation type="unfinished">Перейти на уровень выше.</translation>
     </message>
     <message>
-        <location filename="../src/HistoryDockWidget.cpp" line="41"/>
-        <source>Command History</source>
-        <translation>Журнал выполненных команд</translation>
+        <location line="+4"/>
+        <source>Enter the path or filename.</source>
+        <translation type="unfinished">Введите путь или имя файла.</translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>Doubleclick a file to open it.</source>
+        <translation type="unfinished">Двойной щелчок по файлу откроет его.</translation>
     </message>
 </context>
 <context>
-    <name>LexerOctaveGui</name>
+    <name>find_dialog</name>
+    <message>
+        <location filename="../src/m-editor/find-dialog.cc" line="+58"/>
+        <source>Find &amp;what:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Re&amp;place with:</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
-        <location filename="../src/lexer/lexeroctavegui.cpp" line="111"/>
-        <source>Default</source>
-        <translation>По умолчанию</translation>
+        <location line="+4"/>
+        <source>Match &amp;case</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Search from &amp;start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;Wrap while searching</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/lexer/lexeroctavegui.cpp" line="113"/>
-        <source>Comment</source>
-        <translation>Комментарий</translation>
+        <location line="+2"/>
+        <source>&amp;Find Next</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>&amp;Replace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Replace &amp;All</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/lexer/lexeroctavegui.cpp" line="115"/>
-        <source>Command</source>
-        <translation>Команда</translation>
+        <location line="+2"/>
+        <source>&amp;More</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/lexer/lexeroctavegui.cpp" line="117"/>
-        <source>Number</source>
-        <translation>Число</translation>
+        <location line="+11"/>
+        <source>&amp;Whole words</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Regular E&amp;xpressions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Search &amp;backward</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/lexer/lexeroctavegui.cpp" line="119"/>
-        <source>Keyword</source>
-        <translation>Зарезервированное слово</translation>
+        <location line="+1"/>
+        <source>Search se&amp;lection</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>history_dock_widget</name>
+    <message>
+        <location filename="../src/history-dockwidget.cc" line="+55"/>
+        <source>Doubleclick a command to transfer it to the terminal.</source>
+        <translation type="unfinished">Двойной щелчок по команде перенесёт её в командную строку.</translation>
     </message>
     <message>
-        <location filename="../src/lexer/lexeroctavegui.cpp" line="121"/>
-        <source>Single-quoted string</source>
-        <translation>Строка в одинарных кавычках</translation>
+        <location line="+6"/>
+        <source>Enter text to filter the command history.</source>
+        <translation type="unfinished">Введите текст для фильтрации выполненных команд.</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Command History</source>
+        <translation type="unfinished">Журнал выполненных команд</translation>
+    </message>
+    <message>
+        <location line="+42"/>
+        <source>Copy</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/lexer/lexeroctavegui.cpp" line="123"/>
-        <source>Operator</source>
-        <translation>Оператор</translation>
+        <location line="+1"/>
+        <source>Evaluate</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>lexer_octave_gui</name>
+    <message>
+        <location filename="../src/m-editor/lexer-octave-gui.cc" line="+145"/>
+        <source>Default</source>
+        <translation type="unfinished">По умолчанию</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Comment</source>
+        <translation type="unfinished">Комментарий</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Command</source>
+        <translation type="unfinished">Команда</translation>
     </message>
     <message>
-        <location filename="../src/lexer/lexeroctavegui.cpp" line="125"/>
-        <source>Identifier</source>
-        <translation>Идентификатор</translation>
+        <location line="+2"/>
+        <source>Number</source>
+        <translation type="unfinished">Число</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Keyword</source>
+        <translation type="unfinished">Зарезервированное слово</translation>
     </message>
     <message>
-        <location filename="../src/lexer/lexeroctavegui.cpp" line="127"/>
+        <location line="+2"/>
+        <source>Single-quoted string</source>
+        <translation type="unfinished">Строка в одинарных кавычках</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Operator</source>
+        <translation type="unfinished">Оператор</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Identifier</source>
+        <translation type="unfinished">Идентификатор</translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>Double-quoted string</source>
-        <translation>Строка в двойных кавычках</translation>
+        <translation type="unfinished">Строка в двойных кавычках</translation>
     </message>
 </context>
 <context>
-    <name>MainWindow</name>
+    <name>main_window</name>
+    <message>
+        <location filename="../src/main-window.cc" line="+135"/>
+        <source>Save Workspace</source>
+        <translation type="unfinished">Сохранить область переменных</translation>
+    </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="47"/>
-        <source>Opening file.</source>
-        <translation>Открывается файл.</translation>
+        <location line="+11"/>
+        <source>Load Workspace</source>
+        <translation type="unfinished">Загрузить область переменных</translation>
+    </message>
+    <message>
+        <location line="+155"/>
+        <source>Set working direcotry</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="124"/>
-        <source>Save Workspace</source>
-        <translation>Сохранить область переменных</translation>
+        <location line="+186"/>
+        <location line="+381"/>
+        <source>About Octave</source>
+        <translation type="unfinished">Об Octave</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="134"/>
-        <source>Load Workspace</source>
-        <translation>Загрузить область переменных</translation>
+        <location line="-290"/>
+        <source>View the variables in the active workspace.</source>
+        <translation type="unfinished">Просмотр содержимого текущей области переменных.</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Browse and search the command history.</source>
+        <translation type="unfinished">Просмотр и поиск в журнале выполненных команд.</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Browse your files.</source>
+        <translation type="unfinished">Просмотр файлов.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="226"/>
-        <location filename="../src/MainWindow.cpp" line="362"/>
-        <source>About Octave</source>
-        <translation>Об Octave</translation>
+        <location line="+2"/>
+        <source>See the documentation for help.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+39"/>
+        <source>&amp;File</source>
+        <translation type="unfinished">&amp;Файл</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>New</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Script</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="238"/>
-        <source>Saving data and shutting down.</source>
-        <translation>Сохранить и завершить работу.</translation>
+        <location line="+3"/>
+        <source>Function</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Class</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="276"/>
-        <source>View the variables in the active workspace.</source>
-        <translation>Просмотр содержимого текущей области переменных.</translation>
+        <location line="+2"/>
+        <source>Enumeration</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="278"/>
-        <source>Browse and search the command history.</source>
-        <translation>Просмотр и поиск в журнале выполненных команд.</translation>
+        <location line="+2"/>
+        <source>Figure</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Variable</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="280"/>
-        <source>Browse your files.</source>
-        <translation>Просмотр файлов.</translation>
+        <location line="+2"/>
+        <source>Model</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>GUI</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Open...</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="294"/>
-        <source>Terminal</source>
-        <translation>Командная строка</translation>
+        <location line="+4"/>
+        <source>Close Command Window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Import Data...</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="298"/>
-        <source>Enter your commands into the Octave terminal.</source>
-        <translation>Введите команды в командной строке Octave.</translation>
+        <location line="+4"/>
+        <source>Save Workspace...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Preferences...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Page Setup...</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="307"/>
-        <source>Documentation</source>
-        <translation>Документация</translation>
+        <location line="+3"/>
+        <source>Print</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="311"/>
-        <source>Browse the Octave documentation for help.</source>
-        <translation>Открыть документацию по Octave.</translation>
+        <location line="+4"/>
+        <source>Print Selection...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Exit</source>
+        <translation type="unfinished">Выход</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>&amp;Edit</source>
+        <translation type="unfinished">&amp;Правка</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="320"/>
-        <source>Chat</source>
-        <translation>Чат</translation>
+        <location line="+2"/>
+        <source>Undo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Redo</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="323"/>
-        <source>Instantly chat with other Octave users for help.</source>
-        <translation>Чат с пользователями Octave.</translation>
+        <location line="+5"/>
+        <source>Cut</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="330"/>
-        <source>Octave</source>
-        <translation>Octave</translation>
+        <location line="+4"/>
+        <source>Copy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Paste</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="331"/>
-        <source>Settings</source>
-        <translation>Параметры</translation>
+        <location line="+4"/>
+        <source>Paste To Workspace...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Select All</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="333"/>
-        <source>Exit</source>
-        <translation>Выход</translation>
+        <location line="+6"/>
+        <source>Find...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Find Files...</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="335"/>
-        <source>Interface</source>
-        <translation>Интерфейс</translation>
+        <location line="+7"/>
+        <source>Clear Command Window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Clear Command History</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Clear Workspace</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="337"/>
-        <source>Align Windows</source>
-        <translation>Выровнять окна</translation>
+        <location line="+2"/>
+        <source>De&amp;bug</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Step</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Step in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Step out</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="339"/>
-        <location filename="../src/MainWindow.cpp" line="351"/>
-        <source>Workspace</source>
-        <translation>Область переменных</translation>
+        <location line="+8"/>
+        <source>Continue</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Exit Debug Mode</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="342"/>
-        <source>History</source>
-        <translation>Журнал выполненных команд</translation>
+        <location line="+10"/>
+        <source>&amp;Desktop</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="345"/>
-        <source>File Browser</source>
-        <translation>Файловый менеджер</translation>
+        <location line="+1"/>
+        <source>Load workspace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>&amp;Window</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="349"/>
-        <source>Open New Editor Window</source>
-        <translation>Открыть новое окно редактора</translation>
+        <location line="+2"/>
+        <source>Show Command Window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Show Command History</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Show Current Directory</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="352"/>
-        <source>Load</source>
-        <translation>Загрузить</translation>
+        <location line="+6"/>
+        <source>Show Workspace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Show Editor</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="353"/>
-        <source>Save</source>
-        <translation>Сохранить</translation>
+        <location line="+5"/>
+        <source>Show Documentation</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="355"/>
-        <source>Clear</source>
-        <translation>Очистить</translation>
+        <location line="+7"/>
+        <source>Command Window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Command History</source>
+        <translation type="unfinished">Журнал выполненных команд</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="357"/>
-        <source>Community</source>
-        <translation>Сообщество</translation>
+        <location line="+4"/>
+        <source>Current Directory</source>
+        <translation type="unfinished">Текущий каталог</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="358"/>
-        <source>Report Bug</source>
-        <translation>Сообщить об ошибке</translation>
+        <location line="+4"/>
+        <source>Workspace</source>
+        <translation type="unfinished">Область переменных</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Editor</source>
+        <translation type="unfinished">Редактор</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Documentation</source>
+        <translation type="unfinished">Документация</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="359"/>
-        <source>Agora</source>
-        <translation>Agora</translation>
+        <location line="+5"/>
+        <source>Reset Windows</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>&amp;Help</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="360"/>
-        <source>Octave Forge</source>
-        <translation>Octave Forge</translation>
+        <location line="+2"/>
+        <source>Report Bug</source>
+        <translation type="unfinished">Сообщить об ошибке</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="363"/>
-        <source>About Qt</source>
-        <translation>О Qt</translation>
+        <location line="+2"/>
+        <source>Visit Agora</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Visit Octave Forge</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Current Directory:</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>SettingsDialog</name>
+    <name>settings_dialog</name>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="29"/>
+        <location filename="../src/settings-dialog.ui" line="+29"/>
+        <location filename="../src/ui-settings-dialog.h" line="+461"/>
         <source>Settings</source>
-        <translation>Параметры</translation>
+        <translation type="unfinished">Параметры</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <location filename="../src/ui-settings-dialog.h" line="+5"/>
+        <source>General</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="39"/>
-        <source>Chat</source>
-        <translation>Чат</translation>
+        <location line="+18"/>
+        <location filename="../src/ui-settings-dialog.h" line="-4"/>
+        <source>Icon set for dock widget</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="47"/>
-        <source>Connect to #octave on startup</source>
-        <translation>Подключиться к #octave при запуске</translation>
+        <location line="+21"/>
+        <location filename="../src/ui-settings-dialog.h" line="+1"/>
+        <source>Octave logo only</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <location filename="../src/ui-settings-dialog.h" line="+1"/>
+        <source>Letter icons</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <location filename="../src/ui-settings-dialog.h" line="+1"/>
+        <source>Graphic  icons</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="57"/>
-        <source>Show message of the day</source>
-        <translation>Показывать совет дня</translation>
+        <location line="+7"/>
+        <location filename="../src/ui-settings-dialog.h" line="+11"/>
+        <source>Editor</source>
+        <translation type="unfinished">Редактор</translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="64"/>
-        <source>Show topic</source>
-        <translation>Показывать тему обсуждения при подключении</translation>
+        <location line="+10"/>
+        <location line="+147"/>
+        <location filename="../src/ui-settings-dialog.h" line="-9"/>
+        <location line="+10"/>
+        <source>Font</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="71"/>
-        <source>Automatically identify on NickServ</source>
-        <translation>Автоматически идентифицироваться у NickServ</translation>
+        <location line="-130"/>
+        <location line="+147"/>
+        <location filename="../src/ui-settings-dialog.h" line="-9"/>
+        <location line="+10"/>
+        <source>Font Size</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="78"/>
-        <source>Warning: Your password will be stored in ~/.octavegui in human-readable format. Do not enter your password if you worry about security issues.</source>
-        <translation>Предупреждение: пароль будет сохранён в ~/.octavegui обычным текстом. Не вводите пароль, если переживаете о возможных уязвимостях в безопасности приложения.</translation>
+        <location line="-109"/>
+        <location filename="../src/ui-settings-dialog.h" line="-9"/>
+        <source>Show line numbers</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="103"/>
-        <location filename="../src/SettingsDialog.ui" line="311"/>
-        <source>Password:</source>
-        <translation>Пароль:</translation>
+        <location line="+10"/>
+        <location filename="../src/ui-settings-dialog.h" line="+1"/>
+        <source>Highlight current line</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <location filename="../src/ui-settings-dialog.h" line="+1"/>
+        <source>Code completion</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="125"/>
-        <source>Editor</source>
-        <translation>Редактор</translation>
+        <location line="+10"/>
+        <location filename="../src/ui-settings-dialog.h" line="+1"/>
+        <source>Show complete path in window title</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="133"/>
+        <location line="+7"/>
+        <location filename="../src/ui-settings-dialog.h" line="+1"/>
+        <source>Restore tabs from previous session on startup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+27"/>
+        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Use custom file editor:</source>
-        <translation>Выбрать редактор:</translation>
+        <translation type="unfinished">Выбрать редактор:</translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="143"/>
+        <location line="+10"/>
+        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>emacs</source>
-        <translation>emacs</translation>
+        <translation type="unfinished">emacs</translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="166"/>
-        <source>File Browser</source>
-        <translation>Файловый менеджер</translation>
+        <location line="+10"/>
+        <location filename="../src/ui-settings-dialog.h" line="+6"/>
+        <source>Terminal</source>
+        <translation type="unfinished">Командная строка</translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="172"/>
-        <source>Show filenames</source>
-        <translation>Показывать имена файлов</translation>
+        <location line="+62"/>
+        <location filename="../src/ui-settings-dialog.h" line="-2"/>
+        <source>Cursor type:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+27"/>
+        <location filename="../src/ui-settings-dialog.h" line="+1"/>
+        <source>Cursor blinking</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="179"/>
-        <source>Show file size</source>
-        <translation>Показывать размер файлов</translation>
+        <location line="+36"/>
+        <location filename="../src/ui-settings-dialog.h" line="+8"/>
+        <source>File Browser</source>
+        <translation type="unfinished">Файловый менеджер</translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="186"/>
-        <source>Show file type</source>
-        <translation>Показывать типы файлов</translation>
+        <location line="+6"/>
+        <location filename="../src/ui-settings-dialog.h" line="-6"/>
+        <source>Show filenames</source>
+        <translation type="unfinished">Показывать имена файлов</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location filename="../src/ui-settings-dialog.h" line="+1"/>
+        <source>Show file size</source>
+        <translation type="unfinished">Показывать размер файлов</translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="193"/>
+        <location line="+7"/>
+        <location filename="../src/ui-settings-dialog.h" line="+1"/>
+        <source>Show file type</source>
+        <translation type="unfinished">Показывать типы файлов</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Show date of last modification</source>
-        <translation>Показывать дату последнего изменения</translation>
+        <translation type="unfinished">Показывать дату последнего изменения</translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="200"/>
+        <location line="+7"/>
+        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Show hidden files</source>
-        <translation>Показывать скрытые файлы</translation>
+        <translation type="unfinished">Показывать скрытые файлы</translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="207"/>
+        <location line="+7"/>
+        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Alternating row colors</source>
-        <translation>Чередующиеся цвета строк</translation>
+        <translation type="unfinished">Чередующиеся цвета строк</translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="215"/>
+        <location line="+21"/>
+        <location filename="../src/ui-settings-dialog.h" line="+13"/>
         <source>Network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="221"/>
+        <location line="+6"/>
+        <location filename="../src/ui-settings-dialog.h" line="-11"/>
         <source>Use proxy server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="233"/>
+        <location line="+12"/>
+        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Proxy Type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="244"/>
+        <location line="+11"/>
+        <location filename="../src/ui-settings-dialog.h" line="+3"/>
         <source>HttpProxy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="249"/>
+        <location line="+5"/>
+        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Socks5Proxy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="260"/>
+        <location line="+11"/>
+        <location filename="../src/ui-settings-dialog.h" line="+2"/>
         <source>Hostname:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="277"/>
+        <location line="+17"/>
+        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Port:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="294"/>
+        <location line="+17"/>
+        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Username:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="339"/>
-        <source>Reset to defaults</source>
-        <translation>Установить параметры по умолчанию</translation>
+        <location line="+17"/>
+        <location filename="../src/ui-settings-dialog.h" line="+1"/>
+        <source>Password:</source>
+        <translation type="unfinished">Пароль:</translation>
+    </message>
+</context>
+<context>
+    <name>terminal_dock_widget</name>
+    <message>
+        <location filename="../src/terminal-dockwidget.cc" line="+34"/>
+        <source>Command Window</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>webinfo</name>
+    <message>
+        <location filename="../src/qtinfo/webinfo.cc" line="+74"/>
+        <source>Type here and press &apos;Return&apos; to search</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="362"/>
-        <source>Export</source>
-        <translation>Экспортировать</translation>
-    </message>
-    <message>
-        <location filename="../src/SettingsDialog.ui" line="372"/>
-        <source>Import</source>
-        <translation>Импортировать</translation>
+        <location line="+4"/>
+        <source>Global search</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>VariablesDockWidget</name>
+    <name>welcome_wizard</name>
     <message>
-        <location filename="../src/VariablesDockWidget.cpp" line="36"/>
-        <source>Workspace</source>
-        <translation>Область переменных</translation>
+        <location filename="../src/welcome-wizard.ui" line="+26"/>
+        <location filename="../src/ui-welcome-wizard.h" line="+286"/>
+        <source>Welcome to GNU Octave</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <location filename="../src/ui-welcome-wizard.h" line="+1"/>
+        <source>It appears that you have launched Octave GUI for the first time on this computer, since no configuration file could be found at &apos;~/.octave-gui&apos;. This wizard will guide you through the essential settings you should make before you can start using Octave GUI. If you want to transfer your settings you have previously made just close this dialog and copy over the settings file to your home folder. The presence of that file will automatically be detected and will skip this wizard. IMPORTANT: This wizard is not fully functional yet. Just click your way to the end and it will create a standard settings file.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/VariablesDockWidget.cpp" line="40"/>
-        <source>Name</source>
-        <translation>Идентификатор</translation>
+        <location line="+41"/>
+        <location line="+50"/>
+        <location line="+52"/>
+        <location line="+52"/>
+        <location filename="../src/ui-welcome-wizard.h" line="+1"/>
+        <location line="+2"/>
+        <location line="+2"/>
+        <location line="+2"/>
+        <source>Next</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/VariablesDockWidget.cpp" line="40"/>
-        <source>Type</source>
-        <translation>Тип</translation>
+        <location line="-124"/>
+        <location line="+52"/>
+        <location line="+52"/>
+        <location line="+87"/>
+        <location filename="../src/ui-welcome-wizard.h" line="-5"/>
+        <location line="+2"/>
+        <location line="+2"/>
+        <location line="+5"/>
+        <source>Previous</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-45"/>
+        <location filename="../src/ui-welcome-wizard.h" line="-3"/>
+        <source>Welcome to Octave!</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/VariablesDockWidget.cpp" line="40"/>
-        <source>Value</source>
-        <translation>Значение</translation>
+        <location line="+7"/>
+        <location filename="../src/ui-welcome-wizard.h" line="+1"/>
+        <source>This is the development version of Octave with the first official GUI.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/VariablesDockWidget.cpp" line="52"/>
-        <source>Local</source>
-        <translation>Локальная</translation>
+        <location line="+10"/>
+        <location filename="../src/ui-welcome-wizard.h" line="+1"/>
+        <source>You seem to run Octave GUI for the first time on this computer. This assistant will help you to configure this software installation. Click &apos;Finish&apos; to write a configuration file and launch Octave GUI.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/VariablesDockWidget.cpp" line="56"/>
-        <source>Global</source>
-        <translation>Глобальная</translation>
+        <location line="+48"/>
+        <location filename="../src/ui-welcome-wizard.h" line="+2"/>
+        <source>Finish</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>workspace_model</name>
+    <message>
+        <location filename="../src/workspace-model.cc" line="+42"/>
+        <source>Name</source>
+        <translation type="unfinished">Идентификатор</translation>
     </message>
     <message>
-        <location filename="../src/VariablesDockWidget.cpp" line="60"/>
-        <source>Persistent</source>
-        <translation>Статическая</translation>
+        <location line="+0"/>
+        <source>Class</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Dimension</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/VariablesDockWidget.cpp" line="64"/>
-        <source>Hidden</source>
-        <translation>Скрытая</translation>
+        <location line="+0"/>
+        <source>Value</source>
+        <translation type="unfinished">Значение</translation>
+    </message>
+</context>
+<context>
+    <name>workspace_view</name>
+    <message>
+        <location filename="../src/workspace-view.cc" line="+39"/>
+        <source>Workspace</source>
+        <translation type="unfinished">Область переменных</translation>
     </message>
 </context>
 </TS>
--- a/libgui/languages/translators
+++ b/libgui/languages/translators
@@ -1,8 +1,9 @@
 # Below Octave GUI translators are listed with their e-mails
 # to be able inform them about generic translation file changes
-en-en Jacob Dawid <jacob.dawid@googlemail.com>
-es-es Valentin Ortega-Clavero <arcanos3030@gmail.com>
-de-de Jacob Dawid <jacob.dawid@googlemail.com>
-pt-br Júlio Hoffimann Mendes <julio.hoffimann@gmail.com>
-ru-ru Andriy Shinkarchuck <adriano32.gnu@gmail.com>
-uk-ua Andriy Shinkarchuck <adriano32.gnu@gmail.com>
+be_BY Mihas Varantsou <meequz@gmail.com>
+de_DE Jacob Dawid <jacob.dawid@googlemail.com>
+en_US Jacob Dawid <jacob.dawid@googlemail.com>
+es_ES Valentin Ortega-Clavero <arcanos3030@gmail.com>
+pt_BE Júlio Hoffimann Mendes <julio.hoffimann@gmail.com>
+ru_RU Andriy Shinkarchuck <adriano32.gnu@gmail.com>
+uk_UA Andriy Shinkarchuck <adriano32.gnu@gmail.com>
deleted file mode 100644
index 106e473c4ee5a25399cf11bc5c2f5f0a50834565..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..b745f88cebb4bce7ef0709d50d9461a2cebfd0a1
GIT binary patch
literal 5822
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
VN%ZYO-}^`V{~PY&?;n>A{tpDIP5S@<
rename from libgui/languages/uk-ua.ts
rename to libgui/languages/uk_UA.ts
--- a/libgui/languages/uk-ua.ts
+++ b/libgui/languages/uk_UA.ts
@@ -2,573 +2,1065 @@
 <!DOCTYPE TS>
 <TS version="2.0" language="uk_UA">
 <context>
-    <name>FileEditorMdiSubWindow</name>
+    <name>documentation_dock_widget</name>
     <message>
-        <location filename="../src/FileEditorMdiSubWindow.cpp" line="114"/>
-        <location filename="../src/FileEditorMdiSubWindow.cpp" line="207"/>
-        <source>File Editor</source>
-        <translation>Редактор файлів</translation>
+        <location filename="../src/documentation-dockwidget.cc" line="+34"/>
+        <source>Documentation</source>
+        <translation type="unfinished">Документація</translation>
+    </message>
+</context>
+<context>
+    <name>file_editor</name>
+    <message>
+        <location filename="../src/m-editor/file-editor.cc" line="+146"/>
+        <location line="+38"/>
+        <location line="+43"/>
+        <location line="+26"/>
+        <source>Octave Editor</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/FileEditorMdiSubWindow.cpp" line="115"/>
-        <source>Cannot read file %1:
+        <location line="-106"/>
+        <source>File %1 is already open in the editor.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+38"/>
+        <source>Could not open file %1 for read:
 %2.</source>
-        <translation>Не вдалося прочитати файл %1:
-%2.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/FileEditorMdiSubWindow.cpp" line="127"/>
-        <source>File loaded.</source>
-        <translation>Файл завантажено.</translation>
+        <location line="+43"/>
+        <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 filename="../src/FileEditorMdiSubWindow.cpp" line="153"/>
-        <source>Do you want to save the current file
-%1 ?</source>
-        <translation>Справді зберегти поточний файл
-%1?</translation>
+        <location line="+26"/>
+        <source>The associated file editor tab has disappeared.  It was likely closed by some means.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/FileEditorMdiSubWindow.cpp" line="208"/>
-        <source>Cannot write file %1:
-%2.</source>
-        <translation>Не вдалося зберегти файл %1:
-%2.</translation>
+        <location line="+141"/>
+        <source>&amp;%1 %2</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/FileEditorMdiSubWindow.cpp" line="220"/>
-        <source>File %1 saved</source>
-        <translation>Файл %1 збережено</translation>
+        <location line="+130"/>
+        <source>&amp;New File</source>
+        <translation type="unfinished">&amp;Створити</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>&amp;Open File</source>
+        <translation type="unfinished">&amp;Відкрити</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>&amp;Save File</source>
+        <translation type="unfinished">&amp;Зберегти</translation>
     </message>
     <message>
-        <location filename="../src/FileEditorMdiSubWindow.cpp" line="383"/>
-        <source>&amp;Close File</source>
-        <translation>За&amp;крити</translation>
+        <location line="+4"/>
+        <source>Save File &amp;As</source>
+        <translation type="unfinished">Зберегти &amp;як</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>&amp;Undo</source>
+        <translation type="unfinished">В&amp;ернути</translation>
     </message>
     <message>
-        <location filename="../src/FileEditorMdiSubWindow.cpp" line="386"/>
-        <source>&amp;New File</source>
-        <translation>&amp;Створити</translation>
+        <location line="+3"/>
+        <source>&amp;Redo</source>
+        <translation type="unfinished">П&amp;овторити</translation>
     </message>
     <message>
-        <location filename="../src/FileEditorMdiSubWindow.cpp" line="389"/>
-        <source>&amp;Open File</source>
-        <translation>&amp;Відкрити</translation>
+        <location line="+3"/>
+        <source>&amp;Copy</source>
+        <translation type="unfinished">&amp;Копіювати</translation>
     </message>
     <message>
-        <location filename="../src/FileEditorMdiSubWindow.cpp" line="392"/>
-        <source>&amp;Save File</source>
-        <translation>&amp;Зберегти</translation>
+        <location line="+3"/>
+        <source>Cu&amp;t</source>
+        <translation type="unfinished">Виріза&amp;ти</translation>
     </message>
     <message>
-        <location filename="../src/FileEditorMdiSubWindow.cpp" line="395"/>
-        <source>Save File &amp;As</source>
-        <translation>Зберегти &amp;як</translation>
+        <location line="+4"/>
+        <source>Paste</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/FileEditorMdiSubWindow.cpp" line="398"/>
-        <source>&amp;Undo</source>
-        <translation>В&amp;ернути</translation>
+        <location line="+1"/>
+        <source>&amp;Next Bookmark</source>
+        <translation type="unfinished">До &amp;наступної закладки</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Pre&amp;vious Bookmark</source>
+        <translation type="unfinished">До &amp;попередньої закладки</translation>
     </message>
     <message>
-        <location filename="../src/FileEditorMdiSubWindow.cpp" line="401"/>
-        <source>&amp;Redo</source>
-        <translation>П&amp;овторити</translation>
+        <location line="+1"/>
+        <source>Toggle &amp;Bookmark</source>
+        <translation type="unfinished">В&amp;становити/видалити закладку</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;Remove All Bookmarks</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/FileEditorMdiSubWindow.cpp" line="402"/>
-        <source>&amp;Copy</source>
-        <translation>&amp;Копіювати</translation>
+        <location line="+4"/>
+        <source>&amp;Next breakpoint</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/FileEditorMdiSubWindow.cpp" line="403"/>
-        <source>Cu&amp;t</source>
-        <translation>Виріза&amp;ти</translation>
+        <location line="+3"/>
+        <source>Pre&amp;vious breakpoint</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/FileEditorMdiSubWindow.cpp" line="404"/>
-        <source>&amp;Paste</source>
-        <translation>&amp;Вставити</translation>
+        <location line="+3"/>
+        <source>Toggle &amp;breakpoint</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/FileEditorMdiSubWindow.cpp" line="405"/>
-        <source>&amp;Next Bookmark</source>
-        <translation>До &amp;наступної закладки</translation>
+        <location line="+3"/>
+        <source>&amp;Remove All breakpoints</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/FileEditorMdiSubWindow.cpp" line="406"/>
-        <source>Pre&amp;vious Bookmark</source>
-        <translation>До &amp;попередньої закладки</translation>
+        <location line="+2"/>
+        <source>&amp;Comment Selected Text</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/FileEditorMdiSubWindow.cpp" line="407"/>
-        <source>Toggle &amp;Bookmark</source>
-        <translation>В&amp;становити/видалити закладку</translation>
+        <location line="+1"/>
+        <source>&amp;Uncomment Selected Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>&amp;Find and Replace</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/FileEditorMdiSubWindow.cpp" line="410"/>
-        <source>&amp;Run File</source>
-        <translation>&amp;Виконати файл</translation>
+        <location line="+3"/>
+        <source>Save File And Run</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+51"/>
+        <source>&amp;File</source>
+        <translation type="unfinished">&amp;Файл</translation>
     </message>
     <message>
-        <location filename="../src/FileEditorMdiSubWindow.cpp" line="449"/>
-        <source>&amp;File</source>
-        <translation>&amp;Файл</translation>
+        <location line="+6"/>
+        <source>Open &amp;Recent</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/FileEditorMdiSubWindow.cpp" line="457"/>
+        <location line="+8"/>
         <source>&amp;Edit</source>
-        <translation>&amp;Правка</translation>
+        <translation type="unfinished">&amp;Правка</translation>
     </message>
     <message>
-        <location filename="../src/FileEditorMdiSubWindow.cpp" line="469"/>
+        <location line="+19"/>
+        <source>&amp;Debug</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
         <source>&amp;Run</source>
-        <translation>&amp;Виконання</translation>
+        <translation type="unfinished">&amp;Виконання</translation>
     </message>
 </context>
 <context>
-    <name>FilesDockWidget</name>
+    <name>file_editor_tab</name>
     <message>
-        <source>Current Folder</source>
-        <translation type="obsolete">Поточний каталог</translation>
+        <location filename="../src/m-editor/file-editor-tab.cc" line="+687"/>
+        <location line="+102"/>
+        <location line="+98"/>
+        <location line="+63"/>
+        <location line="+14"/>
+        <source>Octave Editor</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/FilesDockWidget.cpp" line="32"/>
-        <source>Current Directory</source>
-        <translation>Поточний каталог</translation>
+        <location line="-276"/>
+        <source>The file &apos;%1&apos; has been modified. Do you want to save the changes?</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/FilesDockWidget.cpp" line="46"/>
-        <source>Move up one directory.</source>
-        <translation>Перейти вгору деревом каталогів.</translation>
+        <location line="+102"/>
+        <source>Could not open file %1 for write:
+%2.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/FilesDockWidget.cpp" line="49"/>
-        <source>Enter the path or filename.</source>
-        <translation>Введіть повний шлях до файлу або назву файлу.</translation>
+        <location line="+98"/>
+        <source>File not saved!  You&apos;ve selected a file name
+
+     %1
+
+which is the same as the current file name.  Use Save to overwrite.  (Could allow overwriting, with message, if that is what folks want.)</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/FilesDockWidget.cpp" line="78"/>
-        <source>Doubleclick a file to open it.</source>
-        <translation>Подвійне клацання відкриє файл.</translation>
+        <location line="+63"/>
+        <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>
+    <message>
+        <location line="+14"/>
+        <source>It seems that &apos;%1&apos; has been deleted or renamed. Do you want to save it now?</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>HistoryDockWidget</name>
+    <name>files_dock_widget</name>
     <message>
-        <location filename="../src/HistoryDockWidget.cpp" line="36"/>
-        <source>Doubleclick a command to transfer it to the terminal.</source>
-        <translation>Подвійне клацання перенесе команду до командного рядку.</translation>
+        <location filename="../src/files-dockwidget.cc" line="+43"/>
+        <source>Current Directory</source>
+        <translation type="unfinished">Поточний каталог</translation>
     </message>
     <message>
-        <location filename="../src/HistoryDockWidget.cpp" line="38"/>
-        <source>Enter text to filter the command history.</source>
-        <translation>Введіть текст для фільтрування історії виконаних команд.</translation>
+        <location line="+11"/>
+        <source>Move up one directory.</source>
+        <translation type="unfinished">Перейти вгору деревом каталогів.</translation>
     </message>
     <message>
-        <location filename="../src/HistoryDockWidget.cpp" line="41"/>
-        <source>Command History</source>
-        <translation>Історія виконаних команд</translation>
+        <location line="+4"/>
+        <source>Enter the path or filename.</source>
+        <translation type="unfinished">Введіть повний шлях до файлу або назву файлу.</translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>Doubleclick a file to open it.</source>
+        <translation type="unfinished">Подвійне клацання відкриє файл.</translation>
     </message>
 </context>
 <context>
-    <name>LexerOctaveGui</name>
+    <name>find_dialog</name>
+    <message>
+        <location filename="../src/m-editor/find-dialog.cc" line="+58"/>
+        <source>Find &amp;what:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Re&amp;place with:</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
-        <location filename="../src/lexer/lexeroctavegui.cpp" line="111"/>
-        <source>Default</source>
-        <translation>Стандартні налаштування</translation>
+        <location line="+4"/>
+        <source>Match &amp;case</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Search from &amp;start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;Wrap while searching</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/lexer/lexeroctavegui.cpp" line="113"/>
-        <source>Comment</source>
-        <translation>Коментар</translation>
+        <location line="+2"/>
+        <source>&amp;Find Next</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>&amp;Replace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Replace &amp;All</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/lexer/lexeroctavegui.cpp" line="115"/>
-        <source>Command</source>
-        <translation>Команда</translation>
+        <location line="+2"/>
+        <source>&amp;More</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/lexer/lexeroctavegui.cpp" line="117"/>
-        <source>Number</source>
-        <translation>Число</translation>
+        <location line="+11"/>
+        <source>&amp;Whole words</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Regular E&amp;xpressions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Search &amp;backward</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/lexer/lexeroctavegui.cpp" line="119"/>
-        <source>Keyword</source>
-        <translation>Зарезервоване слово</translation>
+        <location line="+1"/>
+        <source>Search se&amp;lection</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>history_dock_widget</name>
+    <message>
+        <location filename="../src/history-dockwidget.cc" line="+55"/>
+        <source>Doubleclick a command to transfer it to the terminal.</source>
+        <translation type="unfinished">Подвійне клацання перенесе команду до командного рядку.</translation>
     </message>
     <message>
-        <location filename="../src/lexer/lexeroctavegui.cpp" line="121"/>
-        <source>Single-quoted string</source>
-        <translation>Рядок в одинарних лапках</translation>
+        <location line="+6"/>
+        <source>Enter text to filter the command history.</source>
+        <translation type="unfinished">Введіть текст для фільтрування історії виконаних команд.</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Command History</source>
+        <translation type="unfinished">Історія виконаних команд</translation>
+    </message>
+    <message>
+        <location line="+42"/>
+        <source>Copy</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/lexer/lexeroctavegui.cpp" line="123"/>
-        <source>Operator</source>
-        <translation>Оператор</translation>
+        <location line="+1"/>
+        <source>Evaluate</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>lexer_octave_gui</name>
+    <message>
+        <location filename="../src/m-editor/lexer-octave-gui.cc" line="+145"/>
+        <source>Default</source>
+        <translation type="unfinished">Стандартні налаштування</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Comment</source>
+        <translation type="unfinished">Коментар</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Command</source>
+        <translation type="unfinished">Команда</translation>
     </message>
     <message>
-        <location filename="../src/lexer/lexeroctavegui.cpp" line="125"/>
-        <source>Identifier</source>
-        <translation>Ідентифікатор</translation>
+        <location line="+2"/>
+        <source>Number</source>
+        <translation type="unfinished">Число</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Keyword</source>
+        <translation type="unfinished">Зарезервоване слово</translation>
     </message>
     <message>
-        <location filename="../src/lexer/lexeroctavegui.cpp" line="127"/>
+        <location line="+2"/>
+        <source>Single-quoted string</source>
+        <translation type="unfinished">Рядок в одинарних лапках</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Operator</source>
+        <translation type="unfinished">Оператор</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Identifier</source>
+        <translation type="unfinished">Ідентифікатор</translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>Double-quoted string</source>
-        <translation>Рядок у подвійних лапках</translation>
+        <translation type="unfinished">Рядок у подвійних лапках</translation>
     </message>
 </context>
 <context>
-    <name>MainWindow</name>
+    <name>main_window</name>
+    <message>
+        <location filename="../src/main-window.cc" line="+135"/>
+        <source>Save Workspace</source>
+        <translation type="unfinished">Зберегти область змінних</translation>
+    </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="47"/>
-        <source>Opening file.</source>
-        <translation>Відкривається файл.</translation>
+        <location line="+11"/>
+        <source>Load Workspace</source>
+        <translation type="unfinished">Завантажити область змінних</translation>
+    </message>
+    <message>
+        <location line="+155"/>
+        <source>Set working direcotry</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="124"/>
-        <source>Save Workspace</source>
-        <translation>Зберегти область змінних</translation>
+        <location line="+186"/>
+        <location line="+381"/>
+        <source>About Octave</source>
+        <translation type="unfinished">Про Octave</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="134"/>
-        <source>Load Workspace</source>
-        <translation>Завантажити область змінних</translation>
+        <location line="-290"/>
+        <source>View the variables in the active workspace.</source>
+        <translation type="unfinished">Перегляд змісту поточної області змінних.</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Browse and search the command history.</source>
+        <translation type="unfinished">Перегляд і пошук серед історії виконаних команд.</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Browse your files.</source>
+        <translation type="unfinished">Переглянути файли.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="226"/>
-        <location filename="../src/MainWindow.cpp" line="362"/>
-        <source>About Octave</source>
-        <translation>Про Octave</translation>
+        <location line="+2"/>
+        <source>See the documentation for help.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+39"/>
+        <source>&amp;File</source>
+        <translation type="unfinished">&amp;Файл</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>New</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Script</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="238"/>
-        <source>Saving data and shutting down.</source>
-        <translation>Зберегти дані і завершити роботу.</translation>
+        <location line="+3"/>
+        <source>Function</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Class</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="276"/>
-        <source>View the variables in the active workspace.</source>
-        <translation>Перегляд змісту поточної області змінних.</translation>
+        <location line="+2"/>
+        <source>Enumeration</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="278"/>
-        <source>Browse and search the command history.</source>
-        <translation>Перегляд і пошук серед історії виконаних команд.</translation>
+        <location line="+2"/>
+        <source>Figure</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Variable</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="280"/>
-        <source>Browse your files.</source>
-        <translation>Переглянути файли.</translation>
+        <location line="+2"/>
+        <source>Model</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>GUI</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Open...</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="294"/>
-        <source>Terminal</source>
-        <translation>Командний рядок</translation>
+        <location line="+4"/>
+        <source>Close Command Window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Import Data...</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="298"/>
-        <source>Enter your commands into the Octave terminal.</source>
-        <translation>Введіть команди до командного рядка Octave.</translation>
+        <location line="+4"/>
+        <source>Save Workspace...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Preferences...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Page Setup...</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="307"/>
-        <source>Documentation</source>
-        <translation>Документація</translation>
+        <location line="+3"/>
+        <source>Print</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="311"/>
-        <source>Browse the Octave documentation for help.</source>
-        <translation>Переглянути документацію до Octave.</translation>
+        <location line="+4"/>
+        <source>Print Selection...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Exit</source>
+        <translation type="unfinished">Вийти</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>&amp;Edit</source>
+        <translation type="unfinished">&amp;Правка</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="320"/>
-        <source>Chat</source>
-        <translation>Чат</translation>
+        <location line="+2"/>
+        <source>Undo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Redo</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="323"/>
-        <source>Instantly chat with other Octave users for help.</source>
-        <translation>Чат з користувачами Octave.</translation>
+        <location line="+5"/>
+        <source>Cut</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="330"/>
-        <source>Octave</source>
-        <translation>Octave</translation>
+        <location line="+4"/>
+        <source>Copy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Paste</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="331"/>
-        <source>Settings</source>
-        <translation>Налаштування</translation>
+        <location line="+4"/>
+        <source>Paste To Workspace...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Select All</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="333"/>
-        <source>Exit</source>
-        <translation>Вийти</translation>
+        <location line="+6"/>
+        <source>Find...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Find Files...</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="335"/>
-        <source>Interface</source>
-        <translation>Інтерфейс</translation>
+        <location line="+7"/>
+        <source>Clear Command Window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Clear Command History</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Clear Workspace</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="337"/>
-        <source>Align Windows</source>
-        <translation>Вирівняти вікна</translation>
+        <location line="+2"/>
+        <source>De&amp;bug</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Step</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Step in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Step out</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="339"/>
-        <location filename="../src/MainWindow.cpp" line="351"/>
-        <source>Workspace</source>
-        <translation>Область змінних</translation>
+        <location line="+8"/>
+        <source>Continue</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Exit Debug Mode</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="342"/>
-        <source>History</source>
-        <translation>Історія виконаних команд</translation>
+        <location line="+10"/>
+        <source>&amp;Desktop</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="345"/>
-        <source>File Browser</source>
-        <translation>Файловий менеджер</translation>
+        <location line="+1"/>
+        <source>Load workspace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>&amp;Window</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="349"/>
-        <source>Open New Editor Window</source>
-        <translation>Відкрити нове вікно редактора</translation>
+        <location line="+2"/>
+        <source>Show Command Window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Show Command History</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Show Current Directory</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="352"/>
-        <source>Load</source>
-        <translation>Завантажити</translation>
+        <location line="+6"/>
+        <source>Show Workspace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Show Editor</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="353"/>
-        <source>Save</source>
-        <translation>Зберегти</translation>
+        <location line="+5"/>
+        <source>Show Documentation</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="355"/>
-        <source>Clear</source>
-        <translation>Очистити</translation>
+        <location line="+7"/>
+        <source>Command Window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Command History</source>
+        <translation type="unfinished">Історія виконаних команд</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="357"/>
-        <source>Community</source>
-        <translation>Спільнота</translation>
+        <location line="+4"/>
+        <source>Current Directory</source>
+        <translation type="unfinished">Поточний каталог</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="358"/>
-        <source>Report Bug</source>
-        <translation>Повідомити про помилку</translation>
+        <location line="+4"/>
+        <source>Workspace</source>
+        <translation type="unfinished">Область змінних</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Editor</source>
+        <translation type="unfinished">Редактор</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Documentation</source>
+        <translation type="unfinished">Документація</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="359"/>
-        <source>Agora</source>
-        <translation>Agora</translation>
+        <location line="+5"/>
+        <source>Reset Windows</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>&amp;Help</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="360"/>
-        <source>Octave Forge</source>
-        <translation>Octave Forge</translation>
+        <location line="+2"/>
+        <source>Report Bug</source>
+        <translation type="unfinished">Повідомити про помилку</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="363"/>
-        <source>About Qt</source>
-        <translation>Про Qt</translation>
+        <location line="+2"/>
+        <source>Visit Agora</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Visit Octave Forge</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Current Directory:</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>SettingsDialog</name>
+    <name>settings_dialog</name>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="29"/>
+        <location filename="../src/settings-dialog.ui" line="+29"/>
+        <location filename="../src/ui-settings-dialog.h" line="+461"/>
         <source>Settings</source>
-        <translation>Налаштування</translation>
+        <translation type="unfinished">Налаштування</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <location filename="../src/ui-settings-dialog.h" line="+5"/>
+        <source>General</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="39"/>
-        <source>Chat</source>
-        <translation>Чат</translation>
+        <location line="+18"/>
+        <location filename="../src/ui-settings-dialog.h" line="-4"/>
+        <source>Icon set for dock widget</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="47"/>
-        <source>Connect to #octave on startup</source>
-        <translation>З&apos;єднатися з #octave при запуску</translation>
+        <location line="+21"/>
+        <location filename="../src/ui-settings-dialog.h" line="+1"/>
+        <source>Octave logo only</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <location filename="../src/ui-settings-dialog.h" line="+1"/>
+        <source>Letter icons</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <location filename="../src/ui-settings-dialog.h" line="+1"/>
+        <source>Graphic  icons</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="57"/>
-        <source>Show message of the day</source>
-        <translation>Показувати пораду дня</translation>
+        <location line="+7"/>
+        <location filename="../src/ui-settings-dialog.h" line="+11"/>
+        <source>Editor</source>
+        <translation type="unfinished">Редактор</translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="64"/>
-        <source>Show topic</source>
-        <translation>Показувати тему чату при з&apos;єднанні</translation>
+        <location line="+10"/>
+        <location line="+147"/>
+        <location filename="../src/ui-settings-dialog.h" line="-9"/>
+        <location line="+10"/>
+        <source>Font</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="71"/>
-        <source>Automatically identify on NickServ</source>
-        <translation>Автоматично ідентифікуватися в NickServ</translation>
+        <location line="-130"/>
+        <location line="+147"/>
+        <location filename="../src/ui-settings-dialog.h" line="-9"/>
+        <location line="+10"/>
+        <source>Font Size</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="78"/>
-        <source>Warning: Your password will be stored in ~/.octavegui in human-readable format. Do not enter your password if you worry about security issues.</source>
-        <translation>Попередження: пароль буде збережено в ~/.octavegui звичайним текстом. Не вводьте пароль, якщо переймаєтесь потенційними проблемами із захистом даних в програмі.</translation>
+        <location line="-109"/>
+        <location filename="../src/ui-settings-dialog.h" line="-9"/>
+        <source>Show line numbers</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="103"/>
-        <location filename="../src/SettingsDialog.ui" line="311"/>
-        <source>Password:</source>
-        <translation>Пароль:</translation>
+        <location line="+10"/>
+        <location filename="../src/ui-settings-dialog.h" line="+1"/>
+        <source>Highlight current line</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <location filename="../src/ui-settings-dialog.h" line="+1"/>
+        <source>Code completion</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="125"/>
-        <source>Editor</source>
-        <translation>Редактор</translation>
+        <location line="+10"/>
+        <location filename="../src/ui-settings-dialog.h" line="+1"/>
+        <source>Show complete path in window title</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="133"/>
+        <location line="+7"/>
+        <location filename="../src/ui-settings-dialog.h" line="+1"/>
+        <source>Restore tabs from previous session on startup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+27"/>
+        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Use custom file editor:</source>
-        <translation>Використовувати інший редактор:</translation>
+        <translation type="unfinished">Використовувати інший редактор:</translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="143"/>
+        <location line="+10"/>
+        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>emacs</source>
-        <translation>emacs</translation>
+        <translation type="unfinished">emacs</translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="166"/>
-        <source>File Browser</source>
-        <translation>Файловий менеджер</translation>
+        <location line="+10"/>
+        <location filename="../src/ui-settings-dialog.h" line="+6"/>
+        <source>Terminal</source>
+        <translation type="unfinished">Командний рядок</translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="172"/>
-        <source>Show filenames</source>
-        <translation>Показувати назви файлів</translation>
+        <location line="+62"/>
+        <location filename="../src/ui-settings-dialog.h" line="-2"/>
+        <source>Cursor type:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+27"/>
+        <location filename="../src/ui-settings-dialog.h" line="+1"/>
+        <source>Cursor blinking</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="179"/>
-        <source>Show file size</source>
-        <translation>Показувати розмір файлів</translation>
+        <location line="+36"/>
+        <location filename="../src/ui-settings-dialog.h" line="+8"/>
+        <source>File Browser</source>
+        <translation type="unfinished">Файловий менеджер</translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="186"/>
-        <source>Show file type</source>
-        <translation>Показувати типи файлів</translation>
+        <location line="+6"/>
+        <location filename="../src/ui-settings-dialog.h" line="-6"/>
+        <source>Show filenames</source>
+        <translation type="unfinished">Показувати назви файлів</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location filename="../src/ui-settings-dialog.h" line="+1"/>
+        <source>Show file size</source>
+        <translation type="unfinished">Показувати розмір файлів</translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="193"/>
+        <location line="+7"/>
+        <location filename="../src/ui-settings-dialog.h" line="+1"/>
+        <source>Show file type</source>
+        <translation type="unfinished">Показувати типи файлів</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Show date of last modification</source>
-        <translation>Показувати дату останньої зміни</translation>
+        <translation type="unfinished">Показувати дату останньої зміни</translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="200"/>
+        <location line="+7"/>
+        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Show hidden files</source>
-        <translation>Показувати приховані файли</translation>
+        <translation type="unfinished">Показувати приховані файли</translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="207"/>
+        <location line="+7"/>
+        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Alternating row colors</source>
-        <translation>Чергувати колір рядків</translation>
+        <translation type="unfinished">Чергувати колір рядків</translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="215"/>
+        <location line="+21"/>
+        <location filename="../src/ui-settings-dialog.h" line="+13"/>
         <source>Network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="221"/>
+        <location line="+6"/>
+        <location filename="../src/ui-settings-dialog.h" line="-11"/>
         <source>Use proxy server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="233"/>
+        <location line="+12"/>
+        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Proxy Type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="244"/>
+        <location line="+11"/>
+        <location filename="../src/ui-settings-dialog.h" line="+3"/>
         <source>HttpProxy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="249"/>
+        <location line="+5"/>
+        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Socks5Proxy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="260"/>
+        <location line="+11"/>
+        <location filename="../src/ui-settings-dialog.h" line="+2"/>
         <source>Hostname:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="277"/>
+        <location line="+17"/>
+        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Port:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="294"/>
+        <location line="+17"/>
+        <location filename="../src/ui-settings-dialog.h" line="+1"/>
         <source>Username:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="339"/>
-        <source>Reset to defaults</source>
-        <translation>Встановити стандартні налаштування</translation>
+        <location line="+17"/>
+        <location filename="../src/ui-settings-dialog.h" line="+1"/>
+        <source>Password:</source>
+        <translation type="unfinished">Пароль:</translation>
+    </message>
+</context>
+<context>
+    <name>terminal_dock_widget</name>
+    <message>
+        <location filename="../src/terminal-dockwidget.cc" line="+34"/>
+        <source>Command Window</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>webinfo</name>
+    <message>
+        <location filename="../src/qtinfo/webinfo.cc" line="+74"/>
+        <source>Type here and press &apos;Return&apos; to search</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/SettingsDialog.ui" line="362"/>
-        <source>Export</source>
-        <translation>Експортувати</translation>
-    </message>
-    <message>
-        <location filename="../src/SettingsDialog.ui" line="372"/>
-        <source>Import</source>
-        <translation>Імпортувати</translation>
+        <location line="+4"/>
+        <source>Global search</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>VariablesDockWidget</name>
+    <name>welcome_wizard</name>
     <message>
-        <location filename="../src/VariablesDockWidget.cpp" line="36"/>
-        <source>Workspace</source>
-        <translation>Область змінних</translation>
+        <location filename="../src/welcome-wizard.ui" line="+26"/>
+        <location filename="../src/ui-welcome-wizard.h" line="+286"/>
+        <source>Welcome to GNU Octave</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <location filename="../src/ui-welcome-wizard.h" line="+1"/>
+        <source>It appears that you have launched Octave GUI for the first time on this computer, since no configuration file could be found at &apos;~/.octave-gui&apos;. This wizard will guide you through the essential settings you should make before you can start using Octave GUI. If you want to transfer your settings you have previously made just close this dialog and copy over the settings file to your home folder. The presence of that file will automatically be detected and will skip this wizard. IMPORTANT: This wizard is not fully functional yet. Just click your way to the end and it will create a standard settings file.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/VariablesDockWidget.cpp" line="40"/>
-        <source>Name</source>
-        <translation>Ідентифікатор</translation>
+        <location line="+41"/>
+        <location line="+50"/>
+        <location line="+52"/>
+        <location line="+52"/>
+        <location filename="../src/ui-welcome-wizard.h" line="+1"/>
+        <location line="+2"/>
+        <location line="+2"/>
+        <location line="+2"/>
+        <source>Next</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/VariablesDockWidget.cpp" line="40"/>
-        <source>Type</source>
-        <translation>Тип</translation>
+        <location line="-124"/>
+        <location line="+52"/>
+        <location line="+52"/>
+        <location line="+87"/>
+        <location filename="../src/ui-welcome-wizard.h" line="-5"/>
+        <location line="+2"/>
+        <location line="+2"/>
+        <location line="+5"/>
+        <source>Previous</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-45"/>
+        <location filename="../src/ui-welcome-wizard.h" line="-3"/>
+        <source>Welcome to Octave!</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/VariablesDockWidget.cpp" line="40"/>
-        <source>Value</source>
-        <translation>Значення</translation>
+        <location line="+7"/>
+        <location filename="../src/ui-welcome-wizard.h" line="+1"/>
+        <source>This is the development version of Octave with the first official GUI.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/VariablesDockWidget.cpp" line="52"/>
-        <source>Local</source>
-        <translation>Локальна</translation>
+        <location line="+10"/>
+        <location filename="../src/ui-welcome-wizard.h" line="+1"/>
+        <source>You seem to run Octave GUI for the first time on this computer. This assistant will help you to configure this software installation. Click &apos;Finish&apos; to write a configuration file and launch Octave GUI.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/VariablesDockWidget.cpp" line="56"/>
-        <source>Global</source>
-        <translation>Глобальна</translation>
+        <location line="+48"/>
+        <location filename="../src/ui-welcome-wizard.h" line="+2"/>
+        <source>Finish</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>workspace_model</name>
+    <message>
+        <location filename="../src/workspace-model.cc" line="+42"/>
+        <source>Name</source>
+        <translation type="unfinished">Ідентифікатор</translation>
     </message>
     <message>
-        <location filename="../src/VariablesDockWidget.cpp" line="60"/>
-        <source>Persistent</source>
-        <translation>Статична</translation>
+        <location line="+0"/>
+        <source>Class</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Dimension</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/VariablesDockWidget.cpp" line="64"/>
-        <source>Hidden</source>
-        <translation>Прихована</translation>
+        <location line="+0"/>
+        <source>Value</source>
+        <translation type="unfinished">Значення</translation>
+    </message>
+</context>
+<context>
+    <name>workspace_view</name>
+    <message>
+        <location filename="../src/workspace-view.cc" line="+39"/>
+        <source>Workspace</source>
+        <translation type="unfinished">Область змінних</translation>
     </message>
 </context>
 </TS>
--- a/libgui/src/resource-manager.cc
+++ b/libgui/src/resource-manager.cc
@@ -56,7 +56,7 @@
 resource_manager::find_translator_file (const QString& language)
 {
   // TODO: Quick hack to be able to test language files.
-  return QString ("../languages/%1.qm").arg (language);
+  return QString ("libgui/languages/%1.qm").arg (language);
 }
 
 bool