More ui-lib conversion, plus better UI for dev/nodev and exec/noexec fields

2026-02-03 14:13:29 +00:00 · 2012-05-29 18:02:20 -07:00
parent bfbfc61ebb
commit 8a464faa2b
38 changed files with 61 additions and 568 deletions
--- a/mount/help/linux_nodev.ca.html
+++ b/mount/help/linux_nodev.ca.html
@@ -1,6 +0,0 @@
-<header>Permet fitxers de dispositiu</header>
-
-Interpreta els dispositius especials de blocs o caràcters al sistema de
-fitxers muntat.<br>
-<br>opcions de muntatge: dev/nodev</i>
-<hr>
--- a/mount/help/linux_nodev.fa.html
+++ b/mount/help/linux_nodev.fa.html
@@ -1,7 +0,0 @@
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-
-<body dir="rtl">
-<b>آيا به پرونده هاي دستگاه اجازه داده شود؟ </b>نويسه يا بلوکهای دستگاه هاي خاص 
-را بر روي سيستم پرونده هاي سوار شده ترجمه می کند.<br>
-<br>
-<i>گزينه هاي سوار شدن: dev/nodev</i><hr>
--- a/mount/help/linux_nodev.fr.html
+++ b/mount/help/linux_nodev.fr.html
@@ -1,5 +0,0 @@
-<header>Autoriser les fichiers de p&#233;riph&#233;riques ?</header>
-
-Interpr&#233;ter les fichiers sp&#233;ciaux de p&#233;riph&#233;riques sur le syst&#232;me de fichiers mont&#233;.<br>
-<br><i>Options de mount : dev/nodev</i>
-<hr>
--- a/mount/help/linux_nodev.html
+++ b/mount/help/linux_nodev.html
@@ -1,4 +1,4 @@
-<header>Allow device files?</header>
+<header>Disallow device files?</header>

 Interpret character or block special devices on the mounted filesystem.<br>
 <br><i>mount options: dev/nodev</i>
--- a/mount/help/linux_nodev.ko_KR.UTF-8.html
+++ b/mount/help/linux_nodev.ko_KR.UTF-8.html
@@ -1,5 +0,0 @@
-<header>장치 파일 허용</header>
-
-화일 시스템 상의 문자, 블럭 특수 장치를 해석한다.<br>
-<br><i>mount 옵션: dev/nodev</i>
-<hr>
--- a/mount/help/linux_nodev.ko_KR.euc.html
+++ b/mount/help/linux_nodev.ko_KR.euc.html
@@ -1,5 +0,0 @@
-<header>장치 파일 허용</header>
-
-화일 시스템 상의 문자, 블럭 특수 장치를 해석한다.<br>
-<br><i>mount 옵션: dev/nodev</i>
-<hr>
--- a/mount/help/linux_nodev.nl.html
+++ b/mount/help/linux_nodev.nl.html
@@ -1,5 +0,0 @@
-<header>Apparaat files toestaan?</header>
-
-Karakter interpreteren of blok speciale apparaten op het ge-mounten filesysteem.<br>
-<br><i>mount opties: dev/nodev</i>
-<hr>
--- a/mount/help/linux_noexec.ca.html
+++ b/mount/help/linux_noexec.ca.html
@@ -1,7 +0,0 @@
-<header>Permet l'execució de binaris</header>
-
-Permet l'execució dels binaris en el sistema de fitxers muntat.<br>
-Aquesta opció pot ser útil per un servidor que té sistemes de fitxers que 
-contenen binaris d'arquitectures diferents de la pròpia.<br>
-<br><i>opcions de muntatge: exec/noexec</i>
-<hr>
--- a/mount/help/linux_noexec.fa.html
+++ b/mount/help/linux_noexec.fa.html
@@ -1,8 +0,0 @@
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<body dir="rtl">
-<b>آيا اجازه اجرا کردن دوگاني ها داده شود؟</b> اجازه اجرا کردن همه دوگاني ها را بر روي 
-سيستم پرونده سوار شده می دهد.<br>
-اين گزينه براي سرويس دهنده هایي که داراي سيستم پرونده هاي شامل دوگاني های با معماري متفاوت با 
-معماری خودشان می باشند، مفيد است.<br>
-<br>
-<i>گزينه هاي سوار شدن: exec/noexec</i><hr>
--- a/mount/help/linux_noexec.fr.html
+++ b/mount/help/linux_noexec.fr.html
@@ -1,6 +0,0 @@
-<header>Autoriser l'ex&#233;cution des binaires ?</header>
-
-Autoriser l'ex&#233;cution de fichiers binaires sur le syst&#232;me de fichiers mont&#233;.<br>
-Cette option peut &#234;tre utile pour un serveur qui poss&#232;de un syst&#232;me de fichiers qui contient des binaires pour des architectures autre que la sienne.<br>
-<br><i>Options de mount : exec/noexec</i>
-<hr>
--- a/mount/help/linux_noexec.html
+++ b/mount/help/linux_noexec.html
@@ -1,4 +1,4 @@
-<header>Allow execution of binaries?</header>
+<header>Disallow execution of binaries?</header>

 Allow execution of any binaries on the mounted file system.<br>
 This option might be useful for a server that has filesystems containing binaries for architectures other than its own.<br>
--- a/mount/help/linux_noexec.ko_KR.UTF-8.html
+++ b/mount/help/linux_noexec.ko_KR.UTF-8.html
@@ -1,6 +0,0 @@
-<header>이진 파일 실행 허가</header>
-
-마운트된 파일시스템에서 어떤 이진 파일의 실행을 허가한다.<br>
-이 옵션은 다른 아키텍쳐의 이진 파일을 포함하고 있는 파일시스템을 가진 서버에서 유용하다.<br>
-<br><i>마운트 옵션: exec/noexec</i>
-<hr>
--- a/mount/help/linux_noexec.ko_KR.euc.html
+++ b/mount/help/linux_noexec.ko_KR.euc.html
@@ -1,6 +0,0 @@
-<header>이진 파일 실행 허가</header>
-
-마운트된 파일시스템에서 어떤 이진 파일의 실행을 허가한다.<br>
-이 옵션은 다른 아키텍쳐의 이진 파일을 포함하고 있는 파일시스템을 가진 서버에서 유용하다.<br>
-<br><i>마운트 옵션: exec/noexec</i>
-<hr>
--- a/mount/help/linux_noexec.nl.html
+++ b/mount/help/linux_noexec.nl.html
@@ -1,7 +0,0 @@
-<header>Uitvoeren van binaire bestanden toestaan?</header>
-
-Uitvoeren van alle binaire bestanden toestaan op het ge-mounten filesysteem.<br>
-Deze optie kan erg handig zijn voor een server die binaire bestanden heeft op het filesysteem voor
-andere architecturen dan van hemzelf.<br>
-<br><i>mount opties: exec/noexec</i>
-<hr>
--- a/mount/lang/ca
+++ b/mount/lang/ca
@@ -264,8 +264,6 @@ linux_usel=Partici
 linux_other=Altres dispositius
 linux_ro=Només lectura
 linux_sync=Escriptura del buffer al sistema de fitxers
-linux_nodev=Permet fitxers de dispositiu
-linux_noexec=Permet l'execució de binaris
 linux_nosuid=No permetis programes setuid
 linux_user=Permet que els usuaris muntin aquest sistema de fitxers
 linux_check=Comprova el mode
--- a/mount/lang/cz
+++ b/mount/lang/cz
@@ -192,9 +192,7 @@ linux_mode=Souborov
 linux_nfsdir=Adresář NFS
 linux_nfshost=Jméno hostitele NFS
 linux_noatime=Neaktualizovat čas posledního přístupu?
-linux_nodev=Povolit soubory zařízení?
 linux_noenforce=Ano, ale nevynucovat
-linux_noexec=Povolit spuštění binárních souborů?
 linux_none=Nic
 linux_noopts=Nejsou k dispozici žádná nastavení
 linux_normal=Normální
--- a/mount/lang/de
+++ b/mount/lang/de
@@ -185,9 +185,7 @@ linux_mname=Server-Adresse
 linux_mode=Dateirechte f&uuml;r Nicht-Unix-CDs
 linux_nfsdir=NFS-Verzeichnis
 linux_nfshost=NFS-Host-Name
-linux_nodev=Erlaube Ger&auml;tedateien?
 linux_noenforce=Ja, aber nicht erzwingen
-linux_noexec=Erlaube das Ausf&uuml;hren von Programmen?
 linux_none=Keiner
 linux_noopts=Keine Einstellungen verf&uuml;gbar
 linux_normal=Normal
--- a/mount/lang/en
+++ b/mount/lang/en
@@ -39,6 +39,7 @@ edit_adv=Mount Options
 edit_comm_opt=Common mount options
 edit_ext_opt=ext2/ext3 specific options
 edit_nfs_opt=NFS specific options
+edit_nfs_opt4=NFSv4 specific options
 edit_dos_opt=DOS-based filesystems options
 edit_hpfs_opt=hpfs specific options
 edit_iso9660_opt=ISO9660 specific options
@@ -270,9 +271,8 @@ linux_usel=Partition with ID
 linux_other=Other device
 linux_ro=Read-only?
 linux_sync=Buffer writes to filesystem?
-linux_nodev=Allow device files?
-linux_noexec=Allow execution of binaries?
 linux_nosuid=Disallow setuid programs?
+linux_ifuser=If mountable by users
 linux_user=Allow users to mount this filesystem?
 linux_check=Check mode
 linux_normal=Normal
--- a/mount/lang/en.bak
+++ b/mount/lang/en.bak
@@ -1,394 +0,0 @@
-index_title=Disk and Network Filesystems
-index_dir=Mounted As
-index_type=Type
-index_dev=Location
-index_use=In use?
-index_perm=Permanent?
-index_add=Add mount
-index_auto=Unknown Type
-index_swap=Virtual Memory
-index_return=filesystems list
-
-edit_title=Edit Mount
-create_title=Create Mount
-edit_err=Failed to edit mount
-edit_egone=This mount no longer exists
-edit_header=$1 Mount Details
-edit_dir=Mounted As
-edit_swap=Virtual Memory
-edit_size=Size
-edit_free=Free
-edit_savemount=Save Mount?
-edit_boot=Save and mount at boot
-edit_save=Save
-edit_delete=Delete
-edit_dont=Don't save
-edit_now=Mount now?
-edit_mount=Mount
-edit_dont2=Don't mount
-edit_unmount=Unmount
-edit_order=Check filesystem at boot?
-edit_first=Check First
-edit_second=Check Second
-edit_adv=Advanced Mount Options
-edit_list=List Users
-edit_create=Save and Mount
-edit_save_apply=Save and Apply
-edit_umount=Unmount
-edit_perm=Make Permanent
-edit_del_umount=Umount and Delete
-
-save_err=Failed to save mount
-save_edir='$1' is not a directory
-save_edirname='$1' is not a valid directory name
-save_ealready='$1' is already mounted
-save_ealready2='$1' is already assigned to be mounted
-save_ealready3=The directory '$1' is already mounted
-save_ealready4=The directory '$1' is already assigned for mounting
-save_emkdir=Failed to create directory $1 : $2
-save_eumount=Unmount failed : $1
-save_emount=Mount failed : $1
-save_perm=The changes to the mount on $1 could not be applied, as the mount is currently in use. To have your changes made to the permanent mount list only, click on the button below.
-save_apply=Apply To Permanent List
-save_eremount=Remount failed : $1
-save_enone=You didn't choose to save or mount
-
-swap_err=Failed to create swap file
-swap_esize='$1' is not a valid size
-
-nfs_server=Choose NFS Server..
-nfs_select=Select an NFS server to mount from..
-nfs_ip=IP Address
-nfs_host=Hostname
-nfs_none=No local NFS servers found
-nfs_choose=Choose NFS Directory on $1
-nfs_failed=Failed to retrieve NFS exports from $1 : $2 Maybe there is no NFS server running
-nfs_seldir=Select an NFS directory to mount..
-nfs_dir=Directory
-nfs_clients=Clients
-
-smb_choose=Choose SMB Server..
-smb_elist=Failed to retrieve server list from $1. Maybe the server does not allow browsing
-smb_ehost=The server $1 does not exist
-smb_edown=The server $1 is down, unreachable or is not a file server
-smb_sel=Select a Windows Networking server to mount from..
-smb_name=Server Name
-smb_desc=Description
-smb_none=No local Windows Networking servers found
-smb_choose2=Choose Share on $1
-smb_elist2=Failed to retrieve share list from $1. Maybe the server does not allow browsing
-smb_sel2=Select a share to mount..
-smb_share=Share
-smb_comment=Comment
-smb_noshares=There are no available file shares on the server $1
-
-solaris_scsidev=SCSI controller $1 target $2 unit $3 partition $4
-solaris_mddev=RAID device $1
-solaris_ecacheexists=The directory $1 already exists. Delete it.
-solaris_ebusy=$1 is busy
-solaris_ekill=Failed to kill rumba
-solaris_epid=Failed to find rumba pid
-solaris_nsource=NFS Source
-solaris_nhost=NFS Hostname
-solaris_ndir=NFS Directory
-solaris_nmult=Multiple NFS Servers
-solaris_webnfs=WebNFS URL
-solaris_ufs=UFS Disk
-solaris_scsi=SCSI/IDE Disk
-solaris_ctrlr=Controller
-solaris_target=Target
-solaris_unit=Unit
-solaris_part=Partition
-solaris_raid=RAID Device
-solaris_otherdev=Other Device
-solaris_swapfile=Swap File
-solaris_file=File
-solaris_cdrom=CDROM
-solaris_dvd=DVD
-solaris_msdos=MS-DOS Disk
-solaris_orig=Original Directory
-solaris_cache=Cache Source
-solaris_automap=Automounter map
-solaris_autohosts=All NFS exports
-solaris_autoxfn=Federated Naming Service
-solaris_server=Server Name
-solaris_share=Share Name
-solaris_ro=Read-Only?
-solaris_nosuid=Disallow setuid programs?
-solaris_grpid=Files inherit parent GID?
-solaris_soft=Return error on timeouts?
-solaris_bg=Retry mounts in background?
-solaris_quota=Display quotas?
-solaris_nointr=Allow user interrupt?
-solaris_nfsver=NFS version
-solaris_highest=Highest
-solaris_proto=Protocol
-solaris_port=NFS Port
-solaris_timeo=Timeout
-solaris_retrans=Number of Retransmissions
-solaris_auth=Authentication
-solaris_none=None
-solaris_des=DES
-solaris_krb=Kerberos
-solaris_public=WebNFS mount?
-solaris_quotab=Enable quotas at boot time?
-solaris_onerror=Action on error
-solaris_toosoon=Repair Delay
-solaris_time_s=Seconds
-solaris_time_m=Minutes
-solaris_time_h=Hours
-solaris_time_d=Days
-solaris_time_w=Weeks
-solaris_time_y=Years
-solaris_noatime=Update access times?
-solaris_immed=Immediately
-solaris_defer=Deferred
-solaris_force=Force direct IO?
-solaris_nolarge=Allow large files?
-solaris_logging=Enabled logging?
-solaris_nrr=Ignore Unix attributes?
-solaris_notraildot=Ignore trailing dot?
-solaris_nomaplcase=Use lower case?
-solaris_foldcase=Force lower case?
-solaris_noopts=No Options Available
-solaris_size=Size
-solaris_largebsize=Use large page block size?
-solaris_max=Maximum
-solaris_backfs=Real filesystem type
-solaris_backpath=Real mount point
-solaris_cachedir=Cache directory
-solaris_wmode=Write mode
-solaris_con=Consistency check
-solaris_period=Periodically
-solaris_never=Never
-solaris_demand=On demand
-solaris_waround=Write-around
-solaris_nshared=Non-shared
-solaris_local=Check permissions in cache?
-solaris_nobrowse=Browsing enabled?
-solaris_auto=Automatic
-solaris_mname=Server Hostname
-solaris_cname=Client Name
-solaris_username=Login Name
-solaris_password=Login Password
-solaris_uid=User files are owned by
-solaris_gid=Group files are owned by
-solaris_fmode=File permissions
-solaris_dmode=Directory permissions
-solaris_readwrite=Read/write access is safe?
-solaris_readonly=Files can be read-only?
-solaris_noupper=Send password in upper case?
-solaris_attr=Use attrE commands?
-solaris_eurl='$1' is not a valid NFS URL
-solaris_ehost='$1' is not a valid hostname
-solaris_ehost2=The host '$1' does not exist
-solaris_edown=The host '$1' is down or does not support NFS
-solaris_enfs=The host '$1' does not support NFS
-solaris_enfsdir='$1' is not a valid directory name. The available directories on $2 are : $3
-solaris_enfsperm=This host is not allowed to mount the directory $1 on $2
-solaris_enfsmount=NFS Error - $1
-solaris_ectrlr='$1' is not a valid SCSI controller
-solaris_etarget='$1' is not a valid SCSI target number
-solaris_eunit='$1' is not a valid SCSI unit number
-solaris_epart='$1' is not a valid SCSI partition number
-solaris_eraid='$1' is not a valid RAID unit number
-solaris_epath='$1' is not a valid pathname
-solaris_eexist='$1' does not exist
-solaris_edir='$1' is not a directory
-solaris_eswapfile=The swap file '$1' does not exist
-solaris_eopen=Failed to open $1 : $2
-solaris_ebackfs=The back filesystem '$1' is not mounted
-solaris_ebacktype=The back filesystem is '$1' is not $2
-solaris_ecsrc='$1' is not a valid cache source
-solaris_eautomap=Missing automount map name
-solaris_eautofile=The map file '$1' does not exist
-solaris_etarget2=The SCSI target for '$1' does not exist
-solaris_epart2=The SCSI partition for '$1' does not exist
-solaris_eraid2=The RAID device for '$1' does not exist
-solaris_enopart=No partitions on '$1'
-solaris_edevfile=The device file '$1' does not exist
-solaris_edevice=The device for '$1' does not exist
-solaris_efstyp=The device '$1' is formatted as a $2
-solaris_efstyp2=Failed to check filesystem type : $1
-solaris_ecachedir='$1' is not a valid cache directory
-solaris_efmode='$1' is not a valid octal file mode
-solaris_edmode='$1' is not a valid octal directory mode
-
-linux_eamd=AMD failed
-linux_eauto=Automount failed : $1
-linux_esmbconn=Failed to connect to server
-linux_ekillamd=Failed to kill AMD
-linux_ekillauto=Failed to kill automount
-linux_nfshost=NFS Hostname
-linux_nfsdir=NFS Directory
-linux_map=Automounter Map
-linux_swapfile=Swap File
-linux_disk=Disk
-linux_smbserver=Server Name
-linux_smbshare=Share Name
-linux_raid=RAID device
-linux_rdev=RAID device $1
-linux_lvm=LVM logical volume
-linux_ldev=LVM VG $1, LV $2
-linux_cddev=CD-ROM drive
-linux_cddev2=CD-ROM drive $1
-linux_label=Partition labelled $1
-linux_lsel=Partition labelled
-linux_other=Other device
-linux_ro=Read-only?
-linux_sync=Buffer writes to filesystem?
-linux_nodev=Allow device files?
-linux_noexec=Allow execution of binaries?
-linux_nosuid=Disallow setuid programs?
-linux_user=Allow users to mount this filesystem?
-linux_check=Check mode
-linux_normal=Normal
-linux_strict=Strict
-linux_none=None
-linux_errors=Action on error
-linux_continue=Continue
-linux_remount_ro=Remount read-only
-linux_panic=Panic
-linux_grpid=Files inherit parent GID?
-linux_quotas=Use Quotas?
-linux_usrquota=User only
-linux_grpquota=Group only
-linux_usrgrpquota=User and Group
-linux_usrgrpquota2=User and Group (UNSTABLE!)
-linux_resuid=Reserve space for user
-linux_resgid=Reserve space for group
-linux_bg=Retry mounts in background?
-linux_soft=Return error on timeouts?
-linux_timeo=Timeout
-linux_retrans=Number of Retransmissions
-linux_vers=NFS version
-linux_high=Highest
-linux_port=NFS Port
-linux_intr=Allow user interrupt?
-linux_tcp=RPC Protocol
-linux_uid=User files are owned by
-linux_gid=Group files are owned by
-linux_rules=File naming rules
-linux_relaxed=Relaxed
-linux_conv=DOS-Unix newline conversion
-linux_allfiles=All files
-linux_textfiles=Text files only
-linux_umask=File permissions mask
-linux_quiet=Report errors on <tt>chown</tt> attempts?
-linux_uni_xlate=Translate Unicode characters?
-linux_posix=Allow names that differ only in case?
-linux_conv2=OS/2-Unix newline conversion
-linux_rock=Ignore Unix Attributes?
-linux_mode=File permissions for non-Unix CDs
-linux_noopts=No Options Available
-linux_timeout=Idle time before unmount
-linux_pid_file=Write PID to file
-linux_secs=seconds
-linux_smbwarn=Warning! Filesystem was not mounted from Webmin, so existing options are not available
-linux_username=Login Name
-linux_password=Login Password
-linux_sname=Server Name
-linux_wg=Workgroup
-linux_auto=Automatic
-linux_cname=Client Name
-linux_mname=Server Address
-linux_fmode=File permissions
-linux_dmode=Directory permissions
-linux_notail=Trade off space for speed?
-linux_tmpsize=Maximum filesystem size
-linux_unlimited=Unlimited
-linux_nr_blocks=Maximum blocks available
-linux_nr_inodes=Maximum inodes available
-linux_tmpmode=Mount point permissions
-linux_ehost='$1' is not a valid hostname
-linux_ehost2=The host '$1' does not exist
-linux_edown=The host '$1' is down
-linux_enfs=The host '$1' does not support NFS
-linux_elist=Failed to get mount list : $1
-linux_enfsdir='$1' is not a valid directory name. The available directories on $2 are : $3
-linux_enfsperm=This host is not allowed to mount the directory $1 on $2
-linux_enfsmount=NFS Error - $1
-linux_eautomap=The automount map file '$1' does not exist
-linux_edev=No device entered
-linux_edevfile=The device file '$1' does not exist
-linux_emask='$1' is not a valid octal mask
-linux_etimeout='$1' is not a valid timeout
-linux_epidfile='$1' is not a valid pid file
-linux_efmode='$1' is not a valid octal file mode
-linux_edmode='$1' is not a valid octal directory mode
-linux_etmpsize=Missing or invalid maximum size
-linux_enr_blocks=Missing or invalid number of blocks
-linux_enr_inodes=Missing or invalid number of inodes
-linux_etmpmode=Missing or invalid octal mount point permissions
-linux_usrquotas=Enable user quotas?
-linux_grpquotas=Enable groups quotas?
-linux_noenforce=Yes, but don't enforce
-
-log_mount=Mounted $3
-log_mount_l=Mounted $2 $1 on $3
-log_umount=Unmounted $3
-log_umount_l=Unmounted $2 $1 on $3
-log_remount=Remounted $3
-log_remount_l=Remounted $2 $1 on $3
-log_create=Created mount $3
-log_create_l=Created $2 mount $1 on $3
-log_modify=Modified mount $3
-log_modify_l=Modified $2 mount $1 on $3
-log_delete=Deleted mount $3
-log_delete_l=Deleted $2 mount $1 on $3
-
-unmount_err=Failed to unmount $1
-mount_err=Failed to mount $1
-
-irix_nhost=NFS Hostname
-irix_ndir=NFS Directory
-irix_part=Local partition
-irix_mode0=SCSI controller $1 target $2 partition $3
-irix_mode1=Other device or file
-irix_ro=Read-Only?
-irix_nosuid=Disallow setuid programs?
-irix_grpid=Files inherit parent GID?
-irix_nodev=Disallow device files?
-irix_bg=Retry mounts in background?
-irix_soft=Return error on timeouts?
-irix_nointr=Allow user interrupt?
-irix_version=NFS version
-irix_proto=NFS protocol
-irix_port=NFS port
-irix_timeo=Timeout
-irix_retrans=Number of Retransmissions
-irix_noopts=No Options Available
-irix_quota=Enable quotas?
-irix_noatime=Update access times?
-irix_wsync=All modifications are synchronous?
-irix_quotano=Yes, but don't enforce
-irix_cd=Local CD-ROM
-irix_mode0cd=SCSI controller $1 target $2
-irix_setx=Make all files executable?
-irix_rock=Use Rock Ridge extensions?
-irix_nofsck=Check filesystem at boot?
-irix_auto=Automounter source
-irix_autohosts=All NFS hosts
-irix_automap=Map file
-
-irix_ehost=The host '$1' does not exist
-irix_eloss=The host '$1' is down
-irix_eshowmount=The host '$1' does not support NFS
-irix_emountlist=Failed to get mount list : $1
-irix_edirlist='$1' is not a valid directory name. The available directories on '$2' are : $3
-irix_enotexist=The directory '$1' does not exist on host '$2' The available directories are : $3
-irix_epermission=This host is not allowed to mount the directory '$1' from host '$2'
-irix_enfserr=NFS error : $1
-irix_ectrlr='$1' is not a valid SCSI controller
-irix_edrive='$1' is not a valid SCSI drive
-irix_epart='$1' is not a valid partition number
-irix_edevice=Disk device '$1' does not exist
-irix_eswapfile=The swap device '$1' does not exist
-irix_efstyp2=Failed to get filesystem type $1 : $2
-irix_efstyp=The type of filesystem on $1 is $2, not $3
-irix_eautomap=Automounter map file '$1' does not exist
-irix_eauthmap2=Missing or invalid automounter map file
-
-irix_devroot=Root partition
-irix_devswap=Swap partition
-irix_autohosts=All NFS exports
--- a/mount/lang/es
+++ b/mount/lang/es
@@ -239,8 +239,6 @@ linux_lsel=Partici
 linux_other=Otro dispositivo
 linux_ro=¿Solo lectura?
 linux_sync=¿Buffer escribe al sistema de archivos?
-linux_nodev=¿Permitir archivos de dispositivos?
-linux_noexec=¿Permitir ejecución de binarios?
 linux_nosuid=¿Deshabilitar programas setuid?
 linux_user=¿Permitir a usuarios montar este sistema de archivos?
 linux_check=Verificar modo
--- a/mount/lang/fa
+++ b/mount/lang/fa
@@ -258,8 +258,6 @@ linux_lsel=افراز ناميده شد
 linux_other=دستگاه ديگر
 linux_ro=آيا فقط خواندني است؟
 linux_sync=آيا ميانگير در سيستم پرونده نوشته شود؟
-linux_nodev=آيا به پرونده دستگاه اجازه داده شود؟
-linux_noexec=آيا اجازه اجراي دودويي داده شود؟
 linux_nosUID=آيا اجازه قراردادن شناسه کاربر برنامه‌ها داده نشود؟
 linux_user=آيا کاربران اجازه سوار کردن در اين سيستم پرونده را دارند؟
 linux_check=بررسي حالت
--- a/mount/lang/fr
+++ b/mount/lang/fr
@@ -175,9 +175,7 @@ linux_mname=Adresse du serveur
 linux_mode=Permissions des fichiers pour des CDs non-Unix
 linux_nfsdir=R&#233;pertoire NFS
 linux_nfshost=Nom d'h&#244;te NFS
-linux_nodev=Autoriser les fichiers de p&#233;riph&#233;riques ?
 linux_noenforce=Oui mais sans limite stricte
-linux_noexec=Autoriser l'ex&#233;cution des binaires ?
 linux_none=Aucun
 linux_noopts=Aucune option disponible
 linux_normal=Normal
--- a/mount/lang/hu
+++ b/mount/lang/hu
@@ -220,8 +220,6 @@ linux_smbshare=Megoszt
 linux_other=Más eszköz
 linux_ro=Csak olvasható?
 linux_sync=Buffer írása a filerendszerre?
-linux_nodev=Eszközfile-ok engedélyezése?
-linux_noexec=Binárisok futtatásának engedélyezése?
 linux_nosuid=Setuid-s programok tiltása?
 linux_user=Filerendszer csatolásának engedélyezése felhasználók számára?
 linux_check=Ellenőrzés módja
--- a/mount/lang/it
+++ b/mount/lang/it
@@ -239,8 +239,6 @@ linux_lsel=Partizione etichettata
 linux_other=Altro dispositivo
 linux_ro=Sola lettura?
 linux_sync=Immagazzina le scritture al filesystem?
-linux_nodev=Permetti i file dispositivo?
-linux_noexec=Permetti l'esecuzione dei binari?
 linux_nosuid=Nega i programmi setuid?
 linux_user=Permetti agli utenti di montare questo filesystem?
 linux_check=Modo di controllo
--- a/mount/lang/ja_JP.euc
+++ b/mount/lang/ja_JP.euc
@@ -264,8 +264,6 @@ linux_usel=Partition with ID
 linux_other=他のデバイス
 linux_ro=読取り専用にしますか？
 linux_sync=ファイル システムへのバッファの書込みを可能にしますか？
-linux_nodev=デバイス ファイルを許可しますか？
-linux_noexec=バイナリの実行を許可しますか？
 linux_nosuid=setuid プログラムを不認可にしますか？
 linux_user=ユーザがこのファイル システムをマウント可能にしますか？
 linux_check=モードの検査
--- a/mount/lang/ko_KR.euc
+++ b/mount/lang/ko_KR.euc
@@ -190,9 +190,7 @@ linux_mode=
 linux_nfsdir=NFS 디렉토리
 linux_nfshost=NFS 호스트 이름
 linux_noatime=마지막 접근 시간 업데이트 안함
-linux_nodev=장치 파일을 허용
 linux_noenforce=예, 하지만 강제로 하지 않음
-linux_noexec=이진 파일 실행 허용
 linux_none=없음
 linux_noopts=사용 가능한 옵션 없음
 linux_normal=일반
--- a/mount/lang/nl
+++ b/mount/lang/nl
@@ -193,9 +193,7 @@ linux_mode=File permissies voor niet-Unix CDs
 linux_nfsdir=NFS Directory
 linux_nfshost=NFS Hostnaam
 linux_noatime=Voorkom updaten van laatste toegang tijden?
-linux_nodev=Apparaat files toestaan?
 linux_noenforce=Ja, maar niet geforceerd
-linux_noexec=Uitvoeren toestaan van binaries?
 linux_none=Niets
 linux_noopts=Geen Opties Beschikbaar
 linux_normal=Normaal
--- a/mount/lang/no
+++ b/mount/lang/no
@@ -193,9 +193,7 @@ linux_mode=File permissions for non-Unix CDs
 linux_nfsdir=NFS Directory
 linux_nfshost=NFS Hostname
 linux_noatime=Unng&#229; oppdatering av siste aksesstider?
-linux_nodev=Allow device files?
 linux_noenforce=Yes, but don't enforce
-linux_noexec=Allow execution of binaries?
 linux_none=None
 linux_noopts=No Options Available
 linux_normal=Normal
--- a/mount/lang/pl
+++ b/mount/lang/pl
@@ -234,8 +234,6 @@ linux_lsel=Partycja oznaczona
 linux_other=Inne urządzenie
 linux_ro=Tylko do odczytu
 linux_sync=Zrzucać bufory systemu plików?
-linux_nodev=Pozwolić na pliki urządzeń?
-linux_noexec=Pozwolić na wykonywanie programów?
 linux_nosuid=Zablokować programy setuid-owe?
 linux_user=Pozwolić montować użytkownikom?
 linux_check=Tryb sprawdzania
--- a/mount/lang/pt_BR
+++ b/mount/lang/pt_BR
@@ -257,8 +257,6 @@ linux_usel=Parti
 linux_other=Outro dispositivo
 linux_ro=Somente leitura?
 linux_sync=Buffer grava dados no sistema de arquivos?
-linux_nodev=Permitir arquivos de dispositivos?
-linux_noexec=Permitir a execução de binários?
 linux_nosuid=Não permitir programas setuid?
 linux_user=Permitir que usuários montem este sistema de arquivos?
 linux_check=Modo de verificação
--- a/mount/lang/ru_RU
+++ b/mount/lang/ru_RU
@@ -71,7 +71,6 @@ linux_textfiles=
 linux_allfiles=Для всех файлов
 linux_gid=Группа файлов
 solaris_noatime=Обновлять время доступа?
-linux_nodev=Разрешить файлы устройств?
 linux_edevfile=Файл устройства '$1' не существует
 solaris_ehost='$1' не является допустимым именем компьютера
 solaris_nshared=Неразделенный
@@ -238,7 +237,6 @@ solaris_nhost=
 solaris_auth=Аутентификация
 solaris_auto=Автоматически
 solaris_readwrite=Доступ на запись безопасен?
-linux_noexec=Разрешить выполнение бинарных файлов?
 edit_egone=Данная файловая система больше не существует
 edit_adv=Дополнительные параметры
 smb_elist=Не удалось получить список серверов от $1. Возможно, сервер не позволяет просматривать сеть
--- a/mount/lang/ru_SU
+++ b/mount/lang/ru_SU
@@ -240,8 +240,6 @@ linux_lsel=
 linux_other=Другое устройство
 linux_ro=Только для чтения?
 linux_sync=Буферизовать запись?
-linux_nodev=Разрешить файлы устройств?
-linux_noexec=Разрешить выполнение бинарных файлов?
 linux_nosuid=Запретить setuid программы?
 linux_user=Разрешить пользователям монтировать эту файловую систему?
 linux_check=Режим проверки
--- a/mount/lang/sv
+++ b/mount/lang/sv
@@ -234,8 +234,6 @@ linux_lsel=Partition vid namn
 linux_other=Annan disk
 linux_ro=Endast läsbart?
 linux_sync=Buffra skrivningar till filsystemet?
-linux_nodev=Tillåta diskfiler?
-linux_noexec=Tillåta exekvering av binärfiler?
 linux_nosuid=Förbjuda setuid-program?
 linux_notail=Minska utrymmet till förmån för hastigheten?
 linux_user=Tillåta användare att montera detta filsystem?
--- a/mount/lang/tr
+++ b/mount/lang/tr
@@ -159,8 +159,6 @@ linux_mname=Sunucu Adresi
 linux_mode=Unix olmayan CD'ler için dosya izinleri
 linux_nfsdir=NFS Dizini
 linux_nfshost=NFS Makine Adı
-linux_nodev=Aygıt dosyalarına izin ver?
-linux_noexec=İkililerin çalıştırılmasına izin ver?
 linux_none=Hiçbiri
 linux_noopts=Mümkün Seçenekler Yok
 linux_normal=Normal
--- a/mount/lang/uk_UA
+++ b/mount/lang/uk_UA
@@ -71,7 +71,6 @@ linux_textfiles=
 linux_allfiles=Для всех файлов
 linux_gid=Группа файлов
 solaris_noatime=Обновлять время доступа?
-linux_nodev=Разрешить файлы устройств?
 linux_edevfile=Файл устройства '$1' не существует
 solaris_ehost='$1' не является допустимым именем компьютера
 solaris_nshared=Неразделенный
@@ -238,7 +237,6 @@ solaris_nhost=
 solaris_auth=Аутентификация
 solaris_auto=Автоматически
 solaris_readwrite=Доступ на запись безопасен?
-linux_noexec=Разрешить выполнение бинарных файлов?
 edit_egone=Данная файловая система больше не существует
 edit_adv=Дополнительные параметры
 smb_elist=Не удалось получить список серверов от $1. Возможно, сервер не позволяет просматривать сеть
--- a/mount/lang/zh_CN
+++ b/mount/lang/zh_CN
@@ -236,8 +236,6 @@ linux_lsel=
 linux_other=其它装置
 linux_ro=只读吗？
 linux_sync=将缓冲写到文件系统吗？
-linux_nodev=允许装置文件吗？
-linux_noexec=允许执行二进制吗？
 linux_nosuid=禁用setuid程序吗？
 linux_user=允许用户加载这个文件系统吗？
 linux_check=检查模式
--- a/mount/lang/zh_TW.Big5
+++ b/mount/lang/zh_TW.Big5
@@ -222,8 +222,6 @@ linux_rdev=
 linux_other=其他設備
 linux_ro=是否唯讀？
 linux_sync=是否緩衝寫入檔案系統？
-linux_nodev=是否允許設備檔案？
-linux_noexec=是否可以執行二進位檔？
 linux_nosuid=是否不允許 SUID 檔案？
 linux_user=是否允許使用者掛載這個檔案系統？
 linux_check=檢查模式
--- a/mount/linux-lib.pl
+++ b/mount/linux-lib.pl
@@ -1163,39 +1163,43 @@ local ($type, $newmount) = @_;
 if ($type ne "swap" && $type ne "auto" &&
    $type ne "autofs" && $type ne $smbfs_fs && $type ne "cifs") {
 	# Lots of options are common to all linux filesystems
-	print &ui_table_span("<b>$text{'edit_comm_opt'}</b>");
-
 	print &ui_table_row(&hlink($text{'linux_ro'}, "linux_ro"),
 		&ui_yesno_radio("lnx_ro", defined($options{"ro"})));

 	print &ui_table_row(&hlink($text{'linux_sync'}, "linux_sync"),
 		&ui_yesno_radio("lnx_sync", defined($options{"sync"}), 0, 1));

-	local $nodev = defined($options{"nodev"}) ||
-		       defined($options{"user"}) && !defined($options{"dev"});
-	print &ui_table_row(&hlink($text{'linux_nodev'}, "linux_nodev"),
-		&ui_yesno_radio("lnx_nodev", $nodev, 0, 1));
-
-	local $noexec = defined($options{"noexec"}) ||
-		       defined($options{"user"}) && !defined($options{"exec"});
-	print &ui_table_row(&hlink($text{'linux_noexec'}, "linux_noexec"),
-		&ui_yesno_radio("lnx_noexec", $noexec, 0, 1));
-
-	local $nosuid = defined($options{"nosuid"}) ||
-		       defined($options{"user"}) && !defined($options{"suid"});
-	print &ui_table_row(&hlink($text{'linux_nosuid'}, "linux_nosuid"),
-		&ui_yesno_radio("lnx_nosuid", $nosuid));
-
 	print &ui_table_row(&hlink($text{'linux_user'}, "linux_user"),
 		&ui_yesno_radio("lnx_user", defined($options{"user"})));

+	print &ui_table_row(&hlink($text{'linux_nodev'}, "linux_nodev"),
+		&ui_radio("lnx_nodev", defined($options{"nodev"}) ? 1 :
+				       defined($options{"dev"}) ? 0 : 2,
+			  [ [ 1, $text{'yes'} ],
+			    [ 0, $text{'no'} ],
+			    [ 2, $text{'linux_ifuser'} ] ]));
+
+	print &ui_table_row(&hlink($text{'linux_noexec'}, "linux_noexec"),
+		&ui_radio("lnx_noexec", defined($options{"noexec"}) ? 1 :
+				       defined($options{"dev"}) ? 0 : 2,
+			  [ [ 1, $text{'yes'} ],
+			    [ 0, $text{'no'} ],
+			    [ 2, $text{'linux_ifuser'} ] ]));
+
+	print &ui_table_row(&hlink($text{'linux_nosuid'}, "linux_nosuid"),
+		&ui_radio("lnx_nosuid", defined($options{"nosuid"}) ? 1 :
+				       defined($options{"dev"}) ? 0 : 2,
+			  [ [ 1, $text{'yes'} ],
+			    [ 0, $text{'no'} ],
+			    [ 2, $text{'linux_ifuser'} ] ]));
+
 	print &ui_table_row(&hlink($text{'linux_noatime'}, "linux_noatime"),
 		&ui_yesno_radio("lnx_noatime", defined($options{"noatime"})));
 	}
 	
 if ($type =~ /^ext\d+$/) {
 	# Ext2+ has lots more options..
-	print &ui_table_span("<b>$text{'edit_ext__opt'}</b>");
+	print &ui_table_hr();

 	if ($no_mount_check) {
 		print &ui_table_row($text{'linux_df'},
@@ -1544,47 +1548,42 @@ elsif ($type eq "tmpfs") {
 		&ui_opt_textbox("lnx_tmpmode", $options{"mode"}, 3,
 				$text{'default'}));
 	}
-elsif ($_[0] eq "xfs") {
+elsif ($type eq "xfs") {
 	# Show options for XFS
-        print "<tr $tb> <td colspan=4><b>$text{'edit_xfs_opt'}</b></td> </tr>\n";
-	print "<tr> <td><b>$text{'linux_usrquotas'}</b></td>\n";
-	print "<td colspan=3>\n";
-	printf "<input type=radio name=xfs_usrquota value=1 %s> %s\n",
-		defined($options{"quota"}) || defined($options{"usrquota"}) ?
-		"checked" : "", $text{'yes'};
-	printf "<input type=radio name=xfs_usrquota value=2 %s> %s\n",
-		defined($options{"uqnoenforce"}) ? "checked" : "",
-		$text{'linux_noenforce'};
-	printf "<input type=radio name=xfs_usrquota value=0 %s> %s</td></tr>\n",
-		defined($options{"quota"}) || defined($options{"usrquota"}) ||
-		defined($options{"uqnoenforce"}) ? "" : "checked", $text{'no'};
+	print &ui_table_span("<b>$text{'edit_xfs_opt'}</b>");

-	print "<tr> <td><b>$text{'linux_grpquotas'}</b></td>\n";
-	print "<td colspan=3>\n";
-	printf "<input type=radio name=xfs_grpquota value=1 %s> %s\n",
-		defined($options{"grpquota"}) ?  "checked" : "", $text{'yes'};
-	printf "<input type=radio name=xfs_grpquota value=2 %s> %s\n",
-		defined($options{"gqnoenforce"}) ? "checked" : "",
-		$text{'linux_noenforce'};
-	printf "<input type=radio name=xfs_grpquota value=0 %s> %s</td></tr>\n",
-		defined($options{"grpquota"}) ||
-		defined($options{"gqnoenforce"}) ? "" : "checked", $text{'no'};
+	print &ui_table_row($text{'linux_usrquotas'},
+		&ui_radio("xfs_usrquota",
+			defined($options{"quota"}) ||
+			  defined($options{"usrquota"}) ? 1 :
+			defined($options{"uqnoenforce"}) ? 2 : 0,
+			[ [ 1, $text{'yes'} ],
+			  [ 2, $text{'linux_noenforce'} ],
+			  [ 0, $text{'no'} ] ]));
+
+	print &ui_table_row($text{'linux_grpquotas'},
+		&ui_radio("xfs_grpquota",
+			defined($options{"quota"}) ||
+			  defined($options{"grpquota"}) ? 1 :
+			defined($options{"uqnoenforce"}) ? 2 : 0,
+			[ [ 1, $text{'yes'} ],
+			  [ 2, $text{'linux_noenforce'} ],
+			  [ 0, $text{'no'} ] ]));
 	}
-elsif ($_[0] eq "jfs") {
+elsif ($type eq "jfs") {
 	# No other JFS options yet!
 	}
-elsif ($_[0] eq "ntfs") {
+elsif ($type eq "ntfs") {
 	# Windows NT/XP/2000 filesystem
-        print "<tr $tb> <td colspan=4><b>$text{'edit_ntfs_opt'}</b></td> </tr>\n";
-	print "<tr> <td><b>$text{'linux_uid'}</b></td>\n";
-	printf "<td><input name=ntfs_uid size=8 value=\"%s\">\n",
-		defined($options{"uid"}) ? getpwuid($options{"uid"}) : "";
-	print &user_chooser_button("ntfs_uid", 0),"</td>\n";
+	print &ui_table_span("<b>$text{'edit_ntfs_opt'}</b>");

-	print "<td><b>$text{'linux_gid'}</b></td>\n";
-	printf "<td><input name=ntfs_gid size=8 value=\"%s\">\n",
-		defined($options{"gid"}) ? getgrgid($options{"gid"}) : "";
-	print &group_chooser_button("ntfs_gid", 0),"</td>\n";
+	print &ui_table_row($text{'linux_uid'},
+		&ui_user_textbox("ntfs_uid", defined($options{'uid'}) ?
+					      getpwuid($options{'uid'}) : ""));
+
+	print &ui_table_row($text{'linux_gid'},
+		&ui_group_textbox("ntfs_gid", defined($options{'gid'}) ?
+					      getgrgid($options{'gid'}) : ""));
 	}
 }

@@ -1744,13 +1743,16 @@ if ($_[0] ne "swap" && $_[0] ne "auto" &&
 	if ($in{lnx_sync}) { $options{"sync"} = ""; }

 	delete($options{"dev"}); delete($options{"nodev"});
-	if ($in{lnx_nodev}) { $options{"nodev"} = ""; }
+	if ($in{lnx_nodev} == 1) { $options{"nodev"} = ""; }
+	elsif ($in{lnx_nodev} == 0) { $options{"dev"} = ""; }

 	delete($options{"exec"}); delete($options{"noexec"});
-	if ($in{lnx_noexec}) { $options{"noexec"} = ""; }
+	if ($in{lnx_noexec} == 1) { $options{"noexec"} = ""; }
+	elsif ($in{lnx_noexec} == 0) { $options{"exec"} = ""; }

 	delete($options{"suid"}); delete($options{"nosuid"});
-	if ($in{lnx_nosuid}) { $options{"nosuid"} = ""; }
+	if ($in{lnx_nosuid} == 1) { $options{"nosuid"} = ""; }
+	elsif ($in{lnx_nosuid} == 0) { $options{"suid"} = ""; }

 	delete($options{"user"}); delete($options{"nouser"});
 	if ($in{lnx_user}) { $options{"user"} = ""; }