This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".
The branch, next has been updated via 0df2024f29c9e955dd0bfe4df84afce757d40e26 (commit) via 156337976b33ca58a94b6a4fbb03bae7f1b9b38b (commit) via 1fa96194abe35c08d77ba713877db96f31dee72e (commit) via ddb6262fe588a487f61c8565b399f480b46932ce (commit) via 20730a6feee96496d4933fc2cba54e0c87b7ef84 (commit) from 63ca66d438520e9c613922e4f419ed50eaf1bc6c (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit 0df2024f29c9e955dd0bfe4df84afce757d40e26 Merge: 63ca66d 1563379 Author: Jan Paul Tuecking earl@ipfire.org Date: Tue May 31 22:27:53 2011 +0200
Merge branch 'master' into next
commit 156337976b33ca58a94b6a4fbb03bae7f1b9b38b Author: Jan Paul Tuecking earl@ipfire.org Date: Mon May 30 18:14:42 2011 +0200
extrahd.cgi: French translation. Thx Lalsacien!
commit 1fa96194abe35c08d77ba713877db96f31dee72e Merge: ddb6262 9a5f5d3 Author: Jan Paul Tuecking earl@ipfire.org Date: Mon May 30 18:10:04 2011 +0200
Merge branch 'master' of ssh://earl@git.ipfire.org/pub/git/ipfire-2.x
commit ddb6262fe588a487f61c8565b399f480b46932ce Author: Jan Paul Tuecking earl@ipfire.org Date: Fri May 27 14:03:08 2011 +0200
extrahd.cgi: insert new translation strings.
commit 20730a6feee96496d4933fc2cba54e0c87b7ef84 Author: Jan Paul Tuecking earl@ipfire.org Date: Fri May 27 14:00:57 2011 +0200
extrahd.cgi: removed controller names from list, corrected translation.
-----------------------------------------------------------------------
Summary of changes: html/cgi-bin/extrahd.cgi | 56 +++++++++++++++++++++++++++------------------- langs/de/cgi-bin/de.pl | 9 +++++++ langs/en/cgi-bin/en.pl | 9 +++++++ langs/es/cgi-bin/es.pl | 9 +++++++ langs/fr/cgi-bin/fr.pl | 11 ++++++++- 5 files changed, 70 insertions(+), 24 deletions(-)
Difference in files: diff --git a/html/cgi-bin/extrahd.cgi b/html/cgi-bin/extrahd.cgi index 3bb6afd..7cdad01 100644 --- a/html/cgi-bin/extrahd.cgi +++ b/html/cgi-bin/extrahd.cgi @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2010 IPFire Team info@ipfire.org # +# Copyright (C) 2011 IPFire Team info@ipfire.org # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -79,11 +79,11 @@ if ($extrahdsettings{'ACTION'} eq $Lang::tr{'add'}) @deviceline = split( /;/, $deviceentry ); if ( "$extrahdsettings{'PATH'}" eq "$deviceline[2]" ) { $ok = "false"; - $errormessage = "You can't mount $extrahdsettings{'DEVICE'} to $extrahdsettings{'PATH'}, because there is already a device mounted."; + $errormessage = "$Lang::tr{'extrahd you cant mount'} $extrahdsettings{'DEVICE'} $Lang::tr{'extrahd to'} $extrahdsettings{'PATH'}$Lang::tr{'extrahd because there is already a device mounted'}."; } if ( "$extrahdsettings{'PATH'}" eq "/" ) { $ok = "false"; - $errormessage = "You can't mount $extrahdsettings{'DEVICE'} to root /."; + $errormessage = "$Lang::tr{'extrahd you cant mount'} $extrahdsettings{'DEVICE'} $Lang::tr{'extrahd to root'}."; } }
@@ -113,7 +113,7 @@ elsif ($extrahdsettings{'ACTION'} eq $Lang::tr{'delete'}) } close FILE; } else { - $errormessage = "Can't umount $extrahdsettings{'PATH'}. Maybe the device is in use?"; + $errormessage = "$Lang::tr{'extrahd cant umount'} $extrahdsettings{'PATH'}$Lang::tr{'extrahd maybe the device is in use'}?"; } }
@@ -143,10 +143,10 @@ END $color=$Header::colourgreen; } print <<END - <tr><td colspan="5"> - <tr><td align='center'><font color=$color><b>$deviceline[0]</b></font> - <td align='center'>$deviceline[1] - <td align='center'>$deviceline[2] + <tr><td colspan="4"> </td></tr> + <tr><td align='left'><font color=$color><b>$deviceline[0]</b></font></td> + <td align='left'>$deviceline[1]</td> + <td align='left'>$deviceline[2]</td> <td align='center'> <form method='post' action='$ENV{'SCRIPT_NAME'}'> <input type='hidden' name='DEVICE' value='$deviceline[0]' /> @@ -154,7 +154,7 @@ END <input type='hidden' name='PATH' value='$deviceline[2]' /> <input type='hidden' name='ACTION' value=$Lang::tr{'delete'} /> <input type='image' alt=$Lang::tr{'delete'} src='/images/delete.gif' /> - </form> + </form></td></tr> END ; } @@ -179,21 +179,26 @@ END foreach $scanentry (sort @scans) { @scanline = split( /;/, $scanentry ); - print <<END - <tr><td colspan="5"> - <tr><td align='left' colspan="2"><b>/dev/$scanline[0]</b> - <td align='center' colspan="2">$scanline[1] + # remove wrong entries like usb controller name + if ($scanline[1] ne "\n") + { + print <<END + <tr><td colspan="5"> </td></tr> + <tr><td align='left' colspan="2"><b>/dev/$scanline[0]</b></td> + <td align='center' colspan="2">$scanline[1]</td> END ; + + } foreach $partitionentry (sort @partitions) { @partitionline = split( /;/, $partitionentry ); if ( "$partitionline[0]" eq "$scanline[0]" ) { $size = int($partitionline[1] / 1024); print <<END - <td align='center'>$Lang::tr{'size'} $size MB - <td> - <tr><td colspan="5"> + <td align='center'>$Lang::tr{'size'} $size MB</td> + <td> </td></tr> + <tr><td colspan="5"> </td></tr> END ; } @@ -202,28 +207,31 @@ END foreach $partitionentry (sort @partitions) { @partitionline = split( /;/, $partitionentry ); - if (( "$partitionline[0]" =~ /^$scanline[0]/ ) && !( "$partitionline[2]" eq "" )) { + if (( "$partitionline[0]" =~ /^$scanline[0]/ ) && ! ( "$partitionline[0]" eq "$scanline[0]" )) { $size = int($partitionline[1] / 1024); print <<END <form method='post' action='$ENV{'SCRIPT_NAME'}'> - <tr><td align="left" colspan=5><b>UUID=$partitionline[2]</b></td></tr> + <tr><td align="left" colspan=5><strong>UUID=$partitionline[2]</strong></td></tr> <tr> <td align="list">/dev/$partitionline[0]</td> - <td align="center">$Lang::tr{'size'} $size MB + <td align="center">$Lang::tr{'size'} $size MB</td> <td align="center"><select name="FS"> <option value="auto">auto</option> <option value="ext3">ext3</option> + <option value="ext4">ext4</option> <option value="reiserfs">reiserfs</option> <option value="vfat">fat</option> <option value="ntfs-3g">ntfs (experimental)</option> - </select> - <td align="center"><input type='text' name='PATH' value=/mnt/harddisk /> + </select></td> + <td align="center"><input type='text' name='PATH' value=/mnt/harddisk /></td> <td align="center"> <input type='hidden' name='DEVICE' value='$partitionline[0]' /> <input type='hidden' name='UUID' value='$partitionline[2]' /> <input type='hidden' name='ACTION' value=$Lang::tr{'add'} /> <input type='image' alt=$Lang::tr{'add'} src='/images/add.gif' /> - </form> + </form></td></tr> +END +;
END ; @@ -232,7 +240,9 @@ END }
print <<END - <tr><td align="center" colspan="5">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. + <tr><td align="center" colspan="5"> </td></tr> + <tr><td align="center" colspan="5"> </td></tr> + <tr><td align="center" colspan="5">$Lang::tr{'extrahd install or load driver'}</td></tr> </table> END ; diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index b78efc5..81cc3ee 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -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 --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 20a2681..ad48b4a 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -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 --git a/langs/es/cgi-bin/es.pl b/langs/es/cgi-bin/es.pl index e35c680..1b3c62f 100644 --- a/langs/es/cgi-bin/es.pl +++ b/langs/es/cgi-bin/es.pl @@ -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 --git a/langs/fr/cgi-bin/fr.pl b/langs/fr/cgi-bin/fr.pl index 8d52e1d..c2ac5b4 100644 --- a/langs/fr/cgi-bin/fr.pl +++ b/langs/fr/cgi-bin/fr.pl @@ -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.',
hooks/post-receive -- IPFire 2.x development tree