Index: simplenews.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/simplenews/simplenews.module,v
retrieving revision 1.220.2.7
diff -u -p -r1.220.2.7 simplenews.module
--- simplenews.module	2 Jan 2010 20:26:46 -0000	1.220.2.7
+++ simplenews.module	2 Jan 2010 20:45:26 -0000
@@ -898,7 +898,7 @@ function simplenews_user($op, &$edit, &$
         if (user_access('subscribe to newsletters')) {
           $account->content['simplenews']['my_newsletters'] = array(
             '#type' => 'user_profile_item',
-            '#value' => t('Manage !my_subscriptions', array('!my_subscriptions' => l(t('my subscriptions'), 'user/'. $account->uid .'/edit/newsletter'))),
+            '#value' => t('Manage <a href="!url">my subscriptions</a>', array('!url' => url('user/'. $account->uid .'/edit/newsletter'))),
             '#weight' => -1,
           );
         }
Index: translations/simplenews.pot
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/simplenews/translations/simplenews.pot,v
retrieving revision 1.1
diff -u -p -r1.1 simplenews.pot
--- translations/simplenews.pot	12 Jun 2008 18:25:07 -0000	1.1
+++ translations/simplenews.pot	2 Jan 2010 20:45:26 -0000
@@ -1,22 +1,27 @@
-# $Id: simplenews.pot,v 1.1 2008/06/12 18:25:07 maver77 Exp $
+# $Id$
 #
 # LANGUAGE translation of Drupal (general)
 # Copyright YEAR NAME <EMAIL@ADDRESS>
 # Generated from files:
-#  simplenews.admin.inc,v 1.5.2.11 2008/06/10 19:37:32 sutharsan
-#  simplenews.install,v 1.8.2.7 2008/06/11 09:08:02 sutharsan
-#  simplenews_action.module,v 1.1.2.2 2008/05/04 13:31:04 sutharsan
-#  simplenews.module,v 1.76.2.32 2008/06/11 15:34:18 sutharsan
-#  simplenews.subscription.inc,v 1.2.2.5 2008/05/02 14:54:45 sutharsan
-#  simplenews_views.inc,v 1.2.2.2 2008/04/09 18:12:00 sutharsan
-#  simplenews.info,v 1.5 2008/02/03 01:08:55 sutharsan
-#  simplenews_action.info,v 1.1.2.2 2008/05/04 13:31:04 sutharsan
+#  simplenews.admin.inc,v 1.59.2.2 2009/12/27 11:37:06 sutharsan
+#  simplenews.module,v 1.220.2.6 2010/01/02 19:18:19 sutharsan
+#  simplenews.install,v 1.36.2.1 2009/12/24 16:03:23 sutharsan
+#  simplenews_action.module,v 1.6 2009/07/30 19:56:47 sutharsan
+#  simplenews_handler_field_newsletter_s_status.inc,v 1.3 2009/01/02 12:01:17 sutharsan
+#  simplenews_handler_filter_newsletter_s_status.inc,v 1.3 2009/01/02 12:01:17 sutharsan
+#  simplenews.js,v 1.1 2008/09/30 20:07:34 sutharsan
+#  simplenews.subscription.inc,v 1.13 2009/07/30 19:56:47 sutharsan
+#  simplenews.views.inc,v 1.3 2009/01/02 12:01:17 sutharsan
+#  simplenews.info,v 1.7 2009/09/30 14:10:20 sutharsan
+#  simplenews_action.info,v 1.2 2008/07/15 10:04:27 sutharsan
+#  simplenews_test.info,v 1.1 2009/08/04 07:02:57 sutharsan
+#  simplenews_test.module,v 1.1 2009/08/04 07:02:57 sutharsan
 #
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
-"POT-Creation-Date: 2008-06-12 15:04+0200\n"
+"POT-Creation-Date: 2010-01-02 21:20+0100\n"
 "PO-Revision-Date: YYYY-mm-DD HH:MM+ZZZZ\n"
 "Last-Translator: NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <EMAIL@ADDRESS>\n"
@@ -25,1206 +30,1308 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: simplenews.admin.inc:35
+#: simplenews.admin.inc:21
 msgid "Show issues from"
 msgstr ""
 
-#: simplenews.admin.inc:40
+#: simplenews.admin.inc:31
 msgid "Title"
 msgstr ""
 
-#: simplenews.admin.inc:40 simplenews.install:201 simplenews_action/simplenews_action.module:210;276
+#: simplenews.admin.inc:31 simplenews.module:237 simplenews.install:267;272 simplenews_action/simplenews_action.module:211;276
 msgid "Newsletter"
 msgstr ""
 
-#: simplenews.admin.inc:40
+#: simplenews.admin.inc:31
 msgid "Date created"
 msgstr ""
 
-#: simplenews.admin.inc:40;1104
+#: simplenews.admin.inc:31;1302
 msgid "Published"
 msgstr ""
 
-#: simplenews.admin.inc:40;1119
+#: simplenews.admin.inc:31;1316 simplenews_handler_field_newsletter_s_status.inc:21 simplenews_handler_filter_newsletter_s_status.inc:17
 msgid "Sent"
 msgstr ""
 
-#: simplenews.admin.inc:40
-msgid "Edit"
+#: simplenews.admin.inc:31;105
+msgid "Subscribers"
 msgstr ""
 
-#: simplenews.admin.inc:66
-msgid "n/a"
+#: simplenews.admin.inc:31;105;714;1258
+msgid "Operations"
 msgstr ""
 
-#: simplenews.admin.inc:70;619;875
+#: simplenews.admin.inc:52;755;845
 msgid "edit"
 msgstr ""
 
-#: simplenews.admin.inc:76
+#: simplenews.admin.inc:55
+msgid "n/a"
+msgstr ""
+
+#: simplenews.admin.inc:67
 msgid "No newsletters available."
 msgstr ""
 
-#: simplenews.admin.inc:80;104;977;1001
+#: simplenews.admin.inc:71;95;1159;1183
 msgid "Filter"
 msgstr ""
 
-#: simplenews.admin.inc:114;158
+#: simplenews.admin.inc:105;149
 msgid "Newsletter name"
 msgstr ""
 
-#: simplenews.admin.inc:114;578;1060
-msgid "Operations"
-msgstr ""
-
-#: simplenews.admin.inc:117
+#: simplenews.admin.inc:109
 msgid "edit newsletter"
 msgstr ""
 
-#: simplenews.admin.inc:121
+#: simplenews.admin.inc:113
 msgid "There are currently no newsletter series."
 msgstr ""
 
-#: simplenews.admin.inc:144;243;271;318;602 simplenews.module:173
+#: simplenews.admin.inc:136;269;295;364;738 simplenews.module:158
 msgid "Delete"
 msgstr ""
 
-#: simplenews.admin.inc:155
-msgid "You can create different newsletters (or subjects) to categorize your news (e.g. Cats news, Dogs news, ...)."
+#: simplenews.admin.inc:152
+msgid "The name of this newsletter."
+msgstr ""
+
+#: simplenews.admin.inc:158
+msgid "Description"
 msgstr ""
 
 #: simplenews.admin.inc:161
-msgid "This name is used to identify the newsletter."
+msgid "A description of the newsletter. To be displayed on taxonomy/term pages and RSS feeds."
 msgstr ""
 
-#: simplenews.admin.inc:167
-msgid "Description"
+#: simplenews.admin.inc:166
+msgid "Weight"
 msgstr ""
 
-#: simplenews.admin.inc:170
-msgid "The description can be used to provide more information."
+#: simplenews.admin.inc:168
+msgid "Newsletters are displayed in ascending order by weight."
 msgstr ""
 
 #: simplenews.admin.inc:175
-msgid "Weight"
+msgid "Subscription settings"
+msgstr ""
+
+#: simplenews.admin.inc:178 simplenews.module:887;891
+msgid "None"
 msgstr ""
 
-#: simplenews.admin.inc:177
-msgid "In listings, the heavier (with a higher weight value) terms will sink and the lighter terms will be positioned nearer the top."
+#: simplenews.admin.inc:178
+msgid "Default on"
 msgstr ""
 
-#: simplenews.admin.inc:191;747
+#: simplenews.admin.inc:178
+msgid "Default off"
+msgstr ""
+
+#: simplenews.admin.inc:178
+msgid "Silent"
+msgstr ""
+
+#: simplenews.admin.inc:181
+msgid "Subscribe new account"
+msgstr ""
+
+#: simplenews.admin.inc:184
+msgid "None: This newsletter is not listed on the user registration page.<br />Default on: This newsletter is listed on the user registion page and is selected by default.<br />Default off: This newsletter is listed on the user registion page and is not selected by default.<br />Silent: A new user is automatically subscribed to this newsletter. The newsletter is not listed on the user registration page."
+msgstr ""
+
+#: simplenews.admin.inc:187
+msgid "Hidden"
+msgstr ""
+
+#: simplenews.admin.inc:187
+msgid "Single"
+msgstr ""
+
+#: simplenews.admin.inc:187
+msgid "Double"
+msgstr ""
+
+#: simplenews.admin.inc:190
+msgid "Opt-in/out method"
+msgstr ""
+
+#: simplenews.admin.inc:193
+msgid "Hidden: This newsletter does not appear on subscription forms. No unsubscription footer in newsletter.<br /> Single: Users are (un)subscribed immediately.<br />Double: When (un)subscribing at a subscription form, anonymous users receive an (un)subscription confirmation email. Authenticated users are (un)subscribed immediately."
+msgstr ""
+
+#: simplenews.admin.inc:198;912
 msgid "Sender information"
 msgstr ""
 
-#: simplenews.admin.inc:197;754
+#: simplenews.admin.inc:203;918
 msgid "From name"
 msgstr ""
 
-#: simplenews.admin.inc:204;761
-msgid "From e-mail address"
+#: simplenews.admin.inc:210
+msgid "Newsletter subject"
+msgstr ""
+
+#: simplenews.admin.inc:214;1017 simplenews.module:528
+msgid "Replacement patterns"
+msgstr ""
+
+#: simplenews.admin.inc:224
+msgid "Email subject"
 msgstr ""
 
-#: simplenews.admin.inc:212
+#: simplenews.admin.inc:233;925
+msgid "From email address"
+msgstr ""
+
+#: simplenews.admin.inc:240
 msgid "HTML to text conversion"
 msgstr ""
 
-#: simplenews.admin.inc:215
+#: simplenews.admin.inc:242
 msgid "When your newsletter is sent as plain text, these options will determine how the conversion to text is performed."
 msgstr ""
 
-#: simplenews.admin.inc:229 simplenews.module:1062
+#: simplenews.admin.inc:246
+msgid "Hyperlink conversion"
+msgstr ""
+
+#: simplenews.admin.inc:248
+msgid "Append hyperlinks as a numbered reference list"
+msgstr ""
+
+#: simplenews.admin.inc:249
+msgid "Display hyperlinks inline with the text"
+msgstr ""
+
+#: simplenews.admin.inc:255 simplenews.module:1400 simplenews.js:0
 msgid "Save"
 msgstr ""
 
-#: simplenews.admin.inc:264;863
-msgid "The sender's e-mail address you supplied is not valid."
+#: simplenews.admin.inc:289;937
+msgid "The sender's email address you supplied is not valid."
 msgstr ""
 
-#: simplenews.admin.inc:277
+#: simplenews.admin.inc:311
 msgid "Created new term %name."
 msgstr ""
 
-#: simplenews.admin.inc:280 simplenews.install:223
+#: simplenews.admin.inc:314 simplenews.install:294
 msgid "Updated term %name."
 msgstr ""
 
-#: simplenews.admin.inc:310
+#: simplenews.admin.inc:356
 msgid "Note: All subscriptions associated with this newsletter will be lost."
 msgstr ""
 
-#: simplenews.admin.inc:315
+#: simplenews.admin.inc:361
 msgid "Are you sure you want to delete %title?"
 msgstr ""
 
-#: simplenews.admin.inc:317;361
+#: simplenews.admin.inc:363;410
 msgid "This action cannot be undone."
 msgstr ""
 
-#: simplenews.admin.inc:319;363 simplenews.subscription.inc:139;165
+#: simplenews.admin.inc:365;412 simplenews.subscription.inc:142;168
 msgid "Cancel"
 msgstr ""
 
-#: simplenews.admin.inc:327
+#: simplenews.admin.inc:376
 msgid "Newsletter %title has been deleted."
 msgstr ""
 
-#: simplenews.admin.inc:359
+#: simplenews.admin.inc:408
 msgid "Are you sure you want to delete these subscriptions?"
 msgstr ""
 
-#: simplenews.admin.inc:362
+#: simplenews.admin.inc:411
 msgid "Delete all"
 msgstr ""
 
-#: simplenews.admin.inc:372
+#: simplenews.admin.inc:421
 msgid "The subscriptions have been deleted."
 msgstr ""
 
-#: simplenews.admin.inc:386;495
-msgid "E-mail addresses"
+#: simplenews.admin.inc:437;618
+msgid "Email addresses"
 msgstr ""
 
-#: simplenews.admin.inc:389
-msgid "Supply a comma separated list of e-mail addresses to be added to the list. Spaces between commas and addresses are allowed."
+#: simplenews.admin.inc:440;621
+msgid "Email addresses must be separated by comma, space or newline."
 msgstr ""
 
-#: simplenews.admin.inc:397
-msgid "Subscribe imported addresses to the following newsletter(s)"
+#: simplenews.admin.inc:448
+msgid "Subscribe to"
 msgstr ""
 
-#: simplenews.admin.inc:406
-msgid "Import"
+#: simplenews.admin.inc:457
+msgid "Site default language"
 msgstr ""
 
-#: simplenews.admin.inc:414 simplenews.subscription.inc:51
-msgid "You must select at least one newsletter."
+#: simplenews.admin.inc:465
+msgid "Anonymous user preferred language"
+msgstr ""
+
+#: simplenews.admin.inc:468
+msgid "Anonymous users will be subscribed with the selected preferred language. They will receive newsletters in this language if available. Registered users will be subscribed with their preferred language as set on their account page."
 msgstr ""
 
-#: simplenews.admin.inc:440
+#: simplenews.admin.inc:477 simplenews.subscription.inc:71;141 simplenews.module:1325;1371;1389
+msgid "Subscribe"
+msgstr ""
+
+#: simplenews.admin.inc:504
 msgid "The following addresses were added or updated: %added."
 msgstr ""
 
-#: simplenews.admin.inc:447
+#: simplenews.admin.inc:511
 msgid "The addresses were subscribed to the following newsletters: %newsletters."
 msgstr ""
 
-#: simplenews.admin.inc:450
+#: simplenews.admin.inc:514
 msgid "No addresses were added."
 msgstr ""
 
-#: simplenews.admin.inc:454
+#: simplenews.admin.inc:518;675
 msgid "The following addresses were invalid: %invalid."
 msgstr ""
 
-#: simplenews.admin.inc:467;577;1059 simplenews_views.inc:59
+#: simplenews.admin.inc:531;713;1257
 msgid "Status"
 msgstr ""
 
-#: simplenews.admin.inc:468
-msgid "Select at least 1 status"
-msgstr ""
-
-#: simplenews.admin.inc:473
+#: simplenews.admin.inc:532
 msgid "Active users"
 msgstr ""
 
-#: simplenews.admin.inc:477
+#: simplenews.admin.inc:532
 msgid "Inactive users"
 msgstr ""
 
-#: simplenews.admin.inc:482;926
-msgid "Subscribed to"
+#: simplenews.admin.inc:533
+msgid "Subscriptions matching the selected states will be exported."
 msgstr ""
 
-#: simplenews.admin.inc:483
-msgid "Select at least 1 newsletter"
+#: simplenews.admin.inc:542;1108
+msgid "Subscribed to"
 msgstr ""
 
-#: simplenews.admin.inc:498
-msgid "No search performed"
+#: simplenews.admin.inc:544
+msgid "Subscriptions matching the selected newsletters will be exported."
 msgstr ""
 
-#: simplenews.admin.inc:502;510
+#: simplenews.admin.inc:553;562 simplenews.module:198
 msgid "Export"
 msgstr ""
 
-#: simplenews.admin.inc:538
+#: simplenews.admin.inc:596
 msgid "No addresses were found."
 msgstr ""
 
-#: simplenews.admin.inc:575;1057 simplenews.module:981;1048
-msgid "E-mail"
+#: simplenews.admin.inc:600
+msgid "Export results"
+msgstr ""
+
+#: simplenews.admin.inc:629
+msgid "Unsubscribe from"
+msgstr ""
+
+#: simplenews.admin.inc:635 simplenews.subscription.inc:79;167 simplenews.module:1330;1367
+msgid "Unsubscribe"
+msgstr ""
+
+#: simplenews.admin.inc:661
+msgid "The following addresses were unsubscribed: %removed."
+msgstr ""
+
+#: simplenews.admin.inc:668
+msgid "The addresses were unsubscribed from the following newsletters: %newsletters."
 msgstr ""
 
-#: simplenews.admin.inc:576;1058
+#: simplenews.admin.inc:671
+msgid "No addresses were removed."
+msgstr ""
+
+#: simplenews.admin.inc:711;1255 simplenews.module:1384
+msgid "Email"
+msgstr ""
+
+#: simplenews.admin.inc:712;1256
 msgid "Username"
 msgstr ""
 
-#: simplenews.admin.inc:593
+#: simplenews.admin.inc:729
 msgid "Update options"
 msgstr ""
 
-#: simplenews.admin.inc:600
+#: simplenews.admin.inc:736
 msgid "Activate"
 msgstr ""
 
-#: simplenews.admin.inc:601
+#: simplenews.admin.inc:737
 msgid "Inactivate"
 msgstr ""
 
-#: simplenews.admin.inc:607 simplenews.subscription.inc:57 simplenews.module:973
+#: simplenews.admin.inc:743 simplenews.subscription.inc:57 simplenews.module:1309
 msgid "Update"
 msgstr ""
 
-#: simplenews.admin.inc:631
+#: simplenews.admin.inc:767
 msgid "No items selected."
 msgstr ""
 
-#: simplenews.admin.inc:643;647
+#: simplenews.admin.inc:779;783
 msgid "The update has been performed."
 msgstr ""
 
-#: simplenews.admin.inc:663
-msgid "General settings"
+#: simplenews.admin.inc:799
+msgid "Content types"
+msgstr ""
+
+#: simplenews.admin.inc:803
+msgid "Content types to be used as newsletter."
 msgstr ""
 
-#: simplenews.admin.inc:669
-msgid "Newsletter content types"
+#: simplenews.admin.inc:806
+msgid "<select>"
 msgstr ""
 
-#: simplenews.admin.inc:673
-msgid "Select content type(s) to be used as newsletter."
+#: simplenews.admin.inc:814
+msgid "Newsletter vocabulary"
 msgstr ""
 
-#: simplenews.admin.inc:683
-msgid "Newsletter taxonomy"
+#: simplenews.admin.inc:817
+msgid "This vocabulary identifies newsletter series. Note that changing this vocabulary will require existing newsletters to be re-tagged and activated newsletter blocks to be re-activated."
 msgstr ""
 
-#: simplenews.admin.inc:686
-msgid "Select the taxonomy used to identify newsletter series. Note that changing the newsletter taxonomy will affect existing newsletter issues."
+#: simplenews.admin.inc:844;845
+msgid "Updated vocabulary %name."
 msgstr ""
 
-#: simplenews.admin.inc:691
+#: simplenews.admin.inc:858
 msgid "Default newsletter options"
 msgstr ""
 
-#: simplenews.admin.inc:694
+#: simplenews.admin.inc:860
 msgid "These options will be the defaults for new newsletters, but can be overridden in the newsletter editing form."
 msgstr ""
 
-#: simplenews.admin.inc:696
-msgid "Select the default newsletter sending format."
+#: simplenews.admin.inc:862
+msgid "Default newsletter format."
 msgstr ""
 
-#: simplenews.admin.inc:698
-msgid " Mime Mail module is required to send newsletters in HTML format."
+#: simplenews.admin.inc:864
+msgid "Install <a href=\"@mime_mail_url\">Mime Mail</a> module to send newsletters in HTML format."
 msgstr ""
 
-#: simplenews.admin.inc:702 simplenews.module:437
+#: simplenews.admin.inc:868
 msgid "Format"
 msgstr ""
 
-#: simplenews.admin.inc:709 simplenews.module:451
+#: simplenews.admin.inc:875
 msgid "Priority"
 msgstr ""
 
-#: simplenews.admin.inc:710 simplenews.module:454
+#: simplenews.admin.inc:876 simplenews.module:646
 msgid "none"
 msgstr ""
 
-#: simplenews.admin.inc:710 simplenews.module:455
+#: simplenews.admin.inc:876 simplenews.module:647
 msgid "highest"
 msgstr ""
 
-#: simplenews.admin.inc:710 simplenews.module:456
+#: simplenews.admin.inc:876 simplenews.module:648
 msgid "high"
 msgstr ""
 
-#: simplenews.admin.inc:710 simplenews.module:457
+#: simplenews.admin.inc:876 simplenews.module:649
 msgid "normal"
 msgstr ""
 
-#: simplenews.admin.inc:710 simplenews.module:458
+#: simplenews.admin.inc:876 simplenews.module:650
 msgid "low"
 msgstr ""
 
-#: simplenews.admin.inc:710 simplenews.module:459
+#: simplenews.admin.inc:876 simplenews.module:651
 msgid "lowest"
 msgstr ""
 
-#: simplenews.admin.inc:711
-msgid "Note that e-mail priority is ignored by a lot of e-mail programs."
+#: simplenews.admin.inc:877
+msgid "Note that email priority is ignored by a lot of email programs."
 msgstr ""
 
-#: simplenews.admin.inc:716 simplenews.module:464
+#: simplenews.admin.inc:882 simplenews.module:656
 msgid "Request receipt"
 msgstr ""
 
-#: simplenews.admin.inc:718
-msgid "Request a Read Receipt from your newsletters. A lot of e-mail programs ignore these so it is not a definitive indication of how many people have read your newsletter."
+#: simplenews.admin.inc:884
+msgid "Request a Read Receipt from your newsletters. A lot of email programs ignore these so it is not a definitive indication of how many people have read your newsletter."
 msgstr ""
 
-#: simplenews.admin.inc:722
-msgid "Default selection for sending newsletters"
+#: simplenews.admin.inc:888
+msgid "Default send action"
 msgstr ""
 
-#: simplenews.admin.inc:723 simplenews.module:470;481
+#: simplenews.admin.inc:889 simplenews.module:575;587
 msgid "Don't send now"
 msgstr ""
 
-#: simplenews.admin.inc:723 simplenews.module:471;482
+#: simplenews.admin.inc:889 simplenews.module:576;588
 msgid "Send one test newsletter to the test address"
 msgstr ""
 
-#: simplenews.admin.inc:723 simplenews.module:472
+#: simplenews.admin.inc:889 simplenews.module:548;577
 msgid "Send newsletter"
 msgstr ""
 
-#: simplenews.admin.inc:728
-msgid "Test addresses options"
+#: simplenews.admin.inc:894
+msgid "Test addresses"
 msgstr ""
 
-#: simplenews.admin.inc:731
-msgid "Supply a comma-separated list of e-mail addresses to be used as test addresses. The override function allows to override these addresses upon newsletter creation."
+#: simplenews.admin.inc:896
+msgid "Supply a comma-separated list of email addresses to be used as test addresses. The override function allows to override these addresses in the newsletter editing form."
 msgstr ""
 
-#: simplenews.admin.inc:735
-msgid "Test e-mail address"
+#: simplenews.admin.inc:900;1119
+msgid "Email address"
 msgstr ""
 
-#: simplenews.admin.inc:742
+#: simplenews.admin.inc:907
 msgid "Allow test address override"
 msgstr ""
 
-#: simplenews.admin.inc:750
-msgid "Default sender address that will only be used for confirmation e-mails. You can specify sender information for each newsletter separately on the newsletter's settings page."
+#: simplenews.admin.inc:914
+msgid "Default sender address that will only be used for confirmation emails. You can specify sender information for each newsletter separately on the newsletter's settings page."
 msgstr ""
 
-#: simplenews.admin.inc:769
-msgid "Mail backend options"
+#: simplenews.admin.inc:951
+msgid "Use cron to send newsletters"
 msgstr ""
 
-#: simplenews.admin.inc:772 simplenews.install:113;323
-msgid ""
+#: simplenews.admin.inc:953
+msgid "When checked cron will be used to send newsletters (recommended). Test newsletters and confirmation emails will be send immediately. Leave unchecked for testing purposes."
 msgstr ""
 
-#: simplenews.admin.inc:780
-msgid "Use cron to send newsletters"
+#: simplenews.admin.inc:956
+msgid "Unlimited"
 msgstr ""
 
-#: simplenews.admin.inc:782
-msgid "When checked cron will be used to send newsletters (recommended). Test newsletters and confirmation emails will be send immediately. Leave unchecked for testing purposes."
+#: simplenews.admin.inc:958
+msgid "Cron execution must not exceed the PHP maximum execution time of %max seconds. You find the time spend to sent emails in the <a href=\"/admin/reports/dblog\">Recent log entries</a>."
 msgstr ""
 
-#: simplenews.admin.inc:785
-msgid "Unlimited"
+#: simplenews.admin.inc:961
+msgid "Cron execution must not exceed the PHP maximum execution time of %max seconds."
 msgstr ""
 
-#: simplenews.admin.inc:788
+#: simplenews.admin.inc:965
 msgid "Cron throttle"
 msgstr ""
 
-#: simplenews.admin.inc:791
+#: simplenews.admin.inc:968
 msgid "Sets the numbers of newsletters sent per cron run. Failure to send will also be counted."
 msgstr ""
 
-#: simplenews.admin.inc:795
-msgid "Log emails"
+#: simplenews.admin.inc:972
+msgid "Mail spool expiration"
 msgstr ""
 
-#: simplenews.admin.inc:797
-msgid "When checked all outgoing simplenews emails are logged in the system log. A logged email does not guarantee that it is send or will be delivered. It only indicates that a message is send to the PHP mail() function. No status information is available of delivery by the PHP mail() function."
+#: simplenews.admin.inc:973
+msgid "Immediate"
 msgstr ""
 
-#: simplenews.admin.inc:801
-msgid "Subscription options"
+#: simplenews.admin.inc:973
+msgid "1 day"
 msgstr ""
 
-#: simplenews.admin.inc:808
-msgid "Synchronize with account"
+#: simplenews.admin.inc:973
+msgid "1 week"
+msgstr ""
+
+#: simplenews.admin.inc:973
+msgid "2 weeks"
+msgstr ""
+
+#: simplenews.admin.inc:975
+msgid "Newsletter mails are spooled. How long must messages be retained in the spool after successfull sending. Keeping the message in the spool allows mail statistics (which is not yet implemented). If cron is not used, immediate expiration is advised."
 msgstr ""
 
-#: simplenews.admin.inc:810
-msgid "When checked subscriptions will be synchronized with site accounts. When accounts are deteted, subscriptions with the same email address will be removed. When site accounts are blocked/unblocked, subscriptions will be deactivated/activated. When not checked subscriptions will be unchanged when associated accounts are deleted or blocked."
+#: simplenews.admin.inc:979
+msgid "Log emails"
 msgstr ""
 
-#: simplenews.admin.inc:815
-msgid "Available variables are:"
+#: simplenews.admin.inc:981
+msgid "When checked all outgoing simplenews emails are logged in the system log. A logged email does not guarantee that it is send or will be delivered. It only indicates that a message is send to the PHP mail() function. No status information is available of delivery by the PHP mail() function."
 msgstr ""
 
-#: simplenews.admin.inc:819
-msgid "Subscription confirmation emails"
+#: simplenews.admin.inc:997
+msgid "User account"
 msgstr ""
 
-#: simplenews.admin.inc:822
-msgid "Customize the confimation email which is sent to (un)subscribing visitors."
+#: simplenews.admin.inc:1002
+msgid "Synchronize with account"
 msgstr ""
 
-#: simplenews.admin.inc:826
+#: simplenews.admin.inc:1004
+msgid "When checked subscriptions will be synchronized with site accounts. When accounts are deleted, subscriptions with the same email address will be removed. When site accounts are blocked/unblocked, subscriptions will be deactivated/activated. When not checked subscriptions will be unchanged when associated accounts are deleted or blocked."
+msgstr ""
+
+#: simplenews.admin.inc:1012
+msgid "Confirmation emails"
+msgstr ""
+
+#: simplenews.admin.inc:1028
 msgid "Subject"
 msgstr ""
 
-#: simplenews.admin.inc:832
+#: simplenews.admin.inc:1034
 msgid "Body text of subscribe email"
 msgstr ""
 
-#: simplenews.admin.inc:838
+#: simplenews.admin.inc:1040
 msgid "Body text for already subscribed visitor"
 msgstr ""
 
-#: simplenews.admin.inc:844
+#: simplenews.admin.inc:1046
 msgid "Body text of unsubscribe email"
 msgstr ""
 
-#: simplenews.admin.inc:850
+#: simplenews.admin.inc:1052
 msgid "Body text for not yet subscribed visitor"
 msgstr ""
 
-#: simplenews.admin.inc:874;875
-msgid "Updated vocabulary %name."
-msgstr ""
-
-#: simplenews.admin.inc:906
+#: simplenews.admin.inc:1088
 msgid "all newsletters"
 msgstr ""
 
-#: simplenews.admin.inc:909
+#: simplenews.admin.inc:1091
 msgid "orphaned newsletters"
 msgstr ""
 
-#: simplenews.admin.inc:928
+#: simplenews.admin.inc:1110
 msgid "All newsletters"
 msgstr ""
 
-#: simplenews.admin.inc:937
-msgid "E-mail address"
-msgstr ""
-
-#: simplenews.admin.inc:957
+#: simplenews.admin.inc:1139
 msgid "Subscription filters"
 msgstr ""
 
-#: simplenews.admin.inc:984;1007
+#: simplenews.admin.inc:1166;1189
 msgid "Reset"
 msgstr ""
 
-#: simplenews.admin.inc:1077
+#: simplenews.admin.inc:1275
 msgid "No subscriptions available."
 msgstr ""
 
-#: simplenews.admin.inc:1104
+#: simplenews.admin.inc:1302
 msgid "Not published"
 msgstr ""
 
-#: simplenews.admin.inc:1108
+#: simplenews.admin.inc:1306
 msgid "Inactive: no newsletters will be sent"
 msgstr ""
 
-#: simplenews.admin.inc:1108
+#: simplenews.admin.inc:1306
 msgid "Active: user will receive newsletters"
 msgstr ""
 
-#: simplenews.admin.inc:1117
-msgid "Not sent"
-msgstr ""
-
-#: simplenews.admin.inc:1118
+#: simplenews.admin.inc:1315
 msgid "Currently sending by cron"
 msgstr ""
 
-#: simplenews.admin.inc:875 simplenews.module:834;940;1160;1387;1413;0
+#: simplenews.admin.inc:845 simplenews.module:1145;1271;1726;1784;1787;1815;1863;1875;1878;0
 msgid "simplenews"
 msgstr ""
 
-#: simplenews.subscription.inc:45 simplenews.module:1069
-msgid "The e-mail address you supplied is not valid."
-msgstr ""
+#: simplenews.admin.inc:28
+msgid "Last batch: 1 mail sent at !time."
+msgid_plural "Last batch: !count mails sent at !time."
+msgstr[0] ""
+msgstr[1] ""
 
-#: simplenews.subscription.inc:66
-msgid "The newsletter subscriptions for %mail have been updated."
+#: simplenews.subscription.inc:45 simplenews.module:1407
+msgid "The email address you supplied is not valid."
 msgstr ""
 
-#: simplenews.subscription.inc:68;138 simplenews.module:989;1035;1056
-msgid "Subscribe"
+#: simplenews.subscription.inc:51
+msgid "You must select at least one newsletter."
 msgstr ""
 
-#: simplenews.subscription.inc:74 simplenews.module:1085
-msgid "You will receive a confirmation e-mail shortly containing further instructions on how to complete your subscription."
+#: simplenews.subscription.inc:69
+msgid "The newsletter subscriptions for %mail have been updated."
 msgstr ""
 
-#: simplenews.subscription.inc:76;164 simplenews.module:994;1031;1056
-msgid "Unsubscribe"
+#: simplenews.subscription.inc:77 simplenews.module:1429
+msgid "You will receive a confirmation email shortly containing further instructions on how to complete your subscription."
 msgstr ""
 
-#: simplenews.subscription.inc:82 simplenews.module:1094
-msgid "You will receive a confirmation e-mail shortly containing further instructions on how to complete the unsubscription process."
+#: simplenews.subscription.inc:85 simplenews.module:1438
+msgid "You will receive a confirmation email shortly containing further instructions on how to complete the unsubscription process."
 msgstr ""
 
-#: simplenews.subscription.inc:129
+#: simplenews.subscription.inc:132
 msgid "Are you sure you want to add %user to the %newsletter mailing list?"
 msgstr ""
 
-#: simplenews.subscription.inc:135
+#: simplenews.subscription.inc:138
 msgid "Confirm subscription"
 msgstr ""
 
-#: simplenews.subscription.inc:137
+#: simplenews.subscription.inc:140
 msgid "You always have the option of unsubscribing later."
 msgstr ""
 
-#: simplenews.subscription.inc:145
-msgid "%user was successfully added to the %newsletter mailing list."
+#: simplenews.subscription.inc:148
+msgid "%user was added to the %newsletter mailing list."
 msgstr ""
 
-#: simplenews.subscription.inc:155
+#: simplenews.subscription.inc:158
 msgid "Are you sure you want to remove %user from the %newsletter mailing list?"
 msgstr ""
 
-#: simplenews.subscription.inc:161
+#: simplenews.subscription.inc:164
 msgid "Confirm unsubscription"
 msgstr ""
 
-#: simplenews.subscription.inc:163
-msgid "This action will only remove you from the newsletter mailing list. If you are registered at our site, your account information will remain unchanged."
+#: simplenews.subscription.inc:166
+msgid "This action will unsubscribe you from the newsletter mailing list."
 msgstr ""
 
-#: simplenews.subscription.inc:171
-msgid "%user was successfully removed from the %newsletter mailing list."
+#: simplenews.subscription.inc:174
+msgid "%user was unsubscribed from the %newsletter mailing list."
 msgstr ""
 
-#: simplenews_views.inc:19;40 simplenews.info:0
+#: simplenews.views.inc:17 simplenews.module:2550;217 simplenews.info:0
 msgid "Simplenews"
 msgstr ""
 
-#: simplenews_views.inc:23
+#: simplenews.views.inc:21
 msgid "Node"
 msgstr ""
 
-#: simplenews_views.inc:24
+#: simplenews.views.inc:22
 msgid "Using nodes as newsletters."
 msgstr ""
 
-#: simplenews_views.inc:29
-msgid "Simplenews newsletter"
-msgstr ""
-
-#: simplenews_views.inc:36
-msgid "Send status"
+#: simplenews.views.inc:39
+msgid "Sent status"
 msgstr ""
 
-#: simplenews_views.inc:37
-msgid "Newsletter send status. Not send, Pending (being send or waiting for cron to run), Send."
+#: simplenews.views.inc:40
+msgid "Newsletter sent status: Not sent, Pending (being sent or waiting for cron to run), Sent."
 msgstr ""
 
-#: simplenews_views.inc:62
-msgid "Not send"
+#: simplenews_handler_field_newsletter_s_status.inc:17 simplenews_handler_filter_newsletter_s_status.inc:15
+msgid "Not sent"
 msgstr ""
 
-#: simplenews_views.inc:63
+#: simplenews_handler_field_newsletter_s_status.inc:19 simplenews_handler_filter_newsletter_s_status.inc:16
 msgid "Pending"
 msgstr ""
 
-#: simplenews_views.inc:64
-msgid "Send"
+#: simplenews.module:88
+msgid "Missing newsletter vocabulary. Please set a vocabulary at <a href=\"@settings\">Simplenews settings</a>."
 msgstr ""
 
-#: simplenews.module:51 simplenews_action/simplenews_action.module:124
-msgid "Newsletter issue"
+#: simplenews.module:351
+msgid "No newsletter term is selected, the newsletter taxonomy term is probably not configured correctly.<br /> Check and <strong>save</strong> the <a href=\"@settings\">Simplenews general settings</a>."
 msgstr ""
 
-#: simplenews.module:53
-msgid "A newsletter issue to be sent to subscribed e-mail addresses."
+#: simplenews.module:359
+msgid "Test email address is empty."
 msgstr ""
 
-#: simplenews.module:270
-msgid "You should assign content type %content_type to the !newsletter_vocabulary before you can send this newsletter."
+#: simplenews.module:362
+msgid "Invalid email address %mail."
 msgstr ""
 
-#: simplenews.module:270
-msgid "Newsletter vocabulary"
+#: simplenews.module:367
+msgid "Missing test email address."
 msgstr ""
 
-#: simplenews.module:273
-msgid "You should select a newsletter before you can send this newsletter issue."
+#: simplenews.module:430
+msgid "Newsletter %title was deleted."
 msgstr ""
 
-#: simplenews.module:281
-msgid "Cannot send test newsletter: no test e-mail address specified."
+#: simplenews.module:498
+msgid "This is the designated simplenews vocabulary."
 msgstr ""
 
-#: simplenews.module:284
-msgid "Cannot send test newsletter to %mail: e-mail address invalid."
+#: simplenews.module:506
+msgid "These content type(s) are used as newsletter. They can be set in !simplenews_settings."
 msgstr ""
 
-#: simplenews.module:338
-msgid "Newsletter %title was successfully deleted."
+#: simplenews.module:525
+msgid "This will be the body of your newsletter. See 'Replacement patterns' for available variables.)"
 msgstr ""
 
-#: simplenews.module:368
-msgid "This will be the body of your newsletter. Available variables are:"
+#: simplenews.module:533
+msgid "These tokens can be used in all text fields and will be replaced on-screen and in the email. Note that simplenews-receiver tokens are not suitable for on-screen use."
 msgstr ""
 
-#: simplenews.module:368
-msgid "(the name of your website),"
+#: simplenews.module:544
+msgid "Invalid vocabulary setting detected. Check and <strong>save</strong> the <a href=\"@settings\">Simplenews general settings</a>."
 msgstr ""
 
-#: simplenews.module:368
-msgid "(a link to your homepage),"
+#: simplenews.module:558
+msgid "This newsletter issue is part of a translation set. Sending this set is controlled from the <a href=\"@link\">translation source newsletter</a>."
 msgstr ""
 
-#: simplenews.module:368
-msgid "(homepage link without the http://),"
+#: simplenews.module:580
+msgid "Send action"
 msgstr ""
 
-#: simplenews.module:368
-msgid "(today's date),"
+#: simplenews.module:591
+msgid "Sending"
 msgstr ""
 
-#: simplenews.module:368
-msgid "(link to login page)."
+#: simplenews.module:594
+msgid "You have no privileges to send this newsletter"
 msgstr ""
 
-#: simplenews.module:408
-msgid "This is the designated simplenews vocabulary."
+#: simplenews.module:603
+msgid "Test email addresses"
 msgstr ""
 
-#: simplenews.module:412
-msgid "Select content type(s) to be used as newsletter"
+#: simplenews.module:604
+msgid "Supply a comma-separated list of email addresses to be used as test addresses."
 msgstr ""
 
-#: simplenews.module:424
-msgid "Content type %type requires to be assigned to vocabulary %name. Please change the vocabulary settings."
+#: simplenews.module:619
+msgid "Email options"
 msgstr ""
 
-#: simplenews.module:428
-msgid "Newsletter sending options"
+#: simplenews.module:629
+msgid "Email format"
 msgstr ""
 
-#: simplenews.module:475;485
-msgid "Sending"
+#: simplenews.module:643
+msgid "Email priority"
 msgstr ""
 
-#: simplenews.module:488
-msgid "You have no privileges to send this newsletter"
-msgstr ""
-
-#: simplenews.module:495
-msgid "Test e-mail addresses"
+#: simplenews.module:664
+msgid "This newsletter has been sent"
 msgstr ""
 
-#: simplenews.module:496
-msgid "Supply a comma-separated list of e-mail addresses to be used as test addresses."
+#: simplenews.module:701
+msgid "All subscriptions to newsletter %newsletter have been deleted."
 msgstr ""
 
-#: simplenews.module:512
-msgid "This newsletter has been sent"
+#: simplenews.module:740
+msgid "Select the newsletter(s) to which you wish to subscribe."
 msgstr ""
 
-#: simplenews.module:544
-msgid "Deleted all subscriptions to newsletter %newsletter."
+#: simplenews.module:788
+msgid "You have been subscribed to %newsletter."
 msgstr ""
 
-#: simplenews.module:617
+#: simplenews.module:851
 msgid "Current newsletter subscriptions"
 msgstr ""
 
-#: simplenews.module:624
+#: simplenews.module:859
 msgid "My newsletters"
 msgstr ""
 
-#: simplenews.module:632;658;109;134;142;150
+#: simplenews.module:871;98;118;127;135
 msgid "Newsletters"
 msgstr ""
 
-#: simplenews.module:644
-msgid "None"
-msgstr ""
-
-#: simplenews.module:648
+#: simplenews.module:894
 msgid "Current subscriptions"
 msgstr ""
 
-#: simplenews.module:654
+#: simplenews.module:901
 msgid "Manage !my_subscriptions"
 msgstr ""
 
-#: simplenews.module:654
+#: simplenews.module:901
 msgid "my subscriptions"
 msgstr ""
 
-#: simplenews.module:674
+#: simplenews.module:921
 msgid "Newsletter: @title"
 msgstr ""
 
-#: simplenews.module:682
-msgid "Display block message"
-msgstr ""
-
-#: simplenews.module:688
+#: simplenews.module:929
 msgid "Block message"
 msgstr ""
 
-#: simplenews.module:691;1775
+#: simplenews.module:932;2623
 msgid "Stay informed on our latest news!"
 msgstr ""
 
-#: simplenews.module:695
-msgid "Display subscription form"
+#: simplenews.module:936
+msgid "Subscription interface"
 msgstr ""
 
-#: simplenews.module:697
-msgid "If selected a subscription form is displayed, if not selected a link to the subscription page is displayed."
+#: simplenews.module:937
+msgid "Subscription form"
 msgstr ""
 
-#: simplenews.module:702
-msgid "Display link to previous issues"
+#: simplenews.module:937
+msgid "Link to form"
 msgstr ""
 
-#: simplenews.module:705
-msgid "Links (to previous issues, previous issues and RSS-feed) are only displayed to users who have \"view links in block\" privileges."
+#: simplenews.module:938
+msgid "Note: this requires permission 'subscribe to newsletters'."
 msgstr ""
 
-#: simplenews.module:709
+#: simplenews.module:943
+msgid "Display link to previous issues"
+msgstr ""
+
+#: simplenews.module:949
 msgid "Display previous issues"
 msgstr ""
 
-#: simplenews.module:715
+#: simplenews.module:955
 msgid "Number of issues to display"
 msgstr ""
 
-#: simplenews.module:721
+#: simplenews.module:961
 msgid "Display RSS-feed icon"
 msgstr ""
 
-#: simplenews.module:958
+#: simplenews.module:1294
 msgid "Select the newsletter(s) to which you want to subscribe or unsubscribe."
 msgstr ""
 
-#: simplenews.module:969
+#: simplenews.module:1305
 msgid "Subscriptions for %mail"
 msgstr ""
 
-#: simplenews.module:978
+#: simplenews.module:1314
 msgid "Manage your newsletter subscriptions"
 msgstr ""
 
-#: simplenews.module:1040
+#: simplenews.module:1317
+msgid "email"
+msgstr ""
+
+#: simplenews.module:1376
 msgid "User"
 msgstr ""
 
-#: simplenews.module:1088
-msgid "You have been successfully subscribed."
+#: simplenews.module:1432
+msgid "You have been subscribed."
 msgstr ""
 
-#: simplenews.module:1097
-msgid "You have been successfully unsubscribed."
+#: simplenews.module:1441
+msgid "You have been unsubscribed."
 msgstr ""
 
-#: simplenews.module:1201
-msgid "Test newsletter sent to %recipient."
+#: simplenews.module:1507
+msgid "Newsletter sent."
 msgstr ""
 
-#: simplenews.module:1292;1805
-msgid "Unassigned newsletter"
+#: simplenews.module:1511
+msgid "Newsletter pending."
 msgstr ""
 
-#: simplenews.module:1654
-msgid "Simplenews sends html or plain text newsletters to the mailing list. Subscription and unsubscription are managed through a block, a form or by the newsletter administrator."
+#: simplenews.module:1539
+msgid "Test newsletter sent to %recipient."
 msgstr ""
 
-#: simplenews.module:1655
-msgid "Individual newsletters are grouped by a newsletter taxonomy term. Newsletters can have a block with the ability of (un)subscription, listing of recent newsletters and an associated rss-feed."
+#: simplenews.module:1634
+msgid "Unassigned newsletter"
 msgstr ""
 
-#: simplenews.module:1656
-msgid "Sending of large mailings can be managed by cron."
+#: simplenews.module:1780
+msgid "Sent via Mime Mail"
 msgstr ""
 
-#: simplenews.module:1657
-msgid "For more information please read the configuration and customization handbook <a href=\"@handbook\">Simplenews page</a>."
+#: simplenews.module:1863
+msgid "Cron throttle setting"
 msgstr ""
 
-#: simplenews.module:1660
-msgid "Add this newsletter issue to a newsletter by selecting a newsletter from the select list."
+#: simplenews.module:2276
+msgid "URL of the subscription confirmation page"
 msgstr ""
 
-#: simplenews.module:1661
-msgid "Send a newsletter or a test newsletter by selecting the appropriate radio button and submitting the node."
+#: simplenews.module:2277;2285
+msgid "URL of the unsubscription page"
 msgstr ""
 
-#: simplenews.module:1663
-msgid "Install Mime Mail module to send HTML emails. Mime Mail is also used to send emails with attachments, both plain text and HTML emails."
+#: simplenews.module:2278;2287
+msgid "Email address of the newsletter receiver"
 msgstr ""
 
-#: simplenews.module:1667
-msgid "Newsletter specific settings can be found at the <a href=\"@page\">Newsletters settings page</a>."
+#: simplenews.module:2279;2289
+msgid "The name of the newsletter series"
 msgstr ""
 
-#: simplenews.module:1685
-msgid "plain"
+#: simplenews.module:2280;2290
+msgid "URL of the taxonomy page listing the issues of this newsletter series"
 msgstr ""
 
-#: simplenews.module:1687
-msgid "html"
+#: simplenews.module:2284
+msgid "URL of the subscription confirmation page."
 msgstr ""
 
-#: simplenews.module:1710
-msgid "We have received a request for subscription of !mailto to the !newsletter on !site website at !uri. To confirm this subscription please use the link below.\n\n!confirmation_url"
+#: simplenews.module:2286
+msgid "Username of the newsletter receiver or anonymous user name."
 msgstr ""
 
-#: simplenews.module:1712
-msgid "We have received a request for subscription of !mailto to the !newsletter on !site website at !uri. However, this email is already subscribed to this newsletter. If you intended to unsubscribe please visit our site: !uri"
+#: simplenews.module:2288
+msgid "URL of this newsletter issue"
 msgstr ""
 
-#: simplenews.module:1714
-msgid "We have received a request to unsubscribe !mailto from the !newsletter on !site website at !uri. To confirm this unsubscription please use the link below.\n\n!confirmation_url"
+#: simplenews.module:2365
+msgid "Simplenews publishes and sends newsletters to lists of subscribers. Both anonymous and authenticated users can opt-in to different mailing lists."
 msgstr ""
 
-#: simplenews.module:1716
-msgid "We have received a request to unsubscribe !mailto from the !newsletter on !site website at !uri. However, this email is not subscribed to this newsletter. If you intended to subscribe please visit our site: !uri"
+#: simplenews.module:2366
+msgid "Simplenews uses nodes for <strong>newsletter issues</strong>. Newsletter issues are grouped by a <strong>newsletter taxonomy term</strong>. Node type and vocabulary are selectable. A newsletter is send to all email addresses which are subscribed to the newsletter. Newsletter issues can be sent only once. Large mailings should be sent by cron to balance the mailserver load."
 msgstr ""
 
-#: simplenews.module:1718
-msgid "Confirmation for !newsletter from !site"
+#: simplenews.module:2367
+msgid "Simplenews adds elements to the newsletter node add/edit form to manage newsletter format and sending of the newsletter issue. A newsletter issue can be sent for test before sending officially."
 msgstr ""
 
-#: simplenews.module:1778
-msgid "Manage my subscriptions"
+#: simplenews.module:2368
+msgid "Both anonymous and authenticated users can <strong>opt-in and opt-out</strong> to a newsletter. A confirmation message is sent to anonymous users at subscription and unsubscription. Users can (un)subscribe using a form and a block. A <strong>subscription block</strong> is available for each newsletter offering a subscription form, a link to recent newsletters and RSS feed. Email addresses can also be imported and exported via the subscription administration pages."
 msgstr ""
 
-#: simplenews.module:1781;1783
-msgid "Previous issues"
+#: simplenews.module:2369
+msgid "Configuration"
 msgstr ""
 
-#: simplenews.module:1785
-msgid "@newsletter feed"
+#: simplenews.module:2372
+msgid "Configure permissions"
 msgstr ""
 
-#: simplenews.module:1832
-msgid "Click here to unsubscribe from this newsletter"
+#: simplenews.module:2375
+msgid "Configure Simplenews"
 msgstr ""
 
-#: simplenews.module:1835
-msgid "Unsubscribe from this newsletter: !url"
+#: simplenews.module:2378
+msgid "Enable a newsletter <a href=\"@admin_blocks\">subscription block</a>."
 msgstr ""
 
-#: simplenews.module:1839
-msgid "This is a test version of the newsletter. The above unsubscribe link does not work!"
+#: simplenews.module:2381
+msgid "Manage your <a href=\"@newsletters\">newsletters</a>, <a href=\"@sent\">sent newsletters</a> and <a href=\"@subscriptions\">subscriptions</a>."
 msgstr ""
 
-#: simplenews.module:1854
-msgid "Confirmation for @newsletter from @site"
+#: simplenews.module:2385
+msgid "For more information, see the online handbook entry for <a href=\"@handbook\">Simplenews</a>."
 msgstr ""
 
-#: simplenews.module:1855
-msgid "This is a subscription status confirmation notice for the @newsletter."
+#: simplenews.module:2389
+msgid "Add this newsletter issue to a newsletter by selecting a newsletter from the select list. Send a newsletter or a test newsletter by selecting the appropriate radio button and submitting the node."
 msgstr ""
 
-#: simplenews.module:1862
-msgid "We have received a request for subscription of your e-mail address, @mail, to the @newsletter from @site (!url). However, you are already subscribed to this newsletter. If you want to unsubscribe, you can visit our website by using the link at the bottom of this e-mail."
+#: simplenews.module:2391
+msgid "Set default send options at <a href=\"@configuration\">Administer > Site configuration > Simplenews > Newsletter</a>."
 msgstr ""
 
-#: simplenews.module:1865
-msgid "We have received a request for subscription of your e-mail address, @mail, to the @newsletter from @site (!url). To confirm that you want to be added to this mailing list, simply visit the confirmation link at the bottom of this e-mail."
+#: simplenews.module:2394
+msgid "Set newsletter specific options at <a href=\"@configuration\">Administer > Content management > Newsletters > Newsletters</a>."
 msgstr ""
 
-#: simplenews.module:1866;1878
-msgid "If you do not wish to be subscribed to this list, please disregard this message."
+#: simplenews.module:2400
+msgid "These settings are default to all newsletters. Newsletter specific settings can be found at the <a href=\"@page\">newsletter's settings page</a>."
 msgstr ""
 
-#: simplenews.module:1867
-msgid "Subscribe link: !url"
+#: simplenews.module:2402
+msgid "Install <a href=\"@mime_mail_url\">Mime Mail</a> to send HTML emails or emails with attachments (both plain text and HTML)."
 msgstr ""
 
-#: simplenews.module:1872
-msgid "We have received a request for the removal of your e-mail address, @mail, from the @newsletter from @site (!url). If you want to unsubscribe, simply visit the confirmation link at the bottom of this e-mail."
+#: simplenews.module:2407
+msgid "You can create different newsletters (or subjects) to categorize your news (e.g. Cats news, Dogs news, ...)."
 msgstr ""
 
-#: simplenews.module:1873
-msgid "If you did not make this request, please disregard this message."
+#: simplenews.module:2410
+msgid "'Plain' display settings apply to the content of emails sent in plain text format. 'HTML' display settings apply to both HTML and plain text alternative content of emails sent in HTML format."
 msgstr ""
 
-#: simplenews.module:1874
-msgid "Unsubscribe link: !url"
+#: simplenews.module:2467
+msgid "plain"
 msgstr ""
 
-#: simplenews.module:1877
-msgid "We have received a request for the removal of your e-mail address, @mail, from the @newsletter from @site (!url). However, you were not subscribed to this newsletter. If you want to subscribe, you can visit our website by using the link at the bottom of this e-mail."
+#: simplenews.module:2469
+msgid "html"
 msgstr ""
 
-#: simplenews.module:1884
-msgid "Visit our site: !url"
+#: simplenews.module:2491
+msgid "We have received a request from the email [simplenews-receiver-mail] for subscription to the [simplenews-newsletters-name] newsletter on [site-name] website at [site-url]. To confirm this subscription please use the link below.\n\n[simplenews-subscribe-url]"
 msgstr ""
 
-#: simplenews.module:834
-msgid "Attempt to unsubscribe from non existing newsletter term ID %id"
+#: simplenews.module:2493
+msgid "We have received a request from the email [simplenews-receiver-mail] for subscription to the [simplenews-newsletters-name] newsletter on [site-name] website at [site-url]. However, this email is already subscribed to this newsletter. If you intended to unsubscribe please visit our site: [site-url]"
 msgstr ""
 
-#: simplenews.module:940
-msgid "User %email deleted from the mailing list."
+#: simplenews.module:2495
+msgid "We have received a request from the email [simplenews-receiver-mail] to unsubscribe you from the [simplenews-newsletters-name] on [site-name] website at [site-url]. To confirm this unsubscription please use the  below.\n\n[simplenews-unsubscribe-url]"
 msgstr ""
 
-#: simplenews.module:1160;1387;1413
-msgid "Outgoing email. Message type: %type<br />Subject: %subject<br />Recipient: %to"
+#: simplenews.module:2497
+msgid "We have received a from the email [simplenews-receiver-mail] request to unsubscribe you from the [simplenews-newsletters-name] on [site-name] website at [site-url]. However, this email is not subscribed to this newsletter. If you intended to subscribe please visit our site: [site-url]"
 msgstr ""
 
-#: simplenews.module:1420
-msgid "error"
+#: simplenews.module:2499
+msgid "Confirmation for [simplenews-newsletters-name] from [site-name]"
 msgstr ""
 
-#: simplenews.module:1420
-msgid "Error sending newsletter to %recipient."
+#: simplenews.module:2553
+msgid "Email: Plain"
 msgstr ""
 
-#: simplenews.module:62
-msgid "view links in block"
+#: simplenews.module:2557
+msgid "Email: HTML"
 msgstr ""
 
-#: simplenews.module:62
-msgid "create newsletter"
+#: simplenews.module:2626
+msgid "Manage my subscriptions"
 msgstr ""
 
-#: simplenews.module:62
-msgid "edit own newsletter"
+#: simplenews.module:2628;2630
+msgid "Previous issues"
 msgstr ""
 
-#: simplenews.module:62
-msgid "edit any newsletter"
+#: simplenews.module:2632
+msgid "@newsletter feed"
 msgstr ""
 
-#: simplenews.module:62
-msgid "delete own newsletter"
+#: simplenews.module:2678
+msgid "Unsubscribe from this newsletter"
 msgstr ""
 
-#: simplenews.module:62
-msgid "delete any newsletter"
+#: simplenews.module:2679
+msgid "This is a test version of the newsletter."
 msgstr ""
 
-#: simplenews.module:62
-msgid "administer newsletters"
+#: simplenews.module:1145
+msgid "Attempt to unsubscribe from non existing newsletter term ID %id"
 msgstr ""
 
-#: simplenews.module:62
-msgid "send newsletter"
+#: simplenews.module:1271
+msgid "User %email deleted from the mailing list."
 msgstr ""
 
-#: simplenews.module:62
-msgid "subscribe to newsletters"
+#: simplenews.module:1726
+msgid "Outgoing email. Message type: %type<br />Subject: %subject<br />Recipient: %to"
 msgstr ""
 
-#: simplenews.module:110
-msgid "Manage newsletters, subscriptions, and configuration options."
+#: simplenews.module:1784
+msgid "Outgoing email. Message type: %type<br />Subject: %subject<br />Recipient: %to %mimemail"
 msgstr ""
 
-#: simplenews.module:118
-msgid "Sent issues"
+#: simplenews.module:1787
+msgid "Outgoing email failed. Message type: %type<br />Subject: %subject<br />Recipient: %to %mimemail"
 msgstr ""
 
-#: simplenews.module:126
-msgid "Drafts"
+#: simplenews.module:1815
+msgid "Newsletter not send: newsletter issue does not exist (nid = @nid; vid = @vid)."
 msgstr ""
 
-#: simplenews.module:158
-msgid "List newsletters"
+#: simplenews.module:1863
+msgid "Sending interrupted: PHP maximum execution time almost exceeded. Remaining newsletters will be send during the next cron run. If this warning occurs regularly you should reduce the !cron_throttle_setting."
 msgstr ""
 
-#: simplenews.module:164
-msgid "Add newsletter"
+#: simplenews.module:1875
+msgid "%success emails sent in %sec seconds, %fail failed sending."
 msgstr ""
 
-#: simplenews.module:181;190
-msgid "Subscriptions"
+#: simplenews.module:1878
+msgid "%success emails sent, %fail failed."
 msgstr ""
 
-#: simplenews.module:198
-msgid "List subscriptions"
+#: simplenews.module:77
+msgid "administer newsletters"
 msgstr ""
 
-#: simplenews.module:203
-msgid "Import subscriptions"
+#: simplenews.module:77
+msgid "administer simplenews subscriptions"
 msgstr ""
 
-#: simplenews.module:212
-msgid "Export subscriptions"
+#: simplenews.module:77
+msgid "administer simplenews settings"
 msgstr ""
 
-#: simplenews.module:222
-msgid "Settings"
+#: simplenews.module:77
+msgid "send newsletter"
 msgstr ""
 
-#: simplenews.module:229
-msgid "General"
+#: simplenews.module:77
+msgid "subscribe to newsletters"
 msgstr ""
 
-#: simplenews.module:234
-msgid "Confirm newsletter subscriptions"
+#: simplenews.module:99
+msgid "Manage newsletters and subscriptions."
 msgstr ""
 
-#: simplenews.module:242
-msgid "Manage newsletter subscriptions"
+#: simplenews.module:107
+msgid "Newsletter issues"
 msgstr ""
 
-#: simplenews.install:6
-msgid "Subscribers to {simplenews_newsletters}."
+#: simplenews.module:108
+msgid "List of newsletter issues."
 msgstr ""
 
-#: simplenews.install:9
-msgid "Primary key: Unique subscription ID."
+#: simplenews.module:119
+msgid "List, add and edit newsletter series."
 msgstr ""
 
-#: simplenews.install:14
-msgid "Boolean indicating the status of the subscription."
+#: simplenews.module:143
+msgid "List newsletters"
 msgstr ""
 
-#: simplenews.install:21
-msgid "The subscription email address."
+#: simplenews.module:148
+msgid "Add newsletter"
 msgstr ""
 
-#: simplenews.install:28
-msgid "The {users}.uid that has the same email address."
+#: simplenews.module:166;176
+msgid "Subscriptions"
 msgstr ""
 
-#: simplenews.install:42
-msgid "Simplenews newsletter data."
+#: simplenews.module:167
+msgid "Newsletter subscription management."
 msgstr ""
 
-#: simplenews.install:45
-msgid "{node} that is used as newsletter."
+#: simplenews.module:184
+msgid "List"
 msgstr ""
 
-#: simplenews.install:51
-msgid "The {node}.vid that identifies the version used as newsletter."
+#: simplenews.module:189
+msgid "Mass subscribe"
 msgstr ""
 
-#: simplenews.install:57
-msgid "The {term_data}.tid (= newsletter series) this issue belongs to."
+#: simplenews.module:207
+msgid "Mass unsubscribe"
 msgstr ""
 
-#: simplenews.install:63
-msgid "Send status of the newsletter issue (0 = not send; 1 = pending; 2 = send). "
+#: simplenews.module:218
+msgid "Manage simplenews configuration."
 msgstr ""
 
-#: simplenews.install:70
-msgid "Format of the newsletter (plain or html)."
+#: simplenews.module:227
+msgid "General"
 msgstr ""
 
-#: simplenews.install:77
-msgid "E-mail priority according to RFC 2156 and RFC 5231 (0 = none; 1 = highest; 2 = high; 3 = normal; 4 = low; 5 = lowest)."
+#: simplenews.module:228
+msgid "Simplenews content type and vocabulary settings."
 msgstr ""
 
-#: simplenews.install:84
-msgid "Boolean indicating request for e-mail receipt confirmation according to RFC 2822."
+#: simplenews.module:238
+msgid "Newsletter default settings and sender data."
 msgstr ""
 
-#: simplenews.install:95
-msgid "Newsletter series subscription data."
+#: simplenews.module:247
+msgid "Subscription"
 msgstr ""
 
-#: simplenews.install:98
-msgid "The {simplenews_subscriptions}.snid who is subscribed."
+#: simplenews.module:248
+msgid "Subscription settings, opt-in/out confirmation email text."
 msgstr ""
 
-#: simplenews.install:104
-msgid "The newsletter series ({term_data}.tid) the subscriber is subscribed to."
+#: simplenews.module:257
+msgid "Send mail"
 msgstr ""
 
-#: simplenews.install:116;326
-msgid "The primary identifier for a mail cache record."
+#: simplenews.module:258
+msgid "Send mail, cron and debug options."
 msgstr ""
 
-#: simplenews.install:122
-msgid "The {node}.nid of this newsletter."
+#: simplenews.module:268
+msgid "Confirm newsletter subscriptions"
 msgstr ""
 
-#: simplenews.install:128;332
-msgid "The {term_data}.tid this newsletter issue belongs to."
+#: simplenews.module:276
+msgid "Manage newsletter subscriptions"
 msgstr ""
 
-#: simplenews.install:134;338
-msgid "The subject of this mail message."
+#: simplenews.install:216
+msgid "Simplenews installation instructions are available on the <a href=\"!simplenews_help\">Simplenews help page</a>."
 msgstr ""
 
-#: simplenews.install:141;345
-msgid "The formatted e-mail address of mail message receipient."
+#: simplenews.install:220
+msgid "The installation of Simplenews was not successful."
 msgstr ""
 
-#: simplenews.install:148;352
-msgid "The send status of the e-mail (0 = hold, 1 = pending, 2 = send)."
+#: simplenews.install:251 simplenews_action/simplenews_action.module:125
+msgid "Newsletter issue"
 msgstr ""
 
-#: simplenews.install:156;360
-msgid "The time status was set or changed."
+#: simplenews.install:253
+msgid "A newsletter issue to be sent to subscribed email addresses."
 msgstr ""
 
-#: simplenews.install:163;367
-msgid "The mail message array."
+#: simplenews.install:288
+msgid "@site_name newsletter"
 msgstr ""
 
-#: simplenews.install:180
-msgid "Simplenews module succesfully installed."
+#: simplenews.install:297
+msgid "Deleted term %name."
 msgstr ""
 
-#: simplenews.install:183
-msgid "The installation of the Simplenews module was unsuccessful."
+#: simplenews.install:690
+msgid "Simplenews custom tokens have been deprecated. An attempt was made to replace custom tokens in the confirmation messages. Check the messages at <a href=\"!url\">Simplenews subscription settings</a>. Manually replace Simplenews tokens in (unsent) newsletter issues."
 msgstr ""
 
-#: simplenews.install:217
-msgid "newsletter"
+#: simplenews.info:0
+msgid "Send newsletters to subscribed email addresses."
 msgstr ""
 
-#: simplenews.install:226
-msgid "Deleted term %name."
+#: simplenews.info:0 simplenews_action/simplenews_action.info:0 simplenews_test/simplenews_test.info:0
+msgid "Mail"
 msgstr ""
 
-#: simplenews.info:0
-msgid "Send newsletters to subscribed e-mail addresses."
+#: simplenews.js:0
+msgid "Save and send"
 msgstr ""
 
-#: simplenews.info:0 simplenews_action/simplenews_action.info:0
-msgid "Mail"
+#: simplenews.js:0
+msgid "Save and send test"
 msgstr ""
 
 #: simplenews_action/simplenews_action.module:17
 msgid "Send single simplenews newsletter"
 msgstr ""
 
-#: simplenews_action/simplenews_action.module:26
+#: simplenews_action/simplenews_action.module:27
 msgid "Send pending simplenews newsletters"
 msgstr ""
 
-#: simplenews_action/simplenews_action.module:35
+#: simplenews_action/simplenews_action.module:36
 msgid "Subscribe the user to a newsletter"
 msgstr ""
 
-#: simplenews_action/simplenews_action.module:43
+#: simplenews_action/simplenews_action.module:44
 msgid "Unsubscribe the user from a newsletter"
 msgstr ""
 
-#: simplenews_action/simplenews_action.module:128
+#: simplenews_action/simplenews_action.module:129
 msgid "The newsletter issue to send"
 msgstr ""
 
-#: simplenews_action/simplenews_action.module:131
+#: simplenews_action/simplenews_action.module:132
 msgid "Allow to resend newsletter"
 msgstr ""
 
-#: simplenews_action/simplenews_action.module:134
-msgid "When checked a newsletter will be send even when already send before. The newsletter send status is checked, not the status of individual e-mail addresses. Use this for repeated (e.g. monthly) newsletters."
+#: simplenews_action/simplenews_action.module:135
+msgid "When checked a newsletter will be send even when already sent before. The newsletter sent status is checked, not the status of individual email addresses. Use this for repeated (e.g. monthly) newsletters."
 msgstr ""
 
-#: simplenews_action/simplenews_action.module:147
+#: simplenews_action/simplenews_action.module:148
 msgid "Please select a newsletter issue."
 msgstr ""
 
-#: simplenews_action/simplenews_action.module:190
+#: simplenews_action/simplenews_action.module:191
 msgid "You have been subscribed to newsletter %newsletter."
 msgstr ""
 
-#: simplenews_action/simplenews_action.module:213
+#: simplenews_action/simplenews_action.module:214
 msgid "The newsletter series the user will be subscribed to."
 msgstr ""
 
+#: simplenews_action/simplenews_action.module:253
+msgid "Action"
+msgstr ""
+
 #: simplenews_action/simplenews_action.module:256
 msgid "You have been removed from the %newsletter subscription list."
 msgstr ""
@@ -1233,19 +1340,27 @@ msgstr ""
 msgid "The newsletter series the user will be unsubscribed from."
 msgstr ""
 
-#: simplenews_action/simplenews_action.module:85;170;191;257
+#: simplenews_action/simplenews_action.module:305
+msgid "After a user has been subscribed"
+msgstr ""
+
+#: simplenews_action/simplenews_action.module:308
+msgid "After a user has been unsubscribed"
+msgstr ""
+
+#: simplenews_action/simplenews_action.module:86;171;192;257
 msgid "action"
 msgstr ""
 
-#: simplenews_action/simplenews_action.module:85
+#: simplenews_action/simplenews_action.module:86
 msgid "Simplenews newsletter %title send."
 msgstr ""
 
-#: simplenews_action/simplenews_action.module:170
+#: simplenews_action/simplenews_action.module:171
 msgid "Simplenews cron executed."
 msgstr ""
 
-#: simplenews_action/simplenews_action.module:191
+#: simplenews_action/simplenews_action.module:192
 msgid "User %name subscribed to newsletter %newsletter."
 msgstr ""
 
@@ -1265,3 +1380,31 @@ msgstr ""
 msgid "Provide actions for Simplenews."
 msgstr ""
 
+#: simplenews_test/simplenews_test.module:23
+msgid "Header [@name]: @value"
+msgstr ""
+
+#: simplenews_test/simplenews_test.module:28
+msgid "To: @to"
+msgstr ""
+
+#: simplenews_test/simplenews_test.module:29
+msgid "Subject: @subject"
+msgstr ""
+
+#: simplenews_test/simplenews_test.module:30
+msgid "Body: @body"
+msgstr ""
+
+#: simplenews_test/simplenews_test.module:0
+msgid "simplenews_test"
+msgstr ""
+
+#: simplenews_test/simplenews_test.info:0
+msgid "Simplenews test"
+msgstr ""
+
+#: simplenews_test/simplenews_test.info:0
+msgid "Simplenews helper module for automated simplenews tests."
+msgstr ""
+