Merge branch 'next'

Conflicts:
	make.sh

diff --git a/config/httpd/vhosts.d/ipfire-interface-ssl.conf b/config/httpd/vhosts.d/ipfire-interface-ssl.conf
index dc6bb21ed5db166b6b00c076bb80fab40964c97d..daac75742dd095ea8e82003ff6d74099d5b98aca 100644 (file)
--- a/config/httpd/vhosts.d/ipfire-interface-ssl.conf
+++ b/config/httpd/vhosts.d/ipfire-interface-ssl.conf
@@ -8,7 +8,7 @@
     ErrorLog /var/log/httpd/error_log
     TransferLog /var/log/httpd/access_log
     SSLEngine on
-    SSLProtocol all -SSLv2
+    SSLProtocol all -SSLv2 -SSLv3
     SSLCipherSuite ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-DSS-AES128-GCM-SHA256:kEDH+AESGCM:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-DSS-AES128-SHA256:DHE-RSA-AES256-SHA256:DHE-DSS-AES256-SHA:DHE-RSA-AES256-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128:AES256:HIGH:!RC4:!aNULL:!eNULL:!EXPORT:!DES:!3DES:!MD5:!PSK
     SSLHonorCipherOrder on
     SSLCertificateFile /etc/httpd/server.crt

diff --git a/config/rootfiles/core/84/exclude b/config/rootfiles/core/85/exclude
similarity index 100%
rename from config/rootfiles/core/84/exclude
rename to config/rootfiles/core/85/exclude

diff --git a/config/rootfiles/core/85/filelists/files b/config/rootfiles/core/85/filelists/files
new file mode 100644 (file)
index 0000000..9cf259c
--- /dev/null
+++ b/config/rootfiles/core/85/filelists/files
@@ -0,0 +1,4 @@
+etc/system-release
+etc/issue
+etc/httpd/conf/vhosts.d/ipfire-interface-ssl.conf
+var/ipfire/langs

diff --git a/config/rootfiles/core/85/filelists/openssl b/config/rootfiles/core/85/filelists/openssl
new file mode 120000 (symlink)
index 0000000..e011a92
--- /dev/null
+++ b/config/rootfiles/core/85/filelists/openssl
@@ -0,0 +1 @@
+../../../common/openssl
\ No newline at end of file

diff --git a/config/rootfiles/core/85/filelists/openssl-compat b/config/rootfiles/core/85/filelists/openssl-compat
new file mode 120000 (symlink)
index 0000000..c9fa421
--- /dev/null
+++ b/config/rootfiles/core/85/filelists/openssl-compat
@@ -0,0 +1 @@
+../../../common/openssl-compat
\ No newline at end of file

diff --git a/config/rootfiles/core/84/meta b/config/rootfiles/core/85/meta
similarity index 100%
rename from config/rootfiles/core/84/meta
rename to config/rootfiles/core/85/meta

diff --git a/config/rootfiles/core/85/update.sh b/config/rootfiles/core/85/update.sh
new file mode 100644 (file)
index 0000000..ec9ac63
--- /dev/null
+++ b/config/rootfiles/core/85/update.sh
@@ -0,0 +1,56 @@
+#!/bin/bash
+############################################################################
+#                                                                          #
+# This file is part of the IPFire Firewall.                                #
+#                                                                          #
+# IPFire is free software; you can redistribute it and/or modify           #
+# it under the terms of the GNU General Public License as published by     #
+# the Free Software Foundation; either version 3 of the License, or        #
+# (at your option) any later version.                                      #
+#                                                                          #
+# IPFire is distributed in the hope that it will be useful,                #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of           #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the            #
+# GNU General Public License for more details.                             #
+#                                                                          #
+# You should have received a copy of the GNU General Public License        #
+# along with IPFire; if not, write to the Free Software                    #
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA #
+#                                                                          #
+# Copyright (C) 2014 IPFire-Team <info@ipfire.org>.                        #
+#                                                                          #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+/usr/local/bin/backupctrl exclude >/dev/null 2>&1
+
+# Remove old core updates from pakfire cache to save space...
+core=85
+for (( i=1; i<=$core; i++ ))
+do
+       rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire
+done
+
+# Stop services
+
+# Remove old files
+
+# Extract files
+extract_files
+
+# Start services
+
+# Update Language cache
+perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
+
+sync
+
+# This update need a reboot...
+touch /var/run/need_reboot
+
+# Finish
+/etc/init.d/fireinfo start
+sendprofile
+
+# Don't report the exitcode last command
+exit 0

diff --git a/config/rootfiles/oldcore/84/exclude b/config/rootfiles/oldcore/84/exclude
new file mode 100644 (file)
index 0000000..18e9b4d
--- /dev/null
+++ b/config/rootfiles/oldcore/84/exclude
@@ -0,0 +1,20 @@
+boot/config.txt
+etc/collectd.custom
+etc/ipsec.conf
+etc/ipsec.secrets
+etc/ipsec.user.conf
+etc/ipsec.user.secrets
+etc/localtime
+etc/shadow
+etc/ssh/ssh_config
+etc/ssh/sshd_config
+etc/ssl/openssl.cnf
+etc/sudoers
+etc/sysconfig/firewall.local
+etc/sysconfig/rc.local
+etc/udev/rules.d/30-persistent-network.rules
+srv/web/ipfire/html/proxy.pac
+var/ipfire/ovpn
+var/log/cache
+var/state/dhcp/dhcpd.leases
+var/updatecache

diff --git a/config/rootfiles/core/84/filelists/bash b/config/rootfiles/oldcore/84/filelists/bash
similarity index 100%
rename from config/rootfiles/core/84/filelists/bash
rename to config/rootfiles/oldcore/84/filelists/bash

diff --git a/config/rootfiles/core/84/filelists/dnsmasq b/config/rootfiles/oldcore/84/filelists/dnsmasq
similarity index 100%
rename from config/rootfiles/core/84/filelists/dnsmasq
rename to config/rootfiles/oldcore/84/filelists/dnsmasq

diff --git a/config/rootfiles/core/84/filelists/files b/config/rootfiles/oldcore/84/filelists/files
similarity index 100%
rename from config/rootfiles/core/84/filelists/files
rename to config/rootfiles/oldcore/84/filelists/files

diff --git a/config/rootfiles/core/84/filelists/readline b/config/rootfiles/oldcore/84/filelists/readline
similarity index 100%
rename from config/rootfiles/core/84/filelists/readline
rename to config/rootfiles/oldcore/84/filelists/readline

diff --git a/config/rootfiles/core/84/filelists/squid b/config/rootfiles/oldcore/84/filelists/squid
similarity index 100%
rename from config/rootfiles/core/84/filelists/squid
rename to config/rootfiles/oldcore/84/filelists/squid

diff --git a/config/rootfiles/oldcore/84/meta b/config/rootfiles/oldcore/84/meta
new file mode 100644 (file)
index 0000000..d547fa8
--- /dev/null
+++ b/config/rootfiles/oldcore/84/meta
@@ -0,0 +1 @@
+DEPS=""

diff --git a/config/rootfiles/core/84/update.sh b/config/rootfiles/oldcore/84/update.sh
similarity index 100%
rename from config/rootfiles/core/84/update.sh
rename to config/rootfiles/oldcore/84/update.sh

diff --git a/doc/language_issues.de b/doc/language_issues.de
index 0eb5785ae8317aa98bf881f885e132f6a5308096..34afa732b188ef863c3cb73d119fcf9fb969aef3 100644 (file)
--- a/doc/language_issues.de
+++ b/doc/language_issues.de
@@ -43,7 +43,6 @@ WARNING: translation string unused: advproxy no cre groups
 WARNING: translation string unused: advproxy ssadvanced proxy
 WARNING: translation string unused: advproxy update notification
 WARNING: translation string unused: again
-WARNING: translation string unused: age second
 WARNING: translation string unused: age seconds
 WARNING: translation string unused: age shour
 WARNING: translation string unused: age sminute
@@ -247,6 +246,7 @@ WARNING: translation string unused: fwhost changeremark
 WARNING: translation string unused: fwhost err addrgrp
 WARNING: translation string unused: fwhost err hostorip
 WARNING: translation string unused: fwhost err mac
+WARNING: translation string unused: fwhost err partofnet
 WARNING: translation string unused: fwhost green
 WARNING: translation string unused: fwhost hosts
 WARNING: translation string unused: fwhost ipadr

diff --git a/doc/language_issues.en b/doc/language_issues.en
index f3ef62118977e439dc3eed55f1be881cdb7bdea5..f50f01d47da6a91af0605b288c0037a4cc23565c 100644 (file)
--- a/doc/language_issues.en
+++ b/doc/language_issues.en
@@ -43,7 +43,6 @@ WARNING: translation string unused: advproxy ssadvanced proxy
 WARNING: translation string unused: advproxy update information
 WARNING: translation string unused: advproxy update notification
 WARNING: translation string unused: again
-WARNING: translation string unused: age second
 WARNING: translation string unused: age seconds
 WARNING: translation string unused: age shour
 WARNING: translation string unused: age sminute
@@ -270,6 +269,7 @@ WARNING: translation string unused: fwhost changeremark
 WARNING: translation string unused: fwhost err addrgrp
 WARNING: translation string unused: fwhost err hostorip
 WARNING: translation string unused: fwhost err mac
+WARNING: translation string unused: fwhost err partofnet
 WARNING: translation string unused: fwhost green
 WARNING: translation string unused: fwhost hosts
 WARNING: translation string unused: fwhost ipadr

diff --git a/doc/language_issues.es b/doc/language_issues.es
index e25697512856a1cc6d0787074d64469eb98de559..4842ee22b70f55e9843fd2a07d395b7314ab267c 100644 (file)
--- a/doc/language_issues.es
+++ b/doc/language_issues.es
@@ -606,6 +606,7 @@ WARNING: untranslated string: advproxy errmsg proxy ports equal
 WARNING: untranslated string: advproxy group access control
 WARNING: untranslated string: advproxy group required
 WARNING: untranslated string: advproxy proxy port transparent
+WARNING: untranslated string: age second
 WARNING: untranslated string: atm device
 WARNING: untranslated string: attention
 WARNING: untranslated string: bit
@@ -730,9 +731,11 @@ WARNING: untranslated string: fwdfw dnat nochoice
 WARNING: untranslated string: fwdfw dnat porterr
 WARNING: untranslated string: fwdfw dnat porterr2
 WARNING: untranslated string: fwdfw edit
+WARNING: untranslated string: fwdfw err concon
 WARNING: untranslated string: fwdfw err nosrc
 WARNING: untranslated string: fwdfw err notgt
 WARNING: untranslated string: fwdfw err prot_port
+WARNING: untranslated string: fwdfw err ratecon
 WARNING: untranslated string: fwdfw err remark
 WARNING: untranslated string: fwdfw err ruleexists
 WARNING: untranslated string: fwdfw err same
@@ -748,12 +751,15 @@ WARNING: untranslated string: fwdfw hint ip1
 WARNING: untranslated string: fwdfw hint ip2
 WARNING: untranslated string: fwdfw hint mac
 WARNING: untranslated string: fwdfw iface
+WARNING: untranslated string: fwdfw limitconcon
 WARNING: untranslated string: fwdfw log
 WARNING: untranslated string: fwdfw log rule
 WARNING: untranslated string: fwdfw many
+WARNING: untranslated string: fwdfw maxconcon
 WARNING: untranslated string: fwdfw movedown
 WARNING: untranslated string: fwdfw moveup
 WARNING: untranslated string: fwdfw newrule
+WARNING: untranslated string: fwdfw numcon
 WARNING: untranslated string: fwdfw pol allow
 WARNING: untranslated string: fwdfw pol block
 WARNING: untranslated string: fwdfw pol text
@@ -761,6 +767,7 @@ WARNING: untranslated string: fwdfw pol text1
 WARNING: untranslated string: fwdfw pol title
 WARNING: untranslated string: fwdfw prot41
 WARNING: untranslated string: fwdfw prot41 short
+WARNING: untranslated string: fwdfw ratelimit
 WARNING: untranslated string: fwdfw red
 WARNING: untranslated string: fwdfw reread
 WARNING: untranslated string: fwdfw rule activate
@@ -826,7 +833,6 @@ WARNING: untranslated string: fwhost err name
 WARNING: untranslated string: fwhost err name1
 WARNING: untranslated string: fwhost err net
 WARNING: untranslated string: fwhost err netexist
-WARNING: untranslated string: fwhost err partofnet
 WARNING: untranslated string: fwhost err port
 WARNING: untranslated string: fwhost err remark
 WARNING: untranslated string: fwhost err srv exists

diff --git a/doc/language_issues.fr b/doc/language_issues.fr
index 62dd5d5c940c8dcd135f1bbb328f8caf2d40c045..a411de4fe85a2e75f1ee2cff367900330d22c6f0 100644 (file)
--- a/doc/language_issues.fr
+++ b/doc/language_issues.fr
@@ -616,6 +616,7 @@ WARNING: untranslated string: advproxy errmsg proxy ports equal
 WARNING: untranslated string: advproxy group access control
 WARNING: untranslated string: advproxy group required
 WARNING: untranslated string: advproxy proxy port transparent
+WARNING: untranslated string: age second
 WARNING: untranslated string: atm device
 WARNING: untranslated string: attention
 WARNING: untranslated string: bit
@@ -741,9 +742,11 @@ WARNING: untranslated string: fwdfw dnat nochoice
 WARNING: untranslated string: fwdfw dnat porterr
 WARNING: untranslated string: fwdfw dnat porterr2
 WARNING: untranslated string: fwdfw edit
+WARNING: untranslated string: fwdfw err concon
 WARNING: untranslated string: fwdfw err nosrc
 WARNING: untranslated string: fwdfw err notgt
 WARNING: untranslated string: fwdfw err prot_port
+WARNING: untranslated string: fwdfw err ratecon
 WARNING: untranslated string: fwdfw err remark
 WARNING: untranslated string: fwdfw err ruleexists
 WARNING: untranslated string: fwdfw err same
@@ -759,12 +762,15 @@ WARNING: untranslated string: fwdfw hint ip1
 WARNING: untranslated string: fwdfw hint ip2
 WARNING: untranslated string: fwdfw hint mac
 WARNING: untranslated string: fwdfw iface
+WARNING: untranslated string: fwdfw limitconcon
 WARNING: untranslated string: fwdfw log
 WARNING: untranslated string: fwdfw log rule
 WARNING: untranslated string: fwdfw many
+WARNING: untranslated string: fwdfw maxconcon
 WARNING: untranslated string: fwdfw movedown
 WARNING: untranslated string: fwdfw moveup
 WARNING: untranslated string: fwdfw newrule
+WARNING: untranslated string: fwdfw numcon
 WARNING: untranslated string: fwdfw pol allow
 WARNING: untranslated string: fwdfw pol block
 WARNING: untranslated string: fwdfw pol text
@@ -772,6 +778,7 @@ WARNING: untranslated string: fwdfw pol text1
 WARNING: untranslated string: fwdfw pol title
 WARNING: untranslated string: fwdfw prot41
 WARNING: untranslated string: fwdfw prot41 short
+WARNING: untranslated string: fwdfw ratelimit
 WARNING: untranslated string: fwdfw red
 WARNING: untranslated string: fwdfw reread
 WARNING: untranslated string: fwdfw rule activate
@@ -837,7 +844,6 @@ WARNING: untranslated string: fwhost err name
 WARNING: untranslated string: fwhost err name1
 WARNING: untranslated string: fwhost err net
 WARNING: untranslated string: fwhost err netexist
-WARNING: untranslated string: fwhost err partofnet
 WARNING: untranslated string: fwhost err port
 WARNING: untranslated string: fwhost err remark
 WARNING: untranslated string: fwhost err srv exists

diff --git a/doc/language_issues.nl b/doc/language_issues.nl
index 7360d4fcb5aa57f99fb5b938a85f79054d3a3414..bb17cc7070e91f7d17999d18703e799035b724f2 100644 (file)
--- a/doc/language_issues.nl
+++ b/doc/language_issues.nl
@@ -43,7 +43,6 @@ WARNING: translation string unused: advproxy ssadvanced proxy
 WARNING: translation string unused: advproxy update information
 WARNING: translation string unused: advproxy update notification
 WARNING: translation string unused: again
-WARNING: translation string unused: age second
 WARNING: translation string unused: age seconds
 WARNING: translation string unused: age shour
 WARNING: translation string unused: age sminute
@@ -269,6 +268,7 @@ WARNING: translation string unused: fwhost changeremark
 WARNING: translation string unused: fwhost err addrgrp
 WARNING: translation string unused: fwhost err hostorip
 WARNING: translation string unused: fwhost err mac
+WARNING: translation string unused: fwhost err partofnet
 WARNING: translation string unused: fwhost green
 WARNING: translation string unused: fwhost hosts
 WARNING: translation string unused: fwhost ipadr
@@ -684,6 +684,12 @@ WARNING: untranslated string: dnssec validating
 WARNING: untranslated string: download tls-auth key
 WARNING: untranslated string: drop outgoing
 WARNING: untranslated string: firewall logs country
+WARNING: untranslated string: fwdfw err concon
+WARNING: untranslated string: fwdfw err ratecon
+WARNING: untranslated string: fwdfw limitconcon
+WARNING: untranslated string: fwdfw maxconcon
+WARNING: untranslated string: fwdfw numcon
+WARNING: untranslated string: fwdfw ratelimit
 WARNING: untranslated string: fwhost err hostip
 WARNING: untranslated string: gen dh
 WARNING: untranslated string: generate dh key

diff --git a/doc/language_issues.pl b/doc/language_issues.pl
index e25697512856a1cc6d0787074d64469eb98de559..4842ee22b70f55e9843fd2a07d395b7314ab267c 100644 (file)
--- a/doc/language_issues.pl
+++ b/doc/language_issues.pl
@@ -606,6 +606,7 @@ WARNING: untranslated string: advproxy errmsg proxy ports equal
 WARNING: untranslated string: advproxy group access control
 WARNING: untranslated string: advproxy group required
 WARNING: untranslated string: advproxy proxy port transparent
+WARNING: untranslated string: age second
 WARNING: untranslated string: atm device
 WARNING: untranslated string: attention
 WARNING: untranslated string: bit
@@ -730,9 +731,11 @@ WARNING: untranslated string: fwdfw dnat nochoice
 WARNING: untranslated string: fwdfw dnat porterr
 WARNING: untranslated string: fwdfw dnat porterr2
 WARNING: untranslated string: fwdfw edit
+WARNING: untranslated string: fwdfw err concon
 WARNING: untranslated string: fwdfw err nosrc
 WARNING: untranslated string: fwdfw err notgt
 WARNING: untranslated string: fwdfw err prot_port
+WARNING: untranslated string: fwdfw err ratecon
 WARNING: untranslated string: fwdfw err remark
 WARNING: untranslated string: fwdfw err ruleexists
 WARNING: untranslated string: fwdfw err same
@@ -748,12 +751,15 @@ WARNING: untranslated string: fwdfw hint ip1
 WARNING: untranslated string: fwdfw hint ip2
 WARNING: untranslated string: fwdfw hint mac
 WARNING: untranslated string: fwdfw iface
+WARNING: untranslated string: fwdfw limitconcon
 WARNING: untranslated string: fwdfw log
 WARNING: untranslated string: fwdfw log rule
 WARNING: untranslated string: fwdfw many
+WARNING: untranslated string: fwdfw maxconcon
 WARNING: untranslated string: fwdfw movedown
 WARNING: untranslated string: fwdfw moveup
 WARNING: untranslated string: fwdfw newrule
+WARNING: untranslated string: fwdfw numcon
 WARNING: untranslated string: fwdfw pol allow
 WARNING: untranslated string: fwdfw pol block
 WARNING: untranslated string: fwdfw pol text
@@ -761,6 +767,7 @@ WARNING: untranslated string: fwdfw pol text1
 WARNING: untranslated string: fwdfw pol title
 WARNING: untranslated string: fwdfw prot41
 WARNING: untranslated string: fwdfw prot41 short
+WARNING: untranslated string: fwdfw ratelimit
 WARNING: untranslated string: fwdfw red
 WARNING: untranslated string: fwdfw reread
 WARNING: untranslated string: fwdfw rule activate
@@ -826,7 +833,6 @@ WARNING: untranslated string: fwhost err name
 WARNING: untranslated string: fwhost err name1
 WARNING: untranslated string: fwhost err net
 WARNING: untranslated string: fwhost err netexist
-WARNING: untranslated string: fwhost err partofnet
 WARNING: untranslated string: fwhost err port
 WARNING: untranslated string: fwhost err remark
 WARNING: untranslated string: fwhost err srv exists

diff --git a/doc/language_issues.ru b/doc/language_issues.ru
index d7d3d26dff535a23ad4661a7bf3ed26455cf113f..c471de96fa6cdcbe1f01213d7af729f506926f53 100644 (file)
--- a/doc/language_issues.ru
+++ b/doc/language_issues.ru
@@ -609,6 +609,7 @@ WARNING: untranslated string: advproxy errmsg proxy ports equal
 WARNING: untranslated string: advproxy group access control
 WARNING: untranslated string: advproxy group required
 WARNING: untranslated string: advproxy proxy port transparent
+WARNING: untranslated string: age second
 WARNING: untranslated string: atm device
 WARNING: untranslated string: attention
 WARNING: untranslated string: bit
@@ -725,9 +726,11 @@ WARNING: untranslated string: fwdfw dnat nochoice
 WARNING: untranslated string: fwdfw dnat porterr
 WARNING: untranslated string: fwdfw dnat porterr2
 WARNING: untranslated string: fwdfw edit
+WARNING: untranslated string: fwdfw err concon
 WARNING: untranslated string: fwdfw err nosrc
 WARNING: untranslated string: fwdfw err notgt
 WARNING: untranslated string: fwdfw err prot_port
+WARNING: untranslated string: fwdfw err ratecon
 WARNING: untranslated string: fwdfw err remark
 WARNING: untranslated string: fwdfw err ruleexists
 WARNING: untranslated string: fwdfw err same
@@ -743,12 +746,15 @@ WARNING: untranslated string: fwdfw hint ip1
 WARNING: untranslated string: fwdfw hint ip2
 WARNING: untranslated string: fwdfw hint mac
 WARNING: untranslated string: fwdfw iface
+WARNING: untranslated string: fwdfw limitconcon
 WARNING: untranslated string: fwdfw log
 WARNING: untranslated string: fwdfw log rule
 WARNING: untranslated string: fwdfw many
+WARNING: untranslated string: fwdfw maxconcon
 WARNING: untranslated string: fwdfw movedown
 WARNING: untranslated string: fwdfw moveup
 WARNING: untranslated string: fwdfw newrule
+WARNING: untranslated string: fwdfw numcon
 WARNING: untranslated string: fwdfw pol allow
 WARNING: untranslated string: fwdfw pol block
 WARNING: untranslated string: fwdfw pol text
@@ -756,6 +762,7 @@ WARNING: untranslated string: fwdfw pol text1
 WARNING: untranslated string: fwdfw pol title
 WARNING: untranslated string: fwdfw prot41
 WARNING: untranslated string: fwdfw prot41 short
+WARNING: untranslated string: fwdfw ratelimit
 WARNING: untranslated string: fwdfw red
 WARNING: untranslated string: fwdfw reread
 WARNING: untranslated string: fwdfw rule activate
@@ -821,7 +828,6 @@ WARNING: untranslated string: fwhost err name
 WARNING: untranslated string: fwhost err name1
 WARNING: untranslated string: fwhost err net
 WARNING: untranslated string: fwhost err netexist
-WARNING: untranslated string: fwhost err partofnet
 WARNING: untranslated string: fwhost err port
 WARNING: untranslated string: fwhost err remark
 WARNING: untranslated string: fwhost err srv exists

diff --git a/doc/language_issues.tr b/doc/language_issues.tr
index 623df9836e8c511579554cbfb04da8867241e577..cb16a44805c336756c8e17259ef0801433c82b38 100644 (file)
--- a/doc/language_issues.tr
+++ b/doc/language_issues.tr
@@ -1,4 +1,3 @@
-WARNING: translation string unused: Client status and controlc
 WARNING: translation string unused: ConnSched scheduler
 WARNING: translation string unused: ConnSched select profile
 WARNING: translation string unused: HDD temperature
@@ -21,6 +20,7 @@ WARNING: translation string unused: add xtaccess
 WARNING: translation string unused: add-route
 WARNING: translation string unused: admin user password has been changed
 WARNING: translation string unused: administrator user password
+WARNING: translation string unused: adsl settings
 WARNING: translation string unused: advproxy LDAP auth
 WARNING: translation string unused: advproxy NTLM auth
 WARNING: translation string unused: advproxy advanced proxy
@@ -43,7 +43,6 @@ WARNING: translation string unused: advproxy ssadvanced proxy
 WARNING: translation string unused: advproxy update information
 WARNING: translation string unused: advproxy update notification
 WARNING: translation string unused: again
-WARNING: translation string unused: age second
 WARNING: translation string unused: age seconds
 WARNING: translation string unused: age shour
 WARNING: translation string unused: age sminute
@@ -151,6 +150,7 @@ WARNING: translation string unused: destination ip bad
 WARNING: translation string unused: destination ip or net
 WARNING: translation string unused: destination net
 WARNING: translation string unused: destination port overlaps
+WARNING: translation string unused: dh name is invalid
 WARNING: translation string unused: dhcp base ip fixed lease
 WARNING: translation string unused: dhcp create fixed leases
 WARNING: translation string unused: dhcp fixed lease err1
@@ -174,6 +174,7 @@ WARNING: translation string unused: do not log this port list
 WARNING: translation string unused: domain not set
 WARNING: translation string unused: donation-link
 WARNING: translation string unused: done
+WARNING: translation string unused: download dh parameter
 WARNING: translation string unused: driver
 WARNING: translation string unused: dstprt range overlaps
 WARNING: translation string unused: dstprt within existing
@@ -268,6 +269,7 @@ WARNING: translation string unused: fwhost changeremark
 WARNING: translation string unused: fwhost err addrgrp
 WARNING: translation string unused: fwhost err hostorip
 WARNING: translation string unused: fwhost err mac
+WARNING: translation string unused: fwhost err partofnet
 WARNING: translation string unused: fwhost green
 WARNING: translation string unused: fwhost hosts
 WARNING: translation string unused: fwhost ipadr
@@ -395,6 +397,7 @@ WARNING: translation string unused: network time
 WARNING: translation string unused: network traffic graphs
 WARNING: translation string unused: network updated
 WARNING: translation string unused: networks settings
+WARNING: translation string unused: never
 WARNING: translation string unused: new optionsfw must boot
 WARNING: translation string unused: no alcatelusb firmware
 WARNING: translation string unused: no cfg upload
@@ -442,9 +445,10 @@ WARNING: translation string unused: outgoing firewall warning
 WARNING: translation string unused: override mtu
 WARNING: translation string unused: ovpn config
 WARNING: translation string unused: ovpn dl
+WARNING: translation string unused: ovpn engines
 WARNING: translation string unused: ovpn log
+WARNING: translation string unused: ovpn reneg sec
 WARNING: translation string unused: ovpn_fastio
-WARNING: translation string unused: ovpn_fragment
 WARNING: translation string unused: ovpn_mssfix
 WARNING: translation string unused: ovpn_mtudisc
 WARNING: translation string unused: ovpn_processprio
@@ -556,6 +560,7 @@ WARNING: translation string unused: successfully refreshed updates list
 WARNING: translation string unused: system graphs
 WARNING: translation string unused: system log viewer
 WARNING: translation string unused: system status information
+WARNING: translation string unused: teovpn_fragment
 WARNING: translation string unused: test
 WARNING: translation string unused: test email could not be sent
 WARNING: translation string unused: test email was sent
@@ -634,10 +639,6 @@ WARNING: translation string unused: urlfilter update information
 WARNING: translation string unused: urlfilter update notification
 WARNING: translation string unused: urlfilter update results
 WARNING: translation string unused: urlfilter upload background
-WARNING: translation string unused: usb modem on acm0
-WARNING: translation string unused: usb modem on acm1
-WARNING: translation string unused: usb modem on acm2
-WARNING: translation string unused: usb modem on acm3
 WARNING: translation string unused: use
 WARNING: translation string unused: use dov
 WARNING: translation string unused: use ibod
@@ -660,76 +661,16 @@ WARNING: translation string unused: xtaccess all error
 WARNING: translation string unused: xtaccess bad transfert
 WARNING: translation string unused: year-graph
 WARNING: translation string unused: yearly firewallhits
-WARNING: untranslated string: MTU settings
-WARNING: untranslated string: Number of Countries for the pie chart
 WARNING: untranslated string: Scan for Songs
-WARNING: untranslated string: administrator password
-WARNING: untranslated string: administrator username
-WARNING: untranslated string: advproxy AUTH method ntlm
-WARNING: untranslated string: advproxy AUTH method ntlm auth
-WARNING: untranslated string: advproxy basic authentication
-WARNING: untranslated string: advproxy group access control
-WARNING: untranslated string: advproxy group required
 WARNING: untranslated string: bytes
-WARNING: untranslated string: capabilities
-WARNING: untranslated string: default
-WARNING: untranslated string: dh
-WARNING: untranslated string: dh key move failed
-WARNING: untranslated string: dh key warn
-WARNING: untranslated string: dh key warn1
-WARNING: untranslated string: dh parameter
-WARNING: untranslated string: dnssec aware
-WARNING: untranslated string: dnssec information
-WARNING: untranslated string: dnssec not supported
-WARNING: untranslated string: dnssec validating
-WARNING: untranslated string: download tls-auth key
-WARNING: untranslated string: firewall logs country
+WARNING: untranslated string: fwdfw err concon
+WARNING: untranslated string: fwdfw err ratecon
+WARNING: untranslated string: fwdfw limitconcon
+WARNING: untranslated string: fwdfw maxconcon
+WARNING: untranslated string: fwdfw numcon
+WARNING: untranslated string: fwdfw ratelimit
 WARNING: untranslated string: fwhost err hostip
-WARNING: untranslated string: gen dh
-WARNING: untranslated string: generate dh key
-WARNING: untranslated string: imei
-WARNING: untranslated string: imsi
-WARNING: untranslated string: masquerade blue
-WARNING: untranslated string: masquerade green
-WARNING: untranslated string: masquerade orange
-WARNING: untranslated string: masquerading
-WARNING: untranslated string: masquerading disabled
-WARNING: untranslated string: masquerading enabled
-WARNING: untranslated string: messages
-WARNING: untranslated string: model
-WARNING: untranslated string: modem hardware details
-WARNING: untranslated string: modem information
-WARNING: untranslated string: modem network bit error rate
-WARNING: untranslated string: modem network information
-WARNING: untranslated string: modem network mode
-WARNING: untranslated string: modem network operator
-WARNING: untranslated string: modem network registration
-WARNING: untranslated string: modem network signal quality
-WARNING: untranslated string: modem no connection
-WARNING: untranslated string: modem no connection message
-WARNING: untranslated string: modem sim information
-WARNING: untranslated string: modem status
-WARNING: untranslated string: monitor interface
-WARNING: untranslated string: nameserver
-WARNING: untranslated string: not a valid dh key
-WARNING: untranslated string: ovpn crypt options
-WARNING: untranslated string: ovpn dh
-WARNING: untranslated string: ovpn dh new key
-WARNING: untranslated string: ovpn dh parameters
-WARNING: untranslated string: ovpn dh upload
-WARNING: untranslated string: ovpn generating the root and host certificates
-WARNING: untranslated string: ovpn ha
-WARNING: untranslated string: ovpn hmac
 WARNING: untranslated string: route config changed
 WARNING: untranslated string: routing config added
 WARNING: untranslated string: routing config changed
 WARNING: untranslated string: routing table
-WARNING: untranslated string: samba join a domain
-WARNING: untranslated string: samba join domain
-WARNING: untranslated string: show dh
-WARNING: untranslated string: show tls-auth key
-WARNING: untranslated string: software version
-WARNING: untranslated string: source ip country
-WARNING: untranslated string: ta key
-WARNING: untranslated string: upload dh key
-WARNING: untranslated string: vendor

diff --git a/doc/language_missings b/doc/language_missings
index 376a460ce78c7d2e733845b23ac3cd36dcbb9697..83c242fc3322422af57a2430a4345bbd34c89e40 100644 (file)
--- a/doc/language_missings
+++ b/doc/language_missings
@@ -159,12 +159,14 @@
 < fwdfw dnat porterr2
 < fwdfw DROP
 < fwdfw edit
+< fwdfw err concon
 < fwdfw err nosrc
 < fwdfw err nosrcip
 < fwdfw err notgt
 < fwdfw err notgtip
 < fwdfw err prot_port
 < fwdfw err prot_port1
+< fwdfw err ratecon
 < fwdfw err remark
 < fwdfw err ruleexists
 < fwdfw err same
@@ -183,10 +185,12 @@
 < fwdfw hint mac
 < fwdfw iface
 < fwdfw ipsec network
+< fwdfw limitconcon
 < fwdfw log
 < fwdfw log rule
 < fwdfw man port
 < fwdfw many
+< fwdfw maxconcon
 < fwdfw menu
 < fwdfw MODE1
 < fwdfw MODE2
@@ -194,6 +198,7 @@
 < fwdfw moveup
 < fwdfw natport used
 < fwdfw newrule
+< fwdfw numcon
 < fwdfw p2p txt
 < fwdfw pol allow
 < fwdfw pol block
@@ -202,6 +207,7 @@
 < fwdfw pol title
 < fwdfw prot41
 < fwdfw prot41 short
+< fwdfw ratelimit
 < fwdfw red
 < fwdfw REJECT
 < fwdfw reread
@@ -707,12 +713,14 @@
 < fwdfw dnat porterr2
 < fwdfw DROP
 < fwdfw edit
+< fwdfw err concon
 < fwdfw err nosrc
 < fwdfw err nosrcip
 < fwdfw err notgt
 < fwdfw err notgtip
 < fwdfw err prot_port
 < fwdfw err prot_port1
+< fwdfw err ratecon
 < fwdfw err remark
 < fwdfw err ruleexists
 < fwdfw err same
@@ -731,10 +739,12 @@
 < fwdfw hint mac
 < fwdfw iface
 < fwdfw ipsec network
+< fwdfw limitconcon
 < fwdfw log
 < fwdfw log rule
 < fwdfw man port
 < fwdfw many
+< fwdfw maxconcon
 < fwdfw menu
 < fwdfw MODE1
 < fwdfw MODE2
@@ -742,6 +752,7 @@
 < fwdfw moveup
 < fwdfw natport used
 < fwdfw newrule
+< fwdfw numcon
 < fwdfw p2p txt
 < fwdfw pol allow
 < fwdfw pol block
@@ -750,6 +761,7 @@
 < fwdfw pol title
 < fwdfw prot41
 < fwdfw prot41 short
+< fwdfw ratelimit
 < fwdfw red
 < fwdfw REJECT
 < fwdfw reread
@@ -1239,12 +1251,14 @@
 < fwdfw dnat porterr2
 < fwdfw DROP
 < fwdfw edit
+< fwdfw err concon
 < fwdfw err nosrc
 < fwdfw err nosrcip
 < fwdfw err notgt
 < fwdfw err notgtip
 < fwdfw err prot_port
 < fwdfw err prot_port1
+< fwdfw err ratecon
 < fwdfw err remark
 < fwdfw err ruleexists
 < fwdfw err same
@@ -1263,10 +1277,12 @@
 < fwdfw hint mac
 < fwdfw iface
 < fwdfw ipsec network
+< fwdfw limitconcon
 < fwdfw log
 < fwdfw log rule
 < fwdfw man port
 < fwdfw many
+< fwdfw maxconcon
 < fwdfw menu
 < fwdfw MODE1
 < fwdfw MODE2
@@ -1274,6 +1290,7 @@
 < fwdfw moveup
 < fwdfw natport used
 < fwdfw newrule
+< fwdfw numcon
 < fwdfw p2p txt
 < fwdfw pol allow
 < fwdfw pol block
@@ -1282,6 +1299,7 @@
 < fwdfw pol title
 < fwdfw prot41
 < fwdfw prot41 short
+< fwdfw ratelimit
 < fwdfw red
 < fwdfw REJECT
 < fwdfw reread
@@ -1760,12 +1778,14 @@
 < fwdfw dnat porterr2
 < fwdfw DROP
 < fwdfw edit
+< fwdfw err concon
 < fwdfw err nosrc
 < fwdfw err nosrcip
 < fwdfw err notgt
 < fwdfw err notgtip
 < fwdfw err prot_port
 < fwdfw err prot_port1
+< fwdfw err ratecon
 < fwdfw err remark
 < fwdfw err ruleexists
 < fwdfw err same
@@ -1784,10 +1804,12 @@
 < fwdfw hint mac
 < fwdfw iface
 < fwdfw ipsec network
+< fwdfw limitconcon
 < fwdfw log
 < fwdfw log rule
 < fwdfw man port
 < fwdfw many
+< fwdfw maxconcon
 < fwdfw menu
 < fwdfw MODE1
 < fwdfw MODE2
@@ -1795,6 +1817,7 @@
 < fwdfw moveup
 < fwdfw natport used
 < fwdfw newrule
+< fwdfw numcon
 < fwdfw p2p txt
 < fwdfw pol allow
 < fwdfw pol block
@@ -1803,6 +1826,7 @@
 < fwdfw pol title
 < fwdfw prot41
 < fwdfw prot41 short
+< fwdfw ratelimit
 < fwdfw red
 < fwdfw REJECT
 < fwdfw reread

diff --git a/langs/tr/cgi-bin/tr.pl b/langs/tr/cgi-bin/tr.pl
index e2a6d4f6a590417b6ee4c03c4ff996a6e80b2eb2..90eed2d121082c75f06f7d8dbc7d2682bd030ae4 100644 (file)
--- a/langs/tr/cgi-bin/tr.pl
+++ b/langs/tr/cgi-bin/tr.pl
@@ -10,7 +10,6 @@
 'Choose Rule' => 'Aşağıdaki kurallardan <u>birini</u> seçin.',
 'Class' => 'Sınıf',
 'Class was deleted' => 'with potential subclasses was deleted',
-'Client status and controlc' => 'İstemci durum ve kontrolü:',
 'ConnSched action' => 'Eylem:',
 'ConnSched add action' => 'Eylem ekle',
 'ConnSched change profile title' => 'Profili değitirin:',
@@ -40,6 +39,8 @@
 'MB read' => 'Okunan MB',
 'MB written' => 'Yazılan MB',
 'MTU' => 'MTU boyutu:',
+'MTU settings' => 'MTU ayarları:',
+'Number of Countries for the pie chart' => 'Pasta grafiği için ülkelerin sayısı',
 'Number of IPs for the pie chart' => 'Pasta grafiği için IP numarası',
 'Number of Ports for the pie chart' => 'Pasta grafiği için bağlantı noktası sayısı',
 'OVPN' => 'OpenVPN',
@@ -98,7 +99,10 @@
 'addons' => 'Eklentiler',
 'admin user password has been changed' => 'Yönetici kullanıcı şifresi değiştirildi.',
 'admin users' => 'Yetkili kullanıcı hakları ile kullanıcı',
+'administrator password' => 'Admin parolası',
 'administrator user password' => 'Admin kullanıcı parolası:',
+'administrator username' => 'Admin kullanıcısı',
+'adsl settings' => 'ADSL ayarları',
 'advanced' => 'Gelişmiş',
 'advanced server' => 'Gelişmiş Sunucu Seçenekleri',
 'advproxy AUTH always required' => 'Sınırsız kaynak adresleri için kimlik doğrulaması iste',
@@ -110,6 +114,8 @@
 'advproxy AUTH method ldap' => 'LDAP',
 'advproxy AUTH method ncsa' => 'Yerel',
 'advproxy AUTH method none' => 'Yok',
+'advproxy AUTH method ntlm' => 'Windows',
+'advproxy AUTH method ntlm auth' => 'Windows Aktif Dizini',
 'advproxy AUTH method radius' => 'RADIUS',
 'advproxy AUTH no auth' => 'Kimlik doğrulaması olmayan hedefler (her satırda bir tane)',
 'advproxy AUTH number of auth processes' => 'Kimlik doğrulama işlemlerinin sayısı',
@@ -190,6 +196,7 @@
 'advproxy back to main page' => 'Ana Sayfaya Geri Dön',
 'advproxy banned ip clients' => 'Yasaklanan IP adresleri (her satırda bir tane)',
 'advproxy banned mac clients' => 'Yasaklanan MAC adresleri (her satırda bir tane)',
+'advproxy basic authentication' => 'Temel HTTP kimlik doğrulama izni',
 'advproxy cache management' => 'Önbellek yönetimi',
 'advproxy cache replacement policy' => 'Önbellek değiştirme kuralı',
 'advproxy cache-digest' => 'Önbellek-özeti üretimini aktifleştir',
@@ -260,6 +267,8 @@
 'advproxy fake useragent' => 'Sahte yönlendiriciyi harici sitelere gönder',
 'advproxy friday' => 'Cum',
 'advproxy from' => 'Başlangıç',
+'advproxy group access control' => 'Grup tabanlı erişim kontrolü',
+'advproxy group required' => 'Gerekli grup',
 'advproxy hdd cache size' => 'Sabit disk önbellek boyutu (MB)',
 'advproxy invalid num of children' => 'Filtre işlemleri geçersiz sayıda',
 'advproxy log enabled' => 'Günlük aktif',
@@ -486,6 +495,7 @@
 'cant change certificates' => 'Sertikalar değiştirilemiyor.',
 'cant enable xtaccess' => 'İlgili bağlantı noktası yönlendirme kuralı devre dışı, bu nedenle bu kural için harici erişimi aktifleştirmelisiniz.',
 'cant start openssl' => 'OpenSSH başlatılamıyor',
+'capabilities' => 'Kapasite',
 'caps all' => 'TÜMÜ',
 'capsclosed' => 'BAĞLANTI YOK',
 'capsinactive' => 'PASİF',
@@ -654,6 +664,7 @@
 'december' => 'Aralık',
 'deep scan directories' => 'Ardışık tarama',
 'def lease time' => 'Varsayılan Kira Zamanı',
+'default' => 'Varsayılan',
 'default ip' => 'Varsayılan IP adresi',
 'default lease time' => 'Varsayılan kira zamanı (dakika):',
 'default networks' => 'Varsayılan ağlar',
@@ -681,6 +692,12 @@
 'details' => 'Detaylar',
 'device' => 'Aygıt',
 'devices on blue' => 'Mavi üzerindeki aygıtlar',
+'dh' => 'Anahtar değişim parametreleri',
+'dh key move failed' => 'Anahtar değişim parametreleri taşınması başarısız.',
+'dh key warn' => '1024 veya 2048 bit uzunluğunda anahtar değişim paremetrelerini oluşturma birkaç dakika sürer. 3072 veya 4096 bit uzunluğundaki anahtar oluşturma ise birkaç saat sürebilir. Lütfen sabırlı olun.',
+'dh key warn1' => 'Küçük entropi veya zayıf sistemler için yükleme fonksiyonu kullanımı ile uzun anahtar değişim parametreleri yüklemesi tavsiye edilir.',
+'dh name is invalid' => 'Geçersiz ad. Lütfen "dh1024.pem" biçiminde ad kullanın.',
+'dh parameter' => 'Anahtar değişim parametreleri',
 'dhcp advopt add' => 'DHCP seçeneği ekle',
 'dhcp advopt added' => 'DHCP seçeneği eklendi',
 'dhcp advopt blank value' => 'DHCP seçeneği değeri boş olamaz.',
@@ -765,6 +782,10 @@
 'dnsforward entries' => 'Güncel kayıtlar:',
 'dnsforward forward_server' => 'Ad sunucusu',
 'dnsforward zone' => 'Bölge',
+'dnssec aware' => 'DNSSEC Duyarlılığı',
+'dnssec information' => 'DNSSEC Bilgisi',
+'dnssec not supported' => 'DNSSEC desteklenmiyor',
+'dnssec validating' => 'DNSSEC Doğrulama',
 'do not log this port list' => 'Otorumdan hemen önce bu bağlantı noktaları listesini bırak (günlük boyutunu küçültür)',
 'dod' => 'Çevirmeli bağlantı üzerinden talep et',
 'dod for dns' => 'DNS için çevirmeli bağlantı üzerinden talep et:',
@@ -787,10 +808,12 @@
 'download' => 'İndir',
 'download ca certificate' => 'CA sertifikası indir',
 'download certificate' => 'Sertifika indir',
+'download dh parameter' => 'Anahtar değişimi parametrelerini indir',
 'download host certificate' => 'Ana bilgisayar belgesi indir',
 'download new ruleset' => 'Yeni Kural Kümesi İndir',
 'download pkcs12 file' => 'PKCS12 dosyasını indir',
 'download root certificate' => 'Root sertifikasını indir',
+'download tls-auth key' => 'Tls kimlik doğrulama anahtarını indir',
 'dpd action' => 'Hareketsiz eş algılama eylemi',
 'dpd delay' => 'Gecikme',
 'dpd timeout' => 'Zaman Aşımı',
@@ -928,6 +951,7 @@
 'firewall log' => 'Güvenlik duvarı günlüğü',
 'firewall log viewer' => 'Güvenlik Duvarı Günlük Görüntüleyicisi',
 'firewall logs' => 'Güvenlik Duvarı Günlükleri',
+'firewall logs country' => 'Fw günlük grafikleri (Ülke)',
 'firewall logs ip' => 'Gd-Günlük Grafikleri (IP)',
 'firewall logs port' => 'Gd-Günlük Grafikleri (Port)',
 'firewall rules' => 'Güvenlik Duvarı Kuralları',
@@ -1147,9 +1171,11 @@
 'g.lite' => 'KALDIRILACAK',
 'gateway' => 'Ağ geçidi',
 'gateway ip' => 'Ağ Geçidi IP Adresi',
+'gen dh' => 'Yeni anahtar değişimi parametrelerini oluştur',
 'gen static key' => 'Statik bir anahtar oluştur',
 'generate' => 'Yönetici/Sunucu Sertifikası Oluştur',
 'generate a certificate' => 'Sertifika oluştur:',
+'generate dh key' => 'Anahtar değişimi parametrelerini oluştur',
 'generate iso' => 'ISO oluştur',
 'generate root/host certificates' => 'Yönetici/Sunucu Sertifikası Oluştur',
 'generate tripwire keys and init' => 'tripwire anahtarları ve init oluştur',
@@ -1230,8 +1256,10 @@
 'ike integrity' => 'IKE Bütünlüğü:',
 'ike lifetime' => 'IKE Yaşam Süresi:',
 'ike lifetime should be between 1 and 8 hours' => 'IKE yaşam süresi 1 ila 8 saat arasında olmalıdır.',
+'imei' => 'IMEI',
 'import' => 'Al',
 'importkey' => 'PSK Al',
+'imsi' => 'IMSI',
 'in' => 'içinde',
 'inactive' => 'Pasif',
 'include logfiles' => 'Günlük dosyaları dahil',
@@ -1441,6 +1469,12 @@
 'map to guest' => 'Ziyaretçi haritası',
 'march' => 'Mart',
 'marked' => 'İşaretli',
+'masquerade blue' => 'MAVİ gizli',
+'masquerade green' => 'YEŞİL gizli',
+'masquerade orange' => 'TURUNCU gizil',
+'masquerading' => 'Gizle',
+'masquerading disabled' => 'Gizlemeyi kapat',
+'masquerading enabled' => 'Gizlemeyi aç',
 'max bandwith' => 'En fazla bant genişliği',
 'max incoming size' => 'En fazla gelen boyut (KB):',
 'max lease time' => 'En fazla kira süresi (dakika):',
@@ -1471,6 +1505,7 @@
 'memory' => 'Bellek',
 'memory information' => 'Bellek bilgisi',
 'memory usage per' => 'bellek başına kullanım - ',
+'messages' => 'Mesajlar',
 'messages logging' => '/var/log/messages için günlük ayarları',
 'method' => 'Yöntem:',
 'min costs' => 'En az maliyet',
@@ -1484,18 +1519,32 @@
 'missing dat' => 'Şifreli arşiv bulunamadı',
 'missing gz' => 'Şifrelenmemiş arşiv bulunamadı',
 'mode' => 'Yöntem',
+'model' => 'Model',
 'modem' => 'Modem',
 'modem configuration' => 'Modem yapılandırması',
+'modem hardware details' => 'Modem Donanımı',
+'modem information' => 'Modem Bilgisi',
+'modem network bit error rate' => 'Bit hata oranı',
+'modem network information' => 'Ağ bilgisi',
+'modem network mode' => 'Ağ Yöntemi',
+'modem network operator' => 'Ağ Oparatörü',
+'modem network registration' => 'Ağ Kaydı',
+'modem network signal quality' => 'Sinyal Kalitesi',
+'modem no connection' => 'Bağlantı Yok',
+'modem no connection message' => 'Modemle bağlantı kurulamadı.',
 'modem on com1' => 'COM1 üzerindeki modem',
 'modem on com2' => 'COM2 üzerindeki modem',
 'modem on com3' => 'COM3 üzerindeki modem',
 'modem on com4' => 'COM4 üzerindeki modem',
 'modem on com5' => 'COM5 üzerindeki modem',
 'modem settings have errors' => 'Modem ayarları hatalı',
+'modem sim information' => 'SIM Bilgisi',
 'modem speaker on' => 'Modem üzerindeki hoparlör:',
+'modem status' => 'Modem Durumu',
 'modify' => 'Düzenle',
 'modulation' => 'Geçiş',
 'monday' => 'Pazartesi',
+'monitor interface' => 'Ekran Arabirimi',
 'month' => 'Ay',
 'month-graph' => 'ay',
 'monthly firewallhits' => 'aylık güvenlik duvarı kaydı',
@@ -1522,6 +1571,7 @@
 'name is invalid' => 'Geçersiz ad',
 'name must only contain characters' => 'Ad sadece karakter içermelidir.',
 'name too long' => 'Kullanıcının tam adı veya sistem ana bilgisayar adı çok uzun',
+'nameserver' => 'Sunucu adı',
 'nat-traversal' => 'Nat Geçişi:',
 'needreboot' => 'Bu güncelleştirmeden sonra yeniden başlatmak gerekir',
 'net' => 'Ağ',
@@ -1551,6 +1601,7 @@
 'network traffic graphs others' => 'Ağ (diğer)',
 'network updated' => 'Özel ağ güncellendi',
 'networks settings' => 'Güvenlik Duvarı - Ağ Ayarları',
+'never' => 'Asla',
 'new optionsfw later' => 'Yaptığınız değişiklikler yeniden başlatıldıktan sonra aktif olacaktır',
 'new optionsfw must boot' => 'IPFire yeniden başlatmanız gerekir',
 'newer' => 'Daha yeni',
@@ -1572,6 +1623,7 @@
 'nonetworkname' => 'Ağ adı girilmedi',
 'noservicename' => 'Hizmet adı girilmedi',
 'not a valid ca certificate' => 'Geçerli bir CA sertifikası değil.',
+'not a valid dh key' => 'Geçerli bir anahtar değişim parametre dosyası yok. 1024, 2048, 3072 veya 4096 bit uzunluğunda ve PKCS#3 biçimini kullanın.',
 'not enough disk space' => 'Yeterli disk alanı yok',
 'not present' => 'Mevcut <b>değil</b>',
 'not running' => 'çalışmıyor',
@@ -1664,10 +1716,19 @@
 'ovpn' => 'OpenVPN',
 'ovpn con stat' => 'OpenVPN Bağlantı İstatistiği',
 'ovpn config' => 'OVPN-Yapılandırması',
+'ovpn crypt options' => 'Şifreleme seçenekleri',
 'ovpn device' => 'OpenVPN aygıtı:',
+'ovpn dh' => 'Anahtar değişim uzunluğu parametreleri',
+'ovpn dh new key' => 'Yeni anahtar değişimi parametreleri oluşturun',
+'ovpn dh parameters' => 'Anahtar değişimi parametre seçenekleri',
+'ovpn dh upload' => 'Yeni anahtar değişimi parametrelerini yükle',
 'ovpn dl' => 'OVPN-Yapılandırması İndir',
+'ovpn engines' => 'kripto motoru',
 'ovpn errmsg green already pushed' => 'Yeşil ağ için her zaman bir yol ayarla',
 'ovpn errmsg invalid ip or mask' => 'Geçersiz ağ adresi veya alt ağ maskesi',
+'ovpn generating the root and host certificates' => 'Root ve ana bilgisayar belge üretimi uzun zaman alabilir.',
+'ovpn ha' => 'Hash algoritması',
+'ovpn hmac' => 'HMAC seçenekleri',
 'ovpn log' => 'OVPN-Günlük',
 'ovpn mgmt in root range' => 'Bağlantı noktası numarası 1024 ya da daha yüksek bir numara olmalıdır.',
 'ovpn mtu-disc' => 'MTU algılama',
@@ -1682,6 +1743,7 @@
 'ovpn on orange' => 'TURUNCU üzerindeki OpenVPN',
 'ovpn on red' => 'KIRMIZI üzerindeki OpenVPN',
 'ovpn port in root range' => '1024 ya da daha yüksek bir bağlantı noktası numarası gereklidir..',
+'ovpn reneg sec' => 'Oturum anahtarının kullanım süresi:',
 'ovpn routes push' => 'Yollar (her satırda bir tane) örneğin 192.168.10.0/255.255.255.0 192.168.20.0/24',
 'ovpn routes push options' => 'Yol baskı seçenekleri',
 'ovpn server status' => 'Güncel OpenVPN sunucu durumu:',
@@ -1689,7 +1751,6 @@
 'ovpn subnet is invalid' => 'Geçersiz OpenVPN alt ağı.',
 'ovpn subnet overlap' => 'OpenVPN alt ağı ile örtüşenler: ',
 'ovpn_fastio' => 'Hızlı-IO',
-'ovpn_fragment' => 'Parça boyutu',
 'ovpn_mssfix' => 'MSSFIX Boyutu',
 'ovpn_mtudisc' => 'MTU-Keşfi',
 'ovpn_processprio' => 'İşlem Önceliği',
@@ -1882,6 +1943,8 @@
 'running' => 'ÇALIŞIYOR',
 'safe removal of umounted device' => 'Bağlantısı kesilen aygıtı güvenli bir şekilde kaldırabilirsiniz',
 'samba' => 'Samba',
+'samba join a domain' => 'Bir etki alanına katılın',
+'samba join domain' => 'Etki alanına üyelik',
 'samba status' => 'Samba durumu',
 'saturday' => 'Cumartesi',
 'save' => 'Kaydet',
@@ -1933,11 +1996,13 @@
 'show ca certificate' => 'CA sertifikalarını göster',
 'show certificate' => 'Sertifika göster',
 'show crl' => 'Sertifika İptal Listesini Göster',
+'show dh' => 'Anahtar değişimi parametrelerini göster',
 'show host certificate' => 'Ana bilgisayar sertifikalarını göster',
 'show last x lines' => 'Son x satırlarını göster',
 'show lines' => 'Satırları göster',
 'show root certificate' => 'Root sertifikasını göster',
 'show share options' => 'Paylaşım seçeneklerini göster',
+'show tls-auth key' => 'Tls kimlik doğrulama anahtarını göster',
 'shuffle' => 'Karma',
 'shutdown' => 'Kapat',
 'shutdown ask' => 'Kapat?',
@@ -1963,6 +2028,7 @@
 'snort hits' => 'Saldırı kuralları için toplam aktif sayı',
 'snort working' => 'Snort çalışıyor ... Tüm işlemler başarıyla tamamlanana kadar bekleyin.',
 'socket options' => 'Soket seçenekleri',
+'software version' => 'Yazılım sürümü',
 'sort ascending' => 'Artan sıralama',
 'sort descending' => 'Azalan sıralama',
 'sound' => 'Ses',
@@ -1970,6 +2036,7 @@
 'source ip' => 'Kaynak IP',
 'source ip and port' => 'Kaynak IP: Bağlantı noktası numarası',
 'source ip bad' => 'Geçersiz bir IP adresi ya da ağ adresi.',
+'source ip country' => 'Kaynak Ip ülke',
 'source ip in use' => 'Kullanılan kaynak IP:',
 'source ip or net' => 'Kaynak IP veya Ağ',
 'source net' => 'Kaynak Ağ',
@@ -2047,9 +2114,11 @@
 'system log viewer' => 'Sistem Günlük Görüntüleyicisi',
 'system logs' => 'Sistem Günlükleri',
 'system status information' => 'Sistem Durum Bilgisi',
+'ta key' => 'Tls kimlik doğrulama anahtarı',
 'telephone not set' => 'Telefon ayarlanmamış.',
 'template' => 'Ön Ayar',
 'template warning' => 'QoS kurmak için iki seçeneğiniz vardır. İlk olarak kaydet düğmesine basıp kendi sınıf ve kurallarınızı oluşturabilirsiniz. İkinci olarak ise ön ayar düğmesine basıp sınıf ve kurallar için bir şablonun kurulmasını sağlayın. ',
+'teovpn_fragment' => 'Fragment boyutu',
 'test' => 'test',
 'test email could not be sent' => 'Test e-posta gönderilemedi',
 'test email was sent' => 'Test e-posta başarıyla gönderildi.',
@@ -2271,6 +2340,7 @@
 'upload a certificate' => 'Sertifika yükle:',
 'upload a certificate request' => 'Sertifika isteği yükle:',
 'upload ca certificate' => 'CA Sertifikası Yükle',
+'upload dh key' => 'Anahtar değişimi parametrelerini yükle',
 'upload fcdsl.o' => 'KALDIRILACAK',
 'upload file' => 'Dosya yükle',
 'upload new ruleset' => 'Yeni kurallar yükle',
@@ -2483,10 +2553,6 @@
 'urlfilter weekly' => 'Haftalık',
 'urlfilter whitelist always allowed' => 'Yasaklı istemciler için özel beyaz liste izini',
 'urlfilter wrong filetype' => 'Uzantısı .tar.gz olan dosya yok',
-'usb modem on acm0' => 'ACM0 üzerindeki USB Modem',
-'usb modem on acm1' => 'ACM1 üzerindeki USB Modem',
-'usb modem on acm2' => 'ACM2 üzerindeki USB Modem',
-'usb modem on acm3' => 'ACM3 üzerindeki USB Modem',
 'use' => 'Kullan',
 'use a pre-shared key' => 'Ön paylaşımlı anahtar kullan:',
 'use dov' => 'Ses üzerinden veri kullan (DOV):',
@@ -2507,6 +2573,7 @@
 'valid root certificate already exists' => 'Geçerli bir yönetici sertifikası zaten mevcut.',
 'valid till' => 'Geçerlilik süresi',
 'vci number' => 'VCI numarası:',
+'vendor' => 'Sağlayıcı',
 'view log' => 'günlükleri göster',
 'virtual address' => 'Sanal Adres',
 'virtual private networking' => 'Sanal ÖZel Ağ',

diff --git a/lfs/openssl b/lfs/openssl
index 0f0b823a947acddbfada70d00dc6cfb39eb63e1f..186ea6c6ae49377e1bfb1f1be5a661a316cf395f 100644 (file)
--- a/lfs/openssl
+++ b/lfs/openssl
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 1.0.1i
+VER        = 1.0.1j
 
 THISAPP    = openssl-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -51,7 +51,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = c8dc151a671b9b92ff3e4c118b174972
+$(DL_FILE)_MD5 = f7175c9cd3c39bb1907ac8bba9df8ed3
 
 install : $(TARGET)
 

diff --git a/lfs/openssl-compat b/lfs/openssl-compat
index 604ac1324432847b2e0425af3dfde7cb3c39dcfc..683d979ae04b4601e5f8f48b76c625ff02b5dc91 100644 (file)
--- a/lfs/openssl-compat
+++ b/lfs/openssl-compat
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 0.9.8zb
+VER        = 0.9.8zc
 
 THISAPP    = openssl-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 65c5f42734f8ecd58990b12a9afa6453
+$(DL_FILE)_MD5 = 1b239eea3a60d67863e7b66700e47a16
 
 install : $(TARGET)
 

diff --git a/make.sh b/make.sh
index 074f120dc1ac32c308bff9f3959f3b6390ad63ce..2b24e1159e82b7a1d5344a7de2f125c3b9d7c5b5 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -25,8 +25,8 @@
 NAME="IPFire"                                                  # Software name
 SNAME="ipfire"                                                 # Short name
 VERSION="2.15"                                                 # Version number
-CORE="84"                                                      # Core Level (Filename)
-PAKFIRE_CORE="84"                                              # Core Level (PAKFIRE)
+CORE="85"                                                      # Core Level (Filename)
+PAKFIRE_CORE="85"                                              # Core Level (PAKFIRE)
 GIT_BRANCH=`git rev-parse --abbrev-ref HEAD`                   # Git Branch
 SLOGAN="www.ipfire.org"                                                # Software slogan
 CONFIG_ROOT=/var/ipfire                                                # Configuration rootdir