String reference fixes

diff --git a/bind8/lang/en b/bind8/lang/en
index 170f710..ab0e673 100644 (file)
--- a/bind8/lang/en
+++ b/bind8/lang/en
@@ -1110,4 +1110,3 @@ 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/ipfilter/lang/en b/ipfilter/lang/en
index befba90..cc89778 100644 (file)
--- a/ipfilter/lang/en
+++ b/ipfilter/lang/en
@@ -77,8 +77,8 @@ edit_rst=TCP reset
 edit_return_dest=Fake ICMP source address
 edit_cmt=Rule comment
 edit_active=Rule active?
-edit_active1=$yes
-edit_active0=$no (Commented out)
+edit_active1=Yes
+edit_active0=No (Commented out)
 edit_action=Action to take
 edit_log_body=Log body
 edit_log_first=Only log first packet
@@ -177,18 +177,18 @@ desc_proto=protocol is $1
 desc_on=interface is $1
 desc_from_thishost=source is this host
 desc_to_thishost=destination is this host
-desc_fromto_thishost=$desc_to_thishost
+desc_fromto_thishost=destination is this host
 desc_from=source is $1
 desc_to=destination is $1
-desc_fromto=$desc_to
+desc_fromto=destination is $1
 desc_portcomp_from=source port $1 $2
-desc_portcomp_fromto=$desc_portcomp_to
+desc_portcomp_fromto=destination port $1 $2
 desc_portcomp_to=destination port $1 $2
 desc_portrange_from=source port is between $1 and $2
-desc_portrange_fromto=$desc_portrange_to
+desc_portrange_fromto=destination port is between $1 and $2
 desc_portrange_to=destination port is between $1 and $2
 desc_portrangenot_from=source port is not between $1 and $2
-desc_portrangenot_fromto=$desc_portrange_to
+desc_portrangenot_fromto=destination port is not between $1 and $2
 desc_portrangenot_to=destination port is not between $1 and $2
 desc_where=where $1
 desc_all=for all packets
@@ -313,3 +313,5 @@ nat_erdrips=No destination IPs entered
 nat_erdrport=Missing or invalid destination port
 
 boot_esmf=The SMF service $1 does not exist or is not in a known state
+
+__norefs=1

diff --git a/pam/lang/en b/pam/lang/en
index 18f8d05..1a9aa99 100644 (file)
--- a/pam/lang/en
+++ b/pam/lang/en
@@ -23,7 +23,7 @@ desc_ftpd=File transfer server
 desc_wu-ftpd=WuFTPd file transfer server
 desc_xscreensaver=Screen saver
 desc_other=Other services
-desc_netatalk.pamd=$desc_netatalk
+desc_netatalk.pamd=Netatalk Apple file server
 desc_netatalk=Netatalk Apple file server
 desc_webmin=Webmin web server
 desc_usermin=Usermin web server
@@ -64,11 +64,11 @@ desc_printconf-gui=Redhat printer config tool
 desc_rhn_register=Redhat Network registration
 desc_system-auth=Common authentication
 desc_cups=CUPS printing
-desc_cupsys=$desc_cups
-desc_libcupsys2=$desc_cups
-desc_ssh=$desc_sshd
+desc_cupsys=CUPS printing
+desc_libcupsys2=CUPS printing
+desc_ssh=SSH Login
 desc_proftpd=ProFTPd file transfer server
-desc_qpopper=$desc_qpop
+desc_qpopper=POP Mail Server
 desc_dovecot=POP / IMAP mail server
 desc_cron=Scheduled commands daemon
 desc_runuser=Run command as user
@@ -290,3 +290,5 @@ inc_create=Create Included Service
 inc_header=Included PAM service details
 inc_inc=Included PAM service
 inc_err=Failed to save included service
+
+__norefs=1

diff --git a/sarg/lang/en b/sarg/lang/en
index df08f56..59c84e4 100644 (file)
--- a/sarg/lang/en
+++ b/sarg/lang/en
@@ -120,13 +120,13 @@ report_displayed_values=Display traffic as
 report_bytes2=Bytes
 report_abbrev=Abbreviated (K, M, G)
 report_weekdays=Weekdays to include in report
-report_weekdays0=$sday_0
-report_weekdays1=$sday_1
-report_weekdays2=$sday_2
-report_weekdays3=$sday_3
-report_weekdays4=$sday_4
-report_weekdays5=$sday_5
-report_weekdays6=$sday_6
+report_weekdays0=Su
+report_weekdays1=Mo
+report_weekdays2=Tu
+report_weekdays3=We
+report_weekdays4=Th
+report_weekdays5=Fr
+report_weekdays6=Sa
 report_hours=Hours to include in report
 report_err=Failed to save report options
 report_efile=File does not exist
@@ -173,3 +173,5 @@ webmin_log_sched_delete=Disabled scheduled reporting
 webmin_log_sched_update=Updated scheduled reporting
 webmin_log_sched_nothing=Left scheduled reporting disabled
 webmin_log_generate=Generated report
+
+__norefs=1