[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 72c8478ee5233b8556cdce55238e3dce4676fb7f
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".
The branch, next has been updated via 72c8478ee5233b8556cdce55238e3dce4676fb7f (commit) via 2f44c09d80149e802a22691797503cbebb58ab3c (commit) via 70b43b54c9271895e1b991c15c74ba58d3d72692 (commit) via e7c7ccfa37fbbc2d103060e1c18e2b8cbd674198 (commit) via 86c8299cd46f5034e8a123a539f923844e7b0234 (commit) via 79eec2773e9be355274734b81ad13eeb5eb0331b (commit) via e9b3b1489c7a11d58573cf439d2351cda1c97f4a (commit) via 7bd51283c8eb73958e4db38279bcf9634b35ce88 (commit) via dd42ea2c5e65e1755b2aba271ea51c2cea53efdc (commit) from 730e96c98b5432104f5394aabfc55a05bef39e0e (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit 72c8478ee5233b8556cdce55238e3dce4676fb7f Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Feb 22 13:41:31 2021 +0000
lang: Actually check Polish translation
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 2f44c09d80149e802a22691797503cbebb58ab3c Author: Roberto Peña contacto@northsecure.es Date: Sun Feb 21 12:11:47 2021 +0100
Add Spanish translations for Captive Portal
- Ran ./make lang before adding translations and git status was clear - Ran ./make lang after adding translations and git status included also doc/language_issues.pl although I did not change anything for Polish and it was clear before making any changes
Signed-off-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 70b43b54c9271895e1b991c15c74ba58d3d72692 Author: Matthias Fischer matthias.fischer@ipfire.org Date: Sat Feb 20 11:14:05 2021 +0100
libxcrypt 4.4.17: Fix for rootfile
Signed-off-by: Matthias Fischer matthias.fischer@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit e7c7ccfa37fbbc2d103060e1c18e2b8cbd674198 Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Feb 22 11:27:40 2021 +0000
core155: Ship tar
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 86c8299cd46f5034e8a123a539f923844e7b0234 Author: Matthias Fischer matthias.fischer@ipfire.org Date: Sat Feb 20 00:17:28 2021 +0100
tar: Update to 1.34
For details see: https://lists.gnu.org/archive/html/info-gnu/2021-02/msg00006.html
Signed-off-by: Matthias Fischer matthias.fischer@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 79eec2773e9be355274734b81ad13eeb5eb0331b Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Feb 22 11:26:50 2021 +0000
core155: Ship libgcrypt
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit e9b3b1489c7a11d58573cf439d2351cda1c97f4a Author: Matthias Fischer matthias.fischer@ipfire.org Date: Sat Feb 20 00:14:12 2021 +0100
libgcrypt: Update to 1.9.2
For details see: https://lists.gnupg.org/pipermail/gnupg-announce/2021q1/000457.html
Signed-off-by: Matthias Fischer matthias.fischer@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 7bd51283c8eb73958e4db38279bcf9634b35ce88 Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Feb 22 11:26:19 2021 +0000
core155: Ship nettle
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit dd42ea2c5e65e1755b2aba271ea51c2cea53efdc Author: Matthias Fischer matthias.fischer@ipfire.org Date: Sat Feb 20 00:09:50 2021 +0100
nettle: Update to 3.7.1
For details see:
Annonce for 3.7.1: http://lists.lysator.liu.se/pipermail/nettle-bugs/2021/009434.html
Announce for 3.6: http://lists.lysator.liu.se/pipermail/nettle-bugs/2020/008967.html
Signed-off-by: Matthias Fischer matthias.fischer@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
-----------------------------------------------------------------------
Summary of changes: config/rootfiles/common/libgcrypt | 2 +- config/rootfiles/common/libxcrypt | 1 + config/rootfiles/common/nettle | 12 +++-- .../{oldcore/105 => core/155}/filelists/libgcrypt | 0 .../{oldcore/101 => core/155}/filelists/nettle | 0 .../{oldcore/121 => core/155}/filelists/tar | 0 doc/language_issues.es | 54 ++++++++------------ doc/language_issues.pl | 58 +++++++++++----------- doc/language_missings | 54 -------------------- langs/es/cgi-bin/es.pl | 54 ++++++++++++++++++++ lfs/libgcrypt | 6 +-- lfs/nettle | 6 +-- lfs/tar | 10 ++-- make.sh | 2 +- 14 files changed, 126 insertions(+), 133 deletions(-) copy config/rootfiles/{oldcore/105 => core/155}/filelists/libgcrypt (100%) copy config/rootfiles/{oldcore/101 => core/155}/filelists/nettle (100%) copy config/rootfiles/{oldcore/121 => core/155}/filelists/tar (100%)
Difference in files: diff --git a/config/rootfiles/common/libgcrypt b/config/rootfiles/common/libgcrypt index 63af7e6b1..756940b40 100644 --- a/config/rootfiles/common/libgcrypt +++ b/config/rootfiles/common/libgcrypt @@ -6,7 +6,7 @@ #usr/lib/libgcrypt.la #usr/lib/libgcrypt.so usr/lib/libgcrypt.so.20 -usr/lib/libgcrypt.so.20.3.1 +usr/lib/libgcrypt.so.20.3.2 #usr/lib/pkgconfig/libgcrypt.pc #usr/share/aclocal/libgcrypt.m4 #usr/share/info/gcrypt.info diff --git a/config/rootfiles/common/libxcrypt b/config/rootfiles/common/libxcrypt index c866c2ddb..1cbb05816 100644 --- a/config/rootfiles/common/libxcrypt +++ b/config/rootfiles/common/libxcrypt @@ -9,6 +9,7 @@ usr/lib/libcrypt.so.1.1.0 #usr/lib/libxcrypt.so #usr/lib/pkgconfig/libcrypt.pc #usr/lib/pkgconfig/libxcrypt.pc +#usr/share/man/man3/crypt.3 #usr/share/man/man3/crypt_checksalt.3 #usr/share/man/man3/crypt_gensalt.3 #usr/share/man/man3/crypt_gensalt_ra.3 diff --git a/config/rootfiles/common/nettle b/config/rootfiles/common/nettle index 58e3f57a0..bf43e8ad5 100644 --- a/config/rootfiles/common/nettle +++ b/config/rootfiles/common/nettle @@ -23,6 +23,7 @@ #usr/include/nettle/cmac.h #usr/include/nettle/ctr.h #usr/include/nettle/curve25519.h +#usr/include/nettle/curve448.h #usr/include/nettle/des.h #usr/include/nettle/dsa-compat.h #usr/include/nettle/dsa.h @@ -32,6 +33,7 @@ #usr/include/nettle/ecdsa.h #usr/include/nettle/eddsa.h #usr/include/nettle/gcm.h +#usr/include/nettle/gostdsa.h #usr/include/nettle/gosthash94.h #usr/include/nettle/hkdf.h #usr/include/nettle/hmac.h @@ -61,16 +63,18 @@ #usr/include/nettle/sha1.h #usr/include/nettle/sha2.h #usr/include/nettle/sha3.h +#usr/include/nettle/siv-cmac.h +#usr/include/nettle/streebog.h #usr/include/nettle/twofish.h #usr/include/nettle/umac.h #usr/include/nettle/version.h #usr/include/nettle/xts.h #usr/include/nettle/yarrow.h usr/lib/libhogweed.so -usr/lib/libhogweed.so.5 -usr/lib/libhogweed.so.5.0 +usr/lib/libhogweed.so.6 +usr/lib/libhogweed.so.6.2 #usr/lib/libnettle.so -usr/lib/libnettle.so.7 -usr/lib/libnettle.so.7.0 +usr/lib/libnettle.so.8 +usr/lib/libnettle.so.8.2 #usr/lib/pkgconfig/hogweed.pc #usr/lib/pkgconfig/nettle.pc diff --git a/config/rootfiles/core/155/filelists/libgcrypt b/config/rootfiles/core/155/filelists/libgcrypt new file mode 120000 index 000000000..2df12a20e --- /dev/null +++ b/config/rootfiles/core/155/filelists/libgcrypt @@ -0,0 +1 @@ +../../../common/libgcrypt \ No newline at end of file diff --git a/config/rootfiles/core/155/filelists/nettle b/config/rootfiles/core/155/filelists/nettle new file mode 120000 index 000000000..f0dba7ac8 --- /dev/null +++ b/config/rootfiles/core/155/filelists/nettle @@ -0,0 +1 @@ +../../../common/nettle \ No newline at end of file diff --git a/config/rootfiles/core/155/filelists/tar b/config/rootfiles/core/155/filelists/tar new file mode 120000 index 000000000..3e585d2eb --- /dev/null +++ b/config/rootfiles/core/155/filelists/tar @@ -0,0 +1 @@ +../../../common/tar \ No newline at end of file diff --git a/doc/language_issues.es b/doc/language_issues.es index 82d65d99c..a54428362 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -1,3 +1,25 @@ +WARNING: translation string unused: Captive 1day +WARNING: translation string unused: Captive 1month +WARNING: translation string unused: Captive 1week +WARNING: translation string unused: Captive activate +WARNING: translation string unused: Captive auth_lic +WARNING: translation string unused: Captive auth_vou +WARNING: translation string unused: Captive err doublevoucher +WARNING: translation string unused: Captive expire +WARNING: translation string unused: Captive heading terms +WARNING: translation string unused: Captive heading voucher +WARNING: translation string unused: Captive invalid coupon +WARNING: translation string unused: Captive invalid logosize +WARNING: translation string unused: Captive invalid_voucher +WARNING: translation string unused: Captive ip +WARNING: translation string unused: Captive logo_set +WARNING: translation string unused: Captive noexpiretime +WARNING: translation string unused: Captive nr +WARNING: translation string unused: Captive please enter a coupon code +WARNING: translation string unused: Captive time +WARNING: translation string unused: Captive voactive +WARNING: translation string unused: Captive voucher +WARNING: translation string unused: Captive vout WARNING: translation string unused: Client status and controlc WARNING: translation string unused: ConnSched scheduler WARNING: translation string unused: ConnSched select profile @@ -752,40 +774,8 @@ WARNING: translation string unused: xtaccess bad transfert WARNING: translation string unused: year-graph WARNING: translation string unused: yearly firewallhits WARNING: untranslated string: 24 hours = 24 Hours -WARNING: untranslated string: Captive = Captive Portal WARNING: untranslated string: Captive ACTIVATE = unknown string -WARNING: untranslated string: Captive GAIN ACCESS = GAIN ACCESS -WARNING: untranslated string: Captive WiFi coupon = WiFi Coupon -WARNING: untranslated string: Captive activated = Activated -WARNING: untranslated string: Captive active on = Activated on -WARNING: untranslated string: Captive agree tac = I agree with the terms & conditions below. -WARNING: untranslated string: Captive authentication = Type of Access -WARNING: untranslated string: Captive brand color = Brand Color -WARNING: untranslated string: Captive branding = Branding -WARNING: untranslated string: Captive client session expiry time = Session Expiry Time WARNING: untranslated string: Captive clients = unknown string -WARNING: untranslated string: Captive config = Settings -WARNING: untranslated string: Captive coupon = Coupon -WARNING: untranslated string: Captive delete logo = Delete Logo -WARNING: untranslated string: Captive expiry time = Expiry Time -WARNING: untranslated string: Captive export coupons = Export Coupons -WARNING: untranslated string: Captive generate coupons = Generate Coupons -WARNING: untranslated string: Captive generated coupon no = Number of coupons -WARNING: untranslated string: Captive issued coupons = Issued Coupons -WARNING: untranslated string: Captive logo uploaded = Logo uploaded -WARNING: untranslated string: Captive mac = MAC Address -WARNING: untranslated string: Captive nolimit = unlimited -WARNING: untranslated string: Captive please accept the terms and conditions = Please accept the terms & conditions -WARNING: untranslated string: Captive portal = IPFire Captive Portal -WARNING: untranslated string: Captive portal coupons = Captive Portal Coupons -WARNING: untranslated string: Captive terms = Terms & Conditions -WARNING: untranslated string: Captive terms short = T&Cs -WARNING: untranslated string: Captive title = Title of Login Page -WARNING: untranslated string: Captive upload logo = Upload Logo -WARNING: untranslated string: Captive upload logo recommendations = (PNG or JPEG, recommended 1280x720 pixels) -WARNING: untranslated string: Captive valid for = Valid for -WARNING: untranslated string: Captive vouchervalid = Allowed time for this coupon -WARNING: untranslated string: Captive wrong ext = Uploaded file has wrong filetype WARNING: untranslated string: ConnSched dial = Connect WARNING: untranslated string: ConnSched hangup = Disconnect WARNING: untranslated string: ConnSched reboot = Reboot diff --git a/doc/language_issues.pl b/doc/language_issues.pl index 82d65d99c..f1a475648 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -1,3 +1,4 @@ +WARNING: translation string unused: Async logging enabled WARNING: translation string unused: Client status and controlc WARNING: translation string unused: ConnSched scheduler WARNING: translation string unused: ConnSched select profile @@ -223,7 +224,6 @@ WARNING: translation string unused: dns new 0 WARNING: translation string unused: dns new 1 WARNING: translation string unused: dns saved WARNING: translation string unused: dns saved txt -WARNING: translation string unused: dns server WARNING: translation string unused: do not log this port list WARNING: translation string unused: domain master WARNING: translation string unused: domain not set @@ -276,8 +276,6 @@ WARNING: translation string unused: external access rule added WARNING: translation string unused: external access rule changed WARNING: translation string unused: external access rule removed WARNING: translation string unused: extrahd -WARNING: translation string unused: extrahd unable to read -WARNING: translation string unused: extrahd unable to write WARNING: translation string unused: filename WARNING: translation string unused: firewall graphs WARNING: translation string unused: firewall log viewer @@ -378,9 +376,6 @@ WARNING: translation string unused: local hard disk WARNING: translation string unused: local master WARNING: translation string unused: localkey WARNING: translation string unused: localkeyfile -WARNING: translation string unused: locationblock country code -WARNING: translation string unused: locationblock country name -WARNING: translation string unused: locationblock flag WARNING: translation string unused: log enabled WARNING: translation string unused: log level WARNING: translation string unused: log var messages @@ -478,12 +473,23 @@ WARNING: translation string unused: original WARNING: translation string unused: os level WARNING: translation string unused: out WARNING: translation string unused: outgoing firewall +WARNING: translation string unused: outgoing firewall add ip group +WARNING: translation string unused: outgoing firewall add mac group +WARNING: translation string unused: outgoing firewall edit ip group +WARNING: translation string unused: outgoing firewall edit mac group +WARNING: translation string unused: outgoing firewall group error +WARNING: translation string unused: outgoing firewall groups +WARNING: translation string unused: outgoing firewall ip groups +WARNING: translation string unused: outgoing firewall mac groups WARNING: translation string unused: outgoing firewall mode0 WARNING: translation string unused: outgoing firewall mode1 WARNING: translation string unused: outgoing firewall mode2 WARNING: translation string unused: outgoing firewall outgoing firewall reserved groupname -WARNING: translation string unused: outgoing firewall p2p description +WARNING: translation string unused: outgoing firewall p2p description 1 +WARNING: translation string unused: outgoing firewall p2p description 2 +WARNING: translation string unused: outgoing firewall p2p description 3 WARNING: translation string unused: outgoing firewall reset +WARNING: translation string unused: outgoing firewall view group WARNING: translation string unused: outgoing firewall warning WARNING: translation string unused: override mtu WARNING: translation string unused: ovpn config @@ -797,7 +803,6 @@ WARNING: untranslated string: MB written = MB written WARNING: untranslated string: MTU settings = MTU settings: WARNING: untranslated string: Number of Countries for the pie chart = Number of Countries for the pie chart WARNING: untranslated string: Scan for Songs = unknown string -WARNING: untranslated string: Set time on boot = Force setting the system clock on boot WARNING: untranslated string: Weekly = Weekly WARNING: untranslated string: acpitemp = ACPI - Temperatures WARNING: untranslated string: addons = Addons @@ -869,6 +874,7 @@ WARNING: untranslated string: ccd routes = Routing: WARNING: untranslated string: ccd subnet = Subnet WARNING: untranslated string: ccd used = Used addresses WARNING: untranslated string: check all = Check all +WARNING: untranslated string: community rules = Snort/VRT GPLv2 Community Rules WARNING: untranslated string: count = Count WARNING: untranslated string: countries = Countries WARNING: untranslated string: country codes and flags = Country Codes and Flags: @@ -910,7 +916,6 @@ WARNING: untranslated string: dns mode for qname minimisation = QNAME Minimisati WARNING: untranslated string: dns no address given = No IP Address given. WARNING: untranslated string: dns no tls hostname given = No TLS hostname given. WARNING: untranslated string: dns recursor mode = Recursor Mode -WARNING: untranslated string: dns servers = DNS Servers WARNING: untranslated string: dns tls hostname = TLS Hostname WARNING: untranslated string: dns use isp assigned nameservers = Use ISP-assigned DNS servers WARNING: untranslated string: dns use protocol for dns queries = Protocol for DNS queries @@ -964,25 +969,15 @@ WARNING: untranslated string: entropy = Entropy WARNING: untranslated string: entropy graphs = Entropy Graphs WARNING: untranslated string: error = Error WARNING: untranslated string: error the to date has to be later than the from date = The to date has to be later than the from date! +WARNING: untranslated string: extrahd because there is already a device mounted = , because there is already a device mounted +WARNING: untranslated string: extrahd cant umount = Can't umount +WARNING: untranslated string: extrahd install or load driver = If your device isn't listed here, you need to install or load the driver.<br />If you can see your device but no partitions you have to create them first. +WARNING: untranslated string: extrahd maybe the device is in use = . Maybe the device is in use +WARNING: untranslated string: extrahd to = to +WARNING: untranslated string: extrahd to root = to root +WARNING: untranslated string: extrahd you cant mount = You can't mount WARNING: untranslated string: fallout zombieload ridl = Fallout/ZombieLoad/RIDL WARNING: untranslated string: fifteen minutes = 15 Minutes -WARNING: untranslated string: fireinfo ipfire version = IPFire version -WARNING: untranslated string: fireinfo is disabled = Fireinfo is disabled -WARNING: untranslated string: fireinfo is enabled = Fireinfo is enabled -WARNING: untranslated string: fireinfo is submitted = Your profile is submitted to the fireinfo service. -WARNING: untranslated string: fireinfo is submitted button = No, I do not want to send my profile anymore -WARNING: untranslated string: fireinfo kernel version = Kernel version -WARNING: untranslated string: fireinfo not submitted = Your profile is not submitted to the fireinfo service. -WARNING: untranslated string: fireinfo not submitted button = Yes, I want to send my profile -WARNING: untranslated string: fireinfo pakfire version = Pakfire version -WARNING: untranslated string: fireinfo please enable = Please enable the fireinfo service. -WARNING: untranslated string: fireinfo settings = Fireinfo settings -WARNING: untranslated string: fireinfo system version = System versions -WARNING: untranslated string: fireinfo why descr1 = It is very important for the development of IPFire that you enable this -WARNING: untranslated string: fireinfo why descr2 = service. -WARNING: untranslated string: fireinfo why enable = Why should I enable fireinfo? -WARNING: untranslated string: fireinfo why read more = Read more about the reasons. -WARNING: untranslated string: fireinfo your profile id = Your profile ID WARNING: untranslated string: firewall graph country = Firewall-Diagram (Country) WARNING: untranslated string: firewall graph ip = Firewall-Diagram (IP) WARNING: untranslated string: firewall graph port = Firewall-Diagram (Port) @@ -1241,6 +1236,13 @@ WARNING: untranslated string: least preferred = least preferred WARNING: untranslated string: legacy architecture warning = You are running IPFire on a legacy architecture and it is recommended to upgrade WARNING: untranslated string: lifetime = Lifetime: WARNING: untranslated string: local ip address = Local IP Address +WARNING: untranslated string: location = Location +WARNING: untranslated string: locationblock = Location Block +WARNING: untranslated string: locationblock block countries = Block countries +WARNING: untranslated string: locationblock configuration = Location Configuration +WARNING: untranslated string: locationblock country is allowed = Incoming traffic from this country is allowed +WARNING: untranslated string: locationblock country is blocked = Incoming traffic from this country will be blocked +WARNING: untranslated string: locationblock enable feature = Enable Location based blocking: WARNING: untranslated string: log server protocol = protocol: WARNING: untranslated string: mac filter = MAC filter WARNING: untranslated string: masquerade blue = Masquerade BLUE @@ -1297,8 +1299,6 @@ WARNING: untranslated string: openvpn subnet is used = The given subnet is used WARNING: untranslated string: optional = Optional WARNING: untranslated string: outgoing compression in bytes per second = Outgoing compression WARNING: untranslated string: outgoing firewall access = Outgoing Firewall Access -WARNING: untranslated string: outgoing firewall p2p allow = Using the P2P protocol is allowed -WARNING: untranslated string: outgoing firewall p2p deny = Using the P2P protocol is forbidden WARNING: untranslated string: outgoing overhead in bytes per second = Outgoing Overhead WARNING: untranslated string: ovpn add conf = Additional configuration WARNING: untranslated string: ovpn connection name = Connection Name @@ -1323,7 +1323,6 @@ WARNING: untranslated string: ovpn tls auth = TLS Channel Protection: WARNING: untranslated string: ovpn warning rfc3280 = Your host certificate is not RFC3280 compliant. <br>Please update to the latest IPFire version and generate as soon as possible a new root and host certificate.</br><br>All OpenVPN clients needs then to be renewed!</br> WARNING: untranslated string: p2p block = P2P networks WARNING: untranslated string: p2p block save notice = Please reload the firewall ruleset in order to apply your changes. -WARNING: untranslated string: pakfire ago = ago. WARNING: untranslated string: pakfire invalid tree = Invalid repository selected WARNING: untranslated string: pakfire tree = Repository WARNING: untranslated string: pakfire tree stable = Stable @@ -1383,7 +1382,6 @@ WARNING: untranslated string: strict = Strict WARNING: untranslated string: subnet mask = Subnet Mask WARNING: untranslated string: support donation = Support the IPFire project with your donation WARNING: untranslated string: system has rdrand = This system has support for Intel(R) RDRAND. -WARNING: untranslated string: system information = System Information WARNING: untranslated string: system is offline = The system is offline. WARNING: untranslated string: ta key = TLS-Authentification-Key WARNING: untranslated string: taa zombieload2 = TSX Async Abort / ZombieLoad v2 diff --git a/doc/language_missings b/doc/language_missings index 0d89426ca..f42be2e77 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -108,60 +108,6 @@ < block < broken < capabilities -< Captive -< Captive 1day -< Captive 1month -< Captive 1week -< Captive activate -< Captive activated -< Captive active on -< Captive agree tac -< Captive authentication -< Captive auth_lic -< Captive auth_vou -< Captive brand color -< Captive branding -< Captive client session expiry time -< Captive config -< Captive coupon -< Captive delete logo -< Captive err doublevoucher -< Captive expire -< Captive expiry time -< Captive export coupons -< Captive GAIN ACCESS -< Captive generate coupons -< Captive generated coupon no -< Captive heading terms -< Captive heading voucher -< Captive invalid coupon -< Captive invalid logosize -< Captive invalid_voucher -< Captive ip -< Captive issued coupons -< Captive logo_set -< Captive logo uploaded -< Captive mac -< Captive noexpiretime -< Captive nolimit -< Captive nr -< Captive please accept the terms and conditions -< Captive please enter a coupon code -< Captive portal -< Captive portal coupons -< Captive terms -< Captive terms short -< Captive time -< Captive title -< Captive upload logo -< Captive upload logo recommendations -< Captive valid for -< Captive voactive -< Captive voucher -< Captive vouchervalid -< Captive vout -< Captive WiFi coupon -< Captive wrong ext < ccd add < ccd choose net < ccd clientip diff --git a/langs/es/cgi-bin/es.pl b/langs/es/cgi-bin/es.pl index 9a39ffd16..ad6a228d8 100644 --- a/langs/es/cgi-bin/es.pl +++ b/langs/es/cgi-bin/es.pl @@ -6,6 +6,60 @@ 'Add Port Rule' => 'Añadir Regla de Puerto', 'Add Rule' => 'Añadir Regla', 'Add a route' => 'Añadir una route', +'Captive' => 'Portal Cautivo', +'Captive 1day' => '1 día', +'Captive 1month' => '1 mes', +'Captive 1week' => '1 semana', +'Captive GAIN ACCESS' => 'ACCEDER', +'Captive WiFi coupon' => 'WiFi Cupón', +'Captive activate' => 'Activar', +'Captive activated' => 'Activado', +'Captive active on' => 'Activado en', +'Captive agree tac' => 'Estoy de acuerdo con los términos y condiciones de a continuación.', +'Captive auth_lic' => 'Licencia', +'Captive auth_vou' => 'Cupón', +'Captive authentication' => 'Tipo de Acceso', +'Captive brand color' => 'Color de Marca', +'Captive branding' => 'Marca', +'Captive client session expiry time' => 'Caducidad de la Sesión', +'Captive config' => 'Ajustes', +'Captive coupon' => 'Cupón', +'Captive delete logo' => 'Borrar Logo', +'Captive err doublevoucher' => 'Ya existe un cupón con este código', +'Captive expire' => 'Caducar', +'Captive expiry time' => 'Tiempo de caducidad', +'Captive export coupons' => 'Exportar Cupones', +'Captive generate coupons' => 'Generar Cupones', +'Captive generated coupon no' => 'Numero de cupones', +'Captive heading terms' => 'Términos & Condiciones', +'Captive heading voucher' => 'Cupón or Código de Acceso', +'Captive invalid coupon' => 'Ingresó un código de cupón no válido. Inténtalo de nuevo.', +'Captive invalid logosize' => 'El archivo de imagen cargado no cumple con la resolución requerida de al menos 1280x400 pero no mayor de 1920x800 píxeles', +'Captive invalid_voucher' => 'Código inválido. Por favor, inténtalo de nuevo', +'Captive ip' => 'Dirección IP', +'Captive issued coupons' => 'Cupones emitidos', +'Captive logo uploaded' => 'Logo subido', +'Captive logo_set' => 'Logo actual', +'Captive mac' => 'Dirección MAC', +'Captive noexpiretime' => 'No se ha proporcionado un intervalo de tiempo de conexión válido', +'Captive nolimit' => 'ilimitado', +'Captive nr' => 'Número', +'Captive please accept the terms and conditions' => 'Por favor, acepte los términos & condiciones', +'Captive please enter a coupon code' => 'Por favor, introduzca el código de cupón', +'Captive portal' => 'Portal Cautivo Business Secure', +'Captive portal coupons' => 'Cupones del Portal Cautivo', +'Captive terms' => 'Términos & Condiciones', +'Captive terms short' => 'T&Cs', +'Captive time' => 'Tiempo de acceso posterior a la activación (horas)', +'Captive title' => 'Título de la página de inicio de sesión', +'Captive upload logo' => 'Logo subido', +'Captive upload logo recommendations' => '(PNG o JPEG, 1280x720 pixels recomendados)', +'Captive valid for' => 'Válido para', +'Captive voactive' => 'Cupones activos', +'Captive voucher' => 'Cupón', +'Captive vouchervalid' => 'Tiempo permitido para este cupón', +'Captive vout' => 'Cupones emitidos', +'Captive wrong ext' => 'El archivo subido tiene un tipo de archivo incorrecto', 'Choose Rule' => 'Seleccione <u>una</u> de las siguientes reglas.', 'Class' => 'Clase', 'Class was deleted' => 'con subclases potenciales fué eliminado', diff --git a/lfs/libgcrypt b/lfs/libgcrypt index a901c558f..392a21c30 100644 --- a/lfs/libgcrypt +++ b/lfs/libgcrypt @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2020 IPFire Team info@ipfire.org # +# Copyright (C) 2007-2021 IPFire Team info@ipfire.org # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@
include Config
-VER = 1.9.1 +VER = 1.9.2
THISAPP = libgcrypt-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 8805f3e466af315222b6e1864f52b79a +$(DL_FILE)_MD5 = 00121b05e1ff4cc85a4a6503e0a7d9fb
install : $(TARGET)
diff --git a/lfs/nettle b/lfs/nettle index cc34b1fad..e2d5df88d 100644 --- a/lfs/nettle +++ b/lfs/nettle @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2019 IPFire Team info@ipfire.org # +# Copyright (C) 2007-2021 IPFire Team info@ipfire.org # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@
include Config
-VER = 3.5.1 +VER = 3.7.1
THISAPP = nettle-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 0e5707b418c3826768d41130fbe4ee86 +$(DL_FILE)_MD5 = 4d23a99df650ee88511653fb9acea3f0
install : $(TARGET)
diff --git a/lfs/tar b/lfs/tar index f5c280fb2..9ba5e5c88 100644 --- a/lfs/tar +++ b/lfs/tar @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2019 IPFire Team info@ipfire.org # +# Copyright (C) 2007-2021 IPFire Team info@ipfire.org # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,10 +24,10 @@
include Config
-VER = 1.32 +VER = 1.34
THISAPP = tar-$(VER) -DL_FILE = $(THISAPP).tar.bz2 +DL_FILE = $(THISAPP).tar.xz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP)
@@ -50,7 +50,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 17917356fff5cb4bd3cd5a6c3e727b05 +$(DL_FILE)_MD5 = 9a08d29a9ac4727130b5708347c0f5cf
install : $(TARGET)
@@ -79,7 +79,7 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/tar/01_extract.c.patch
diff --git a/make.sh b/make.sh index e17d0487c..cc19432ac 100755 --- a/make.sh +++ b/make.sh @@ -1973,7 +1973,7 @@ lang) $BASEDIR/tools/check_strings.pl de > $BASEDIR/doc/language_issues.de $BASEDIR/tools/check_strings.pl fr > $BASEDIR/doc/language_issues.fr $BASEDIR/tools/check_strings.pl es > $BASEDIR/doc/language_issues.es - $BASEDIR/tools/check_strings.pl es > $BASEDIR/doc/language_issues.pl + $BASEDIR/tools/check_strings.pl pl > $BASEDIR/doc/language_issues.pl $BASEDIR/tools/check_strings.pl ru > $BASEDIR/doc/language_issues.ru $BASEDIR/tools/check_strings.pl nl > $BASEDIR/doc/language_issues.nl $BASEDIR/tools/check_strings.pl tr > $BASEDIR/doc/language_issues.tr
hooks/post-receive -- IPFire 2.x development tree
-
Michael Tremer