From: Arne Fitzenreiter Date: Tue, 26 Jul 2011 06:12:05 +0000 (+0200) Subject: Merge branch 'master' into next X-Git-Tag: v2.9-core53~67 X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=8c4f3d176b15855e3da914569f669bfd70ff9253 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 --- 8c4f3d176b15855e3da914569f669bfd70ff9253 diff --cc doc/language_issues.de index 2174633695,d59f1f3ddc..52324ceba5 --- a/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 883b0045f7,3df8ad2725..14e47d9956 --- a/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 c3e97feb91,ae69c6faba..456eb1f28c --- a/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 70618b50f5,cb58f42022..784bf382c2 --- a/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 c3e97feb91,ae69c6faba..456eb1f28c --- a/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 a98df06c70,0ddcb9582a..3de5aec9e0 --- a/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 34d7b03004,e6d451fe7f..0f95df04e3 --- a/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 eine 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
und klicken Sie danach auf Speichern.', 'Existing Files' => 'Dateien in der Datenbank', 'HDD temperature' => 'HDD-Temperatur', diff --cc langs/en/cgi-bin/en.pl index 46b10a1bdb,247814505a..851d3c6a8a --- a/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 one 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
and then press Save.', 'Existing Files' => 'Files in database', 'HDD temperature' => 'HDD temperature', diff --cc langs/es/cgi-bin/es.pl index 3f0fe78d32,861ff2a2a6..409380965c --- a/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 una 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
y después presione Guardar', 'Existing Files' => 'Archivos en la base de datos', 'HDD temperature' => 'Temperatura de HDD', diff --cc langs/fr/cgi-bin/fr.pl index bfc2cc5fac,778d9d5ae4..69e8ba1c66 --- a/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 une 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
puis appuyez sur Enregistrer .', 'Existing Files' => 'Fichiers dans la base de donnée', 'HDD temperature' => 'Température Disque Dur', diff --cc langs/pl/cgi-bin/pl.pl index 31bff32e14,43599843b8..be4f5ea0f9 --- a/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łÄ™ L7', - 'Add Port Rule' => 'Dodaj regułÄ™ portu', - 'Add Rule' => 'Dodaj regułÄ™', - 'Async logging enabled' => 'WłÄ…cz asynchroniczny zapis do pliku syslog', - 'Choose Rule' => 'Wybierz jedną z poniższych reguł.', - '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ła usunięta', + 'Async logging enabled' => 'Włącz asynchroniczny zapis do pliku syslog', + 'Choose Rule' => 'Wybierz jedną 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
a następnie kliknij Zapisz.', ++'Edit an existing route' => 'Edytuj istniejaca trase', + 'Enter TOS' => 'Aktywuj lub deaktywuj bity TOS
a następnie kliknij Zapisz.', 'Existing Files' => 'Plików w bazie', 'HDD temperature' => 'Temperatura HDD', 'Level7 Protocol' => 'Protokół-L7', diff --cc make.sh index 8c08fc34cb,a9bc4bede0..660bfbe149 --- a/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