# HG changeset patch
# User Rik <rik@octave.org>
# Date 1522684700 25200
# Node ID 56b26a3376d05c663a8e91c363cff6a312cb48ab
# Parent  e909207e9ff151d4201cc1ff3dfb472b6383da5b# Parent  3166d47adde28d1e3a1852864a6ecfe7fff7c481
maint: merge stable to default.

diff -r e909207e9ff1 -r 56b26a3376d0 configure.ac
--- a/configure.ac	Fri Mar 30 17:47:12 2018 -0400
+++ b/configure.ac	Mon Apr 02 08:58:20 2018 -0700
@@ -2720,7 +2720,7 @@
 
   ## Check Java version is recent enough.
   AC_MSG_CHECKING([for Java version])
-  java_version=[`"$JAVA" -version 2>&1 | $SED -n -e 's/^[^ ]* version[^0-9"]*"\([^"]*\)"/\1/p'`]
+  java_version=[`"$JAVA" -version 2>&1 | $SED -n -e 's/^[^ ]* version[^0-9"]*"\([^"]*\)".*/\1/p'`]
   AC_MSG_RESULT([$java_version])
   java_major=[`echo $java_version | $SED -e 's/^\([0-9][0-9]*\)\.\([0-9][0-9]*\)\..*$/\1/'`]
   java_minor=[`echo $java_version | $SED -e 's/^\([0-9][0-9]*\)\.\([0-9][0-9]*\)\..*$/\2/'`]
diff -r e909207e9ff1 -r 56b26a3376d0 etc/RELEASE.PROCESS
--- a/etc/RELEASE.PROCESS	Fri Mar 30 17:47:12 2018 -0400
+++ b/etc/RELEASE.PROCESS	Mon Apr 02 08:58:20 2018 -0700
@@ -3,11 +3,15 @@
    The format of the file is wiki markup and can be directly used as a page
    on wiki.octave.org.
 <!----------------------------------------------------------------------------->
-==4.2.0 Release Tasks==
+==4.4.0 Release Tasks==
 
 This page shows the tasks to be completed before the GUI release is finalized.
 
 <!----------------------------------------------------------------------------->
+# Update gnulib to latest version
+# Must occur first as it could resolve existing, or create new, bug reports
+#: Completion Date:
+<!----------------------------------------------------------------------------->
 # File bug reports for all outstanding bugs known, but not reported
 #* Put out a general call for reports on Octave-Maintainers and Octave-Help list
 #: Completion Date:
@@ -26,6 +30,7 @@
 <!----------------------------------------------------------------------------->
 # GPL License activities
 #* Update Copyright statements for all source controlled files
+#* Update dates in any other locations (launch message, citation, etc.)
 #* Add any new contributors to contributors.in
 #: Completion Date:
 <!----------------------------------------------------------------------------->
@@ -36,10 +41,10 @@
 #* C++ style check.  Completion Date:
 <!----------------------------------------------------------------------------->
 # Run lint checker on code base
-#* cppcheck, Clang sanitize, etc.
+#* cppcheck, -fsanitize, etc.
 #: Completion Date:
 <!----------------------------------------------------------------------------->
-# Verify 'make check' is passing
+# Verify 'make check' is passing on all buildbot combinations of OS and compilers
 #* Start discussion on octave-maintainers list about which failing tests must be fixed
 #* Identify and fix any tests determined critical in step above
 #: Completion Date:
diff -r e909207e9ff1 -r 56b26a3376d0 etc/icons/org.octave.Octave.appdata.xml
--- a/etc/icons/org.octave.Octave.appdata.xml	Fri Mar 30 17:47:12 2018 -0400
+++ b/etc/icons/org.octave.Octave.appdata.xml	Mon Apr 02 08:58:20 2018 -0700
@@ -25,7 +25,8 @@
   <name>GNU Octave</name>
   <summary>Interactive programming environment for numerical computations</summary>
   <summary xml:lang="de">Interaktive Programmierumgebung für numerische Berechnungen</summary>
-
+  <summary xml:lang="ja">数値計算のための対話的なプログラミング環境</summary>
+  <summary xml:lang="nl">Interactieve programmeeromgeving voor numerieke berekeningen</summary>
   <description>
     <p>
       GNU Octave is a high-level interpreted language, primarily intended for
diff -r e909207e9ff1 -r 56b26a3376d0 etc/icons/org.octave.Octave.desktop.in
--- a/etc/icons/org.octave.Octave.desktop.in	Fri Mar 30 17:47:12 2018 -0400
+++ b/etc/icons/org.octave.Octave.desktop.in	Mon Apr 02 08:58:20 2018 -0700
@@ -2,6 +2,8 @@
 Name=GNU Octave
 Comment=Interactive programming environment for numerical computations
 Comment[de]=Interaktive Programmierumgebung für numerische Berechnungen
+Comment[ja]=数値計算のための対話的なプログラミング環境
+Comment[nl]=Interactieve programmeeromgeving voor numerieke berekeningen
 TryExec=%OCTAVE_PREFIX%/bin/octave
 Exec=%OCTAVE_PREFIX%/bin/octave --gui %f
 Icon=octave
diff -r e909207e9ff1 -r 56b26a3376d0 libgui/graphics/GLCanvas.cc
--- a/libgui/graphics/GLCanvas.cc	Fri Mar 30 17:47:12 2018 -0400
+++ b/libgui/graphics/GLCanvas.cc	Mon Apr 02 08:58:20 2018 -0700
@@ -138,7 +138,7 @@
             octave::gl2ps_print (figObj, file_cmd.toStdString (),
                                  term.toStdString ());
           }
-        catch (octave::execution_exception e)
+        catch (octave::execution_exception& e)
           {
             octave_link::post_exception (std::current_exception ());
             end_rendering ();
diff -r e909207e9ff1 -r 56b26a3376d0 libgui/languages/de_DE.ts
--- a/libgui/languages/de_DE.ts	Fri Mar 30 17:47:12 2018 -0400
+++ b/libgui/languages/de_DE.ts	Mon Apr 02 08:58:20 2018 -0700
@@ -61,7 +61,7 @@
     <message>
         <location line="+6"/>
         <source>Background color, pink (255, 0, 255) means default</source>
-        <translation type="unfinished">Hintergrundfarbe, Pink (255,0,255) für Standard {255, 0, 255)?}</translation>
+        <translation>Hintergrundfarbe, Pink (255,0,255) für Standard</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -179,7 +179,7 @@
     <message>
         <location line="+41"/>
         <source>Octave Figure File (*.ofig);;Vector Image Formats (*.eps *.epsc *.pdf *.svg *.ps *.tikz);;Bitmap Image Formats (*.gif *.jpg *.png *.tiff)</source>
-        <translation type="unfinished"></translation>
+        <translation>Octave Abbildungsdatei (*.ofig);;Vektorgrafik-Formate (*.eps *.epsc *.pdf *.svg *.ps *.tikz);;Rastergrafik Formate (*.gif *.jpg *.png *.tiff)</translation>
     </message>
     <message>
         <location line="-576"/>
@@ -231,28 +231,28 @@
     <message>
         <location filename="../qterminal/libqterminal/unix/Filter.cpp" line="+628"/>
         <source>Open Link</source>
-        <translation type="unfinished"></translation>
+        <translation>Link öffnen</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Copy Link Address</source>
-        <translation type="unfinished"></translation>
+        <translation>Link-Adresse kopieren</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Send Email To...</source>
-        <translation type="unfinished"></translation>
+        <translation>E-Mail senden an...</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Copy Email Address</source>
-        <translation type="unfinished"></translation>
+        <translation>E-Mail-Adresse kopieren</translation>
     </message>
     <message>
         <location line="+10"/>
         <location line="+12"/>
         <source>Edit %1 at line %2</source>
-        <translation type="unfinished">Bearbeite %1 in Zeile %2</translation>
+        <translation>%1 in Zeile %2 bearbeiten</translation>
     </message>
 </context>
 <context>
@@ -418,7 +418,7 @@
     <message>
         <location filename="../src/dialog.cc" line="+276"/>
         <source>Select All</source>
-        <translation type="unfinished">Alles auswählen</translation>
+        <translation>Alles auswählen</translation>
     </message>
 </context>
 <context>
@@ -426,35 +426,37 @@
     <message>
         <location filename="../src/documentation.cc" line="+59"/>
         <source>Octave Documentation</source>
-        <translation type="unfinished"></translation>
+        <translation>Octave Dokumentation</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Could not setup the data required for the
 documentation viewer. Only help texts in
 the Console Widget will be available.</source>
-        <translation type="unfinished"></translation>
+        <translation>Die für den Dokumentationsbetrachter
+benötigten Dateien konnten nicht vorbereitet werden.
+Das Betrachten der Hilfe ist auf das Befehlsfenster beschränkt.</translation>
     </message>
     <message>
         <location line="+20"/>
         <source>Contents</source>
-        <translation type="unfinished"></translation>
+        <translation>Inhalt</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Enter text to search the indices</source>
-        <translation type="unfinished"></translation>
+        <translation>Text eingeben, um die Indizes zu durchsuchen</translation>
     </message>
     <message>
         <location line="+10"/>
         <location line="+37"/>
         <source>Search</source>
-        <translation type="unfinished"></translation>
+        <translation>Suchen</translation>
     </message>
     <message>
         <location line="-22"/>
         <source>Index</source>
-        <translation type="unfinished"></translation>
+        <translation>Index</translation>
     </message>
 </context>
 <context>
@@ -462,12 +464,12 @@
     <message>
         <location filename="../src/documentation-dock-widget.cc" line="+39"/>
         <source>Documentation</source>
-        <translation type="unfinished">Dokumentation</translation>
+        <translation>Dokumentation</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>See the documentation for help.</source>
-        <translation type="unfinished">Siehe Dokumentation für Hilfe.</translation>
+        <translation>Siehe Dokumentation für Hilfe.</translation>
     </message>
 </context>
 <context>
@@ -476,20 +478,21 @@
         <location filename="../src/external-editor-interface.cc" line="+63"/>
         <location line="+45"/>
         <source>Octave Editor</source>
-        <translation type="unfinished">Octave Editor</translation>
+        <translation>Octave Editor</translation>
     </message>
     <message>
         <location line="-44"/>
         <source>Could not start custom file editor
 %1</source>
-        <translation type="unfinished">Externer Editor kann nicht gestartet werden:
+        <translation>Externer Editor kann nicht gestartet werden:
 %1</translation>
     </message>
     <message>
         <location line="+45"/>
         <source>There is no custom editor configured yet.
 Do you want to open the preferences?</source>
-        <translation type="unfinished"></translation>
+        <translation>Es wurde noch kein externer Editor konfiguriert.
+Jetzt die Einstellungen öffnen?</translation>
     </message>
 </context>
 <context>
@@ -501,28 +504,28 @@
         <location line="+19"/>
         <location line="+25"/>
         <source>Octave Editor</source>
-        <translation type="unfinished">Octave Editor</translation>
+        <translation>Octave Editor</translation>
     </message>
     <message>
         <location line="-487"/>
         <source>File not saved! A file with the selected name
 %1
 is already open in the editor</source>
-        <translation type="unfinished">Die Datei wurde nicht gespeichert! Eine Datei mit dem gewählten Namen
+        <translation>Die Datei wurde nicht gespeichert! Eine Datei mit dem gewählten Namen
 %1
 ist im Editor bereits geöffnet</translation>
     </message>
     <message>
         <location line="+28"/>
         <source>The associated file editor tab has disappeared.</source>
-        <translation type="unfinished">Der zugehörige Editor-Reiter ist nicht mehr vorhanden.</translation>
+        <translation>Der zugehörige Editor-Reiter ist nicht mehr vorhanden.</translation>
     </message>
     <message>
         <location line="+416"/>
         <source>Could not open file
 %1
 for read: %2.</source>
-        <translation type="unfinished">Die Datei
+        <translation>Die Datei
 %1
 konnte nicht zum Lesen geöffnet werden:
 %2.</translation>
@@ -532,26 +535,26 @@
         <source>File
 %1
 does not exist. Do you want to create it?</source>
-        <translation type="unfinished">Die Datei
+        <translation>Die Datei
 %1
 existiert nicht. Soll sie erzeugt werden?</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Create</source>
-        <translation type="unfinished">Erzeugen</translation>
+        <translation>Erstellen</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Cancel</source>
-        <translation type="unfinished">Abbrechen</translation>
+        <translation>Abbrechen</translation>
     </message>
     <message>
         <location line="+20"/>
         <source>Could not open file
 %1
 for write: %2.</source>
-        <translation type="unfinished">Die Datei
+        <translation>Die Datei
 %1
 konnte nicht zum Schreiben geöffnet werden:
 %2.</translation>
@@ -559,377 +562,372 @@
     <message>
         <location line="+217"/>
         <source>&amp;File</source>
-        <translation type="unfinished">&amp;Datei</translation>
+        <translation>&amp;Datei</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>&amp;Recent Editor Files</source>
-        <translation type="unfinished">&amp;Zuletzt bearbeitete Dateien</translation>
+        <translation>&amp;Zuletzt bearbeitete Dateien</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>&amp;Edit Function</source>
-        <translation type="unfinished">Funktion b&amp;earbeiten</translation>
+        <translation>Funktion b&amp;earbeiten</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>&amp;Save File</source>
-        <translation type="unfinished">Datei &amp;speichern</translation>
+        <translation>Datei &amp;speichern</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Save File &amp;As...</source>
-        <translation type="unfinished">D&amp;atei speichern unter...</translation>
+        <translation>D&amp;atei speichern unter...</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>&amp;Close</source>
-        <translation type="unfinished">S&amp;chließen</translation>
+        <translation>S&amp;chließen</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Close All</source>
-        <translation type="unfinished">Alle schließen</translation>
+        <translation>Alle schließen</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Close Other Files</source>
-        <translation type="unfinished">Andere Dokumente schließen</translation>
+        <translation>Andere Dateien schließen</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Print...</source>
-        <translation type="unfinished">Drucken...</translation>
+        <translation>Drucken...</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>&amp;Edit</source>
-        <translation type="unfinished">&amp;Bearbeiten</translation>
+        <translation>&amp;Bearbeiten</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>&amp;Redo</source>
-        <translation type="unfinished">&amp;Wiederherstellen</translation>
+        <translation>&amp;Wiederherstellen</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Cu&amp;t</source>
-        <translation type="unfinished">&amp;Ausschneiden</translation>
+        <translation>&amp;Ausschneiden</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>&amp;Find and Replace...</source>
-        <translation type="unfinished">&amp;Suchen und Ersetzen...</translation>
+        <translation>&amp;Suchen und Ersetzen...</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Find &amp;Next...</source>
-        <translation type="unfinished">&amp;Nächsten suchen...</translation>
+        <translation>&amp;Nächsten suchen...</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Find &amp;Previous...</source>
-        <translation type="unfinished">&amp;Vorherigen suchen...</translation>
+        <translation>&amp;Vorherigen suchen...</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>&amp;Commands</source>
-        <translation type="unfinished">Befe&amp;hle</translation>
+        <translation>Befe&amp;hle</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Delete Line</source>
-        <translation type="unfinished">Zeile löschen</translation>
+        <translation>Zeile löschen</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Copy Line</source>
-        <translation type="unfinished">Zeile kopieren</translation>
+        <translation>Zeile kopieren</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Cut Line</source>
-        <translation type="unfinished">Zeile ausschneiden</translation>
+        <translation>Zeile ausschneiden</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Delete to Start of Word</source>
-        <translation type="unfinished">Bis zum Anfang des Wortes löschen</translation>
+        <translation>Bis zum Anfang des Wortes löschen</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Delete to End of Word</source>
-        <translation type="unfinished">Bis zum Ende des Wortes löschen</translation>
+        <translation>Bis zum Ende des Wortes löschen</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Delete to Start of Line</source>
-        <translation type="unfinished">Bis zum Anfang der Zeile löschen</translation>
+        <translation>Bis zum Anfang der Zeile löschen</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Delete to End of Line</source>
-        <translation type="unfinished">Bis zum Ende der Zeile löschen</translation>
+        <translation>Bis zum Ende der Zeile löschen</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Duplicate Selection/Line</source>
-        <translation type="unfinished">Zeile oder Auswahl duplizieren</translation>
+        <translation>Zeile oder Auswahl duplizieren</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Transpose Line</source>
-        <translation type="unfinished">Zeilen tauschen</translation>
+        <translation>Zeilen tauschen</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>&amp;Show Completion List</source>
-        <translation type="unfinished">Vervoll&amp;ständigungsliste anzeigen</translation>
+        <translation>Vervoll&amp;ständigungsliste anzeigen</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>&amp;Format</source>
-        <translation type="unfinished">&amp;Format</translation>
+        <translation>&amp;Format</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>&amp;Uppercase Selection</source>
-        <translation type="unfinished">Auswahl zu Großb&amp;uchstaben</translation>
+        <translation>Auswahl zu Großb&amp;uchstaben</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>&amp;Lowercase Selection</source>
-        <translation type="unfinished">Auswahl zu K&amp;leinbuchstaben</translation>
+        <translation>Auswahl zu K&amp;leinbuchstaben</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>&amp;Comment</source>
-        <translation type="unfinished">&amp;Kommentieren</translation>
+        <translation>&amp;Kommentieren</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>&amp;Uncomment</source>
-        <translation type="unfinished">Kommentar &amp;entfernen</translation>
+        <translation>Kommentar &amp;entfernen</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Comment (Choosing String)</source>
-        <translation type="unfinished"></translation>
+        <translation>Kommentieren (Syntax auswählen)</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>&amp;Indent Selection Rigidly</source>
-        <translation type="unfinished"></translation>
+        <translation>Auswahl eine Ebene &amp;einrücken</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>&amp;Unindent Selection Rigidly</source>
-        <translation type="unfinished"></translation>
+        <translation>Auswahl eine Ebene &amp;ausrücken</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Indent Code</source>
-        <translation type="unfinished"></translation>
+        <translation>Code automatisch einrücken</translation>
     </message>
     <message>
         <location line="+7"/>
-        <source>convert line endings to &amp;windows (crlf)</source>
-        <translation type="unfinished"></translation>
+        <source>Convert Line Endings to &amp;Windows (CRLF)</source>
+        <translation>Zeilenenden für &amp;Windows (CRLF) umwandeln</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Convert Line Endings to &amp;Unix (LF)</source>
-        <translation type="unfinished">Zeilenenden für &amp;Unix (LF) umwandeln</translation>
+        <translation>Zeilenenden für &amp;Unix umwandeln (LF)</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Convert Line Endings to &amp;Mac (CR)</source>
-        <translation type="unfinished">Zeilenenden für &amp;Mac (CR) umwandeln</translation>
+        <translation>Zeilenenden für &amp;Mac umwandeln (CR)</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Navi&amp;gation</source>
-        <translation type="unfinished">Navi&amp;gation</translation>
+        <translation>Navi&amp;gation</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Go &amp;to Line...</source>
-        <translation type="unfinished">&amp;Gehe zu Zeile...</translation>
+        <translation>&amp;Gehe zu Zeile...</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Move to Matching Brace</source>
-        <translation type="unfinished"></translation>
+        <translation>Zur zugehörigen Klammer springen</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Select to Matching Brace</source>
-        <translation type="unfinished"></translation>
+        <translation>Bis zur zugehörigen Klammer auswählen</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>&amp;Next Bookmark</source>
-        <translation type="unfinished">&amp;Nächstes Lesezeichen</translation>
+        <translation>&amp;Nächstes Lesezeichen</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Pre&amp;vious Bookmark</source>
-        <translation type="unfinished">&amp;Vorheriges Lesezeichen</translation>
+        <translation>&amp;Vorheriges Lesezeichen</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Toggle &amp;Bookmark</source>
-        <translation type="unfinished">&amp;Lesezeichen umschalten</translation>
+        <translation>&amp;Lesezeichen umschalten</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>&amp;Remove All Bookmarks</source>
-        <translation type="unfinished">Alle Lesezeichen &amp;entfernen</translation>
+        <translation>Alle Lesezeichen &amp;entfernen</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>&amp;Preferences...</source>
-        <translation type="unfinished">&amp;Einstellungen...</translation>
+        <translation>&amp;Einstellungen...</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>&amp;Styles Preferences...</source>
-        <translation type="unfinished">&amp;Stil-Einstellungen...</translation>
+        <translation>&amp;Stil-Einstellungen...</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>&amp;View</source>
-        <translation type="unfinished">An&amp;sicht</translation>
+        <translation>An&amp;sicht</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>&amp;Editor</source>
-        <translation type="unfinished">&amp;Editor</translation>
+        <translation>&amp;Editor</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Show &amp;Line Numbers</source>
-        <translation type="unfinished">Zei&amp;lennummern anzeigen</translation>
+        <translation>Zei&amp;lennummern anzeigen</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Show &amp;Whitespace Characters</source>
-        <translation type="unfinished">Lee&amp;rzeichen anzeigen</translation>
+        <translation>Lee&amp;rzeichen anzeigen</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Show Line &amp;Endings</source>
-        <translation type="unfinished">Z&amp;eilenenden anzeigen</translation>
+        <translation>Z&amp;eilenenden anzeigen</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Show &amp;Indentation Guides</source>
-        <translation type="unfinished">E&amp;inrückungshinweise anzeigen</translation>
+        <translation>E&amp;inrückungshinweise anzeigen</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Show Long Line &amp;Marker</source>
-        <translation type="unfinished">&amp;Markierung langer Zeilen anzeigen</translation>
+        <translation>&amp;Markierung langer Zeilen anzeigen</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Show &amp;Toolbar</source>
-        <translation type="unfinished">&amp;Werkzeugleiste anzeigen</translation>
+        <translation>&amp;Werkzeugleiste anzeigen</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Show &amp;Statusbar</source>
-        <translation type="unfinished">&amp;Statusleiste anzeigen</translation>
+        <translation>&amp;Statusleiste anzeigen</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Show &amp;Horizontal Scrollbar</source>
-        <translation type="unfinished">&amp;Horizontale Bildlaufleiste anzeigen</translation>
+        <translation>&amp;Horizontale Bildlaufleiste anzeigen</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Zoom &amp;In</source>
-        <translation type="unfinished">Ver&amp;größern</translation>
+        <translation>Ver&amp;größern</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Zoom &amp;Out</source>
-        <translation type="unfinished">Ver&amp;kleinern</translation>
+        <translation>Ver&amp;kleinern</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>&amp;Normal Size</source>
-        <translation type="unfinished">&amp;Normale Größe</translation>
+        <translation>&amp;Normale Größe</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>&amp;Debug</source>
-        <translation type="unfinished">&amp;Debuggen</translation>
+        <translation>&amp;Debuggen</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Toggle &amp;Breakpoint</source>
-        <translation type="unfinished">Haltepunkt &amp;umschalten</translation>
+        <translation>Haltepunkt &amp;umschalten</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>&amp;Next Breakpoint</source>
-        <translation type="unfinished">&amp;Nächster Haltepunkt</translation>
+        <translation>&amp;Nächster Haltepunkt</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Pre&amp;vious Breakpoint</source>
-        <translation type="unfinished">&amp;Vorheriger Haltepunkt</translation>
+        <translation>&amp;Vorheriger Haltepunkt</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>&amp;Remove All Breakpoints</source>
-        <translation type="unfinished">Alle Haltepunkte entfe&amp;rnen</translation>
+        <translation>Alle Haltepunkte entfe&amp;rnen</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>&amp;Run</source>
-        <translation type="unfinished">&amp;Ausführen</translation>
+        <translation>&amp;Ausführen</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Save File and Run</source>
-        <translation type="unfinished">Datei speichern und ausführen</translation>
+        <translation>Datei speichern und ausführen</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Run &amp;Selection</source>
-        <translation type="unfinished">Markierten Quellcode au&amp;sführen</translation>
+        <translation>Markierten Quellcode au&amp;sführen</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>&amp;Help</source>
-        <translation type="unfinished">&amp;Hilfe</translation>
+        <translation>&amp;Hilfe</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>&amp;Help on Keyword</source>
-        <translation type="unfinished">&amp;Hilfe zum Schlüsselwort</translation>
+        <translation>&amp;Hilfe zum Schlüsselwort</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>&amp;Documentation on Keyword</source>
-        <translation type="unfinished">&amp;Dokumentation zum Schlüsselwort</translation>
+        <translation>&amp;Dokumentation zum Schlüsselwort</translation>
     </message>
     <message>
         <location line="+25"/>
         <source>Recent Files</source>
-        <translation type="unfinished">Zuletzt bearbeitete Dateien</translation>
+        <translation>Zuletzt bearbeitete Dateien</translation>
     </message>
     <message>
         <location line="+65"/>
         <source>Editor</source>
-        <translation type="unfinished">Editor</translation>
-    </message>
-    <message>
-        <location line="+207"/>
-        <source>&amp;%1 %2</source>
-        <translation type="unfinished">&amp;%1 %2</translation>
+        <translation>Editor</translation>
     </message>
 </context>
 <context>
@@ -937,27 +935,27 @@
     <message>
         <location filename="../src/m-editor/file-editor-tab.cc" line="+140"/>
         <source>line:</source>
-        <translation type="unfinished">Zeile:</translation>
+        <translation>Zeile:</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>col:</source>
-        <translation type="unfinished">Spalte:</translation>
+        <translation>Spalte:</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>encoding:</source>
-        <translation type="unfinished">Kodierung:</translation>
+        <translation>Kodierung:</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>eol:</source>
-        <translation type="unfinished">Zeilenende:</translation>
+        <translation>Zeilenende:</translation>
     </message>
     <message>
         <location line="+231"/>
         <source>Breakpoint condition</source>
-        <translation type="unfinished">Bedingung für Haltepunkt</translation>
+        <translation>Bedingung für Haltepunkt</translation>
     </message>
     <message>
         <location line="+91"/>
@@ -969,46 +967,47 @@
         <location line="+85"/>
         <location line="+36"/>
         <source>Octave Editor</source>
-        <translation type="unfinished">Octave Editor</translation>
+        <translation>Octave Editor</translation>
     </message>
     <message>
         <location line="-1896"/>
         <source>Cannot add breakpoint to modified file.
 Save and add breakpoint, or cancel?</source>
-        <translation type="unfinished">Haltepunkt kann nicht in einer geänderten Datei gesetzt werden.
+        <translation>Haltepunkt kann nicht in einer geänderten Datei gesetzt werden.
 Speichern und Haltepunkt setzen oder abbrechen?</translation>
     </message>
     <message>
         <location line="+837"/>
         <source>Goto line</source>
-        <translation type="unfinished">Gehe zu Zeile</translation>
+        <translation>Gehe zu Zeile</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Line number</source>
-        <translation type="unfinished">Zeilennummer</translation>
+        <translation>Zeilennummer</translation>
     </message>
     <message>
         <location line="+126"/>
         <source>Comment selected text</source>
-        <translation type="unfinished"></translation>
+        <translation>Markierten Text auskommentieren</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Comment string to use:
 </source>
-        <translation type="unfinished"></translation>
+        <translation>Diese Zeichenkette verwenden:
+</translation>
     </message>
     <message>
         <location line="+135"/>
         <location line="+60"/>
         <source>&lt;unnamed&gt;</source>
-        <translation type="unfinished">&lt;unbenannt&gt;</translation>
+        <translation>&lt;unbenannt&gt;</translation>
     </message>
     <message>
         <location line="-6"/>
         <source>Do you want to cancel closing, save or discard the changes?</source>
-        <translation type="unfinished">Änderungen speichern, verwerfen oder Schließen abbrechen?</translation>
+        <translation>Änderungen speichern, verwerfen oder Schließen abbrechen?</translation>
     </message>
     <message>
         <location line="+10"/>
@@ -1017,50 +1016,50 @@
   %1
 
 is about to be closed but has been modified.  %2</source>
-        <translation type="unfinished">Die Datei
+        <translation>Die Datei
 
-   %1
+  %1
 
 soll geschlossen werden, wurde aber modifiziert.  %2</translation>
     </message>
     <message>
         <location line="+295"/>
         <source>Debug or Save</source>
-        <translation type="unfinished">Debug oder Speichern</translation>
+        <translation>Debug oder Speichern</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>This file is currently being executed.
 Quit debugging and save?</source>
-        <translation type="unfinished">Diese Datei wird momentan ausgeführt.
+        <translation>Diese Datei wird momentan ausgeführt.
 Debuggen abbrechen und speichern?</translation>
     </message>
     <message>
         <location line="+75"/>
         <source>Could not open file %1 for write:
 %2.</source>
-        <translation type="unfinished">Die Datei %1 konnte nicht zum Schreiben geöffnet werden:
+        <translation>Die Datei %1 konnte nicht zum Schreiben geöffnet werden:
 %2.</translation>
     </message>
     <message>
         <location line="+92"/>
         <source>Line Endings:</source>
-        <translation type="unfinished">Zeilenenden:</translation>
+        <translation>Zeilenenden:</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>File Encoding:</source>
-        <translation type="unfinished">Zeichenkodierung:</translation>
+        <translation>Zeichenkodierung:</translation>
     </message>
     <message>
         <location line="+28"/>
         <source>Octave Files (*.m)</source>
-        <translation type="unfinished">Octave Dateien (*.m)</translation>
+        <translation>Octave Dateien (*.m)</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>All Files (*)</source>
-        <translation type="unfinished">Alle Dateien (*)</translation>
+        <translation>Alle Dateien (*)</translation>
     </message>
     <message>
         <location line="+80"/>
@@ -1071,55 +1070,58 @@
 call your script using its name as an Octave command.
 
 Do you want to choose another name?</source>
-        <translation type="unfinished">&quot;%1&quot;
+        <translation>&quot;%1&quot;
 ist kein gültiger Name.
 
-Mit diesem Dateinamen kann das Skript nicht als 
+Mit diesem Dateinamen kann das Skript nicht als
 Octave-Befehl aufgerufen werden.
 
-Einen anderen Namen wählen?
-</translation>
+Einen anderen Namen wählen?</translation>
     </message>
     <message>
         <location line="+20"/>
-        <source>The current codec %1
+        <source>The current encoding %1
 can not be applied.
 
 Please select another one or cancel saving!</source>
-        <translation type="unfinished"></translation>
+        <translation>Die ausgewählte Zeichenkodierung %1
+kann nicht angewandt werden.
+
+Wählen Sie eine andere Kodierung oder brechen Sie das Speichern ab!</translation>
     </message>
     <message>
         <location line="+11"/>
         <source>The current editor contents can not be encoded
-with the selected codec %1.
+with the selected encoding %1.
 Using it will result in data loss!
 
-Do you want to chose another codec?</source>
-        <translation type="unfinished">Der Text kann mit der gewählten
+Do you want to chose another encoding?</source>
+        <translation>Der Text kann mit der gewählten
 Zeichenkodierung %1 nicht ohne Datenverlust
 gespeichert werden!
 
-Andere Zeichenkodierung wählen?
-</translation>
+Andere Zeichenkodierung wählen?</translation>
     </message>
     <message>
         <location line="+85"/>
         <source>It seems that &apos;%1&apos; has been modified by another application. Do you want to reload it?</source>
-        <translation type="unfinished">Die Datei &apos;%1&apos; wurde von einer anderen Anwendung verändert. Soll der neue Inhalt geladen werden?</translation>
+        <translation>Die Datei &apos;%1&apos; wurde von einer anderen Anwendung verändert. Soll der neue Inhalt geladen werden?</translation>
     </message>
     <message>
         <location line="+29"/>
         <source>
 
 Warning: The contents in the editor is modified!</source>
-        <translation type="unfinished">Achtung: Der Inhalt des Editors wurde verändert!</translation>
+        <translation>
+
+Achtung: Der Inhalt des Editors wurde verändert!</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>It seems that the file
 %1
 has been deleted or renamed. Do you want to save it now?%2</source>
-        <translation type="unfinished">Die Datei
+        <translation>Die Datei
 %1
 wurde gelöscht oder umbenannt. Soll die Datei jetzt gespeichert werden?%2</translation>
     </message>
@@ -1129,227 +1131,228 @@
     <message>
         <location filename="../src/files-dock-widget.cc" line="+73"/>
         <source>File Browser</source>
-        <translation type="unfinished">Dateibrowser</translation>
+        <translation>Dateibrowser</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Browse your files</source>
-        <translation type="unfinished">Dateien durchsuchen</translation>
+        <translation>Dateien durchsuchen</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>File size</source>
-        <translation type="unfinished">Dateigröße</translation>
+        <translation>Dateigröße</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>File type</source>
-        <translation type="unfinished">Dateityp</translation>
+        <translation>Dateityp</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Date modified</source>
-        <translation type="unfinished">Änderungsdatum</translation>
+        <translation>Änderungsdatum</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Show hidden</source>
-        <translation type="unfinished">Verborgene Dateien anzeigen</translation>
+        <translation>Versteckte Dateien anzeigen</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Alternating row colors</source>
-        <translation type="unfinished">Alternierende Farben für die Zeilen verwenden</translation>
+        <translation>Zeilen abwechselnd einfärben</translation>
     </message>
     <message>
         <location line="+25"/>
         <source>Enter the path or filename</source>
-        <translation type="unfinished">Pfad oder Dateinamen eingeben</translation>
+        <translation>Pfad oder Dateinamen eingeben</translation>
     </message>
     <message>
         <location line="+11"/>
         <source>One directory up</source>
-        <translation type="unfinished">Ein Verzeichnis höher</translation>
+        <translation>Ein Verzeichnis höher</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Show Octave directory</source>
-        <translation type="unfinished">Aktuelles Octave Verzeichnis anzeigen</translation>
+        <translation>Aktuelles Octave Verzeichnis anzeigen</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Go to current Octave directory</source>
-        <translation type="unfinished">Zum aktuellen Octave Verzeichnis gehen</translation>
+        <translation>Zum aktuellen Octave Verzeichnis gehen</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Set Octave directory</source>
-        <translation type="unfinished">Octave Verzeichnis setzen</translation>
+        <translation>Octave Verzeichnis setzen</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Set Octave directory to current browser directory</source>
-        <translation type="unfinished">Setze Octave Verzeichnis zu aktuellem Browser Verzeichnis</translation>
+        <translation>Setze Octave Verzeichnis zu aktuellem Browser Verzeichnis</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Actions on current directory</source>
-        <translation type="unfinished">Aktionen mit aktuellem Verzeichnis</translation>
+        <translation>Aktionen mit aktuellem Verzeichnis</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Show Home Directory</source>
-        <translation type="unfinished">Wechsle zum Heimatverzeichnis</translation>
+        <translation>Wechsle zum Heimatverzeichnis</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>Set Browser Directory...</source>
-        <translation type="unfinished">Wechsle in Verzeichnis...</translation>
+        <translation>Wechsle in Verzeichnis...</translation>
     </message>
     <message>
         <location line="+4"/>
         <location line="+365"/>
         <source>Find Files...</source>
-        <translation type="unfinished"></translation>
+        <translation>Dateien suchen...</translation>
     </message>
     <message>
         <location line="-361"/>
         <location line="+374"/>
         <source>New File...</source>
-        <translation type="unfinished">Neue Datei...</translation>
+        <translation>Neue Datei...</translation>
     </message>
     <message>
         <location line="-371"/>
         <location line="+374"/>
         <source>New Directory...</source>
-        <translation type="unfinished">Neues Verzeichnis...</translation>
+        <translation>Neues Verzeichnis...</translation>
     </message>
     <message>
         <location line="-320"/>
         <source>Activate to open in editor, right click for alternatives</source>
-        <translation type="unfinished">Doppelklick zum Öffnen im Editor, Rechtsklick für mehr Optionen</translation>
+        <translation>Doppelklick zum Öffnen im Editor, Rechtsklick für mehr Optionen</translation>
     </message>
     <message>
         <location line="+273"/>
         <source>Open</source>
-        <translation type="unfinished">Öffnen</translation>
+        <translation>Öffnen</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Open in System File Explorer</source>
-        <translation type="unfinished">Im Dateimanager öffnen</translation>
+        <translation>Im Dateimanager öffnen</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Open in Text Editor</source>
-        <translation type="unfinished">Im Texteditor öffnen</translation>
+        <translation>Im Texteditor öffnen</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Copy Selection to Clipboard</source>
-        <translation type="unfinished">Kopiere Auswahl in die Zwischenablage</translation>
+        <translation>Auswahl in die Zwischenablage kopieren</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Run</source>
-        <translation type="unfinished">Ausführen</translation>
+        <translation>Ausführen</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Load Data</source>
-        <translation type="unfinished">Daten laden</translation>
+        <translation>Daten laden</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Set Current Directory</source>
-        <translation type="unfinished">Aktuelles Verzeichnis setzen</translation>
+        <translation>Aktuelles Verzeichnis setzen</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Rename...</source>
-        <translation type="unfinished">Umbenennen...</translation>
+        <translation>Umbenennen...</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Delete...</source>
-        <translation type="unfinished">Löschen...</translation>
+        <translation>Löschen...</translation>
     </message>
     <message>
         <location line="+118"/>
         <source>Rename file/directory</source>
-        <translation type="unfinished">Datei/Verzeichnis umbenennen</translation>
+        <translation>Datei/Verzeichnis umbenennen</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Rename file/directory:
 </source>
-        <translation type="unfinished">Datei/Verzeichnis umbenennen:</translation>
+        <translation>Datei/Verzeichnis umbenennen:
+</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>
  to: </source>
-        <translation type="unfinished">
-zu: </translation>
+        <translation>
+ in: </translation>
     </message>
     <message>
         <location line="+30"/>
         <location line="+14"/>
         <source>Delete file/directory</source>
-        <translation type="unfinished">Datei/Verzeichnis löschen</translation>
+        <translation>Datei/Verzeichnis löschen</translation>
     </message>
     <message>
         <location line="-13"/>
         <source>Are you sure you want to delete
 </source>
-        <translation type="unfinished">Folgende/s Datei/Verzeichnis wirklich löschen
+        <translation>Folgende/s Datei/Verzeichnis wirklich löschen
 </translation>
     </message>
     <message>
         <location line="+14"/>
         <source>Can not delete a directory that is not empty</source>
-        <translation type="unfinished">Verzeichnis ist nicht leer und kann daher nicht gelöscht werden</translation>
+        <translation>Verzeichnis ist nicht leer und kann daher nicht gelöscht werden</translation>
     </message>
     <message>
         <location line="+145"/>
         <source>Set directory of file browser</source>
-        <translation type="unfinished">Setze aktuelles Browser Verzeichnis</translation>
+        <translation>Datei-Browser Verzeichnis setzen</translation>
     </message>
     <message>
         <location line="+26"/>
         <source>Create File</source>
-        <translation type="unfinished">Neue Datei</translation>
+        <translation>Neue Datei</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Create file in
 </source>
         <comment>String ends with \n!</comment>
-        <translation type="unfinished">Neue Datei in
+        <translation>Neue Datei in
 </translation>
     </message>
     <message>
         <location line="+1"/>
         <source>New File.txt</source>
-        <translation type="unfinished">Neue Datei.txt</translation>
+        <translation>Neue Datei.txt</translation>
     </message>
     <message>
         <location line="+15"/>
         <source>Create Directory</source>
-        <translation type="unfinished">Neues Verzeichnis</translation>
+        <translation>Neues Verzeichnis</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Create folder in
 </source>
         <comment>String ends with \n!</comment>
-        <translation type="unfinished">Neues Verzeichnis in
+        <translation>Neues Verzeichnis in
 </translation>
     </message>
     <message>
         <location line="+1"/>
         <source>New Directory</source>
-        <translation type="unfinished">Neues Verzeichnis</translation>
+        <translation>Neues Verzeichnis</translation>
     </message>
 </context>
 <context>
@@ -1357,22 +1360,22 @@
     <message>
         <location filename="../src/welcome-wizard.cc" line="+274"/>
         <source>Enjoy!</source>
-        <translation type="unfinished">Viel Spaß!</translation>
+        <translation>Viel Spaß!</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Previous</source>
-        <translation type="unfinished">Zurück</translation>
+        <translation>Zurück</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Finish</source>
-        <translation type="unfinished">Beenden</translation>
+        <translation>Beenden</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Cancel</source>
-        <translation type="unfinished">Abbrechen</translation>
+        <translation>Abbrechen</translation>
     </message>
     <message>
         <location line="+7"/>
@@ -1381,10 +1384,10 @@
 &lt;p&gt;If you encounter problems, there are a number of ways to get help, including commercial support options, a mailing list, a wiki, and other community-based support channels.
 You can find more information about each of these by visiting &lt;a href=&quot;https://octave.org/support.html&quot;&gt;https://octave.org/support.html&lt;/a&gt; (opens in external browser).&lt;/p&gt;
 &lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished">&lt;html&gt;&lt;body&gt;
-&lt;p&gt;Wir hoffen, dass Du Octave nützlich findest.&lt;/p&gt;
-&lt;p&gt;Wenn Du auf Probleme stoßen solltest, gibt es eine Reihe von Wegen, um Hilfe zu bekommen. Neben der Option kommerziellen Support zu erhalten, gibt es noch eine Mailingliste, ein Wiki und andere Community Support Channels.
-Mehr über jede Möglichkeit findest Du im Internet unter &lt;a href=&quot;https://octave.org/support.html&quot;&gt;https://octave.org/support.html&lt;/a&gt; (Wird im externen Browser geöffnet).&lt;/p&gt;
+        <translation>&lt;html&gt;&lt;body&gt;
+&lt;p&gt;Wir hoffen, Sie halten Octave für ein nützliches Werkzeug.&lt;/p&gt;
+&lt;p&gt;Wenn Sie auf Probleme stoßen sollten, können Sie auf verschiedene Arten Hilfe bekommen. Neben der Option kommerziellen Support zu erhalten, gibt es noch eine Mailingliste, ein Wiki und andere Community-Support-Channels (auf Englisch).
+Mehr über jede Möglichkeit finden Sie im Internet unter &lt;a href=&quot;https://octave.org/support.html&quot;&gt;https://octave.org/support.html&lt;/a&gt; (Wird im externen Browser geöffnet).&lt;/p&gt;
 &lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
@@ -1401,16 +1404,16 @@
 &lt;li&gt;Open the documentation browser of the Octave GUI with the help menu&lt;/li&gt;
 &lt;/ul&gt;
 &lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished">&lt;html&gt;&lt;head&gt;
+        <translation>&lt;html&gt;&lt;head&gt;
 &lt;style&gt;
 a:link { text-decoration: underline; color: #0000ff; }
 &lt;/style&gt;
 &lt;head/&gt;&lt;body&gt;
-&lt;p&gt;Für weitere Informationen über Octave:&lt;/p&gt;
+&lt;p&gt;Für weitere Informationen über Octave (auf Englisch):&lt;/p&gt;
 &lt;ul&gt;
-&lt;li&gt;&lt;a href=&quot;https://octave.org&quot;&gt;https://octave.org&lt;/a&gt; (Öffnet im externen Browser)&lt;/li&gt;
-&lt;li&gt;Online Dokumentation &lt;a href=&quot;https://www.gnu.org/software/octave/doc/interpreter/index.html&quot;&gt;html&lt;/a&gt;- oder &lt;a href=&quot;https://www.gnu.org/software/octave/octave.pdf&quot;&gt;PDF&lt;/span&gt;&lt;/a&gt;-Dokument (Öffnet im externen Browser)&lt;/li&gt;
-&lt;li&gt;Benutze den Dokumentations-Browser von Octave GUI im Hilfe-Menü&lt;/li&gt;
+&lt;li&gt;Webseite: &lt;a href=&quot;https://octave.org&quot;&gt;https://octave.org&lt;/a&gt; (Öffnet im externen Browser)&lt;/li&gt;
+&lt;li&gt;Online-Dokumentation als &lt;a href=&quot;https://www.gnu.org/software/octave/doc/interpreter/index.html&quot;&gt;HTML&lt;/a&gt;- oder als &lt;a href=&quot;https://www.gnu.org/software/octave/octave.pdf&quot;&gt;PDF&lt;/span&gt;&lt;/a&gt;-Dokument (Öffnet im externen Browser)&lt;/li&gt;
+&lt;li&gt;Dokumentations-Browser im Hilfe-Menü der Octave GUI&lt;/li&gt;
 &lt;/ul&gt;
 &lt;/body&gt;&lt;/html&gt;</translation>
     </message>
@@ -1420,107 +1423,107 @@
     <message>
         <location filename="../src/m-editor/find-dialog.cc" line="+87"/>
         <source>Find and Replace</source>
-        <translation type="unfinished">Suchen und Ersetzen</translation>
+        <translation>Suchen und Ersetzen</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Find &amp;what:</source>
-        <translation type="unfinished">&amp;Suche:</translation>
+        <translation>&amp;Suchen nach:</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Re&amp;place with:</source>
-        <translation type="unfinished">&amp;Ersetze durch:</translation>
+        <translation>&amp;Ersetzen durch:</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Match &amp;case</source>
-        <translation type="unfinished">&amp;Groß-/Kleinschreibung beachten</translation>
+        <translation>&amp;Groß-/Kleinschreibung beachten</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Search from &amp;start</source>
-        <translation type="unfinished">Suche vom &amp;Beginn</translation>
+        <translation>Suche vom &amp;Beginn</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>&amp;Wrap while searching</source>
-        <translation type="unfinished">&amp;Umbruch beim Suchen</translation>
+        <translation>&amp;Umbruch beim Suchen</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>&amp;Find Next</source>
-        <translation type="unfinished">&amp;Nächsten suchen</translation>
+        <translation>&amp;Nächsten suchen</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Find &amp;Previous</source>
-        <translation type="unfinished">&amp;Vorherigen suchen</translation>
+        <translation>&amp;Vorherigen suchen</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>&amp;Replace</source>
-        <translation type="unfinished">&amp;Ersetze</translation>
+        <translation>&amp;Ersetzen</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Replace &amp;All</source>
-        <translation type="unfinished">Ersetze &amp;alle</translation>
+        <translation>&amp;Alle ersetzen</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>&amp;More...</source>
-        <translation type="unfinished">&amp;Mehr...</translation>
+        <translation>&amp;Mehr...</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>&amp;Whole words</source>
-        <translation type="unfinished">&amp;Ganze Wörter</translation>
+        <translation>&amp;Ganze Wörter</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Regular E&amp;xpressions</source>
-        <translation type="unfinished">&amp;Reguläre Ausdrücke</translation>
+        <translation>&amp;Reguläre Ausdrücke</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Search &amp;backward</source>
-        <translation type="unfinished">Rück&amp;wärts suchen</translation>
+        <translation>Rück&amp;wärts suchen</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Search se&amp;lection</source>
-        <translation type="unfinished">In Auswah&amp;l suchen</translation>
+        <translation>In Auswah&amp;l suchen</translation>
     </message>
     <message>
         <location line="+86"/>
         <source>Search from end</source>
-        <translation type="unfinished">Vom Ende suchen</translation>
+        <translation>Vom Ende suchen</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Search from start</source>
-        <translation type="unfinished">Suche vom Beginn</translation>
+        <translation>Vom Beginn suchen</translation>
     </message>
     <message>
         <location line="+209"/>
         <source>Replace Result</source>
-        <translation type="unfinished">Ergebnis der Ersetzungen</translation>
+        <translation>Ergebnis der Ersetzungen</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>%1 items replaced</source>
-        <translation type="unfinished">%1 Vorkommnisse ersetzt</translation>
+        <translation>%1 Vorkommnisse ersetzt</translation>
     </message>
     <message>
         <location line="+14"/>
         <source>Find Result</source>
-        <translation type="unfinished">Suchergebnis</translation>
+        <translation>Suchergebnis</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>No more matches found</source>
-        <translation type="unfinished">Keine weiteren Vorkommnisse gefunden</translation>
+        <translation>Keine weiteren Vorkommnisse gefunden</translation>
     </message>
 </context>
 <context>
@@ -1528,147 +1531,147 @@
     <message>
         <location filename="../src/find-files-dialog.cc" line="+54"/>
         <source>Find Files</source>
-        <translation type="unfinished">Suche Dateien</translation>
+        <translation>Dateien suchen</translation>
     </message>
     <message>
         <location line="+11"/>
         <source>Named:</source>
-        <translation type="unfinished">Name:</translation>
+        <translation>Name:</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Enter the filename search expression</source>
-        <translation type="unfinished">Suchausdruck für den Dateinamen</translation>
+        <translation>Suchausdruck für den Dateinamen</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Start in:</source>
-        <translation type="unfinished">Beginne in:</translation>
+        <translation>Beginne in:</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Enter the start directory</source>
-        <translation type="unfinished">Verzeichnis, in dem die Suche beginnt</translation>
+        <translation>Verzeichnis, in dem die Suche beginnt</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Browse...</source>
-        <translation type="unfinished">Durchsuchen...</translation>
+        <translation>Durchsuchen...</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Browse for start directory</source>
-        <translation type="unfinished">Startverzeichnis auswählen</translation>
+        <translation>Startverzeichnis auswählen</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Search subdirectories</source>
-        <translation type="unfinished">Unterverzeichnisse einschließen</translation>
+        <translation>Unterverzeichnisse einschließen</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Search recursively through directories for matching files</source>
-        <translation type="unfinished">Rekursive Dateisuche durch Unterverzeichnisse</translation>
+        <translation>Rekursive Dateisuche durch Unterverzeichnisse</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Include directory names</source>
-        <translation type="unfinished">Verzeichnisnamen einschließen</translation>
+        <translation>Verzeichnisnamen einschließen</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Include matching directories in search results</source>
-        <translation type="unfinished">Auch Verzeichnisse berücksichtigen, deren Name die Suchanfrage erfüllt</translation>
+        <translation>Auch Verzeichnisse berücksichtigen, deren Namen die Suchanfrage erfüllen</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Name case insensitive</source>
-        <translation type="unfinished">Groß-/Kleinschreibung ignorieren</translation>
+        <translation>Groß-/Kleinschreibung ignorieren</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Set matching name is case insensitive</source>
-        <translation type="unfinished">Groß-/Kleinschreibung bei der Dateisuche ignorieren</translation>
+        <translation>Groß-/Kleinschreibung bei der Dateisuche ignorieren</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Contains text:</source>
-        <translation type="unfinished">In Datei vorkommender Text:</translation>
+        <translation>In Datei vorkommender Text:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Enter the file content search expression</source>
-        <translation type="unfinished">Suche nach Dateien, die einen bestimmten Text enthalten</translation>
+        <translation>Suche nach Dateien, die einen bestimmten Text enthalten</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Text to match</source>
-        <translation type="unfinished">Zu suchender Text</translation>
+        <translation>Zu suchender Text</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Text case insensitive</source>
-        <translation type="unfinished">Groß-/Kleinschreibung ignorieren</translation>
+        <translation>Groß-/Kleinschreibung ignorieren</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Set text content is case insensitive</source>
-        <translation type="unfinished">Groß-/Kleinschreibung beim Text ignorieren</translation>
+        <translation>Groß-/Kleinschreibung beim Text ignorieren</translation>
     </message>
     <message>
         <location line="+11"/>
         <source>Search results</source>
-        <translation type="unfinished">Suchergebnisse</translation>
+        <translation>Suchergebnisse</translation>
     </message>
     <message>
         <location line="+19"/>
         <source>Idle.</source>
-        <translation type="unfinished">Leerlauf.</translation>
+        <translation>Leerlauf.</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Find</source>
-        <translation type="unfinished">Suche</translation>
+        <translation>Suchen</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Start search for matching files</source>
-        <translation type="unfinished">Beginne die Dateisuche</translation>
+        <translation>Dateisuche beginnen</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Stop</source>
-        <translation type="unfinished">Beenden</translation>
+        <translation>Beenden</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Stop searching</source>
-        <translation type="unfinished">Suche beenden</translation>
+        <translation>Suche beenden</translation>
     </message>
     <message>
         <location line="+15"/>
         <source>Filename/location</source>
-        <translation type="unfinished">Dateinamen/Verzeichnis</translation>
+        <translation>Dateiname/Verzeichnis</translation>
     </message>
     <message>
         <location line="+17"/>
         <source>File contents</source>
-        <translation type="unfinished">Dateiinhalt</translation>
+        <translation>Dateiinhalt</translation>
     </message>
     <message>
         <location line="+103"/>
         <source>Searching...</source>
-        <translation type="unfinished">Suche...</translation>
+        <translation>Suche...</translation>
     </message>
     <message>
         <location line="+22"/>
         <source>%1 match (es)</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 Treffer</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Set search directory</source>
-        <translation type="unfinished">Suchverzeichnis setzen</translation>
+        <translation>Suchverzeichnis setzen</translation>
     </message>
 </context>
 <context>
@@ -1676,12 +1679,12 @@
     <message>
         <location filename="../src/find-files-model.cc" line="+88"/>
         <source>Filename</source>
-        <translation type="unfinished">Dateiname</translation>
+        <translation>Dateiname</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Directory</source>
-        <translation type="unfinished">Verzeichnis</translation>
+        <translation>Verzeichnis</translation>
     </message>
 </context>
 <context>
@@ -1689,52 +1692,52 @@
     <message>
         <location filename="../src/history-dock-widget.cc" line="+48"/>
         <source>Browse and search the command history.</source>
-        <translation type="unfinished">Durchsuchen des Befehlsverlaufs.</translation>
+        <translation>Durchsuchen des Befehlsverlaufs.</translation>
     </message>
     <message>
         <location line="+94"/>
         <source>Copy</source>
-        <translation type="unfinished">Kopieren</translation>
+        <translation>Kopieren</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Evaluate</source>
-        <translation type="unfinished">Ausführen</translation>
+        <translation>Ausführen</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Create script</source>
-        <translation type="unfinished">Skript erzeugen</translation>
+        <translation>Skript erzeugen</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Hide filter</source>
-        <translation type="unfinished">Filter ausblenden</translation>
+        <translation>Filter ausblenden</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Show filter</source>
-        <translation type="unfinished">Filter anzeigen</translation>
+        <translation>Filter anzeigen</translation>
     </message>
     <message>
         <location line="+123"/>
         <source>Double-click a command to transfer it to the terminal.</source>
-        <translation type="unfinished">Doppelklick auf ein Kommando, um dieses in das Terminal zu übertragen.</translation>
+        <translation>Doppelklick auf einen Befehl, um diesen in das Befehlsfenster zu übertragen.</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Enter text to filter the command history</source>
-        <translation type="unfinished">Suchbegriff eingeben, um den Befehlsverlauf zu filtern</translation>
+        <translation>Suchbegriff eingeben, um den Befehlsverlauf zu filtern</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Filter</source>
-        <translation type="unfinished">Filter</translation>
+        <translation>Filter</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Command History</source>
-        <translation type="unfinished"></translation>
+        <translation>Befehlsverlauf</translation>
     </message>
 </context>
 <context>
@@ -1742,17 +1745,17 @@
     <message>
         <location filename="../src/welcome-wizard.cc" line="-178"/>
         <source>Welcome to Octave!</source>
-        <translation type="unfinished">Willkommen bei Octave!</translation>
+        <translation>Willkommen bei Octave!</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Next</source>
-        <translation type="unfinished">Weiter</translation>
+        <translation>Weiter</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Cancel</source>
-        <translation type="unfinished">Abbrechen</translation>
+        <translation>Abbrechen</translation>
     </message>
     <message>
         <location line="+7"/>
@@ -1761,9 +1764,9 @@
 Click &apos;Next&apos; to create a configuration file and launch Octave.&lt;/p&gt;
 &lt;p&gt;The configuration file is stored in&lt;br&gt;%1.&lt;/p&gt;
 &lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished">&lt;html&gt;&lt;body&gt;
-&lt;p&gt;Es scheint, dass die grafische Benutzerschnittstelle (GUI) zum ersten Mal auf diesem Computer gestartet wurde.
-Klicke auf &apos;Weiter&apos;, um eine Konfigurationsdatei anzulegen und Octave zu starten.&lt;/p&gt;
+        <translation>&lt;html&gt;&lt;body&gt;
+&lt;p&gt;Anscheinend wurde die grafische Benutzeroberfläche (GUI) zum ersten Mal auf diesem Computer gestartet.
+Klicken Sie auf &apos;Weiter&apos;, um eine Konfigurationsdatei anzulegen und Octave zu starten.&lt;/p&gt;
 &lt;p&gt;Die Konfigurationsdatei wird in&lt;br&gt;%1&lt;br&gt;gespeichert.&lt;/p&gt;
 &lt;/body&gt;&lt;/html&gt;</translation>
     </message>
@@ -1773,12 +1776,12 @@
     <message>
         <location filename="../src/octave-dock-widget.cc" line="+52"/>
         <source>Undock widget</source>
-        <translation type="unfinished">Fenster lösen</translation>
+        <translation>Bedienelement lösen</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Close widget</source>
-        <translation type="unfinished"></translation>
+        <translation>Bedienelement schließen</translation>
     </message>
 </context>
 <context>
@@ -1786,377 +1789,377 @@
     <message>
         <location filename="../src/main-window.cc" line="+367"/>
         <source>Save Workspace As</source>
-        <translation type="unfinished">Arbeitsumgebung speichern unter</translation>
+        <translation>Arbeitsumgebung speichern unter</translation>
     </message>
     <message>
         <location line="+14"/>
         <source>Load Workspace</source>
-        <translation type="unfinished">Lade Arbeitsumgebung</translation>
+        <translation>Arbeitsumgebung laden</translation>
     </message>
     <message>
         <location line="+85"/>
         <source>The release notes file &apos;%1&apos; is empty.</source>
-        <translation type="unfinished">Die Datei &apos;%1&apos; mit Versionshinweisen ist leer.</translation>
+        <translation>Die Datei &apos;%1&apos; mit Versionshinweisen ist leer.</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>The release notes file &apos;%1&apos; cannot be read.</source>
-        <translation type="unfinished">Die Datei &apos;%1&apos; mit Versionshinweisen kann nicht gelesen werden.</translation>
+        <translation>Die Datei &apos;%1&apos; mit Versionshinweisen kann nicht gelesen werden.</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>Octave Release Notes</source>
-        <translation type="unfinished">Versionshinweise zu Octave</translation>
+        <translation>Versionshinweise zu Octave</translation>
     </message>
     <message>
         <location line="+79"/>
         <source>Octave Community News</source>
-        <translation type="unfinished">Neuigkeiten aus der Octave Community</translation>
+        <translation>Neuigkeiten aus der Octave-Community</translation>
     </message>
     <message>
         <location line="+91"/>
         <location line="+1724"/>
         <source>About Octave</source>
-        <translation type="unfinished">Über Octave</translation>
+        <translation>Über Octave</translation>
     </message>
     <message>
         <location line="-1603"/>
         <source>Octave</source>
-        <translation type="unfinished">Octave</translation>
+        <translation>Octave</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Are you sure you want to exit Octave?</source>
-        <translation type="unfinished">Octave wirklich beenden?</translation>
+        <translation>Octave wirklich beenden?</translation>
     </message>
     <message>
         <location line="+64"/>
         <location line="+1600"/>
         <source>Browse directories</source>
-        <translation type="unfinished">Verzeichnisse durchsuchen</translation>
+        <translation>Verzeichnisse durchsuchen</translation>
     </message>
     <message>
         <location line="-1444"/>
         <source>Octave Files (*.m);;All Files (*)</source>
-        <translation type="unfinished">Octave Dateien (*.m);;Alle Dateien (*)</translation>
+        <translation>Octave Dateien (*.m);;Alle Dateien (*)</translation>
     </message>
     <message>
         <location line="+16"/>
         <source>File Encoding:</source>
-        <translation type="unfinished">Zeichenkodierung:</translation>
+        <translation>Zeichenkodierung:</translation>
     </message>
     <message>
         <location line="+53"/>
         <source>New Function</source>
-        <translation type="unfinished">Neue Funktion</translation>
+        <translation>Neue Funktion</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>New function name:
 </source>
-        <translation type="unfinished">Neuer Funktionsname:
+        <translation>Neuer Funktionsname:
 </translation>
     </message>
     <message>
         <location line="+43"/>
         <source>%1 is a built-in function</source>
-        <translation type="unfinished">%1 ist eine eingebaute Funktion</translation>
+        <translation>%1 ist eine integrierte Funktion</translation>
     </message>
     <message>
         <location line="+37"/>
         <source>Can not find function %1</source>
-        <translation type="unfinished">Kann Funktion %1 nicht finden</translation>
+        <translation>Kann Funktion %1 nicht finden</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Octave Editor</source>
-        <translation type="unfinished">Octave Editor</translation>
+        <translation>Octave Editor</translation>
     </message>
     <message>
         <location line="+909"/>
         <source>&amp;File</source>
-        <translation type="unfinished">&amp;Datei</translation>
+        <translation>&amp;Datei</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Open...</source>
-        <translation type="unfinished">Öffnen...</translation>
+        <translation>Öffnen...</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Open an existing file in editor</source>
-        <translation type="unfinished">Öffne eine vorhandene Datei im Editor</translation>
+        <translation>Eine vorhandene Datei im Editor öffnen</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Load Workspace...</source>
-        <translation type="unfinished">Lade Arbeitsumgebung...</translation>
+        <translation>Arbeitsumgebung laden...</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Save Workspace As...</source>
-        <translation type="unfinished">Arbeitsumgebung speichern unter...</translation>
+        <translation>Arbeitsumgebung speichern unter...</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Exit</source>
-        <translation type="unfinished">Beenden</translation>
+        <translation>Beenden</translation>
     </message>
     <message>
         <location line="+18"/>
         <source>New</source>
-        <translation type="unfinished">Neu</translation>
+        <translation>Neu</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>New Script</source>
-        <translation type="unfinished">Neues Skript</translation>
+        <translation>Neues Skript</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>New Function...</source>
-        <translation type="unfinished">Neue Funktion...</translation>
+        <translation>Neue Funktion...</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>New Figure</source>
-        <translation type="unfinished">Neue Abbildung</translation>
+        <translation>Neue Abbildung</translation>
     </message>
     <message>
         <location line="+26"/>
         <source>&amp;Edit</source>
-        <translation type="unfinished">&amp;Bearbeiten</translation>
+        <translation>&amp;Bearbeiten</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Undo</source>
-        <translation type="unfinished">Rückgängig</translation>
+        <translation>Rückgängig</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Copy</source>
-        <translation type="unfinished">Kopieren</translation>
+        <translation>Kopieren</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Paste</source>
-        <translation type="unfinished">Einfügen</translation>
+        <translation>Einfügen</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Select All</source>
-        <translation type="unfinished">Alles auswählen</translation>
+        <translation>Alles auswählen</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Clear Clipboard</source>
-        <translation type="unfinished">Zwischenablage leeren</translation>
+        <translation>Zwischenablage leeren</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Find Files...</source>
-        <translation type="unfinished"></translation>
+        <translation>Dateien suchen...</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Clear Command Window</source>
-        <translation type="unfinished">Befehlsfenster löschen</translation>
+        <translation>Befehlsfenster leeren</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Clear Command History</source>
-        <translation type="unfinished"></translation>
+        <translation>Befehlsverlauf leeren</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Clear Workspace</source>
-        <translation type="unfinished">Arbeitsumgebung löschen</translation>
+        <translation>Arbeitsumgebung leeren</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Preferences...</source>
-        <translation type="unfinished">Einstellungen...</translation>
+        <translation>Einstellungen...</translation>
     </message>
     <message>
         <location line="+49"/>
         <source>De&amp;bug</source>
-        <translation type="unfinished">De&amp;bug</translation>
+        <translation>De&amp;bug</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Step</source>
-        <translation type="unfinished">Einzelschritt</translation>
+        <translation>Einzelschritt</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Step In</source>
-        <translation type="unfinished">Hineinspringen</translation>
+        <translation>Hineinspringen</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Step Out</source>
-        <translation type="unfinished">Herausspringen</translation>
+        <translation>Herausspringen</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Continue</source>
-        <translation type="unfinished">Fortfahren</translation>
+        <translation>Fortfahren</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Quit Debug Mode</source>
-        <translation type="unfinished">Debug-Modus beenden</translation>
+        <translation>Debug-Modus beenden</translation>
     </message>
     <message>
         <location line="+38"/>
         <source>&amp;Window</source>
-        <translation type="unfinished">&amp;Fenster</translation>
+        <translation>&amp;Fenster</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Show Command Window</source>
-        <translation type="unfinished">Befehlsfenster anzeigen</translation>
+        <translation>Befehlsfenster anzeigen</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Show Command History</source>
-        <translation type="unfinished">Befehlshistorie anzeigen</translation>
+        <translation>Befehlsverlauf anzeigen</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Show File Browser</source>
-        <translation type="unfinished">Dateibrowser anzeigen</translation>
+        <translation>Dateibrowser anzeigen</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Show Workspace</source>
-        <translation type="unfinished">Arbeitsumgebung anzeigen</translation>
+        <translation>Arbeitsumgebung anzeigen</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Show Editor</source>
-        <translation type="unfinished">Editor anzeigen</translation>
+        <translation>Editor anzeigen</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Show Documentation</source>
-        <translation type="unfinished">Dokumentation anzeigen</translation>
+        <translation>Dokumentation anzeigen</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Show Variable Editor</source>
-        <translation type="unfinished"></translation>
+        <translation>Variableneditor anzeigen</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Command Window</source>
-        <translation type="unfinished">Befehlsfenster</translation>
+        <translation>Befehlsfenster</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Command History</source>
-        <translation type="unfinished"></translation>
+        <translation>Befehlsverlauf</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>File Browser</source>
-        <translation type="unfinished">Dateibrowser</translation>
+        <translation>Dateibrowser</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Workspace</source>
-        <translation type="unfinished">Arbeitsumgebung</translation>
+        <translation>Arbeitsumgebung</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Editor</source>
-        <translation type="unfinished">Editor</translation>
+        <translation>Editor</translation>
     </message>
     <message>
         <location line="+3"/>
         <location line="+39"/>
         <source>Documentation</source>
-        <translation type="unfinished">Dokumentation</translation>
+        <translation>Dokumentation</translation>
     </message>
     <message>
         <location line="-36"/>
         <source>Variable Editor</source>
-        <translation type="unfinished"></translation>
+        <translation>Variableneditor</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Reset Default Window Layout</source>
-        <translation type="unfinished">Fensterlayout auf Grundeinstellung zurücksetzen</translation>
+        <translation>Fensterlayout auf Grundeinstellung zurücksetzen</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>&amp;Help</source>
-        <translation type="unfinished">&amp;Hilfe</translation>
+        <translation>&amp;Hilfe</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Report Bug</source>
-        <translation type="unfinished">Fehler melden</translation>
+        <translation>Fehler melden</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Octave Packages</source>
-        <translation type="unfinished">Octave Pakete</translation>
+        <translation>Octave Pakete</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Contribute</source>
-        <translation type="unfinished">Zum Projekt beitragen</translation>
+        <translation>Zum Projekt beitragen</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Donate to Octave</source>
-        <translation type="unfinished">Für Octave spenden</translation>
+        <translation>Für Octave spenden</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>On Disk</source>
-        <translation type="unfinished">Auf der Festplatte</translation>
+        <translation>Auf der Festplatte</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Online</source>
-        <translation type="unfinished">Im Internet</translation>
+        <translation>Im Internet</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>&amp;News</source>
-        <translation type="unfinished">&amp;Neuigkeiten</translation>
+        <translation>&amp;Neuigkeiten</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Release Notes</source>
-        <translation type="unfinished">Versionshinweise</translation>
+        <translation>Versionshinweise</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Community News</source>
-        <translation type="unfinished">Neuigkeiten der Community</translation>
+        <translation>Neuigkeiten der Community</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Toolbar</source>
-        <translation type="unfinished">Werkzeugleiste</translation>
+        <translation>Werkzeugleiste</translation>
     </message>
     <message>
         <location line="+19"/>
         <source>Enter directory name</source>
-        <translation type="unfinished">Neues Verzeichnis eingeben</translation>
+        <translation>Verzeichnisnamen eingeben</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Current Directory: </source>
-        <translation type="unfinished">Aktuelles Verzeichnis: </translation>
+        <translation>Aktuelles Verzeichnis: </translation>
     </message>
     <message>
         <location line="+4"/>
         <source>One directory up</source>
-        <translation type="unfinished">Ein Verzeichnis höher</translation>
+        <translation>Ein Verzeichnis höher</translation>
     </message>
 </context>
 <context>
@@ -2175,18 +2178,18 @@
 &lt;/p&gt;
 &lt;p&gt;
 &lt;small&gt;&lt;em&gt;&amp;mdash; The Octave Developers, </source>
-        <translation type="unfinished">&lt;html&gt;
+        <translation>&lt;html&gt;
 &lt;body&gt;
 &lt;p&gt;
-Die Neuigkeiten aus der Octave Community scheinen nicht erreichbar zu sein.
+Die Neuigkeiten aus der Octave-Community scheinen nicht erreichbar zu sein.
 &lt;/p&gt;
 &lt;p&gt;
-Für die aktuellsten Neuigkeiten besuche
-&lt;a href=&quot;https://octave.org/community-news.html&quot;&gt;https://octave.org/community-news.html&lt;/a&gt;
-sobald Du über eine Verbindung zum Internet verfügst (Link öffnet sich im externen Browser).
+Für aktuelle Neuigkeiten (auf Englisch) besuchen Sie
+&lt;a href=&quot;https://octave.org/community-news.html&quot;&gt;https://octave.org/community-news.html&lt;/a&gt;,
+sobald Sie über eine Verbindung zum Internet verfügen (Link öffnet sich im externen Browser).
 &lt;/p&gt;
 &lt;p&gt;
-&lt;small&gt;&lt;em&gt;&amp;mdash; Die Entwickler von Octave,</translation>
+&lt;small&gt;&lt;em&gt;&amp;mdash; Die Entwickler von Octave, </translation>
     </message>
     <message>
         <location line="+18"/>
@@ -2203,19 +2206,19 @@
 &lt;/p&gt;
 &lt;p&gt;
 &lt;small&gt;&lt;em&gt;&amp;mdash; The Octave Developers, </source>
-        <translation type="unfinished">&lt;html&gt;
+        <translation>&lt;html&gt;
 &lt;body&gt;
 &lt;p&gt;
-Die Verbindung zum Internet um aktuelle Neuigkeiten von der Octave Community anzuzeigen wurde deaktiviert.
+Die Internetverbindung zur Anzeige aktueller Neuigkeiten der Octave-Community wurde deaktiviert.
 &lt;/p&gt;
 &lt;p&gt;
-Für aktuelle Neuigkeiten besuche
-&lt;a href=&quot;https://octave.org/community-news.html&quot;&gt;https://octave.org/community-news.html&lt;/a&gt;
-sobald Du über eine Verbindung zum Internet verfügst (Link öffnet sich im externen Browser)
-oder aktiviere die Internetverbindung in den Einstellungen unter Netzwerk.
+Für aktuelle Neuigkeiten (auf Englisch) besuchen Sie
+&lt;a href=&quot;https://octave.org/community-news.html&quot;&gt;https://octave.org/community-news.html&lt;/a&gt;,
+sobald Sie über eine Verbindung zum Internet verfügen (Link öffnet sich im externen Browser)
+oder aktivieren Sie die Internetverbindung in den Einstellungen unter Netzwerk.
 &lt;/p&gt;
 &lt;p&gt;
-&lt;small&gt;&lt;em&gt;&amp;mdash; Die Entwickler von Octave,</translation>
+&lt;small&gt;&lt;em&gt;&amp;mdash; Die Entwickler von Octave, </translation>
     </message>
 </context>
 <context>
@@ -2223,22 +2226,22 @@
     <message>
         <location filename="../src/octave-dock-widget.cc" line="+69"/>
         <source>Hide widget</source>
-        <translation type="unfinished">Fenster verbergen</translation>
+        <translation>Bedienelement verbergen</translation>
     </message>
     <message>
         <location line="+43"/>
         <source>Use &lt;Alt&gt; + &lt;Left Mouse Button&gt; for moving the window</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;Alt&gt; + &lt;Linke Maustaste&gt; verwenden, um das Fenster zu verschieben</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Dock widget</source>
-        <translation type="unfinished">Fenster andocken</translation>
+        <translation>Bedienelement andocken</translation>
     </message>
     <message>
         <location line="+42"/>
         <source>Undock widget</source>
-        <translation type="unfinished">Fenster lösen</translation>
+        <translation>Bedienelement lösen</translation>
     </message>
 </context>
 <context>
@@ -2246,27 +2249,27 @@
     <message>
         <location filename="../src/m-editor/octave-qscintilla.cc" line="+277"/>
         <source>Help on</source>
-        <translation type="unfinished">Hilfe zu</translation>
+        <translation>Hilfe zu</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Documentation on</source>
-        <translation type="unfinished">Dokumentation zu</translation>
+        <translation>Dokumentation zu</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Edit</source>
-        <translation type="unfinished"></translation>
+        <translation>Bearbeiten</translation>
     </message>
     <message>
         <location line="+15"/>
         <source>dbstop if ...</source>
-        <translation type="unfinished">dbstop wenn ...</translation>
+        <translation>dbstop wenn ...</translation>
     </message>
     <message>
         <location line="+461"/>
         <source>Press &apos;%1&apos; to replace all occurrences of &apos;%2&apos; with &apos;%3&apos;.</source>
-        <translation type="unfinished"></translation>
+        <translation>&apos;%1&apos; drücken, um alle Vorkommnisse von &apos;%2&apos; mit &apos;%3&apos; zu ersetzen.</translation>
     </message>
 </context>
 <context>
@@ -2276,52 +2279,52 @@
         <location line="+9"/>
         <location line="+11"/>
         <source>Create</source>
-        <translation type="unfinished">Erzeugen</translation>
+        <translation>Erstellen</translation>
     </message>
     <message>
         <location line="-20"/>
         <location line="+268"/>
         <source>Cancel</source>
-        <translation type="unfinished">Abbrechen</translation>
+        <translation>Abbrechen</translation>
     </message>
     <message>
         <location line="-262"/>
         <source>File
 %1
 does not exist. Do you want to create it?</source>
-        <translation type="unfinished">Die Datei
+        <translation>Die Datei
 %1
-existiert nicht. Soll sie erzeugt werden?</translation>
+existiert nicht. Soll sie erstellt werden?</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Octave Editor</source>
-        <translation type="unfinished">Octave Editor</translation>
+        <translation>Octave Editor</translation>
     </message>
     <message>
         <location line="+252"/>
         <source>The file %1 does not exist in the load path.  To run or debug the function you are editing, you must either change to the directory %2 or add that directory to the load path.</source>
-        <translation type="unfinished">Die Datei %1 befindet sich nicht im Suchpfad. Um die momentan geöffnete Datei auszuführen oder zu debuggen, in das Verzeichnis %2 wechseln oder dieses Verzeichnis dem Suchpfad hinzufügen.</translation>
+        <translation>Die Datei %1 befindet sich nicht im Suchpfad. Um die momentan geöffnete Datei auszuführen oder zu debuggen, in das Verzeichnis %2 wechseln oder dieses Verzeichnis dem Suchpfad hinzufügen.</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>The file %1 is shadowed by a file with the same name in the load path. To run or debug the function you are editing, change to the directory %2.</source>
-        <translation type="unfinished">Die Datei %1 wird von einer Datei gleichen Namens im Suchpfad verdeckt. Um die momentan geöffnete Funktion auszuführen oder zu debuggen, in das Verzeichnis %2 wechseln.</translation>
+        <translation>Die Datei %1 wird von einer Datei gleichen Namens im Suchpfad verdeckt. Um die momentan geöffnete Funktion auszuführen oder zu debuggen, in das Verzeichnis %2 wechseln.</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Change Directory or Add Directory to Load Path</source>
-        <translation type="unfinished">Verzeichnis wechseln oder zum Suchpfad hinzufügen</translation>
+        <translation>Verzeichnis wechseln oder zum Suchpfad hinzufügen</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>&amp;Change Directory</source>
-        <translation type="unfinished"></translation>
+        <translation>Verzeichnis &amp;wechseln</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>&amp;Add Directory to Load Path</source>
-        <translation type="unfinished"></translation>
+        <translation>Verzeichnis zum &amp;Suchpfad hinzufügen</translation>
     </message>
 </context>
 <context>
@@ -2329,7 +2332,7 @@
     <message>
         <location filename="../src/m-editor/octave-txt-lexer.cc" line="+40"/>
         <source>Default</source>
-        <translation type="unfinished">Standard</translation>
+        <translation>Standard</translation>
     </message>
 </context>
 <context>
@@ -2343,18 +2346,19 @@
 %2
 
 Octave GUI must be closed now.</source>
-        <translation type="unfinished">Die Konfigurationsdatei
+        <translation>Die Konfigurationsdatei
 %1
 existiert nicht und kann nicht angelegt werden.
-Stelle sicher, dass Du Lese- und Schreibrechte für
+Stellen sicher, dass Sie Lese- und Schreibrechte für
 %2
-besitzt.
+besitzen.
+
 Die Octave-Benutzeroberfläche muss jetzt geschlossen werden.</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Octave Critical Error</source>
-        <translation type="unfinished">Kritischer Octave Fehler</translation>
+        <translation>Octave Kritischer Fehler</translation>
     </message>
 </context>
 <context>
@@ -2362,22 +2366,22 @@
     <message>
         <location filename="../src/welcome-wizard.cc" line="+42"/>
         <source>Community News</source>
-        <translation type="unfinished">Neuigkeiten der Community</translation>
+        <translation>Neuigkeiten aus der Community</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Previous</source>
-        <translation type="unfinished">Zurück</translation>
+        <translation>Zurück</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Next</source>
-        <translation type="unfinished">Weiter</translation>
+        <translation>Weiter</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Cancel</source>
-        <translation type="unfinished">Abbrechen</translation>
+        <translation>Abbrechen</translation>
     </message>
     <message>
         <location line="+7"/>
@@ -2387,7 +2391,12 @@
 &lt;p&gt;You may also view the news by selecting the &quot;Community News&quot; item in the &quot;Help&quot; menu, or by visiting
 &lt;a href=&quot;https://octave.org/community-news.html&quot;&gt;https://octave.org/community-news.html&lt;/a&gt;.&lt;/p&gt;
 &lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;html&gt;&lt;body&gt;
+&lt;p&gt;Beim Start kann Octave optional die Octave-Webseite nach aktuellen Neuigkeiten und Informationen über die Octave-Community überprüfen.
+Die Überprüfung erfolgt höchstens einmal am Tag, und nur Neuigkeiten werden angezeigt, die noch nicht gezeigt wurden.&lt;/p&gt;
+&lt;p&gt;Die Neuigkeiten können auch über den Punkt &quot;Neuigkeiten der Community&quot; im &quot;Hilfe&quot;-Menü angezeigt oder auf dieser Webseite betrachtet werden:
+&lt;a href=&quot;https://octave.org/community-news.html&quot;&gt;https://octave.org/community-news.html&lt;/a&gt;.&lt;/p&gt;
+&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location line="+28"/>
@@ -2398,12 +2407,12 @@
 &lt;head/&gt;&lt;body&gt;
 &lt;p&gt;Allow Octave to connect to the Octave web site when it starts to display current news and information about the Octave community.&lt;/p&gt;
 &lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished">&lt;html&gt;&lt;head&gt;
+        <translation>&lt;html&gt;&lt;head&gt;
 &lt;style&gt;
 a:link { text-decoration: underline; color: #0000ff; }
 &lt;/style&gt;
 &lt;head/&gt;&lt;body&gt;
-&lt;p&gt;Erlaube Octave beim Programmstart eine Verbindung zur Octave Webseite herzustellen, um aktuelle Neuigkeiten und Informationen über Octave anzuzeigen.&lt;/p&gt;
+&lt;p&gt;Erlaube Octave beim Programmstart eine Verbindung zur Octave-Webseite herzustellen, um aktuelle Neuigkeiten und Informationen über die Octave-Community anzuzeigen.&lt;/p&gt;
 &lt;/body&gt;&lt;/html&gt;</translation>
     </message>
 </context>
@@ -2412,7 +2421,7 @@
     <message>
         <location filename="../src/shortcut-manager.cc" line="+131"/>
         <source>Double Shortcut</source>
-        <translation type="unfinished">Doppeltes Tastenkürzel</translation>
+        <translation>Doppeltes Tastenkürzel</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -2421,688 +2430,689 @@
 is already used for the action
   &quot;%2&quot;.
 Do you want to use the shortcut anyhow removing it from the previous action?</source>
-        <translation type="unfinished">Das gewählte Tastenkürzel
+        <translation>Das gewählte Tastenkürzel
   &quot;%1&quot;&quot;
 wird bereits für die Aktion
   &quot;%2&quot;&quot;
-verwendet. Soll das Tastenkürzel trotzdem verwendet werden und damit von der vorgenannten Aktion entfernt werden?</translation>
+verwendet.
+Soll das Tastenkürzel trotzdem verwendet und damit von der vorgenannten Aktion entfernt werden?</translation>
     </message>
     <message>
         <location line="+102"/>
         <source>New File</source>
-        <translation type="unfinished">Neue Datei</translation>
+        <translation>Neue Datei</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>New Function</source>
-        <translation type="unfinished">Neue Funktion</translation>
+        <translation>Neue Funktion</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>New Figure</source>
-        <translation type="unfinished">Neue Abbildung</translation>
+        <translation>Neue Abbildung</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Open File</source>
-        <translation type="unfinished">Datei öffnen</translation>
+        <translation>Datei öffnen</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Load Workspace</source>
-        <translation type="unfinished">Lade Arbeitsumgebung</translation>
+        <translation>Arbeitsumgebung laden</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Save Workspace As</source>
-        <translation type="unfinished">Arbeitsumgebung speichern unter</translation>
+        <translation>Arbeitsumgebung speichern unter</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Exit Octave</source>
-        <translation type="unfinished">Octave beenden</translation>
+        <translation>Octave beenden</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Copy</source>
-        <translation type="unfinished">Kopieren</translation>
+        <translation>Kopieren</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Paste</source>
-        <translation type="unfinished">Einfügen</translation>
+        <translation>Einfügen</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Undo</source>
-        <translation type="unfinished">Rückgängig</translation>
+        <translation>Rückgängig</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Select All</source>
-        <translation type="unfinished">Alles auswählen</translation>
+        <translation>Alles auswählen</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Clear Clipboard</source>
-        <translation type="unfinished">Zwischenablage leeren</translation>
+        <translation>Zwischenablage leeren</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Find in Files</source>
-        <translation type="unfinished">In Dateien suchen</translation>
+        <translation>In Dateien suchen</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Clear Command Window</source>
-        <translation type="unfinished">Befehlsfenster löschen</translation>
+        <translation>Befehlsfenster leeren</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Clear Command History</source>
-        <translation type="unfinished"></translation>
+        <translation>Befehlsverlauf leeren</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Clear Workspace</source>
-        <translation type="unfinished">Arbeitsumgebung löschen</translation>
+        <translation>Arbeitsumgebung leeren</translation>
     </message>
     <message>
         <location line="+1"/>
         <location line="+162"/>
         <source>Preferences</source>
-        <translation type="unfinished">Einstellungen</translation>
+        <translation>Einstellungen</translation>
     </message>
     <message>
         <location line="-159"/>
         <source>Step</source>
-        <translation type="unfinished">Einzelschritt</translation>
+        <translation>Einzelschritt</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Step Into</source>
-        <translation type="unfinished">Hineinspringen</translation>
+        <translation>Hineinspringen</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Step Out</source>
-        <translation type="unfinished">Herausspringen</translation>
+        <translation>Herausspringen</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Continue</source>
-        <translation type="unfinished">Fortfahren</translation>
+        <translation>Fortfahren</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Quit Debug Mode</source>
-        <translation type="unfinished">Debug-Modus beenden</translation>
+        <translation>Debug-Modus beenden</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Show Command Window</source>
-        <translation type="unfinished">Befehlsfenster anzeigen</translation>
+        <translation>Befehlsfenster anzeigen</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Show Command History</source>
-        <translation type="unfinished">Befehlshistorie anzeigen</translation>
+        <translation>Befehlsverlauf anzeigen</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Show File Browser</source>
-        <translation type="unfinished">Dateibrowser anzeigen</translation>
+        <translation>Dateibrowser anzeigen</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Show Workspace</source>
-        <translation type="unfinished">Arbeitsumgebung anzeigen</translation>
+        <translation>Arbeitsumgebung anzeigen</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Show Editor</source>
-        <translation type="unfinished">Editor anzeigen</translation>
+        <translation>Editor anzeigen</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Show Documentation</source>
-        <translation type="unfinished">Dokumentation anzeigen</translation>
+        <translation>Dokumentation anzeigen</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Show Variable Editor</source>
-        <translation type="unfinished"></translation>
+        <translation>Variableneditor anzeigen</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Command Window</source>
-        <translation type="unfinished">Befehlsfenster</translation>
+        <translation>Befehlsfenster</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Command History</source>
-        <translation type="unfinished"></translation>
+        <translation>Befehlsverlauf</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>File Browser</source>
-        <translation type="unfinished">Dateibrowser</translation>
+        <translation>Dateibrowser</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Workspace</source>
-        <translation type="unfinished">Arbeitsumgebung</translation>
+        <translation>Arbeitsumgebung</translation>
     </message>
     <message>
         <location line="+2"/>
         <location line="+258"/>
         <source>Editor</source>
-        <translation type="unfinished">Editor</translation>
+        <translation>Editor</translation>
     </message>
     <message>
         <location line="-256"/>
         <source>Documentation</source>
-        <translation type="unfinished">Dokumentation</translation>
+        <translation>Dokumentation</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Variable Editor</source>
-        <translation type="unfinished"></translation>
+        <translation>Variableneditor</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Reset Default Window Layout</source>
-        <translation type="unfinished">Fensterlayout auf Grundeinstellung zurücksetzen</translation>
+        <translation>Fensterlayout auf Grundeinstellung zurücksetzen</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Show Ondisk Documentation</source>
-        <translation type="unfinished">Lokal installierte Dokumentation anzeigen</translation>
+        <translation>Lokal installierte Dokumentation anzeigen</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Show Online Documentation</source>
-        <translation type="unfinished">Online-Dokumentation anzeigen</translation>
+        <translation>Online-Dokumentation anzeigen</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Report Bug</source>
-        <translation type="unfinished">Fehler melden</translation>
+        <translation>Fehler melden</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Octave Packages</source>
-        <translation type="unfinished">Octave Pakete</translation>
+        <translation>Octave Pakete</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Contribute to Octave</source>
-        <translation type="unfinished">Zu Octave beitragen</translation>
+        <translation>Zu Octave beitragen</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Octave Developer Resources</source>
-        <translation type="unfinished">Ressourcen für Octave Entwickler</translation>
+        <translation>Ressourcen für Octave-Entwickler</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>About Octave</source>
-        <translation type="unfinished">Über Octave</translation>
+        <translation>Über Octave</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Release Notes</source>
-        <translation type="unfinished">Versionshinweise</translation>
+        <translation>Versionshinweise</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Community News</source>
-        <translation type="unfinished">Neuigkeiten der Community</translation>
+        <translation>Neuigkeiten aus der Community</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Close Tab</source>
-        <translation type="unfinished"></translation>
+        <translation>Tab schließen</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Close All Tabs</source>
-        <translation type="unfinished"></translation>
+        <translation>Alle Tabs schließen</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Close Other Tabs</source>
-        <translation type="unfinished"></translation>
+        <translation>Andere Tabs schließen</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Switch to Left Tab</source>
-        <translation type="unfinished">Zum Reiter links wechseln</translation>
+        <translation>Zum linken Tab wechseln</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Switch to Right Tab</source>
-        <translation type="unfinished">Zum Reiter rechts wechseln</translation>
+        <translation>Zum rechten Tab wechseln</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Move Tab Left</source>
-        <translation type="unfinished">Reiter links schieben</translation>
+        <translation>Tab nach links verschieben</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Move Tab Right</source>
-        <translation type="unfinished">Reiter rechts schieben</translation>
+        <translation>Tab nach rechts verschieben</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Edit Function</source>
-        <translation type="unfinished">Funktion bearbeiten</translation>
+        <translation>Funktion bearbeiten</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Save File</source>
-        <translation type="unfinished">Datei speichern</translation>
+        <translation>Datei speichern</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Save File As</source>
-        <translation type="unfinished">Datei speichern unter</translation>
+        <translation>Datei speichern unter</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Print</source>
-        <translation type="unfinished">Drucken</translation>
+        <translation>Drucken</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Redo</source>
-        <translation type="unfinished">Wiederherstellen</translation>
+        <translation>Wiederherstellen</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Cut</source>
-        <translation type="unfinished">Ausschneiden</translation>
+        <translation>Ausschneiden</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Find and Replace</source>
-        <translation type="unfinished">Suchen und Ersetzen</translation>
+        <translation>Suchen und Ersetzen</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Find Next</source>
-        <translation type="unfinished">Nächsten suchen</translation>
+        <translation>Nächsten suchen</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Find Previous</source>
-        <translation type="unfinished">Vorherigen suchen</translation>
+        <translation>Vorherigen suchen</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Delete to Start of Word</source>
-        <translation type="unfinished">Bis zum Anfang des Wortes löschen</translation>
+        <translation>Bis zum Anfang des Wortes löschen</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Delete to End of Word</source>
-        <translation type="unfinished">Bis zum Ende des Wortes löschen</translation>
+        <translation>Bis zum Ende des Wortes löschen</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Delete to Start of Line</source>
-        <translation type="unfinished">Bis zum Anfang der Zeile löschen</translation>
+        <translation>Bis zum Anfang der Zeile löschen</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Delete to End of Line</source>
-        <translation type="unfinished">Bis zum Ende der Zeile löschen</translation>
+        <translation>Bis zum Ende der Zeile löschen</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Delete Line</source>
-        <translation type="unfinished">Zeile löschen</translation>
+        <translation>Zeile löschen</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Copy Line</source>
-        <translation type="unfinished">Zeile kopieren</translation>
+        <translation>Zeile kopieren</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Cut Line</source>
-        <translation type="unfinished">Zeile ausschneiden</translation>
+        <translation>Zeile ausschneiden</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Duplicate Selection/Line</source>
-        <translation type="unfinished">Zeile oder Auswahl duplizieren</translation>
+        <translation>Zeile oder Auswahl duplizieren</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Transpose Line</source>
-        <translation type="unfinished">Zeilen tauschen</translation>
+        <translation>Zeilen tauschen</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Show Completion List</source>
-        <translation type="unfinished">Vervollständigungsliste anzeigen</translation>
+        <translation>Vervollständigungsliste anzeigen</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Comment Selection</source>
-        <translation type="unfinished">Kommentieren</translation>
+        <translation>Auswahl kommentieren</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Uncomment Selection</source>
-        <translation type="unfinished">Kommentar entfernen</translation>
+        <translation>Kommentar entfernen</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Comment Selection (Choosing String)</source>
-        <translation type="unfinished"></translation>
+        <translation>Auswahl kommentieren (String auswählen)</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Uppercase Selection</source>
-        <translation type="unfinished">Auswahl zu Großbuchstaben</translation>
+        <translation>Auswahl zu Großbuchstaben</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Lowercase Selection</source>
-        <translation type="unfinished">Auswahl zu Kleinbuchstaben</translation>
+        <translation>Auswahl zu Kleinbuchstaben</translation>
     </message>
     <message>
         <location line="+4"/>
         <location line="+5"/>
         <source>Indent Selection Rigidly</source>
-        <translation type="unfinished"></translation>
+        <translation>Auswahl eine Ebene einrücken</translation>
     </message>
     <message>
         <location line="-3"/>
         <location line="+5"/>
         <source>Unindent Selection Rigidly</source>
-        <translation type="unfinished"></translation>
+        <translation>Auswahl eine Ebene ausrücken</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Indent Code</source>
-        <translation type="unfinished"></translation>
+        <translation>Code automatisch einrücken</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Convert Line Endings to Windows</source>
-        <translation type="unfinished">Zeilenenden für Windows umwandeln</translation>
+        <translation>Zeilenenden für Windows umwandeln</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Convert Line Endings to Unix</source>
-        <translation type="unfinished">Zeilenenden für Linux umwandeln</translation>
+        <translation>Zeilenenden für Linux umwandeln</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Convert Line Endings to Mac</source>
-        <translation type="unfinished">Zeilenenden für Mac umwandeln</translation>
+        <translation>Zeilenenden für Mac umwandeln</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Goto Line</source>
-        <translation type="unfinished">Gehe zu Zeile</translation>
+        <translation>Gehe zu Zeile</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Move to Matching Brace</source>
-        <translation type="unfinished"></translation>
+        <translation>Zur zugehörigen Klammer springen</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Select to Matching Brace</source>
-        <translation type="unfinished"></translation>
+        <translation>Bis zur zugehörigen Klammer markieren</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Toggle Bookmark</source>
-        <translation type="unfinished">Lesezeichen umschalten</translation>
+        <translation>Lesezeichen umschalten</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Next Bookmark</source>
-        <translation type="unfinished">Nächstes Lesezeichen</translation>
+        <translation>Nächstes Lesezeichen</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Previous Bookmark</source>
-        <translation type="unfinished">Vorheriges Lesezeichen</translation>
+        <translation>Vorheriges Lesezeichen</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Remove All Bookmark</source>
-        <translation type="unfinished">Alle Lesezeichen entfernen</translation>
+        <translation>Alle Lesezeichen entfernen</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Styles Preferences</source>
-        <translation type="unfinished">Stil-Einstellungen</translation>
+        <translation>Stil-Einstellungen</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Show Line Numbers</source>
-        <translation type="unfinished">Zeilennummern anzeigen</translation>
+        <translation>Zeilennummern anzeigen</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Show Whitespace Characters</source>
-        <translation type="unfinished">Leerzeichen anzeigen</translation>
+        <translation>Leerzeichen anzeigen</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Show Line Endings</source>
-        <translation type="unfinished">Zeilenenden anzeigen</translation>
+        <translation>Zeilenenden anzeigen</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Show Indentation Guides</source>
-        <translation type="unfinished">Einrückungshinweise anzeigen</translation>
+        <translation>Einrückungshinweise anzeigen</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Show Long Line Marker</source>
-        <translation type="unfinished">Markierung langer Zeilen anzeigen</translation>
+        <translation>Markierung für lange Zeilen anzeigen</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Show Toolbar</source>
-        <translation type="unfinished">Werkzeugleiste anzeigen</translation>
+        <translation>Werkzeugleiste anzeigen</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Show Statusbar</source>
-        <translation type="unfinished">Statusleiste anzeigen</translation>
+        <translation>Statusleiste anzeigen</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Show Horizontal Scrollbar</source>
-        <translation type="unfinished">Horizontale Bildlaufleiste anzeigen</translation>
+        <translation>Horizontale Bildlaufleiste anzeigen</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Zoom In</source>
-        <translation type="unfinished">Vergrößern</translation>
+        <translation>Vergrößern</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Zoom Out</source>
-        <translation type="unfinished">Verkleinern</translation>
+        <translation>Verkleinern</translation>
     </message>
     <message>
         <location line="+2"/>
         <location line="+3"/>
         <source>Zoom Normal</source>
-        <translation type="unfinished">Normale Größe</translation>
+        <translation>Normale Größe</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Toggle Breakpoint</source>
-        <translation type="unfinished">Haltepunkt umschalten</translation>
+        <translation>Haltepunkt umschalten</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Next Breakpoint</source>
-        <translation type="unfinished">Nächster Haltepunkt</translation>
+        <translation>Nächster Haltepunkt</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Previous Breakpoint</source>
-        <translation type="unfinished">Vorheriger Haltepunkt</translation>
+        <translation>Vorheriger Haltepunkt</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Remove All Breakpoints</source>
-        <translation type="unfinished">Alle Haltepunkte entfernen</translation>
+        <translation>Alle Haltepunkte entfernen</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Run File</source>
-        <translation type="unfinished">Datei ausführen</translation>
+        <translation>Datei ausführen</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Run Selection</source>
-        <translation type="unfinished">Auswahl ausführen</translation>
+        <translation>Auswahl ausführen</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Help on Keyword</source>
-        <translation type="unfinished">Hilfe zum Schlüsselwort</translation>
+        <translation>Hilfe zum Schlüsselwort</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Document on Keyword</source>
-        <translation type="unfinished">Dokumentation zum Schlüsselwort</translation>
+        <translation>Dokumentation zum Schlüsselwort</translation>
     </message>
     <message>
         <location line="+57"/>
         <source>Global</source>
-        <translation type="unfinished">Global</translation>
+        <translation>Global</translation>
     </message>
     <message>
         <location line="+3"/>
         <location line="+27"/>
         <source>File Menu</source>
-        <translation type="unfinished"></translation>
+        <translation>Datei-Menü</translation>
     </message>
     <message>
         <location line="-25"/>
         <location line="+27"/>
         <source>Edit Menu</source>
-        <translation type="unfinished"></translation>
+        <translation>Bearbeiten-Menü</translation>
     </message>
     <message>
         <location line="-25"/>
         <location line="+29"/>
         <source>Debug Menu</source>
-        <translation type="unfinished"></translation>
+        <translation>Debug-Menü</translation>
     </message>
     <message>
         <location line="-27"/>
         <source>Window Menu</source>
-        <translation type="unfinished"></translation>
+        <translation>Fenster-Menü</translation>
     </message>
     <message>
         <location line="+2"/>
         <location line="+29"/>
         <source>Help Menu</source>
-        <translation type="unfinished"></translation>
+        <translation>Hilfe-Menü</translation>
     </message>
     <message>
         <location line="-27"/>
         <source>News Menu</source>
-        <translation type="unfinished"></translation>
+        <translation>Neuigkeiten-Menü</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Tab Handling in Dock Widgets</source>
-        <translation type="unfinished"></translation>
+        <translation>Tabverhalten in andockbaren Bedienelementen</translation>
     </message>
     <message>
         <location line="+19"/>
         <source>View Menu</source>
-        <translation type="unfinished"></translation>
+        <translation>Ansicht-Menü</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Run Menu</source>
-        <translation type="unfinished"></translation>
+        <translation>Ausführen-Menü</translation>
     </message>
     <message>
         <location line="+68"/>
         <source>Import shortcuts from file ...</source>
-        <translation type="unfinished">Tastenkürzel aus Datei importieren ...</translation>
+        <translation>Tastenkürzel aus Datei importieren ...</translation>
     </message>
     <message>
         <location line="+1"/>
         <location line="+5"/>
         <source>Octave Shortcut Files (*.osc);;All Files (*)</source>
-        <translation type="unfinished">Octave Tastenkürzel-Dateien (*.osc);;Alle Dateien (*)</translation>
+        <translation>Octave Tastenkürzel-Dateien (*.osc);;Alle Dateien (*)</translation>
     </message>
     <message>
         <location line="-1"/>
         <source>Export shortcuts into file ...</source>
-        <translation type="unfinished">Tastenkürzel in Datei exportieren ...</translation>
+        <translation>Tastenkürzel in Datei exportieren...</translation>
     </message>
     <message>
         <location line="+11"/>
         <source>Failed to open %1 as octave shortcut file</source>
-        <translation type="unfinished">Konnte %1 nicht als Octave-Tastenkürzel-Datei öffnen</translation>
+        <translation>Konnte %1 nicht als Octave-Tastenkürzel-Datei öffnen</translation>
     </message>
     <message>
         <location line="+26"/>
         <source>Enter new Shortcut</source>
-        <translation type="unfinished">Neuer Tastenkürzel eingeben</translation>
+        <translation>Neues Tastenkürzel eingeben</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Apply the desired shortcut or click on the right button to reset the shortcut to its default.</source>
-        <translation type="unfinished">Das gewünschte Tastenkürzel eingeben oder auf die Schaltfläche rechts klicken, um das Tastenkürzel auf seinen Standardwert zurückzusetzen.</translation>
+        <translation>Das gewünschte Tastenkürzel eingeben oder auf die Schaltfläche rechts klicken, um das Tastenkürzel auf seinen Standardwert zurückzusetzen.</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Enter shortcut directly by performing it</source>
-        <translation type="unfinished">Tastenkürzel direkt durch seine Ausführung eingeben</translation>
+        <translation>Tastenkürzel direkt durch seine Ausführung eingeben</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Actual shortcut</source>
-        <translation type="unfinished">Aktives Tastenkürzel</translation>
+        <translation>Aktives Tastenkürzel</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Default shortcut</source>
-        <translation type="unfinished">Standard-Tastenkürzel</translation>
+        <translation>Standard-Tastenkürzel</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Set to default</source>
-        <translation type="unfinished">Auf Standardwert setzen</translation>
+        <translation>Auf Standardwert setzen</translation>
     </message>
     <message>
         <location line="+63"/>
         <source>Overwriting Shortcuts</source>
-        <translation type="unfinished">Tastenkürzel überschreiben</translation>
+        <translation>Tastenkürzel überschreiben</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>You are about to overwrite all shortcuts.
 Would you like to save the current shortcut set or cancel the action?</source>
-        <translation type="unfinished">Dies überschreibt alle Tastenkürzel.
+        <translation>Dies überschreibt alle Tastenkürzel.
 Die eingestellten Tastenkürzel speichern oder die Aktion abbrechen?</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Don&apos;t save</source>
-        <translation type="unfinished">Nicht speichern</translation>
+        <translation>Nicht speichern</translation>
     </message>
 </context>
 <context>
@@ -3110,7 +3120,7 @@
     <message>
         <location filename="../src/terminal-dock-widget.cc" line="+43"/>
         <source>Command Window</source>
-        <translation type="unfinished">Befehlsfenster</translation>
+        <translation>Befehlsfenster</translation>
     </message>
 </context>
 <context>
@@ -3118,22 +3128,22 @@
     <message>
         <location filename="../src/variable-editor.cc" line="+177"/>
         <source>Dock widget</source>
-        <translation type="unfinished">Fenster andocken</translation>
+        <translation>Bedienelement andocken</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Undock widget</source>
-        <translation type="unfinished">Fenster lösen</translation>
+        <translation>Bedienelement lösen</translation>
     </message>
     <message>
         <location line="+17"/>
         <source>Restore geometry</source>
-        <translation type="unfinished"></translation>
+        <translation>Anordnung wiederherstellen</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Redock</source>
-        <translation type="unfinished"></translation>
+        <translation>Wieder andocken</translation>
     </message>
 </context>
 <context>
@@ -3141,94 +3151,94 @@
     <message>
         <location line="+790"/>
         <source>Variable Editor</source>
-        <translation type="unfinished"></translation>
+        <translation>Variableneditor</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Edit variables.</source>
-        <translation type="unfinished"></translation>
+        <translation>Variablen bearbeiten.</translation>
     </message>
     <message>
         <location line="+470"/>
         <source>Variable Editor Toolbar</source>
-        <translation type="unfinished"></translation>
+        <translation>Werkzeugleiste des Variableneditors</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Save</source>
-        <translation type="unfinished"></translation>
+        <translation>Speichern</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Save variable to a file</source>
-        <translation type="unfinished"></translation>
+        <translation>Variable in Datei speichern</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Cut</source>
-        <translation type="unfinished">Ausschneiden</translation>
+        <translation>Ausschneiden</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Cut data to clipboard</source>
-        <translation type="unfinished"></translation>
+        <translation>Daten in Zwischenablage verschieben</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Copy</source>
-        <translation type="unfinished">Kopieren</translation>
+        <translation>Kopieren</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Copy data to clipboard</source>
-        <translation type="unfinished"></translation>
+        <translation>Daten in Zwischenablage kopieren</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Paste</source>
-        <translation type="unfinished">Einfügen</translation>
+        <translation>Einfügen</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Paste clipboard into variable data</source>
-        <translation type="unfinished"></translation>
+        <translation>Daten aus Zwischenablage in Variable einfügen</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Paste Table</source>
-        <translation type="unfinished"></translation>
+        <translation>Tabelle einfügen</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Another paste clipboard into variable data</source>
-        <translation type="unfinished"></translation>
+        <translation>Tabelle aus Zwischenablage in Variabendaten einfügen</translation>
     </message>
     <message>
         <location line="+9"/>
         <location line="+5"/>
         <location line="+7"/>
         <source>Plot</source>
-        <translation type="unfinished"></translation>
+        <translation>Plotten</translation>
     </message>
     <message>
         <location line="-11"/>
         <source>Plot Selected Data</source>
-        <translation type="unfinished"></translation>
+        <translation>Ausgewählte Daten plotten</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Plot selected data</source>
-        <translation type="unfinished"></translation>
+        <translation>Ausgewählte Daten plotten</translation>
     </message>
     <message>
         <location line="+21"/>
         <source>Up</source>
-        <translation type="unfinished"></translation>
+        <translation>Hoch</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Go one level up in variable hierarchy</source>
-        <translation type="unfinished"></translation>
+        <translation>In der Variablenhierarchie eine Ebene nach oben gehen</translation>
     </message>
 </context>
 <context>
@@ -3236,12 +3246,7 @@
     <message>
         <location line="-1169"/>
         <source>Save Variable %1 As</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>./%1.txt</source>
-        <translation type="unfinished"></translation>
+        <translation>Variable %1 speichern unter</translation>
     </message>
 </context>
 <context>
@@ -3249,42 +3254,42 @@
     <message>
         <location line="+123"/>
         <source>Cut</source>
-        <translation type="unfinished">Ausschneiden</translation>
+        <translation>Ausschneiden</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Copy</source>
-        <translation type="unfinished">Kopieren</translation>
+        <translation>Kopieren</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Paste</source>
-        <translation type="unfinished">Einfügen</translation>
+        <translation>Einfügen</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Paste Table</source>
-        <translation type="unfinished"></translation>
+        <translation>Tabelle einfügen</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Clear</source>
-        <translation type="unfinished"></translation>
+        <translation>Leeren</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Delete</source>
-        <translation type="unfinished"></translation>
+        <translation>Löschen</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Variable from Selection</source>
-        <translation type="unfinished"></translation>
+        <translation>Variable aus Auswahl erstellen</translation>
     </message>
     <message>
         <location line="+18"/>
         <source>Transpose</source>
-        <translation type="unfinished"></translation>
+        <translation>Transponieren</translation>
     </message>
 </context>
 <context>
@@ -3292,32 +3297,32 @@
     <message>
         <location filename="../src/qtinfo/webinfo.cc" line="+85"/>
         <source>Type here and press &apos;Return&apos; to search</source>
-        <translation type="unfinished">Suchbegriff eingeben und mit der &apos;Eingabetaste&apos; die Suche starten</translation>
+        <translation>Suchbegriff eingeben und mit der &apos;Eingabetaste&apos; die Suche starten</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Global search</source>
-        <translation type="unfinished">Globale Suche</translation>
+        <translation>Globale Suche</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>&amp;Close</source>
-        <translation type="unfinished">S&amp;chließen</translation>
+        <translation>S&amp;chließen</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Close &amp;Other Tabs</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Andere Tabs schließen</translation>
     </message>
     <message>
         <location line="+79"/>
         <source>Error</source>
-        <translation type="unfinished">Fehler</translation>
+        <translation>Fehler</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>The info file&lt;p&gt;%1&lt;p&gt;or compressed versions do not exist</source>
-        <translation type="unfinished">Die Info-Datei &lt;p&gt;%1&lt;p&gt;existiert nicht, auch keine komprimierte Version</translation>
+        <translation>Die Info-Datei &lt;p&gt;%1&lt;p&gt; existiert nicht, auch keine komprimierte Version</translation>
     </message>
 </context>
 <context>
@@ -3325,7 +3330,7 @@
     <message>
         <location filename="../src/welcome-wizard.cc" line="-162"/>
         <source>Welcome to GNU Octave</source>
-        <translation type="unfinished">Willkommen bei GNU Octave</translation>
+        <translation>Willkommen bei GNU Octave</translation>
     </message>
 </context>
 <context>
@@ -3333,38 +3338,38 @@
     <message>
         <location filename="../src/workspace-model.cc" line="-41"/>
         <source>Name</source>
-        <translation type="unfinished">Bezeichner</translation>
+        <translation>Name</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Class</source>
-        <translation type="unfinished">Klasse</translation>
+        <translation>Klasse</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Dimension</source>
-        <translation type="unfinished">Dimension</translation>
+        <translation>Dimension</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Value</source>
-        <translation type="unfinished">Wert</translation>
+        <translation>Wert</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Attribute</source>
-        <translation type="unfinished">Attribut</translation>
+        <translation>Attribut</translation>
     </message>
     <message>
         <location line="+108"/>
         <source>Right click to copy, rename, or display</source>
-        <translation type="unfinished">Rechtsklick zum Kopieren, Umbenennen oder Anzeigen</translation>
+        <translation>Rechtsklick zum Kopieren, Umbenennen oder Anzeigen</translation>
     </message>
     <message>
         <location line="+37"/>
         <location line="+2"/>
         <source>complex</source>
-        <translation type="unfinished">komplex</translation>
+        <translation>komplex</translation>
     </message>
 </context>
 <context>
@@ -3372,87 +3377,87 @@
     <message>
         <location filename="../src/workspace-view.cc" line="+55"/>
         <source>Workspace</source>
-        <translation type="unfinished">Arbeitsumgebung</translation>
+        <translation>Arbeitsumgebung</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>View the variables in the active workspace.</source>
-        <translation type="unfinished">Variablen einsehen, die sich in der aktiven Arbeitsumgebung befinden.</translation>
+        <translation>Variablen einsehen, die sich in der aktiven Arbeitsumgebung befinden.</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Enter text to filter the workspace</source>
-        <translation type="unfinished">Text eingeben um die Arbeitsumgebung zu filtern</translation>
+        <translation>Text eingeben, um die Arbeitsumgebung zu filtern</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Filter</source>
-        <translation type="unfinished">Filter</translation>
+        <translation>Filter</translation>
     </message>
     <message>
         <location line="+129"/>
         <source>View the variables in the active workspace.&lt;br&gt;</source>
-        <translation type="unfinished">Einsehen der Variablen der aktiven Arbeitsumgebung.&lt;br&gt;</translation>
+        <translation>Anzeige der Variablen der aktiven Arbeitsumgebung.&lt;br&gt;</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Colors for variable attributes:</source>
-        <translation type="unfinished">Farben für Variablen-Attribute:</translation>
+        <translation>Farben für Variablen-Attribute:</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Class</source>
-        <translation type="unfinished">Klasse</translation>
+        <translation>Klasse</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Dimension</source>
-        <translation type="unfinished">Dimension</translation>
+        <translation>Dimension</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Value</source>
-        <translation type="unfinished">Wert</translation>
+        <translation>Wert</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Attribute</source>
-        <translation type="unfinished">Attribut</translation>
+        <translation>Attribut</translation>
     </message>
     <message>
         <location line="+136"/>
         <source>Open in Variable Editor</source>
-        <translation type="unfinished"></translation>
+        <translation>Im Variableneditor öffnen</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Copy name</source>
-        <translation type="unfinished">Namen kopieren</translation>
+        <translation>Namen kopieren</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Copy value</source>
-        <translation type="unfinished">Wert kopieren</translation>
+        <translation>Wert kopieren</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Rename</source>
-        <translation type="unfinished">Umbenennen</translation>
+        <translation>Umbenennen</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Only top-level symbols may be renamed</source>
-        <translation type="unfinished">Nur Toplevel-Symbole können umbenannt werden</translation>
+        <translation>Nur Symbole der obersten Ebene können umbenannt werden</translation>
     </message>
     <message>
         <location line="+22"/>
         <source>Hide filter</source>
-        <translation type="unfinished">Filter ausblenden</translation>
+        <translation>Filter ausblenden</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Show filter</source>
-        <translation type="unfinished">Filter anzeigen</translation>
+        <translation>Filter anzeigen</translation>
     </message>
 </context>
 <context>
@@ -3660,7 +3665,7 @@
     <message>
         <location line="+28"/>
         <source>History buffer Size</source>
-        <translation>Puffergröße der Befehlshistorie</translation>
+        <translation>Puffergröße des Befehlsverlaufs</translation>
     </message>
     <message>
         <location line="+34"/>
@@ -3841,92 +3846,92 @@
     <message>
         <location line="-889"/>
         <source>Show complete path in title</source>
-        <translation type="unfinished"></translation>
+        <translation>Vollständigen Pfad im Titel anzeigen</translation>
     </message>
     <message>
         <location line="+131"/>
         <source>Number size as difference to editor font</source>
-        <translation type="unfinished"></translation>
+        <translation>Differenz zur Schriftgröße der Zeilennummern</translation>
     </message>
     <message>
         <location line="+124"/>
         <source>Highlight all occurrences of a word selected by a double click</source>
-        <translation type="unfinished"></translation>
+        <translation>Alle Vorkommnisse eines Wortes nach einem Doppelklick hervorheben</translation>
     </message>
     <message>
         <location line="+65"/>
         <source>Comments (Octave)</source>
-        <translation type="unfinished"></translation>
+        <translation>Kommentare (Octave)</translation>
     </message>
     <message>
         <location line="+11"/>
         <source>Strings considered for uncommenting text</source>
-        <translation type="unfinished"></translation>
+        <translation>Strings, die beim Entfernen von Kommentaren berücksichtigt werden</translation>
     </message>
     <message>
         <location line="+23"/>
         <source>String used for commenting selected text</source>
-        <translation type="unfinished"></translation>
+        <translation>String, der zum Auskommentieren des ausgewählten Texts genutzt wird</translation>
     </message>
     <message>
         <location line="+31"/>
         <source>Long lines</source>
-        <translation type="unfinished"></translation>
+        <translation>Lange Zeilen</translation>
     </message>
     <message>
         <location line="+25"/>
         <source>Break long lines at line length</source>
-        <translation type="unfinished"></translation>
+        <translation>bei Zeilenlänge umbrechen</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Break lines only in comments</source>
-        <translation type="unfinished"></translation>
+        <translation>nur in Kommentaren</translation>
     </message>
     <message>
         <location line="+60"/>
         <source>Line length</source>
-        <translation type="unfinished"></translation>
+        <translation>Zeilenlänge</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Long line marker</source>
-        <translation type="unfinished"></translation>
+        <translation>Markierung langer Zeilen</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Line</source>
-        <translation type="unfinished"></translation>
+        <translation>Linie</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Background</source>
-        <translation type="unfinished">Hintergrund</translation>
+        <translation>Hintergrund</translation>
     </message>
     <message>
         <location line="+38"/>
-        <source>Wrap long lines at curent window border</source>
-        <translation type="unfinished"></translation>
+        <source>Wrap long lines at current window border</source>
+        <translation>Lange Zeilen an Fensterrand umbrechen</translation>
     </message>
     <message>
         <location line="+153"/>
         <source>Auto insert after &quot;if&quot; etc.</source>
-        <translation type="unfinished"></translation>
+        <translation>Automatisch nach &quot;if&quot; usw. einfügen</translation>
     </message>
     <message>
         <location line="+20"/>
         <source>Nothing</source>
-        <translation type="unfinished"></translation>
+        <translation>Nichts</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>&quot;endif&quot; etc.</source>
-        <translation type="unfinished"></translation>
+        <translation>&quot;endif&quot; usw.</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>&quot;end&quot;</source>
-        <translation type="unfinished"></translation>
+        <translation>&quot;end&quot;</translation>
     </message>
     <message>
         <location line="+235"/>
@@ -3936,12 +3941,12 @@
     <message>
         <location line="+32"/>
         <source>Restore editor tabs from previous session on startup or when editor is shown again after closing</source>
-        <translation type="unfinished"></translation>
+        <translation>Editor-Tabs der vorherigen Sitzung oder nach dem Schließen des Editors wiederherstellen</translation>
     </message>
     <message>
         <location line="+105"/>
         <source>Close all files when the editor widget is closed/hidden</source>
-        <translation type="unfinished"></translation>
+        <translation>Alle Dateien beim Schließen des Editorfensters schließen</translation>
     </message>
     <message>
         <location line="+55"/>
@@ -4027,62 +4032,62 @@
     <message>
         <location line="+90"/>
         <source>Variable Editor</source>
-        <translation type="unfinished"></translation>
+        <translation>Variableneditor</translation>
     </message>
     <message>
         <location line="+33"/>
         <source>Default row height</source>
-        <translation type="unfinished"></translation>
+        <translation>Standard-Zeilenhöhe</translation>
     </message>
     <message>
         <location line="+17"/>
         <source>20</source>
-        <translation type="unfinished">3D {20?}</translation>
+        <translation>20</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Default column width</source>
-        <translation type="unfinished"></translation>
+        <translation>Standard-Spaltenbreite</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Use Terminal Font</source>
-        <translation type="unfinished"></translation>
+        <translation>Schriftart des Befehlsfensters verwenden</translation>
     </message>
     <message>
         <location line="+27"/>
         <source>2</source>
-        <translation type="unfinished">3D {2?}</translation>
+        <translation>2</translation>
     </message>
     <message>
         <location line="+16"/>
         <source>Autofit</source>
-        <translation type="unfinished"></translation>
+        <translation>automatisch</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Plus font height</source>
-        <translation type="unfinished"></translation>
+        <translation>plus Schrifthöhe</translation>
     </message>
     <message>
         <location line="+17"/>
         <source>By Column</source>
-        <translation type="unfinished"></translation>
+        <translation>Je Spalte</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Uniform</source>
-        <translation type="unfinished"></translation>
+        <translation>Gleichmäßig</translation>
     </message>
     <message>
         <location line="+23"/>
         <source>Variable Editor Colors</source>
-        <translation type="unfinished"></translation>
+        <translation>Farben für Variableneditor</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>Use alternating row colors</source>
-        <translation type="unfinished"></translation>
+        <translation>Zeilen abwechselnd einfärben</translation>
     </message>
     <message>
         <location line="-287"/>
diff -r e909207e9ff1 -r 56b26a3376d0 libgui/languages/ja_JP.ts
--- a/libgui/languages/ja_JP.ts	Fri Mar 30 17:47:12 2018 -0400
+++ b/libgui/languages/ja_JP.ts	Mon Apr 02 08:58:20 2018 -0700
@@ -56,12 +56,12 @@
     <message>
         <location filename="../src/settings-dialog.cc" line="+136"/>
         <source>Difference to the default size</source>
-        <translation type="unfinished">既定のサイズとの差</translation>
+        <translation>既定のサイズとの差</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Background color, pink (255, 0, 255) means default</source>
-        <translation type="unfinished">背景色，ピンク (255,0,255) が既定を意味する {255, 0, 255)?}</translation>
+        <translation>背景色，ピンク (255,0,255) が既定を意味する {255, 0, 255)?}</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -107,7 +107,7 @@
     <message>
         <location filename="../qterminal/libqterminal/QTerminal.cc" line="+49"/>
         <source>Edit %1 at line %2</source>
-        <translation type="unfinished"></translation>
+        <translation>%2 行目の %1 を編集</translation>
     </message>
 </context>
 <context>
@@ -153,7 +153,7 @@
     <message>
         <location line="+3"/>
         <source>Single-quoted string</source>
-        <translation type="unfinished">シングルクォートで囲まれた文字列</translation>
+        <translation>シングルクォートで囲まれた文字列</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -173,7 +173,7 @@
     <message>
         <location line="+3"/>
         <source>Parameter expansion</source>
-        <translation type="unfinished"></translation>
+        <translation>パラメータの展開</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -244,7 +244,7 @@
     <message>
         <location line="+3"/>
         <source>Inactive default</source>
-        <translation type="unfinished"></translation>
+        <translation>既定をインアクティブ</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -254,7 +254,7 @@
     <message>
         <location line="+3"/>
         <source>Inactive C comment</source>
-        <translation type="unfinished"></translation>
+        <translation>C のコメントをインアクティブ</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -264,7 +264,7 @@
     <message>
         <location line="+3"/>
         <source>Inactive C++ comment</source>
-        <translation type="unfinished"></translation>
+        <translation>C++  のコメントをインアクティブ</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -274,7 +274,7 @@
     <message>
         <location line="+3"/>
         <source>Inactive JavaDoc style C comment</source>
-        <translation type="unfinished"></translation>
+        <translation>JavaDoc スタイル C のコメントをインアクティブ</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -284,7 +284,7 @@
     <message>
         <location line="+3"/>
         <source>Inactive number</source>
-        <translation type="unfinished"></translation>
+        <translation>数をインアクティブ</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -294,7 +294,7 @@
     <message>
         <location line="+3"/>
         <source>Inactive keyword</source>
-        <translation type="unfinished"></translation>
+        <translation>キーワードをインアクティブ</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -304,7 +304,7 @@
     <message>
         <location line="+3"/>
         <source>Inactive double-quoted string</source>
-        <translation type="unfinished"></translation>
+        <translation>ダブルクォートで囲まれた文字列をインアクティブ</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -314,7 +314,7 @@
     <message>
         <location line="+3"/>
         <source>Inactive single-quoted string</source>
-        <translation type="unfinished"></translation>
+        <translation>シングルクォートで囲まれた文字列をインアクティブ</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -334,7 +334,7 @@
     <message>
         <location line="+3"/>
         <source>Inactive pre-processor block</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location line="+3"/>
@@ -344,7 +344,7 @@
     <message>
         <location line="+3"/>
         <source>Inactive operator</source>
-        <translation type="unfinished"></translation>
+        <translation>演算子をインアクティブ</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -359,12 +359,12 @@
     <message>
         <location line="+3"/>
         <source>Unclosed string</source>
-        <translation type="unfinished"></translation>
+        <translation>閉じられていない文字列</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Inactive unclosed string</source>
-        <translation type="unfinished"></translation>
+        <translation>閉じられていない文字列をインアクティブ</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -384,7 +384,7 @@
     <message>
         <location line="+3"/>
         <source>Inactive JavaScript regular expression</source>
-        <translation type="unfinished"></translation>
+        <translation>JavaScript の正規表現をインアクティブ</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -394,7 +394,7 @@
     <message>
         <location line="+3"/>
         <source>Inactive JavaDoc style C++ comment</source>
-        <translation type="unfinished"></translation>
+        <translation>JavaDoc スタイルのC++のコメントをインアクティブ</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -414,7 +414,7 @@
     <message>
         <location line="+3"/>
         <source>Inactive JavaDoc keyword</source>
-        <translation type="unfinished"></translation>
+        <translation>JavaDoc キーワードをインアクティブ</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -424,7 +424,7 @@
     <message>
         <location line="+3"/>
         <source>Inactive JavaDoc keyword error</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">JavaDoc キーワードエラーをインアクティブ</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -439,12 +439,12 @@
     <message>
         <location line="+3"/>
         <source>C++ raw string</source>
-        <translation type="unfinished"></translation>
+        <translation>C++ raw 文字列</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Inactive C++ raw string</source>
-        <translation type="unfinished"></translation>
+        <translation>C++ raw 文字列をインアクティブ</translation>
     </message>
 </context>
 <context>
@@ -452,7 +452,7 @@
     <message>
         <location filename="../../../qsci/qscilexerdiff.cpp" line="+107"/>
         <source>Default</source>
-        <translation type="unfinished">既定</translation>
+        <translation>既定</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -579,8 +579,7 @@
         <location line="+3"/>
         <source>Single-quoted string</source>
         <translation>シングルクォートで囲まれた文字列</translation>
-    </message>
-    <message>
+    </message>    <message>
         <location line="+3"/>
         <source>Operator</source>
         <translation>演算子</translation>
@@ -598,12 +597,12 @@
     <message>
         <location line="+3"/>
         <source>Array</source>
-        <translation type="unfinished"></translation>
+        <translation>配列</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Hash</source>
-        <translation type="unfinished"></translation>
+        <translation>ハッシ</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -618,7 +617,7 @@
     <message>
         <location line="+3"/>
         <source>Substitution</source>
-        <translation type="unfinished"></translation>
+        <translation>置換</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -653,27 +652,27 @@
     <message>
         <location line="+3"/>
         <source>Quoted string (q)</source>
-        <translation type="unfinished"></translation>
+        <translation>クォートされた文字列 (q)</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Quoted string (qq)</source>
-        <translation type="unfinished"></translation>
+        <translation>クォートされた文字列 (qq)</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Quoted string (qx)</source>
-        <translation type="unfinished"></translation>
+        <translation>クォートされた文字列 (qx)</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Quoted string (qr)</source>
-        <translation type="unfinished"></translation>
+        <translation>クォートされた文字列 (qr)</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Quoted string (qw)</source>
-        <translation type="unfinished"></translation>
+        <translation>クォートされた文字列 (qw)</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -683,7 +682,7 @@
     <message>
         <location line="+3"/>
         <source>Subroutine prototype</source>
-        <translation type="unfinished"></translation>
+        <translation>サブルーチンプロトタイプ</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -693,27 +692,27 @@
     <message>
         <location line="+3"/>
         <source>Format body</source>
-        <translation type="unfinished"></translation>
+        <translation>フォーマットボディ</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Double-quoted string (interpolated variable)</source>
-        <translation type="unfinished"></translation>
+        <translation>ダブルクオートされた文字列（インターポレートされた変数）</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Translation</source>
-        <translation type="unfinished"></translation>
+        <translation>翻訳</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Regular expression (interpolated variable)</source>
-        <translation type="unfinished"></translation>
+        <translation>正規表現（インターポレートされた変数）</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Substitution (interpolated variable)</source>
-        <translation type="unfinished"></translation>
+        <translation>置換（インターポレートされた変数）</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -723,7 +722,7 @@
     <message>
         <location line="+3"/>
         <source>Double-quoted here document (interpolated variable)</source>
-        <translation type="unfinished"></translation>
+        <translation>ダブルクォートされたヒヤドキュメント（インターポレートされた変数）</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -733,17 +732,17 @@
     <message>
         <location line="+3"/>
         <source>Quoted string (qq, interpolated variable)</source>
-        <translation type="unfinished"></translation>
+        <translation>クォートされた文字列（qq, インターポレートされた変数）</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Quoted string (qx, interpolated variable)</source>
-        <translation type="unfinished"></translation>
+        <translation>クォートされた文字列（qx, インターポレートされた変数）</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Quoted string (qr, interpolated variable)</source>
-        <translation type="unfinished"></translation>
+        <translation>クォートされた文字列（qr, インターポレートされた変数）</translation>
     </message>
 </context>
 <context>
@@ -845,7 +844,7 @@
     <message>
         <location line="+41"/>
         <source>Octave Figure File (*.ofig);;Vector Image Formats (*.eps *.epsc *.pdf *.svg *.ps *.tikz);;Bitmap Image Formats (*.gif *.jpg *.png *.tiff)</source>
-        <translation type="unfinished"></translation>
+        <translation>Octave 図ファイル (*.ofig);;ベクトル イメージ ファオーマット (*.eps *.epsc *.pdf *.svg *.ps *.tikz);;ビットマップ イメージ ファオーマット(*.gif *.jpg *.png *.tiff)</translation>
     </message>
     <message>
         <location line="-576"/>
@@ -897,28 +896,28 @@
     <message>
         <location filename="../qterminal/libqterminal/unix/Filter.cpp" line="+628"/>
         <source>Open Link</source>
-        <translation type="unfinished"></translation>
+        <translation>オープンリンク</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Copy Link Address</source>
-        <translation type="unfinished"></translation>
+        <translation>リンクアドレスをコピー</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Send Email To...</source>
-        <translation type="unfinished"></translation>
+        <translation>E メールを...に送信</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Copy Email Address</source>
-        <translation type="unfinished"></translation>
+        <translation>E メールアドレスをコピー</translation>
     </message>
     <message>
         <location line="+10"/>
         <location line="+12"/>
         <source>Edit %1 at line %2</source>
-        <translation type="unfinished"></translation>
+        <translation>%2 行目の %1 を編集</translation>
     </message>
 </context>
 <context>
@@ -926,7 +925,7 @@
     <message>
         <location filename="../graphics/annotation-dialog.ui" line="+17"/>
         <source>Annotation</source>
-        <translation type="unfinished"></translation>
+        <translation>アノテーション</translation>
     </message>
     <message>
         <location line="+6"/>
@@ -1080,7 +1079,7 @@
     <message>
         <location filename="../src/dialog.cc" line="+276"/>
         <source>Select All</source>
-        <translation type="unfinished"></translation>
+        <translation>すべてを選択</translation>
     </message>
 </context>
 <context>
@@ -1088,35 +1087,35 @@
     <message>
         <location filename="../src/documentation.cc" line="+59"/>
         <source>Octave Documentation</source>
-        <translation type="unfinished"></translation>
+        <translation>Octave ドキュメント</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Could not setup the data required for the
 documentation viewer. Only help texts in
 the Console Widget will be available.</source>
-        <translation type="unfinished"></translation>
+        <translation>ドキュメントビューアーに必要なデータをセットアップできません．コンソールウィジェットでのヘルプテキストだけが使用可能です．</translation>
     </message>
     <message>
         <location line="+20"/>
         <source>Contents</source>
-        <translation type="unfinished"></translation>
+        <translation>コンテント</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Enter text to search the indices</source>
-        <translation type="unfinished"></translation>
+        <translation>インデックスを検索するテキストを入力</translation>
     </message>
     <message>
         <location line="+10"/>
         <location line="+37"/>
         <source>Search</source>
-        <translation type="unfinished"></translation>
+        <translation>検索</translation>
     </message>
     <message>
         <location line="-22"/>
         <source>Index</source>
-        <translation type="unfinished"></translation>
+        <translation>インデックス</translation>
     </message>
 </context>
 <context>
@@ -1124,12 +1123,12 @@
     <message>
         <location filename="../src/documentation-dock-widget.cc" line="+39"/>
         <source>Documentation</source>
-        <translation type="unfinished">ドキュメント</translation>
+        <translation>ドキュメント</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>See the documentation for help.</source>
-        <translation type="unfinished">ヘルプとしてドキュメントを見る</translation>
+        <translation>ヘルプとしてドキュメントを見る</translation>
     </message>
 </context>
 <context>
@@ -1138,20 +1137,20 @@
         <location filename="../src/external-editor-interface.cc" line="+63"/>
         <location line="+45"/>
         <source>Octave Editor</source>
-        <translation type="unfinished">Octave エディタ</translation>
+        <translation>Octave エディタ</translation>
     </message>
     <message>
         <location line="-44"/>
         <source>Could not start custom file editor
 %1</source>
-        <translation type="unfinished">カスタムファイルエディタをスタートできません
+        <translation>カスタムファイルエディタをスタートできません
 %1</translation>
     </message>
     <message>
         <location line="+45"/>
         <source>There is no custom editor configured yet.
 Do you want to open the preferences?</source>
-        <translation type="unfinished"></translation>
+        <translation>設定されたカスタムエディタが存在しません．設定を開きますか?</translation>
     </message>
 </context>
 <context>
@@ -1163,28 +1162,28 @@
         <location line="+19"/>
         <location line="+25"/>
         <source>Octave Editor</source>
-        <translation type="unfinished">Octave エディタ</translation>
+        <translation>Octave エディタ</translation>
     </message>
     <message>
         <location line="-487"/>
         <source>File not saved! A file with the selected name
 %1
 is already open in the editor</source>
-        <translation type="unfinished">ファイルは保存されていません！
+        <translation>ファイルは保存されていません！
 %1
 同名のファイルがエディタで既に開かれています</translation>
     </message>
     <message>
         <location line="+28"/>
         <source>The associated file editor tab has disappeared.</source>
-        <translation type="unfinished"></translation>
+        <translation>関連づけられたエディタタブが消失しました</translation>
     </message>
     <message>
         <location line="+416"/>
         <source>Could not open file
 %1
 for read: %2.</source>
-        <translation type="unfinished">ファイル
+        <translation>ファイル
 %1
 を開けません: %2 の読み込みのために.</translation>
     </message>
@@ -1193,146 +1192,148 @@
         <source>File
 %1
 does not exist. Do you want to create it?</source>
-        <translation type="unfinished"></translation>
+        <translation>ファイル
+%1
+は存在しません．作成しますか?</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Create</source>
-        <translation type="unfinished">作成</translation>
+        <translation>作成</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation>キャンセル</translation>
     </message>
     <message>
         <location line="+20"/>
         <source>Could not open file
 %1
 for write: %2.</source>
-        <translation type="unfinished">ファイル
+        <translation>ファイル
 %1
 が開けません: %2　の書き込みのために.</translation>
     </message>
     <message>
         <location line="+217"/>
         <source>&amp;File</source>
-        <translation type="unfinished">ファイル (&amp;F)</translation>
+        <translation>ファイル (&amp;F)</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>&amp;Recent Editor Files</source>
-        <translation type="unfinished">最近開いたファイル (&amp;R)</translation>
+        <translation>最近開いたファイル (&amp;R)</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>&amp;Edit Function</source>
-        <translation type="unfinished">関数の編集 (&amp;E)</translation>
+        <translation>関数の編集 (&amp;E)</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>&amp;Save File</source>
-        <translation type="unfinished">ファイルの保存 (&amp;S)</translation>
+        <translation>ファイルの保存 (&amp;S)</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Save File &amp;As...</source>
-        <translation type="unfinished">ファイルを別名で保存 (&amp;A)...</translation>
+        <translation>ファイルを別名で保存 (&amp;A)...</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>&amp;Close</source>
-        <translation type="unfinished">閉じる (&amp;C)</translation>
+        <translation>閉じる (&amp;C)</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Close All</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Close Other Files</source>
-        <translation type="unfinished">他のファイルを閉じる</translation>
+        <translation>他のファイルを閉じる</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Print...</source>
-        <translation type="unfinished">印刷...</translation>
+        <translation>印刷...</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>&amp;Edit</source>
-        <translation type="unfinished"></translation>
+        <translation>編集 (&amp;E)</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>&amp;Redo</source>
-        <translation type="unfinished">やり直す (&amp;R)</translation>
+        <translation>やり直す (&amp;R)</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Cu&amp;t</source>
-        <translation type="unfinished">切り取り (&amp;T)</translation>
+        <translation>切り取り (&amp;T)</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>&amp;Find and Replace...</source>
-        <translation type="unfinished">検索と置換 (&amp;F) ...</translation>
+        <translation>検索と置換 (&amp;F) ...</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Find &amp;Next...</source>
-        <translation type="unfinished">次を検索 (&amp;N)</translation>
+        <translation>次を検索 (&amp;N)</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Find &amp;Previous...</source>
-        <translation type="unfinished">前を検索 (&amp;N)</translation>
+        <translation>前を検索 (&amp;N)</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>&amp;Commands</source>
-        <translation type="unfinished">コマンド (&amp;C)</translation>
+        <translation>コマンド (&amp;C)</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Delete Line</source>
-        <translation type="unfinished">行削除</translation>
+        <translation>行削除</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Copy Line</source>
-        <translation type="unfinished">行のコピー</translation>
+        <translation>行のコピー</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Cut Line</source>
-        <translation type="unfinished">行の切り取り</translation>
+        <translation>行の切り取り</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Delete to Start of Word</source>
-        <translation type="unfinished">単語の始まりまで削除</translation>
+        <translation>単語の始まりまで削除</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Delete to End of Word</source>
-        <translation type="unfinished">単語の終わりまで削除</translation>
+        <translation>単語の終わりまで削除</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Delete to Start of Line</source>
-        <translation type="unfinished">行の始まりまで削除</translation>
+        <translation>行の始まりまで削除</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Delete to End of Line</source>
-        <translation type="unfinished">行末まで削除</translation>
+        <translation>行末まで削除</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Duplicate Selection/Line</source>
-        <translation type="unfinished"></translation>
+        <translation>選択部/行の複製</translation>
     </message>
     <message>
         <location line="+5"/>
@@ -1342,252 +1343,252 @@
     <message>
         <location line="+7"/>
         <source>&amp;Show Completion List</source>
-        <translation type="unfinished">補完リストの表示 (&amp;s)</translation>
+        <translation>補完リストの表示 (&amp;S)</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>&amp;Format</source>
-        <translation type="unfinished">フォーマット (&amp;F)</translation>
+        <translation>フォーマット (&amp;F)</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>&amp;Uppercase Selection</source>
-        <translation type="unfinished">大文字を選択(&amp;U)</translation>
+        <translation>大文字を選択(&amp;U)</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>&amp;Lowercase Selection</source>
-        <translation type="unfinished">小文字を選択(&amp;L)</translation>
+        <translation>小文字を選択(&amp;L)</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>&amp;Comment</source>
-        <translation type="unfinished">コメント (&amp;C)</translation>
+        <translation>コメント (&amp;C)</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>&amp;Uncomment</source>
-        <translation type="unfinished">コメントを取り消す (&amp;U)</translation>
+        <translation>アンコメント (&amp;U)</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Comment (Choosing String)</source>
-        <translation type="unfinished"></translation>
+        <translation>コメント (文字列を選択)</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>&amp;Indent Selection Rigidly</source>
-        <translation type="unfinished"></translation>
+        <translation>リジッドにセクションをインデント</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>&amp;Unindent Selection Rigidly</source>
-        <translation type="unfinished"></translation>
+        <translation>リジッドにセクションをアンインデント</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Indent Code</source>
-        <translation type="unfinished"></translation>
+        <translation>コードをインデント</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>convert line endings to &amp;windows (crlf)</source>
-        <translation type="unfinished"></translation>
+        <translation>行末文字を windows 仕様にする (CRLF)  (&amp;W)</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Convert Line Endings to &amp;Unix (LF)</source>
-        <translation type="unfinished">行末文字を Unix 仕様にする (LF) (&amp;U)</translation>
+        <translation>行末文字を Unix 仕様にする (LF) (&amp;U)</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Convert Line Endings to &amp;Mac (CR)</source>
-        <translation type="unfinished">行末文字を Mac 仕様にする (CR) (&amp;U)</translation>
+        <translation>行末文字を Mac 仕様にする (CR) (&amp;M)</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Navi&amp;gation</source>
-        <translation type="unfinished">ナビゲーション (&amp;g)</translation>
+        <translation>ナビゲーション (&amp;G)</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Go &amp;to Line...</source>
-        <translation type="unfinished">指定行 (&amp;T) ...</translation>
+        <translation>指定行 (&amp;T) ... へ移動</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Move to Matching Brace</source>
-        <translation type="unfinished">対応する括弧に移動</translation>
+        <translation>対応する括弧に移動</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Select to Matching Brace</source>
-        <translation type="unfinished">対応する括弧を選択</translation>
+        <translation>対応する括弧を選択</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>&amp;Next Bookmark</source>
-        <translation type="unfinished">次のブックマーク (&amp;N)</translation>
+        <translation>次のブックマーク (&amp;N)</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Pre&amp;vious Bookmark</source>
-        <translation type="unfinished">前のブックマーク (&amp;V)</translation>
+        <translation>前のブックマーク (&amp;V)</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Toggle &amp;Bookmark</source>
-        <translation type="unfinished">ブックマークをトグル (&amp;B)</translation>
+        <translation>ブックマークをトグル (&amp;B)</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>&amp;Remove All Bookmarks</source>
-        <translation type="unfinished">全てのブックマークを取り除く (&amp;R)</translation>
+        <translation>全てのブックマークを取り除く (&amp;R)</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>&amp;Preferences...</source>
-        <translation type="unfinished">設定 (&amp;P) ...</translation>
+        <translation>設定 (&amp;P) ...</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>&amp;Styles Preferences...</source>
-        <translation type="unfinished">スタイルの設定 (&amp;S) ...</translation>
+        <translation>スタイルの設定 (&amp;S) ...</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>&amp;View</source>
-        <translation type="unfinished">表示 (&amp;V)</translation>
+        <translation>表示 (&amp;V)</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>&amp;Editor</source>
-        <translation type="unfinished">エディタ (&amp;E)</translation>
+        <translation>エディタ (&amp;E)</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Show &amp;Line Numbers</source>
-        <translation type="unfinished">行番号の表示 (&amp;L)</translation>
+        <translation>行番号の表示 (&amp;L)</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Show &amp;Whitespace Characters</source>
-        <translation type="unfinished">ホワイトスペースを表示 (&amp;W)</translation>
+        <translation>ホワイトスペースを表示 (&amp;W)</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Show Line &amp;Endings</source>
-        <translation type="unfinished">行末の表示 (&amp;E)</translation>
+        <translation>行末の表示 (&amp;E)</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Show &amp;Indentation Guides</source>
-        <translation type="unfinished">インデンテーションガイドの表示 (&amp;I)</translation>
+        <translation>インデンテーションガイドの表示 (&amp;I)</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Show Long Line &amp;Marker</source>
-        <translation type="unfinished">長い行のマーカーを表示</translation>
+        <translation>長い行のマーカーを表示</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Show &amp;Toolbar</source>
-        <translation type="unfinished">ツールバーの表示(&amp;T)</translation>
+        <translation>ツールバーの表示(&amp;T)</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Show &amp;Statusbar</source>
-        <translation type="unfinished">ステイタスバーの表示</translation>
+        <translation>ステイタスバーの表示</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Show &amp;Horizontal Scrollbar</source>
-        <translation type="unfinished">横スクロールバーの表示</translation>
+        <translation>横スクロールバーの表示</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Zoom &amp;In</source>
-        <translation type="unfinished">ズームイン (&amp;I)</translation>
+        <translation>ズームイン (&amp;I)</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Zoom &amp;Out</source>
-        <translation type="unfinished">ズームアウト (&amp;O)</translation>
+        <translation>ズームアウト (&amp;O)</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>&amp;Normal Size</source>
-        <translation type="unfinished">通常サイズ (&amp;N)</translation>
+        <translation>通常サイズ (&amp;N)</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>&amp;Debug</source>
-        <translation type="unfinished">デバッグ (&amp;D)</translation>
+        <translation>デバッグ (&amp;D)</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Toggle &amp;Breakpoint</source>
-        <translation type="unfinished">ブレークポイントをトグル (&amp;B)</translation>
+        <translation>ブレークポイントをトグル (&amp;B)</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>&amp;Next Breakpoint</source>
-        <translation type="unfinished">次のブレークポイント (&amp;N)</translation>
+        <translation>次のブレークポイント (&amp;N)</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Pre&amp;vious Breakpoint</source>
-        <translation type="unfinished">前のブレークポイント (&amp;V)</translation>
+        <translation>前のブレークポイント (&amp;V)</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>&amp;Remove All Breakpoints</source>
-        <translation type="unfinished">全てのブレークポイントを解除 (&amp;R)</translation>
+        <translation>全てのブレークポイントを解除 (&amp;R)</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>&amp;Run</source>
-        <translation type="unfinished">実行 (&amp;R)</translation>
+        <translation>実行 (&amp;R)</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Save File and Run</source>
-        <translation type="unfinished">ファイルを保存して実行</translation>
+        <translation>ファイルを保存して実行</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Run &amp;Selection</source>
-        <translation type="unfinished">選択部を実行 (&amp;S)</translation>
+        <translation>選択部を実行 (&amp;S)</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>&amp;Help</source>
-        <translation type="unfinished">ヘルプ (&amp;H)</translation>
+        <translation>ヘルプ (&amp;H)</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>&amp;Help on Keyword</source>
-        <translation type="unfinished">キーワードでヘルプ (&amp;H)</translation>
+        <translation>キーワードでヘルプ (&amp;H)</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>&amp;Documentation on Keyword</source>
-        <translation type="unfinished">キーワードでドキュメント (&amp;D)</translation>
+        <translation>キーワードでドキュメント (&amp;D)</translation>
     </message>
     <message>
         <location line="+25"/>
         <source>Recent Files</source>
-        <translation type="unfinished">最近使用したファイル</translation>
+        <translation>最近使用したファイル</translation>
     </message>
     <message>
         <location line="+65"/>
         <source>Editor</source>
-        <translation type="unfinished">エディタ</translation>
+        <translation>エディタ</translation>
     </message>
     <message>
         <location line="+207"/>
         <source>&amp;%1 %2</source>
-        <translation type="unfinished">&amp;%1 %2</translation>
+        <translation>&amp;%1 %2</translation>
     </message>
 </context>
 <context>
@@ -1595,27 +1596,27 @@
     <message>
         <location filename="../src/m-editor/file-editor-tab.cc" line="+140"/>
         <source>line:</source>
-        <translation type="unfinished">行:</translation>
+        <translation>行:</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>col:</source>
-        <translation type="unfinished">列:</translation>
+        <translation>列:</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>encoding:</source>
-        <translation type="unfinished">エンコード</translation>
+        <translation>エンコード</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>eol:</source>
-        <translation type="unfinished"></translation>
+        <translation>eol</translation>
     </message>
     <message>
         <location line="+231"/>
         <source>Breakpoint condition</source>
-        <translation type="unfinished">ブレークポイントの状態</translation>
+        <translation>ブレークポイントの状態</translation>
     </message>
     <message>
         <location line="+91"/>
@@ -1627,28 +1628,29 @@
         <location line="+85"/>
         <location line="+36"/>
         <source>Octave Editor</source>
-        <translation type="unfinished">Octave エディタ</translation>
+        <translation>Octave エディタ</translation>
     </message>
     <message>
         <location line="-1896"/>
         <source>Cannot add breakpoint to modified file.
 Save and add breakpoint, or cancel?</source>
-        <translation type="unfinished"></translation>
+        <translation>修正されたファイルにブレークポイントを加えることはできません．
+保存してブレークポイントをくわえますか，キャンセルしますか?</translation>
     </message>
     <message>
         <location line="+837"/>
         <source>Goto line</source>
-        <translation type="unfinished">指定行へ行く</translation>
+        <translation>指定行へ行く</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Line number</source>
-        <translation type="unfinished">行数</translation>
+        <translation>行数</translation>
     </message>
     <message>
         <location line="+126"/>
         <source>Comment selected text</source>
-        <translation type="unfinished"></translation>
+        <translation>選択部をコメントにする</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -1665,7 +1667,7 @@
     <message>
         <location line="-6"/>
         <source>Do you want to cancel closing, save or discard the changes?</source>
-        <translation type="unfinished">閉じるのを中止しますか，変更を無視しますか?</translation>
+        <translation>閉じるのを中止しますか，変更を無視しますか?</translation>
     </message>
     <message>
         <location line="+10"/>
@@ -1674,47 +1676,47 @@
   %1
 
 is about to be closed but has been modified.  %2</source>
-        <translation type="unfinished">ファイル
+        <translation>ファイル
   %1
 が閉じられようとしていますが修正されています．%2</translation>
     </message>
     <message>
         <location line="+295"/>
         <source>Debug or Save</source>
-        <translation type="unfinished">デバッグまたは保存</translation>
+        <translation>デバッグまたは保存</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>This file is currently being executed.
 Quit debugging and save?</source>
-        <translation type="unfinished">このファイルは現在実行中です．デバッグを終了して保存しますか?</translation>
+        <translation>このファイルは現在実行中です．デバッグを終了して保存しますか?</translation>
     </message>
     <message>
         <location line="+75"/>
         <source>Could not open file %1 for write:
 %2.</source>
-        <translation type="unfinished">ファイル %1 を書き込み用として開けません:
+        <translation>ファイル %1 を書き込み用として開けません:
 %2.</translation>
     </message>
     <message>
         <location line="+92"/>
         <source>Line Endings:</source>
-        <translation type="unfinished"></translation>
+        <translation>行末</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>File Encoding:</source>
-        <translation type="unfinished">ファイルのエンコード</translation>
+        <translation>ファイルのエンコード</translation>
     </message>
     <message>
         <location line="+28"/>
         <source>Octave Files (*.m)</source>
-        <translation type="unfinished">octave のファイル (*.m)</translation>
+        <translation>Octave のファイル (*.m)</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>All Files (*)</source>
-        <translation type="unfinished">全てのファイル (*)</translation>
+        <translation>全てのファイル (*)</translation>
     </message>
     <message>
         <location line="+80"/>
@@ -1733,7 +1735,8 @@
 can not be applied.
 
 Please select another one or cancel saving!</source>
-        <translation type="unfinished"></translation>
+        <translation>現在のコーデック %1
+は適用できません．別のもの選択するが保存をキャンセルしてください．</translation>
     </message>
     <message>
         <location line="+11"/>
@@ -1742,19 +1745,22 @@
 Using it will result in data loss!
 
 Do you want to chose another codec?</source>
-        <translation type="unfinished"></translation>
+        <translation>現在エディタ上のコンテンツを選択された
+コーデック %1 でエンコードできません．
+それを使用するとデータを消失します！
+</translation>
     </message>
     <message>
         <location line="+85"/>
         <source>It seems that &apos;%1&apos; has been modified by another application. Do you want to reload it?</source>
-        <translation type="unfinished">&apos;%1&apos; は他のアプリケーションで変更されたいます．再読込しますか？</translation>
+        <translation>&apos;%1&apos; は他のアプリケーションで変更されたいます．再読込しますか？</translation>
     </message>
     <message>
         <location line="+29"/>
         <source>
 
 Warning: The contents in the editor is modified!</source>
-        <translation type="unfinished">
+        <translation>
 
 警告: エディタ内の内容は変更されています</translation>
     </message>
@@ -1763,7 +1769,7 @@
         <source>It seems that the file
 %1
 has been deleted or renamed. Do you want to save it now?%2</source>
-        <translation type="unfinished">ファイル
+        <translation>ファイル
 %1
 削除されたか名前が変更されています．ファイルを今保存しますか？%2</translation>
     </message>
@@ -1773,27 +1779,27 @@
     <message>
         <location filename="../src/files-dock-widget.cc" line="+73"/>
         <source>File Browser</source>
-        <translation type="unfinished">ファイルブラウザ</translation>
+        <translation>ファイルブラウザ</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Browse your files</source>
-        <translation type="unfinished">ファイルをブラウズする</translation>
+        <translation>ファイルをブラウズする</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>File size</source>
-        <translation type="unfinished">ファイルのサイズ</translation>
+        <translation>ファイルのサイズ</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>File type</source>
-        <translation type="unfinished">ファイルのタイプ</translation>
+        <translation>ファイルのタイプ</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Date modified</source>
-        <translation type="unfinished">修正日付</translation>
+        <translation>修正日付</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -1803,70 +1809,70 @@
     <message>
         <location line="+1"/>
         <source>Alternating row colors</source>
-        <translation type="unfinished">列の色のオルタネーション</translation>
+        <translation>列の色のオルタネーション</translation>
     </message>
     <message>
         <location line="+25"/>
         <source>Enter the path or filename</source>
-        <translation type="unfinished">パスまたはファイル名の入力</translation>
+        <translation>パスまたはファイル名の入力</translation>
     </message>
     <message>
         <location line="+11"/>
         <source>One directory up</source>
-        <translation type="unfinished">一つ上のディレクトリ</translation>
+        <translation>一つ上のディレクトリ</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Show Octave directory</source>
-        <translation type="unfinished">octave ディレクトリの表示</translation>
+        <translation>Octave ディレクトリの表示</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Go to current Octave directory</source>
-        <translation type="unfinished">現在の Octave ディレクトリへ行く</translation>
+        <translation>現在の Octave ディレクトリへ行く</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Set Octave directory</source>
-        <translation type="unfinished">Octave ディレクトリの設定</translation>
+        <translation>Octave ディレクトリの設定</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Set Octave directory to current browser directory</source>
-        <translation type="unfinished"></translation>
+        <translation>Octave ディレクトリを現在のブラウザディレクトリに設定</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Actions on current directory</source>
-        <translation type="unfinished">現在のディレクトリで実行</translation>
+        <translation>現在のディレクトリで実行</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Show Home Directory</source>
-        <translation type="unfinished">ホームディレクトリの表示</translation>
+        <translation>ホームディレクトリの表示</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>Set Browser Directory...</source>
-        <translation type="unfinished">ブラウザディレクトリを設定</translation>
+        <translation>ブラウザディレクトリを設定</translation>
     </message>
     <message>
         <location line="+4"/>
         <location line="+365"/>
         <source>Find Files...</source>
-        <translation type="unfinished"></translation>
+        <translation>ファイルを検索...</translation>
     </message>
     <message>
         <location line="-361"/>
         <location line="+374"/>
         <source>New File...</source>
-        <translation type="unfinished">新規のファイル...</translation>
+        <translation>新規のファイル...</translation>
     </message>
     <message>
         <location line="-371"/>
         <location line="+374"/>
         <source>New Directory...</source>
-        <translation type="unfinished">新規のディレクトリ...</translation>
+        <translation>新規のディレクトリ...</translation>
     </message>
     <message>
         <location line="-320"/>
@@ -1876,58 +1882,58 @@
     <message>
         <location line="+273"/>
         <source>Open</source>
-        <translation type="unfinished">開く</translation>
+        <translation>開く</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Open in System File Explorer</source>
-        <translation type="unfinished"></translation>
+        <translation>システムファイルエクスローラーで開く</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Open in Text Editor</source>
-        <translation type="unfinished">テキストエディタで開く</translation>
+        <translation>テキストエディタで開く</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Copy Selection to Clipboard</source>
-        <translation type="unfinished">選択部をクリップボードにコピー</translation>
+        <translation>選択部をクリップボードにコピー</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Run</source>
-        <translation type="unfinished">実行</translation>
+        <translation>実行</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Load Data</source>
-        <translation type="unfinished">データのロード</translation>
+        <translation>データのロード</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Set Current Directory</source>
-        <translation type="unfinished">現在のディレクトリの設定</translation>
+        <translation>現在のディレクトリの設定</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Rename...</source>
-        <translation type="unfinished">名前の変更 ...</translation>
+        <translation>名前の変更 ...</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Delete...</source>
-        <translation type="unfinished">削除 ...</translation>
+        <translation>削除 ...</translation>
     </message>
     <message>
         <location line="+118"/>
         <source>Rename file/directory</source>
-        <translation type="unfinished">ファイル名／ディレクトリ名を変更</translation>
+        <translation>ファイル名／ディレクトリ名を変更</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Rename file/directory:
 </source>
-        <translation type="unfinished">ファイル名／ディレクトリ名を変更:
+        <translation>ファイル名／ディレクトリ名を変更:
 </translation>
     </message>
     <message>
@@ -1935,35 +1941,35 @@
         <source>
  to: </source>
         <translation type="unfinished">
-到: </translation>
+ </translation>
     </message>
     <message>
         <location line="+30"/>
         <location line="+14"/>
         <source>Delete file/directory</source>
-        <translation type="unfinished">ファイル／ディレクトリの削除</translation>
+        <translation>ファイル／ディレクトリの削除</translation>
     </message>
     <message>
         <location line="-13"/>
         <source>Are you sure you want to delete
 </source>
-        <translation type="unfinished">本当に削除しますか
+        <translation>本当に削除しますか
 </translation>
     </message>
     <message>
         <location line="+14"/>
         <source>Can not delete a directory that is not empty</source>
-        <translation type="unfinished">空のディレクトリでないので削除できません</translation>
+        <translation>空のディレクトリでないので削除できません</translation>
     </message>
     <message>
         <location line="+145"/>
         <source>Set directory of file browser</source>
-        <translation type="unfinished">ディレクトリをファイルブラウザで設定</translation>
+        <translation>ディレクトリをファイルブラウザで設定</translation>
     </message>
     <message>
         <location line="+26"/>
         <source>Create File</source>
-        <translation type="unfinished">ファイルを開く</translation>
+        <translation>ファイルを</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -1981,7 +1987,7 @@
     <message>
         <location line="+15"/>
         <source>Create Directory</source>
-        <translation type="unfinished">ディレクトリの作成</translation>
+        <translation>ディレクトリの作成</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -1994,7 +2000,7 @@
     <message>
         <location line="+1"/>
         <source>New Directory</source>
-        <translation type="unfinished">新しいディレクトリ</translation>
+        <translation>新しいディレクトリ</translation>
     </message>
 </context>
 <context>
@@ -2002,22 +2008,22 @@
     <message>
         <location filename="../src/welcome-wizard.cc" line="+274"/>
         <source>Enjoy!</source>
-        <translation type="unfinished">エンジョイ！</translation>
+        <translation>エンジョイ！</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Previous</source>
-        <translation type="unfinished"></translation>
+        <translation>戻る</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Finish</source>
-        <translation type="unfinished">終了</translation>
+        <translation>終了</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation>キャンセル</translation>
     </message>
     <message>
         <location line="+7"/>
@@ -2026,7 +2032,7 @@
 &lt;p&gt;If you encounter problems, there are a number of ways to get help, including commercial support options, a mailing list, a wiki, and other community-based support channels.
 You can find more information about each of these by visiting &lt;a href=&quot;https://octave.org/support.html&quot;&gt;https://octave.org/support.html&lt;/a&gt; (opens in external browser).&lt;/p&gt;
 &lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished">&lt;html&gt;&lt;body&gt;
+        <translation>&lt;html&gt;&lt;body&gt;
 &lt;p&gt;Octave が有用なツールであることを願っています．&lt;/p&gt;
 &lt;p&gt;もし問題に遭遇したときは， たくさんの方法のヘルプがあります, 商用サポートのオプション, メーリングリスト, ウィキ, その他のコミュニケーションベースのサポートなど.
 詳しい情報は次のウェブサイトから &lt;a href=&quot;https://octave.org/support.html&quot;&gt;https://octave.org/support.html&lt;/a&gt; (外部ブラウザで開く．).&lt;/p&gt;
@@ -2046,7 +2052,7 @@
 &lt;li&gt;Open the documentation browser of the Octave GUI with the help menu&lt;/li&gt;
 &lt;/ul&gt;
 &lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished">&lt;html&gt;&lt;head&gt;
+        <translation>&lt;html&gt;&lt;head&gt;
 &lt;style&gt;
 a:link { text-decoration: underline; color: #0000ff; }
 &lt;/style&gt;
@@ -2065,7 +2071,7 @@
     <message>
         <location filename="../src/m-editor/find-dialog.cc" line="+87"/>
         <source>Find and Replace</source>
-        <translation type="unfinished">検索と置換</translation>
+        <translation>検索と置換</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -2075,17 +2081,17 @@
     <message>
         <location line="+3"/>
         <source>Re&amp;place with:</source>
-        <translation type="unfinished">以下で置換:  (&amp;P)</translation>
+        <translation>以下で置換:  (&amp;P)</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Match &amp;case</source>
-        <translation type="unfinished">大文字小文字のマッチ (&amp;C)</translation>
+        <translation>大文字小文字のマッチ (&amp;C)</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Search from &amp;start</source>
-        <translation type="unfinished">始めから検索 (&amp;S)</translation>
+        <translation>始めから検索 (&amp;S)</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -2095,22 +2101,22 @@
     <message>
         <location line="+2"/>
         <source>&amp;Find Next</source>
-        <translation type="unfinished">次を検索 (&amp;F)</translation>
+        <translation>次を検索 (&amp;F)</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Find &amp;Previous</source>
-        <translation type="unfinished">前の検索 (&amp;P)</translation>
+        <translation>前の検索 (&amp;P)</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>&amp;Replace</source>
-        <translation type="unfinished">置換 (&amp;R)</translation>
+        <translation>置換 (&amp;R)</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Replace &amp;All</source>
-        <translation type="unfinished">全てを置換 (&amp;A)</translation>
+        <translation>全てを置換 (&amp;A)</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -2120,52 +2126,52 @@
     <message>
         <location line="+13"/>
         <source>&amp;Whole words</source>
-        <translation type="unfinished"></translation>
+        <translation>全体のワード (&amp;W)</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Regular E&amp;xpressions</source>
-        <translation type="unfinished">正規表現 (&amp;X)</translation>
+        <translation>正規表現 (&amp;X)</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Search &amp;backward</source>
-        <translation type="unfinished">逆方向へ検索 (&amp;B)</translation>
+        <translation>逆方向へ検索 (&amp;B)</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Search se&amp;lection</source>
-        <translation type="unfinished">選択部を検索 (&amp;L)</translation>
+        <translation>選択部を検索 (&amp;L)</translation>
     </message>
     <message>
         <location line="+86"/>
         <source>Search from end</source>
-        <translation type="unfinished">ファイルの終わりから検索</translation>
+        <translation>ファイルの終わりから検索</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Search from start</source>
-        <translation type="unfinished">始めから検索</translation>
+        <translation>始めから検索</translation>
     </message>
     <message>
         <location line="+209"/>
         <source>Replace Result</source>
-        <translation type="unfinished"></translation>
+        <translation >置換結果</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>%1 items replaced</source>
-        <translation type="unfinished">%1 が置換されました</translation>
+        <translation>%1 が置換されました</translation>
     </message>
     <message>
         <location line="+14"/>
         <source>Find Result</source>
-        <translation type="unfinished"></translation>
+        <translation>検索結果</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>No more matches found</source>
-        <translation type="unfinished">これ以上マッチする対象はありません</translation>
+        <translation>これ以上マッチする対象はありません</translation>
     </message>
 </context>
 <context>
@@ -2173,67 +2179,67 @@
     <message>
         <location filename="../src/find-files-dialog.cc" line="+54"/>
         <source>Find Files</source>
-        <translation type="unfinished">複数のファイルで検索</translation>
+        <translation>複数のファイルで検索</translation>
     </message>
     <message>
         <location line="+11"/>
         <source>Named:</source>
-        <translation type="unfinished">名称: </translation>
+        <translation>名称: </translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Enter the filename search expression</source>
-        <translation type="unfinished">検索表現にファイル名を含める</translation>
+        <translation>検索表現にファイル名を含める</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Start in:</source>
-        <translation type="unfinished"></translation>
+        <translation>スタートイン:</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Enter the start directory</source>
-        <translation type="unfinished">当初ディレクトリへ設定</translation>
+        <translation>スタートディレクトリへ設定</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Browse...</source>
-        <translation type="unfinished">ブラウズ ...</translation>
+        <translation>ブラウズ ...</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Browse for start directory</source>
-        <translation type="unfinished">当初ディレクトリをブラウズ</translation>
+        <translation>スタートディレクトリをブラウズ</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Search subdirectories</source>
-        <translation type="unfinished">サブディレクトリを検索</translation>
+        <translation>サブディレクトリを検索</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Search recursively through directories for matching files</source>
-        <translation type="unfinished">マッチするファイルを再帰的に検索</translation>
+        <translation>マッチするファイルを再帰的に検索</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Include directory names</source>
-        <translation type="unfinished">ディレクトリ名を含める</translation>
+        <translation>ディレクトリ名を含める</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Include matching directories in search results</source>
-        <translation type="unfinished">検索結果にマッチしたディレクトリを含ませる</translation>
+        <translation>検索結果にマッチしたディレクトリを含ませる</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Name case insensitive</source>
-        <translation type="unfinished"></translation>
+        <translation>名前大文字小文字の区別をしない</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Set matching name is case insensitive</source>
-        <translation type="unfinished">検索名で大文字小文字の区別しない</translation>
+        <translation>検索名で大文字小文字の区別しない</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -2243,77 +2249,77 @@
     <message>
         <location line="+1"/>
         <source>Enter the file content search expression</source>
-        <translation type="unfinished">検索表現にファイルの内容を含める</translation>
+        <translation>検索表現にファイルの内容を含める</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Text to match</source>
-        <translation type="unfinished"></translation>
+        <translation>マッチするテキストへ</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Text case insensitive</source>
-        <translation type="unfinished"></translation>
+        <translation>テキスト 大文字小文字の区別をしない</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Set text content is case insensitive</source>
-        <translation type="unfinished"></translation>
+        <translation>テキストの内容の大文字小文字の区別をしないように設定</translation>
     </message>
     <message>
         <location line="+11"/>
         <source>Search results</source>
-        <translation type="unfinished">検索結果</translation>
+        <translation>検索結果</translation>
     </message>
     <message>
         <location line="+19"/>
         <source>Idle.</source>
-        <translation type="unfinished">アイドル</translation>
+        <translation>アイドル</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Find</source>
-        <translation type="unfinished">検索</translation>
+        <translation>検索</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Start search for matching files</source>
-        <translation type="unfinished">マッチするファイルの検索を開始</translation>
+        <translation>マッチするファイルの検索を開始</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Stop</source>
-        <translation type="unfinished">停止</translation>
+        <translation>停止</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Stop searching</source>
-        <translation type="unfinished">検索の停止</translation>
+        <translation>検索の停止</translation>
     </message>
     <message>
         <location line="+15"/>
         <source>Filename/location</source>
-        <translation type="unfinished">ファイル名／場所</translation>
+        <translation>ファイル名／場所</translation>
     </message>
     <message>
         <location line="+17"/>
         <source>File contents</source>
-        <translation type="unfinished">ファイルの内容</translation>
+        <translation>ファイルの内容</translation>
     </message>
     <message>
         <location line="+103"/>
         <source>Searching...</source>
-        <translation type="unfinished">検索中 ...</translation>
+        <translation>検索中 ...</translation>
     </message>
     <message>
         <location line="+22"/>
         <source>%1 match (es)</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 マッチ</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Set search directory</source>
-        <translation type="unfinished">検索ディレクトリを設定</translation>
+        <translation>検索ディレクトリを設定</translation>
     </message>
 </context>
 <context>
@@ -2321,12 +2327,12 @@
     <message>
         <location filename="../src/find-files-model.cc" line="+88"/>
         <source>Filename</source>
-        <translation type="unfinished">ファイル名</translation>
+        <translation>ファイル名</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Directory</source>
-        <translation type="unfinished">ディレクトリ</translation>
+        <translation>ディレクトリ</translation>
     </message>
 </context>
 <context>
@@ -2334,12 +2340,12 @@
     <message>
         <location filename="../src/history-dock-widget.cc" line="+48"/>
         <source>Browse and search the command history.</source>
-        <translation type="unfinished">コマンドヒストリのブラウズと検索</translation>
+        <translation>コマンドヒストリのブラウズと検索</translation>
     </message>
     <message>
         <location line="+94"/>
         <source>Copy</source>
-        <translation type="unfinished">コピー</translation>
+        <translation>コピー</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -2349,37 +2355,37 @@
     <message>
         <location line="+3"/>
         <source>Create script</source>
-        <translation type="unfinished">スクリプトの作成</translation>
+        <translation>スクリプトの作成</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Hide filter</source>
-        <translation type="unfinished">フィルタを隠す</translation>
+        <translation>フィルタを隠す</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Show filter</source>
-        <translation type="unfinished">フィルタを表示</translation>
+        <translation>フィルタを表示</translation>
     </message>
     <message>
         <location line="+123"/>
         <source>Double-click a command to transfer it to the terminal.</source>
-        <translation type="unfinished">ダブルクリックでコマンドを端末に送る</translation>
+        <translation>ダブルクリックでコマンドを端末に送る</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Enter text to filter the command history</source>
-        <translation type="unfinished">コマンドヒストリをフィルタするためのテキストを入力</translation>
+        <translation>コマンドヒストリをフィルタするためのテキストを入力</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Filter</source>
-        <translation type="unfinished">フィルタ</translation>
+        <translation>フィルタ</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Command History</source>
-        <translation type="unfinished">コマンドヒストリ</translation>
+        <translation>コマンドヒストリ</translation>
     </message>
 </context>
 <context>
@@ -2387,17 +2393,17 @@
     <message>
         <location filename="../src/welcome-wizard.cc" line="-178"/>
         <source>Welcome to Octave!</source>
-        <translation type="unfinished">Octaveへようこそ!</translation>
+        <translation>Octaveへようこそ!</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Next</source>
-        <translation type="unfinished">次</translation>
+        <translation>次</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation>キャンセル</translation>
     </message>
     <message>
         <location line="+7"/>
@@ -2406,7 +2412,7 @@
 Click &apos;Next&apos; to create a configuration file and launch Octave.&lt;/p&gt;
 &lt;p&gt;The configuration file is stored in&lt;br&gt;%1.&lt;/p&gt;
 &lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished">&lt;html&gt;&lt;body&gt;
+        <translation>&lt;html&gt;&lt;body&gt;
 &lt;p&gt; このコンピュータでの Octave のグラフィカルインターフェースへの初めてのアクセスのようです
 &apos;次へ&apos; をクリックして，設定ファイルを作成し，Octave を起動してください.&lt;/p&gt;
 &lt;p&gt;設定ファイルは以下に置かれます&lt;br&gt;%1.&lt;/p&gt;
@@ -2418,12 +2424,12 @@
     <message>
         <location filename="../src/octave-dock-widget.cc" line="+52"/>
         <source>Undock widget</source>
-        <translation type="unfinished">ウィジェットをアンドック</translation>
+        <translation>ウィジェットをアンドック</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Close widget</source>
-        <translation type="unfinished"></translation>
+        <translation>ウィジェットを閉じる</translation>
     </message>
 </context>
 <context>
@@ -2431,377 +2437,377 @@
     <message>
         <location filename="../src/main-window.cc" line="+367"/>
         <source>Save Workspace As</source>
-        <translation type="unfinished">ワークスペースを別名で保存</translation>
+        <translation>ワークスペースを別名で保存</translation>
     </message>
     <message>
         <location line="+14"/>
         <source>Load Workspace</source>
-        <translation type="unfinished"></translation>
+        <translation>ワークスペースをロード</translation>
     </message>
     <message>
         <location line="+85"/>
         <source>The release notes file &apos;%1&apos; is empty.</source>
-        <translation type="unfinished">リリースノートファイル &apos;%1&apos; が空です．</translation>
+        <translation>リリースノートファイル &apos;%1&apos; が空です．</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>The release notes file &apos;%1&apos; cannot be read.</source>
-        <translation type="unfinished">リリースノートファイル &apos;%1&apos; が読み取れません．</translation>
+        <translation>リリースノートファイル &apos;%1&apos; が読み取れません．</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>Octave Release Notes</source>
-        <translation type="unfinished">Octave リリースノート</translation>
+        <translation>Octave リリースノート</translation>
     </message>
     <message>
         <location line="+79"/>
         <source>Octave Community News</source>
-        <translation type="unfinished">Octave コミュニティーニュース</translation>
+        <translation>Octave コミュニティーニュース</translation>
     </message>
     <message>
         <location line="+91"/>
         <location line="+1724"/>
         <source>About Octave</source>
-        <translation type="unfinished">Octave について</translation>
+        <translation>Octave について</translation>
     </message>
     <message>
         <location line="-1603"/>
         <source>Octave</source>
-        <translation type="unfinished">Octave</translation>
+        <translation>Octave</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Are you sure you want to exit Octave?</source>
-        <translation type="unfinished">本当に Octave を終了しますか？</translation>
+        <translation>本当に Octave を終了しますか？</translation>
     </message>
     <message>
         <location line="+64"/>
         <location line="+1600"/>
         <source>Browse directories</source>
-        <translation type="unfinished">ディレクトリのブラウズ</translation>
+        <translation>ディレクトリのブラウズ</translation>
     </message>
     <message>
         <location line="-1444"/>
         <source>Octave Files (*.m);;All Files (*)</source>
-        <translation type="unfinished">Octave ファイル (*.m);;全てのファイル (*)</translation>
+        <translation>Octave ファイル (*.m);;全てのファイル (*)</translation>
     </message>
     <message>
         <location line="+16"/>
         <source>File Encoding:</source>
-        <translation type="unfinished">ファイルのエンコード</translation>
+        <translation>ファイルのエンコード</translation>
     </message>
     <message>
         <location line="+53"/>
         <source>New Function</source>
-        <translation type="unfinished"></translation>
+        <translation>新しい関数</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>New function name:
 </source>
-        <translation type="unfinished">新しい関数の名前:
+        <translation>新しい関数の名前:
 </translation>
     </message>
     <message>
         <location line="+43"/>
         <source>%1 is a built-in function</source>
-        <translation type="unfinished">%1 は組み込み関数です</translation>
+        <translation>%1 は組み込み関数です</translation>
     </message>
     <message>
         <location line="+37"/>
         <source>Can not find function %1</source>
-        <translation type="unfinished">関数 %1 が見つかりません</translation>
+        <translation>関数 %1 が見つかりません</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Octave Editor</source>
-        <translation type="unfinished">Octave エディタ</translation>
+        <translation>Octave エディタ</translation>
     </message>
     <message>
         <location line="+909"/>
         <source>&amp;File</source>
-        <translation type="unfinished">ファイル (&amp;F)</translation>
+        <translation>ファイル (&amp;F)</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Open...</source>
-        <translation type="unfinished">開く...</translation>
+        <translation>開く...</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Open an existing file in editor</source>
-        <translation type="unfinished">エディタに存在するファイルを開く</translation>
+        <translation>エディタに存在するファイルを開く</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Load Workspace...</source>
-        <translation type="unfinished">ワークスペースのロード...</translation>
+        <translation>ワークスペースのロード...</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Save Workspace As...</source>
-        <translation type="unfinished">ワークスペースを別名で保存...</translation>
+        <translation>ワークスペースを別名で保存...</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Exit</source>
-        <translation type="unfinished">終了</translation>
+        <translation>終了</translation>
     </message>
     <message>
         <location line="+18"/>
         <source>New</source>
-        <translation type="unfinished">新規</translation>
+        <translation>新規</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>New Script</source>
-        <translation type="unfinished">新規のスクリプト</translation>
+        <translation>新規のスクリプト</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>New Function...</source>
-        <translation type="unfinished">新規の関数 ...</translation>
+        <translation>新規の関数 ...</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>New Figure</source>
-        <translation type="unfinished">新規のフィギュア</translation>
+        <translation>新規のフィギュア</translation>
     </message>
     <message>
         <location line="+26"/>
         <source>&amp;Edit</source>
-        <translation type="unfinished"></translation>
+        <translation>編集(&amp;E)</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Undo</source>
-        <translation type="unfinished">元に戻す</translation>
+        <translation>元に戻す</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Copy</source>
-        <translation type="unfinished">コピー</translation>
+        <translation>コピー</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Paste</source>
-        <translation type="unfinished">貼り付け</translation>
+        <translation>貼り付け</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Select All</source>
-        <translation type="unfinished"></translation>
+        <translation>すべてを選択</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Clear Clipboard</source>
-        <translation type="unfinished">クリップボードをクリア</translation>
+        <translation>クリップボードをクリア</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Find Files...</source>
-        <translation type="unfinished"></translation>
+        <translation>複数のファイルを検索</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Clear Command Window</source>
-        <translation type="unfinished">コマンドウィンドウのクリア</translation>
+        <translation>コマンドウィンドウのクリア</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Clear Command History</source>
-        <translation type="unfinished">コマンドヒストリのクリア</translation>
+        <translation>コマンドヒストリのクリア</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Clear Workspace</source>
-        <translation type="unfinished">ワークスペースのクリア</translation>
+        <translation>ワークスペースのクリア</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Preferences...</source>
-        <translation type="unfinished">設定 ...</translation>
+        <translation>設定 ...</translation>
     </message>
     <message>
         <location line="+49"/>
         <source>De&amp;bug</source>
-        <translation type="unfinished">デバッグ (&amp;B)</translation>
+        <translation>デバッグ (&amp;b)</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Step</source>
-        <translation type="unfinished">ステップ</translation>
+        <translation>ステップ</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Step In</source>
-        <translation type="unfinished">ステップイン</translation>
+        <translation>ステップイン</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Step Out</source>
-        <translation type="unfinished">ステップアウト</translation>
+        <translation>ステップアウト</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Continue</source>
-        <translation type="unfinished">継続</translation>
+        <translation>継続</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Quit Debug Mode</source>
-        <translation type="unfinished"></translation>
+        <translation>デバッグモードの終了</translation>
     </message>
     <message>
         <location line="+38"/>
         <source>&amp;Window</source>
-        <translation type="unfinished">ウィンドウ (&amp;W)</translation>
+        <translation>ウィンドウ (&amp;W)</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Show Command Window</source>
-        <translation type="unfinished"></translation>
+        <translation>コマンドウィンドウの表示</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Show Command History</source>
-        <translation type="unfinished">コマンドヒストリの表示</translation>
+        <translation>コマンドヒストリの表示</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Show File Browser</source>
-        <translation type="unfinished"></translation>
+        <translation>ファイルブラウザの表示</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Show Workspace</source>
-        <translation type="unfinished">ワークスペースの表示</translation>
+        <translation>ワークスペースの表示</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Show Editor</source>
-        <translation type="unfinished">エディタの表示</translation>
+        <translation>エディタの表示</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Show Documentation</source>
-        <translation type="unfinished">ドキュメントの表示</translation>
+        <translation>ドキュメントの表示</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Show Variable Editor</source>
-        <translation type="unfinished"></translation>
+        <translation>変数エディタの表示</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Command Window</source>
-        <translation type="unfinished">コマンドウィンドウ</translation>
+        <translation>コマンドウィンドウ</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Command History</source>
-        <translation type="unfinished">コマンドヒストリ</translation>
+        <translation>コマンドヒストリ</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>File Browser</source>
-        <translation type="unfinished">ファイルブラウザ</translation>
+        <translation>ファイルブラウザ</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Workspace</source>
-        <translation type="unfinished">ワークスペース</translation>
+        <translation>ワークスペース</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Editor</source>
-        <translation type="unfinished">エディタ</translation>
+        <translation>エディタ</translation>
     </message>
     <message>
         <location line="+3"/>
         <location line="+39"/>
         <source>Documentation</source>
-        <translation type="unfinished">ドキュメント</translation>
+        <translation>ドキュメント</translation>
     </message>
     <message>
         <location line="-36"/>
         <source>Variable Editor</source>
-        <translation type="unfinished"></translation>
+        <translation>変数エディタ</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Reset Default Window Layout</source>
-        <translation type="unfinished">既定のウィンドウのレイアウト</translation>
+        <translation>既定のウィンドウのレイアウト</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>&amp;Help</source>
-        <translation type="unfinished">ヘルプ (&amp;H)</translation>
+        <translation>ヘルプ (&amp;H)</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Report Bug</source>
-        <translation type="unfinished">バグの報告</translation>
+        <translation>バグの報告</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Octave Packages</source>
-        <translation type="unfinished">Octave パッケージ</translation>
+        <translation>Octave パッケージ</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Contribute</source>
-        <translation type="unfinished">貢献</translation>
+        <translation>貢献</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Donate to Octave</source>
-        <translation type="unfinished">octave への寄付</translation>
+        <translation>octave への寄付</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>On Disk</source>
-        <translation type="unfinished">ディスク上</translation>
+        <translation>ディスク上</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Online</source>
-        <translation type="unfinished">オンライン</translation>
+        <translation>オンライン</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>&amp;News</source>
-        <translation type="unfinished">ニュース (&amp;N)</translation>
+        <translation>ニュース (&amp;N)</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Release Notes</source>
-        <translation type="unfinished">リリースノート</translation>
+        <translation>リリースノート</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Community News</source>
-        <translation type="unfinished">コミュニティーニュース</translation>
+        <translation>コミュニティーニュース</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Toolbar</source>
-        <translation type="unfinished">ツールバー</translation>
+        <translation>ツールバー</translation>
     </message>
     <message>
         <location line="+19"/>
         <source>Enter directory name</source>
-        <translation type="unfinished">ディレクトリ名を入力</translation>
+        <translation>ディレクトリ名を入力</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Current Directory: </source>
-        <translation type="unfinished">現在のディレクトリ: </translation>
+        <translation>現在のディレクトリ: </translation>
     </message>
     <message>
         <location line="+4"/>
         <source>One directory up</source>
-        <translation type="unfinished">一つ上のディレクトリ</translation>
+        <translation>一つ上のディレクトリ</translation>
     </message>
 </context>
 <context>
@@ -2820,7 +2826,7 @@
 &lt;/p&gt;
 &lt;p&gt;
 &lt;small&gt;&lt;em&gt;&amp;mdash; The Octave Developers, </source>
-        <translation type="unfinished">&lt;html&gt;
+        <translation>&lt;html&gt;
 &lt;body&gt;
 &lt;p&gt;
 Octaveコミュニティニュースが入手できません。
@@ -2848,7 +2854,7 @@
 &lt;/p&gt;
 &lt;p&gt;
 &lt;small&gt;&lt;em&gt;&amp;mdash; The Octave Developers, </source>
-        <translation type="unfinished">&lt;html&gt;
+        <translation>&lt;html&gt;
 &lt;body&gt;
 &lt;p&gt;
 最新 Octave コミュニティーニュースを得る接続機能がオフになっています．
@@ -2867,22 +2873,22 @@
     <message>
         <location filename="../src/octave-dock-widget.cc" line="+69"/>
         <source>Hide widget</source>
-        <translation type="unfinished">ウィジェットを隠す</translation>
+        <translation>ウィジェットを隠す</translation>
     </message>
     <message>
         <location line="+43"/>
         <source>Use &lt;Alt&gt; + &lt;Left Mouse Button&gt; for moving the window</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;Alt&gt; + &lt;左マウスボタンを&gt; ウィンドウの移動に使用</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Dock widget</source>
-        <translation type="unfinished">ウィジェットをドック</translation>
+        <translation>ウィジェットをドック</translation>
     </message>
     <message>
         <location line="+42"/>
         <source>Undock widget</source>
-        <translation type="unfinished">ウィジェットをアンドック</translation>
+        <translation>ウィジェットをアンドック</translation>
     </message>
 </context>
 <context>
@@ -2900,7 +2906,7 @@
     <message>
         <location line="+3"/>
         <source>Edit</source>
-        <translation type="unfinished">編集</translation>
+        <translation>編集</translation>
     </message>
     <message>
         <location line="+15"/>
@@ -2920,50 +2926,52 @@
         <location line="+9"/>
         <location line="+11"/>
         <source>Create</source>
-        <translation type="unfinished">作成</translation>
+        <translation>作成</translation>
     </message>
     <message>
         <location line="-20"/>
         <location line="+268"/>
         <source>Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation>キャンセル</translation>
     </message>
     <message>
         <location line="-262"/>
         <source>File
 %1
 does not exist. Do you want to create it?</source>
-        <translation type="unfinished"></translation>
+        <translation>ファイル
+%1
+が存在しません． 作成しますか ?</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Octave Editor</source>
-        <translation type="unfinished">Octave エディタ</translation>
+        <translation>Octave エディタ</translation>
     </message>
     <message>
         <location line="+252"/>
         <source>The file %1 does not exist in the load path.  To run or debug the function you are editing, you must either change to the directory %2 or add that directory to the load path.</source>
-        <translation type="unfinished">ファイル %1 がロードパスに存在しません．編集している関数を実行またはデバッグするためには，ディレクトリを変更するかロードパスにディレクトリを加えてください．</translation>
+        <translation>ファイル %1 がロードパスに存在しません．編集している関数を実行またはデバッグするためには，ディレクトリを変更するかロードパスにディレクトリを加えてください．</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>The file %1 is shadowed by a file with the same name in the load path. To run or debug the function you are editing, change to the directory %2.</source>
-        <translation type="unfinished">ファイル %1 がロードパスに存在する同名のファイルでシャドウされています．編集している関数を実行またはデバッグするためには，ディレクトリを %2 に変更してください．</translation>
+        <translation>ファイル %1 がロードパスに存在する同名のファイルでシャドウされています．編集している関数を実行またはデバッグするためには，ディレクトリを %2 に変更してください．</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Change Directory or Add Directory to Load Path</source>
-        <translation type="unfinished">ディレクトリの変更またはロードパスへのディレクトリの追加</translation>
+        <translation>ディレクトリの変更またはロードパスへのディレクトリの追加</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>&amp;Change Directory</source>
-        <translation type="unfinished"></translation>
+        <translation>ディレクトリの変更 (&amp;C) </translation>
     </message>
     <message>
         <location line="+1"/>
         <source>&amp;Add Directory to Load Path</source>
-        <translation type="unfinished"></translation>
+        <translation>ロードパスにディレクトリを追加 (&amp;A)</translation>
     </message>
 </context>
 <context>
@@ -2971,7 +2979,7 @@
     <message>
         <location filename="../src/m-editor/octave-txt-lexer.cc" line="+40"/>
         <source>Default</source>
-        <translation type="unfinished">既定</translation>
+        <translation>既定</translation>
     </message>
 </context>
 <context>
@@ -2985,7 +2993,7 @@
 %2
 
 Octave GUI must be closed now.</source>
-        <translation type="unfinished">設定ファイル
+        <translation>設定ファイル
 %1
 が存在せずまた作成もできません．
 次に対する読込，書込の許可を確認してください．
@@ -2996,7 +3004,7 @@
     <message>
         <location line="+5"/>
         <source>Octave Critical Error</source>
-        <translation type="unfinished">Octave クリティカルエラー</translation>
+        <translation>Octave クリティカルエラー</translation>
     </message>
 </context>
 <context>
@@ -3004,22 +3012,22 @@
     <message>
         <location filename="../src/welcome-wizard.cc" line="+42"/>
         <source>Community News</source>
-        <translation type="unfinished">コミュニティーニュース</translation>
+        <translation>コミュニティーニュース</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Previous</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Next</source>
-        <translation type="unfinished">次</translation>
+        <translation>次</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation>キャンセル</translation>
     </message>
     <message>
         <location line="+7"/>
@@ -3029,7 +3037,12 @@
 &lt;p&gt;You may also view the news by selecting the &quot;Community News&quot; item in the &quot;Help&quot; menu, or by visiting
 &lt;a href=&quot;https://octave.org/community-news.html&quot;&gt;https://octave.org/community-news.html&lt;/a&gt;.&lt;/p&gt;
 &lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;Octave 起動時，Octave コミュニティの現在のニュースや情報をオプションで検索します．
+このチェックは一日一回で最後のニュースをみた時点からなにかあたらしいニュースが存在する場合のみ表示されます．&lt;/p&gt;
+&lt;p&gt;ニュースは &quot;ヘルプ&quot; メニュー内の &quot;コミュニティ ニュース&quot; の項目を選択するかまたは in  
+&lt;a href=&quot;https://octave.org/community-news.html&quot;&gt;https://octave.org/community-news.html&lt;/a&gt;　を訪問したときに表示されます.&lt;/p&gt;
+&lt;/body&gt;&lt;/html&gt;
+</translation>
     </message>
     <message>
         <location line="+28"/>
@@ -3040,7 +3053,7 @@
 &lt;head/&gt;&lt;body&gt;
 &lt;p&gt;Allow Octave to connect to the Octave web site when it starts to display current news and information about the Octave community.&lt;/p&gt;
 &lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished">&lt;html&gt;&lt;head&gt;
+        <translation>&lt;html&gt;&lt;head&gt;
 &lt;style&gt;
 a:link { text-decoration: underline; color: #0000ff; }
 &lt;/style&gt;
@@ -3054,7 +3067,7 @@
     <message>
         <location filename="../src/shortcut-manager.cc" line="+131"/>
         <source>Double Shortcut</source>
-        <translation type="unfinished"></translation>
+        <translation>ダブルショートカット</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -3063,7 +3076,7 @@
 is already used for the action
   &quot;%2&quot;.
 Do you want to use the shortcut anyhow removing it from the previous action?</source>
-        <translation type="unfinished">選択されたショートカット
+        <translation>選択されたショートカット
   &quot;%1&quot;
 はすでにアクション &quot;%2&quot; として使用されています．
 以前のアクションショートカットを削除して実行しますか?</translation>
@@ -3071,259 +3084,259 @@
     <message>
         <location line="+102"/>
         <source>New File</source>
-        <translation type="unfinished">新規ファイル</translation>
+        <translation>新規ファイル</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>New Function</source>
-        <translation type="unfinished"></translation>
+        <translation>新規関数</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>New Figure</source>
-        <translation type="unfinished">新規のフィギュア</translation>
+        <translation>新規のフィギュア</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Open File</source>
-        <translation type="unfinished">ファイルを開く</translation>
+        <translation>ファイルを開く</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Load Workspace</source>
-        <translation type="unfinished"></translation>
+        <translation>ワークスペースをロード</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Save Workspace As</source>
-        <translation type="unfinished">ワークスペースを別名で保存</translation>
+        <translation>ワークスペースを別名で保存</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Exit Octave</source>
-        <translation type="unfinished">Octave の終了</translation>
+        <translation>Octave の終了</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Copy</source>
-        <translation type="unfinished">コピー</translation>
+        <translation>コピー</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Paste</source>
-        <translation type="unfinished">貼り付け</translation>
+        <translation>貼り付け</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Undo</source>
-        <translation type="unfinished">元に戻す</translation>
+        <translation>元に戻す</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Select All</source>
-        <translation type="unfinished"></translation>
+        <translation>すべてを選択</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Clear Clipboard</source>
-        <translation type="unfinished">クリップボードをクリア</translation>
+        <translation>クリップボードをクリア</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Find in Files</source>
-        <translation type="unfinished">複数のファイルで検索</translation>
+        <translation>複数のファイルで検索</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Clear Command Window</source>
-        <translation type="unfinished">コマンドウィンドウのクリア</translation>
+        <translation>コマンドウィンドウのクリア</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Clear Command History</source>
-        <translation type="unfinished">コマンドヒストリのクリア</translation>
+        <translation >コマンドヒストリのクリア</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Clear Workspace</source>
-        <translation type="unfinished">ワークスペースのクリア</translation>
+        <translation>ワークスペースのクリア</translation>
     </message>
     <message>
         <location line="+1"/>
         <location line="+162"/>
         <source>Preferences</source>
-        <translation type="unfinished">設定</translation>
+        <translation>設定</translation>
     </message>
     <message>
         <location line="-159"/>
         <source>Step</source>
-        <translation type="unfinished">ステップ</translation>
+        <translation>ステップ</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Step Into</source>
-        <translation type="unfinished">ステップイン</translation>
+        <translation>ステップイン</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Step Out</source>
-        <translation type="unfinished">ステップアウト</translation>
+        <translation>ステップアウト</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Continue</source>
-        <translation type="unfinished">継続</translation>
+        <translation>継続</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Quit Debug Mode</source>
-        <translation type="unfinished"></translation>
+        <translation>デバッグモードの終了</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Show Command Window</source>
-        <translation type="unfinished"></translation>
+        <translation>コマンドウィンドウの表示</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Show Command History</source>
-        <translation type="unfinished">コマンドヒストリの表示</translation>
+        <translation>コマンドヒストリの表示</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Show File Browser</source>
-        <translation type="unfinished"></translation>
+        <translation>ファイルブラウザの表示</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Show Workspace</source>
-        <translation type="unfinished">ワークスペースの表示</translation>
+        <translation>ワークスペースの表示</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Show Editor</source>
-        <translation type="unfinished">エディタの表示</translation>
+        <translation>エディタの表示</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Show Documentation</source>
-        <translation type="unfinished">ドキュメントの表示</translation>
+        <translation>ドキュメントの表示</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Show Variable Editor</source>
-        <translation type="unfinished"></translation>
+        <translation>変数エディタの表示</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Command Window</source>
-        <translation type="unfinished">コマンドウィンドウ</translation>
+        <translation>コマンドウィンドウ</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Command History</source>
-        <translation type="unfinished">コマンドヒストリ</translation>
+        <translation>コマンドヒストリ</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>File Browser</source>
-        <translation type="unfinished">ファイルブラウザ</translation>
+        <translation>ファイルブラウザ</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Workspace</source>
-        <translation type="unfinished">ワークスペース</translation>
+        <translation>ワークスペース</translation>
     </message>
     <message>
         <location line="+2"/>
         <location line="+258"/>
         <source>Editor</source>
-        <translation type="unfinished">エディタ</translation>
+        <translation>エディタ</translation>
     </message>
     <message>
         <location line="-256"/>
         <source>Documentation</source>
-        <translation type="unfinished">ドキュメント</translation>
+        <translation>ドキュメント</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Variable Editor</source>
-        <translation type="unfinished"></translation>
+        <translation>変数エディタ</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Reset Default Window Layout</source>
-        <translation type="unfinished">既定のウィンドウのレイアウト</translation>
+        <translation>既定のウィンドウのレイアウトをリセット</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Show Ondisk Documentation</source>
-        <translation type="unfinished">ディスク保存のドキュメントの表示</translation>
+        <translation>ディスク保存のドキュメントの表示</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Show Online Documentation</source>
-        <translation type="unfinished">オンラインドキュメントの表示</translation>
+        <translation>オンラインドキュメントの表示</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Report Bug</source>
-        <translation type="unfinished">バグの報告</translation>
+        <translation>バグの報告</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Octave Packages</source>
-        <translation type="unfinished">Octave パッケージ</translation>
+        <translation>Octave パッケージ</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Contribute to Octave</source>
-        <translation type="unfinished">Octave への貢献</translation>
+        <translation>Octave への貢献</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Octave Developer Resources</source>
-        <translation type="unfinished">Octave 開発チーム</translation>
+        <translation>Octave 開発チーム</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>About Octave</source>
-        <translation type="unfinished">Octave について</translation>
+        <translation>Octave について</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Release Notes</source>
-        <translation type="unfinished">リリースノート</translation>
+        <translation>リリースノート</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Community News</source>
-        <translation type="unfinished">コミュニティーニュース</translation>
+        <translation>コミュニティーニュース</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Close Tab</source>
-        <translation type="unfinished"></translation>
+        <translation>タブを閉じる</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Close All Tabs</source>
-        <translation type="unfinished"></translation>
+        <translation>すべてのタブを閉じる</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Close Other Tabs</source>
-        <translation type="unfinished"></translation>
+        <translation>他のタブを閉じる</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Switch to Left Tab</source>
-        <translation type="unfinished">左タブに切替</translation>
+        <translation>左タブに切替</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Switch to Right Tab</source>
-        <translation type="unfinished">右タブに切替</translation>
+        <translation>右タブに切替</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -3333,385 +3346,385 @@
     <message>
         <location line="+2"/>
         <source>Move Tab Right</source>
-        <translation type="unfinished"></translation>
+        <translation> type="unfinished"</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Edit Function</source>
-        <translation type="unfinished">関数の編集</translation>
+        <translation>関数の編集</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Save File</source>
-        <translation type="unfinished">ファイルの保存</translation>
+        <translation>ファイルの保存</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Save File As</source>
-        <translation type="unfinished">ファイルを別名で保存</translation>
+        <translation>ファイルを別名で保存</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Print</source>
-        <translation type="unfinished">印刷</translation>
+        <translation>印刷</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Redo</source>
-        <translation type="unfinished">やり直し</translation>
+        <translation>やり直し</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Cut</source>
-        <translation type="unfinished">切り取り</translation>
+        <translation>切り取り</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Find and Replace</source>
-        <translation type="unfinished">検索と置換</translation>
+        <translation>検索と置換</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Find Next</source>
-        <translation type="unfinished">次を検索</translation>
+        <translation>次を検索</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Find Previous</source>
-        <translation type="unfinished">前を検索</translation>
+        <translation>前を検索</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Delete to Start of Word</source>
-        <translation type="unfinished">単語の始まりまで削除</translation>
+        <translation>単語の始まりまで削除</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Delete to End of Word</source>
-        <translation type="unfinished">単語の終わりまで削除</translation>
+        <translation>単語の終わりまで削除</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Delete to Start of Line</source>
-        <translation type="unfinished">行の始まりまで削除</translation>
+        <translation>行の始まりまで削除</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Delete to End of Line</source>
-        <translation type="unfinished">行末まで削除</translation>
+        <translation>行末まで削除</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Delete Line</source>
-        <translation type="unfinished">行削除</translation>
+        <translation>行削除</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Copy Line</source>
-        <translation type="unfinished">行のコピー</translation>
+        <translation>行のコピー</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Cut Line</source>
-        <translation type="unfinished">行の切り取り</translation>
+        <translation>行の切り取り</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Duplicate Selection/Line</source>
-        <translation type="unfinished"></translation>
+        <translation>選択部/行の複製</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Transpose Line</source>
-        <translation type="unfinished"></translation>
+        <translation>行の入れ替え</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Show Completion List</source>
-        <translation type="unfinished">補完リストの表示</translation>
+        <translation>補完リストの表示</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Comment Selection</source>
-        <translation type="unfinished">選択部をコメントにする</translation>
+        <translation>選択部をコメントにする</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Uncomment Selection</source>
-        <translation type="unfinished">選択部をコメントでなくす</translation>
+        <translation>選択部をアンコメントする</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Comment Selection (Choosing String)</source>
-        <translation type="unfinished"></translation>
+        <translation>選択部をコメントにする（文字列を選ぶ）</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Uppercase Selection</source>
-        <translation type="unfinished">選択部を大文字にする</translation>
+        <translation>選択部を大文字にする</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Lowercase Selection</source>
-        <translation type="unfinished">選択部を小文字にする</translation>
+        <translation>選択部を小文字にする</translation>
     </message>
     <message>
         <location line="+4"/>
         <location line="+5"/>
         <source>Indent Selection Rigidly</source>
-        <translation type="unfinished"></translation>
+        <translation>リジッドにセクションをインデント</translation>
     </message>
     <message>
         <location line="-3"/>
         <location line="+5"/>
         <source>Unindent Selection Rigidly</source>
-        <translation type="unfinished"></translation>
+        <translation>リジッドにセクションをアンインデント</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Indent Code</source>
-        <translation type="unfinished"></translation>
+        <translation>インデントのコード</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Convert Line Endings to Windows</source>
-        <translation type="unfinished">行末を Windows 形式に変換</translation>
+        <translation>行末を Windows 形式に変換</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Convert Line Endings to Unix</source>
-        <translation type="unfinished">行末を Unix 形式に変換</translation>
+        <translation>行末を Unix 形式に変換</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Convert Line Endings to Mac</source>
-        <translation type="unfinished">行末を Mac 形式に変換</translation>
+        <translation>行末を Mac 形式に変換</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Goto Line</source>
-        <translation type="unfinished">指定行に行く</translation>
+        <translation>指定行に移動</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Move to Matching Brace</source>
-        <translation type="unfinished">対応する括弧に移動</translation>
+        <translation>対応する括弧に移動</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Select to Matching Brace</source>
-        <translation type="unfinished">対応する括弧を選択</translation>
+        <translation>対応する括弧を選択</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Toggle Bookmark</source>
-        <translation type="unfinished">ブックマークをトグル</translation>
+        <translation>ブックマークをトグル</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Next Bookmark</source>
-        <translation type="unfinished">次のブックマーク</translation>
+        <translation>次のブックマーク</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Previous Bookmark</source>
-        <translation type="unfinished">前のブックマーク</translation>
+        <translation>前のブックマーク</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Remove All Bookmark</source>
-        <translation type="unfinished">すべてのブックマークの削除</translation>
+        <translation>すべてのブックマークの削除</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Styles Preferences</source>
-        <translation type="unfinished"></translation>
+        <translation>スタイルの設定</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Show Line Numbers</source>
-        <translation type="unfinished">行番号の表示</translation>
+        <translation>行番号の表示</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Show Whitespace Characters</source>
-        <translation type="unfinished">ホワイトスペースの表示</translation>
+        <translation>ホワイトスペースキャラクタの表示</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Show Line Endings</source>
-        <translation type="unfinished">行末の表示</translation>
+        <translation>行末の表示</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Show Indentation Guides</source>
-        <translation type="unfinished">インデントガイドの表示</translation>
+        <translation>インデントガイドの表示</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Show Long Line Marker</source>
-        <translation type="unfinished">長い行のマーカーを表示</translation>
+        <translation>長い行のマーカーを表示</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Show Toolbar</source>
-        <translation type="unfinished">ツールバーの表示</translation>
+        <translation>ツールバーの表示</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Show Statusbar</source>
-        <translation type="unfinished">ステータスバーの表示</translation>
+        <translation>ステータスバーの表示</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Show Horizontal Scrollbar</source>
-        <translation type="unfinished">縦スクロールバーの表示</translation>
+        <translation>縦スクロールバーの表示</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Zoom In</source>
-        <translation type="unfinished">ズームイン</translation>
+        <translation>ズームイン</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Zoom Out</source>
-        <translation type="unfinished">ズームアウト</translation>
+        <translation>ズームアウト</translation>
     </message>
     <message>
         <location line="+2"/>
         <location line="+3"/>
         <source>Zoom Normal</source>
-        <translation type="unfinished"></translation>
+        <translation>ズームノーマル</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Toggle Breakpoint</source>
-        <translation type="unfinished">ブレークポイントをトグル</translation>
+        <translation>ブレークポイントをトグル</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Next Breakpoint</source>
-        <translation type="unfinished">次のブレークポイント</translation>
+        <translation>次のブレークポイント</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Previous Breakpoint</source>
-        <translation type="unfinished">前のブレークポイント</translation>
+        <translation>前のブレークポイント</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Remove All Breakpoints</source>
-        <translation type="unfinished">全てのブレークポイントを解除</translation>
+        <translation>全てのブレークポイントを解除</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Run File</source>
-        <translation type="unfinished">ファイルを実行</translation>
+        <translation>ファイルを実行</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Run Selection</source>
-        <translation type="unfinished">選択部を実行</translation>
+        <translation>選択部を実行</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Help on Keyword</source>
-        <translation type="unfinished">キーワードでヘルプ</translation>
+        <translation>キーワードでヘルプ</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Document on Keyword</source>
-        <translation type="unfinished">キーワードでドキュメント</translation>
+        <translation>キーワードでドキュメント</translation>
     </message>
     <message>
         <location line="+57"/>
         <source>Global</source>
-        <translation type="unfinished"></translation>
+        <translation>グローバル</translation>
     </message>
     <message>
         <location line="+3"/>
         <location line="+27"/>
         <source>File Menu</source>
-        <translation type="unfinished"></translation>
+        <translation>ファイルメニュー</translation>
     </message>
     <message>
         <location line="-25"/>
         <location line="+27"/>
         <source>Edit Menu</source>
-        <translation type="unfinished"></translation>
+        <translation>エディトメニュー</translation>
     </message>
     <message>
         <location line="-25"/>
         <location line="+29"/>
         <source>Debug Menu</source>
-        <translation type="unfinished"></translation>
+        <translation>デバッグメニュー</translation>
     </message>
     <message>
         <location line="-27"/>
         <source>Window Menu</source>
-        <translation type="unfinished"></translation>
+        <translation>ウィンドウメニュー</translation>
     </message>
     <message>
         <location line="+2"/>
         <location line="+29"/>
         <source>Help Menu</source>
-        <translation type="unfinished"></translation>
+        <translation>ヘルプメニュー</translation>
     </message>
     <message>
         <location line="-27"/>
         <source>News Menu</source>
-        <translation type="unfinished"></translation>
+        <translation>新しいメニュー</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Tab Handling in Dock Widgets</source>
-        <translation type="unfinished"></translation>
+        <translation>ドックウィジェットでタブの操作</translation>
     </message>
     <message>
         <location line="+19"/>
         <source>View Menu</source>
-        <translation type="unfinished"></translation>
+        <translation>ビューメニュー</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Run Menu</source>
-        <translation type="unfinished"></translation>
+        <translation>実行メニュー</translation>
     </message>
     <message>
         <location line="+68"/>
         <source>Import shortcuts from file ...</source>
-        <translation type="unfinished">ショートカットのファイルからのインポート ...</translation>
+        <translation>ショートカットのファイルからのインポート ...</translation>
     </message>
     <message>
         <location line="+1"/>
         <location line="+5"/>
         <source>Octave Shortcut Files (*.osc);;All Files (*)</source>
-        <translation type="unfinished">Octave ショートカットファイル (*.osc);;全てのファイル (*)</translation>
+        <translation>Octave ショートカットファイル (*.osc);;全てのファイル (*)</translation>
     </message>
     <message>
         <location line="-1"/>
         <source>Export shortcuts into file ...</source>
-        <translation type="unfinished">ショートカットのファイルへのエクスポート ...</translation>
+        <translation>ショートカットのファイルへのエクスポート ...</translation>
     </message>
     <message>
         <location line="+11"/>
         <source>Failed to open %1 as octave shortcut file</source>
-        <translation type="unfinished">%1 を Octave ショートカットファイルとして開くのに失敗しました</translation>
+        <translation>%1 を Octave ショートカットファイルとして開くのに失敗しました</translation>
     </message>
     <message>
         <location line="+26"/>
         <source>Enter new Shortcut</source>
-        <translation type="unfinished">新しいショートカットの入力</translation>
+        <translation>新しいショートカットの入力</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Apply the desired shortcut or click on the right button to reset the shortcut to its default.</source>
-        <translation type="unfinished">ショートカットの適用または右クリックでショートカットを既定に戻す</translation>
+        <translation>ショートカットの適用または右クリックでショートカットを既定に戻す</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Enter shortcut directly by performing it</source>
-        <translation type="unfinished">実行により直接ショートカットの入力</translation>
+        <translation>実行により直接ショートカットの入力</translation>
     </message>
     <message>
         <location line="+6"/>
@@ -3721,29 +3734,29 @@
     <message>
         <location line="+6"/>
         <source>Default shortcut</source>
-        <translation type="unfinished">既定のショートカット</translation>
+        <translation>既定のショートカット</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Set to default</source>
-        <translation type="unfinished">既定に設定</translation>
+        <translation>既定に設定</translation>
     </message>
     <message>
         <location line="+63"/>
         <source>Overwriting Shortcuts</source>
-        <translation type="unfinished">ショートカットの上書き</translation>
+        <translation>ショートカットの上書き</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>You are about to overwrite all shortcuts.
 Would you like to save the current shortcut set or cancel the action?</source>
-        <translation type="unfinished">すべてのショートカットを上書きしようとしています．
+        <translation>すべてのショートカットを上書きしようとしています．
 現在のショートカットを保存しますか，キャンセルしますか?</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Don&apos;t save</source>
-        <translation type="unfinished">保存しない</translation>
+        <translation>保存しない</translation>
     </message>
 </context>
 <context>
@@ -3751,7 +3764,7 @@
     <message>
         <location filename="../src/terminal-dock-widget.cc" line="+43"/>
         <source>Command Window</source>
-        <translation type="unfinished">コマンドウィンドウ</translation>
+        <translation>コマンドウィンドウ</translation>
     </message>
 </context>
 <context>
@@ -3759,22 +3772,22 @@
     <message>
         <location filename="../src/variable-editor.cc" line="+177"/>
         <source>Dock widget</source>
-        <translation type="unfinished">ウィジェットをドック</translation>
+        <translation>ウィジェットをドック</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Undock widget</source>
-        <translation type="unfinished">ウィジェットをアンドック</translation>
+        <translation>ウィジェットをアンドック</translation>
     </message>
     <message>
         <location line="+17"/>
         <source>Restore geometry</source>
-        <translation type="unfinished"></translation>
+        <translation>ジオメトリをリストア</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Redock</source>
-        <translation type="unfinished"></translation>
+        <translation>リドック</translation>
     </message>
 </context>
 <context>
@@ -3782,62 +3795,62 @@
     <message>
         <location line="+790"/>
         <source>Variable Editor</source>
-        <translation type="unfinished"></translation>
+        <translation>変数エディタ</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Edit variables.</source>
-        <translation type="unfinished"></translation>
+        <translation>変数の編集</translation>
     </message>
     <message>
         <location line="+470"/>
         <source>Variable Editor Toolbar</source>
-        <translation type="unfinished"></translation>
+        <translation>変数エディタのツールバー</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Save</source>
-        <translation type="unfinished"></translation>
+        <translation>保存</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Save variable to a file</source>
-        <translation type="unfinished"></translation>
+        <translation>変数をファイルに保存</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Cut</source>
-        <translation type="unfinished">切り取り</translation>
+        <translation>切り取り</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Cut data to clipboard</source>
-        <translation type="unfinished"></translation>
+        <translation>データを切り取ってクリップボードへ</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Copy</source>
-        <translation type="unfinished">コピー</translation>
+        <translation>コピー</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Copy data to clipboard</source>
-        <translation type="unfinished"></translation>
+        <translation>クリップボードにデータをコピー</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Paste</source>
-        <translation type="unfinished">貼り付け</translation>
+        <translation>貼り付け</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Paste clipboard into variable data</source>
-        <translation type="unfinished"></translation>
+        <translation>クリップボードを変数データに貼り付け</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Paste Table</source>
-        <translation type="unfinished"></translation>
+        <translation>貼り付けテーブル</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -3849,27 +3862,27 @@
         <location line="+5"/>
         <location line="+7"/>
         <source>Plot</source>
-        <translation type="unfinished"></translation>
+        <translation>プロット</translation>
     </message>
     <message>
         <location line="-11"/>
         <source>Plot Selected Data</source>
-        <translation type="unfinished"></translation>
+        <translation>選択されたデータをプロット</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Plot selected data</source>
-        <translation type="unfinished"></translation>
+        <translation>選択されたデータをプロット</translation>
     </message>
     <message>
         <location line="+21"/>
         <source>Up</source>
-        <translation type="unfinished"></translation>
+        <translation>アップ</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Go one level up in variable hierarchy</source>
-        <translation type="unfinished"></translation>
+        <translation>変数の階層を1レベルアップする</translation>
     </message>
 </context>
 <context>
@@ -3877,7 +3890,7 @@
     <message>
         <location line="-1169"/>
         <source>Save Variable %1 As</source>
-        <translation type="unfinished"></translation>
+        <translation>変数 %1 を別名で保存</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -3890,32 +3903,32 @@
     <message>
         <location line="+123"/>
         <source>Cut</source>
-        <translation type="unfinished">切り取り</translation>
+        <translation>切り取り</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Copy</source>
-        <translation type="unfinished">コピー</translation>
+        <translation>コピー</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Paste</source>
-        <translation type="unfinished">貼り付け</translation>
+        <translation>貼り付け</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Paste Table</source>
-        <translation type="unfinished"></translation>
+        <translation>貼り付けテーブル</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Clear</source>
-        <translation type="unfinished"></translation>
+        <translation>クリア</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Delete</source>
-        <translation type="unfinished">削除</translation>
+        <translation>削除</translation>
     </message>
     <message>
         <location line="+4"/>
@@ -3933,32 +3946,32 @@
     <message>
         <location filename="../src/qtinfo/webinfo.cc" line="+85"/>
         <source>Type here and press &apos;Return&apos; to search</source>
-        <translation type="unfinished">ここでタイプして&apos;リターンキー&apos;を押して検索</translation>
+        <translation>ここでタイプして&apos;リターンキー&apos;を押して検索</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Global search</source>
-        <translation type="unfinished">グローバル検索</translation>
+        <translation>グローバル検索</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>&amp;Close</source>
-        <translation type="unfinished">閉じる (&amp;C)</translation>
+        <translation>閉じる (&amp;C)</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Close &amp;Other Tabs</source>
-        <translation type="unfinished"></translation>
+        <translation>他のタブを閉じる (&amp;O)</translation>
     </message>
     <message>
         <location line="+79"/>
         <source>Error</source>
-        <translation type="unfinished">エラー</translation>
+        <translation>エラー</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>The info file&lt;p&gt;%1&lt;p&gt;or compressed versions do not exist</source>
-        <translation type="unfinished">info ファイル &lt;p&gt;%1&lt;p&gt; またはその圧縮されたファイルが存在しません</translation>
+        <translation>info ファイル &lt;p&gt;%1&lt;p&gt; またはその圧縮されたファイルが存在しません</translation>
     </message>
 </context>
 <context>
@@ -3966,7 +3979,7 @@
     <message>
         <location filename="../src/welcome-wizard.cc" line="-162"/>
         <source>Welcome to GNU Octave</source>
-        <translation type="unfinished">GNU Octave へようこそ</translation>
+        <translation>GNU Octave へようこそ</translation>
     </message>
 </context>
 <context>
@@ -3974,38 +3987,38 @@
     <message>
         <location filename="../src/workspace-model.cc" line="-41"/>
         <source>Name</source>
-        <translation type="unfinished">名前</translation>
+        <translation>名前</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Class</source>
-        <translation type="unfinished">クラス</translation>
+        <translation>クラス</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Dimension</source>
-        <translation type="unfinished">次元</translation>
+        <translation>次元</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Value</source>
-        <translation type="unfinished">値</translation>
+        <translation>値</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Attribute</source>
-        <translation type="unfinished">属性</translation>
+        <translation>属性</translation>
     </message>
     <message>
         <location line="+108"/>
         <source>Right click to copy, rename, or display</source>
-        <translation type="unfinished">右クリックでコピー，名前の変更，または表示</translation>
+        <translation>右クリックでコピー，名前の変更，または表示</translation>
     </message>
     <message>
         <location line="+37"/>
         <location line="+2"/>
         <source>complex</source>
-        <translation type="unfinished">複素数</translation>
+        <translation>複素数</translation>
     </message>
 </context>
 <context>
@@ -4013,87 +4026,87 @@
     <message>
         <location filename="../src/workspace-view.cc" line="+55"/>
         <source>Workspace</source>
-        <translation type="unfinished">ワークスペース</translation>
+        <translation>ワークスペース</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>View the variables in the active workspace.</source>
-        <translation type="unfinished">アクティブなワークスペースの表示．</translation>
+        <translation>アクティブなワークスペースの表示．</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Enter text to filter the workspace</source>
-        <translation type="unfinished">ワークスペースをフィルタするためにテキストを入力</translation>
+        <translation>ワークスペースをフィルタするためにテキストを入力</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Filter</source>
-        <translation type="unfinished">フィルタ</translation>
+        <translation>フィルタ</translation>
     </message>
     <message>
         <location line="+129"/>
         <source>View the variables in the active workspace.&lt;br&gt;</source>
-        <translation type="unfinished">アクティブワークスペースの変数の表示&lt;br&gt;</translation>
+        <translation>アクティブワークスペースの変数の表示&lt;br&gt;</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Colors for variable attributes:</source>
-        <translation type="unfinished">変数の属性のための色</translation>
+        <translation>変数の属性のための色</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Class</source>
-        <translation type="unfinished">クラス</translation>
+        <translation>クラス</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Dimension</source>
-        <translation type="unfinished">次元</translation>
+        <translation>次元</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Value</source>
-        <translation type="unfinished">値</translation>
+        <translation>値</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Attribute</source>
-        <translation type="unfinished">属性</translation>
+        <translation>属性</translation>
     </message>
     <message>
         <location line="+136"/>
         <source>Open in Variable Editor</source>
-        <translation type="unfinished"></translation>
+        <translation>変数エディタで開く</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Copy name</source>
-        <translation type="unfinished">名前のコピー</translation>
+        <translation>名前のコピー</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Copy value</source>
-        <translation type="unfinished">値のコピー</translation>
+        <translation>値のコピー</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Rename</source>
-        <translation type="unfinished">名前の変更</translation>
+        <translation>名前の変更</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Only top-level symbols may be renamed</source>
-        <translation type="unfinished">トップレベルのシンボルのみの名前の変更</translation>
+        <translation>トップレベルのシンボルのみの名前の変更</translation>
     </message>
     <message>
         <location line="+22"/>
         <source>Hide filter</source>
-        <translation type="unfinished">フィルタを隠す</translation>
+        <translation>フィルタを隠す</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Show filter</source>
-        <translation type="unfinished">フィルタを表示</translation>
+        <translation>フィルタを表示</translation>
     </message>
 </context>
 <context>
@@ -4112,7 +4125,7 @@
     <message>
         <location line="-457"/>
         <source>Interface</source>
-        <translation type="unfinished"></translation>
+        <translation>インターフェイス</translation>
     </message>
     <message>
         <location line="+259"/>
@@ -4143,13 +4156,13 @@
     <message>
         <location line="-458"/>
         <source>Text inactive</source>
-        <translation type="unfinished"></translation>
+        <translation>テキストをインアクティブ</translation>
     </message>
     <message>
         <location line="-32"/>
         <location line="+45"/>
         <source>Active</source>
-        <translation type="unfinished"></translation>
+        <translation>アクティブ</translation>
     </message>
     <message>
         <location line="-142"/>
@@ -4222,7 +4235,7 @@
     <message>
         <location line="-463"/>
         <source>Enable Code Folding</source>
-        <translation type="unfinished"></translation>
+        <translation>コードの折りたたみを有効化</translation>
     </message>
     <message>
         <location line="+961"/>
@@ -4362,7 +4375,7 @@
     <message>
         <location line="+27"/>
         <source>Set focus to terminal when running a command from within another widget</source>
-        <translation type="unfinished"></translation>
+        <translation>他のウィジェットないでコマンド実行時，端末にフォーカスする</translation>
     </message>
     <message>
         <location line="+7"/>
@@ -4393,7 +4406,7 @@
     <message>
         <location line="-478"/>
         <source>Graphic icons</source>
-        <translation type="unfinished"></translation>
+        <translation>グラフィクアイコン</translation>
     </message>
     <message>
         <location line="+60"/>
@@ -4428,12 +4441,12 @@
     <message>
         <location line="-136"/>
         <source>Number of characters before list is shown: </source>
-        <translation type="unfinished"></translation>
+        <translation>リストが表示される前の文字数</translation>
     </message>
     <message>
         <location line="+124"/>
         <source>Create nonexistent files without prompting</source>
-        <translation type="unfinished"></translation>
+        <translation>プロンプトなしに現在存在しないファイルを作成</translation>
     </message>
     <message>
         <location line="-728"/>
@@ -4463,12 +4476,12 @@
     <message>
         <location line="+231"/>
         <source>Show complete path in title</source>
-        <translation type="unfinished"></translation>
+        <translation>完全なパスを表示</translation>
     </message>
     <message>
         <location line="+131"/>
         <source>Number size as difference to editor font</source>
-        <translation type="unfinished"></translation>
+        <translation>エディタのフォントとのサイズの違い</translation>
     </message>
     <message>
         <location line="+124"/>
@@ -4478,7 +4491,7 @@
     <message>
         <location line="+65"/>
         <source>Comments (Octave)</source>
-        <translation type="unfinished"></translation>
+        <translation>コメント (Octave)</translation>
     </message>
     <message>
         <location line="+11"/>
@@ -4493,47 +4506,47 @@
     <message>
         <location line="+31"/>
         <source>Long lines</source>
-        <translation type="unfinished"></translation>
+        <translation>長い行</translation>
     </message>
     <message>
         <location line="+25"/>
         <source>Break long lines at line length</source>
-        <translation type="unfinished"></translation>
+        <translation>長い行を行の長さで分断</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Break lines only in comments</source>
-        <translation type="unfinished"></translation>
+        <translation>コメント内でのみ行の分断</translation>
     </message>
     <message>
         <location line="+60"/>
         <source>Line length</source>
-        <translation type="unfinished"></translation>
+        <translation>行の長さ</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Long line marker</source>
-        <translation type="unfinished"></translation>
+        <translation>長い行のマーカー</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Line</source>
-        <translation type="unfinished"></translation>
+        <translation>行</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Background</source>
-        <translation type="unfinished">背景</translation>
+        <translation>背景</translation>
     </message>
     <message>
         <location line="+38"/>
         <source>Wrap long lines at curent window border</source>
-        <translation type="unfinished"></translation>
+        <translation>現在のウィンドウの境界で長い行をラップ</translation>
     </message>
     <message>
         <location line="+153"/>
         <source>Auto insert after &quot;if&quot; etc.</source>
-        <translation type="unfinished"></translation>
+        <translation>&quot;if&quot; などの後に自動挿入</translation>
     </message>
     <message>
         <location line="+20"/>
@@ -4553,12 +4566,12 @@
     <message>
         <location line="+267"/>
         <source>Restore editor tabs from previous session on startup or when editor is shown again after closing</source>
-        <translation type="unfinished"></translation>
+        <translation>起動時またはエディタが閉じられ再び起動された際一つ前のセッションからエディタのタブをリストアする</translation>
     </message>
     <message>
         <location line="+105"/>
         <source>Close all files when the editor widget is closed/hidden</source>
-        <translation type="unfinished"></translation>
+        <translation>エディタウィジェットが閉じられるまたは隠されたらすべてのファイルを閉じる</translation>
     </message>
     <message>
         <location line="+120"/>
@@ -4584,7 +4597,7 @@
     <message>
         <location line="+35"/>
         <source>Colors for variable attributes</source>
-        <translation type="unfinished"></translation>
+        <translation>変数の属性の色</translation>
     </message>
     <message>
         <location line="+7"/>
@@ -4610,7 +4623,7 @@
         <location line="+3"/>
         <location line="+80"/>
         <source>Default</source>
-        <translation type="unfinished">既定</translation>
+        <translation>既定</translation>
     </message>
     <message>
         <location line="-71"/>
@@ -4640,27 +4653,27 @@
     <message>
         <location line="+90"/>
         <source>Variable Editor</source>
-        <translation type="unfinished"></translation>
+        <translation>変数エディタ</translation>
     </message>
     <message>
         <location line="+33"/>
         <source>Default row height</source>
-        <translation type="unfinished"></translation>
+        <translation>既定の行の幅</translation>
     </message>
     <message>
         <location line="+17"/>
         <source>20</source>
-        <translation type="unfinished"></translation>
+        <translation>20</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Default column width</source>
-        <translation type="unfinished"></translation>
+        <translation>既定の列の幅</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Use Terminal Font</source>
-        <translation type="unfinished"></translation>
+        <translation>端末のフォントを使用する</translation>
     </message>
     <message>
         <location line="+27"/>
@@ -4675,7 +4688,7 @@
     <message>
         <location line="+7"/>
         <source>Plus font height</source>
-        <translation type="unfinished"></translation>
+        <translation>フォントの高さをプラス</translation>
     </message>
     <message>
         <location line="+17"/>
@@ -4690,7 +4703,7 @@
     <message>
         <location line="+23"/>
         <source>Variable Editor Colors</source>
-        <translation type="unfinished"></translation>
+        <translation>変数エディタの色</translation>
     </message>
     <message>
         <location line="+12"/>
@@ -4700,11 +4713,12 @@
     <message>
         <location line="-287"/>
         <source>HttpProxy</source>
-        <translation>HTTP Proxy</translation>
+        <translation>HTTP プロキシ</translation>
     </message>
     <message>
         <location line="-2179"/>
         <source>Icon set for dock widgets</source>
+        <translation>Dock widgets のためのアイコンセット</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -4725,7 +4739,7 @@
     <message>
         <location line="+1509"/>
         <source>File handling</source>
-        <translation type="unfinished"></translation>
+        <translation>ファイル操作</translation>
     </message>
     <message>
         <location line="+526"/>
diff -r e909207e9ff1 -r 56b26a3376d0 libgui/languages/zh_CN.ts
--- a/libgui/languages/zh_CN.ts	Fri Mar 30 17:47:12 2018 -0400
+++ b/libgui/languages/zh_CN.ts	Mon Apr 02 08:58:20 2018 -0700
@@ -2,6 +2,14 @@
 <!DOCTYPE TS>
 <TS version="2.1" language="zh_CN">
 <context>
+    <name>ListDialog</name>
+    <message>
+        <location filename="../src/dialog.cc" line="+258"/>
+        <source>Select All</source>
+        <translation>全选</translation>
+    </message>
+</context>
+<context>
     <name>QObject</name>
     <message>
         <location filename="../src/workspace-model.cc" line="+78"/>
@@ -61,7 +69,7 @@
     <message>
         <location line="+6"/>
         <source>Background color, pink (255, 0, 255) means default</source>
-        <translation type="unfinished">背景颜色，粉红色 (255,0,255) 代表默认值 {255, 0, 255)?}</translation>
+        <translation type="unfinished">背景颜色，粉红色 (255, 0, 255) 代表默认值 {255, 0, 255)?}</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -102,12 +110,12 @@
     <message>
         <location line="+7"/>
         <source>Clear Window</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">清空窗口</translation>
     </message>
     <message>
         <location filename="../qterminal/libqterminal/QTerminal.cc" line="+49"/>
         <source>Edit %1 at line %2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">在 %2 行编辑 %1</translation>
     </message>
 </context>
 <context>
@@ -123,72 +131,72 @@
     <message>
         <location filename="../../../qsci/qscilexerbash.cpp" line="+208"/>
         <source>Default</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">默认</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Error</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">错误</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Comment</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">注释</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Number</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">数字</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Keyword</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">关键字</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Double-quoted string</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">双引号字符串</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Single-quoted string</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">单引号字符串</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Operator</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">操作符</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Identifier</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">标识符</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Scalar</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">标量</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Parameter expansion</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">参数展开</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Backticks</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">反引号</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Here document delimiter</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">此处文档分隔符</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Single-quoted here document</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">此处单引号文档</translation>
     </message>
 </context>
 <context>
@@ -196,42 +204,42 @@
     <message>
         <location filename="../../../qsci/qscilexerbatch.cpp" line="+179"/>
         <source>Default</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">默认</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Comment</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">注释</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Keyword</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">关键字</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Label</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">标签</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Hide command character</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">隐藏命令字符</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>External command</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">外部命令</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Variable</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">变量</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Operator</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">操作符</translation>
     </message>
 </context>
 <context>
@@ -239,212 +247,212 @@
     <message>
         <location filename="../../../qsci/qscilexercpp.cpp" line="+352"/>
         <source>Default</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">默认</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Inactive default</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">不活动的默认</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>C comment</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">C 注释</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Inactive C comment</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">不活动的 C 注释</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>C++ comment</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">C++ 注释</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Inactive C++ comment</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">不活动的 C++ 注释</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>JavaDoc style C comment</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">JavaDoc 风格的 C 注释</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Inactive JavaDoc style C comment</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">不活动的 JavaDoc 风格的 C 注释</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Number</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">数字</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Inactive number</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">不活动的数字</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Keyword</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">关键字</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Inactive keyword</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">不活动的关键字</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Double-quoted string</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">双引号字符串</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Inactive double-quoted string</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">不活动的双引号字符串</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Single-quoted string</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">单引号字符串</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Inactive single-quoted string</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">不活动的单引号字符串</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>IDL UUID</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">IDL UUID</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Inactive IDL UUID</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">不活动的 IDL UUID</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Pre-processor block</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">预处理块</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Inactive pre-processor block</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">不活动的预处理块</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Operator</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">操作符</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Inactive operator</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">不活动的操作符</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Identifier</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">标识符</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Inactive identifier</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">不活动的标识符</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Unclosed string</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">未闭合的字符串</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Inactive unclosed string</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">不活动的未闭合字符串</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>C# verbatim string</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">C# verbatim string</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Inactive C# verbatim string</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">不活动的 C# verbatim string</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>JavaScript regular expression</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">JavaScript 正则表达式</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Inactive JavaScript regular expression</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">不活动的 JavaScript 正则表达式</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>JavaDoc style C++ comment</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">JavaDoc 风格 C++ 注释</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Inactive JavaDoc style C++ comment</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">不活动的 JavaDoc 风格 C++ 注释</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Secondary keywords and identifiers</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">次要关键字和标识符</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Inactive secondary keywords and identifiers</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">不活动的次要关键字和标识符</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>JavaDoc keyword</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">JavaDoc 关键字</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Inactive JavaDoc keyword</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">不活动的 JavaDoc 关键字</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>JavaDoc keyword error</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">JavaDoc 关键字错误</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Inactive JavaDoc keyword error</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">不活动的 JavaDoc 关键字错误</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Global classes and typedefs</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">全局的 classes 和 typedefs</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Inactive global classes and typedefs</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">不活动的全局 classes 和 typedefs</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>C++ raw string</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">C++ raw string</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Inactive C++ raw string</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">不活动的 C++ raw string</translation>
     </message>
 </context>
 <context>
@@ -452,42 +460,42 @@
     <message>
         <location filename="../../../qsci/qscilexerdiff.cpp" line="+107"/>
         <source>Default</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">默认</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Comment</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">注释</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Command</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">命令</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Header</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">标头</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Position</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">位置</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Removed line</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">移除的行</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Added line</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">添加的行</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Changed line</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">改变的行</translation>
     </message>
 </context>
 <context>
@@ -495,47 +503,47 @@
     <message>
         <location filename="../../../qsci/qscilexermatlab.cpp" line="+138"/>
         <source>Default</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">默认</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Comment</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">注释</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Command</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">命令</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Number</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">数字</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Keyword</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">关键字</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Single-quoted string</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">单引号字符串</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Operator</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">操作符</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Identifier</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">标识符</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Double-quoted string</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">双引号字符串</translation>
     </message>
 </context>
 <context>
@@ -543,207 +551,207 @@
     <message>
         <location filename="../../../qsci/qscilexerperl.cpp" line="+333"/>
         <source>Default</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">默认</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Error</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">错误</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Comment</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">注释</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>POD</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">POD</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Number</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">数字</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Keyword</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">关键字</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Double-quoted string</source>
-        <translation type="unfinished"></translation>
+        <translation>双引号字符串</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Single-quoted string</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">单引号字符串</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Operator</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">操作符</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Identifier</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">标识符</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Scalar</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">标量</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Array</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">数组</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Hash</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">哈希</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Symbol table</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">符号表</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Regular expression</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">正则表达式</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Substitution</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">替换</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Backticks</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">反引号</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Data section</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">数据段</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Here document delimiter</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">此处文档分隔符</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Single-quoted here document</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">此处单引号文档</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Double-quoted here document</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">此处双引号文档</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Backtick here document</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">此处反引号文档</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Quoted string (q)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">引用的字符串 (q)</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Quoted string (qq)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">引用的字符串 (qq)</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Quoted string (qx)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">引用的字符串 (qx)</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Quoted string (qr)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">引用的字符串 (qr)</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Quoted string (qw)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">引用的字符串 (qw)</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>POD verbatim</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">POD verbatim</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Subroutine prototype</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">子程序原型</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Format identifier</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">格式标识符</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Format body</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">格式正文</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Double-quoted string (interpolated variable)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">双引号字符串 (插值的变量)</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Translation</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">翻译</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Regular expression (interpolated variable)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">正则表达式 (插值的变量)</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Substitution (interpolated variable)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">替换 (插值的变量)</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Backticks (interpolated variable)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">反引号 (插值的变量)</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Double-quoted here document (interpolated variable)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">此处双引号文档 (插值的变量)</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Backtick here document (interpolated variable)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">此处反引号文档 (插值的变量)</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Quoted string (qq, interpolated variable)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">引用的字符串 (qq, 插值的变量)</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Quoted string (qx, interpolated variable)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">引用的字符串 (qx, 插值的变量)</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Quoted string (qr, interpolated variable)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">引用的字符串 (qr, 插值的变量)</translation>
     </message>
 </context>
 <context>
@@ -771,7 +779,7 @@
     <message>
         <location line="+6"/>
         <source>&amp;Paste</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">粘贴</translation>
     </message>
     <message>
         <location line="+4"/>
@@ -787,24 +795,24 @@
 <context>
     <name>QtHandles::Figure</name>
     <message>
-        <location filename="../graphics/Figure.cc" line="+299"/>
+        <location filename="../graphics/Figure.cc" line="+298"/>
         <source>Figure ToolBar</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">图表工具栏</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Axes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">轴</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Grid</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">网格</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Autoscale</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">自动缩放</translation>
     </message>
     <message>
         <location line="+7"/>
@@ -814,17 +822,17 @@
     <message>
         <location line="+2"/>
         <source>&amp;Save</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">保存 (&amp;S)</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Save &amp;As</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">另存为 (&amp;A)</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>&amp;Close Figure</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">关闭图表 (&amp;C)</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -834,29 +842,24 @@
     <message>
         <location line="+2"/>
         <source>Cop&amp;y</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">复制 (&amp;y)</translation>
     </message>
     <message>
         <location line="+7"/>
-        <location line="+533"/>
+        <location line="+463"/>
         <source>About Octave</source>
         <translation type="unfinished">关于 Octave</translation>
     </message>
     <message>
-        <location line="+41"/>
-        <source>Octave Figure File (*.ofig);;Vector Image Formats (*.eps *.epsc *.pdf *.svg *.ps *.tikz);;Bitmap Image Formats (*.gif *.jpg *.png *.tiff)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-576"/>
+        <location line="-465"/>
         <source>&amp;Help</source>
         <translation type="unfinished">帮助 (&amp;H)</translation>
     </message>
     <message>
-        <location line="+574"/>
-        <location line="+76"/>
+        <location line="+504"/>
+        <location line="+69"/>
         <source>Save Figure As</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">另存图表为</translation>
     </message>
 </context>
 <context>
@@ -864,61 +867,32 @@
     <message>
         <location filename="../graphics/MouseModeActionGroup.cc" line="+40"/>
         <source>Rotate</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">旋转</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Zoom In</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">放大</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Zoom Out</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">缩小</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Pan</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">拖动</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Insert Text</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">插入文本</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Select</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>UrlFilter</name>
-    <message>
-        <location filename="../qterminal/libqterminal/unix/Filter.cpp" line="+628"/>
-        <source>Open Link</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Copy Link Address</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Send Email To...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Copy Email Address</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <location line="+12"/>
-        <source>Edit %1 at line %2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">选择</translation>
     </message>
 </context>
 <context>
@@ -926,17 +900,17 @@
     <message>
         <location filename="../graphics/annotation-dialog.ui" line="+17"/>
         <source>Annotation</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">注释</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Text</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">文本</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>String</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">字符串</translation>
     </message>
     <message>
         <location line="+13"/>
@@ -946,7 +920,7 @@
     <message>
         <location line="+42"/>
         <source>bold</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">粗体</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -956,7 +930,7 @@
     <message>
         <location line="+13"/>
         <source>italic</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">斜体</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -966,224 +940,545 @@
     <message>
         <location line="+428"/>
         <source>color</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">颜色</translation>
     </message>
     <message>
         <location line="+22"/>
         <source>Horz alignment</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">水平对齐</translation>
     </message>
     <message>
         <location line="+11"/>
         <source>left</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">左</translation>
     </message>
     <message>
         <location line="+5"/>
         <location line="+29"/>
         <source>middle</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">中</translation>
     </message>
     <message>
         <location line="-24"/>
         <source>right</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">右</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Vert alignment</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">垂直对齐</translation>
     </message>
     <message>
         <location line="+11"/>
         <source>top</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">上</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>bottom</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">下</translation>
     </message>
     <message>
         <location line="+11"/>
         <source>Position</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">位置</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>X</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">X</translation>
     </message>
     <message>
         <location line="+20"/>
         <source>Y</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Y</translation>
     </message>
     <message>
         <location line="+20"/>
         <source>Width</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">宽</translation>
     </message>
     <message>
         <location line="+17"/>
         <source>Height</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">高</translation>
     </message>
     <message>
         <location line="+17"/>
         <source>units</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">单位</translation>
     </message>
     <message>
         <location line="+11"/>
         <source>normalized</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">归一化</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Fit to box</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">适应方框大小</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Box</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">方框</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Background</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">背景</translation>
     </message>
     <message>
         <location line="+444"/>
         <source>Edge</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">边</translation>
     </message>
     <message>
         <location line="+133"/>
         <source>Line style</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">线条样式</translation>
     </message>
     <message>
         <location line="+11"/>
         <source>none</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">无</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Line width</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>octave::ListDialog</name>
-    <message>
-        <location filename="../src/dialog.cc" line="+276"/>
-        <source>Select All</source>
-        <translation type="unfinished">全选</translation>
+        <translation type="unfinished">线条宽度</translation>
     </message>
 </context>
 <context>
-    <name>octave::documentation</name>
-    <message>
-        <location filename="../src/documentation.cc" line="+59"/>
-        <source>Octave Documentation</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Could not setup the data required for the
-documentation viewer. Only help texts in
-the Console Widget will be available.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
-        <source>Contents</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>Enter text to search the indices</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <location line="+37"/>
-        <source>Search</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-22"/>
-        <source>Index</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>octave::documentation_dock_widget</name>
-    <message>
-        <location filename="../src/documentation-dock-widget.cc" line="+39"/>
+    <name>documentation_dock_widget</name>
+    <message>
+        <location filename="../src/documentation-dock-widget.cc" line="+34"/>
         <source>Documentation</source>
-        <translation type="unfinished">文档</translation>
+        <translation>文档</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>See the documentation for help.</source>
-        <translation type="unfinished">阅读文档以获取帮助。</translation>
-    </message>
-</context>
-<context>
-    <name>octave::external_editor_interface</name>
-    <message>
-        <location filename="../src/external-editor-interface.cc" line="+63"/>
-        <location line="+45"/>
-        <source>Octave Editor</source>
-        <translation type="unfinished">Octave 编辑器</translation>
-    </message>
-    <message>
-        <location line="-44"/>
-        <source>Could not start custom file editor
-%1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+45"/>
-        <source>There is no custom editor configured yet.
-Do you want to open the preferences?</source>
-        <translation type="unfinished"></translation>
+        <translation>阅读文档以获取帮助。</translation>
     </message>
 </context>
 <context>
-    <name>octave::file_editor</name>
-    <message>
-        <location filename="../src/m-editor/file-editor.cc" line="+834"/>
-        <location line="+28"/>
-        <location line="+416"/>
+    <name>file_editor</name>
+    <message>
+        <location filename="../src/m-editor/file-editor.cc" line="+366"/>
+        <location line="+152"/>
         <location line="+19"/>
         <location line="+25"/>
+        <location line="+62"/>
+        <location line="+28"/>
+        <location line="+79"/>
         <source>Octave Editor</source>
-        <translation type="unfinished">Octave 编辑器</translation>
-    </message>
-    <message>
-        <location line="-487"/>
+        <translation>Octave 编辑器</translation>
+    </message>
+    <message>
+        <location line="-462"/>
+        <source>Octave Files (*.m);;All Files (*)</source>
+        <translation>Octave 文件 (*.m);;所有文件 (*)</translation>
+    </message>
+    <message>
+        <location line="-40"/>
+        <source>New Function</source>
+        <translation>新建函数</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>New function name:
+</source>
+        <translation>新建函数的名称:
+</translation>
+    </message>
+    <message>
+        <location line="+395"/>
         <source>File not saved! A file with the selected name
 %1
 is already open in the editor</source>
-        <translation type="unfinished">文件未保存！一个带有相同名称
+        <translation>文件未保存！一个带有相同名称
 %1
 的文件在编辑器中被打开</translation>
     </message>
     <message>
-        <location line="+28"/>
-        <source>The associated file editor tab has disappeared.</source>
-        <translation type="unfinished">关联文件的编辑标签消失了。</translation>
-    </message>
-    <message>
-        <location line="+416"/>
+        <location line="+492"/>
+        <source>&amp;%1 %2</source>
+        <translation>&amp;%1 %2</translation>
+    </message>
+    <message>
+        <location line="+480"/>
+        <source>&amp;Save File</source>
+        <translation>保存文件 (&amp;S)</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Save File &amp;As...</source>
+        <translation>文件另存为 (&amp;A)...</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Print...</source>
+        <translation>打印...</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>&amp;Redo</source>
+        <translation>重做 (&amp;R)</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Cu&amp;t</source>
+        <translation>剪切 (&amp;T)</translation>
+    </message>
+    <message>
+        <location line="+94"/>
+        <source>&amp;Next Bookmark</source>
+        <translation>下一个书签 (&amp;N)</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Pre&amp;vious Bookmark</source>
+        <translation>上一个书签 (&amp;V)</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Toggle &amp;Bookmark</source>
+        <translation>打开/关闭书签 (&amp;B)</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>&amp;Remove All Bookmarks</source>
+        <translation>移除所有书签 (&amp;R)</translation>
+    </message>
+    <message>
+        <location line="+68"/>
+        <source>&amp;Next Breakpoint</source>
+        <translation>下一个断点 (&amp;N)</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Pre&amp;vious Breakpoint</source>
+        <translation>上一个断点 (&amp;V)</translation>
+    </message>
+    <message>
+        <location line="-6"/>
+        <source>Toggle &amp;Breakpoint</source>
+        <translation>打开/关闭断点 (&amp;B)</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>&amp;Remove All Breakpoints</source>
+        <translation>移除所有断点 (&amp;R)</translation>
+    </message>
+    <message>
+        <location line="-118"/>
+        <source>&amp;Comment</source>
+        <translation>注释 (&amp;C)</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>&amp;Uncomment</source>
+        <translation>取消注释 (&amp;U)</translation>
+    </message>
+    <message>
+        <location line="-54"/>
+        <source>&amp;Find and Replace...</source>
+        <translation>查找并替换 (&amp;F) ...</translation>
+    </message>
+    <message>
+        <location line="+182"/>
+        <source>Save File and Run</source>
+        <translation>保存文件并运行</translation>
+    </message>
+    <message>
+        <location line="-104"/>
+        <source>Go &amp;to Line...</source>
+        <translation>跳至行 (&amp;T) ...</translation>
+    </message>
+    <message>
+        <location line="-1341"/>
+        <source>Could not start custom file editor
+%1</source>
+        <translation type="unfinished">无法启动自定义文件编辑器
+%1</translation>
+    </message>
+    <message>
+        <location line="+175"/>
+        <source>Create</source>
+        <translation type="unfinished">创建</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cancel</source>
+        <translation type="unfinished">取消</translation>
+    </message>
+    <message>
+        <location line="+1041"/>
+        <source>&amp;Recent Editor Files</source>
+        <translation>最近编辑器文件 (&amp;R)</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>&amp;Edit Function</source>
+        <translation>编辑函数 (&amp;E)</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>&amp;Close</source>
+        <translation>关闭 (&amp;C)</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Close All</source>
+        <translation>关闭全部</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Close Other Files</source>
+        <translation>关闭其他文件</translation>
+    </message>
+    <message>
+        <location line="+32"/>
+        <source>&amp;Commands</source>
+        <translation type="unfinished">命令 (&amp;C)</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Delete Line</source>
+        <translation type="unfinished">删除行</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Copy Line</source>
+        <translation type="unfinished">复制行</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Cut Line</source>
+        <translation type="unfinished">剪切行</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Delete to Start of Word</source>
+        <translation type="unfinished">删除到单词起始处</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Delete to End of Word</source>
+        <translation type="unfinished">删除到单词结尾处</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Delete to Start of Line</source>
+        <translation type="unfinished">删除到一行开头</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Delete to End of Line</source>
+        <translation type="unfinished">删除到一行结尾</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Duplicate Selection/Line</source>
+        <translation type="unfinished">重复选择/行</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Transpose Line</source>
+        <translation type="unfinished">交换行</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>&amp;Show Completion List</source>
+        <translation type="unfinished">显示完成列表</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>&amp;Format</source>
+        <translation type="unfinished">格式</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>&amp;Uppercase Selection</source>
+        <translation type="unfinished">选择文本转大写 (&amp;U)</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>&amp;Lowercase Selection</source>
+        <translation type="unfinished">选择文本转小写 (&amp;L)</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>&amp;Indent</source>
+        <translation type="unfinished">向右缩进 (&amp;I)</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>&amp;Unindent</source>
+        <translation type="unfinished">向左缩进 (&amp;U)</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Convert Line Endings to &amp;Windows (CRLF)</source>
+        <translation type="unfinished">将行尾转为 &amp;Windows 风格 (CRLF)</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Convert Line Endings to &amp;Unix (LF)</source>
+        <translation type="unfinished">将行尾转为 &amp;Unix 风格 (LF)</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Convert Line Endings to &amp;Mac (CR)</source>
+        <translation type="unfinished">将行尾转为 &amp;Mac 风格 (CR)</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Navi&amp;gation</source>
+        <translation type="unfinished">转到 (&amp;g)</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Move to Matching Brace</source>
+        <translation type="unfinished">移至匹配的括号</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Select to Matching Brace</source>
+        <translation type="unfinished">选择匹配的括号间的内容</translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>&amp;Preferences...</source>
+        <translation>首选项 (&amp;P) ...</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>&amp;Styles Preferences...</source>
+        <translation>风格首选项 (&amp;S) ...</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>&amp;View</source>
+        <translation type="unfinished">视图 (&amp;V)</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>&amp;Editor</source>
+        <translation type="unfinished">编辑器 (&amp;E)</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Show &amp;Line Numbers</source>
+        <translation type="unfinished">显示行数 (&amp;L)</translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>Show &amp;Toolbar</source>
+        <translation type="unfinished">显示工具栏 (&amp;T)</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Show &amp;Statusbar</source>
+        <translation type="unfinished">显示状态栏 (&amp;S)</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Show &amp;Horizontal Scrollbar</source>
+        <translation type="unfinished">显示垂直滚动条 (&amp;H)</translation>
+    </message>
+    <message>
+        <location line="+69"/>
+        <source>Recent Files</source>
+        <translation type="unfinished">最近文件</translation>
+    </message>
+    <message>
+        <location line="+65"/>
+        <source>Editor</source>
+        <translation type="unfinished">编辑器</translation>
+    </message>
+    <message>
+        <location line="-156"/>
+        <source>Show Line &amp;Endings</source>
+        <translation type="unfinished">显示行尾 (&amp;E)</translation>
+    </message>
+    <message>
+        <location line="-1467"/>
+        <source>File Encoding:</source>
+        <translation type="unfinished">文件编码:</translation>
+    </message>
+    <message>
+        <location line="+403"/>
+        <source>%1 is a built-in function</source>
+        <translation type="unfinished">%1 是内置函数</translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>Can not find function %1</source>
+        <translation type="unfinished">找不到函数 %1</translation>
+    </message>
+    <message>
+        <location line="+911"/>
+        <source>Find &amp;Next...</source>
+        <translation type="unfinished">下一个匹配 (&amp;N)</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Find &amp;Previous...</source>
+        <translation type="unfinished">上一个匹配 (&amp;P)</translation>
+    </message>
+    <message>
+        <location line="+118"/>
+        <source>Show &amp;Indentation Guides</source>
+        <translation type="unfinished">显示缩进对齐线 (&amp;I)</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Show Long Line &amp;Marker</source>
+        <translation type="unfinished">显示长线标记 (&amp;M)</translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Zoom &amp;In</source>
+        <translation type="unfinished">放大 (&amp;I)</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Zoom &amp;Out</source>
+        <translation type="unfinished">缩小 (&amp;O)</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>&amp;Normal Size</source>
+        <translation type="unfinished">正常大小 (&amp;N)</translation>
+    </message>
+    <message>
+        <location line="+32"/>
+        <source>Run &amp;Selection</source>
+        <translation>运行选定部分 (&amp;S)</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>&amp;Help</source>
+        <translation>帮助 (&amp;H)</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>&amp;Help on Keyword</source>
+        <translation>帮助关键字 (&amp;H)</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>&amp;Documentation on Keyword</source>
+        <translation>文档关键字 (&amp;D)</translation>
+    </message>
+    <message>
+        <location line="-1305"/>
         <source>Could not open file
 %1
 for read: %2.</source>
-        <translation type="unfinished">数据文件
+        <translation>数据文件
 %1
 无法打开/读取: %2.</translation>
     </message>
@@ -1192,529 +1487,163 @@
         <source>File
 %1
 does not exist. Do you want to create it?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Create</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Cancel</source>
-        <translation type="unfinished">取消</translation>
-    </message>
-    <message>
-        <location line="+20"/>
+        <translation>数据文件
+%1
+不存在。你希望创建它么？</translation>
+    </message>
+    <message>
+        <location line="+25"/>
         <source>Could not open file
 %1
 for write: %2.</source>
-        <translation type="unfinished">数据文件
+        <translation>数据文件
 %1
 无法打开/写入: %2.</translation>
     </message>
     <message>
-        <location line="+217"/>
+        <location line="+90"/>
+        <source>The associated file editor tab has disappeared.</source>
+        <translation>关联文件的编辑标签消失了。</translation>
+    </message>
+    <message>
+        <location line="+928"/>
         <source>&amp;File</source>
-        <translation type="unfinished">文件 (&amp;F)</translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>&amp;Recent Editor Files</source>
-        <translation type="unfinished">最近编辑器文件 (&amp;R)</translation>
-    </message>
-    <message>
-        <location line="+9"/>
-        <source>&amp;Edit Function</source>
-        <translation type="unfinished">编辑函数 (&amp;E)</translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>&amp;Save File</source>
-        <translation type="unfinished">保存文件 (&amp;S)</translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Save File &amp;As...</source>
-        <translation type="unfinished">文件另存为 (&amp;A)...</translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>&amp;Close</source>
-        <translation type="unfinished">关闭 (&amp;C)</translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Close All</source>
-        <translation type="unfinished">关闭全部</translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Close Other Files</source>
-        <translation type="unfinished">关闭其他文件</translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>Print...</source>
-        <translation type="unfinished">打印...</translation>
-    </message>
-    <message>
-        <location line="+5"/>
+        <translation>文件 (&amp;F)</translation>
+    </message>
+    <message>
+        <location line="+36"/>
         <source>&amp;Edit</source>
-        <translation type="unfinished">编辑 (&amp;E)</translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>&amp;Redo</source>
-        <translation type="unfinished">重做 (&amp;R)</translation>
-    </message>
-    <message>
-        <location line="+9"/>
-        <source>Cu&amp;t</source>
-        <translation type="unfinished">剪切 (&amp;T)</translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <source>&amp;Find and Replace...</source>
-        <translation type="unfinished">查找并替换 (&amp;F) ...</translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Find &amp;Next...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Find &amp;Previous...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>&amp;Commands</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Delete Line</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Copy Line</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Cut Line</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <source>Delete to Start of Word</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Delete to End of Word</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Delete to Start of Line</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Delete to End of Line</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <source>Duplicate Selection/Line</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Transpose Line</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <source>&amp;Show Completion List</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>&amp;Format</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>&amp;Uppercase Selection</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>&amp;Lowercase Selection</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <source>&amp;Comment</source>
-        <translation type="unfinished">注释 (&amp;C)</translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>&amp;Uncomment</source>
-        <translation type="unfinished">取消注释 (&amp;U)</translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Comment (Choosing String)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <source>&amp;Indent Selection Rigidly</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>&amp;Unindent Selection Rigidly</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Indent Code</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <source>convert line endings to &amp;windows (crlf)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Convert Line Endings to &amp;Unix (LF)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Convert Line Endings to &amp;Mac (CR)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Navi&amp;gation</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Go &amp;to Line...</source>
-        <translation type="unfinished">跳至行 (&amp;T) ...</translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <source>Move to Matching Brace</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Select to Matching Brace</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <source>&amp;Next Bookmark</source>
-        <translation type="unfinished">下一个书签 (&amp;N)</translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Pre&amp;vious Bookmark</source>
-        <translation type="unfinished">上一个书签 (&amp;V)</translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Toggle &amp;Bookmark</source>
-        <translation type="unfinished">打开/关闭书签 (&amp;B)</translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>&amp;Remove All Bookmarks</source>
-        <translation type="unfinished">移除所有书签 (&amp;R)</translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>&amp;Preferences...</source>
-        <translation type="unfinished">首选项 (&amp;P) ...</translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>&amp;Styles Preferences...</source>
-        <translation type="unfinished">风格首选项 (&amp;S) ...</translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>&amp;View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>&amp;Editor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Show &amp;Line Numbers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
+        <translation>编辑 (&amp;E)</translation>
+    </message>
+    <message>
+        <location line="+129"/>
         <source>Show &amp;Whitespace Characters</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Show Line &amp;Endings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Show &amp;Indentation Guides</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Show Long Line &amp;Marker</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>Show &amp;Toolbar</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Show &amp;Statusbar</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Show &amp;Horizontal Scrollbar</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>Zoom &amp;In</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Zoom &amp;Out</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>&amp;Normal Size</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
+        <translation type="unfinished">显示空白字符 (&amp;W)</translation>
+    </message>
+    <message>
+        <location line="+42"/>
         <source>&amp;Debug</source>
-        <translation type="unfinished">除错 (&amp;D)</translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Toggle &amp;Breakpoint</source>
-        <translation type="unfinished">打开/关闭断点 (&amp;B)</translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>&amp;Next Breakpoint</source>
-        <translation type="unfinished">下一个断点 (&amp;N)</translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Pre&amp;vious Breakpoint</source>
-        <translation type="unfinished">上一个断点 (&amp;V)</translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>&amp;Remove All Breakpoints</source>
-        <translation type="unfinished">移除所有断点 (&amp;R)</translation>
-    </message>
-    <message>
-        <location line="+9"/>
+        <translation>调试 (&amp;D)</translation>
+    </message>
+    <message>
+        <location line="+21"/>
         <source>&amp;Run</source>
-        <translation type="unfinished">运行 (&amp;R)</translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Save File and Run</source>
-        <translation type="unfinished">保存文件并运行</translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Run &amp;Selection</source>
-        <translation type="unfinished">运行选定部分 (&amp;S)</translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>&amp;Help</source>
-        <translation type="unfinished">帮助 (&amp;H)</translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>&amp;Help on Keyword</source>
-        <translation type="unfinished">帮助关键字 (&amp;H)</translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>&amp;Documentation on Keyword</source>
-        <translation type="unfinished">文档关键字 (&amp;D)</translation>
-    </message>
-    <message>
-        <location line="+25"/>
-        <source>Recent Files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+65"/>
-        <source>Editor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+207"/>
-        <source>&amp;%1 %2</source>
-        <translation type="unfinished">&amp;%1 %2</translation>
+        <translation>运行 (&amp;R)</translation>
     </message>
 </context>
 <context>
-    <name>octave::file_editor_tab</name>
-    <message>
-        <location filename="../src/m-editor/file-editor-tab.cc" line="+140"/>
+    <name>file_editor_tab</name>
+    <message>
+        <location filename="../src/m-editor/file-editor-tab.cc" line="+145"/>
+        <source>eol:</source>
+        <translation type="unfinished">行尾:</translation>
+    </message>
+    <message>
+        <location line="-17"/>
         <source>line:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">行数:</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>col:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <source>encoding:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <source>eol:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+231"/>
-        <source>Breakpoint condition</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+91"/>
-        <location line="+1164"/>
-        <location line="+371"/>
-        <location line="+210"/>
-        <location line="+20"/>
-        <location line="+11"/>
-        <location line="+85"/>
-        <location line="+36"/>
-        <source>Octave Editor</source>
-        <translation type="unfinished">Octave 编辑器</translation>
-    </message>
-    <message>
-        <location line="-1896"/>
-        <source>Cannot add breakpoint to modified file.
-Save and add breakpoint, or cancel?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+837"/>
+        <translation type="unfinished">列数:</translation>
+    </message>
+    <message>
+        <location line="+1146"/>
         <source>Goto line</source>
-        <translation type="unfinished">前往行</translation>
+        <translation>前往行</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Line number</source>
-        <translation type="unfinished">行数</translation>
-    </message>
-    <message>
-        <location line="+126"/>
-        <source>Comment selected text</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Comment string to use:
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+135"/>
-        <location line="+60"/>
+        <translation>行数</translation>
+    </message>
+    <message>
+        <location line="+145"/>
+        <location line="+63"/>
         <source>&lt;unnamed&gt;</source>
-        <translation type="unfinished">&lt;未命名&gt;</translation>
-    </message>
-    <message>
-        <location line="-6"/>
-        <source>Do you want to cancel closing, save or discard the changes?</source>
-        <translation type="unfinished">你希望关闭，保存还是丢弃更改？</translation>
-    </message>
-    <message>
-        <location line="+10"/>
+        <translation>&lt;未命名&gt;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
         <source>The file
 
   %1
 
 is about to be closed but has been modified.  %2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+295"/>
+        <translation type="unfinished">文件
+
+  %1
+
+发生改动且将被关闭.  %2</translation>
+    </message>
+    <message>
+        <location line="+298"/>
         <source>Debug or Save</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">调试或保存</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>This file is currently being executed.
 Quit debugging and save?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+75"/>
-        <source>Could not open file %1 for write:
-%2.</source>
-        <translation type="unfinished">无法打开文件 %1 以写入:
-%2.</translation>
-    </message>
-    <message>
-        <location line="+92"/>
+        <translation type="unfinished">此文件正在运行，
+是否推出调试并保存?</translation>
+    </message>
+    <message>
+        <location line="+166"/>
         <source>Line Endings:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">行尾:</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>File Encoding:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">文件编码:</translation>
     </message>
     <message>
         <location line="+28"/>
         <source>Octave Files (*.m)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Octave 文件 (*.m)</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>All Files (*)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+80"/>
+        <translation type="unfinished">所有文件 (*)</translation>
+    </message>
+    <message>
+        <location line="-513"/>
+        <source>Do you want to cancel closing, save or discard the changes?</source>
+        <translation>你希望关闭，保存还是丢弃更改？</translation>
+    </message>
+    <message>
+        <location line="-1015"/>
+        <location line="+1024"/>
+        <location line="+372"/>
+        <location line="+215"/>
+        <location line="+21"/>
+        <location line="+83"/>
+        <location line="+23"/>
+        <source>Octave Editor</source>
+        <translation>Octave 编辑器</translation>
+    </message>
+    <message>
+        <location line="-2065"/>
+        <source>encoding:</source>
+        <translation type="unfinished">编码:</translation>
+    </message>
+    <message>
+        <location line="+239"/>
+        <source>Breakpoint condition</source>
+        <translation type="unfinished">条件断点</translation>
+    </message>
+    <message>
+        <location line="+89"/>
+        <source>Cannot add breakpoint to modified file.
+Save and add breakpoint, or canel?</source>
+        <translation type="unfinished">无法在已修改的文件中添加断点，
+保存并添加断点或者取消?</translation>
+    </message>
+    <message>
+        <location line="+1611"/>
         <source>&quot;%1&quot;
 is not a valid identifier.
 
@@ -1722,36 +1651,32 @@
 call your script using its name as an Octave command.
 
 Do you want to choose another name?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
-        <source>The current codec %1
-can not be applied.
+        <translation type="unfinished">&quot;%1&quot;
+不是有效的标识符。
+
+如果使用此文件名，您将无法将这个名字当作 Octave 命令来调用。
 
-Please select another one or cancel saving!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+11"/>
+是否选择其他文件名?</translation>
+    </message>
+    <message>
+        <location line="+21"/>
         <source>The current editor contents can not be encoded
 with the selected codec %1.
 Using it will result in data loss!
 
 Do you want to chose another codec?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+85"/>
-        <source>It seems that &apos;%1&apos; has been modified by another application. Do you want to reload it?</source>
-        <translation type="unfinished">看起来 &apos;%1&apos; 已经被其他应用修改。你希望重新载入这个文件吗？</translation>
-    </message>
-    <message>
-        <location line="+29"/>
+        <translation type="unfinished">当前编辑器内容无法使用
+选择的编解码器 %1 编码。
+继续使用它将导致数据丢失!
+
+是否选择其他的编解码器?</translation>
+    </message>
+    <message>
+        <location line="+99"/>
         <source>
 
 Warning: The contents in the editor is modified!</source>
-        <translation type="unfinished">
+        <translation>
 
 警告: 编辑器中内容已经被修改！</translation>
     </message>
@@ -1760,270 +1685,311 @@
         <source>It seems that the file
 %1
 has been deleted or renamed. Do you want to save it now?%2</source>
-        <translation type="unfinished">数据文件
+        <translation>数据文件
 %1
 已经被修改或重命名。你希望现在保存这个文件吗？%2</translation>
     </message>
+    <message>
+        <location line="-342"/>
+        <source>Could not open file %1 for write:
+%2.</source>
+        <translation>无法打开文件 %1 以写入:
+%2.</translation>
+    </message>
+    <message>
+        <location line="+319"/>
+        <source>It seems that &apos;%1&apos; has been modified by another application. Do you want to reload it?</source>
+        <translation>看起来 &apos;%1&apos; 已经被其他应用修改。你希望重新载入这个文件吗？</translation>
+    </message>
 </context>
 <context>
-    <name>octave::files_dock_widget</name>
-    <message>
-        <location filename="../src/files-dock-widget.cc" line="+73"/>
+    <name>files_dock_widget</name>
+    <message>
+        <location filename="../src/files-dock-widget.cc" line="+69"/>
         <source>File Browser</source>
-        <translation type="unfinished">文件浏览器</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Browse your files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>File size</source>
-        <translation type="unfinished">文件大小</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>File type</source>
-        <translation type="unfinished">文件类型</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Date modified</source>
-        <translation type="unfinished">修改日期</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Show hidden</source>
-        <translation type="unfinished">显示隐藏文件</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Alternating row colors</source>
-        <translation type="unfinished">备选列颜色</translation>
-    </message>
-    <message>
-        <location line="+25"/>
+        <translation>文件浏览器</translation>
+    </message>
+    <message>
+        <location line="+35"/>
         <source>Enter the path or filename</source>
-        <translation type="unfinished">输入路径或文件名</translation>
-    </message>
-    <message>
-        <location line="+11"/>
-        <source>One directory up</source>
-        <translation type="unfinished">向上一级</translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Show Octave directory</source>
-        <translation type="unfinished">显示 Octave 目录</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Go to current Octave directory</source>
-        <translation type="unfinished">前往当前的 Octave 目录</translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Set Octave directory</source>
-        <translation type="unfinished">设置 Octave 目录</translation>
-    </message>
-    <message>
-        <location line="+2"/>
+        <translation>输入路径或文件名</translation>
+    </message>
+    <message>
+        <location line="+24"/>
         <source>Set Octave directory to current browser directory</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">设置 Octave 目录到当前浏览器目录</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Actions on current directory</source>
-        <translation type="unfinished">在当前目录的操作</translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Show Home Directory</source>
-        <translation type="unfinished">显示主目录</translation>
-    </message>
-    <message>
-        <location line="+12"/>
+        <translation>在当前目录的操作</translation>
+    </message>
+    <message>
+        <location line="+15"/>
         <source>Set Browser Directory...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">设置浏览器目录...</translation>
     </message>
     <message>
         <location line="+4"/>
-        <location line="+365"/>
+        <location line="+373"/>
         <source>Find Files...</source>
-        <translation type="unfinished">查找文件...</translation>
-    </message>
-    <message>
-        <location line="-361"/>
-        <location line="+374"/>
-        <source>New File...</source>
-        <translation type="unfinished">新建文件...</translation>
-    </message>
-    <message>
-        <location line="-371"/>
-        <location line="+374"/>
-        <source>New Directory...</source>
-        <translation type="unfinished">新建目录...</translation>
-    </message>
-    <message>
-        <location line="-320"/>
-        <source>Activate to open in editor, right click for alternatives</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+273"/>
-        <source>Open</source>
-        <translation type="unfinished">打开</translation>
-    </message>
-    <message>
-        <location line="+5"/>
+        <translation>查找文件...</translation>
+    </message>
+    <message>
+        <location line="-26"/>
         <source>Open in System File Explorer</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">在系统文件浏览器中打开</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Open in Text Editor</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">在文本编辑器中打开</translation>
+    </message>
+    <message>
+        <location line="+389"/>
+        <source>New Directory</source>
+        <translation>新建目录</translation>
+    </message>
+    <message>
+        <location line="-773"/>
+        <source>Show Octave directory</source>
+        <translation>显示 Octave 目录</translation>
+    </message>
+    <message>
+        <location line="-49"/>
+        <source>Browse your files</source>
+        <translation type="unfinished">浏览文件</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Alternating row colors</source>
+        <translation type="unfinished">备选列颜色</translation>
     </message>
     <message>
         <location line="+3"/>
+        <source>filesdockwidget/showFileSize</source>
+        <translation type="unfinished">文件可停靠组件/显示文件大小</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>filesdockwidget/showFileType</source>
+        <translation type="unfinished">文件可停靠组件/显示文件类型</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>filesdockwidget/showLastModified</source>
+        <translation type="unfinished">文件可停靠组件/显示最近修改</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>filesdockwidget/showHiddenFiles</source>
+        <translation type="unfinished">文件可停靠组件/显示隐藏的文件</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>filesdockwidget/useAlternatingRowColors</source>
+        <translation type="unfinished">文件可停靠组件/使用可选的行颜色</translation>
+    </message>
+    <message>
+        <location line="+29"/>
+        <source>One directory up</source>
+        <translation type="unfinished">向上一级</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Go to current Octave directory</source>
+        <translation>前往当前的 Octave 目录</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Set Octave directory</source>
+        <translation>设置 Octave 目录</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Show Home Directory</source>
+        <translation>显示主目录</translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <location line="+382"/>
+        <source>New File...</source>
+        <translation>新建文件...</translation>
+    </message>
+    <message>
+        <location line="-379"/>
+        <location line="+382"/>
+        <source>New Directory...</source>
+        <translation>新建目录...</translation>
+    </message>
+    <message>
+        <location line="-329"/>
+        <source>Activate to open in editor, right click for alternatives</source>
+        <translation type="unfinished">激活以在编辑器中打开，右击选择</translation>
+    </message>
+    <message>
+        <location line="-136"/>
+        <source>File size</source>
+        <translation>文件大小</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>File type</source>
+        <translation>文件类型</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Date modified</source>
+        <translation>修改日期</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Show hidden</source>
+        <translation>显示隐藏文件</translation>
+    </message>
+    <message>
+        <location line="+415"/>
+        <source>Open</source>
+        <translation>打开</translation>
+    </message>
+    <message>
+        <location line="+13"/>
         <source>Copy Selection to Clipboard</source>
-        <translation type="unfinished">复制选中到剪贴板</translation>
+        <translation>复制选中到剪贴板</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Run</source>
-        <translation type="unfinished">运行</translation>
+        <translation>运行</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Load Data</source>
-        <translation type="unfinished">载入数据</translation>
+        <translation>载入数据</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Set Current Directory</source>
-        <translation type="unfinished">设置当前目录</translation>
+        <translation>设置当前目录</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Rename...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">重命名...</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Delete...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+118"/>
+        <translation type="unfinished">删除...</translation>
+    </message>
+    <message>
+        <location line="+125"/>
         <source>Rename file/directory</source>
-        <translation type="unfinished">重命名文件/目录</translation>
+        <translation>重命名文件/目录</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Rename file/directory:
 </source>
-        <translation type="unfinished">重命名文件/目录:
+        <translation>重命名文件/目录:
 </translation>
     </message>
     <message>
         <location line="+1"/>
         <source>
  to: </source>
-        <translation type="unfinished">
+        <translation>
 到: </translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+25"/>
         <location line="+14"/>
         <source>Delete file/directory</source>
-        <translation type="unfinished">删除文件/目录</translation>
+        <translation>删除文件/目录</translation>
     </message>
     <message>
         <location line="-13"/>
         <source>Are you sure you want to delete
 </source>
-        <translation type="unfinished">你确实希望删除
+        <translation>你确实希望删除
 </translation>
     </message>
     <message>
         <location line="+14"/>
         <source>Can not delete a directory that is not empty</source>
-        <translation type="unfinished">不能删除一个非空目录</translation>
+        <translation>不能删除一个非空目录</translation>
     </message>
     <message>
         <location line="+145"/>
         <source>Set directory of file browser</source>
-        <translation type="unfinished">设置目录到文件浏览器</translation>
-    </message>
-    <message>
-        <location line="+26"/>
+        <translation>设置目录到文件浏览器</translation>
+    </message>
+    <message>
+        <location line="+29"/>
         <source>Create File</source>
-        <translation type="unfinished">创建文件</translation>
+        <translation>创建文件</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Create file in
 </source>
         <comment>String ends with \n!</comment>
-        <translation type="unfinished">创建文件于
+        <translation>创建文件于
 </translation>
     </message>
     <message>
         <location line="+1"/>
         <source>New File.txt</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+15"/>
+        <translation type="unfinished">新建文件.txt</translation>
+    </message>
+    <message>
+        <location line="+16"/>
         <source>Create Directory</source>
-        <translation type="unfinished">创建目录</translation>
+        <translation>创建目录</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Create folder in
 </source>
         <comment>String ends with \n!</comment>
-        <translation type="unfinished">创建目录于
+        <translation>创建目录于
 </translation>
     </message>
-    <message>
-        <location line="+1"/>
-        <source>New Directory</source>
-        <translation type="unfinished">新建目录</translation>
-    </message>
 </context>
 <context>
-    <name>octave::final_page</name>
-    <message>
-        <location filename="../src/welcome-wizard.cc" line="+274"/>
+    <name>final_page</name>
+    <message>
+        <location filename="../src/welcome-wizard.cc" line="+195"/>
         <source>Enjoy!</source>
-        <translation type="unfinished">尽情享受吧！</translation>
+        <translation>尽情享受吧！</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Previous</source>
-        <translation type="unfinished">上一个</translation>
+        <translation>上一个</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Finish</source>
-        <translation type="unfinished">完成</translation>
+        <translation>完成</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Cancel</source>
-        <translation type="unfinished">取消</translation>
+        <translation>取消</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>&lt;html&gt;&lt;body&gt;
 &lt;p&gt;We hope you find Octave to be a useful tool.&lt;/p&gt;
 &lt;p&gt;If you encounter problems, there are a number of ways to get help, including commercial support options, a mailing list, a wiki, and other community-based support channels.
-You can find more information about each of these by visiting &lt;a href=&quot;https://octave.org/support.html&quot;&gt;https://octave.org/support.html&lt;/a&gt; (opens in external browser).&lt;/p&gt;
+You can find more information about each of these by visiting &lt;a href=&quot;http://octave.org/support.html&quot;&gt;http://octave.org/support.html&lt;/a&gt; (opens in external browser).&lt;/p&gt;
 &lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">&lt;html&gt;&lt;body&gt;
+&lt;p&gt;我们希望你发现Octave是一个有用的工具。&lt;/p&gt;
+&lt;p&gt;如果遇到问题，可以通过多种方式获得帮助，包括商业支持选项，邮件列表，wiki以及其他基于社区的支持渠道。
+你可以通过访问 &lt;a href=&quot;http://octave.org/support.html&quot;&gt;http://octave.org/support.html&lt;/a&gt; 找到更多信息(在外部浏览器中打开).&lt;/p&gt;
+&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location line="+21"/>
@@ -2034,363 +2000,363 @@
 &lt;head/&gt;&lt;body&gt;
 &lt;p&gt;For more information about Octave:&lt;/p&gt;
 &lt;ul&gt;
-&lt;li&gt;Visit &lt;a href=&quot;https://octave.org&quot;&gt;https://octave.org&lt;/a&gt; (opens in external browser)&lt;/li&gt;
-&lt;li&gt;Get the documentation online as &lt;a href=&quot;https://www.gnu.org/software/octave/doc/interpreter/index.html&quot;&gt;html&lt;/a&gt;- or &lt;a href=&quot;https://www.gnu.org/software/octave/octave.pdf&quot;&gt;pdf&lt;/span&gt;&lt;/a&gt;-document (opens in external browser)&lt;/li&gt;
+&lt;li&gt;Visit &lt;a href=&quot;http://octave.org&quot;&gt;http://octave.org&lt;/a&gt; (opens in external browser)&lt;/li&gt;
+&lt;li&gt;Get the documentation online as &lt;a href=&quot;http://www.gnu.org/software/octave/doc/interpreter/index.html&quot;&gt;html&lt;/a&gt;- or &lt;a href=&quot;http://www.gnu.org/software/octave/octave.pdf&quot;&gt;pdf&lt;/span&gt;&lt;/a&gt;-document (opens in external browser)&lt;/li&gt;
 &lt;li&gt;Open the documentation browser of the Octave GUI with the help menu&lt;/li&gt;
 &lt;/ul&gt;
 &lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished">&lt;html&gt;&lt;head&gt;
+        <translation>&lt;html&gt;&lt;head&gt;
 &lt;style&gt;
 a:link { text-decoration: underline; color: #0000ff; }
 &lt;/style&gt;
 &lt;head/&gt;&lt;body&gt;
 &lt;p&gt;欲了解更多关于 Octave 的信息: &lt;/p&gt;
 &lt;ul&gt;
-&lt;li&gt;访问 &lt;a href=&quot;https://octave.org&quot;&gt;https://octave.org&lt;/a&gt; (在外部浏览器打开)&lt;/li&gt;
-&lt;li&gt;从 &lt;a href=&quot;https://www.gnu.org/software/octave/doc/interpreter/index.html&quot;&gt;html&lt;/a&gt;- 或 &lt;a href=&quot;https://www.gnu.org/software/octave/octave.pdf&quot;&gt;获取 PDF 格式的&lt;/span&gt;&lt;/a&gt;-文档 (在外部浏览器打开)&lt;/li&gt;
+&lt;li&gt;访问 &lt;a href=&quot;http://octave.org&quot;&gt;http://octave.org&lt;/a&gt; (在外部浏览器打开)&lt;/li&gt;
+&lt;li&gt;从 &lt;a href=&quot;http://www.gnu.org/software/octave/doc/interpreter/index.html&quot;&gt;html&lt;/a&gt;- 或 &lt;a href=&quot;http://www.gnu.org/software/octave/octave.pdf&quot;&gt;获取 PDF 格式的&lt;/span&gt;&lt;/a&gt;-文档 (在外部浏览器打开)&lt;/li&gt;
 &lt;li&gt;在 Octave GUI 的帮助菜单打开帮助文档。&lt;/li&gt;
 &lt;/ul&gt;
 &lt;/body&gt;&lt;/html&gt;</translation>
     </message>
 </context>
 <context>
-    <name>octave::find_dialog</name>
-    <message>
-        <location filename="../src/m-editor/find-dialog.cc" line="+87"/>
+    <name>find_dialog</name>
+    <message>
+        <location filename="../src/m-editor/find-dialog.cc" line="+85"/>
         <source>Find and Replace</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">查找并替换</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Find &amp;what:</source>
-        <translation type="unfinished">搜索 (&amp;W) : </translation>
+        <translation>搜索 (&amp;W) : </translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Re&amp;place with:</source>
-        <translation type="unfinished">替换为 (&amp;P) : </translation>
+        <translation>替换为 (&amp;P) : </translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Match &amp;case</source>
-        <translation type="unfinished">匹配大小写 (&amp;C)</translation>
+        <translation>匹配大小写 (&amp;C)</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Search from &amp;start</source>
-        <translation type="unfinished">从开头搜索 (&amp;S)</translation>
+        <translation>从开头搜索 (&amp;S)</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>&amp;Wrap while searching</source>
-        <translation type="unfinished">搜索时循环 (&amp;W)</translation>
+        <translation>搜索时循环 (&amp;W)</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>&amp;Find Next</source>
-        <translation type="unfinished">查找下一个 (&amp;F)</translation>
+        <translation>查找下一个 (&amp;F)</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Find &amp;Previous</source>
-        <translation type="unfinished">查找上一个 (&amp;P)</translation>
+        <translation>查找上一个 (&amp;P)</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>&amp;Replace</source>
-        <translation type="unfinished">替换 (&amp;R)</translation>
+        <translation>替换 (&amp;R)</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Replace &amp;All</source>
-        <translation type="unfinished">替换全部 (&amp;A)</translation>
+        <translation>替换全部 (&amp;A)</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>&amp;More...</source>
-        <translation type="unfinished">更多 (&amp;M) ...</translation>
+        <translation>更多 (&amp;M) ...</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>&amp;Whole words</source>
-        <translation type="unfinished">整个单词 (&amp;W)</translation>
+        <translation>整个单词 (&amp;W)</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Regular E&amp;xpressions</source>
-        <translation type="unfinished">常规表达式 (&amp;X)</translation>
+        <translation>正则表达式 (&amp;X)</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Search &amp;backward</source>
-        <translation type="unfinished">反向搜索 (&amp;B)</translation>
+        <translation>反向搜索 (&amp;B)</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Search se&amp;lection</source>
-        <translation type="unfinished">搜索选中 (&amp;L)</translation>
-    </message>
-    <message>
-        <location line="+86"/>
+        <translation>搜索选中 (&amp;L)</translation>
+    </message>
+    <message>
+        <location line="+87"/>
         <source>Search from end</source>
-        <translation type="unfinished">从尾部搜索</translation>
+        <translation>从尾部搜索</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Search from start</source>
-        <translation type="unfinished">从开头搜索</translation>
-    </message>
-    <message>
-        <location line="+209"/>
+        <translation>从开头搜索</translation>
+    </message>
+    <message>
+        <location line="+221"/>
         <source>Replace Result</source>
-        <translation type="unfinished">替换结果</translation>
+        <translation>替换结果</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>%1 items replaced</source>
-        <translation type="unfinished">%1 项已替换</translation>
-    </message>
-    <message>
-        <location line="+14"/>
+        <translation>%1 项已替换</translation>
+    </message>
+    <message>
+        <location line="+15"/>
         <source>Find Result</source>
-        <translation type="unfinished">查找结果</translation>
+        <translation>查找结果</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>No more matches found</source>
-        <translation type="unfinished">没有更多匹配项</translation>
+        <translation>没有更多匹配项</translation>
     </message>
 </context>
 <context>
-    <name>octave::find_files_dialog</name>
-    <message>
-        <location filename="../src/find-files-dialog.cc" line="+54"/>
+    <name>find_files_dialog</name>
+    <message>
+        <location filename="../src/find-files-dialog.cc" line="+52"/>
         <source>Find Files</source>
-        <translation type="unfinished">查找文件</translation>
-    </message>
-    <message>
-        <location line="+11"/>
+        <translation>查找文件</translation>
+    </message>
+    <message>
+        <location line="+10"/>
         <source>Named:</source>
-        <translation type="unfinished">名称: </translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Enter the filename search expression</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
+        <translation>名称: </translation>
+    </message>
+    <message>
+        <location line="+8"/>
         <source>Start in:</source>
-        <translation type="unfinished">从: </translation>
+        <translation>从: </translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Enter the start directory</source>
-        <translation type="unfinished">进入初始目录</translation>
+        <translation>进入初始目录</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Browse...</source>
-        <translation type="unfinished">浏览...</translation>
+        <translation>浏览...</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Browse for start directory</source>
-        <translation type="unfinished">从初始目录浏览</translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Search subdirectories</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <translation>从初始目录浏览</translation>
+    </message>
+    <message>
+        <location line="+7"/>
         <source>Search recursively through directories for matching files</source>
-        <translation type="unfinished">递归搜索目录以查找匹配文件</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Include directory names</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <translation>递归搜索目录以查找匹配文件</translation>
+    </message>
+    <message>
+        <location line="+6"/>
         <source>Include matching directories in search results</source>
-        <translation type="unfinished">在搜索结果中包含匹配目录</translation>
+        <translation>在搜索结果中包含匹配目录</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Name case insensitive</source>
-        <translation type="unfinished">名称大小写敏感</translation>
+        <translation>名称大小写敏感</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Set matching name is case insensitive</source>
-        <translation type="unfinished">设置匹配名称大小写敏感</translation>
+        <translation>设置匹配名称大小写敏感</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Contains text:</source>
-        <translation type="unfinished">包含文字: </translation>
-    </message>
-    <message>
-        <location line="+1"/>
+        <translation>包含文字: </translation>
+    </message>
+    <message>
+        <location line="-35"/>
+        <source>Enter the filename search expression</source>
+        <translation type="unfinished">输入文件名搜索表达式</translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>Search subdirectories</source>
+        <translation type="unfinished">搜索子目录</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Include directory names</source>
+        <translation type="unfinished">包含的目录名</translation>
+    </message>
+    <message>
+        <location line="+12"/>
         <source>Enter the file content search expression</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">输入文件内容搜索表达式</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Text to match</source>
-        <translation type="unfinished">要匹配的文字</translation>
+        <translation>要匹配的文字</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Text case insensitive</source>
-        <translation type="unfinished">文字大小写敏感</translation>
+        <translation>文字大小写敏感</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Set text content is case insensitive</source>
-        <translation type="unfinished">设置文字内容大小写敏感</translation>
+        <translation>设置文字内容大小写敏感</translation>
     </message>
     <message>
         <location line="+11"/>
         <source>Search results</source>
-        <translation type="unfinished">搜索结果</translation>
-    </message>
-    <message>
-        <location line="+19"/>
+        <translation>搜索结果</translation>
+    </message>
+    <message>
+        <location line="+21"/>
         <source>Idle.</source>
-        <translation type="unfinished">空闲。</translation>
+        <translation>空闲。</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Find</source>
-        <translation type="unfinished">查找</translation>
+        <translation>查找</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Start search for matching files</source>
-        <translation type="unfinished">开始查找匹配文件</translation>
-    </message>
-    <message>
-        <location line="+4"/>
+        <translation>开始查找匹配文件</translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source>Stop</source>
-        <translation type="unfinished">停止</translation>
+        <translation>停止</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Stop searching</source>
-        <translation type="unfinished">停止搜索</translation>
+        <translation>停止搜索</translation>
     </message>
     <message>
         <location line="+15"/>
         <source>Filename/location</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">文件名/位置</translation>
     </message>
     <message>
         <location line="+17"/>
         <source>File contents</source>
-        <translation type="unfinished">文件内容</translation>
-    </message>
-    <message>
-        <location line="+103"/>
+        <translation>文件内容</translation>
+    </message>
+    <message>
+        <location line="+111"/>
         <source>Searching...</source>
-        <translation type="unfinished">正在搜索...</translation>
-    </message>
-    <message>
-        <location line="+22"/>
-        <source>%1 match (es)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
+        <translation>正在搜索...</translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>%1 match(es)</source>
+        <translation type="unfinished">%1 个匹配</translation>
+    </message>
+    <message>
+        <location line="+9"/>
         <source>Set search directory</source>
-        <translation type="unfinished">设置搜索目录</translation>
+        <translation>设置搜索目录</translation>
     </message>
 </context>
 <context>
-    <name>octave::find_files_model</name>
-    <message>
-        <location filename="../src/find-files-model.cc" line="+88"/>
+    <name>find_files_model</name>
+    <message>
+        <location filename="../src/find-files-model.cc" line="+83"/>
         <source>Filename</source>
-        <translation type="unfinished">文件名</translation>
+        <translation>文件名</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Directory</source>
-        <translation type="unfinished">目录</translation>
+        <translation>目录</translation>
     </message>
 </context>
 <context>
-    <name>octave::history_dock_widget</name>
-    <message>
-        <location filename="../src/history-dock-widget.cc" line="+48"/>
+    <name>history_dock_widget</name>
+    <message>
+        <location filename="../src/history-dock-widget.cc" line="+47"/>
         <source>Browse and search the command history.</source>
-        <translation type="unfinished">浏览并搜索命令历史。</translation>
-    </message>
-    <message>
-        <location line="+94"/>
+        <translation>浏览并搜索命令历史。</translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>Double-click a command to transfer it to the terminal.</source>
+        <translation>双击一个命令以传递到终端。</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Enter text to filter the command history</source>
+        <translation type="unfinished">输入文本以过滤命令历史记录</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Filter</source>
+        <translation type="unfinished">过滤器</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Command History</source>
+        <translation>命令历史</translation>
+    </message>
+    <message>
+        <location line="+107"/>
         <source>Copy</source>
-        <translation type="unfinished">复制</translation>
+        <translation>复制</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Evaluate</source>
-        <translation type="unfinished">评估</translation>
+        <translation>评估</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Create script</source>
-        <translation type="unfinished">创建脚本</translation>
+        <translation>创建脚本</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Hide filter</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">隐藏过滤器</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Show filter</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+123"/>
-        <source>Double-click a command to transfer it to the terminal.</source>
-        <translation type="unfinished">双击一个命令以传递到终端。</translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>Enter text to filter the command history</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>Filter</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Command History</source>
-        <translation type="unfinished">命令历史</translation>
+        <translation type="unfinished">显示过滤器</translation>
     </message>
 </context>
 <context>
-    <name>octave::initial_page</name>
-    <message>
-        <location filename="../src/welcome-wizard.cc" line="-178"/>
+    <name>initial_page</name>
+    <message>
+        <location filename="../src/welcome-wizard.cc" line="-176"/>
         <source>Welcome to Octave!</source>
-        <translation type="unfinished">欢迎来到 Octave!</translation>
+        <translation>欢迎来到 Octave!</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Next</source>
-        <translation type="unfinished">下一个</translation>
+        <translation>下一个</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Cancel</source>
-        <translation type="unfinished">取消</translation>
+        <translation>取消</translation>
     </message>
     <message>
         <location line="+7"/>
@@ -2399,7 +2365,7 @@
 Click &apos;Next&apos; to create a configuration file and launch Octave.&lt;/p&gt;
 &lt;p&gt;The configuration file is stored in&lt;br&gt;%1.&lt;/p&gt;
 &lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished">&lt;html&gt;&lt;body&gt;
+        <translation>&lt;html&gt;&lt;body&gt;
 &lt;p&gt;看起来这是你第一次在这台电脑上使用 Octave 图形界面。
 点击 &apos;下一步&apos; 以创建一个配置文件并启动 Octave .&lt;/p&gt;
 &lt;p&gt;配置文件存放于&lt;br&gt;%1.&lt;/p&gt;
@@ -2407,400 +2373,345 @@
     </message>
 </context>
 <context>
-    <name>octave::label_dock_widget</name>
-    <message>
-        <location filename="../src/octave-dock-widget.cc" line="+52"/>
-        <source>Undock widget</source>
-        <translation type="unfinished">移动挂件</translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>Close widget</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>octave::main_window</name>
-    <message>
-        <location filename="../src/main-window.cc" line="+367"/>
+    <name>main_window</name>
+    <message>
+        <location filename="../src/main-window.cc" line="+275"/>
+        <source>Load Workspace</source>
+        <translation>载入工作空间</translation>
+    </message>
+    <message>
+        <location line="+758"/>
+        <location line="+975"/>
+        <source>About Octave</source>
+        <translation>关于 Octave</translation>
+    </message>
+    <message>
+        <location line="-301"/>
+        <source>&amp;File</source>
+        <translation>文件 (&amp;F)</translation>
+    </message>
+    <message>
+        <location line="+45"/>
+        <source>New</source>
+        <translation>新建</translation>
+    </message>
+    <message>
+        <location line="-39"/>
+        <source>Open...</source>
+        <translation>打开...</translation>
+    </message>
+    <message>
+        <location line="+117"/>
+        <source>Preferences...</source>
+        <translation>首选项...</translation>
+    </message>
+    <message>
+        <location line="-99"/>
+        <source>Exit</source>
+        <translation>退出</translation>
+    </message>
+    <message>
+        <location line="+50"/>
+        <source>&amp;Edit</source>
+        <translation>编辑 (&amp;E)</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Undo</source>
+        <translation>撤销</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Copy</source>
+        <translation>复制</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Paste</source>
+        <translation>粘贴</translation>
+    </message>
+    <message>
+        <location line="-1537"/>
         <source>Save Workspace As</source>
-        <translation type="unfinished">工作空间另存为</translation>
-    </message>
-    <message>
-        <location line="+14"/>
-        <source>Load Workspace</source>
-        <translation type="unfinished">载入工作空间</translation>
-    </message>
-    <message>
-        <location line="+85"/>
+        <translation>工作空间另存为</translation>
+    </message>
+    <message>
+        <location line="+124"/>
         <source>The release notes file &apos;%1&apos; is empty.</source>
-        <translation type="unfinished">发行注记文件 &apos;%1&apos; 是空的。</translation>
+        <translation>发行注记文件 &apos;%1&apos; 是空的。</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>The release notes file &apos;%1&apos; cannot be read.</source>
-        <translation type="unfinished">发行注记文件 &apos;%1&apos; 无法读取。</translation>
+        <translation>发行注记文件 &apos;%1&apos; 无法读取。</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>Octave Release Notes</source>
-        <translation type="unfinished">Octave 发行注记</translation>
-    </message>
-    <message>
-        <location line="+79"/>
+        <translation>Octave 发行注记</translation>
+    </message>
+    <message>
+        <location line="+192"/>
         <source>Octave Community News</source>
-        <translation type="unfinished">Octave 社区新闻</translation>
-    </message>
-    <message>
-        <location line="+91"/>
-        <location line="+1724"/>
-        <source>About Octave</source>
-        <translation type="unfinished">关于 Octave</translation>
-    </message>
-    <message>
-        <location line="-1603"/>
-        <source>Octave</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Are you sure you want to exit Octave?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+64"/>
-        <location line="+1600"/>
-        <source>Browse directories</source>
-        <translation type="unfinished">浏览目录</translation>
-    </message>
-    <message>
-        <location line="-1444"/>
-        <source>Octave Files (*.m);;All Files (*)</source>
-        <translation type="unfinished">Octave 文件 (*.m);;所有文件 (*)</translation>
-    </message>
-    <message>
-        <location line="+16"/>
-        <source>File Encoding:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+53"/>
-        <source>New Function</source>
-        <translation type="unfinished">新建函数</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>New function name:
-</source>
-        <translation type="unfinished">新建函数的名称:
-</translation>
-    </message>
-    <message>
-        <location line="+43"/>
-        <source>%1 is a built-in function</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+37"/>
-        <source>Can not find function %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+9"/>
-        <source>Octave Editor</source>
-        <translation type="unfinished">Octave 编辑器</translation>
-    </message>
-    <message>
-        <location line="+909"/>
-        <source>&amp;File</source>
-        <translation type="unfinished">文件 (&amp;F)</translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Open...</source>
-        <translation type="unfinished">打开...</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Open an existing file in editor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+9"/>
-        <source>Load Workspace...</source>
-        <translation type="unfinished">载入工作空间...</translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Save Workspace As...</source>
-        <translation type="unfinished">工作空间另存为...</translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Exit</source>
-        <translation type="unfinished">退出</translation>
-    </message>
-    <message>
-        <location line="+18"/>
-        <source>New</source>
-        <translation type="unfinished">新建</translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>New Script</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>New Function...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>New Figure</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+26"/>
-        <source>&amp;Edit</source>
-        <translation type="unfinished">编辑 (&amp;E)</translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Undo</source>
-        <translation type="unfinished">撤销</translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <source>Copy</source>
-        <translation type="unfinished">复制</translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Paste</source>
-        <translation type="unfinished">粘贴</translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Select All</source>
-        <translation type="unfinished">全选</translation>
-    </message>
-    <message>
-        <location line="+4"/>
+        <translation>Octave 社区新闻</translation>
+    </message>
+    <message>
+        <location line="+1213"/>
         <source>Clear Clipboard</source>
-        <translation type="unfinished">清空剪贴板</translation>
+        <translation>清空剪贴板</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Find Files...</source>
-        <translation type="unfinished">查找文件...</translation>
+        <translation>查找文件...</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Clear Command Window</source>
-        <translation type="unfinished">清空命令窗口</translation>
+        <translation>清空命令窗口</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Clear Command History</source>
-        <translation type="unfinished">清空命令历史</translation>
+        <translation>清空命令历史</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Clear Workspace</source>
-        <translation type="unfinished">清空工作空间</translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Preferences...</source>
-        <translation type="unfinished">首选项...</translation>
+        <translation>清空工作空间</translation>
     </message>
     <message>
         <location line="+49"/>
         <source>De&amp;bug</source>
-        <translation type="unfinished">除错 (&amp;B)</translation>
+        <translation>调试 (&amp;B)</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Step</source>
-        <translation type="unfinished">步骤</translation>
-    </message>
-    <message>
-        <location line="+4"/>
+        <translation>步骤</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>Continue</source>
+        <translation>继续</translation>
+    </message>
+    <message>
+        <location line="+56"/>
+        <source>Show File Browser</source>
+        <translation>显示文件浏览器</translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>File Browser</source>
+        <translation>文件浏览器</translation>
+    </message>
+    <message>
+        <location line="-84"/>
         <source>Step In</source>
-        <translation type="unfinished">步进</translation>
+        <translation>步进</translation>
+    </message>
+    <message>
+        <location line="-156"/>
+        <source>Load Workspace...</source>
+        <translation>载入工作空间...</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Save Workspace As...</source>
+        <translation>工作空间另存为...</translation>
+    </message>
+    <message>
+        <location line="+157"/>
+        <source>Step Out</source>
+        <translation>步出</translation>
+    </message>
+    <message>
+        <location line="+94"/>
+        <source>Reset Default Window Layout</source>
+        <translation>复位为默认窗口布局</translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>Octave Packages</source>
+        <translation>Octave 软件包</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Share Code</source>
+        <translation>共享代码</translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>On Disk</source>
+        <translation>磁盘上</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Online</source>
+        <translation>在线</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>&amp;News</source>
+        <translation>新闻 (&amp;N)</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Release Notes</source>
+        <translation>发行注记</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Community News</source>
+        <translation>社区新闻</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Toolbar</source>
+        <translation type="unfinished">工具栏</translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>Enter directory name</source>
+        <translation>输入目录名</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Current Directory: </source>
+        <translation>当前目录: </translation>
     </message>
     <message>
         <location line="+4"/>
-        <source>Step Out</source>
-        <translation type="unfinished">步出</translation>
+        <source>One directory up</source>
+        <translation>向上一级</translation>
+    </message>
+    <message>
+        <location line="-1198"/>
+        <location line="+1201"/>
+        <source>Browse directories</source>
+        <translation>浏览目录</translation>
+    </message>
+    <message>
+        <location line="-1274"/>
+        <source>Octave</source>
+        <translation type="unfinished">Octave</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Are you sure you want to exit Octave?</source>
+        <translation type="unfinished">确定要退出 Octave 吗？</translation>
+    </message>
+    <message>
+        <location line="+916"/>
+        <source>Open an existing file in editor</source>
+        <translation type="unfinished">在编辑器中打开一个已存在的文件</translation>
+    </message>
+    <message>
+        <location line="+41"/>
+        <source>New Script</source>
+        <translation type="unfinished">新建脚本</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>New Function...</source>
+        <translation type="unfinished">新建函数</translation>
     </message>
     <message>
         <location line="+4"/>
-        <source>Continue</source>
-        <translation type="unfinished">继续</translation>
-    </message>
-    <message>
-        <location line="+9"/>
+        <source>New Figure</source>
+        <translation type="unfinished">新建图表</translation>
+    </message>
+    <message>
+        <location line="+39"/>
+        <source>Select All</source>
+        <translation type="unfinished">全选</translation>
+    </message>
+    <message>
+        <location line="+95"/>
         <source>Quit Debug Mode</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">退出调试</translation>
     </message>
     <message>
         <location line="+38"/>
         <source>&amp;Window</source>
-        <translation type="unfinished">窗口 (&amp;W)</translation>
+        <translation>窗口 (&amp;W)</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Show Command Window</source>
-        <translation type="unfinished">显示命令窗口</translation>
+        <translation>显示命令窗口</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Show Command History</source>
-        <translation type="unfinished">显示命令历史</translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Show File Browser</source>
-        <translation type="unfinished">显示文件浏览器</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <translation>显示命令历史</translation>
+    </message>
+    <message>
+        <location line="+6"/>
         <source>Show Workspace</source>
-        <translation type="unfinished">显示工作空间</translation>
+        <translation>显示工作空间</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Show Editor</source>
-        <translation type="unfinished">显示编辑器</translation>
+        <translation>显示编辑器</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Show Documentation</source>
-        <translation type="unfinished">显示文档</translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Show Variable Editor</source>
-        <translation type="unfinished"></translation>
+        <translation>显示文档</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Command Window</source>
-        <translation type="unfinished">命令窗口</translation>
+        <translation>命令窗口</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Command History</source>
-        <translation type="unfinished">命令历史</translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>File Browser</source>
-        <translation type="unfinished">文件浏览器</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <translation>命令历史</translation>
+    </message>
+    <message>
+        <location line="+6"/>
         <source>Workspace</source>
-        <translation type="unfinished"></translation>
+        <translation>工作空间</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Editor</source>
-        <translation type="unfinished"></translation>
+        <translation>编辑器</translation>
     </message>
     <message>
         <location line="+3"/>
-        <location line="+39"/>
+        <location line="+41"/>
         <source>Documentation</source>
-        <translation type="unfinished">文档</translation>
-    </message>
-    <message>
-        <location line="-36"/>
-        <source>Variable Editor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Reset Default Window Layout</source>
-        <translation type="unfinished">复位为默认窗口布局</translation>
-    </message>
-    <message>
-        <location line="+5"/>
+        <translation>文档</translation>
+    </message>
+    <message>
+        <location line="-30"/>
         <source>&amp;Help</source>
-        <translation type="unfinished">帮助 (&amp;H)</translation>
+        <translation>帮助 (&amp;H)</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Report Bug</source>
-        <translation type="unfinished">报告问题</translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Octave Packages</source>
-        <translation type="unfinished">Octave 软件包</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <translation>报告问题</translation>
+    </message>
+    <message>
+        <location line="+9"/>
         <source>Contribute</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">参与 Octave</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Donate to Octave</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+13"/>
-        <source>On Disk</source>
-        <translation type="unfinished">磁盘上</translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Online</source>
-        <translation type="unfinished">在线</translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>&amp;News</source>
-        <translation type="unfinished">新闻 (&amp;N)</translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Release Notes</source>
-        <translation type="unfinished">发行注记</translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Community News</source>
-        <translation type="unfinished">社区新闻</translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Toolbar</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+19"/>
-        <source>Enter directory name</source>
-        <translation type="unfinished">输入目录名</translation>
-    </message>
-    <message>
-        <location line="+9"/>
-        <source>Current Directory: </source>
-        <translation type="unfinished">当前目录: </translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>One directory up</source>
-        <translation type="unfinished">向上一级</translation>
+        <translation type="unfinished">捐赠 Octave</translation>
     </message>
 </context>
 <context>
-    <name>octave::news_reader</name>
-    <message>
-        <location line="+305"/>
+    <name>news_reader</name>
+    <message>
+        <location line="-1504"/>
         <source>&lt;html&gt;
 &lt;body&gt;
 &lt;p&gt;
@@ -2808,19 +2719,19 @@
 &lt;/p&gt;
 &lt;p&gt;
 For the latest news, please check
-&lt;a href=&quot;https://octave.org/community-news.html&quot;&gt;https://octave.org/community-news.html&lt;/a&gt;
+&lt;a href=&quot;http://octave.org/community-news.html&quot;&gt;http://octave.org/community-news.html&lt;/a&gt;
 when you have a connection to the web (link opens in an external browser).
 &lt;/p&gt;
 &lt;p&gt;
 &lt;small&gt;&lt;em&gt;&amp;mdash; The Octave Developers, </source>
-        <translation type="unfinished">&lt;html&gt;
+        <translation>&lt;html&gt;
 &lt;body&gt;
 &lt;p&gt;
 Octave 的社区新闻来源似乎不可用。
 &lt;/p&gt;
 &lt;p&gt;
 当你的网络连接可用时，要获取最新新闻，请查阅
-&lt;a href=&quot;https://octave.org/community-news.html&quot;&gt;https://octave.org/community-news.html&lt;/a&gt;
+&lt;a href=&quot;http://octave.org/community-news.html&quot;&gt;http://octave.org/community-news.html&lt;/a&gt;
 (将在外部浏览器打开) .
 &lt;/p&gt;
 &lt;p&gt;
@@ -2835,20 +2746,20 @@
 &lt;/p&gt;
 &lt;p&gt;
 For the latest news, please check
-&lt;a href=&quot;https://octave.org/community-news.html&quot;&gt;https://octave.org/community-news.html&lt;/a&gt;
+&lt;a href=&quot;http://octave.org/community-news.html&quot;&gt;http://octave.org/community-news.html&lt;/a&gt;
 when you have a connection to the web (link opens in an external browser)
 or enable web connections for news in Octave&apos;s network settings dialog.
 &lt;/p&gt;
 &lt;p&gt;
 &lt;small&gt;&lt;em&gt;&amp;mdash; The Octave Developers, </source>
-        <translation type="unfinished">&lt;html&gt;
+        <translation>&lt;html&gt;
 &lt;body&gt;
 &lt;p&gt;
 连接到互联网以获取 Octave 社区新闻的选项已经被禁用。
 &lt;/p&gt;
 &lt;p&gt;
 在网络连接可用时，要获取最新新闻，请查阅
-&lt;a href=&quot;https://octave.org/community-news.html&quot;&gt;https://octave.org/community-news.html&lt;/a&gt;
+&lt;a href=&quot;http://octave.org/community-news.html&quot;&gt;http://octave.org/community-news.html&lt;/a&gt;
 (将在外部浏览器打开链接)。
 或者在 Octave 网络设置对话框打开网络连接。
 &lt;/p&gt;
@@ -2857,121 +2768,114 @@
     </message>
 </context>
 <context>
-    <name>octave::octave_dock_widget</name>
-    <message>
-        <location filename="../src/octave-dock-widget.cc" line="+69"/>
+    <name>octave_dock_widget</name>
+    <message>
+        <location filename="../src/octave-dock-widget.cc" line="+67"/>
+        <location line="+201"/>
+        <source>Undock widget</source>
+        <translation>取消组件停靠</translation>
+    </message>
+    <message>
+        <location line="-191"/>
         <source>Hide widget</source>
-        <translation type="unfinished">隐藏挂件</translation>
-    </message>
-    <message>
-        <location line="+43"/>
-        <source>Use &lt;Alt&gt; + &lt;Left Mouse Button&gt; for moving the window</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
+        <translation>隐藏组件</translation>
+    </message>
+    <message>
+        <location line="+136"/>
         <source>Dock widget</source>
-        <translation type="unfinished">停靠挂件</translation>
-    </message>
-    <message>
-        <location line="+42"/>
-        <source>Undock widget</source>
-        <translation type="unfinished">移动挂件</translation>
+        <translation>停靠组件</translation>
     </message>
 </context>
 <context>
-    <name>octave::octave_qscintilla</name>
-    <message>
-        <location filename="../src/m-editor/octave-qscintilla.cc" line="+277"/>
+    <name>octave_qscintilla</name>
+    <message>
+        <location filename="../src/m-editor/octave-qscintilla.cc" line="+237"/>
         <source>Help on</source>
-        <translation type="unfinished">开启帮助</translation>
+        <translation>开启帮助</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Documentation on</source>
-        <translation type="unfinished">开启文档</translation>
+        <translation>开启文档</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Edit</source>
-        <translation type="unfinished">编辑</translation>
+        <translation>编辑</translation>
     </message>
     <message>
         <location line="+15"/>
         <source>dbstop if ...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+461"/>
-        <source>Press &apos;%1&apos; to replace all occurrences of &apos;%2&apos; with &apos;%3&apos;.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">dbstop 如果 ...</translation>
     </message>
 </context>
 <context>
-    <name>octave::octave_qt_link</name>
-    <message>
-        <location filename="../src/octave-qt-link.cc" line="+105"/>
-        <location line="+9"/>
-        <location line="+11"/>
-        <source>Create</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-20"/>
-        <location line="+268"/>
-        <source>Cancel</source>
-        <translation type="unfinished">取消</translation>
-    </message>
-    <message>
-        <location line="-262"/>
+    <name>octave_qt_link</name>
+    <message>
+        <location filename="../src/octave-qt-link.cc" line="+142"/>
         <source>File
 %1
 does not exist. Do you want to create it?</source>
-        <translation type="unfinished"></translation>
+        <translation>文件
+%1
+不存在。你希望创建它吗？</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Octave Editor</source>
-        <translation type="unfinished">Octave 编辑器</translation>
-    </message>
-    <message>
-        <location line="+252"/>
+        <translation>Octave 编辑器</translation>
+    </message>
+    <message>
+        <location line="-9"/>
+        <location line="+9"/>
+        <location line="+11"/>
+        <source>Create</source>
+        <translation type="unfinished">创建</translation>
+    </message>
+    <message>
+        <location line="+243"/>
         <source>The file %1 does not exist in the load path.  To run or debug the function you are editing, you must either change to the directory %2 or add that directory to the load path.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">加载路径中文件 %1 不存在。如要运行或调试正在编辑的函数，请转到目录 %2 或添加其至加载路径。</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>The file %1 is shadowed by a file with the same name in the load path. To run or debug the function you are editing, change to the directory %2.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">文件 %1 被加载路径中同名文件隐藏。 如要运行或调试正在编辑的函数，请切换到目录 %2 。</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Change Directory or Add Directory to Load Path</source>
-        <translation type="unfinished">切换目录或添加目录到载入路径</translation>
+        <translation>切换目录或添加目录到载入路径</translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>&amp;Change Directory</source>
-        <translation type="unfinished"></translation>
+        <source>Change Directory</source>
+        <translation>切换目录</translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>&amp;Add Directory to Load Path</source>
-        <translation type="unfinished"></translation>
+        <source>Add Directory to Load Path</source>
+        <translation>添加目录到载入路径</translation>
+    </message>
+    <message>
+        <location line="-269"/>
+        <location line="+270"/>
+        <source>Cancel</source>
+        <translation>取消</translation>
     </message>
 </context>
 <context>
-    <name>octave::octave_txt_lexer</name>
-    <message>
-        <location filename="../src/m-editor/octave-txt-lexer.cc" line="+40"/>
+    <name>octave_txt_lexer</name>
+    <message>
+        <location filename="../src/m-editor/octave-txt-lexer.cc" line="+39"/>
         <source>Default</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">默认</translation>
     </message>
 </context>
 <context>
-    <name>octave::resource_manager</name>
-    <message>
-        <location filename="../src/resource-manager.cc" line="+272"/>
+    <name>resource_manager</name>
+    <message>
+        <location filename="../src/resource-manager.cc" line="+246"/>
         <source>The settings file
 %1
 does not exist and can not be created.
@@ -2979,7 +2883,7 @@
 %2
 
 Octave GUI must be closed now.</source>
-        <translation type="unfinished">配置文件
+        <translation>配置文件
 %1
 不存在且不能被创建。
 请确定你在如下目录有写入权限。
@@ -2990,43 +2894,659 @@
     <message>
         <location line="+5"/>
         <source>Octave Critical Error</source>
-        <translation type="unfinished">Octave 严重错误</translation>
+        <translation>Octave 严重错误</translation>
     </message>
 </context>
 <context>
-    <name>octave::setup_community_news</name>
+    <name>settings_dialog</name>
+    <message>
+        <location filename="../src/settings-dialog.ui" line="+23"/>
+        <source>Settings</source>
+        <translation>设置</translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <location line="+468"/>
+        <source>General</source>
+        <translation>常规</translation>
+    </message>
+    <message>
+        <location line="-447"/>
+        <source>Interface</source>
+        <translation type="unfinished">接口</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Dock widget title bar</source>
+        <translation type="unfinished">停靠组件标题栏</translation>
+    </message>
+    <message>
+        <location line="+44"/>
+        <source>Confirm before exiting</source>
+        <translation type="unfinished">退出前确认</translation>
+    </message>
+    <message>
+        <location line="+57"/>
+        <source>Octave logo only</source>
+        <translation>仅 Octave 徽标</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Letter icons</source>
+        <translation>字母图标</translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <location line="+640"/>
+        <source>Show status bar</source>
+        <translation type="unfinished">显示状态栏</translation>
+    </message>
+    <message>
+        <location line="-588"/>
+        <source>Text inactive</source>
+        <translation type="unfinished">不活动的文本</translation>
+    </message>
+    <message>
+        <location line="-32"/>
+        <location line="+45"/>
+        <source>Active</source>
+        <translation type="unfinished">活动</translation>
+    </message>
+    <message>
+        <location line="-159"/>
+        <source>Small</source>
+        <translation type="unfinished">小</translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Large</source>
+        <translation type="unfinished">大</translation>
+    </message>
+    <message>
+        <location line="+168"/>
+        <source>Custom style</source>
+        <translation type="unfinished">自定义样式</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Background inactive</source>
+        <translation type="unfinished">不活动的背景</translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>3D</source>
+        <translation type="unfinished">3D</translation>
+    </message>
+    <message>
+        <location line="+54"/>
+        <source>Octave Startup</source>
+        <translation type="unfinished">Octave 启动</translation>
+    </message>
+    <message>
+        <location line="+41"/>
+        <location line="+1440"/>
+        <source>Startup path</source>
+        <translation type="unfinished">启动路径</translation>
+    </message>
+    <message>
+        <location line="-1427"/>
+        <location line="+1420"/>
+        <source>Browse</source>
+        <translation type="unfinished">浏览</translation>
+    </message>
+    <message>
+        <location line="-1380"/>
+        <source>Editor</source>
+        <translation> 编辑器</translation>
+    </message>
+    <message>
+        <location line="+277"/>
+        <source>After Column</source>
+        <translation type="unfinished">列后</translation>
+    </message>
+    <message>
+        <location line="-170"/>
+        <source>Color</source>
+        <translation>颜色</translation>
+    </message>
+    <message>
+        <location line="+95"/>
+        <source>Tab width min.</source>
+        <translation type="unfinished">Tab 最小宽度.</translation>
+    </message>
+    <message>
+        <location line="+64"/>
+        <source>max.</source>
+        <translation type="unfinished">最大.</translation>
+    </message>
+    <message>
+        <location line="-231"/>
+        <source>This works well for monospaced fonts. The line is drawn at a position based on the width of a space character in the default font. It may not work very well if styles use proportional fonts or if varied font sizes or bold, italic and normal texts are used.</source>
+        <translation type="unfinished">这适用于等宽字体。 该线根据默认字体中空格字符的宽度绘制。 如果样式使用比例字体，或者使用不同的字体大小或粗体，斜体和普通文本，它可能无法很好地工作。</translation>
+    </message>
+    <message>
+        <location line="+289"/>
+        <source>Enable Code Folding</source>
+        <translation type="unfinished">启用代码折叠</translation>
+    </message>
+    <message>
+        <location line="+551"/>
+        <source>Windows (CRLF)</source>
+        <translation type="unfinished">Windows (CRLF)</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Mac (CR)</source>
+        <translation type="unfinished">Mac (CR)</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Unix (LF)</source>
+        <translation type="unfinished">Unix (LF)</translation>
+    </message>
+    <message>
+        <location line="-532"/>
+        <source>Show horizontal scroll bar</source>
+        <translation type="unfinished">显示水平滚动条</translation>
+    </message>
+    <message>
+        <location line="-299"/>
+        <source>Show tool bar</source>
+        <translation type="unfinished">显示工具栏</translation>
+    </message>
+    <message>
+        <location line="+383"/>
+        <source>Indentation</source>
+        <translation type="unfinished">缩进</translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>Indent width</source>
+        <translation>缩进宽度</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Tab indents line</source>
+        <translation>Tab 键缩进行</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Auto indentation</source>
+        <translation>自动缩进</translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>Tab width</source>
+        <translation>Tab 键宽度</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Show indentation guides</source>
+        <translation>显示缩进参考线</translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Backspace unindents line</source>
+        <translation>退格键删除缩进符</translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Indentation uses tabs</source>
+        <translation type="unfinished">使用 tabs 缩进</translation>
+    </message>
+    <message>
+        <location line="+38"/>
+        <source>Auto completion</source>
+        <translation type="unfinished">自动补全</translation>
+    </message>
+    <message>
+        <location line="+27"/>
+        <source>Match keywords</source>
+        <translation>匹配关键字</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Case sensitive</source>
+        <translation>大小写敏感</translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Replace word by suggested one</source>
+        <translation>使用建议的单词替换原有的</translation>
+    </message>
+    <message>
+        <location line="-10"/>
+        <source>Match words in document</source>
+        <translation>在文档中匹配单词</translation>
+    </message>
+    <message>
+        <location line="+48"/>
+        <source>With Octave builtins</source>
+        <translation type="unfinished">Octave 内建</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>With Octave functions</source>
+        <translation type="unfinished">Octave 函数</translation>
+    </message>
+    <message>
+        <location line="+64"/>
+        <source>Show completion list automatically</source>
+        <translation type="unfinished">自动显示补全列表</translation>
+    </message>
+    <message>
+        <location line="+63"/>
+        <source>Restore editor tabs from previous session on startup</source>
+        <translation>在启动时恢复上次会话的编辑器标签</translation>
+    </message>
+    <message>
+        <location line="-13"/>
+        <source>Reload externally changed files without prompt</source>
+        <translation type="unfinished">无需提示即可重新加载外部更改的文件</translation>
+    </message>
+    <message>
+        <location line="-425"/>
+        <source>Use custom file editor</source>
+        <translation>使用自定义文件编辑器</translation>
+    </message>
+    <message>
+        <location line="+518"/>
+        <source>Text encoding used for loading and saving</source>
+        <translation type="unfinished">文本编码用于加载和保存</translation>
+    </message>
+    <message>
+        <location line="+56"/>
+        <source>Editor Styles</source>
+        <translation>编辑器风格</translation>
+    </message>
+    <message>
+        <location line="+209"/>
+        <source>(Changing buffer size clears history)</source>
+        <translation type="unfinished">(更改缓冲区大小清除历史记录)</translation>
+    </message>
+    <message>
+        <location line="+28"/>
+        <source>History buffer Size</source>
+        <translation type="unfinished">历史缓冲区大小</translation>
+    </message>
+    <message>
+        <location line="+27"/>
+        <source>Set focus to terminal when running a command from within another widget</source>
+        <translation type="unfinished">从另一个组件中运行命令时，将焦点设置为终端</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Print debug location in terminal window in addition to the marker in the editor</source>
+        <translation type="unfinished">除了编辑器中的标记之外，还可以在终端窗口中打印调试位置</translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>Terminal Colors</source>
+        <translation>终端颜色</translation>
+    </message>
+    <message>
+        <location line="-173"/>
+        <source>Font</source>
+        <translation>字体</translation>
+    </message>
+    <message>
+        <location line="-1007"/>
+        <source>Show line numbers</source>
+        <translation>显示行数</translation>
+    </message>
+    <message>
+        <location line="+81"/>
+        <source>Highlight current line</source>
+        <translation>高亮当前行</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Show complete path in window title</source>
+        <translation>在窗口标题显示完整路径</translation>
+    </message>
+    <message>
+        <location line="-467"/>
+        <source>Graphic icons</source>
+        <translation>图形图标</translation>
+    </message>
+    <message>
+        <location line="+212"/>
+        <source>These preferences are applied after any .octaverc startup files.</source>
+        <translation type="unfinished">这些首选项在任何.octaverc启动文件之后应用。</translation>
+    </message>
+    <message>
+        <location line="+55"/>
+        <source>Restore working directory of previous session</source>
+        <translation type="unfinished">恢复前一个会话的工作目录</translation>
+    </message>
+    <message>
+        <location line="+213"/>
+        <source>Show whitespace</source>
+        <translation>显示空白</translation>
+    </message>
+    <message>
+        <location line="+157"/>
+        <source>Do not show whitespace used for indentation</source>
+        <translation>不要显示缩进的空白空间</translation>
+    </message>
+    <message>
+        <location line="-299"/>
+        <source>Draw a long line marker</source>
+        <translation type="unfinished">画长线标记</translation>
+    </message>
+    <message>
+        <location line="+155"/>
+        <source>Show EOL characters</source>
+        <translation type="unfinished">显示 EOL 字符</translation>
+    </message>
+    <message>
+        <location line="+662"/>
+        <source>Default EOL mode</source>
+        <translation type="unfinished">默认 EOL 模式</translation>
+    </message>
+    <message>
+        <location line="-136"/>
+        <source>Number of characters before list is shown: </source>
+        <translation type="unfinished">显示列表前的字符数:</translation>
+    </message>
+    <message>
+        <location line="+124"/>
+        <source>Create nonexistent files without prompting</source>
+        <translation>在创建不存在的文件时不提示</translation>
+    </message>
+    <message>
+        <location line="-441"/>
+        <source>command line (%f=file, %l=line):</source>
+        <translation>命令行 (%f=文件, %l=行数): </translation>
+    </message>
+    <message>
+        <location line="+581"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Select font, font size (as a difference from the default size), font style (&lt;b&gt;b&lt;/b&gt;old, &lt;b&gt;i&lt;/b&gt;talic, &lt;b&gt;u&lt;/b&gt;nderline), text color, and background color (for the latter, the color magenta (255,0,255) is a placeholder for the default background color).&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;选择字体, 字体大小 (作为与默认大小的差异), 字体样式 (&lt;b&gt;b&lt;/b&gt;old, &lt;b&gt;i&lt;/b&gt;talic, &lt;b&gt;u&lt;/b&gt;nderline), 文本颜色, 和背景颜色 (对于后者，颜色洋红色(255,0,255)是默认背景颜色的占位符).&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <location line="+32"/>
+        <source>Terminal</source>
+        <translation>终端</translation>
+    </message>
+    <message>
+        <location line="+51"/>
+        <source>Cursor type:</source>
+        <translation>光标类型: </translation>
+    </message>
+    <message>
+        <location line="-11"/>
+        <source>Cursor blinking</source>
+        <translation>光标闪烁</translation>
+    </message>
+    <message>
+        <location line="-7"/>
+        <source>Use foreground color</source>
+        <translation>使用前景色</translation>
+    </message>
+    <message>
+        <location line="+59"/>
+        <source>Font size</source>
+        <translation>字体大小</translation>
+    </message>
+    <message>
+        <location line="+196"/>
+        <source>File Browser</source>
+        <translation>文件浏览器</translation>
+    </message>
+    <message>
+        <location line="+144"/>
+        <source>Workspace</source>
+        <translation>工作空间</translation>
+    </message>
+    <message>
+        <location line="+35"/>
+        <source>Colors for variable attributes</source>
+        <translation type="unfinished">变量属性的颜色</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Hide tool tips</source>
+        <translation type="unfinished">隐藏工具提示</translation>
+    </message>
+    <message>
+        <location line="+101"/>
+        <source>Import shortcut set</source>
+        <translation type="unfinished">导入快捷键设置</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Export current shortcut set</source>
+        <translation type="unfinished">导出当前快捷键设置</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Reset shortcuts to their defaults</source>
+        <translation type="unfinished">将快捷方式重置为其默认值</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location line="+80"/>
+        <source>Default</source>
+        <translation type="unfinished">默认</translation>
+    </message>
+    <message>
+        <location line="-71"/>
+        <source>Edit a shortcut by double-clicking in a cell</source>
+        <translation type="unfinished">通过双击单元格编辑快捷方式</translation>
+    </message>
+    <message>
+        <location line="+76"/>
+        <source>Actual</source>
+        <translation type="unfinished">当前</translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Network</source>
+        <translation>网络</translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Allow Octave to connect to the Octave web site to display current news and information</source>
+        <translation>允许 Octave 连接到 Octave 站点以显示当前新闻和信息</translation>
+    </message>
+    <message>
+        <location line="+46"/>
+        <source>Use proxy server</source>
+        <translation>使用代理服务器</translation>
+    </message>
+    <message>
+        <location line="-23"/>
+        <source>HttpProxy</source>
+        <translation>HTTP Proxy</translation>
+    </message>
+    <message>
+        <location line="-2039"/>
+        <source>Icon set for dock widgets</source>
+        <translation>挂件的图标集</translation>
+    </message>
+    <message>
+        <location line="-48"/>
+        <source>Language (requires restart)</source>
+        <translation>语言 (需要重启)</translation>
+    </message>
+    <message>
+        <location line="-58"/>
+        <source>Icon size</source>
+        <translation>图标大小</translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>Normal</source>
+        <translation type="unfinished">正常</translation>
+    </message>
+    <message>
+        <location line="+1156"/>
+        <source>File handling</source>
+        <translation type="unfinished">文件处理</translation>
+    </message>
+    <message>
+        <location line="+526"/>
+        <source>Behavior</source>
+        <translation type="unfinished">行为</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Synchronize Octave working directory with file browser</source>
+        <translation>使用文件浏览器同步 Octave 工作目录</translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>Restore last directory of previous session</source>
+        <translation type="unfinished">恢复前一个会话的最后一个目录</translation>
+    </message>
+    <message>
+        <location line="+162"/>
+        <source>Shortcuts</source>
+        <translation type="unfinished">快捷键</translation>
+    </message>
+    <message>
+        <location line="+31"/>
+        <source>Select this option to prevent conflicts with readline shortcuts</source>
+        <translation type="unfinished">选择此选项可防止与readline快捷方式冲突</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Disable global shortcuts when terminal window has focus</source>
+        <translation type="unfinished">当终端窗口获得焦点时禁用全局快捷方式</translation>
+    </message>
+    <message>
+        <location line="+53"/>
+        <source>Export</source>
+        <translation type="unfinished">导出</translation>
+    </message>
+    <message>
+        <location line="-10"/>
+        <source>Import</source>
+        <translation type="unfinished">导入</translation>
+    </message>
+    <message>
+        <location line="+90"/>
+        <source>Action</source>
+        <translation type="unfinished">动作</translation>
+    </message>
+    <message>
+        <location line="+83"/>
+        <source>Socks5Proxy</source>
+        <translation>Socks5Proxy</translation>
+    </message>
+    <message>
+        <location line="-16"/>
+        <source>Hostname:</source>
+        <translation>主机名: </translation>
+    </message>
+    <message>
+        <location line="-342"/>
+        <source>Extensions of files to be opened in the default text editor (separated by &quot;;&quot;):</source>
+        <translation type="unfinished">要在默认文本编辑器中打开的文件的扩展名 (以 &quot;;&quot; 分隔):</translation>
+    </message>
+    <message>
+        <location line="+386"/>
+        <source>Proxy type:</source>
+        <translation>代理类型: </translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Port:</source>
+        <translation>端口: </translation>
+    </message>
+    <message>
+        <location line="-27"/>
+        <source>Username:</source>
+        <translation>用户名: </translation>
+    </message>
+    <message>
+        <location line="+37"/>
+        <source>Password:</source>
+        <translation>密码: </translation>
+    </message>
+    <message>
+        <location filename="../src/settings-dialog.cc" line="+127"/>
+        <source>Octave Settings</source>
+        <translation type="unfinished">Octave 设置</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Unable to save settings.  Missing settings file or unknown directory.</source>
+        <translation type="unfinished">无法保存设置，缺少设置文件或未知目录。</translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <location line="+4"/>
+        <location line="+444"/>
+        <source>System setting</source>
+        <translation>系统设置</translation>
+    </message>
+    <message>
+        <location line="-232"/>
+        <source>IBeam Cursor</source>
+        <translation>IBeam 光标</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Block Cursor</source>
+        <translation>块状光标</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Underline Cursor</source>
+        <translation>给光标添加下划线</translation>
+    </message>
+    <message>
+        <location line="+503"/>
+        <source>Set Octave Startup Directory</source>
+        <translation type="unfinished">设置 Octave 启动目录</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Set File Browser Startup Directory</source>
+        <translation type="unfinished">设置文件浏览器启动目录</translation>
+    </message>
+</context>
+<context>
+    <name>setup_community_news</name>
     <message>
         <location filename="../src/welcome-wizard.cc" line="+42"/>
         <source>Community News</source>
-        <translation type="unfinished">社区新闻</translation>
+        <translation>社区新闻</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Previous</source>
-        <translation type="unfinished">上一个</translation>
+        <translation>上一个</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Next</source>
-        <translation type="unfinished">下一个</translation>
+        <translation>下一个</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Cancel</source>
-        <translation type="unfinished">取消</translation>
+        <translation>取消</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>&lt;html&gt;&lt;body&gt;
-&lt;p&gt;When Octave starts, it will optionally check the Octave web site for current news and information about the Octave community.
+&lt;p&gt;When the Octave GUI starts, it will check the Octave web site for current news and information about the Octave community.
 The check will happen at most once each day and news will only be displayed if there is something new since the last time you viewed the news.&lt;/p&gt;
-&lt;p&gt;You may also view the news by selecting the &quot;Community News&quot; item in the &quot;Help&quot; menu, or by visiting
-&lt;a href=&quot;https://octave.org/community-news.html&quot;&gt;https://octave.org/community-news.html&lt;/a&gt;.&lt;/p&gt;
+&lt;p&gt;You may also view the news by selecting the &quot;Community News&quot; item in the &quot;Help&quot; menu in the GUI, or by visiting
+&lt;a href=&quot;http://octave.org/community-news.html&quot;&gt;http://octave.org/community-news.html&lt;/a&gt;.&lt;/p&gt;
 &lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+28"/>
+        <translation>&lt;html&gt;&lt;body&gt;
+&lt;p&gt;当 Octave GUI 启动的时候，它会检查 Octave 站点上关于 Octave 社区的新闻和信息。
+每天会检查一次新闻消息，而只有在你上次阅读新闻起有新的新闻出现时才会弹出。&lt;/p&gt;
+&lt;p&gt;你也可以点选 GUI 上的 &quot;社区新闻&quot; 以直接阅读新闻，或直接访问:
+&lt;a href=&quot;http://octave.org/community-news.html&quot;&gt;http://octave.org/community-news.html&lt;/a&gt;.&lt;/p&gt;
+&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <location line="+26"/>
         <source>&lt;html&gt;&lt;head&gt;
 &lt;style&gt;
 a:link { text-decoration: underline; color: #0000ff; }
@@ -3034,7 +3554,7 @@
 &lt;head/&gt;&lt;body&gt;
 &lt;p&gt;Allow Octave to connect to the Octave web site when it starts to display current news and information about the Octave community.&lt;/p&gt;
 &lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished">&lt;html&gt;&lt;head&gt;
+        <translation>&lt;html&gt;&lt;head&gt;
 &lt;style&gt;
 a:link { text-decoration: underline; color: #0000ff; }
 &lt;/style&gt;
@@ -3044,23 +3564,9 @@
     </message>
 </context>
 <context>
-    <name>octave::shortcut_manager</name>
-    <message>
-        <location filename="../src/shortcut-manager.cc" line="+131"/>
-        <source>Double Shortcut</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>The chosen shortcut
-  &quot;%1&quot;
-is already used for the action
-  &quot;%2&quot;.
-Do you want to use the shortcut anyhow removing it from the previous action?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+102"/>
+    <name>shortcut_manager</name>
+    <message>
+        <location filename="../src/shortcut-manager.cc" line="+106"/>
         <source>New File</source>
         <translation type="unfinished">新建文件</translation>
     </message>
@@ -3072,12 +3578,12 @@
     <message>
         <location line="+2"/>
         <source>New Figure</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">新建图表</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Open File</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">打开文件</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -3090,9 +3596,15 @@
         <translation type="unfinished">工作空间另存为</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+16"/>
+        <location line="+143"/>
+        <source>Preferences</source>
+        <translation type="unfinished">首选项</translation>
+    </message>
+    <message>
+        <location line="-158"/>
         <source>Exit Octave</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">退出 Octave</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -3122,7 +3634,7 @@
     <message>
         <location line="+1"/>
         <source>Find in Files</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">在文件中查找</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -3140,20 +3652,9 @@
         <translation type="unfinished">清空工作空间</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <location line="+162"/>
-        <source>Preferences</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-159"/>
-        <source>Step</source>
-        <translation type="unfinished">步骤</translation>
-    </message>
-    <message>
-        <location line="+2"/>
+        <location line="+6"/>
         <source>Step Into</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">步入</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -3168,7 +3669,7 @@
     <message>
         <location line="+2"/>
         <source>Quit Debug Mode</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">退出调试</translation>
     </message>
     <message>
         <location line="+4"/>
@@ -3202,11 +3703,6 @@
     </message>
     <message>
         <location line="+2"/>
-        <source>Show Variable Editor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
         <source>Command Window</source>
         <translation type="unfinished">命令窗口</translation>
     </message>
@@ -3223,48 +3719,38 @@
     <message>
         <location line="+2"/>
         <source>Workspace</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">工作空间</translation>
     </message>
     <message>
         <location line="+2"/>
-        <location line="+258"/>
+        <location line="+234"/>
         <source>Editor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-256"/>
+        <translation type="unfinished">编辑器</translation>
+    </message>
+    <message>
+        <location line="-232"/>
         <source>Documentation</source>
         <translation type="unfinished">文档</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Variable Editor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Reset Default Window Layout</source>
-        <translation type="unfinished">复位为默认窗口布局</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <location line="+5"/>
         <source>Show Ondisk Documentation</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">显示本地文档</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Show Online Documentation</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Report Bug</source>
-        <translation type="unfinished">报告问题</translation>
+        <translation type="unfinished">显示在线文档</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Octave Packages</source>
+        <translation type="unfinished">Octave 软件包</translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Octave Packages</source>
-        <translation type="unfinished">Octave 软件包</translation>
+        <source>Share Code</source>
+        <translation type="unfinished">共享代码</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -3293,745 +3779,605 @@
     </message>
     <message>
         <location line="+5"/>
-        <source>Close Tab</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Close All Tabs</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Close Other Tabs</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Switch to Left Tab</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Switch to Right Tab</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Move Tab Left</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Move Tab Right</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
         <source>Edit Function</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">编辑函数</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Save File</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">保存文件</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Save File As</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">另存文件为</translation>
     </message>
     <message>
         <location line="+1"/>
+        <source>Close</source>
+        <translation type="unfinished">关闭</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Close All</source>
+        <translation type="unfinished">关闭全部</translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>Print</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">打印</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Redo</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">撤销</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Cut</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">剪切</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Find and Replace</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">查找并替换</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Find Next</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">查找下一个</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Find Previous</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">查找上一个</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Delete to Start of Word</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">删除到单词开始</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Delete to End of Word</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">删除到单词结束</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Delete to Start of Line</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">删除到行的开始</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Delete to End of Line</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">删除到行的结束</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Delete Line</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">删除行</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Copy Line</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">复制行</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Cut Line</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">剪切行</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Duplicate Selection/Line</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">重复选择的文本/行</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Transpose Line</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Show Completion List</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <translation type="unfinished">交换行</translation>
+    </message>
+    <message>
+        <location line="+5"/>
         <source>Comment Selection</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">注释选择的文本</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Uncomment Selection</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Comment Selection (Choosing String)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">取消选择的文本的注释</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Uppercase Selection</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">将选择的文本大写</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Lowercase Selection</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">将选择的文本小写</translation>
     </message>
     <message>
         <location line="+4"/>
         <location line="+5"/>
-        <source>Indent Selection Rigidly</source>
-        <translation type="unfinished"></translation>
+        <source>Indent Selection</source>
+        <translation type="unfinished">向右缩进选择的文本</translation>
     </message>
     <message>
         <location line="-3"/>
         <location line="+5"/>
-        <source>Unindent Selection Rigidly</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Indent Code</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Convert Line Endings to Windows</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Convert Line Endings to Unix</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Convert Line Endings to Mac</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <source>Unindent Selection</source>
+        <translation type="unfinished">向左缩进选择的文本</translation>
+    </message>
+    <message>
+        <location line="+11"/>
         <source>Goto Line</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">转到行</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Move to Matching Brace</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">移至匹配的括号</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Select to Matching Brace</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">选择匹配的括号间的文本</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Toggle Bookmark</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">切换书签</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Next Bookmark</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">下一个书签</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Previous Bookmark</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">上一个书签</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Remove All Bookmark</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">移除所有书签</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Styles Preferences</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">样式首选项</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Show Line Numbers</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">显示行号</translation>
+    </message>
+    <message>
+        <location line="+48"/>
+        <source>Switch to Left Tab</source>
+        <translation type="unfinished">切换到左侧标签页</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Switch to Right Tab</source>
+        <translation type="unfinished">切换到右侧标签页</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Move Tab Left</source>
+        <translation type="unfinished">向左移动标签页</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Move Tab Right</source>
+        <translation type="unfinished">向右移动标签页</translation>
+    </message>
+    <message>
+        <location line="+44"/>
+        <source>Global</source>
+        <translation type="unfinished">全局</translation>
+    </message>
+    <message>
+        <location line="+38"/>
+        <source>Tabs</source>
+        <translation type="unfinished">标签页</translation>
+    </message>
+    <message>
+        <location line="+98"/>
+        <source>Enter new Shortcut</source>
+        <translation type="unfinished">输入一个新的快捷键</translation>
+    </message>
+    <message>
+        <location line="+143"/>
+        <source>Overwriting Shortcuts</source>
+        <translation type="unfinished">覆盖快捷键</translation>
     </message>
     <message>
         <location line="+2"/>
+        <source>You are about to overwrite all shortcuts.
+Would you like to save the current shortcut set or cancel the action?</source>
+        <translation type="unfinished">您即将覆盖所有快捷键。
+你想保存当前的快捷键设置还是取消操作？</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Don&apos;t save</source>
+        <translation type="unfinished">不保存 (&apos;t)</translation>
+    </message>
+    <message>
+        <location line="+39"/>
+        <source>Import shortcuts from file ...</source>
+        <translation type="unfinished">从文件导入快捷键 ...</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Export shortcuts into file ...</source>
+        <translation type="unfinished">导出快捷键到文件 ...</translation>
+    </message>
+    <message>
+        <location line="-571"/>
+        <source>Step</source>
+        <translation type="unfinished">步骤</translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>Reset Default Window Layout</source>
+        <translation type="unfinished">复位为默认窗口布局</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Report Bug</source>
+        <translation type="unfinished">报告问题</translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>Close Other Files</source>
+        <translation type="unfinished">关闭其他文件</translation>
+    </message>
+    <message>
+        <location line="+30"/>
+        <source>Show Completion List</source>
+        <translation type="unfinished">显示补全列表</translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>Convert Line Endings to Windows</source>
+        <translation type="unfinished">将行结束符转换为Windows样式</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Convert Line Endings to Unix</source>
+        <translation type="unfinished">将行结束符转换为Unix样式</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Convert Line Endings to Mac</source>
+        <translation type="unfinished">将行结束符转换为Mac样式</translation>
+    </message>
+    <message>
+        <location line="+25"/>
         <source>Show Whitespace Characters</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">显示空白字符</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Show Line Endings</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">显示行结束符</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Show Indentation Guides</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">显示缩进对齐线</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Show Long Line Marker</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">显示长线标记</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Show Toolbar</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">显示工具栏</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Show Statusbar</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">显示状态栏</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Show Horizontal Scrollbar</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">显示水平滚动条</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Zoom In</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">放大</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Zoom Out</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">缩小</translation>
     </message>
     <message>
         <location line="+2"/>
         <location line="+3"/>
         <source>Zoom Normal</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">缩放正常</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Toggle Breakpoint</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">切换断点</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Next Breakpoint</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">下一个断点</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Previous Breakpoint</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">上一个断点</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Remove All Breakpoints</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">移除所有断点</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Run File</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">运行文件</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Run Selection</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">运行所选</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Help on Keyword</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">关键字帮助</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Document on Keyword</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">关键字文档</translation>
     </message>
     <message>
         <location line="+57"/>
-        <source>Global</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <location line="+27"/>
-        <source>File Menu</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-25"/>
-        <location line="+27"/>
-        <source>Edit Menu</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-25"/>
-        <location line="+29"/>
-        <source>Debug Menu</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-27"/>
-        <source>Window Menu</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <location line="+29"/>
-        <source>Help Menu</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-27"/>
-        <source>News Menu</source>
-        <translation type="unfinished"></translation>
+        <location line="+23"/>
+        <source>File</source>
+        <translation type="unfinished">文件</translation>
+    </message>
+    <message>
+        <location line="-21"/>
+        <location line="+23"/>
+        <source>Edit</source>
+        <translation type="unfinished">编辑</translation>
+    </message>
+    <message>
+        <location line="-21"/>
+        <location line="+25"/>
+        <source>Debug</source>
+        <translation type="unfinished">调试</translation>
+    </message>
+    <message>
+        <location line="-23"/>
+        <source>Window</source>
+        <translation type="unfinished">窗口</translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>Tab Handling in Dock Widgets</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+19"/>
-        <source>View Menu</source>
-        <translation type="unfinished"></translation>
+        <location line="+25"/>
+        <source>Help</source>
+        <translation type="unfinished">帮助</translation>
+    </message>
+    <message>
+        <location line="-23"/>
+        <source>News</source>
+        <translation type="unfinished">新闻</translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>View</source>
+        <translation type="unfinished">视图</translation>
     </message>
     <message>
         <location line="+4"/>
-        <source>Run Menu</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+68"/>
-        <source>Import shortcuts from file ...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <location line="+5"/>
-        <source>Octave Shortcut Files (*.osc);;All Files (*)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-1"/>
-        <source>Export shortcuts into file ...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+11"/>
-        <source>Failed to open %1 as octave shortcut file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+26"/>
-        <source>Enter new Shortcut</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
+        <source>Run</source>
+        <translation type="unfinished">运行</translation>
+    </message>
+    <message>
+        <location line="+106"/>
         <source>Apply the desired shortcut or click on the right button to reset the shortcut to its default.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">应用所需的快捷方式或单击右键以将快捷方式重置为其默认值。</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Enter shortcut directly by performing it</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">通过执行直接输入快捷方式</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Actual shortcut</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">当前快捷键</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Default shortcut</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">默认快捷键</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Set to default</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+63"/>
-        <source>Overwriting Shortcuts</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>You are about to overwrite all shortcuts.
-Would you like to save the current shortcut set or cancel the action?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Don&apos;t save</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>octave::terminal_dock_widget</name>
-    <message>
-        <location filename="../src/terminal-dock-widget.cc" line="+43"/>
-        <source>Command Window</source>
-        <translation type="unfinished">命令窗口</translation>
-    </message>
-</context>
-<context>
-    <name>octave::variable_dock_widget</name>
-    <message>
-        <location filename="../src/variable-editor.cc" line="+177"/>
-        <source>Dock widget</source>
-        <translation type="unfinished">停靠挂件</translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>Undock widget</source>
-        <translation type="unfinished">移动挂件</translation>
-    </message>
-    <message>
-        <location line="+17"/>
-        <source>Restore geometry</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Redock</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>octave::variable_editor</name>
-    <message>
-        <location line="+790"/>
-        <source>Variable Editor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Edit variables.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+470"/>
-        <source>Variable Editor Toolbar</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Save</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Save variable to a file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Cut</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Cut data to clipboard</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Copy</source>
-        <translation type="unfinished">复制</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Copy data to clipboard</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Paste</source>
-        <translation type="unfinished">粘贴</translation>
+        <translation type="unfinished">设为默认值</translation>
+    </message>
+    <message>
+        <location line="+45"/>
+        <source>Double Shortcut</source>
+        <translation type="unfinished">双快捷键</translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Paste clipboard into variable data</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Paste Table</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Another paste clipboard into variable data</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+9"/>
+        <source>The chosen shortcut
+  &quot;%1&quot;
+is already used for the action
+  &quot;%2&quot;.
+Do you want to use the shortcut anyhow removing it from the previous action?</source>
+        <translation type="unfinished">选择的快捷键
+  &quot;%1&quot;
+已经被动作
+  &quot;%2&quot;使用。
+您是否想要使用快捷方式并将其从前一个动作中删除？</translation>
+    </message>
+    <message>
+        <location line="+113"/>
         <location line="+5"/>
-        <location line="+7"/>
-        <source>Plot</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-11"/>
-        <source>Plot Selected Data</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Plot selected data</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+21"/>
-        <source>Up</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Go one level up in variable hierarchy</source>
-        <translation type="unfinished"></translation>
+        <source>Octave Shortcut Files (*.osc);;All Files (*)</source>
+        <translation type="unfinished">Octave 快捷键文件 (*.osc);;全部文件 (*)</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Failed to open %1 as octave shortcut file</source>
+        <translation type="unfinished">无法将 %1 作为 Octave 快捷键文件打开</translation>
     </message>
 </context>
 <context>
-    <name>octave::variable_editor_stack</name>
-    <message>
-        <location line="-1169"/>
-        <source>Save Variable %1 As</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>./%1.txt</source>
-        <translation type="unfinished"></translation>
+    <name>terminal_dock_widget</name>
+    <message>
+        <location filename="../src/terminal-dock-widget.cc" line="+38"/>
+        <source>Command Window</source>
+        <translation>命令窗口</translation>
     </message>
 </context>
 <context>
-    <name>octave::variable_editor_view</name>
-    <message>
-        <location line="+123"/>
-        <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="+6"/>
-        <source>Paste Table</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Clear</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Delete</source>
-        <translation type="unfinished">删除</translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Variable from Selection</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+18"/>
-        <source>Transpose</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>octave::webinfo</name>
-    <message>
-        <location filename="../src/qtinfo/webinfo.cc" line="+85"/>
+    <name>webinfo</name>
+    <message>
+        <location filename="../src/qtinfo/webinfo.cc" line="+83"/>
         <source>Type here and press &apos;Return&apos; to search</source>
-        <translation type="unfinished">在这里输入并按下回车以搜索</translation>
+        <translation>在这里输入并按下回车以搜索</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Global search</source>
-        <translation type="unfinished">全局搜索</translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>&amp;Close</source>
-        <translation type="unfinished">关闭 (&amp;C)</translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Close &amp;Other Tabs</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+79"/>
+        <translation>全局搜索</translation>
+    </message>
+    <message>
+        <location line="+18"/>
         <source>Error</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">错误</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>The info file&lt;p&gt;%1&lt;p&gt;or compressed versions do not exist</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">信息文件&lt;p&gt;%1&lt;p&gt;或者压缩版本不存在</translation>
     </message>
 </context>
 <context>
-    <name>octave::welcome_wizard</name>
-    <message>
-        <location filename="../src/welcome-wizard.cc" line="-162"/>
+    <name>welcome_wizard</name>
+    <message>
+        <location filename="../src/welcome-wizard.cc" line="+133"/>
         <source>Welcome to GNU Octave</source>
-        <translation type="unfinished">欢迎来到 GNU Octave</translation>
+        <translation>欢迎来到 GNU Octave</translation>
     </message>
 </context>
 <context>
-    <name>octave::workspace_model</name>
+    <name>workspace_model</name>
     <message>
         <location filename="../src/workspace-model.cc" line="-41"/>
         <source>Name</source>
-        <translation type="unfinished">名称</translation>
+        <translation>名称</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Class</source>
-        <translation type="unfinished">类</translation>
+        <translation>类</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Dimension</source>
-        <translation type="unfinished">维度</translation>
+        <translation>维度</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Value</source>
-        <translation type="unfinished">值</translation>
+        <translation>值</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Attribute</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">属性</translation>
     </message>
     <message>
         <location line="+108"/>
         <source>Right click to copy, rename, or display</source>
-        <translation type="unfinished">右击以复制，重命名或显示</translation>
+        <translation>右击以复制，重命名或显示</translation>
     </message>
     <message>
         <location line="+37"/>
         <location line="+2"/>
         <source>complex</source>
-        <translation type="unfinished">复杂度</translation>
+        <translation>复杂度</translation>
     </message>
 </context>
 <context>
-    <name>octave::workspace_view</name>
-    <message>
-        <location filename="../src/workspace-view.cc" line="+55"/>
+    <name>workspace_view</name>
+    <message>
+        <location filename="../src/workspace-view.cc" line="+51"/>
         <source>Workspace</source>
-        <translation type="unfinished"></translation>
+        <translation>工作区</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>View the variables in the active workspace.</source>
-        <translation type="unfinished">显示当前活动工作区的变量。</translation>
+        <translation>显示当前活动工作区的变量。</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Enter text to filter the workspace</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">输入文本以过滤工作区</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Filter</source>
+        <translation type="unfinished">过滤器</translation>
+    </message>
+    <message>
+        <location line="+242"/>
+        <source>Copy name</source>
+        <translation type="unfinished">复制变量名</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Copy value</source>
+        <translation type="unfinished">复制变量值</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Rename</source>
+        <translation>重命名</translation>
     </message>
     <message>
         <location line="+9"/>
-        <source>Filter</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+129"/>
-        <source>View the variables in the active workspace.&lt;br&gt;</source>
-        <translation type="unfinished">显示当前活动工作区的变量。&lt;br&gt;</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Colors for variable attributes:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+13"/>
+        <source>Only top-level symbols may be renamed</source>
+        <translation type="unfinished">只有顶级符号可能会被重命名</translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Hide filter</source>
+        <translation type="unfinished">隐藏过滤器</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Show filter</source>
+        <translation type="unfinished">显示过滤器</translation>
+    </message>
+    <message>
+        <location line="+149"/>
         <source>Class</source>
         <translation type="unfinished">类</translation>
     </message>
@@ -4048,796 +4394,17 @@
     <message>
         <location line="+1"/>
         <source>Attribute</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+136"/>
-        <source>Open in Variable Editor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Copy name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Copy value</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Rename</source>
-        <translation type="unfinished">重命名</translation>
-    </message>
-    <message>
-        <location line="+9"/>
-        <source>Only top-level symbols may be renamed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+22"/>
-        <source>Hide filter</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Show filter</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>settings_dialog</name>
-    <message>
-        <location filename="../src/settings-dialog.ui" line="+23"/>
-        <source>Settings</source>
-        <translation>设置</translation>
-    </message>
-    <message>
-        <location line="+19"/>
-        <location line="+478"/>
-        <source>General</source>
-        <translation>常规</translation>
-    </message>
-    <message>
-        <location line="-457"/>
-        <source>Interface</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+259"/>
-        <source>Dock widget title bar</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-176"/>
-        <source>Confirm before exiting</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+188"/>
-        <source>Octave logo only</source>
-        <translation>仅 Octave 徽标</translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>Letter icons</source>
-        <translation>字母图标</translation>
-    </message>
-    <message>
-        <location line="+36"/>
-        <location line="+280"/>
-        <source>Show status bar</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-458"/>
-        <source>Text inactive</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-32"/>
-        <location line="+45"/>
-        <source>Active</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-142"/>
-        <source>Small</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+17"/>
-        <source>Large</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+151"/>
-        <source>Custom style</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+13"/>
-        <source>Background inactive</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+19"/>
-        <source>3D</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+132"/>
-        <source>Octave Startup</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+41"/>
-        <location line="+1732"/>
-        <source>Startup path</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-1719"/>
-        <location line="+1712"/>
-        <source>Browse</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-1672"/>
-        <source>Editor</source>
-        <translation> 编辑器</translation>
-    </message>
-    <message>
-        <location line="+314"/>
-        <source>Color</source>
-        <translation>颜色</translation>
-    </message>
-    <message>
-        <location line="-277"/>
-        <source>Tab width min.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+70"/>
-        <source>max.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+422"/>
-        <location line="+140"/>
-        <source>This works well for monospaced fonts. The line is drawn at a position based on the width of a space character in the default font. It may not work very well if styles use proportional fonts or if varied font sizes or bold, italic and normal texts are used.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-463"/>
-        <source>Enable Code Folding</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+961"/>
-        <source>Windows (CRLF)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Mac (CR)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Unix (LF)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-936"/>
-        <source>Show horizontal scroll bar</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-19"/>
-        <source>Show tool bar</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+465"/>
-        <source>Indentation</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+40"/>
-        <source>Indent width</source>
-        <translation>缩进宽度</translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <source>Tab indents line</source>
-        <translation>Tab 键缩进行</translation>
-    </message>
-    <message>
-        <location line="+20"/>
-        <source>Auto indentation</source>
-        <translation>自动缩进</translation>
-    </message>
-    <message>
-        <location line="+23"/>
-        <source>Tab width</source>
-        <translation>Tab 键宽度</translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <source>Show indentation guides</source>
-        <translation>显示缩进参考线</translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <source>Backspace unindents line</source>
-        <translation>退格键删除缩进符</translation>
-    </message>
-    <message>
-        <location line="+23"/>
-        <source>Indentation uses tabs</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+70"/>
-        <source>Auto completion</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+27"/>
-        <source>Match keywords</source>
-        <translation>匹配关键字</translation>
-    </message>
-    <message>
-        <location line="+13"/>
-        <source>Case sensitive</source>
-        <translation>大小写敏感</translation>
-    </message>
-    <message>
-        <location line="+23"/>
-        <source>Replace word by suggested one</source>
-        <translation>使用建议的单词替换原有的</translation>
-    </message>
-    <message>
-        <location line="-10"/>
-        <source>Match words in document</source>
-        <translation>在文档中匹配单词</translation>
-    </message>
-    <message>
-        <location line="+48"/>
-        <source>With Octave builtins</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>With Octave functions</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+64"/>
-        <source>Show completion list automatically</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+50"/>
-        <source>Reload externally changed files without prompt</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-712"/>
-        <source>Use custom file editor</source>
-        <translation>使用自定义文件编辑器</translation>
-    </message>
-    <message>
-        <location line="+805"/>
-        <source>Text encoding used for loading and saving</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+63"/>
-        <source>Editor Styles</source>
-        <translation>编辑器风格</translation>
-    </message>
-    <message>
-        <location line="+202"/>
-        <source>(Changing buffer size clears history)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+28"/>
-        <source>History buffer Size</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+27"/>
-        <source>Set focus to terminal when running a command from within another widget</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <source>Print debug location in terminal window in addition to the marker in the editor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+16"/>
-        <source>Terminal Colors</source>
-        <translation>终端颜色</translation>
-    </message>
-    <message>
-        <location line="-173"/>
-        <location line="+834"/>
-        <source>Font</source>
-        <translation>字体</translation>
-    </message>
-    <message>
-        <location line="-2026"/>
-        <source>Show line numbers</source>
-        <translation>显示行数</translation>
-    </message>
-    <message>
-        <location line="+150"/>
-        <source>Highlight current line</source>
-        <translation>高亮当前行</translation>
-    </message>
-    <message>
-        <location line="-478"/>
-        <source>Graphic icons</source>
-        <translation>图形图标</translation>
-    </message>
-    <message>
-        <location line="+60"/>
-        <source>These preferences are applied after any .octaverc startup files.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+55"/>
-        <source>Restore working directory of previous session</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+226"/>
-        <source>Show whitespace</source>
-        <translation>显示空白</translation>
-    </message>
-    <message>
-        <location line="-45"/>
-        <source>Do not show whitespace used for indentation</source>
-        <translation>不要显示缩进的空白空间</translation>
-    </message>
-    <message>
-        <location line="+215"/>
-        <source>Show EOL characters</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+784"/>
-        <source>Default EOL mode</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-136"/>
-        <source>Number of characters before list is shown: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+124"/>
-        <source>Create nonexistent files without prompting</source>
-        <translation>在创建不存在的文件时不提示</translation>
-    </message>
-    <message>
-        <location line="-728"/>
-        <source>command line (%f=file, %l=line):</source>
-        <translation>命令行 (%f=文件, %l=行数): </translation>
-    </message>
-    <message>
-        <location line="+875"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Select font, font size (as a difference from the default size), font style (&lt;b&gt;b&lt;/b&gt;old, &lt;b&gt;i&lt;/b&gt;talic, &lt;b&gt;u&lt;/b&gt;nderline), text color, and background color (for the latter, the color magenta (255,0,255) is a placeholder for the default background color).&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+32"/>
-        <source>Terminal</source>
-        <translation>终端</translation>
-    </message>
-    <message>
-        <location line="+44"/>
-        <source>Cursor type:</source>
-        <translation>光标类型: </translation>
-    </message>
-    <message>
-        <location line="-1467"/>
-        <source>Cursor blinking</source>
-        <translation>光标闪烁</translation>
-    </message>
-    <message>
-        <location line="+231"/>
-        <source>Show complete path in title</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+131"/>
-        <source>Number size as difference to editor font</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+124"/>
-        <source>Highlight all occurrences of a word selected by a double click</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+65"/>
-        <source>Comments (Octave)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+11"/>
-        <source>Strings considered for uncommenting text</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+23"/>
-        <source>String used for commenting selected text</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+31"/>
-        <source>Long lines</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+25"/>
-        <source>Break long lines at line length</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+13"/>
-        <source>Break lines only in comments</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+60"/>
-        <source>Line length</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+9"/>
-        <source>Long line marker</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>Line</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>Background</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+38"/>
-        <source>Wrap long lines at curent window border</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+153"/>
-        <source>Auto insert after &quot;if&quot; etc.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
-        <source>Nothing</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>&quot;endif&quot; etc.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>&quot;end&quot;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+267"/>
-        <source>Restore editor tabs from previous session on startup or when editor is shown again after closing</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+105"/>
-        <source>Close all files when the editor widget is closed/hidden</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+120"/>
-        <source>Use foreground color</source>
-        <translation>使用前景色</translation>
-    </message>
-    <message>
-        <location line="+52"/>
-        <location line="+851"/>
-        <source>Font size</source>
-        <translation>字体大小</translation>
-    </message>
-    <message>
-        <location line="-655"/>
-        <source>File Browser</source>
-        <translation>文件浏览器</translation>
-    </message>
-    <message>
-        <location line="+144"/>
-        <source>Workspace</source>
-        <translation>工作空间</translation>
-    </message>
-    <message>
-        <location line="+35"/>
-        <source>Colors for variable attributes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <source>Hide tool tips</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+101"/>
-        <source>Import shortcut set</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>Export current shortcut set</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>Reset shortcuts to their defaults</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <location line="+80"/>
-        <source>Default</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-71"/>
-        <source>Edit a shortcut by double-clicking in a cell</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+76"/>
-        <source>Actual</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+17"/>
-        <source>Network</source>
-        <translation>网络</translation>
-    </message>
-    <message>
-        <location line="+23"/>
-        <source>Allow Octave to connect to the Octave web site to display current news and information</source>
-        <translation>允许 Octave 连接到 Octave 站点以显示当前新闻和信息</translation>
-    </message>
-    <message>
-        <location line="+46"/>
-        <source>Use proxy server</source>
-        <translation>使用代理服务器</translation>
-    </message>
-    <message>
-        <location line="+90"/>
-        <source>Variable Editor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+33"/>
-        <source>Default row height</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+17"/>
-        <source>20</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <source>Default column width</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>Use Terminal Font</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+27"/>
-        <source>2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+16"/>
-        <source>Autofit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <source>Plus font height</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+17"/>
-        <source>By Column</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Uniform</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+23"/>
-        <source>Variable Editor Colors</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+12"/>
-        <source>Use alternating row colors</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-287"/>
-        <source>HttpProxy</source>
-        <translation>HTTP Proxy</translation>
-    </message>
-    <message>
-        <location line="-2179"/>
-        <source>Icon set for dock widgets</source>
-        <translation>挂件的图标集</translation>
-    </message>
-    <message>
-        <location line="-220"/>
-        <source>Language (requires restart)</source>
-        <translation>语言 (需要重启)</translation>
+        <translation type="unfinished">属性</translation>
     </message>
     <message>
         <location line="-17"/>
-        <source>Icon size</source>
-        <translation>图标大小</translation>
-    </message>
-    <message>
-        <location line="-56"/>
-        <source>Normal</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1509"/>
-        <source>File handling</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+526"/>
-        <source>Behavior</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>Synchronize Octave working directory with file browser</source>
-        <translation>使用文件浏览器同步 Octave 工作目录</translation>
-    </message>
-    <message>
-        <location line="+22"/>
-        <source>Restore last directory of previous session</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+162"/>
-        <source>Shortcuts</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+31"/>
-        <source>Select this option to prevent conflicts with readline shortcuts</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Disable global shortcuts when terminal window has focus</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+53"/>
-        <source>Export</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-10"/>
-        <source>Import</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+90"/>
-        <source>Action</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+83"/>
-        <source>Socks5Proxy</source>
-        <translation>Socks5Proxy</translation>
-    </message>
-    <message>
-        <location line="-16"/>
-        <source>Hostname:</source>
-        <translation>主机名: </translation>
-    </message>
-    <message>
-        <location line="-342"/>
-        <source>Extensions of files to be opened in the default text editor (separated by &quot;;&quot;):</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+386"/>
-        <source>Proxy type:</source>
-        <translation>代理类型: </translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>Port:</source>
-        <translation>端口: </translation>
-    </message>
-    <message>
-        <location line="-27"/>
-        <source>Username:</source>
-        <translation>用户名: </translation>
-    </message>
-    <message>
-        <location line="+37"/>
-        <source>Password:</source>
-        <translation>密码: </translation>
-    </message>
-    <message>
-        <location filename="../src/settings-dialog.cc" line="+125"/>
-        <source>Octave Settings</source>
-        <translation type="unfinished"></translation>
+        <source>View the variables in the active workspace.&lt;br&gt;</source>
+        <translation>显示当前活动工作区的变量。&lt;br&gt;</translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Unable to save settings.  Missing settings file or unknown directory.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+15"/>
-        <location line="+4"/>
-        <location line="+489"/>
-        <source>System setting</source>
-        <translation>系统设置</translation>
-    </message>
-    <message>
-        <location line="-260"/>
-        <source>IBeam Cursor</source>
-        <translation>IBeam 光标</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Block Cursor</source>
-        <translation>块状光标</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Underline Cursor</source>
-        <translation>给光标添加下划线</translation>
-    </message>
-    <message>
-        <location line="+172"/>
-        <source>Set Octave Startup Directory</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Set File Browser Startup Directory</source>
-        <translation type="unfinished"></translation>
+        <source>Colors for variable attributes:</source>
+        <translation type="unfinished">变量属性的颜色:</translation>
     </message>
 </context>
 </TS>
diff -r e909207e9ff1 -r 56b26a3376d0 libgui/src/m-editor/file-editor-tab.cc
--- a/libgui/src/m-editor/file-editor-tab.cc	Fri Mar 30 17:47:12 2018 -0400
+++ b/libgui/src/m-editor/file-editor-tab.cc	Mon Apr 02 08:58:20 2018 -0700
@@ -2256,7 +2256,7 @@
                                         tr ("The current editor contents can not be encoded\n"
                                             "with the selected encoding %1.\n"
                                             "Using it will result in data loss!\n\n"
-                                            "Do you want to chose another encoding?").arg (_encoding),
+                                            "Do you want to choose another encoding?").arg (_encoding),
                                         QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes);
 
         if (ans == QMessageBox::Yes)
diff -r e909207e9ff1 -r 56b26a3376d0 libgui/src/settings-dialog.cc
--- a/libgui/src/settings-dialog.cc	Fri Mar 30 17:47:12 2018 -0400
+++ b/libgui/src/settings-dialog.cc	Mon Apr 02 08:58:20 2018 -0700
@@ -568,10 +568,10 @@
   read_terminal_colors (settings);
 
   // variable editor
-  ui->varedit_columnWidth->setText (settings->value ("variable_editor/column_width", "100").toString ());
+  ui->varedit_columnWidth->setValue (settings->value ("variable_editor/column_width", 100).toInt ());
   ui->varedit_autoFitColumnWidth->setChecked (settings->value ("variable_editor/autofit_column_width", false).toBool ());
   ui->varedit_autofitType->setCurrentIndex (settings->value ("autofit_type", 0).toInt ());
-  ui->varedit_rowHeight->setText (settings->value ("variable_editor/row_height", "2").toString ());
+  ui->varedit_rowHeight->setValue (settings->value ("variable_editor/row_height", 10).toInt ());
   ui->varedit_rowAutofit->setChecked (settings->value ("variable_editor/autofit_row_height", true).toBool ());
 
   ui->varedit_font->setCurrentFont (QFont (settings->value ("variable_editor/font_name", settings->value ("terminal/fontName", "Courier New")).toString ()));
@@ -961,8 +961,8 @@
   // Variable editor
   settings->setValue ("variable_editor/autofit_column_width", ui->varedit_autoFitColumnWidth->isChecked ());
   settings->setValue ("variable_editor/autofit_type", ui->varedit_autofitType->currentIndex ());
-  settings->setValue ("variable_editor/column_width", ui->varedit_columnWidth->text ());
-  settings->setValue ("variable_editor/row_height", ui->varedit_rowHeight->text ());
+  settings->setValue ("variable_editor/column_width", ui->varedit_columnWidth->value ());
+  settings->setValue ("variable_editor/row_height", ui->varedit_rowHeight->value ());
   settings->setValue ("variable_editor/autofit_row_height", ui->varedit_rowAutofit->isChecked ());
   settings->setValue ("variable_editor/use_terminal_font", ui->varedit_useTerminalFont->isChecked ());
   settings->setValue ("variable_editor/alternate_rows", ui->varedit_alternate->isChecked ());
diff -r e909207e9ff1 -r 56b26a3376d0 libgui/src/settings-dialog.ui
--- a/libgui/src/settings-dialog.ui	Fri Mar 30 17:47:12 2018 -0400
+++ b/libgui/src/settings-dialog.ui	Mon Apr 02 08:58:20 2018 -0700
@@ -32,7 +32,7 @@
       </size>
      </property>
      <property name="currentIndex">
-      <number>1</number>
+      <number>8</number>
      </property>
      <widget class="QWidget" name="tab_general">
       <property name="enabled">
@@ -509,7 +509,7 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>642</width>
+            <width>645</width>
             <height>1012</height>
            </rect>
           </property>
@@ -1823,8 +1823,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>481</width>
-            <height>230</height>
+            <width>658</width>
+            <height>573</height>
            </rect>
           </property>
           <layout class="QVBoxLayout" name="verticalLayout_7">
@@ -2104,8 +2104,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>474</width>
-            <height>196</height>
+            <width>658</width>
+            <height>573</height>
            </rect>
           </property>
           <layout class="QGridLayout" name="gridLayout_8">
@@ -2248,8 +2248,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>200</width>
-            <height>77</height>
+            <width>658</width>
+            <height>573</height>
            </rect>
           </property>
           <layout class="QVBoxLayout" name="verticalLayout_19">
@@ -2317,8 +2317,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>364</width>
-            <height>210</height>
+            <width>658</width>
+            <height>573</height>
            </rect>
           </property>
           <layout class="QVBoxLayout" name="verticalLayout_25">
@@ -2516,8 +2516,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>529</width>
-            <height>199</height>
+            <width>658</width>
+            <height>573</height>
            </rect>
           </property>
           <layout class="QVBoxLayout" name="verticalLayout_20">
@@ -2675,8 +2675,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>615</width>
-            <height>169</height>
+            <width>658</width>
+            <height>573</height>
            </rect>
           </property>
           <layout class="QVBoxLayout" name="verticalLayout_vesc_manual">
@@ -2692,6 +2692,26 @@
             <layout class="QVBoxLayout" name="verticalLayout_ve">
              <item>
               <layout class="QGridLayout" name="gridLayout_ve">
+               <item row="0" column="3">
+                <widget class="QLabel" name="label_26">
+                 <property name="text">
+                  <string>Font size</string>
+                 </property>
+                 <property name="alignment">
+                  <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+                 </property>
+                </widget>
+               </item>
+               <item row="2" column="2" colspan="2">
+                <widget class="QCheckBox" name="varedit_rowAutofit">
+                 <property name="text">
+                  <string>Plus font height</string>
+                 </property>
+                 <property name="checked">
+                  <bool>true</bool>
+                 </property>
+                </widget>
+               </item>
                <item row="2" column="0">
                 <widget class="QLabel" name="label_27">
                  <property name="text">
@@ -2709,13 +2729,6 @@
                  </property>
                 </widget>
                </item>
-               <item row="1" column="1">
-                <widget class="QLineEdit" name="varedit_columnWidth">
-                 <property name="text">
-                  <string>20</string>
-                 </property>
-                </widget>
-               </item>
                <item row="1" column="0">
                 <widget class="QLabel" name="label_ve_colwidth">
                  <property name="text">
@@ -2743,23 +2756,6 @@
                  </property>
                 </widget>
                </item>
-               <item row="0" column="3">
-                <widget class="QLabel" name="label_26">
-                 <property name="text">
-                  <string>Font size</string>
-                 </property>
-                 <property name="alignment">
-                  <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                 </property>
-                </widget>
-               </item>
-               <item row="2" column="1">
-                <widget class="QLineEdit" name="varedit_rowHeight">
-                 <property name="text">
-                  <string>2</string>
-                 </property>
-                </widget>
-               </item>
                <item row="0" column="1" colspan="2">
                 <widget class="QFontComboBox" name="varedit_font">
                  <property name="currentFont">
@@ -2776,16 +2772,6 @@
                  </property>
                 </widget>
                </item>
-               <item row="2" column="2" colspan="2">
-                <widget class="QCheckBox" name="varedit_rowAutofit">
-                 <property name="text">
-                  <string>Plus font height</string>
-                 </property>
-                 <property name="checked">
-                  <bool>true</bool>
-                 </property>
-                </widget>
-               </item>
                <item row="1" column="3" colspan="2">
                 <widget class="QComboBox" name="varedit_autofitType">
                  <property name="enabled">
@@ -2819,6 +2805,23 @@
                  </property>
                 </spacer>
                </item>
+               <item row="2" column="1">
+                <widget class="QSpinBox" name="varedit_rowHeight">
+                 <property name="value">
+                  <number>10</number>
+                 </property>
+                </widget>
+               </item>
+               <item row="1" column="1">
+                <widget class="QSpinBox" name="varedit_columnWidth">
+                 <property name="maximum">
+                  <number>500</number>
+                 </property>
+                 <property name="value">
+                  <number>100</number>
+                 </property>
+                </widget>
+               </item>
               </layout>
              </item>
              <item>
diff -r e909207e9ff1 -r 56b26a3376d0 libinterp/corefcn/mappers.cc
--- a/libinterp/corefcn/mappers.cc	Fri Mar 30 17:47:12 2018 -0400
+++ b/libinterp/corefcn/mappers.cc	Mon Apr 02 08:58:20 2018 -0700
@@ -126,14 +126,14 @@
 
 ## Test large magnitude arguments (bug #45507)
 ## Test fails with older versions of libm, solution is to upgrade.
-%!testif ; ! ismac ()   <*45507>
+%!testif ; ! ismac () && ! ispc ()   <*45507>
 %! x = [1, -1, i, -i] .* 1e150;
 %! v = [0, pi, pi/2, pi/2];
 %! assert (real (acos (x)), v);
 
 %!xtest <52627>
-%! ## Same test code as above, but intended only for test statistics on Mac.
-%! ## Mac trig/hyperbolic functions have huge tolerances.
+%! ## Same test code as above, but intended only for test statistics on Mac and
+%! ## Windows.  Their trig/hyperbolic functions have huge tolerances.
 %! if (! ismac ()), return; endif
 %! x = [1, -1, i, -i] .* 1e150;
 %! v = [0, pi, pi/2, pi/2];
@@ -201,14 +201,14 @@
 
 ## Test large magnitude arguments (bug #45507)
 ## Test fails with older versions of libm, solution is to upgrade.
-%!testif ; ! ismac ()   <*45507>
+%!testif ; ! ismac () && ! ispc ()   <*45507>
 %! x = [1, -1, i, -i] .* 1e150;
 %! v = [0, pi, pi/2, -pi/2];
 %! assert (imag (acosh (x)), v);
 
 %!xtest <52627>
-%! ## Same test code as above, but intended only for test statistics on Mac.
-%! ## Mac trig/hyperbolic functions have huge tolerances.
+%! ## Same test code as above, but intended only for test statistics on Mac and
+%! ## Windows.  Their trig/hyperbolic functions have huge tolerances.
 %! if (! ismac ()), return; endif
 %! x = [1, -1, i, -i] .* 1e150;
 %! v = [0, pi, pi/2, -pi/2];
@@ -329,14 +329,14 @@
 
 ## Test large magnitude arguments (bug #45507)
 ## Test fails with older versions of libm, solution is to upgrade.
-%!testif ; ! ismac ()   <*45507>
+%!testif ; ! ismac () && ! ispc ()   <*45507>
 %! x = [1, -1, i, -i] .* 1e150;
 %! v = [pi/2, -pi/2, 0, -0];
 %! assert (real (asin (x)), v);
 
 %!xtest <52627>
-%! ## Same test code as above, but intended only for test statistics on Mac.
-%! ## Mac trig/hyperbolic functions have huge tolerances.
+%! ## Same test code as above, but intended only for test statistics on Mac and
+%! ## Windows. Their trig/hyperbolic functions have huge tolerances.
 %! if (! ismac ()), return; endif
 %! x = [1, -1, i, -i] .* 1e150;
 %! v = [pi/2, -pi/2, 0, -0];
@@ -372,14 +372,14 @@
 
 ## Test large magnitude arguments (bug #45507)
 ## Test fails with older versions of libm, solution is to upgrade.
-%!testif ; ! ismac ()   <*45507>
+%!testif ; ! ismac () && ! ispc ()   <*45507>
 %! x = [1, -1, i, -i] .* 1e150;
 %! v = [0, 0, pi/2, -pi/2];
 %! assert (imag (asinh (x)), v);
 
 %!xtest <52627>
-%! ## Same test code as above, but intended only for test statistics on Mac.
-%! ## Mac trig/hyperbolic functions have huge tolerances.
+%! ## Same test code as above, but intended only for test statistics on Mac and
+%! ## Windows.  Their trig/hyperbolic functions have huge tolerances.
 %! if (! ismac ()), return; endif
 %! x = [1, -1, i, -i] .* 1e150;
 %! v = [0, 0, pi/2, -pi/2];
diff -r e909207e9ff1 -r 56b26a3376d0 libinterp/corefcn/quad.cc
--- a/libinterp/corefcn/quad.cc	Fri Mar 30 17:47:12 2018 -0400
+++ b/libinterp/corefcn/quad.cc	Mon Apr 02 08:58:20 2018 -0700
@@ -270,6 +270,7 @@
             default:
               error ("quad: TOL must be a 1 or 2-element vector");
             }
+          OCTAVE_FALLTHROUGH;
 
         case 3:
           if (indefinite)
@@ -365,6 +366,7 @@
             default:
               error ("quad: TOL must be a 1 or 2-element vector");
             }
+          OCTAVE_FALLTHROUGH;
 
         case 3:
           if (indefinite)
diff -r e909207e9ff1 -r 56b26a3376d0 scripts/specfun/gammainc.m
--- a/scripts/specfun/gammainc.m	Fri Mar 30 17:47:12 2018 -0400
+++ b/scripts/specfun/gammainc.m	Mon Apr 02 08:58:20 2018 -0700
@@ -296,7 +296,11 @@
 ## a == 1.
 function y = gammainc_a1 (x, tail)
   if (strcmp (tail, "lower"))
-    y = 1 - exp (-x);
+    if (abs (x) < 1/2)
+      y = - expm1 (-x);
+    else
+      y = 1 - exp (-x);
+    endif
   elseif (strcmp (tail, "upper"))
     y = exp (-x);
   elseif (strcmp (tail, "scaledlower"))
@@ -511,6 +515,10 @@
 %!        [0.0000496679133402659, 4.99666791633340e-7, 4.99996666679167e-11, ...
 %!        4.99999999666667e-19, 4.99999999999997e-29], -1e-12);
 
+%!test <*53543>
+%! y_exp = 9.995001666250085e-04;
+%! assert (gammainc (1/1000, 1), y_exp, -eps);
+
 ## FIXME: should this be tagged with a bug report number?
 %!xtest
 %! assert (gammainc (-20, 1.1, "upper"), ...
diff -r e909207e9ff1 -r 56b26a3376d0 src/main.in.cc
--- a/src/main.in.cc	Fri Mar 30 17:47:12 2018 -0400
+++ b/src/main.in.cc	Mon Apr 02 08:58:20 2018 -0700
@@ -243,7 +243,6 @@
           // require less memory.  Don't pass the --no-gui-libs option
           // on as that option is not recognized by Octave.
 
-          start_gui = false;
           gui_libs = false;
           file = octave_cli;
         }
@@ -303,6 +302,25 @@
         new_argv[k++] = argv[i];
     }
 
+  // At this point, gui_libs and start_gui are just about options, not
+  // the environment.  Exit if they don't make sense.
+
+  if (start_gui)
+    {
+      if (! gui_libs)
+        {
+          std::cerr << "octave: conflicting options: --no-gui-libs and --gui"
+                    << std::endl;
+          return 1;
+        }
+
+#if ! defined (HAVE_OCTAVE_QT_GUI)
+      std::cerr << "octave: GUI features missing or disabled in this build"
+                << std::endl;
+      return 1;
+#endif
+    }
+
   new_argv[k] = nullptr;
 
   if (no_display)