From 74091b64ffddec9db154d7a76c202b98401b1117 Mon Sep 17 00:00:00 2001 From: jervfors Date: Sat, 8 May 2004 16:19:27 +0000 Subject: [PATCH 1/1] Moving HTML out of strings and updating some tags to XHTML git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@7396 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- functions/mailbox_display.php | 15 +-- plugins/bug_report/bug_report.php | 10 +- plugins/filters/options.php | 2 +- plugins/filters/spamoptions.php | 16 +-- plugins/spamcop/options.php | 34 +++--- .../squirrelspell/modules/crypto_badkey.mod | 6 +- plugins/squirrelspell/modules/forget_me.mod | 2 +- plugins/squirrelspell/modules/lang_change.mod | 4 +- po/squirrelmail.pot | 107 ++++++++++-------- 9 files changed, 100 insertions(+), 96 deletions(-) diff --git a/functions/mailbox_display.php b/functions/mailbox_display.php index c010ba8a..107d2d96 100644 --- a/functions/mailbox_display.php +++ b/functions/mailbox_display.php @@ -598,7 +598,7 @@ function showMessagesForMailbox($imapConnection, $mailbox, $num_msgs, $msgs = getThreadMessages($imapConnection, $start_msg, $show_num, $num_msgs); if ($msgs === false) { echo '
' . - _("Thread sorting is not supported by your IMAP server.") . "
" . + _("Thread sorting is not supported by your IMAP server.") . '
' . _("Please report this to the system administrator."). '
'; $thread_sort_messages = 0; @@ -613,7 +613,7 @@ function showMessagesForMailbox($imapConnection, $mailbox, $num_msgs, $num_msgs, $sort, $mbxresponse); if ($msgs === false) { echo '
' . - _( "Server-side sorting is not supported by your IMAP server.") . "
" . + _( "Server-side sorting is not supported by your IMAP server.") . '
' . _("Please report this to the system administrator."). '
'; $sort = $server_sort_order; @@ -926,12 +926,7 @@ function mail_message_listing_beginning ($imapConnection, - + @@ -1132,7 +1127,7 @@ function ShowSortButton($sort, $mailbox, $Down, $Up ) { . '&startMessage=1&mailbox=' . urlencode($mailbox) . '">sort'; + . _("Click here to change the sorting of the message list") .' /">'; } /** @@ -1360,7 +1355,7 @@ function get_paginator_str($box, $start_msg, $end_msg, $num_msgs, * I am leaving this debug code here, commented out, because * it is a really nice way to see what the above code is doing. * echo "qts = $q1_pgs/$q2_pgs/$q3_pgs/$q4_pgs = " - * . ($q1_pgs + $q2_pgs + $q3_pgs + $q4_pgs) . '
'; + * . ($q1_pgs + $q2_pgs + $q3_pgs + $q4_pgs) . '
'; */ /* Print out the page links from the compute page quarters. */ diff --git a/plugins/bug_report/bug_report.php b/plugins/bug_report/bug_report.php index f75d69fc..d480a097 100644 --- a/plugins/bug_report/bug_report.php +++ b/plugins/bug_report/bug_report.php @@ -51,7 +51,7 @@ $body_top = "I subscribe to the squirrelmail-users mailing list.\n" . $body = htmlspecialchars($body_top) . $body; ?> -
+
- -
"._("Submit a Bug Report")."",'center',$color[0]); ?>
@@ -64,12 +64,12 @@ $body = htmlspecialchars($body_top) . $body; echo "
    "; echo "
  • "; - echo _("Make sure that you are running the most recent copy of SquirrelMail."); - echo sprintf(_("You are currently using version %s."),$version); + printf(_("Make sure that you are running the most recent copy of %s.") . 'SquirrelMail'); + printf(_("You are currently using version %s."),$version); echo "
    • \n"; echo "
  • "; - echo _("Check to see if your bug is already listed in the Bug List on SourceForge. If it is, we already know about it and are trying to fix it."); + printf(_("Check to see if your bug is already listed in the %sBug List%s on SourceForge. If it is, we already know about it and are trying to fix it."), '', ''); echo "
    • \n"; echo "
  • "; @@ -77,7 +77,7 @@ $body = htmlspecialchars($body_top) . $body; echo "
    • \n"; echo "
  • "; - echo _("If there were warnings displayed above, try to resolve them yourself. Read the guides in the doc/ directory where SquirrelMail was installed."); + printf(_("If there were warnings displayed above, try to resolve them yourself. Read the guides in the %s directory where SquirrelMail was installed."), 'doc/'); echo "
    • \n"; echo "
\n"; diff --git a/plugins/filters/options.php b/plugins/filters/options.php index f439ad07..5706aad5 100644 --- a/plugins/filters/options.php +++ b/plugins/filters/options.php @@ -85,7 +85,7 @@ if (sqgetGlobalVar('filter_submit',$filter_submit,SQ_POST)) { $filter_what = str_replace('"', '"', $filter_what); if (($filter_where == 'Header') && (strchr($filter_what,':') == '')) { - do_error(_("WARNING! Header filters should be of the format \"Header: value\"")); + do_error(_("WARNING! Header filters should be of the format "Header: value"")); $action = 'edit'; } setPref($data_dir, $username, 'filter'.$theid, $filter_where.','.$filter_what.','.$filter_folder); diff --git a/plugins/filters/spamoptions.php b/plugins/filters/spamoptions.php index 730086cf..a31ebaa5 100644 --- a/plugins/filters/spamoptions.php +++ b/plugins/filters/spamoptions.php @@ -59,7 +59,7 @@ if (sqgetGlobalVar('spam_submit',$spam_submit,SQ_POST)) { if (isset($filters_spam_folder_set)) { setPref($data_dir, $username, 'filters_spam_folder', $filters_spam_folder_set); } else { - echo _("You must select spam folder."); + echo _("You must select a spam folder."); } // setting scan type @@ -67,7 +67,7 @@ if (sqgetGlobalVar('spam_submit',$spam_submit,SQ_POST)) { if (isset($filters_spam_scan_set)) { setPref($data_dir, $username, 'filters_spam_scan', $filters_spam_scan_set); } else { - echo _("You must select scan type."); + echo _("You must select a scan type."); } foreach ($spam_filters as $Key => $Value) { @@ -93,7 +93,7 @@ echo html_tag( 'table', if ($SpamFilters_YourHop == ' ') { echo '
' . html_tag( 'div', '' . - sprintf(_("WARNING! Tell your admin to set the %s variable"),'SpamFilters_YourHop') . + sprintf(_("WARNING! Tell the adminstrator to set the %s variable."), '"SpamFilters_YourHop"') . '' , 'center' ) . '
'; @@ -148,14 +148,14 @@ if (isset($action) && $action == 'spam') { if ($filters_spam_scan == 'new') { echo ' selected'; } - echo '>' . _("Only unread messages") . '' . + echo '>' . _("Unread messages only") . '' . ''. ''. ''. html_tag( 'tr', html_tag( 'td', ' ' ) . html_tag( 'td', - _("The more messages you scan, the longer it takes. I would suggest that you scan only new messages. If you make a change to your filters, I would set it to scan all messages, then go view my INBOX, then come back and set it to scan only new messages. That way, your new spam filters will be applied and you'll scan even the spam you read with the new filters.") , + _("The more messages scanned, the longer it takes. It's recommended to scan unread messages only. If a change to the filters is made, it's recommended to set it to scan all messages, then go view the INBOX, then come back and set it to scan unread messages only. That way, the new spam filters will be applied and even the spam you didn't catch with the old filters will be scanned.") , 'left' ) ); @@ -199,9 +199,9 @@ if (isset($action) && $action == 'spam') { echo html_tag( 'p', '', 'center' ) . '[' . _("Edit") . ']' . ' - [' . _("Done") . ']

'; - printf( _("Spam is sent to %s"), ($filters_spam_folder?''.imap_utf7_decode_local($filters_spam_folder).'':'['._("not set yet").']' ) ); - echo '
'; - printf( _("Spam scan is limited to %s"), (($filters_spam_scan == 'new')?_("New Messages Only"):_("All Messages") ) ); + printf( _("Spam is sent to %s."), ($filters_spam_folder?''.imap_utf7_decode_local($filters_spam_folder).'':'['._("not set yet").']' ) ); + echo '
'; + printf( _("Spam scan is limited to %s."), '' . ( ($filters_spam_scan == 'new')?_("Unread messages only"):_("All Messages") ) . '' ); echo '

'. '\n"; diff --git a/plugins/spamcop/options.php b/plugins/spamcop/options.php index a64e304d..146e8308 100755 --- a/plugins/spamcop/options.php +++ b/plugins/spamcop/options.php @@ -178,46 +178,46 @@ spamcop_load();
"; +echo '

' . _("About SpamCop") . '
'; 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 '

'; +printf(_("To use it, you must get a SpamCop authorization code. There is a free %ssign up page%s 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 '

' . _("Before you sign up, be warned") . '
'; +printf(_("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 (%s has a %slist of places%s) so that messages from system administrators and what not can be sent to you."), 'Yahoo!', '', ''); 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 '

'; +echo _("Once you have signed up with SpamCop and have received your SpamCop authorization code, you need to enable this plugin by clicking 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"; -echo "

" . _("Email-based Reporting") . "
"; +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 "

\n"; if ($spamcop_quick_report) { -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 '

'; + 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 '

' . _("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 '

'; 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 "

". _("Spamcop Service Type") . "
\n"; +echo '

' . _("Spamcop service type") . '
'; echo _("Service type option allows selecting which spamcop services you are using. Member services use different web reporting forms and does not display nags. You can purchase these services, if you want to support SpamCop."); 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 '

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

\n"; ?> diff --git a/plugins/squirrelspell/modules/crypto_badkey.mod b/plugins/squirrelspell/modules/crypto_badkey.mod index b817f531..e8e84979 100644 --- a/plugins/squirrelspell/modules/crypto_badkey.mod +++ b/plugins/squirrelspell/modules/crypto_badkey.mod @@ -48,7 +48,7 @@ if ($delete_words=='ON'){ . '

' . '

' . '' + . _("Close this Window") . ' " onclick="self.close()" />' . '

'; sqspell_makeWindow(null, _("Dictionary Erased"), null, $msg); } @@ -75,13 +75,13 @@ if ($old_key){ $msg = '

' . _("Your personal dictionary was re-encrypted successfully. Now return to the "SpellChecker options" menu and make your selection again." ) . '

'; - sqspell_makePage(_("Successful Re-encryption"), null, $msg); + sqspell_makePage(_("Successful re-encryption"), null, $msg); } else { $msg = '

' . _("Your personal dictionary was re-encrypted successfully. Please close this window and click \"Check Spelling\" button again to start your spellcheck over.") . '

'; + . 'onclick="self.close()" />

'; sqspell_makeWindow(null, _("Dictionary re-encrypted"), null, $msg); } exit; diff --git a/plugins/squirrelspell/modules/forget_me.mod b/plugins/squirrelspell/modules/forget_me.mod index f33a69f1..129c3af9 100644 --- a/plugins/squirrelspell/modules/forget_me.mod +++ b/plugins/squirrelspell/modules/forget_me.mod @@ -29,7 +29,7 @@ if (sizeof($words_ary)){ $words=sqspell_getWords(); $lang_words = sqspell_getLang($words, $sqspell_use_app); $msg = '

' - . sprintf(_("Deleting the following entries from %s dictionary:"), $sqspell_use_app) + . sprintf(_("Deleting the following entries from %s dictionary:"), ''.$sqspell_use_app.'') . '

' . "
    \n"; for ($i=0; $i%s with %s as default dictionary."), $dsp_string, _($lang_default)) + . sprintf(_("Settings adjusted to: %s with %s as default dictionary."), ''.$dsp_string.'', ''._($lang_default).'') . '

    '; } else { /** * No dictionaries selected. Use system default. */ $msg = '

    ' - . sprintf(_("Using %s dictionary (system default) for spellcheck." ), $SQSPELL_APP_DEFAULT) + . sprintf(_("Using %s dictionary (system default) for spellcheck." ), ''.$SQSPELL_APP_DEFAULT.'') . '

    '; $lang_string = $SQSPELL_APP_DEFAULT; } diff --git a/po/squirrelmail.pot b/po/squirrelmail.pot index 2d29d6de..dcfcdfe9 100644 --- a/po/squirrelmail.pot +++ b/po/squirrelmail.pot @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2004-05-06 00:25+0200\n" +"POT-Creation-Date: 2004-05-08 18:31+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -2247,19 +2247,18 @@ msgid "" "for any common problems." msgstr "" -msgid "" -"Make sure that you are running the most recent copy of SquirrelMail." +#, c-format +msgid "Make sure that you are running the most recent copy of %s." msgstr "" #, c-format msgid "You are currently using version %s." msgstr "" +#, c-format msgid "" -"Check to see if your bug is already listed in the Bug List on SourceForge. If it is, " -"we already know about it and are trying to fix it." +"Check to see if your bug is already listed in the %sBug List%s on " +"SourceForge. If it is, we already know about it and are trying to fix it." msgstr "" msgid "" @@ -2268,9 +2267,10 @@ msgid "" "view a specific message, keep that message around so maybe we can see it." msgstr "" +#, c-format msgid "" "If there were warnings displayed above, try to resolve them yourself. Read " -"the guides in the doc/ directory where SquirrelMail was installed." +"the guides in the %s directory where SquirrelMail was installed." msgstr "" msgid "" @@ -2309,6 +2309,9 @@ msgstr "" msgid "Show button in toolbar" msgstr "" +msgid "Show system specs" +msgstr "" + msgid "TODAY" msgstr "" @@ -2555,7 +2558,8 @@ msgstr "" msgid "FREE - Distributed Sender Boycott List - UN-Confirmed Relays" msgstr "" -msgid "WARNING! Header filters should be of the format \"Header: value\"" +msgid "" +"WARNING! Header filters should be of the format "Header: value"" msgstr "" msgid "Saved Scan type" @@ -2605,17 +2609,17 @@ msgid "" "junk email in your INBOX and move it to another folder (like Trash)." msgstr "" -msgid "You must select spam folder." +msgid "You must select a spam folder." msgstr "" -msgid "You must select scan type." +msgid "You must select a scan type." msgstr "" msgid "Spam Filtering" msgstr "" #, c-format -msgid "WARNING! Tell your admin to set the %s variable" +msgid "WARNING! Tell the adminstrator to set the %s variable." msgstr "" msgid "Move spam to:" @@ -2629,26 +2633,27 @@ msgid "" "around." msgstr "" +msgid "Unread messages only" +msgstr "" + msgid "" -"The more messages you scan, the longer it takes. I would suggest that you " -"scan only new messages. If you make a change to your filters, I would set it " -"to scan all messages, then go view my INBOX, then come back and set it to " -"scan only new messages. That way, your new spam filters will be applied and " -"you'll scan even the spam you read with the new filters." +"The more messages scanned, the longer it takes. It's recommended to scan " +"unread messages only. If a change to the filters is made, it's recommended " +"to set it to scan all messages, then go view the INBOX, then come back and " +"set it to scan unread messages only. That way, the new spam filters will be " +"applied and even the spam you didn't catch with the old filters will be " +"scanned." msgstr "" #, c-format -msgid "Spam is sent to %s" +msgid "Spam is sent to %s." msgstr "" msgid "not set yet" msgstr "" #, c-format -msgid "Spam scan is limited to %s" -msgstr "" - -msgid "New Messages Only" +msgid "Spam scan is limited to %s." msgstr "" msgid "All Messages" @@ -3228,34 +3233,37 @@ msgstr "" msgid "Save ID" msgstr "" +msgid "About SpamCop" +msgstr "" + msgid "" "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." msgstr "" +#, c-format msgid "" -"To use it, you must get a SpamCop authorization code. There is a free sign up page so you can use " -"SpamCop." +"To use it, you must get a SpamCop authorization code. There is a free %ssign " +"up page%s so you can use SpamCop." +msgstr "" + +msgid "Before you sign up, be warned" msgstr "" +#, c-format msgid "" -"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." +"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 (%s has a %slist of places%s) so that messages from " +"system administrators and what not can be sent to you." msgstr "" msgid "" "Once you have signed up with SpamCop and have received your SpamCop " -"authorization code, you need to enable this plugin -- just click the link " +"authorization code, you need to enable this plugin by clicking 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 " @@ -3264,7 +3272,7 @@ msgid "" "different reporting methods." msgstr "" -msgid "Email-based Reporting" +msgid "Email-based reporting" msgstr "" msgid "" @@ -3282,7 +3290,7 @@ msgid "" "Hopefully this will change soon." msgstr "" -msgid "Web-based Reporting" +msgid "Web-based reporting" msgstr "" msgid "" @@ -3300,7 +3308,7 @@ msgid "" "folder to see messages and/or delete the spam." msgstr "" -msgid "Spamcop Service Type" +msgid "Spamcop service type" msgstr "" msgid "" @@ -3309,10 +3317,13 @@ msgid "" "You can purchase these services, if you want to support SpamCop." msgstr "" +msgid "More information" +msgstr "" + +#, c-format msgid "" -"For more information about SpamCop, it's services, spam in general, " -"and many related topics, try reading through SpamCop's Help and Feedback section." +"For more information about SpamCop, it's services, spam in general, and many " +"related topics, try reading through SpamCop's %sHelp and Feedback%s section." msgstr "" msgid "Report as Spam" @@ -3514,7 +3525,7 @@ msgid "" ""SpellChecker options" menu and make your selection again." msgstr "" -msgid "Successful Re-encryption" +msgid "Successful re-encryption" msgstr "" msgid "" @@ -3598,7 +3609,7 @@ msgid "" msgstr "" #, c-format -msgid "Deleting the following entries from %s dictionary:" +msgid "Deleting the following entries from %s dictionary:" msgstr "" msgid "All done!" @@ -3622,13 +3633,11 @@ msgid "SquirrelSpell Initiating" msgstr "" #, c-format -msgid "" -"Settings adjusted to: %s with %s as " -"default dictionary." +msgid "Settings adjusted to: %s with %s as default dictionary." msgstr "" #, c-format -msgid "Using %s dictionary (system default) for spellcheck." +msgid "Using %s dictionary (system default) for spellcheck." msgstr "" msgid "International Dictionaries Preferences Updated" -- 2.25.1