Cherry-picking upstream version 0.6.0+20151227.

Removed dbg package in favor of dbgsym. Fixied debian/docs Simplifed debian/rules Renamed debian/qterminal.manpages to debian/manpages
8 years ago · 8efa303345
parent 44bb546f94
commit 8efa303345
25 changed files with 348 additions and 401 deletions
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@ -1,16 +1,16 @@
 # Bug reports

 Please file bugs on the qterminal github tracker:
-  https://github.com/qterminal/qterminal/
+  https://github.com/lxde/qterminal/issues

 Please file qtermwidget-related bugs on the qtermwidget github tracker:
-  https://github.com/qterminal/qtermwidget/
+  https://github.com/lxde/qtermwidget/issues


 # Code contributions

 For all code contributions, please open a pull request on Github:
-  https://github.com/qterminal/qterminal/
+  https://github.com/lxde/qterminal/

 Make sure your code is clean, devoid of debug statements and respects the style
 of the rest of the file (including line length and indentation).
--- a/15
+++ b/15
@ -1,15 +0,0 @@
-Requirements:
-    Qt >= 5.2
-    cmake
-    qtermwidget (https://github.com/qterminal/qtermwidget)
-
-Build:
-    A shadow build (out of source) is strongly recommended
-    http://www.cmake.org/Wiki/CMake_FAQ#Out-of-source_build_trees
-
-    1) mkdir -p build && cd build
-    2) cmake path/to/source
-    3) make
-    4) optional: make install
-
-    Read cmake docs to fine tune the build process (CMAKE_INSTALL_PREFIX, etc...)
--- a/59
+++ b/59
@ -278,62 +278,3 @@ PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGES.

                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License along
-    with this program; if not, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.
--- a/8
+++ b/8
@ -1,8 +0,0 @@
-qterminal
-
-## Installation
-See the INSTALL file for details
-
-## Translations
- - Edit src/CMakeLists.txt to add a new ts file.
- - make lupdate updates ts files to be translated (lrelease is called automatically in make)
--- a/README.md
+++ b/README.md
@ -0,0 +1,29 @@
+# QTerminal
+
+The lightweight Qt terminal emulator
+
+## Installation
+
+### Requirements
+
+* Qt >= 5.2
+* CMake >= 2.8
+* [qtermwidget](https://github.com/lxde/qtermwidget)
+
+
+### Building
+
+A shadow build (out of source) is strongly recommended
+http://www.cmake.org/Wiki/CMake_FAQ#Out-of-source_build_trees
+
+1. `mkdir -p build && cd build`
+2. `cmake <path/to/source>`
+3. `make`
+4. (to install) `make install`
+
+Read cmake docs to fine tune the build process (CMAKE_INSTALL_PREFIX, etc...)
+
+## Translations
+
+* Edit `src/CMakeLists.txt` to add a new ts file.
+* `make lupdate` updates ts files to be translated (lrelease is called automatically in make)
--- a/debian/changelog
+++ b/debian/changelog
@ -1,3 +1,13 @@
+qterminal (0.6.0+20151227-1) unstable; urgency=medium
+
+  * Cherry-picking upstream version 0.6.0+20151227.
+  * Removed dbg package in favor of dbgsym.
+  * Fixied debian/docs
+  * Simplifed debian/rules
+  * Renamed debian/qterminal.manpages to debian/manpages
+
+ -- Alf Gaida <agaida@siduction.org>  Sun, 27 Dec 2015 17:57:04 +0100
+
 qterminal (0.6.0+20150802-2) unstable; urgency=medium

  * Change x-terminal-emulator alternative priority to 40. (Closes: #802430)
--- a/debian/control
+++ b/debian/control
@ -32,22 +32,3 @@ Description: QT-based multitab terminal emulator
  * Multiple tab.
  * Customized shortcut.
  * Change color scheme.
-
-Package: qterminal-dbg
-Architecture: any
-Section: debug
-Priority: extra
-Depends: ${shlibs:Depends},
-         ${misc:Depends},
-         qterminal (= ${binary:Version})
-Description: QT-based multitab terminal emulator (debug symbols)
- Qterminal is a Qt-based multitab terminal forked from QTermWidget, it is
- lightweight, open-source, specially designed for LXQt desktop environment.
- .
- The features of qterminal include:
-  * Split terminal horizontal and vertical.
-  * Multiple tab.
-  * Customized shortcut.
-  * Change color scheme.
- .
- This package contains debug symbols for qterminal.
--- a/debian/docs
+++ b/debian/docs
@ -1,3 +1,3 @@
 AUTHORS
 CONTRIBUTING.md
-README
+README.md
--- a/debian/qterminal.manpages
+++ b/debian/qterminal.manpages
--- a/debian/postinst
+++ b/debian/postinst
@ -1,7 +1,5 @@
 #!/bin/sh
 # postinst script for qterminal
-#
-# see: dh_installdeb(1)

 set -e

@ -19,9 +17,6 @@ case "$1" in
    ;;
 esac

-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
 #DEBHELPER#

 exit 0
--- a/debian/prerm
+++ b/debian/prerm
@ -1,24 +1,8 @@
 #!/bin/sh
 # postrm script for qterminal
-#
-# see: dh_installdeb(1)

 set -e

-# summary of how this script can be called:
-#        * <postrm> `remove'
-#        * <postrm> `purge'
-#        * <old-postrm> `upgrade' <new-version>
-#        * <new-postrm> `failed-upgrade' <old-version>
-#        * <new-postrm> `abort-install'
-#        * <new-postrm> `abort-install' <old-version>
-#        * <new-postrm> `abort-upgrade' <old-version>
-#        * <disappearer's-postrm> `disappear' <overwriter>
-#          <overwriter-version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-
 case "$1" in
    purge|remove|disappear)
        update-alternatives --remove x-terminal-emulator /usr/bin/qterminal | exit 0
@ -33,9 +17,6 @@ case "$1" in
        ;;
 esac

-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
 #DEBHELPER#

 exit 0
--- a/debian/rules
+++ b/debian/rules
@ -4,10 +4,5 @@
 export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed

 %:
-	dh $@  --buildsystem cmake --parallel
-
-override_dh_auto_install:
-	dh_auto_install -- DESTDIR=$(CURDIR)/debian/qterminal
-
-override_dh_strip:
-	dh_strip --dbg-package=qterminal-dbg
+	dh ${@} --buildsystem cmake \
+		--parallel
--- a/qterminal.appdata.xml
+++ b/qterminal.appdata.xml
@ -38,5 +38,5 @@
      <caption>Find bar and highlighted match.</caption>
    </screenshot>
  </screenshots>
-  <url type="homepage">https://github.com/qterminal/qterminal</url>
+  <url type="homepage">https://github.com/lxde/qterminal</url>
 </application>
--- a/qterminal.desktop
+++ b/qterminal.desktop
@ -8,6 +8,7 @@ Comment[de]=Befehlszeile verwenden
 Comment[fr]=Terminal
 Comment[pt]=Emulador de terminal
 Comment[ru_RU]=Эмулятор терминала
+Comment[ja]=ターミナル　エミュレータ

 Icon=utilities-terminal
 Exec=qterminal
@ -17,8 +18,8 @@ Actions=Dropdown;

 [Desktop Action Dropdown]
 Name=Drop-down terminal
-Icon=qterminal
 Exec=qterminal --drop
+Icon=utilities-terminal

 Name[en_GB]=Drop-down Terminal
 Name[bg]=Падащ терминал
--- a/qterminal_drop.desktop
+++ b/qterminal_drop.desktop
@ -3,11 +3,12 @@ Type=Application
 Exec=qterminal --drop
 Terminal=false
 Categories=Qt;System;TerminalEmulator;
-Icon=qterminal
+Icon=utilities-terminal

 Name=QTerminal drop down
 Name[de]=QTerminal herabhängend
 Name[pt]=QTerminal suspenso
+Name[ja]=QTerminal ドロップダウン

 GenericName=Drop-down Terminal
 GenericName[bg]=Падащ терминал
@ -47,3 +48,5 @@ Comment=A drop-down terminal emulator.
 Comment[de]=Ein Ausklapp-Terminalemulator.
 Comment[pt]=Um emulador de terminal suspenso.
 Comment[ru]=Вападающий эмулятор терминала.
+Comment[ja]=ドロップダウン式　ターミナルエミュレータ
+
--- a/src/forms/propertiesdialog.ui
+++ b/src/forms/propertiesdialog.ui
@ -34,7 +34,7 @@
     </property>
     <property name="minimumSize">
      <size>
-       <width>100</width>
+       <width>150</width>
       <height>0</height>
      </size>
     </property>
--- a/src/forms/qterminal.ui
+++ b/src/forms/qterminal.ui
@ -63,6 +63,9 @@
     <height>26</height>
    </rect>
   </property>
+   <property name="autoFillBackground">
+    <bool>true</bool>
+   </property>
   <widget class="QMenu" name="menu_File">
    <property name="title">
     <string>&amp;File</string>
--- a/src/main.cpp
+++ b/src/main.cpp
@ -49,8 +49,8 @@ void print_usage_and_exit(int code)
    puts("  -p,  --profile            Load qterminal with specific options");
    puts("  -v,  --version            Prints application version and exits");
    puts("  -w,  --workdir <dir>      Start session with specified work directory");
-    puts("\nHomepage: <https://github.com/qterminal>");
-    puts("Report bugs to <https://github.com/qterminal/qterminal>");
+    puts("\nHomepage: <https://github.com/lxde/qterminal>");
+    puts("Report bugs to <https://github.com/lxde/qterminal/issues>");
    exit(code);
 }

@ -122,7 +122,7 @@ int main(int argc, char *argv[])
        QIcon::setThemeName("QTerminal");

    // translations
-    QString fname = QString("qterminal_%1.qm").arg(QLocale::system().name().left(2));
+    QString fname = QString("qterminal_%1.qm").arg(QLocale::system().name().left(5));
    QTranslator translator;
 #ifdef TRANSLATIONS_DIR
    qDebug() << "TRANSLATIONS_DIR: Loading translation file" << fname << "from dir" << TRANSLATIONS_DIR;
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@ -52,7 +52,9 @@ MainWindow::MainWindow(const QString& work_dir,

    m_bookmarksDock = new QDockWidget(tr("Bookmarks"), this);
    m_bookmarksDock->setObjectName("BookmarksDockWidget");
+    m_bookmarksDock->setAutoFillBackground(true);
    BookmarksWidget *bookmarksWidget = new BookmarksWidget(m_bookmarksDock);
+    bookmarksWidget->setAutoFillBackground(true);
    m_bookmarksDock->setWidget(bookmarksWidget);
    addDockWidget(Qt::LeftDockWidgetArea, m_bookmarksDock);
    connect(bookmarksWidget, SIGNAL(callCommand(QString)),
@ -511,15 +513,18 @@ void MainWindow::closeEvent(QCloseEvent *ev)
    {
        // #80 - do not save state and geometry in drop mode
        if (!m_dropMode) {
-	    if (Properties::Instance()->savePosOnExit) {
+            if (Properties::Instance()->savePosOnExit) {
            	Properties::Instance()->mainWindowPosition = pos();
-	    }
-	    if (Properties::Instance()->saveSizeOnExit) {
+            }
+            if (Properties::Instance()->saveSizeOnExit) {
            	Properties::Instance()->mainWindowSize = size();
-	    }
+            }
            Properties::Instance()->mainWindowState = saveState();
        }
        Properties::Instance()->saveSettings();
+        for (int i = consoleTabulator->count(); i > 0; --i) {
+            consoleTabulator->removeTab(i - 1);
+        }
        ev->accept();
        return;
    }
@ -531,6 +536,7 @@ void MainWindow::closeEvent(QCloseEvent *ev)

    QCheckBox * dontAskCheck = new QCheckBox(tr("Do not ask again"), dia);
    QDialogButtonBox * buttonBox = new QDialogButtonBox(QDialogButtonBox::Yes | QDialogButtonBox::No, Qt::Horizontal, dia);
+    buttonBox->button(QDialogButtonBox::Yes)->setDefault(true);

    connect(buttonBox, SIGNAL(accepted()), dia, SLOT(accept()));
    connect(buttonBox, SIGNAL(rejected()), dia, SLOT(reject()));
@ -547,6 +553,9 @@ void MainWindow::closeEvent(QCloseEvent *ev)
        Properties::Instance()->mainWindowState = saveState();
        Properties::Instance()->askOnExit = !dontAskCheck->isChecked();
        Properties::Instance()->saveSettings();
+        for (int i = consoleTabulator->count(); i > 0; --i) {
+            consoleTabulator->removeTab(i - 1);
+        }
        ev->accept();
    } else {
        ev->ignore();
--- a/src/tabwidget.cpp
+++ b/src/tabwidget.cpp
@ -50,6 +50,7 @@ TabWidget::TabWidget(QWidget* parent) : QTabWidget(parent), tabNumerator(0)

    connect(this, SIGNAL(tabCloseRequested(int)), this, SLOT(removeTab(int)));
    connect(tabBar(), SIGNAL(tabMoved(int,int)), this, SLOT(updateTabIndices()));
+    connect(this, SIGNAL(tabRenameRequested(int)), this, SLOT(renameSession(int)));
 }

 TermWidgetHolder * TabWidget::terminalHolder()
@ -78,9 +79,7 @@ int TabWidget::addNewTab(const QString & shell_program)

    TermWidgetHolder *console = new TermWidgetHolder(cwd, shell_program, this);
    connect(console, SIGNAL(finished()), SLOT(removeFinished()));
-    //connect(console, SIGNAL(lastTerminalClosed()), this, SLOT(removeCurrentTab()));
    connect(console, SIGNAL(lastTerminalClosed()), this, SLOT(removeFinished()));
-    connect(console, SIGNAL(renameSession()), this, SLOT(renameSession()));

    int index = addTab(console, label);
    updateTabIndices();
@ -153,7 +152,7 @@ void TabWidget::updateTabIndices()
        widget(i)->setProperty(TAB_INDEX_PROPERTY, i);
 }

-void TabWidget::renameSession()
+void TabWidget::renameSession(int index)
 {
    bool ok = false;
    QString text = QInputDialog::getText(this, tr("Tab name"),
@ -161,7 +160,7 @@ void TabWidget::renameSession()
                                        QString(), &ok);
    if(ok && !text.isEmpty())
    {
-        setTabText(currentIndex(), text);
+        setTabText(index, text);
    }
 }

@ -179,11 +178,17 @@ void TabWidget::contextMenuEvent ( QContextMenuEvent * event )
 {
    QMenu menu(this);

-    menu.addAction(QIcon::fromTheme("document-close"), tr("Close session"),
-                   this, SLOT(removeCurrentTab()));
-    menu.addAction(tr("Rename session"), this, SLOT(renameSession()), tr(RENAME_SESSION_SHORTCUT));
+    QAction *close = menu.addAction(QIcon::fromTheme("document-close"), tr("Close session"));
+    QAction *rename = menu.addAction(tr("Rename session"));
+    rename->setShortcut(tr(RENAME_SESSION_SHORTCUT));

-    menu.exec(event->globalPos());
+    int tabIndex = tabBar()->tabAt(event->pos());
+    QAction *action = menu.exec(event->globalPos());
+    if (action == close) {
+        emit tabCloseRequested(tabIndex);
+    } else if (action == rename) {
+        emit tabRenameRequested(tabIndex);
+    }
 }

 bool TabWidget::eventFilter(QObject *obj, QEvent *event)
@ -193,10 +198,11 @@ bool TabWidget::eventFilter(QObject *obj, QEvent *event)
        QMouseEvent *e = reinterpret_cast<QMouseEvent*>(event);
        // if user doubleclicks on tab button - rename it. If user
        // clicks on free space - open new tab
-        if (tabBar()->tabAt(e->pos()) == -1)
+        int index = tabBar()->tabAt(e->pos());
+        if (index == -1)
            addNewTab();
        else
-            renameSession();
+            renameSession(index);
        return true;
    }
    return QTabWidget::eventFilter(obj, event);
--- a/src/tabwidget.h
+++ b/src/tabwidget.h
@ -48,7 +48,7 @@ public slots:
    void removeFinished();
    void moveLeft();
    void moveRight();
-    void renameSession();
+    void renameSession(int);
    void setWorkDirectory(const QString&);

    void switchNextSubterminal();
@ -79,6 +79,7 @@ public slots:

 signals:
    void closeTabNotification();
+    void tabRenameRequested(int);

 protected:
    enum Direction{Left = 1, Right};
--- a/src/translations/qterminal_de.ts
+++ b/src/translations/qterminal_de.ts
@ -36,232 +36,237 @@
 <context>
    <name>MainWindow</name>
    <message>
-        <location filename="../mainwindow.cpp" line="319"/>
-        <source>Close Tab</source>
-        <translation>Reiter schließen</translation>
+        <location filename="../mainwindow.cpp" line="53"/>
+        <source>Bookmarks</source>
+        <translation>Lesezeichen</translation>
    </message>
    <message>
-        <location filename="../mainwindow.cpp" line="175"/>
-        <source>Split Terminal Horizontally</source>
-        <translation>Terminal horizontal teilen</translation>
+        <location filename="../mainwindow.cpp" line="98"/>
+        <source>Rename Session</source>
+        <translation>Sitzung umbenennen</translation>
    </message>
    <message>
-        <location filename="../mainwindow.cpp" line="182"/>
-        <source>Split Terminal Vertically</source>
-        <translation>Terminal vertikal teilen</translation>
+        <location filename="../mainwindow.cpp" line="131"/>
+        <source>Press &quot;%1&quot; to see the terminal.</source>
+        <translation>&quot;%1&quot; tippen, um das Terminal zu sehen.</translation>
    </message>
    <message>
-        <location filename="../mainwindow.cpp" line="189"/>
-        <source>Collapse Subterminal</source>
-        <translation>Unterterminal schließen</translation>
+        <location filename="../mainwindow.cpp" line="142"/>
+        <source>&amp;Clear Current Tab</source>
+        <translation>&amp;Aktuellen Reiter leeren</translation>
    </message>
    <message>
-        <location filename="../mainwindow.cpp" line="196"/>
-        <source>Next Subterminal</source>
-        <translation>Nächstes Unterterminal</translation>
+        <location filename="../mainwindow.cpp" line="151"/>
+        <source>&amp;Next Tab</source>
+        <translation>&amp;Nächster Reiter</translation>
    </message>
    <message>
-        <location filename="../mainwindow.cpp" line="203"/>
-        <source>Previous Subterminal</source>
-        <translation>Voriges Unterterminal</translation>
+        <location filename="../mainwindow.cpp" line="158"/>
+        <source>&amp;Previous Tab</source>
+        <translation>&amp;Voriger Reiter</translation>
    </message>
    <message>
-        <location filename="../mainwindow.cpp" line="145"/>
-        <source>Next Tab</source>
-        <translation>Nächster Reiter</translation>
+        <location filename="../mainwindow.cpp" line="165"/>
+        <source>Move Tab &amp;Left</source>
+        <translation>Reiter nach &amp;links verschieben</translation>
    </message>
    <message>
-        <location filename="../mainwindow.cpp" line="152"/>
-        <source>Previous Tab</source>
-        <translation>Voriger Reiter</translation>
+        <location filename="../mainwindow.cpp" line="172"/>
+        <source>Move Tab &amp;Right</source>
+        <translation>Reiter nach &amp;rechts verschieben</translation>
    </message>
    <message>
-        <location filename="../mainwindow.cpp" line="159"/>
-        <source>Move Tab Left</source>
-        <translation>Reiter nach links verschieben</translation>
+        <location filename="../mainwindow.cpp" line="181"/>
+        <source>Split Terminal &amp;Horizontally</source>
+        <translation>Terminal &amp;horizontal teilen</translation>
    </message>
    <message>
-        <location filename="../mainwindow.cpp" line="166"/>
-        <source>Move Tab Right</source>
-        <translation>Reiter nach rechts verschieben</translation>
+        <location filename="../mainwindow.cpp" line="188"/>
+        <source>Split Terminal &amp;Vertically</source>
+        <translation>Terminal &amp;vertikal teilen</translation>
    </message>
    <message>
-        <location filename="../mainwindow.cpp" line="213"/>
-        <source>Copy Selection</source>
-        <translation>Textauswahl kopieren</translation>
+        <location filename="../mainwindow.cpp" line="195"/>
+        <source>&amp;Collapse Subterminal</source>
+        <translation>&amp;Unterterminal schließen</translation>
    </message>
    <message>
-        <location filename="../mainwindow.cpp" line="227"/>
-        <source>Paste Selection</source>
-        <translation>Textauswahl einfügen</translation>
+        <location filename="../mainwindow.cpp" line="202"/>
+        <source>N&amp;ext Subterminal</source>
+        <translation>Nächst&amp;es Unterterminal</translation>
    </message>
    <message>
-        <location filename="../mainwindow.cpp" line="269"/>
-        <source>Save Session</source>
-        <translation>Sitzung speichern</translation>
+        <location filename="../mainwindow.cpp" line="209"/>
+        <source>P&amp;revious Subterminal</source>
+        <translation>Vo&amp;riges Unterterminal</translation>
    </message>
    <message>
-        <location filename="../mainwindow.cpp" line="275"/>
-        <source>Load Session</source>
-        <translation>Sitzung laden</translation>
+        <location filename="../mainwindow.cpp" line="219"/>
+        <source>Copy &amp;Selection</source>
+        <translation>Textau&amp;swahl kopieren</translation>
    </message>
    <message>
-        <location filename="../mainwindow.cpp" line="308"/>
-        <source>New Tab From Preset</source>
-        <translation>Neuer Reiter von Vorlage</translation>
+        <location filename="../mainwindow.cpp" line="226"/>
+        <source>Paste Clip&amp;board</source>
+        <translation>Zwischena&amp;blage einfügen</translation>
    </message>
    <message>
-        <location filename="../mainwindow.cpp" line="309"/>
-        <source>1 Terminal</source>
-        <translation>1 Terminal</translation>
+        <location filename="../mainwindow.cpp" line="233"/>
+        <source>Paste S&amp;election</source>
+        <translation>Textauswahl &amp;einfügen</translation>
    </message>
    <message>
-        <location filename="../mainwindow.cpp" line="311"/>
-        <source>2 Horizontal Terminals</source>
-        <translation>2 horizontale Terminals</translation>
+        <location filename="../mainwindow.cpp" line="240"/>
+        <source>Zoom &amp;in</source>
+        <translation>Ver&amp;größern</translation>
    </message>
    <message>
-        <location filename="../mainwindow.cpp" line="313"/>
-        <source>2 Vertical Terminals</source>
-        <translation>2 vertikale Terminals</translation>
+        <location filename="../mainwindow.cpp" line="247"/>
+        <source>Zoom &amp;out</source>
+        <translation>Ver&amp;kleinern</translation>
    </message>
    <message>
-        <location filename="../mainwindow.cpp" line="315"/>
-        <source>4 Terminals</source>
-        <translation>4 Terminals</translation>
+        <location filename="../mainwindow.cpp" line="254"/>
+        <source>Zoom rese&amp;t</source>
+        <translation>Zurückse&amp;tzen</translation>
    </message>
    <message>
-        <location filename="../mainwindow.cpp" line="395"/>
-        <source>Bottom</source>
-        <translation>Unten</translation>
+        <location filename="../mainwindow.cpp" line="263"/>
+        <source>&amp;Find...</source>
+        <translation>&amp;Suchen...</translation>
    </message>
    <message>
-        <location filename="../mainwindow.cpp" line="396"/>
-        <source>Top</source>
-        <translation>Oben</translation>
+        <location filename="../mainwindow.cpp" line="275"/>
+        <source>&amp;Save Session</source>
+        <translation>&amp;Sitzung speichern</translation>
    </message>
    <message>
-        <location filename="../mainwindow.cpp" line="397"/>
-        <location filename="../mainwindow.cpp" line="428"/>
-        <source>Right</source>
-        <translation>Rechts</translation>
+        <location filename="../mainwindow.cpp" line="281"/>
+        <source>&amp;Load Session</source>
+        <translation>Sitzung &amp;laden</translation>
    </message>
    <message>
-        <location filename="../mainwindow.cpp" line="398"/>
-        <location filename="../mainwindow.cpp" line="429"/>
-        <source>Left</source>
-        <translation>Links</translation>
+        <location filename="../mainwindow.cpp" line="288"/>
+        <source>&amp;Toggle Menu</source>
+        <translation>&amp;Menü ein-/ausblenden</translation>
    </message>
    <message>
-        <location filename="../mainwindow.cpp" line="413"/>
-        <source>Tabs Layout</source>
-        <translation>Anzeige Reiterleiste</translation>
+        <location filename="../mainwindow.cpp" line="307"/>
+        <source>&amp;New Tab</source>
+        <translation>Neuer Rei&amp;ter</translation>
    </message>
    <message>
-        <location filename="../mainwindow.cpp" line="427"/>
-        <source>None</source>
-        <translation>Keine</translation>
+        <location filename="../mainwindow.cpp" line="314"/>
+        <source>New Tab From &amp;Preset</source>
+        <translation>Neuer Reiter von Vor&amp;lage</translation>
    </message>
    <message>
-        <location filename="../mainwindow.cpp" line="445"/>
-        <source>Scrollbar Layout</source>
-        <translation>Anzeige Bildlaufleiste</translation>
+        <location filename="../mainwindow.cpp" line="315"/>
+        <source>1 &amp;Terminal</source>
+        <translation>1 &amp;Terminal</translation>
    </message>
    <message>
-        <location filename="../mainwindow.cpp" line="500"/>
-        <source>Exit QTerminal</source>
-        <translation>QTerminal beenden</translation>
+        <location filename="../mainwindow.cpp" line="317"/>
+        <source>2 &amp;Horizontal Terminals</source>
+        <translation>2 &amp;horizontale Terminals</translation>
    </message>
    <message>
-        <location filename="../mainwindow.cpp" line="502"/>
-        <source>Do not ask again</source>
-        <translation>Nicht erneut nachfragen</translation>
+        <location filename="../mainwindow.cpp" line="319"/>
+        <source>2 &amp;Vertical Terminals</source>
+        <translation>2 &amp;vertikale Terminals</translation>
    </message>
    <message>
-        <location filename="../mainwindow.cpp" line="509"/>
-        <source>Are you sure you want to exit?</source>
-        <translation>Sind Sie sicher, dass Sie QTerminal beenden wollen?</translation>
+        <location filename="../mainwindow.cpp" line="321"/>
+        <source>4 Terminal&amp;s</source>
+        <translation>4 Terminal&amp;s</translation>
    </message>
    <message>
-        <location filename="../mainwindow.cpp" line="529"/>
-        <source>A lightweight multiplatform terminal emulator</source>
-        <translation>Ein schlanker plattformunabhängiger Terminalemulator</translation>
+        <location filename="../mainwindow.cpp" line="325"/>
+        <source>&amp;Close Tab</source>
+        <translation>&amp;Reiter schließen</translation>
    </message>
    <message>
-        <location filename="../mainwindow.cpp" line="53"/>
-        <source>Bookmarks</source>
-        <translation>Lesezeichen</translation>
+        <location filename="../mainwindow.cpp" line="332"/>
+        <source>&amp;New Window</source>
+        <translation>&amp;Neues Fenster</translation>
    </message>
    <message>
-        <location filename="../mainwindow.cpp" line="92"/>
-        <source>Rename Session</source>
-        <translation>Sitzung umbenennen</translation>
+        <location filename="../mainwindow.cpp" line="366"/>
+        <source>&amp;Hide Window Borders</source>
+        <translation>Fensterra&amp;hmen ausblenden</translation>
    </message>
    <message>
-        <location filename="../mainwindow.cpp" line="125"/>
-        <source>Press &quot;%1&quot; to see the terminal.</source>
-        <translation>Tippen Sie &quot;%1&quot;, um das Terminal zu sehen.</translation>
+        <location filename="../mainwindow.cpp" line="381"/>
+        <source>&amp;Show Tab Bar</source>
+        <translation>Reiterlei&amp;ste anzeigen</translation>
    </message>
    <message>
-        <location filename="../mainwindow.cpp" line="136"/>
-        <source>Clear Current Tab</source>
-        <translation>Aktuellen Reiter leeren</translation>
+        <location filename="../mainwindow.cpp" line="393"/>
+        <source>Fullscreen</source>
+        <translation>Vollbild</translation>
    </message>
    <message>
-        <location filename="../mainwindow.cpp" line="220"/>
-        <source>Paste Clipboard</source>
-        <translation>Zwischenablage einfügen</translation>
+        <location filename="../mainwindow.cpp" line="413"/>
+        <source>&amp;Bottom</source>
+        <translation>&amp;Unten</translation>
    </message>
    <message>
-        <location filename="../mainwindow.cpp" line="234"/>
-        <source>Zoom in</source>
-        <translation>Vergrößern</translation>
+        <location filename="../mainwindow.cpp" line="414"/>
+        <source>&amp;Top</source>
+        <translation>&amp;Oben</translation>
    </message>
    <message>
-        <location filename="../mainwindow.cpp" line="241"/>
-        <source>Zoom out</source>
-        <translation>Verkleinern</translation>
+        <location filename="../mainwindow.cpp" line="415"/>
+        <location filename="../mainwindow.cpp" line="446"/>
+        <source>&amp;Right</source>
+        <translation>&amp;Rechts</translation>
    </message>
    <message>
-        <location filename="../mainwindow.cpp" line="248"/>
-        <source>Zoom reset</source>
-        <translation>Zurücksetzen</translation>
+        <location filename="../mainwindow.cpp" line="416"/>
+        <location filename="../mainwindow.cpp" line="447"/>
+        <source>&amp;Left</source>
+        <translation>&amp;Links</translation>
    </message>
    <message>
-        <location filename="../mainwindow.cpp" line="257"/>
-        <source>Find...</source>
-        <translation>Suchen...</translation>
+        <location filename="../mainwindow.cpp" line="431"/>
+        <source>&amp;Tabs Layout</source>
+        <translation>&amp;Anzeige Reiterleiste</translation>
    </message>
    <message>
-        <location filename="../mainwindow.cpp" line="282"/>
-        <source>Toggle Menu</source>
-        <translation>Menü ein-/ausblenden</translation>
+        <location filename="../mainwindow.cpp" line="445"/>
+        <source>&amp;None</source>
+        <translation>&amp;Keine</translation>
    </message>
    <message>
-        <location filename="../mainwindow.cpp" line="301"/>
-        <source>New Tab</source>
-        <translation>Neuer Reiter</translation>
+        <location filename="../mainwindow.cpp" line="463"/>
+        <source>S&amp;crollbar Layout</source>
+        <translation>&amp;Anzeige Bildlaufleiste</translation>
    </message>
    <message>
-        <location filename="../mainwindow.cpp" line="326"/>
-        <source>New Window</source>
-        <translation>Neues Fenster</translation>
+        <location filename="../mainwindow.cpp" line="530"/>
+        <source>Exit QTerminal</source>
+        <translation>QTerminal beenden</translation>
    </message>
    <message>
-        <location filename="../mainwindow.cpp" line="360"/>
-        <source>Hide Window Borders</source>
-        <translation>Fensterrahmen ausblenden</translation>
+        <location filename="../mainwindow.cpp" line="532"/>
+        <source>Do not ask again</source>
+        <translation>Nicht erneut nachfragen</translation>
    </message>
    <message>
-        <location filename="../mainwindow.cpp" line="374"/>
-        <source>Show Tab Bar</source>
-        <translation>Reiterleiste anzeigen</translation>
+        <location filename="../mainwindow.cpp" line="539"/>
+        <source>Are you sure you want to exit?</source>
+        <translation>Soll QTerminal wirklich beendet werden?</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="560"/>
+        <source>A lightweight multiplatform terminal emulator</source>
+        <translation>Ein schlanker plattformunabhängiger Terminalemulator</translation>
    </message>
 </context>
 <context>
    <name>PropertiesDialog</name>
    <message>
-        <location filename="../forms/propertiesdialog.ui" line="316"/>
+        <location filename="../forms/propertiesdialog.ui" line="319"/>
        <source>Emulation</source>
        <translation>Emulation</translation>
    </message>
@ -282,7 +287,7 @@
    </message>
    <message>
        <location filename="../forms/propertiesdialog.ui" line="57"/>
-        <location filename="../forms/propertiesdialog.ui" line="341"/>
+        <location filename="../forms/propertiesdialog.ui" line="344"/>
        <source>Behavior</source>
        <translation>Verhalten</translation>
    </message>
@ -337,88 +342,98 @@
        <translation>Start mit Vorlage:</translation>
    </message>
    <message>
-        <location filename="../forms/propertiesdialog.ui" line="205"/>
+        <location filename="../forms/propertiesdialog.ui" line="208"/>
        <source>None (single terminal)</source>
        <translation>Keine (ein Terminal)</translation>
    </message>
    <message>
-        <location filename="../forms/propertiesdialog.ui" line="210"/>
+        <location filename="../forms/propertiesdialog.ui" line="213"/>
        <source>2 terminals horizontally</source>
        <translation>2 horizontale Terminals</translation>
    </message>
    <message>
-        <location filename="../forms/propertiesdialog.ui" line="215"/>
+        <location filename="../forms/propertiesdialog.ui" line="218"/>
        <source>2 terminals vertically</source>
        <translation>2 vertikale Terminals</translation>
    </message>
    <message>
-        <location filename="../forms/propertiesdialog.ui" line="220"/>
+        <location filename="../forms/propertiesdialog.ui" line="223"/>
        <source>4 terminals</source>
        <translation>4 Terminals</translation>
    </message>
    <message>
-        <location filename="../forms/propertiesdialog.ui" line="256"/>
+        <location filename="../forms/propertiesdialog.ui" line="259"/>
        <source>Font</source>
        <translation>Schriftart</translation>
    </message>
    <message>
-        <location filename="../forms/propertiesdialog.ui" line="325"/>
+        <location filename="../forms/propertiesdialog.ui" line="328"/>
        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Which behavior to emulate. Note that this does not have to match your operating system.&lt;/p&gt;&lt;p&gt;The &lt;span style=&quot; font-weight:600;&quot;&gt;default&lt;/span&gt; emulation is a fallback with a minimal featureset.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Verhalten des Emulators wählen. Hinweis: Emulationsarten können auch unter anderen Systemen genutzt werden (z.B. &quot;linux&quot; unter OS X).&lt;/p&gt;&lt;p&gt;Die Standardemulation ist &lt;span style=&quot; font-weight:600;&quot;&gt;default&lt;/span&gt; mit minimalem Funktionsumfang.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
    </message>
    <message>
-        <location filename="../forms/propertiesdialog.ui" line="347"/>
+        <location filename="../forms/propertiesdialog.ui" line="350"/>
        <source>Action after paste</source>
        <translation>Aktion nach Einfügen aus der Zwischenablage</translation>
    </message>
    <message>
-        <location filename="../forms/propertiesdialog.ui" line="380"/>
+        <location filename="../forms/propertiesdialog.ui" line="383"/>
        <source>Open new terminals in current working directory</source>
        <translation>Neues Terminal im aktuellen Verzeichnis öffnen</translation>
    </message>
    <message>
-        <location filename="../forms/propertiesdialog.ui" line="387"/>
+        <location filename="../forms/propertiesdialog.ui" line="390"/>
+        <source>Save Size when closing</source>
+        <translation>Beim Beenden Größe speichern</translation>
+    </message>
+    <message>
+        <location filename="../forms/propertiesdialog.ui" line="397"/>
+        <source>Save Position when closing</source>
+        <translation>Beim Beenden Position speichern</translation>
+    </message>
+    <message>
+        <location filename="../forms/propertiesdialog.ui" line="404"/>
        <source>Ask for confirmation when closing</source>
        <translation>Beim Schließen eines Fensters nachfragen</translation>
    </message>
    <message>
-        <location filename="../forms/propertiesdialog.ui" line="397"/>
+        <location filename="../forms/propertiesdialog.ui" line="414"/>
        <source>Unlimited history</source>
        <translation>Uneingeschränkte Historie</translation>
    </message>
    <message>
-        <location filename="../forms/propertiesdialog.ui" line="404"/>
+        <location filename="../forms/propertiesdialog.ui" line="421"/>
        <source>History size (in lines)</source>
        <translation>Historie (Zeilen)</translation>
    </message>
    <message>
-        <location filename="../forms/propertiesdialog.ui" line="472"/>
+        <location filename="../forms/propertiesdialog.ui" line="489"/>
        <source>Height</source>
        <translation>Höhe</translation>
    </message>
    <message>
-        <location filename="../forms/propertiesdialog.ui" line="479"/>
-        <location filename="../forms/propertiesdialog.ui" line="493"/>
+        <location filename="../forms/propertiesdialog.ui" line="496"/>
+        <location filename="../forms/propertiesdialog.ui" line="510"/>
        <source>%</source>
        <translation>%</translation>
    </message>
    <message>
-        <location filename="../forms/propertiesdialog.ui" line="486"/>
+        <location filename="../forms/propertiesdialog.ui" line="503"/>
        <source>Width</source>
        <translation>Breite</translation>
    </message>
    <message>
-        <location filename="../forms/propertiesdialog.ui" line="536"/>
+        <location filename="../forms/propertiesdialog.ui" line="553"/>
        <source>Edit bookmark file contents</source>
        <translation>Lesezeichendatei bearbeiten</translation>
    </message>
    <message>
-        <location filename="../forms/propertiesdialog.ui" line="558"/>
+        <location filename="../forms/propertiesdialog.ui" line="575"/>
        <source>Enable bookmarks</source>
        <translation>Lesezeichen verwenden</translation>
    </message>
    <message>
-        <location filename="../forms/propertiesdialog.ui" line="567"/>
+        <location filename="../forms/propertiesdialog.ui" line="584"/>
        <source>Bookmark file</source>
        <translation>Lesezeichendatei</translation>
    </message>
@ -429,12 +444,12 @@
        <translation>%</translation>
    </message>
    <message>
-        <location filename="../forms/propertiesdialog.ui" line="437"/>
+        <location filename="../forms/propertiesdialog.ui" line="454"/>
        <source>Shortcut</source>
        <translation>Tastenkürzel</translation>
    </message>
    <message>
-        <location filename="../forms/propertiesdialog.ui" line="442"/>
+        <location filename="../forms/propertiesdialog.ui" line="459"/>
        <source>Key</source>
        <translation>Taste</translation>
    </message>
@ -446,88 +461,88 @@
    <message>
        <location filename="../forms/propertiesdialog.ui" line="137"/>
        <source>Hide tab bar with only one tab</source>
-        <translation type="unfinished">Reiterleiste bei nur einem Reiter vergergen</translation>
+        <translation>Reiterleiste bei nur einem Reiter verbergen</translation>
    </message>
    <message>
-        <location filename="../forms/propertiesdialog.ui" line="289"/>
+        <location filename="../forms/propertiesdialog.ui" line="292"/>
        <source>&amp;Change...</source>
-        <translation type="unfinished">&amp;Ändern...</translation>
+        <translation>&amp;Ändern...</translation>
    </message>
    <message>
-        <location filename="../forms/propertiesdialog.ui" line="454"/>
+        <location filename="../forms/propertiesdialog.ui" line="471"/>
        <source>Show on start</source>
        <translation>Beim Start anzeigen</translation>
    </message>
    <message>
-        <location filename="../forms/propertiesdialog.ui" line="461"/>
+        <location filename="../forms/propertiesdialog.ui" line="478"/>
        <source>Size</source>
        <translation>Größe</translation>
    </message>
    <message>
-        <location filename="../forms/propertiesdialog.ui" line="507"/>
+        <location filename="../forms/propertiesdialog.ui" line="524"/>
        <source>Shortcut:</source>
        <translation>Tastenkürzel:</translation>
    </message>
    <message>
-        <location filename="../forms/propertiesdialog.ui" line="577"/>
+        <location filename="../forms/propertiesdialog.ui" line="594"/>
        <source>Find...</source>
        <translation>Suchen...</translation>
    </message>
    <message>
-        <location filename="../forms/propertiesdialog.ui" line="586"/>
+        <location filename="../forms/propertiesdialog.ui" line="603"/>
        <source>You can specify your own bookmarks file location. It allows easy bookmark sharing with tools like OwnCloud or Dropbox.</source>
        <translation>Sie können eine Datei für eigene Lesezeichen angeben. Das erlaubt einfachen Austausch mit Werkzeugen wie OwnCloud oder DropBox.</translation>
    </message>
    <message>
-        <location filename="../propertiesdialog.cpp" line="45"/>
+        <location filename="../propertiesdialog.cpp" line="61"/>
        <source>No scrollbar</source>
        <translation>Keine Bildlaufleiste</translation>
    </message>
    <message>
-        <location filename="../propertiesdialog.cpp" line="45"/>
-        <location filename="../propertiesdialog.cpp" line="51"/>
+        <location filename="../propertiesdialog.cpp" line="61"/>
+        <location filename="../propertiesdialog.cpp" line="67"/>
        <source>Left</source>
        <translation>Links</translation>
    </message>
    <message>
-        <location filename="../propertiesdialog.cpp" line="45"/>
-        <location filename="../propertiesdialog.cpp" line="51"/>
+        <location filename="../propertiesdialog.cpp" line="61"/>
+        <location filename="../propertiesdialog.cpp" line="67"/>
        <source>Right</source>
        <translation>Rechts</translation>
    </message>
    <message>
-        <location filename="../propertiesdialog.cpp" line="51"/>
+        <location filename="../propertiesdialog.cpp" line="67"/>
        <source>Top</source>
        <translation>Oben</translation>
    </message>
    <message>
-        <location filename="../propertiesdialog.cpp" line="51"/>
+        <location filename="../propertiesdialog.cpp" line="67"/>
        <source>Bottom</source>
        <translation>Unten</translation>
    </message>
    <message>
-        <location filename="../propertiesdialog.cpp" line="63"/>
+        <location filename="../propertiesdialog.cpp" line="79"/>
        <source>No move</source>
        <translation>Nicht bewegen</translation>
    </message>
    <message>
-        <location filename="../propertiesdialog.cpp" line="63"/>
+        <location filename="../propertiesdialog.cpp" line="79"/>
        <source>Move start</source>
        <translation>An den Anfang bewegen</translation>
    </message>
    <message>
-        <location filename="../propertiesdialog.cpp" line="63"/>
+        <location filename="../propertiesdialog.cpp" line="79"/>
        <source>Move end</source>
        <translation>An das Ende bewegen</translation>
    </message>
    <message>
-        <location filename="../propertiesdialog.cpp" line="68"/>
-        <location filename="../propertiesdialog.cpp" line="122"/>
+        <location filename="../propertiesdialog.cpp" line="84"/>
+        <location filename="../propertiesdialog.cpp" line="139"/>
        <source>System Default</source>
        <translation>Systemstandard</translation>
    </message>
    <message>
-        <location filename="../propertiesdialog.cpp" line="252"/>
+        <location filename="../propertiesdialog.cpp" line="272"/>
        <source>Open or create bookmarks file</source>
        <translation>Lesezeichendatei öffnen oder erstellen</translation>
    </message>
@ -535,12 +550,12 @@
 <context>
    <name>QObject</name>
    <message>
-        <location filename="../bookmarkswidget.cpp" line="97"/>
+        <location filename="../bookmarkswidget.cpp" line="110"/>
        <source>Local Bookmarks</source>
        <translation>Lokale Lesezeichen</translation>
    </message>
    <message>
-        <location filename="../bookmarkswidget.cpp" line="187"/>
+        <location filename="../bookmarkswidget.cpp" line="167"/>
        <source>Synchronized Bookmarks</source>
        <translation>Synchronisierte Lesezeichen</translation>
    </message>
@ -548,28 +563,28 @@
 <context>
    <name>TabWidget</name>
    <message>
-        <location filename="../tabwidget.cpp" line="69"/>
-        <location filename="../tabwidget.cpp" line="174"/>
+        <location filename="../tabwidget.cpp" line="68"/>
+        <location filename="../tabwidget.cpp" line="173"/>
        <source>Shell No. %1</source>
        <translation>Shell Nr. %1</translation>
    </message>
    <message>
-        <location filename="../tabwidget.cpp" line="160"/>
+        <location filename="../tabwidget.cpp" line="159"/>
        <source>Tab name</source>
        <translation>Reiterbezeichnung</translation>
    </message>
    <message>
-        <location filename="../tabwidget.cpp" line="161"/>
+        <location filename="../tabwidget.cpp" line="160"/>
        <source>New tab name:</source>
        <translation>Neue Reiterbezeichnung:</translation>
    </message>
    <message>
-        <location filename="../tabwidget.cpp" line="183"/>
+        <location filename="../tabwidget.cpp" line="182"/>
        <source>Close session</source>
        <translation>Sitzung schließen</translation>
    </message>
    <message>
-        <location filename="../tabwidget.cpp" line="185"/>
+        <location filename="../tabwidget.cpp" line="184"/>
        <source>Rename session</source>
        <translation>Sitzung umbenennen</translation>
    </message>
@ -577,65 +592,65 @@
 <context>
    <name>TermWidgetHolder</name>
    <message>
-        <location filename="../termwidgetholder.cpp" line="46"/>
+        <location filename="../termwidgetholder.cpp" line="64"/>
        <source>Load Session</source>
        <translation>Sitzung laden</translation>
    </message>
    <message>
-        <location filename="../termwidgetholder.cpp" line="47"/>
+        <location filename="../termwidgetholder.cpp" line="65"/>
        <source>List of saved sessions:</source>
        <translation>Liste der gespeicherten Sitzungen:</translation>
    </message>
 </context>
 <context>
    <name>mainWindow</name>
+    <message>
+        <location filename="../forms/qterminal.ui" line="68"/>
+        <source>&amp;File</source>
+        <translation>&amp;Datei</translation>
+    </message>
    <message>
        <location filename="../forms/qterminal.ui" line="76"/>
-        <source>Actions</source>
-        <translation>Aktionen</translation>
+        <source>&amp;Actions</source>
+        <translation>&amp;Aktionen</translation>
    </message>
    <message>
        <location filename="../forms/qterminal.ui" line="81"/>
-        <source>Help</source>
-        <translation>Hilfe</translation>
+        <source>&amp;Help</source>
+        <translation>&amp;Hilfe</translation>
+    </message>
+    <message>
+        <location filename="../forms/qterminal.ui" line="88"/>
+        <source>&amp;View</source>
+        <translation>&amp;Ansicht</translation>
    </message>
    <message>
        <location filename="../forms/qterminal.ui" line="93"/>
-        <source>Edit</source>
-        <translation>Bearbeiten</translation>
+        <source>&amp;Edit</source>
+        <translation>&amp;Bearbeiten</translation>
    </message>
    <message>
-        <location filename="../forms/qterminal.ui" line="107"/>
-        <source>About...</source>
-        <translation>Über...</translation>
+        <location filename="../forms/qterminal.ui" line="109"/>
+        <source>&amp;About...</source>
+        <translation>Ü&amp;ber...</translation>
    </message>
    <message>
-        <location filename="../forms/qterminal.ui" line="112"/>
-        <source>About Qt...</source>
-        <translation>Über Qt...</translation>
+        <location filename="../forms/qterminal.ui" line="114"/>
+        <source>About &amp;Qt...</source>
+        <translation>Über &amp;Qt...</translation>
    </message>
    <message>
-        <location filename="../forms/qterminal.ui" line="117"/>
+        <location filename="../forms/qterminal.ui" line="119"/>
        <source>&amp;Preferences...</source>
        <translation>&amp;Einstellungen...</translation>
    </message>
    <message>
        <location filename="../forms/qterminal.ui" line="14"/>
        <source>MainWindow</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../forms/qterminal.ui" line="68"/>
-        <source>File</source>
-        <translation>Datei</translation>
-    </message>
-    <message>
-        <location filename="../forms/qterminal.ui" line="88"/>
-        <source>View</source>
-        <translation>Ansicht</translation>
+        <translation>Hauptfenster</translation>
    </message>
    <message>
-        <location filename="../forms/qterminal.ui" line="125"/>
+        <location filename="../forms/qterminal.ui" line="129"/>
        <source>&amp;Quit</source>
        <translation>&amp;Beenden</translation>
    </message>
--- a/src/translations/qterminal_ja.ts
+++ b/src/translations/qterminal_ja.ts
@ -235,7 +235,7 @@
    <message>
        <location filename="../mainwindow.cpp" line="287"/>
        <source>&amp;Toggle Menu</source>
-        <translation>トグルメニュー(&amp;T)</translation>
+        <translation>メニューの表示/非表示(&amp;T)</translation>
    </message>
    <message>
        <location filename="../mainwindow.cpp" line="306"/>
@ -324,7 +324,7 @@
    <message>
        <location filename="../forms/propertiesdialog.ui" line="144"/>
        <source>Show a border around the current terminal</source>
-        <translation type="unfinished">カレントターミナルの境界を表示</translation>
+        <translation>カレントターミナルの境界を表示</translation>
    </message>
    <message>
        <location filename="../forms/propertiesdialog.ui" line="151"/>
@ -339,7 +339,7 @@
    <message>
        <location filename="../forms/propertiesdialog.ui" line="184"/>
        <source>Start with preset:</source>
-        <translation type="unfinished">プリセットでスタート</translation>
+        <translation>プリセットでスタート</translation>
    </message>
    <message>
        <location filename="../forms/propertiesdialog.ui" line="208"/>
@ -369,37 +369,37 @@
    <message>
        <location filename="../forms/propertiesdialog.ui" line="328"/>
        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Which behavior to emulate. Note that this does not have to match your operating system.&lt;/p&gt;&lt;p&gt;The &lt;span style=&quot; font-weight:600;&quot;&gt;default&lt;/span&gt; emulation is a fallback with a minimal featureset.&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;/p&gt;&lt;p&gt; &lt;span style=&quot; font-weight:600;&quot;&gt;default&lt;/span&gt;エミュレーションは最小の機能にフォールバックしたものです。&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;エミュレータの挙動の選択。注意して頂きたいのは、この選択はオペレーティングシステムと適合する必要はありません。&lt;/p&gt;&lt;p&gt; &lt;span style=&quot; font-weight:600;&quot;&gt;default&lt;/span&gt;エミュレーションは最小の機能にフォールバックしたものです。&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
    </message>
    <message>
        <location filename="../forms/propertiesdialog.ui" line="350"/>
        <source>Action after paste</source>
-        <translation type="unfinished">貼り付け後の挙動</translation>
+        <translation>貼り付け後の挙動</translation>
    </message>
    <message>
        <location filename="../forms/propertiesdialog.ui" line="383"/>
        <source>Open new terminals in current working directory</source>
-        <translation type="unfinished">カレントディレクトリに新しいターミナルを開く</translation>
+        <translation>カレントディレクトリに新しいターミナルを開く</translation>
    </message>
    <message>
        <location filename="../forms/propertiesdialog.ui" line="390"/>
        <source>Save Size when closing</source>
-        <translation type="unfinished">閉じるときにサイズを保存する</translation>
+        <translation>閉じるときにサイズを保存する</translation>
    </message>
        <message>
        <location filename="../forms/propertiesdialog.ui" line="397"/>
        <source>Save Position when closing</source>
-        <translation type="unfinished">閉じるときに位置を保存する</translation>
+        <translation>閉じるときに位置を保存する</translation>
    </message>
    <message>
        <location filename="../forms/propertiesdialog.ui" line="404"/>
        <source>Ask for confirmation when closing</source>
-        <translation type="unfinished">閉じるときに確認する</translation>
+        <translation>閉じるときに確認する</translation>
    </message>
    <message>
        <location filename="../forms/propertiesdialog.ui" line="414"/>
        <source>Unlimited history</source>
-        <translation type="unfinished">履歴を制限しない</translation>
+        <translation>履歴を制限しない</translation>
    </message>
    <message>
        <location filename="../forms/propertiesdialog.ui" line="421"/>
@ -420,7 +420,7 @@
    <message>
        <location filename="../forms/propertiesdialog.ui" line="486"/>
        <source>Width</source>
-        <translation type="unfinished">幅</translation>
+        <translation>幅</translation>
    </message>
    <message>
        <location filename="../forms/propertiesdialog.ui" line="536"/>
@ -430,7 +430,7 @@
    <message>
        <location filename="../forms/propertiesdialog.ui" line="558"/>
        <source>Enable bookmarks</source>
-        <translation type="unfinished">ブックマークを利用可能にする</translation>
+        <translation>ブックマークを利用可能にする</translation>
    </message>
    <message>
        <location filename="../forms/propertiesdialog.ui" line="567"/>
@ -461,12 +461,12 @@
    <message>
        <location filename="../forms/propertiesdialog.ui" line="137"/>
        <source>Hide tab bar with only one tab</source>
-        <translation type="unfinished">1つのタブしか使用していない場合、タブバーを隠す</translation>
+        <translation>1つのタブしか使用していない場合、タブバーを隠す</translation>
    </message>
    <message>
        <location filename="../forms/propertiesdialog.ui" line="289"/>
        <source>&amp;Change...</source>
-        <translation type="unfinished">変更（&amp;C)...</translation>
+        <translation>変更（&amp;C)...</translation>
    </message>
    <message>
        <location filename="../forms/propertiesdialog.ui" line="454"/>
@ -491,7 +491,7 @@
    <message>
        <location filename="../forms/propertiesdialog.ui" line="586"/>
        <source>You can specify your own bookmarks file location. It allows easy bookmark sharing with tools like OwnCloud or Dropbox.</source>
-        <translation type="unfinished">ブックマークファイルの場所を指定することができます。OwnCloudやDropboxのようなツールとブックマークを共有することが容易にできます。</translation>
+        <translation>ブックマークファイルの場所を指定することができます。OwnCloudやDropboxのようなツールとブックマークを共有することが容易にできます。</translation>
    </message>
    <message>
        <location filename="../propertiesdialog.cpp" line="45"/>
@ -523,17 +523,17 @@
    <message>
        <location filename="../propertiesdialog.cpp" line="63"/>
        <source>No move</source>
-        <translation>無動作</translation>
+        <translation type="unfinished">無動作</translation>
    </message>
    <message>
        <location filename="../propertiesdialog.cpp" line="63"/>
        <source>Move start</source>
-        <translation>動作開始</translation>
+        <translation type="unfinished">動作開始</translation>
    </message>
    <message>
        <location filename="../propertiesdialog.cpp" line="63"/>
        <source>Move end</source>
-        <translation>動作終了</translation>
+        <translation type="unfinished">動作終了</translation>
    </message>
    <message>
        <location filename="../propertiesdialog.cpp" line="68"/>
@ -632,7 +632,7 @@
    <message>
        <location filename="../forms/qterminal.ui" line="119"/>
        <source>&amp;Preferences...</source>
-        <translation type="unfinished">設定(&amp;P)...</translation>
+        <translation>設定(&amp;P)...</translation>
    </message>
    <message>
        <location filename="../forms/qterminal.ui" line="14"/>
--- a/src/translations/qterminal_ru.ts
+++ b/src/translations/qterminal_ru.ts
@ -15,7 +15,7 @@
        <location filename="../forms/fontdialog.ui" line="14"/>
        <location filename="../forms/fontdialog.ui" line="73"/>
        <source>Select Terminal Font</source>
-        <translation>Выбрать шрифт терминала</translation>
+        <translation>Выберите шрифт терминала</translation>
    </message>
    <message>
        <location filename="../forms/fontdialog.ui" line="32"/>
@ -68,12 +68,12 @@
    <message>
        <location filename="../mainwindow.cpp" line="164"/>
        <source>Move Tab &amp;Left</source>
-        <translation>Сдвинуть вкладку &amp;влево</translation>
+        <translation>Сдвинуть вкладку в&amp;лево</translation>
    </message>
    <message>
        <location filename="../mainwindow.cpp" line="171"/>
        <source>Move Tab &amp;Right</source>
-        <translation>Сдвинуть вкладку &amp;вправо</translation>
+        <translation>Сдвинуть вкладку в&amp;право</translation>
    </message>
    <message>
        <location filename="../mainwindow.cpp" line="180"/>
@ -250,7 +250,7 @@
    <message>
        <location filename="../mainwindow.cpp" line="531"/>
        <source>Do not ask again</source>
-        <translation>Не справшивать снова</translation>
+        <translation>Не спрашивать снова</translation>
    </message>
    <message>
        <location filename="../mainwindow.cpp" line="538"/>
@ -260,7 +260,7 @@
    <message>
        <location filename="../mainwindow.cpp" line="559"/>
        <source>A lightweight multiplatform terminal emulator</source>
-        <translation>Лёгкий мультиплатформенный эмулятор терминала </translation>
+        <translation>Лёгкий мультиплатформенный эмулятор терминала</translation>
    </message>
 </context>
 <context>
@ -324,7 +324,7 @@
    <message>
        <location filename="../forms/propertiesdialog.ui" line="130"/>
        <source>Show the menu bar</source>
-        <translation>Показать панель меню</translation>
+        <translation>Показывать панель меню</translation>
    </message>
    <message>
        <location filename="../forms/propertiesdialog.ui" line="144"/>
@ -374,7 +374,7 @@
    <message>
        <location filename="../forms/propertiesdialog.ui" line="328"/>
        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Which behavior to emulate. Note that this does not have to match your operating system.&lt;/p&gt;&lt;p&gt;The &lt;span style=&quot; font-weight:600;&quot;&gt;default&lt;/span&gt; emulation is a fallback with a minimal featureset.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Какое поведение эмулировать. Обратите внимание, что это не обязательно должн осоответствовать вашей операционной системе.&lt;/p&gt;&lt;p&gt;Эмуляция &lt;span style=&quot; font-weight:600;&quot;&gt;по умолчанию&lt;/span&gt; — это запасной режим с минимальным набором функций.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Какое поведение эмулировать. Обратите внимание, что это не обязательно должно соответствовать вашей операционной системе.&lt;/p&gt;&lt;p&gt;Эмуляция &lt;span style=&quot; font-weight:600;&quot;&gt;по умолчанию&lt;/span&gt; - это запасной режим с минимальным набором функций.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
    </message>
    <message>
        <location filename="../forms/propertiesdialog.ui" line="350"/>
@ -384,7 +384,7 @@
    <message>
        <location filename="../forms/propertiesdialog.ui" line="383"/>
        <source>Open new terminals in current working directory</source>
-        <translation>Открывать новые терминалы в текущей рабочей папке</translation>
+        <translation>Открывать новые терминалы в текущем рабочем каталоге</translation>
    </message>
    <message>
        <location filename="../forms/propertiesdialog.ui" line="390"/>
@ -523,17 +523,17 @@
    <message>
        <location filename="../propertiesdialog.cpp" line="63"/>
        <source>No move</source>
-        <translation type="unfinished"></translation>
+        <translation>Не двигаться</translation>
    </message>
    <message>
        <location filename="../propertiesdialog.cpp" line="63"/>
        <source>Move start</source>
-        <translation type="unfinished"></translation>
+        <translation>Переместиться в начало</translation>
    </message>
    <message>
        <location filename="../propertiesdialog.cpp" line="63"/>
        <source>Move end</source>
-        <translation type="unfinished"></translation>
+        <translation>Переместиться в конец</translation>
    </message>
    <message>
        <location filename="../propertiesdialog.cpp" line="68"/>
--- a/src/translations/qterminal_zh_CN.ts
+++ b/src/translations/qterminal_zh_CN.ts
@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.1" language="ja">
+<TS version="2.1" language="zh_CN">
 <context>
    <name>BookmarksWidget</name>
    <message>