From 4f137592484b25eef1797d155ee6cb90fc6c2163 Mon Sep 17 00:00:00 2001 From: Luke aka SwissalpS Date: Fri, 9 Sep 2022 17:32:04 +0200 Subject: [PATCH 1/6] locale tweaks de, es & fr --- po/de.po | 18 +++++++++--------- po/es.po | 20 ++++++++++---------- po/fr.po | 30 +++++++++++++++--------------- 3 files changed, 34 insertions(+), 34 deletions(-) diff --git a/po/de.po b/po/de.po index b9d4ec6..7102a21 100644 --- a/po/de.po +++ b/po/de.po @@ -8,8 +8,8 @@ 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" @@ -18,7 +18,7 @@ msgstr "" #: src/termit_preferences.c:219 msgid "Apply to all tabs" -msgstr "" +msgstr "Auf alle Tabs anwenden" #: src/termit_preferences.c:213 #, fuzzy @@ -40,11 +40,11 @@ msgstr "" #: src/termit.c:170 src/termit.c:223 msgid "Close tab" -msgstr "" +msgstr "Tab schliessen" #: src/termit.c:187 src/termit.c:226 msgid "Copy" -msgstr "" +msgstr "Kopieren" #: src/termit.c:190 msgid "Edit" @@ -65,7 +65,7 @@ msgstr "Vordergrund" #. File menu #: src/termit.c:169 src/termit.c:222 msgid "New tab" -msgstr "" +msgstr "Neuen Tab" #. Sessions menu #: src/termit.c:202 src/callbacks.c:418 @@ -74,15 +74,15 @@ 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: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:388 msgid "Save session" diff --git a/po/es.po b/po/es.po index 89ed4b9..92eb306 100644 --- a/po/es.po +++ b/po/es.po @@ -7,8 +7,8 @@ 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" @@ -17,7 +17,7 @@ msgstr "" #: src/termit_preferences.c:219 msgid "Apply to all tabs" -msgstr "" +msgstr "Aplicar a todas las pestañas" #: src/termit_preferences.c:213 #, fuzzy @@ -38,11 +38,11 @@ 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 "" +msgstr "Cerrar pestaña" #: src/termit.c:187 src/termit.c:226 msgid "Copy" -msgstr "" +msgstr "Copiar" #: src/termit.c:190 msgid "Edit" @@ -63,7 +63,7 @@ msgstr "Frente" #. File menu #: src/termit.c:169 src/termit.c:222 msgid "New tab" -msgstr "" +msgstr "Nueva pestaña" #. Sessions menu #: src/termit.c:202 src/callbacks.c:418 @@ -72,15 +72,15 @@ 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: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:388 msgid "Save session" @@ -105,7 +105,7 @@ msgid "" "Close anyway?" msgstr "" "Hay varias pestañas abiertas.\n" -"¿Cerrarlas todas?" +"¿Cerrarlas todas igual?" #: src/callbacks.c:297 src/callbacks.c:308 msgid "Tab name" diff --git a/po/fr.po b/po/fr.po index 04d27aa..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" @@ -14,15 +14,15 @@ msgstr "" #: 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 "" +msgstr "Cloche sonore" #: src/termit_preferences.c:207 msgid "Background" -msgstr "" +msgstr "Fond" #: src/termit_core_api.c:464 msgid "Cannot create a new tab" @@ -30,15 +30,15 @@ msgstr "Impossible de créer un nouvel onglet" #: 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 "" +msgstr "Fermer l'onglet" #: src/termit.c:187 src/termit.c:226 msgid "Copy" -msgstr "" +msgstr "Copie" #: src/termit.c:190 msgid "Edit" @@ -50,16 +50,16 @@ msgstr "Fichier" #: src/termit_preferences.c:193 msgid "Font" -msgstr "" +msgstr "Fonte" #: src/termit_preferences.c:200 msgid "Foreground" -msgstr "" +msgstr "Premier plan" #. File menu #: src/termit.c:169 src/termit.c:222 msgid "New tab" -msgstr "" +msgstr "Nouvel onglet" #. Sessions menu #: src/termit.c:202 src/callbacks.c:418 @@ -68,15 +68,15 @@ 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: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:388 msgid "Save session" @@ -84,7 +84,7 @@ msgstr "Enregistrer la session" #: src/termit.c:229 msgid "Scrollbar" -msgstr "" +msgstr "Barre de défilement" #: src/termit.c:205 msgid "Sessions" From 7f7a4b64b82d9d2caf28d357eaa686641ac10e71 Mon Sep 17 00:00:00 2001 From: Luke aka SwissalpS Date: Fri, 9 Sep 2022 17:36:39 +0200 Subject: [PATCH 2/6] correct include path --- src/termit.c | 2 +- src/termit.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/termit.c b/src/termit.c index e240b5c..fce5406 100644 --- a/src/termit.c +++ b/src/termit.c @@ -19,7 +19,7 @@ #include #include #include -#include +#include #include "config.h" 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 From 7a52348957cab1d5fabc42244ccf41a772bb8989 Mon Sep 17 00:00:00 2001 From: Luke aka SwissalpS Date: Fri, 9 Sep 2022 17:37:56 +0200 Subject: [PATCH 3/6] satisfy cmake version warning --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8049116..de76e31 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) From 9baeb0d449914deddaab62cc6c86225b422d3454 Mon Sep 17 00:00:00 2001 From: Luke aka SwissalpS Date: Fri, 9 Sep 2022 17:42:28 +0200 Subject: [PATCH 4/6] add github workflows to test build for fedora and ubuntu --- .github/workflows/build.yml | 56 +++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 .github/workflows/build.yml 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 From d96ce6b176ec2cdc8a9a2f2bbc8b35399ae4e416 Mon Sep 17 00:00:00 2001 From: Luke aka SwissalpS Date: Fri, 9 Sep 2022 17:44:23 +0200 Subject: [PATCH 5/6] add readme.md --- README.md | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 README.md 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) From 72239daf90cae6ddf5d4ed7f5ace58ada4c9bdea Mon Sep 17 00:00:00 2001 From: Luke aka SwissalpS Date: Fri, 9 Sep 2022 17:45:32 +0200 Subject: [PATCH 6/6] version bump 3.1.1 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index de76e31..33585eb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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")