Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next

diff --git a/doc/language_issues.de b/doc/language_issues.de
index 6c204b1c1c10ae53049cbc8157531328874e5c3c..2174633695b83df67d6a6726e8e5437dd1e851d3 100644 (file)
--- a/doc/language_issues.de
+++ b/doc/language_issues.de
@@ -144,6 +144,8 @@ WARNING: translation string unused: error external access
 WARNING: translation string unused: expected
 WARNING: translation string unused: exportkey
 WARNING: translation string unused: external access rule changed
+WARNING: translation string unused: extrahd unable to read
+WARNING: translation string unused: extrahd unable to write
 WARNING: translation string unused: filename
 WARNING: translation string unused: firewall graphs
 WARNING: translation string unused: firewall log viewer

diff --git a/doc/language_issues.en b/doc/language_issues.en
index 63eda2cae4a02bac7cf2915d022113e25358bae6..883b0045f72815c6a18e59bdcbe535f86e64191f 100644 (file)
--- a/doc/language_issues.en
+++ b/doc/language_issues.en
@@ -168,6 +168,8 @@ WARNING: translation string unused: error external access
 WARNING: translation string unused: expected
 WARNING: translation string unused: exportkey
 WARNING: translation string unused: external access rule changed
+WARNING: translation string unused: extrahd unable to read
+WARNING: translation string unused: extrahd unable to write
 WARNING: translation string unused: filename
 WARNING: translation string unused: firewall graphs
 WARNING: translation string unused: firewall log viewer

diff --git a/doc/language_issues.es b/doc/language_issues.es
index 376ee6ed005a3dee11d5eefb0f11f3af93d85344..c3e97feb915158e204c4abadafffee2bac22f310 100644 (file)
--- a/doc/language_issues.es
+++ b/doc/language_issues.es
@@ -168,6 +168,8 @@ WARNING: translation string unused: error external access
 WARNING: translation string unused: expected
 WARNING: translation string unused: exportkey
 WARNING: translation string unused: external access rule changed
+WARNING: translation string unused: extrahd unable to read
+WARNING: translation string unused: extrahd unable to write
 WARNING: translation string unused: filename
 WARNING: translation string unused: firewall graphs
 WARNING: translation string unused: firewall log viewer
@@ -531,3 +533,4 @@ WARNING: untranslated string: outgoing firewall reserved groupname
 WARNING: untranslated string: outgoing firewall view group
 WARNING: untranslated string: pakfire ago
 WARNING: untranslated string: system information
+WARNING: untranslated string: vpn keyexchange

diff --git a/doc/language_issues.fr b/doc/language_issues.fr
index 98c6a69aeb85e86bee7efd828ef8082f8f5ea3e2..70618b50f51ac78b29332e85947de491ac76b2c9 100644 (file)
--- a/doc/language_issues.fr
+++ b/doc/language_issues.fr
@@ -168,7 +168,8 @@ WARNING: translation string unused: error external access
 WARNING: translation string unused: expected
 WARNING: translation string unused: exportkey
 WARNING: translation string unused: external access rule changed
-WARNING: translation string unused: extrahd founded drives
+WARNING: translation string unused: extrahd unable to read
+WARNING: translation string unused: extrahd unable to write
 WARNING: translation string unused: filename
 WARNING: translation string unused: firewall graphs
 WARNING: translation string unused: firewall log viewer
@@ -497,7 +498,6 @@ WARNING: translation string unused: yearly firewallhits
 WARNING: untranslated string: Scan for Songs
 WARNING: untranslated string: bytes
 WARNING: untranslated string: dns address deleted txt
-WARNING: untranslated string: extrahd detected drives
 WARNING: untranslated string: fireinfo ipfire version
 WARNING: untranslated string: fireinfo is disabled
 WARNING: untranslated string: fireinfo is enabled
@@ -525,6 +525,7 @@ WARNING: untranslated string: system information
 WARNING: untranslated string: upload new ruleset
 WARNING: untranslated string: urlfilter file ext block
 WARNING: untranslated string: urlfilter mode block
+WARNING: untranslated string: vpn keyexchange
 WARNING: untranslated string: wlanap access point
 WARNING: untranslated string: wlanap channel
 WARNING: untranslated string: wlanap debugging

diff --git a/doc/language_issues.pl b/doc/language_issues.pl
index 376ee6ed005a3dee11d5eefb0f11f3af93d85344..c3e97feb915158e204c4abadafffee2bac22f310 100644 (file)
--- a/doc/language_issues.pl
+++ b/doc/language_issues.pl
@@ -168,6 +168,8 @@ WARNING: translation string unused: error external access
 WARNING: translation string unused: expected
 WARNING: translation string unused: exportkey
 WARNING: translation string unused: external access rule changed
+WARNING: translation string unused: extrahd unable to read
+WARNING: translation string unused: extrahd unable to write
 WARNING: translation string unused: filename
 WARNING: translation string unused: firewall graphs
 WARNING: translation string unused: firewall log viewer
@@ -531,3 +533,4 @@ WARNING: untranslated string: outgoing firewall reserved groupname
 WARNING: untranslated string: outgoing firewall view group
 WARNING: untranslated string: pakfire ago
 WARNING: untranslated string: system information
+WARNING: untranslated string: vpn keyexchange

diff --git a/doc/language_missings b/doc/language_missings
index 46bfe68d9b02a62762b4467fb458fa4bcb51ca01..a98df06c70b87fa8e03b2489257f11a90fea1fa3 100644 (file)
--- a/doc/language_missings
+++ b/doc/language_missings
@@ -11,7 +11,6 @@
 # Checking cgi-bin translations for language: fr                           #
 ############################################################################
 < dns address deleted txt
-< extrahd detected drives
 < fireinfo ipfire version
 < fireinfo is disabled
 < fireinfo is enabled
@@ -36,6 +35,7 @@
 < upload new ruleset
 < urlfilter file ext block
 < urlfilter mode block
+< vpn keyexchange
 < wlanap access point
 < wlanap channel
 < wlanap debugging
@@ -96,288 +96,20 @@
 < outgoing firewall view group
 < Set time on boot
 < system information
+< vpn keyexchange
 ############################################################################
 # Checking install/setup translations for language: pl                     #
 ############################################################################
-< TR_ISDN
-< TR_ERROR_PROBING_ISDN
-< TR_PROBING_ISDN
-< TR_MISSING_GREEN_IP
-< TR_CHOOSE_FILESYSTEM
-< TR_NOT_ENOUGH_INTERFACES
-< TR_INTERFACE_CHANGE
-< TR_NETCARD_COLOR
-< TR_REMOVE
-< TR_MISSING_DNS
-< TR_MISSING_DEFAULT
-< TR_JOURNAL_EXT3
-< TR_CHOOSE_NETCARD
-< TR_NETCARDMENU2
-< TR_ERROR_INTERFACES
-< TR_REMOVE_CARD
-< TR_JOURNAL_ERROR
-< TR_FILESYSTEM
-< TR_ADDRESS_SETTINGS
-< TR_ADMIN_PASSWORD
-< TR_AGAIN_PROMPT
-< TR_ALL_CARDS_SUCCESSFULLY_ALLOCATED
-< TR_AUTODETECT
-< TR_BUILDING_INITRD
-< TR_CANCEL
-< TR_CARD_ASSIGNMENT
-< TR_CHECKING
-< TR_CHECKING_FOR
-< TR_CHOOSE_THE_ISDN_CARD_INSTALLED
-< TR_CHOOSE_THE_ISDN_PROTOCOL
-< TR_CONFIGURE_DHCP
-< TR_CONFIGURE_NETWORKING
-< TR_CONFIGURE_NETWORKING_LONG
-< TR_CONFIGURE_NETWORK_DRIVERS
-< TR_CONFIGURE_THE_CDROM
-< TR_CONGRATULATIONS
-< TR_CONGRATULATIONS_LONG
-< TR_CONTINUE_NO_SWAP
-< TR_CURRENT_CONFIG
-< TR_DEFAULT_GATEWAY
-< TR_DEFAULT_GATEWAY_CR
-< TR_DEFAULT_LEASE
-< TR_DEFAULT_LEASE_CR
-< TR_DETECTED
-< TR_DHCP_HOSTNAME
-< TR_DHCP_HOSTNAME_CR
-< TR_DHCP_SERVER_CONFIGURATION
-< TR_DISABLED
-< TR_DISABLE_ISDN
-< TR_DISK_TOO_SMALL
-< TR_DNS_AND_GATEWAY_SETTINGS
-< TR_DNS_AND_GATEWAY_SETTINGS_LONG
-< TR_DNS_GATEWAY_WITH_GREEN
-< TR_DOMAINNAME
-< TR_DOMAINNAME_CANNOT_BE_EMPTY
-< TR_DOMAINNAME_CANNOT_CONTAIN_SPACES
-< TR_DOMAINNAME_NOT_VALID_CHARS
-< TR_DOMAIN_NAME_SUFFIX
-< TR_DOMAIN_NAME_SUFFIX_CR
-< TR_DONE
-< TR_DO_YOU_WISH_TO_CHANGE_THESE_SETTINGS
-< TR_DRIVERS_AND_CARD_ASSIGNMENTS
-< TR_ENABLED
-< TR_ENABLE_ISDN
-< TR_END_ADDRESS
-< TR_END_ADDRESS_CR
-< TR_ENTER_ADDITIONAL_MODULE_PARAMS
-< TR_ENTER_ADMIN_PASSWORD
-< TR_ENTER_DOMAINNAME
-< TR_ENTER_HOSTNAME
-< TR_ENTER_IP_ADDRESS_INFO
-< TR_ENTER_NETWORK_DRIVER
-< TR_ENTER_ROOT_PASSWORD
-< TR_ENTER_SETUP_PASSWORD
-< TR_ENTER_THE_IP_ADDRESS_INFORMATION
-< TR_ENTER_THE_LOCAL_MSN
-< TR_ENTER_URL
-< TR_ERROR
-< TR_ERROR_PROBING_CDROM
-< TR_ERROR_WRITING_CONFIG
-< TR_EURO_EDSS1
-< TR_EXTRACTING_MODULES
-< TR_FAILED_TO_FIND
-< TR_FOUND_NIC
-< TR_GERMAN_1TR6
-< TR_HELPLINE
-< TR_HOSTNAME
-< TR_HOSTNAME_CANNOT_BE_EMPTY
-< TR_HOSTNAME_CANNOT_CONTAIN_SPACES
-< TR_HOSTNAME_NOT_VALID_CHARS
-< TR_INITIALISING_ISDN
-< TR_INSERT_CDROM
-< TR_INSERT_FLOPPY
-< TR_INSTALLATION_CANCELED
-< TR_INSTALLING_FILES
-< TR_INSTALLING_GRUB
-< TR_INSTALLING_LANG_CACHE
-< TR_INTERFACE
-< TR_INTERFACE_FAILED_TO_COME_UP
-< TR_INVALID_FIELDS
-< TR_INVALID_IO
-< TR_INVALID_IRQ
-< TR_IP_ADDRESS_CR
-< TR_IP_ADDRESS_PROMPT
-< TR_ISDN_CARD
-< TR_ISDN_CARD_NOT_DETECTED
-< TR_ISDN_CARD_SELECTION
-< TR_ISDN_CONFIGURATION
-< TR_ISDN_CONFIGURATION_MENU
-< TR_ISDN_NOT_SETUP
-< TR_ISDN_NOT_YET_CONFIGURED
-< TR_ISDN_PROTOCOL_SELECTION
-< TR_ISDN_STATUS
-< TR_KEYBOARD_MAPPING
-< TR_KEYBOARD_MAPPING_LONG
-< TR_LEASED_LINE
-< TR_LOADING_MODULE
-< TR_LOADING_PCMCIA
-< TR_LOOKING_FOR_NIC
-< TR_MAKING_BOOT_FILESYSTEM
-< TR_MAKING_LOG_FILESYSTEM
-< TR_MAKING_ROOT_FILESYSTEM
-< TR_MAKING_SWAPSPACE
-< TR_MANUAL
-< TR_MAX_LEASE
-< TR_MAX_LEASE_CR
-< TR_MISSING_BLUE_IP
-< TR_MISSING_ORANGE_IP
-< TR_MISSING_RED_IP
-< TR_MODULE_NAME_CANNOT_BE_BLANK
-< TR_MODULE_PARAMETERS
-< TR_MOUNTING_BOOT_FILESYSTEM
-< TR_MOUNTING_LOG_FILESYSTEM
-< TR_MOUNTING_ROOT_FILESYSTEM
-< TR_MOUNTING_SWAP_PARTITION
-< TR_MSN_CONFIGURATION
-< TR_NETMASK_PROMPT
-< TR_NETWORKING
-< TR_NETWORK_ADDRESS_CR
-< TR_NETWORK_ADDRESS_PROMPT
-< TR_NETWORK_CONFIGURATION_MENU
-< TR_NETWORK_CONFIGURATION_TYPE
-< TR_NETWORK_CONFIGURATION_TYPE_LONG
-< TR_NETWORK_MASK_CR
-< TR_NETWORK_SETUP_FAILED
-< TR_NOT_ENOUGH_CARDS_WERE_ALLOCATED
-< TR_NO_BLUE_INTERFACE
-< TR_NO_CDROM
-< TR_NO_GREEN_INTERFACE
-< TR_NO_HARDDISK
-< TR_NO_IPCOP_TARBALL_FOUND
-< TR_NO_ORANGE_INTERFACE
-< TR_NO_RED_INTERFACE
-< TR_NO_SCSI_IMAGE_FOUND
-< TR_NO_UNALLOCATED_CARDS
-< TR_OK
-< TR_PARTITIONING_DISK
-< TR_PASSWORDS_DO_NOT_MATCH
-< TR_PASSWORD_CANNOT_BE_BLANK
-< TR_PASSWORD_CANNOT_CONTAIN_SPACES
-< TR_PASSWORD_PROMPT
-< TR_PHONENUMBER_CANNOT_BE_EMPTY
-< TR_PREPARE_HARDDISK
-< TR_PRESS_OK_TO_REBOOT
-< TR_PRIMARY_DNS
-< TR_PRIMARY_DNS_CR
-< TR_PROBE
-< TR_PROBE_FAILED
-< TR_PROBING_HARDWARE
-< TR_PROBING_FOR_NICS
-< TR_PROBLEM_SETTING_ADMIN_PASSWORD
-< TR_PROBLEM_SETTING_ROOT_PASSWORD
-< TR_PROBLEM_SETTING_SETUP_PASSWORD
-< TR_PROTOCOL_COUNTRY
-< TR_PULLING_NETWORK_UP
-< TR_PUSHING_NETWORK_DOWN
-< TR_PUSHING_NON_LOCAL_NETWORK_DOWN
-< TR_QUIT
-< TR_RED_IN_USE
-< TR_RESTART_REQUIRED
-< TR_RESTORE
-< TR_RESTORE_CONFIGURATION
-< TR_ROOT_PASSWORD
-< TR_SECONDARY_DNS
-< TR_SECONDARY_DNS_CR
-< TR_SECONDARY_WITHOUT_PRIMARY_DNS
-< TR_SECTION_MENU
-< TR_SELECT
-< TR_SELECT_CDROM_TYPE
-< TR_SELECT_CDROM_TYPE_LONG
-< TR_SELECT_INSTALLATION_MEDIA
-< TR_SELECT_INSTALLATION_MEDIA_LONG
-< TR_SELECT_NETWORK_DRIVER
-< TR_SELECT_NETWORK_DRIVER_LONG
-< TR_SELECT_THE_INTERFACE_YOU_WISH_TO_RECONFIGURE
-< TR_SELECT_THE_ITEM
-< TR_SETTING_ADMIN_PASSWORD
-< TR_SETTING_ROOT_PASSWORD
-< TR_SETTING_SETUP_PASSWORD
-< TR_SETUP_FINISHED
-< TR_SETUP_NOT_COMPLETE
-< TR_SETUP_PASSWORD
-< TR_SET_ADDITIONAL_MODULE_PARAMETERS
-< TR_SINGLE_GREEN
-< TR_SKIP
-< TR_START_ADDRESS
-< TR_START_ADDRESS_CR
-< TR_STATIC
-< TR_SUGGEST_IO
-< TR_SUGGEST_IRQ
-< TR_THIS_DRIVER_MODULE_IS_ALREADY_LOADED
-< TR_TIMEZONE
-< TR_TIMEZONE_LONG
-< TR_UNABLE_TO_EJECT_CDROM
-< TR_UNABLE_TO_EXTRACT_MODULES
-< TR_UNABLE_TO_FIND_ANY_ADDITIONAL_DRIVERS
-< TR_UNABLE_TO_FIND_AN_ISDN_CARD
-< TR_UNABLE_TO_INITIALISE_ISDN
-< TR_UNABLE_TO_INSTALL_FILES
-< TR_UNABLE_TO_INSTALL_LANG_CACHE
-< TR_UNABLE_TO_INSTALL_GRUB
-< TR_UNABLE_TO_LOAD_DRIVER_MODULE
-< TR_UNABLE_TO_MAKE_BOOT_FILESYSTEM
-< TR_UNABLE_TO_MAKE_LOG_FILESYSTEM
-< TR_UNABLE_TO_MAKE_ROOT_FILESYSTEM
-< TR_UNABLE_TO_MAKE_SWAPSPACE
-< TR_UNABLE_TO_MAKE_SYMLINK_DEV_HARDDISK
-< TR_UNABLE_TO_MAKE_SYMLINK_DEV_HARDDISK1
-< TR_UNABLE_TO_MAKE_SYMLINK_DEV_HARDDISK2
-< TR_UNABLE_TO_MAKE_SYMLINK_DEV_HARDDISK3
-< TR_UNABLE_TO_MAKE_SYMLINK_DEV_HARDDISK4
-< TR_UNABLE_TO_MAKE_SYMLINK_DEV_ROOT
-< TR_UNABLE_TO_MOUNT_BOOT_FILESYSTEM
-< TR_UNABLE_TO_MOUNT_LOG_FILESYSTEM
-< TR_UNABLE_TO_MOUNT_PROC_FILESYSTEM
-< TR_UNABLE_TO_MOUNT_ROOT_FILESYSTEM
-< TR_UNABLE_TO_MOUNT_SWAP_PARTITION
-< TR_UNABLE_TO_OPEN_HOSTS_FILE
-< TR_UNABLE_TO_OPEN_SETTINGS_FILE
-< TR_UNABLE_TO_PARTITION
-< TR_UNABLE_TO_REMOVE_TEMP_FILES
-< TR_UNABLE_TO_SET_HOSTNAME
-< TR_UNABLE_TO_UNMOUNT_CDROM
-< TR_UNABLE_TO_UNMOUNT_HARDDISK
-< TR_UNABLE_TO_WRITE_ETC_FSTAB
-< TR_UNABLE_TO_WRITE_ETC_HOSTNAME
-< TR_UNABLE_TO_WRITE_ETC_HOSTS
-< TR_UNABLE_TO_WRITE_ETC_HOSTS_ALLOW
-< TR_UNABLE_TO_WRITE_ETC_HOSTS_DENY
-< TR_UNABLE_TO_WRITE_VAR_SMOOTHWALL_ETHERNET_SETTINGS
-< TR_UNABLE_TO_WRITE_VAR_SMOOTHWALL_MAIN_HOSTNAMECONF
-< TR_UNABLE_TO_WRITE_VAR_SMOOTHWALL_MAIN_SETTINGS
-< TR_UNCLAIMED_DRIVER
-< TR_UNKNOWN
-< TR_UNSET
-< TR_USB_KEY_VFAT_ERR
-< TR_US_NI1
-< TR_WARNING
-< TR_WARNING_LONG
-< TR_WELCOME
-< TR_YOUR_CONFIGURATION_IS_SINGLE_GREEN_ALREADY_HAS_DRIVER
-< TR_YES
-< TR_NO
-< TR_AS
-< TR_IGNORE
-< TR_PPP_DIALUP
-< TR_DHCP
-< TR_DHCP_STARTSERVER
-< TR_DHCP_STOPSERVER
-< TR_LICENSE_ACCEPT
-< TR_LICENSE_NOT_ACCEPTED
-< TR_EXT2FS_DESCR
-< TR_EXT3FS_DESCR
-< TR_EXT4FS_DESCR
-< TR_REISERFS_DESCR
-< TR_NO_LOCAL_SOURCE
-< TR_DOWNLOADING_ISO
-< TR_DOWNLOAD_ERROR
-< TR_DHCP_FORCE_MTU
 ############################################################################
 # 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
+< vpn keyexchange

diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index 126213dec754afb31e194e86679049c960c4040c..2c9592218ebac7b2f11b0ee0f5bc0275ece720e7 100644 (file)
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -1,7 +1,6 @@
 %tr = ( 
 %tr,
 
-'vpn keyexchange' => 'Schlüsseltausch',
 'Act as' => 'Konfiguriert als',
 'Add Level7 rule' => 'Level7-Regel hinzufügen',
 'Add Port Rule' => 'Port Regel hinzufügen',
@@ -775,16 +774,16 @@
 'external access rule removed' => ' Regel für externen Zugang entfernt; Starte Zugangskontroller neu',
 'external aliases configuration' => 'Externe Alias-Konfiguration',
 'extrahd' => 'ExtraHD',
+'extrahd because there is already a device mounted' => ' mounten, weil bereits ein Geräte gemountet ist',
+'extrahd cant umount' => 'Konnte',
 'extrahd detected drives' => 'gefundene Laufwerke',
+'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.',
+'extrahd maybe the device is in use' => 'nicht mounten. Vielleicht wird das Gerät bereits verwendet',
+'extrahd to' => 'nicht nach',
+'extrahd to root' => 'nicht nach root mounten',
 '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.',
@@ -2087,6 +2086,7 @@
 'vpn delayed start' => 'Verzögerung bevor VPN gestartet wird (Sekunden)',
 'vpn delayed start help' => 'Falls notwendig, kann diese Verzögerung dazu verwendet werden, um Dynamic DNS Updates ordnungsgemäß anzuwenden. 60 ist ein gängiger Wert, wenn ROT (RED) eine dynamische IP Adresse ist.',
 'vpn incompatible use of defaultroute' => 'Hostname=%defaultroute nicht zulässig',
+'vpn keyexchange' => 'Schlüsseltausch',
 'vpn local id' => 'Lokale ID',
 'vpn missing remote id' => 'Sie müssen einen korrekten Distinguished Name (DN) für diese Authentifikation eingeben.',
 'vpn mtu invalid' => 'MTU muß ein numerischer Wert sein!',

diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index c774168bdaa03b99ee3c358f8582d3b552fe6ba8..92d9f8fdabb7882683c8626b693fc91df39a6ef4 100644 (file)
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -1,7 +1,6 @@
 %tr = ( 
 %tr,
-'vpn keyexchange' => 'Keyexchange'
-'Act as' => 'Act as:',
+
 'Act as' => 'Act as:',
 'Add Level7 rule' => 'Add Level7 rule',
 'Add Port Rule' => 'Add port rule',
@@ -799,16 +798,16 @@
 'external access rule removed' => ' External access rule removed; restarting access controller',
 'external aliases configuration' => 'External aliases configuration',
 'extrahd' => 'ExtraHD',
+'extrahd because there is already a device mounted' => ', because there is already a device mounted',
+'extrahd cant umount' => 'Can\'t umount',
 'extrahd detected drives' => 'detected drives',
+'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.',
+'extrahd maybe the device is in use' => '. Maybe the device is in use',
+'extrahd to' => 'to',
+'extrahd to root' => 'to root',
 '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.',
@@ -2121,6 +2120,7 @@
 'vpn delayed start' => 'Delay before launching VPN (seconds)',
 'vpn delayed start help' => 'If required, this delay can be used to allow dynamic DNS updates to propagate properly. 60 is a common value when RED is a dynamic IP.',
 'vpn incompatible use of defaultroute' => 'hostname=%defaultroute not allowed',
+'vpn keyexchange' => 'Keyexchange',
 'vpn local id' => 'Local ID',
 'vpn missing remote id' => 'You must specify a correct Distinguished Name (DN) for this authentication.',
 'vpn mtu invalid' => 'MTU must be a numeric value!',

diff --git a/langs/es/cgi-bin/es.pl b/langs/es/cgi-bin/es.pl
index 585f1244912f808b5a5a91407b59dde8935c2fc5..41c0917f50b3282fefedb4afbd070a9aada4b834 100644 (file)
--- a/langs/es/cgi-bin/es.pl
+++ b/langs/es/cgi-bin/es.pl
@@ -796,16 +796,16 @@
 'external access rule removed' => '"Reglas de acceso externo eliminadas; reiniciando controlador de acceso"',
 'external aliases configuration' => 'Configuración de Alias externo',
 'extrahd' => 'Disco duro Adicional',
+'extrahd because there is already a device mounted' => ', because there is already a device mounted',
+'extrahd cant umount' => 'Can\'t umount',
 'extrahd detected drives' => 'Unidades encontradas',
+'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.',
+'extrahd maybe the device is in use' => '. Maybe the device is in use',
+'extrahd to' => 'to',
+'extrahd to root' => 'to root',
 '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 53c0f9f76454afab7ebad165b25bc20781786be5..62bfb28d70aa8a878c33bbe3f1ac576ba111d1a6 100644 (file)
--- a/langs/fr/cgi-bin/fr.pl
+++ b/langs/fr/cgi-bin/fr.pl
@@ -797,16 +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 because there is already a device mounted' => ' car vous avez déjà un support de monté',
+'extrahd cant umount' => 'Impossible de démonter',
 'extrahd detected drives' => 'Périphériques trouvés',
+'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.',
+'extrahd maybe the device is in use' => '. Votre support est peut-être en cours d\'utilisation',
+'extrahd to' => 'vers',
+'extrahd to root' => 'vers root',
 '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.',