diff options
| -rw-r--r-- | locale/FixMyStreet.po | 104 | ||||
| -rw-r--r-- | locale/cy_GB.UTF-8/LC_MESSAGES/EmptyHomes.po | 177 | ||||
| -rw-r--r-- | locale/de_CH.UTF-8/LC_MESSAGES/FixMyStreet.po | 181 | ||||
| -rw-r--r-- | locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po | 179 | ||||
| -rw-r--r-- | locale/nn_NO.UTF-8/LC_MESSAGES/FixMyStreet.po | 180 | ||||
| -rw-r--r-- | templates/web/default/auth/token.html | 11 |
6 files changed, 445 insertions, 387 deletions
diff --git a/locale/FixMyStreet.po b/locale/FixMyStreet.po index ad196c194..420314244 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-02-21 12:36+0000\n" +"POT-Creation-Date: 2013-03-11 18:53+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" @@ -345,19 +345,19 @@ msgstr "" msgid "Area covered" msgstr "" -#: templates/web/zurich/admin/report_edit.html:111 templates/web/zurich/admin/stats.html:36 +#: templates/web/zurich/admin/report_edit.html:117 templates/web/zurich/admin/stats.html:36 msgid "Assign to different category:" msgstr "" -#: templates/web/zurich/admin/report_edit.html:120 +#: templates/web/zurich/admin/report_edit.html:126 msgid "Assign to external body:" msgstr "" -#: templates/web/zurich/admin/report_edit.html:152 templates/web/zurich/admin/report_edit.html:99 +#: templates/web/zurich/admin/report_edit.html:103 templates/web/zurich/admin/report_edit.html:158 msgid "Assign to subdivision:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:97 templates/web/zurich/report/updates.html:11 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:98 templates/web/zurich/report/updates.html:11 msgid "Assigned to %s" msgstr "" @@ -385,7 +385,7 @@ msgstr "" msgid "Be sure to choose the right category, because we use that to determine to whom the report is sent." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1131 perllib/FixMyStreet/Cobrand/Zurich.pm:203 templates/web/default/admin/bodies.html:1 templates/web/zurich/header.html:64 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1131 perllib/FixMyStreet/Cobrand/Zurich.pm:204 templates/web/default/admin/bodies.html:1 templates/web/zurich/header.html:64 msgid "Bodies" msgstr "" @@ -417,7 +417,7 @@ msgstr "" msgid "Category fix rate for problems > 4 weeks old" msgstr "" -#: templates/web/default/admin/body.html:75 templates/web/default/admin/body_edit.html:23 templates/web/default/admin/report_edit.html:36 templates/web/default/report/new/fill_in_details_form.html:67 templates/web/emptyhomes/report/new/fill_in_details_form.html:50 templates/web/zurich/admin/body.html:36 templates/web/zurich/admin/report_edit-sdm.html:39 templates/web/zurich/admin/report_edit.html:110 +#: templates/web/default/admin/body.html:75 templates/web/default/admin/body_edit.html:23 templates/web/default/admin/report_edit.html:36 templates/web/default/report/new/fill_in_details_form.html:67 templates/web/emptyhomes/report/new/fill_in_details_form.html:50 templates/web/zurich/admin/body.html:36 templates/web/zurich/admin/report_edit-sdm.html:42 templates/web/zurich/admin/report_edit.html:116 msgid "Category:" msgstr "" @@ -433,7 +433,7 @@ msgstr "" msgid "Click map to report a problem" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:74 templates/web/default/admin/report_edit.html:29 templates/web/default/admin/report_edit.html:31 templates/web/default/dashboard/index.html:142 templates/web/default/dashboard/index.html:144 templates/web/fixmystreet/report/banner.html:15 templates/web/zurich/admin/header.html:1 templates/web/zurich/admin/header.html:10 templates/web/zurich/admin/header.html:12 templates/web/zurich/admin/report_edit.html:87 templates/web/zurich/admin/report_edit.html:89 templates/web/zurich/admin/stats.html:31 templates/web/zurich/report/banner.html:13 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:75 templates/web/default/admin/report_edit.html:29 templates/web/default/admin/report_edit.html:31 templates/web/default/dashboard/index.html:142 templates/web/default/dashboard/index.html:144 templates/web/fixmystreet/report/banner.html:15 templates/web/zurich/admin/header.html:1 templates/web/zurich/admin/header.html:10 templates/web/zurich/admin/header.html:12 templates/web/zurich/admin/report_edit.html:90 templates/web/zurich/admin/report_edit.html:92 templates/web/zurich/admin/stats.html:31 templates/web/zurich/report/banner.html:13 msgid "Closed" msgstr "" @@ -453,7 +453,7 @@ msgstr "" msgid "Closest nearby problems <small>(within %skm)</small>" msgstr "" -#: templates/web/default/admin/report_edit.html:17 templates/web/zurich/admin/report_edit-sdm.html:30 templates/web/zurich/admin/report_edit.html:43 +#: templates/web/default/admin/report_edit.html:17 templates/web/zurich/admin/report_edit-sdm.html:33 templates/web/zurich/admin/report_edit.html:46 msgid "Co-ordinates:" msgstr "" @@ -557,7 +557,7 @@ msgstr "" msgid "Created" msgstr "" -#: templates/web/default/admin/report_edit.html:44 templates/web/default/admin/update_edit.html:45 templates/web/zurich/admin/report_edit-sdm.html:44 templates/web/zurich/admin/report_edit.html:58 templates/web/zurich/admin/update_edit.html:29 +#: templates/web/default/admin/report_edit.html:44 templates/web/default/admin/update_edit.html:45 templates/web/zurich/admin/report_edit-sdm.html:47 templates/web/zurich/admin/report_edit.html:61 templates/web/zurich/admin/update_edit.html:29 msgid "Created:" msgstr "" @@ -585,7 +585,7 @@ msgstr "" msgid "Details" msgstr "" -#: templates/web/default/admin/report_edit.html:14 templates/web/default/report/new/fill_in_details_form.html:61 templates/web/emptyhomes/report/new/fill_in_details_form.html:79 templates/web/zurich/admin/report_edit-sdm.html:22 templates/web/zurich/admin/report_edit.html:22 templates/web/zurich/admin/report_edit.html:32 +#: templates/web/default/admin/report_edit.html:14 templates/web/default/report/new/fill_in_details_form.html:61 templates/web/emptyhomes/report/new/fill_in_details_form.html:79 templates/web/zurich/admin/report_edit-sdm.html:25 templates/web/zurich/admin/report_edit.html:25 templates/web/zurich/admin/report_edit.html:35 msgid "Details:" msgstr "" @@ -657,7 +657,7 @@ msgstr "" msgid "Email me updates" msgstr "" -#: templates/web/default/admin/body.html:80 templates/web/default/admin/body_edit.html:26 templates/web/default/admin/report_edit.html:42 templates/web/default/admin/update_edit.html:27 templates/web/default/admin/user-form.html:6 templates/web/default/alert/updates.html:13 templates/web/default/report/display.html:38 templates/web/zurich/admin/body.html:41 templates/web/zurich/admin/report_edit-sdm.html:41 templates/web/zurich/admin/report_edit.html:54 +#: templates/web/default/admin/body.html:80 templates/web/default/admin/body_edit.html:26 templates/web/default/admin/report_edit.html:42 templates/web/default/admin/update_edit.html:27 templates/web/default/admin/user-form.html:6 templates/web/default/alert/updates.html:13 templates/web/default/report/display.html:38 templates/web/zurich/admin/body.html:41 templates/web/zurich/admin/report_edit-sdm.html:44 templates/web/zurich/admin/report_edit.html:57 msgid "Email:" msgstr "" @@ -902,7 +902,7 @@ msgstr "" msgid "Hi %s" msgstr "" -#: templates/web/default/admin/report_edit.html:29 templates/web/default/admin/report_edit.html:32 templates/web/default/admin/update_edit.html:22 templates/web/zurich/admin/header.html:1 templates/web/zurich/admin/header.html:11 templates/web/zurich/admin/report_edit.html:78 templates/web/zurich/admin/report_edit.html:82 templates/web/zurich/admin/stats.html:32 templates/web/zurich/admin/update_edit.html:18 +#: templates/web/default/admin/report_edit.html:29 templates/web/default/admin/report_edit.html:32 templates/web/default/admin/update_edit.html:22 templates/web/zurich/admin/header.html:1 templates/web/zurich/admin/header.html:11 templates/web/zurich/admin/report_edit.html:81 templates/web/zurich/admin/report_edit.html:85 templates/web/zurich/admin/stats.html:32 templates/web/zurich/admin/update_edit.html:18 msgid "Hidden" msgstr "" @@ -970,7 +970,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:25 templates/web/default/email_sent.html:9 +#: templates/web/default/auth/token.html:22 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 "" @@ -997,7 +997,7 @@ msgstr "" msgid "In addition, the following attributes that are not part of the Open311 v2 specification are returned: agency_sent_datetime, title (also returned as part of description), interface_used, comment_count, requestor_name (only present if requestor allowed the name to be shown on this site)." msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:77 templates/web/default/admin/report_edit.html:29 templates/web/default/admin/report_edit.html:31 templates/web/fixmystreet/report/banner.html:19 templates/web/zurich/admin/header.html:1 templates/web/zurich/admin/header.html:8 templates/web/zurich/admin/report_edit.html:91 templates/web/zurich/report/banner.html:15 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:78 templates/web/default/admin/report_edit.html:29 templates/web/default/admin/report_edit.html:31 templates/web/fixmystreet/report/banner.html:19 templates/web/zurich/admin/header.html:1 templates/web/zurich/admin/header.html:8 templates/web/zurich/admin/report_edit.html:94 templates/web/zurich/report/banner.html:15 msgid "In progress" msgstr "" @@ -1005,7 +1005,7 @@ msgstr "" msgid "Incident Category" msgstr "" -#: templates/web/zurich/admin/report_edit.html:130 +#: templates/web/zurich/admin/report_edit.html:136 msgid "Include reporter personal details" msgstr "" @@ -1017,7 +1017,7 @@ msgstr "" msgid "Incorrect has_photo value \"%s\"" msgstr "" -#: templates/web/zurich/admin/report_edit-sdm.html:53 templates/web/zurich/admin/report_edit.html:73 +#: templates/web/zurich/admin/report_edit-sdm.html:56 templates/web/zurich/admin/report_edit.html:76 msgid "Internal notes:" msgstr "" @@ -1129,7 +1129,7 @@ msgstr "" msgid "Name (optional)" msgstr "" -#: templates/web/default/admin/report_edit.html:41 templates/web/default/admin/update_edit.html:26 templates/web/default/admin/user-form.html:5 templates/web/zurich/admin/report_edit-sdm.html:40 templates/web/zurich/admin/report_edit.html:53 templates/web/zurich/admin/stats.html:41 +#: templates/web/default/admin/report_edit.html:41 templates/web/default/admin/update_edit.html:26 templates/web/default/admin/user-form.html:5 templates/web/zurich/admin/report_edit-sdm.html:43 templates/web/zurich/admin/report_edit.html:56 templates/web/zurich/admin/stats.html:41 msgid "Name:" msgstr "" @@ -1235,7 +1235,7 @@ msgstr "" msgid "New state" msgstr "" -#: templates/web/zurich/admin/report_edit-sdm.html:56 +#: templates/web/zurich/admin/report_edit-sdm.html:59 msgid "New update:" msgstr "" @@ -1275,7 +1275,7 @@ msgstr "" msgid "No flagged users found" msgstr "" -#: templates/web/zurich/admin/report_edit-sdm.html:62 +#: templates/web/zurich/admin/report_edit-sdm.html:65 msgid "No further updates" msgstr "" @@ -1299,7 +1299,7 @@ msgstr "" msgid "Non Public" msgstr "" -#: templates/web/default/admin/report_edit.html:24 templates/web/zurich/admin/report_edit-sdm.html:43 templates/web/zurich/admin/report_edit.html:57 +#: templates/web/default/admin/report_edit.html:24 templates/web/zurich/admin/report_edit-sdm.html:46 templates/web/zurich/admin/report_edit.html:60 msgid "None" msgstr "" @@ -1307,7 +1307,7 @@ msgstr "" msgid "Not Responsible" msgstr "" -#: templates/web/zurich/admin/report_edit-sdm.html:18 +#: templates/web/zurich/admin/report_edit-sdm.html:21 msgid "Not for my subdivision" msgstr "" @@ -1387,7 +1387,7 @@ msgstr "" msgid "Older problems" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:71 templates/web/bromley/report/display.html:80 templates/web/default/admin/report_edit.html:29 templates/web/default/admin/update_edit.html:22 templates/web/default/dashboard/index.html:142 templates/web/default/report/update-form.html:30 templates/web/fixmystreet/report/update-form.html:28 templates/web/zurich/admin/header.html:1 templates/web/zurich/admin/header.html:7 templates/web/zurich/admin/report_edit.html:78 templates/web/zurich/admin/report_edit.html:80 templates/web/zurich/admin/update_edit.html:18 templates/web/zurich/report/banner.html:11 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:72 templates/web/bromley/report/display.html:80 templates/web/default/admin/report_edit.html:29 templates/web/default/admin/update_edit.html:22 templates/web/default/dashboard/index.html:142 templates/web/default/report/update-form.html:30 templates/web/fixmystreet/report/update-form.html:28 templates/web/zurich/admin/header.html:1 templates/web/zurich/admin/header.html:7 templates/web/zurich/admin/report_edit.html:81 templates/web/zurich/admin/report_edit.html:83 templates/web/zurich/admin/update_edit.html:18 templates/web/zurich/report/banner.html:11 msgid "Open" msgstr "" @@ -1451,7 +1451,7 @@ msgstr "" msgid "Phone number (optional)" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:279 templates/web/default/admin/report_edit.html:43 templates/web/default/report/new/fill_in_details_form.html:215 templates/web/emptyhomes/report/new/fill_in_details_form.html:138 templates/web/zurich/admin/report_edit-sdm.html:43 templates/web/zurich/admin/report_edit.html:57 templates/web/zurich/admin/stats.html:39 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:279 templates/web/default/admin/report_edit.html:43 templates/web/default/report/new/fill_in_details_form.html:215 templates/web/emptyhomes/report/new/fill_in_details_form.html:138 templates/web/zurich/admin/report_edit-sdm.html:46 templates/web/zurich/admin/report_edit.html:60 templates/web/zurich/admin/stats.html:39 msgid "Phone:" msgstr "" @@ -1471,7 +1471,7 @@ msgstr "" msgid "Place pin on map" msgstr "" -#: templates/web/default/admin/report_edit.html:29 templates/web/default/admin/report_edit.html:30 templates/web/default/dashboard/index.html:142 templates/web/default/dashboard/index.html:143 templates/web/zurich/admin/header.html:1 templates/web/zurich/admin/header.html:9 templates/web/zurich/admin/index-dm.html:9 templates/web/zurich/admin/report_edit.html:78 templates/web/zurich/admin/report_edit.html:81 +#: templates/web/default/admin/report_edit.html:29 templates/web/default/admin/report_edit.html:30 templates/web/default/dashboard/index.html:142 templates/web/default/dashboard/index.html:143 templates/web/zurich/admin/header.html:1 templates/web/zurich/admin/header.html:9 templates/web/zurich/admin/index-dm.html:9 templates/web/zurich/admin/report_edit.html:81 templates/web/zurich/admin/report_edit.html:84 msgid "Planned" msgstr "" @@ -1487,7 +1487,7 @@ msgstr "" msgid "Please check the passwords and try again" msgstr "" -#: templates/web/default/auth/token.html:17 +#: templates/web/default/auth/token.html:14 msgid "Please check your email" msgstr "" @@ -1823,15 +1823,15 @@ msgstr "" msgid "Public information (shown on site)" msgstr "" -#: templates/web/zurich/admin/report_edit.html:162 templates/web/zurich/admin/report_edit.html:170 +#: templates/web/zurich/admin/report_edit.html:168 templates/web/zurich/admin/report_edit.html:176 msgid "Public response:" msgstr "" -#: templates/web/zurich/admin/report_edit.html:69 templates/web/zurich/admin/stats.html:38 +#: templates/web/zurich/admin/report_edit.html:72 templates/web/zurich/admin/stats.html:38 msgid "Publish photo" msgstr "" -#: templates/web/zurich/admin/report_edit.html:178 +#: templates/web/zurich/admin/report_edit.html:184 msgid "Publish the response" msgstr "" @@ -2011,7 +2011,7 @@ msgstr "" msgid "Reporting a problem" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1132 perllib/FixMyStreet/Cobrand/Zurich.pm:196 templates/web/seesomething/admin/stats.html:1 templates/web/zurich/header.html:60 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1132 perllib/FixMyStreet/Cobrand/Zurich.pm:197 templates/web/seesomething/admin/stats.html:1 templates/web/zurich/header.html:60 msgid "Reports" msgstr "" @@ -2047,11 +2047,11 @@ msgstr "" msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1331 perllib/FixMyStreet/App/Controller/Admin.pm:1342 templates/web/default/admin/report_edit.html:60 templates/web/zurich/admin/report_edit.html:65 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1331 perllib/FixMyStreet/App/Controller/Admin.pm:1342 templates/web/default/admin/report_edit.html:60 templates/web/zurich/admin/report_edit.html:68 msgid "Rotate Left" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1331 templates/web/default/admin/report_edit.html:61 templates/web/zurich/admin/report_edit.html:66 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1331 templates/web/default/admin/report_edit.html:61 templates/web/zurich/admin/report_edit.html:69 msgid "Rotate Right" msgstr "" @@ -2200,11 +2200,11 @@ msgstr "" msgid "State" msgstr "" -#: templates/web/default/admin/report_edit.html:28 templates/web/default/admin/update_edit.html:21 templates/web/default/report/update-form.html:28 templates/web/zurich/admin/report_edit-sdm.html:51 templates/web/zurich/admin/report_edit.html:76 templates/web/zurich/admin/update_edit.html:17 +#: templates/web/default/admin/report_edit.html:28 templates/web/default/admin/update_edit.html:21 templates/web/default/report/update-form.html:28 templates/web/zurich/admin/report_edit-sdm.html:54 templates/web/zurich/admin/report_edit.html:79 templates/web/zurich/admin/update_edit.html:17 msgid "State:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1137 perllib/FixMyStreet/Cobrand/Zurich.pm:211 templates/web/default/admin/stats.html:1 templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:72 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1137 perllib/FixMyStreet/Cobrand/Zurich.pm:212 templates/web/default/admin/stats.html:1 templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:72 msgid "Stats" msgstr "" @@ -2228,7 +2228,7 @@ msgstr "" msgid "Subject" msgstr "" -#: templates/web/default/admin/report_edit.html:13 templates/web/default/contact/index.html:83 templates/web/default/report/new/fill_in_details_form.html:52 templates/web/emptyhomes/report/new/fill_in_details_form.html:70 templates/web/zurich/admin/report_edit.html:31 +#: templates/web/default/admin/report_edit.html:13 templates/web/default/contact/index.html:83 templates/web/default/report/new/fill_in_details_form.html:52 templates/web/emptyhomes/report/new/fill_in_details_form.html:70 templates/web/zurich/admin/report_edit.html:34 msgid "Subject:" msgstr "" @@ -2236,7 +2236,7 @@ msgstr "" msgid "Submit" msgstr "" -#: templates/web/default/admin/report_edit.html:67 templates/web/default/admin/update_edit.html:54 templates/web/default/admin/user-form.html:17 templates/web/zurich/admin/report_edit-sdm.html:61 templates/web/zurich/admin/report_edit.html:180 templates/web/zurich/admin/update_edit.html:38 +#: templates/web/default/admin/report_edit.html:67 templates/web/default/admin/update_edit.html:54 templates/web/default/admin/user-form.html:17 templates/web/zurich/admin/report_edit-sdm.html:64 templates/web/zurich/admin/report_edit.html:186 templates/web/zurich/admin/update_edit.html:38 msgid "Submit changes" msgstr "" @@ -2244,7 +2244,7 @@ msgstr "" msgid "Submit questionnaire" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:67 templates/web/zurich/admin/header.html:1 templates/web/zurich/admin/header.html:6 templates/web/zurich/admin/index-dm.html:23 templates/web/zurich/admin/index-dm.html:6 templates/web/zurich/admin/index-sdm.html:21 templates/web/zurich/admin/report_edit.html:78 templates/web/zurich/admin/report_edit.html:79 templates/web/zurich/admin/reports.html:13 templates/web/zurich/report/banner.html:9 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:68 templates/web/zurich/admin/header.html:1 templates/web/zurich/admin/header.html:6 templates/web/zurich/admin/index-dm.html:23 templates/web/zurich/admin/index-dm.html:6 templates/web/zurich/admin/index-sdm.html:21 templates/web/zurich/admin/report_edit.html:81 templates/web/zurich/admin/report_edit.html:82 templates/web/zurich/admin/reports.html:13 templates/web/zurich/report/banner.html:9 msgid "Submitted" msgstr "" @@ -2260,7 +2260,7 @@ msgstr "" msgid "Subscribe to an alert based upon what baranagay you’re in:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1130 perllib/FixMyStreet/Cobrand/Zurich.pm:195 templates/web/default/admin/index.html:1 templates/web/zurich/admin/index-dm.html:1 templates/web/zurich/admin/index-sdm.html:1 templates/web/zurich/admin/index.html:1 templates/web/zurich/footer.html:12 templates/web/zurich/header.html:57 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1130 perllib/FixMyStreet/Cobrand/Zurich.pm:196 templates/web/default/admin/index.html:1 templates/web/zurich/admin/index-dm.html:1 templates/web/zurich/admin/index-sdm.html:1 templates/web/zurich/admin/index.html:1 templates/web/zurich/footer.html:12 templates/web/zurich/header.html:57 msgid "Summary" msgstr "" @@ -2371,7 +2371,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:22 templates/web/default/email_sent.html:6 +#: templates/web/default/auth/token.html:19 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 "" @@ -2519,6 +2519,10 @@ msgstr "" msgid "This is a summary of all reports on this site; select a particular council to see the reports sent there." msgstr "" +#: templates/web/default/auth/token.html:9 +msgid "This may be because the link is too old or already used, or the address was not copied correctly." +msgstr "" + #: templates/web/default/report/banner.html:15 msgid "This problem has been closed" msgstr "" @@ -2539,7 +2543,7 @@ msgstr "" msgid "This problem is old and of unknown status." msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:65 templates/web/zurich/report/_main.html:14 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:65 perllib/FixMyStreet/Cobrand/Zurich.pm:66 templates/web/zurich/report/_main.html:14 msgid "This report is awaiting moderation." msgstr "" @@ -2599,7 +2603,7 @@ msgstr "" msgid "Unable to fix" msgstr "" -#: templates/web/default/admin/report_edit.html:29 templates/web/default/admin/report_edit.html:32 templates/web/default/admin/update_edit.html:22 templates/web/zurich/admin/report_edit-sdm.html:42 templates/web/zurich/admin/report_edit.html:55 templates/web/zurich/admin/update_edit.html:18 +#: templates/web/default/admin/report_edit.html:29 templates/web/default/admin/report_edit.html:32 templates/web/default/admin/update_edit.html:22 templates/web/zurich/admin/report_edit-sdm.html:45 templates/web/zurich/admin/report_edit.html:58 templates/web/zurich/admin/update_edit.html:18 msgid "Unconfirmed" msgstr "" @@ -2671,7 +2675,7 @@ msgstr "" msgid "Updated" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:762 perllib/FixMyStreet/App/Controller/Admin.pm:906 perllib/FixMyStreet/App/Controller/Admin.pm:959 perllib/FixMyStreet/App/Controller/Admin.pm:998 perllib/FixMyStreet/Cobrand/Zurich.pm:422 perllib/FixMyStreet/Cobrand/Zurich.pm:486 +#: perllib/FixMyStreet/App/Controller/Admin.pm:762 perllib/FixMyStreet/App/Controller/Admin.pm:906 perllib/FixMyStreet/App/Controller/Admin.pm:959 perllib/FixMyStreet/App/Controller/Admin.pm:998 perllib/FixMyStreet/Cobrand/Zurich.pm:423 perllib/FixMyStreet/Cobrand/Zurich.pm:487 msgid "Updated!" msgstr "" @@ -2699,7 +2703,7 @@ msgstr "" msgid "User flagged" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1135 perllib/FixMyStreet/Cobrand/Zurich.pm:210 templates/web/default/admin/flagged.html:30 templates/web/zurich/header.html:69 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1135 perllib/FixMyStreet/Cobrand/Zurich.pm:211 templates/web/default/admin/flagged.html:30 templates/web/zurich/header.html:69 msgid "Users" msgstr "" @@ -2707,7 +2711,7 @@ msgstr "" msgid "Values updated" msgstr "" -#: templates/web/default/admin/report_edit.html:12 templates/web/default/admin/update_edit.html:12 templates/web/zurich/admin/report_edit-sdm.html:21 templates/web/zurich/admin/report_edit.html:19 templates/web/zurich/admin/update_edit.html:10 +#: templates/web/default/admin/report_edit.html:12 templates/web/default/admin/update_edit.html:12 templates/web/zurich/admin/report_edit-sdm.html:24 templates/web/zurich/admin/report_edit.html:22 templates/web/zurich/admin/update_edit.html:10 msgid "View report on site" msgstr "" @@ -2735,7 +2739,11 @@ msgstr "" msgid "We found more than one match for that location. We show up to ten matches, please try a different search if yours is not here." msgstr "" -#: templates/web/default/auth/token.html:19 +#: templates/web/default/auth/token.html:8 +msgid "We have not been able to confirm your account - sorry." +msgstr "" + +#: templates/web/default/auth/token.html:16 msgid "We have sent you an email containing a link to confirm your account." msgstr "" @@ -2983,7 +2991,7 @@ msgstr "" msgid "council ref: %s" msgstr "" -#: templates/web/default/admin/report_edit.html:22 templates/web/zurich/admin/report_edit-sdm.html:37 templates/web/zurich/admin/report_edit.html:51 +#: templates/web/default/admin/report_edit.html:22 templates/web/zurich/admin/report_edit-sdm.html:40 templates/web/zurich/admin/report_edit.html:54 msgid "didn't use map" msgstr "" @@ -3035,7 +3043,7 @@ msgstr "" msgid "or locate me automatically" msgstr "" -#: templates/web/default/admin/report_edit.html:18 templates/web/default/admin/report_edit.html:20 templates/web/zurich/admin/report_edit-sdm.html:24 templates/web/zurich/admin/report_edit-sdm.html:26 templates/web/zurich/admin/report_edit-sdm.html:33 templates/web/zurich/admin/report_edit-sdm.html:35 templates/web/zurich/admin/report_edit.html:24 templates/web/zurich/admin/report_edit.html:26 templates/web/zurich/admin/report_edit.html:35 templates/web/zurich/admin/report_edit.html:37 templates/web/zurich/admin/report_edit.html:47 templates/web/zurich/admin/report_edit.html:49 +#: templates/web/default/admin/report_edit.html:18 templates/web/default/admin/report_edit.html:20 templates/web/zurich/admin/report_edit-sdm.html:27 templates/web/zurich/admin/report_edit-sdm.html:29 templates/web/zurich/admin/report_edit-sdm.html:36 templates/web/zurich/admin/report_edit-sdm.html:38 templates/web/zurich/admin/report_edit.html:27 templates/web/zurich/admin/report_edit.html:29 templates/web/zurich/admin/report_edit.html:38 templates/web/zurich/admin/report_edit.html:40 templates/web/zurich/admin/report_edit.html:50 templates/web/zurich/admin/report_edit.html:52 msgid "originally entered: “%s”" msgstr "" @@ -3071,7 +3079,7 @@ msgstr "" msgid "today" msgstr "" -#: templates/web/default/admin/report_edit.html:22 templates/web/zurich/admin/report_edit-sdm.html:37 templates/web/zurich/admin/report_edit.html:51 +#: templates/web/default/admin/report_edit.html:22 templates/web/zurich/admin/report_edit-sdm.html:40 templates/web/zurich/admin/report_edit.html:54 msgid "used map" msgstr "" diff --git a/locale/cy_GB.UTF-8/LC_MESSAGES/EmptyHomes.po b/locale/cy_GB.UTF-8/LC_MESSAGES/EmptyHomes.po index 5ce9871be..3b1f3b8d5 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-02-21 12:36+0000\n" +"POT-Creation-Date: 2013-03-11 18:53+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" @@ -582,21 +582,21 @@ msgstr "Ni roddwyd gwybod i'r cyngor am hyn" msgid "Area covered" msgstr "" -#: templates/web/zurich/admin/report_edit.html:111 +#: templates/web/zurich/admin/report_edit.html:117 #: templates/web/zurich/admin/stats.html:36 msgid "Assign to different category:" msgstr "" -#: templates/web/zurich/admin/report_edit.html:120 +#: templates/web/zurich/admin/report_edit.html:126 msgid "Assign to external body:" msgstr "" -#: templates/web/zurich/admin/report_edit.html:152 -#: templates/web/zurich/admin/report_edit.html:99 +#: templates/web/zurich/admin/report_edit.html:103 +#: templates/web/zurich/admin/report_edit.html:158 msgid "Assign to subdivision:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:97 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:98 #: templates/web/zurich/report/updates.html:11 msgid "Assigned to %s" msgstr "" @@ -633,7 +633,7 @@ msgid "" msgstr "" #: perllib/FixMyStreet/App/Controller/Admin.pm:1131 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:203 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:204 #: templates/web/default/admin/bodies.html:1 #: templates/web/zurich/header.html:64 msgid "Bodies" @@ -697,8 +697,8 @@ msgstr "" #: templates/web/default/report/new/fill_in_details_form.html:67 #: templates/web/emptyhomes/report/new/fill_in_details_form.html:50 #: templates/web/zurich/admin/body.html:36 -#: templates/web/zurich/admin/report_edit-sdm.html:39 -#: templates/web/zurich/admin/report_edit.html:110 +#: templates/web/zurich/admin/report_edit-sdm.html:42 +#: templates/web/zurich/admin/report_edit.html:116 msgid "Category:" msgstr "Categori:" @@ -719,7 +719,7 @@ msgstr "" msgid "Click map to report an empty property" msgstr "Sut i roi gwybod am eiddo gwag" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:74 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:75 #: templates/web/default/admin/report_edit.html:29 #: templates/web/default/admin/report_edit.html:31 #: templates/web/default/dashboard/index.html:142 @@ -728,8 +728,8 @@ msgstr "Sut i roi gwybod am eiddo gwag" #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:10 #: templates/web/zurich/admin/header.html:12 -#: templates/web/zurich/admin/report_edit.html:87 -#: templates/web/zurich/admin/report_edit.html:89 +#: templates/web/zurich/admin/report_edit.html:90 +#: templates/web/zurich/admin/report_edit.html:92 #: templates/web/zurich/admin/stats.html:31 #: templates/web/zurich/report/banner.html:13 msgid "Closed" @@ -755,8 +755,8 @@ msgid "Closest nearby empty properties <small>(within %skm)</small>" msgstr "Yr eiddo gwag cyfagos agosaf <small>(within %skm)</small>" #: templates/web/default/admin/report_edit.html:17 -#: templates/web/zurich/admin/report_edit-sdm.html:30 -#: templates/web/zurich/admin/report_edit.html:43 +#: templates/web/zurich/admin/report_edit-sdm.html:33 +#: templates/web/zurich/admin/report_edit.html:46 msgid "Co-ordinates:" msgstr "" @@ -916,8 +916,8 @@ msgstr "" #: templates/web/default/admin/report_edit.html:44 #: templates/web/default/admin/update_edit.html:45 -#: templates/web/zurich/admin/report_edit-sdm.html:44 -#: templates/web/zurich/admin/report_edit.html:58 +#: templates/web/zurich/admin/report_edit-sdm.html:47 +#: templates/web/zurich/admin/report_edit.html:61 #: templates/web/zurich/admin/update_edit.html:29 msgid "Created:" msgstr "" @@ -960,9 +960,9 @@ msgstr "Manylion:" #: templates/web/default/admin/report_edit.html:14 #: templates/web/default/report/new/fill_in_details_form.html:61 #: templates/web/emptyhomes/report/new/fill_in_details_form.html:79 -#: templates/web/zurich/admin/report_edit-sdm.html:22 -#: templates/web/zurich/admin/report_edit.html:22 -#: templates/web/zurich/admin/report_edit.html:32 +#: templates/web/zurich/admin/report_edit-sdm.html:25 +#: templates/web/zurich/admin/report_edit.html:25 +#: templates/web/zurich/admin/report_edit.html:35 msgid "Details:" msgstr "Manylion:" @@ -1081,8 +1081,8 @@ msgstr "Anfonwch ddiweddariadau ataf i drwy'r e-bost" #: templates/web/default/alert/updates.html:13 #: templates/web/default/report/display.html:38 #: templates/web/zurich/admin/body.html:41 -#: templates/web/zurich/admin/report_edit-sdm.html:41 -#: templates/web/zurich/admin/report_edit.html:54 +#: templates/web/zurich/admin/report_edit-sdm.html:44 +#: templates/web/zurich/admin/report_edit.html:57 msgid "Email:" msgstr "E-bost:" @@ -1468,8 +1468,8 @@ msgstr "" #: templates/web/default/admin/update_edit.html:22 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:11 -#: templates/web/zurich/admin/report_edit.html:78 -#: templates/web/zurich/admin/report_edit.html:82 +#: templates/web/zurich/admin/report_edit.html:81 +#: templates/web/zurich/admin/report_edit.html:85 #: templates/web/zurich/admin/stats.html:32 #: templates/web/zurich/admin/update_edit.html:18 #, fuzzy @@ -1573,7 +1573,7 @@ msgstr "" "fel y gallwn\n" "ddangos i'r cyngor y gweithgarwch yn ei ardal." -#: templates/web/default/auth/token.html:25 +#: templates/web/default/auth/token.html:22 #: templates/web/default/email_sent.html:9 msgid "" "If you use web-based email or have 'junk mail' filters, you may wish to " @@ -1622,13 +1622,13 @@ msgid "" "present if requestor allowed the name to be shown on this site)." msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:77 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:78 #: templates/web/default/admin/report_edit.html:29 #: templates/web/default/admin/report_edit.html:31 #: templates/web/fixmystreet/report/banner.html:19 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:8 -#: templates/web/zurich/admin/report_edit.html:91 +#: templates/web/zurich/admin/report_edit.html:94 #: templates/web/zurich/report/banner.html:15 msgid "In progress" msgstr "" @@ -1638,7 +1638,7 @@ msgstr "" msgid "Incident Category" msgstr "Categori:" -#: templates/web/zurich/admin/report_edit.html:130 +#: templates/web/zurich/admin/report_edit.html:136 #, fuzzy msgid "Include reporter personal details" msgstr "Cofnodwch fanylion" @@ -1652,8 +1652,8 @@ msgstr "Cynnwys hen adroddiadau" msgid "Incorrect has_photo value \"%s\"" msgstr "" -#: templates/web/zurich/admin/report_edit-sdm.html:53 -#: templates/web/zurich/admin/report_edit.html:73 +#: templates/web/zurich/admin/report_edit-sdm.html:56 +#: templates/web/zurich/admin/report_edit.html:76 msgid "Internal notes:" msgstr "" @@ -1869,8 +1869,8 @@ msgstr "(dewisol)" #: templates/web/default/admin/report_edit.html:41 #: templates/web/default/admin/update_edit.html:26 #: templates/web/default/admin/user-form.html:5 -#: templates/web/zurich/admin/report_edit-sdm.html:40 -#: templates/web/zurich/admin/report_edit.html:53 +#: templates/web/zurich/admin/report_edit-sdm.html:43 +#: templates/web/zurich/admin/report_edit.html:56 #: templates/web/zurich/admin/stats.html:41 msgid "Name:" msgstr "Enw:" @@ -2008,7 +2008,7 @@ msgstr "Adroddiadau newydd o fewn ffin {{NAME}} ar reportemptyhomes.com" msgid "New state" msgstr "" -#: templates/web/zurich/admin/report_edit-sdm.html:56 +#: templates/web/zurich/admin/report_edit-sdm.html:59 #, fuzzy msgid "New update:" msgstr "Anfonwch ddiweddariadau ataf i drwy'r e-bost" @@ -2068,7 +2068,7 @@ msgstr "Ni ddaethpwyd o hyd i unrhyw eiddo gwag." msgid "No flagged users found" msgstr "" -#: templates/web/zurich/admin/report_edit-sdm.html:62 +#: templates/web/zurich/admin/report_edit-sdm.html:65 #, fuzzy msgid "No further updates" msgstr "Adroddiadau" @@ -2096,8 +2096,8 @@ msgid "Non Public" msgstr "" #: templates/web/default/admin/report_edit.html:24 -#: templates/web/zurich/admin/report_edit-sdm.html:43 -#: templates/web/zurich/admin/report_edit.html:57 +#: templates/web/zurich/admin/report_edit-sdm.html:46 +#: templates/web/zurich/admin/report_edit.html:60 #, fuzzy msgid "None" msgstr "Nac ydw" @@ -2111,7 +2111,7 @@ msgstr "Nac ydw" msgid "Not Responsible" msgstr "" -#: templates/web/zurich/admin/report_edit-sdm.html:18 +#: templates/web/zurich/admin/report_edit-sdm.html:21 msgid "Not for my subdivision" msgstr "" @@ -2216,7 +2216,7 @@ msgstr "Wedi'u hadfer i'w defnyddio ers amser" msgid "Older empty property reports" msgstr "Adroddiadau hŷn o eiddo gwag" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:71 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:72 #: templates/web/bromley/report/display.html:80 #: templates/web/default/admin/report_edit.html:29 #: templates/web/default/admin/update_edit.html:22 @@ -2225,8 +2225,8 @@ msgstr "Adroddiadau hŷn o eiddo gwag" #: templates/web/fixmystreet/report/update-form.html:28 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:7 -#: templates/web/zurich/admin/report_edit.html:78 -#: templates/web/zurich/admin/report_edit.html:80 +#: templates/web/zurich/admin/report_edit.html:81 +#: templates/web/zurich/admin/report_edit.html:83 #: templates/web/zurich/admin/update_edit.html:18 #: templates/web/zurich/report/banner.html:11 msgid "Open" @@ -2331,8 +2331,8 @@ msgstr "(dewisol)" #: templates/web/default/admin/report_edit.html:43 #: templates/web/default/report/new/fill_in_details_form.html:215 #: templates/web/emptyhomes/report/new/fill_in_details_form.html:138 -#: templates/web/zurich/admin/report_edit-sdm.html:43 -#: templates/web/zurich/admin/report_edit.html:57 +#: templates/web/zurich/admin/report_edit-sdm.html:46 +#: templates/web/zurich/admin/report_edit.html:60 #: templates/web/zurich/admin/stats.html:39 msgid "Phone:" msgstr "Rhif ffôn:" @@ -2371,8 +2371,8 @@ msgstr "" #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:9 #: templates/web/zurich/admin/index-dm.html:9 -#: templates/web/zurich/admin/report_edit.html:78 #: templates/web/zurich/admin/report_edit.html:81 +#: templates/web/zurich/admin/report_edit.html:84 msgid "Planned" msgstr "" @@ -2394,7 +2394,7 @@ msgstr "" msgid "Please check the passwords and try again" msgstr "" -#: templates/web/default/auth/token.html:17 +#: templates/web/default/auth/token.html:14 #, fuzzy msgid "Please check your email" msgstr "Rhowch eich cyfeiriad e-bost" @@ -2917,17 +2917,17 @@ msgstr "" msgid "Public information (shown on site)" msgstr "" -#: templates/web/zurich/admin/report_edit.html:162 -#: templates/web/zurich/admin/report_edit.html:170 +#: templates/web/zurich/admin/report_edit.html:168 +#: templates/web/zurich/admin/report_edit.html:176 msgid "Public response:" msgstr "" -#: templates/web/zurich/admin/report_edit.html:69 +#: templates/web/zurich/admin/report_edit.html:72 #: templates/web/zurich/admin/stats.html:38 msgid "Publish photo" msgstr "" -#: templates/web/zurich/admin/report_edit.html:178 +#: templates/web/zurich/admin/report_edit.html:184 msgid "Publish the response" msgstr "" @@ -3204,7 +3204,7 @@ msgid "Reporting an empty property" msgstr "Adrodd am eiddo gwag" #: perllib/FixMyStreet/App/Controller/Admin.pm:1132 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:196 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:197 #: templates/web/seesomething/admin/stats.html:1 #: templates/web/zurich/header.html:60 msgid "Reports" @@ -3250,13 +3250,13 @@ msgstr "" #: perllib/FixMyStreet/App/Controller/Admin.pm:1331 #: perllib/FixMyStreet/App/Controller/Admin.pm:1342 #: templates/web/default/admin/report_edit.html:60 -#: templates/web/zurich/admin/report_edit.html:65 +#: templates/web/zurich/admin/report_edit.html:68 msgid "Rotate Left" msgstr "" #: perllib/FixMyStreet/App/Controller/Admin.pm:1331 #: templates/web/default/admin/report_edit.html:61 -#: templates/web/zurich/admin/report_edit.html:66 +#: templates/web/zurich/admin/report_edit.html:69 msgid "Rotate Right" msgstr "" @@ -3504,15 +3504,15 @@ msgstr "Diweddariad:" #: templates/web/default/admin/report_edit.html:28 #: templates/web/default/admin/update_edit.html:21 #: templates/web/default/report/update-form.html:28 -#: templates/web/zurich/admin/report_edit-sdm.html:51 -#: templates/web/zurich/admin/report_edit.html:76 +#: templates/web/zurich/admin/report_edit-sdm.html:54 +#: templates/web/zurich/admin/report_edit.html:79 #: templates/web/zurich/admin/update_edit.html:17 #, fuzzy msgid "State:" msgstr "Diweddariad:" #: perllib/FixMyStreet/App/Controller/Admin.pm:1137 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:211 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:212 #: templates/web/default/admin/stats.html:1 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:72 #, fuzzy @@ -3551,7 +3551,7 @@ msgstr "Pwnc:" #: templates/web/default/contact/index.html:83 #: templates/web/default/report/new/fill_in_details_form.html:52 #: templates/web/emptyhomes/report/new/fill_in_details_form.html:70 -#: templates/web/zurich/admin/report_edit.html:31 +#: templates/web/zurich/admin/report_edit.html:34 msgid "Subject:" msgstr "Pwnc:" @@ -3574,8 +3574,8 @@ msgstr "Anfon" #: templates/web/default/admin/report_edit.html:67 #: templates/web/default/admin/update_edit.html:54 #: templates/web/default/admin/user-form.html:17 -#: templates/web/zurich/admin/report_edit-sdm.html:61 -#: templates/web/zurich/admin/report_edit.html:180 +#: templates/web/zurich/admin/report_edit-sdm.html:64 +#: templates/web/zurich/admin/report_edit.html:186 #: templates/web/zurich/admin/update_edit.html:38 #, fuzzy msgid "Submit changes" @@ -3586,14 +3586,14 @@ msgstr "Anfon" msgid "Submit questionnaire" msgstr "Anfon yr holiadur" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:67 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:68 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:6 #: templates/web/zurich/admin/index-dm.html:23 #: templates/web/zurich/admin/index-dm.html:6 #: templates/web/zurich/admin/index-sdm.html:21 -#: templates/web/zurich/admin/report_edit.html:78 -#: templates/web/zurich/admin/report_edit.html:79 +#: templates/web/zurich/admin/report_edit.html:81 +#: templates/web/zurich/admin/report_edit.html:82 #: templates/web/zurich/admin/reports.html:13 #: templates/web/zurich/report/banner.html:9 #, fuzzy @@ -3622,7 +3622,7 @@ msgstr "" "byw ynddo:" #: perllib/FixMyStreet/App/Controller/Admin.pm:1130 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:195 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:196 #: templates/web/default/admin/index.html:1 #: templates/web/zurich/admin/index-dm.html:1 #: templates/web/zurich/admin/index-sdm.html:1 @@ -3831,7 +3831,7 @@ msgid "" "the way the attribute is defined in the Open311 v2 specification." msgstr "" -#: templates/web/default/auth/token.html:22 +#: templates/web/default/auth/token.html:19 #: templates/web/default/email_sent.html:6 msgid "" "The confirmation email <strong>may</strong> take a few minutes to arrive " @@ -4079,6 +4079,12 @@ msgstr "" "Dyma grynodeb o'r holl adroddiadau ar y safle hwn; dewiswch gyngor penodol i " "weld yr adroddiadau a anfonwyd ato." +#: templates/web/default/auth/token.html:9 +msgid "" +"This may be because the link is too old or already used, or the address was " +"not copied correctly." +msgstr "" + #: templates/web/default/report/banner.html:15 #, fuzzy msgid "This empty property has been closed" @@ -4109,6 +4115,7 @@ msgid "This empty property is old and of unknown status." msgstr "Mae'r eiddo gwag hwn yn hen ac nid yw ei statws yn hysbys." #: perllib/FixMyStreet/Cobrand/Zurich.pm:65 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:66 #: templates/web/zurich/report/_main.html:14 msgid "This report is awaiting moderation." msgstr "" @@ -4202,8 +4209,8 @@ msgstr "" #: templates/web/default/admin/report_edit.html:29 #: templates/web/default/admin/report_edit.html:32 #: templates/web/default/admin/update_edit.html:22 -#: templates/web/zurich/admin/report_edit-sdm.html:42 -#: templates/web/zurich/admin/report_edit.html:55 +#: templates/web/zurich/admin/report_edit-sdm.html:45 +#: templates/web/zurich/admin/report_edit.html:58 #: templates/web/zurich/admin/update_edit.html:18 msgid "Unconfirmed" msgstr "" @@ -4302,8 +4309,8 @@ msgstr "Diweddariadau" #: perllib/FixMyStreet/App/Controller/Admin.pm:906 #: perllib/FixMyStreet/App/Controller/Admin.pm:959 #: perllib/FixMyStreet/App/Controller/Admin.pm:998 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:422 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:486 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:423 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:487 #, fuzzy msgid "Updated!" msgstr "Diweddariadau" @@ -4343,7 +4350,7 @@ msgid "User flagged" msgstr "" #: perllib/FixMyStreet/App/Controller/Admin.pm:1135 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:210 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:211 #: templates/web/default/admin/flagged.html:30 #: templates/web/zurich/header.html:69 msgid "Users" @@ -4357,8 +4364,8 @@ msgstr "Anfonwch ddiweddariadau ataf i drwy'r e-bost" #: templates/web/default/admin/report_edit.html:12 #: templates/web/default/admin/update_edit.html:12 -#: templates/web/zurich/admin/report_edit-sdm.html:21 -#: templates/web/zurich/admin/report_edit.html:19 +#: templates/web/zurich/admin/report_edit-sdm.html:24 +#: templates/web/zurich/admin/report_edit.html:22 #: templates/web/zurich/admin/update_edit.html:10 #, fuzzy msgid "View report on site" @@ -4402,7 +4409,11 @@ msgstr "" "hyd at ddeg cyfatebiaeth, rhowch gynnig ar chwiliad gwahanol os nad yw'ch " "lleoliad chi yno." -#: templates/web/default/auth/token.html:19 +#: templates/web/default/auth/token.html:8 +msgid "We have not been able to confirm your account - sorry." +msgstr "" + +#: templates/web/default/auth/token.html:16 msgid "We have sent you an email containing a link to confirm your account." msgstr "" @@ -4860,8 +4871,8 @@ msgid "council ref: %s" msgstr "" #: templates/web/default/admin/report_edit.html:22 -#: templates/web/zurich/admin/report_edit-sdm.html:37 -#: templates/web/zurich/admin/report_edit.html:51 +#: templates/web/zurich/admin/report_edit-sdm.html:40 +#: templates/web/zurich/admin/report_edit.html:54 msgid "didn't use map" msgstr "" @@ -4926,16 +4937,16 @@ msgstr "" #: templates/web/default/admin/report_edit.html:18 #: templates/web/default/admin/report_edit.html:20 -#: templates/web/zurich/admin/report_edit-sdm.html:24 -#: templates/web/zurich/admin/report_edit-sdm.html:26 -#: templates/web/zurich/admin/report_edit-sdm.html:33 -#: templates/web/zurich/admin/report_edit-sdm.html:35 -#: templates/web/zurich/admin/report_edit.html:24 -#: templates/web/zurich/admin/report_edit.html:26 -#: templates/web/zurich/admin/report_edit.html:35 -#: templates/web/zurich/admin/report_edit.html:37 -#: templates/web/zurich/admin/report_edit.html:47 -#: templates/web/zurich/admin/report_edit.html:49 +#: templates/web/zurich/admin/report_edit-sdm.html:27 +#: templates/web/zurich/admin/report_edit-sdm.html:29 +#: templates/web/zurich/admin/report_edit-sdm.html:36 +#: templates/web/zurich/admin/report_edit-sdm.html:38 +#: templates/web/zurich/admin/report_edit.html:27 +#: templates/web/zurich/admin/report_edit.html:29 +#: templates/web/zurich/admin/report_edit.html:38 +#: templates/web/zurich/admin/report_edit.html:40 +#: templates/web/zurich/admin/report_edit.html:50 +#: templates/web/zurich/admin/report_edit.html:52 msgid "originally entered: “%s”" msgstr "" @@ -4989,8 +5000,8 @@ msgid "today" msgstr "heddiw" #: templates/web/default/admin/report_edit.html:22 -#: templates/web/zurich/admin/report_edit-sdm.html:37 -#: templates/web/zurich/admin/report_edit.html:51 +#: templates/web/zurich/admin/report_edit-sdm.html:40 +#: templates/web/zurich/admin/report_edit.html:54 msgid "used map" msgstr "" diff --git a/locale/de_CH.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/de_CH.UTF-8/LC_MESSAGES/FixMyStreet.po index d0f7e7ccc..55b388c69 100644 --- a/locale/de_CH.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/de_CH.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -6,10 +6,11 @@ msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2013-02-21 12:36+0000\n" +"POT-Creation-Date: 2013-03-11 18:53+0000\n" "PO-Revision-Date: 2013-03-07 17:00+0100\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <team@fixmystreet.com>\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -468,21 +469,21 @@ msgstr "" msgid "Area covered" msgstr "Gebiet" -#: templates/web/zurich/admin/report_edit.html:111 +#: templates/web/zurich/admin/report_edit.html:117 #: templates/web/zurich/admin/stats.html:36 msgid "Assign to different category:" msgstr "Einer anderen Kategorie (DA) zuweisen:" -#: templates/web/zurich/admin/report_edit.html:120 +#: templates/web/zurich/admin/report_edit.html:126 msgid "Assign to external body:" msgstr "Einer externen Stelle zuweisen:" -#: templates/web/zurich/admin/report_edit.html:152 -#: templates/web/zurich/admin/report_edit.html:99 +#: templates/web/zurich/admin/report_edit.html:103 +#: templates/web/zurich/admin/report_edit.html:158 msgid "Assign to subdivision:" msgstr "An Fachbereich zuweisen:" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:97 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:98 #: templates/web/zurich/report/updates.html:11 msgid "Assigned to %s" msgstr "Weitergeleitet an: %s" @@ -518,7 +519,7 @@ msgid "" msgstr "" #: perllib/FixMyStreet/App/Controller/Admin.pm:1131 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:203 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:204 #: templates/web/default/admin/bodies.html:1 #: templates/web/zurich/header.html:64 msgid "Bodies" @@ -580,8 +581,8 @@ msgstr "" #: templates/web/default/report/new/fill_in_details_form.html:67 #: templates/web/emptyhomes/report/new/fill_in_details_form.html:50 #: templates/web/zurich/admin/body.html:36 -#: templates/web/zurich/admin/report_edit-sdm.html:39 -#: templates/web/zurich/admin/report_edit.html:110 +#: templates/web/zurich/admin/report_edit-sdm.html:42 +#: templates/web/zurich/admin/report_edit.html:116 msgid "Category:" msgstr "Kategorie:" @@ -600,7 +601,7 @@ msgstr "Passwort ändern" msgid "Click map to report a problem" msgstr "Mangel lokalisieren" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:74 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:75 #: templates/web/default/admin/report_edit.html:29 #: templates/web/default/admin/report_edit.html:31 #: templates/web/default/dashboard/index.html:142 @@ -609,8 +610,8 @@ msgstr "Mangel lokalisieren" #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:10 #: templates/web/zurich/admin/header.html:12 -#: templates/web/zurich/admin/report_edit.html:87 -#: templates/web/zurich/admin/report_edit.html:89 +#: templates/web/zurich/admin/report_edit.html:90 +#: templates/web/zurich/admin/report_edit.html:92 #: templates/web/zurich/admin/stats.html:31 #: templates/web/zurich/report/banner.html:13 msgid "Closed" @@ -634,8 +635,8 @@ msgid "Closest nearby problems <small>(within %skm)</small>" msgstr "" #: templates/web/default/admin/report_edit.html:17 -#: templates/web/zurich/admin/report_edit-sdm.html:30 -#: templates/web/zurich/admin/report_edit.html:43 +#: templates/web/zurich/admin/report_edit-sdm.html:33 +#: templates/web/zurich/admin/report_edit.html:46 msgid "Co-ordinates:" msgstr "Koordinaten:" @@ -783,8 +784,8 @@ msgstr "Erstellt" #: templates/web/default/admin/report_edit.html:44 #: templates/web/default/admin/update_edit.html:45 -#: templates/web/zurich/admin/report_edit-sdm.html:44 -#: templates/web/zurich/admin/report_edit.html:58 +#: templates/web/zurich/admin/report_edit-sdm.html:47 +#: templates/web/zurich/admin/report_edit.html:61 #: templates/web/zurich/admin/update_edit.html:29 msgid "Created:" msgstr "Erstellt:" @@ -826,9 +827,9 @@ msgstr "Beschreibung" #: templates/web/default/admin/report_edit.html:14 #: templates/web/default/report/new/fill_in_details_form.html:61 #: templates/web/emptyhomes/report/new/fill_in_details_form.html:79 -#: templates/web/zurich/admin/report_edit-sdm.html:22 -#: templates/web/zurich/admin/report_edit.html:22 -#: templates/web/zurich/admin/report_edit.html:32 +#: templates/web/zurich/admin/report_edit-sdm.html:25 +#: templates/web/zurich/admin/report_edit.html:25 +#: templates/web/zurich/admin/report_edit.html:35 msgid "Details:" msgstr "Beschreibung:" @@ -941,8 +942,8 @@ msgstr "Schicken Sie mir Aktualisierungen" #: templates/web/default/alert/updates.html:13 #: templates/web/default/report/display.html:38 #: templates/web/zurich/admin/body.html:41 -#: templates/web/zurich/admin/report_edit-sdm.html:41 -#: templates/web/zurich/admin/report_edit.html:54 +#: templates/web/zurich/admin/report_edit-sdm.html:44 +#: templates/web/zurich/admin/report_edit.html:57 msgid "Email:" msgstr "E-mail:" @@ -1286,8 +1287,8 @@ msgstr "Hallo %s" #: templates/web/default/admin/update_edit.html:22 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:11 -#: templates/web/zurich/admin/report_edit.html:78 -#: templates/web/zurich/admin/report_edit.html:82 +#: templates/web/zurich/admin/report_edit.html:81 +#: templates/web/zurich/admin/report_edit.html:85 #: templates/web/zurich/admin/stats.html:32 #: templates/web/zurich/admin/update_edit.html:18 msgid "Hidden" @@ -1376,7 +1377,7 @@ msgid "" "the council the activity in their area." msgstr "" -#: templates/web/default/auth/token.html:25 +#: templates/web/default/auth/token.html:22 #: templates/web/default/email_sent.html:9 msgid "" "If you use web-based email or have 'junk mail' filters, you may wish to " @@ -1421,13 +1422,13 @@ msgid "" "present if requestor allowed the name to be shown on this site)." msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:77 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:78 #: templates/web/default/admin/report_edit.html:29 #: templates/web/default/admin/report_edit.html:31 #: templates/web/fixmystreet/report/banner.html:19 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:8 -#: templates/web/zurich/admin/report_edit.html:91 +#: templates/web/zurich/admin/report_edit.html:94 #: templates/web/zurich/report/banner.html:15 msgid "In progress" msgstr "In Bearbeitung" @@ -1436,7 +1437,7 @@ msgstr "In Bearbeitung" msgid "Incident Category" msgstr "Kategorie" -#: templates/web/zurich/admin/report_edit.html:130 +#: templates/web/zurich/admin/report_edit.html:136 msgid "Include reporter personal details" msgstr "Persönliche Angaben des Meldenden mitsenden" @@ -1448,8 +1449,8 @@ msgstr "" msgid "Incorrect has_photo value \"%s\"" msgstr "" -#: templates/web/zurich/admin/report_edit-sdm.html:53 -#: templates/web/zurich/admin/report_edit.html:73 +#: templates/web/zurich/admin/report_edit-sdm.html:56 +#: templates/web/zurich/admin/report_edit.html:76 msgid "Internal notes:" msgstr "Interne Notizen" @@ -1645,8 +1646,8 @@ msgstr "(optional)" #: templates/web/default/admin/report_edit.html:41 #: templates/web/default/admin/update_edit.html:26 #: templates/web/default/admin/user-form.html:5 -#: templates/web/zurich/admin/report_edit-sdm.html:40 -#: templates/web/zurich/admin/report_edit.html:53 +#: templates/web/zurich/admin/report_edit-sdm.html:43 +#: templates/web/zurich/admin/report_edit.html:56 #: templates/web/zurich/admin/stats.html:41 msgid "Name:" msgstr "Name:" @@ -1767,7 +1768,7 @@ msgstr "" msgid "New state" msgstr "Neuer Status" -#: templates/web/zurich/admin/report_edit-sdm.html:56 +#: templates/web/zurich/admin/report_edit-sdm.html:59 msgid "New update:" msgstr "Neue Antwort" @@ -1824,7 +1825,7 @@ msgstr "" msgid "No flagged users found" msgstr "" -#: templates/web/zurich/admin/report_edit-sdm.html:62 +#: templates/web/zurich/admin/report_edit-sdm.html:65 msgid "No further updates" msgstr "Bearbeitung abschliessen" @@ -1851,8 +1852,8 @@ msgid "Non Public" msgstr "" #: templates/web/default/admin/report_edit.html:24 -#: templates/web/zurich/admin/report_edit-sdm.html:43 -#: templates/web/zurich/admin/report_edit.html:57 +#: templates/web/zurich/admin/report_edit-sdm.html:46 +#: templates/web/zurich/admin/report_edit.html:60 msgid "None" msgstr "Keine" @@ -1865,7 +1866,7 @@ msgstr "Keine" msgid "Not Responsible" msgstr "" -#: templates/web/zurich/admin/report_edit-sdm.html:18 +#: templates/web/zurich/admin/report_edit-sdm.html:21 msgid "Not for my subdivision" msgstr "Anderer Fachbereich zuständig" @@ -1960,7 +1961,7 @@ msgstr "" msgid "Older problems" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:71 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:72 #: templates/web/bromley/report/display.html:80 #: templates/web/default/admin/report_edit.html:29 #: templates/web/default/admin/update_edit.html:22 @@ -1969,8 +1970,8 @@ msgstr "" #: templates/web/fixmystreet/report/update-form.html:28 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:7 -#: templates/web/zurich/admin/report_edit.html:78 -#: templates/web/zurich/admin/report_edit.html:80 +#: templates/web/zurich/admin/report_edit.html:81 +#: templates/web/zurich/admin/report_edit.html:83 #: templates/web/zurich/admin/update_edit.html:18 #: templates/web/zurich/report/banner.html:11 msgid "Open" @@ -2068,8 +2069,8 @@ msgstr "Telefonnummer (optional)" #: templates/web/default/admin/report_edit.html:43 #: templates/web/default/report/new/fill_in_details_form.html:215 #: templates/web/emptyhomes/report/new/fill_in_details_form.html:138 -#: templates/web/zurich/admin/report_edit-sdm.html:43 -#: templates/web/zurich/admin/report_edit.html:57 +#: templates/web/zurich/admin/report_edit-sdm.html:46 +#: templates/web/zurich/admin/report_edit.html:60 #: templates/web/zurich/admin/stats.html:39 msgid "Phone:" msgstr "Telefonnummer:" @@ -2107,8 +2108,8 @@ msgstr "Pin auf der Karte absetzen" #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:9 #: templates/web/zurich/admin/index-dm.html:9 -#: templates/web/zurich/admin/report_edit.html:78 #: templates/web/zurich/admin/report_edit.html:81 +#: templates/web/zurich/admin/report_edit.html:84 msgid "Planned" msgstr "Rückmeldung ausstehend" @@ -2129,7 +2130,7 @@ msgstr "Bitte seien Sie freundlich und prägnant." msgid "Please check the passwords and try again" msgstr "" -#: templates/web/default/auth/token.html:17 +#: templates/web/default/auth/token.html:14 msgid "Please check your email" msgstr "Bitte überprüfen Sie Ihr E-Mail" @@ -2616,17 +2617,17 @@ msgstr "" msgid "Public information (shown on site)" msgstr "" -#: templates/web/zurich/admin/report_edit.html:162 -#: templates/web/zurich/admin/report_edit.html:170 +#: templates/web/zurich/admin/report_edit.html:168 +#: templates/web/zurich/admin/report_edit.html:176 msgid "Public response:" msgstr "Offizielle Antwort" -#: templates/web/zurich/admin/report_edit.html:69 +#: templates/web/zurich/admin/report_edit.html:72 #: templates/web/zurich/admin/stats.html:38 msgid "Publish photo" msgstr "Foto veröffentlichen" -#: templates/web/zurich/admin/report_edit.html:178 +#: templates/web/zurich/admin/report_edit.html:184 msgid "Publish the response" msgstr "Antwort veröffentlichen" @@ -2892,7 +2893,7 @@ msgid "Reporting a problem" msgstr "Ihre Meldung" #: perllib/FixMyStreet/App/Controller/Admin.pm:1132 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:196 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:197 #: templates/web/seesomething/admin/stats.html:1 #: templates/web/zurich/header.html:60 msgid "Reports" @@ -2936,13 +2937,13 @@ msgstr "" #: perllib/FixMyStreet/App/Controller/Admin.pm:1331 #: perllib/FixMyStreet/App/Controller/Admin.pm:1342 #: templates/web/default/admin/report_edit.html:60 -#: templates/web/zurich/admin/report_edit.html:65 +#: templates/web/zurich/admin/report_edit.html:68 msgid "Rotate Left" msgstr "Links drehen" #: perllib/FixMyStreet/App/Controller/Admin.pm:1331 #: templates/web/default/admin/report_edit.html:61 -#: templates/web/zurich/admin/report_edit.html:66 +#: templates/web/zurich/admin/report_edit.html:69 msgid "Rotate Right" msgstr "Rechts drehen" @@ -3159,14 +3160,14 @@ msgstr "Status" #: templates/web/default/admin/report_edit.html:28 #: templates/web/default/admin/update_edit.html:21 #: templates/web/default/report/update-form.html:28 -#: templates/web/zurich/admin/report_edit-sdm.html:51 -#: templates/web/zurich/admin/report_edit.html:76 +#: templates/web/zurich/admin/report_edit-sdm.html:54 +#: templates/web/zurich/admin/report_edit.html:79 #: templates/web/zurich/admin/update_edit.html:17 msgid "State:" msgstr "Status:" #: perllib/FixMyStreet/App/Controller/Admin.pm:1137 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:211 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:212 #: templates/web/default/admin/stats.html:1 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:72 msgid "Stats" @@ -3201,7 +3202,7 @@ msgstr "Titel" #: templates/web/default/contact/index.html:83 #: templates/web/default/report/new/fill_in_details_form.html:52 #: templates/web/emptyhomes/report/new/fill_in_details_form.html:70 -#: templates/web/zurich/admin/report_edit.html:31 +#: templates/web/zurich/admin/report_edit.html:34 msgid "Subject:" msgstr "Titel:" @@ -3224,8 +3225,8 @@ msgstr "Abschicken" #: templates/web/default/admin/report_edit.html:67 #: templates/web/default/admin/update_edit.html:54 #: templates/web/default/admin/user-form.html:17 -#: templates/web/zurich/admin/report_edit-sdm.html:61 -#: templates/web/zurich/admin/report_edit.html:180 +#: templates/web/zurich/admin/report_edit-sdm.html:64 +#: templates/web/zurich/admin/report_edit.html:186 #: templates/web/zurich/admin/update_edit.html:38 msgid "Submit changes" msgstr "Speichern" @@ -3235,14 +3236,14 @@ msgstr "Speichern" msgid "Submit questionnaire" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:67 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:68 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:6 #: templates/web/zurich/admin/index-dm.html:23 #: templates/web/zurich/admin/index-dm.html:6 #: templates/web/zurich/admin/index-sdm.html:21 -#: templates/web/zurich/admin/report_edit.html:78 -#: templates/web/zurich/admin/report_edit.html:79 +#: templates/web/zurich/admin/report_edit.html:81 +#: templates/web/zurich/admin/report_edit.html:82 #: templates/web/zurich/admin/reports.html:13 #: templates/web/zurich/report/banner.html:9 msgid "Submitted" @@ -3267,7 +3268,7 @@ msgid "Subscribe to an alert based upon what baranagay you’re in:" msgstr "" #: perllib/FixMyStreet/App/Controller/Admin.pm:1130 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:195 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:196 #: templates/web/default/admin/index.html:1 #: templates/web/zurich/admin/index-dm.html:1 #: templates/web/zurich/admin/index-sdm.html:1 @@ -3428,7 +3429,7 @@ msgid "" "the attribute is defined in the Open311 v2 specification." msgstr "" -#: templates/web/default/auth/token.html:22 +#: templates/web/default/auth/token.html:19 #: templates/web/default/email_sent.html:6 msgid "" "The confirmation email <strong>may</strong> take a few minutes to arrive " @@ -3644,6 +3645,12 @@ msgid "" "to see the reports sent there." msgstr "" +#: templates/web/default/auth/token.html:9 +msgid "" +"This may be because the link is too old or already used, or the address was " +"not copied correctly." +msgstr "" + #: templates/web/default/report/banner.html:15 msgid "This problem has been closed" msgstr "" @@ -3671,6 +3678,7 @@ msgid "This problem is old and of unknown status." msgstr "Dieses Problem ist alt und hat einen unbekannten Status" #: perllib/FixMyStreet/Cobrand/Zurich.pm:65 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:66 #: templates/web/zurich/report/_main.html:14 msgid "This report is awaiting moderation." msgstr "Überprüfung ausstehend" @@ -3751,8 +3759,8 @@ msgstr "" #: templates/web/default/admin/report_edit.html:29 #: templates/web/default/admin/report_edit.html:32 #: templates/web/default/admin/update_edit.html:22 -#: templates/web/zurich/admin/report_edit-sdm.html:42 -#: templates/web/zurich/admin/report_edit.html:55 +#: templates/web/zurich/admin/report_edit-sdm.html:45 +#: templates/web/zurich/admin/report_edit.html:58 #: templates/web/zurich/admin/update_edit.html:18 msgid "Unconfirmed" msgstr "Unbestätigt" @@ -3836,8 +3844,8 @@ msgstr "Aktualisiert" #: perllib/FixMyStreet/App/Controller/Admin.pm:906 #: perllib/FixMyStreet/App/Controller/Admin.pm:959 #: perllib/FixMyStreet/App/Controller/Admin.pm:998 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:422 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:486 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:423 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:487 msgid "Updated!" msgstr "Aktualisiert!" @@ -3876,7 +3884,7 @@ msgid "User flagged" msgstr "" #: perllib/FixMyStreet/App/Controller/Admin.pm:1135 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:210 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:211 #: templates/web/default/admin/flagged.html:30 #: templates/web/zurich/header.html:69 msgid "Users" @@ -3889,8 +3897,8 @@ msgstr "" #: templates/web/default/admin/report_edit.html:12 #: templates/web/default/admin/update_edit.html:12 -#: templates/web/zurich/admin/report_edit-sdm.html:21 -#: templates/web/zurich/admin/report_edit.html:19 +#: templates/web/zurich/admin/report_edit-sdm.html:24 +#: templates/web/zurich/admin/report_edit.html:22 #: templates/web/zurich/admin/update_edit.html:10 msgid "View report on site" msgstr "Meldung auf der Webseite betrachten" @@ -3931,7 +3939,14 @@ msgstr "" "Ihre Anfrage ergab mehr als eine mögliche Adresse. Die ersten zehn " "Treffer werden unten aufgelistet." -#: templates/web/default/auth/token.html:19 +#: templates/web/default/auth/token.html:8 +#, fuzzy +msgid "We have not been able to confirm your account - sorry." +msgstr "" +"Sie werden in Kürze ein E-Mail erhalten um Ihren Account zu bestä" +"tigen." + +#: templates/web/default/auth/token.html:16 msgid "We have sent you an email containing a link to confirm your account." msgstr "" "Sie werden in Kürze ein E-Mail erhalten um Ihren Account zu bestä" @@ -4366,8 +4381,8 @@ msgid "council ref: %s" msgstr "" #: templates/web/default/admin/report_edit.html:22 -#: templates/web/zurich/admin/report_edit-sdm.html:37 -#: templates/web/zurich/admin/report_edit.html:51 +#: templates/web/zurich/admin/report_edit-sdm.html:40 +#: templates/web/zurich/admin/report_edit.html:54 msgid "didn't use map" msgstr "hat Karte nicht verwendet" @@ -4430,16 +4445,16 @@ msgstr "oder automatisch lokalisieren" #: templates/web/default/admin/report_edit.html:18 #: templates/web/default/admin/report_edit.html:20 -#: templates/web/zurich/admin/report_edit-sdm.html:24 -#: templates/web/zurich/admin/report_edit-sdm.html:26 -#: templates/web/zurich/admin/report_edit-sdm.html:33 -#: templates/web/zurich/admin/report_edit-sdm.html:35 -#: templates/web/zurich/admin/report_edit.html:24 -#: templates/web/zurich/admin/report_edit.html:26 -#: templates/web/zurich/admin/report_edit.html:35 -#: templates/web/zurich/admin/report_edit.html:37 -#: templates/web/zurich/admin/report_edit.html:47 -#: templates/web/zurich/admin/report_edit.html:49 +#: templates/web/zurich/admin/report_edit-sdm.html:27 +#: templates/web/zurich/admin/report_edit-sdm.html:29 +#: templates/web/zurich/admin/report_edit-sdm.html:36 +#: templates/web/zurich/admin/report_edit-sdm.html:38 +#: templates/web/zurich/admin/report_edit.html:27 +#: templates/web/zurich/admin/report_edit.html:29 +#: templates/web/zurich/admin/report_edit.html:38 +#: templates/web/zurich/admin/report_edit.html:40 +#: templates/web/zurich/admin/report_edit.html:50 +#: templates/web/zurich/admin/report_edit.html:52 msgid "originally entered: “%s”" msgstr "Originaltext: “%s”" @@ -4493,8 +4508,8 @@ msgid "today" msgstr "heute" #: templates/web/default/admin/report_edit.html:22 -#: templates/web/zurich/admin/report_edit-sdm.html:37 -#: templates/web/zurich/admin/report_edit.html:51 +#: templates/web/zurich/admin/report_edit-sdm.html:40 +#: templates/web/zurich/admin/report_edit.html:54 msgid "used map" msgstr "Karte verwendet" diff --git a/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po index 14d23abdb..982d6e192 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-02-21 12:36+0000\n" +"POT-Creation-Date: 2013-03-11 18:53+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" @@ -513,21 +513,21 @@ msgstr "Der du fra den lokale administrasjonen?" msgid "Area covered" msgstr "" -#: templates/web/zurich/admin/report_edit.html:111 +#: templates/web/zurich/admin/report_edit.html:117 #: templates/web/zurich/admin/stats.html:36 msgid "Assign to different category:" msgstr "" -#: templates/web/zurich/admin/report_edit.html:120 +#: templates/web/zurich/admin/report_edit.html:126 msgid "Assign to external body:" msgstr "" -#: templates/web/zurich/admin/report_edit.html:152 -#: templates/web/zurich/admin/report_edit.html:99 +#: templates/web/zurich/admin/report_edit.html:103 +#: templates/web/zurich/admin/report_edit.html:158 msgid "Assign to subdivision:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:97 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:98 #: templates/web/zurich/report/updates.html:11 #, fuzzy msgid "Assigned to %s" @@ -567,7 +567,7 @@ msgid "" msgstr "" #: perllib/FixMyStreet/App/Controller/Admin.pm:1131 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:203 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:204 #: templates/web/default/admin/bodies.html:1 #: templates/web/zurich/header.html:64 msgid "Bodies" @@ -631,8 +631,8 @@ msgstr "Løsningsrate fordelt på kategori for problemer > 4 uker gamle" #: templates/web/default/report/new/fill_in_details_form.html:67 #: templates/web/emptyhomes/report/new/fill_in_details_form.html:50 #: templates/web/zurich/admin/body.html:36 -#: templates/web/zurich/admin/report_edit-sdm.html:39 -#: templates/web/zurich/admin/report_edit.html:110 +#: templates/web/zurich/admin/report_edit-sdm.html:42 +#: templates/web/zurich/admin/report_edit.html:116 msgid "Category:" msgstr "Kategori:" @@ -651,7 +651,7 @@ msgstr "Bytt passord" msgid "Click map to report a problem" msgstr "Klikk i kartet for å rapportere et problem" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:74 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:75 #: templates/web/default/admin/report_edit.html:29 #: templates/web/default/admin/report_edit.html:31 #: templates/web/default/dashboard/index.html:142 @@ -660,8 +660,8 @@ msgstr "Klikk i kartet for å rapportere et problem" #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:10 #: templates/web/zurich/admin/header.html:12 -#: templates/web/zurich/admin/report_edit.html:87 -#: templates/web/zurich/admin/report_edit.html:89 +#: templates/web/zurich/admin/report_edit.html:90 +#: templates/web/zurich/admin/report_edit.html:92 #: templates/web/zurich/admin/stats.html:31 #: templates/web/zurich/report/banner.html:13 msgid "Closed" @@ -685,8 +685,8 @@ msgid "Closest nearby problems <small>(within %skm)</small>" msgstr "De nærmeste problemene <small>(innenfor %skm)</small>" #: templates/web/default/admin/report_edit.html:17 -#: templates/web/zurich/admin/report_edit-sdm.html:30 -#: templates/web/zurich/admin/report_edit.html:43 +#: templates/web/zurich/admin/report_edit-sdm.html:33 +#: templates/web/zurich/admin/report_edit.html:46 msgid "Co-ordinates:" msgstr "Koordinater:" @@ -836,8 +836,8 @@ msgstr "Opprettet" #: templates/web/default/admin/report_edit.html:44 #: templates/web/default/admin/update_edit.html:45 -#: templates/web/zurich/admin/report_edit-sdm.html:44 -#: templates/web/zurich/admin/report_edit.html:58 +#: templates/web/zurich/admin/report_edit-sdm.html:47 +#: templates/web/zurich/admin/report_edit.html:61 #: templates/web/zurich/admin/update_edit.html:29 msgid "Created:" msgstr "Opprettet:" @@ -879,9 +879,9 @@ msgstr "Detaljer" #: templates/web/default/admin/report_edit.html:14 #: templates/web/default/report/new/fill_in_details_form.html:61 #: templates/web/emptyhomes/report/new/fill_in_details_form.html:79 -#: templates/web/zurich/admin/report_edit-sdm.html:22 -#: templates/web/zurich/admin/report_edit.html:22 -#: templates/web/zurich/admin/report_edit.html:32 +#: templates/web/zurich/admin/report_edit-sdm.html:25 +#: templates/web/zurich/admin/report_edit.html:25 +#: templates/web/zurich/admin/report_edit.html:35 msgid "Details:" msgstr "Detaljer:" @@ -995,8 +995,8 @@ msgstr "Send meg oppdateringer" #: templates/web/default/alert/updates.html:13 #: templates/web/default/report/display.html:38 #: templates/web/zurich/admin/body.html:41 -#: templates/web/zurich/admin/report_edit-sdm.html:41 -#: templates/web/zurich/admin/report_edit.html:54 +#: templates/web/zurich/admin/report_edit-sdm.html:44 +#: templates/web/zurich/admin/report_edit.html:57 msgid "Email:" msgstr "E-post:" @@ -1361,8 +1361,8 @@ msgstr "Hei, %s" #: templates/web/default/admin/update_edit.html:22 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:11 -#: templates/web/zurich/admin/report_edit.html:78 -#: templates/web/zurich/admin/report_edit.html:82 +#: templates/web/zurich/admin/report_edit.html:81 +#: templates/web/zurich/admin/report_edit.html:85 #: templates/web/zurich/admin/stats.html:32 #: templates/web/zurich/admin/update_edit.html:18 msgid "Hidden" @@ -1462,7 +1462,7 @@ msgstr "" "inn din rapport, slik at vi kan vise administrasjonen aktiviteten i deres " "område." -#: templates/web/default/auth/token.html:25 +#: templates/web/default/auth/token.html:22 #: templates/web/default/email_sent.html:9 msgid "" "If you use web-based email or have 'junk mail' filters, you may wish to " @@ -1515,13 +1515,13 @@ msgstr "" "del av description), interface_used, comment_count, requestor_name (kun " "tilstede hvis innsender tillot at navnet kunne vises på dette nettstedet)." -#: perllib/FixMyStreet/Cobrand/Zurich.pm:77 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:78 #: templates/web/default/admin/report_edit.html:29 #: templates/web/default/admin/report_edit.html:31 #: templates/web/fixmystreet/report/banner.html:19 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:8 -#: templates/web/zurich/admin/report_edit.html:91 +#: templates/web/zurich/admin/report_edit.html:94 #: templates/web/zurich/report/banner.html:15 msgid "In progress" msgstr "Under arbeid" @@ -1531,7 +1531,7 @@ msgstr "Under arbeid" msgid "Incident Category" msgstr "Kategori" -#: templates/web/zurich/admin/report_edit.html:130 +#: templates/web/zurich/admin/report_edit.html:136 #, fuzzy msgid "Include reporter personal details" msgstr "Legg inn opplysninger om problemet" @@ -1544,8 +1544,8 @@ msgstr "Inkluder ubekreftede problemer" msgid "Incorrect has_photo value \"%s\"" msgstr "Feil has_photo-verdi \"%s\"" -#: templates/web/zurich/admin/report_edit-sdm.html:53 -#: templates/web/zurich/admin/report_edit.html:73 +#: templates/web/zurich/admin/report_edit-sdm.html:56 +#: templates/web/zurich/admin/report_edit.html:76 msgid "Internal notes:" msgstr "" @@ -1745,8 +1745,8 @@ msgstr "(valgfritt)" #: templates/web/default/admin/report_edit.html:41 #: templates/web/default/admin/update_edit.html:26 #: templates/web/default/admin/user-form.html:5 -#: templates/web/zurich/admin/report_edit-sdm.html:40 -#: templates/web/zurich/admin/report_edit.html:53 +#: templates/web/zurich/admin/report_edit-sdm.html:43 +#: templates/web/zurich/admin/report_edit.html:56 #: templates/web/zurich/admin/stats.html:41 msgid "Name:" msgstr "Navn:" @@ -1880,7 +1880,7 @@ msgstr "Nye rapporter innenfor grensen til {{NAME}} på reportemptyhomes.com" msgid "New state" msgstr "Ny tilstand" -#: templates/web/zurich/admin/report_edit-sdm.html:56 +#: templates/web/zurich/admin/report_edit-sdm.html:59 #, fuzzy msgid "New update:" msgstr "Få oppdateringer" @@ -1938,7 +1938,7 @@ msgstr "Ingen flaggede problemer ble funnet" msgid "No flagged users found" msgstr "Ingen flaggede brukere ble funnet" -#: templates/web/zurich/admin/report_edit-sdm.html:62 +#: templates/web/zurich/admin/report_edit-sdm.html:65 #, fuzzy msgid "No further updates" msgstr "Dine oppdateringer" @@ -1966,8 +1966,8 @@ msgid "Non Public" msgstr "" #: templates/web/default/admin/report_edit.html:24 -#: templates/web/zurich/admin/report_edit-sdm.html:43 -#: templates/web/zurich/admin/report_edit.html:57 +#: templates/web/zurich/admin/report_edit-sdm.html:46 +#: templates/web/zurich/admin/report_edit.html:60 msgid "None" msgstr "Ingen" @@ -1980,7 +1980,7 @@ msgstr "Ingen" msgid "Not Responsible" msgstr "" -#: templates/web/zurich/admin/report_edit-sdm.html:18 +#: templates/web/zurich/admin/report_edit-sdm.html:21 msgid "Not for my subdivision" msgstr "" @@ -2079,7 +2079,7 @@ msgstr "Eldre løste" msgid "Older problems" msgstr "Eldre problemer" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:71 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:72 #: templates/web/bromley/report/display.html:80 #: templates/web/default/admin/report_edit.html:29 #: templates/web/default/admin/update_edit.html:22 @@ -2088,8 +2088,8 @@ msgstr "Eldre problemer" #: templates/web/fixmystreet/report/update-form.html:28 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:7 -#: templates/web/zurich/admin/report_edit.html:78 -#: templates/web/zurich/admin/report_edit.html:80 +#: templates/web/zurich/admin/report_edit.html:81 +#: templates/web/zurich/admin/report_edit.html:83 #: templates/web/zurich/admin/update_edit.html:18 #: templates/web/zurich/report/banner.html:11 msgid "Open" @@ -2191,8 +2191,8 @@ msgstr "Telefonnummer (valgfritt)" #: templates/web/default/admin/report_edit.html:43 #: templates/web/default/report/new/fill_in_details_form.html:215 #: templates/web/emptyhomes/report/new/fill_in_details_form.html:138 -#: templates/web/zurich/admin/report_edit-sdm.html:43 -#: templates/web/zurich/admin/report_edit.html:57 +#: templates/web/zurich/admin/report_edit-sdm.html:46 +#: templates/web/zurich/admin/report_edit.html:60 #: templates/web/zurich/admin/stats.html:39 msgid "Phone:" msgstr "Telefon:" @@ -2230,8 +2230,8 @@ msgstr "" #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:9 #: templates/web/zurich/admin/index-dm.html:9 -#: templates/web/zurich/admin/report_edit.html:78 #: templates/web/zurich/admin/report_edit.html:81 +#: templates/web/zurich/admin/report_edit.html:84 msgid "Planned" msgstr "Planlagt" @@ -2254,7 +2254,7 @@ msgstr "Vær høflig, poengtert og kortfattet." msgid "Please check the passwords and try again" msgstr "Vennligst sjekk passordene og prøv igjen" -#: templates/web/default/auth/token.html:17 +#: templates/web/default/auth/token.html:14 msgid "Please check your email" msgstr "Vennligst sjekk e-posten du oppgav" @@ -2777,17 +2777,17 @@ msgstr "" msgid "Public information (shown on site)" msgstr "" -#: templates/web/zurich/admin/report_edit.html:162 -#: templates/web/zurich/admin/report_edit.html:170 +#: templates/web/zurich/admin/report_edit.html:168 +#: templates/web/zurich/admin/report_edit.html:176 msgid "Public response:" msgstr "" -#: templates/web/zurich/admin/report_edit.html:69 +#: templates/web/zurich/admin/report_edit.html:72 #: templates/web/zurich/admin/stats.html:38 msgid "Publish photo" msgstr "" -#: templates/web/zurich/admin/report_edit.html:178 +#: templates/web/zurich/admin/report_edit.html:184 msgid "Publish the response" msgstr "" @@ -3053,7 +3053,7 @@ msgid "Reporting a problem" msgstr "Legger til et problem" #: perllib/FixMyStreet/App/Controller/Admin.pm:1132 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:196 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:197 #: templates/web/seesomething/admin/stats.html:1 #: templates/web/zurich/header.html:60 #, fuzzy @@ -3102,13 +3102,13 @@ msgstr "Veioperatør for denne navngitte veien (fra OpenStreetMap): %s" #: perllib/FixMyStreet/App/Controller/Admin.pm:1331 #: perllib/FixMyStreet/App/Controller/Admin.pm:1342 #: templates/web/default/admin/report_edit.html:60 -#: templates/web/zurich/admin/report_edit.html:65 +#: templates/web/zurich/admin/report_edit.html:68 msgid "Rotate Left" msgstr "" #: perllib/FixMyStreet/App/Controller/Admin.pm:1331 #: templates/web/default/admin/report_edit.html:61 -#: templates/web/zurich/admin/report_edit.html:66 +#: templates/web/zurich/admin/report_edit.html:69 msgid "Rotate Right" msgstr "" @@ -3332,14 +3332,14 @@ msgstr "Tilstand" #: templates/web/default/admin/report_edit.html:28 #: templates/web/default/admin/update_edit.html:21 #: templates/web/default/report/update-form.html:28 -#: templates/web/zurich/admin/report_edit-sdm.html:51 -#: templates/web/zurich/admin/report_edit.html:76 +#: templates/web/zurich/admin/report_edit-sdm.html:54 +#: templates/web/zurich/admin/report_edit.html:79 #: templates/web/zurich/admin/update_edit.html:17 msgid "State:" msgstr "Tilstand:" #: perllib/FixMyStreet/App/Controller/Admin.pm:1137 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:211 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:212 #: templates/web/default/admin/stats.html:1 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:72 msgid "Stats" @@ -3375,7 +3375,7 @@ msgstr "Emne" #: templates/web/default/contact/index.html:83 #: templates/web/default/report/new/fill_in_details_form.html:52 #: templates/web/emptyhomes/report/new/fill_in_details_form.html:70 -#: templates/web/zurich/admin/report_edit.html:31 +#: templates/web/zurich/admin/report_edit.html:34 msgid "Subject:" msgstr "Emne:" @@ -3398,8 +3398,8 @@ msgstr "Send inn" #: templates/web/default/admin/report_edit.html:67 #: templates/web/default/admin/update_edit.html:54 #: templates/web/default/admin/user-form.html:17 -#: templates/web/zurich/admin/report_edit-sdm.html:61 -#: templates/web/zurich/admin/report_edit.html:180 +#: templates/web/zurich/admin/report_edit-sdm.html:64 +#: templates/web/zurich/admin/report_edit.html:186 #: templates/web/zurich/admin/update_edit.html:38 msgid "Submit changes" msgstr "Send inn endringer" @@ -3409,14 +3409,14 @@ msgstr "Send inn endringer" msgid "Submit questionnaire" msgstr "Send inn spørreskjema" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:67 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:68 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:6 #: templates/web/zurich/admin/index-dm.html:23 #: templates/web/zurich/admin/index-dm.html:6 #: templates/web/zurich/admin/index-sdm.html:21 -#: templates/web/zurich/admin/report_edit.html:78 -#: templates/web/zurich/admin/report_edit.html:79 +#: templates/web/zurich/admin/report_edit.html:81 +#: templates/web/zurich/admin/report_edit.html:82 #: templates/web/zurich/admin/reports.html:13 #: templates/web/zurich/report/banner.html:9 #, fuzzy @@ -3445,7 +3445,7 @@ msgstr "" "hører inn under:" #: perllib/FixMyStreet/App/Controller/Admin.pm:1130 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:195 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:196 #: templates/web/default/admin/index.html:1 #: templates/web/zurich/admin/index-dm.html:1 #: templates/web/zurich/admin/index-sdm.html:1 @@ -3622,7 +3622,7 @@ msgstr "" "administrasjonene som mottok problemrapporten, noe som ikke helt stemmer med " "hvordan atributten er definert i Open311 v2-spesifikasjonen." -#: templates/web/default/auth/token.html:22 +#: templates/web/default/auth/token.html:19 #: templates/web/default/email_sent.html:6 msgid "" "The confirmation email <strong>may</strong> take a few minutes to arrive " @@ -3882,6 +3882,12 @@ msgstr "" "Dette er en opplisting av alle problemene i denne tjenesten; velg en bestemt " "administrasjon for å se problemer som er sendt dit." +#: templates/web/default/auth/token.html:9 +msgid "" +"This may be because the link is too old or already used, or the address was " +"not copied correctly." +msgstr "" + #: templates/web/default/report/banner.html:15 msgid "This problem has been closed" msgstr "Dette problemet er lukket" @@ -3909,6 +3915,7 @@ msgid "This problem is old and of unknown status." msgstr "Dette problemet er gammel og med ukjent status." #: perllib/FixMyStreet/Cobrand/Zurich.pm:65 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:66 #: templates/web/zurich/report/_main.html:14 #, fuzzy msgid "This report is awaiting moderation." @@ -3994,8 +4001,8 @@ msgstr "" #: templates/web/default/admin/report_edit.html:29 #: templates/web/default/admin/report_edit.html:32 #: templates/web/default/admin/update_edit.html:22 -#: templates/web/zurich/admin/report_edit-sdm.html:42 -#: templates/web/zurich/admin/report_edit.html:55 +#: templates/web/zurich/admin/report_edit-sdm.html:45 +#: templates/web/zurich/admin/report_edit.html:58 #: templates/web/zurich/admin/update_edit.html:18 msgid "Unconfirmed" msgstr "Ubekreftet" @@ -4082,8 +4089,8 @@ msgstr "Oppdatert!" #: perllib/FixMyStreet/App/Controller/Admin.pm:906 #: perllib/FixMyStreet/App/Controller/Admin.pm:959 #: perllib/FixMyStreet/App/Controller/Admin.pm:998 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:422 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:486 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:423 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:487 msgid "Updated!" msgstr "Oppdatert!" @@ -4122,7 +4129,7 @@ msgid "User flagged" msgstr "Bruker flagget" #: perllib/FixMyStreet/App/Controller/Admin.pm:1135 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:210 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:211 #: templates/web/default/admin/flagged.html:30 #: templates/web/zurich/header.html:69 msgid "Users" @@ -4135,8 +4142,8 @@ msgstr "Verdier oppdatert" #: templates/web/default/admin/report_edit.html:12 #: templates/web/default/admin/update_edit.html:12 -#: templates/web/zurich/admin/report_edit-sdm.html:21 -#: templates/web/zurich/admin/report_edit.html:19 +#: templates/web/zurich/admin/report_edit-sdm.html:24 +#: templates/web/zurich/admin/report_edit.html:22 #: templates/web/zurich/admin/update_edit.html:10 msgid "View report on site" msgstr "Se rapport på nettstedet" @@ -4177,7 +4184,13 @@ msgstr "" "Vi fant mer en ett treff for den plassen. Vi viser opp til ti treff, så " "forsøk et annet søk hvis din plass ikke er her." -#: templates/web/default/auth/token.html:19 +#: templates/web/default/auth/token.html:8 +#, fuzzy +msgid "We have not been able to confirm your account - sorry." +msgstr "" +"Vi har sendt deg en epost som inneholder link for å bekrefte din konto." + +#: templates/web/default/auth/token.html:16 msgid "We have sent you an email containing a link to confirm your account." msgstr "" "Vi har sendt deg en epost som inneholder link for å bekrefte din konto." @@ -4650,8 +4663,8 @@ msgid "council ref: %s" msgstr "%s ref: %s" #: templates/web/default/admin/report_edit.html:22 -#: templates/web/zurich/admin/report_edit-sdm.html:37 -#: templates/web/zurich/admin/report_edit.html:51 +#: templates/web/zurich/admin/report_edit-sdm.html:40 +#: templates/web/zurich/admin/report_edit.html:54 msgid "didn't use map" msgstr "brukte ikke kart" @@ -4716,16 +4729,16 @@ msgstr "" #: templates/web/default/admin/report_edit.html:18 #: templates/web/default/admin/report_edit.html:20 -#: templates/web/zurich/admin/report_edit-sdm.html:24 -#: templates/web/zurich/admin/report_edit-sdm.html:26 -#: templates/web/zurich/admin/report_edit-sdm.html:33 -#: templates/web/zurich/admin/report_edit-sdm.html:35 -#: templates/web/zurich/admin/report_edit.html:24 -#: templates/web/zurich/admin/report_edit.html:26 -#: templates/web/zurich/admin/report_edit.html:35 -#: templates/web/zurich/admin/report_edit.html:37 -#: templates/web/zurich/admin/report_edit.html:47 -#: templates/web/zurich/admin/report_edit.html:49 +#: templates/web/zurich/admin/report_edit-sdm.html:27 +#: templates/web/zurich/admin/report_edit-sdm.html:29 +#: templates/web/zurich/admin/report_edit-sdm.html:36 +#: templates/web/zurich/admin/report_edit-sdm.html:38 +#: templates/web/zurich/admin/report_edit.html:27 +#: templates/web/zurich/admin/report_edit.html:29 +#: templates/web/zurich/admin/report_edit.html:38 +#: templates/web/zurich/admin/report_edit.html:40 +#: templates/web/zurich/admin/report_edit.html:50 +#: templates/web/zurich/admin/report_edit.html:52 #, fuzzy msgid "originally entered: “%s”" msgstr "søkte etter" @@ -4778,8 +4791,8 @@ msgid "today" msgstr "idag" #: templates/web/default/admin/report_edit.html:22 -#: templates/web/zurich/admin/report_edit-sdm.html:37 -#: templates/web/zurich/admin/report_edit.html:51 +#: templates/web/zurich/admin/report_edit-sdm.html:40 +#: templates/web/zurich/admin/report_edit.html:54 msgid "used map" msgstr "brukte kart" diff --git a/locale/nn_NO.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/nn_NO.UTF-8/LC_MESSAGES/FixMyStreet.po index 7e4515000..183acbd20 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-02-21 12:36+0000\n" +"POT-Creation-Date: 2013-03-11 18:53+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" @@ -520,21 +520,21 @@ msgstr "den lokale administrasjonen" msgid "Area covered" msgstr "" -#: templates/web/zurich/admin/report_edit.html:111 +#: templates/web/zurich/admin/report_edit.html:117 #: templates/web/zurich/admin/stats.html:36 msgid "Assign to different category:" msgstr "" -#: templates/web/zurich/admin/report_edit.html:120 +#: templates/web/zurich/admin/report_edit.html:126 msgid "Assign to external body:" msgstr "" -#: templates/web/zurich/admin/report_edit.html:152 -#: templates/web/zurich/admin/report_edit.html:99 +#: templates/web/zurich/admin/report_edit.html:103 +#: templates/web/zurich/admin/report_edit.html:158 msgid "Assign to subdivision:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:97 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:98 #: templates/web/zurich/report/updates.html:11 #, fuzzy msgid "Assigned to %s" @@ -574,7 +574,7 @@ msgid "" msgstr "" #: perllib/FixMyStreet/App/Controller/Admin.pm:1131 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:203 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:204 #: templates/web/default/admin/bodies.html:1 #: templates/web/zurich/header.html:64 msgid "Bodies" @@ -639,8 +639,8 @@ msgstr "Løysingsrate fordelt på kategori for problem > 4 veker gamle" #: templates/web/default/report/new/fill_in_details_form.html:67 #: templates/web/emptyhomes/report/new/fill_in_details_form.html:50 #: templates/web/zurich/admin/body.html:36 -#: templates/web/zurich/admin/report_edit-sdm.html:39 -#: templates/web/zurich/admin/report_edit.html:110 +#: templates/web/zurich/admin/report_edit-sdm.html:42 +#: templates/web/zurich/admin/report_edit.html:116 msgid "Category:" msgstr "Kategori:" @@ -660,7 +660,7 @@ msgstr "Byt passord" msgid "Click map to report a problem" msgstr "Korleis rapportera eit problem" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:74 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:75 #: templates/web/default/admin/report_edit.html:29 #: templates/web/default/admin/report_edit.html:31 #: templates/web/default/dashboard/index.html:142 @@ -669,8 +669,8 @@ msgstr "Korleis rapportera eit problem" #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:10 #: templates/web/zurich/admin/header.html:12 -#: templates/web/zurich/admin/report_edit.html:87 -#: templates/web/zurich/admin/report_edit.html:89 +#: templates/web/zurich/admin/report_edit.html:90 +#: templates/web/zurich/admin/report_edit.html:92 #: templates/web/zurich/admin/stats.html:31 #: templates/web/zurich/report/banner.html:13 msgid "Closed" @@ -695,8 +695,8 @@ msgid "Closest nearby problems <small>(within %skm)</small>" msgstr "Dei næraste problema <small>(innanfor %skm)</small>" #: templates/web/default/admin/report_edit.html:17 -#: templates/web/zurich/admin/report_edit-sdm.html:30 -#: templates/web/zurich/admin/report_edit.html:43 +#: templates/web/zurich/admin/report_edit-sdm.html:33 +#: templates/web/zurich/admin/report_edit.html:46 msgid "Co-ordinates:" msgstr "Koordinatar:" @@ -846,8 +846,8 @@ msgstr "Oppretta" #: templates/web/default/admin/report_edit.html:44 #: templates/web/default/admin/update_edit.html:45 -#: templates/web/zurich/admin/report_edit-sdm.html:44 -#: templates/web/zurich/admin/report_edit.html:58 +#: templates/web/zurich/admin/report_edit-sdm.html:47 +#: templates/web/zurich/admin/report_edit.html:61 #: templates/web/zurich/admin/update_edit.html:29 msgid "Created:" msgstr "Oppretta:" @@ -890,9 +890,9 @@ msgstr "Detaljar:" #: templates/web/default/admin/report_edit.html:14 #: templates/web/default/report/new/fill_in_details_form.html:61 #: templates/web/emptyhomes/report/new/fill_in_details_form.html:79 -#: templates/web/zurich/admin/report_edit-sdm.html:22 -#: templates/web/zurich/admin/report_edit.html:22 -#: templates/web/zurich/admin/report_edit.html:32 +#: templates/web/zurich/admin/report_edit-sdm.html:25 +#: templates/web/zurich/admin/report_edit.html:25 +#: templates/web/zurich/admin/report_edit.html:35 msgid "Details:" msgstr "Detaljar:" @@ -1006,8 +1006,8 @@ msgstr "Send meg oppdateringar" #: templates/web/default/alert/updates.html:13 #: templates/web/default/report/display.html:38 #: templates/web/zurich/admin/body.html:41 -#: templates/web/zurich/admin/report_edit-sdm.html:41 -#: templates/web/zurich/admin/report_edit.html:54 +#: templates/web/zurich/admin/report_edit-sdm.html:44 +#: templates/web/zurich/admin/report_edit.html:57 msgid "Email:" msgstr "E-post:" @@ -1377,8 +1377,8 @@ msgstr "" #: templates/web/default/admin/update_edit.html:22 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:11 -#: templates/web/zurich/admin/report_edit.html:78 -#: templates/web/zurich/admin/report_edit.html:82 +#: templates/web/zurich/admin/report_edit.html:81 +#: templates/web/zurich/admin/report_edit.html:85 #: templates/web/zurich/admin/stats.html:32 #: templates/web/zurich/admin/update_edit.html:18 msgid "Hidden" @@ -1478,7 +1478,7 @@ msgstr "" "sender inn rapporten din, slik at vi kan visa administrasjonen aktiviteten i " "området ditt." -#: templates/web/default/auth/token.html:25 +#: templates/web/default/auth/token.html:22 #: templates/web/default/email_sent.html:9 msgid "" "If you use web-based email or have 'junk mail' filters, you may wish to " @@ -1532,13 +1532,13 @@ msgstr "" "av description), interface_used, comment_count, requestor_name (berre " "tilstades viss innsendar tillét at namnet kunne visast på denne nettstaden)." -#: perllib/FixMyStreet/Cobrand/Zurich.pm:77 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:78 #: templates/web/default/admin/report_edit.html:29 #: templates/web/default/admin/report_edit.html:31 #: templates/web/fixmystreet/report/banner.html:19 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:8 -#: templates/web/zurich/admin/report_edit.html:91 +#: templates/web/zurich/admin/report_edit.html:94 #: templates/web/zurich/report/banner.html:15 #, fuzzy msgid "In progress" @@ -1549,7 +1549,7 @@ msgstr "Under arbeid" msgid "Incident Category" msgstr "Kategori" -#: templates/web/zurich/admin/report_edit.html:130 +#: templates/web/zurich/admin/report_edit.html:136 #, fuzzy msgid "Include reporter personal details" msgstr "Ver venleg og legg inn opplysningar om problemet" @@ -1562,8 +1562,8 @@ msgstr "Inkluder ikkje-stadfesta problem" msgid "Incorrect has_photo value \"%s\"" msgstr "Feil has_photo-verdi «%s»" -#: templates/web/zurich/admin/report_edit-sdm.html:53 -#: templates/web/zurich/admin/report_edit.html:73 +#: templates/web/zurich/admin/report_edit-sdm.html:56 +#: templates/web/zurich/admin/report_edit.html:76 msgid "Internal notes:" msgstr "" @@ -1765,8 +1765,8 @@ msgstr "(valfritt)" #: templates/web/default/admin/report_edit.html:41 #: templates/web/default/admin/update_edit.html:26 #: templates/web/default/admin/user-form.html:5 -#: templates/web/zurich/admin/report_edit-sdm.html:40 -#: templates/web/zurich/admin/report_edit.html:53 +#: templates/web/zurich/admin/report_edit-sdm.html:43 +#: templates/web/zurich/admin/report_edit.html:56 #: templates/web/zurich/admin/stats.html:41 msgid "Name:" msgstr "Namn:" @@ -1901,7 +1901,7 @@ msgstr "Nye rapportar innanfor grensa til {{NAME}} på reportemptyhomes.com" msgid "New state" msgstr "Ny tilstand" -#: templates/web/zurich/admin/report_edit-sdm.html:56 +#: templates/web/zurich/admin/report_edit-sdm.html:59 #, fuzzy msgid "New update:" msgstr "Siste oppdatering:" @@ -1959,7 +1959,7 @@ msgstr "Fann ingen flagga problem" msgid "No flagged users found" msgstr "Fann ingen flagga brukarar" -#: templates/web/zurich/admin/report_edit-sdm.html:62 +#: templates/web/zurich/admin/report_edit-sdm.html:65 #, fuzzy msgid "No further updates" msgstr "Oppdateringane dine" @@ -1987,8 +1987,8 @@ msgid "Non Public" msgstr "" #: templates/web/default/admin/report_edit.html:24 -#: templates/web/zurich/admin/report_edit-sdm.html:43 -#: templates/web/zurich/admin/report_edit.html:57 +#: templates/web/zurich/admin/report_edit-sdm.html:46 +#: templates/web/zurich/admin/report_edit.html:60 msgid "None" msgstr "Ingen" @@ -2001,7 +2001,7 @@ msgstr "Ingen" msgid "Not Responsible" msgstr "" -#: templates/web/zurich/admin/report_edit-sdm.html:18 +#: templates/web/zurich/admin/report_edit-sdm.html:21 msgid "Not for my subdivision" msgstr "" @@ -2104,7 +2104,7 @@ msgstr "Eldre løyste" msgid "Older problems" msgstr "Eldre problem" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:71 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:72 #: templates/web/bromley/report/display.html:80 #: templates/web/default/admin/report_edit.html:29 #: templates/web/default/admin/update_edit.html:22 @@ -2113,8 +2113,8 @@ msgstr "Eldre problem" #: templates/web/fixmystreet/report/update-form.html:28 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:7 -#: templates/web/zurich/admin/report_edit.html:78 -#: templates/web/zurich/admin/report_edit.html:80 +#: templates/web/zurich/admin/report_edit.html:81 +#: templates/web/zurich/admin/report_edit.html:83 #: templates/web/zurich/admin/update_edit.html:18 #: templates/web/zurich/report/banner.html:11 msgid "Open" @@ -2218,8 +2218,8 @@ msgstr "(valfritt)" #: templates/web/default/admin/report_edit.html:43 #: templates/web/default/report/new/fill_in_details_form.html:215 #: templates/web/emptyhomes/report/new/fill_in_details_form.html:138 -#: templates/web/zurich/admin/report_edit-sdm.html:43 -#: templates/web/zurich/admin/report_edit.html:57 +#: templates/web/zurich/admin/report_edit-sdm.html:46 +#: templates/web/zurich/admin/report_edit.html:60 #: templates/web/zurich/admin/stats.html:39 msgid "Phone:" msgstr "Telefon:" @@ -2258,8 +2258,8 @@ msgstr "" #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:9 #: templates/web/zurich/admin/index-dm.html:9 -#: templates/web/zurich/admin/report_edit.html:78 #: templates/web/zurich/admin/report_edit.html:81 +#: templates/web/zurich/admin/report_edit.html:84 msgid "Planned" msgstr "Planlagt" @@ -2281,7 +2281,7 @@ msgstr "Ver høfleg, poengtert og kortfatta." msgid "Please check the passwords and try again" msgstr "Ver venleg og sjekk passorda og prøv igjen" -#: templates/web/default/auth/token.html:17 +#: templates/web/default/auth/token.html:14 msgid "Please check your email" msgstr "Ver venleg og sjekk e-posten du oppgav" @@ -2809,17 +2809,17 @@ msgstr "" msgid "Public information (shown on site)" msgstr "" -#: templates/web/zurich/admin/report_edit.html:162 -#: templates/web/zurich/admin/report_edit.html:170 +#: templates/web/zurich/admin/report_edit.html:168 +#: templates/web/zurich/admin/report_edit.html:176 msgid "Public response:" msgstr "" -#: templates/web/zurich/admin/report_edit.html:69 +#: templates/web/zurich/admin/report_edit.html:72 #: templates/web/zurich/admin/stats.html:38 msgid "Publish photo" msgstr "" -#: templates/web/zurich/admin/report_edit.html:178 +#: templates/web/zurich/admin/report_edit.html:184 msgid "Publish the response" msgstr "" @@ -3088,7 +3088,7 @@ msgid "Reporting a problem" msgstr "Legger til eit problem" #: perllib/FixMyStreet/App/Controller/Admin.pm:1132 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:196 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:197 #: templates/web/seesomething/admin/stats.html:1 #: templates/web/zurich/header.html:60 #, fuzzy @@ -3137,13 +3137,13 @@ msgstr "Vegoperatør for denne namngjevne vegen (frå OpenStreetMap): %s" #: perllib/FixMyStreet/App/Controller/Admin.pm:1331 #: perllib/FixMyStreet/App/Controller/Admin.pm:1342 #: templates/web/default/admin/report_edit.html:60 -#: templates/web/zurich/admin/report_edit.html:65 +#: templates/web/zurich/admin/report_edit.html:68 msgid "Rotate Left" msgstr "" #: perllib/FixMyStreet/App/Controller/Admin.pm:1331 #: templates/web/default/admin/report_edit.html:61 -#: templates/web/zurich/admin/report_edit.html:66 +#: templates/web/zurich/admin/report_edit.html:69 msgid "Rotate Right" msgstr "" @@ -3368,14 +3368,14 @@ msgstr "Tilstand" #: templates/web/default/admin/report_edit.html:28 #: templates/web/default/admin/update_edit.html:21 #: templates/web/default/report/update-form.html:28 -#: templates/web/zurich/admin/report_edit-sdm.html:51 -#: templates/web/zurich/admin/report_edit.html:76 +#: templates/web/zurich/admin/report_edit-sdm.html:54 +#: templates/web/zurich/admin/report_edit.html:79 #: templates/web/zurich/admin/update_edit.html:17 msgid "State:" msgstr "Tilstand:" #: perllib/FixMyStreet/App/Controller/Admin.pm:1137 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:211 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:212 #: templates/web/default/admin/stats.html:1 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:72 msgid "Stats" @@ -3413,7 +3413,7 @@ msgstr "Emne:" #: templates/web/default/contact/index.html:83 #: templates/web/default/report/new/fill_in_details_form.html:52 #: templates/web/emptyhomes/report/new/fill_in_details_form.html:70 -#: templates/web/zurich/admin/report_edit.html:31 +#: templates/web/zurich/admin/report_edit.html:34 msgid "Subject:" msgstr "Emne:" @@ -3436,8 +3436,8 @@ msgstr "Send inn" #: templates/web/default/admin/report_edit.html:67 #: templates/web/default/admin/update_edit.html:54 #: templates/web/default/admin/user-form.html:17 -#: templates/web/zurich/admin/report_edit-sdm.html:61 -#: templates/web/zurich/admin/report_edit.html:180 +#: templates/web/zurich/admin/report_edit-sdm.html:64 +#: templates/web/zurich/admin/report_edit.html:186 #: templates/web/zurich/admin/update_edit.html:38 msgid "Submit changes" msgstr "Send inn endringar" @@ -3447,14 +3447,14 @@ msgstr "Send inn endringar" msgid "Submit questionnaire" msgstr "Send inn spørjeskjema" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:67 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:68 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:6 #: templates/web/zurich/admin/index-dm.html:23 #: templates/web/zurich/admin/index-dm.html:6 #: templates/web/zurich/admin/index-sdm.html:21 -#: templates/web/zurich/admin/report_edit.html:78 -#: templates/web/zurich/admin/report_edit.html:79 +#: templates/web/zurich/admin/report_edit.html:81 +#: templates/web/zurich/admin/report_edit.html:82 #: templates/web/zurich/admin/reports.html:13 #: templates/web/zurich/report/banner.html:9 #, fuzzy @@ -3483,7 +3483,7 @@ msgstr "" "høyrer til under:" #: perllib/FixMyStreet/App/Controller/Admin.pm:1130 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:195 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:196 #: templates/web/default/admin/index.html:1 #: templates/web/zurich/admin/index-dm.html:1 #: templates/web/zurich/admin/index-sdm.html:1 @@ -3665,7 +3665,7 @@ msgstr "" "administrasjonane som mottok problemrapporten, noko som ikkje heilt passar " "med korleis attributten er definert i Open311 v2-spesifikasjonen." -#: templates/web/default/auth/token.html:22 +#: templates/web/default/auth/token.html:19 #: templates/web/default/email_sent.html:6 msgid "" "The confirmation email <strong>may</strong> take a few minutes to arrive " @@ -3931,6 +3931,12 @@ msgstr "" "Dette er ei opplisting av alle problema i denne tenesta; vel ein viss " "administrasjon for å sjå problem som er sende dit." +#: templates/web/default/auth/token.html:9 +msgid "" +"This may be because the link is too old or already used, or the address was " +"not copied correctly." +msgstr "" + #: templates/web/default/report/banner.html:15 msgid "This problem has been closed" msgstr "Dette problemet er lukka" @@ -3958,6 +3964,7 @@ msgid "This problem is old and of unknown status." msgstr "Dette problemet er gammalt og med ukjend status." #: perllib/FixMyStreet/Cobrand/Zurich.pm:65 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:66 #: templates/web/zurich/report/_main.html:14 #, fuzzy msgid "This report is awaiting moderation." @@ -4046,8 +4053,8 @@ msgstr "" #: templates/web/default/admin/report_edit.html:29 #: templates/web/default/admin/report_edit.html:32 #: templates/web/default/admin/update_edit.html:22 -#: templates/web/zurich/admin/report_edit-sdm.html:42 -#: templates/web/zurich/admin/report_edit.html:55 +#: templates/web/zurich/admin/report_edit-sdm.html:45 +#: templates/web/zurich/admin/report_edit.html:58 #: templates/web/zurich/admin/update_edit.html:18 msgid "Unconfirmed" msgstr "Ikkje stadfesta" @@ -4136,8 +4143,8 @@ msgstr "Oppdatert!" #: perllib/FixMyStreet/App/Controller/Admin.pm:906 #: perllib/FixMyStreet/App/Controller/Admin.pm:959 #: perllib/FixMyStreet/App/Controller/Admin.pm:998 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:422 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:486 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:423 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:487 msgid "Updated!" msgstr "Oppdatert!" @@ -4176,7 +4183,7 @@ msgid "User flagged" msgstr "Brukar flagga" #: perllib/FixMyStreet/App/Controller/Admin.pm:1135 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:210 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:211 #: templates/web/default/admin/flagged.html:30 #: templates/web/zurich/header.html:69 msgid "Users" @@ -4189,8 +4196,8 @@ msgstr "Verdi oppdatert" #: templates/web/default/admin/report_edit.html:12 #: templates/web/default/admin/update_edit.html:12 -#: templates/web/zurich/admin/report_edit-sdm.html:21 -#: templates/web/zurich/admin/report_edit.html:19 +#: templates/web/zurich/admin/report_edit-sdm.html:24 +#: templates/web/zurich/admin/report_edit.html:22 #: templates/web/zurich/admin/update_edit.html:10 msgid "View report on site" msgstr "Sjå rapport på nettstaden" @@ -4232,7 +4239,14 @@ msgstr "" "Vi fann meir ein eitt treff for den staden. Vi viser opp til ti treff, så " "prøv eit anna søk viss staden din ikkje er her." -#: templates/web/default/auth/token.html:19 +#: templates/web/default/auth/token.html:8 +#, fuzzy +msgid "We have not been able to confirm your account - sorry." +msgstr "" +"Vi har sendt deg ein epost som inneheld ei lenkje for å stadfesta kontoen " +"din." + +#: templates/web/default/auth/token.html:16 msgid "We have sent you an email containing a link to confirm your account." msgstr "" "Vi har sendt deg ein epost som inneheld ei lenkje for å stadfesta kontoen " @@ -4716,8 +4730,8 @@ msgid "council ref: %s" msgstr "" #: templates/web/default/admin/report_edit.html:22 -#: templates/web/zurich/admin/report_edit-sdm.html:37 -#: templates/web/zurich/admin/report_edit.html:51 +#: templates/web/zurich/admin/report_edit-sdm.html:40 +#: templates/web/zurich/admin/report_edit.html:54 msgid "didn't use map" msgstr "brukte ikkje kart" @@ -4782,16 +4796,16 @@ msgstr "" #: templates/web/default/admin/report_edit.html:18 #: templates/web/default/admin/report_edit.html:20 -#: templates/web/zurich/admin/report_edit-sdm.html:24 -#: templates/web/zurich/admin/report_edit-sdm.html:26 -#: templates/web/zurich/admin/report_edit-sdm.html:33 -#: templates/web/zurich/admin/report_edit-sdm.html:35 -#: templates/web/zurich/admin/report_edit.html:24 -#: templates/web/zurich/admin/report_edit.html:26 -#: templates/web/zurich/admin/report_edit.html:35 -#: templates/web/zurich/admin/report_edit.html:37 -#: templates/web/zurich/admin/report_edit.html:47 -#: templates/web/zurich/admin/report_edit.html:49 +#: templates/web/zurich/admin/report_edit-sdm.html:27 +#: templates/web/zurich/admin/report_edit-sdm.html:29 +#: templates/web/zurich/admin/report_edit-sdm.html:36 +#: templates/web/zurich/admin/report_edit-sdm.html:38 +#: templates/web/zurich/admin/report_edit.html:27 +#: templates/web/zurich/admin/report_edit.html:29 +#: templates/web/zurich/admin/report_edit.html:38 +#: templates/web/zurich/admin/report_edit.html:40 +#: templates/web/zurich/admin/report_edit.html:50 +#: templates/web/zurich/admin/report_edit.html:52 #, fuzzy msgid "originally entered: “%s”" msgstr "søkte etter" @@ -4845,8 +4859,8 @@ msgid "today" msgstr "i dag" #: templates/web/default/admin/report_edit.html:22 -#: templates/web/zurich/admin/report_edit-sdm.html:37 -#: templates/web/zurich/admin/report_edit.html:51 +#: templates/web/zurich/admin/report_edit-sdm.html:40 +#: templates/web/zurich/admin/report_edit.html:54 msgid "used map" msgstr "brukte kart" diff --git a/templates/web/default/auth/token.html b/templates/web/default/auth/token.html index 5fa69ab21..361d4fbd5 100644 --- a/templates/web/default/auth/token.html +++ b/templates/web/default/auth/token.html @@ -4,13 +4,10 @@ <h1>[% loc('Error') %]</h1> -<p>We have not been able to confirm your account - sorry. This may be because:</p> - -<ul> - <li>Link too old or already used</li> - <li>URL not copied correctly</li> - [%# FIXME - add more reasons here %] -</ul> +<p> + [% loc('We have not been able to confirm your account - sorry.') %] + [% loc('This may be because the link is too old or already used, or the address was not copied correctly.') %] +</p> [% ELSE %] |