Merge branch 'master' into next

This commit is contained in:
Arne Fitzenreiter
2011-06-24 11:10:13 +02:00
24 changed files with 3628 additions and 22 deletions

View File

@@ -17,7 +17,6 @@
'ConnSched down' => 'Down',
'ConnSched ipsecstart' => 'IPSec (re)start',
'ConnSched ipsecstop' => 'IPSec stop',
'cpu frequency per' => 'CPU frequency per',
'ConnSched reconnect' => 'Reconnect',
'ConnSched scheduled actions' => 'Scheduled actions',
'ConnSched scheduler' => 'Scheduler',
@@ -535,6 +534,7 @@
'could not open update information file' => 'Could not open update information file. The update file is corrupt.',
'could not retrieve common name from certificate' => 'Could not retrieve common name from certificate.',
'country' => 'Country',
'cpu frequency per' => 'CPU frequency per',
'cpu idle usage' => 'Idle CPU Usage',
'cpu interrupt usage' => 'Interrupt CPU Usage',
'cpu iowait usage' => 'CPU waiting for IO',