diff options
| -rw-r--r-- | locale/FixMyStreet.po | 100 | ||||
| -rw-r--r-- | locale/cy_GB.UTF-8/LC_MESSAGES/EmptyHomes.po | 131 | ||||
| -rw-r--r-- | locale/de_CH.UTF-8/LC_MESSAGES/FixMyStreet.po | 121 | ||||
| -rw-r--r-- | locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po | 132 | ||||
| -rw-r--r-- | locale/nn_NO.UTF-8/LC_MESSAGES/FixMyStreet.po | 132 | ||||
| -rw-r--r-- | templates/web/default/admin/body_edit.html | 19 | ||||
| -rw-r--r-- | templates/web/default/email_sent.html | 44 | ||||
| -rw-r--r-- | templates/web/zurich/admin/body.html | 2 | ||||
| -rw-r--r-- | web/cobrands/zurich/base.scss | 7 | ||||
| -rw-r--r-- | web/js/map-wmts-zurich.js | 6 |
10 files changed, 354 insertions, 340 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 — %s)" +#: templates/web/default/email_sent.html:28 +msgid "(Don't worry — 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 — 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 — 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 – 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 — <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 — 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" diff --git a/locale/cy_GB.UTF-8/LC_MESSAGES/EmptyHomes.po b/locale/cy_GB.UTF-8/LC_MESSAGES/EmptyHomes.po index 4855a78e4..5da3f6b77 100644 --- a/locale/cy_GB.UTF-8/LC_MESSAGES/EmptyHomes.po +++ b/locale/cy_GB.UTF-8/LC_MESSAGES/EmptyHomes.po @@ -10,7 +10,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: 2009-07-10 14:20-0000\n" "Last-Translator: Mark Smith <Mark.Smith@trosol.co.uk>\n" "Language-Team: mySociety\n" @@ -101,9 +101,28 @@ msgstr "Adroddwyd am %s gan %s am %s" msgid "%s, within %s ward" msgstr "Eiddo gwag yn ward %s" -#: templates/web/default/email_sent.html:31 -msgid "(Don't worry — %s)" +#: templates/web/default/email_sent.html:28 +#, fuzzy +msgid "" +"(Don't worry — we'll hang on to your alert while you're checking your " +"email.)" +msgstr "byddwn yn dal gafael ar eich hysbysiad wrth i chi wirio eich e-bost." + +#: templates/web/default/email_sent.html:24 +#, fuzzy +msgid "" +"(Don't worry — we'll hang on to your empty property report while " +"you're checking your email.)" msgstr "" +"byddwn yn dal gafael ar eich hysbysiad am eiddo gwag wrth i chi wirio eich e-" +"bost." + +#: templates/web/default/email_sent.html:26 +#, fuzzy +msgid "" +"(Don't worry — we'll hang on to your update while you're checking your " +"email.)" +msgstr "byddwn yn dal gafael ar eich diweddariad wrth i chi wirio eich e-bost." #: templates/web/default/admin/report_blocks.html:11 #: templates/web/default/admin/users.html:26 @@ -754,7 +773,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 #, fuzzy msgid "Configure Endpoint" msgstr "Cadarnhau" @@ -792,8 +811,8 @@ msgstr "Cadarnhau" #: 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/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 #, fuzzy @@ -906,8 +925,8 @@ 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_edit.html:37 +#: templates/web/default/admin/body_edit.html:85 msgid "Deleted" msgstr "" @@ -990,14 +1009,14 @@ msgstr "Cyflwyno'ch diweddariad" msgid "Editing user %d" msgstr "Cyflwyno'ch diweddariad" -#: 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/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 @@ -1323,7 +1342,7 @@ msgid "GeoRSS on Google Maps" msgstr "" #: templates/web/bromley/report/display.html:30 -#: templates/web/fixmystreet/report/display.html:32 +#: templates/web/fixmystreet/report/display.html:38 #, fuzzy msgid "Get updates" msgstr "Anfonwch ddiweddariadau ataf i drwy'r e-bost" @@ -1428,7 +1447,7 @@ msgstr "" msgid "Hide pins" msgstr "Cuddio pinnau" -#: templates/web/default/admin/body_edit.html:72 +#: templates/web/default/admin/body_edit.html:79 msgid "History" msgstr "" @@ -1481,6 +1500,21 @@ msgstr "" msgid "ID" msgstr "" +#: templates/web/default/email_sent.html:18 +#, fuzzy +msgid "If you do not, your alert will not be activated." +msgstr "ni fydd eich hysbysiad yn cael ei weithredu" + +#: templates/web/default/email_sent.html:14 +#, fuzzy +msgid "If you do not, your empty property will not be posted." +msgstr "ni fydd eich eiddo gwag yn cael ei bostio" + +#: templates/web/default/email_sent.html:16 +#, fuzzy +msgid "If you do not, your update will not be posted." +msgstr "ni fydd eich diweddariad yn cael ei bostio" + #: templates/web/default/report/new/councils_text_none.html:8 #: templates/web/default/report/new/councils_text_none.html:9 msgid "" @@ -1504,7 +1538,7 @@ msgstr "" "ddangos i'r cyngor y gweithgarwch yn ei ardal." #: templates/web/default/auth/token.html:23 -#: templates/web/default/email_sent.html:26 +#: 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 " @@ -1807,7 +1841,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 "" @@ -2003,7 +2037,7 @@ msgid "Not reported to council" msgstr "Ni roddwyd gwybod i'r cyngor am hyn" #: templates/web/default/admin/body.html:41 -#: templates/web/default/admin/body_edit.html:80 +#: templates/web/default/admin/body_edit.html:87 #: templates/web/zurich/admin/body.html:16 #, fuzzy msgid "Note" @@ -2017,7 +2051,7 @@ msgid "" msgstr "" #: templates/web/default/admin/body.html:92 -#: templates/web/default/admin/body_edit.html:37 +#: templates/web/default/admin/body_edit.html:44 #: templates/web/zurich/admin/body.html:47 #, fuzzy msgid "Note:" @@ -2593,7 +2627,7 @@ msgid "Posted by %s at %s" msgstr "Cofnodwyd gan %s am %s" #: templates/web/default/admin/body.html:97 -#: templates/web/default/admin/body_edit.html:35 +#: templates/web/default/admin/body_edit.html:40 #: templates/web/default/admin/report_edit.html:44 msgid "Private" msgstr "" @@ -2642,7 +2676,7 @@ msgstr "Eiddo gwag yn yr ardal hon" #: templates/web/bromley/report/display.html:31 #: templates/web/fixmystreet/around/tabbed_lists.html:4 -#: templates/web/fixmystreet/report/display.html:37 +#: templates/web/fixmystreet/report/display.html:43 #, fuzzy msgid "Empty properties nearby" msgstr "Mwy o eiddo gwag cyfagos" @@ -2778,7 +2812,7 @@ msgstr "Llenwyd yr holiadur gan yr unigolyn a roddodd wybod am yr eiddo gwag" #: 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/fixmystreet/report/display.html:57 msgid "RSS feed" msgstr "Porthiant RSS" @@ -2836,7 +2870,7 @@ msgstr "Porthiant RSS o eiddo gwag lleol diweddar" #: 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/fixmystreet/report/display.html:57 msgid "RSS feed of updates to this empty property" msgstr "Porthiant RSS o ddiweddariadau i'r eiddo gwag hwn" @@ -2844,7 +2878,7 @@ msgstr "Porthiant RSS o ddiweddariadau i'r eiddo gwag hwn" #: 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/fixmystreet/report/display.html:59 msgid "Receive email when updates are left on this empty property." msgstr "" "Derbyn neges e-bost pan fydd diweddariadau'n cael eu rhoi am yr eiddo gwag " @@ -2912,7 +2946,7 @@ msgid "Report a property" msgstr "Rhoi gwybod am eiddo" #: templates/web/bromley/report/display.html:28 -#: templates/web/fixmystreet/report/display.html:29 +#: templates/web/fixmystreet/report/display.html:35 #, fuzzy msgid "Report abuse" msgstr "Adroddiadau" @@ -3033,7 +3067,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 "" @@ -3094,7 +3128,7 @@ msgstr "Pwnc:" msgid "Service:" msgstr "" -#: templates/web/fixmystreet/report/display.html:35 +#: templates/web/fixmystreet/report/display.html:41 msgid "Share" msgstr "" @@ -3358,7 +3392,7 @@ msgstr "Anfon" #: 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/fixmystreet/report/display.html:64 msgid "Subscribe" msgstr "Tanysgrifio" @@ -3592,7 +3626,7 @@ msgid "" msgstr "" #: templates/web/default/auth/token.html:21 -#: templates/web/default/email_sent.html:23 +#: templates/web/default/email_sent.html:6 msgid "" "The confirmation email <strong>may</strong> take a few minutes to arrive " "— <em>please</em> be patient." @@ -4226,7 +4260,7 @@ msgstr "" "anfonwch neges e-bost at <a href='mailto:%s'>%s</a>:" #: templates/web/default/admin/body.html:43 -#: templates/web/default/admin/body_edit.html:75 +#: templates/web/default/admin/body_edit.html:82 #: templates/web/zurich/admin/body.html:17 msgid "When edited" msgstr "" @@ -4449,10 +4483,8 @@ msgid "" "accurate:" msgstr "Rydych wedi cadarnhau'ch hysbysiad yn llwyddiannus." -#: templates/web/default/email_sent.html:28 -msgid "" -"You must now click the link in the email we've just sent you — 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 @@ -4474,8 +4506,8 @@ msgstr "Adroddiadau" #: 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/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 @@ -4713,39 +4745,6 @@ msgstr "Adroddiadau hŷn o eiddo gwag" 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 "byddwn yn dal gafael ar eich hysbysiad wrth i chi wirio eich e-bost." - -#: templates/web/default/email_sent.html:3 -#: templates/web/default/email_sent.html:7 -msgid "" -"we'll hang on to your empty property report while you're checking your email." -msgstr "" -"byddwn yn dal gafael ar eich hysbysiad am eiddo gwag wrth i chi wirio eich e-" -"bost." - -#: 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 "byddwn yn dal gafael ar eich diweddariad wrth i chi wirio eich e-bost." - -#: templates/web/default/email_sent.html:14 -#: templates/web/default/email_sent.html:3 -msgid "your alert will not be activated" -msgstr "ni fydd eich hysbysiad yn cael ei weithredu" - -#: templates/web/default/email_sent.html:3 -#: templates/web/default/email_sent.html:6 -msgid "your empty property will not be posted" -msgstr "ni fydd eich eiddo gwag yn cael ei bostio" - -#: templates/web/default/email_sent.html:10 -#: templates/web/default/email_sent.html:3 -msgid "your update will not be posted" -msgstr "ni fydd eich diweddariad yn cael ei bostio" - #: templates/web/emptyhomes/front/stats.html:17 #, perl-format msgid "<big>%s</big> report recently" diff --git a/locale/de_CH.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/de_CH.UTF-8/LC_MESSAGES/FixMyStreet.po index 778468c09..8799c4828 100644 --- a/locale/de_CH.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/de_CH.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -6,7 +6,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: 2013-01-24 15:20+0100\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <team@fixmystreet.com>\n" @@ -93,8 +93,22 @@ msgstr "" msgid "%s, within %s ward" msgstr "" -#: templates/web/default/email_sent.html:31 -msgid "(Don't worry — %s)" +#: templates/web/default/email_sent.html:28 +msgid "" +"(Don't worry — 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 — 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 — we'll hang on to your update while you're checking your " +"email.)" msgstr "" #: templates/web/default/admin/report_blocks.html:11 @@ -636,7 +650,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 "" @@ -671,8 +685,8 @@ msgstr "Bestätigung" #: 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/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" @@ -776,8 +790,8 @@ 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_edit.html:37 +#: templates/web/default/admin/body_edit.html:85 msgid "Deleted" msgstr "Gelöscht" @@ -854,14 +868,14 @@ 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/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 @@ -1152,7 +1166,7 @@ msgid "GeoRSS on Google Maps" msgstr "" #: templates/web/bromley/report/display.html:30 -#: templates/web/fixmystreet/report/display.html:32 +#: templates/web/fixmystreet/report/display.html:38 msgid "Get updates" msgstr "" @@ -1249,7 +1263,7 @@ msgstr "Alte ausblenden" msgid "Hide pins" msgstr "Stecknadeln ausblenden" -#: templates/web/default/admin/body_edit.html:72 +#: templates/web/default/admin/body_edit.html:79 msgid "History" msgstr "History" @@ -1299,6 +1313,18 @@ msgstr "" msgid "ID" msgstr "ID" +#: 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 "" @@ -1314,7 +1340,7 @@ msgid "" msgstr "" #: templates/web/default/auth/token.html:23 -#: templates/web/default/email_sent.html:26 +#: 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 " @@ -1593,7 +1619,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 "Fast Fertig! Bitte checken Sie ihre Mailbox..." @@ -1768,7 +1794,7 @@ msgid "Not reported to council" msgstr "" #: templates/web/default/admin/body.html:41 -#: templates/web/default/admin/body_edit.html:80 +#: templates/web/default/admin/body_edit.html:87 #: templates/web/zurich/admin/body.html:16 msgid "Note" msgstr "" @@ -1781,7 +1807,7 @@ msgid "" msgstr "" #: templates/web/default/admin/body.html:92 -#: templates/web/default/admin/body_edit.html:37 +#: templates/web/default/admin/body_edit.html:44 #: templates/web/zurich/admin/body.html:47 msgid "Note:" msgstr "" @@ -2318,7 +2344,7 @@ 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/body_edit.html:40 #: templates/web/default/admin/report_edit.html:44 msgid "Private" msgstr "" @@ -2361,7 +2387,7 @@ msgstr "Meldungen in dieser Gegend" #: templates/web/bromley/report/display.html:31 #: templates/web/fixmystreet/around/tabbed_lists.html:4 -#: templates/web/fixmystreet/report/display.html:37 +#: templates/web/fixmystreet/report/display.html:43 msgid "Problems nearby" msgstr "Meldungen in der Nähe" @@ -2485,7 +2511,7 @@ msgstr "" #: 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/fixmystreet/report/display.html:57 msgid "RSS feed" msgstr "" @@ -2538,7 +2564,7 @@ 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/fixmystreet/report/display.html:57 msgid "RSS feed of updates to this problem" msgstr "" @@ -2546,7 +2572,7 @@ msgstr "" #: 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/fixmystreet/report/display.html:59 msgid "Receive email when updates are left on this problem." msgstr "Erhalten Sie Aktualisierungen dieser Meldung." @@ -2616,7 +2642,7 @@ msgid "Report a problem" msgstr "Eine Meldung erfassen" #: templates/web/bromley/report/display.html:28 -#: templates/web/fixmystreet/report/display.html:29 +#: templates/web/fixmystreet/report/display.html:35 msgid "Report abuse" msgstr "Missbrauch melden" @@ -2730,7 +2756,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 "Änderungen speichern" @@ -2784,7 +2810,7 @@ msgstr "Gesendet:" msgid "Service:" msgstr "" -#: templates/web/fixmystreet/report/display.html:35 +#: templates/web/fixmystreet/report/display.html:41 msgid "Share" msgstr "" @@ -3018,7 +3044,7 @@ msgstr "Erfasst" #: 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/fixmystreet/report/display.html:64 msgid "Subscribe" msgstr "" @@ -3196,7 +3222,7 @@ msgid "" msgstr "" #: templates/web/default/auth/token.html:21 -#: templates/web/default/email_sent.html:23 +#: templates/web/default/email_sent.html:6 msgid "" "The confirmation email <strong>may</strong> take a few minutes to arrive " "— <em>please</em> be patient." @@ -3752,7 +3778,7 @@ msgid "" msgstr "" #: templates/web/default/admin/body.html:43 -#: templates/web/default/admin/body_edit.html:75 +#: templates/web/default/admin/body_edit.html:82 #: templates/web/zurich/admin/body.html:17 msgid "When edited" msgstr "Wann editiert" @@ -3960,10 +3986,9 @@ msgid "" "accurate:" msgstr "" -#: templates/web/default/email_sent.html:28 -msgid "" -"You must now click the link in the email we've just sent you — if you " -"do not, %s." +#: templates/web/default/email_sent.html:12 +#, fuzzy +msgid "You must now click the link in the email we've just sent you." msgstr "" "Sie können Ihre Meldung bestätigen, indem Sie auf den Link im E-" "Mail klicken." @@ -3986,8 +4011,8 @@ msgstr "" #: 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/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 @@ -4216,36 +4241,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" diff --git a/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po index 26702ae2b..6f92189ec 100644 --- a/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: FixMyStreet\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: 2012-09-14 00:22+0100\n" "Last-Translator: Anders Einar Hilden <hildenae@gmail.com>\n" "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n" @@ -99,9 +99,26 @@ msgstr "%s, rapportert av %s %s" msgid "%s, within %s ward" msgstr "%s, innefor bydel %s" -#: templates/web/default/email_sent.html:31 -msgid "(Don't worry — %s)" -msgstr "(Ingen grunn til bekymring — %s)" +#: templates/web/default/email_sent.html:28 +#, fuzzy +msgid "" +"(Don't worry — we'll hang on to your alert while you're checking your " +"email.)" +msgstr "vi tar vare på ditt varsel mens du sjekker din e-post." + +#: templates/web/default/email_sent.html:24 +#, fuzzy +msgid "" +"(Don't worry — we'll hang on to your problem report while you're " +"checking your email.)" +msgstr "vi tar vare på rapporten din mens du sjekker e-post." + +#: templates/web/default/email_sent.html:26 +#, fuzzy +msgid "" +"(Don't worry — we'll hang on to your update while you're checking your " +"email.)" +msgstr "vi tar vare på din oppdatering mens du sjekker din e-post." #: templates/web/default/admin/report_blocks.html:11 #: templates/web/default/admin/users.html:26 @@ -685,7 +702,7 @@ msgstr "Merkevaresamarbeid:" msgid "Configuration updated - contacts will be generated automatically later" msgstr "Oppsett oppdatert - kontakter vil bli generert automatisk senere" -#: templates/web/default/admin/body_edit.html:40 +#: templates/web/default/admin/body_edit.html:47 #, fuzzy msgid "Configure Endpoint" msgstr "Sett opp Open311" @@ -721,8 +738,8 @@ msgstr "Bekreftelse" #: 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/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" @@ -827,8 +844,8 @@ msgstr "Oversikt" #: 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_edit.html:37 +#: templates/web/default/admin/body_edit.html:85 msgid "Deleted" msgstr "Slettet" @@ -906,14 +923,14 @@ msgstr "Redigerer oppdatering %d" msgid "Editing user %d" msgstr "Redigerer bruker %d" -#: templates/web/default/admin/body_edit.html:79 +#: templates/web/default/admin/body_edit.html:86 msgid "Editor" msgstr "Oppdatert av" #: 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/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 @@ -1220,7 +1237,7 @@ msgid "GeoRSS on Google Maps" msgstr "GeoRSS på Google Maps" #: templates/web/bromley/report/display.html:30 -#: templates/web/fixmystreet/report/display.html:32 +#: templates/web/fixmystreet/report/display.html:38 msgid "Get updates" msgstr "Få oppdateringer" @@ -1321,7 +1338,7 @@ msgstr "Skjul gamle" msgid "Hide pins" msgstr "Skjul nåler" -#: templates/web/default/admin/body_edit.html:72 +#: templates/web/default/admin/body_edit.html:79 msgid "History" msgstr "Historie" @@ -1372,6 +1389,21 @@ msgstr "" msgid "ID" msgstr "ID" +#: templates/web/default/email_sent.html:18 +#, fuzzy +msgid "If you do not, your alert will not be activated." +msgstr "ditt varsel vil ikke bli aktivert" + +#: templates/web/default/email_sent.html:14 +#, fuzzy +msgid "If you do not, your problem will not be posted." +msgstr "vil ditt problem ikke bli publisert" + +#: templates/web/default/email_sent.html:16 +#, fuzzy +msgid "If you do not, your update will not be posted." +msgstr "din oppdatering vil ikke bli publisert" + #: templates/web/default/report/new/councils_text_none.html:8 #: templates/web/default/report/new/councils_text_none.html:9 msgid "" @@ -1394,7 +1426,7 @@ msgstr "" "område." #: templates/web/default/auth/token.html:23 -#: templates/web/default/email_sent.html:26 +#: 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 " @@ -1693,7 +1725,7 @@ msgstr "" "Bing Maps) er: %s\n" "\n" -#: templates/web/default/email_sent.html:20 +#: templates/web/default/email_sent.html:3 msgid "Nearly Done! Now check your email..." msgstr "Nesten ferdig! Nå må du sjekke e-posten din..." @@ -1872,7 +1904,7 @@ msgid "Not reported to council" msgstr "Ikke rapportert til administrasjonen" #: templates/web/default/admin/body.html:41 -#: templates/web/default/admin/body_edit.html:80 +#: templates/web/default/admin/body_edit.html:87 #: templates/web/zurich/admin/body.html:16 msgid "Note" msgstr "Merk" @@ -1888,7 +1920,7 @@ msgstr "" "bekreftet, så tallene kan hoppe litt opp og ned." #: templates/web/default/admin/body.html:92 -#: templates/web/default/admin/body_edit.html:37 +#: templates/web/default/admin/body_edit.html:44 #: templates/web/zurich/admin/body.html:47 msgid "Note:" msgstr "Merk:" @@ -2462,7 +2494,7 @@ msgid "Posted by %s at %s" msgstr "Sendt inn av %s %s" #: templates/web/default/admin/body.html:97 -#: templates/web/default/admin/body_edit.html:35 +#: templates/web/default/admin/body_edit.html:40 #: templates/web/default/admin/report_edit.html:44 msgid "Private" msgstr "" @@ -2505,7 +2537,7 @@ msgstr "Problemer i dette området" #: templates/web/bromley/report/display.html:31 #: templates/web/fixmystreet/around/tabbed_lists.html:4 -#: templates/web/fixmystreet/report/display.html:37 +#: templates/web/fixmystreet/report/display.html:43 msgid "Problems nearby" msgstr "Problemer i nærheten" @@ -2636,7 +2668,7 @@ msgstr "Spørreskjema fylt inn av feilrapportøren" #: 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/fixmystreet/report/display.html:57 msgid "RSS feed" msgstr "RSS-strøm" @@ -2689,7 +2721,7 @@ msgstr "RSS-strøm med nylige lokale problemer" #: 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/fixmystreet/report/display.html:57 msgid "RSS feed of updates to this problem" msgstr "RSS-strøm med oppdateringer for dette problemet" @@ -2697,7 +2729,7 @@ msgstr "RSS-strøm med oppdateringer for dette problemet" #: 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/fixmystreet/report/display.html:59 msgid "Receive email when updates are left on this problem." msgstr "Motta e-post når det er oppdateringer på dette problemet" @@ -2766,7 +2798,7 @@ msgid "Report a problem" msgstr "Rapporter et problem" #: templates/web/bromley/report/display.html:28 -#: templates/web/fixmystreet/report/display.html:29 +#: templates/web/fixmystreet/report/display.html:35 msgid "Report abuse" msgstr "Rapporter misbruk" @@ -2884,7 +2916,7 @@ msgstr "" msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "Veioperatør for denne navngitte veien (fra OpenStreetMap): %s" -#: templates/web/default/admin/body_edit.html:69 +#: templates/web/default/admin/body_edit.html:76 msgid "Save changes" msgstr "Lagre endringer" @@ -2940,7 +2972,7 @@ msgstr "Sendt:" msgid "Service:" msgstr "Tjeneste:" -#: templates/web/fixmystreet/report/display.html:35 +#: templates/web/fixmystreet/report/display.html:41 msgid "Share" msgstr "" @@ -3180,7 +3212,7 @@ msgstr "Send inn" #: 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/fixmystreet/report/display.html:64 msgid "Subscribe" msgstr "Abonner" @@ -3382,7 +3414,7 @@ msgstr "" "hvordan atributten er definert i Open311 v2-spesifikasjonen." #: templates/web/default/auth/token.html:21 -#: templates/web/default/email_sent.html:23 +#: templates/web/default/email_sent.html:6 msgid "" "The confirmation email <strong>may</strong> take a few minutes to arrive " "— <em>please</em> be patient." @@ -4001,7 +4033,7 @@ msgstr "" "fyll ut skjemaet, eller send en e-post <a href='mailto:%s'>%s</a>:" #: templates/web/default/admin/body.html:43 -#: templates/web/default/admin/body_edit.html:75 +#: templates/web/default/admin/body_edit.html:82 #: templates/web/zurich/admin/body.html:17 msgid "When edited" msgstr "Når redigert" @@ -4239,10 +4271,9 @@ msgstr "" "Du har lykkes med å logge inn. Vennligst sjekk og bekreft at dine detaljer " "er korrekte:" -#: templates/web/default/email_sent.html:28 -msgid "" -"You must now click the link in the email we've just sent you — if you " -"do not, %s." +#: templates/web/default/email_sent.html:12 +#, fuzzy +msgid "You must now click the link in the email we've just sent you." msgstr "" "Du må nå åpne lenken i e-posten vi akkurat sendte deg — dersom du ikke " "gjør det, %s" @@ -4265,8 +4296,8 @@ msgstr "Dine rapporter" #: 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/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 @@ -4494,36 +4525,6 @@ msgstr "bruker er eier av problemet" msgid "ward" msgstr "bydel" -#: 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 "vi tar vare på ditt varsel mens du sjekker din e-post." - -#: 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 "vi tar vare på rapporten din mens du sjekker e-post." - -#: 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 "vi tar vare på din oppdatering mens du sjekker din e-post." - -#: templates/web/default/email_sent.html:14 -#: templates/web/default/email_sent.html:3 -msgid "your alert will not be activated" -msgstr "ditt varsel vil ikke bli aktivert" - -#: templates/web/default/email_sent.html:3 -#: templates/web/default/email_sent.html:6 -msgid "your problem will not be posted" -msgstr "vil ditt problem ikke bli publisert" - -#: templates/web/default/email_sent.html:10 -#: templates/web/default/email_sent.html:3 -msgid "your update will not be posted" -msgstr "din oppdatering vil ikke bli publisert" - #: templates/web/emptyhomes/front/stats.html:17 #, perl-format msgid "<big>%s</big> report recently" @@ -4605,6 +4606,9 @@ msgid_plural "%d days" msgstr[0] "%d dag" msgstr[1] "%d dager" +#~ msgid "(Don't worry — %s)" +#~ msgstr "(Ingen grunn til bekymring — %s)" + #, fuzzy #~ msgid "" #~ "All the information you provide here will be sent to <strong>Stadt " diff --git a/locale/nn_NO.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/nn_NO.UTF-8/LC_MESSAGES/FixMyStreet.po index 22c494c60..a3e584024 100644 --- a/locale/nn_NO.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/nn_NO.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -11,7 +11,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: 2011-12-08 10:56+0100\n" "Last-Translator: Anders Einar Hilden <hildenae@gmail.com>\n" "Language-Team: Norwegian Nynorsk <i18n-nn@lister.ping.uio.no>\n" @@ -98,9 +98,26 @@ msgstr "%s, rapportert av %s %s" msgid "%s, within %s ward" msgstr "%s, innanfor bydelen %s" -#: templates/web/default/email_sent.html:31 -msgid "(Don't worry — %s)" -msgstr "(Ingen grunn til å uroa seg — %s)" +#: templates/web/default/email_sent.html:28 +#, fuzzy +msgid "" +"(Don't worry — we'll hang on to your alert while you're checking your " +"email.)" +msgstr "vi tek vare på varselet ditt medan du sjekkar e-posten din." + +#: templates/web/default/email_sent.html:24 +#, fuzzy +msgid "" +"(Don't worry — we'll hang on to your problem report while you're " +"checking your email.)" +msgstr "vi tek vare på rapporten din medan du sjekkar e-posten din." + +#: templates/web/default/email_sent.html:26 +#, fuzzy +msgid "" +"(Don't worry — we'll hang on to your update while you're checking your " +"email.)" +msgstr "vi tek vare på oppdateringa di medan du sjekkar e-posten din." #: templates/web/default/admin/report_blocks.html:11 #: templates/web/default/admin/users.html:26 @@ -694,7 +711,7 @@ msgstr "Merkevaresamarbeid:" msgid "Configuration updated - contacts will be generated automatically later" msgstr "Oppsett oppdatert - kontaktar vil genererast automatisk seinare" -#: templates/web/default/admin/body_edit.html:40 +#: templates/web/default/admin/body_edit.html:47 #, fuzzy msgid "Configure Endpoint" msgstr "Sett opp Open311" @@ -730,8 +747,8 @@ msgstr "Stadfesting" #: 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/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" @@ -836,8 +853,8 @@ 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_edit.html:37 +#: templates/web/default/admin/body_edit.html:85 msgid "Deleted" msgstr "Sletta" @@ -916,14 +933,14 @@ msgstr "Redigerer oppdatering %d" msgid "Editing user %d" msgstr "Redigerer brukar %d" -#: templates/web/default/admin/body_edit.html:79 +#: templates/web/default/admin/body_edit.html:86 msgid "Editor" msgstr "Oppdatert av" #: 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/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 @@ -1234,7 +1251,7 @@ msgid "GeoRSS on Google Maps" msgstr "GeoRSS på Google Maps" #: templates/web/bromley/report/display.html:30 -#: templates/web/fixmystreet/report/display.html:32 +#: templates/web/fixmystreet/report/display.html:38 #, fuzzy msgid "Get updates" msgstr "Siste oppdatering:" @@ -1337,7 +1354,7 @@ msgstr "" msgid "Hide pins" msgstr "Skjul nåler" -#: templates/web/default/admin/body_edit.html:72 +#: templates/web/default/admin/body_edit.html:79 msgid "History" msgstr "Historie" @@ -1388,6 +1405,21 @@ msgstr "" msgid "ID" msgstr "ID" +#: templates/web/default/email_sent.html:18 +#, fuzzy +msgid "If you do not, your alert will not be activated." +msgstr "varselet ditt vil ikkje aktiverast" + +#: templates/web/default/email_sent.html:14 +#, fuzzy +msgid "If you do not, your problem will not be posted." +msgstr "vil problemet ditt ikkje publiserast" + +#: templates/web/default/email_sent.html:16 +#, fuzzy +msgid "If you do not, your update will not be posted." +msgstr "oppdateringa di vil ikkje publiserast" + #: templates/web/default/report/new/councils_text_none.html:8 #: templates/web/default/report/new/councils_text_none.html:9 msgid "" @@ -1410,7 +1442,7 @@ msgstr "" "området ditt." #: templates/web/default/auth/token.html:23 -#: templates/web/default/email_sent.html:26 +#: 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 " @@ -1712,7 +1744,7 @@ msgstr "" "Næraste veg til nålen plassert på karta (automatisk generert ved hjelp av " "Bing Maps): %s" -#: templates/web/default/email_sent.html:20 +#: templates/web/default/email_sent.html:3 msgid "Nearly Done! Now check your email..." msgstr "Nesten ferdig! No må du sjekka e-posten din …" @@ -1892,7 +1924,7 @@ msgid "Not reported to council" msgstr "Ikkje rapportert til administrasjonen" #: templates/web/default/admin/body.html:41 -#: templates/web/default/admin/body_edit.html:80 +#: templates/web/default/admin/body_edit.html:87 #: templates/web/zurich/admin/body.html:16 msgid "Note" msgstr "Merk" @@ -1908,7 +1940,7 @@ msgstr "" "så tala kan hoppa litt opp og ned." #: templates/web/default/admin/body.html:92 -#: templates/web/default/admin/body_edit.html:37 +#: templates/web/default/admin/body_edit.html:44 #: templates/web/zurich/admin/body.html:47 msgid "Note:" msgstr "Merk:" @@ -2490,7 +2522,7 @@ msgid "Posted by %s at %s" msgstr "Sendt inn av %s %s" #: templates/web/default/admin/body.html:97 -#: templates/web/default/admin/body_edit.html:35 +#: templates/web/default/admin/body_edit.html:40 #: templates/web/default/admin/report_edit.html:44 msgid "Private" msgstr "" @@ -2533,7 +2565,7 @@ msgstr "Problem i dette området" #: templates/web/bromley/report/display.html:31 #: templates/web/fixmystreet/around/tabbed_lists.html:4 -#: templates/web/fixmystreet/report/display.html:37 +#: templates/web/fixmystreet/report/display.html:43 #, fuzzy msgid "Problems nearby" msgstr "Fleire problem i nærleiken" @@ -2667,7 +2699,7 @@ msgstr "Spørjeskjema fylt inn av feilrapportøren" #: 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/fixmystreet/report/display.html:57 msgid "RSS feed" msgstr "RSS-straum" @@ -2720,7 +2752,7 @@ msgstr "RSS-straum med nye lokale problem" #: 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/fixmystreet/report/display.html:57 msgid "RSS feed of updates to this problem" msgstr "RSS-straum med oppdateringar for dette problemet" @@ -2728,7 +2760,7 @@ msgstr "RSS-straum med oppdateringar for dette problemet" #: 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/fixmystreet/report/display.html:59 msgid "Receive email when updates are left on this problem." msgstr "Motta e-post når det er oppdateringar på dette problemet" @@ -2798,7 +2830,7 @@ msgid "Report a problem" msgstr "Rapporter eit problem" #: templates/web/bromley/report/display.html:28 -#: templates/web/fixmystreet/report/display.html:29 +#: templates/web/fixmystreet/report/display.html:35 #, fuzzy msgid "Report abuse" msgstr "Rapporter eit problem" @@ -2918,7 +2950,7 @@ msgstr "" msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "Vegoperatør for denne namngjevne vegen (frå OpenStreetMap): %s" -#: templates/web/default/admin/body_edit.html:69 +#: templates/web/default/admin/body_edit.html:76 msgid "Save changes" msgstr "Lagra endringar" @@ -2974,7 +3006,7 @@ msgstr "Sendt:" msgid "Service:" msgstr "Teneste:" -#: templates/web/fixmystreet/report/display.html:35 +#: templates/web/fixmystreet/report/display.html:41 msgid "Share" msgstr "" @@ -3217,7 +3249,7 @@ msgstr "Send inn" #: 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/fixmystreet/report/display.html:64 msgid "Subscribe" msgstr "Abonner" @@ -3424,7 +3456,7 @@ msgstr "" "med korleis attributten er definert i Open311 v2-spesifikasjonen." #: templates/web/default/auth/token.html:21 -#: templates/web/default/email_sent.html:23 +#: templates/web/default/email_sent.html:6 msgid "" "The confirmation email <strong>may</strong> take a few minutes to arrive " "— <em>please</em> be patient." @@ -4060,7 +4092,7 @@ msgstr "" "Berre fyll ut skjemaet, eller send ein e-post <a href='mailto:%s'>%s</a>:" #: templates/web/default/admin/body.html:43 -#: templates/web/default/admin/body_edit.html:75 +#: templates/web/default/admin/body_edit.html:82 #: templates/web/zurich/admin/body.html:17 msgid "When edited" msgstr "Når redigert" @@ -4298,10 +4330,9 @@ msgstr "" "Du har no logga inn. Ver venleg og sjekk og stadfest at detaljane dine er " "korrekte:" -#: templates/web/default/email_sent.html:28 -msgid "" -"You must now click the link in the email we've just sent you — if you " -"do not, %s." +#: templates/web/default/email_sent.html:12 +#, fuzzy +msgid "You must now click the link in the email we've just sent you." msgstr "" "Du må no opna lenkja i e-posten vi akkurat sende deg — dersom du ikkje " "gjer det, %s" @@ -4324,8 +4355,8 @@ msgstr "Rapportane dine" #: 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/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 @@ -4561,36 +4592,6 @@ msgstr "brukaren er eigaren av problemet" msgid "ward" msgstr "bydel" -#: 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 "vi tek vare på varselet ditt medan du sjekkar e-posten din." - -#: 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 "vi tek vare på rapporten din medan du sjekkar e-posten din." - -#: 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 "vi tek vare på oppdateringa di medan du sjekkar e-posten din." - -#: templates/web/default/email_sent.html:14 -#: templates/web/default/email_sent.html:3 -msgid "your alert will not be activated" -msgstr "varselet ditt vil ikkje aktiverast" - -#: templates/web/default/email_sent.html:3 -#: templates/web/default/email_sent.html:6 -msgid "your problem will not be posted" -msgstr "vil problemet ditt ikkje publiserast" - -#: templates/web/default/email_sent.html:10 -#: templates/web/default/email_sent.html:3 -msgid "your update will not be posted" -msgstr "oppdateringa di vil ikkje publiserast" - #: templates/web/emptyhomes/front/stats.html:17 #, perl-format msgid "<big>%s</big> report recently" @@ -4672,6 +4673,9 @@ msgid_plural "%d days" msgstr[0] "%d dag" msgstr[1] "%d dager" +#~ msgid "(Don't worry — %s)" +#~ msgstr "(Ingen grunn til å uroa seg — %s)" + #, fuzzy #~ msgid "" #~ "All the information you provide here will be sent to <strong>Stadt " diff --git a/templates/web/default/admin/body_edit.html b/templates/web/default/admin/body_edit.html index 1fde716c9..1eeff9ab5 100644 --- a/templates/web/default/admin/body_edit.html +++ b/templates/web/default/admin/body_edit.html @@ -27,12 +27,19 @@ <input type="text" name="email" value="[% contact.email | html %]" size="30"> <p> - <input type="checkbox" name="confirmed" value="1" id="confirmed"[% ' checked' IF contact.confirmed %]> - <label class="inline" for="confirmed">[% loc('Confirmed' ) %]</label> - <input type="checkbox" name="deleted" value="1" id="deleted"[% ' checked' IF contact.deleted %]> - <label class="inline" for="deleted">[% loc('Deleted') %]</label> - <input type="checkbox" name="non_public" value="1" id="non_public"[% ' checked' IF contact.non_public %]> - <label class="inline" for="non_public">[% loc('Private') %]</label> + [% IF c.cobrand.moniker != 'zurich' %] + <input type="checkbox" name="confirmed" value="1" id="confirmed"[% ' checked' IF contact.confirmed %]> + <label class="inline" for="confirmed">[% loc('Confirmed' ) %]</label> + [% ELSE %] + <input type="hidden" name="confirmed" value="1"> + [% END %] + <input type="checkbox" name="deleted" value="1" id="deleted"[% ' checked' IF contact.deleted %]> + <label class="inline" for="deleted">[% loc('Deleted') %]</label> + [% IF c.cobrand.moniker != 'zurich' %] + <input type="checkbox" name="non_public" value="1" id="non_public"[% ' checked' IF contact.non_public %]> + <label class="inline" for="non_public">[% loc('Private') %]</label> + [% END %] + </p> <p><strong>[% loc('Note:') %] </strong><textarea name="note" rows="3" cols="40">[% contact.note | html %]</textarea> diff --git a/templates/web/default/email_sent.html b/templates/web/default/email_sent.html index a18a73888..9afddf2bd 100644 --- a/templates/web/default/email_sent.html +++ b/templates/web/default/email_sent.html @@ -1,34 +1,34 @@ -[% INCLUDE 'header.html', title => loc('Create a report') %] - -[% - messages = { - problem => { - action => loc('your problem will not be posted'), - worry => loc("we'll hang on to your problem report while you're checking your email."), - }, - update => { - action => loc('your update will not be posted'), - worry => loc("we'll hang on to your update while you're checking your email."), - }, - alert => { - action => loc('your alert will not be activated'), - worry => loc("we'll hang on to your alert while you're checking your email."), - }, - } -%] +[% INCLUDE 'header.html', title = loc('Create a report') %] <h1>[% loc("Nearly Done! Now check your email...") %]</h1> [% IF c.cobrand.moniker != 'zurich' %] -<p>[% loc("The confirmation email <strong>may</strong> take a few minutes to arrive — <em>please</em> be patient.") %]</p> + <p>[% loc("The confirmation email <strong>may</strong> take a few minutes to arrive — <em>please</em> be patient.") %]</p> [% END %] <p>[% loc("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.") %]</p> -<p>[% tprintf( loc("You must now click the link in the email we've just sent you — if you do not, %s."), messages.$email_type.action ) %].</p> - [% IF c.cobrand.moniker != 'zurich' %] -<p>[% tprintf( loc("(Don't worry — %s)"), messages.$email_type.worry ) %]</p> + <p> + [% loc("You must now click the link in the email we've just sent you.") %] + [% IF email_type == 'problem' %] + [% loc("If you do not, your problem will not be posted.") %] + [% ELSIF email_type == 'update' %] + [% loc("If you do not, your update will not be posted.") %] + [% ELSIF email_type == 'alert' %] + [% loc("If you do not, your alert will not be activated.") %] + [% END %] + </p> + + <p> + [% IF email_type == 'problem' %] + [% loc("(Don't worry — we'll hang on to your problem report while you're checking your email.)") %] + [% ELSIF email_type == 'update' %] + [% loc("(Don't worry — we'll hang on to your update while you're checking your email.)") %] + [% ELSIF email_type == 'alert' %] + [% loc("(Don't worry — we'll hang on to your alert while you're checking your email.)") %] + [% END %] + </p> [% END %] [% INCLUDE 'footer.html' %] diff --git a/templates/web/zurich/admin/body.html b/templates/web/zurich/admin/body.html index dd1b0b844..764ad9bd8 100644 --- a/templates/web/zurich/admin/body.html +++ b/templates/web/zurich/admin/body.html @@ -7,7 +7,7 @@ </p> [% END %] -[% IF admin_type == 'super' AND body.parent AND body.bodies # A division %] +[% IF admin_type == 'super' AND body.parent AND NOT body.parent.parent # A division %] <table cellspacing="0" cellpadding="2" border="1"> <tr> <th>[% loc('Category') %]</th> diff --git a/web/cobrands/zurich/base.scss b/web/cobrands/zurich/base.scss index 3824c0ff6..8111f2726 100644 --- a/web/cobrands/zurich/base.scss +++ b/web/cobrands/zurich/base.scss @@ -5,10 +5,17 @@ @import "../fixmystreet/_base"; +/* Front page main box is in content now, so get rid of its margin from parent */ +#front-main { + margin: 0; +} + +/* Autocomplete dropdown on front page, don't want bullets */ .ui-menu-item { list-style-type: none; } +/* Simplify the problem header on a report page */ .problem-header h1 { font-size: 120%; font-weight: bold; diff --git a/web/js/map-wmts-zurich.js b/web/js/map-wmts-zurich.js index f7e1fbf05..f296a12d9 100644 --- a/web/js/map-wmts-zurich.js +++ b/web/js/map-wmts-zurich.js @@ -28,9 +28,11 @@ $(function(){ fixmystreet.controls = [ new OpenLayers.Control.Attribution(), new OpenLayers.Control.ArgParser(), - fixmystreet.nav_control, - new OpenLayers.Control.PanZoomFMS({id: 'fms_pan_zoom' }) + fixmystreet.nav_control ]; + if ( fixmystreet.page != 'report' || !$('html').hasClass('mobile') ) { + fixmystreet.controls.push( new OpenLayers.Control.PanZoomFMS({id: 'fms_pan_zoom' }) ); + } fixmystreet.map_type = OpenLayers.Layer.WMTS; |