Don't perform text substitutions where not needed

diff --git a/acl/lang/en b/acl/lang/en
index 864e94e..071d717 100644 (file)
--- a/acl/lang/en
+++ b/acl/lang/en
@@ -337,7 +337,7 @@ switch_euser=You are not allowed to switch to this user
 switch_eold=Existing session not found!
 
 rbac_title=Setup RBAC
-rbac_desc=Webmin's RBAC integration provides a way for user module and ACL permissions to be determined from an RBAC (Role Based Access Control) database, rather than Webmin's own configuration files. Once RBAC support is enabled, any user for whom the <b>$edit_rbacdeny1</b> option is selected will have his capabilities determined by RBAC rather than Webmin's own access control settings.
+rbac_desc=Webmin's RBAC integration provides a way for user module and ACL permissions to be determined from an RBAC (Role Based Access Control) database, rather than Webmin's own configuration files. Once RBAC support is enabled, any user for whom the <b>RBAC controls all modules and ACLs</b> option is selected will have his capabilities determined by RBAC rather than Webmin's own access control settings.
 rbac_esolaris=RBAC is only supported on Solaris at the moment, and so cannot be used on this $1 system.
 rbac_eperl=The Perl module $1 needed for RBAC integration is not installed. <a href='$2'>Click here</a> to have it installed now.
 rbac_ecpan=You do not have access to Webmin's Perl Modules page in order to install the necessary $1 module for RBAC integration.
@@ -448,3 +448,4 @@ makedn_still=Some problems were found even after DN creation : $1
 schema_title=Download LDAP Schema
 schema_desc=Before Webmin can use an LDAP server to store users and groups it must be configured to use the schema below. This can typically be done by saving the schema definition in <tt>/etc/ldap/schema</tt> or <tt>/etc/openldap/schema</tt> as <tt>webmin.schema</tt>, then configuring the server to load that schema file.
 schema_download=Download schema file : <a href=$1>$1</a>
+__norefs=1

diff --git a/adsl-client/lang/en b/adsl-client/lang/en
index 086e37d..dbb5a74 100644 (file)
--- a/adsl-client/lang/en
+++ b/adsl-client/lang/en
@@ -65,3 +65,4 @@ log_bootup=Enabled ADSL at boot time
 log_bootdown=Disabled ADSL at boot time
 log_setup=Set up default configuration
 
+__norefs=1

diff --git a/ajaxterm/lang/en b/ajaxterm/lang/en
index 806b3f8..7661d8e 100644 (file)
--- a/ajaxterm/lang/en
+++ b/ajaxterm/lang/en
@@ -3,3 +3,4 @@ index_epython=Ajaxterm requires Python to run, but the $1 command was not found
 index_estart=Ajaxterm did not start accepting connections on port $2 after $1 seconds.
 index_popup=Open in separate window ..
 index_credits=Uses code from <a href='$1' target=_new>Ajaxterm</a> by Antony Lesuisse.
+__norefs=1

diff --git a/apache/lang/en b/apache/lang/en
index 4f27617..0c5ef32 100644 (file)
--- a/apache/lang/en
+++ b/apache/lang/en
@@ -1124,3 +1124,4 @@ mods_available=Available for installation
 mods_ecannot=You are not allowed to configure Apache modules
 mods_save=Enable Selected Modules
 mods_desc=This page allows you to select which optional Apache modules are enabled, using the checkbox next to each module name. Be careful when disabling a module, as any existing directives that are specific to it will be no longer recognized.
+__norefs=1

diff --git a/at/lang/en b/at/lang/en
index ecf6abb..156ee95 100644 (file)
--- a/at/lang/en
+++ b/at/lang/en
@@ -65,3 +65,4 @@ log_create_job=Created scheduled command for $1
 log_delete_job=Cancelled scheduled command for $1
 log_exec_job=Executed scheduled command for $1
 log_delete_jobs=Cancelled $1 scheduled commands
+__norefs=1

diff --git a/backup-config/lang/en b/backup-config/lang/en
index f78a524..cd8e970 100644 (file)
--- a/backup-config/lang/en
+++ b/backup-config/lang/en
@@ -119,3 +119,4 @@ email_pre=Running pre-backup command $1 ..
 email_post=Running post-backup command $1 ..
 email_prefailed=Pre-backup command failed!
 
+__norefs=1

diff --git a/bacula-backup/lang/en b/bacula-backup/lang/en
index 4088b9e..4c89e4f 100644 (file)
--- a/bacula-backup/lang/en
+++ b/bacula-backup/lang/en
@@ -656,3 +656,4 @@ restore_enofiles=None of the selected files are in the backup
 restore_level_F=Full
 restore_level_D=Differential
 restore_level_I=Incremental
+__norefs=1

diff --git a/bandwidth/lang/en b/bandwidth/lang/en
index 31ee44e..acb36a3 100644 (file)
--- a/bandwidth/lang/en
+++ b/bandwidth/lang/en
@@ -82,3 +82,4 @@ rotate_title=Updating Statistics
 rotate_doing=Processing logged network traffic ..
 rotate_done=.. done.
 
+__norefs=1

diff --git a/bind8/lang/en b/bind8/lang/en
index e253752..de9238e 100644 (file)
--- a/bind8/lang/en
+++ b/bind8/lang/en
@@ -1108,3 +1108,5 @@ trusted_ealg=Missing or invalid algorithm number in row $1
 trusted_ekey=Missing base-64 encoded trusted zone key in row $1
 trusted_setup=For DNSSEC to be useful to verify the majority of signed zones on the Internet, BIND must be configured to use a DLV server. Webmin can set this up for you, using the ICS DLV server at $1.
 trusted_ok=Setup DLV and Enable DNSSEC Verification
+__norefs=1
+__norefs=1

diff --git a/blue-theme/lang/en b/blue-theme/lang/en
index 3afbb0d..f63bc04 100644 (file)
--- a/blue-theme/lang/en
+++ b/blue-theme/lang/en
@@ -41,3 +41,4 @@ right_updates=Package updates
 right_upok=All installed packages are up to date
 right_upneed=$1 package updates are available
 right_upsec=$1 package updates are available, of which $2 are security updates
+__norefs=1

diff --git a/bsdexports/lang/en b/bsdexports/lang/en
index 302d436..e428f5a 100644 (file)
--- a/bsdexports/lang/en
+++ b/bsdexports/lang/en
@@ -47,3 +47,4 @@ save_esame1=The directory <tt>$1</tt> is already being exported to <tt>$2</tt>.
 save_esame2=The directory <tt>$1</tt> is already being exported to <tt>$2</tt>. Your operating system does not allow directories on the same <i>local</i> filesystem to be exported to the same network separately
 
 restart_err=Failed to apply changes
+__norefs=1

diff --git a/burner/lang/en b/burner/lang/en
index 598a576..cc91ed9 100644 (file)
--- a/burner/lang/en
+++ b/burner/lang/en
@@ -147,3 +147,4 @@ acl_dirs=Allow directories for source files
 delete_err=Failed to delete burn profiles
 delete_enone=None selected
 
+__norefs=1

diff --git a/certmgr/lang/en b/certmgr/lang/en
index 3d2bab1..0be7e82 100755 (executable)
--- a/certmgr/lang/en
+++ b/certmgr/lang/en
@@ -147,3 +147,4 @@ manual_title=Edit Config File
 manual_desc=Editing OpenSSL configuration file $1 ..
 manual_err=Failed to save config file
 manual_edata=Nothing entered!
+__norefs=1

diff --git a/change-user/lang/en b/change-user/lang/en
index 175be1b..ecfdd30 100644 (file)
--- a/change-user/lang/en
+++ b/change-user/lang/en
@@ -36,3 +36,4 @@ acl_lang=Can change language?
 acl_theme=Can change theme?
 acl_pass=Can change password (when set in Webmin) ?
 
+__norefs=1

diff --git a/cluster-copy/lang/en b/cluster-copy/lang/en
index 8f02ae1..931c181 100644 (file)
--- a/cluster-copy/lang/en
+++ b/cluster-copy/lang/en
@@ -66,3 +66,4 @@ email_subject_failed=Cluster copy of $1 failed
 delete_err=Failed to delete copies
 delete_enone=None selected
 
+__norefs=1

diff --git a/cluster-cron/lang/en b/cluster-cron/lang/en
index 5a96e52..d913c60 100644 (file)
--- a/cluster-cron/lang/en
+++ b/cluster-cron/lang/en
@@ -33,3 +33,4 @@ log_deletes=Deleted $1 cluster cron jobs
 
 delete_err=Failed to delete cluster cron jobs
 delete_enone=None selected
+__norefs=1

diff --git a/cluster-passwd/lang/en b/cluster-passwd/lang/en
index ade2739..9ceb5b7 100644 (file)
--- a/cluster-passwd/lang/en
+++ b/cluster-passwd/lang/en
@@ -6,3 +6,4 @@ passwd_err=Failed to change password
 passwd_title=Changing Password
 passwd_on=Changing password on $1 ..
 passwd_euser=User does not exist!
+__norefs=1

diff --git a/cluster-shell/lang/en b/cluster-shell/lang/en
index 5c95ef1..127d004 100644 (file)
--- a/cluster-shell/lang/en
+++ b/cluster-shell/lang/en
@@ -19,3 +19,4 @@ run_enone=No servers to run on selected
 log_clear=Cleared command history
 log_run=Ran $1 on $2 servers
 log_run_l=Ran $1 on $2
+__norefs=1

diff --git a/cluster-software/lang/en b/cluster-software/lang/en
index e8a3ce0..04fc666 100644 (file)
--- a/cluster-software/lang/en
+++ b/cluster-software/lang/en
@@ -176,3 +176,4 @@ deletes_rusure=Are you sure you want to uninstall the packages $1 from the selec
 deletes_ok=Delete them all
 
 
+__norefs=1

diff --git a/cluster-useradmin/lang/en b/cluster-useradmin/lang/en
index 1480189..84674e0 100644 (file)
--- a/cluster-useradmin/lang/en
+++ b/cluster-useradmin/lang/en
@@ -164,3 +164,4 @@ log_add_group=Added users and groups from hosts in group $1
 log_refresh=Refreshed users and groups
 log_sync=Synchronized users and groups
 
+__norefs=1

diff --git a/cluster-usermin/lang/en b/cluster-usermin/lang/en
index 35a07cc..19016ff 100644 (file)
--- a/cluster-usermin/lang/en
+++ b/cluster-usermin/lang/en
@@ -320,3 +320,4 @@ update_onhost=Results of update on $1 ..
 update_failed=.. update failed : $1
 update_none=.. no updates were found.
 
+__norefs=1

diff --git a/cluster-webmin/lang/en b/cluster-webmin/lang/en
index 9c47954..e825a3c 100644 (file)
--- a/cluster-webmin/lang/en
+++ b/cluster-webmin/lang/en
@@ -330,3 +330,4 @@ config_have=On servers that have it
 config_group=On members of group $1
 config_on=On $1
 config_err=Failed to save module configuration
+__norefs=1

diff --git a/cpan/lang/en b/cpan/lang/en
index 4c69817..2e2969d 100644 (file)
--- a/cpan/lang/en
+++ b/cpan/lang/en
@@ -120,3 +120,4 @@ uninstalls_err=Failed to uninstall modules
 uninstalls_enone=None selected
 uninstalls_emod=$1 failed : $2
 uninstalls_rusure=Are you sure you want to un-install the $1 selected modules? $2 sub-modules and $3 files will be removed.
+__norefs=1

diff --git a/cron/lang/en b/cron/lang/en
index 14d4aa1..19b8152 100644 (file)
--- a/cron/lang/en
+++ b/cron/lang/en
@@ -176,3 +176,4 @@ range_eend=Missing or invalid ending date in range to run
 
 delete_err=Failed to delete Cron jobs
 delete_enone=None selected
+__norefs=1

diff --git a/custom/lang/en b/custom/lang/en
index 3492f4e..0fc0f5d 100644 (file)
--- a/custom/lang/en
+++ b/custom/lang/en
@@ -156,3 +156,4 @@ srun_cmd=Executing SQL command $1 ..
 srun_eprepare=.. SQL error : $1
 srun_eexecute=.. execution error : $1
 srun_none=.. no results were returned.
+__norefs=1

diff --git a/dfsadmin/lang/en b/dfsadmin/lang/en
index aca3d07..70636c5 100644 (file)
--- a/dfsadmin/lang/en
+++ b/dfsadmin/lang/en
@@ -55,3 +55,4 @@ delete_err=Failed to delete shares
 delete_enone=None selected
 
 restart_err=Failed to apply changes
+__norefs=1

diff --git a/dhcp-dns/lang/en b/dhcp-dns/lang/en
index 1b2c40b..94db865 100644 (file)
--- a/dhcp-dns/lang/en
+++ b/dhcp-dns/lang/en
@@ -45,3 +45,4 @@ delete_enone=None selected
 
 chooser_ip=Select free IP address
 chooser_none=No free IP addresses were found in any of your subnets!
+__norefs=1

diff --git a/dhcpd/lang/en b/dhcpd/lang/en
index 2681d82..1d15048 100644 (file)
--- a/dhcpd/lang/en
+++ b/dhcpd/lang/en
@@ -474,3 +474,4 @@ hdelete_rusure3=Are you sure you want to deleted the $2 selected groups? Any hos
 hdelete_ok=Delete Now
 
 
+__norefs=1

diff --git a/dnsadmin/lang/en b/dnsadmin/lang/en
index 395148f..b22289d 100644 (file)
--- a/dnsadmin/lang/en
+++ b/dnsadmin/lang/en
@@ -25,3 +25,4 @@ log_create_record=Created $1 record $2 in zone $3
 log_modify_record=Modified $1 record $2 in zone $3
 log_boot=Created primary configuration file
 
+__norefs=1

diff --git a/dovecot/lang/en b/dovecot/lang/en
index 8cffebb..8a970a7 100644 (file)
--- a/dovecot/lang/en
+++ b/dovecot/lang/en
@@ -192,3 +192,4 @@ manual_title=Edit Config File
 manual_desc=Editing Dovecot configuration file $1 ..
 manual_err=Failed to save config file
 manual_edata=Nothing entered!
+__norefs=1

diff --git a/export-call/lang/en b/export-call/lang/en
index 55d1ef0..d294739 100644 (file)
--- a/export-call/lang/en
+++ b/export-call/lang/en
@@ -1,2 +1,3 @@
 my_msg=This is from the other module
 my_subs=Your name in the other module is $1
+__norefs=1

diff --git a/export-test/lang/en b/export-test/lang/en
index 3e1bd94..a0b3003 100644 (file)
--- a/export-test/lang/en
+++ b/export-test/lang/en
@@ -1,2 +1,3 @@
 my_msg=Some message here
 my_subs=Your name is $1
+__norefs=1

diff --git a/exports/lang/en b/exports/lang/en
index 2fb9c63..5471e42 100644 (file)
--- a/exports/lang/en
+++ b/exports/lang/en
@@ -53,9 +53,9 @@ edit_anonuid=Treat untrusted users as
 edit_default=Default
 edit_anongid=Treat untrusted groups as
 edit_sync=Immediately sync all writes?
-edit_sync1=$yes
-edit_sync2=$no
-edit_sync0=$default
+edit_sync1=Yes
+edit_sync2=No
+edit_sync0=Default
 edit_in=in
 
 save_err=Failed to save export
@@ -85,3 +85,4 @@ log_create=Created NFS export $1
 log_create_l=Created NFS export $1 to $2
 log_apply=Applied configuration
 log_delete_exports=Deleted $1 NFS exports
+__norefs=1

diff --git a/fdisk/lang/en b/fdisk/lang/en
index f31b89b..f13aeaf 100644 (file)
--- a/fdisk/lang/en
+++ b/fdisk/lang/en
@@ -266,3 +266,4 @@ disk_dsize=<b>Disk size:</b> $1
 disk_model=<b>Make and model:</b> $1
 disk_cylinders=<b>Cylinders:</b> $1
 
+__norefs=1

diff --git a/fetchmail/lang/en b/fetchmail/lang/en
index 12fcfe7..a6bea67 100644 (file)
--- a/fetchmail/lang/en
+++ b/fetchmail/lang/en
@@ -133,3 +133,4 @@ user_return=user's configuration
 
 email_ok=Fetchmail output
 email_failed=Fetchmail error
+__norefs=1

diff --git a/file/lang/en b/file/lang/en
index 5aa9dcd..12f49f9 100644 (file)
--- a/file/lang/en
+++ b/file/lang/en
@@ -263,8 +263,8 @@ acl_button_mount=Mount (mount or un-mount filesystem)
 acl_button_copy=Copy, Cut and Paste
 acl_unarchive=Can extract uploaded archive files?
 acl_unarchive2=Always attempt to
-acl_unarchive1=$yes
-acl_unarchive0=$no
+acl_unarchive1=Yes
+acl_unarchive0=No
 acl_dostounix=Can have Windows newlines converted?
 acl_chroot=Chroot directory for entire file manager
 acl_relto=(relative to any chroot directory)
@@ -429,3 +429,4 @@ extract_yes=Yes, then delete
 extract_show=Show contents
 extract_err2=Failed to get file contents : $1
 extract_shown=Contents of compressed file
+__norefs=1

diff --git a/filter/lang/en b/filter/lang/en
index 4b5c138..c54f462 100644 (file)
--- a/filter/lang/en
+++ b/filter/lang/en
@@ -112,3 +112,4 @@ forward_enabled=Email forwarding enabled?
 forward_to=Forward to addresses
 forward_cont=Also deliver normally?
 forward_err=Failed to save email forwarding
+__norefs=1

diff --git a/firewall/lang/en b/firewall/lang/en
index 74ef302..594f29e 100644 (file)
--- a/firewall/lang/en
+++ b/firewall/lang/en
@@ -344,3 +344,4 @@ rename_header=Chain rename options
 rename_adjust=Modify other rules that jump to this chain?
 rename_none=None
 rename_ecannot=You are not allowed to rename chains
+__norefs=1

diff --git a/flashterm/lang/en b/flashterm/lang/en
index 366ee54..e268e44 100644 (file)
--- a/flashterm/lang/en
+++ b/flashterm/lang/en
@@ -2,3 +2,4 @@ index_title=FlashTerm
 index_esocket=Socket failed : $1
 index_eport=Port $1 is already in use, perhaps by another Flash policy server
 index_etelnet=This system is not running a Telnet server on port $1.
+__norefs=1

diff --git a/foobar/lang/en b/foobar/lang/en
index d1aa15d..be6df6e 100644 (file)
--- a/foobar/lang/en
+++ b/foobar/lang/en
@@ -19,3 +19,4 @@ save_egone=Website no longer exists
 log_create=Created website $1
 log_modify=Modified website $1
 log_delete=Deleted website $1
+__norefs=1

diff --git a/format/lang/en b/format/lang/en
index 7238d37..33d2e51 100644 (file)
--- a/format/lang/en
+++ b/format/lang/en
@@ -148,3 +148,4 @@ acl_view=Can edit disks and partitions?
 
 ecannot=You are not allowed to edit partitions
 
+__norefs=1

diff --git a/frox/lang/en b/frox/lang/en
index 8fd4e19..d44ed78 100644 (file)
--- a/frox/lang/en
+++ b/frox/lang/en
@@ -145,3 +145,4 @@ log_stop=Stopped Frox server
 log_start=Started Frox server
 log_apply=Applied configuration
 
+__norefs=1

diff --git a/fsdump/lang/en b/fsdump/lang/en
index 1e236b4..3aedd0f 100644 (file)
--- a/fsdump/lang/en
+++ b/fsdump/lang/en
@@ -227,3 +227,4 @@ email_failed=Backup failed!
 
 newtape_subject=Tape change $1 for backup of $2 on $3
 newtape_body=The backup of $2 on $3 has reached the maximum amount of data allowed on tape $1. You will need to load a new tape and hit the 'Tape Loaded' link in Webmin's Filesystem Backup module for the backup to continue.
+__norefs=1

diff --git a/ftelnet/lang/en b/ftelnet/lang/en
index 4640b2c..1c45c79 100644 (file)
--- a/ftelnet/lang/en
+++ b/ftelnet/lang/en
@@ -2,3 +2,4 @@ index_title=FTelnet
 index_esocket=Socket failed : $1
 index_eport=Port $1 is already in use, perhaps by another Flash policy server
 index_etelnet=This system is not running a Telnet server on port $1.
+__norefs=1

diff --git a/grub/lang/en b/grub/lang/en
index 5df715f..760ade2 100644 (file)
--- a/grub/lang/en
+++ b/grub/lang/en
@@ -74,3 +74,4 @@ log_up_title=Moved up boot option $1
 log_down_title=Moved down  boot option $1
 log_global=Changed global options
 log_install=Installed GRUB
+__norefs=1

diff --git a/heartbeat/lang/en b/heartbeat/lang/en
index 3e3d9ad..692cf8e 100644 (file)
--- a/heartbeat/lang/en
+++ b/heartbeat/lang/en
@@ -102,3 +102,4 @@ start_err=Failed to start heartbeat
 apply_err=Failed to apply changes
 apply_epid=Process is no longer running
 
+__norefs=1

diff --git a/help/lang/en b/help/lang/en
index ea4af1b..6dd3937 100644 (file)
--- a/help/lang/en
+++ b/help/lang/en
@@ -18,3 +18,4 @@ search_mod=Module
 search_page=Help page
 search_line=Match on
 search_results=Webmin help pages matching $1
+__norefs=1

diff --git a/hpuxexports/lang/en b/hpuxexports/lang/en
index 5084431..9938b55 100644 (file)
--- a/hpuxexports/lang/en
+++ b/hpuxexports/lang/en
@@ -75,3 +75,4 @@ log_delete_l=Deleted NFS export $1 to $2
 log_create=Created NFS export $1
 log_create_l=Created NFS export $1 to $2
 log_apply=Applied configuration
+__norefs=1

diff --git a/htaccess-htpasswd/lang/en b/htaccess-htpasswd/lang/en
index 0d4098f..f03c94e 100644 (file)
--- a/htaccess-htpasswd/lang/en
+++ b/htaccess-htpasswd/lang/en
@@ -123,3 +123,4 @@ search_noprot=Skipping Apache options file $1, as it does not protect the direct
 search_open=Could not open Apache options file $1 : $2
 search_done=.. done
 
+__norefs=1

diff --git a/htpasswd-file/lang/en b/htpasswd-file/lang/en
index 1a4151c..8d5eb45 100644 (file)
--- a/htpasswd-file/lang/en
+++ b/htpasswd-file/lang/en
@@ -53,3 +53,4 @@ log_create=Created user $1
 log_delete=Deleted user $1
 log_modify=Modified user $1
 
+__norefs=1

diff --git a/idmapd/lang/en b/idmapd/lang/en
index d6b2e5a..77a84fe 100644 (file)
--- a/idmapd/lang/en
+++ b/idmapd/lang/en
@@ -9,3 +9,4 @@ nobody_group=Nobody group
 save=Save config and restart daemon
 save_err=Failed to save config file $1
 error_dir=Directory $1 does not exist
+__norefs=1

diff --git a/inetd/lang/en b/inetd/lang/en
index 37cb745..0c96cda 100644 (file)
--- a/inetd/lang/en
+++ b/inetd/lang/en
@@ -105,3 +105,4 @@ log_create_rprog_l=Created RPC $1 number $2 for program $3
 log_modify_rprog_l=Modified RPC $1 number $2 for program $3
 log_delete_rprog_l=Deleted RPC $1 number $2 for program $3
 
+__norefs=1

diff --git a/init/lang/en b/init/lang/en
index ff32cb5..78c203a 100644 (file)
--- a/init/lang/en
+++ b/init/lang/en
@@ -164,3 +164,4 @@ change_err=You are not allowed to switch runlevels
 change_title=Switch Runlevel
 change_cmd=Switching to runlevel $1 with command $2. This may take some time, and Webmin might not be available anymore after switching.
 
+__norefs=1

diff --git a/inittab/lang/en b/inittab/lang/en
index 2e8ae65..8b9282d 100644 (file)
--- a/inittab/lang/en
+++ b/inittab/lang/en
@@ -20,7 +20,7 @@ inittab_powerokwait=Power is restored
 inittab_powerfailnow=Power fail
 inittab_ctrlaltdel=Ctrl-Alt-Del
 inittab_kbdrequest=Special key combination
-inittab_kbrequest=$inittab_kbdrequest
+inittab_kbrequest=Special key combination
 inittab_return=process list
 inittab_apply=Apply Init Configuration
 inittab_applymsg=Click this button to apply the current SysV Init Configuration by running the command <tt>telinit q</tt>. Be aware that any mistakes in your configuration may make the system unusable when this command is run.
@@ -51,3 +51,4 @@ apply_err=Failed to apply configuration
 delete_err=Failed to delete processes
 delete_enone=None selected
 
+__norefs=1

diff --git a/ipfw/lang/en b/ipfw/lang/en
index ff58f44..ffceb31 100644 (file)
--- a/ipfw/lang/en
+++ b/ipfw/lang/en
@@ -235,3 +235,4 @@ add_emissing=Server $1 does not have the IPFW firewall setup
 add_ok=Added $1, with $2 active firewall rules.
 
 
+__norefs=1

diff --git a/jabber/lang/en b/jabber/lang/en
index 0001d3d..53c28df 100644 (file)
--- a/jabber/lang/en
+++ b/jabber/lang/en
@@ -119,3 +119,4 @@ stop_err=Failed to stop Jabber
 stop_epid=Failed to find Jabber process
 start_err=Failed to start Jabber
 
+__norefs=1

diff --git a/krb5/lang/en b/krb5/lang/en
index 6f953f1..75dc4a9 100644 (file)
--- a/krb5/lang/en
+++ b/krb5/lang/en
@@ -15,3 +15,4 @@ default_admin=Admin server
 default_domain=Default domain name
 
 save=Update Configuration
+__norefs=1

diff --git a/lang/en b/lang/en
index da5ea33..e1aac26 100644 (file)
--- a/lang/en
+++ b/lang/en
@@ -349,3 +349,4 @@ sql_eldapconnect=Failed to connect to LDAP server $1
 sql_eldaptls=Failed to start TLS encryption for LDAP : $1
 sql_eldaplogin=Failed to login to LDAP server as $1 : $2
 
+__norefs=1

diff --git a/ldap-client/lang/en b/ldap-client/lang/en
index 931e0bf..639acce 100644 (file)
--- a/ldap-client/lang/en
+++ b/ldap-client/lang/en
@@ -149,9 +149,9 @@ desc_amd.master=Automounter maps
 desc_auto_home=Automounter home
 desc_auto_master=Automounter maps
 desc_auto_local=Automounter local
-desc_auto.home=$desc_auto_home
-desc_auto.master=$desc_auto_master
-desc_auto.local=$desc_auto_local
+desc_auto.home=Automounter home
+desc_auto.master=Automounter maps
+desc_auto.local=Automounter local
 desc_automount=Automounter maps
 desc_netgroup=Netgroups
 desc_netgrp=Netgroups
@@ -217,3 +217,4 @@ check_match=Looking for Unix user $1 ..
 check_ematch=.. user does not exist.
 check_matched=.. user found successfully.
 check_done=Your system has been successfully configured as an LDAP client!
+__norefs=1

diff --git a/ldap-server/lang/en b/ldap-server/lang/en
index de52938..fff84bf 100644 (file)
--- a/ldap-server/lang/en
+++ b/ldap-server/lang/en
@@ -31,7 +31,7 @@ connect_elogin=Failed to login to LDAP server $1 as $2 : $3
 connect_cpan=You can have the <tt>$1</tt> Perl module <a href='$2'>automatically installed</a> from CPAN.
 
 slapd_title=OpenLDAP Server Configuration
-ldif_title=$slapd_title
+ldif_title=OpenLDAP Server Configuration
 slapd_header=Global LDAP server options
 slapd_suffix=Root DN for LDAP database
 slapd_rootdn=Administration login DN
@@ -265,7 +265,7 @@ gencert_edest=Destination directory does not exist
 perms_err=Failed to fix file ownership
 
 acl_slapd=Can configure LDAP server?
-acl_ldif=$acl_slapd
+acl_ldif=Can configure LDAP server?
 acl_schema=Can manage schema?
 acl_acl=Can edit access control?
 acl_browser=Can browse and edit database?
@@ -322,3 +322,4 @@ eacl_efilter=Missing or invalid filter - should be like <tt>(objectClass=posixAc
 eacl_eattrs=Missing or invalid comma-separated list of attributes
 eacl_ewho=Missing or invalid-looking DN in row $1
 eacl_eaccess=Missing or invalid access level in row $1
+__norefs=1

diff --git a/ldap-useradmin/lang/en b/ldap-useradmin/lang/en
index 2d19daf..97d52d0 100644 (file)
--- a/ldap-useradmin/lang/en
+++ b/ldap-useradmin/lang/en
@@ -94,3 +94,4 @@ raw_for=For $1
 batch_samba=Create Samba account for new users?
 batch_descafter3=In <b>create</b> and <b>modify</b> lines, you can optionally append extra fields containing LDAP atttributes in <i>name</i>=<i>value</i> format, to be assigned to the new or modified users.
 batch_eattr=Invalid LDAP attribute at line $1 : $2
+__norefs=1

diff --git a/lilo/lang/en b/lilo/lang/en
index 51af4ae..836a328 100644 (file)
--- a/lilo/lang/en
+++ b/lilo/lang/en
@@ -95,3 +95,4 @@ log_apply=Applied configuration
 log_global=Changed global options
 
 
+__norefs=1

diff --git a/link/lang/en b/link/lang/en
index 71b0935..85d68d9 100644 (file)
--- a/link/lang/en
+++ b/link/lang/en
@@ -4,3 +4,4 @@ index_evirtualmin=The URL contains Virtualmin-specific variables, but no server
 
 acl_link=Redirect to URL
 acl_elink=Missing URL to redirect to
+__norefs=1

diff --git a/logrotate/lang/en b/logrotate/lang/en
index 2a0f255..57e77c9 100644 (file)
--- a/logrotate/lang/en
+++ b/logrotate/lang/en
@@ -58,7 +58,7 @@ edit_errorsno=Nobody
 edit_errorsto=Address or user
 edit_post=Commands to run after rotation
 edit_pre=Commands to run before rotation
-edit_default=$default ($1)
+edit_default=Default ($1)
 edit_sharedscripts=Only run scripts once for all files?
 edit_now=Rotate Now
 
@@ -108,3 +108,4 @@ force_failed=.. failed! See the output above for the reason why.
 delete_err=Failed to delete logs
 delete_enone=None selected
 
+__norefs=1

diff --git a/lpadmin/lang/en b/lpadmin/lang/en
index 17aedbf..2f97529 100644 (file)
--- a/lpadmin/lang/en
+++ b/lpadmin/lang/en
@@ -315,3 +315,4 @@ add_ediff=Server $1 is using a different print system ($2) to this server
 add_ediff2=Server $1 is using a different print driver ($2) to this server
 add_ok=Added $1, with $2 printers.
 
+__norefs=1

diff --git a/lvm/lang/en b/lvm/lang/en
index a7bcbda..3a1d34b 100644 (file)
--- a/lvm/lang/en
+++ b/lvm/lang/en
@@ -178,3 +178,4 @@ log_resize_pv=Resized physical volume $1 in VG $2
 
 blocks=blocks
 
+__norefs=1

diff --git a/mailboxes/lang/en b/mailboxes/lang/en
index 0758607..e86ef5b 100644 (file)
--- a/mailboxes/lang/en
+++ b/mailboxes/lang/en
@@ -436,3 +436,4 @@ delall_ok=Delete Now
 slide_title=Attached Images
 slide_prev=Previous
 slide_next=Next
+__norefs=1

diff --git a/mailcap/lang/en b/mailcap/lang/en
index 21c617b..8bfc508 100644 (file)
--- a/mailcap/lang/en
+++ b/mailcap/lang/en
@@ -44,3 +44,4 @@ log_modify_mailcap=Modified MIME type program for $1
 log_delete_mailcaps=Deleted $1 MIME type programs
 log_disable_mailcaps=Disabled $1 MIME type programs
 log_enable_mailcaps=Enabled $1 MIME type programs
+__norefs=1

diff --git a/man/lang/en b/man/lang/en
index 468c2f2..8b3a695 100644 (file)
--- a/man/lang/en
+++ b/man/lang/en
@@ -72,3 +72,4 @@ perl_title=Perl Module
 perl_header=Documentation for Perl module $1
 perl_emod=Invalid Perl module name
 
+__norefs=1

diff --git a/mon/lang/en b/mon/lang/en
index 613ade1..203ad13 100644 (file)
--- a/mon/lang/en
+++ b/mon/lang/en
@@ -203,3 +203,4 @@ periods_ehour=Missing or invalid hour for period $1 (must be like 9am or 5pm)
 
 show_title=Operational Status
 show_ecgi=The MON status program $1 does not exist. Maybe it is not installed, or your <a href='$2'>module configuration</a> is incorrect.
+__norefs=1

diff --git a/mount/lang/en b/mount/lang/en
index d9722a1..6b0476e 100644 (file)
--- a/mount/lang/en
+++ b/mount/lang/en
@@ -461,3 +461,4 @@ ecompile=An error has occurred building a program for listing mounted filesystem
 freebsd_eaddr=Missing or invalid server address
 freebsd_eworkgroup=Missing or invalid workgroup
 
+__norefs=1

diff --git a/mysql/lang/en b/mysql/lang/en
index 856626e..14de71b 100644 (file)
--- a/mysql/lang/en
+++ b/mysql/lang/en
@@ -859,3 +859,4 @@ root_epass1=No new password entered
 root_epass2=Passwords do not match
 root_none=No password!
 root_auto=Automatic (typically <tt>root</tt>)
+__norefs=1

diff --git a/net/lang/en b/net/lang/en
index d8560e0..822a3b5 100644 (file)
--- a/net/lang/en
+++ b/net/lang/en
@@ -293,3 +293,4 @@ hdelete_err=Failed to delete host addresses
 hdelete_enone=None selected
 idelete_err=Failed to delete IPv6 host addresses
 
+__norefs=1

diff --git a/nis/lang/en b/nis/lang/en
index bd74235..d258fe7 100644 (file)
--- a/nis/lang/en
+++ b/nis/lang/en
@@ -98,9 +98,9 @@ desc_amd.master=Automounter maps
 desc_auto_home=Automounter home
 desc_auto_master=Automounter maps
 desc_auto_local=Automounter local
-desc_auto.home=$desc_auto_home
-desc_auto.master=$desc_auto_master
-desc_auto.local=$desc_auto_local
+desc_auto.home=Automounter home
+desc_auto.master=Automounter maps
+desc_auto.local=Automounter local
 desc_automount=Automounter maps
 desc_netgroup=Netgroups
 desc_netgrp=Netgroups
@@ -306,3 +306,4 @@ eswitch_err=Failed to save service
 eswitch_enone=No sources selected!
 
 
+__norefs=1

diff --git a/openslp/lang/en b/openslp/lang/en
index 8d7f257..df73965 100644 (file)
--- a/openslp/lang/en
+++ b/openslp/lang/en
@@ -48,3 +48,4 @@ index_stopmsg=Click this button to stop the OpenSLP daemon on your system.
 
 stop_err=Failed to stop OpenSLP
 start_err=Failed to start OpenSLP
+__norefs=1

diff --git a/package-updates/lang/en b/package-updates/lang/en
index a7a6e98..eb316e8 100644 (file)
--- a/package-updates/lang/en
+++ b/package-updates/lang/en
@@ -114,3 +114,4 @@ system_csw=CSW (Blastwave)
 system_webmin=Webmin module
 system_usermin=Usermin module
 system_tgz=Webmin or Usermin tar.gz
+__norefs=1

diff --git a/pap/lang/en b/pap/lang/en
index a746954..543a39f 100644 (file)
--- a/pap/lang/en
+++ b/pap/lang/en
@@ -162,3 +162,4 @@ sync_title=User Synchronization
 delete_err=Failed to delete accounts
 delete_enone=None selected
 
+__norefs=1

diff --git a/passwd/lang/en b/passwd/lang/en
index d23d36d..170f675 100644 (file)
--- a/passwd/lang/en
+++ b/passwd/lang/en
@@ -43,3 +43,4 @@ acl_mode6=Users matching
 acl_expire=Can force users to change password at next login?
 acl_sec=Include secondary groups?
 acl_notusers=Except for users
+__norefs=1

diff --git a/phpini/lang/en b/phpini/lang/en
index 064fc2a..d0e9ffc 100644 (file)
--- a/phpini/lang/en
+++ b/phpini/lang/en
@@ -168,3 +168,4 @@ acl_anyfile=Can edit any file as a PHP configuration?
 acl_manual=Can manually edit configuration files?
 acl_inis=Additional configuration files<br>(In <i>filename</i>=<i>description</i> format)
 acl_user=Read and write files as user
+__norefs=1

diff --git a/postfix/lang/en b/postfix/lang/en
index ffa270d..0f975b9 100644 (file)
--- a/postfix/lang/en
+++ b/postfix/lang/en
@@ -379,7 +379,7 @@ mapping_none=No mappings of this type have been defined yet.
 virtual_title=Virtual Domains
 virtual_ecannot=You are not allowed to edit the virtual domains mapping configuration
 opts_virtual_maps=Domain mapping lookup tables
-opts_virtual_alias_maps=$opts_virtual_maps
+opts_virtual_alias_maps=Domain mapping lookup tables
 opts_virtual_alias_domains=Domains to perform virtual mapping for
 virtual_same=From domain mapping tables
 virtual_return=virtual domains
@@ -722,11 +722,11 @@ log_virtual_alias_maps_modify=Modified virtual domain $1
 log_virtual_alias_maps_delete=Deleted virtual domain $1
 log_delete_virtual_alias_mapss=Deleted $1 virtual domains
 log_manual_virtual_alias_mapss=Manually edited virtual domains in $1
-log_virtual_maps_create=$log_virtual_alias_maps_create
-log_virtual_maps_modify=$log_virtual_alias_maps_modify
-log_virtual_maps_delete=$log_virtual_alias_maps_delete
-log_delete_virtual_mapss=$log_delete_virtual_alias_mapss
-log_manual_virtual_mapss=$log_manual_virtual_alias_mapss
+log_virtual_maps_create=Created virtual domain $1
+log_virtual_maps_modify=Modified virtual domain $1
+log_virtual_maps_delete=Deleted virtual domain $1
+log_delete_virtual_mapss=Deleted $1 virtual domains
+log_manual_virtual_mapss=Manually edited virtual domains in $1
 log_canonical_maps_create=Created canonical mapping $1
 log_canonical_maps_modify=Modified canonical mapping $1
 log_canonical_maps_delete=Deleted canonical mapping $1
@@ -787,7 +787,7 @@ sasl_permit_sasl_authenticated=Allow authenticated clients
 sasl_reject_unauth_destination=Reject email to other domains
 sasl_permit_inet_interfaces=Allow connections from this system
 sasl_reject_unknown_reverse_client_hostname=Reject clients with no reverse hostname
-sasl_reject_unknown_client=$sasl_reject_unknown_reverse_client_hostname
+sasl_reject_unknown_client=Reject clients with no reverse hostname
 sasl_check_relay_domains=Allow only relay domains
 sasl_permit_mx_backup=Allow domains this system is a backup MX for
 sasl_permit_tls_all_clientcerts=Allow TLS clients with any certificate
@@ -903,3 +903,5 @@ bcc_sender=Sender mappings
 bcc_recipient=Recipient mappings
 bcc_senderdesc=The sender BCC mappings define an additional email address that mail <b>from</b> the addresses or domains listed will be BCCd to.
 bcc_recipientdesc=The recipient BCC mappings define an additional email address that mail <b>to</b> the addresses or domains listed will be BCCd to.
+
+__norefs=1

diff --git a/postgresql/lang/en b/postgresql/lang/en
index f535896..9ea7bb8 100644 (file)
--- a/postgresql/lang/en
+++ b/postgresql/lang/en
@@ -613,3 +613,4 @@ seq_ecannot=You are not allowed to manage sequences
 
 dgrant_err=Failed to reset grants
 dgrant_enone=No objects selected
+__norefs=1

diff --git a/postgresql/postgresql-lib.pl b/postgresql/postgresql-lib.pl
index c9ff281..7d88928 100755 (executable)
--- a/postgresql/postgresql-lib.pl
+++ b/postgresql/postgresql-lib.pl
@@ -1116,18 +1116,20 @@ if ($? || $out =~ /could not|error|failed/i) {
 return undef;
 }
 
-# restore_database(database, source-path, only-data, clear-db)
+# restore_database(database, source-path, only-data, clear-db, [&only-tables])
 # Restores the contents of a PostgreSQL backup into the specified database.
 # Returns undef on success, or an error message on failure.
 sub restore_database
 {
-local ($db, $path, $only, $clean) = @_;
+local ($db, $path, $only, $clean, $tables) = @_;
+local $tablesarg = join(" ", map { " -t ".quotemeta($_) } @$tables);
 local $cmd = &quote_path($config{'rstr_cmd'}).
             (!$postgres_login ? "" :
              &supports_pgpass() ? " -U $postgres_login" : " -u").
             ($config{'host'} ? " -h $config{'host'}" : "").
             ($only ? " -a" : "").
             ($clean ? " -c" : "").
+            $tablesarg.
             " -d $db ".&quote_path($path);
 if ($postgres_sameunix && defined(getpwnam($postgres_login))) {
        $cmd = &command_as_user($postgres_login, 0, $cmd);

diff --git a/ppp-client/lang/en b/ppp-client/lang/en
index f4d4702..3ef2acc 100644 (file)
--- a/ppp-client/lang/en
+++ b/ppp-client/lang/en
@@ -103,3 +103,4 @@ log_connect=Connected with $1
 log_fail=Failed to connect with $1
 log_disconnect=Disconnected from $1
 
+__norefs=1

diff --git a/pptp-client/lang/en b/pptp-client/lang/en
index ddd9ebd..6801201 100644 (file)
--- a/pptp-client/lang/en
+++ b/pptp-client/lang/en
@@ -111,3 +111,4 @@ log_failed=Failed to connect tunnel $1
 log_disc=Disconnected tunnel $1
 log_opts=Edited global PPP options
 
+__norefs=1

diff --git a/pptp-server/lang/en b/pptp-server/lang/en
index 684ea43..7802ca3 100644 (file)
--- a/pptp-server/lang/en
+++ b/pptp-server/lang/en
@@ -67,8 +67,8 @@ options_version=PPPd version $1
 options_msdesc=The options below enable the MS-CHAP authentication method and MPPE encryption, used by default by Windows VPN clients. However, MPPE requires support in both the PPP daemon and operating system kernel.
 options_mschap=MS-CHAP authentication
 options_mschap-v2=MS-CHAP version 2 authentication
-options_chapms=$options_mschap
-options_chapms-v2=$options_mschap-v2
+options_chapms=MS-CHAP authentication
+options_chapms-v2=MS-CHAP version 2 authentication
 
 secrets_title=PPP Accounts
 secrets_ecannot=You are not allowed to edit PPP accounts
@@ -150,3 +150,4 @@ acl_secrets=Can manage PPTP accounts?
 acl_conns=Can view connections?
 acl_stop=Can stop and start PPTP server?
 acl_apply=Can apply configuration?
+__norefs=1

diff --git a/proc/lang/en b/proc/lang/en
index 46baf66..cd05467 100644 (file)
--- a/proc/lang/en
+++ b/proc/lang/en
@@ -95,7 +95,7 @@ linux_group=Group
 linux_ruser=Real user
 linux_rgroup=Real group
 linux_pgid=Process group ID
-linux_stime=$stime
+linux_stime=Started
 
 linuxstat_R=Running
 linuxstat_S=Sleeping
@@ -111,14 +111,14 @@ freebsd_ruser=Real user
 freebsd_rgroup=Real group
 freebsd_tty=TTY
 freebsd_pgid=Process group
-freebsd_stime=$stime
+freebsd_stime=Started
 freebsd_lim=Memory limit
 
 hpux_pri=Priority
 hpux_tty=TTY
 hpux_status=Status
 hpux_wchan=Waiting for
-hpux_stime=$stime
+hpux_stime=Started
 
 hpuxstat_0=Nonexistent
 hpuxstat_S=Sleeping
@@ -136,7 +136,7 @@ sysv_ruser=Real user
 sysv_rgroup=Real group
 sysv_pgid=Process group ID
 sysv_tty=TTY
-sysv_stime=$stime
+sysv_stime=Started
 sysv_task=Task ID
 sysv_zone=Zone name
 
@@ -201,3 +201,4 @@ trace_change=Change
 windows_threads=Threads in process
 
 syslog_dmesg=Kernel messages
+__norefs=1

diff --git a/procmail/lang/en b/procmail/lang/en
index b0f0bdc..97e760c 100644 (file)
--- a/procmail/lang/en
+++ b/procmail/lang/en
@@ -127,3 +127,4 @@ delete_enone=None selected
 
 check_epostfix=Procmail is not enabled in your Postfix configuration. The configuration file <tt>$2</tt> must have the <tt>$1</tt> option set to <tt>$3</tt>.
 check_esendmail=Sendmail is not setup to use Procmail for local delivery. This can be configured in Webmin's <a href='$1'>Sendmail Mail Server</a> module.
+__norefs=1

diff --git a/proftpd/lang/en b/proftpd/lang/en
index 9c64117..db26593 100644 (file)
--- a/proftpd/lang/en
+++ b/proftpd/lang/en
@@ -453,3 +453,4 @@ proftpd_apply=Apply Changes
 proftpd_stop=Stop ProFTPd
 proftpd_start=Start ProFTPd
 
+__norefs=1

diff --git a/pserver/lang/en b/pserver/lang/en
index dc95137..c36cf5c 100644 (file)
--- a/pserver/lang/en
+++ b/pserver/lang/en
@@ -107,3 +107,4 @@ acl_init=Can initialized repository?
 init_err=Failed to initialize repository
 init_ecannot=You are not allowed to initialize a repository
 
+__norefs=1

diff --git a/qmailadmin/lang/en b/qmailadmin/lang/en
index fcd31ad..2b0a89a 100644 (file)
--- a/qmailadmin/lang/en
+++ b/qmailadmin/lang/en
@@ -141,7 +141,7 @@ vsave_err=Failed to save virtual mapping
 vsave_edomain='$1' is not a valid email domain
 vsave_euser='$1' is not a valid email username
 vsave_eprepend='$1' is not a valid mapping prefix
-vsave_eboth=You cannot select both '$vform_all' and '$vform_none'
+vsave_eboth=You cannot select both 'Any address not matching another virtual mapping' and 'Nothing'
 
 vdelete_err=Failed to delete virtual mappings
 
@@ -401,3 +401,4 @@ match_!headers=Headers don't match
 delq_titles=Deleting Messages
 delq_rusure=Are you sure you want to delete the $1 selected queued messages?
 delq_confirm=Delete Messages
+__norefs=1

diff --git a/quota/lang/en b/quota/lang/en
index f6f737f..de7b8d2 100644 (file)
--- a/quota/lang/en
+++ b/quota/lang/en
@@ -343,3 +343,4 @@ gmass_header=Quota changes to apply to selected groups
 gmass_count=The changes below will apply to $1 selected groups ..
 gmass_ok=Update Groups
 gmass_err=Failed to update group quotas
+__norefs=1

diff --git a/raid/lang/en b/raid/lang/en
index 5916ea1..4f79fe2 100644 (file)
--- a/raid/lang/en
+++ b/raid/lang/en
@@ -148,3 +148,4 @@ delete_title=Delete RAID Array
 delete_rusure=Are you sure you want to delete the RAID array $1, which uses $2 of disk space?
 delete_ok=Yes, Delete It
 delete_eidx=No RAID array selected!
+__norefs=1

diff --git a/rbac/lang/en b/rbac/lang/en
index 50bbf76..8a13b0b 100644 (file)
--- a/rbac/lang/en
+++ b/rbac/lang/en
@@ -250,3 +250,4 @@ prctl_res=Resource
 prctl_priv=Privilege type
 prctl_limit=Upper limit
 prctl_action=Action
+__norefs=1

diff --git a/samba/lang/en b/samba/lang/en
index b70b913..4a4d39a 100644 (file)
--- a/samba/lang/en
+++ b/samba/lang/en
@@ -646,3 +646,4 @@ manual_edata=Nothing entered!
 
 delete_err=Failed to delete shares
 delete_enone=None selected
+__norefs=1

diff --git a/sendmail/lang/en b/sendmail/lang/en
index 7315a72..956a70c 100644 (file)
--- a/sendmail/lang/en
+++ b/sendmail/lang/en
@@ -836,3 +836,4 @@ ports_eclash=Duplicate port name in row $1
 ports_eaddress=Missing or invalid IP address in row $1
 ports_eport=Missing or invalid port number in row $1
 
+__norefs=1

diff --git a/sentry/lang/en b/sentry/lang/en
index 578b08b..6fd2f17 100644 (file)
--- a/sentry/lang/en
+++ b/sentry/lang/en
@@ -104,3 +104,4 @@ log_hostsentry_stop=Stopped hostsentry daemon
 log_portsentry_start=Started portsentry daemon
 log_portsentry_stop=Stopped portsentry daemon
 
+__norefs=1

diff --git a/servers/lang/en b/servers/lang/en
index 3500974..c72d9d8 100644 (file)
--- a/servers/lang/en
+++ b/servers/lang/en
@@ -152,3 +152,4 @@ email_regsubject=System $1 registered
 email_reg=The system $1 has been automatically registered.
 email_unregsubject=System $1 un-registered
 email_unreg=The system $1 has been automatically un-registered.
+__norefs=1

diff --git a/sgiexports/lang/en b/sgiexports/lang/en
index a46942f..00c9c3d 100644 (file)
--- a/sgiexports/lang/en
+++ b/sgiexports/lang/en
@@ -38,3 +38,4 @@ log_delete_export=Deleted export of $1
 log_modify_export=Modified export of $1
 log_apply=Applied configuration
 
+__norefs=1

diff --git a/shell/lang/en b/shell/lang/en
index b2d62c1..d14c9d1 100644 (file)
--- a/shell/lang/en
+++ b/shell/lang/en
@@ -13,3 +13,4 @@ acl_user_def=Current Webmin user
 log_run=Ran command $1
 log_clear=Cleared command history
 
+__norefs=1

diff --git a/shellinabox/lang/en b/shellinabox/lang/en
index cd4cd0d..9069059 100644 (file)
--- a/shellinabox/lang/en
+++ b/shellinabox/lang/en
@@ -1 +1,2 @@
 index_ecpu=This module only runs on x86 Linux systems.
+__norefs=1

diff --git a/shorewall/lang/en b/shorewall/lang/en
index d5847dd..cbafff3 100644 (file)
--- a/shorewall/lang/en
+++ b/shorewall/lang/en
@@ -452,3 +452,4 @@ params_create=Create custom parameter
 params_header=Custom parameter details
 params_err=Failed to save custom parameter
 params_varname=Invalid parameter name (must be a valid shell variable name)
+__norefs=1

diff --git a/smart-status/lang/en b/smart-status/lang/en
index a9b2615..4845001 100644 (file)
--- a/smart-status/lang/en
+++ b/smart-status/lang/en
@@ -40,11 +40,12 @@ short_ok=.. test started OK. See the drive status on the module's main page for
 
 ext_title=Extended Self Test
 ext_doing=Starting extended self test of $1 ..
-ext_failed=$short_failed
-ext_ok=$short_ok
+ext_failed=.. failed!
+ext_ok=.. test started OK. See the drive status on the module's main page for the results.
 
 data_title=Data Collection Test
 data_doing=Starting offline data collection on $1 ..
 data_failed=.. failed!
 data_ok=.. collection started OK. See the drive status on the module's main page for the results.
 
+__norefs=1

diff --git a/smf/lang/en b/smf/lang/en
index f9d2aca..a3b9bfb 100644 (file)
--- a/smf/lang/en
+++ b/smf/lang/en
@@ -323,3 +323,4 @@ smfwizard_manpage_section=Specify manpage section
 smfwizard_manpage_section_error=*Section must be non-null!*
 smfwizard_manpage_manpath=Specify manpath
 smfwizard_manpage_manpath_error=*Manpath must be non-null!*
+__norefs=1

diff --git a/software/lang/en b/software/lang/en
index cba52c1..56bfcca 100644 (file)
--- a/software/lang/en
+++ b/software/lang/en
@@ -389,3 +389,4 @@ hpux_enforce_scripts=Enforce scripts?
 hpux_enforce_dsa=Enforce disk space analysis?
 hpux_root=Root directory
 
+__norefs=1

diff --git a/spam/lang/en b/spam/lang/en
index cd0aad1..cfd4d59 100644 (file)
--- a/spam/lang/en
+++ b/spam/lang/en
@@ -285,7 +285,7 @@ procmail_title=Procmail Spam Delivery
 procmail_ok=Change Procmail Delivery
 procmail_desc=The form can be used to change the Procmail configuration that determines what happens to messages classified as spam.
 
-simple_title=$header_title
+simple_title=Header and Body Tests
 simple_desc=This page allows you to define additional tests that SpamAssassin will apply to email, based on message headers, the body content, URLs found in the body. The name assigned to each test is up to you, but is usually something like CONTAINS_FOO.
 simple_switch=Switch to advanced mode ..
 simple_header=Message tests to apply
@@ -380,3 +380,4 @@ dawl_ecannot=You are not allowed to manage the auto-whitelist for this user
 dawl_doing=Deleting auto-whitelists for all users ..
 dawl_done=.. deleted $2 entries from $1 users.
 dawl_title=Delete All Auto-Whitelists
+__norefs=1

diff --git a/squid/lang/en b/squid/lang/en
index db2b588..8cc3340 100644 (file)
--- a/squid/lang/en
+++ b/squid/lang/en
@@ -971,3 +971,4 @@ cachemgr_all=Use this password for all actions
 cachemgr_others=Other actions:
 cachemgr_enone=None entered - you should select <i>No passwords required</i> instead
 cachemgr_err=Failed to save cache manager passwords
+__norefs=1

diff --git a/ssh2/lang/en b/ssh2/lang/en
index b80b347..c31c80c 100644 (file)
--- a/ssh2/lang/en
+++ b/ssh2/lang/en
@@ -5,3 +5,4 @@ index_credits=MindTerm applet developed by <a href='$1' target=_top>AppGate</a>.
 index_esocket=There is no telnet server running on $1 port $2.
 index_esocket2=There is no SSH server running on $1 port $2.
 index_elookup=Failed to lookup IP address for $1 to test telnet or SSH server.
+__norefs=1

diff --git a/sshd/lang/en b/sshd/lang/en
index e1d5ef5..ea6f8fa 100644 (file)
--- a/sshd/lang/en
+++ b/sshd/lang/en
@@ -241,3 +241,4 @@ manual_err=Failed to save config file
 dknown_err=Failed to delete known hosts
 dknown_enone=None selected
 
+__norefs=1

diff --git a/status/lang/en b/status/lang/en
index 40d2d33..c02d68c 100644 (file)
--- a/status/lang/en
+++ b/status/lang/en
@@ -379,9 +379,9 @@ monitor_sub_timed=$1 timed out on $2
 monitor_pager_timed=$1: $2 timed out $3
 monitor_snmp_timed=$1: $2 timed out
 monitor_email_timed=Monitor on $1 for '$2' has timed out at at $3
-monitor_sub_isdown=$monitor_sub_down
-monitor_pager_isdown=$monitor_pager_down
-monitor_snmp_isdown=$monitor_snmp_down
+monitor_sub_isdown=$1 down on $2
+monitor_pager_isdown=$1: "$2" is down $3
+monitor_snmp_isdown=$1: $2
 monitor_email_isdown=Monitor on $1 for '$2' has detected that the service is down at $3
 monitor_sub=Service monitor : $1
 monitor_sub2=Service monitor
@@ -513,3 +513,4 @@ du_edir=Missing or non-absolute directory path
 du_emax=Missing or non-numeric maximum size
 du_over=Size is $1
 du_under=Size is only $1
+__norefs=1

diff --git a/stunnel/lang/en b/stunnel/lang/en
index 02a8f61..1de2653 100644 (file)
--- a/stunnel/lang/en
+++ b/stunnel/lang/en
@@ -69,3 +69,4 @@ log_create=Created SSL tunnel $1
 log_delete=Deleted SSL tunnel $1
 log_modify=Modified SSL tunnel $1
 log_delete_stunnels=Deleted $1 SSL tunnels
+__norefs=1

diff --git a/syslog-ng/lang/en b/syslog-ng/lang/en
index c90cb75..045dcd2 100644 (file)
--- a/syslog-ng/lang/en
+++ b/syslog-ng/lang/en
@@ -288,3 +288,4 @@ log_apply=Applied configuration
 log_start=Started Syslog-NG server
 log_stop=Stopped Syslog-NG server
 log_options=Changed global options
+__norefs=1

diff --git a/syslog/lang/en b/syslog/lang/en
index cae10a6..e930fb9 100644 (file)
--- a/syslog/lang/en
+++ b/syslog/lang/en
@@ -108,3 +108,4 @@ acl_sel=Only listed files and those under listed directories ..
 acl_extra=Extra log files for this user
 acl_syslog=Can view logs from syslog?
 acl_others=Can view logs from other modules?
+__norefs=1

diff --git a/tcpwrappers/lang/en b/tcpwrappers/lang/en
index 244587d..900b60a 100644 (file)
--- a/tcpwrappers/lang/en
+++ b/tcpwrappers/lang/en
@@ -31,3 +31,4 @@ save_eservice=Daemon names contain bad characters
 
 del_errtitle=Error on rules delete
 del_enone=No rules marked to delete
+__norefs=1

diff --git a/telnet/lang/en b/telnet/lang/en
index eacc0d5..5661a0a 100644 (file)
--- a/telnet/lang/en
+++ b/telnet/lang/en
@@ -6,3 +6,4 @@ index_sshcredits=Includes software developed by the Cryptix Development Team (<a
 index_esocket=There is no telnet server running on $1 port $2.
 index_esocket2=There is no SSH server running on $1 port $2.
 index_elookup=Failed to lookup IP address for $1 to test telnet or SSH server.
+__norefs=1

diff --git a/time/lang/en b/time/lang/en
index 18c1648..6e60ad9 100644 (file)
--- a/time/lang/en
+++ b/time/lang/en
@@ -68,3 +68,4 @@ timezone_err=Failed to save timezone
 timezone_ecannot=You are not allowed to change the timezone
 timezone_enone=No zone selected
 
+__norefs=1

diff --git a/tunnel/lang/en b/tunnel/lang/en
index 04ba8e1..12fec5f 100644 (file)
--- a/tunnel/lang/en
+++ b/tunnel/lang/en
@@ -19,3 +19,4 @@ login_clear=Clear
 seturl_err=Failed to open URL
 seturl_eurl=Invalid URL entered
 
+__norefs=1

diff --git a/updown/lang/en b/updown/lang/en
index c37e7a0..fc0e930 100644 (file)
--- a/updown/lang/en
+++ b/updown/lang/en
@@ -132,3 +132,4 @@ email_upsize=Uploaded size: $1
 email_upextract=Extraction status: $1
 email_subjectu=Upload complete
 email_upmsg=The following uploads have completed :
+__norefs=1

diff --git a/useradmin/lang/en b/useradmin/lang/en
index 35c73b5..436820d 100644 (file)
--- a/useradmin/lang/en
+++ b/useradmin/lang/en
@@ -118,7 +118,7 @@ uedit_nocheck=Don't check password restrictions
 uedit_cothers=Create user in other modules?
 uedit_mothers=Modify user in other modules?
 uedit_grename=Rename group if username changes?
-uedit_dothers=$udel_dothers
+uedit_dothers=Delete user in other modules?
 uedit_forcechange=Force change at next login?
 uedit_uid_def=Automatic
 uedit_uid_calc=Calculated
@@ -370,10 +370,10 @@ log_delete_groups=Deleted $1 groups
 batch_title=Execute Batch File
 batch_ecannot=You cannot use the batch file form
 batch_desc=This form allows you to create, modify or delete many users at once from an uploaded or local text file. Each line in the file specifies one action to take, depending on its first field. The line formats are :
-batch_desc6=$batch_desc1
+batch_desc6=<b>create</b>:username:passwd:uid:gid:realname:homedir:shell:class:change:expire<p><b>modify</b>:oldusername:username:passwd:uid:gid:realname:homedir:shell:class:change:expire<p><b>delete</b>:username
 batch_desc5=<b>create</b>:username:passwd:uid:gid:realname:homedir:shell:min:max<p><b>modify</b>:oldusername:username:passwd:uid:gid:realname:homedir:shell:min:max<p><b>delete</b>:username
 batch_desc4=<b>create</b>:username:passwd:uid:gid:realname:homedir:shell:min:max:expire:flags<p><b>modify</b>:oldusername:username:passwd:uid:gid:realname:homedir:shell:min:max:expire:flags<p><b>delete</b>:username
-batch_desc3=$batch_desc0
+batch_desc3=<b>create</b>:username:passwd:uid:gid:realname:homedir:shell<p><b>modify</b>:oldusername:username:passwd:uid:gid:realname:homedir:shell<p><b>delete</b>:username
 batch_desc2=<b>create</b>:username:passwd:uid:gid:realname:homedir:shell:min:max:warn:inactive:expire<p><b>modify</b>:oldusername:username:passwd:uid:gid:realname:homedir:shell:min:max:warn:inactive:expire<p><b>delete</b>:username
 batch_desc1=<b>create</b>:username:passwd:uid:gid:realname:homedir:shell:class:change:expire<p><b>modify</b>:oldusername:username:passwd:uid:gid:realname:homedir:shell:class:change:expire<p><b>delete</b>:username
 batch_desc0=<b>create</b>:username:passwd:uid:gid:realname:homedir:shell<p><b>modify</b>:oldusername:username:passwd:uid:gid:realname:homedir:shell<p><b>delete</b>:username
@@ -525,3 +525,4 @@ gbatch_eprimary=Group at line $1 cannot be deleted, as it is the primary group o
 gbatch_egroup=Duplicate group name at line $1 : $2
 gbatch_egroupname=Invalid group name at line $1
 gbatch_erename=You are not allowed to rename groups at line $1 : $2
+__norefs=1

diff --git a/usermin/lang/en b/usermin/lang/en
index 56f0a28..33cdf09 100644 (file)
--- a/usermin/lang/en
+++ b/usermin/lang/en
@@ -24,7 +24,7 @@ bind_desc2=This form can be used to change the port number that Usermin listens
 bind_erestart=An error occurring starting Usermin with the new address and port settings : $1
 
 mods_title=Usermin Modules
-umods_title=$mods_title
+umods_title=Usermin Modules
 mods_desc1=Usermin modules can be added after installation by using the form to the right. Modules are typically distributed in <tt>.wbm</tt> files, each of which can contain one or more modules. Modules can also be installed from RPM files if supported by your operating system.
 mods_install=Install Module
 mods_local=From local file
@@ -491,3 +491,4 @@ blocked_cleardesc=Click this button to clear all current host and user blocks, b
 
 mobile_title=Mobile Device Options
 
+__norefs=1

diff --git a/vgetty/lang/en b/vgetty/lang/en
index ec75689..ff94a32 100644 (file)
--- a/vgetty/lang/en
+++ b/vgetty/lang/en
@@ -116,3 +116,4 @@ log_vgetty_delete=Deleted serial port $1
 
 email_subject=Voicemail message
 email_body=Voicemail message received at $1 by $2.
+__norefs=1

diff --git a/vnc/lang/en b/vnc/lang/en
index 4a52020..ce93fe0 100644 (file)
--- a/vnc/lang/en
+++ b/vnc/lang/en
@@ -4,3 +4,4 @@ index_nojava=This module requires java to function, but your browser does not su
 index_credits=VNC client applet created by AT&amp;T. See <a href=http://www.uk.research.att.com/vnc>http://www.uk.research.att.com/vnc</a> for more information.
 index_esocket=There is no VNC server running on $1 port $2.
 index_ecmd=The VNC server program $1 needed for running a specific program is not installed.
+__norefs=1

diff --git a/web-lib-funcs.pl b/web-lib-funcs.pl
index d2f43eb..72fd0b9 100755 (executable)
--- a/web-lib-funcs.pl
+++ b/web-lib-funcs.pl
@@ -4437,8 +4437,12 @@ if ($_[0]) {
                }
        &read_file_cached("$config_directory/$_[0]/custom-lang", \%text);
        }
-foreach $k (keys %text) {
-       $text{$k} =~ s/\$(\{([^\}]+)\}|([A-Za-z0-9\.\-\_]+))/text_subs($2 || $3,\%text)/ge;
+
+# Replace references to other strings
+if (!$text{'__norefs'}) {
+       foreach $k (keys %text) {
+               $text{$k} =~ s/\$(\{([^\}]+)\}|([A-Za-z0-9\.\-\_]+))/text_subs($2 || $3,\%text)/ge;
+               }
        }
 
 if (defined(&theme_load_language)) {

diff --git a/webalizer/lang/en b/webalizer/lang/en
index e7f5606..c9c46a5 100644 (file)
--- a/webalizer/lang/en
+++ b/webalizer/lang/en
@@ -1,6 +1,6 @@
 index_title=Webalizer Logfile Analysis
 index_version=Webalizer version $1
-index_version_webalizer=$index_version
+index_version_webalizer=Webalizer version $1
 index_version_awffull=AWFFull
 index_ewebalizer=The logfile analysis command $1 was not found on your system. Maybe it is not installed, or your <a href='$2'>module configuration</a> is incorrect.
 index_econf=The Webalizer configuration file $1 was not found on your system. Maybe it is not installed, or your <a href='$2'>module configuration</a> is incorrect.
@@ -163,3 +163,4 @@ acl_this=Current webmin user
 acl_any=Any user
 acl_add=Can add new logfiles for analysis?
 
+__norefs=1

diff --git a/webmin/lang/en b/webmin/lang/en
index 71647e0..134cae6 100644 (file)
--- a/webmin/lang/en
+++ b/webmin/lang/en
@@ -893,3 +893,4 @@ status_interval1=Never
 status_interval0=Every
 status_mins=minutes
 status_pkgs=Collect available package updates?
+__norefs=1

diff --git a/webmincron/lang/en b/webmincron/lang/en
index 0292e30..ea60536 100644 (file)
--- a/webmincron/lang/en
+++ b/webmincron/lang/en
@@ -16,3 +16,4 @@ edit_special_weekly=Weekly (on Sunday)
 edit_special_monthly=Monthly (on the 1st)
 edit_special_yearly=Yearly (on 1st Jan)
 
+__norefs=1

diff --git a/webminlog/lang/en b/webminlog/lang/en
index 62ded70..991472f 100644 (file)
--- a/webminlog/lang/en
+++ b/webminlog/lang/en
@@ -119,3 +119,4 @@ rollback_nodeleted=Skipped non-existant file $1.
 rollback_enone=No files selected
 
 log_rollback=Rolled back action $1 in module $2
+__norefs=1

diff --git a/wuftpd/lang/en b/wuftpd/lang/en
index 729400d..dfa511e 100644 (file)
--- a/wuftpd/lang/en
+++ b/wuftpd/lang/en
@@ -236,3 +236,4 @@ log_misc=Changed miscellaneous options
 log_restart=Applied changed
 log_start=Started FTP server
 
+__norefs=1

diff --git a/xinetd/lang/en b/xinetd/lang/en
index cf206ab..b984cf6 100644 (file)
--- a/xinetd/lang/en
+++ b/xinetd/lang/en
@@ -134,3 +134,4 @@ log_disable_l=Disabled services $1
 config_dirdef=Xinetd configuration file
 config_dirto=New file in directory
 
+__norefs=1

diff --git a/zones/lang/en b/zones/lang/en
index c246f57..0a059d0 100644 (file)
--- a/zones/lang/en
+++ b/zones/lang/en
@@ -287,3 +287,4 @@ webmin_eperl=Perl is not installed at $1
 webmin_eroot=The directory $1 does not exist or does not contain Webmin.
 webmin_title=Install Webmin
 
+__norefs=1