From patchwork Tue Sep 28 11:09:06 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Leo-Andres Hofmann X-Patchwork-Id: 4751 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 "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4HJcGL0Z8jz3xWd for ; Tue, 28 Sep 2021 11:09:30 +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) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4HJcGG6QLvz6FS; Tue, 28 Sep 2021 11:09:26 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4HJcGG5rNSz2y66; Tue, 28 Sep 2021 11:09:26 +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 "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4HJcGF4vrRz32KK for ; Tue, 28 Sep 2021 11:09:25 +0000 (UTC) Received: from arche.uberspace.de (arche.uberspace.de [185.26.156.147]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPS id 4HJcG83r6hz15y for ; Tue, 28 Sep 2021 11:09:20 +0000 (UTC) Received: (qmail 16589 invoked from network); 28 Sep 2021 11:09:19 -0000 Received: from localhost (HELO localhost) (127.0.0.1) by arche.uberspace.de with SMTP; 28 Sep 2021 11:09:19 -0000 From: Leo-Andres Hofmann To: development@lists.ipfire.org Subject: [PATCH v2 3/3] Fix translations and clean general-functions.pl Date: Tue, 28 Sep 2021 13:09:06 +0200 Message-Id: <20210928110906.1089-3-hofmann@leo-andres.de> X-Mailer: git-send-email 2.27.0.windows.1 In-Reply-To: <20210928110906.1089-1-hofmann@leo-andres.de> References: <20210928110906.1089-1-hofmann@leo-andres.de> MIME-Version: 1.0 ARC-Seal: i=1; s=202003rsa; d=lists.ipfire.org; t=1632827360; a=rsa-sha256; cv=none; b=FFI41sEySg3zAGNMYbLwpie4l+XBqTC9kLXVi6gPCqGSlpjNZ8DoAWXIwmOxtBh8noQ3+J voE+EeI494cjawbXkZn4GiavwXKig+cPmHYmMEtLPH+fGUBPgC1njPvlI+8JE6eikPXWOt ZX6HIwYXTYxVKQXoDvwNx5ur9zYRPaJ92nFZEsd02Gg5xqVFL85X7rxjGpBpLKMlJfnAbn /o13XC1XdZ7F3ssB2IafiM8l0q7ym830Nt+oK1LjxV016KJ7JbP9+XSYz51kpPXyWJ+gy9 RS+LW4ujGfY6JgGQU7iObrTf4obKvAiLEjyZSsWhOVnIcMwGd0udMw17ukRu2A== ARC-Authentication-Results: i=1; mail01.ipfire.org; dkim=none; dmarc=none; spf=pass (mail01.ipfire.org: domain of hofmann@leo-andres.de designates 185.26.156.147 as permitted sender) smtp.mailfrom=hofmann@leo-andres.de ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=lists.ipfire.org; s=202003rsa; t=1632827360; 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: in-reply-to:in-reply-to:references:references; bh=vkLYEQVCO0qfUgqgk0U3YbrnDZEiB38E68CpdEN9zn8=; b=bAOyVTEJ83hzdnU5bPK4Ke8PQMCbq/lWKtkq00YKje+iKIHu+xqvqPYUo9Kls0heVZEBCX hCv+szhEC3jupkOUBdwVIi/pYIBcCN1i+O/c58S6BIV65/XIN9ae/t9Gtn1wp32P//DQgQ HfAr7vW2VFc4gsoUdhhVmNeRlsg32ra8Y6rF3zdxWhZFGawjDO1Ereltdnk0hH5aE9oy80 rm8PGWf2VTP9c83uJt4DlFFdsoK6KPaH8owSldZNggUJ7lBAZCLuoHdZeTLCnp/bztWuM/ WvkI/cgDoiWmus+dKv3xLKfHyzk0sPxjtusSMGjcFi9aVkWmLsSdaLMNa94fLQ== Authentication-Results: mail01.ipfire.org; dkim=none; dmarc=none; spf=pass (mail01.ipfire.org: domain of hofmann@leo-andres.de designates 185.26.156.147 as permitted sender) smtp.mailfrom=hofmann@leo-andres.de X-Rspamd-Server: mail01.haj.ipfire.org X-Spamd-Result: default: False [-1.98 / 11.00]; BAYES_HAM(-3.00)[99.99%]; MID_CONTAINS_FROM(1.00)[]; MX_INVALID(0.50)[]; R_SPF_ALLOW(-0.20)[+mx:c]; NEURAL_HAM(-0.17)[-0.173]; MIME_GOOD(-0.10)[text/plain]; IP_REPUTATION_HAM(-0.01)[asn: 205766(0.00), country: DE(-0.01), ip: 185.26.156.147(0.00)]; ARC_SIGNED(0.00)[lists.ipfire.org:s=202003rsa:i=1]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; FROM_EQ_ENVFROM(0.00)[]; ASN(0.00)[asn:205766, ipnet:185.26.156.0/24, country:DE]; RCVD_TLS_LAST(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; FROM_HAS_DN(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; TO_MATCH_ENVRCPT_ALL(0.00)[]; DMARC_NA(0.00)[leo-andres.de]; TO_DN_NONE(0.00)[]; ARC_NA(0.00)[] X-Rspamd-Queue-Id: 4HJcG83r6hz15y 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" This patch fixes two wrong translations now used by the new user manual links feature and removes an abandoned constant. Signed-off-by: Leo-Andres Hofmann Reviewed-by: Bernhard Bitsch Tested-by: Bernhard Bitsch --- config/cfgroot/general-functions.pl | 1 - langs/de/cgi-bin/de.pl | 2 +- langs/fr/cgi-bin/fr.pl | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/config/cfgroot/general-functions.pl b/config/cfgroot/general-functions.pl index de608e38b..355f8d372 100644 --- a/config/cfgroot/general-functions.pl +++ b/config/cfgroot/general-functions.pl @@ -24,7 +24,6 @@ $|=1; # line buffering $General::version = 'VERSION'; $General::swroot = 'CONFIG_ROOT'; $General::noipprefix = 'noipg-'; -$General::adminmanualurl = 'http://wiki.ipfire.org'; require "${General::swroot}/network-functions.pl"; diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 70dcb10a6..ba57698e7 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -1828,7 +1828,7 @@ 'one month' => 'Ein Monat', 'one week' => 'Eine Woche', 'one year' => 'Ein Jahr', -'online help en' => 'Online-Hilfe (auf Deutsch)', +'online help en' => 'Online-Hilfe (auf Englisch)', 'only digits allowed in holdoff field' => 'Im Holdoff-Feld sind nur Ziffern erlaubt', 'only digits allowed in max retries field' => 'Im Feld "Maximale Wiederholversuche" sind nur Ziffern erlaubt.', 'only digits allowed in the idle timeout' => 'Im Feld "Leerlauf-Wartezeit" sind nur Ziffern erlaubt.', diff --git a/langs/fr/cgi-bin/fr.pl b/langs/fr/cgi-bin/fr.pl index 7f8239773..43dafe73d 100644 --- a/langs/fr/cgi-bin/fr.pl +++ b/langs/fr/cgi-bin/fr.pl @@ -1869,7 +1869,7 @@ 'one month' => 'Un mois', 'one week' => 'Une semaine', 'one year' => 'Un an', -'online help en' => 'Aide en ligne (en français)', +'online help en' => 'Aide en ligne (en anglais)', 'only digits allowed in holdoff field' => 'Seuls les chiffres sont autorisés dans le champ holdoff', 'only digits allowed in max retries field' => 'Seuls les chiffres sont autorisés dans le champ nombre d\'essais maximum.', 'only digits allowed in the idle timeout' => 'Seuls les chiffres sont autorisés pour le délai d\'inactivité.',