Make email_sent template strings easier to translate.

1 files changed, 48 insertions, 52 deletions

diff --git a/locale/FixMyStreet.po b/locale/FixMyStreet.po
index 9ab0be2dc..b51f8c5db 100644
--- a/locale/FixMyStreet.po
+++ b/locale/FixMyStreet.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 1.0\n"
 "Report-Msgid-Bugs-To: matthew@mysociety.org\n"
-"POT-Creation-Date: 2013-01-24 15:23+0000\n"
+"POT-Creation-Date: 2013-01-24 18:27+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <team@fixmystreet.com>\n"
@@ -81,8 +81,16 @@ msgstr ""
 msgid "%s, within %s ward"
 msgstr ""
 
-#: templates/web/default/email_sent.html:31
-msgid "(Don't worry &mdash; %s)"
+#: templates/web/default/email_sent.html:28
+msgid "(Don't worry &mdash; we'll hang on to your alert while you're checking your email.)"
+msgstr ""
+
+#: templates/web/default/email_sent.html:24
+msgid "(Don't worry &mdash; we'll hang on to your problem report while you're checking your email.)"
+msgstr ""
+
+#: templates/web/default/email_sent.html:26
+msgid "(Don't worry &mdash; we'll hang on to your update while you're checking your email.)"
 msgstr ""
 
 #: templates/web/default/admin/report_blocks.html:11 templates/web/default/admin/users.html:26
@@ -465,7 +473,7 @@ msgstr ""
 msgid "Configuration updated - contacts will be generated automatically later"
 msgstr ""
 
-#: templates/web/default/admin/body_edit.html:40
+#: templates/web/default/admin/body_edit.html:47
 msgid "Configure Endpoint"
 msgstr ""
 
@@ -485,7 +493,7 @@ msgstr ""
 msgid "Confirmation"
 msgstr ""
 
-#: templates/web/default/admin/body.html:37 templates/web/default/admin/body.html:85 templates/web/default/admin/body_edit.html:31 templates/web/default/admin/body_edit.html:77 templates/web/zurich/admin/report_edit-sdm.html:24 templates/web/zurich/admin/report_edit.html:41
+#: templates/web/default/admin/body.html:37 templates/web/default/admin/body.html:85 templates/web/default/admin/body_edit.html:32 templates/web/default/admin/body_edit.html:84 templates/web/zurich/admin/report_edit-sdm.html:24 templates/web/zurich/admin/report_edit.html:41
 msgid "Confirmed"
 msgstr ""
 
@@ -561,7 +569,7 @@ msgstr ""
 msgid "Dashboard"
 msgstr ""
 
-#: templates/web/default/admin/body.html:38 templates/web/default/admin/body.html:88 templates/web/default/admin/body_edit.html:33 templates/web/default/admin/body_edit.html:78
+#: templates/web/default/admin/body.html:38 templates/web/default/admin/body.html:88 templates/web/default/admin/body_edit.html:37 templates/web/default/admin/body_edit.html:85
 msgid "Deleted"
 msgstr ""
 
@@ -617,11 +625,11 @@ msgstr ""
 msgid "Editing user %d"
 msgstr ""
 
-#: templates/web/default/admin/body_edit.html:79
+#: templates/web/default/admin/body_edit.html:86
 msgid "Editor"
 msgstr ""
 
-#: templates/web/bromley/report/display.html:126 templates/web/default/admin/bodies.html:9 templates/web/default/admin/body.html:36 templates/web/default/admin/body_edit.html:76 templates/web/default/admin/flagged.html:12 templates/web/default/admin/flagged.html:35 templates/web/default/admin/list_updates.html:8 templates/web/default/admin/reports.html:15 templates/web/default/admin/users.html:13 templates/web/fixmystreet/auth/general.html:20 templates/web/fixmystreet/report/update-form.html:74 templates/web/zurich/admin/body-form.html:9 templates/web/zurich/admin/body.html:14
+#: templates/web/bromley/report/display.html:126 templates/web/default/admin/bodies.html:9 templates/web/default/admin/body.html:36 templates/web/default/admin/body_edit.html:83 templates/web/default/admin/flagged.html:12 templates/web/default/admin/flagged.html:35 templates/web/default/admin/list_updates.html:8 templates/web/default/admin/reports.html:15 templates/web/default/admin/users.html:13 templates/web/fixmystreet/auth/general.html:20 templates/web/fixmystreet/report/update-form.html:74 templates/web/zurich/admin/body-form.html:9 templates/web/zurich/admin/body.html:14
 msgid "Email"
 msgstr ""
 
@@ -834,7 +842,7 @@ msgstr ""
 msgid "GeoRSS on Google Maps"
 msgstr ""
 
-#: templates/web/bromley/report/display.html:30 templates/web/fixmystreet/report/display.html:32
+#: templates/web/bromley/report/display.html:30 templates/web/fixmystreet/report/display.html:38
 msgid "Get updates"
 msgstr ""
 
@@ -898,7 +906,7 @@ msgstr ""
 msgid "Hide pins"
 msgstr ""
 
-#: templates/web/default/admin/body_edit.html:72
+#: templates/web/default/admin/body_edit.html:79
 msgid "History"
 msgstr ""
 
@@ -934,6 +942,18 @@ msgstr ""
 msgid "ID"
 msgstr ""
 
+#: templates/web/default/email_sent.html:18
+msgid "If you do not, your alert will not be activated."
+msgstr ""
+
+#: templates/web/default/email_sent.html:14
+msgid "If you do not, your problem will not be posted."
+msgstr ""
+
+#: templates/web/default/email_sent.html:16
+msgid "If you do not, your update will not be posted."
+msgstr ""
+
 #: templates/web/default/report/new/councils_text_none.html:8 templates/web/default/report/new/councils_text_none.html:9
 msgid "If you submit a problem here the subject and details of the problem will be public, but the problem will <strong>not</strong> be reported to the council."
 msgstr ""
@@ -942,7 +962,7 @@ msgstr ""
 msgid "If you submit a report here it will be left on the site, but not reported to the council &ndash; please still leave your report, so that we can show to the council the activity in their area."
 msgstr ""
 
-#: templates/web/default/auth/token.html:23 templates/web/default/email_sent.html:26
+#: templates/web/default/auth/token.html:23 templates/web/default/email_sent.html:9
 msgid "If you use web-based email or have 'junk mail' filters, you may wish to check your bulk/spam mail folders: sometimes, our messages are marked that way."
 msgstr ""
 
@@ -1107,7 +1127,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: templates/web/default/email_sent.html:20
+#: templates/web/default/email_sent.html:3
 msgid "Nearly Done! Now check your email..."
 msgstr ""
 
@@ -1255,7 +1275,7 @@ msgstr ""
 msgid "Not reported to council"
 msgstr ""
 
-#: templates/web/default/admin/body.html:41 templates/web/default/admin/body_edit.html:80 templates/web/zurich/admin/body.html:16
+#: templates/web/default/admin/body.html:41 templates/web/default/admin/body_edit.html:87 templates/web/zurich/admin/body.html:16
 msgid "Note"
 msgstr ""
 
@@ -1263,7 +1283,7 @@ msgstr ""
 msgid "Note that when including unconfirmed reports we use the date the report was created which may not be in the same month the report was confirmed so the numbers may jump about a little"
 msgstr ""
 
-#: templates/web/default/admin/body.html:92 templates/web/default/admin/body_edit.html:37 templates/web/zurich/admin/body.html:47
+#: templates/web/default/admin/body.html:92 templates/web/default/admin/body_edit.html:44 templates/web/zurich/admin/body.html:47
 msgid "Note:"
 msgstr ""
 
@@ -1627,7 +1647,7 @@ msgstr ""
 msgid "Posted by %s at %s"
 msgstr ""
 
-#: templates/web/default/admin/body.html:97 templates/web/default/admin/body_edit.html:35 templates/web/default/admin/report_edit.html:44
+#: templates/web/default/admin/body.html:97 templates/web/default/admin/body_edit.html:40 templates/web/default/admin/report_edit.html:44
 msgid "Private"
 msgstr ""
 
@@ -1667,7 +1687,7 @@ msgstr ""
 msgid "Problems in this area"
 msgstr ""
 
-#: templates/web/bromley/report/display.html:31 templates/web/fixmystreet/around/tabbed_lists.html:4 templates/web/fixmystreet/report/display.html:37
+#: templates/web/bromley/report/display.html:31 templates/web/fixmystreet/around/tabbed_lists.html:4 templates/web/fixmystreet/report/display.html:43
 msgid "Problems nearby"
 msgstr ""
 
@@ -1755,7 +1775,7 @@ msgstr ""
 msgid "Questionnaire filled in by problem reporter"
 msgstr ""
 
-#: templates/web/bromley/report/display.html:37 templates/web/default/alert/_list.html:21 templates/web/default/around/display_location.html:1 templates/web/default/around/display_location.html:3 templates/web/default/report/display.html:42 templates/web/default/reports/_rss.html:1 templates/web/fixmystreet/alert/_list.html:22 templates/web/fixmystreet/alert/updates.html:9 templates/web/fixmystreet/report/display.html:51
+#: templates/web/bromley/report/display.html:37 templates/web/default/alert/_list.html:21 templates/web/default/around/display_location.html:1 templates/web/default/around/display_location.html:3 templates/web/default/report/display.html:42 templates/web/default/reports/_rss.html:1 templates/web/fixmystreet/alert/_list.html:22 templates/web/fixmystreet/alert/updates.html:9 templates/web/fixmystreet/report/display.html:57
 msgid "RSS feed"
 msgstr ""
 
@@ -1795,11 +1815,11 @@ msgstr ""
 msgid "RSS feed of recent local problems"
 msgstr ""
 
-#: templates/web/bromley/report/display.html:37 templates/web/default/report/display.html:42 templates/web/fixmystreet/alert/updates.html:9 templates/web/fixmystreet/report/display.html:51
+#: templates/web/bromley/report/display.html:37 templates/web/default/report/display.html:42 templates/web/fixmystreet/alert/updates.html:9 templates/web/fixmystreet/report/display.html:57
 msgid "RSS feed of updates to this problem"
 msgstr ""
 
-#: templates/web/bromley/report/display.html:39 templates/web/default/alert/updates.html:9 templates/web/default/report/display.html:33 templates/web/fixmystreet/alert/updates.html:14 templates/web/fixmystreet/report/display.html:53
+#: templates/web/bromley/report/display.html:39 templates/web/default/alert/updates.html:9 templates/web/default/report/display.html:33 templates/web/fixmystreet/alert/updates.html:14 templates/web/fixmystreet/report/display.html:59
 msgid "Receive email when updates are left on this problem."
 msgstr ""
 
@@ -1843,7 +1863,7 @@ msgstr ""
 msgid "Report a problem"
 msgstr ""
 
-#: templates/web/bromley/report/display.html:28 templates/web/fixmystreet/report/display.html:29
+#: templates/web/bromley/report/display.html:28 templates/web/fixmystreet/report/display.html:35
 msgid "Report abuse"
 msgstr ""
 
@@ -1935,7 +1955,7 @@ msgstr ""
 msgid "Road operator for this named road (from OpenStreetMap): %s"
 msgstr ""
 
-#: templates/web/default/admin/body_edit.html:69
+#: templates/web/default/admin/body_edit.html:76
 msgid "Save changes"
 msgstr ""
 
@@ -1979,7 +1999,7 @@ msgstr ""
 msgid "Service:"
 msgstr ""
 
-#: templates/web/fixmystreet/report/display.html:35
+#: templates/web/fixmystreet/report/display.html:41
 msgid "Share"
 msgstr ""
 
@@ -2124,7 +2144,7 @@ msgstr ""
 msgid "Submitted"
 msgstr ""
 
-#: templates/web/bromley/report/display.html:44 templates/web/default/alert/updates.html:17 templates/web/default/report/display.html:38 templates/web/fixmystreet/alert/updates.html:23 templates/web/fixmystreet/report/display.html:58
+#: templates/web/bromley/report/display.html:44 templates/web/default/alert/updates.html:17 templates/web/default/report/display.html:38 templates/web/fixmystreet/alert/updates.html:23 templates/web/fixmystreet/report/display.html:64
 msgid "Subscribe"
 msgstr ""
 
@@ -2251,7 +2271,7 @@ msgstr ""
 msgid "The Open311 v2 attribute agency_responsible is used to list the administrations that received the problem report, which is not quite the way the attribute is defined in the Open311 v2 specification."
 msgstr ""
 
-#: templates/web/default/auth/token.html:21 templates/web/default/email_sent.html:23
+#: templates/web/default/auth/token.html:21 templates/web/default/email_sent.html:6
 msgid "The confirmation email <strong>may</strong> take a few minutes to arrive &mdash; <em>please</em> be patient."
 msgstr ""
 
@@ -2651,7 +2671,7 @@ msgstr ""
 msgid "We'd love to hear what you think about this site. Just fill in the form, or send an email to <a href='mailto:%s'>%s</a>:"
 msgstr ""
 
-#: templates/web/default/admin/body.html:43 templates/web/default/admin/body_edit.html:75 templates/web/zurich/admin/body.html:17
+#: templates/web/default/admin/body.html:43 templates/web/default/admin/body_edit.html:82 templates/web/zurich/admin/body.html:17
 msgid "When edited"
 msgstr ""
 
@@ -2771,8 +2791,8 @@ msgstr ""
 msgid "You have successfully signed in; please check and confirm your details are accurate:"
 msgstr ""
 
-#: templates/web/default/email_sent.html:28
-msgid "You must now click the link in the email we've just sent you &mdash; if you do not, %s."
+#: templates/web/default/email_sent.html:12
+msgid "You must now click the link in the email we've just sent you."
 msgstr ""
 
 #: templates/web/default/admin/report_edit.html:36
@@ -2783,7 +2803,7 @@ msgstr ""
 msgid "Your Reports"
 msgstr ""
 
-#: templates/web/bromley/report/display.html:41 templates/web/bromley/report/display.html:43 templates/web/bromley/report/new/fill_in_details_form.html:145 templates/web/fixmystreet/alert/_list.html:89 templates/web/fixmystreet/alert/updates.html:19 templates/web/fixmystreet/alert/updates.html:22 templates/web/fixmystreet/contact/index.html:72 templates/web/fixmystreet/report/display.html:55 templates/web/fixmystreet/report/display.html:57 templates/web/fixmystreet/report/new/fill_in_details_form.html:115 templates/web/fixmystreet/report/new/fill_in_details_form.html:157 templates/web/zurich/report/new/fill_in_details_form.html:88
+#: templates/web/bromley/report/display.html:41 templates/web/bromley/report/display.html:43 templates/web/bromley/report/new/fill_in_details_form.html:145 templates/web/fixmystreet/alert/_list.html:89 templates/web/fixmystreet/alert/updates.html:19 templates/web/fixmystreet/alert/updates.html:22 templates/web/fixmystreet/contact/index.html:72 templates/web/fixmystreet/report/display.html:61 templates/web/fixmystreet/report/display.html:63 templates/web/fixmystreet/report/new/fill_in_details_form.html:115 templates/web/fixmystreet/report/new/fill_in_details_form.html:157 templates/web/zurich/report/new/fill_in_details_form.html:88
 msgid "Your email"
 msgstr ""
 
@@ -2943,30 +2963,6 @@ msgstr ""
 msgid "ward"
 msgstr ""
 
-#: templates/web/default/email_sent.html:15 templates/web/default/email_sent.html:3
-msgid "we'll hang on to your alert while you're checking your email."
-msgstr ""
-
-#: templates/web/default/email_sent.html:3 templates/web/default/email_sent.html:7
-msgid "we'll hang on to your problem report while you're checking your email."
-msgstr ""
-
-#: templates/web/default/email_sent.html:11 templates/web/default/email_sent.html:3
-msgid "we'll hang on to your update while you're checking your email."
-msgstr ""
-
-#: templates/web/default/email_sent.html:14 templates/web/default/email_sent.html:3
-msgid "your alert will not be activated"
-msgstr ""
-
-#: templates/web/default/email_sent.html:3 templates/web/default/email_sent.html:6
-msgid "your problem will not be posted"
-msgstr ""
-
-#: templates/web/default/email_sent.html:10 templates/web/default/email_sent.html:3
-msgid "your update will not be posted"
-msgstr ""
-
 #: templates/web/emptyhomes/front/stats.html:17
 #, perl-format
 msgid "<big>%s</big> report recently"