Merge branch 'master' into next

Conflicts:
	config/kernel/kernel.config.i586-ipfire-pae
	config/rootfiles/core/45/meta
	config/rootfiles/core/46/meta
	config/rootfiles/core/47/meta
	config/rootfiles/core/48/meta
	config/rootfiles/core/52/meta
	config/rootfiles/oldcore/44/meta
	config/rootfiles/oldcore/45/meta
	config/rootfiles/oldcore/46/meta
	config/rootfiles/oldcore/47/meta
	doc/language_missings
	langs/pl/cgi-bin/pl.pl
	make.sh

diff --cc doc/language_issues.de
index 2174633695b83df67d6a6726e8e5437dd1e851d3,d59f1f3ddc5df04230300aa7ab1f076ec9c5094a..52324ceba559b0ccf4851ba17ae002de600d1a83
--- 1/doc/language_issues.de
--- 2/doc/language_issues.de
+++ b/doc/language_issues.de
@@@ -465,3 -462,3 +464,7 @@@ WARNING: untranslated string: byte
  WARNING: untranslated string: new
  WARNING: untranslated string: outgoing firewall reserved groupname
  WARNING: untranslated string: qos add subclass
++WARNING: untranslated string: route config changed
++WARNING: untranslated string: routing config added
++WARNING: untranslated string: routing config changed
++WARNING: untranslated string: routing table

diff --cc doc/language_issues.en
index 883b0045f72815c6a18e59bdcbe535f86e64191f,3df8ad27256978651873a1af477bcd50379b0bb7..14e47d99560d5a3468b8291611fea9c4e52ef285
--- 1/doc/language_issues.en
--- 2/doc/language_issues.en
+++ b/doc/language_issues.en
@@@ -497,3 -494,3 +496,7 @@@ WARNING: untranslated string: Scan for 
  WARNING: untranslated string: bytes
  WARNING: untranslated string: new
  WARNING: untranslated string: outgoing firewall reserved groupname
++WARNING: untranslated string: route config changed
++WARNING: untranslated string: routing config added
++WARNING: untranslated string: routing config changed
++WARNING: untranslated string: routing table

diff --cc doc/language_issues.es
index c3e97feb915158e204c4abadafffee2bac22f310,ae69c6faba5513ed1ba082f5191e3e367dcbdf7c..456eb1f28c38c6100ffa1088ead4f79d1c160d25
--- 1/doc/language_issues.es
--- 2/doc/language_issues.es
+++ b/doc/language_issues.es
@@@ -532,5 -530,4 +532,9 @@@ WARNING: untranslated string: outgoing 
  WARNING: untranslated string: outgoing firewall reserved groupname
  WARNING: untranslated string: outgoing firewall view group
  WARNING: untranslated string: pakfire ago
++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: system information
 +WARNING: untranslated string: vpn keyexchange

diff --cc doc/language_issues.fr
index 70618b50f51ac78b29332e85947de491ac76b2c9,cb58f420224b688884bbedddc97fac5e22adc945..784bf382c21a2ba814523cd58e0a2a1cd2b8bae9
--- 1/doc/language_issues.fr
--- 2/doc/language_issues.fr
+++ b/doc/language_issues.fr
@@@ -520,6 -520,6 +520,10 @@@ WARNING: untranslated string: ntp commo
  WARNING: untranslated string: ntp sync
  WARNING: untranslated string: outgoing firewall reserved groupname
  WARNING: untranslated string: pakfire ago
++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: snort working
  WARNING: untranslated string: system information
  WARNING: untranslated string: upload new ruleset

diff --cc doc/language_issues.pl
index c3e97feb915158e204c4abadafffee2bac22f310,ae69c6faba5513ed1ba082f5191e3e367dcbdf7c..456eb1f28c38c6100ffa1088ead4f79d1c160d25
--- 1/doc/language_issues.pl
--- 2/doc/language_issues.pl
+++ b/doc/language_issues.pl
@@@ -532,5 -530,4 +532,9 @@@ WARNING: untranslated string: outgoing 
  WARNING: untranslated string: outgoing firewall reserved groupname
  WARNING: untranslated string: outgoing firewall view group
  WARNING: untranslated string: pakfire ago
++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: system information
 +WARNING: untranslated string: vpn keyexchange

diff --cc doc/language_missings
index a98df06c70b87fa8e03b2489257f11a90fea1fa3,0ddcb9582affb9a76f4215ec11d3858ae4703c0c..3de5aec9e05eb3a993dc8ebdf2ed150e1908992e
--- 1/doc/language_missings
--- 2/doc/language_missings
+++ b/doc/language_missings
@@@ -103,13 -104,4 +105,14 @@@
  ############################################################################
  # Checking cgi-bin translations for language: pl                           #
  ############################################################################
 +< extrahd because there is already a device mounted
 +< extrahd cant umount
 +< extrahd install or load driver
 +< extrahd maybe the device is in use
 +< extrahd to
 +< extrahd to root
 +< extrahd unable to read
 +< extrahd unable to write
 +< extrahd you cant mount
+ < minute
 +< vpn keyexchange

diff --cc langs/de/cgi-bin/de.pl
index 34d7b03004a1c51fd9ac8ef9801b19e100f65e97,e6d451fe7f700b369888ae630bc3f8dff06c48f1..0f95df04e3d42836b625402f85e80e100b44d71a
--- 1/langs/de/cgi-bin/de.pl
--- 2/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@@ -5,8 -5,6 +5,7 @@@
  'Add Level7 rule' => 'Level7-Regel hinzufügen',
  'Add Port Rule' => 'Port Regel hinzufügen',
  'Add Rule' => 'Regel hinzufügen',
++'Add a route' => 'Eine Route hinzufügen',
  'Async logging enabled' => 'Aktiviere asynchrones schreiben des Syslogs',
  'Choose Rule' => 'Wählen sie <u>eine</u> der untenstehenden Regeln aus.',
  'Class' => 'Klasse',
@@@ -26,6 -24,6 +25,7 @@@
  'ConnSched time' => 'Zeit:',
  'ConnSched up' => 'Hoch',
  'ConnSched weekdays' => 'Wochentage:',
++'Edit an existing route' => 'Eine existierende Route editieren',
  'Enter TOS' => 'Aktivieren oder deaktivieren sie die TOS-Bits <br /> und klicken Sie danach auf <i>Speichern</i>.',
  'Existing Files' => 'Dateien in der Datenbank',
  'HDD temperature' => 'HDD-Temperatur',

diff --cc langs/en/cgi-bin/en.pl
index 46b10a1bdb151eafe4ff9fea084f03a1e9191d87,247814505a94244f141749e5298de2486a8dce1a..851d3c6a8a3de12e9a2c52d5d824286c7e7429cf
--- 1/langs/en/cgi-bin/en.pl
--- 2/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@@ -4,9 -4,7 +4,8 @@@
  'Act as' => 'Act as:',
  'Add Level7 rule' => 'Add Level7 rule',
  'Add Port Rule' => 'Add port rule',
- 'Edit an existing route' => 'Edit an existing route',
- 'Add a route' => 'Add a route',
  'Add Rule' => 'Add rule',
++'Add a route' => 'Add a route',
  'Async logging enabled' => 'Enable asynchronous writing of the syslog file',
  'Choose Rule' => 'Choose <u>one</u> of the following rules.',
  'Class' => 'Class',
@@@ -26,6 -24,6 +25,7 @@@
  'ConnSched time' => 'Time:',
  'ConnSched up' => 'Up',
  'ConnSched weekdays' => 'Days of the week:',
++'Edit an existing route' => 'Edit an existing route',
  'Enter TOS' => 'Activate or deactivate TOS-bits <br /> and then press <i>Save</i>.',
  'Existing Files' => 'Files in database',
  'HDD temperature' => 'HDD temperature',

diff --cc langs/es/cgi-bin/es.pl
index 3f0fe78d32fdc2caf3738e5b0aa559855d4e2f97,861ff2a2a6fde0b9c901534e6a44e74fc5d3d8a4..409380965c11b44f4fffa3a6e324cd9cfb0cddba
--- 1/langs/es/cgi-bin/es.pl
--- 2/langs/es/cgi-bin/es.pl
+++ b/langs/es/cgi-bin/es.pl
@@@ -5,8 -5,6 +5,7 @@@
  'Add Level7 rule' => 'añadir regla de Nivel 7',
  'Add Port Rule' => 'Añadir Regla de Puerto',
  'Add Rule' => 'Añadir Regla',
- 'Edit an existing route' => 'Editar una route existente',
 +'Add a route' => 'Añadir una route',
  'Choose Rule' => 'Seleccione <u>una</u> de las siguientes reglas.',
  'Class' => 'Clase',
  'Class was deleted' => 'con subclases potenciales fué eliminado',
@@@ -25,6 -23,6 +24,7 @@@
  'ConnSched time' => 'Tiempo:',
  'ConnSched up' => 'Arriba',
  'ConnSched weekdays' => 'Días de las semana:',
++'Edit an existing route' => 'Editar una route existente',
  'Enter TOS' => 'Activar o desactivar bits TOS<br /> y después presione <i>Guardar</i>',
  'Existing Files' => 'Archivos en la base de datos',
  'HDD temperature' => 'Temperatura de HDD',

diff --cc langs/fr/cgi-bin/fr.pl
index bfc2cc5facbd981cddc5151c67c4955ed42943d1,778d9d5ae42a3ae99197d3e1768ef88aaae23fd0..69e8ba1c664669b53ec3b5a158b8c400b5280f0c
--- 1/langs/fr/cgi-bin/fr.pl
--- 2/langs/fr/cgi-bin/fr.pl
+++ b/langs/fr/cgi-bin/fr.pl
@@@ -5,8 -5,6 +5,7 @@@
  'Add Level7 rule' => 'Ajouter une règle Level7',
  'Add Port Rule' => 'Ajouter une règle de port',
  'Add Rule' => 'Ajouter une règle',
- 'Edit an existing route' => 'Modifier une route existante',
 +'Add a route' => 'Ajouter une route',
  'Async logging enabled' => 'Activer l\'écriture asynchrone du fichier syslog',
  'Choose Rule' => 'Choisissez <u>une</u> des règles suivantes.',
  'Class' => 'Classe',
@@@ -26,6 -24,6 +25,7 @@@
  'ConnSched time' => 'Temps :',
  'ConnSched up' => 'Actif',
  'ConnSched weekdays' => 'Jours de la semaine :',
++'Edit an existing route' => 'Modifier une route existante',
  'Enter TOS' => 'Activer ou désactiver TOS-Bits <br /> puis appuyez sur <i> Enregistrer </i>.',
  'Existing Files' => 'Fichiers dans la base de donnée',
  'HDD temperature' => 'Température Disque Dur',

diff --cc langs/pl/cgi-bin/pl.pl
index 31bff32e14c676f93b131b0713e65417c7b8ca91,43599843b8f570084b733ea41fa025417aa69316..be4f5ea0f96472fddbe6d11d8d3cb608d101feac
--- 1/langs/pl/cgi-bin/pl.pl
--- 2/langs/pl/cgi-bin/pl.pl
+++ b/langs/pl/cgi-bin/pl.pl
@@@ -2,15 -2,13 +2,14 @@@
  %tr,
  
  'Act as' => 'Act as:',
- 'Add Level7 rule' => 'Dodaj reguÅ\82Ã\84\99 L7',
- 'Add Port Rule' => 'Dodaj reguÅ\82Ã\84\99 portu',
- 'Add Rule' => 'Dodaj reguÅ\82Ã\84\99',
- 'Async logging enabled' => 'WÅ\82Ã\84\85cz asynchroniczny zapis do pliku syslog',
- 'Choose Rule' => 'Wybierz <u>jednÃ\84\85</u> z poniższych reguÅ\82.',
- 'Class' => 'Klasa',
- 'Edit an existing route' => 'Edytuj istniejaca trase',
+ 'Add Level7 rule' => 'Dodaj regułę L7',
+ 'Add Port Rule' => 'Dodaj regułę portu',
+ 'Add Rule' => 'Dodaj regułę',
 +'Add a route' => 'Dodaj trase',
- 'Class was deleted' => 'wraz z ewentualnymi podklasami zostaÅ\82a usuniÃ\84\99ta',
+ 'Async logging enabled' => 'Włącz asynchroniczny zapis do pliku syslog',
+ 'Choose Rule' => 'Wybierz <u>jedną</u> z poniższych reguł.',
+ 'Class' => 'Klasa',
+ 'Class was deleted' => 'wraz z ewentualnymi podklasami została usunięta',
  'Client status and controlc' => 'Client status and control:',
  'ConnSched action' => 'Zadanie:',
  'ConnSched add action' => 'Dodaj zadanie',
@@@ -26,7 -24,7 +25,8 @@@
  'ConnSched time' => 'Czas:',
  'ConnSched up' => 'Wyżej',
  'ConnSched weekdays' => 'Dni tygodnia:',
- 'Enter TOS' => 'Aktywuj lub deaktywuj bity TOS <br /> a nastÃ\84\99pnie kliknij <i>Zapisz</i>.',
++'Edit an existing route' => 'Edytuj istniejaca trase',
+ 'Enter TOS' => 'Aktywuj lub deaktywuj bity TOS <br /> a następnie kliknij <i>Zapisz</i>.',
  'Existing Files' => 'Plików w bazie',
  'HDD temperature' => 'Temperatura HDD',
  'Level7 Protocol' => 'Protokół-L7',

diff --cc make.sh
index 8c08fc34cb8384708c1f06aea8f1303eab1b78c8,a9bc4bede00f4f01f77f28b345399de990cacf58..660bfbe1495b0746ec34a7606d8fd3e772fd2295
--- 1/make.sh
--- 2/make.sh
+++ b/make.sh
@@@ -24,9 -24,9 +24,9 @@@
  
  NAME="IPFire"                                                 # Software name
  SNAME="ipfire"                                                        # Short name
 -VERSION="2.9"                                                 # Version number
 +VERSION="2.10"                                                        # Version number
- CORE="51"                                                     # Core Level (Filename)
- PAKFIRE_CORE="50"                                             # Core Level (PAKFIRE)
+ CORE="52"                                                     # Core Level (Filename)
+ PAKFIRE_CORE="51"                                             # 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