From b5c5e2d84de59abc3a09061b38c4027780383fb6 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Sat, 10 Nov 2012 16:25:54 +0100 Subject: [PATCH 1/4] langs: remove not translated ovpn strings. Don't add english strings to other language files! English will automaticly used if the string is not defined. --- langs/es/cgi-bin/es.pl | 4 ---- langs/pl/cgi-bin/pl.pl | 4 ---- 2 files changed, 8 deletions(-) diff --git a/langs/es/cgi-bin/es.pl b/langs/es/cgi-bin/es.pl index f96284f11..365630a6e 100644 --- a/langs/es/cgi-bin/es.pl +++ b/langs/es/cgi-bin/es.pl @@ -1328,14 +1328,10 @@ 'ovpn config' => 'Configruación de OVPN', 'ovpn device' => 'Dispositivo OpenVPN', 'ovpn dl' => 'Configuración de descargas OVPN', -'ovpn errmsg green already pushed' => 'Route for green network is always set', -'ovpn errmsg invalid ip or mask' => 'Invalid network-address or subnetmask', 'ovpn log' => 'Registro de log de OVPN', 'ovpn on blue' => 'OpenVPN en BLUE', 'ovpn on orange' => 'OpenVPN en ORANGE', 'ovpn on red' => 'OpenVPN en RED', -'ovpn routes push' => 'Routes (one per line):', -'ovpn routes push options' => 'Route push options', 'ovpn server status' => 'Status actual del servidor OpenVPN:', 'ovpn subnet' => 'Subred de OpenVPN (ej. 10.0.10.0/255.255.255.0', 'ovpn subnet is invalid' => 'Subred de OpenVPN no es válida.', diff --git a/langs/pl/cgi-bin/pl.pl b/langs/pl/cgi-bin/pl.pl index e0d64a095..12439e445 100644 --- a/langs/pl/cgi-bin/pl.pl +++ b/langs/pl/cgi-bin/pl.pl @@ -1351,14 +1351,10 @@ 'ovpn config' => 'OVPN-Konfig', 'ovpn device' => 'Urządzenie OpenVPN:', 'ovpn dl' => 'Pobierz konfig OVPN', -'ovpn errmsg green already pushed' => 'Route for green network is always set', -'ovpn errmsg invalid ip or mask' => 'Invalid network-address or subnetmask', 'ovpn log' => 'Log OVPN', 'ovpn on blue' => 'OpenVPN na int. BLUE', 'ovpn on orange' => 'OpenVPN na int. ORANGE', 'ovpn on red' => 'OpenVPN na int. RED', -'ovpn routes push' => 'Routes (one per line):', -'ovpn routes push options' => 'Route push options', 'ovpn server status' => 'Stan serwera OpenVPN:', 'ovpn subnet' => 'Podsieć OpenVPN (np. 10.0.10.0/255.255.255.0)', 'ovpn subnet is invalid' => 'Podsieć OpenVPN jest niepoprawna.', From 24510a3563d196586caf9b34fb359e5b60f339cf Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Sat, 10 Nov 2012 16:27:51 +0100 Subject: [PATCH 2/4] core64: add langs to updater and update cache. --- config/rootfiles/core/64/filelists/files | 1 + config/rootfiles/core/64/update.sh | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/config/rootfiles/core/64/filelists/files b/config/rootfiles/core/64/filelists/files index a3b99c8e0..072fc7022 100644 --- a/config/rootfiles/core/64/filelists/files +++ b/config/rootfiles/core/64/filelists/files @@ -4,3 +4,4 @@ etc/rc.d/init.d/firewall srv/web/ipfire/cgi-bin/credits.cgi srv/web/ipfire/cgi-bin/ids.cgi var/ipfire/outgoing/bin/outgoingfw.pl +var/ipfire/langs diff --git a/config/rootfiles/core/64/update.sh b/config/rootfiles/core/64/update.sh index 00394d1ac..c1e754550 100644 --- a/config/rootfiles/core/64/update.sh +++ b/config/rootfiles/core/64/update.sh @@ -46,7 +46,7 @@ extract_files # #Update Language cache -#perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" +perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" #Rebuild module dep's #arch=`uname -m` From b4a91e662d70122da6d22b4136b792ebaa23061b Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Sat, 10 Nov 2012 16:28:15 +0100 Subject: [PATCH 3/4] GeoIP: update database to 6.11.2012. --- lfs/GeoIP | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lfs/GeoIP b/lfs/GeoIP index 3dd7e6fb8..68254a7dd 100644 --- a/lfs/GeoIP +++ b/lfs/GeoIP @@ -25,7 +25,7 @@ include Config VER = 1.17 -DATVER = 02102012 +DATVER = 06112012 THISAPP = Geo-IP-PurePerl-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -43,7 +43,7 @@ $(DL_FILE) = $(DL_FROM)/$(DL_FILE) GeoIP.dat-$(DATVER).gz = $(DL_FROM)/GeoIP.dat-$(DATVER).gz $(DL_FILE)_MD5 = 42a6b9d4dd2563a20c8998556216e1de -GeoIP.dat-$(DATVER).gz_MD5 = 371c7ea4a8c8b963594ec3031e798696 +GeoIP.dat-$(DATVER).gz_MD5 = a8677695b0abecb69707ebe2444e64f9 install : $(TARGET) From 6f8891ccc776e62448e1e08d3efbada21a8fd447 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Sat, 10 Nov 2012 16:29:09 +0100 Subject: [PATCH 4/4] finished core64. --- make.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/make.sh b/make.sh index f52f9e8b3..ea908d948 100755 --- a/make.sh +++ b/make.sh @@ -26,7 +26,7 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name VERSION="2.11" # Version number CORE="64" # Core Level (Filename) -PAKFIRE_CORE="63" # Core Level (PAKFIRE) +PAKFIRE_CORE="64" # Core Level (PAKFIRE) GIT_BRANCH=`git status | head -n1 | cut -d" " -f4` # Git Branch SLOGAN="www.ipfire.org" # Software slogan CONFIG_ROOT=/var/ipfire # Configuration rootdir