From patchwork Sat Jul 18 12:49:51 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Matthias Fischer X-Patchwork-Id: 3265 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4B87B74dpSz3xTQ for ; Sat, 18 Jul 2020 12:50:07 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4B87B535Rzz2mq; Sat, 18 Jul 2020 12:50:05 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4B87B42JjLz2yVX; Sat, 18 Jul 2020 12:50:04 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4B87B23qLZz2xbB for ; Sat, 18 Jul 2020 12:50:02 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 4B87B10lSTz1fW for ; Sat, 18 Jul 2020 12:50:01 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1595076601; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nLvvTrmey06bg9UewmLTS0eIJ1t9gEHO1zdkiUGZH8I=; b=ivBtTwwuvWHjhgsRArN9t61+MzSn9qUprC+UKnUgBygaGxMHqd80zefUmbJHTaZKfGcXTv 6lLd2CCrRV+HapBA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1595076601; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nLvvTrmey06bg9UewmLTS0eIJ1t9gEHO1zdkiUGZH8I=; b=tPSanXCuKfun9jFixNOKqruVS30N4lZxvyTIOXE65EsJ0D7MB7FmrG1CAw3WXAx5BZUng8 gRwAX03uV62QopKH+GJmsI/0p8K/axqHOl2OVmqyMQIpUQItofhPzATonxpfb9GSi0ZUHW PDeVGc46+yC0ItuXGH7OKbptY67GKXH+A90C10pq8pkQ9UFj4G0jtU8zPds13kgJhowVJa 2jDfz66qHx0GJUuVYUx9gUn0RSpcFVLhcRfDjMWDZ0SIAJ0eYQkpAITQODAgEyDIdrAkSg j8wrdMkYn0Supg+gqWKTS5rWH/ejYAb6O0zTNLByRvC+/l/MoArG0sdfbNz4Qg== From: Matthias Fischer To: development@lists.ipfire.org Subject: [PATCH] pakfire.cgi: Partially fixes Bug #12049 Date: Sat, 18 Jul 2020 14:49:51 +0200 Message-Id: <20200718124951.2096-1-matthias.fischer@ipfire.org> MIME-Version: 1.0 Authentication-Results: mail01.ipfire.org; auth=pass smtp.mailfrom=matthias.fischer@ipfire.org X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" I added translations for package uninstallation but didn't know how to fix the missing list of affected dependencies during uninstallation, see: => https://forum.ipfire.org/viewtopic.php?f=17&t=21912&p=120466#p120593 Signed-off-by: Matthias Fischer Reviewed-by: Michael Tremer --- html/cgi-bin/pakfire.cgi | 2 +- langs/de/cgi-bin/de.pl | 1 + langs/en/cgi-bin/en.pl | 1 + langs/es/cgi-bin/es.pl | 1 + langs/fr/cgi-bin/fr.pl | 1 + langs/it/cgi-bin/it.pl | 1 + langs/nl/cgi-bin/nl.pl | 1 + langs/pl/cgi-bin/pl.pl | 1 + langs/ru/cgi-bin/ru.pl | 1 + langs/tr/cgi-bin/tr.pl | 1 + 10 files changed, 10 insertions(+), 1 deletion(-) diff --git a/html/cgi-bin/pakfire.cgi b/html/cgi-bin/pakfire.cgi index dacbe11f4..39389ad02 100644 --- a/html/cgi-bin/pakfire.cgi +++ b/html/cgi-bin/pakfire.cgi @@ -113,7 +113,7 @@ END } print < - $Lang::tr{'pakfire accept all'} + $Lang::tr{'pakfire uninstall all'}  
diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 93fbc2d18..45bd24543 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -1979,6 +1979,7 @@ 'pakfire tree stable' => 'Veröffentlichte Versionen (stable)', 'pakfire tree testing' => 'Vorabversionen (testing)', 'pakfire tree unstable' => 'Experimentelle Versionen (unstable)', +'pakfire uninstall all' => 'Möchten Sie die folgenden Pakete deinstallieren?', 'pakfire uninstall description' => 'Wählen Sie ein oder mehrere Pakete zur Deinstallation aus und drücken Sie auf das minus-Symbol.', 'pakfire uninstall package' => 'Sie möchten folgende Pakete deinstallieren: ', 'pakfire update daily' => 'Täglich nach Updates suchen:', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 3fcd3691e..2c69391cd 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -2004,6 +2004,7 @@ 'pakfire tree stable' => 'Stable', 'pakfire tree testing' => 'Testing', 'pakfire tree unstable' => 'Unstable', +'pakfire uninstall all' => 'Do you want to uninstall the following packages?', 'pakfire uninstall description' => 'Please choose one or more items from the list below and
click the minus to uninstall.', 'pakfire uninstall package' => 'You want to uninstall the following packages: ', 'pakfire update daily' => 'Search for updates daily:', diff --git a/langs/es/cgi-bin/es.pl b/langs/es/cgi-bin/es.pl index 0a757602a..04be55c5c 100644 --- a/langs/es/cgi-bin/es.pl +++ b/langs/es/cgi-bin/es.pl @@ -1374,6 +1374,7 @@ 'pakfire possible dependency' => 'Puede haber paquetes con dependencias, aquí está una lista de paquetes que necesitan ser instalados.', 'pakfire register' => 'Registrar en el servidor pakfire:', 'pakfire system state' => 'Status del sistema', +'pakfire uninstall all' => '¿Desea desinstalar los siguientes paquetes?', 'pakfire uninstall description' => 'Por favor elija uno o más elementos de la siguiente lista y
haga click en el signo - para desinstalar', 'pakfire uninstall package' => 'Ud. desea desinstalar los siguientes paquetes:', 'pakfire update daily' => 'Buscar actualizaciones diariamente:', diff --git a/langs/fr/cgi-bin/fr.pl b/langs/fr/cgi-bin/fr.pl index a566afacb..418876f30 100644 --- a/langs/fr/cgi-bin/fr.pl +++ b/langs/fr/cgi-bin/fr.pl @@ -2012,6 +2012,7 @@ 'pakfire tree stable' => 'Stable', 'pakfire tree testing' => 'En test', 'pakfire tree unstable' => 'Instable', +'pakfire uninstall all' => 'Souhaitez-vous désinstaller les packages suivants?', 'pakfire uninstall description' => 'Veuillez choisir un ou plusieurs modules dans la liste ci-dessous
et cliquer sur le signe MOINS pour le(s) désinstaller.', 'pakfire uninstall package' => 'Vous voulez désinstaller les paquets suivants : ', 'pakfire update daily' => 'Rechercher des mises à jour quotidiennes :', diff --git a/langs/it/cgi-bin/it.pl b/langs/it/cgi-bin/it.pl index 6c9137c28..7b73ae834 100644 --- a/langs/it/cgi-bin/it.pl +++ b/langs/it/cgi-bin/it.pl @@ -1764,6 +1764,7 @@ 'pakfire possible dependency' => ' There may be depending packages, here is a list of packages that need to be installed.', 'pakfire register' => 'Registrati sul pakfire-server:', 'pakfire system state' => 'Stato del Sistema', +'pakfire uninstall all' => 'Vuoi disinstallare i seguenti pacchetti?', 'pakfire uninstall description' => 'Si prega di scegliere uno o più elementi dalla lista qui sotto e
fare clic sul meno per disinstallare..', 'pakfire uninstall package' => 'You want to uninstall the following packages: ', 'pakfire update daily' => 'Ricerca gli aggiornamenti una volta al giorno:', diff --git a/langs/nl/cgi-bin/nl.pl b/langs/nl/cgi-bin/nl.pl index 5fa89b1ac..2977dc741 100644 --- a/langs/nl/cgi-bin/nl.pl +++ b/langs/nl/cgi-bin/nl.pl @@ -1717,6 +1717,7 @@ 'pakfire possible dependency' => ' Er kunnen pakketafhankelijkheden zijn, hier is een lijst met pakketten die moeten worden geïnstalleerd.', 'pakfire register' => 'Registreer bij de pakfire-server:', 'pakfire system state' => 'Systeemstatus', +'pakfire uninstall all' => 'Wilt u de volgende pakketten verwijderen?', 'pakfire uninstall description' => 'Kies een of meer items uit de lijst hieronder en
klik op de min om te deinstalleren.', 'pakfire uninstall package' => 'U wilt de volgende pakketten deinstalleren: ', 'pakfire update daily' => 'Zoek dagelijks naar updates:', diff --git a/langs/pl/cgi-bin/pl.pl b/langs/pl/cgi-bin/pl.pl index 521381af2..8f1e99794 100644 --- a/langs/pl/cgi-bin/pl.pl +++ b/langs/pl/cgi-bin/pl.pl @@ -1386,6 +1386,7 @@ 'pakfire possible dependency' => ' Pewne pakiety mogą wymagać zależności. Oto lista pakietów które muszę zostać zainstalowane.', 'pakfire register' => 'Register at pakfire-server:', 'pakfire system state' => 'Status systemu', +'pakfire uninstall all' => 'Czy chcesz odinstalować następujące pakiety?', 'pakfire uninstall description' => 'Proszę wybrać jedną lub kilka pozycji z poniższej listy,
a następnie kliknąć minus aby odinstalować.', 'pakfire uninstall package' => 'Zamierzasz odinstalować następujące pakiety: ', 'pakfire update daily' => 'Szukaj aktualizacje codziennie:', diff --git a/langs/ru/cgi-bin/ru.pl b/langs/ru/cgi-bin/ru.pl index 9ac46d459..c9df1156f 100644 --- a/langs/ru/cgi-bin/ru.pl +++ b/langs/ru/cgi-bin/ru.pl @@ -1381,6 +1381,7 @@ 'pakfire possible dependency' => ' There may be depending packages, here is a list of packages that need to be installed.', 'pakfire register' => 'Регистрировать на pakfire-сервере:', 'pakfire system state' => 'Статус системы', +'pakfire uninstall all' => 'Вы хотите удалить следующие пакеты?', 'pakfire uninstall description' => 'Пожалуйста, укажите один или несколько элементов в списке ниже и
нажмите минус для удаления.', 'pakfire uninstall package' => 'Вы собираетесь удалить следующие пакеты: ', 'pakfire update daily' => 'Ежедневный поиск обновлений:', diff --git a/langs/tr/cgi-bin/tr.pl b/langs/tr/cgi-bin/tr.pl index 9829b4076..72397dbbf 100644 --- a/langs/tr/cgi-bin/tr.pl +++ b/langs/tr/cgi-bin/tr.pl @@ -1909,6 +1909,7 @@ 'pakfire possible dependency' => ' Yüklenemesi gereken paketlerin yüklenebilmesi için buradaki paketlere ihtiyaç duyulabilir.', 'pakfire register' => 'Pakfire sunucusuna kayıt:', 'pakfire system state' => 'Sistem durumu', +'pakfire uninstall all' => 'Aşağıdaki paketleri kaldırmak istiyor musunuz?', 'pakfire uninstall description' => 'Aşağıdaki listeden bir veya daha fazla öğeyi seçtikten sonra
kaldırmak için eksi simgesine tıklayınız.', 'pakfire uninstall package' => 'Aşağıdaki paketleri kaldırmak istiyorum: ', 'pakfire update daily' => 'Günlük güncellemeleri ara:',