From 2bd52bbe2f7a0b5d4875ebb1668b7e57bf4b9fc4 Mon Sep 17 00:00:00 2001 From: tokul Date: Wed, 8 Oct 2003 13:08:04 +0000 Subject: [PATCH] Fixing lines that cause warnings with xgettext git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@5887 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- plugins/spamcop/options.php | 92 +++++++++++++++---------------------- plugins/spamcop/setup.php | 19 +++----- plugins/spamcop/spamcop.php | 26 ++++------- 3 files changed, 52 insertions(+), 85 deletions(-) diff --git a/plugins/spamcop/options.php b/plugins/spamcop/options.php index d9ec771c..085fd21d 100755 --- a/plugins/spamcop/options.php +++ b/plugins/spamcop/options.php @@ -107,67 +107,47 @@ spamcop_load(); (see below)
- +
+"; +echo _("SpamCop is a free service that greatly assists in finding the true source of the spam and helps in letting the proper people know about the abuse."); +echo "

\n"; + +echo "

"; +echo _("To use it, you must get a SpamCop authorization code. There is a free sign up page so you can use SpamCop."); +echo "

\n"; + +echo "

"; +echo _("Before you sign up, be warned: Some users have reported that the email addresses used with SpamCop find their way onto spam lists. To be safe, you can just create an email forwarding account and have all SpamCop reports get sent to there. Also, if it gets flooded with spam, you can then just delete that account with no worries about losing your real email address. Just go create an email forwarder somewhere (Yahoo! has a list of places) so that messages from system administrators and whatnot can be sent to you."); +echo "

\n"; + +echo "

"; +echo _("Once you have signed up with SpamCop and have received your SpamCop authorization code, you need to enable this plugin -- just click the link above. Once enabled, you go about your normal life. If you encounter a spam message in your mailbox, just view it. On the right-hand side, near the top of where the message is displayed, you will see a link to report this message as spam. Clicking on it brings you to a confirmation page. Confirming that you want the spam report sent will do different things with different reporting methods."); +echo "

\n"; -

SpamCop is a free service that greatly assists in finding the true source -of the spam and helps in letting the proper people know about the abuse.

- -

To use it, you must get a SpamCop authorization code. There is a free sign up page so you can use -SpamCop.

- -

Before you sign up, be warned: Some users have reported that the -email addresses used with SpamCop find their way onto spam lists. To be -safe, you can just create an email forwarding account and have all SpamCop -reports get sent to there. Also, if it gets flooded with spam, you can then -just delete that account with no worries about losing your real email address. -Just go create an email forwarder somewhere (Yahoo! has a list -of places) so that messages from system administrators and whatnot can -be sent to you.

- -

Once you have signed up with SpamCop and have received your SpamCop -authorization code, you need to enable this plugin -- just click the link -above. Once enabled, you go about your normal life. If you encounter a -spam message in your mailbox, just view it. On the right-hand side, near -the top of where the message is displayed, you will see a link to report -this message as spam. Clicking on it brings you to a confirmation page. -Confirming that you want the spam report sent will do different things with -different reporting methods.

- -

Email-based Reporting
-Pressing the button forwards the message to the SpamCop service and will -optionally delete the message. From there, you just need to go to your -INBOX and quite soon a message should appear from SpamCop. (It gets sent to -the account you registered with, so make sure that your mail forwarder works!) -Open it up, click on the appropriate link at the top, and a new browser -window will open.

- -

Currently, the quick reporting just forwards the request to the thorough -reporting. Also, it appears that this is for members (non-free) only. -Hopefully this will change soon.

- -

Web-based Reporting
-When you press the button on the confirmation page, this will pop open a new -browser window and the SpamCop service should appear inside. The message -will not be deleted (working on that part), but you won't need to wait for a -response email to start the spam reporting.

- -

The SpamCop service will display information as it finds it, so scroll -down until you see a form button. It might pause a little while it is -looking up information, so be a little patient. Read what it says, and -submit the spam. Close the browser window. Press Cancel or click on the -appropriate mail folder to see messages and/or delete the spam.

- -

For more information about SpamCop, it's services, spam in general, -and many related topics, try reading through SpamCop's Help and Feedback section.

+echo "

" . _("Email-based Reporting") . "
"; +echo _("Pressing the button forwards the message to the SpamCop service and will optionally delete the message. From there, you just need to go to your INBOX and quite soon a message should appear from SpamCop. (It gets sent to the account you registered with, so make sure that your mail forwarder works!) Open it up, click on the appropriate link at the top, and a new browser window will open."); +echo "

"; +echo "

"; +echo _("Currently, the quick reporting just forwards the request to the thorough reporting. Also, it appears that this is for members (non-free) only. Hopefully this will change soon."); +echo "

\n"; + +echo "

" . _("Web-based Reporting") . "
"; +echo _("When you press the button on the confirmation page, this will pop open a new browser window and the SpamCop service should appear inside. The message will not be deleted (working on that part), but you won't need to wait for a response email to start the spam reporting."); +echo "

\n"; + +echo "

"; +echo _("The SpamCop service will display information as it finds it, so scroll down until you see a form button. It might pause a little while it is looking up information, so be a little patient. Read what it says, and submit the spam. Close the browser window. Press Cancel or click on the appropriate mail folder to see messages and/or delete the spam."); +echo "

\n"; + +echo "

"; +echo _("For more information about SpamCop, it's services, spam in general, and many related topics, try reading through SpamCop's Help and Feedback section."; +echo "

\n"; +?> diff --git a/plugins/spamcop/setup.php b/plugins/spamcop/setup.php index 8c7d5e4d..f44a7134 100755 --- a/plugins/spamcop/setup.php +++ b/plugins/spamcop/setup.php @@ -71,24 +71,17 @@ function spamcop_show_link() { if ($spamcop_method == 'web_form') { ?> + +'; } -?> -

Sending this spam report will give you back a reply with URLs that you -can click on to properly report this spam message to the proper authorities. -This is a free service. By pressing the "Send Spam Report" button, you -agree to follow SpamCop's rules/terms of service/etc.

+echo "

"; +echo _("Sending this spam report will give you back a reply with URLs that you can click on to properly report this spam message to the proper authorities. This is a free service. By pressing the \"Send Spam Report\" button, you agree to follow SpamCop's rules/terms of service/etc."); +echo "

"; + +?> @@ -139,10 +139,8 @@ agree to follow SpamCop's rules/terms of service/etc.

- - + + $report_email = 'quick.' . $spamcop_id . '@spam.spamcop.net'; $form_action = SM_PATH . 'src/compose.php'; ?> - - + + @@ -188,9 +184,7 @@ agree to follow SpamCop's rules/terms of service/etc.

- + -- 2.25.1