From 4f0617f6c390844c61041d85738af201a5c0b3d3 Mon Sep 17 00:00:00 2001 From: Brian Read Date: Tue, 4 Mar 2025 14:18:38 +0000 Subject: [PATCH] * Tue Mar 04 2025 Brian Read 11.0.0-62.sme - Update .lex files to conform to standard english punctuation [SME: 11809] --- .../lib/SrvMngr/I18N/Modules/Clamav/clamav_en.lex | 2 +- .../SrvMngr/I18N/Modules/Domains/domains_en.lex | 14 +++++++------- .../SrvMngr/I18N/Modules/General/general_en.lex | 2 +- .../lib/SrvMngr/I18N/Modules/Groups/groups_en.lex | 2 +- .../I18N/Modules/Hostentries/hostentries_en.lex | 6 +++--- .../I18N/Modules/Pseudonyms/pseudonyms_en.lex | 2 +- .../I18N/Modules/Remoteaccess/remoteaccess_en.lex | 4 ++-- .../lib/SrvMngr/I18N/Modules/Review/review_en.lex | 2 +- .../I18N/Modules/Viewlogfiles/viewlogfiles_en.lex | 2 +- smeserver-manager.spec | 5 ++++- 10 files changed, 22 insertions(+), 19 deletions(-) diff --git a/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Clamav/clamav_en.lex b/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Clamav/clamav_en.lex index 5542e00..3e0117a 100644 --- a/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Clamav/clamav_en.lex +++ b/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Clamav/clamav_en.lex @@ -2,7 +2,7 @@ 'clm_LABEL_FILESYSTEM_SCAN_PERIOD' => 'Scan filesystem', 'clm_DESC_FILESYSTEM_SCAN_PERIOD' => '

General Settings

If this option is enabled then the filesystem will be -scanned for viruses.A report of any found viruses will be +scanned for viruses. A report of any found viruses will be emailed to the administrator.', 'clm_LABEL_QUARANTINE' => 'Quarantine infected files', 'clm_LABEL_CLAM_VERSIONS' => 'ClamAV and db versions', diff --git a/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Domains/domains_en.lex b/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Domains/domains_en.lex index 29b3d6e..3a1737f 100644 --- a/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Domains/domains_en.lex +++ b/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Domains/domains_en.lex @@ -14,26 +14,26 @@ web site for that domain.', i-bay as the content.', 'dom_DOMAIN_NAME_VALIDATION_ERROR' => 'Error: unexpected or missing characters in domain name [_1].The domain name should contain one or more -letters, numbers, periods and minus signs.Did not create new domain.', +letters, numbers, periods and minus signs. Did not create new domain.', 'dom_DOMAIN_DESCRIPTION_VALIDATION_ERROR' => 'Error: unexpected or missing characters in domain description [_1]. Did not create new domain.', -'dom_DOMAIN_IN_USE_ERROR' => 'Error: domain [_1] is already in use.Did not create +'dom_DOMAIN_IN_USE_ERROR' => 'Error: domain [_1] is already in use. Did not create new domain.', -'dom_SYSTEM_DOMAIN_ERROR' => 'Error: domain [_1] is your system domain name.You -cannot have a domain with the same name.Did not create new domain.', +'dom_SYSTEM_DOMAIN_ERROR' => 'Error: domain [_1] is your system domain name. You +cannot have a domain with the same name. Did not create new domain.', 'dom_SUCCESSFULLY_CREATED' => 'Successfully created domain [_1].Your web -server is now being restarted.The links on this page will be +server is now being restarted. The links on this page will be inactive until the web server restart is complete.', 'dom_MODIFY_TITLE' => 'Modify domain', 'dom_NONEXISTENT_DOMAIN_ERROR' => 'Error: [_1] is not an existing domain.', 'dom_SUCCESSFULLY_MODIFIED' => 'Successfully modified domain [_1].Your web -server is now being restarted.The links on this page will be inactive until the web server restart is complete.', +server is now being restarted. The links on this page will be inactive until the web server restart is complete.', 'dom_REMOVE_TITLE' => 'Remove domain', 'dom_REMOVE_DESCRIPTION' => 'You are about to remove the domain "[_1]" ([_2]).', 'dom_ABOUT_TO_REMOVE' => 'Are you sure you wish to remove this domain ?', 'dom_ERROR_WHILE_REMOVING_DOMAIN' => 'Error: internal failure while removing domain [_1].', 'dom_SUCCESSFULLY_DELETED' => 'Successfully deleted domain [_1]. Your web server -is now being restarted.The links on this page will be inactive +is now being restarted. The links on this page will be inactive until the web server restart is complete.', 'dom_DESC_CORPORATE_DNS_CURRENT' => 'Corporate DNS Settings', 'dom_DOMAINS_PAGE_CORPORATE_DNS' => 'Modify corporate DNS settings', diff --git a/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/General/general_en.lex b/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/General/general_en.lex index 43bdb3f..a372ee7 100644 --- a/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/General/general_en.lex +++ b/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/General/general_en.lex @@ -128,7 +128,7 @@ 'FM_IP_NUMBER3' => '[_1] is more than 255', 'FM_USERNAME' => 'This field must look like a valid username (3 to 8 letters and numbers)', 'FM_PASSWORD1' => 'You must provide a password.', -'FM_PASSWORD2' => 'The password you provided was not a good password.A good password must contain all of the following: upper case letter, lower case letter, number, non-alphanumeric character, be at least 7 characters long.', +'FM_PASSWORD2' => 'The password you provided was not a good password. A good password must contain all of the following: upper case letter, lower case letter, number, non-alphanumeric character, be at least 7 characters long.', 'FM_MAC_ADDRESS1' => 'You must provide a MAC address.', 'FM_MAC_ADDRESS2' => 'The MAC address you provided was not valid.', 'FM_ERR_UNEXPECTED_DESC' => 'Error: unexpected or missing characters in description', diff --git a/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Groups/groups_en.lex b/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Groups/groups_en.lex index dd46960..5bb3493 100644 --- a/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Groups/groups_en.lex +++ b/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Groups/groups_en.lex @@ -4,7 +4,7 @@ 'grp_ACCOUNT_CONFLICT' => 'Error: the group "[_1]" can\'t be created because there is already a [_2] account of that name.', 'grp_INVALID_GROUP_DESCRIPTION' => 'Error: unexpected or missing characters in group description', -'grp_NO_MEMBERS' => 'Error: no members in group.Did not create new group.', +'grp_NO_MEMBERS' => 'Error: no members in group. Did not create new group.', 'grp_CREATED_GROUP' => 'Successfully created user group', 'grp_DELETED_GROUP' => 'Successfully removed user group', 'grp_MODIFIED_GROUP' => 'Successfully modifed user group', diff --git a/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Hostentries/hostentries_en.lex b/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Hostentries/hostentries_en.lex index 539f0a2..d777053 100644 --- a/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Hostentries/hostentries_en.lex +++ b/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Hostentries/hostentries_en.lex @@ -34,17 +34,17 @@ the local network. Please enter a valid IP address in the format "aaa.bbb.ccc.ddd".', 'hos_ETHERNET_ADDRESS_DESCRIPTION' => 'The ethernet address is optional and causes the DHCP server to statically bind the local IP address to the computer with this -ethernet address.If specified, it must be of the form +ethernet address. If specified, it must be of the form "AA:BB:CC:DD:EE:FF" and must contain only the numbers 0-9 and the letters A-F.', 'hos_CREATE_LOCAL_HOST_TITLE' => 'Create a new hostname referring to a local host.', -'hos_DIDNT_ENTER_LOCAL_IP' => 'Error: You did not specify a Local IP address.IP +'hos_DIDNT_ENTER_LOCAL_IP' => 'Error: You did not specify a Local IP address. IP addresses must contain only numbers and periods and be in the form "aaa.bbb.ccc.ddd".Did not create hostname.', 'hos_IP_VALIDATION_ERROR' => 'Error: IP Address [_1] is invalid. IP Addresses must contain only numbers and periodsand be in the form "aaa.bbb.ccc.ddd". Did not create hostname.', 'hos_MAC_ADDRESS_VALIDATION_ERROR' => 'Error: Ethernet address [_1] -is invalid.Ethernet addresses must be in the +is invalid. Ethernet addresses must be in the form "AA:BB:CC:DD:EE:FF" and only contain the numbers 0-9 and the letters A-F. Did not create hostname.', diff --git a/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Pseudonyms/pseudonyms_en.lex b/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Pseudonyms/pseudonyms_en.lex index 044937b..abb65ce 100644 --- a/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Pseudonyms/pseudonyms_en.lex +++ b/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Pseudonyms/pseudonyms_en.lex @@ -14,7 +14,7 @@ For example, you may wish to create a pseudonym "webmaster" for your "webdevelopers" group or a pseudonym "joe" for the user "joseph".

The server automatically creates pseudonyms of the form -firstname.lastname and firstname_lastname for every user +firstname. lastname and firstname_lastname for every user on the system and a pseudonym "everyone" which contains all users on the system.

Pseudonyms also allow you to create e-mail aliases for valid diff --git a/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Remoteaccess/remoteaccess_en.lex b/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Remoteaccess/remoteaccess_en.lex index 468271b..2e062ca 100644 --- a/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Remoteaccess/remoteaccess_en.lex +++ b/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Remoteaccess/remoteaccess_en.lex @@ -77,11 +77,11 @@ connected to a server serial port.', 'rma_LABEL_PPTP_ACCESS' => 'PPTP default user access', 'rma_TITLE_TELNET_ACCESS' => 'Telnet Settings', 'rma_DESC_TELNET_ACCESS' => 'WARNING:Telnet is currently enabled, but this feature is -no longer supported.Telnet is inherently insecure and should only +no longer supported. Telnet is inherently insecure and should only be used in circumstances where no practical alternative exists. You should change option to [_1] and use secure shell if remote access is -required.Once disabled, telnet will no longer appear on this +required. Once disabled, telnet will no longer appear on this screen. ', 'rma_TITLE_IPSECRW' => 'IPSEC Client (Roadwarrior) Settings', 'rma_DESC_IPSECRW' => 'You can allow IPSEC client access to your server, authenticated by diff --git a/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Review/review_en.lex b/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Review/review_en.lex index 8640131..14d2467 100644 --- a/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Review/review_en.lex +++ b/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Review/review_en.lex @@ -2,7 +2,7 @@ 'rvw_FORM_TITLE' => 'Review configuration', 'rvw_DESCRIPTION' => 'This report summarizes the networking, server, and domain parameters on this server relevant to configuring -the client computers on your network.You may wish to print this +the client computers on your network. You may wish to print this page and use it as a reference.', 'rvw_NETWORKING_PARAMS' => 'Networking Parameters', 'rvw_SERVER_MODE' => 'Server Mode', diff --git a/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Viewlogfiles/viewlogfiles_en.lex b/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Viewlogfiles/viewlogfiles_en.lex index 343aadc..80b7425 100644 --- a/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Viewlogfiles/viewlogfiles_en.lex +++ b/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Viewlogfiles/viewlogfiles_en.lex @@ -4,7 +4,7 @@ by the services running on your server.', 'log_LOG_FILE_SELECT_DESC' => 'Choose a log file to view', 'log_FILTER_PATTERN_DESC' => 'You may optionally specify a filter pattern to display only the -lines from the log file which match this pattern.If you leave +lines from the log file which match this pattern. If you leave this field blank, all available lines of the log file will be displayed. Note that this option is not used if you download the logfile.', diff --git a/smeserver-manager.spec b/smeserver-manager.spec index 856905b..b0e17f4 100644 --- a/smeserver-manager.spec +++ b/smeserver-manager.spec @@ -2,7 +2,7 @@ Summary: Sme server navigation module : manager 2 %define name smeserver-manager Name: %{name} %define version 11.0.0 -%define release 61 +%define release 62 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -143,6 +143,9 @@ true %defattr(-,root,root) %changelog +* Tue Mar 04 2025 Brian Read 11.0.0-62.sme +- Update .lex files to conform to standard english punctuation [SME: 11809] + * Tue Mar 04 2025 Brian Read 11.0.0-61.sme - Arrange for the version in the footer to be suppressed if non admin login [SME: 12887]