Message ID | 20221108161335.19780-1-robin.roevens@disroot.org |
---|---|
State | Superseded |
Headers |
Return-Path: <development-bounces@lists.ipfire.org> 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) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4N6CpF4W2xz3wcM for <patchwork@web04.haj.ipfire.org>; Tue, 8 Nov 2022 16:13:57 +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 "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4N6CpC4LfWzmp; Tue, 8 Nov 2022 16:13:55 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4N6CpC2xKdz2yWN; Tue, 8 Nov 2022 16:13:55 +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) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4N6CpB3Gctz2xRJ for <development@lists.ipfire.org>; Tue, 8 Nov 2022 16:13:54 +0000 (UTC) Received: from knopi.disroot.org (knopi.disroot.org [178.21.23.139]) (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 ESMTPS id 4N6Cp92ZH1zmp for <development@lists.ipfire.org>; Tue, 8 Nov 2022 16:13:53 +0000 (UTC) Authentication-Results: mail01.ipfire.org; dkim=pass header.d=disroot.org header.s=mail header.b=D5TAdNLU; dmarc=pass (policy=reject) header.from=disroot.org; spf=pass (mail01.ipfire.org: domain of robin.roevens@disroot.org designates 178.21.23.139 as permitted sender) smtp.mailfrom=robin.roevens@disroot.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=lists.ipfire.org; s=202003rsa; t=1667924033; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding:dkim-signature; bh=HhyT63qYt66umYLHdZE2vg6cXh5mvStIO4kDKolY2a8=; b=Awy07KBD/IkApcg01HYTNmI4lU4RcK6UNTySZphYPaDMGjMbwuIa9iJ4Mq6eDe48RIDFyF 9q239vSujLT/iwifjTp++dbnp8YXkq5/DDddSyXu+4WkRhKWg360LUfKlWg91Z2UbYrpAo ZYEro2vRxEjK/h4qhomdww/bI6sBrZEq07U9UYs5/5CI+dUghJIRKHsuaOjVPrilvfb6TT utYrPCtHPShbLfYuFIssKyPGBuyGeWPu3Smpiw4sYyARU6BkTX+VB6x/8NAX9zjXCImeaw MHkKxy5eM78MEmdSDEuqq0e/Sz3i/cixtbCWJ0arggcrJF6xnnXTEk9DLcR1fA== ARC-Authentication-Results: i=1; mail01.ipfire.org; dkim=pass header.d=disroot.org header.s=mail header.b=D5TAdNLU; dmarc=pass (policy=reject) header.from=disroot.org; spf=pass (mail01.ipfire.org: domain of robin.roevens@disroot.org designates 178.21.23.139 as permitted sender) smtp.mailfrom=robin.roevens@disroot.org ARC-Seal: i=1; s=202003rsa; d=lists.ipfire.org; t=1667924033; a=rsa-sha256; cv=none; b=OFxBde0TJzHsflZxBBy/cJly44gb4mUnEmLs8IJ75lFpiAhCZ7TCozbH72Yq7u9yCsg6YN PSCY39CkXOWhRDfBwSjDaxN0JL3Uunh9wrniDM1AcympC88oraAme+SeSamyoJlxUndQQW 32+8KUJmpTcavrUWzyqXIT4Bct0HqkvPDw3FD+Uk2SHDxrIDjMoa0+Syp/DC8w+3xQ+TCu zKCANx0sJVQird/btdrFxGhEFWol3LC5Y4M/YMe/+5CnyjcdtTaV5QB7KmocJTVJds5N8t WWy2g+u7Yyq79dYsZv8CXkDt17opbhN+5OUo4honieIzh+FI/o0xwaGW7q1k3Q== Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 126A2411C1 for <development@lists.ipfire.org>; Tue, 8 Nov 2022 17:13:52 +0100 (CET) X-Virus-Scanned: SPAM Filter at disroot.org Received: from knopi.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id JN8AdheOUF56 for <development@lists.ipfire.org>; Tue, 8 Nov 2022 17:13:50 +0100 (CET) Received: from chojin.sicho.home (amaterasu.sicho.home [192.168.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (no client certificate requested) (Authenticated sender) by hachiman (MailScanner Milter) with SMTP id 61A6D7FC94; Tue, 8 Nov 2022 17:13:45 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1667924030; bh=A5rmyepYYRofmegKZYEZd+GOwE4FZCezeq3uLRV+pRM=; h=From:To:Cc:Subject:Date:From; b=D5TAdNLU+n0Vyj4wiMfY5U0IRaRSU0vvvjJINTc3BT2yBNAjuwfMFkr+RJRpU3BRV 9fzLjOC5riuBvGdjLDM+5wzbj2xnIcB6URso1Cg8uiQxQouef7VTxtEZyaKOcK298b r0mNv8nqw5gzZX0t416KbNVeaPv+t1vz9sI0d0IukmqRyTHj4oJsIxKBGNdWsyCO7x pMFgdpfZlA9cal2MHnfa1QJpxvSosNud2yU0wxxW/6BQr2rfssWI/jd6GyMIiQ0J8Y wWdfZz7dRu8xxHSLTl+dIC5KOkRsuxdJJqm++sWPYr4iY2bW6eyUGI1xNNV1IrsLvb RooifAtHXJesA== From: Robin Roevens <robin.roevens@disroot.org> To: development@lists.ipfire.org Subject: [PATCH] services.cgi: translate "Addon" Date: Tue, 8 Nov 2022 17:13:35 +0100 Message-Id: <20221108161335.19780-1-robin.roevens@disroot.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-sicho-MailScanner-ID: 61A6D7FC94.A8A80 X-sicho-MailScanner: Found to be clean X-sicho-MailScanner-From: robin.roevens@disroot.org X-sicho-MailScanner-Watermark: 1668528825.7107@Ij77TVJ7CxEBnGYUCHmOHA X-Spamd-Result: default: False [-0.89 / 11.00]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM(-0.94)[-0.940]; DMARC_POLICY_ALLOW(-0.50)[disroot.org,reject]; R_DKIM_ALLOW(-0.20)[disroot.org:s=mail]; R_SPF_ALLOW(-0.20)[+a]; MIME_GOOD(-0.10)[text/plain]; SPF_REPUTATION_SPAM(0.07)[0.02432098144646]; MX_GOOD(-0.01)[]; IP_REPUTATION_HAM(-0.01)[asn: 50673(0.00), country: NL(-0.01), ip: 178.21.23.139(0.00)]; BAYES_HAM(-0.00)[32.23%]; FROM_EQ_ENVFROM(0.00)[]; ASN(0.00)[asn:50673, ipnet:178.21.23.0/24, country:NL]; MIME_TRACE(0.00)[0:+]; RCVD_TLS_LAST(0.00)[]; TO_MATCH_ENVRCPT_SOME(0.00)[]; DKIM_TRACE(0.00)[disroot.org:+]; TO_DN_SOME(0.00)[]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_TWO(0.00)[2]; PREVIOUSLY_DELIVERED(0.00)[development@lists.ipfire.org]; DKIM_REPUTATION(0.00)[0]; ARC_SIGNED(0.00)[lists.ipfire.org:s=202003rsa:i=1]; RCVD_COUNT_THREE(0.00)[4]; ARC_NA(0.00)[] X-Rspamd-Server: mail01.haj.ipfire.org X-Rspamd-Queue-Id: 4N6Cp92ZH1zmp X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk <development.lists.ipfire.org> List-Unsubscribe: <https://lists.ipfire.org/mailman/options/development>, <mailto:development-request@lists.ipfire.org?subject=unsubscribe> List-Archive: <http://lists.ipfire.org/pipermail/development/> List-Post: <mailto:development@lists.ipfire.org> List-Help: <mailto:development-request@lists.ipfire.org?subject=help> List-Subscribe: <https://lists.ipfire.org/mailman/listinfo/development>, <mailto:development-request@lists.ipfire.org?subject=subscribe> Errors-To: development-bounces@lists.ipfire.org Sender: "Development" <development-bounces@lists.ipfire.org> |
Series |
services.cgi: translate "Addon"
|
|
Commit Message
Robin Roevens
Nov. 8, 2022, 4:13 p.m. UTC
Signed-off-by: Robin Roevens <robin.roevens@disroot.org>
---
html/cgi-bin/services.cgi | 4 ++--
langs/de/cgi-bin/de.pl | 2 +-
langs/en/cgi-bin/en.pl | 1 +
langs/nl/cgi-bin/nl.pl | 3 ++-
4 files changed, 6 insertions(+), 4 deletions(-)
Comments
Hello Robin, > On 8 Nov 2022, at 16:13, Robin Roevens <robin.roevens@disroot.org> wrote: > > Signed-off-by: Robin Roevens <robin.roevens@disroot.org> > --- > html/cgi-bin/services.cgi | 4 ++-- > langs/de/cgi-bin/de.pl | 2 +- > langs/en/cgi-bin/en.pl | 1 + > langs/nl/cgi-bin/nl.pl | 3 ++- > 4 files changed, 6 insertions(+), 4 deletions(-) > > diff --git a/html/cgi-bin/services.cgi b/html/cgi-bin/services.cgi > index 14ed01c50..3c0f27f99 100644 > --- a/html/cgi-bin/services.cgi > +++ b/html/cgi-bin/services.cgi > @@ -138,7 +138,7 @@ END > print "</table></div>\n"; > &Header::closebox(); > > - &Header::openbox('100%', 'left', "Addon - $Lang::tr{services}"); > + &Header::openbox('100%', 'left', "$Lang::tr{addon} - $Lang::tr{services}"); > my $paramstr=$ENV{QUERY_STRING}; > my @param=split(/!/, $paramstr); > # Make sure action parameter is actually one of the allowed service actions > @@ -156,7 +156,7 @@ END > <div align='center'> > <table width='80%' cellspacing='1' class='tbl'> > <tr> > - <th align='left'><b>Addon $Lang::tr{service}</b></th> > + <th align='left'><b>$Lang::tr{addon} $Lang::tr{service}</b></th> > <th align='center'><b>Boot</b></th> > <th align='center' colspan=2><b>$Lang::tr{'action'}</b></th> > <th align='center'><b>$Lang::tr{'status'}</b></th> > diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl > index db7d117b0..8310f7eba 100644 > --- a/langs/de/cgi-bin/de.pl > +++ b/langs/de/cgi-bin/de.pl > @@ -157,7 +157,7 @@ > 'add xtaccess' => 'Externen Zugang hinzugefügt', > 'add-route' => 'Zusätzlich zu propagierende Route', > 'added from dhcp lease list' => 'hinzugefügt von der DHCP-Zuordnungsliste', > -'addon' => 'Add-Ons', > +'addon' => 'Add-On', > 'addons' => 'Add-Ons', > 'admin user password has been changed' => 'Passwort für Benutzer admin wurde geändert.', > 'admin users' => 'Liste der Benutzer mit Super User Rechten', > diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl > index 60dca5be4..2aec959c3 100644 > --- a/langs/en/cgi-bin/en.pl > +++ b/langs/en/cgi-bin/en.pl > @@ -155,6 +155,7 @@ > 'add xtaccess' => 'Add External Access', > 'add-route' => 'Additional push route', > 'added from dhcp lease list' => 'Added from DHCP lease list', > +'addon' => 'Addon', > 'addons' => 'Addons', Shouldn’t we be consistent and call them “Add-on” everywhere? Technically this patch is not introducing that as an error, because it has been “Addon” before, but I suppose we should be consistent. -Michael > 'admin user password has been changed' => 'Admin user password has been changed.', > 'admin users' => 'User with superuser rights', > diff --git a/langs/nl/cgi-bin/nl.pl b/langs/nl/cgi-bin/nl.pl > index 4fd6955cc..cd790e595 100644 > --- a/langs/nl/cgi-bin/nl.pl > +++ b/langs/nl/cgi-bin/nl.pl > @@ -95,7 +95,8 @@ > 'add xtaccess' => 'Voeg een externe toegang toe', > 'add-route' => 'Extra push route', > 'added from dhcp lease list' => 'Toegevoegd van DHCP lease-lijst.', > -'addons' => 'Toevoegingen', > +'addon' => 'Add-on', > +'addons' => 'Add-ons', > 'admin user password has been changed' => 'Beheerderswachtwoord is gewijzigd.', > 'admin users' => 'Gebruiker met beheerdersrechten.', > 'administrator user password' => 'Beheerderswachtwoord:', > -- > 2.38.0 > > > -- > Dit bericht is gescanned op virussen en andere gevaarlijke > inhoud door MailScanner en lijkt schoon te zijn. >
Hi Michael Michael Tremer schreef op di 08-11-2022 om 17:26 [+0000]: > Hello Robin, > > > On 8 Nov 2022, at 16:13, Robin Roevens <robin.roevens@disroot.org> > > wrote: > > > > Signed-off-by: Robin Roevens <robin.roevens@disroot.org> > > --- > > html/cgi-bin/services.cgi | 4 ++-- > > langs/de/cgi-bin/de.pl | 2 +- > > langs/en/cgi-bin/en.pl | 1 + > > langs/nl/cgi-bin/nl.pl | 3 ++- > > 4 files changed, 6 insertions(+), 4 deletions(-) > > > > diff --git a/html/cgi-bin/services.cgi b/html/cgi-bin/services.cgi > > index 14ed01c50..3c0f27f99 100644 > > --- a/html/cgi-bin/services.cgi > > +++ b/html/cgi-bin/services.cgi > > @@ -138,7 +138,7 @@ END > > print "</table></div>\n"; > > &Header::closebox(); > > > > - &Header::openbox('100%', 'left', "Addon - $Lang::tr{services}"); > > + &Header::openbox('100%', 'left', "$Lang::tr{addon} - > > $Lang::tr{services}"); > > my $paramstr=$ENV{QUERY_STRING}; > > my @param=split(/!/, $paramstr); > > # Make sure action parameter is actually one of the allowed service > > actions > > @@ -156,7 +156,7 @@ END > > <div align='center'> > > <table width='80%' cellspacing='1' class='tbl'> > > <tr> > > - <th align='left'><b>Addon $Lang::tr{service}</b></th> > > + <th align='left'><b>$Lang::tr{addon} $Lang::tr{service}</b></th> > > <th align='center'><b>Boot</b></th> > > <th align='center' colspan=2><b>$Lang::tr{'action'}</b></th> > > <th align='center'><b>$Lang::tr{'status'}</b></th> > > diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl > > index db7d117b0..8310f7eba 100644 > > --- a/langs/de/cgi-bin/de.pl > > +++ b/langs/de/cgi-bin/de.pl > > @@ -157,7 +157,7 @@ > > 'add xtaccess' => 'Externen Zugang hinzugefügt', > > 'add-route' => 'Zusätzlich zu propagierende Route', > > 'added from dhcp lease list' => 'hinzugefügt von der DHCP- > > Zuordnungsliste', > > -'addon' => 'Add-Ons', > > +'addon' => 'Add-On', > > 'addons' => 'Add-Ons', > > 'admin user password has been changed' => 'Passwort für Benutzer > > admin wurde geändert.', > > 'admin users' => 'Liste der Benutzer mit Super User Rechten', > > diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl > > index 60dca5be4..2aec959c3 100644 > > --- a/langs/en/cgi-bin/en.pl > > +++ b/langs/en/cgi-bin/en.pl > > @@ -155,6 +155,7 @@ > > 'add xtaccess' => 'Add External Access', > > 'add-route' => 'Additional push route', > > 'added from dhcp lease list' => 'Added from DHCP lease list', > > +'addon' => 'Addon', > > 'addons' => 'Addons', > > Shouldn’t we be consistent and call them “Add-on” everywhere? > > Technically this patch is not introducing that as an error, because > it has been “Addon” before, but I suppose we should be consistent. > The DE translation already existed as "Add-Ons". The NL translation was "Toevoegingen" which is a literal translation of add-ons but "Add-ons" as in german better covers the load whereas "Toevoeging" sounds a bit silly in this context. On the other hand for French, probably Spanish, and maybe other languages as they actively try to use native alternatives for english words, I don't think they will be happy with "Add-on" when there is a native alternative. Or did you just mean the english "Addon" which should be "Add-on"? As indeed, after reading this: https://grammarhow.com/addon-add-on-or-add-on/ it seems "Addon" is just plain wrong, and should be written as "Add-on". (I didn't know, I knew "Add-on" is most common in dutch for this, I assumed the same for german, as that is what the de.pl file contains. I thought both where possible in english..) So I will change the patch for English to use "Add-on"/ "Add-ons" Regards Robin > -Michael > > > 'admin user password has been changed' => 'Admin user password has > > been changed.', > > 'admin users' => 'User with superuser rights', > > diff --git a/langs/nl/cgi-bin/nl.pl b/langs/nl/cgi-bin/nl.pl > > index 4fd6955cc..cd790e595 100644 > > --- a/langs/nl/cgi-bin/nl.pl > > +++ b/langs/nl/cgi-bin/nl.pl > > @@ -95,7 +95,8 @@ > > 'add xtaccess' => 'Voeg een externe toegang toe', > > 'add-route' => 'Extra push route', > > 'added from dhcp lease list' => 'Toegevoegd van DHCP lease-lijst.', > > -'addons' => 'Toevoegingen', > > +'addon' => 'Add-on', > > +'addons' => 'Add-ons', > > 'admin user password has been changed' => 'Beheerderswachtwoord is > > gewijzigd.', > > 'admin users' => 'Gebruiker met beheerdersrechten.', > > 'administrator user password' => 'Beheerderswachtwoord:', > > -- > > 2.38.0 > > > > > > -- > > Dit bericht is gescanned op virussen en andere gevaarlijke > > inhoud door MailScanner en lijkt schoon te zijn. > > > >
Thank you for bringing this up. As I update the Wiki I will add on the word Add-on And not add on Addon. Good talk! > On Nov 8, 2022, at 1:41 PM, Robin Roevens <robin.roevens@disroot.org> wrote: > > Hi Michael > > Michael Tremer schreef op di 08-11-2022 om 17:26 [+0000]: >> Hello Robin, >> >>> On 8 Nov 2022, at 16:13, Robin Roevens <robin.roevens@disroot.org> >>> wrote: >>> >>> Signed-off-by: Robin Roevens <robin.roevens@disroot.org> >>> --- >>> html/cgi-bin/services.cgi | 4 ++-- >>> langs/de/cgi-bin/de.pl | 2 +- >>> langs/en/cgi-bin/en.pl | 1 + >>> langs/nl/cgi-bin/nl.pl | 3 ++- >>> 4 files changed, 6 insertions(+), 4 deletions(-) >>> >>> diff --git a/html/cgi-bin/services.cgi b/html/cgi-bin/services.cgi >>> index 14ed01c50..3c0f27f99 100644 >>> --- a/html/cgi-bin/services.cgi >>> +++ b/html/cgi-bin/services.cgi >>> @@ -138,7 +138,7 @@ END >>> print "</table></div>\n"; >>> &Header::closebox(); >>> >>> - &Header::openbox('100%', 'left', "Addon - $Lang::tr{services}"); >>> + &Header::openbox('100%', 'left', "$Lang::tr{addon} - >>> $Lang::tr{services}"); >>> my $paramstr=$ENV{QUERY_STRING}; >>> my @param=split(/!/, $paramstr); >>> # Make sure action parameter is actually one of the allowed service >>> actions >>> @@ -156,7 +156,7 @@ END >>> <div align='center'> >>> <table width='80%' cellspacing='1' class='tbl'> >>> <tr> >>> - <th align='left'><b>Addon $Lang::tr{service}</b></th> >>> + <th align='left'><b>$Lang::tr{addon} $Lang::tr{service}</b></th> >>> <th align='center'><b>Boot</b></th> >>> <th align='center' colspan=2><b>$Lang::tr{'action'}</b></th> >>> <th align='center'><b>$Lang::tr{'status'}</b></th> >>> diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl >>> index db7d117b0..8310f7eba 100644 >>> --- a/langs/de/cgi-bin/de.pl >>> +++ b/langs/de/cgi-bin/de.pl >>> @@ -157,7 +157,7 @@ >>> 'add xtaccess' => 'Externen Zugang hinzugefügt', >>> 'add-route' => 'Zusätzlich zu propagierende Route', >>> 'added from dhcp lease list' => 'hinzugefügt von der DHCP- >>> Zuordnungsliste', >>> -'addon' => 'Add-Ons', >>> +'addon' => 'Add-On', >>> 'addons' => 'Add-Ons', >>> 'admin user password has been changed' => 'Passwort für Benutzer >>> admin wurde geändert.', >>> 'admin users' => 'Liste der Benutzer mit Super User Rechten', >>> diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl >>> index 60dca5be4..2aec959c3 100644 >>> --- a/langs/en/cgi-bin/en.pl >>> +++ b/langs/en/cgi-bin/en.pl >>> @@ -155,6 +155,7 @@ >>> 'add xtaccess' => 'Add External Access', >>> 'add-route' => 'Additional push route', >>> 'added from dhcp lease list' => 'Added from DHCP lease list', >>> +'addon' => 'Addon', >>> 'addons' => 'Addons', >> >> Shouldn’t we be consistent and call them “Add-on” everywhere? >> >> Technically this patch is not introducing that as an error, because >> it has been “Addon” before, but I suppose we should be consistent. >> > > The DE translation already existed as "Add-Ons". The NL translation was > "Toevoegingen" which is a literal translation of add-ons but "Add-ons" > as in german better covers the load whereas "Toevoeging" sounds a bit > silly in this context. > On the other hand for French, probably Spanish, and maybe other > languages as they actively try to use native alternatives for english > words, I don't think they will be happy with "Add-on" when there is a > native alternative. > > Or did you just mean the english "Addon" which should be "Add-on"? As > indeed, after reading this: > https://grammarhow.com/addon-add-on-or-add-on/ <https://grammarhow.com/addon-add-on-or-add-on/> it seems "Addon" is just > plain wrong, and should be written as "Add-on". (I didn't know, I knew > "Add-on" is most common in dutch for this, I assumed the same for > german, as that is what the de.pl file contains. I thought both where > possible in english..) > > So I will change the patch for English to use "Add-on"/ "Add-ons" > > Regards > > Robin > >> -Michael >> >>> 'admin user password has been changed' => 'Admin user password has >>> been changed.', >>> 'admin users' => 'User with superuser rights', >>> diff --git a/langs/nl/cgi-bin/nl.pl b/langs/nl/cgi-bin/nl.pl >>> index 4fd6955cc..cd790e595 100644 >>> --- a/langs/nl/cgi-bin/nl.pl >>> +++ b/langs/nl/cgi-bin/nl.pl >>> @@ -95,7 +95,8 @@ >>> 'add xtaccess' => 'Voeg een externe toegang toe', >>> 'add-route' => 'Extra push route', >>> 'added from dhcp lease list' => 'Toegevoegd van DHCP lease-lijst.', >>> -'addons' => 'Toevoegingen', >>> +'addon' => 'Add-on', >>> +'addons' => 'Add-ons', >>> 'admin user password has been changed' => 'Beheerderswachtwoord is >>> gewijzigd.', >>> 'admin users' => 'Gebruiker met beheerdersrechten.', >>> 'administrator user password' => 'Beheerderswachtwoord:', >>> -- >>> 2.38.0 >>> >>> >>> -- >>> Dit bericht is gescanned op virussen en andere gevaarlijke >>> inhoud door MailScanner en lijkt schoon te zijn. >>> >> >> > > -- > Dit bericht is gescanned op virussen en andere gevaarlijke > inhoud door MailScanner en lijkt schoon te zijn.
diff --git a/html/cgi-bin/services.cgi b/html/cgi-bin/services.cgi index 14ed01c50..3c0f27f99 100644 --- a/html/cgi-bin/services.cgi +++ b/html/cgi-bin/services.cgi @@ -138,7 +138,7 @@ END print "</table></div>\n"; &Header::closebox(); - &Header::openbox('100%', 'left', "Addon - $Lang::tr{services}"); + &Header::openbox('100%', 'left', "$Lang::tr{addon} - $Lang::tr{services}"); my $paramstr=$ENV{QUERY_STRING}; my @param=split(/!/, $paramstr); # Make sure action parameter is actually one of the allowed service actions @@ -156,7 +156,7 @@ END <div align='center'> <table width='80%' cellspacing='1' class='tbl'> <tr> - <th align='left'><b>Addon $Lang::tr{service}</b></th> + <th align='left'><b>$Lang::tr{addon} $Lang::tr{service}</b></th> <th align='center'><b>Boot</b></th> <th align='center' colspan=2><b>$Lang::tr{'action'}</b></th> <th align='center'><b>$Lang::tr{'status'}</b></th> diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index db7d117b0..8310f7eba 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -157,7 +157,7 @@ 'add xtaccess' => 'Externen Zugang hinzugefügt', 'add-route' => 'Zusätzlich zu propagierende Route', 'added from dhcp lease list' => 'hinzugefügt von der DHCP-Zuordnungsliste', -'addon' => 'Add-Ons', +'addon' => 'Add-On', 'addons' => 'Add-Ons', 'admin user password has been changed' => 'Passwort für Benutzer admin wurde geändert.', 'admin users' => 'Liste der Benutzer mit Super User Rechten', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 60dca5be4..2aec959c3 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -155,6 +155,7 @@ 'add xtaccess' => 'Add External Access', 'add-route' => 'Additional push route', 'added from dhcp lease list' => 'Added from DHCP lease list', +'addon' => 'Addon', 'addons' => 'Addons', 'admin user password has been changed' => 'Admin user password has been changed.', 'admin users' => 'User with superuser rights', diff --git a/langs/nl/cgi-bin/nl.pl b/langs/nl/cgi-bin/nl.pl index 4fd6955cc..cd790e595 100644 --- a/langs/nl/cgi-bin/nl.pl +++ b/langs/nl/cgi-bin/nl.pl @@ -95,7 +95,8 @@ 'add xtaccess' => 'Voeg een externe toegang toe', 'add-route' => 'Extra push route', 'added from dhcp lease list' => 'Toegevoegd van DHCP lease-lijst.', -'addons' => 'Toevoegingen', +'addon' => 'Add-on', +'addons' => 'Add-ons', 'admin user password has been changed' => 'Beheerderswachtwoord is gewijzigd.', 'admin users' => 'Gebruiker met beheerdersrechten.', 'administrator user password' => 'Beheerderswachtwoord:',