From 5cc0df1ca44b7d63913c5cb4764685694ade593a Mon Sep 17 00:00:00 2001 From: "Brian K. White" Date: Mon, 29 May 2023 19:05:30 -0400 Subject: [PATCH] fix threshold_major when show_previous=-1, fix is_mainline in split_version_string() --- .deb_build_number.mak | 2 +- BRANDING.mak | 2 +- debian/changelog | 8 ++ po/de.po | 62 +++++------ po/el.po | 62 +++++------ po/es.po | 62 +++++------ po/fr.po | 62 +++++------ po/hr.po | 62 +++++------ po/it.po | 62 +++++------ po/ko.po | 62 +++++------ po/messages.pot | 64 ++++++------ po/nl.po | 62 +++++------ po/pl.po | 62 +++++------ po/ru.po | 62 +++++------ po/sv.po | 62 +++++------ po/tr.po | 62 +++++------ po/uk.po | 62 +++++------ settings.md | 12 +-- src/Common/LinuxKernel.vala | 201 +++++++++++++++++++----------------- src/Gtk/MainWindow.vala | 4 +- 20 files changed, 562 insertions(+), 537 deletions(-) diff --git a/.deb_build_number.mak b/.deb_build_number.mak index 98334245..cb252455 100644 --- a/.deb_build_number.mak +++ b/.deb_build_number.mak @@ -1,3 +1,3 @@ # This file is generated by Makefile "make deb_build_number" -DEB_PKG_VERSION := 1.3.2 +DEB_PKG_VERSION := 1.3.3 DEB_BUILD_NUMBER := 0000 diff --git a/BRANDING.mak b/BRANDING.mak index 898d48a3..aefb6cc1 100644 --- a/BRANDING.mak +++ b/BRANDING.mak @@ -3,7 +3,7 @@ VERSION_MAJOR = 1 VERSION_MINOR = 3 -VERSION_MICRO = 2 +VERSION_MICRO = 3 BRANDING_SHORTNAME = mainline BRANDING_LONGNAME = Ubuntu Mainline Kernel Installer BRANDING_AUTHORNAME = Brian K. White diff --git a/debian/changelog b/debian/changelog index afe6f6a8..e5f84b6f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +mainline (1.3.3) unstable; urgency=medium + + * fix threshold_major when show_previous=-1 + * improve some version string parsing stuff + * fix the is_mainline test in split_version_string() + + -- Brian K. White Mon, 29 May 2023 18:58:42 -0400 + mainline (1.3.2) unstable; urgency=medium * install/uninstall/download all now accept lists diff --git a/po/de.po b/po/de.po index 42ee6952..121f67f9 100644 --- a/po/de.po +++ b/po/de.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: mainline\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-05-29 06:50-0400\n" +"POT-Creation-Date: 2023-05-29 18:58-0400\n" "PO-Revision-Date: 2023-02-20 18:40+0100\n" "Last-Translator: Marvin Meysel \n" "Language-Team: German\n" @@ -61,125 +61,125 @@ msgstr "Installiert gefunden" msgid "locked" msgstr "" -#: src/Common/LinuxKernel.vala:497 src/Common/LinuxKernel.vala:1060 -#: src/Common/LinuxKernel.vala:1094 src/Common/LinuxKernel.vala:1150 +#: src/Common/LinuxKernel.vala:497 src/Common/LinuxKernel.vala:1077 +#: src/Common/LinuxKernel.vala:1111 src/Common/LinuxKernel.vala:1167 msgid "is locked." msgstr "" -#: src/Common/LinuxKernel.vala:732 src/Gtk/MainWindow.vala:511 +#: src/Common/LinuxKernel.vala:749 src/Gtk/MainWindow.vala:511 #: src/Gtk/MainWindow.vala:524 msgid "Running" msgstr "Läuft" -#: src/Common/LinuxKernel.vala:733 +#: src/Common/LinuxKernel.vala:750 msgid "Installed" msgstr "Installiert" -#: src/Common/LinuxKernel.vala:734 +#: src/Common/LinuxKernel.vala:751 msgid "Invalid" msgstr "Ungültig" -#: src/Common/LinuxKernel.vala:820 +#: src/Common/LinuxKernel.vala:837 msgid "Packages Available" msgstr "Verfügbare Pakete" -#: src/Common/LinuxKernel.vala:826 +#: src/Common/LinuxKernel.vala:843 msgid "Packages Installed" msgstr "Installierte Pakete" -#: src/Common/LinuxKernel.vala:851 src/lib/TeeJee.FileSystem.vala:118 +#: src/Common/LinuxKernel.vala:868 src/lib/TeeJee.FileSystem.vala:118 msgid "File not found" msgstr "Datei nicht gefunden " -#: src/Common/LinuxKernel.vala:945 +#: src/Common/LinuxKernel.vala:962 msgid "Available Kernels" msgstr "Verfügbare Kernel" -#: src/Common/LinuxKernel.vala:973 +#: src/Common/LinuxKernel.vala:990 #, fuzzy msgid "No kernels specified" msgstr "Befehl nicht angegeben" -#: src/Common/LinuxKernel.vala:980 src/Gtk/MainWindow.vala:119 +#: src/Common/LinuxKernel.vala:997 src/Gtk/MainWindow.vala:119 msgid "Kernel" msgstr "Kernel" -#: src/Common/LinuxKernel.vala:980 +#: src/Common/LinuxKernel.vala:997 #, fuzzy msgid "not found" msgstr "Datei nicht gefunden " -#: src/Common/LinuxKernel.vala:1006 +#: src/Common/LinuxKernel.vala:1023 msgid "enabled" msgstr "ermöglichte" -#: src/Common/LinuxKernel.vala:1030 +#: src/Common/LinuxKernel.vala:1047 msgid "Downloading" msgstr "Laden" -#: src/Common/LinuxKernel.vala:1055 +#: src/Common/LinuxKernel.vala:1072 msgid "is already installed." msgstr "ist bereits installiert." -#: src/Common/LinuxKernel.vala:1065 +#: src/Common/LinuxKernel.vala:1082 msgid "download failed." msgstr "" -#: src/Common/LinuxKernel.vala:1082 +#: src/Common/LinuxKernel.vala:1099 msgid "Uninstalling selected kernels" msgstr "Deinstallation des angegebenen Kernels" -#: src/Common/LinuxKernel.vala:1086 +#: src/Common/LinuxKernel.vala:1103 msgid "requested" msgstr "angefordert" -#: src/Common/LinuxKernel.vala:1089 +#: src/Common/LinuxKernel.vala:1106 msgid "not uninstalling the currently running kernel" msgstr "Den aktuell laufenden Kernel wird nicht deinstalliert" -#: src/Common/LinuxKernel.vala:1102 +#: src/Common/LinuxKernel.vala:1119 msgid "found" msgstr "gründen" -#: src/Common/LinuxKernel.vala:1107 +#: src/Common/LinuxKernel.vala:1124 msgid "No packages to un-install!" msgstr "Keine Pakete zum Deinstallieren!" -#: src/Common/LinuxKernel.vala:1146 +#: src/Common/LinuxKernel.vala:1163 #, fuzzy msgid "is the highest installed version." msgstr "Deinstallieren Sie alle bis auf die höchste installierte Version" -#: src/Common/LinuxKernel.vala:1159 +#: src/Common/LinuxKernel.vala:1176 msgid "Could not find running kernel in list" msgstr "Konnte keinen laufenden Kernel in der Liste finden" -#: src/Common/LinuxKernel.vala:1164 +#: src/Common/LinuxKernel.vala:1181 msgid "Could not find any kernels to uninstall" msgstr "Es konnten keine Kernel zum Deinstallieren gefunden werden" -#: src/Common/LinuxKernel.vala:1172 +#: src/Common/LinuxKernel.vala:1189 msgid "The following kernels will be uninstalled" msgstr "Die folgenden Kernel werden deinstalliert" -#: src/Common/LinuxKernel.vala:1176 +#: src/Common/LinuxKernel.vala:1193 msgid "Continue ?" msgstr "Weiter ?" -#: src/Common/LinuxKernel.vala:1198 src/Console/AppConsole.vala:234 +#: src/Common/LinuxKernel.vala:1215 src/Console/AppConsole.vala:234 msgid "Latest update" msgstr "Neustes Update" -#: src/Common/LinuxKernel.vala:1209 src/Console/AppConsole.vala:241 +#: src/Common/LinuxKernel.vala:1226 src/Console/AppConsole.vala:241 msgid "Latest point update" msgstr "Letzte Punktaktualisierung" -#: src/Common/LinuxKernel.vala:1217 src/Console/AppConsole.vala:246 +#: src/Common/LinuxKernel.vala:1234 src/Console/AppConsole.vala:246 #: src/Console/AppConsole.vala:262 msgid "No updates found" msgstr "Keine Updates gefunden" -#: src/Common/LinuxKernel.vala:1226 +#: src/Common/LinuxKernel.vala:1243 #, c-format msgid "Install Kernel Version %s ? (y/n): " msgstr "Kernel-Version %s installieren? (j/n):" diff --git a/po/el.po b/po/el.po index 594828d8..ad7fe839 100644 --- a/po/el.po +++ b/po/el.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: mainline\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-05-29 06:50-0400\n" +"POT-Creation-Date: 2023-05-29 18:58-0400\n" "PO-Revision-Date: 2023-01-10 02:03-0600\n" "Last-Translator: Vasilis Kosmidis \n" "Language-Team: Greek\n" @@ -61,125 +61,125 @@ msgstr "Βρέθηκε εγκατεστημένο" msgid "locked" msgstr "" -#: src/Common/LinuxKernel.vala:497 src/Common/LinuxKernel.vala:1060 -#: src/Common/LinuxKernel.vala:1094 src/Common/LinuxKernel.vala:1150 +#: src/Common/LinuxKernel.vala:497 src/Common/LinuxKernel.vala:1077 +#: src/Common/LinuxKernel.vala:1111 src/Common/LinuxKernel.vala:1167 msgid "is locked." msgstr "" -#: src/Common/LinuxKernel.vala:732 src/Gtk/MainWindow.vala:511 +#: src/Common/LinuxKernel.vala:749 src/Gtk/MainWindow.vala:511 #: src/Gtk/MainWindow.vala:524 msgid "Running" msgstr "Ενεργός" -#: src/Common/LinuxKernel.vala:733 +#: src/Common/LinuxKernel.vala:750 msgid "Installed" msgstr "Εγκατεστημένος" -#: src/Common/LinuxKernel.vala:734 +#: src/Common/LinuxKernel.vala:751 msgid "Invalid" msgstr "Άκυρος" -#: src/Common/LinuxKernel.vala:820 +#: src/Common/LinuxKernel.vala:837 msgid "Packages Available" msgstr "Διαθέσιμα πακέτα" -#: src/Common/LinuxKernel.vala:826 +#: src/Common/LinuxKernel.vala:843 msgid "Packages Installed" msgstr "Εγκατεστημένα πακέτα" -#: src/Common/LinuxKernel.vala:851 src/lib/TeeJee.FileSystem.vala:118 +#: src/Common/LinuxKernel.vala:868 src/lib/TeeJee.FileSystem.vala:118 msgid "File not found" msgstr "Το αρχείο δε βρέθηκε" -#: src/Common/LinuxKernel.vala:945 +#: src/Common/LinuxKernel.vala:962 msgid "Available Kernels" msgstr "Διαθέσιμοι πυρήνες" -#: src/Common/LinuxKernel.vala:973 +#: src/Common/LinuxKernel.vala:990 #, fuzzy msgid "No kernels specified" msgstr "Η εντολή δεν προσδιορίστηκε" -#: src/Common/LinuxKernel.vala:980 src/Gtk/MainWindow.vala:119 +#: src/Common/LinuxKernel.vala:997 src/Gtk/MainWindow.vala:119 msgid "Kernel" msgstr "Πυρήνας" -#: src/Common/LinuxKernel.vala:980 +#: src/Common/LinuxKernel.vala:997 #, fuzzy msgid "not found" msgstr "Το αρχείο δε βρέθηκε" -#: src/Common/LinuxKernel.vala:1006 +#: src/Common/LinuxKernel.vala:1023 msgid "enabled" msgstr "ενεργοποιημένη" -#: src/Common/LinuxKernel.vala:1030 +#: src/Common/LinuxKernel.vala:1047 msgid "Downloading" msgstr "Κατέβασμα" -#: src/Common/LinuxKernel.vala:1055 +#: src/Common/LinuxKernel.vala:1072 msgid "is already installed." msgstr "είναι ήδη εγκατεστημένο." -#: src/Common/LinuxKernel.vala:1065 +#: src/Common/LinuxKernel.vala:1082 msgid "download failed." msgstr "" -#: src/Common/LinuxKernel.vala:1082 +#: src/Common/LinuxKernel.vala:1099 msgid "Uninstalling selected kernels" msgstr "Απεγκατάσταση επιλεγμένων πυρήνων" -#: src/Common/LinuxKernel.vala:1086 +#: src/Common/LinuxKernel.vala:1103 msgid "requested" msgstr "ζητήθηκε" -#: src/Common/LinuxKernel.vala:1089 +#: src/Common/LinuxKernel.vala:1106 msgid "not uninstalling the currently running kernel" msgstr "δεν θα απεγκαταστήσει τον πυρήνα που εκτελείται αυτήν τη στιγμή" -#: src/Common/LinuxKernel.vala:1102 +#: src/Common/LinuxKernel.vala:1119 msgid "found" msgstr "ιδρύω" -#: src/Common/LinuxKernel.vala:1107 +#: src/Common/LinuxKernel.vala:1124 msgid "No packages to un-install!" msgstr "Δεν υπάρχουν πακέτα για απεγκατάσταση!" -#: src/Common/LinuxKernel.vala:1146 +#: src/Common/LinuxKernel.vala:1163 #, fuzzy msgid "is the highest installed version." msgstr "Απεγκαταστήστε όλες εκτός από την υψηλότερη εγκατεστημένη έκδοση" -#: src/Common/LinuxKernel.vala:1159 +#: src/Common/LinuxKernel.vala:1176 msgid "Could not find running kernel in list" msgstr "Δεν ήταν δυνατή η εύρεση του πυρήνα που εκτελείται αυτήν τη στιγμή" -#: src/Common/LinuxKernel.vala:1164 +#: src/Common/LinuxKernel.vala:1181 msgid "Could not find any kernels to uninstall" msgstr "Δεν βρέθηκε κανένας πυρήνας για απεγκατάσταση" -#: src/Common/LinuxKernel.vala:1172 +#: src/Common/LinuxKernel.vala:1189 msgid "The following kernels will be uninstalled" msgstr "Θα καταργηθεί η εγκατάσταση των ακόλουθων πυρήνων" -#: src/Common/LinuxKernel.vala:1176 +#: src/Common/LinuxKernel.vala:1193 msgid "Continue ?" msgstr "Συνέχεια;" -#: src/Common/LinuxKernel.vala:1198 src/Console/AppConsole.vala:234 +#: src/Common/LinuxKernel.vala:1215 src/Console/AppConsole.vala:234 msgid "Latest update" msgstr "Τελευταία αναβάθμιση" -#: src/Common/LinuxKernel.vala:1209 src/Console/AppConsole.vala:241 +#: src/Common/LinuxKernel.vala:1226 src/Console/AppConsole.vala:241 msgid "Latest point update" msgstr "Τελευταία ενημέρωση συντήρησης" -#: src/Common/LinuxKernel.vala:1217 src/Console/AppConsole.vala:246 +#: src/Common/LinuxKernel.vala:1234 src/Console/AppConsole.vala:246 #: src/Console/AppConsole.vala:262 msgid "No updates found" msgstr "Δεν βρέθηκαν ενημερώσεις" -#: src/Common/LinuxKernel.vala:1226 +#: src/Common/LinuxKernel.vala:1243 #, c-format msgid "Install Kernel Version %s ? (y/n): " msgstr "Εγκατάσταση του πυρήνα έκδοσης %s ; (ν/ό):" diff --git a/po/es.po b/po/es.po index 115cd7ed..f1c3e756 100644 --- a/po/es.po +++ b/po/es.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: mainline\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-05-29 06:50-0400\n" +"POT-Creation-Date: 2023-05-29 18:58-0400\n" "PO-Revision-Date: 2018-01-03 02:03-0600\n" "Last-Translator: Adolfo Jayme Barrientos \n" "Language-Team: Spanish\n" @@ -61,125 +61,125 @@ msgstr "Encontrado instalado" msgid "locked" msgstr "" -#: src/Common/LinuxKernel.vala:497 src/Common/LinuxKernel.vala:1060 -#: src/Common/LinuxKernel.vala:1094 src/Common/LinuxKernel.vala:1150 +#: src/Common/LinuxKernel.vala:497 src/Common/LinuxKernel.vala:1077 +#: src/Common/LinuxKernel.vala:1111 src/Common/LinuxKernel.vala:1167 msgid "is locked." msgstr "" -#: src/Common/LinuxKernel.vala:732 src/Gtk/MainWindow.vala:511 +#: src/Common/LinuxKernel.vala:749 src/Gtk/MainWindow.vala:511 #: src/Gtk/MainWindow.vala:524 msgid "Running" msgstr "En ejecución" -#: src/Common/LinuxKernel.vala:733 +#: src/Common/LinuxKernel.vala:750 msgid "Installed" msgstr "Instalado" -#: src/Common/LinuxKernel.vala:734 +#: src/Common/LinuxKernel.vala:751 msgid "Invalid" msgstr "No válido" -#: src/Common/LinuxKernel.vala:820 +#: src/Common/LinuxKernel.vala:837 msgid "Packages Available" msgstr "Paquetes disponibles" -#: src/Common/LinuxKernel.vala:826 +#: src/Common/LinuxKernel.vala:843 msgid "Packages Installed" msgstr "Paquetes instalados" -#: src/Common/LinuxKernel.vala:851 src/lib/TeeJee.FileSystem.vala:118 +#: src/Common/LinuxKernel.vala:868 src/lib/TeeJee.FileSystem.vala:118 msgid "File not found" msgstr "No se encontró el archivo" -#: src/Common/LinuxKernel.vala:945 +#: src/Common/LinuxKernel.vala:962 msgid "Available Kernels" msgstr "Núcleos disponibles" -#: src/Common/LinuxKernel.vala:973 +#: src/Common/LinuxKernel.vala:990 #, fuzzy msgid "No kernels specified" msgstr "Coomand no especificado" -#: src/Common/LinuxKernel.vala:980 src/Gtk/MainWindow.vala:119 +#: src/Common/LinuxKernel.vala:997 src/Gtk/MainWindow.vala:119 msgid "Kernel" msgstr "Núcleo" -#: src/Common/LinuxKernel.vala:980 +#: src/Common/LinuxKernel.vala:997 #, fuzzy msgid "not found" msgstr "No se encontró el archivo" -#: src/Common/LinuxKernel.vala:1006 +#: src/Common/LinuxKernel.vala:1023 msgid "enabled" msgstr "habilitado" -#: src/Common/LinuxKernel.vala:1030 +#: src/Common/LinuxKernel.vala:1047 msgid "Downloading" msgstr "Descargar" -#: src/Common/LinuxKernel.vala:1055 +#: src/Common/LinuxKernel.vala:1072 msgid "is already installed." msgstr "ya está instalado." -#: src/Common/LinuxKernel.vala:1065 +#: src/Common/LinuxKernel.vala:1082 msgid "download failed." msgstr "" -#: src/Common/LinuxKernel.vala:1082 +#: src/Common/LinuxKernel.vala:1099 msgid "Uninstalling selected kernels" msgstr "Desinstalación de kernels seleccionados" -#: src/Common/LinuxKernel.vala:1086 +#: src/Common/LinuxKernel.vala:1103 msgid "requested" msgstr "solicitado" -#: src/Common/LinuxKernel.vala:1089 +#: src/Common/LinuxKernel.vala:1106 msgid "not uninstalling the currently running kernel" msgstr "No desinstalará el kernel que se está ejecutando actualmente" -#: src/Common/LinuxKernel.vala:1102 +#: src/Common/LinuxKernel.vala:1119 msgid "found" msgstr "fundar" -#: src/Common/LinuxKernel.vala:1107 +#: src/Common/LinuxKernel.vala:1124 msgid "No packages to un-install!" msgstr "¡No hay paquetes para desinstalar!" -#: src/Common/LinuxKernel.vala:1146 +#: src/Common/LinuxKernel.vala:1163 #, fuzzy msgid "is the highest installed version." msgstr "Desinstale todas las versiones instaladas excepto la más alta" -#: src/Common/LinuxKernel.vala:1159 +#: src/Common/LinuxKernel.vala:1176 msgid "Could not find running kernel in list" msgstr "No se pudo encontrar el kernel en ejecución en la lista" -#: src/Common/LinuxKernel.vala:1164 +#: src/Common/LinuxKernel.vala:1181 msgid "Could not find any kernels to uninstall" msgstr "No se pudo encontrar ningún kernel para desinstalar" -#: src/Common/LinuxKernel.vala:1172 +#: src/Common/LinuxKernel.vala:1189 msgid "The following kernels will be uninstalled" msgstr "Se desinstalarán los siguientes kernels" -#: src/Common/LinuxKernel.vala:1176 +#: src/Common/LinuxKernel.vala:1193 msgid "Continue ?" msgstr "¿Continuar?" -#: src/Common/LinuxKernel.vala:1198 src/Console/AppConsole.vala:234 +#: src/Common/LinuxKernel.vala:1215 src/Console/AppConsole.vala:234 msgid "Latest update" msgstr "Última actualización" -#: src/Common/LinuxKernel.vala:1209 src/Console/AppConsole.vala:241 +#: src/Common/LinuxKernel.vala:1226 src/Console/AppConsole.vala:241 msgid "Latest point update" msgstr "Última actualización puntual" -#: src/Common/LinuxKernel.vala:1217 src/Console/AppConsole.vala:246 +#: src/Common/LinuxKernel.vala:1234 src/Console/AppConsole.vala:246 #: src/Console/AppConsole.vala:262 msgid "No updates found" msgstr "No se encontró ninguna actualización" -#: src/Common/LinuxKernel.vala:1226 +#: src/Common/LinuxKernel.vala:1243 #, c-format msgid "Install Kernel Version %s ? (y/n): " msgstr "Instalar la versión del kernel %s? (s/n): " diff --git a/po/fr.po b/po/fr.po index 586ecbd6..6d7e71f2 100644 --- a/po/fr.po +++ b/po/fr.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: mainline\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-05-29 06:50-0400\n" +"POT-Creation-Date: 2023-05-29 18:58-0400\n" "PO-Revision-Date: 2018-08-05 15:50+0200\n" "Last-Translator: Yolateng0 \n" "Language-Team: French\n" @@ -61,125 +61,125 @@ msgstr "Trouvé installé" msgid "locked" msgstr "" -#: src/Common/LinuxKernel.vala:497 src/Common/LinuxKernel.vala:1060 -#: src/Common/LinuxKernel.vala:1094 src/Common/LinuxKernel.vala:1150 +#: src/Common/LinuxKernel.vala:497 src/Common/LinuxKernel.vala:1077 +#: src/Common/LinuxKernel.vala:1111 src/Common/LinuxKernel.vala:1167 msgid "is locked." msgstr "" -#: src/Common/LinuxKernel.vala:732 src/Gtk/MainWindow.vala:511 +#: src/Common/LinuxKernel.vala:749 src/Gtk/MainWindow.vala:511 #: src/Gtk/MainWindow.vala:524 msgid "Running" msgstr "Actuel" -#: src/Common/LinuxKernel.vala:733 +#: src/Common/LinuxKernel.vala:750 msgid "Installed" msgstr "Installé" -#: src/Common/LinuxKernel.vala:734 +#: src/Common/LinuxKernel.vala:751 msgid "Invalid" msgstr "No válido" -#: src/Common/LinuxKernel.vala:820 +#: src/Common/LinuxKernel.vala:837 msgid "Packages Available" msgstr "Paquets Disponibles" -#: src/Common/LinuxKernel.vala:826 +#: src/Common/LinuxKernel.vala:843 msgid "Packages Installed" msgstr "Paquets Installés" -#: src/Common/LinuxKernel.vala:851 src/lib/TeeJee.FileSystem.vala:118 +#: src/Common/LinuxKernel.vala:868 src/lib/TeeJee.FileSystem.vala:118 msgid "File not found" msgstr "Fichier non trouvé" -#: src/Common/LinuxKernel.vala:945 +#: src/Common/LinuxKernel.vala:962 msgid "Available Kernels" msgstr "Noyaux Disponibles" -#: src/Common/LinuxKernel.vala:973 +#: src/Common/LinuxKernel.vala:990 #, fuzzy msgid "No kernels specified" msgstr "Pas de commande fournie" -#: src/Common/LinuxKernel.vala:980 src/Gtk/MainWindow.vala:119 +#: src/Common/LinuxKernel.vala:997 src/Gtk/MainWindow.vala:119 msgid "Kernel" msgstr "Noyau" -#: src/Common/LinuxKernel.vala:980 +#: src/Common/LinuxKernel.vala:997 #, fuzzy msgid "not found" msgstr "Fichier non trouvé" -#: src/Common/LinuxKernel.vala:1006 +#: src/Common/LinuxKernel.vala:1023 msgid "enabled" msgstr "activé" -#: src/Common/LinuxKernel.vala:1030 +#: src/Common/LinuxKernel.vala:1047 msgid "Downloading" msgstr "Téléchargement" -#: src/Common/LinuxKernel.vala:1055 +#: src/Common/LinuxKernel.vala:1072 msgid "is already installed." msgstr "est déjà installé." -#: src/Common/LinuxKernel.vala:1065 +#: src/Common/LinuxKernel.vala:1082 msgid "download failed." msgstr "" -#: src/Common/LinuxKernel.vala:1082 +#: src/Common/LinuxKernel.vala:1099 msgid "Uninstalling selected kernels" msgstr "Désinstallation des noyaux sélectionnés" -#: src/Common/LinuxKernel.vala:1086 +#: src/Common/LinuxKernel.vala:1103 msgid "requested" msgstr "Demandé" -#: src/Common/LinuxKernel.vala:1089 +#: src/Common/LinuxKernel.vala:1106 msgid "not uninstalling the currently running kernel" msgstr "Ne pas désinstaller le noyau en cours d'exécution" -#: src/Common/LinuxKernel.vala:1102 +#: src/Common/LinuxKernel.vala:1119 msgid "found" msgstr "fonder" -#: src/Common/LinuxKernel.vala:1107 +#: src/Common/LinuxKernel.vala:1124 msgid "No packages to un-install!" msgstr "Pas de paquets à désinstaller !" -#: src/Common/LinuxKernel.vala:1146 +#: src/Common/LinuxKernel.vala:1163 #, fuzzy msgid "is the highest installed version." msgstr "Désinstallez toutes le version installées, sauf la plus élevée" -#: src/Common/LinuxKernel.vala:1159 +#: src/Common/LinuxKernel.vala:1176 msgid "Could not find running kernel in list" msgstr "Impossible de trouver le noyau en cours d'exécution dans la liste" -#: src/Common/LinuxKernel.vala:1164 +#: src/Common/LinuxKernel.vala:1181 msgid "Could not find any kernels to uninstall" msgstr "Impossible de trouver des noyaux à désinstaller" -#: src/Common/LinuxKernel.vala:1172 +#: src/Common/LinuxKernel.vala:1189 msgid "The following kernels will be uninstalled" msgstr "Les noyaux suivants seront désinstallés" -#: src/Common/LinuxKernel.vala:1176 +#: src/Common/LinuxKernel.vala:1193 msgid "Continue ?" msgstr "Reprendre ?" -#: src/Common/LinuxKernel.vala:1198 src/Console/AppConsole.vala:234 +#: src/Common/LinuxKernel.vala:1215 src/Console/AppConsole.vala:234 msgid "Latest update" msgstr "Dernière mise à jour" -#: src/Common/LinuxKernel.vala:1209 src/Console/AppConsole.vala:241 +#: src/Common/LinuxKernel.vala:1226 src/Console/AppConsole.vala:241 msgid "Latest point update" msgstr "Dernière mise à jour mineure" -#: src/Common/LinuxKernel.vala:1217 src/Console/AppConsole.vala:246 +#: src/Common/LinuxKernel.vala:1234 src/Console/AppConsole.vala:246 #: src/Console/AppConsole.vala:262 msgid "No updates found" msgstr "Aucune mise à jour disponible" -#: src/Common/LinuxKernel.vala:1226 +#: src/Common/LinuxKernel.vala:1243 #, c-format msgid "Install Kernel Version %s ? (y/n): " msgstr "Installer le noyau en version %s ? (y/n): " diff --git a/po/hr.po b/po/hr.po index 48aa1afd..5fd3df9a 100644 --- a/po/hr.po +++ b/po/hr.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: mainline\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-05-29 06:50-0400\n" +"POT-Creation-Date: 2023-05-29 18:58-0400\n" "PO-Revision-Date: 2022-09-22 12:13+0200\n" "Last-Translator: gogo \n" "Language-Team: Croatian\n" @@ -61,125 +61,125 @@ msgstr "Pronađeno instalirano" msgid "locked" msgstr "" -#: src/Common/LinuxKernel.vala:497 src/Common/LinuxKernel.vala:1060 -#: src/Common/LinuxKernel.vala:1094 src/Common/LinuxKernel.vala:1150 +#: src/Common/LinuxKernel.vala:497 src/Common/LinuxKernel.vala:1077 +#: src/Common/LinuxKernel.vala:1111 src/Common/LinuxKernel.vala:1167 msgid "is locked." msgstr "" -#: src/Common/LinuxKernel.vala:732 src/Gtk/MainWindow.vala:511 +#: src/Common/LinuxKernel.vala:749 src/Gtk/MainWindow.vala:511 #: src/Gtk/MainWindow.vala:524 msgid "Running" msgstr "Pokrenuto" -#: src/Common/LinuxKernel.vala:733 +#: src/Common/LinuxKernel.vala:750 msgid "Installed" msgstr "Instalirano" -#: src/Common/LinuxKernel.vala:734 +#: src/Common/LinuxKernel.vala:751 msgid "Invalid" msgstr "Érvénytelen" -#: src/Common/LinuxKernel.vala:820 +#: src/Common/LinuxKernel.vala:837 msgid "Packages Available" msgstr "Dostupni Paketi" -#: src/Common/LinuxKernel.vala:826 +#: src/Common/LinuxKernel.vala:843 msgid "Packages Installed" msgstr "Instalirani paketi" -#: src/Common/LinuxKernel.vala:851 src/lib/TeeJee.FileSystem.vala:118 +#: src/Common/LinuxKernel.vala:868 src/lib/TeeJee.FileSystem.vala:118 msgid "File not found" msgstr "Datoteka nije pronađena" -#: src/Common/LinuxKernel.vala:945 +#: src/Common/LinuxKernel.vala:962 msgid "Available Kernels" msgstr "Dostupni kerneli" -#: src/Common/LinuxKernel.vala:973 +#: src/Common/LinuxKernel.vala:990 #, fuzzy msgid "No kernels specified" msgstr "Naredba nije navedena" -#: src/Common/LinuxKernel.vala:980 src/Gtk/MainWindow.vala:119 +#: src/Common/LinuxKernel.vala:997 src/Gtk/MainWindow.vala:119 msgid "Kernel" msgstr "Kernel" -#: src/Common/LinuxKernel.vala:980 +#: src/Common/LinuxKernel.vala:997 #, fuzzy msgid "not found" msgstr "Datoteka nije pronađena" -#: src/Common/LinuxKernel.vala:1006 +#: src/Common/LinuxKernel.vala:1023 msgid "enabled" msgstr "omogućen" -#: src/Common/LinuxKernel.vala:1030 +#: src/Common/LinuxKernel.vala:1047 msgid "Downloading" msgstr "Učitavanje" -#: src/Common/LinuxKernel.vala:1055 +#: src/Common/LinuxKernel.vala:1072 msgid "is already installed." msgstr "je već instaliran." -#: src/Common/LinuxKernel.vala:1065 +#: src/Common/LinuxKernel.vala:1082 msgid "download failed." msgstr "" -#: src/Common/LinuxKernel.vala:1082 +#: src/Common/LinuxKernel.vala:1099 msgid "Uninstalling selected kernels" msgstr "Deinstaliraj određene kernele" -#: src/Common/LinuxKernel.vala:1086 +#: src/Common/LinuxKernel.vala:1103 msgid "requested" msgstr "Zatražio" -#: src/Common/LinuxKernel.vala:1089 +#: src/Common/LinuxKernel.vala:1106 msgid "not uninstalling the currently running kernel" msgstr "ne deinstaliranje trenutno pokrenute kernel" -#: src/Common/LinuxKernel.vala:1102 +#: src/Common/LinuxKernel.vala:1119 msgid "found" msgstr "pronađen" -#: src/Common/LinuxKernel.vala:1107 +#: src/Common/LinuxKernel.vala:1124 msgid "No packages to un-install!" msgstr "Nema paketa za poništavanje instalacije!" -#: src/Common/LinuxKernel.vala:1146 +#: src/Common/LinuxKernel.vala:1163 #, fuzzy msgid "is the highest installed version." msgstr "Deinstaliraj sve osim najnovije instalirane verzije" -#: src/Common/LinuxKernel.vala:1159 +#: src/Common/LinuxKernel.vala:1176 msgid "Could not find running kernel in list" msgstr "Nije moguće pronaći pokrenutu kernel na popisu" -#: src/Common/LinuxKernel.vala:1164 +#: src/Common/LinuxKernel.vala:1181 msgid "Could not find any kernels to uninstall" msgstr "Nema pronađenih kernela za deinstaliranje" -#: src/Common/LinuxKernel.vala:1172 +#: src/Common/LinuxKernel.vala:1189 msgid "The following kernels will be uninstalled" msgstr "Deinstalirat će se sljedeće kerneli" -#: src/Common/LinuxKernel.vala:1176 +#: src/Common/LinuxKernel.vala:1193 msgid "Continue ?" msgstr "Nastavi?" -#: src/Common/LinuxKernel.vala:1198 src/Console/AppConsole.vala:234 +#: src/Common/LinuxKernel.vala:1215 src/Console/AppConsole.vala:234 msgid "Latest update" msgstr "Najnovija nadopuna" -#: src/Common/LinuxKernel.vala:1209 src/Console/AppConsole.vala:241 +#: src/Common/LinuxKernel.vala:1226 src/Console/AppConsole.vala:241 msgid "Latest point update" msgstr "Najnovija ciljana nadopuna" -#: src/Common/LinuxKernel.vala:1217 src/Console/AppConsole.vala:246 +#: src/Common/LinuxKernel.vala:1234 src/Console/AppConsole.vala:246 #: src/Console/AppConsole.vala:262 msgid "No updates found" msgstr "Nema pronađenih nadopuna" -#: src/Common/LinuxKernel.vala:1226 +#: src/Common/LinuxKernel.vala:1243 #, c-format msgid "Install Kernel Version %s ? (y/n): " msgstr "Instaliraj kernel inačice %s ? (d/n): " diff --git a/po/it.po b/po/it.po index df749724..f490cfca 100644 --- a/po/it.po +++ b/po/it.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: mainline\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-05-29 06:50-0400\n" +"POT-Creation-Date: 2023-05-29 18:58-0400\n" "PO-Revision-Date: 2020-08-22 15:35+0100\n" "Last-Translator: Demetrio Mendozzi\n" "Language-Team: Italian\n" @@ -59,125 +59,125 @@ msgstr "Trovato installato" msgid "locked" msgstr "" -#: src/Common/LinuxKernel.vala:497 src/Common/LinuxKernel.vala:1060 -#: src/Common/LinuxKernel.vala:1094 src/Common/LinuxKernel.vala:1150 +#: src/Common/LinuxKernel.vala:497 src/Common/LinuxKernel.vala:1077 +#: src/Common/LinuxKernel.vala:1111 src/Common/LinuxKernel.vala:1167 msgid "is locked." msgstr "" -#: src/Common/LinuxKernel.vala:732 src/Gtk/MainWindow.vala:511 +#: src/Common/LinuxKernel.vala:749 src/Gtk/MainWindow.vala:511 #: src/Gtk/MainWindow.vala:524 msgid "Running" msgstr "In esecuzione" -#: src/Common/LinuxKernel.vala:733 +#: src/Common/LinuxKernel.vala:750 msgid "Installed" msgstr "Installato" -#: src/Common/LinuxKernel.vala:734 +#: src/Common/LinuxKernel.vala:751 msgid "Invalid" msgstr "Non valido" -#: src/Common/LinuxKernel.vala:820 +#: src/Common/LinuxKernel.vala:837 msgid "Packages Available" msgstr "Pacchetti disponibili" -#: src/Common/LinuxKernel.vala:826 +#: src/Common/LinuxKernel.vala:843 msgid "Packages Installed" msgstr "Pacchetti installati" -#: src/Common/LinuxKernel.vala:851 src/lib/TeeJee.FileSystem.vala:118 +#: src/Common/LinuxKernel.vala:868 src/lib/TeeJee.FileSystem.vala:118 msgid "File not found" msgstr "File non trovato" -#: src/Common/LinuxKernel.vala:945 +#: src/Common/LinuxKernel.vala:962 msgid "Available Kernels" msgstr "Kernel disponibili" -#: src/Common/LinuxKernel.vala:973 +#: src/Common/LinuxKernel.vala:990 #, fuzzy msgid "No kernels specified" msgstr "Comando non specificato" -#: src/Common/LinuxKernel.vala:980 src/Gtk/MainWindow.vala:119 +#: src/Common/LinuxKernel.vala:997 src/Gtk/MainWindow.vala:119 msgid "Kernel" msgstr "Kernel" -#: src/Common/LinuxKernel.vala:980 +#: src/Common/LinuxKernel.vala:997 #, fuzzy msgid "not found" msgstr "File non trovato" -#: src/Common/LinuxKernel.vala:1006 +#: src/Common/LinuxKernel.vala:1023 msgid "enabled" msgstr "abilitato" -#: src/Common/LinuxKernel.vala:1030 +#: src/Common/LinuxKernel.vala:1047 msgid "Downloading" msgstr "Scaricamento" -#: src/Common/LinuxKernel.vala:1055 +#: src/Common/LinuxKernel.vala:1072 msgid "is already installed." msgstr "è già installato." -#: src/Common/LinuxKernel.vala:1065 +#: src/Common/LinuxKernel.vala:1082 msgid "download failed." msgstr "" -#: src/Common/LinuxKernel.vala:1082 +#: src/Common/LinuxKernel.vala:1099 msgid "Uninstalling selected kernels" msgstr "Disinstalla i kernel specificati" -#: src/Common/LinuxKernel.vala:1086 +#: src/Common/LinuxKernel.vala:1103 msgid "requested" msgstr "richiesto" -#: src/Common/LinuxKernel.vala:1089 +#: src/Common/LinuxKernel.vala:1106 msgid "not uninstalling the currently running kernel" msgstr "non disinstallare il kernel attualmente in esecuzione" -#: src/Common/LinuxKernel.vala:1102 +#: src/Common/LinuxKernel.vala:1119 msgid "found" msgstr "trovato" -#: src/Common/LinuxKernel.vala:1107 +#: src/Common/LinuxKernel.vala:1124 msgid "No packages to un-install!" msgstr "Nessun pacchetto da disinstallare!" -#: src/Common/LinuxKernel.vala:1146 +#: src/Common/LinuxKernel.vala:1163 #, fuzzy msgid "is the highest installed version." msgstr "Disinstallare tutti tranne la versione più recente installata" -#: src/Common/LinuxKernel.vala:1159 +#: src/Common/LinuxKernel.vala:1176 msgid "Could not find running kernel in list" msgstr "Impossibile trovare il kernel in esecuzione nell'elenco" -#: src/Common/LinuxKernel.vala:1164 +#: src/Common/LinuxKernel.vala:1181 msgid "Could not find any kernels to uninstall" msgstr "Impossibile trovare alcun kernel da rimuovere" -#: src/Common/LinuxKernel.vala:1172 +#: src/Common/LinuxKernel.vala:1189 msgid "The following kernels will be uninstalled" msgstr "I seguenti kernel saranno rimossi" -#: src/Common/LinuxKernel.vala:1176 +#: src/Common/LinuxKernel.vala:1193 msgid "Continue ?" msgstr "Continuare ?" -#: src/Common/LinuxKernel.vala:1198 src/Console/AppConsole.vala:234 +#: src/Common/LinuxKernel.vala:1215 src/Console/AppConsole.vala:234 msgid "Latest update" msgstr "Ultimo aggiornamento" -#: src/Common/LinuxKernel.vala:1209 src/Console/AppConsole.vala:241 +#: src/Common/LinuxKernel.vala:1226 src/Console/AppConsole.vala:241 msgid "Latest point update" msgstr "Ultimo aggiornamento del rilascio parziale" -#: src/Common/LinuxKernel.vala:1217 src/Console/AppConsole.vala:246 +#: src/Common/LinuxKernel.vala:1234 src/Console/AppConsole.vala:246 #: src/Console/AppConsole.vala:262 msgid "No updates found" msgstr "Nessun aggiornamento trovato" -#: src/Common/LinuxKernel.vala:1226 +#: src/Common/LinuxKernel.vala:1243 #, c-format msgid "Install Kernel Version %s ? (y/n): " msgstr "Installare la versione del kernel %s ? (y/n): " diff --git a/po/ko.po b/po/ko.po index 3d017507..25b926eb 100644 --- a/po/ko.po +++ b/po/ko.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: mainline\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-05-29 06:50-0400\n" +"POT-Creation-Date: 2023-05-29 18:58-0400\n" "PO-Revision-Date: 2022-09-28 11:48+0900\n" "Last-Translator: Kevin Kim \n" "Language-Team: Korean\n" @@ -61,125 +61,125 @@ msgstr "설치된 것을 찾았습니다" msgid "locked" msgstr "" -#: src/Common/LinuxKernel.vala:497 src/Common/LinuxKernel.vala:1060 -#: src/Common/LinuxKernel.vala:1094 src/Common/LinuxKernel.vala:1150 +#: src/Common/LinuxKernel.vala:497 src/Common/LinuxKernel.vala:1077 +#: src/Common/LinuxKernel.vala:1111 src/Common/LinuxKernel.vala:1167 msgid "is locked." msgstr "" -#: src/Common/LinuxKernel.vala:732 src/Gtk/MainWindow.vala:511 +#: src/Common/LinuxKernel.vala:749 src/Gtk/MainWindow.vala:511 #: src/Gtk/MainWindow.vala:524 msgid "Running" msgstr "구동 중" -#: src/Common/LinuxKernel.vala:733 +#: src/Common/LinuxKernel.vala:750 msgid "Installed" msgstr "설치 됨" -#: src/Common/LinuxKernel.vala:734 +#: src/Common/LinuxKernel.vala:751 msgid "Invalid" msgstr "사용할 수 없음" -#: src/Common/LinuxKernel.vala:820 +#: src/Common/LinuxKernel.vala:837 msgid "Packages Available" msgstr "설치 가능한 패키지" -#: src/Common/LinuxKernel.vala:826 +#: src/Common/LinuxKernel.vala:843 msgid "Packages Installed" msgstr "설치된 패키지" -#: src/Common/LinuxKernel.vala:851 src/lib/TeeJee.FileSystem.vala:118 +#: src/Common/LinuxKernel.vala:868 src/lib/TeeJee.FileSystem.vala:118 msgid "File not found" msgstr "파일을 찾을 수 없습니다" -#: src/Common/LinuxKernel.vala:945 +#: src/Common/LinuxKernel.vala:962 msgid "Available Kernels" msgstr "설치 가능한 커널" -#: src/Common/LinuxKernel.vala:973 +#: src/Common/LinuxKernel.vala:990 #, fuzzy msgid "No kernels specified" msgstr "지정한 명령어가 없습니다" -#: src/Common/LinuxKernel.vala:980 src/Gtk/MainWindow.vala:119 +#: src/Common/LinuxKernel.vala:997 src/Gtk/MainWindow.vala:119 msgid "Kernel" msgstr "커널" -#: src/Common/LinuxKernel.vala:980 +#: src/Common/LinuxKernel.vala:997 #, fuzzy msgid "not found" msgstr "파일을 찾을 수 없습니다" -#: src/Common/LinuxKernel.vala:1006 +#: src/Common/LinuxKernel.vala:1023 msgid "enabled" msgstr "사용" -#: src/Common/LinuxKernel.vala:1030 +#: src/Common/LinuxKernel.vala:1047 msgid "Downloading" msgstr "다운로드" -#: src/Common/LinuxKernel.vala:1055 +#: src/Common/LinuxKernel.vala:1072 msgid "is already installed." msgstr "가 이미 설치되어 있습니다" -#: src/Common/LinuxKernel.vala:1065 +#: src/Common/LinuxKernel.vala:1082 msgid "download failed." msgstr "" -#: src/Common/LinuxKernel.vala:1082 +#: src/Common/LinuxKernel.vala:1099 msgid "Uninstalling selected kernels" msgstr "선택한 커널 제거" -#: src/Common/LinuxKernel.vala:1086 +#: src/Common/LinuxKernel.vala:1103 msgid "requested" msgstr "요청" -#: src/Common/LinuxKernel.vala:1089 +#: src/Common/LinuxKernel.vala:1106 msgid "not uninstalling the currently running kernel" msgstr "현재 실행 중인 커널을 제거하지 않음" -#: src/Common/LinuxKernel.vala:1102 +#: src/Common/LinuxKernel.vala:1119 msgid "found" msgstr "설립하다" -#: src/Common/LinuxKernel.vala:1107 +#: src/Common/LinuxKernel.vala:1124 msgid "No packages to un-install!" msgstr "제거 할 패키지가 없습니다!" -#: src/Common/LinuxKernel.vala:1146 +#: src/Common/LinuxKernel.vala:1163 #, fuzzy msgid "is the highest installed version." msgstr "설치된 가장 높은 버전을 제외한 모든 버전을 제거합니다" -#: src/Common/LinuxKernel.vala:1159 +#: src/Common/LinuxKernel.vala:1176 msgid "Could not find running kernel in list" msgstr "현재 실행 중인 커널을 찾을 수 없습니다" -#: src/Common/LinuxKernel.vala:1164 +#: src/Common/LinuxKernel.vala:1181 msgid "Could not find any kernels to uninstall" msgstr "삭제할 커널을 찾을 수 없습니다" -#: src/Common/LinuxKernel.vala:1172 +#: src/Common/LinuxKernel.vala:1189 msgid "The following kernels will be uninstalled" msgstr "풀이" -#: src/Common/LinuxKernel.vala:1176 +#: src/Common/LinuxKernel.vala:1193 msgid "Continue ?" msgstr "계속하시겠습니까?" -#: src/Common/LinuxKernel.vala:1198 src/Console/AppConsole.vala:234 +#: src/Common/LinuxKernel.vala:1215 src/Console/AppConsole.vala:234 msgid "Latest update" msgstr "최신 업데이트" -#: src/Common/LinuxKernel.vala:1209 src/Console/AppConsole.vala:241 +#: src/Common/LinuxKernel.vala:1226 src/Console/AppConsole.vala:241 msgid "Latest point update" msgstr "최신 포인트 업데이트" -#: src/Common/LinuxKernel.vala:1217 src/Console/AppConsole.vala:246 +#: src/Common/LinuxKernel.vala:1234 src/Console/AppConsole.vala:246 #: src/Console/AppConsole.vala:262 msgid "No updates found" msgstr "업데이트를 찾을 수 없습니다" -#: src/Common/LinuxKernel.vala:1226 +#: src/Common/LinuxKernel.vala:1243 #, c-format msgid "Install Kernel Version %s ? (y/n): " msgstr "커널 %s 버전을 설치하시겠습니까? (y/n): " diff --git a/po/messages.pot b/po/messages.pot index eafef367..e96a0b37 100644 --- a/po/messages.pot +++ b/po/messages.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: mainline 1.3.2\n" +"Project-Id-Version: mainline 1.3.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-05-29 06:50-0400\n" +"POT-Creation-Date: 2023-05-29 18:58-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -65,122 +65,122 @@ msgstr "" msgid "locked" msgstr "" -#: src/Common/LinuxKernel.vala:497 src/Common/LinuxKernel.vala:1060 -#: src/Common/LinuxKernel.vala:1094 src/Common/LinuxKernel.vala:1150 +#: src/Common/LinuxKernel.vala:497 src/Common/LinuxKernel.vala:1077 +#: src/Common/LinuxKernel.vala:1111 src/Common/LinuxKernel.vala:1167 msgid "is locked." msgstr "" -#: src/Common/LinuxKernel.vala:732 src/Gtk/MainWindow.vala:511 +#: src/Common/LinuxKernel.vala:749 src/Gtk/MainWindow.vala:511 #: src/Gtk/MainWindow.vala:524 msgid "Running" msgstr "" -#: src/Common/LinuxKernel.vala:733 +#: src/Common/LinuxKernel.vala:750 msgid "Installed" msgstr "" -#: src/Common/LinuxKernel.vala:734 +#: src/Common/LinuxKernel.vala:751 msgid "Invalid" msgstr "" -#: src/Common/LinuxKernel.vala:820 +#: src/Common/LinuxKernel.vala:837 msgid "Packages Available" msgstr "" -#: src/Common/LinuxKernel.vala:826 +#: src/Common/LinuxKernel.vala:843 msgid "Packages Installed" msgstr "" -#: src/Common/LinuxKernel.vala:851 src/lib/TeeJee.FileSystem.vala:118 +#: src/Common/LinuxKernel.vala:868 src/lib/TeeJee.FileSystem.vala:118 msgid "File not found" msgstr "" -#: src/Common/LinuxKernel.vala:945 +#: src/Common/LinuxKernel.vala:962 msgid "Available Kernels" msgstr "" -#: src/Common/LinuxKernel.vala:973 +#: src/Common/LinuxKernel.vala:990 msgid "No kernels specified" msgstr "" -#: src/Common/LinuxKernel.vala:980 src/Gtk/MainWindow.vala:119 +#: src/Common/LinuxKernel.vala:997 src/Gtk/MainWindow.vala:119 msgid "Kernel" msgstr "" -#: src/Common/LinuxKernel.vala:980 +#: src/Common/LinuxKernel.vala:997 msgid "not found" msgstr "" -#: src/Common/LinuxKernel.vala:1006 +#: src/Common/LinuxKernel.vala:1023 msgid "enabled" msgstr "" -#: src/Common/LinuxKernel.vala:1030 +#: src/Common/LinuxKernel.vala:1047 msgid "Downloading" msgstr "" -#: src/Common/LinuxKernel.vala:1055 +#: src/Common/LinuxKernel.vala:1072 msgid "is already installed." msgstr "" -#: src/Common/LinuxKernel.vala:1065 +#: src/Common/LinuxKernel.vala:1082 msgid "download failed." msgstr "" -#: src/Common/LinuxKernel.vala:1082 +#: src/Common/LinuxKernel.vala:1099 msgid "Uninstalling selected kernels" msgstr "" -#: src/Common/LinuxKernel.vala:1086 +#: src/Common/LinuxKernel.vala:1103 msgid "requested" msgstr "" -#: src/Common/LinuxKernel.vala:1089 +#: src/Common/LinuxKernel.vala:1106 msgid "not uninstalling the currently running kernel" msgstr "" -#: src/Common/LinuxKernel.vala:1102 +#: src/Common/LinuxKernel.vala:1119 msgid "found" msgstr "" -#: src/Common/LinuxKernel.vala:1107 +#: src/Common/LinuxKernel.vala:1124 msgid "No packages to un-install!" msgstr "" -#: src/Common/LinuxKernel.vala:1146 +#: src/Common/LinuxKernel.vala:1163 msgid "is the highest installed version." msgstr "" -#: src/Common/LinuxKernel.vala:1159 +#: src/Common/LinuxKernel.vala:1176 msgid "Could not find running kernel in list" msgstr "" -#: src/Common/LinuxKernel.vala:1164 +#: src/Common/LinuxKernel.vala:1181 msgid "Could not find any kernels to uninstall" msgstr "" -#: src/Common/LinuxKernel.vala:1172 +#: src/Common/LinuxKernel.vala:1189 msgid "The following kernels will be uninstalled" msgstr "" -#: src/Common/LinuxKernel.vala:1176 +#: src/Common/LinuxKernel.vala:1193 msgid "Continue ?" msgstr "" -#: src/Common/LinuxKernel.vala:1198 src/Console/AppConsole.vala:234 +#: src/Common/LinuxKernel.vala:1215 src/Console/AppConsole.vala:234 msgid "Latest update" msgstr "" -#: src/Common/LinuxKernel.vala:1209 src/Console/AppConsole.vala:241 +#: src/Common/LinuxKernel.vala:1226 src/Console/AppConsole.vala:241 msgid "Latest point update" msgstr "" -#: src/Common/LinuxKernel.vala:1217 src/Console/AppConsole.vala:246 +#: src/Common/LinuxKernel.vala:1234 src/Console/AppConsole.vala:246 #: src/Console/AppConsole.vala:262 msgid "No updates found" msgstr "" -#: src/Common/LinuxKernel.vala:1226 +#: src/Common/LinuxKernel.vala:1243 #, c-format msgid "Install Kernel Version %s ? (y/n): " msgstr "" diff --git a/po/nl.po b/po/nl.po index a9b2cb14..ed03a9e6 100644 --- a/po/nl.po +++ b/po/nl.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: mainline\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-05-29 06:50-0400\n" +"POT-Creation-Date: 2023-05-29 18:58-0400\n" "PO-Revision-Date: 2020-08-23 13:55+0200\n" "Last-Translator: Heimen Stoffels \n" "Language-Team: Dutch (Netherlands)\n" @@ -61,125 +61,125 @@ msgstr "Geïnstalleerd gevonden" msgid "locked" msgstr "" -#: src/Common/LinuxKernel.vala:497 src/Common/LinuxKernel.vala:1060 -#: src/Common/LinuxKernel.vala:1094 src/Common/LinuxKernel.vala:1150 +#: src/Common/LinuxKernel.vala:497 src/Common/LinuxKernel.vala:1077 +#: src/Common/LinuxKernel.vala:1111 src/Common/LinuxKernel.vala:1167 msgid "is locked." msgstr "" -#: src/Common/LinuxKernel.vala:732 src/Gtk/MainWindow.vala:511 +#: src/Common/LinuxKernel.vala:749 src/Gtk/MainWindow.vala:511 #: src/Gtk/MainWindow.vala:524 msgid "Running" msgstr "In gebruik" -#: src/Common/LinuxKernel.vala:733 +#: src/Common/LinuxKernel.vala:750 msgid "Installed" msgstr "Geïnstalleerd" -#: src/Common/LinuxKernel.vala:734 +#: src/Common/LinuxKernel.vala:751 msgid "Invalid" msgstr "Ongeldig" -#: src/Common/LinuxKernel.vala:820 +#: src/Common/LinuxKernel.vala:837 msgid "Packages Available" msgstr "Beschikbare pakketten" -#: src/Common/LinuxKernel.vala:826 +#: src/Common/LinuxKernel.vala:843 msgid "Packages Installed" msgstr "Geïnstalleerde pakketten" -#: src/Common/LinuxKernel.vala:851 src/lib/TeeJee.FileSystem.vala:118 +#: src/Common/LinuxKernel.vala:868 src/lib/TeeJee.FileSystem.vala:118 msgid "File not found" msgstr "Het bestand is niet gevonden" -#: src/Common/LinuxKernel.vala:945 +#: src/Common/LinuxKernel.vala:962 msgid "Available Kernels" msgstr "Beschikbare kernels" -#: src/Common/LinuxKernel.vala:973 +#: src/Common/LinuxKernel.vala:990 #, fuzzy msgid "No kernels specified" msgstr "Geen opdracht opgegeven" -#: src/Common/LinuxKernel.vala:980 src/Gtk/MainWindow.vala:119 +#: src/Common/LinuxKernel.vala:997 src/Gtk/MainWindow.vala:119 msgid "Kernel" msgstr "Kernel" -#: src/Common/LinuxKernel.vala:980 +#: src/Common/LinuxKernel.vala:997 #, fuzzy msgid "not found" msgstr "Het bestand is niet gevonden" -#: src/Common/LinuxKernel.vala:1006 +#: src/Common/LinuxKernel.vala:1023 msgid "enabled" msgstr "ingeschakeld" -#: src/Common/LinuxKernel.vala:1030 +#: src/Common/LinuxKernel.vala:1047 msgid "Downloading" msgstr "Downloaden" -#: src/Common/LinuxKernel.vala:1055 +#: src/Common/LinuxKernel.vala:1072 msgid "is already installed." msgstr "is al geïnstalleerd." -#: src/Common/LinuxKernel.vala:1065 +#: src/Common/LinuxKernel.vala:1082 msgid "download failed." msgstr "" -#: src/Common/LinuxKernel.vala:1082 +#: src/Common/LinuxKernel.vala:1099 msgid "Uninstalling selected kernels" msgstr "Geselecteerde kernels verwijderen" -#: src/Common/LinuxKernel.vala:1086 +#: src/Common/LinuxKernel.vala:1103 msgid "requested" msgstr "verzocht" -#: src/Common/LinuxKernel.vala:1089 +#: src/Common/LinuxKernel.vala:1106 msgid "not uninstalling the currently running kernel" msgstr "de momenteel actieve kernel niet verwijderen" -#: src/Common/LinuxKernel.vala:1102 +#: src/Common/LinuxKernel.vala:1119 msgid "found" msgstr "gevonden" -#: src/Common/LinuxKernel.vala:1107 +#: src/Common/LinuxKernel.vala:1124 msgid "No packages to un-install!" msgstr "Geen pakketten om te verwijderen!" -#: src/Common/LinuxKernel.vala:1146 +#: src/Common/LinuxKernel.vala:1163 #, fuzzy msgid "is the highest installed version." msgstr "Verwijder alle behalve de hoogst geïnstalleerde versie" -#: src/Common/LinuxKernel.vala:1159 +#: src/Common/LinuxKernel.vala:1176 msgid "Could not find running kernel in list" msgstr "De in gebruik zijnde kernel staat niet op de lijst" -#: src/Common/LinuxKernel.vala:1164 +#: src/Common/LinuxKernel.vala:1181 msgid "Could not find any kernels to uninstall" msgstr "Er zijn geen te verwijderen kernels" -#: src/Common/LinuxKernel.vala:1172 +#: src/Common/LinuxKernel.vala:1189 msgid "The following kernels will be uninstalled" msgstr "De volgende kernels worden verwijderd" -#: src/Common/LinuxKernel.vala:1176 +#: src/Common/LinuxKernel.vala:1193 msgid "Continue ?" msgstr "Wilt u doorgaan?" -#: src/Common/LinuxKernel.vala:1198 src/Console/AppConsole.vala:234 +#: src/Common/LinuxKernel.vala:1215 src/Console/AppConsole.vala:234 msgid "Latest update" msgstr "Recentste update" -#: src/Common/LinuxKernel.vala:1209 src/Console/AppConsole.vala:241 +#: src/Common/LinuxKernel.vala:1226 src/Console/AppConsole.vala:241 msgid "Latest point update" msgstr "Recentste puntupdate" -#: src/Common/LinuxKernel.vala:1217 src/Console/AppConsole.vala:246 +#: src/Common/LinuxKernel.vala:1234 src/Console/AppConsole.vala:246 #: src/Console/AppConsole.vala:262 msgid "No updates found" msgstr "Geen updates gevonden" -#: src/Common/LinuxKernel.vala:1226 +#: src/Common/LinuxKernel.vala:1243 #, c-format msgid "Install Kernel Version %s ? (y/n): " msgstr "Wilt u versie %s installeren? (j/n): " diff --git a/po/pl.po b/po/pl.po index a9d3ca20..0b243400 100644 --- a/po/pl.po +++ b/po/pl.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: mainline\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-05-29 06:50-0400\n" +"POT-Creation-Date: 2023-05-29 18:58-0400\n" "PO-Revision-Date: 2023-05-25 13:37+0200\n" "Last-Translator: Matthaiks\n" "Language-Team: Polish\n" @@ -60,124 +60,124 @@ msgstr "Znaleziono zainstalowane" msgid "locked" msgstr "zablokowane" -#: src/Common/LinuxKernel.vala:497 src/Common/LinuxKernel.vala:1060 -#: src/Common/LinuxKernel.vala:1094 src/Common/LinuxKernel.vala:1150 +#: src/Common/LinuxKernel.vala:497 src/Common/LinuxKernel.vala:1077 +#: src/Common/LinuxKernel.vala:1111 src/Common/LinuxKernel.vala:1167 msgid "is locked." msgstr "jest zablokowane." -#: src/Common/LinuxKernel.vala:732 src/Gtk/MainWindow.vala:511 +#: src/Common/LinuxKernel.vala:749 src/Gtk/MainWindow.vala:511 #: src/Gtk/MainWindow.vala:524 msgid "Running" msgstr "Uruchomione" -#: src/Common/LinuxKernel.vala:733 +#: src/Common/LinuxKernel.vala:750 msgid "Installed" msgstr "Zainstalowane" -#: src/Common/LinuxKernel.vala:734 +#: src/Common/LinuxKernel.vala:751 msgid "Invalid" msgstr "Nieprawidłowe" -#: src/Common/LinuxKernel.vala:820 +#: src/Common/LinuxKernel.vala:837 msgid "Packages Available" msgstr "Dostępne pakiety" -#: src/Common/LinuxKernel.vala:826 +#: src/Common/LinuxKernel.vala:843 msgid "Packages Installed" msgstr "Pakiety zainstalowane" -#: src/Common/LinuxKernel.vala:851 src/lib/TeeJee.FileSystem.vala:118 +#: src/Common/LinuxKernel.vala:868 src/lib/TeeJee.FileSystem.vala:118 msgid "File not found" msgstr "Nie odnaleziono pliku" -#: src/Common/LinuxKernel.vala:945 +#: src/Common/LinuxKernel.vala:962 msgid "Available Kernels" msgstr "Dostępne jądra" -#: src/Common/LinuxKernel.vala:973 +#: src/Common/LinuxKernel.vala:990 #, fuzzy msgid "No kernels specified" msgstr "Nie określono polecenia" -#: src/Common/LinuxKernel.vala:980 src/Gtk/MainWindow.vala:119 +#: src/Common/LinuxKernel.vala:997 src/Gtk/MainWindow.vala:119 msgid "Kernel" msgstr "Jądro" -#: src/Common/LinuxKernel.vala:980 +#: src/Common/LinuxKernel.vala:997 #, fuzzy msgid "not found" msgstr "Nie odnaleziono pliku" -#: src/Common/LinuxKernel.vala:1006 +#: src/Common/LinuxKernel.vala:1023 msgid "enabled" msgstr "włączone" -#: src/Common/LinuxKernel.vala:1030 +#: src/Common/LinuxKernel.vala:1047 msgid "Downloading" msgstr "Pobieranie" -#: src/Common/LinuxKernel.vala:1055 +#: src/Common/LinuxKernel.vala:1072 msgid "is already installed." msgstr "jest już zainstalowane." -#: src/Common/LinuxKernel.vala:1065 +#: src/Common/LinuxKernel.vala:1082 msgid "download failed." msgstr "" -#: src/Common/LinuxKernel.vala:1082 +#: src/Common/LinuxKernel.vala:1099 msgid "Uninstalling selected kernels" msgstr "Odinstalowanie wybranych jąder" -#: src/Common/LinuxKernel.vala:1086 +#: src/Common/LinuxKernel.vala:1103 msgid "requested" msgstr "zażądane" -#: src/Common/LinuxKernel.vala:1089 +#: src/Common/LinuxKernel.vala:1106 msgid "not uninstalling the currently running kernel" msgstr "bez odinstalowywania aktualnie uruchomionego jądra" -#: src/Common/LinuxKernel.vala:1102 +#: src/Common/LinuxKernel.vala:1119 msgid "found" msgstr "znalezione" -#: src/Common/LinuxKernel.vala:1107 +#: src/Common/LinuxKernel.vala:1124 msgid "No packages to un-install!" msgstr "Brak pakietów do odinstalowania!" -#: src/Common/LinuxKernel.vala:1146 +#: src/Common/LinuxKernel.vala:1163 msgid "is the highest installed version." msgstr "to najwyższa zainstalowana wersja." -#: src/Common/LinuxKernel.vala:1159 +#: src/Common/LinuxKernel.vala:1176 msgid "Could not find running kernel in list" msgstr "Nie można znaleźć uruchomionego jądra na liście" -#: src/Common/LinuxKernel.vala:1164 +#: src/Common/LinuxKernel.vala:1181 msgid "Could not find any kernels to uninstall" msgstr "Nie można znaleźć żadnych jąder do odinstalowania" -#: src/Common/LinuxKernel.vala:1172 +#: src/Common/LinuxKernel.vala:1189 msgid "The following kernels will be uninstalled" msgstr "Następujące jądra zostaną odinstalowane" -#: src/Common/LinuxKernel.vala:1176 +#: src/Common/LinuxKernel.vala:1193 msgid "Continue ?" msgstr "Kontynuować?" -#: src/Common/LinuxKernel.vala:1198 src/Console/AppConsole.vala:234 +#: src/Common/LinuxKernel.vala:1215 src/Console/AppConsole.vala:234 msgid "Latest update" msgstr "Najnowsza aktualizacja" -#: src/Common/LinuxKernel.vala:1209 src/Console/AppConsole.vala:241 +#: src/Common/LinuxKernel.vala:1226 src/Console/AppConsole.vala:241 msgid "Latest point update" msgstr "Najnowsza aktualizacja punktowa" -#: src/Common/LinuxKernel.vala:1217 src/Console/AppConsole.vala:246 +#: src/Common/LinuxKernel.vala:1234 src/Console/AppConsole.vala:246 #: src/Console/AppConsole.vala:262 msgid "No updates found" msgstr "Nie znaleziono aktualizacji" -#: src/Common/LinuxKernel.vala:1226 +#: src/Common/LinuxKernel.vala:1243 #, c-format msgid "Install Kernel Version %s ? (y/n): " msgstr "Zainstalować wersję jądra %s? (t/n): " diff --git a/po/ru.po b/po/ru.po index 27e4c3a7..65f3ecef 100644 --- a/po/ru.po +++ b/po/ru.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: mainline\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-05-29 06:50-0400\n" +"POT-Creation-Date: 2023-05-29 18:58-0400\n" "PO-Revision-Date: 2023-04-17 20:16+0300\n" "Last-Translator: Danik2343 \n" "Language-Team: Russian\n" @@ -61,125 +61,125 @@ msgstr "Найдено установлененное" msgid "locked" msgstr "" -#: src/Common/LinuxKernel.vala:497 src/Common/LinuxKernel.vala:1060 -#: src/Common/LinuxKernel.vala:1094 src/Common/LinuxKernel.vala:1150 +#: src/Common/LinuxKernel.vala:497 src/Common/LinuxKernel.vala:1077 +#: src/Common/LinuxKernel.vala:1111 src/Common/LinuxKernel.vala:1167 msgid "is locked." msgstr "" -#: src/Common/LinuxKernel.vala:732 src/Gtk/MainWindow.vala:511 +#: src/Common/LinuxKernel.vala:749 src/Gtk/MainWindow.vala:511 #: src/Gtk/MainWindow.vala:524 msgid "Running" msgstr "Используется" -#: src/Common/LinuxKernel.vala:733 +#: src/Common/LinuxKernel.vala:750 msgid "Installed" msgstr "Установлено" -#: src/Common/LinuxKernel.vala:734 +#: src/Common/LinuxKernel.vala:751 msgid "Invalid" msgstr "Негодный" -#: src/Common/LinuxKernel.vala:820 +#: src/Common/LinuxKernel.vala:837 msgid "Packages Available" msgstr "Доступные пакеты" -#: src/Common/LinuxKernel.vala:826 +#: src/Common/LinuxKernel.vala:843 msgid "Packages Installed" msgstr "Установленные пакеты" -#: src/Common/LinuxKernel.vala:851 src/lib/TeeJee.FileSystem.vala:118 +#: src/Common/LinuxKernel.vala:868 src/lib/TeeJee.FileSystem.vala:118 msgid "File not found" msgstr "Файл не найден" -#: src/Common/LinuxKernel.vala:945 +#: src/Common/LinuxKernel.vala:962 msgid "Available Kernels" msgstr "Доступные ядра" -#: src/Common/LinuxKernel.vala:973 +#: src/Common/LinuxKernel.vala:990 #, fuzzy msgid "No kernels specified" msgstr "Команда не указана" -#: src/Common/LinuxKernel.vala:980 src/Gtk/MainWindow.vala:119 +#: src/Common/LinuxKernel.vala:997 src/Gtk/MainWindow.vala:119 msgid "Kernel" msgstr "Ядро" -#: src/Common/LinuxKernel.vala:980 +#: src/Common/LinuxKernel.vala:997 #, fuzzy msgid "not found" msgstr "Файл не найден" -#: src/Common/LinuxKernel.vala:1006 +#: src/Common/LinuxKernel.vala:1023 msgid "enabled" msgstr "включено" -#: src/Common/LinuxKernel.vala:1030 +#: src/Common/LinuxKernel.vala:1047 msgid "Downloading" msgstr "Загрузки" -#: src/Common/LinuxKernel.vala:1055 +#: src/Common/LinuxKernel.vala:1072 msgid "is already installed." msgstr "уже установлен." -#: src/Common/LinuxKernel.vala:1065 +#: src/Common/LinuxKernel.vala:1082 msgid "download failed." msgstr "" -#: src/Common/LinuxKernel.vala:1082 +#: src/Common/LinuxKernel.vala:1099 msgid "Uninstalling selected kernels" msgstr "Удаление выбранных ядер" -#: src/Common/LinuxKernel.vala:1086 +#: src/Common/LinuxKernel.vala:1103 msgid "requested" msgstr "запрошено" -#: src/Common/LinuxKernel.vala:1089 +#: src/Common/LinuxKernel.vala:1106 msgid "not uninstalling the currently running kernel" msgstr "не удаляет текущее работающее ядро" -#: src/Common/LinuxKernel.vala:1102 +#: src/Common/LinuxKernel.vala:1119 msgid "found" msgstr "найдено" -#: src/Common/LinuxKernel.vala:1107 +#: src/Common/LinuxKernel.vala:1124 msgid "No packages to un-install!" msgstr "Нет пакетов для удаления!" -#: src/Common/LinuxKernel.vala:1146 +#: src/Common/LinuxKernel.vala:1163 #, fuzzy msgid "is the highest installed version." msgstr "Удаление всех установленных версий, кроме самой высокой" -#: src/Common/LinuxKernel.vala:1159 +#: src/Common/LinuxKernel.vala:1176 msgid "Could not find running kernel in list" msgstr "Could not find running kernel in list" -#: src/Common/LinuxKernel.vala:1164 +#: src/Common/LinuxKernel.vala:1181 msgid "Could not find any kernels to uninstall" msgstr "Не удалось найти ядра для деинсталляции" -#: src/Common/LinuxKernel.vala:1172 +#: src/Common/LinuxKernel.vala:1189 msgid "The following kernels will be uninstalled" msgstr "Следующие ядра будут удалены" -#: src/Common/LinuxKernel.vala:1176 +#: src/Common/LinuxKernel.vala:1193 msgid "Continue ?" msgstr "Продолжить ?" -#: src/Common/LinuxKernel.vala:1198 src/Console/AppConsole.vala:234 +#: src/Common/LinuxKernel.vala:1215 src/Console/AppConsole.vala:234 msgid "Latest update" msgstr "Последнее обновление" -#: src/Common/LinuxKernel.vala:1209 src/Console/AppConsole.vala:241 +#: src/Common/LinuxKernel.vala:1226 src/Console/AppConsole.vala:241 msgid "Latest point update" msgstr "Последнее обновление пунктов" -#: src/Common/LinuxKernel.vala:1217 src/Console/AppConsole.vala:246 +#: src/Common/LinuxKernel.vala:1234 src/Console/AppConsole.vala:246 #: src/Console/AppConsole.vala:262 msgid "No updates found" msgstr "Обновлений не найдено" -#: src/Common/LinuxKernel.vala:1226 +#: src/Common/LinuxKernel.vala:1243 #, c-format msgid "Install Kernel Version %s ? (y/n): " msgstr "Установить версию ядра %s ? (y/n): " diff --git a/po/sv.po b/po/sv.po index 87cbafa3..d59ac5fd 100644 --- a/po/sv.po +++ b/po/sv.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: mainline\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-05-29 06:50-0400\n" +"POT-Creation-Date: 2023-05-29 18:58-0400\n" "PO-Revision-Date: 2018-01-13 16:56+0100\n" "Last-Translator: Åke Engelbrektson \n" "Language-Team:Swedish\n" @@ -61,125 +61,125 @@ msgstr "Hittade installerat" msgid "locked" msgstr "" -#: src/Common/LinuxKernel.vala:497 src/Common/LinuxKernel.vala:1060 -#: src/Common/LinuxKernel.vala:1094 src/Common/LinuxKernel.vala:1150 +#: src/Common/LinuxKernel.vala:497 src/Common/LinuxKernel.vala:1077 +#: src/Common/LinuxKernel.vala:1111 src/Common/LinuxKernel.vala:1167 msgid "is locked." msgstr "" -#: src/Common/LinuxKernel.vala:732 src/Gtk/MainWindow.vala:511 +#: src/Common/LinuxKernel.vala:749 src/Gtk/MainWindow.vala:511 #: src/Gtk/MainWindow.vala:524 msgid "Running" msgstr "Körs" -#: src/Common/LinuxKernel.vala:733 +#: src/Common/LinuxKernel.vala:750 msgid "Installed" msgstr "Installerad" -#: src/Common/LinuxKernel.vala:734 +#: src/Common/LinuxKernel.vala:751 msgid "Invalid" msgstr "Ogiltig" -#: src/Common/LinuxKernel.vala:820 +#: src/Common/LinuxKernel.vala:837 msgid "Packages Available" msgstr "Tillgängliga paket" -#: src/Common/LinuxKernel.vala:826 +#: src/Common/LinuxKernel.vala:843 msgid "Packages Installed" msgstr "Installerade paket" -#: src/Common/LinuxKernel.vala:851 src/lib/TeeJee.FileSystem.vala:118 +#: src/Common/LinuxKernel.vala:868 src/lib/TeeJee.FileSystem.vala:118 msgid "File not found" msgstr "Filen kan inte hittas" -#: src/Common/LinuxKernel.vala:945 +#: src/Common/LinuxKernel.vala:962 msgid "Available Kernels" msgstr "Tillgängliga kärnor" -#: src/Common/LinuxKernel.vala:973 +#: src/Common/LinuxKernel.vala:990 #, fuzzy msgid "No kernels specified" msgstr "Kommandot har inte angetts" -#: src/Common/LinuxKernel.vala:980 src/Gtk/MainWindow.vala:119 +#: src/Common/LinuxKernel.vala:997 src/Gtk/MainWindow.vala:119 msgid "Kernel" msgstr "Kärna" -#: src/Common/LinuxKernel.vala:980 +#: src/Common/LinuxKernel.vala:997 #, fuzzy msgid "not found" msgstr "Filen kan inte hittas" -#: src/Common/LinuxKernel.vala:1006 +#: src/Common/LinuxKernel.vala:1023 msgid "enabled" msgstr "aktiverat" -#: src/Common/LinuxKernel.vala:1030 +#: src/Common/LinuxKernel.vala:1047 msgid "Downloading" msgstr "Ladda ner" -#: src/Common/LinuxKernel.vala:1055 +#: src/Common/LinuxKernel.vala:1072 msgid "is already installed." msgstr "är redan installerat." -#: src/Common/LinuxKernel.vala:1065 +#: src/Common/LinuxKernel.vala:1082 msgid "download failed." msgstr "" -#: src/Common/LinuxKernel.vala:1082 +#: src/Common/LinuxKernel.vala:1099 msgid "Uninstalling selected kernels" msgstr "Avinstallera valda kärnor" -#: src/Common/LinuxKernel.vala:1086 +#: src/Common/LinuxKernel.vala:1103 msgid "requested" msgstr "begärd" -#: src/Common/LinuxKernel.vala:1089 +#: src/Common/LinuxKernel.vala:1106 msgid "not uninstalling the currently running kernel" msgstr "Avinstallera inte den kärna som körs, för närvarande" -#: src/Common/LinuxKernel.vala:1102 +#: src/Common/LinuxKernel.vala:1119 msgid "found" msgstr "grunda" -#: src/Common/LinuxKernel.vala:1107 +#: src/Common/LinuxKernel.vala:1124 msgid "No packages to un-install!" msgstr "Inga paket att avinstallera!" -#: src/Common/LinuxKernel.vala:1146 +#: src/Common/LinuxKernel.vala:1163 #, fuzzy msgid "is the highest installed version." msgstr "Avinstallera alla utom den högsta installerade versionen" -#: src/Common/LinuxKernel.vala:1159 +#: src/Common/LinuxKernel.vala:1176 msgid "Could not find running kernel in list" msgstr "Det gick inte att hitta kernel som körs i listan" -#: src/Common/LinuxKernel.vala:1164 +#: src/Common/LinuxKernel.vala:1181 msgid "Could not find any kernels to uninstall" msgstr "Det gick inte att hitta några kärnor att avinstallera" -#: src/Common/LinuxKernel.vala:1172 +#: src/Common/LinuxKernel.vala:1189 msgid "The following kernels will be uninstalled" msgstr "Följande kärnor kommer att avinstalleras" -#: src/Common/LinuxKernel.vala:1176 +#: src/Common/LinuxKernel.vala:1193 msgid "Continue ?" msgstr "Fortsätta?" -#: src/Common/LinuxKernel.vala:1198 src/Console/AppConsole.vala:234 +#: src/Common/LinuxKernel.vala:1215 src/Console/AppConsole.vala:234 msgid "Latest update" msgstr "Senaste uppdatering" -#: src/Common/LinuxKernel.vala:1209 src/Console/AppConsole.vala:241 +#: src/Common/LinuxKernel.vala:1226 src/Console/AppConsole.vala:241 msgid "Latest point update" msgstr "Senaste punktuppdatering" -#: src/Common/LinuxKernel.vala:1217 src/Console/AppConsole.vala:246 +#: src/Common/LinuxKernel.vala:1234 src/Console/AppConsole.vala:246 #: src/Console/AppConsole.vala:262 msgid "No updates found" msgstr "Inga uppdateringar hittades" -#: src/Common/LinuxKernel.vala:1226 +#: src/Common/LinuxKernel.vala:1243 #, c-format msgid "Install Kernel Version %s ? (y/n): " msgstr "Installera kärnversion %s ? (j/n):" diff --git a/po/tr.po b/po/tr.po index 0fd5a0a2..0377115f 100644 --- a/po/tr.po +++ b/po/tr.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: mainline\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-05-29 06:50-0400\n" +"POT-Creation-Date: 2023-05-29 18:58-0400\n" "PO-Revision-Date: 2022-08-06 16:48+0300\n" "Last-Translator: Sabri Ünal \n" "Language-Team: Turkish\n" @@ -61,126 +61,126 @@ msgstr "Yüklü bulundu" msgid "locked" msgstr "" -#: src/Common/LinuxKernel.vala:497 src/Common/LinuxKernel.vala:1060 -#: src/Common/LinuxKernel.vala:1094 src/Common/LinuxKernel.vala:1150 +#: src/Common/LinuxKernel.vala:497 src/Common/LinuxKernel.vala:1077 +#: src/Common/LinuxKernel.vala:1111 src/Common/LinuxKernel.vala:1167 msgid "is locked." msgstr "" -#: src/Common/LinuxKernel.vala:732 src/Gtk/MainWindow.vala:511 +#: src/Common/LinuxKernel.vala:749 src/Gtk/MainWindow.vala:511 #: src/Gtk/MainWindow.vala:524 msgid "Running" msgstr "Çalışıyor" -#: src/Common/LinuxKernel.vala:733 +#: src/Common/LinuxKernel.vala:750 msgid "Installed" msgstr "Kurulu" -#: src/Common/LinuxKernel.vala:734 +#: src/Common/LinuxKernel.vala:751 msgid "Invalid" msgstr "Geçersiz" -#: src/Common/LinuxKernel.vala:820 +#: src/Common/LinuxKernel.vala:837 msgid "Packages Available" msgstr "Mevcut Paketler" -#: src/Common/LinuxKernel.vala:826 +#: src/Common/LinuxKernel.vala:843 msgid "Packages Installed" msgstr "Kurulu Paketler" -#: src/Common/LinuxKernel.vala:851 src/lib/TeeJee.FileSystem.vala:118 +#: src/Common/LinuxKernel.vala:868 src/lib/TeeJee.FileSystem.vala:118 msgid "File not found" msgstr "Dosya bulunamadı" -#: src/Common/LinuxKernel.vala:945 +#: src/Common/LinuxKernel.vala:962 msgid "Available Kernels" msgstr "Mevcut Çekirdekler" -#: src/Common/LinuxKernel.vala:973 +#: src/Common/LinuxKernel.vala:990 #, fuzzy msgid "No kernels specified" msgstr "Komut belirtilmedi" -#: src/Common/LinuxKernel.vala:980 src/Gtk/MainWindow.vala:119 +#: src/Common/LinuxKernel.vala:997 src/Gtk/MainWindow.vala:119 msgid "Kernel" msgstr "Çekirdek" -#: src/Common/LinuxKernel.vala:980 +#: src/Common/LinuxKernel.vala:997 #, fuzzy msgid "not found" msgstr "Dosya bulunamadı" -#: src/Common/LinuxKernel.vala:1006 +#: src/Common/LinuxKernel.vala:1023 msgid "enabled" msgstr "etkin" -#: src/Common/LinuxKernel.vala:1030 +#: src/Common/LinuxKernel.vala:1047 msgid "Downloading" msgstr "Indiriyor" -#: src/Common/LinuxKernel.vala:1055 +#: src/Common/LinuxKernel.vala:1072 msgid "is already installed." msgstr "zaten yüklü." -#: src/Common/LinuxKernel.vala:1065 +#: src/Common/LinuxKernel.vala:1082 msgid "download failed." msgstr "" -#: src/Common/LinuxKernel.vala:1082 +#: src/Common/LinuxKernel.vala:1099 msgid "Uninstalling selected kernels" msgstr "Seçili çekirdekleri kaldırma" -#: src/Common/LinuxKernel.vala:1086 +#: src/Common/LinuxKernel.vala:1103 msgid "requested" msgstr "istenen" -#: src/Common/LinuxKernel.vala:1089 +#: src/Common/LinuxKernel.vala:1106 msgid "not uninstalling the currently running kernel" msgstr "çalışmakta olan çekirdeğin kaldırılmaması" -#: src/Common/LinuxKernel.vala:1102 +#: src/Common/LinuxKernel.vala:1119 msgid "found" msgstr "kurmak" -#: src/Common/LinuxKernel.vala:1107 +#: src/Common/LinuxKernel.vala:1124 msgid "No packages to un-install!" msgstr "Kaldırılacak paket yok!" -#: src/Common/LinuxKernel.vala:1146 +#: src/Common/LinuxKernel.vala:1163 #, fuzzy msgid "is the highest installed version." msgstr "En yüksek yüklü sürüm dışındaki tüm sürümleri kaldırın" -#: src/Common/LinuxKernel.vala:1159 +#: src/Common/LinuxKernel.vala:1176 msgid "Could not find running kernel in list" msgstr "Listede çalışan çekirdek bulunamadı" -#: src/Common/LinuxKernel.vala:1164 +#: src/Common/LinuxKernel.vala:1181 msgid "Could not find any kernels to uninstall" msgstr "Kaldırılacak çekirdek bulunamadı" -#: src/Common/LinuxKernel.vala:1172 +#: src/Common/LinuxKernel.vala:1189 msgid "The following kernels will be uninstalled" msgstr "Aşağıdaki çekirdekler kaldırılacaktır" -#: src/Common/LinuxKernel.vala:1176 +#: src/Common/LinuxKernel.vala:1193 msgid "Continue ?" msgstr "Devam edilsin mi?" -#: src/Common/LinuxKernel.vala:1198 src/Console/AppConsole.vala:234 +#: src/Common/LinuxKernel.vala:1215 src/Console/AppConsole.vala:234 msgid "Latest update" msgstr "Son güncelleme" # Point burada point release anlamında kullanılıyor. Örneğin 5.10.x sayısının en sonundaki x rakamı point release/nokta sürüm oluyor. -#: src/Common/LinuxKernel.vala:1209 src/Console/AppConsole.vala:241 +#: src/Common/LinuxKernel.vala:1226 src/Console/AppConsole.vala:241 msgid "Latest point update" msgstr "Son nokta güncellemesi" -#: src/Common/LinuxKernel.vala:1217 src/Console/AppConsole.vala:246 +#: src/Common/LinuxKernel.vala:1234 src/Console/AppConsole.vala:246 #: src/Console/AppConsole.vala:262 msgid "No updates found" msgstr "Güncelleme bulunamadı" -#: src/Common/LinuxKernel.vala:1226 +#: src/Common/LinuxKernel.vala:1243 #, c-format msgid "Install Kernel Version %s ? (y/n): " msgstr "Linux Çekirdek Sürümü %s Kurulsun mu? (e/h): " diff --git a/po/uk.po b/po/uk.po index 8e3e3514..2500c550 100644 --- a/po/uk.po +++ b/po/uk.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: mainline\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-05-29 06:50-0400\n" +"POT-Creation-Date: 2023-05-29 18:58-0400\n" "PO-Revision-Date: 2019-07-25 11:00+0300\n" "Last-Translator: Serhii Golovko \n" "Language-Team: Ukranian\n" @@ -61,125 +61,125 @@ msgstr "Знайдено встановленим" msgid "locked" msgstr "заблокований" -#: src/Common/LinuxKernel.vala:497 src/Common/LinuxKernel.vala:1060 -#: src/Common/LinuxKernel.vala:1094 src/Common/LinuxKernel.vala:1150 +#: src/Common/LinuxKernel.vala:497 src/Common/LinuxKernel.vala:1077 +#: src/Common/LinuxKernel.vala:1111 src/Common/LinuxKernel.vala:1167 msgid "is locked." msgstr "заблоковано." -#: src/Common/LinuxKernel.vala:732 src/Gtk/MainWindow.vala:511 +#: src/Common/LinuxKernel.vala:749 src/Gtk/MainWindow.vala:511 #: src/Gtk/MainWindow.vala:524 msgid "Running" msgstr "Використовується" -#: src/Common/LinuxKernel.vala:733 +#: src/Common/LinuxKernel.vala:750 msgid "Installed" msgstr "Встановлено" -#: src/Common/LinuxKernel.vala:734 +#: src/Common/LinuxKernel.vala:751 msgid "Invalid" msgstr "Інвалід" -#: src/Common/LinuxKernel.vala:820 +#: src/Common/LinuxKernel.vala:837 msgid "Packages Available" msgstr "Доступні пакети" -#: src/Common/LinuxKernel.vala:826 +#: src/Common/LinuxKernel.vala:843 msgid "Packages Installed" msgstr "Встановлені пакети" -#: src/Common/LinuxKernel.vala:851 src/lib/TeeJee.FileSystem.vala:118 +#: src/Common/LinuxKernel.vala:868 src/lib/TeeJee.FileSystem.vala:118 msgid "File not found" msgstr "Файл не знайдено" -#: src/Common/LinuxKernel.vala:945 +#: src/Common/LinuxKernel.vala:962 msgid "Available Kernels" msgstr "Доступні ядра" -#: src/Common/LinuxKernel.vala:973 +#: src/Common/LinuxKernel.vala:990 #, fuzzy msgid "No kernels specified" msgstr "Команда не вказана" -#: src/Common/LinuxKernel.vala:980 src/Gtk/MainWindow.vala:119 +#: src/Common/LinuxKernel.vala:997 src/Gtk/MainWindow.vala:119 msgid "Kernel" msgstr "Ядро" -#: src/Common/LinuxKernel.vala:980 +#: src/Common/LinuxKernel.vala:997 #, fuzzy msgid "not found" msgstr "Файл не знайдено" -#: src/Common/LinuxKernel.vala:1006 +#: src/Common/LinuxKernel.vala:1023 msgid "enabled" msgstr "увімкнено" -#: src/Common/LinuxKernel.vala:1030 +#: src/Common/LinuxKernel.vala:1047 msgid "Downloading" msgstr "Завантаження" -#: src/Common/LinuxKernel.vala:1055 +#: src/Common/LinuxKernel.vala:1072 msgid "is already installed." msgstr "вже встановлено." -#: src/Common/LinuxKernel.vala:1065 +#: src/Common/LinuxKernel.vala:1082 msgid "download failed." msgstr "" -#: src/Common/LinuxKernel.vala:1082 +#: src/Common/LinuxKernel.vala:1099 msgid "Uninstalling selected kernels" msgstr "Видаліть конкретні ядра" -#: src/Common/LinuxKernel.vala:1086 +#: src/Common/LinuxKernel.vala:1103 msgid "requested" msgstr "запитуваний" -#: src/Common/LinuxKernel.vala:1089 +#: src/Common/LinuxKernel.vala:1106 msgid "not uninstalling the currently running kernel" msgstr "не видалятиме поточне запущене ядро" -#: src/Common/LinuxKernel.vala:1102 +#: src/Common/LinuxKernel.vala:1119 msgid "found" msgstr "знайдено" -#: src/Common/LinuxKernel.vala:1107 +#: src/Common/LinuxKernel.vala:1124 msgid "No packages to un-install!" msgstr "Немає пакетів для видалення!" -#: src/Common/LinuxKernel.vala:1146 +#: src/Common/LinuxKernel.vala:1163 #, fuzzy msgid "is the highest installed version." msgstr "Видаліть усі, крім найвищої встановленої версії" -#: src/Common/LinuxKernel.vala:1159 +#: src/Common/LinuxKernel.vala:1176 msgid "Could not find running kernel in list" msgstr "Не вдалося знайти запущене ядро у списку!" -#: src/Common/LinuxKernel.vala:1164 +#: src/Common/LinuxKernel.vala:1181 msgid "Could not find any kernels to uninstall" msgstr "Не вдалося знайти жодне ядро для вилучення" -#: src/Common/LinuxKernel.vala:1172 +#: src/Common/LinuxKernel.vala:1189 msgid "The following kernels will be uninstalled" msgstr "Наступні ядра будуть видалені" -#: src/Common/LinuxKernel.vala:1176 +#: src/Common/LinuxKernel.vala:1193 msgid "Continue ?" msgstr "Продовжувати ?" -#: src/Common/LinuxKernel.vala:1198 src/Console/AppConsole.vala:234 +#: src/Common/LinuxKernel.vala:1215 src/Console/AppConsole.vala:234 msgid "Latest update" msgstr "Останнє оновлення" -#: src/Common/LinuxKernel.vala:1209 src/Console/AppConsole.vala:241 +#: src/Common/LinuxKernel.vala:1226 src/Console/AppConsole.vala:241 msgid "Latest point update" msgstr "Остання точка оновлення" -#: src/Common/LinuxKernel.vala:1217 src/Console/AppConsole.vala:246 +#: src/Common/LinuxKernel.vala:1234 src/Console/AppConsole.vala:246 #: src/Console/AppConsole.vala:262 msgid "No updates found" msgstr "Оновлень не знайдено" -#: src/Common/LinuxKernel.vala:1226 +#: src/Common/LinuxKernel.vala:1243 #, c-format msgid "Install Kernel Version %s ? (y/n): " msgstr "Встановити Ядро Версії %s ? (так/ні): " diff --git a/settings.md b/settings.md index 3e45c381..ef0bc2e5 100644 --- a/settings.md +++ b/settings.md @@ -15,17 +15,17 @@ Excludes less stable more bleeding edge -rc kernels from the list. **Show N previous major versions \[#\]** Defines a threshold value for the oldest major version to include in the display, as an offset from the whatever the current latest version is. -The algorithm is essentially this pseudocode: -threshold_major = min( latest_available - N , oldest_installed ) +The threshold is whichever is lower: + - the oldest mainline kernel you have installed + - the highest mainline version available minus N -In other words, whichever is lower: the latest major version available minus N, or the oldest major version you have installed. +The special value "-1" is also allowed, and means to show all possible kernel versions. With this setting the initial cache update or Reload takes a long time, but it's actually usable after that. -The special value "-1" is also allowed, and means always show all kernel versions. With this value the initial cache update takes a long time, but it's actually usable after that. +Any installed non-mainline kernels are ignored for this. +This allows to have a prior-generation distribution kernel installed without causing the list to include the entire prior generation of mainline kernels for no reason. Generally, you want this setting to just be 0. -Distribution (non-mainline) kernels are not included when determining the lowest or highest installed versions. - ## Network **Internet connection timeout in \[##\] seconds** **Max concurrent downloads \[#\]** diff --git a/src/Common/LinuxKernel.vala b/src/Common/LinuxKernel.vala index 30c1f7a7..dac04676 100644 --- a/src/Common/LinuxKernel.vala +++ b/src/Common/LinuxKernel.vala @@ -67,7 +67,7 @@ public class LinuxKernel : GLib.Object, Gee.Comparable { public static int progress_total = 0; public static int progress_count = 0; public static bool cancelled = false; - public static int threshold_major = 0; + public static int threshold_major = -1; // class initialize public static void initialize() { @@ -255,7 +255,7 @@ public class LinuxKernel : GLib.Object, Gee.Comparable { if (!k.is_installed) { if (k.version_major < threshold_major) continue; - if (App.hide_unstable && k.is_unstable) continue; + if (App.hide_unstable && k.version_rc>=0) continue; } // add index.html to download list @@ -350,8 +350,8 @@ public class LinuxKernel : GLib.Object, Gee.Comparable { // read the main index.html listing all kernels private static void load_index() { vprint("load_index()",2); - if (threshold_major<1) update_threshold_major(true); - if (threshold_major<1) { vprint("threshold_major not initialized"); exit(1); } + if (threshold_major<0) update_threshold_major(true); + if (threshold_major<0) { vprint("load_index(): threshold_major not initialized"); exit(1); } if (!file_exists(MAIN_INDEX_HTML)) return; string txt = file_read(MAIN_INDEX_HTML); @@ -417,7 +417,7 @@ public class LinuxKernel : GLib.Object, Gee.Comparable { bool found = false; foreach (var k in kernel_list) { if (k.is_invalid) continue; - if (k.version_major { vprint(k.version_main+" "+_("is locked."),2); continue; } - if (k.is_unstable && App.hide_unstable) continue; + if (k.version_rc>=0 && App.hide_unstable) continue; if (k.version_major < threshold_major) break; if (k.compare_to(kernel_latest_installed)<=0) break; @@ -548,9 +548,11 @@ public class LinuxKernel : GLib.Object, Gee.Comparable { // This k.is_mainline test is only based on an unreliable semantic used in split_version_string(). // A real test would be to scan kernel_list for matching k.kver or k.name, // but we don't have kernel_list yet and we can't run mk_kernel_list to generate it, - // because we are being run from within mk_kernel_list itself to set bounds on kernel_list. + // because we are run from within mk_kernel_list itself to set bounds on kernel_list. // It's not critical. All this does is try to avoid having an installed distro kernel // cause kernel_list to include a whole previous generation. + // If the assumption in split_version_string() is ever wrong, + // all it means is threshold_major would not ignore non-mainline kernels. if (k.version_major < kernel_oldest_installed.version_major && k.is_mainline) kernel_oldest_installed = k; } @@ -567,63 +569,81 @@ public class LinuxKernel : GLib.Object, Gee.Comparable { version_extra = ""; is_mainline = true; // FIXME bad assumption + /* + * The is_mainline test below is an unsafe assumption. + * But we need *something*, and it is working for now. + * + * The definitive way to determine is_mainline, is to scan the main + * index.html and see if the current kernel is in there. + * + * But mk_kernel_list() uses is_mainline itself as part of + * determining threshold_major. + * + * Possible fix, go back to letting mk_kernel_list() build + * a full list including everything in the main index.html, + * tag those all as mainline, make sure kernel_list + * has a unique id index that can be used to find a record without + * walking the entire list with a foreach loop. + * + * Then when getting a new unknown kernel from a version number + * or from dpkg, we can answer if it's mainline by looking if + * the same id exists in the list. + * + * Actually this whole version string parser is pretty hokey. + */ + string t = s; if (t==null || t.length<1) t = "0"; if (t.has_prefix("v")) t = t[1: t.length - 1]; if (t.has_suffix("/")) t = t[0: t.length - 1]; + t = t.split("~")[0]; // old ubuntu versions in dpkg, not seen lately - var version_string = t.split("~")[0]; - var mi = regex_match("""([0-9]+|rc)""", version_string); + // Unsafe. "rc" could be part of intel-arc or something some day. + var mi = regex_match("""([0-9]+|rc)""",t); int i = -1; - bool saw_rc = false; + bool rc = false; while (mi != null) { - string? num = mi.fetch(1); + string? v = mi.fetch(1); - if (num != null) { + if (v != null) { i++; - //vprint("num="+num); - if (saw_rc) { - saw_rc = false; - version_rc = int.parse(num); - } else if (num == "rc") { - saw_rc = true; + if (rc) { + rc = false; + version_rc = int.parse(v); + //vprint ("%s: i=%d v.length=%d mainline=%s".printf(t,i,v.length,is_mainline.to_string())); + } else if (v == "rc") { + rc = true; + //vprint ("%s: i=%d v.length=%d mainline=%s".printf(t,i,v.length,is_mainline.to_string())); } else { switch (i) { - case 0: - version_major = int.parse(num); - break; - case 1: - version_minor = int.parse(num); - break; - case 2: - version_point = int.parse(num); - break; - case 3: - if ((version_rc<0) && (num.length<3)) version_extra += "."+num; - break; - case 4: - if ((version_rc<0) && (num.length<3)) version_extra += "."+num; - break; + case 0: version_major = int.parse(v); break; + case 1: version_minor = int.parse(v); break; + case 2: version_point = int.parse(v); break; + case 3: if (version_rc<0 && v.length<6) version_extra += "."+v; break; // not great + case 4: + if (version_rc<0 && v.length<6) version_extra += "."+v; // not great + if (v.length<12) is_mainline = false; // FIXME bad assumption + break; } - if (num.length<12) is_mainline = false; // FIXME bad assumption + //vprint ("%s: i=%d v.length=%d mainline=%s".printf(t,i,v.length,is_mainline.to_string())); } } - if (version_rc>-1) version_extra = "-rc%d".printf(version_rc); + if (version_rc>=0) version_extra = "-rc%d".printf(version_rc); version_main = "%d.%d.%d%s".printf(version_major,version_minor,version_point,version_extra); - try{ - if (!mi.next()) break; - } - catch(Error e) { - break; - } + try { if (!mi.next()) break; } + catch (Error e) { break; } } - } +// inputs a & b: a.compare_to(b) +// return: +// ab return 1 public int compare_to(LinuxKernel b) { LinuxKernel a = this; //vprint("compare_to()",5); @@ -632,59 +652,62 @@ public class LinuxKernel : GLib.Object, Gee.Comparable { //vprint("a "+a.version_main,5); //vprint("b "+b.version_main,5); - int i = 0; + int i = -1; int x, y; // while both arrays have an element - while ((i < arr_a.length) && (i < arr_b.length)) { + while ((++i < arr_a.length) && (i < arr_b.length)) { - // continue if equal - //vprint("("+arr_a[i]+" == "+arr_b[i]+")",5); - if (arr_a[i] == arr_b[i]) { - i++; - continue; - } + // keep reading if both are the same + if (arr_a[i] == arr_b[i]) continue; - // check if number + // this doesn't distinguish "000" from "abc", but quickly handles if both are >0 x = int.parse(arr_a[i]); y = int.parse(arr_b[i]); - if ((x > 0) && (y > 0)) { - // both are numbers - //vprint(arr_a[i]+" - "+arr_b[i]+" = return "+(x-y).to_string(),5); - return (x - y); - } else if ((x == 0) && (y == 0)) { - // BKW - this is one place where "-rc3" gets compared to "-rc4" - // both are strings - //vprint("strcmp("+arr_a[i]+","+arr_b[i]+") = return "+strcmp(arr_a[i], arr_b[i]).to_string(),5); - return strcmp(arr_a[i], arr_b[i]); - } else { - //vprint("("+arr_a[i]+">0)",5); - if (x > 0) { - //vprint("return 1",5); - return 1; - } - //vprint("return -1",5); - return -1; - } - } + if (x>0 && y>0) return (x - y); - // if we got here - // one array has less parts than the other, and all corresponding parts are equal + // this is one place where "-rc3" gets compared to "-rc4" + // both are either text or "0", int.parse() returns 0 for "ABC" or "000" + // strcmp() will return "00" is less than "ab" + if (x==0 && y==0) return strcmp(arr_a[i], arr_b[i]); - if (i < arr_a.length) { - //vprint("a ("+arr_a[i]+">0)",5); - x = int.parse(arr_a[i]); + // if we got this far: + // the two sides were neither both numbers nor both text + + // if a is a number > 0, then b must be either text or number 0 + // any number > 0 is bigger than either text or number 0 + // because rc comes before non-rc if (x > 0) return 1; + + // if we didn't return above, then all the same but for b return -1; } + // if we got this far: + // * all elements are equal up to this point + // * one array has more elements than the other + + + // These next two catch the case where one array + // is longer than the other, and the longer arrays + // next element is numeric, not rnN + + // if there are any more a elements + if (i < arr_a.length) { + // if a is a number > 0 + if (int.parse(arr_a[i])>0) return 1; // a is bigger + return -1; // b is bigger + } + + // if there are any more b elements if (i < arr_b.length) { - //vprint("b ("+arr_b[i]+">0)",5); - y = int.parse(arr_b[i]); - if (y > 0) return -1; - return 1; + // if b is a number > 0 + if (int.parse(arr_b[i]) > 0) return -1; // b is bigger + return 1; // a is bigger } + // is it possible to get here? + // the larger array is the lower version, // because 1.2.3-rcN comes before 1.2.3 return (arr_a.length - arr_b.length) * -1; @@ -693,11 +716,11 @@ public class LinuxKernel : GLib.Object, Gee.Comparable { public void set_pkg_list() { vprint("set_pkg_list()",2); vprint("kname:"+kname+" kver:"+kver+" version_main:"+version_main,3); - foreach(var pkg in Package.dpkg_list) { - if (!pkg.pname.has_prefix("linux-")) continue; - if (pkg.version == kver) { - pkg_list[pkg.pname] = pkg.pname; - vprint("Package: "+pkg.pname,2); + foreach(var p in Package.dpkg_list) { + if (!p.pname.has_prefix("linux-")) continue; + if (p.version == kver) { + pkg_list[p.pname] = p.pname; + vprint("Package: "+p.pname,2); } } } @@ -708,12 +731,6 @@ public class LinuxKernel : GLib.Object, Gee.Comparable { // properties - public bool is_unstable { - get { - return version_main.contains("-rc") || version_main.contains("-unstable"); - } - } - public bool is_invalid { get { return file_exists(cached_status_file); @@ -743,7 +760,7 @@ public class LinuxKernel : GLib.Object, Gee.Comparable { if (ppa_dirs_ver==2) return true; if (ppa_dirs_ver==1) return false; int r = 0; - if (is_unstable) r = compare_to(kernel_last_unstable_old_ppa_dirs); + if (version_rc>=0) r = compare_to(kernel_last_unstable_old_ppa_dirs); else r = compare_to(kernel_last_stable_old_ppa_dirs); if (r>0) { ppa_dirs_ver = 2; return true; } else { ppa_dirs_ver = 1; return false; } @@ -951,7 +968,7 @@ public class LinuxKernel : GLib.Object, Gee.Comparable { // hide hidden, but don't hide any installed if (!k.is_installed) { - if (App.hide_unstable && k.is_unstable) continue; + if (App.hide_unstable && k.version_rc>=0) continue; if (k.version_major < threshold_major) continue; } diff --git a/src/Gtk/MainWindow.vala b/src/Gtk/MainWindow.vala index c8aa99a4..db9b5c71 100644 --- a/src/Gtk/MainWindow.vala +++ b/src/Gtk/MainWindow.vala @@ -243,7 +243,7 @@ public class MainWindow : Window { if (!k.is_installed) { // don't hide anything that's installed if (k.is_invalid) continue; // hide invalid - if (k.is_unstable && App.hide_unstable) continue; // hide unstable if settings say to + if (k.version_rc>=0 && App.hide_unstable) continue; // hide unstable if settings say to if (k.version_major < LinuxKernel.threshold_major) continue; // hide versions older than settings threshold } @@ -254,7 +254,7 @@ public class MainWindow : Window { tm.set(iter, COL.KERN, k); p = pix_mainline; - if (k.is_unstable) p = pix_mainline_rc; + if (k.version_rc>=0) p = pix_mainline_rc; if (!k.is_mainline) p = pix_ubuntu; tm.set(iter, COL.ICON, p);