Merge branch 'master' into next

diff --combined langs/de/cgi-bin/de.pl
index f3553fbceea6cbb577fff78d736a9bce07ac961f,09cd50993180d5e697976057cba59df2d3d49e85..6d9f36bcff2dfe6391f9c562fb02d49b417f12f9
--- 1/langs/de/cgi-bin/de.pl
--- 2/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@@ -18,7 -18,6 +18,6 @@@
  'ConnSched ipsecstart' => 'IPSec (neu)starten',
  'ConnSched ipsecstop' => 'IPSec stop',
  'ConnSched reconnect' => 'Neu verbinden',
- 'cpu frequency per' => 'CPU Frequenz pro',
  'ConnSched scheduled actions' => 'Geplante Aktionen',
  'ConnSched scheduler' => 'Scheduler',
  'ConnSched select profile' => 'Wähle Profil',
@@@ -514,6 -513,7 +513,7 @@@
  'could not open update information file' => 'Datei mit den Update-Information konnte nicht geöffnet werden. Die Update-Datei ist beschädigt.',
  'could not retrieve common name from certificate' => 'Der Gemeinsame Name (CN) konnte nicht aus dem Zertifikat gelesen werden.',
  'country' => 'Land',
+ 'cpu frequency per' => 'CPU Frequenz pro',
  'cpu idle usage' => 'Leerlauf CPU Nutzung',
  'cpu interrupt usage' => 'Interrupt CPU Nutzung',
  'cpu iowait usage' => 'CPU wartet auf IO',
@@@ -775,15 -775,6 +775,15 @@@
  'external aliases configuration' => 'Externe Alias-Konfiguration',
  'extrahd' => 'ExtraHD',
  'extrahd detected drives' => 'gefundene Laufwerke',
 +'extrahd unable to read' => 'Lesefehler von',
 +'extrahd unable to write' => 'Schreibfehler von',
 +'extrahd you cant mount' => 'Sie können',
 +'extrahd to' => 'nicht nach',
 +'extrahd to root' => 'nicht nach root mounten',
 +'extrahd because there is already a device mounted' => ' mounten, weil bereits ein Geräte gemountet ist',
 +'extrahd cant umount' => 'Konnte',
 +'extrahd maybe the device is in use' => 'nicht mounten. Vielleicht wird das Gerät bereits verwendet',
 +'extrahd install or load driver' => 'Wenn Ihre Festplatte nicht angezeigt wird, müssen Sie zuerst den Treiber laden oder ggf. auch nach installieren. Wenn diese jedoch angezeigt wird, aber keine Partitionen zu sehen sind, müssen diese erst angelegt werden.',
  'false classnumber' => 'Die Klassennummer passt nicht zum angegebenen Interface.',
  'false max bandwith' => 'Maximalbandbreite ist ungültig.',
  'false min bandwith' => 'Mindestbandbreite ist ungültig.',

diff --combined langs/en/cgi-bin/en.pl
index ad48b4a36706cb8a81379fbd127a60b49f01a96b,fcb9241fb1aad1681a579ce37a5612abc596794a..12ba2a7c8fadb4849c0d3d3d78465da96c0e1666
--- 1/langs/en/cgi-bin/en.pl
--- 2/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@@ -17,7 -17,6 +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 +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',
@@@ -799,15 -799,6 +799,15 @@@
  'external aliases configuration' => 'External aliases configuration',
  'extrahd' => 'ExtraHD',
  'extrahd detected drives' => 'detected drives',
 +'extrahd unable to read' => 'Unable to read',
 +'extrahd unable to write' => 'Unable to write',
 +'extrahd you cant mount' => 'You can\'t mount',
 +'extrahd to' => 'to',
 +'extrahd to root' => 'to root',
 +'extrahd because there is already a device mounted' => ', because there is already a device mounted',
 +'extrahd cant umount' => 'Can\'t umount',
 +'extrahd maybe the device is in use' => '. Maybe the device is in use',
 +'extrahd install or load driver' => 'If your device isn\'t listed here, you need to install or load the driver.<br />If you can see your device but no partitions you have to create them first.',
  'false classnumber' => 'The Class-Number does not match the interface.',
  'false max bandwith' => 'Maximum bandwith is false.',
  'false min bandwith' => 'Minimum bandwith is false.',

diff --combined langs/es/cgi-bin/es.pl
index 1b3c62f98262aca489f8088f9c15eadb3087826e,861ff2a2a6fde0b9c901534e6a44e74fc5d3d8a4..585f1244912f808b5a5a91407b59dde8935c2fc5
--- 1/langs/es/cgi-bin/es.pl
--- 2/langs/es/cgi-bin/es.pl
+++ b/langs/es/cgi-bin/es.pl
@@@ -532,10 -532,10 +532,10 @@@
  'could not open update information file' => 'No se pudo abrir el archivo de información de actualizaciones. El archivo de actualizaciones está dañado',
  'could not retrieve common name from certificate' => 'No se pudo recuperar el nombre común del certificado.',
  'country' => 'País',
+ 'cpu frequency per' => 'CPU frecuencia por',
  'cpu idle usage' => 'Uso de CPU inactivo',
  'cpu interrupt usage' => 'Uso de interrupción de CPU',
  'cpu iowait usage' => 'CPU esperando IO',
- 'cpu frequency per' => 'CPU frecuencia por',
  'cpu irq usage' => 'Uso de IRQ del CPU',
  'cpu nice usage' => 'Buen uso de CPU',
  'cpu steal usage' => 'uso de CPU steal',
@@@ -797,15 -797,6 +797,15 @@@
  'external aliases configuration' => 'Configuración de Alias externo',
  'extrahd' => 'Disco duro Adicional',
  'extrahd detected drives' => 'Unidades encontradas',
 +'extrahd unable to read' => 'Unable to read',
 +'extrahd unable to write' => 'Unable to write',
 +'extrahd you cant mount' => 'You can\'t mount',
 +'extrahd to' => 'to',
 +'extrahd to root' => 'to root',
 +'extrahd because there is already a device mounted' => ', because there is already a device mounted',
 +'extrahd cant umount' => 'Can\'t umount',
 +'extrahd maybe the device is in use' => '. Maybe the device is in use',
 +'extrahd install or load driver' => 'If your device isn\'t listed here, you need to install or load the driver.<br />If you can see your device but no partitions you have to create them first.',
  'false classnumber' => 'El número de clase no coincide con la interfaz',
  'false max bandwith' => 'El ancho de banda máximo es falso',
  'false min bandwith' => 'El ancho de banda mínimo es falso',

diff --combined langs/fr/cgi-bin/fr.pl
index c2ac5b4b48dc04e5204d1c5c5010cf82090b33c4,778d9d5ae42a3ae99197d3e1768ef88aaae23fd0..53c0f9f76454afab7ebad165b25bc20781786be5
--- 1/langs/fr/cgi-bin/fr.pl
--- 2/langs/fr/cgi-bin/fr.pl
+++ b/langs/fr/cgi-bin/fr.pl
@@@ -16,7 -16,6 +16,6 @@@
  'ConnSched days' => 'Jours :',
  'ConnSched down' => 'Arrêt',
  'ConnSched ipsecstart' => 'IPSec (re)démarrage',
- 'cpu frequency per' => 'CPU fréquence par',
  'ConnSched ipsecstop' => 'IPSec arrêt',
  'ConnSched reconnect' => 'Reconnecter',
  'ConnSched scheduled actions' => 'Actions planifiées',
@@@ -535,6 -534,7 +534,7 @@@
  'could not open update information file' => 'Impossible d\'ouvrir le fichier d\'information de mise à jour. Le fichier est corrompu.',
  'could not retrieve common name from certificate' => 'Impossible de récupérer le nom courant depuis le certificat.',
  'country' => 'Pays',
+ 'cpu frequency per' => 'CPU fréquence par',
  'cpu idle usage' => 'Pourcentage d\'inactivite CPU',
  'cpu interrupt usage' => 'Utilisation des interruptions CPU',
  'cpu iowait usage' => 'Le COU attend des IO',
@@@ -797,16 -797,7 +797,16 @@@
  'external access rule removed' => 'Règle d\'accès externe supprimée; redémarrage du controleur d\'accès',
  'external aliases configuration' => 'Configuration des alias externes',
  'extrahd' => 'ExtraHD',
 -'extrahd founded drives' => 'Périphériques trouvés',
 +'extrahd detected drives' => 'Périphériques trouvés',
 +'extrahd unable to read' => 'Impossible de lire',
 +'extrahd unable to write' => 'Impossible d\'écrire',
 +'extrahd you cant mount' => 'Vous ne pouvez pas monter',
 +'extrahd to' => 'vers',
 +'extrahd to root' => 'vers root',
 +'extrahd because there is already a device mounted' => ' car vous avez déjà un support de monté',
 +'extrahd cant umount' => 'Impossible de démonter',
 +'extrahd maybe the device is in use' => '. Votre support est peut-être en cours d\'utilisation',
 +'extrahd install or load driver' => 'Si votre support n\'est pas visible ici, vous devez installer ou charger son pilote.<br />Si vous voyez votre support mais pas de partitions, vous devez tout d\'abord les créer.',
  'false classnumber' => 'Le numéro de classe ne correspond pas à l\'interface.',
  'false max bandwith' => 'La bande passante maximum est fausse.',
  'false min bandwith' => 'La bande passante minimum est fausse.',