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
This commit is contained in:
Arne Fitzenreiter
2011-07-26 08:12:05 +02:00
48 changed files with 1055 additions and 681 deletions

View File

@@ -237,7 +237,6 @@ WARNING: translation string unused: mbmon graphs
WARNING: translation string unused: mbmon temp in
WARNING: translation string unused: mbmon value
WARNING: translation string unused: min size
WARNING: translation string unused: minutes
WARNING: translation string unused: missing dat
WARNING: translation string unused: missing gz
WARNING: translation string unused: modem on com1
@@ -465,3 +464,7 @@ WARNING: untranslated string: bytes
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