diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000..1c3d739 --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,56 @@ +name: Build termit + +on: [push, pull_request] + +jobs: + fedora_latest_build: + runs-on: ubuntu-latest + container: + image: fedora:latest + steps: + - name: Checkout + uses: actions/checkout@v2 + with: + fetch-depth: 1000 + - name: Prepare build environment. + run: | + dnf -y upgrade + dnf -y install cmake gcc gtk+ vte291 vte291-devel lua lua-devel + - name: Configure + run: | + cmake -DCMAKE_BUILD_TYPE=Release . + - name: Build + run: | + make + - name: Install + run: | + make install + - name: Test version + run: | + termit --version + + ubuntu_latest_build: + runs-on: ubuntu-latest + container: + image: ubuntu:latest + steps: + - name: Checkout + uses: actions/checkout@v2 + - name: Prepare build environment. + run: | + apt-get update + apt-get -y install apt-utils + apt-get -y full-upgrade + apt-get install -y gcc cmake lua5.4-dev libgtk-3-dev libvte-2.91 gettext + - name: Configure + run: | + cmake -DCMAKE_BUILD_TYPE=Release . + - name: Build + run: | + make + - name: Install + run: | + make install + - name: Test version + run: | + termit --version diff --git a/CMakeLists.txt b/CMakeLists.txt index 8049116..33585eb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,7 +15,7 @@ PROJECT(TERMIT C) -cmake_minimum_required(VERSION 2.6.1 FATAL_ERROR) +cmake_minimum_required(VERSION 2.6.1...3.22.2 FATAL_ERROR) SET(CMAKE_VERSION "${CMAKE_CACHE_MAJOR_VERSION}.${CMAKE_CACHE_MINOR_VERSION}.${CMAKE_CACHE_RELEASE_VERSION}") INCLUDE(UsePkgConfig) @@ -38,7 +38,7 @@ SET(ENABLE_NLS TRUE CACHE BOOL "enable translation") SET(XDG_DIR ${XDG_DIR} CACHE STRING "default xdg dir") SET(TERMIT_PACKAGE "termit") -SET(TERMIT_PACKAGE_VERSION "3.1.0") +SET(TERMIT_PACKAGE_VERSION "3.1.1") SET(TERMIT_LOCALE_DIR "${CMAKE_INSTALL_PREFIX}/share/locale") SET(TERMIT_XDG_DIR "${XDG_DIR}/termit") SET(TERMIT_PACKAGE_NAME "termit - terminal emulator") diff --git a/README.md b/README.md new file mode 100644 index 0000000..3ef6948 --- /dev/null +++ b/README.md @@ -0,0 +1,29 @@ +# termit +Terminal emulator based on VTE library with Lua scripting + +## Installation Instructions +[General guide](INSTALL) +### Prepare dependancies +#### fedora +```bash +# dnf -y install cmake gcc gtk+ vte291 vte291-devel lua lua-devel +``` + +#### ubuntu +```bash +# apt-get install -y gcc cmake lua5.4-dev libgtk-3-dev libvte-2.91 gettext +``` + +### build +Download, configure, build and install +```bash +$ git clone https://github.com/nonstop/termit.git +$ cd termit +$ cmake -DCMAKE_BUILD_TYPE=Release . +$ make +$ sudo make install +``` + +## [Changelog](ChangeLog) + +## [Copyright](COPYING) diff --git a/po/CMakeLists.txt b/po/CMakeLists.txt index c6289fd..7da7896 100644 --- a/po/CMakeLists.txt +++ b/po/CMakeLists.txt @@ -1,10 +1,12 @@ SET(PO_FILES + da.po de.po es.po fr.po hu.po ja.po ko.po + nl.po pl.po ru.po sv.po diff --git a/po/de.po b/po/de.po index 81bd804..7102a21 100644 --- a/po/de.po +++ b/po/de.po @@ -8,38 +8,43 @@ msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2011-12-19 21:23+0100\n" -"Last-Translator: Dennis Ploeger \n" +"PO-Revision-Date: 2022-09-08 22:22+0100\n" +"Last-Translator: SwissalpS \n" "Language-Team: de\n" "Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: src/termit_preferences.c:218 +#: src/termit_preferences.c:219 msgid "Apply to all tabs" -msgstr "" +msgstr "Auf alle Tabs anwenden" -#: src/termit_preferences.c:206 +#: src/termit_preferences.c:213 +#, fuzzy +msgid "Audible bell" +msgstr "Glocke" + +#: src/termit_preferences.c:207 msgid "Background" msgstr "Hintergrund" -#: src/termit_core_api.c:440 +#: src/termit_core_api.c:464 msgid "Cannot create a new tab" msgstr "Konnte keinen neuen Tab erzeugen" -#: src/termit_core_api.c:392 +#: src/termit_core_api.c:416 msgid "Cannot parse command. Creating tab with shell" msgstr "" "Konnte Befehl nicht untersuchen. Erstelle einen Tab mit der Kommandozeile" +#: src/termit.c:170 src/termit.c:223 +msgid "Close tab" +msgstr "Tab schliessen" + #: src/termit.c:187 src/termit.c:226 msgid "Copy" -msgstr "" - -#: src/termit.c:170 src/termit.c:223 -msgid "Delete" -msgstr "" +msgstr "Kopieren" #: src/termit.c:190 msgid "Edit" @@ -49,37 +54,37 @@ msgstr "Bearbeiten" msgid "File" msgstr "Datei" -#: src/termit_preferences.c:192 +#: src/termit_preferences.c:193 msgid "Font" msgstr "Schriftart" -#: src/termit_preferences.c:199 +#: src/termit_preferences.c:200 msgid "Foreground" msgstr "Vordergrund" #. File menu #: src/termit.c:169 src/termit.c:222 -msgid "Open" -msgstr "" +msgid "New tab" +msgstr "Neuen Tab" #. Sessions menu -#: src/termit.c:202 src/callbacks.c:395 +#: src/termit.c:202 src/callbacks.c:418 msgid "Open session" msgstr "Sitzung öffnen" #: src/termit.c:188 src/termit.c:227 msgid "Paste" -msgstr "" +msgstr "Einfügen" -#: src/termit.c:186 src/termit.c:225 src/termit_preferences.c:166 +#: src/termit.c:186 src/termit.c:225 src/termit_preferences.c:167 msgid "Preferences" -msgstr "" +msgstr "Einstellungen" #: src/termit.c:171 src/termit.c:228 msgid "Quit" -msgstr "" +msgstr "Beenden" -#: src/termit.c:203 src/callbacks.c:365 +#: src/termit.c:203 src/callbacks.c:388 msgid "Save session" msgstr "Sitzung speichern" @@ -104,11 +109,11 @@ msgstr "" "Mehrere Tabs sind geöffnet.\n" "Trotzdem schließen?" -#: src/callbacks.c:274 src/callbacks.c:285 +#: src/callbacks.c:297 src/callbacks.c:308 msgid "Tab name" msgstr "Tab-Name" -#: src/termit_preferences.c:186 +#: src/termit_preferences.c:187 msgid "Title" msgstr "Titel" @@ -117,11 +122,6 @@ msgstr "Titel" msgid "Unable to create directory '%s': %s" msgstr "Konnte Verzeichnis '%s' nicht erstellen: %s" -#: src/termit_preferences.c:212 -#, fuzzy -msgid "audible bell" -msgstr "Glocke" - #~ msgid "Background image" #~ msgstr "Hintergrundbild" diff --git a/po/es.po b/po/es.po index 24a410b..92eb306 100644 --- a/po/es.po +++ b/po/es.po @@ -7,37 +7,42 @@ msgid "" msgstr "" "Project-Id-Version: \n" "POT-Creation-Date: \n" -"PO-Revision-Date: \n" -"Last-Translator: Martintxo \n" +"PO-Revision-Date: 2022-09-08 22:22+0100\n" +"Last-Translator: SwissalpS \n" "Language-Team: \n" "Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -#: src/termit_preferences.c:218 +#: src/termit_preferences.c:219 msgid "Apply to all tabs" -msgstr "" +msgstr "Aplicar a todas las pestañas" -#: src/termit_preferences.c:206 +#: src/termit_preferences.c:213 +#, fuzzy +msgid "Audible bell" +msgstr "Timbre audible" + +#: src/termit_preferences.c:207 msgid "Background" msgstr "Fondo" -#: src/termit_core_api.c:440 +#: src/termit_core_api.c:464 msgid "Cannot create a new tab" msgstr "No se puede crear una nueva pestaña" -#: src/termit_core_api.c:392 +#: src/termit_core_api.c:416 msgid "Cannot parse command. Creating tab with shell" msgstr "El comando no se entiende. Creando una nueva pestaña con shell" +#: src/termit.c:170 src/termit.c:223 +msgid "Close tab" +msgstr "Cerrar pestaña" + #: src/termit.c:187 src/termit.c:226 msgid "Copy" -msgstr "" - -#: src/termit.c:170 src/termit.c:223 -msgid "Delete" -msgstr "" +msgstr "Copiar" #: src/termit.c:190 msgid "Edit" @@ -47,37 +52,37 @@ msgstr "Editar" msgid "File" msgstr "Archivo" -#: src/termit_preferences.c:192 +#: src/termit_preferences.c:193 msgid "Font" msgstr "Tipografía" -#: src/termit_preferences.c:199 +#: src/termit_preferences.c:200 msgid "Foreground" msgstr "Frente" #. File menu #: src/termit.c:169 src/termit.c:222 -msgid "Open" -msgstr "" +msgid "New tab" +msgstr "Nueva pestaña" #. Sessions menu -#: src/termit.c:202 src/callbacks.c:395 +#: src/termit.c:202 src/callbacks.c:418 msgid "Open session" msgstr "Abrir sesión" #: src/termit.c:188 src/termit.c:227 msgid "Paste" -msgstr "" +msgstr "Pegar" -#: src/termit.c:186 src/termit.c:225 src/termit_preferences.c:166 +#: src/termit.c:186 src/termit.c:225 src/termit_preferences.c:167 msgid "Preferences" -msgstr "" +msgstr "Preferencias" #: src/termit.c:171 src/termit.c:228 msgid "Quit" -msgstr "" +msgstr "Salir" -#: src/termit.c:203 src/callbacks.c:365 +#: src/termit.c:203 src/callbacks.c:388 msgid "Save session" msgstr "Guardar sesión" @@ -100,13 +105,13 @@ msgid "" "Close anyway?" msgstr "" "Hay varias pestañas abiertas.\n" -"¿Cerrarlas todas?" +"¿Cerrarlas todas igual?" -#: src/callbacks.c:274 src/callbacks.c:285 +#: src/callbacks.c:297 src/callbacks.c:308 msgid "Tab name" msgstr "Nombre de la pestaña" -#: src/termit_preferences.c:186 +#: src/termit_preferences.c:187 msgid "Title" msgstr "Título" @@ -115,11 +120,6 @@ msgstr "Título" msgid "Unable to create directory '%s': %s" msgstr "No se puede crear el directorio '%s': %s." -#: src/termit_preferences.c:212 -#, fuzzy -msgid "audible bell" -msgstr "Timbre audible" - #~ msgid "Background image" #~ msgstr "Imagen de fondo" diff --git a/po/fr.po b/po/fr.po index 8b8e963..3b8fdd6 100644 --- a/po/fr.po +++ b/po/fr.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: Termit 1.1.1\n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2008-01-22 11:12+0100\n" -"Last-Translator: Mallory Mollo \n" +"PO-Revision-Date: 2022-09-08 22:22+0100\n" +"Last-Translator: SwissalpS \n" "Language-Team: Mallory Mollo \n" "Language: \n" "MIME-Version: 1.0\n" @@ -12,29 +12,33 @@ msgstr "" "X-Poedit-Language: French\n" "X-Poedit-Country: FRANCE\n" -#: src/termit_preferences.c:218 +#: src/termit_preferences.c:219 msgid "Apply to all tabs" -msgstr "" +msgstr "Appliquer à tous les onglets" + +#: src/termit_preferences.c:213 +msgid "Audible bell" +msgstr "Cloche sonore" -#: src/termit_preferences.c:206 +#: src/termit_preferences.c:207 msgid "Background" -msgstr "" +msgstr "Fond" -#: src/termit_core_api.c:440 +#: src/termit_core_api.c:464 msgid "Cannot create a new tab" msgstr "Impossible de créer un nouvel onglet" -#: src/termit_core_api.c:392 +#: src/termit_core_api.c:416 msgid "Cannot parse command. Creating tab with shell" -msgstr "" +msgstr "Impossible d'analyser la commande. Création d'onglet avec shell" + +#: src/termit.c:170 src/termit.c:223 +msgid "Close tab" +msgstr "Fermer l'onglet" #: src/termit.c:187 src/termit.c:226 msgid "Copy" -msgstr "" - -#: src/termit.c:170 src/termit.c:223 -msgid "Delete" -msgstr "" +msgstr "Copie" #: src/termit.c:190 msgid "Edit" @@ -44,43 +48,43 @@ msgstr "Éditer" msgid "File" msgstr "Fichier" -#: src/termit_preferences.c:192 +#: src/termit_preferences.c:193 msgid "Font" -msgstr "" +msgstr "Fonte" -#: src/termit_preferences.c:199 +#: src/termit_preferences.c:200 msgid "Foreground" -msgstr "" +msgstr "Premier plan" #. File menu #: src/termit.c:169 src/termit.c:222 -msgid "Open" -msgstr "" +msgid "New tab" +msgstr "Nouvel onglet" #. Sessions menu -#: src/termit.c:202 src/callbacks.c:395 +#: src/termit.c:202 src/callbacks.c:418 msgid "Open session" msgstr "Ouvrir une session" #: src/termit.c:188 src/termit.c:227 msgid "Paste" -msgstr "" +msgstr "Coller" -#: src/termit.c:186 src/termit.c:225 src/termit_preferences.c:166 +#: src/termit.c:186 src/termit.c:225 src/termit_preferences.c:167 msgid "Preferences" -msgstr "" +msgstr "Préférences" #: src/termit.c:171 src/termit.c:228 msgid "Quit" -msgstr "" +msgstr "Quitter" -#: src/termit.c:203 src/callbacks.c:365 +#: src/termit.c:203 src/callbacks.c:388 msgid "Save session" msgstr "Enregistrer la session" #: src/termit.c:229 msgid "Scrollbar" -msgstr "" +msgstr "Barre de défilement" #: src/termit.c:205 msgid "Sessions" @@ -99,11 +103,11 @@ msgstr "" "Vous êtes sur le point de fermer plusieurs onglets.\n" "Voulez-vous vraiment continuer ?" -#: src/callbacks.c:274 src/callbacks.c:285 +#: src/callbacks.c:297 src/callbacks.c:308 msgid "Tab name" msgstr "Nom de l'onglet" -#: src/termit_preferences.c:186 +#: src/termit_preferences.c:187 #, fuzzy msgid "Title" msgstr "Fichier" @@ -113,10 +117,6 @@ msgstr "Fichier" msgid "Unable to create directory '%s': %s" msgstr "Impossible de créer le dossier '%s': %s" -#: src/termit_preferences.c:212 -msgid "audible bell" -msgstr "" - #~ msgid "Bookmarks" #~ msgstr "Marques-page" diff --git a/po/hu.po b/po/hu.po index 7f543ad..b8ae753 100644 --- a/po/hu.po +++ b/po/hu.po @@ -16,29 +16,34 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: src/termit_preferences.c:218 +#: src/termit_preferences.c:219 msgid "Apply to all tabs" msgstr "" -#: src/termit_preferences.c:206 +#: src/termit_preferences.c:213 +#, fuzzy +msgid "Audible bell" +msgstr "Hallható figyelmeztetés" + +#: src/termit_preferences.c:207 msgid "Background" msgstr "Háttér" -#: src/termit_core_api.c:440 +#: src/termit_core_api.c:464 msgid "Cannot create a new tab" msgstr "Nem sikerült új fület létrehozni" -#: src/termit_core_api.c:392 +#: src/termit_core_api.c:416 msgid "Cannot parse command. Creating tab with shell" msgstr "" "Nem lehetséges a parancs értelmezése. Fül létrehozása shell segítségével" -#: src/termit.c:187 src/termit.c:226 -msgid "Copy" +#: src/termit.c:170 src/termit.c:223 +msgid "Close tab" msgstr "" -#: src/termit.c:170 src/termit.c:223 -msgid "Delete" +#: src/termit.c:187 src/termit.c:226 +msgid "Copy" msgstr "" #: src/termit.c:190 @@ -49,21 +54,21 @@ msgstr "Szerkesztés" msgid "File" msgstr "Fájl" -#: src/termit_preferences.c:192 +#: src/termit_preferences.c:193 msgid "Font" msgstr "Betűtípus" -#: src/termit_preferences.c:199 +#: src/termit_preferences.c:200 msgid "Foreground" msgstr "Előtér" #. File menu #: src/termit.c:169 src/termit.c:222 -msgid "Open" +msgid "New tab" msgstr "" #. Sessions menu -#: src/termit.c:202 src/callbacks.c:395 +#: src/termit.c:202 src/callbacks.c:418 msgid "Open session" msgstr "Megnyitás" @@ -71,7 +76,7 @@ msgstr "Megnyitás" msgid "Paste" msgstr "" -#: src/termit.c:186 src/termit.c:225 src/termit_preferences.c:166 +#: src/termit.c:186 src/termit.c:225 src/termit_preferences.c:167 msgid "Preferences" msgstr "" @@ -79,7 +84,7 @@ msgstr "" msgid "Quit" msgstr "" -#: src/termit.c:203 src/callbacks.c:365 +#: src/termit.c:203 src/callbacks.c:388 msgid "Save session" msgstr "Mentés" @@ -104,11 +109,11 @@ msgstr "" "Több fül is nyitva van.\n" "Bezárja mind?" -#: src/callbacks.c:274 src/callbacks.c:285 +#: src/callbacks.c:297 src/callbacks.c:308 msgid "Tab name" msgstr "Fül neve" -#: src/termit_preferences.c:186 +#: src/termit_preferences.c:187 msgid "Title" msgstr "Cím" @@ -117,11 +122,6 @@ msgstr "Cím" msgid "Unable to create directory '%s': %s" msgstr "A könyvtár létrehozása sikertelen '%s': %s" -#: src/termit_preferences.c:212 -#, fuzzy -msgid "audible bell" -msgstr "Hallható figyelmeztetés" - #~ msgid "Background image" #~ msgstr "Háttérkép" diff --git a/po/ja.po b/po/ja.po index 2b9abea..3593b96 100644 --- a/po/ja.po +++ b/po/ja.po @@ -13,28 +13,33 @@ msgstr "" "X-Poedit-Language: Japanese\n" "X-Poedit-Country: JAPAN\n" -#: src/termit_preferences.c:218 +#: src/termit_preferences.c:219 msgid "Apply to all tabs" msgstr "" -#: src/termit_preferences.c:206 +#: src/termit_preferences.c:213 +#, fuzzy +msgid "Audible bell" +msgstr "可聴ベル" + +#: src/termit_preferences.c:207 msgid "Background" msgstr "背景" -#: src/termit_core_api.c:440 +#: src/termit_core_api.c:464 msgid "Cannot create a new tab" msgstr "新しいタブを作成できません" -#: src/termit_core_api.c:392 +#: src/termit_core_api.c:416 msgid "Cannot parse command. Creating tab with shell" msgstr "コマンドを解析できません。シェル経由でタブを作成します" -#: src/termit.c:187 src/termit.c:226 -msgid "Copy" +#: src/termit.c:170 src/termit.c:223 +msgid "Close tab" msgstr "" -#: src/termit.c:170 src/termit.c:223 -msgid "Delete" +#: src/termit.c:187 src/termit.c:226 +msgid "Copy" msgstr "" #: src/termit.c:190 @@ -45,21 +50,21 @@ msgstr "編集" msgid "File" msgstr "ファイル" -#: src/termit_preferences.c:192 +#: src/termit_preferences.c:193 msgid "Font" msgstr "フォント" -#: src/termit_preferences.c:199 +#: src/termit_preferences.c:200 msgid "Foreground" msgstr "前景" #. File menu #: src/termit.c:169 src/termit.c:222 -msgid "Open" +msgid "New tab" msgstr "" #. Sessions menu -#: src/termit.c:202 src/callbacks.c:395 +#: src/termit.c:202 src/callbacks.c:418 msgid "Open session" msgstr "セッションを開く" @@ -67,7 +72,7 @@ msgstr "セッションを開く" msgid "Paste" msgstr "" -#: src/termit.c:186 src/termit.c:225 src/termit_preferences.c:166 +#: src/termit.c:186 src/termit.c:225 src/termit_preferences.c:167 msgid "Preferences" msgstr "" @@ -75,7 +80,7 @@ msgstr "" msgid "Quit" msgstr "" -#: src/termit.c:203 src/callbacks.c:365 +#: src/termit.c:203 src/callbacks.c:388 msgid "Save session" msgstr "セッションを保存する" @@ -98,11 +103,11 @@ msgid "" "Close anyway?" msgstr "終了しますか?" -#: src/callbacks.c:274 src/callbacks.c:285 +#: src/callbacks.c:297 src/callbacks.c:308 msgid "Tab name" msgstr "タブ名" -#: src/termit_preferences.c:186 +#: src/termit_preferences.c:187 msgid "Title" msgstr "タイトル" @@ -111,11 +116,6 @@ msgstr "タイトル" msgid "Unable to create directory '%s': %s" msgstr "ディレクトリ '%s' が生成できません: %s" -#: src/termit_preferences.c:212 -#, fuzzy -msgid "audible bell" -msgstr "可聴ベル" - #~ msgid "Background image" #~ msgstr "背景画像" diff --git a/po/ko.po b/po/ko.po index 89744bb..065260a 100644 --- a/po/ko.po +++ b/po/ko.po @@ -12,28 +12,32 @@ msgstr "" "X-Poedit-Language: Korean\n" "X-Poedit-Country: KOREA, REPUBLIC OF\n" -#: src/termit_preferences.c:218 +#: src/termit_preferences.c:219 msgid "Apply to all tabs" msgstr "" -#: src/termit_preferences.c:206 +#: src/termit_preferences.c:213 +msgid "Audible bell" +msgstr "" + +#: src/termit_preferences.c:207 msgid "Background" msgstr "" -#: src/termit_core_api.c:440 +#: src/termit_core_api.c:464 msgid "Cannot create a new tab" msgstr "새 탭을 만들 수 없습니다" -#: src/termit_core_api.c:392 +#: src/termit_core_api.c:416 msgid "Cannot parse command. Creating tab with shell" msgstr "명령을 해석할 수 없습니다. 쉘을 이용한 새 탭을 만듭니다" -#: src/termit.c:187 src/termit.c:226 -msgid "Copy" +#: src/termit.c:170 src/termit.c:223 +msgid "Close tab" msgstr "" -#: src/termit.c:170 src/termit.c:223 -msgid "Delete" +#: src/termit.c:187 src/termit.c:226 +msgid "Copy" msgstr "" #: src/termit.c:190 @@ -44,21 +48,21 @@ msgstr "편집" msgid "File" msgstr "파일" -#: src/termit_preferences.c:192 +#: src/termit_preferences.c:193 msgid "Font" msgstr "" -#: src/termit_preferences.c:199 +#: src/termit_preferences.c:200 msgid "Foreground" msgstr "" #. File menu #: src/termit.c:169 src/termit.c:222 -msgid "Open" +msgid "New tab" msgstr "" #. Sessions menu -#: src/termit.c:202 src/callbacks.c:395 +#: src/termit.c:202 src/callbacks.c:418 msgid "Open session" msgstr "세션 열기" @@ -66,7 +70,7 @@ msgstr "세션 열기" msgid "Paste" msgstr "" -#: src/termit.c:186 src/termit.c:225 src/termit_preferences.c:166 +#: src/termit.c:186 src/termit.c:225 src/termit_preferences.c:167 msgid "Preferences" msgstr "" @@ -74,7 +78,7 @@ msgstr "" msgid "Quit" msgstr "" -#: src/termit.c:203 src/callbacks.c:365 +#: src/termit.c:203 src/callbacks.c:388 msgid "Save session" msgstr "세션 저장" @@ -99,11 +103,11 @@ msgstr "" "다른 탭들이 아직 열려 있습니다.\n" "전부 닫고 종료할까요 ?" -#: src/callbacks.c:274 src/callbacks.c:285 +#: src/callbacks.c:297 src/callbacks.c:308 msgid "Tab name" msgstr "탭 이름" -#: src/termit_preferences.c:186 +#: src/termit_preferences.c:187 #, fuzzy msgid "Title" msgstr "파일" @@ -113,10 +117,6 @@ msgstr "파일" msgid "Unable to create directory '%s': %s" msgstr "디렉토리를 만들 수 없습니다 '%s': %s" -#: src/termit_preferences.c:212 -msgid "audible bell" -msgstr "" - #~ msgid "Bookmarks" #~ msgstr "책갈피" diff --git a/po/nl.po b/po/nl.po index ae7135d..62c5f65 100644 --- a/po/nl.po +++ b/po/nl.po @@ -12,30 +12,35 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Poedit 3.0\n" -#: src/termit_preferences.c:218 +#: src/termit_preferences.c:219 msgid "Apply to all tabs" msgstr "Toepassen op alle tabbladen" -#: src/termit_preferences.c:206 +#: src/termit_preferences.c:213 +msgid "Audible bell" +msgstr "Luide bel" + +#: src/termit_preferences.c:207 msgid "Background" msgstr "Achtergrond" -#: src/termit_core_api.c:440 +#: src/termit_core_api.c:464 msgid "Cannot create a new tab" msgstr "Er kan geen nieuw tabblad worden geopend" -#: src/termit_core_api.c:392 +#: src/termit_core_api.c:416 msgid "Cannot parse command. Creating tab with shell" -msgstr "De opdracht kan niet worden verwerkt. Bezig met openen van tabblad met shell…" +msgstr "" +"De opdracht kan niet worden verwerkt. Bezig met openen van tabblad met shell…" + +#: src/termit.c:170 src/termit.c:223 +msgid "Close tab" +msgstr "Verwijderen" #: src/termit.c:187 src/termit.c:226 msgid "Copy" msgstr "Kopiëren" -#: src/termit.c:170 src/termit.c:223 -msgid "Delete" -msgstr "Verwijderen" - #: src/termit.c:190 msgid "Edit" msgstr "Bewerken" @@ -44,21 +49,21 @@ msgstr "Bewerken" msgid "File" msgstr "Bestand" -#: src/termit_preferences.c:192 +#: src/termit_preferences.c:193 msgid "Font" msgstr "Lettertype" -#: src/termit_preferences.c:199 +#: src/termit_preferences.c:200 msgid "Foreground" msgstr "Voorgrond" #. File menu #: src/termit.c:169 src/termit.c:222 -msgid "Open" +msgid "New tab" msgstr "Openen" #. Sessions menu -#: src/termit.c:202 src/callbacks.c:395 +#: src/termit.c:202 src/callbacks.c:418 msgid "Open session" msgstr "Sessie openen" @@ -66,7 +71,7 @@ msgstr "Sessie openen" msgid "Paste" msgstr "Plakken" -#: src/termit.c:186 src/termit.c:225 src/termit_preferences.c:166 +#: src/termit.c:186 src/termit.c:225 src/termit_preferences.c:167 msgid "Preferences" msgstr "Instellingen" @@ -74,7 +79,7 @@ msgstr "Instellingen" msgid "Quit" msgstr "Afsluiten" -#: src/termit.c:203 src/callbacks.c:365 +#: src/termit.c:203 src/callbacks.c:388 msgid "Save session" msgstr "Sessie opslaan" @@ -99,11 +104,11 @@ msgstr "" "Er zijn nog openstaande tabbladen.\n" "Weet u zeker dat u wilt doorgaan?" -#: src/callbacks.c:274 src/callbacks.c:285 +#: src/callbacks.c:297 src/callbacks.c:308 msgid "Tab name" msgstr "Tabbladnaam" -#: src/termit_preferences.c:186 +#: src/termit_preferences.c:187 msgid "Title" msgstr "Naam" @@ -111,7 +116,3 @@ msgstr "Naam" #, c-format msgid "Unable to create directory '%s': %s" msgstr "De map ‘%s’ kan niet worden aangemaakt: %s" - -#: src/termit_preferences.c:212 -msgid "audible bell" -msgstr "Luide bel" diff --git a/po/pl.po b/po/pl.po index 7d6dfe9..78be033 100644 --- a/po/pl.po +++ b/po/pl.po @@ -17,28 +17,33 @@ msgstr "" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " "|| n%100>=20) ? 1 : 2);\n" -#: src/termit_preferences.c:218 +#: src/termit_preferences.c:219 msgid "Apply to all tabs" msgstr "" -#: src/termit_preferences.c:206 +#: src/termit_preferences.c:213 +#, fuzzy +msgid "Audible bell" +msgstr "Głośny dzwonek" + +#: src/termit_preferences.c:207 msgid "Background" msgstr "Tło" -#: src/termit_core_api.c:440 +#: src/termit_core_api.c:464 msgid "Cannot create a new tab" msgstr "Nie można utworzyć nowej karty" -#: src/termit_core_api.c:392 +#: src/termit_core_api.c:416 msgid "Cannot parse command. Creating tab with shell" msgstr "Nie można przetworzyć polecenia. Tworzenia karty z powłoki" -#: src/termit.c:187 src/termit.c:226 -msgid "Copy" +#: src/termit.c:170 src/termit.c:223 +msgid "Close tab" msgstr "" -#: src/termit.c:170 src/termit.c:223 -msgid "Delete" +#: src/termit.c:187 src/termit.c:226 +msgid "Copy" msgstr "" #: src/termit.c:190 @@ -49,21 +54,21 @@ msgstr "Edycja" msgid "File" msgstr "Plik" -#: src/termit_preferences.c:192 +#: src/termit_preferences.c:193 msgid "Font" msgstr "Czcionka" -#: src/termit_preferences.c:199 +#: src/termit_preferences.c:200 msgid "Foreground" msgstr "Pierwszy plan" #. File menu #: src/termit.c:169 src/termit.c:222 -msgid "Open" +msgid "New tab" msgstr "" #. Sessions menu -#: src/termit.c:202 src/callbacks.c:395 +#: src/termit.c:202 src/callbacks.c:418 msgid "Open session" msgstr "Otwórz sesje" @@ -71,7 +76,7 @@ msgstr "Otwórz sesje" msgid "Paste" msgstr "" -#: src/termit.c:186 src/termit.c:225 src/termit_preferences.c:166 +#: src/termit.c:186 src/termit.c:225 src/termit_preferences.c:167 msgid "Preferences" msgstr "" @@ -79,7 +84,7 @@ msgstr "" msgid "Quit" msgstr "" -#: src/termit.c:203 src/callbacks.c:365 +#: src/termit.c:203 src/callbacks.c:388 msgid "Save session" msgstr "Zapisz sesje " @@ -104,11 +109,11 @@ msgstr "" "Kilka kart jest otwartych.\n" "Zamknąć pomimo to?" -#: src/callbacks.c:274 src/callbacks.c:285 +#: src/callbacks.c:297 src/callbacks.c:308 msgid "Tab name" msgstr "Nazwa Karty" -#: src/termit_preferences.c:186 +#: src/termit_preferences.c:187 msgid "Title" msgstr "Tytuł" @@ -117,11 +122,6 @@ msgstr "Tytuł" msgid "Unable to create directory '%s': %s" msgstr "Nie można utworzyć katalogu '%s': %s" -#: src/termit_preferences.c:212 -#, fuzzy -msgid "audible bell" -msgstr "Głośny dzwonek" - #~ msgid "Background image" #~ msgstr "Obraz tła" diff --git a/po/ru.po b/po/ru.po index 783e442..dbc1e9d 100644 --- a/po/ru.po +++ b/po/ru.po @@ -16,28 +16,32 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: src/termit_preferences.c:218 +#: src/termit_preferences.c:219 msgid "Apply to all tabs" msgstr "" -#: src/termit_preferences.c:206 +#: src/termit_preferences.c:213 +msgid "Audible bell" +msgstr "" + +#: src/termit_preferences.c:207 msgid "Background" msgstr "" -#: src/termit_core_api.c:440 +#: src/termit_core_api.c:464 msgid "Cannot create a new tab" msgstr "Ошибка открытия новой вкладки" -#: src/termit_core_api.c:392 +#: src/termit_core_api.c:416 msgid "Cannot parse command. Creating tab with shell" msgstr "" -#: src/termit.c:187 src/termit.c:226 -msgid "Copy" +#: src/termit.c:170 src/termit.c:223 +msgid "Close tab" msgstr "" -#: src/termit.c:170 src/termit.c:223 -msgid "Delete" +#: src/termit.c:187 src/termit.c:226 +msgid "Copy" msgstr "" #: src/termit.c:190 @@ -48,21 +52,21 @@ msgstr "Правка" msgid "File" msgstr "Файл" -#: src/termit_preferences.c:192 +#: src/termit_preferences.c:193 msgid "Font" msgstr "" -#: src/termit_preferences.c:199 +#: src/termit_preferences.c:200 msgid "Foreground" msgstr "" #. File menu #: src/termit.c:169 src/termit.c:222 -msgid "Open" +msgid "New tab" msgstr "" #. Sessions menu -#: src/termit.c:202 src/callbacks.c:395 +#: src/termit.c:202 src/callbacks.c:418 msgid "Open session" msgstr "Открыть сессию" @@ -70,7 +74,7 @@ msgstr "Открыть сессию" msgid "Paste" msgstr "" -#: src/termit.c:186 src/termit.c:225 src/termit_preferences.c:166 +#: src/termit.c:186 src/termit.c:225 src/termit_preferences.c:167 msgid "Preferences" msgstr "" @@ -78,7 +82,7 @@ msgstr "" msgid "Quit" msgstr "" -#: src/termit.c:203 src/callbacks.c:365 +#: src/termit.c:203 src/callbacks.c:388 msgid "Save session" msgstr "Сохранить сессию" @@ -103,11 +107,11 @@ msgstr "" "Открыто несколько вкладок.\n" "Закрыть?" -#: src/callbacks.c:274 src/callbacks.c:285 +#: src/callbacks.c:297 src/callbacks.c:308 msgid "Tab name" msgstr "Заголовок вкладки" -#: src/termit_preferences.c:186 +#: src/termit_preferences.c:187 #, fuzzy msgid "Title" msgstr "Файл" @@ -117,10 +121,6 @@ msgstr "Файл" msgid "Unable to create directory '%s': %s" msgstr "Невозможно создать директорию '%s': %s" -#: src/termit_preferences.c:212 -msgid "audible bell" -msgstr "" - #~ msgid "Bookmarks" #~ msgstr "Закладки" diff --git a/po/sv.po b/po/sv.po index c948a5b..fe53932 100644 --- a/po/sv.po +++ b/po/sv.po @@ -1,25 +1,30 @@ -#: src/termit_preferences.c:218 +#: src/termit_preferences.c:219 msgid "Apply to all tabs" msgstr "" -#: src/termit_preferences.c:206 +#: src/termit_preferences.c:213 +#, fuzzy +msgid "Audible bell" +msgstr "Ljudsignal" + +#: src/termit_preferences.c:207 msgid "Background" msgstr "Bakgrund" -#: src/termit_core_api.c:440 +#: src/termit_core_api.c:464 msgid "Cannot create a new tab" msgstr "Kan inte skapa ny flik" -#: src/termit_core_api.c:392 +#: src/termit_core_api.c:416 msgid "Cannot parse command. Creating tab with shell" msgstr "Kan inte tolka kommando. Skapar interaktiv flik." -#: src/termit.c:187 src/termit.c:226 -msgid "Copy" +#: src/termit.c:170 src/termit.c:223 +msgid "Close tab" msgstr "" -#: src/termit.c:170 src/termit.c:223 -msgid "Delete" +#: src/termit.c:187 src/termit.c:226 +msgid "Copy" msgstr "" #: src/termit.c:190 @@ -30,21 +35,21 @@ msgstr "Redigera" msgid "File" msgstr "Arkiv" -#: src/termit_preferences.c:192 +#: src/termit_preferences.c:193 msgid "Font" msgstr "Teckensnitt" -#: src/termit_preferences.c:199 +#: src/termit_preferences.c:200 msgid "Foreground" msgstr "Frgrund" #. File menu #: src/termit.c:169 src/termit.c:222 -msgid "Open" +msgid "New tab" msgstr "" #. Sessions menu -#: src/termit.c:202 src/callbacks.c:395 +#: src/termit.c:202 src/callbacks.c:418 msgid "Open session" msgstr "ppna arbetspass" @@ -52,7 +57,7 @@ msgstr "ppna arbetspass" msgid "Paste" msgstr "" -#: src/termit.c:186 src/termit.c:225 src/termit_preferences.c:166 +#: src/termit.c:186 src/termit.c:225 src/termit_preferences.c:167 msgid "Preferences" msgstr "" @@ -60,7 +65,7 @@ msgstr "" msgid "Quit" msgstr "" -#: src/termit.c:203 src/callbacks.c:365 +#: src/termit.c:203 src/callbacks.c:388 msgid "Save session" msgstr "Spara arbetspass" @@ -83,11 +88,11 @@ msgid "" "Close anyway?" msgstr "" -#: src/callbacks.c:274 src/callbacks.c:285 +#: src/callbacks.c:297 src/callbacks.c:308 msgid "Tab name" msgstr "Fliknamn" -#: src/termit_preferences.c:186 +#: src/termit_preferences.c:187 msgid "Title" msgstr "Rubrik" @@ -96,11 +101,6 @@ msgstr "Rubrik" msgid "Unable to create directory '%s': %s" msgstr "Kan inte skapa mappen '%s': %s" -#: src/termit_preferences.c:212 -#, fuzzy -msgid "audible bell" -msgstr "Ljudsignal" - #~ msgid "Background image" #~ msgstr "Bakgrundsbild" diff --git a/po/termit.pot b/po/termit.pot index cb36ad4..84349c5 100644 --- a/po/termit.pot +++ b/po/termit.pot @@ -1,25 +1,29 @@ -#: src/termit_preferences.c:218 +#: src/termit_preferences.c:219 msgid "Apply to all tabs" msgstr "" -#: src/termit_preferences.c:206 +#: src/termit_preferences.c:213 +msgid "Audible bell" +msgstr "" + +#: src/termit_preferences.c:207 msgid "Background" msgstr "" -#: src/termit_core_api.c:440 +#: src/termit_core_api.c:464 msgid "Cannot create a new tab" msgstr "" -#: src/termit_core_api.c:392 +#: src/termit_core_api.c:416 msgid "Cannot parse command. Creating tab with shell" msgstr "" -#: src/termit.c:187 src/termit.c:226 -msgid "Copy" +#: src/termit.c:170 src/termit.c:223 +msgid "Close tab" msgstr "" -#: src/termit.c:170 src/termit.c:223 -msgid "Delete" +#: src/termit.c:187 src/termit.c:226 +msgid "Copy" msgstr "" #: src/termit.c:190 @@ -30,21 +34,21 @@ msgstr "" msgid "File" msgstr "" -#: src/termit_preferences.c:192 +#: src/termit_preferences.c:193 msgid "Font" msgstr "" -#: src/termit_preferences.c:199 +#: src/termit_preferences.c:200 msgid "Foreground" msgstr "" #. File menu #: src/termit.c:169 src/termit.c:222 -msgid "Open" +msgid "New tab" msgstr "" #. Sessions menu -#: src/termit.c:202 src/callbacks.c:395 +#: src/termit.c:202 src/callbacks.c:418 msgid "Open session" msgstr "" @@ -52,7 +56,7 @@ msgstr "" msgid "Paste" msgstr "" -#: src/termit.c:186 src/termit.c:225 src/termit_preferences.c:166 +#: src/termit.c:186 src/termit.c:225 src/termit_preferences.c:167 msgid "Preferences" msgstr "" @@ -60,7 +64,7 @@ msgstr "" msgid "Quit" msgstr "" -#: src/termit.c:203 src/callbacks.c:365 +#: src/termit.c:203 src/callbacks.c:388 msgid "Save session" msgstr "" @@ -83,11 +87,11 @@ msgid "" "Close anyway?" msgstr "" -#: src/callbacks.c:274 src/callbacks.c:285 +#: src/callbacks.c:297 src/callbacks.c:308 msgid "Tab name" msgstr "" -#: src/termit_preferences.c:186 +#: src/termit_preferences.c:187 msgid "Title" msgstr "" @@ -95,7 +99,3 @@ msgstr "" #, c-format msgid "Unable to create directory '%s': %s" msgstr "" - -#: src/termit_preferences.c:212 -msgid "audible bell" -msgstr "" diff --git a/po/zh_TW.po b/po/zh_TW.po index 2d5fec5..cd8df22 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -13,28 +13,32 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: src/termit_preferences.c:218 +#: src/termit_preferences.c:219 msgid "Apply to all tabs" msgstr "" -#: src/termit_preferences.c:206 +#: src/termit_preferences.c:213 +msgid "Audible bell" +msgstr "" + +#: src/termit_preferences.c:207 msgid "Background" msgstr "" -#: src/termit_core_api.c:440 +#: src/termit_core_api.c:464 msgid "Cannot create a new tab" msgstr "無法建立新分頁" -#: src/termit_core_api.c:392 +#: src/termit_core_api.c:416 msgid "Cannot parse command. Creating tab with shell" msgstr "" -#: src/termit.c:187 src/termit.c:226 -msgid "Copy" +#: src/termit.c:170 src/termit.c:223 +msgid "Close tab" msgstr "" -#: src/termit.c:170 src/termit.c:223 -msgid "Delete" +#: src/termit.c:187 src/termit.c:226 +msgid "Copy" msgstr "" #: src/termit.c:190 @@ -45,21 +49,21 @@ msgstr "編輯" msgid "File" msgstr "檔案" -#: src/termit_preferences.c:192 +#: src/termit_preferences.c:193 msgid "Font" msgstr "" -#: src/termit_preferences.c:199 +#: src/termit_preferences.c:200 msgid "Foreground" msgstr "" #. File menu #: src/termit.c:169 src/termit.c:222 -msgid "Open" +msgid "New tab" msgstr "" #. Sessions menu -#: src/termit.c:202 src/callbacks.c:395 +#: src/termit.c:202 src/callbacks.c:418 msgid "Open session" msgstr "開啟作業階段" @@ -67,7 +71,7 @@ msgstr "開啟作業階段" msgid "Paste" msgstr "" -#: src/termit.c:186 src/termit.c:225 src/termit_preferences.c:166 +#: src/termit.c:186 src/termit.c:225 src/termit_preferences.c:167 msgid "Preferences" msgstr "" @@ -75,7 +79,7 @@ msgstr "" msgid "Quit" msgstr "" -#: src/termit.c:203 src/callbacks.c:365 +#: src/termit.c:203 src/callbacks.c:388 msgid "Save session" msgstr "儲存作業階段" @@ -98,11 +102,11 @@ msgid "" "Close anyway?" msgstr "已開啟數個分頁。是否關閉?" -#: src/callbacks.c:274 src/callbacks.c:285 +#: src/callbacks.c:297 src/callbacks.c:308 msgid "Tab name" msgstr "分頁名稱" -#: src/termit_preferences.c:186 +#: src/termit_preferences.c:187 #, fuzzy msgid "Title" msgstr "檔案" @@ -112,10 +116,6 @@ msgstr "檔案" msgid "Unable to create directory '%s': %s" msgstr "無法建立目錄 '%s': %s" -#: src/termit_preferences.c:212 -msgid "audible bell" -msgstr "" - #~ msgid "Bookmarks" #~ msgstr "書籤" diff --git a/src/termit.c b/src/termit.c index 73fb748..fce5406 100644 --- a/src/termit.c +++ b/src/termit.c @@ -19,7 +19,7 @@ #include #include #include -#include +#include #include "config.h" @@ -166,8 +166,8 @@ void termit_create_menubar() GtkWidget* menu_bar = gtk_menu_bar_new(); // File menu - GtkWidget *mi_new_tab = termit_lua_menu_item_from_string(_("Open"), "openTab"); - GtkWidget *mi_close_tab = termit_lua_menu_item_from_string(_("Delete"), "closeTab"); + GtkWidget *mi_new_tab = termit_lua_menu_item_from_string(_("New tab"), "openTab"); + GtkWidget *mi_close_tab = termit_lua_menu_item_from_string(_("Close tab"), "closeTab"); GtkWidget *mi_exit = termit_lua_menu_item_from_string(_("Quit"), "quit"); GtkWidget *mi_file = gtk_menu_item_new_with_label(_("File")); @@ -219,8 +219,8 @@ void termit_create_popup_menu() { termit.menu = gtk_menu_new(); - GtkWidget *mi_new_tab = termit_lua_menu_item_from_string(_("Open"), "openTab"); - GtkWidget *mi_close_tab = termit_lua_menu_item_from_string(_("Delete"), "closeTab"); + GtkWidget *mi_new_tab = termit_lua_menu_item_from_string(_("New tab"), "openTab"); + GtkWidget *mi_close_tab = termit_lua_menu_item_from_string(_("Close tab"), "closeTab"); GtkWidget *mi_set_tab_name = termit_lua_menu_item_from_string(_("Set tab name..."), "setTabTitleDlg"); GtkWidget *mi_edit_preferences = termit_lua_menu_item_from_string(_("Preferences"), "preferencesDlg"); GtkWidget *mi_copy = termit_lua_menu_item_from_string(_("Copy"), "copy"); diff --git a/src/termit.h b/src/termit.h index 7253dd5..8f34e3d 100644 --- a/src/termit.h +++ b/src/termit.h @@ -21,7 +21,7 @@ #include #include -#include +#include #include #include diff --git a/src/termit_preferences.c b/src/termit_preferences.c index e038bc8..5cef5ed 100644 --- a/src/termit_preferences.c +++ b/src/termit_preferences.c @@ -210,7 +210,7 @@ void termit_preferences_dialog(struct TermitTab *pTab) GtkWidget* btn_audible_bell = gtk_check_button_new(); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(btn_audible_bell), pTab->audible_bell); g_signal_connect(btn_audible_bell, "toggled", G_CALLBACK(dlg_set_audible_bell), pTab); - TERMIT_PREFERENCE_ROW(_("audible bell"), btn_audible_bell); + TERMIT_PREFERENCE_ROW(_("Audible bell"), btn_audible_bell); // apply to al tabs GtkWidget* btn_apply_to_all_tabs = gtk_check_button_new();