diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index a849a6d..14c7cf8 100644 --- 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). diff --git a/INSTALL b/INSTALL deleted file mode 100644 index c2654d9..0000000 --- a/INSTALL +++ /dev/null @@ -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...) diff --git a/COPYING b/LICENSE similarity index 84% rename from COPYING rename to LICENSE index d159169..d8cf7d4 100644 --- a/COPYING +++ b/LICENSE @@ -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. - - - Copyright (C) - - 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. - - , 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. diff --git a/README b/README deleted file mode 100644 index 283403d..0000000 --- a/README +++ /dev/null @@ -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) diff --git a/README.md b/README.md new file mode 100644 index 0000000..4954c1f --- /dev/null +++ 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 ` +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) diff --git a/debian/changelog b/debian/changelog index 45b2dc9..4866b4e 100644 --- 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 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) diff --git a/debian/control b/debian/control index 810d02f..145b7cf 100644 --- 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. diff --git a/debian/docs b/debian/docs index b6f9bad..26270aa 100644 --- a/debian/docs +++ b/debian/docs @@ -1,3 +1,3 @@ AUTHORS CONTRIBUTING.md -README +README.md diff --git a/debian/qterminal.manpages b/debian/manpages similarity index 100% rename from debian/qterminal.manpages rename to debian/manpages diff --git a/debian/postinst b/debian/postinst index 31e01bc..44cdd41 100755 --- 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 diff --git a/debian/prerm b/debian/prerm index 3cb9935..751b2ee 100644 --- 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: -# * `remove' -# * `purge' -# * `upgrade' -# * `failed-upgrade' -# * `abort-install' -# * `abort-install' -# * `abort-upgrade' -# * `disappear' -# -# 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 diff --git a/debian/rules b/debian/rules index aea6b92..e8abf41 100755 --- 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 diff --git a/qterminal.appdata.xml b/qterminal.appdata.xml index f289d02..7e59987 100644 --- a/qterminal.appdata.xml +++ b/qterminal.appdata.xml @@ -38,5 +38,5 @@ Find bar and highlighted match. - https://github.com/qterminal/qterminal + https://github.com/lxde/qterminal diff --git a/qterminal.desktop b/qterminal.desktop index 92f8511..91a1b68 100644 --- 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]=Падащ терминал diff --git a/qterminal_drop.desktop b/qterminal_drop.desktop index baf3603..1da3605 100644 --- 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]=ドロップダウン式　ターミナルエミュレータ + diff --git a/src/forms/propertiesdialog.ui b/src/forms/propertiesdialog.ui index 144ff05..24a2fc1 100644 --- a/src/forms/propertiesdialog.ui +++ b/src/forms/propertiesdialog.ui @@ -34,7 +34,7 @@ - 100 + 150 0 diff --git a/src/forms/qterminal.ui b/src/forms/qterminal.ui index f98ef5e..55761fe 100644 --- a/src/forms/qterminal.ui +++ b/src/forms/qterminal.ui @@ -63,6 +63,9 @@ 26 + + true + &File diff --git a/src/main.cpp b/src/main.cpp index b4dbfe8..ceab01f 100644 --- 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 Start session with specified work directory"); - puts("\nHomepage: "); - puts("Report bugs to "); + puts("\nHomepage: "); + puts("Report bugs to "); 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; diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 74de0d5..ce67cf9 100644 --- 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(); diff --git a/src/tabwidget.cpp b/src/tabwidget.cpp index 0e2d423..4ca3a61 100644 --- 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(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); diff --git a/src/tabwidget.h b/src/tabwidget.h index 1140c61..806b4f6 100644 --- 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}; diff --git a/src/translations/qterminal_de.ts b/src/translations/qterminal_de.ts index 01d49f4..4d5f503 100644 --- a/src/translations/qterminal_de.ts +++ b/src/translations/qterminal_de.ts @@ -36,232 +36,237 @@ MainWindow - - Close Tab - Reiter schließen + + Bookmarks + Lesezeichen - - Split Terminal Horizontally - Terminal horizontal teilen + + Rename Session + Sitzung umbenennen - - Split Terminal Vertically - Terminal vertikal teilen + + Press "%1" to see the terminal. + "%1" tippen, um das Terminal zu sehen. - - Collapse Subterminal - Unterterminal schließen + + &Clear Current Tab + &Aktuellen Reiter leeren - - Next Subterminal - Nächstes Unterterminal + + &Next Tab + &Nächster Reiter - - Previous Subterminal - Voriges Unterterminal + + &Previous Tab + &Voriger Reiter - - Next Tab - Nächster Reiter + + Move Tab &Left + Reiter nach &links verschieben - - Previous Tab - Voriger Reiter + + Move Tab &Right + Reiter nach &rechts verschieben - - Move Tab Left - Reiter nach links verschieben + + Split Terminal &Horizontally + Terminal &horizontal teilen - - Move Tab Right - Reiter nach rechts verschieben + + Split Terminal &Vertically + Terminal &vertikal teilen - - Copy Selection - Textauswahl kopieren + + &Collapse Subterminal + &Unterterminal schließen - - Paste Selection - Textauswahl einfügen + + N&ext Subterminal + Nächst&es Unterterminal - - Save Session - Sitzung speichern + + P&revious Subterminal + Vo&riges Unterterminal - - Load Session - Sitzung laden + + Copy &Selection + Textau&swahl kopieren - - New Tab From Preset - Neuer Reiter von Vorlage + + Paste Clip&board + Zwischena&blage einfügen - - 1 Terminal - 1 Terminal + + Paste S&election + Textauswahl &einfügen - - 2 Horizontal Terminals - 2 horizontale Terminals + + Zoom &in + Ver&größern - - 2 Vertical Terminals - 2 vertikale Terminals + + Zoom &out + Ver&kleinern - - 4 Terminals - 4 Terminals + + Zoom rese&t + Zurückse&tzen - - Bottom - Unten + + &Find... + &Suchen... - - Top - Oben + + &Save Session + &Sitzung speichern - - - Right - Rechts + + &Load Session + Sitzung &laden - - - Left - Links + + &Toggle Menu + &Menü ein-/ausblenden - - Tabs Layout - Anzeige Reiterleiste + + &New Tab + Neuer Rei&ter - - None - Keine + + New Tab From &Preset + Neuer Reiter von Vor&lage - - Scrollbar Layout - Anzeige Bildlaufleiste + + 1 &Terminal + 1 &Terminal - - Exit QTerminal - QTerminal beenden + + 2 &Horizontal Terminals + 2 &horizontale Terminals - - Do not ask again - Nicht erneut nachfragen + + 2 &Vertical Terminals + 2 &vertikale Terminals - - Are you sure you want to exit? - Sind Sie sicher, dass Sie QTerminal beenden wollen? + + 4 Terminal&s + 4 Terminal&s - - A lightweight multiplatform terminal emulator - Ein schlanker plattformunabhängiger Terminalemulator + + &Close Tab + &Reiter schließen - - Bookmarks - Lesezeichen + + &New Window + &Neues Fenster - - Rename Session - Sitzung umbenennen + + &Hide Window Borders + Fensterra&hmen ausblenden - - Press "%1" to see the terminal. - Tippen Sie "%1", um das Terminal zu sehen. + + &Show Tab Bar + Reiterlei&ste anzeigen - - Clear Current Tab - Aktuellen Reiter leeren + + Fullscreen + Vollbild - - Paste Clipboard - Zwischenablage einfügen + + &Bottom + &Unten - - Zoom in - Vergrößern + + &Top + &Oben - - Zoom out - Verkleinern + + + &Right + &Rechts - - Zoom reset - Zurücksetzen + + + &Left + &Links - - Find... - Suchen... + + &Tabs Layout + &Anzeige Reiterleiste - - Toggle Menu - Menü ein-/ausblenden + + &None + &Keine - - New Tab - Neuer Reiter + + S&crollbar Layout + &Anzeige Bildlaufleiste - - New Window - Neues Fenster + + Exit QTerminal + QTerminal beenden - - Hide Window Borders - Fensterrahmen ausblenden + + Do not ask again + Nicht erneut nachfragen - - Show Tab Bar - Reiterleiste anzeigen + + Are you sure you want to exit? + Soll QTerminal wirklich beendet werden? + + + + A lightweight multiplatform terminal emulator + Ein schlanker plattformunabhängiger Terminalemulator PropertiesDialog - + Emulation Emulation @@ -282,7 +287,7 @@ - + Behavior Verhalten @@ -337,88 +342,98 @@ Start mit Vorlage: - + None (single terminal) Keine (ein Terminal) - + 2 terminals horizontally 2 horizontale Terminals - + 2 terminals vertically 2 vertikale Terminals - + 4 terminals 4 Terminals - + Font Schriftart - + <html><head/><body><p>Which behavior to emulate. Note that this does not have to match your operating system.</p><p>The <span style=" font-weight:600;">default</span> emulation is a fallback with a minimal featureset.</p></body></html> <html><head/><body><p>Verhalten des Emulators wählen. Hinweis: Emulationsarten können auch unter anderen Systemen genutzt werden (z.B. "linux" unter OS X).</p><p>Die Standardemulation ist <span style=" font-weight:600;">default</span> mit minimalem Funktionsumfang.</p></body></html> - + Action after paste Aktion nach Einfügen aus der Zwischenablage - + Open new terminals in current working directory Neues Terminal im aktuellen Verzeichnis öffnen - + + Save Size when closing + Beim Beenden Größe speichern + + + + Save Position when closing + Beim Beenden Position speichern + + + Ask for confirmation when closing Beim Schließen eines Fensters nachfragen - + Unlimited history Uneingeschränkte Historie - + History size (in lines) Historie (Zeilen) - + Height Höhe - - + + % % - + Width Breite - + Edit bookmark file contents Lesezeichendatei bearbeiten - + Enable bookmarks Lesezeichen verwenden - + Bookmark file Lesezeichendatei @@ -429,12 +444,12 @@ % - + Shortcut Tastenkürzel - + Key Taste @@ -446,88 +461,88 @@ Hide tab bar with only one tab - Reiterleiste bei nur einem Reiter vergergen + Reiterleiste bei nur einem Reiter verbergen - + &Change... - &Ändern... + &Ändern... - + Show on start Beim Start anzeigen - + Size Größe - + Shortcut: Tastenkürzel: - + Find... Suchen... - + You can specify your own bookmarks file location. It allows easy bookmark sharing with tools like OwnCloud or Dropbox. Sie können eine Datei für eigene Lesezeichen angeben. Das erlaubt einfachen Austausch mit Werkzeugen wie OwnCloud oder DropBox. - + No scrollbar Keine Bildlaufleiste - - + + Left Links - - + + Right Rechts - + Top Oben - + Bottom Unten - + No move Nicht bewegen - + Move start An den Anfang bewegen - + Move end An das Ende bewegen - - + + System Default Systemstandard - + Open or create bookmarks file Lesezeichendatei öffnen oder erstellen @@ -535,12 +550,12 @@ QObject - + Local Bookmarks Lokale Lesezeichen - + Synchronized Bookmarks Synchronisierte Lesezeichen @@ -548,28 +563,28 @@ TabWidget - - + + Shell No. %1 Shell Nr. %1 - + Tab name Reiterbezeichnung - + New tab name: Neue Reiterbezeichnung: - + Close session Sitzung schließen - + Rename session Sitzung umbenennen @@ -577,65 +592,65 @@ TermWidgetHolder - + Load Session Sitzung laden - + List of saved sessions: Liste der gespeicherten Sitzungen: mainWindow + + + &File + &Datei + - Actions - Aktionen + &Actions + &Aktionen - Help - Hilfe + &Help + &Hilfe + + + + &View + &Ansicht - Edit - Bearbeiten + &Edit + &Bearbeiten - - About... - Über... + + &About... + Ü&ber... - - About Qt... - Über Qt... + + About &Qt... + Über &Qt... - + &Preferences... &Einstellungen... MainWindow - - - - - File - Datei - - - - View - Ansicht + Hauptfenster - + &Quit &Beenden diff --git a/src/translations/qterminal_ja.ts b/src/translations/qterminal_ja.ts index 107b0d8..d3c07cf 100644 --- a/src/translations/qterminal_ja.ts +++ b/src/translations/qterminal_ja.ts @@ -235,7 +235,7 @@ &Toggle Menu - トグルメニュー(&T) + メニューの表示/非表示(&T) @@ -324,7 +324,7 @@ Show a border around the current terminal - カレントターミナルの境界を表示 + カレントターミナルの境界を表示 @@ -339,7 +339,7 @@ Start with preset: - プリセットでスタート + プリセットでスタート @@ -369,37 +369,37 @@ <html><head/><body><p>Which behavior to emulate. Note that this does not have to match your operating system.</p><p>The <span style=" font-weight:600;">default</span> emulation is a fallback with a minimal featureset.</p></body></html> - <html><head/><body><p>エミュレータの挙動の選択。注意して頂きたいのは、この選択はオペレーティングシステムと適合する必要はありません。</p><p> <span style=" font-weight:600;">default</span>エミュレーションは最小の機能にフォールバックしたものです。</p></body></html> + <html><head/><body><p>エミュレータの挙動の選択。注意して頂きたいのは、この選択はオペレーティングシステムと適合する必要はありません。</p><p> <span style=" font-weight:600;">default</span>エミュレーションは最小の機能にフォールバックしたものです。</p></body></html> Action after paste - 貼り付け後の挙動 + 貼り付け後の挙動 Open new terminals in current working directory - カレントディレクトリに新しいターミナルを開く + カレントディレクトリに新しいターミナルを開く Save Size when closing - 閉じるときにサイズを保存する + 閉じるときにサイズを保存する Save Position when closing - 閉じるときに位置を保存する + 閉じるときに位置を保存する Ask for confirmation when closing - 閉じるときに確認する + 閉じるときに確認する Unlimited history - 履歴を制限しない + 履歴を制限しない @@ -420,7 +420,7 @@ Width - 幅 + 幅 @@ -430,7 +430,7 @@ Enable bookmarks - ブックマークを利用可能にする + ブックマークを利用可能にする @@ -461,12 +461,12 @@ Hide tab bar with only one tab - 1つのタブしか使用していない場合、タブバーを隠す + 1つのタブしか使用していない場合、タブバーを隠す &Change... - 変更（&C)... + 変更（&C)... @@ -491,7 +491,7 @@ You can specify your own bookmarks file location. It allows easy bookmark sharing with tools like OwnCloud or Dropbox. - ブックマークファイルの場所を指定することができます。OwnCloudやDropboxのようなツールとブックマークを共有することが容易にできます。 + ブックマークファイルの場所を指定することができます。OwnCloudやDropboxのようなツールとブックマークを共有することが容易にできます。 @@ -523,17 +523,17 @@ No move - 無動作 + 無動作 Move start - 動作開始 + 動作開始 Move end - 動作終了 + 動作終了 @@ -632,7 +632,7 @@ &Preferences... - 設定(&P)... + 設定(&P)... diff --git a/src/translations/qterminal_ru.ts b/src/translations/qterminal_ru.ts index 11d8eec..7b50acf 100644 --- a/src/translations/qterminal_ru.ts +++ b/src/translations/qterminal_ru.ts @@ -15,7 +15,7 @@ Select Terminal Font - Выбрать шрифт терминала + Выберите шрифт терминала @@ -68,12 +68,12 @@ Move Tab &Left - Сдвинуть вкладку &влево + Сдвинуть вкладку в&лево Move Tab &Right - Сдвинуть вкладку &вправо + Сдвинуть вкладку в&право @@ -250,7 +250,7 @@ Do not ask again - Не справшивать снова + Не спрашивать снова @@ -260,7 +260,7 @@ A lightweight multiplatform terminal emulator - Лёгкий мультиплатформенный эмулятор терминала + Лёгкий мультиплатформенный эмулятор терминала @@ -324,7 +324,7 @@ Show the menu bar - Показать панель меню + Показывать панель меню @@ -374,7 +374,7 @@ <html><head/><body><p>Which behavior to emulate. Note that this does not have to match your operating system.</p><p>The <span style=" font-weight:600;">default</span> emulation is a fallback with a minimal featureset.</p></body></html> - <html><head/><body><p>Какое поведение эмулировать. Обратите внимание, что это не обязательно должн осоответствовать вашей операционной системе.</p><p>Эмуляция <span style=" font-weight:600;">по умолчанию</span> — это запасной режим с минимальным набором функций.</p></body></html> + <html><head/><body><p>Какое поведение эмулировать. Обратите внимание, что это не обязательно должно соответствовать вашей операционной системе.</p><p>Эмуляция <span style=" font-weight:600;">по умолчанию</span> - это запасной режим с минимальным набором функций.</p></body></html> @@ -384,7 +384,7 @@ Open new terminals in current working directory - Открывать новые терминалы в текущей рабочей папке + Открывать новые терминалы в текущем рабочем каталоге @@ -523,17 +523,17 @@ No move - + Не двигаться Move start - + Переместиться в начало Move end - + Переместиться в конец diff --git a/src/translations/qterminal_zh_CN.ts b/src/translations/qterminal_zh_CN.ts index 4b09960..1cab1f4 100644 --- a/src/translations/qterminal_zh_CN.ts +++ b/src/translations/qterminal_zh_CN.ts @@ -1,6 +1,6 @@ - + BookmarksWidget