aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xfirma20
1 files changed, 10 insertions, 10 deletions
diff --git a/firma b/firma
index 7efa205..9f2705d 100755
--- a/firma
+++ b/firma
@@ -820,10 +820,10 @@ function ProcessMessage {
# the anti-replay mechanism detected a repeated message
MESSAGE_BODY="\
It was not possible to process this message. This list
- is configured to discarded replayed messages as an attack
- protection measue. It looks like that your message was
- already sent to the list and then it was discarded.
- Contact the list administrator if you have any questions."
+ is configured to discard replayed messages as an attack
+ protection measure. It looks like your message has been
+ sent to the list before and so it was discarded. Contact
+ the list administrator if you have any questions."
ComposeAndSendBounceMessage
fi
@@ -870,8 +870,8 @@ function NewList {
local last_char digits_only
# UTF-8 is avoided in DETAILS
- echo "Firma will ask you some questions before setup your list."
- echo "Please dont use UTF-8 characters."
+ echo "Firma will ask you some questions to setup your list."
+ echo "Please don't use UTF-8 characters."
read -rep " List keyring location: ("$LIST_PATH") " LIST_HOMEDIR
LIST_HOMEDIR=${LIST_HOMEDIR:-"$LIST_PATH"}
@@ -1530,7 +1530,7 @@ function SubscribeUsers {
"
elif [[ "$1" == "stdin" ]]; then
if [[ "$MODE" == "admin-interactive" ]]; then
- echo "Please enter the key material here, finninshing with Ctrl-D sequence..."
+ echo "Please enter the key material here, finishing with Ctrl-D sequence..."
$GPG_NOBATCH --import
return_code=$?
if [[ "$return_code" == "0" ]]; then
@@ -1768,7 +1768,7 @@ function RandomString {
function AdminLog {
#-------------------------------------------------------------
- # check wheter admin is made via command line
+ # check whether admin is made via command line
#+or email and then log a message according to the
#+display mode
#
@@ -2203,7 +2203,7 @@ function ReplayProtectionFlush {
if [[ "$REPLAY_PROTECTION" == "yes" ]]; then
if [[ -f "$REPLAY_FILE" ]]; then
if [[ "$(wc -l $REPLAY_FILE | cut -d " " -f 1)" -gt "$REPLAY_COUNT" ]]; then
- sed -ie '1d' $REPLAY_FILE
+ sed -i -e '1d' $REPLAY_FILE
fi
else
touch $REPLAY_FILE
@@ -2397,7 +2397,7 @@ case $# in
SYSLOG_PRIORITY=${SYSLOG_PRIORITY:-"user.err"}
fi
- # and finally check firma.conf parameters and pessmissions
+ # and finally check firma.conf parameters and permissions
if CheckFirmaConfigFile && CheckPermission $FIRMA_CONFIG_FILE; then
LIST_NAME="$2"