diff options
35 files changed, 694 insertions, 552 deletions
diff --git a/conf/crontab.ugly b/conf/crontab.ugly index 4eb6d5a26..c85d3f119 100644 --- a/conf/crontab.ugly +++ b/conf/crontab.ugly @@ -25,14 +25,17 @@ my @sending = qw( demo.fixmybarangay.com www.fixmybarangay.com zurich.fixmystreet.staging.mysociety.org + www.zueriwieneu.ch seesomething.mysociety.org ); my @no_alerts = qw( zurich.fixmystreet.staging.mysociety.org + www.zueriwieneu.ch seesomething.mysociety.org ); my @no_open311 = qw( zurich.fixmystreet.staging.mysociety.org + www.zueriwieneu.ch seesomething.mysociety.org ); my %sending = map { $_ => 1 } @sending; @@ -75,6 +78,6 @@ my %no_alerts = map { $_ => 1 } @no_alerts; 43 2 * * * !!(*= $user *)!! /data/vhost/!!(*= $vhost *)!!/fixmystreet/bin/problem-creation-graph 00 8 * * * !!(*= $user *)!! /data/vhost/!!(*= $vhost *)!!/fixmystreet/bin/check-for-zombies !!(*= $user *)!! -!!(* if ($vhost =~ /zurich/) { *)!! +!!(* if ($vhost =~ /zurich|zueri/) { *)!! 30 0 * * * !!(*= $user *)!! /data/vhost/!!(*= $vhost *)!!/fixmystreet/bin/cron-wrapper zurich-overdue-alert !!(* } *)!! diff --git a/locale/FixMyStreet.po b/locale/FixMyStreet.po index 887830d82..495564477 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 15:57+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" @@ -337,19 +337,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 "" @@ -377,7 +377,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 "" @@ -409,7 +409,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 "" @@ -425,7 +425,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 "" @@ -445,7 +445,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 "" @@ -549,7 +549,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 "" @@ -577,7 +577,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 "" @@ -649,7 +649,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 "" @@ -894,7 +894,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 "" @@ -962,7 +962,7 @@ msgstr "" msgid "If you submit a report here it will be left on the site, but not reported to the council – please still leave your report, so that we can show to the council the activity in their area." msgstr "" -#: templates/web/default/auth/token.html: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 "" @@ -989,7 +989,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 "" @@ -997,7 +997,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 "" @@ -1009,7 +1009,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 "" @@ -1121,7 +1121,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 "" @@ -1227,7 +1227,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 "" @@ -1267,7 +1267,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 "" @@ -1291,7 +1291,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 "" @@ -1299,7 +1299,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 "" @@ -1379,7 +1379,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 "" @@ -1443,7 +1443,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 "" @@ -1463,7 +1463,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 "" @@ -1479,7 +1479,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 "" @@ -1815,15 +1815,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 "" @@ -2003,7 +2003,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 "" @@ -2039,11 +2039,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 "" @@ -2192,11 +2192,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 "" @@ -2220,7 +2220,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 "" @@ -2228,7 +2228,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 "" @@ -2236,7 +2236,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 "" @@ -2252,7 +2252,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 "" @@ -2363,7 +2363,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 "" @@ -2511,6 +2511,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 "" @@ -2531,7 +2535,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 "" @@ -2591,7 +2595,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 "" @@ -2663,7 +2667,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 "" @@ -2691,7 +2695,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 "" @@ -2699,7 +2703,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 "" @@ -2727,7 +2731,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 "" @@ -2975,7 +2983,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 "" @@ -3027,7 +3035,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 "" @@ -3063,7 +3071,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 dc7723cfe..1f4b4ab5d 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 15:57+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" @@ -574,21 +574,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 "" @@ -625,7 +625,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" @@ -689,8 +689,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:" @@ -711,7 +711,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 @@ -720,8 +720,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" @@ -747,8 +747,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 "" @@ -908,8 +908,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 "" @@ -952,9 +952,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:" @@ -1073,8 +1073,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:" @@ -1460,8 +1460,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 @@ -1565,7 +1565,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 " @@ -1614,13 +1614,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 "" @@ -1630,7 +1630,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" @@ -1644,8 +1644,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 "" @@ -1861,8 +1861,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:" @@ -2000,7 +2000,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" @@ -2060,7 +2060,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" @@ -2089,8 +2089,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" @@ -2104,7 +2104,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 "" @@ -2209,7 +2209,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 @@ -2218,8 +2218,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" @@ -2324,8 +2324,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:" @@ -2364,8 +2364,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 "" @@ -2387,7 +2387,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" @@ -2910,17 +2910,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 "" @@ -3197,7 +3197,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" @@ -3243,13 +3243,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 "" @@ -3497,15 +3497,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 @@ -3544,7 +3544,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:" @@ -3567,8 +3567,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" @@ -3579,14 +3579,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 @@ -3615,7 +3615,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 @@ -3824,7 +3824,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 " @@ -4072,6 +4072,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" @@ -4102,6 +4108,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 "" @@ -4195,8 +4202,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 "" @@ -4295,8 +4302,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" @@ -4336,7 +4343,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" @@ -4350,8 +4357,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" @@ -4395,7 +4402,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 "" @@ -4853,8 +4864,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 "" @@ -4919,16 +4930,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 "" @@ -4982,8 +4993,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 cb5f27c90..4528607f8 100644 --- a/locale/de_CH.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/de_CH.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2013-02-21 15:57+0000\n" -"PO-Revision-Date: 2013-02-04 12:02+0100\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" @@ -65,12 +65,12 @@ msgstr "" #: templates/web/default/pagination.html:10 msgid "%d to %d of %d" -msgstr "" +msgstr "%d bis %d von %d" #: templates/web/default/reports/body.html:0 #: templates/web/default/reports/body.html:20 msgid "%s - Summary reports" -msgstr "" +msgstr "Alle Meldungen" #: perllib/FixMyStreet/DB/Result/Problem.pm:685 msgid "%s ref: %s" @@ -81,7 +81,6 @@ msgid "%s ward, %s" msgstr "" #: perllib/FixMyStreet/DB/Result/Problem.pm:572 -#, fuzzy msgid "%s, reported at %s" msgstr "Gemeldet von %s um %s" @@ -134,7 +133,7 @@ msgstr "(erledigt)" #: templates/web/fixmystreet/report/_item.html:20 #: templates/web/zurich/report/_item.html:19 msgid "(fixed)" -msgstr "(gelöst)" +msgstr "(erledigt)" #: templates/web/default/index.html:11 templates/web/default/index.html:15 #: templates/web/fixmystreet/around/intro.html:2 @@ -159,11 +158,11 @@ msgstr "" #: templates/web/default/report/new/fill_in_details_form.html:211 msgid "(we never show your email address or phone number)" -msgstr "(ihre E-Mail Adresse und Telefonnummer werden nie angezeigt)" +msgstr "(Ihre E-Mail Adresse und Telefonnummer werden nie angezeigt)" #: templates/web/default/report/update-form.html:158 msgid "(we never show your email)" -msgstr "(ihre E-Mail Adresse wird nie angezeigt)" +msgstr "(Ihre E-Mail Adresse wird nie angezeigt)" #: perllib/FixMyStreet/App/Controller/Report/New.pm:634 #: perllib/FixMyStreet/App/Controller/Report/New.pm:661 @@ -270,7 +269,7 @@ msgstr "" #: templates/web/default/admin/index.html:14 #: templates/web/zurich/admin/index.html:4 msgid "<strong>%d</strong> live problems" -msgstr "" +msgstr "<strong>%d</strong> Meldungen Total" #: templates/web/fixmystreet/report/new/fill_in_details_form.html:183 msgid "<strong>No</strong> Let me confirm my report by email" @@ -283,7 +282,7 @@ msgstr "" #: templates/web/fixmystreet/auth/general.html:50 #: templates/web/zurich/auth/general.html:49 msgid "<strong>No</strong> let me sign in by email" -msgstr "Erstmalige Anmeldung" +msgstr "Neu Registrieren" #: templates/web/default/auth/general.html:55 msgid "<strong>No</strong>, I do not, let me sign in by email:" @@ -388,7 +387,7 @@ msgstr "Alle Meldungen" #: templates/web/default/admin/stats.html:5 #: templates/web/zurich/admin/stats.html:8 msgid "All reports between %s and %s" -msgstr "Gemeldet von %s um %s" +msgstr "Alle Meldungen von %s bis %s" #: templates/web/default/report/new/councils_text_some.html:2 msgid "All the information you provide here will be sent to" @@ -462,24 +461,24 @@ 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 "An Fachbereich zuweisen: %s" +msgstr "Weitergeleitet an: %s" #: templates/web/default/open311/index.html:17 msgid "" @@ -512,7 +511,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" @@ -574,8 +573,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:" @@ -594,7 +593,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 @@ -603,8 +602,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" @@ -628,8 +627,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:" @@ -684,7 +683,7 @@ msgstr "" #: templates/web/zurich/tokens/confirm_problem.html:1 #: templates/web/zurich/tokens/confirm_problem.html:3 msgid "Confirmation" -msgstr "Bestätigung" +msgstr "Bestätigung" #: templates/web/default/admin/body.html:37 #: templates/web/default/admin/body.html:85 @@ -777,8 +776,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:" @@ -794,7 +793,7 @@ msgstr "" #: templates/web/zurich/admin/stats.html:35 msgid "Dealt with by subdivision within 5 working days" -msgstr "" +msgstr "Innerhalb von fünf Arbeitstagen abgeschlossen" #: templates/web/default/admin/body.html:38 #: templates/web/default/admin/body.html:88 @@ -820,9 +819,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:" @@ -925,7 +924,7 @@ msgstr "" #: templates/web/default/report/display.html:34 msgid "Email me updates" -msgstr "Schicken sie mir Aktualisierungen" +msgstr "Schicken Sie mir Aktualisierungen" #: templates/web/default/admin/body.html:80 #: templates/web/default/admin/body_edit.html:26 @@ -935,13 +934,12 @@ 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:" #: perllib/FixMyStreet/DB/ResultSet/Problem.pm:315 -#, fuzzy msgid "Email: %s" msgstr "E-mail:" @@ -1121,7 +1119,7 @@ msgstr "" #: templates/web/fixmystreet/report/update-form.html:28 #: templates/web/fixmystreet/report/update-form.html:32 msgid "Fixed" -msgstr "Gelöst" +msgstr "Erledigt" #: templates/web/default/admin/report_edit.html:29 #: templates/web/default/admin/report_edit.html:32 @@ -1179,7 +1177,7 @@ msgstr "Ihr Passwort" #: templates/web/fixmystreet/static/privacy.html:1 #: templates/web/oxfordshire/faq/faq-en-gb.html:1 msgid "Frequently Asked Questions" -msgstr "" +msgstr "Hilfe" #: templates/web/emptyhomes/static/about.html:34 msgid "Further information about our work on empty homes." @@ -1281,8 +1279,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" @@ -1306,7 +1304,7 @@ msgstr "" #: templates/web/default/index-steps.html:1 msgid "How to report a problem" -msgstr "Erfasse eine neue Meldung:" +msgstr "Erfassen Sie eine neue Meldung:" #: templates/web/default/js/translation_strings.html:27 msgid "How to send successful reports" @@ -1331,8 +1329,8 @@ msgid "" "I'm afraid we couldn't validate that token. If you've copied the URL from an " "email, please check that you copied it exactly.\n" msgstr "" -"Leider konnte ihre URL nicht aufgelöst werden. Falls sie die URL aus " -"einer Mail kopiert haben, überprüfen sie bitte ob sie die gesamte " +"Leider konnte Ihre URL nicht aufgelöst werden. Falls Sie die URL aus " +"einer Mail kopiert haben, überprüfen Sie bitte ob Sie die gesamte " "URL kopiert haben.\n" #: templates/web/default/admin/flagged.html:9 @@ -1371,7 +1369,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 " @@ -1405,7 +1403,6 @@ msgstr "" #: templates/web/default/report/update-form.html:32 #: templates/web/fixmystreet/report/update-form.html:28 #: templates/web/fixmystreet/report/update-form.html:30 -#, fuzzy msgid "In Progress" msgstr "In Bearbeitung" @@ -1417,25 +1414,24 @@ 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" #: templates/web/seesomething/report/new/fill_in_details_form.html:38 -#, fuzzy 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&oumol;nliche Angaben des Meldenden mitsenden" +msgstr "Persönliche Angaben des Meldenden mitsenden" #: templates/web/default/admin/stats.html:76 msgid "Include unconfirmed reports" @@ -1445,8 +1441,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" @@ -1603,7 +1599,7 @@ msgstr "" #: templates/web/zurich/admin/stats.html:34 msgid "Moderated by division within one working day" -msgstr "" +msgstr "Innerhalb eines Arbeitstages moderiert" #: templates/web/default/admin/stats.html:11 msgid "Month" @@ -1636,23 +1632,21 @@ msgid "Name" msgstr "Name" #: templates/web/seesomething/report/new/fill_in_details_form.html:74 -#, fuzzy msgid "Name (optional)" 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:" #: perllib/FixMyStreet/DB/ResultSet/Problem.pm:314 -#, fuzzy msgid "Name: %s" -msgstr "Name:" +msgstr "Name: %s" #: templates/web/fiksgatami/footer.html:3 #: templates/web/fiksgatami/nn/footer.html:3 @@ -1688,7 +1682,7 @@ msgstr "" #: templates/web/default/email_sent.html:3 msgid "Nearly Done! Now check your email..." -msgstr "Fast Fertig! Bitte checken Sie ihre Mailbox..." +msgstr "Fast Fertig! Bitte checken Sie Ihre Mailbox..." #: templates/web/default/reports/index.html:16 #: templates/web/fixmybarangay/reports/index.html:16 @@ -1766,7 +1760,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" @@ -1778,7 +1772,7 @@ msgstr "Neu!" #: templates/web/default/pagination.html:13 msgid "Next" -msgstr "" +msgstr "Weiter" #: templates/web/default/admin/body.html:50 #: templates/web/default/admin/body.html:51 @@ -1823,7 +1817,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 +1845,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 +1859,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 +1954,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 +1963,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" @@ -1978,7 +1972,7 @@ msgstr "Aufgenommen" #: templates/web/default/my/my.html:22 templates/web/fixmystreet/my/my.html:26 msgid "Open reports" -msgstr "" +msgstr "Offene Meldungen" #: templates/web/default/open311/index.html:3 msgid "Open311 API for the mySociety FixMyStreet server" @@ -2068,8 +2062,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 +2101,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,9 +2123,9 @@ 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" +msgstr "Bitte überprüfen Sie Ihr E-Mail" #: templates/web/default/auth/general.html:14 #: templates/web/default/auth/general.html:8 @@ -2226,7 +2220,7 @@ msgstr "Bitte geben Sie eine gültige E-Mail Adresse an" #: templates/web/default/js/translation_strings.html:4 #: templates/web/seesomething/js/translation_strings.html:2 msgid "Please enter some details" -msgstr "Bitte geben Sie einiges Details an" +msgstr "Bitte geben Sie einige Details an" #: perllib/FixMyStreet/App/Controller/Contact.pm:96 #: perllib/FixMyStreet/DB/Result/User.pm:112 @@ -2277,7 +2271,7 @@ msgstr "Bitte geben Sie Ihren Namen an" #: templates/web/default/js/translation_strings.html:18 msgid "Please enter your title" -msgstr "Bitte geben Sie Iher E-Mail-Adresse an" +msgstr "Bitte geben Sie Ihre E-Mail-Adresse an" #: templates/web/default/auth/sign_out.html:5 #: templates/web/zurich/auth/sign_out.html:5 @@ -2318,10 +2312,10 @@ msgid "" "and if possible describe the exact location of\n" "the problem (e.g. if there is a streetlight number or road name)." msgstr "" -"Bitte beschreiben sie Ihre Meldung weiter unten. Wir können den Mangel " +"Bitte beschreiben Sie Ihre Meldung weiter unten. Wir können den Mangel " "nur beheben, wenn Sie soviel Details wie möglich angeben: Beschreiben " -"sie die exakte Lage (z.B. An der Wand Richtung Strasse), was genau der " -"Mangel ist, wie lange dieser schon da ist und laden sie wenn möglich " +"Sie die exakte Lage (z.B. An der Wand Richtung Strasse), was genau der " +"Mangel ist, wie lange dieser schon da ist und laden Sie wenn möglich " "ein Photo des Mangels hoch." #: templates/web/default/report/new/fill_in_details_text.html:1 @@ -2334,10 +2328,10 @@ msgid "" "description (and a\n" "photo of the problem if you have one), etc." msgstr "" -"Bitte beschreiben sie Ihre Meldung weiter unten. Wir können den Mangel " +"Bitte beschreiben Sie Ihre Meldung weiter unten. Wir können den Mangel " "nur beheben, wenn Sie soviel Details wie möglich angeben: Beschreiben " -"sie die exakte Lage (z.B. An der Wand Richtung Strasse), was genau der " -"Mangel ist, wie lange dieser schon da ist und laden sie wenn möglich " +"Sie die exakte Lage (z.B. An der Wand Richtung Strasse), was genau der " +"Mangel ist, wie lange dieser schon da ist und laden Sie wenn möglich " "ein Photo des Mangels hoch." #: templates/web/fixmystreet/report/new/fill_in_details_form.html:70 @@ -2474,7 +2468,7 @@ msgstr "" #: templates/web/default/pagination.html:7 msgid "Previous" -msgstr "" +msgstr "Zurück" #: templates/web/default/admin/body.html:97 #: templates/web/default/admin/body_edit.html:40 @@ -2536,7 +2530,7 @@ msgstr "Meldungen auf der Karte" #: db/alert_types.pl:14 msgid "Problems recently reported fixed on FixMyStreet" -msgstr "Meldungen, welche kürzlich gelöst wurden" +msgstr "Meldungen, welche kürzlich erledigt wurden" #: templates/web/default/alert/_list.html:19 #: templates/web/fixmystreet/alert/_list.html:21 @@ -2616,17 +2610,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" @@ -2735,12 +2729,12 @@ msgstr "" #: templates/web/default/reports/index.html:19 #: templates/web/fixmybarangay/reports/index.html:19 msgid "Recently <br>fixed" -msgstr "Kürzlich <br>gelöst" +msgstr "Kürzlich <br>erledigt" #: templates/web/fiksgatami/nn/reports/index.html:13 #: templates/web/fiksgatami/reports/index.html:13 msgid "Recently fixed" -msgstr "Kürzlich gelöst" +msgstr "Kürzlich erledigt" #: templates/web/default/index.html:41 templates/web/fixmystreet/index.html:45 msgid "Recently reported problems" @@ -2754,10 +2748,10 @@ msgid "" "site remember that you can contact your council directly using their own " "website." msgstr "" -"Fix My Zürich dient dazu Mängel an der Infrastruktur zu melden. " +"Züri wie neu dient dazu Mängel an der Infrastruktur zu melden. " "Meldungen und Wünsche bezüglich Verbesserungen an der " -"Infrastruktur sowie Gestaltungsvorschläge können über Fix My " -"Zürich nicht berücksichtigt werden. Notfälle müssen der " +"Infrastruktur sowie Gestaltungsvorschläge können über Züri " +"wie neu nicht berücksichtigt werden. Notfälle müssen der " "Polizei gemeldet werden via Telefon 117." #: templates/web/fixmybarangay/report/new/notes.html:9 @@ -2892,7 +2886,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,19 +2930,19 @@ 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" #: templates/web/default/admin/body_edit.html:76 msgid "Save changes" -msgstr "Änderungen speichern" +msgstr "Speichern" #: templates/web/default/admin/flagged.html:1 #: templates/web/default/admin/reports.html:1 @@ -3159,18 +3153,18 @@ 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" -msgstr "" +msgstr "Statistik" #: templates/web/zurich/admin/index-dm.html:23 #: templates/web/zurich/admin/index-sdm.html:21 @@ -3201,7 +3195,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,25 +3218,25 @@ 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 "Änderungen speichern" +msgstr "Speichern" #: templates/web/default/questionnaire/index.html:116 #: templates/web/fixmystreet/questionnaire/index.html:105 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 +3261,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 @@ -3284,7 +3278,7 @@ msgstr "Zusammenfassung" #: templates/web/zurich/reports/index.html:0 #: templates/web/zurich/reports/index.html:4 msgid "Summary reports" -msgstr "" +msgstr "Alle Meldungen" #: perllib/FixMyStreet/App/Controller/Admin.pm:1134 msgid "Survey" @@ -3314,8 +3308,8 @@ msgid "" "Thank you — you can <a href=\"%s\">view your updated problem</a> on " "the site." msgstr "" -"Danke &mdash; Sie können Ihre aktualisierte Meldung <a href=\"%s" -"\">auf der Webseite anschauen</a>" +"Danke — Sie können Ihre aktualisierte Meldung <a href=\"%s\">auf " +"der Webseite anschauen</a>." #: templates/web/emptyhomes/tokens/confirm_problem.html:6 #: templates/web/emptyhomes/tokens/confirm_problem.html:8 @@ -3394,13 +3388,12 @@ msgid "That problem will now be resent." msgstr "" #: perllib/FixMyStreet/App/Controller/Report.pm:117 -#, fuzzy msgid "That report cannot be viewed on %s." -msgstr "Diese Meldung wurde von Fix My Zürich entfernt." +msgstr "Diese Meldung wurde von Züri wie neu entfernt." #: perllib/FixMyStreet/App/Controller/Report.pm:111 msgid "That report has been removed from FixMyStreet." -msgstr "Diese Meldung wurde von Fix My Zürich entfernt." +msgstr "Diese Meldung wurde von Züri wie neu entfernt." #: templates/web/emptyhomes/static/about.html:7 msgid "The Empty Homes Agency" @@ -3429,7 +3422,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 " @@ -3645,6 +3638,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 "" @@ -3672,6 +3671,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" @@ -3733,7 +3733,6 @@ msgid "Total" msgstr "Total" #: templates/web/seesomething/report/new/fill_in_details_form.html:24 -#, fuzzy msgid "Transport Category" msgstr "Kategorie" @@ -3753,8 +3752,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" @@ -3797,7 +3796,7 @@ msgstr "" #: templates/web/default/admin/body-form.html:82 #: templates/web/zurich/admin/body-form.html:47 msgid "Update body" -msgstr "Beschreibung" +msgstr "Speichern" #: templates/web/default/admin/index.html:30 msgid "Update breakdown by state" @@ -3838,8 +3837,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!" @@ -3878,7 +3877,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" @@ -3891,8 +3890,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" @@ -3910,13 +3909,13 @@ msgstr "" #: templates/web/seesomething/around/display_location.html:0 #: templates/web/seesomething/around/display_location.html:16 msgid "Viewing a location" -msgstr "" +msgstr "Meldung erfassen" #: templates/web/bromley/report/display.html:0 #: templates/web/default/report/display.html:0 #: templates/web/fixmystreet/report/display.html:0 msgid "Viewing a problem" -msgstr "" +msgstr "Meldung anschauen" #: templates/web/default/reports/body.html:14 msgid "Wards of this council" @@ -3933,9 +3932,18 @@ 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ä" +"tigen." #: templates/web/emptyhomes/tokens/confirm_problem.html:18 #: templates/web/emptyhomes/tokens/confirm_problem.html:20 @@ -4107,7 +4115,7 @@ msgstr "" msgid "You can <a href=\"%s%s\">view the problem on this site</a>." msgstr "" "Danke! Sie können Ihre aktualisierte Meldung <a href=\"%s%s\">auf der " -"Webseite anschauen</a>" +"Webseite anschauen</a>." #: templates/web/default/report/new/councils_text_none.html:11 #: templates/web/default/report/new/councils_text_none.html:13 @@ -4140,6 +4148,8 @@ msgid "" "You have already attached a photo to this report, attaching another one will " "replace it." msgstr "" +"Sie haben bereits ein Photo angehängt. Laden Sie ein neues hoch um es " +"zu ersetzen." #: templates/web/bromley/report/display.html:108 #: templates/web/default/report/update-form.html:59 @@ -4174,7 +4184,7 @@ msgstr "" #: templates/web/zurich/tokens/confirm_problem.html:5 #: templates/web/zurich/tokens/confirm_problem.html:6 msgid "You have successfully confirmed your email address." -msgstr "Sie haben Ihre Meldung erfolgreich bestätigt" +msgstr "Sie haben Ihre Meldung erfolgreich bestätigt. " #: templates/web/default/tokens/confirm_problem.html:14 #: templates/web/default/tokens/confirm_problem.html:15 @@ -4218,7 +4228,7 @@ msgstr "" #: templates/web/fixmystreet/my/my.html:14 #: templates/web/fixmystreet/my/my.html:3 msgid "Your Reports" -msgstr "" +msgstr "Ihre Meldungen" #: templates/web/bromley/report/display.html:41 #: templates/web/bromley/report/display.html:43 @@ -4364,8 +4374,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" @@ -4383,13 +4393,12 @@ msgstr "z.B. ‘%s’ oder ‘%s’" #: templates/web/default/admin/index.html:15 #: templates/web/zurich/admin/index.html:5 msgid "from %d different users" -msgstr "" +msgstr "von %d verschiedenen Personen" #: templates/web/fixmystreet/report/_item.html:12 #: templates/web/zurich/report/_item.html:16 -#, fuzzy msgid "last updated %s" -msgstr "Letzte Bearbeitung" +msgstr "letzte Bearbeitung %s" #: perllib/Utils.pm:263 msgid "less than a minute" @@ -4401,7 +4410,7 @@ msgstr "" #: templates/web/default/report/updates.html:27 msgid "marked as fixed" -msgstr "als gelöst markiert" +msgstr "als erledigt markiert" #: perllib/FixMyStreet/App/Controller/Admin.pm:128 #: templates/web/default/admin/questionnaire.html:15 @@ -4410,9 +4419,8 @@ msgid "n/a" msgstr "" #: templates/web/default/report/updates.html:32 -#, fuzzy msgid "no further action" -msgstr "Bearbeitung abschliessen" +msgstr "Abschliessen" #: perllib/FixMyStreet/DB/Result/Comment.pm:193 msgid "not the council's responsibility" @@ -4430,16 +4438,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 +4501,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 de9746425..98c925008 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 15:57+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" @@ -505,21 +505,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" @@ -559,7 +559,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" @@ -623,8 +623,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:" @@ -643,7 +643,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 @@ -652,8 +652,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" @@ -677,8 +677,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:" @@ -828,8 +828,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:" @@ -871,9 +871,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:" @@ -987,8 +987,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:" @@ -1353,8 +1353,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" @@ -1454,7 +1454,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 " @@ -1507,13 +1507,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" @@ -1523,7 +1523,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" @@ -1536,8 +1536,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 "" @@ -1737,8 +1737,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:" @@ -1872,7 +1872,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" @@ -1930,7 +1930,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" @@ -1959,8 +1959,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" @@ -1973,7 +1973,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 "" @@ -2072,7 +2072,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 @@ -2081,8 +2081,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" @@ -2184,8 +2184,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:" @@ -2223,8 +2223,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" @@ -2247,7 +2247,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" @@ -2770,17 +2770,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 "" @@ -3046,7 +3046,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 @@ -3095,13 +3095,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 "" @@ -3325,14 +3325,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" @@ -3368,7 +3368,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:" @@ -3391,8 +3391,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" @@ -3402,14 +3402,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 @@ -3438,7 +3438,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 @@ -3615,7 +3615,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 " @@ -3875,6 +3875,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" @@ -3902,6 +3908,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." @@ -3987,8 +3994,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" @@ -4075,8 +4082,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!" @@ -4115,7 +4122,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" @@ -4128,8 +4135,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" @@ -4170,7 +4177,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." @@ -4643,8 +4656,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" @@ -4709,16 +4722,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" @@ -4771,8 +4784,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 c790fecf6..bc9dec3a6 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 15:57+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" @@ -512,21 +512,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" @@ -566,7 +566,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ø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:" @@ -652,7 +652,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 @@ -661,8 +661,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" @@ -687,8 +687,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:" @@ -838,8 +838,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:" @@ -882,9 +882,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:" @@ -998,8 +998,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:" @@ -1369,8 +1369,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" @@ -1470,7 +1470,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 " @@ -1524,13 +1524,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" @@ -1541,7 +1541,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" @@ -1554,8 +1554,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 "" @@ -1757,8 +1757,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:" @@ -1893,7 +1893,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:" @@ -1951,7 +1951,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" @@ -1980,8 +1980,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" @@ -1994,7 +1994,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 "" @@ -2097,7 +2097,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 @@ -2106,8 +2106,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" @@ -2211,8 +2211,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:" @@ -2251,8 +2251,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" @@ -2274,7 +2274,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" @@ -2802,17 +2802,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 "" @@ -3081,7 +3081,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 @@ -3130,13 +3130,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 "" @@ -3361,14 +3361,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" @@ -3406,7 +3406,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:" @@ -3429,8 +3429,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" @@ -3440,14 +3440,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 @@ -3476,7 +3476,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 @@ -3658,7 +3658,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 " @@ -3924,6 +3924,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" @@ -3951,6 +3957,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." @@ -4039,8 +4046,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" @@ -4129,8 +4136,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!" @@ -4169,7 +4176,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" @@ -4182,8 +4189,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" @@ -4225,7 +4232,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 " @@ -4709,8 +4723,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" @@ -4775,16 +4789,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" @@ -4838,8 +4852,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/perllib/CronFns.pm b/perllib/CronFns.pm index 878482339..ac7f85596 100755 --- a/perllib/CronFns.pm +++ b/perllib/CronFns.pm @@ -36,7 +36,7 @@ sub site { my $base_url = shift; my $site = 'fixmystreet'; $site = 'emptyhomes' if $base_url =~ 'emptyhomes'; - $site = 'zurich' if $base_url =~ 'zurich'; + $site = 'zurich' if $base_url =~ /zurich|zueri/; return $site; } diff --git a/perllib/FixMyStreet/App.pm b/perllib/FixMyStreet/App.pm index 4469ad1c9..ee5b11876 100644 --- a/perllib/FixMyStreet/App.pm +++ b/perllib/FixMyStreet/App.pm @@ -86,6 +86,13 @@ __PACKAGE__->config( # Start the application __PACKAGE__->setup(); +# Due to some current issues with proxyings, need to manually +# tell the code we're secure if we are. +after 'prepare_headers' => sub { + my $self = shift; + $self->req->secure( 1 ) if $self->config->{BASE_URL} eq 'https://www.zueriwieneu.ch'; +}; + # set up DB handle for old code FixMyStreet->configure_mysociety_dbhandle; diff --git a/perllib/FixMyStreet/Cobrand/Zurich.pm b/perllib/FixMyStreet/Cobrand/Zurich.pm index 7ac776df2..806fc8391 100644 --- a/perllib/FixMyStreet/Cobrand/Zurich.pm +++ b/perllib/FixMyStreet/Cobrand/Zurich.pm @@ -63,6 +63,7 @@ sub problem_as_hashref { delete $hashref->{ $var }; } $hashref->{detail} = _('This report is awaiting moderation.'); + $hashref->{title} = _('This report is awaiting moderation.'); $hashref->{state} = 'submitted'; $hashref->{state_t} = _('Submitted'); } else { @@ -92,7 +93,7 @@ sub updates_as_hashref { $hashref->{update_pp} = $self->prettify_dt( $problem->lastupdate ); if ( $problem->state eq 'fixed - council' ) { - $hashref->{details} = FixMyStreet::App::View::Web->add_links( $ctx, $problem->extra->{public_response} ); + $hashref->{details} = FixMyStreet::App::View::Web->add_links( $ctx, $problem->extra ? $problem->extra->{public_response} : '' ); } elsif ( $problem->state eq 'closed' ) { $hashref->{details} = sprintf( _('Assigned to %s'), $problem->body($ctx)->name ); } @@ -220,16 +221,13 @@ sub admin_type { my $body = $c->user->from_body; $c->stash->{body} = $body; - my $parent = $body->parent; - my $children = $body->bodies->count; - my $type; + my $parent = $body->parent; if (!$parent) { $type = 'super'; - } elsif ($parent && $children) { - $type = 'dm'; - } elsif ($parent) { - $type = 'sdm'; + } else { + my $grandparent = $parent->parent; + $type = $grandparent ? 'sdm' : 'dm'; } $c->stash->{admin_type} = $type; diff --git a/perllib/FixMyStreet/Map/Zurich.pm b/perllib/FixMyStreet/Map/Zurich.pm index 73ebc5608..e09f8c90f 100644 --- a/perllib/FixMyStreet/Map/Zurich.pm +++ b/perllib/FixMyStreet/Map/Zurich.pm @@ -31,7 +31,7 @@ sub map_tiles { } sub base_tile_url { - return 'http://www.wmts.stadt-zuerich.ch/Hybrid/MapServer/WMTS/tile/1.0.0/Hybrid/default/nativeTileMatrixSet'; + return '/maps/Hybrid/1.0.0/Hybrid/default/nativeTileMatrixSet'; } sub copyright { diff --git a/perllib/FixMyStreet/SendReport/Zurich.pm b/perllib/FixMyStreet/SendReport/Zurich.pm index 4930ff61e..d46561e9e 100644 --- a/perllib/FixMyStreet/SendReport/Zurich.pm +++ b/perllib/FixMyStreet/SendReport/Zurich.pm @@ -51,9 +51,22 @@ sub get_template { return $template; } -# Zurich emails come from the site itself +# Zurich emails come from the site itself, unless it's to an external body, +# in which case it's from the category/body sub send_from { my ( $self, $row ) = @_; + + if ( $row->external_body ) { + my $body = @{ $self->bodies }[0]; + my $body_email = $body->endpoint; + my $contact = FixMyStreet::App->model("DB::Contact")->find( { + body_id => $body->id, + category => $row->category + } ); + $body_email = $contact->email if $contact && $contact->email; + return [ $body_email, FixMyStreet->config('CONTACT_NAME') ]; + } + return [ FixMyStreet->config('CONTACT_EMAIL'), FixMyStreet->config('CONTACT_NAME') ]; } diff --git a/t/app/controller/auth.t b/t/app/controller/auth.t index 67466e959..8d7bfbf4d 100644 --- a/t/app/controller/auth.t +++ b/t/app/controller/auth.t @@ -95,7 +95,7 @@ $mech->not_logged_in_ok; $mech->log_out_ok; $mech->get_ok($link); is $mech->uri, $link, "not logged in"; - $mech->content_contains( 'Link too old or already used', + $mech->content_contains( 'too old or already used', 'token now invalid' ); $mech->not_logged_in_ok; } diff --git a/t/cobrand/zurich.t b/t/cobrand/zurich.t index 71c904ed9..ac0cc52b3 100644 --- a/t/cobrand/zurich.t +++ b/t/cobrand/zurich.t @@ -19,6 +19,8 @@ $mech->content_like( qr/zurich/i ); # Set up bodies my $zurich = $mech->create_body_ok( 1, 'Zurich' ); +$zurich->parent( undef ); +$zurich->update; my $division = $mech->create_body_ok( 2, 'Division 1' ); $division->parent( $zurich->id ); $division->send_method( 'Zurich' ); @@ -169,6 +171,31 @@ like $email->header('From'), qr/division\@example.org/, 'from line looks correct like $email->body, qr/FINAL UPDATE/, 'body looks correct'; $mech->clear_emails_ok; +# Assign directly to planned, don't confirm email +@reports = $mech->create_problems_for_body( 1, 2, 'Second', { + state => 'unconfirmed', + confirmed => undef, + cobrand => 'zurich', +}); +$report = $reports[0]; + +$mech->get_ok( '/admin/report_edit/' . $report->id ); +$mech->submit_form_ok( { with_fields => { state => 'planned' } } ); +$mech->get_ok( '/report/' . $report->id ); +$mech->content_contains('In Bearbeitung'); +$mech->content_contains('Second Test'); + +$mech->get_ok( '/admin/report_edit/' . $report->id ); +$mech->content_contains( 'Unbestätigt' ); +$mech->submit_form_ok( { button => 'publish_response', with_fields => { status_update => 'FINAL UPDATE' } } ); + +$mech->get_ok( '/report/' . $report->id ); +$mech->content_contains('Erledigt'); +$mech->content_contains('Second Test'); +$mech->content_contains('FINAL UPDATE'); + +$mech->email_count_is(0); + # Report assigned to third party @reports = $mech->create_problems_for_body( 1, 2, 'Third', { diff --git a/templates/email/default/login.txt b/templates/email/default/login.txt index 608d99ee9..762407b01 100644 --- a/templates/email/default/login.txt +++ b/templates/email/default/login.txt @@ -1,4 +1,4 @@ -Subject: [% loc('Your FixMyStreet.com account details') %] +Subject: Your FixMyStreet.com account details Please click on the link below to confirm your email address. Then you will be able to view your problem reports and manage them more easily. diff --git a/templates/email/zurich/alert-moderation-overdue.txt b/templates/email/zurich/alert-moderation-overdue.txt index f410956c0..c31d5c349 100644 --- a/templates/email/zurich/alert-moderation-overdue.txt +++ b/templates/email/zurich/alert-moderation-overdue.txt @@ -1,6 +1,6 @@ Subject: eskalierte Meldungen auf Züri wie neu -Die folgenden Meldungen auf Züri wie neu sind älter als einen Tag und müssen dringend bearbeitet werden: +Die folgenden Meldungen auf <<Züri wie neu>> sind älter als einen Tag und müssen dringend bearbeitet werden: <?=$values['data']?> diff --git a/templates/email/zurich/login.txt b/templates/email/zurich/login.txt new file mode 100644 index 000000000..6c7b91330 --- /dev/null +++ b/templates/email/zurich/login.txt @@ -0,0 +1,6 @@ +Subject: Ihr Züri wie neu Konto + +Bitte klicken Sie auf den Link um Ihre E-Mail-Adresse zu bestätigen und sich direkt einzuloggen. + +[% c.uri_for_action( 'auth/token', token ) %] + diff --git a/templates/email/zurich/problem-closed.txt b/templates/email/zurich/problem-closed.txt index f16c3534d..bc0a4141f 100644 --- a/templates/email/zurich/problem-closed.txt +++ b/templates/email/zurich/problem-closed.txt @@ -1,17 +1,18 @@ Subject: Züri wie neu: Meldung #[% problem.id %] -Guten Tag [% problem.name %] +Grüezi [% problem.name %] -Antwort auf Ihre Meldung: +Besten Dank für Ihre Meldung auf <<Züri wie neu>>. Ihr Anliegen wurde wie folgt beantwortet: [% problem.extra.public_response %] -Um die Meldung auf der Webseite zu betrachen, klicken Sie auf folgenden Link: +Unter: [% url %] +finden Sie Ihre Meldung auf der Website. -Ihre Meldung: +Ihre Meldung lautet: [% problem.detail %] -Dieses E-Mail wurde automatisch generiert. Bitte antworten Sie nicht auf dieses E-Mail. +Dieses E-Mail wurde automatisch generiert. Bitte antworten Sie nicht darauf. diff --git a/templates/email/zurich/problem-confirm.txt b/templates/email/zurich/problem-confirm.txt index f1f1af7e9..9518481e5 100755..100644 --- a/templates/email/zurich/problem-confirm.txt +++ b/templates/email/zurich/problem-confirm.txt @@ -1,13 +1,17 @@ Subject: Züri wie neu: Meldung #[% report.id %] -Guten Tag [% report.name %] +Grüezi [% report.name %] -Bitte klicken Sie auf den untenstehenden Link, um Ihre Meldung zu bestätigen. Falls der Link nicht funktioniert, kopieren Sie ihn in Ihren Browser: +Besten Dank für Ihre Meldung auf <<Züri wie neu>>. Klicken Sie bitte auf diesen Link, um Ihre E-Mail-Adresse zu bestätigen und über den Status der Meldung informiert zu bleiben. Falls der Link nicht funktioniert, kopieren Sie ihn in Ihren Browser: [% token_url %] -Ihre Meldung: +Wir werden Ihr Anliegen innerhalb der nächsten sechs Arbeitstage beantworten. + + +Ihre Meldung lautet: [% report.detail %] -Dieses E-Mail wurde automatisch generiert. Bitte antworten Sie nicht auf dieses E-Mail. + +Dieses E-Mail wurde automatisch generiert. Bitte antworten Sie nicht darauf. diff --git a/templates/email/zurich/problem-external.txt b/templates/email/zurich/problem-external.txt index 55263f4a8..21bd364ed 100644 --- a/templates/email/zurich/problem-external.txt +++ b/templates/email/zurich/problem-external.txt @@ -1,15 +1,17 @@ Subject: Züri wie neu: Meldung #[% problem.id %] -Guten Tag [% problem.name %] +Grüezi [% problem.name %] -Ihre Meldung wurde an [% problem.body(c).name %] weitergeleitet. +Besten Dank für Ihre Meldung auf <<Züri wie neu>>. Wir haben Ihr Anliegen an [% problem.body(c).name %] weitergeleitet, da es nicht in die Zuständigkeit der Stadt Zürich fällt. -Um die Meldung auf der Webseite zu betrachen, klicken Sie auf folgenden Link: +Unter: [% url %] +finden Sie Ihre Meldung auf der Website. -Ihre Meldung: + +Ihre Meldung lautet: [% problem.detail %] -Dieses E-Mail wurde automatisch generiert. Bitte antworten Sie nicht auf dieses E-Mail. +Dieses E-Mail wurde automatisch generiert. Bitte antworten Sie nicht darauf. diff --git a/templates/email/zurich/problem-rejected.txt b/templates/email/zurich/problem-rejected.txt index 410a77a04..99917f075 100644 --- a/templates/email/zurich/problem-rejected.txt +++ b/templates/email/zurich/problem-rejected.txt @@ -1,12 +1,14 @@ Subject: Züri wie neu: Meldung #[% problem.id %] -Guten Tag [% problem.name %] +Grüezi [% problem.name %] -Ihre Meldung wurde aufgrund des Inhalts zurückgewiesen. +Ihre Meldung wurde aufgrund des Inhalts zurückgewiesen: +Die Stadt Zürich toleriert keine beleidigenden, rassistischen oder sexistischen Meldungen. Offensichtliche Falschmeldungen werden nicht behandelt. -Ihre Meldung: + +Ihre Meldung lautet: [% problem.detail %] -Dieses E-Mail wurde automatisch generiert. Bitte antworten Sie nicht auf dieses E-Mail. +Dieses E-Mail wurde automatisch generiert. Bitte antworten Sie nicht darauf. diff --git a/templates/email/zurich/submit-external-personal.txt b/templates/email/zurich/submit-external-personal.txt index 698c5297a..1c4320af1 100644 --- a/templates/email/zurich/submit-external-personal.txt +++ b/templates/email/zurich/submit-external-personal.txt @@ -1,6 +1,6 @@ Subject: Züri wie neu: Neue Meldung #<?=$values['id']?> -Guten Tag <?=$values['bodies_name']?>, +Grüezi <?=$values['bodies_name']?>, Diese Meldung wurde Ihnen von der Stadt Zürich gesendet, da es Ihr Zuständigkeitsgebiet betreffen könnte. diff --git a/templates/email/zurich/submit-external.txt b/templates/email/zurich/submit-external.txt index 56b5e4196..ec497f862 100644 --- a/templates/email/zurich/submit-external.txt +++ b/templates/email/zurich/submit-external.txt @@ -1,6 +1,6 @@ Subject: Züri wie neu: Neue Meldung #<?=$values['id']?> -Guten Tag <?=$values['bodies_name']?>, +Grüezi <?=$values['bodies_name']?>, Diese Meldung wurde Ihnen von der Stadt Zürich gesendet, da es Ihr Zuständigkeitsgebiet betreffen könnte. diff --git a/templates/web/default/admin/user-form.html b/templates/web/default/admin/user-form.html index eec54d447..9c60ec940 100644 --- a/templates/web/default/admin/user-form.html +++ b/templates/web/default/admin/user-form.html @@ -1,7 +1,7 @@ <form method="post" action="[% c.uri_for( 'user_edit', user.id ) %]" enctype="application/x-www-form-urlencoded" accept-charset="utf-8"> <input type="hidden" name="token" value="[% token %]" > <input type="hidden" name="submit" value="1" > - <ul> + <ul class="no-bullets"> <li>[% loc('Name:') %] <input type='text' name='name' id='name' value='[% user.name | html %]'></li> <li>[% loc('Email:') %] <input type='text' id='email' name='email' value='[% user.email | html %]'></li> <li>[% loc('Body:') %] <select id='body' name='body'> 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 %] diff --git a/templates/web/zurich/admin/report_edit-sdm.html b/templates/web/zurich/admin/report_edit-sdm.html index 39d74881c..85fa0a067 100644 --- a/templates/web/zurich/admin/report_edit-sdm.html +++ b/templates/web/zurich/admin/report_edit-sdm.html @@ -7,6 +7,9 @@ -%] [% map_html %] + <p id='sub_map_links'> + <a class="hidden-nojs" id="map_layer_toggle" href="">Stadtplan</a> + </p> </div> [% status_message %] @@ -58,8 +61,10 @@ </ul> -<p><input type="submit" name="Submit changes" value="[% loc('Submit changes') %]" ></p> -<p align="right"><input type="submit" name="no_more_updates" value="[% loc('No further updates') %]"></p> +<p class="cf"> + <input style="float:left" type="submit" name="Submit changes" value="[% loc('Submit changes') %]" > + <input style="float:right" type="submit" name="no_more_updates" value="[% loc('No further updates') %]"> +</p> </form> [% INCLUDE 'admin/list_updates.html' %] diff --git a/templates/web/zurich/admin/report_edit.html b/templates/web/zurich/admin/report_edit.html index 059c4b5c0..b604a7ea0 100644 --- a/templates/web/zurich/admin/report_edit.html +++ b/templates/web/zurich/admin/report_edit.html @@ -7,6 +7,9 @@ -%] [% map_html %] + <p id='sub_map_links'> + <a class="hidden-nojs" id="map_layer_toggle" href="">Stadtplan</a> + </p> </div> [% status_message %] @@ -95,15 +98,19 @@ [% IF problem.state == 'unconfirmed' OR problem.state == 'confirmed' %] <ul class="no-bullets"> -<li class="assignation"> -<label for="body_subdivision">[% loc('Assign to subdivision:') %]</label> +[% list = FOR body IN bodies %] + [%- NEXT UNLESS body.parent.id == c.user.from_body.id %] + <option value="[% body.id %]"[% IF body.id == problem.bodies_str %] selected[% END %]>[% body.name %]</option> +[% END %] + [% IF admin_type != 'super' AND list %] + <li class="assignation"> + <label for="body_subdivision">[% loc('Assign to subdivision:') %]</label> <select name="body_subdivision" id="body_subdivision"> <option value="">--</option> - [% FOR body IN bodies %] - [% NEXT UNLESS body.parent.id == c.user.from_body.id %] - <option value="[% body.id %]"[% IF body.id == problem.bodies_str %] selected[% END %]>[% body.name %]</option> - [% END %] + [% list %] </select> + </li> + [% END %] <li class="assignation"> <label for="category"> @@ -147,21 +154,32 @@ $(function(){ [% ELSIF problem.state == 'planned' %] -<ul> +<ul class="no-bullets"> +[% list = FOR body IN bodies %] + [%- NEXT UNLESS body.parent.id == c.user.from_body.id %] + <option value="[% body.id %]">[% body.name %]</option> +[% END %] + [% IF admin_type != 'super' AND list %] <li class="assignation"> <label for="body_subdivision">[% loc('Assign to subdivision:') %]</label> <select name="body_subdivision" id="body_subdivision"> <option value="" selected>--</option> - [% FOR body IN bodies %] - [% NEXT UNLESS body.parent.id == c.user.from_body.id %] - <option value="[% body.id %]">[% body.name %]</option> - [% END %] + [% list %] </select> </li> + [% END %] <li><label for="status_update">[% loc('Public response:') %]</label> - <textarea name='status_update' id='status_update' cols=60 rows=5>[% problem.extra.public_response | html %]</textarea> + <textarea name='status_update' id='status_update' cols=60 rows=5> + [%- IF problem.extra.public_response -%] + [%- problem.extra.public_response | html -%] + [%- ELSE -%] + +Freundliche Grüsse + +Ihre Stadt Zürich + [%- END %]</textarea> </li> </ul> diff --git a/templates/web/zurich/around/intro.html b/templates/web/zurich/around/intro.html index f7a4904e3..b60fa7388 100644 --- a/templates/web/zurich/around/intro.html +++ b/templates/web/zurich/around/intro.html @@ -5,11 +5,6 @@ $(function() { $( "#pc" ).autocomplete({ minLength: 3, - select: function(event, ui) { - $(this).val(ui.item.value); - this.form.submit(); - return true; - }, source: "/ajax/geocode" }); }); diff --git a/templates/web/zurich/auth/general.html b/templates/web/zurich/auth/general.html index 23af75dcf..7f6403d00 100644 --- a/templates/web/zurich/auth/general.html +++ b/templates/web/zurich/auth/general.html @@ -61,7 +61,7 @@ END %] <label for="password_register">[% loc('Password (optional)') %]</label> <div class="form-txt-submit-box"> <input type="password" class="required" name="password_register" id="password_register" value="" placeholder="[% loc('Enter a password') %]"> - <input class="green-btn" type="submit" name="email_sign_in" value="Registieren"> + <input class="green-btn" type="submit" name="email_sign_in" value="Registrieren"> </div> </div> diff --git a/templates/web/zurich/faq/faq-de-ch.html b/templates/web/zurich/faq/faq-de-ch.html index 3ddfd3cb9..f15196f8d 100755..100644 --- a/templates/web/zurich/faq/faq-de-ch.html +++ b/templates/web/zurich/faq/faq-de-ch.html @@ -4,24 +4,24 @@ <dl> -<dt>Was ist «Züri wie neu»</dt> +<dt>Was ist «Züri wie neu»</dt> <dd> -«Züri wie neu» ist eine Online-Plattform, über die die Einwohnerinnen und -Einwohner der Stadt Zürich auf Mängel und Schäden der städtischen Infrastruktur -hinweisen können. «Züri wie neu» wird von der Stadtverwaltung moderiert und -transparent geführt. Die Meldungen werden den zuständigen Fachstellen -zugewiesen und innert fünf Arbeitstagen abschliessend beantwortet. Fällt eine -Meldung nicht in den Zuständigkeitsbereich der Stadtverwaltung, wird die -Meldung anonymisiert der zuständigen dritten Stelle per E-Mail zugestellt. +«Züri wie neu» ist eine Online-Plattform, über die die Einwohnerinnen und +Einwohner der Stadt Zürich auf Mängel und Schäden der städtischen Infrastruktur +hinweisen können. «Züri wie neu» wird von der Stadtverwaltung moderiert und +transparent geführt. Die Meldungen werden innerhalb von einem Arbeitstag den zuständigen Fachstellen +zugewiesen und innert fünf Arbeitstagen abschliessend beantwortet. Fällt eine +Meldung nicht in den Zuständigkeitsbereich der Stadtverwaltung, wird die +Meldung anonymisiert der zuständigen dritten Stelle per E-Mail zugestellt. </dd> -<dt>Welche Probleme kann ich über «Züri wie neu» melden?</dt> +<dt>Welche Probleme kann ich über «Züri wie neu» melden?</dt> <dd> -<p>Gemeldet werden können sämtliche Schäden an der Infrastruktur der Stadt Zürich. +<p>Gemeldet werden können sämtliche Schäden an der Infrastruktur der Stadt Zürich. Dabei kann es sich um ein Loch im Strassenbelag, ein Graffiti am Stadthaus oder -eine durch Vandalen beschädigte Parkbank handeln. +eine durch Vandalen beschädigte Parkbank handeln. -<p>Es können Probleme zu folgenden Kategorien gemeldet werden: +<p>Es können Probleme zu folgenden Kategorien gemeldet werden: <ul> <li>Abfall / Sammelstellen</li> @@ -29,51 +29,54 @@ eine durch Vandalen beschädigte Parkbank handeln. <li>Graffiti</li> <li>Spielplatz / Sitzbank</li> <li>Strasse / Trottoir / Platz</li> -<li>Tiere / Grünflächen</li> +<li>Tiere / Grünflächen</li> </ul> </dd> -<dt>Was kann ich nicht über «Züri wie neu» melden?</dt> - +<dt>Was kann ich nicht über «Züri wie neu» melden?</dt> <dd> -Mängel die nicht auf Stadtgebiet liegen. -<br>Melden Sie «Züri wie neu» KEINE Notfälle. Die Notrufnummern lauten: -<br>Medizinisch - 144 Polizei - 117 Feuer - 118 Allgemein - 112 +<ul> +<li>Mängel die nicht auf Stadtgebiet liegen.</li> +<li>Melden Sie «Züri wie neu» KEINE Notfälle. Die Notrufnummern lauten: + <br>Medizinisch - 144 Polizei - 117 Feuer - 118 Allgemein - 112</li> +<li>Allgemeine Verschönerungs- und Verbesserungsvorschläge</li> +</ul> </dd> <dt>Wie verwende ich die Webseite?</dt> <dd> <p> -Geben Sie zuerst eine Adresse an oder lassen sie ihren Standort automatisch -über den entsprechenden Link lokalisieren. Mittels Mausklick in die danach -angezeigte Karte können Sie den exakten Ort des Mangels angeben. Als letzten -Schritt füllen sie die Felder des Formulars aus und schicken die Meldung ab. +Geben Sie zuerst eine Adresse an oder lassen Sie Ihren Standort automatisch +über den entsprechenden Link lokalisieren. Mittels Mausklick in die danach +angezeigte Karte können Sie den exakten Ort des Mangels angeben. Als letzten +Schritt füllen Sie die Felder des Formulars aus und schicken die Meldung ab. </p> <p> -Weiter können Sie bestehende Meldungen sowie auch die Rückmeldungen der +Weiter können Sie bestehende Meldungen sowie auch die Rückmeldungen der Verwaltung betrachten. </p> </dd> -<dt>Wie werden die Probleme gelöst?</dt> +<dt>Wie werden die Probleme gelöst?</dt> <dd> -Die Meldungen werden innerhalb von fünf Arbeitstagen von den dafür zuständigen -Fachstellen bearbeitet und mit einer entsprechenden Rückmeldung versehen. +Die Meldungen werden innerhalb von einem Arbeitstag den zuständigen Fachstellen +zugewiesen und innert fünf Arbeitstagen von den dafür zuständigen +Fachstellen bearbeitet sowie mit einer entsprechenden Rückmeldung versehen. </dd> -<dt>Kann ich «Züri wie neu» auf meinem Smartphone nutzen?</dt> +<dt>Kann ich «Züri wie neu» auf meinem Smartphone nutzen?</dt> <dd> -Ja, sowohl über die für mobile Geräte optimierte Webseite, als auch über die +Ja, sowohl über die für mobile Geräte optimierte Webseite, als auch über die iOS- und Android-App. </dd> -<dt>Kann ich auch Probleme ausserhalb von Zürich melden?</dt> +<dt>Kann ich auch Probleme ausserhalb von Zürich melden?</dt> <dd>Nein.</dd> <dt>Werden meine E-Mail-Adresse, mein Name und meine Telefonnummer vertraulich behandelt?</dt> <dd> -Die Kontaktinformationen werden nur stadtintern für Rückfragen verwendet. Sie +Die Kontaktinformationen werden nur stadtintern für Rückfragen verwendet. Sie werden weder im Internet publiziert noch an Dritte weitergegeben. </dd> diff --git a/templates/web/zurich/footer.html b/templates/web/zurich/footer.html index ece8763f0..2304c048e 100644 --- a/templates/web/zurich/footer.html +++ b/templates/web/zurich/footer.html @@ -33,7 +33,6 @@ © 2013 Stadt Zürich <span class="hidden">|</span> <a href="http://www.stadt-zuerich.ch/content/portal/de/index/footer/rechtliche_hinweise.html">Rechtliche Hinweise</a> <span class="hidden">|</span> <a href="http://www.stadt-zuerich.ch/content/portal/de/index/footer/impressum.html">Impressum</a> - <span class="hidden">|</span> <a href="http://www.stadt-zuerich.ch/content/portal/de/index/footer/barrierefreiheit.html">Barrierefreiheit</a> </div> </div> diff --git a/templates/web/zurich/header.html b/templates/web/zurich/header.html index 7d18459b8..891c6f1d3 100644 --- a/templates/web/zurich/header.html +++ b/templates/web/zurich/header.html @@ -20,14 +20,14 @@ <link rel="stylesheet" href="[% start %][% version('/cobrands/' _ c.cobrand.moniker _ '/layout.css') %]"> <![endif]--> -<!-- CDN for now FIXME --><link rel="stylesheet" href="http://code.jquery.com/ui/1.9.2/themes/redmond/jquery-ui.css"> + <link rel="stylesheet" href="//ajax.googleapis.com/ajax/libs/jqueryui/1.9.2/themes/redmond/jquery-ui.css"> <script src="[% start %][% version('/js/modernizr.custom.js') %]" charset="utf-8"></script> <script src="[% start %][% version('/cobrands/fixmystreet/position_map.js') %]" charset="utf-8"></script> [% INCLUDE 'common_header_tags.html', js_override = '/cobrands/fixmystreet/fixmystreet.js', site_title = 'Züri wie neu' %] [% extra_js %] -<!-- CDN for now FIXME --><script src="http://code.jquery.com/ui/1.9.2/jquery-ui.js" charset="utf-8"></script> + <script src="//ajax.googleapis.com/ajax/libs/jqueryui/1.9.2/jquery-ui.min.js" charset="utf-8"></script> [% INCLUDE 'tracking_code.html' %] diff --git a/templates/web/zurich/tracking_code.html b/templates/web/zurich/tracking_code.html index f94fbdcd5..f98a1e038 100644 --- a/templates/web/zurich/tracking_code.html +++ b/templates/web/zurich/tracking_code.html @@ -1,8 +1,11 @@ -[% IF c.config.BASE_URL == "http://zurich.fixmystreet.staging.mysociety.org" %] +[% + SET ga_code = 'UA-38427437-1'; + SET ga_code = 'UA-39223200-1' IF c.config.BASE_URL == "http://www.zueriwieneu.ch"; +%] <script type="text/javascript"> var _gaq = _gaq || []; - _gaq.push(['_setAccount', 'UA-38427437-1']); + _gaq.push(['_setAccount', '[% ga_code %]']); _gaq.push (['_gat._anonymizeIp']); _gaq.push(['_trackPageview']); @@ -13,6 +16,3 @@ })(); </script> -[% ELSE %] -<!-- Tracking code not inserted as "[% c.config.BASE_URL %]" not "http://www.fixmystreet.com" --> -[% END %] diff --git a/web/cobrands/fixmystreet/fixmystreet.js b/web/cobrands/fixmystreet/fixmystreet.js index d9360d0e2..b490c6177 100644 --- a/web/cobrands/fixmystreet/fixmystreet.js +++ b/web/cobrands/fixmystreet/fixmystreet.js @@ -61,7 +61,7 @@ $(function(){ } else if (window.location.href.indexOf('oxfordshire') != -1) { cobrand = 'oxfordshire'; is_small_map = true; - } else if (window.location.href.indexOf('zurich') != -1) { + } else if (window.location.href.indexOf('zurich') != -1 || window.location.href.indexOf('zueri') != -1) { cobrand = 'zurich'; } diff --git a/web/cobrands/zurich/base.scss b/web/cobrands/zurich/base.scss index c3246a1b1..a89aec2fd 100644 --- a/web/cobrands/zurich/base.scss +++ b/web/cobrands/zurich/base.scss @@ -40,6 +40,14 @@ &:before { display: none; } + &#closed { + color: #1a1a1a; + background: #e25436; + } + &#progress { + color: #1a1a1a; + background: #f3d74b; + } } } diff --git a/web/js/map-wmts-zurich.js b/web/js/map-wmts-zurich.js index 9fed68b8a..cfff686e6 100644 --- a/web/js/map-wmts-zurich.js +++ b/web/js/map-wmts-zurich.js @@ -93,7 +93,7 @@ $(function(){ layer: "Hybrid", matrixSet: "nativeTileMatrixSet", requestEncoding: "REST", - url: "http://www.wmts.stadt-zuerich.ch/Hybrid/MapServer/WMTS/tile/", + url: "/maps/Hybrid/", style: "default", matrixIds: [ //{ identifier: "0", matrixHeight: 2, matrixWidth: 2, scaleDenominator: 250000, supportedCRS: "urn:ogc:def:crs:EPSG::21781", tileHeight: 256, tileWidth: 256, topLeftCorner: { lat: 30814423, lon: -29386322 } }, @@ -112,7 +112,7 @@ $(function(){ layer_options, OpenLayers.Util.applyDefaults({ name: "Stadtplan", layer: "Stadtplan", - url: "http://www.wmts.stadt-zuerich.ch/Stadtplan/MapServer/WMTS/tile/" + url: "/maps/Stadtplan/" }, layer_options) ]; |