diff options
| author | Matthew Somerville <matthew@mysociety.org> | 2016-03-02 14:58:23 +0000 |
|---|---|---|
| committer | Matthew Somerville <matthew@mysociety.org> | 2016-03-02 14:58:23 +0000 |
| commit | 2fc65ef99e7591f4f570c5102f46583a0ce9a793 (patch) | |
| tree | c30c3c3da3adb22261ddadccc4f6f26d7ba1af37 | |
| parent | 3ef78780e20e1ede6631a2243c7f337bea46b269 (diff) | |
Version 1.8.v1.8
Add things missing from README, pull from Transifex, merge in new
translations, bump version number.
34 files changed, 16467 insertions, 21764 deletions
diff --git a/.tx/config b/.tx/config index b71aac569..e9bd8975f 100644 --- a/.tx/config +++ b/.tx/config @@ -2,7 +2,7 @@ host = https://www.transifex.com type = PO -[fixmystreet.v1-7] +[fixmystreet.v1-8] file_filter = locale/<lang>.UTF-8/LC_MESSAGES/FixMyStreet.po source_file = locale/FixMyStreet.po source_lang = en_GB @@ -40,9 +40,17 @@ We've extracted all of the mobile apps from this repository into the ## Releases -* master (development) +* v1.8 (2nd March 2016) + - New features: + - Facebook login. #1146 + - Multiple photo upload support, with new UI. #190 #825 #1300 - Front end improvements: - - Add multiple photo upload support, with new UI. #190 + - Pad internal update links so they are in view. #1308 + - Move alert page "recent photos" out of sidebar. #1168 + - Clearer relationship between map pins/list items. #1094 + - Consistent styling for updates on /report and /my pages. #1312 + - Stop a top banner overlapping header contents/improve CSS. #1306 + - Improve design of some error pages. - Performance improvements: - Reduce memory usage. #1285 - Bugfixes: @@ -50,12 +58,27 @@ We've extracted all of the mobile apps from this repository into the - Prevent SVG chevron being stretched in Firefox. #1256 - Better display/internationalisation of numbers. #1297 - Fix cobrand restriction of My/Nearby. #1289 - - Don't have hover state on disabled buttons. + - If app user logged in, perform alert signup. #1321 + - Spot media_url in Open311 GetServiceRequestUpdate. #1315 + - Improve disabled input behaviour (no hover, ensure faded). + - Fix co-ordinate swapping bug in Google geocoder. + - Exclude update alerts from summary alert counts. + - Skip sending if any body marks it for skipping. + - Upgrade Net::SMTP::SSL to fix email sending issue. - Development improvements: - Add generic static route handler. #1235 - Store reports summary data by cobrand. #1290 + - Better handling replies to bounce addresses. #85 + - Combine more base/fixmystreet templates. + - Add OpenStreetMap URL to report email. - Admin improvements: - - Don't allow blank email/name to be submitted. + - Don't allow blank email/name to be submitted. #1294 + - Handle multiple photo rotation/removal in admin. #1300 + - Fix typo in admin body form checked status. + - UK only + - Make sure front page error is visible. #1336 + - Don't show app next step if used app. #1305 + - House Rules. #890 #1311 * v1.7 (23rd October 2015) - Front end improvements: diff --git a/bin/site-specific-install.sh b/bin/site-specific-install.sh index 4c39a1bd7..4083d9d75 100644 --- a/bin/site-specific-install.sh +++ b/bin/site-specific-install.sh @@ -1,7 +1,7 @@ #!/bin/sh # Set this to the version we want to check out -VERSION=${VERSION_OVERRIDE:-v1.7} +VERSION=${VERSION_OVERRIDE:-v1.8} PARENT_SCRIPT_URL=https://github.com/mysociety/commonlib/blob/master/bin/install-site.sh diff --git a/locale/FixMyStreet.po b/locale/FixMyStreet.po index 55bd7a978..f0fcc789b 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: 2015-10-23 16:51+0100\n" +"POT-Creation-Date: 2016-03-02 13:09+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" @@ -17,34 +17,18 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:628 perllib/FixMyStreet/DB/ResultSet/Problem.pm:411 +#: perllib/FixMyStreet/DB/Result/Problem.pm:616 perllib/FixMyStreet/Script/Reports.pm:189 msgid " and " msgstr "" -#: templates/web/base/report/new/councils_text_all.html:2 templates/web/base/report/new/councils_text_none.html:11 templates/web/base/report/new/councils_text_none.html:2 templates/web/base/report/new/councils_text_some.html:19 templates/web/base/report/new/councils_text_some.html:22 templates/web/base/report/new/councils_text_some.html:5 +#: templates/web/base/report/new/councils_text_all.html:2 templates/web/base/report/new/councils_text_none.html:12 templates/web/base/report/new/councils_text_none.html:15 templates/web/base/report/new/councils_text_some.html:19 templates/web/base/report/new/councils_text_some.html:22 templates/web/base/report/new/councils_text_some.html:5 msgid " or " msgstr "" -#: templates/web/base/admin/index.html:35 templates/web/base/status/index.html:13 -msgid "%s confirmed alerts, %s unconfirmed" -msgstr "" - -#: templates/web/base/admin/index.html:37 templates/web/base/status/index.html:16 templates/web/zurich/admin/index.html:6 -msgid "%s council contacts – %s confirmed, %s unconfirmed" -msgstr "" - #: templates/web/base/admin/edit-league.html:12 msgid "%d edits by %s" msgstr "" -#: templates/web/base/admin/index.html:34 templates/web/base/status/index.html:12 -msgid "%s live updates" -msgstr "" - -#: templates/web/base/admin/index.html:36 templates/web/base/status/index.html:14 -msgid "%s questionnaires sent – %s answered (%s%%)" -msgstr "" - #: templates/web/base/pagination.html:10 msgid "%d to %d of %d" msgstr "" @@ -58,6 +42,18 @@ msgstr "" msgid "%s admin:" msgstr "" +#: templates/web/base/status/stats.html:26 +msgid "%s bodies" +msgstr "" + +#: templates/web/base/status/stats.html:24 +msgid "%s confirmed alerts, %s unconfirmed" +msgstr "" + +#: templates/web/base/status/stats.html:27 templates/web/zurich/admin/index.html:6 +msgid "%s council contacts – %s confirmed, %s unconfirmed" +msgstr "" + #. ("%s is the site name") #: templates/web/base/alert/index.html:7 msgid "" @@ -74,7 +70,15 @@ msgid "" "within a certain distance of a particular location." msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:695 +#: templates/web/base/status/stats.html:23 +msgid "%s live updates" +msgstr "" + +#: templates/web/base/status/stats.html:25 +msgid "%s questionnaires sent – %s answered (%s%%)" +msgstr "" + +#: perllib/FixMyStreet/DB/Result/Problem.pm:683 msgid "%s ref: %s" msgstr "" @@ -89,15 +93,15 @@ msgid "" "for the county council." msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:255 perllib/FixMyStreet/Cobrand/UK.pm:267 +#: perllib/FixMyStreet/Cobrand/UK.pm:256 perllib/FixMyStreet/Cobrand/UK.pm:268 msgid "%s ward, %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:564 +#: perllib/FixMyStreet/DB/Result/Problem.pm:552 msgid "%s, reported at %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:282 perllib/FixMyStreet/Cobrand/UK.pm:294 +#: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295 msgid "%s, within %s ward" msgstr "" @@ -105,7 +109,7 @@ msgstr "" msgid "© <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors" msgstr "" -#: templates/web/zurich/report/new/fill_in_details_form.html:53 +#: templates/web/zurich/report/new/fill_in_details_form.html:46 msgid "(Defect & location of defect)" msgstr "" @@ -130,11 +134,11 @@ msgstr "" msgid "(alternatively the RSS feed can be customised, within %s)" msgstr "" -#: templates/web/base/report/_item.html:27 templates/web/zurich/report/_item.html:21 +#: templates/web/base/report/_item.html:25 templates/web/zurich/report/_item.html:19 msgid "(closed)" msgstr "" -#: templates/web/base/report/_item.html:25 templates/web/zurich/report/_item.html:19 +#: templates/web/base/report/_item.html:23 templates/web/zurich/report/_item.html:17 msgid "(fixed)" msgstr "" @@ -142,35 +146,27 @@ msgstr "" msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)" msgstr "" -#: templates/web/base/report/_item.html:21 +#: templates/web/base/report/_item.html:19 msgid "(not sent to council)" msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:200 templates/web/zurich/report/new/fill_in_details_form.html:82 +#: templates/web/zurich/report/new/fill_in_details_form.html:82 msgid "(optional)" msgstr "" -#: templates/web/fixmystreet/report/public_label.html:1 +#: templates/web/base/report/public_label.html:1 msgid "(public)" msgstr "" -#: templates/web/base/report/_item.html:20 +#: templates/web/base/report/_item.html:18 msgid "(sent to both)" msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:194 -msgid "(we never show your email address or phone number)" -msgstr "" - -#: templates/web/base/report/update-form.html:159 -msgid "(we never show your email)" -msgstr "" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:673 perllib/FixMyStreet/DB/Result/Problem.pm:410 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 perllib/FixMyStreet/DB/Result/Problem.pm:410 msgid "-- Pick a category --" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:637 perllib/FixMyStreet/DB/Result/Problem.pm:416 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:632 perllib/FixMyStreet/DB/Result/Problem.pm:416 msgid "-- Pick a property type --" msgstr "" @@ -187,39 +183,31 @@ msgstr "" msgid "<label>Show %s</label> <label>about %s</label>" msgstr "" -#: templates/web/base/admin/index.html:32 templates/web/base/status/index.html:11 templates/web/zurich/admin/index.html:4 +#: templates/web/base/status/stats.html:18 templates/web/zurich/admin/index.html:4 msgid "<strong>%s</strong> live problems" msgstr "" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:39 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:2 msgid "<strong>No</strong> Let me confirm my report by email" msgstr "" -#: templates/web/fixmystreet/report/update-form.html:112 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:2 msgid "<strong>No</strong> Let me confirm my update by email" msgstr "" -#: templates/web/base/auth/general.html:48 templates/web/zurich/auth/general.html:51 +#: templates/web/base/auth/general.html:87 templates/web/zurich/auth/general.html:51 msgid "<strong>No</strong> let me sign in by email" msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:145 -msgid "<strong>No</strong>, let me confirm my report by email:" -msgstr "" - -#: templates/web/base/report/update-form.html:118 -msgid "<strong>No</strong>, let me confirm my update by email:" -msgstr "" - -#: templates/web/base/auth/general.html:34 templates/web/base/report/new/fill_in_details_form.html:123 templates/web/base/report/update-form.html:96 templates/web/fixmystreet/report/new/form_user_loggedout.html:15 templates/web/fixmystreet/report/update-form.html:89 +#: templates/web/base/auth/general.html:70 templates/web/base/report/new/form_user_loggedout_password.html:3 templates/web/base/report/update/form_user_loggedout_password.html:2 msgid "<strong>Yes</strong> I have a password" msgstr "" -#: templates/web/base/static/about-en-gb.html:1 templates/web/base/static/about-en-gb.html:3 +#: templates/web/base/about/about-en-gb.html:1 templates/web/base/about/about-en-gb.html:3 msgid "About us" msgstr "" -#: templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:8 templates/web/base/report/update-form.html:30 templates/web/base/report/update-form.html:31 templates/web/fixmystreet/report/update-form.html:28 templates/web/fixmystreet/report/update-form.html:29 +#: templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:8 templates/web/base/report/update/form_update.html:34 templates/web/base/report/update/form_update.html:35 msgid "Action Scheduled" msgstr "" @@ -246,7 +234,7 @@ msgstr "" msgid "Add user" msgstr "" -#: templates/web/base/my/my.html:52 +#: templates/web/base/my/my.html:56 msgid "Added %s" msgstr "" @@ -266,7 +254,7 @@ msgstr "" msgid "Alert %d disabled (created %s)" msgstr "" -#: templates/web/base/report/update-form.html:164 templates/web/fixmystreet/report/update-form.html:150 +#: templates/web/base/report/update/form_name.html:20 msgid "Alert me to future updates" msgstr "" @@ -290,7 +278,7 @@ msgstr "" msgid "All the information you provide here will be sent to" msgstr "" -#: templates/web/base/report/new/councils_text_all.html:2 templates/web/base/report/new/councils_text_all.html:4 templates/web/base/report/new/fill_in_details_form.html:12 templates/web/base/report/new/fill_in_details_form.html:14 templates/web/fixmystreet/report/new/fill_in_details_form.html:10 templates/web/fixmystreet/report/new/fill_in_details_form.html:11 +#: templates/web/base/report/new/councils_text_all.html:2 templates/web/base/report/new/councils_text_all.html:4 templates/web/base/report/new/fill_in_details_form.html:10 templates/web/base/report/new/fill_in_details_form.html:9 msgid "All the information you provide here will be sent to <strong>%s</strong>." msgstr "" @@ -310,6 +298,10 @@ msgstr "" msgid "Are you a developer?" msgstr "" +#: templates/web/base/js/translation_strings.html:52 +msgid "Are you sure you want to cancel this upload?" +msgstr "" + #: templates/web/base/admin/body-form.html:69 templates/web/base/admin/body.html:16 templates/web/zurich/admin/body-form.html:24 msgid "Area covered" msgstr "" @@ -338,15 +330,15 @@ msgstr "" msgid "Assigned to %s" msgstr "" -#: templates/web/base/open311/index.html:84 +#: templates/web/base/open311/index.html:76 msgid "At most %d requests are returned in each query. The returned requests are ordered by requested_datetime, so to get all requests, do several searches with rolling start_date and end_date." msgstr "" -#: templates/web/base/open311/index.html:76 +#: templates/web/base/open311/index.html:68 msgid "At the moment only searching for and looking at reports work." msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:373 templates/web/zurich/report/_item.html:11 +#: perllib/FixMyStreet/DB/Result/Problem.pm:373 templates/web/zurich/report/_item.html:9 msgid "Awaiting moderation" msgstr "" @@ -358,7 +350,7 @@ msgstr "" msgid "Ban email address" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1276 perllib/FixMyStreet/Cobrand/Zurich.pm:392 templates/web/base/admin/bodies.html:1 templates/web/zurich/header.html:64 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1285 perllib/FixMyStreet/Cobrand/Zurich.pm:392 templates/web/base/admin/bodies.html:1 templates/web/zurich/header.html:64 msgid "Bodies" msgstr "" @@ -382,11 +374,11 @@ msgstr "" msgid "Can't see the map? <em>Skip this step</em>" msgstr "" -#: templates/web/base/admin/body.html:68 templates/web/base/admin/index.html:61 templates/web/base/report/new/category.html:10 templates/web/base/report/new/category_wrapper.html:3 templates/web/zurich/admin/body.html:14 templates/web/zurich/admin/index-dm.html:23 templates/web/zurich/admin/index-sdm.html:21 templates/web/zurich/admin/reports.html:13 templates/web/zurich/admin/stats.html:50 +#: templates/web/base/admin/body.html:68 templates/web/base/admin/index.html:54 templates/web/base/report/new/category.html:10 templates/web/base/report/new/category_wrapper.html:3 templates/web/zurich/admin/body.html:14 templates/web/zurich/admin/index-dm.html:23 templates/web/zurich/admin/index-sdm.html:21 templates/web/zurich/admin/reports.html:13 templates/web/zurich/admin/stats.html:50 msgid "Category" msgstr "" -#: templates/web/base/admin/index.html:59 templates/web/base/admin/index.html:67 +#: templates/web/base/admin/index.html:52 templates/web/base/admin/index.html:60 msgid "Category fix rate for problems > 4 weeks old" msgstr "" @@ -394,7 +386,7 @@ msgstr "" msgid "Category:" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:402 +#: perllib/FixMyStreet/Script/Reports.pm:180 msgid "Category: %s" msgstr "" @@ -439,7 +431,7 @@ msgstr "" msgid "Click here or enter as dd/mm/yyyy" msgstr "" -#: templates/web/base/around/_report_banner.html:2 templates/web/base/js/translation_strings.html:50 +#: templates/web/base/around/_report_banner.html:2 templates/web/base/js/translation_strings.html:55 msgid "Click map to report a problem" msgstr "" @@ -459,11 +451,11 @@ msgstr "" msgid "Click the link in our confirmation email to sign in." msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:196 perllib/FixMyStreet/Cobrand/Zurich.pm:969 templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:15 templates/web/base/admin/report_blocks.html:25 templates/web/base/dashboard/index.html:142 templates/web/base/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:16 templates/web/zurich/admin/stats.html:31 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:196 perllib/FixMyStreet/Cobrand/Zurich.pm:969 templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:15 templates/web/base/admin/report_blocks.html:25 templates/web/base/dashboard/index.html:142 templates/web/base/dashboard/index.html:144 templates/web/base/report/banner.html:15 templates/web/zurich/admin/header.html:1 templates/web/zurich/admin/header.html:10 templates/web/zurich/admin/header.html:16 templates/web/zurich/admin/stats.html:31 msgid "Closed" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:794 +#: perllib/FixMyStreet/DB/Result/Problem.pm:779 msgid "Closed by council" msgstr "" @@ -487,7 +479,7 @@ msgstr "" msgid "Cobrand:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1283 templates/web/base/admin/config_page.html:1 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1292 templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "" @@ -499,12 +491,12 @@ msgstr "" msgid "Confirm" msgstr "" -#: templates/web/base/auth/token.html:1 templates/web/zurich/auth/token.html:1 +#: templates/web/base/auth/token.html:1 msgid "Confirm account" msgstr "" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:33 templates/web/fixmystreet/report/update-form.html:107 -msgid "Confirm by email below, providing a new password at that point. When you confirm, your password will be updated." +#: templates/web/base/report/new/form_user_loggedout_password.html:21 templates/web/base/report/update/form_user_loggedout_password.html:20 +msgid "Confirm by email instead, providing a new password at that point. When you confirm, your password will be updated." msgstr "" #: templates/web/base/questionnaire/creator_fixed.html:1 templates/web/base/tokens/confirm_problem.html:1 templates/web/base/tokens/confirm_update.html:1 templates/web/zurich/tokens/confirm_problem.html:1 templates/web/zurich/tokens/confirm_problem.html:3 @@ -524,15 +516,15 @@ msgid "Confirmed:" msgstr "" #. ("%s is the site name") -#: templates/web/base/faq/faq-en-gb.html:8 templates/web/base/footer.html:24 templates/web/base/open311/index.html:8 templates/web/base/static/privacy.html:10 templates/web/fixmystreet/contact/index.html:12 +#: templates/web/base/about/_sidebar.html:6 templates/web/base/footer.html:24 msgid "Contact %s" msgstr "" -#: templates/web/base/contact/index.html:1 templates/web/base/contact/index.html:2 templates/web/base/contact/submit.html:1 templates/web/fixmystreet/contact/index.html:1 templates/web/fixmystreet/contact/index.html:2 +#: templates/web/base/contact/index.html:1 templates/web/base/contact/index.html:2 templates/web/base/contact/submit.html:1 msgid "Contact Us" msgstr "" -#: templates/web/base/contact/index.html:6 templates/web/fixmystreet/contact/index.html:20 +#: templates/web/base/contact/index.html:12 msgid "Contact the team" msgstr "" @@ -540,7 +532,7 @@ msgstr "" msgid "Coordinates:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1420 perllib/FixMyStreet/App/Controller/Admin.pm:1448 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1429 perllib/FixMyStreet/App/Controller/Admin.pm:1457 msgid "Could not find user" msgstr "" @@ -556,7 +548,7 @@ msgstr "" msgid "Council contacts for %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:693 +#: perllib/FixMyStreet/DB/Result/Problem.pm:681 msgid "Council ref: %s" msgstr "" @@ -568,7 +560,7 @@ msgstr "" msgid "Count" msgstr "" -#: templates/web/base/email_sent.html:1 templates/web/zurich/email_sent.html:1 +#: templates/web/base/email_sent.html:1 msgid "Create a report" msgstr "" @@ -608,7 +600,7 @@ msgstr "" msgid "Dealt with by subdivision within 5 working days" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:878 templates/web/zurich/admin/template_edit.html:33 +#: perllib/FixMyStreet/App/Controller/Admin.pm:877 templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "" @@ -616,15 +608,15 @@ msgstr "" msgid "Deleted" msgstr "" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:51 templates/web/zurich/admin/index-dm.html:22 templates/web/zurich/admin/index-sdm.html:20 templates/web/zurich/admin/reports.html:12 +#: templates/web/base/report/new/form_report.html:45 templates/web/zurich/admin/index-dm.html:22 templates/web/zurich/admin/index-sdm.html:20 templates/web/zurich/admin/reports.html:12 msgid "Description" msgstr "" -#: templates/web/base/js/translation_strings.html:34 templates/web/zurich/report/new/fill_in_details_form.html:42 +#: templates/web/base/js/translation_strings.html:34 templates/web/zurich/report/new/fill_in_details_form.html:68 msgid "Details" msgstr "" -#: templates/web/base/admin/report_edit.html:20 templates/web/base/report/new/fill_in_details_form.html:62 templates/web/zurich/admin/report_edit-sdm.html:27 templates/web/zurich/admin/report_edit.html:29 templates/web/zurich/admin/report_edit.html:43 +#: templates/web/base/admin/report_edit.html:20 templates/web/zurich/admin/report_edit-sdm.html:27 templates/web/zurich/admin/report_edit.html:29 templates/web/zurich/admin/report_edit.html:43 msgid "Details:" msgstr "" @@ -641,7 +633,7 @@ msgid "Diligency prize league table" msgstr "" #. ("%s is the site name") -#: templates/web/base/auth/general.html:31 templates/web/base/report/new/fill_in_details_form.html:114 templates/web/base/report/update-form.html:87 templates/web/fixmystreet/report/new/form_user_loggedout.html:11 templates/web/fixmystreet/report/update-form.html:86 +#: templates/web/base/auth/general.html:48 templates/web/base/report/new/form_user_loggedout.html:18 templates/web/base/report/new/oauth_email_form.html:18 templates/web/base/report/update-form.html:29 templates/web/base/report/update/form_user_loggedout.html:17 msgid "Do you have a %s password?" msgstr "" @@ -649,11 +641,15 @@ msgstr "" msgid "Don’t know" msgstr "" -#: templates/web/fixmystreet/contact/index.html:118 +#: templates/web/base/contact/index.html:110 msgid "Don't like forms?" msgstr "" -#: templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:14 templates/web/base/report/update-form.html:30 templates/web/base/report/update-form.html:32 templates/web/fixmystreet/report/update-form.html:28 templates/web/fixmystreet/report/update-form.html:30 +#: templates/web/base/js/translation_strings.html:51 +msgid "Drag and drop photos here or <u>click to upload</u>" +msgstr "" + +#: templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:14 templates/web/base/report/update/form_update.html:34 templates/web/base/report/update/form_update.html:36 msgid "Duplicate" msgstr "" @@ -689,11 +685,11 @@ msgstr "" msgid "Editor" msgstr "" -#: templates/web/base/admin/bodies.html:23 templates/web/base/admin/category_edit.html:91 templates/web/base/admin/flagged.html:38 templates/web/base/admin/users.html:16 templates/web/base/auth/general.html:22 templates/web/zurich/admin/body-form.html:9 templates/web/zurich/admin/body.html:15 templates/web/zurich/auth/general.html:24 templates/web/zurich/auth/general.html:54 +#: templates/web/base/admin/bodies.html:23 templates/web/base/admin/category_edit.html:91 templates/web/base/admin/flagged.html:38 templates/web/base/admin/users.html:16 templates/web/base/auth/general.html:39 templates/web/zurich/admin/body-form.html:9 templates/web/zurich/admin/body.html:15 templates/web/zurich/auth/general.html:24 templates/web/zurich/auth/general.html:54 msgid "Email" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1396 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1405 msgid "Email added to abuse list" msgstr "" @@ -709,7 +705,7 @@ msgstr "" msgid "Email alert deleted" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1393 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1402 msgid "Email already in abuse list" msgstr "" @@ -717,35 +713,31 @@ msgstr "" msgid "Email me new local problems" msgstr "" -#: templates/web/base/report/display.html:38 -msgid "Email me updates" -msgstr "" - -#: templates/web/base/admin/category_edit.html:31 templates/web/base/admin/report_edit.html:62 templates/web/base/admin/update_edit.html:33 templates/web/base/admin/user-form.html:20 templates/web/base/alert/updates.html:13 templates/web/base/report/display.html:42 templates/web/zurich/admin/body.html:47 +#: templates/web/base/admin/category_edit.html:31 templates/web/base/admin/report_edit.html:62 templates/web/base/admin/update_edit.html:33 templates/web/base/admin/user-form.html:20 templates/web/base/alert/updates.html:13 templates/web/zurich/admin/body.html:47 msgid "Email:" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:329 +#: perllib/FixMyStreet/Script/Reports.pm:108 msgid "Email: %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:639 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:634 msgid "Empty flat or maisonette" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:638 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:633 msgid "Empty house or bungalow" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:641 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:636 msgid "Empty office or other commercial" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:642 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:637 msgid "Empty pub or bar" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:643 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:638 msgid "Empty public building - school, hospital, etc." msgstr "" @@ -776,7 +768,7 @@ msgstr "" msgid "Enter a Zürich street name" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:13 +#: perllib/FixMyStreet/Cobrand/UK.pm:14 msgid "Enter a nearby UK postcode, or street name and area" msgstr "" @@ -792,11 +784,7 @@ msgstr "" msgid "Enter a nearby street name and area, postal code or district in Delhi" msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:152 templates/web/base/report/update-form.html:125 -msgid "Enter a new password:" -msgstr "" - -#: templates/web/base/auth/general.html:60 templates/web/fixmystreet/report/new/form_user_loggedout.html:75 templates/web/fixmystreet/report/update-form.html:123 templates/web/zurich/auth/general.html:65 +#: templates/web/base/auth/general.html:99 templates/web/base/report/new/form_user_loggedout_by_email.html:38 templates/web/base/report/update/form_user_loggedout_by_email.html:13 templates/web/zurich/auth/general.html:65 msgid "Enter a password" msgstr "" @@ -804,7 +792,7 @@ msgstr "" msgid "Enter details of the problem" msgstr "" -#: templates/web/base/errors/generic.html:1 templates/web/base/errors/generic.html:3 templates/web/base/tokens/abuse.html:1 templates/web/base/tokens/abuse.html:3 templates/web/base/tokens/error.html:1 templates/web/base/tokens/error.html:3 +#: templates/web/base/errors/generic.html:1 templates/web/base/errors/generic.html:4 templates/web/base/tokens/abuse.html:1 templates/web/base/tokens/abuse.html:3 templates/web/base/tokens/error.html:1 templates/web/base/tokens/error.html:5 msgid "Error" msgstr "" @@ -816,11 +804,11 @@ msgstr "" msgid "Example postcode %s" msgstr "" -#: templates/web/base/open311/index.html:94 +#: templates/web/base/open311/index.html:86 msgid "Examples:" msgstr "" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:55 +#: templates/web/base/report/new/form_report.html:49 msgid "Explain what’s wrong, exactly where it is, and how long it’s been there…" msgstr "" @@ -856,7 +844,7 @@ msgstr "" msgid "FixMyStreet" msgstr "" -#: templates/web/base/admin/index.html:61 templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:24 templates/web/base/admin/report_blocks.html:9 templates/web/base/dashboard/index.html:142 templates/web/base/dashboard/index.html:144 templates/web/base/report/update-form.html:30 templates/web/base/report/update-form.html:34 templates/web/fixmystreet/report/banner.html:12 templates/web/fixmystreet/report/update-form.html:28 templates/web/fixmystreet/report/update-form.html:32 +#: templates/web/base/admin/index.html:54 templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:24 templates/web/base/admin/report_blocks.html:9 templates/web/base/dashboard/index.html:142 templates/web/base/dashboard/index.html:144 templates/web/base/report/banner.html:12 templates/web/base/report/update/form_update.html:34 templates/web/base/report/update/form_update.html:38 msgid "Fixed" msgstr "" @@ -880,7 +868,7 @@ msgstr "" msgid "Flag user" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1281 templates/web/base/admin/users.html:19 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1290 templates/web/base/admin/users.html:19 msgid "Flagged" msgstr "" @@ -908,7 +896,7 @@ msgstr "" msgid "For more information, see <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>." msgstr "" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:32 templates/web/fixmystreet/report/update-form.html:106 +#: templates/web/base/report/new/form_user_loggedout_password.html:20 templates/web/base/report/update/form_user_loggedout_password.html:19 msgid "Forgotten your password?" msgstr "" @@ -920,15 +908,15 @@ msgstr "" msgid "Forwarded wish to external body" msgstr "" -#: templates/web/base/faq/faq-en-gb.html:1 templates/web/base/faq/faq-en-gb.html:13 templates/web/base/faq/faq-en-gb.html:6 templates/web/base/open311/index.html:6 templates/web/base/static/privacy.html:8 templates/web/fixmystreet/contact/index.html:10 +#: templates/web/base/about/_sidebar.html:4 templates/web/base/about/faq-en-gb.html:1 templates/web/base/about/faq-en-gb.html:5 msgid "Frequently Asked Questions" msgstr "" -#: templates/web/base/open311/index.html:136 +#: templates/web/base/open311/index.html:128 msgid "GeoRSS on Google Maps" msgstr "" -#: templates/web/fixmystreet/around/_updates.html:3 templates/web/fixmystreet/report/display.html:35 +#: templates/web/base/report/display_tools.html:11 templates/web/fixmystreet/around/_updates.html:3 msgid "Get updates" msgstr "" @@ -956,7 +944,7 @@ msgstr "" msgid "Going to send questionnaire?" msgstr "" -#: templates/web/base/admin/index.html:42 +#: templates/web/base/admin/index.html:35 msgid "Graph of problem creation by status over time" msgstr "" @@ -972,7 +960,7 @@ msgstr "" msgid "Have you ever reported a problem to a council before, or is this your first time?" msgstr "" -#: templates/web/base/footer.html:15 templates/web/fixmystreet/footer.html:38 templates/web/zurich/faq/faq-de-ch.html:1 templates/web/zurich/footer.html:22 templates/web/zurich/nav_over_content.html:8 +#: templates/web/base/footer.html:15 templates/web/fixmystreet/footer.html:38 templates/web/zurich/about/faq-de-ch.html:1 templates/web/zurich/footer.html:22 templates/web/zurich/nav_over_content.html:8 msgid "Help" msgstr "" @@ -1012,7 +1000,7 @@ msgstr "" msgid "How to send successful reports" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:754 +#: perllib/FixMyStreet/App/Controller/Admin.pm:752 msgid "I am afraid you cannot confirm unconfirmed reports." msgstr "" @@ -1028,10 +1016,6 @@ msgstr "" msgid "I'm afraid we couldn't locate your problem in the database.\n" msgstr "" -#: perllib/FixMyStreet/App/Controller/Tokens.pm:327 -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 "" - #: templates/web/base/admin/flagged.html:14 templates/web/base/admin/list_updates.html:6 templates/web/base/admin/reports.html:11 templates/web/zurich/admin/index-dm.html:21 templates/web/zurich/admin/index-sdm.html:19 templates/web/zurich/admin/list_updates.html:24 templates/web/zurich/admin/list_updates.html:38 templates/web/zurich/admin/reports.html:11 msgid "ID" msgstr "" @@ -1052,14 +1036,10 @@ msgstr "" msgid "If you get some more information about the status of your problem, please come back to the site and leave an update." msgstr "" -#: templates/web/base/report/new/councils_text_none.html:2 templates/web/base/report/new/councils_text_none.html:8 +#: templates/web/base/report/new/councils_text_none.html:10 templates/web/base/report/new/councils_text_none.html:9 msgid "If you submit a problem here the subject and details of the problem will be public, but the problem will <strong>not</strong> be reported to the council." msgstr "" -#: templates/web/zurich/auth/token.html:19 templates/web/zurich/email_sent.html:7 -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 "" - #: templates/web/base/questionnaire/index.html:68 msgid "" "If you wish to leave a public update on the problem, please enter it here\n" @@ -1098,7 +1078,7 @@ msgstr "" msgid "Illegal feed selection" msgstr "" -#: templates/web/base/dashboard/index.html:142 templates/web/base/dashboard/index.html:144 templates/web/base/report/update-form.html:30 templates/web/base/report/update-form.html:32 templates/web/fixmystreet/report/update-form.html:28 templates/web/fixmystreet/report/update-form.html:30 +#: templates/web/base/dashboard/index.html:142 templates/web/base/dashboard/index.html:144 templates/web/base/report/update/form_update.html:34 templates/web/base/report/update/form_update.html:36 msgid "In Progress" msgstr "" @@ -1106,11 +1086,11 @@ msgstr "" msgid "In abuse table?" msgstr "" -#: templates/web/base/open311/index.html:88 +#: templates/web/base/open311/index.html:80 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:199 perllib/FixMyStreet/Cobrand/Zurich.pm:963 templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:7 templates/web/fixmystreet/report/banner.html:19 templates/web/zurich/admin/header.html:1 templates/web/zurich/admin/header.html:8 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:199 perllib/FixMyStreet/Cobrand/Zurich.pm:963 templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:7 templates/web/base/report/banner.html:19 templates/web/zurich/admin/header.html:1 templates/web/zurich/admin/header.html:8 msgid "In progress" msgstr "" @@ -1142,7 +1122,7 @@ msgstr "" msgid "Invalid agency_responsible value %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1201 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1210 msgid "Invalid end date" msgstr "" @@ -1150,15 +1130,15 @@ msgstr "" msgid "Invalid format %s specified." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1206 msgid "Invalid start date" msgstr "" -#: templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:5 templates/web/base/dashboard/index.html:142 templates/web/base/dashboard/index.html:143 templates/web/base/report/update-form.html:30 templates/web/base/report/update-form.html:31 templates/web/fixmystreet/report/update-form.html:28 templates/web/fixmystreet/report/update-form.html:29 +#: templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:5 templates/web/base/dashboard/index.html:142 templates/web/base/dashboard/index.html:143 templates/web/base/report/update/form_update.html:34 templates/web/base/report/update/form_update.html:35 msgid "Investigating" msgstr "" -#: templates/web/fixmystreet/contact/blurb.html:8 +#: templates/web/base/contact/blurb.html:8 msgid "It's often quickest to <a href=\"%s\">check our FAQs</a> and see if the answer is there." msgstr "" @@ -1174,7 +1154,7 @@ msgstr "" msgid "Jurisdiction unknown" msgstr "" -#: templates/web/base/auth/general.html:44 templates/web/base/report/new/fill_in_details_form.html:132 templates/web/base/report/update-form.html:105 templates/web/fixmystreet/report/new/form_user_loggedout.html:28 templates/web/fixmystreet/report/update-form.html:102 templates/web/zurich/auth/general.html:40 +#: templates/web/base/auth/general.html:80 templates/web/base/report/new/form_user_loggedout_password.html:16 templates/web/base/report/update/form_user_loggedout_password.html:15 templates/web/zurich/auth/general.html:40 msgid "Keep me signed in on this computer" msgstr "" @@ -1222,7 +1202,7 @@ msgstr "" msgid "MAP" msgstr "" -#: templates/web/base/js/translation_strings.html:45 +#: templates/web/base/js/translation_strings.html:45 templates/web/base/maps/google-ol.html:13 msgid "Map" msgstr "" @@ -1242,7 +1222,7 @@ msgstr "" msgid "Marked fixed/closed more than eight weeks ago" msgstr "" -#: templates/web/fixmystreet/contact/index.html:106 +#: templates/web/base/contact/index.html:98 msgid "Message" msgstr "" @@ -1254,10 +1234,6 @@ msgstr "" msgid "Message to external body:" msgstr "" -#: templates/web/base/contact/index.html:97 -msgid "Message:" -msgstr "" - #: perllib/FixMyStreet/App/Controller/Open311.pm:445 msgid "Missing jurisdiction_id" msgstr "" @@ -1270,11 +1246,7 @@ msgstr "" msgid "Month" msgstr "" -#: templates/web/base/report/display.html:34 -msgid "More problems nearby" -msgstr "" - -#: templates/web/base/admin/bodies.html:21 templates/web/base/admin/body-form.html:18 templates/web/base/admin/flagged.html:16 templates/web/base/admin/flagged.html:37 templates/web/base/admin/list_updates.html:7 templates/web/base/admin/reports.html:13 templates/web/base/admin/users.html:15 templates/web/base/auth/general.html:50 templates/web/base/reports/index.html:20 templates/web/fixmystreet/report/new/form_user_loggedin.html:9 templates/web/fixmystreet/report/new/form_user_loggedout.html:44 templates/web/fixmystreet/report/update-form.html:138 templates/web/zurich/admin/body-form.html:4 templates/web/zurich/auth/general.html:60 templates/web/zurich/report/new/fill_in_details_form.html:82 +#: templates/web/base/admin/bodies.html:21 templates/web/base/admin/body-form.html:18 templates/web/base/admin/flagged.html:16 templates/web/base/admin/flagged.html:37 templates/web/base/admin/list_updates.html:7 templates/web/base/admin/reports.html:13 templates/web/base/admin/users.html:15 templates/web/base/auth/general.html:89 templates/web/base/report/new/form_user_loggedin.html:9 templates/web/base/report/new/form_user_loggedout_by_email.html:7 templates/web/base/report/update/form_name.html:4 templates/web/base/reports/index.html:20 templates/web/zurich/admin/body-form.html:4 templates/web/zurich/auth/general.html:60 templates/web/zurich/report/new/fill_in_details_form.html:82 msgid "Name" msgstr "" @@ -1282,7 +1254,7 @@ msgstr "" msgid "Name:" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:328 +#: perllib/FixMyStreet/Script/Reports.pm:107 msgid "Name: %s" msgstr "" @@ -1290,24 +1262,20 @@ msgstr "" msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:127 +#: perllib/FixMyStreet/Cobrand/UK.pm:128 msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:434 perllib/FixMyStreet/Cobrand/Default.pm:474 +#: perllib/FixMyStreet/Cobrand/Default.pm:455 perllib/FixMyStreet/Cobrand/Default.pm:495 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:267 +#: perllib/FixMyStreet/Script/Alerts.pm:290 msgid "" "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n" "\n" msgstr "" -#: templates/web/zurich/email_sent.html:5 -msgid "Nearly Done! Now check your email..." -msgstr "" - #: templates/web/base/auth/token.html:17 templates/web/base/email_sent.html:5 msgid "Nearly done! Now check your email…" msgstr "" @@ -1372,7 +1340,7 @@ msgstr "" msgid "Next" msgstr "" -#: templates/web/base/admin/body.html:80 templates/web/base/admin/body.html:82 templates/web/base/admin/body.html:86 templates/web/base/admin/body.html:88 templates/web/base/admin/category_edit.html:4 templates/web/base/admin/list_updates.html:32 templates/web/base/admin/list_updates.html:34 templates/web/base/admin/list_updates.html:35 templates/web/base/admin/problem_row.html:20 templates/web/base/admin/report_edit.html:59 templates/web/base/admin/report_edit.html:75 templates/web/base/admin/update_edit.html:25 templates/web/base/questionnaire/creator_fixed.html:16 templates/web/base/questionnaire/index.html:53 templates/web/base/questionnaire/index.html:92 +#: templates/web/base/admin/body.html:80 templates/web/base/admin/body.html:82 templates/web/base/admin/body.html:86 templates/web/base/admin/body.html:88 templates/web/base/admin/category_edit.html:4 templates/web/base/admin/list_updates.html:32 templates/web/base/admin/list_updates.html:34 templates/web/base/admin/list_updates.html:35 templates/web/base/admin/problem_row.html:20 templates/web/base/admin/report_edit.html:59 templates/web/base/admin/report_edit.html:75 templates/web/base/admin/update_edit.html:25 templates/web/base/questionnaire/creator_fixed.html:16 templates/web/base/questionnaire/index.html:101 templates/web/base/questionnaire/index.html:53 msgid "No" msgstr "" @@ -1430,7 +1398,7 @@ msgid "" " activity across their body), the ability to hide reports or set special report statuses." msgstr "" -#: templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:13 templates/web/base/report/update-form.html:30 templates/web/base/report/update-form.html:33 templates/web/fixmystreet/report/update-form.html:28 templates/web/fixmystreet/report/update-form.html:31 +#: templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:13 templates/web/base/report/update/form_update.html:34 templates/web/base/report/update/form_update.html:37 msgid "Not Responsible" msgstr "" @@ -1462,7 +1430,7 @@ msgstr "" msgid "Note:" msgstr "" -#: templates/web/base/open311/index.html:73 +#: templates/web/base/open311/index.html:65 msgid "Note: <strong>%s</strong>" msgstr "" @@ -1470,11 +1438,11 @@ msgstr "" msgid "Notes from SDM to DM" msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:113 templates/web/fixmystreet/report/new/form_user_loggedout.html:10 +#: templates/web/base/report/new/form_user_loggedout.html:14 templates/web/base/report/new/form_user_loggedout.html:2 templates/web/base/report/new/oauth_email_form.html:17 msgid "Now to submit your report…" msgstr "" -#: templates/web/base/report/update-form.html:86 templates/web/fixmystreet/report/update-form.html:85 +#: templates/web/base/report/update-form.html:28 templates/web/base/report/update/form_user_loggedout.html:13 templates/web/base/report/update/form_user_loggedout.html:2 msgid "Now to submit your update…" msgstr "" @@ -1482,10 +1450,6 @@ msgstr "" msgid "OK" msgstr "" -#: templates/web/base/report/display.html:28 templates/web/base/report/update.html:17 -msgid "Offensive? Unsuitable? Tell us" -msgstr "" - #: templates/web/base/reports/index.html:23 msgid "Old / unknown <br>problems" msgstr "" @@ -1502,11 +1466,11 @@ msgstr "" msgid "Older <br>problems" msgstr "" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:45 +#: templates/web/base/report/new/form_report.html:15 msgid "One-line summary" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:176 perllib/FixMyStreet/Cobrand/Zurich.pm:909 templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:23 templates/web/base/admin/report_blocks.html:4 templates/web/base/admin/update_edit.html:28 templates/web/base/dashboard/index.html:142 templates/web/base/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/update_edit.html:18 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:176 perllib/FixMyStreet/Cobrand/Zurich.pm:909 templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:23 templates/web/base/admin/report_blocks.html:4 templates/web/base/admin/update_edit.html:28 templates/web/base/dashboard/index.html:142 templates/web/base/report/update/form_update.html:34 templates/web/zurich/admin/header.html:1 templates/web/zurich/admin/header.html:7 templates/web/zurich/admin/update_edit.html:18 msgid "Open" msgstr "" @@ -1518,15 +1482,15 @@ msgstr "" msgid "Open, but not had any update in eight weeks" msgstr "" -#: templates/web/base/open311/index.html:70 +#: templates/web/base/open311/index.html:62 msgid "Open311 API for the mySociety FixMyStreet server" msgstr "" -#: templates/web/base/open311/index.html:80 +#: templates/web/base/open311/index.html:72 msgid "Open311 initiative web page" msgstr "" -#: templates/web/base/open311/index.html:81 +#: templates/web/base/open311/index.html:73 msgid "Open311 specification" msgstr "" @@ -1538,7 +1502,7 @@ msgstr "" msgid "Or you can subscribe to an alert based upon what ward or council you’re in:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1084 perllib/FixMyStreet/App/Controller/Report/New.pm:673 perllib/FixMyStreet/App/Controller/Report/New.pm:674 perllib/FixMyStreet/DB/Result/Problem.pm:570 perllib/FixMyStreet/DB/Result/Problem.pm:580 perllib/FixMyStreet/DB/Result/Problem.pm:590 perllib/FixMyStreet/DB/Result/Problem.pm:602 perllib/FixMyStreet/DB/ResultSet/Problem.pm:397 perllib/FixMyStreet/DB/ResultSet/Problem.pm:412 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1055 perllib/FixMyStreet/App/Controller/Report/New.pm:668 perllib/FixMyStreet/App/Controller/Report/New.pm:669 perllib/FixMyStreet/DB/Result/Problem.pm:558 perllib/FixMyStreet/DB/Result/Problem.pm:568 perllib/FixMyStreet/DB/Result/Problem.pm:578 perllib/FixMyStreet/DB/Result/Problem.pm:590 perllib/FixMyStreet/Script/Reports.pm:175 perllib/FixMyStreet/Script/Reports.pm:190 msgid "Other" msgstr "" @@ -1546,7 +1510,7 @@ msgstr "" msgid "Owner" msgstr "" -#: templates/web/base/errors/page_error_404_not_found.html:1 templates/web/base/errors/page_error_404_not_found.html:3 +#: templates/web/base/errors/page_error_404_not_found.html:1 templates/web/base/errors/page_error_404_not_found.html:4 msgid "Page Not Found" msgstr "" @@ -1558,11 +1522,11 @@ msgstr "" msgid "Partial" msgstr "" -#: templates/web/base/auth/general.html:53 templates/web/fixmystreet/report/new/form_user_loggedout.html:68 templates/web/fixmystreet/report/update-form.html:116 templates/web/zurich/auth/general.html:32 templates/web/zurich/auth/general.html:63 +#: templates/web/base/auth/general.html:92 templates/web/base/report/new/form_user_loggedout_by_email.html:31 templates/web/base/report/update/form_user_loggedout_by_email.html:6 templates/web/zurich/auth/general.html:32 templates/web/zurich/auth/general.html:63 msgid "Password (optional)" msgstr "" -#: templates/web/base/auth/change_password.html:25 templates/web/base/auth/general.html:36 +#: templates/web/base/auth/change_password.html:25 templates/web/base/auth/general.html:72 msgid "Password:" msgstr "" @@ -1574,19 +1538,19 @@ msgstr "" msgid "Phone number" msgstr "" -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:26 templates/web/fixmystreet/report/new/form_user_loggedout.html:62 +#: templates/web/base/report/new/form_user_loggedin.html:26 templates/web/base/report/new/form_user_loggedout_by_email.html:25 msgid "Phone number (optional)" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:306 templates/web/base/admin/report_edit.html:63 templates/web/base/report/new/fill_in_details_form.html:198 templates/web/zurich/admin/stats.html:39 +#: perllib/FixMyStreet/Script/Reports.pm:83 templates/web/base/admin/report_edit.html:63 templates/web/zurich/admin/stats.html:39 msgid "Phone:" msgstr "" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:66 templates/web/fixmystreet/report/update-form.html:59 templates/web/zurich/admin/index-dm.html:29 templates/web/zurich/admin/index-sdm.html:24 templates/web/zurich/admin/reports.html:16 templates/web/zurich/admin/stats.html:37 templates/web/zurich/report/new/fill_in_details_form.html:52 +#: templates/web/base/questionnaire/index.html:75 templates/web/base/report/new/form_report.html:23 templates/web/base/report/update/form_update.html:6 templates/web/zurich/admin/index-dm.html:29 templates/web/zurich/admin/index-sdm.html:24 templates/web/zurich/admin/reports.html:16 templates/web/zurich/admin/stats.html:37 templates/web/zurich/report/new/fill_in_details_form.html:45 msgid "Photo" msgstr "" -#: perllib/FixMyStreet/App/Controller/Photo.pm:221 +#: perllib/FixMyStreet/App/Controller/Photo.pm:187 msgid "Photo is required." msgstr "" @@ -1594,11 +1558,7 @@ msgstr "" msgid "Photo required" msgstr "" -#: templates/web/base/questionnaire/index.html:80 templates/web/base/report/new/fill_in_details_form.html:84 templates/web/base/report/update-form.html:62 -msgid "Photo:" -msgstr "" - -#: templates/web/base/alert/list.html:26 +#: templates/web/base/alert/list.html:23 msgid "Photos of recent nearby reports" msgstr "" @@ -1618,15 +1578,11 @@ msgstr "" msgid "Please check the passwords and try again" msgstr "" -#: templates/web/zurich/auth/token.html:16 -msgid "Please check your email" -msgstr "" - -#: templates/web/base/auth/general.html:10 templates/web/base/auth/general.html:16 templates/web/zurich/auth/general.html:3 templates/web/zurich/auth/general.html:9 +#: templates/web/base/auth/general.html:27 templates/web/base/auth/general.html:33 templates/web/zurich/auth/general.html:3 templates/web/zurich/auth/general.html:9 msgid "Please check your email address is correct" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:343 perllib/FixMyStreet/App/Controller/Report/New.pm:883 perllib/FixMyStreet/App/Controller/Report/New.pm:948 perllib/FixMyStreet/DB/Result/Problem.pm:412 templates/web/base/js/translation_strings.html:9 +#: perllib/FixMyStreet/App/Controller/Admin.pm:343 perllib/FixMyStreet/App/Controller/Report/New.pm:878 perllib/FixMyStreet/App/Controller/Report/New.pm:943 perllib/FixMyStreet/DB/Result/Problem.pm:412 templates/web/base/js/translation_strings.html:9 msgid "Please choose a category" msgstr "" @@ -1638,7 +1594,7 @@ msgstr "" msgid "Please correct the errors below" msgstr "" -#: templates/web/base/contact/blurb.html:2 templates/web/fixmystreet/contact/blurb.html:12 +#: templates/web/base/contact/blurb.html:12 msgid "" "Please do <strong>not</strong> report problems through this form; messages go to\n" "the team behind this site, not a council. To report a problem,\n" @@ -1649,10 +1605,14 @@ msgstr "" msgid "Please do not be abusive — abusing your council devalues the service for all users." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:346 perllib/FixMyStreet/DB/Result/Comment.pm:126 templates/web/base/js/translation_strings.html:2 +#: perllib/FixMyStreet/App/Controller/Admin.pm:346 perllib/FixMyStreet/DB/Result/Comment.pm:125 templates/web/base/js/translation_strings.html:2 msgid "Please enter a message" msgstr "" +#: perllib/FixMyStreet/App/Controller/Admin.pm:1091 perllib/FixMyStreet/App/Controller/Admin.pm:1146 +msgid "Please enter a name" +msgstr "" + #: templates/web/base/auth/change_password.html:12 templates/web/base/auth/change_password.html:15 templates/web/base/js/translation_strings.html:19 msgid "Please enter a password" msgstr "" @@ -1661,7 +1621,7 @@ msgstr "" msgid "Please enter a subject" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1084 perllib/FixMyStreet/App/Controller/Admin.pm:1137 perllib/FixMyStreet/App/Controller/Admin.pm:345 perllib/FixMyStreet/DB/Result/User.pm:127 templates/web/base/js/translation_strings.html:12 templates/web/base/js/translation_strings.html:16 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1087 perllib/FixMyStreet/App/Controller/Admin.pm:1142 perllib/FixMyStreet/App/Controller/Admin.pm:345 perllib/FixMyStreet/DB/Result/User.pm:133 templates/web/base/js/translation_strings.html:12 templates/web/base/js/translation_strings.html:16 msgid "Please enter a valid email" msgstr "" @@ -1673,11 +1633,11 @@ msgstr "" msgid "Please enter some details" msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:113 perllib/FixMyStreet/DB/Result/User.pm:124 templates/web/base/auth/general.html:10 templates/web/base/auth/general.html:15 templates/web/base/js/translation_strings.html:11 templates/web/base/js/translation_strings.html:15 templates/web/zurich/auth/general.html:3 templates/web/zurich/auth/general.html:8 +#: perllib/FixMyStreet/App/Controller/Contact.pm:113 perllib/FixMyStreet/DB/Result/User.pm:130 templates/web/base/auth/general.html:27 templates/web/base/auth/general.html:32 templates/web/base/js/translation_strings.html:11 templates/web/base/js/translation_strings.html:15 templates/web/zurich/auth/general.html:3 templates/web/zurich/auth/general.html:8 msgid "Please enter your email" msgstr "" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:7 templates/web/zurich/report/new/fill_in_details_form.html:80 +#: templates/web/base/report/new/form_user_loggedout_email.html:7 templates/web/zurich/report/new/fill_in_details_form.html:80 msgid "Please enter your email address" msgstr "" @@ -1685,11 +1645,11 @@ msgstr "" msgid "Please enter your first name" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:318 templates/web/base/js/translation_strings.html:7 +#: perllib/FixMyStreet/Cobrand/UK.pm:319 templates/web/base/js/translation_strings.html:7 msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below" msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:112 perllib/FixMyStreet/DB/Result/Comment.pm:123 perllib/FixMyStreet/DB/Result/Problem.pm:406 perllib/FixMyStreet/DB/Result/User.pm:120 templates/web/base/js/translation_strings.html:6 +#: perllib/FixMyStreet/App/Controller/Contact.pm:112 perllib/FixMyStreet/DB/Result/Comment.pm:122 perllib/FixMyStreet/DB/Result/Problem.pm:406 perllib/FixMyStreet/DB/Result/User.pm:126 templates/web/base/js/translation_strings.html:6 msgid "Please enter your name" msgstr "" @@ -1713,11 +1673,11 @@ msgstr "" msgid "Please fill in details of the problem below." msgstr "" -#: templates/web/zurich/report/new/fill_in_details_form.html:46 +#: templates/web/zurich/report/new/fill_in_details_form.html:72 msgid "Please fill in details of the problem." msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:28 templates/web/fixmystreet/report/new/sidebar.html:7 templates/web/zurich/report/new/fill_in_details_form.html:20 +#: templates/web/base/report/new/sidebar.html:7 templates/web/zurich/report/new/fill_in_details_form.html:20 msgid "Please fill in the form below with details of the problem, and describe the location as precisely as possible in the details box." msgstr "" @@ -1725,18 +1685,22 @@ msgstr "" msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "" -#: templates/web/fixmystreet/report/updates-sidebar-notes.html:4 +#: templates/web/base/report/updates-sidebar-notes.html:2 msgid "Please note that updates are not sent to the council." msgstr "" -#: templates/web/base/report/update-form.html:7 -msgid "Please note that updates are not sent to the council. If you leave your name it will be public. Your information will only be used in accordance with our <a href=\"/faq#privacy\">privacy policy</a>" +#: templates/web/base/report/new/oauth_email_form.html:4 +msgid "Please note your report has <strong>not yet been sent</strong>." msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:8 templates/web/fixmystreet/report/new/fill_in_details_form.html:21 templates/web/zurich/report/new/fill_in_details_form.html:11 +#: templates/web/base/report/new/fill_in_details_form.html:20 templates/web/zurich/report/new/fill_in_details_form.html:11 msgid "Please note your report has <strong>not yet been sent</strong>. Choose a category and add further information below, then submit." msgstr "" +#: templates/web/base/report/display.html:26 +msgid "Please note your update has <strong>not yet been posted</strong>." +msgstr "" + #: templates/web/base/report/new/notes.html:1 templates/web/zurich/report/new/notes.html:1 msgid "Please note:" msgstr "" @@ -1769,7 +1733,7 @@ msgstr "" msgid "Please state whether or not the problem has been fixed" msgstr "" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:117 perllib/FixMyStreet/App/Model/PhotoSet.pm:145 perllib/FixMyStreet/App/Model/PhotoSet.pm:147 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:117 perllib/FixMyStreet/App/Model/PhotoSet.pm:145 perllib/FixMyStreet/App/Model/PhotoSet.pm:147 templates/web/base/js/translation_strings.html:53 msgid "Please upload a JPEG image only" msgstr "" @@ -1777,11 +1741,11 @@ msgstr "" msgid "Please write a message" msgstr "" -#: templates/web/fixmystreet/report/update-form.html:23 +#: templates/web/base/report/update/form_update.html:29 msgid "Please write your update here" msgstr "" -#: templates/web/base/contact/index.html:100 templates/web/base/report/update-form.html:110 templates/web/base/report/update-form.html:132 templates/web/base/report/update-form.html:72 templates/web/fixmystreet/contact/index.html:113 templates/web/fixmystreet/report/update-form.html:124 templates/web/fixmystreet/report/update-form.html:71 templates/web/fixmystreet/report/update-form.html:97 +#: templates/web/base/contact/index.html:105 templates/web/base/report/update-form.html:24 templates/web/base/report/update/form_user_loggedout_by_email.html:14 templates/web/base/report/update/form_user_loggedout_password.html:10 msgid "Post" msgstr "" @@ -1809,7 +1773,7 @@ msgstr "" msgid "Privacy" msgstr "" -#: templates/web/base/faq/faq-en-gb.html:7 templates/web/base/open311/index.html:7 templates/web/base/static/privacy.html:1 templates/web/base/static/privacy.html:2 templates/web/base/static/privacy.html:9 templates/web/fixmystreet/contact/index.html:11 +#: templates/web/base/about/_sidebar.html:5 templates/web/base/about/privacy.html:1 templates/web/base/about/privacy.html:2 msgid "Privacy and cookies" msgstr "" @@ -1833,11 +1797,11 @@ msgstr "" msgid "Problem %s sent to council %s" msgstr "" -#: templates/web/base/admin/index.html:46 templates/web/zurich/admin/index.html:9 +#: templates/web/base/admin/index.html:39 templates/web/zurich/admin/index.html:9 msgid "Problem breakdown by state" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1055 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1058 msgid "Problem marked as open." msgstr "" @@ -1853,11 +1817,11 @@ msgstr "" msgid "Problems in this area" msgstr "" -#: templates/web/fixmystreet/report/display.html:43 +#: templates/web/base/report/display_tools.html:19 msgid "Problems nearby" msgstr "" -#: templates/web/fixmystreet/report/display.html:41 +#: templates/web/base/report/display_tools.html:17 msgid "Problems on the map" msgstr "" @@ -1869,11 +1833,11 @@ msgstr "" msgid "Problems within %.1fkm of this location" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:642 perllib/FixMyStreet/Cobrand/EmptyHomes.pm:120 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:139 perllib/FixMyStreet/Cobrand/UK.pm:207 +#: perllib/FixMyStreet/Cobrand/Default.pm:663 perllib/FixMyStreet/Cobrand/EmptyHomes.pm:120 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:139 perllib/FixMyStreet/Cobrand/UK.pm:208 msgid "Problems within %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:128 perllib/FixMyStreet/Cobrand/UK.pm:221 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:128 perllib/FixMyStreet/Cobrand/UK.pm:222 msgid "Problems within %s ward" msgstr "" @@ -1894,15 +1858,15 @@ msgstr "" msgid "Property type:" msgstr "" -#: templates/web/base/report/update-form.html:3 templates/web/fixmystreet/report/update-form.html:4 +#: templates/web/base/report/update-form.html:6 msgid "Provide an update" msgstr "" -#: templates/web/base/auth/general.html:56 +#: templates/web/base/auth/general.html:95 msgid "Providing a name and password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:156 templates/web/base/report/update-form.html:129 templates/web/fixmystreet/report/new/form_user_loggedout.html:71 templates/web/fixmystreet/report/update-form.html:119 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:34 templates/web/base/report/update/form_user_loggedout_by_email.html:9 msgid "Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." msgstr "" @@ -1930,23 +1894,23 @@ msgstr "" msgid "Questionnaire filled in by problem reporter" msgstr "" -#: templates/web/base/alert/_list.html:22 templates/web/base/around/display_location.html:1 templates/web/base/around/display_location.html:3 templates/web/base/report/display.html:50 templates/web/base/reports/_rss.html:1 templates/web/fixmystreet/alert/updates.html:9 templates/web/fixmystreet/report/display.html:58 +#: templates/web/base/alert/_list.html:22 templates/web/base/around/display_location.html:1 templates/web/base/around/display_location.html:3 templates/web/base/report/display_tools.html:34 templates/web/base/reports/_rss.html:1 templates/web/fixmystreet/alert/updates.html:9 msgid "RSS feed" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:250 perllib/FixMyStreet/Cobrand/UK.pm:262 +#: perllib/FixMyStreet/Cobrand/UK.pm:251 perllib/FixMyStreet/Cobrand/UK.pm:263 msgid "RSS feed for %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:256 perllib/FixMyStreet/Cobrand/UK.pm:268 +#: perllib/FixMyStreet/Cobrand/UK.pm:257 perllib/FixMyStreet/Cobrand/UK.pm:269 msgid "RSS feed for %s ward, %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:155 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:163 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:173 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:181 perllib/FixMyStreet/Cobrand/UK.pm:276 perllib/FixMyStreet/Cobrand/UK.pm:288 +#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:155 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:163 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:173 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:181 perllib/FixMyStreet/Cobrand/UK.pm:277 perllib/FixMyStreet/Cobrand/UK.pm:289 msgid "RSS feed of %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:281 perllib/FixMyStreet/Cobrand/UK.pm:293 +#: perllib/FixMyStreet/Cobrand/UK.pm:282 perllib/FixMyStreet/Cobrand/UK.pm:294 msgid "RSS feed of %s, within %s ward" msgstr "" @@ -1958,11 +1922,11 @@ msgstr "" msgid "RSS feed of problems in this %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:643 perllib/FixMyStreet/Cobrand/EmptyHomes.pm:121 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:138 perllib/FixMyStreet/Cobrand/UK.pm:214 +#: perllib/FixMyStreet/Cobrand/Default.pm:664 perllib/FixMyStreet/Cobrand/EmptyHomes.pm:121 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:138 perllib/FixMyStreet/Cobrand/UK.pm:215 msgid "RSS feed of problems within %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:127 perllib/FixMyStreet/Cobrand/UK.pm:220 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:127 perllib/FixMyStreet/Cobrand/UK.pm:221 msgid "RSS feed of problems within %s ward" msgstr "" @@ -1970,11 +1934,11 @@ msgstr "" msgid "RSS feed of recent local problems" msgstr "" -#: templates/web/base/report/display.html:50 templates/web/fixmystreet/alert/updates.html:9 templates/web/fixmystreet/report/display.html:58 +#: templates/web/base/report/display_tools.html:34 templates/web/fixmystreet/alert/updates.html:9 msgid "RSS feed of updates to this problem" msgstr "" -#: templates/web/base/alert/updates.html:9 templates/web/base/report/display.html:41 templates/web/fixmystreet/alert/updates.html:14 templates/web/fixmystreet/report/display.html:60 +#: templates/web/base/alert/updates.html:9 templates/web/base/report/display_tools.html:36 templates/web/fixmystreet/alert/updates.html:14 msgid "Receive email when updates are left on this problem." msgstr "" @@ -1999,7 +1963,7 @@ msgstr "" msgid "Remove flag" msgstr "" -#: templates/web/base/admin/report_edit.html:92 templates/web/base/admin/update_edit.html:62 templates/web/zurich/admin/update_edit.html:35 +#: templates/web/base/admin/report_edit.html:93 templates/web/base/admin/update_edit.html:67 templates/web/zurich/admin/update_edit.html:35 msgid "Remove photo (can't be undone!)" msgstr "" @@ -2015,7 +1979,7 @@ msgstr "" msgid "Report a problem" msgstr "" -#: templates/web/fixmystreet/report/display.html:32 +#: templates/web/base/report/display_tools.html:8 msgid "Report abuse" msgstr "" @@ -2023,7 +1987,7 @@ msgstr "" msgid "Report on %s" msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:1 templates/web/fixmystreet/report/new/fill_in_details_form.html:2 +#: templates/web/base/report/new/fill_in_details_form.html:1 templates/web/base/report/new/login_success_form.html:1 templates/web/base/report/new/oauth_email_form.html:1 msgid "Report your problem" msgstr "" @@ -2031,7 +1995,7 @@ msgstr "" msgid "Report, view, or discuss local problems" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:585 templates/web/base/contact/index.html:50 templates/web/fixmystreet/contact/index.html:65 +#: perllib/FixMyStreet/DB/Result/Problem.pm:573 templates/web/base/contact/index.html:57 msgid "Reported anonymously at %s" msgstr "" @@ -2039,7 +2003,7 @@ msgstr "" msgid "Reported before" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:608 templates/web/base/contact/index.html:52 templates/web/fixmystreet/contact/index.html:67 +#: perllib/FixMyStreet/DB/Result/Problem.pm:596 templates/web/base/contact/index.html:59 msgid "Reported by %s at %s" msgstr "" @@ -2051,27 +2015,27 @@ msgstr "" msgid "Reported in the %s category" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:581 +#: perllib/FixMyStreet/DB/Result/Problem.pm:569 msgid "Reported in the %s category anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:603 +#: perllib/FixMyStreet/DB/Result/Problem.pm:591 msgid "Reported in the %s category by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:577 +#: perllib/FixMyStreet/DB/Result/Problem.pm:565 msgid "Reported via %s anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:599 +#: perllib/FixMyStreet/DB/Result/Problem.pm:587 msgid "Reported via %s by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:573 +#: perllib/FixMyStreet/DB/Result/Problem.pm:561 msgid "Reported via %s in the %s category anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:593 +#: perllib/FixMyStreet/DB/Result/Problem.pm:581 msgid "Reported via %s in the %s category by %s at %s" msgstr "" @@ -2087,11 +2051,11 @@ msgstr "" msgid "Reporting a problem" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1277 perllib/FixMyStreet/Cobrand/Zurich.pm:384 templates/web/zurich/header.html:60 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1286 perllib/FixMyStreet/Cobrand/Zurich.pm:384 templates/web/zurich/header.html:60 msgid "Reports" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:327 perllib/FixMyStreet/Cobrand/UK.pm:331 +#: perllib/FixMyStreet/Cobrand/UK.pm:328 perllib/FixMyStreet/Cobrand/UK.pm:332 msgid "Reports are limited to %s characters in length. Please shorten your report" msgstr "" @@ -2123,11 +2087,11 @@ msgstr "" msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1495 perllib/FixMyStreet/App/Controller/Admin.pm:1500 templates/web/base/admin/report_edit.html:88 templates/web/zurich/admin/report_edit.html:116 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 perllib/FixMyStreet/App/Controller/Admin.pm:1508 templates/web/base/admin/report_edit.html:90 templates/web/base/admin/update_edit.html:64 templates/web/zurich/admin/report_edit.html:116 msgid "Rotate Left" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1495 templates/web/base/admin/report_edit.html:89 templates/web/zurich/admin/report_edit.html:117 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 templates/web/base/admin/report_edit.html:91 templates/web/base/admin/update_edit.html:65 templates/web/zurich/admin/report_edit.html:117 msgid "Rotate Right" msgstr "" @@ -2135,7 +2099,7 @@ msgstr "" msgid "Rotating this photo will discard unsaved changes to the report." msgstr "" -#: templates/web/base/js/translation_strings.html:46 templates/web/base/maps/google-ol.html:13 +#: templates/web/base/js/translation_strings.html:46 msgid "Satellite" msgstr "" @@ -2187,7 +2151,7 @@ msgstr "" msgid "Sent report back" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:708 +#: perllib/FixMyStreet/DB/Result/Problem.pm:696 msgid "Sent to %s %s later" msgstr "" @@ -2199,11 +2163,11 @@ msgstr "" msgid "Service:" msgstr "" -#: templates/web/fixmystreet/report/display.html:38 +#: templates/web/base/report/display_tools.html:14 msgid "Share" msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:193 templates/web/base/report/update-form.html:158 templates/web/fixmystreet/report/new/form_user_loggedin.html:23 templates/web/fixmystreet/report/new/form_user_loggedout.html:59 templates/web/fixmystreet/report/update-form.html:146 +#: templates/web/base/report/new/form_user_loggedin.html:23 templates/web/base/report/new/form_user_loggedout_by_email.html:22 templates/web/base/report/update/form_name.html:15 msgid "Show my name publicly" msgstr "" @@ -2215,7 +2179,7 @@ msgstr "" msgid "Show pins" msgstr "" -#: templates/web/base/auth/general.html:3 templates/web/base/auth/general.html:40 templates/web/base/auth/general.html:61 templates/web/zurich/auth/general.html:18 templates/web/zurich/auth/general.html:35 +#: templates/web/base/auth/general.html:100 templates/web/base/auth/general.html:3 templates/web/base/auth/general.html:76 templates/web/zurich/auth/general.html:18 templates/web/zurich/auth/general.html:35 msgid "Sign in" msgstr "" @@ -2237,7 +2201,7 @@ msgid "" " sent from your FixMyStreet installation." msgstr "" -#: templates/web/base/alert/index.html:42 +#: templates/web/base/alert/index.html:40 msgid "Some photos of recent reports" msgstr "" @@ -2246,7 +2210,7 @@ msgstr "" msgid "Some text to localize" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:78 +#: perllib/FixMyStreet/Cobrand/UK.pm:79 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover." msgstr "" @@ -2258,11 +2222,15 @@ msgstr "" msgid "Sorry, there has been an error confirming your problem." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:221 perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:37 perllib/FixMyStreet/Geocode/FixaMinGata.pm:56 perllib/FixMyStreet/Geocode/OSM.pm:48 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:216 perllib/FixMyStreet/Geocode.pm:38 perllib/FixMyStreet/Geocode/Bing.pm:38 perllib/FixMyStreet/Geocode/FixaMinGata.pm:56 perllib/FixMyStreet/Geocode/OSM.pm:48 msgid "Sorry, we could not find that location." msgstr "" -#: perllib/FixMyStreet/Geocode/Bing.pm:34 perllib/FixMyStreet/Geocode/Google.pm:45 perllib/FixMyStreet/Geocode/Zurich.pm:88 +#: templates/web/base/auth/general.html:9 templates/web/base/report/display.html:21 templates/web/base/report/new/fill_in_details_form.html:23 +msgid "Sorry, we could not log you in. Please fill in the form below." +msgstr "" + +#: perllib/FixMyStreet/Geocode/Bing.pm:35 perllib/FixMyStreet/Geocode/Google.pm:45 perllib/FixMyStreet/Geocode/Zurich.pm:88 msgid "Sorry, we could not parse that location. Please try again." msgstr "" @@ -2270,19 +2238,23 @@ msgstr "" msgid "Sorry, we couldn't save your image(s), please try again." msgstr "" +#: perllib/FixMyStreet/App/Controller/AuthSS.pm:301 +msgid "Sorry, you can not log in with Facebook. Please try again later." +msgstr "" + #: templates/web/base/admin/stats.html:64 msgid "Start Date:" msgstr "" -#: templates/web/base/admin/body.html:69 templates/web/base/admin/flagged.html:18 templates/web/base/admin/list_updates.html:11 templates/web/base/admin/reports.html:15 templates/web/fixmystreet/report/update-form.html:26 +#: templates/web/base/admin/body.html:69 templates/web/base/admin/flagged.html:18 templates/web/base/admin/list_updates.html:11 templates/web/base/admin/reports.html:15 templates/web/base/report/update/form_update.html:32 msgid "State" msgstr "" -#: templates/web/base/admin/report_edit.html:47 templates/web/base/admin/update_edit.html:27 templates/web/base/report/update-form.html:28 templates/web/zurich/admin/report_edit-sdm.html:73 templates/web/zurich/admin/report_edit.html:101 templates/web/zurich/admin/report_edit.html:155 templates/web/zurich/admin/update_edit.html:17 +#: templates/web/base/admin/report_edit.html:47 templates/web/base/admin/update_edit.html:27 templates/web/zurich/admin/report_edit-sdm.html:73 templates/web/zurich/admin/report_edit.html:101 templates/web/zurich/admin/report_edit.html:155 templates/web/zurich/admin/update_edit.html:17 msgid "State:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1282 perllib/FixMyStreet/Cobrand/Zurich.pm:387 templates/web/base/admin/stats.html:1 templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:73 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1291 perllib/FixMyStreet/Cobrand/Zurich.pm:387 templates/web/base/admin/stats.html:1 templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:73 msgid "Stats" msgstr "" @@ -2298,7 +2270,7 @@ msgstr "" msgid "Street View" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:406 +#: perllib/FixMyStreet/Script/Reports.pm:184 msgid "Subcategory: %s" msgstr "" @@ -2306,23 +2278,23 @@ msgstr "" msgid "Subdivision/Body" msgstr "" -#: templates/web/fixmystreet/contact/index.html:98 +#: templates/web/base/contact/index.html:90 msgid "Subject" msgstr "" -#: templates/web/base/admin/report_edit.html:19 templates/web/base/contact/index.html:88 templates/web/base/report/new/fill_in_details_form.html:53 templates/web/zurich/admin/report_edit.html:39 +#: templates/web/base/admin/report_edit.html:19 templates/web/zurich/admin/report_edit.html:39 msgid "Subject:" msgstr "" -#: templates/web/base/questionnaire/creator_fixed.html:19 templates/web/base/report/new/fill_in_details_form.html:137 templates/web/base/report/new/fill_in_details_form.html:159 templates/web/base/report/new/fill_in_details_form.html:96 templates/web/fixmystreet/report/new/form_user_loggedin.html:36 templates/web/fixmystreet/report/new/form_user_loggedout.html:23 templates/web/fixmystreet/report/new/form_user_loggedout.html:76 templates/web/zurich/report/new/fill_in_details_form.html:96 +#: templates/web/base/questionnaire/creator_fixed.html:19 templates/web/base/report/new/form_user_loggedin.html:36 templates/web/base/report/new/form_user_loggedout_by_email.html:39 templates/web/base/report/new/form_user_loggedout_password.html:11 templates/web/zurich/report/new/fill_in_details_form.html:96 msgid "Submit" msgstr "" -#: templates/web/base/admin/report_edit.html:95 templates/web/base/admin/update_edit.html:65 templates/web/base/admin/user-form.html:56 templates/web/zurich/admin/report_edit-sdm.html:137 templates/web/zurich/admin/report_edit.html:268 templates/web/zurich/admin/update_edit.html:38 +#: templates/web/base/admin/report_edit.html:101 templates/web/base/admin/update_edit.html:75 templates/web/base/admin/user-form.html:56 templates/web/zurich/admin/report_edit-sdm.html:137 templates/web/zurich/admin/report_edit.html:268 templates/web/zurich/admin/update_edit.html:38 msgid "Submit changes" msgstr "" -#: templates/web/base/questionnaire/index.html:97 +#: templates/web/base/questionnaire/index.html:106 msgid "Submit questionnaire" msgstr "" @@ -2330,7 +2302,7 @@ msgstr "" msgid "Submitted" msgstr "" -#: templates/web/base/alert/updates.html:17 templates/web/base/report/display.html:46 templates/web/fixmystreet/alert/updates.html:23 templates/web/fixmystreet/report/display.html:65 +#: templates/web/base/alert/updates.html:17 templates/web/base/report/display_tools.html:41 templates/web/fixmystreet/alert/updates.html:23 msgid "Subscribe" msgstr "" @@ -2338,7 +2310,7 @@ msgstr "" msgid "Subscribe me to an email alert" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1275 perllib/FixMyStreet/Cobrand/Zurich.pm:383 templates/web/base/admin/bodies.html:25 templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1 templates/web/base/status/index.html:3 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:13 templates/web/zurich/header.html:57 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1284 perllib/FixMyStreet/Cobrand/Zurich.pm:383 templates/web/base/admin/bodies.html:25 templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1 templates/web/base/status/index.html:3 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:13 templates/web/zurich/header.html:57 msgid "Summary" msgstr "" @@ -2346,7 +2318,7 @@ msgstr "" msgid "Summary reports" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1279 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1288 msgid "Survey" msgstr "" @@ -2378,7 +2350,7 @@ msgstr "" msgid "Thank you for reporting this issue!" msgstr "" -#: templates/web/base/tokens/error.html:7 +#: templates/web/base/tokens/error.html:6 msgid "Thank you for trying to confirm your update or problem. We seem to have an error ourselves though, so <a href=\"%s\">please let us know what went on</a> and we'll look into it." msgstr "" @@ -2410,23 +2382,23 @@ msgstr "" msgid "That location does not appear to be in the UK; please try again." msgstr "" -#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:47 perllib/FixMyStreet/Cobrand/FixaMinGata.pm:63 perllib/FixMyStreet/Cobrand/UK.pm:71 +#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:47 perllib/FixMyStreet/Cobrand/FixaMinGata.pm:63 perllib/FixMyStreet/Cobrand/UK.pm:72 msgid "That postcode was not recognised, sorry." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:726 +#: perllib/FixMyStreet/App/Controller/Admin.pm:724 msgid "That problem has been marked as sent." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:718 +#: perllib/FixMyStreet/App/Controller/Admin.pm:716 msgid "That problem will now be resent." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:125 +#: perllib/FixMyStreet/App/Controller/Report.pm:127 msgid "That report cannot be viewed on %s." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:119 +#: perllib/FixMyStreet/App/Controller/Report.pm:121 msgid "That report has been removed from FixMyStreet." msgstr "" @@ -2454,7 +2426,7 @@ msgid "" " If you leave this blank, <strong>send method defaults to email</strong>." msgstr "" -#: templates/web/base/open311/index.html:90 +#: templates/web/base/open311/index.html:82 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 "" @@ -2472,11 +2444,11 @@ msgstr "" msgid "The diligency prize league table shows editors' activity (who's been editing the most records)." msgstr "" -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:60 perllib/FixMyStreet/App/Controller/Reports.pm:79 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:61 perllib/FixMyStreet/App/Controller/Reports.pm:80 msgid "The error was: %s" msgstr "" -#: templates/web/base/open311/index.html:86 +#: templates/web/base/open311/index.html:78 msgid "The following Open311 v2 attributes are returned for each request: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code and service_name." msgstr "" @@ -2520,7 +2492,7 @@ msgstr "" msgid "The passwords do not match" msgstr "" -#: templates/web/base/errors/page_error_404_not_found.html:10 templates/web/base/errors/page_error_404_not_found.html:12 +#: templates/web/base/errors/page_error_404_not_found.html:9 msgid "The requested URL '%s' was not found on this server" msgstr "" @@ -2528,11 +2500,11 @@ msgstr "" msgid "The simplest alert is our geographic one:" msgstr "" -#: templates/web/base/report/new/councils_extra_text.html:1 templates/web/base/report/new/councils_text_some.html:10 templates/web/base/report/new/fill_in_details_form.html:18 templates/web/fixmystreet/report/new/fill_in_details_form.html:14 +#: templates/web/base/report/new/councils_extra_text.html:1 templates/web/base/report/new/councils_text_some.html:10 templates/web/base/report/new/fill_in_details_form.html:13 msgid "The summary and description will also be made public (see our <a href=\"/privacy\">privacy policy</a>)." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:315 +#: perllib/FixMyStreet/Script/Reports.pm:92 msgid "The user could not locate the problem on a map, but to see the area around the location they entered" msgstr "" @@ -2546,15 +2518,15 @@ msgstr "" msgid "There are no reports to show." msgstr "" -#: perllib/FixMyStreet/App/Controller/Reports.pm:76 +#: perllib/FixMyStreet/App/Controller/Reports.pm:77 msgid "There was a problem showing the All Reports page. Please try again later." msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:137 perllib/FixMyStreet/App/Controller/Dashboard.pm:59 +#: perllib/FixMyStreet/App/Controller/Contact.pm:137 perllib/FixMyStreet/App/Controller/Dashboard.pm:60 msgid "There was a problem showing this page. Please try again later." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:769 perllib/FixMyStreet/App/Controller/Report/Update.pm:134 templates/web/base/auth/general.html:26 templates/web/zurich/auth/general.html:28 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:764 perllib/FixMyStreet/App/Controller/Report/Update.pm:138 templates/web/base/auth/general.html:43 templates/web/zurich/auth/general.html:28 msgid "There was a problem with your email/password combination. If you cannot remember your password, or do not have one, please fill in the ‘sign in by email’ section of the form." msgstr "" @@ -2562,7 +2534,7 @@ msgstr "" msgid "There was a problem with your email/password combination. Please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:272 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:336 msgid "There was a problem with your update. Please try again." msgstr "" @@ -2570,7 +2542,7 @@ msgstr "" msgid "There were problems with your report. Please see below." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:300 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:371 msgid "There were problems with your update. Please see below." msgstr "" @@ -2583,7 +2555,7 @@ msgid "" " " msgstr "" -#: templates/web/base/open311/index.html:77 +#: templates/web/base/open311/index.html:69 msgid "This API implementation is work in progress and not yet stabilized. It will change without warnings in the future." msgstr "" @@ -2604,15 +2576,15 @@ msgid "" " A body will not receive any reports unless it covers at least one area." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:413 +#: perllib/FixMyStreet/Script/Reports.pm:191 msgid "This email has been sent to both councils covering the location of the problem, as the user did not categorise it; please ignore it if you're not the correct council to deal with the issue, or let us know what category of problem this is so we can add it to our system." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:416 +#: perllib/FixMyStreet/Script/Reports.pm:194 msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:925 perllib/FixMyStreet/App/Controller/Report/New.pm:995 perllib/FixMyStreet/Cobrand/EmptyHomes.pm:142 perllib/FixMyStreet/Cobrand/UK.pm:43 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:920 perllib/FixMyStreet/App/Controller/Report/New.pm:990 perllib/FixMyStreet/Cobrand/EmptyHomes.pm:142 perllib/FixMyStreet/Cobrand/UK.pm:44 msgid "This information is required" msgstr "" @@ -2624,51 +2596,35 @@ msgstr "" msgid "This is a summary of all reports on this site." msgstr "" -#: templates/web/zurich/auth/token.html:8 -msgid "This may be because the link is too old or already used, or the address was not copied correctly." -msgstr "" - -#: templates/web/base/report/banner.html:15 -msgid "This problem has been closed" -msgstr "" - -#: templates/web/base/report/banner.html:12 templates/web/base/report/update-form.html:48 templates/web/fixmystreet/report/update-form.html:46 +#: templates/web/base/report/update/form_update.html:52 msgid "This problem has been fixed" msgstr "" -#: templates/web/base/report/update-form.html:43 templates/web/fixmystreet/report/update-form.html:40 +#: templates/web/base/report/update/form_update.html:46 msgid "This problem has not been fixed" msgstr "" -#: templates/web/base/report/banner.html:19 -msgid "This problem is in progress" -msgstr "" - -#: templates/web/base/report/banner.html:9 -msgid "This problem is old and of unknown status." -msgstr "" - #: perllib/FixMyStreet/Cobrand/Zurich.pm:168 perllib/FixMyStreet/Cobrand/Zurich.pm:169 templates/web/zurich/report/_main.html:14 msgid "This report is awaiting moderation." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:86 +#: perllib/FixMyStreet/Script/Alerts.pm:94 msgid "This report is currently marked as closed." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:84 +#: perllib/FixMyStreet/Script/Alerts.pm:92 msgid "This report is currently marked as fixed." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:88 +#: perllib/FixMyStreet/Script/Alerts.pm:96 msgid "This report is currently marked as open." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:326 +#: perllib/FixMyStreet/Script/Reports.pm:105 msgid "This report was submitted anonymously" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:308 +#: perllib/FixMyStreet/Script/Reports.pm:85 msgid "This web page also contains a photo of the problem, provided by the user." msgstr "" @@ -2676,7 +2632,7 @@ msgstr "" msgid "Time spent (in minutes):" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1278 templates/web/base/admin/timeline.html:1 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1287 templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "" @@ -2696,11 +2652,11 @@ msgstr "" msgid "To find out what local alerts we have for you, please enter your postcode or street name and area" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:314 +#: perllib/FixMyStreet/Script/Reports.pm:91 msgid "To view a map of the precise location of this issue" msgstr "" -#: templates/web/base/admin/index.html:61 templates/web/base/admin/questionnaire.html:24 templates/web/base/admin/stats.html:24 templates/web/base/admin/stats.html:43 templates/web/zurich/admin/stats.html:30 +#: templates/web/base/admin/index.html:54 templates/web/base/admin/questionnaire.html:24 templates/web/base/admin/stats.html:24 templates/web/base/admin/stats.html:43 templates/web/zurich/admin/stats.html:30 msgid "Total" msgstr "" @@ -2712,7 +2668,7 @@ msgstr "" msgid "Try emailing us directly:" msgstr "" -#: templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:12 templates/web/base/report/update-form.html:30 templates/web/base/report/update-form.html:33 templates/web/fixmystreet/report/update-form.html:28 templates/web/fixmystreet/report/update-form.html:31 +#: templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:12 templates/web/base/report/update/form_update.html:34 templates/web/base/report/update/form_update.html:37 msgid "Unable to fix" msgstr "" @@ -2720,7 +2676,7 @@ msgstr "" msgid "Unconfirmed" msgstr "" -#: templates/web/fixmystreet/report/banner.html:9 +#: templates/web/base/report/banner.html:9 msgid "Unknown" msgstr "" @@ -2728,15 +2684,15 @@ msgstr "" msgid "Unknown alert type" msgstr "" -#: templates/web/base/js/translation_strings.html:39 +#: perllib/FixMyStreet/App/Controller/Photo.pm:110 templates/web/base/js/translation_strings.html:39 msgid "Unknown error" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:103 perllib/FixMyStreet/App/Controller/Report.pm:109 perllib/FixMyStreet/App/Controller/Report.pm:112 +#: perllib/FixMyStreet/App/Controller/Report.pm:105 perllib/FixMyStreet/App/Controller/Report.pm:111 perllib/FixMyStreet/App/Controller/Report.pm:114 msgid "Unknown problem ID" msgstr "" -#: templates/web/fixmystreet/report/update-form.html:19 +#: templates/web/base/report/update/form_update.html:25 msgid "Update" msgstr "" @@ -2744,11 +2700,11 @@ msgstr "" msgid "Update %s created for problem %d; by %s" msgstr "" -#: templates/web/base/contact/index.html:21 templates/web/fixmystreet/contact/index.html:36 +#: templates/web/base/contact/index.html:28 msgid "Update below added anonymously at %s" msgstr "" -#: templates/web/base/contact/index.html:23 templates/web/fixmystreet/contact/index.html:38 +#: templates/web/base/contact/index.html:30 msgid "Update below added by %s at %s" msgstr "" @@ -2756,7 +2712,7 @@ msgstr "" msgid "Update body" msgstr "" -#: templates/web/base/admin/index.html:55 +#: templates/web/base/admin/index.html:48 msgid "Update breakdown by state" msgstr "" @@ -2780,23 +2736,19 @@ msgstr "" msgid "Update statuses" msgstr "" -#: templates/web/base/report/update-form.html:22 -msgid "Update:" -msgstr "" - #: templates/web/zurich/admin/index-dm.html:23 templates/web/zurich/admin/index-sdm.html:21 templates/web/zurich/admin/reports.html:13 msgid "Updated" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1045 perllib/FixMyStreet/App/Controller/Admin.pm:1103 perllib/FixMyStreet/App/Controller/Admin.pm:1147 perllib/FixMyStreet/App/Controller/Admin.pm:822 perllib/FixMyStreet/Cobrand/Zurich.pm:771 perllib/FixMyStreet/Cobrand/Zurich.pm:796 perllib/FixMyStreet/Cobrand/Zurich.pm:866 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1048 perllib/FixMyStreet/App/Controller/Admin.pm:1108 perllib/FixMyStreet/App/Controller/Admin.pm:1156 perllib/FixMyStreet/App/Controller/Admin.pm:821 perllib/FixMyStreet/Cobrand/Zurich.pm:771 perllib/FixMyStreet/Cobrand/Zurich.pm:796 perllib/FixMyStreet/Cobrand/Zurich.pm:866 msgid "Updated!" msgstr "" -#: templates/web/base/admin/list_updates.html:2 templates/web/base/report/update.html:3 templates/web/fixmystreet/report/update.html:5 templates/web/zurich/report/updates.html:2 +#: templates/web/base/admin/list_updates.html:2 templates/web/base/report/update.html:5 templates/web/zurich/report/updates.html:2 msgid "Updates" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:132 +#: perllib/FixMyStreet/DB/Result/Comment.pm:131 msgid "Updates are limited to %s characters in length. Please shorten your update" msgstr "" @@ -2805,7 +2757,7 @@ msgid "Updates on {{title}}" msgstr "" #. ("%s is the site name") -#: templates/web/base/report/display.html:0 templates/web/base/report/display.html:5 templates/web/fixmystreet/report/display.html:0 templates/web/fixmystreet/report/display.html:9 +#: templates/web/base/report/display.html:0 templates/web/base/report/display.html:9 msgid "Updates to this problem, %s" msgstr "" @@ -2817,11 +2769,11 @@ msgstr "" msgid "Used map" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1452 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1461 msgid "User flag removed" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1424 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1433 msgid "User flagged" msgstr "" @@ -2829,7 +2781,7 @@ msgstr "" msgid "User search finds matches in users' names and email addresses." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1280 perllib/FixMyStreet/Cobrand/Zurich.pm:399 templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:69 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1289 perllib/FixMyStreet/Cobrand/Zurich.pm:399 templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:69 msgid "Users" msgstr "" @@ -2849,7 +2801,7 @@ msgstr "" msgid "Viewing a location" msgstr "" -#: templates/web/base/report/display.html:0 templates/web/fixmystreet/report/display.html:0 +#: templates/web/base/report/display.html:0 msgid "Viewing a problem" msgstr "" @@ -2861,23 +2813,19 @@ 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/zurich/auth/token.html:7 -msgid "We have not been able to confirm your account - sorry." +#: templates/web/base/auth/general.html:6 templates/web/base/report/display.html:27 templates/web/base/report/new/oauth_email_form.html:5 +msgid "We need your email address, please give it below." msgstr "" -#: templates/web/zurich/auth/token.html:17 -msgid "We have sent you an email containing a link to confirm your account." -msgstr "" - -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:2 templates/web/fixmystreet/report/update-form.html:77 +#: templates/web/base/report/new/form_user_loggedout_email.html:2 templates/web/base/report/update/form_user_loggedout_email.html:2 msgid "We never show your email" msgstr "" -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:31 templates/web/fixmystreet/report/new/form_user_loggedout.html:65 +#: templates/web/base/report/new/form_user_loggedin.html:31 templates/web/base/report/new/form_user_loggedout_by_email.html:28 msgid "We never show your email address or phone number." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:422 +#: perllib/FixMyStreet/Script/Reports.pm:200 msgid "We realise this problem might be the responsibility of %s; however, we don't currently have any contact details for them. If you know of an appropriate contact address, please do get in touch." msgstr "" @@ -2893,10 +2841,6 @@ msgstr "" msgid "We’re sorry to hear the problem’s not fixed. Why not try writing to your local representatives?" msgstr "" -#: templates/web/base/contact/blurb.html:8 -msgid "We'd love to hear what you think about this site. Just fill in the form, or send an email to <a href='mailto:%s'>%s</a>:" -msgstr "" - #: templates/web/base/contact/submit.html:7 msgid "We’ll get back to you as soon as we can." msgstr "" @@ -2905,7 +2849,7 @@ msgstr "" msgid "What was your experience of getting the problem fixed?" msgstr "" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:49 +#: templates/web/base/report/new/form_report.html:19 msgid "What’s the issue, and where is it?" msgstr "" @@ -2917,7 +2861,11 @@ msgstr "" msgid "When sent" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:640 +#: templates/web/base/js/translation_strings.html:50 +msgid "Whoa there Testino! Three photos are enough." +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Report/New.pm:635 msgid "Whole block of empty flats" msgstr "" @@ -2929,7 +2877,7 @@ msgstr "" msgid "Wish" msgstr "" -#: templates/web/base/open311/index.html:92 +#: templates/web/base/open311/index.html:84 msgid "With request searches, it is also possible to search for agency_responsible to limit the requests to those sent to a single administration. The search term is the administration ID provided by <a href=\"%s\">MaPit</a>." msgstr "" @@ -2937,7 +2885,7 @@ msgstr "" msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"http://fixmystreet.org\">available at fixmystreet.org</a>." msgstr "" -#: templates/web/base/questionnaire/index.html:87 +#: templates/web/base/questionnaire/index.html:96 msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?" msgstr "" @@ -2945,7 +2893,7 @@ msgstr "" msgid "Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation." msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:4 templates/web/fixmystreet/report/new/fill_in_details_form.html:5 +#: templates/web/base/report/new/fill_in_details_form.html:4 msgid "Wrong location? Just click again on the map." msgstr "" @@ -2953,23 +2901,23 @@ msgstr "" msgid "Year" msgstr "" -#: templates/web/base/admin/bodies.html:66 templates/web/base/admin/body.html:80 templates/web/base/admin/body.html:82 templates/web/base/admin/body.html:86 templates/web/base/admin/body.html:88 templates/web/base/admin/category_edit.html:5 templates/web/base/admin/flagged.html:47 templates/web/base/admin/list_updates.html:32 templates/web/base/admin/list_updates.html:34 templates/web/base/admin/list_updates.html:35 templates/web/base/admin/problem_row.html:20 templates/web/base/admin/report_edit.html:58 templates/web/base/admin/report_edit.html:75 templates/web/base/admin/update_edit.html:24 templates/web/base/admin/users.html:31 templates/web/base/questionnaire/creator_fixed.html:14 templates/web/base/questionnaire/index.html:51 templates/web/base/questionnaire/index.html:90 +#: templates/web/base/admin/bodies.html:66 templates/web/base/admin/body.html:80 templates/web/base/admin/body.html:82 templates/web/base/admin/body.html:86 templates/web/base/admin/body.html:88 templates/web/base/admin/category_edit.html:5 templates/web/base/admin/flagged.html:47 templates/web/base/admin/list_updates.html:32 templates/web/base/admin/list_updates.html:34 templates/web/base/admin/list_updates.html:35 templates/web/base/admin/problem_row.html:20 templates/web/base/admin/report_edit.html:58 templates/web/base/admin/report_edit.html:75 templates/web/base/admin/update_edit.html:24 templates/web/base/admin/users.html:31 templates/web/base/questionnaire/creator_fixed.html:14 templates/web/base/questionnaire/index.html:51 templates/web/base/questionnaire/index.html:99 msgid "Yes" msgstr "" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:17 templates/web/fixmystreet/report/update-form.html:91 +#: templates/web/base/report/new/form_user_loggedout_password.html:5 templates/web/base/report/update/form_user_loggedout_password.html:4 msgid "Yes I have a password" msgstr "" -#: templates/web/base/contact/index.html:39 templates/web/fixmystreet/contact/index.html:54 +#: templates/web/base/contact/index.html:46 msgid "You are complaining that this problem report was unnecessarily moderated:" msgstr "" -#: templates/web/base/contact/index.html:41 templates/web/fixmystreet/contact/index.html:56 +#: templates/web/base/contact/index.html:48 msgid "You are reporting the following problem report for being abusive, containing personal information, or similar:" msgstr "" -#: templates/web/base/contact/index.html:15 templates/web/fixmystreet/contact/index.html:30 +#: templates/web/base/contact/index.html:22 msgid "You are reporting the following update for being abusive, containing personal information, or similar:" msgstr "" @@ -2981,7 +2929,7 @@ msgstr "" msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create." msgstr "" -#: templates/web/fixmystreet/contact/index.html:121 +#: templates/web/base/contact/index.html:113 msgid "You can contact technical support on <a href='mailto:%s'>%s</a>" msgstr "" @@ -2992,7 +2940,7 @@ msgid "" " reports in the past." msgstr "" -#: templates/web/base/report/new/councils_text_none.html:10 templates/web/base/report/new/councils_text_none.html:2 templates/web/base/report/new/councils_text_some.html:19 templates/web/base/report/new/councils_text_some.html:21 +#: templates/web/base/report/new/councils_text_none.html:12 templates/web/base/report/new/councils_text_none.html:14 templates/web/base/report/new/councils_text_some.html:19 templates/web/base/report/new/councils_text_some.html:21 msgid "You can help us by finding a contact email address for local problems for %s and emailing it to us at <a href='mailto:%s'>%s</a>." msgstr "" @@ -3008,16 +2956,12 @@ msgstr "" msgid "You have already answered this questionnaire. If you have a question, please <a href='%s'>get in touch</a>, or <a href='%s'>view your problem</a>.\n" msgstr "" -#: templates/web/base/questionnaire/index.html:77 templates/web/base/report/new/fill_in_details_form.html:75 templates/web/fixmystreet/report/new/fill_in_details_form.html:73 -msgid "You have already attached a photo to this report, attaching another one will replace it." -msgstr "" - -#: templates/web/base/report/update-form.html:59 templates/web/fixmystreet/report/update-form.html:56 -msgid "You have already attached a photo to this update, attaching another one will replace it." +#: templates/web/base/report/new/form_report.html:32 templates/web/zurich/report/new/fill_in_details_form.html:55 +msgid "You have already attached photos to this report. Note that you can attach a maximum of 3 to this report (if you try to upload more, the oldest will be removed)." msgstr "" -#: templates/web/zurich/report/new/fill_in_details_form.html:61 -msgid "You have already attached photos to this report. Note that you can attach a maximum of 3 to this report (if you try to upload more, the oldest will be removed)." +#: templates/web/base/questionnaire/index.html:83 templates/web/base/report/update/form_update.html:14 +msgid "You have already attached photos to this update. Note that you can attach a maximum of 3 to this update (if you try to upload more, the oldest will be removed)." msgstr "" #: templates/web/base/auth/sign_out.html:4 templates/web/zurich/auth/sign_out.html:3 @@ -3032,7 +2976,7 @@ msgstr "" msgid "You have successfully confirmed your email address." msgstr "" -#: templates/web/base/report/display.html:20 templates/web/base/report/new/fill_in_details.html:37 templates/web/fixmystreet/report/display.html:17 +#: templates/web/base/report/display.html:17 templates/web/base/report/new/login_success_form.html:3 msgid "You have successfully signed in; please check and confirm your details are accurate:" msgstr "" @@ -3059,31 +3003,23 @@ msgstr "" msgid "Your Reports" msgstr "" -#: templates/web/base/alert/_list.html:89 templates/web/fixmystreet/alert/updates.html:19 templates/web/fixmystreet/alert/updates.html:22 templates/web/fixmystreet/contact/index.html:91 templates/web/fixmystreet/report/display.html:62 templates/web/fixmystreet/report/display.html:64 templates/web/fixmystreet/report/new/form_user_loggedin.html:3 templates/web/fixmystreet/report/new/form_user_loggedout.html:1 templates/web/fixmystreet/report/update-form.html:76 templates/web/zurich/report/new/fill_in_details_form.html:76 +#: templates/web/base/alert/_list.html:89 templates/web/base/contact/index.html:83 templates/web/base/report/display_tools.html:38 templates/web/base/report/display_tools.html:40 templates/web/base/report/new/form_user_loggedin.html:3 templates/web/base/report/new/form_user_loggedout_email.html:1 templates/web/base/report/update/form_user_loggedout_email.html:1 templates/web/fixmystreet/alert/updates.html:19 templates/web/fixmystreet/alert/updates.html:22 templates/web/zurich/report/new/fill_in_details_form.html:76 msgid "Your email" msgstr "" -#: templates/web/base/auth/general.html:28 templates/web/fixmystreet/report/update-form.html:82 templates/web/zurich/auth/general.html:30 templates/web/zurich/auth/general.html:58 +#: templates/web/base/auth/general.html:45 templates/web/base/report/update/form_user_loggedout_email.html:7 templates/web/zurich/auth/general.html:30 templates/web/zurich/auth/general.html:58 msgid "Your email address" msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:106 templates/web/base/report/update-form.html:81 -msgid "Your email:" -msgstr "" - -#: templates/web/fixmystreet/report/updates-sidebar-notes.html:7 +#: templates/web/base/report/updates-sidebar-notes.html:3 msgid "Your information will only be used in accordance with our <a href=\"/privacy\">privacy policy</a>" msgstr "" -#: templates/web/base/auth/general.html:51 templates/web/fixmystreet/contact/index.html:84 templates/web/fixmystreet/report/new/form_user_loggedin.html:18 templates/web/fixmystreet/report/new/form_user_loggedout.html:54 templates/web/fixmystreet/report/update-form.html:142 templates/web/zurich/auth/general.html:61 templates/web/zurich/report/new/fill_in_details_form.html:86 +#: templates/web/base/auth/general.html:90 templates/web/base/contact/index.html:76 templates/web/base/report/new/form_user_loggedin.html:18 templates/web/base/report/new/form_user_loggedout_by_email.html:17 templates/web/base/report/update/form_name.html:11 templates/web/zurich/auth/general.html:61 templates/web/zurich/report/new/fill_in_details_form.html:86 msgid "Your name" msgstr "" -#: templates/web/base/contact/index.html:73 templates/web/base/report/new/fill_in_details_form.html:186 templates/web/base/report/update-form.html:152 -msgid "Your name:" -msgstr "" - -#: templates/web/base/auth/general.html:39 templates/web/fixmystreet/report/new/form_user_loggedout.html:22 templates/web/fixmystreet/report/update-form.html:96 templates/web/zurich/auth/general.html:34 +#: templates/web/base/auth/general.html:75 templates/web/base/report/new/form_user_loggedout_password.html:10 templates/web/base/report/update/form_user_loggedout_password.html:9 templates/web/zurich/auth/general.html:34 msgid "Your password" msgstr "" @@ -3091,7 +3027,7 @@ msgstr "" msgid "Your password has been changed" msgstr "" -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:27 templates/web/fixmystreet/report/new/form_user_loggedout.html:63 templates/web/zurich/report/new/fill_in_details_form.html:92 +#: templates/web/base/report/new/form_user_loggedin.html:27 templates/web/base/report/new/form_user_loggedout_by_email.html:26 templates/web/zurich/report/new/fill_in_details_form.html:92 msgid "Your phone number" msgstr "" @@ -3107,10 +3043,6 @@ msgstr "" msgid "Your updates" msgstr "" -#: templates/web/base/contact/index.html:81 -msgid "Your email:" -msgstr "" - #: templates/web/base/reports/_list-filters.html:3 msgid "all reports" msgstr "" @@ -3143,11 +3075,11 @@ msgstr "" msgid "fixed reports" msgstr "" -#: templates/web/base/admin/index.html:33 templates/web/zurich/admin/index.html:5 +#: templates/web/base/status/stats.html:20 templates/web/zurich/admin/index.html:5 msgid "from %s different users" msgstr "" -#: templates/web/base/report/_item.html:17 templates/web/zurich/report/_item.html:16 +#: templates/web/base/report/_item.html:15 templates/web/zurich/report/_item.html:14 msgid "last updated %s" msgstr "" @@ -3223,7 +3155,7 @@ msgstr "" msgid "sign out" msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:12 templates/web/base/report/new/fill_in_details_form.html:15 templates/web/fixmystreet/report/new/fill_in_details_form.html:10 templates/web/fixmystreet/report/new/fill_in_details_form.html:12 +#: templates/web/base/report/new/fill_in_details_form.html:11 templates/web/base/report/new/fill_in_details_form.html:9 msgid "the local council" msgstr "" @@ -3231,7 +3163,7 @@ msgstr "" msgid "there is no pin shown as the user did not use the map" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:398 +#: perllib/FixMyStreet/Script/Reports.pm:176 msgid "this type of local problem" msgstr "" @@ -3259,7 +3191,7 @@ msgstr "" msgid "ward" msgstr "" -#: templates/web/base/front/stats.html:17 +#: templates/web/base/front/stats.html:13 #, perl-format msgid "<big>%s</big> report recently" msgid_plural "<big>%s</big> reports recently" @@ -3287,7 +3219,7 @@ msgid_plural "%d minutes" msgstr[0] "" msgstr[1] "" -#: templates/web/base/front/stats.html:29 +#: templates/web/base/front/stats.html:25 #, perl-format msgid "<big>%s</big> update on reports" msgid_plural "<big>%s</big> updates on reports" @@ -3308,14 +3240,14 @@ msgid_plural "%d weeks" msgstr[0] "" msgstr[1] "" -#: templates/web/base/front/stats.html:12 +#: templates/web/base/front/stats.html:8 #, perl-format msgid "<big>%s</big> report in past week" msgid_plural "<big>%s</big> reports in past week" msgstr[0] "" msgstr[1] "" -#: templates/web/base/front/stats.html:23 +#: templates/web/base/front/stats.html:19 #, perl-format msgid "<big>%s</big> fixed in past month" msgid_plural "<big>%s</big> fixed in past month" diff --git a/locale/ar.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/ar.UTF-8/LC_MESSAGES/FixMyStreet.po index 7d9283f33..a727fd0bf 100644 --- a/locale/ar.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/ar.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -5,6 +5,7 @@ # # Translators: # Abdullah Aldebas <demo@adebas.net>, 2015 +# AR C2 <e2f458fd4s512@outlook.com>, 2015 # Khaled Saleem Baleesh <Kbaleesh@gmail.com>, 2015 # Omar Duhaiby <3omarz@gmail.com>, 2015 # Turki Alhajjaji <thugrh@gmail.com>, 2014 @@ -12,9 +13,9 @@ msgid "" msgstr "" "Project-Id-Version: fixmystreet\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2015-10-23 16:51+0100\n" -"PO-Revision-Date: 2015-10-22 20:28+0000\n" -"Last-Translator: Khaled Saleem Baleesh <Kbaleesh@gmail.com>\n" +"POT-Creation-Date: 2016-03-02 13:09+0000\n" +"PO-Revision-Date: 2015-11-25 14:17+0000\n" +"Last-Translator: AR C2 <e2f458fd4s512@outlook.com>\n" "Language-Team: Arabic (http://www.transifex.com/mysociety/fixmystreet/language/ar/)\n" "Language: ar\n" "MIME-Version: 1.0\n" @@ -22,45 +23,24 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:628 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:411 +#: perllib/FixMyStreet/DB/Result/Problem.pm:616 +#: perllib/FixMyStreet/Script/Reports.pm:189 msgid " and " msgstr "Ùˆ" #: templates/web/base/report/new/councils_text_all.html:2 -#: templates/web/base/report/new/councils_text_none.html:11 -#: templates/web/base/report/new/councils_text_none.html:2 +#: templates/web/base/report/new/councils_text_none.html:12 +#: templates/web/base/report/new/councils_text_none.html:15 #: templates/web/base/report/new/councils_text_some.html:19 #: templates/web/base/report/new/councils_text_some.html:22 #: templates/web/base/report/new/councils_text_some.html:5 msgid " or " msgstr "أو" -#: templates/web/base/admin/index.html:35 -#: templates/web/base/status/index.html:13 -msgid "%s confirmed alerts, %s unconfirmed" -msgstr "%d تنبيهات مؤكدة ØŒ %d غير مؤكدة" - -#: templates/web/base/admin/index.html:37 -#: templates/web/base/status/index.html:16 -#: templates/web/zurich/admin/index.html:6 -msgid "%s council contacts – %s confirmed, %s unconfirmed" -msgstr "%d معلومات الاتصال – %d مؤكدة, %d غير مؤكدة" - #: templates/web/base/admin/edit-league.html:12 msgid "%d edits by %s" msgstr "%d تم التعديل بواسطة %s" -#: templates/web/base/admin/index.html:34 -#: templates/web/base/status/index.html:12 -msgid "%s live updates" -msgstr "%d تØديثات مباشرة" - -#: templates/web/base/admin/index.html:36 -#: templates/web/base/status/index.html:14 -msgid "%s questionnaires sent – %s answered (%s%%)" -msgstr "%d الأسئلة المرسلة – %d المجابة (%s%%)" - #: templates/web/base/pagination.html:10 msgid "%d to %d of %d" msgstr "%d إلى %d من %d" @@ -73,7 +53,21 @@ msgstr "%s - ملخص التقارير" #. ("%s here is the site name") #: templates/web/base/admin/header.html:10 msgid "%s admin:" -msgstr "" +msgstr "مسؤول %s:" + +#: templates/web/base/status/stats.html:26 +#, fuzzy +msgid "%s bodies" +msgstr "الهيئات" + +#: templates/web/base/status/stats.html:24 +msgid "%s confirmed alerts, %s unconfirmed" +msgstr "%s تنبيهات مؤكدة ØŒ %s غير مؤكدة" + +#: templates/web/base/status/stats.html:27 +#: templates/web/zurich/admin/index.html:6 +msgid "%s council contacts – %s confirmed, %s unconfirmed" +msgstr "%s معلومات الاتصال – %s مؤكدة, %s غير مؤكدة" #. ("%s is the site name") #: templates/web/base/alert/index.html:7 @@ -82,6 +76,9 @@ msgid "" "problems, including alerts for all problems within a particular ward, or all\n" "problems within a certain distance of a particular location." msgstr "" +"%s لديه مجموعة متنوعة من مواجز RSS وتنبيهات البريد الإلكتروني\n" +"لمشكلات Ù…Øلية، تشمل تنبيهات لكل المشكلات الواقعة بدائرة معينة، أو كل\n" +"المشكلات الواقعة ضمن مساÙØ© معينة من موقع معين." #. ("%s is the site name") #: templates/web/base/alert/index.html:11 @@ -90,10 +87,21 @@ msgid "" "alerts for all problems within a particular ward or council, or all problems\n" "within a certain distance of a particular location." msgstr "" +"%s لديه مجموعة متنوعة من مواجز RSS وتنبيهات البريد الإلكتروني لمشكلات Ù…Øلية، تشمل\n" +"تنبيهات لكل المشكلات الواقعة بدائرة معينة أو مجلس معين، أو كل المشكلات\n" +"الواقعة ضمن مساÙØ© معينة من موقع معين." -#: perllib/FixMyStreet/DB/Result/Problem.pm:695 +#: templates/web/base/status/stats.html:23 +msgid "%s live updates" +msgstr "%s تØديثات مباشرة" + +#: templates/web/base/status/stats.html:25 +msgid "%s questionnaires sent – %s answered (%s%%)" +msgstr "%s الأسئلة المرسلة – %s المجابة (%s%%)" + +#: perllib/FixMyStreet/DB/Result/Problem.pm:683 msgid "%s ref: %s" -msgstr "%s ref: %s" +msgstr "مرجع %s: %s" #. ("%s is the site name") #: templates/web/base/alert/_list.html:73 @@ -105,26 +113,32 @@ msgid "" "council’s alerts, but will only appear in the \"Within the boundary\" alert\n" "for the county council." msgstr "" +"يرسل %s Ùئات مختلÙØ© من المشكلة\n" +"إلى المجلس المناسب، Ùالمشكلات الواقعة ضمن Øدود مجلس معين\n" +"قد لا تطابق المشكلات المرسلة إلى ذلك المجلس. على سبيل المثال، تقرير الرسم على\n" +"الجدران، جراÙيتي، سيÙرسل إلى المجلس المØلي\n" +"لذلك سيظهر ÙÙŠ كلا تنبيهي المجلس المØلي، ولكن سيظهر Ùقط ÙÙŠ تنبيه \"ضمن الØدود\"\n" +"للمجلس البلدي." -#: perllib/FixMyStreet/Cobrand/UK.pm:255 perllib/FixMyStreet/Cobrand/UK.pm:267 +#: perllib/FixMyStreet/Cobrand/UK.pm:256 perllib/FixMyStreet/Cobrand/UK.pm:268 msgid "%s ward, %s" -msgstr "" +msgstr "دائرة %sØŒ %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:564 +#: perllib/FixMyStreet/DB/Result/Problem.pm:552 msgid "%s, reported at %s" msgstr "%s, تم التقرير إلى %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:282 perllib/FixMyStreet/Cobrand/UK.pm:294 +#: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295 msgid "%s, within %s ward" -msgstr "" +msgstr "%sØŒ ضمن دائرة %s" #: perllib/FixMyStreet/Map/OSM.pm:42 msgid "© <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors" msgstr "© <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> المساهمون" -#: templates/web/zurich/report/new/fill_in_details_form.html:53 +#: templates/web/zurich/report/new/fill_in_details_form.html:46 msgid "(Defect & location of defect)" -msgstr "" +msgstr "(الخلل وموقع الخلل)" #: templates/web/base/admin/report_blocks.html:41 #: templates/web/base/admin/users.html:31 @@ -134,12 +148,12 @@ msgstr "(البريد ÙÙŠ لائØØ© المسيئين)" #: templates/web/zurich/admin/report_edit-sdm.html:60 #: templates/web/zurich/admin/report_edit.html:88 msgid "(No name)" -msgstr "" +msgstr "(بلا اسم)" #: templates/web/zurich/admin/report_edit-sdm.html:67 #: templates/web/zurich/admin/report_edit.html:95 msgid "(No phone number)" -msgstr "" +msgstr "(بلا رقم هاتÙ)" #: templates/web/base/alert/_list.html:24 msgid "(a default distance which covers roughly 200,000 people)" @@ -147,55 +161,45 @@ msgstr "(المساÙØ© الإÙتراضية التي تغطي مايقارب 20 #. ("%s is a list of distance links, e.g. [2km] / [5km] / [10km] / [20km]") #: templates/web/base/alert/_list.html:29 -#, fuzzy msgid "(alternatively the RSS feed can be customised, within %s)" -msgstr "الخيار الأخر للملخصات المرسلة RSS يمكن تعديلها ØŒ Øسب" +msgstr "(يمكن بدلاً من ذلك تخصيص موجز RSSØŒ ضمن %s)" -#: templates/web/base/report/_item.html:27 -#: templates/web/zurich/report/_item.html:21 +#: templates/web/base/report/_item.html:25 +#: templates/web/zurich/report/_item.html:19 msgid "(closed)" msgstr "(مغلق)" -#: templates/web/base/report/_item.html:25 -#: templates/web/zurich/report/_item.html:19 +#: templates/web/base/report/_item.html:23 +#: templates/web/zurich/report/_item.html:17 msgid "(fixed)" -msgstr "(تم إصلاØها)" +msgstr "(تم الإصلاØ)" #: templates/web/base/around/intro.html:2 msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)" msgstr "( مثل الكتابة على الجدران ØŒ رمي النÙايات ÙÙŠ الاماكن الغير مخصصة ØŒ بلاطات ارصÙØ© مكسورة او انارة الشوارع)" -#: templates/web/base/report/_item.html:21 +#: templates/web/base/report/_item.html:19 msgid "(not sent to council)" msgstr "(لم ترسل الى الجهة المسئولة)" -#: templates/web/base/report/new/fill_in_details_form.html:200 #: templates/web/zurich/report/new/fill_in_details_form.html:82 msgid "(optional)" msgstr "(إختياري)" -#: templates/web/fixmystreet/report/public_label.html:1 +#: templates/web/base/report/public_label.html:1 msgid "(public)" msgstr "(عام)" -#: templates/web/base/report/_item.html:20 +#: templates/web/base/report/_item.html:18 msgid "(sent to both)" msgstr "(أرسل لكليهما)" -#: templates/web/base/report/new/fill_in_details_form.html:194 -msgid "(we never show your email address or phone number)" -msgstr "(لن نقوم بعرض بريدك الإلكتروني او رقم هاتÙÙƒ المØمول)" - -#: templates/web/base/report/update-form.html:159 -msgid "(we never show your email)" -msgstr "(لن نقوم بعرض بريدك الإلكتروني)" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:673 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 #: perllib/FixMyStreet/DB/Result/Problem.pm:410 msgid "-- Pick a category --" msgstr "--إختر تصنيÙ--" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:637 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:632 #: perllib/FixMyStreet/DB/Result/Problem.pm:416 msgid "-- Pick a property type --" msgstr "-- إختر نوع العقار--" @@ -207,59 +211,49 @@ msgid "" " This is probably why \"area covered\" is empty (below).<br>\n" " Maybe add some <code>MAPIT_TYPES</code> to your config file?" msgstr "" +"تم تعيين <code>MAPIT_URL</code> (<code>%s</code>) ولكن لا يوجد <code>MAPIT_TYPES</code>.<br>\n" +" هذا هو السبب Ø§Ù„Ù…Ø±Ø¬Ø ÙˆØ±Ø§Ø¡ كون \"منطقة التغطية\" Ùارغة (أدناه).<br>\n" +" هل تريد إضاÙØ© بعض <code>MAPIT_TYPES</code> إلى مل٠التكوين؟" #. ('The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories') #. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories") #: templates/web/base/reports/_list-filters.html:27 msgid "<label>Show %s</label> <label>about %s</label>" -msgstr "" +msgstr "<label>إظهار %s</label> <label>عن %s</label>" -#: templates/web/base/admin/index.html:32 -#: templates/web/base/status/index.html:11 +#: templates/web/base/status/stats.html:18 #: templates/web/zurich/admin/index.html:4 msgid "<strong>%s</strong> live problems" -msgstr "<strong>%d</strong> المشاكل الØالية" +msgstr "<strong>%s</strong> المشاكل الØالية" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:39 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:2 msgid "<strong>No</strong> Let me confirm my report by email" msgstr "<strong>لا</strong> دعني أؤكّد بلاغي بالبريد" -#: templates/web/fixmystreet/report/update-form.html:112 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:2 msgid "<strong>No</strong> Let me confirm my update by email" msgstr "<strong>لا</strong> دعني أؤكّد تØديثي بالبريد" -#: templates/web/base/auth/general.html:48 +#: templates/web/base/auth/general.html:87 #: templates/web/zurich/auth/general.html:51 msgid "<strong>No</strong> let me sign in by email" msgstr "<strong>لا</strong> دعني أسجّل دخولي بالبريد" -#: templates/web/base/report/new/fill_in_details_form.html:145 -msgid "<strong>No</strong>, let me confirm my report by email:" -msgstr "<strong>لا</strong> دعني أؤكّد بلاغي عبر البريد:" - -#: templates/web/base/report/update-form.html:118 -msgid "<strong>No</strong>, let me confirm my update by email:" -msgstr "<strong>لا</strong> دعني أؤكّد تØديثي عبر البريد:" - -#: templates/web/base/auth/general.html:34 -#: templates/web/base/report/new/fill_in_details_form.html:123 -#: templates/web/base/report/update-form.html:96 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:15 -#: templates/web/fixmystreet/report/update-form.html:89 +#: templates/web/base/auth/general.html:70 +#: templates/web/base/report/new/form_user_loggedout_password.html:3 +#: templates/web/base/report/update/form_user_loggedout_password.html:2 msgid "<strong>Yes</strong> I have a password" msgstr "<strong>نعم</strong> لدي كلمة المرور" -#: templates/web/base/static/about-en-gb.html:1 -#: templates/web/base/static/about-en-gb.html:3 +#: templates/web/base/about/about-en-gb.html:1 +#: templates/web/base/about/about-en-gb.html:3 msgid "About us" -msgstr "" +msgstr "نبذة عنا" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:8 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:31 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:29 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:35 msgid "Action Scheduled" msgstr "نشاط تم جدولته" @@ -270,6 +264,9 @@ msgid "" " to which problem reports can be sent. You can add one or more contacts (for different\n" " categories of problem) to each body." msgstr "" +"أض٠<strong>هيئة</strong> لكل هيئة إدارية مثل مجلس أو إدارة\n" +" ليتم إرسال تقارير المشكلات إليها. يمكنك إضاÙØ© جهة اتصال واØدة أو أكثر (Ù„Ùئات مختلÙØ©\n" +" من المشكلة) إلى كل هيئة." #: templates/web/base/admin/body.html:56 msgid "Add a contact using the form below." @@ -279,7 +276,7 @@ msgstr "أض٠عنوان اتصال عبر النموذج التالي." #: templates/web/base/admin/body-form.html:240 #: templates/web/zurich/admin/body-form.html:52 msgid "Add body" -msgstr "" +msgstr "إضاÙØ© هيئة" #: templates/web/base/admin/body.html:116 #: templates/web/zurich/admin/body.html:31 @@ -290,14 +287,13 @@ msgstr "أض٠تصنيÙاً" msgid "Add user" msgstr "إضاÙØ© مستخدم" -#: templates/web/base/my/my.html:52 +#: templates/web/base/my/my.html:56 msgid "Added %s" msgstr "Ø£Ùضي٠%s" #: templates/web/base/report/new/category_extras.html:9 -#, fuzzy msgid "Additional Information" -msgstr "ÙÙŠ إنتظار المشرÙين" +msgstr "معلومات إضاÙية" #: templates/web/base/auth/change_password.html:29 msgid "Again:" @@ -311,8 +307,7 @@ msgstr "تØذير %d أنشيء لـ %sØŒ نوع %sØŒ معاملات %s \\ %s" msgid "Alert %d disabled (created %s)" msgstr "التØذير %d ألغي تÙعيله (أنشيء %s)" -#: templates/web/base/report/update-form.html:164 -#: templates/web/fixmystreet/report/update-form.html:150 +#: templates/web/base/report/update/form_name.html:20 msgid "Alert me to future updates" msgstr "نبهني بأØدث المستجدات" @@ -322,9 +317,8 @@ msgid "All Reports" msgstr "كل التقرير" #: templates/web/zurich/admin/stats.html:5 -#, fuzzy msgid "All Reports as CSV" -msgstr "كل التقرير" +msgstr "جميع التقارير بتنسيق CSV" #: templates/web/base/footer.html:11 templates/web/fixmystreet/footer.html:32 #: templates/web/zurich/admin/index-dm.html:12 @@ -345,16 +339,14 @@ msgstr "كل المعلومات التي تقدمها سترسل إلى" #: templates/web/base/report/new/councils_text_all.html:2 #: templates/web/base/report/new/councils_text_all.html:4 -#: templates/web/base/report/new/fill_in_details_form.html:12 -#: templates/web/base/report/new/fill_in_details_form.html:14 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:10 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:11 +#: templates/web/base/report/new/fill_in_details_form.html:10 +#: templates/web/base/report/new/fill_in_details_form.html:9 msgid "All the information you provide here will be sent to <strong>%s</strong>." msgstr "كل المعلومات التي تقدمها سترسل إلى <strong>%s</strong>." #: templates/web/base/questionnaire/index.html:45 msgid "An update marked this problem as fixed." -msgstr "تØديث أشار أن هذه المشكلة تم إصلاØها." +msgstr "تØديث أشار إلى أن هذه المشكلة تم Øلها." #: templates/web/base/admin/list_updates.html:32 #: templates/web/base/admin/problem_row.html:20 @@ -370,6 +362,10 @@ msgstr "مجهول:" msgid "Are you a developer?" msgstr "هل انت مطور ØŸ" +#: templates/web/base/js/translation_strings.html:52 +msgid "Are you sure you want to cancel this upload?" +msgstr "" + #: templates/web/base/admin/body-form.html:69 #: templates/web/base/admin/body.html:16 #: templates/web/zurich/admin/body-form.html:24 @@ -379,40 +375,39 @@ msgstr "المنطقة المغطاة" #: templates/web/base/admin/bodies.html:15 #: templates/web/base/admin/body.html:60 msgid "As this is a staging site and %s is false, reports made on this site will be sent to the problem reporter, not the contact given for the report’s category." -msgstr "" +msgstr "بما أن هذا الموقع هو موقع مؤقت وقيمة %s هي غير Øقيقي falseØŒ Ùإن التقارير التي تÙنشأ ÙÙŠ هذا الموقع ستÙرسل إلى المبلغ عن المشكلة وليس جهة الاتصال المØددة Ù„Ùئة التقرير." #: templates/web/zurich/admin/report_edit.html:213 -#, fuzzy msgid "Assign to competent body:" -msgstr "عين إلى تصني٠آخر:" +msgstr "تعيين إلى الهيئة المختصة:" #: templates/web/zurich/admin/report_edit.html:173 #: templates/web/zurich/admin/stats.html:36 msgid "Assign to different category:" -msgstr "عين إلى تصني٠آخر:" +msgstr "تعيين إلى Ùئة أخرى:" #: templates/web/zurich/admin/report_edit.html:211 msgid "Assign to external body:" -msgstr "" +msgstr "تعيين إلى هيئة خارجية:" #: templates/web/zurich/admin/report_edit.html:190 msgid "Assign to subdivision:" -msgstr "" +msgstr "تعيين إلى قسم Ùرعي:" #: perllib/FixMyStreet/Cobrand/Zurich.pm:221 msgid "Assigned to %s" msgstr "عين إلى %s" -#: templates/web/base/open311/index.html:84 +#: templates/web/base/open311/index.html:76 msgid "At most %d requests are returned in each query. The returned requests are ordered by requested_datetime, so to get all requests, do several searches with rolling start_date and end_date." -msgstr "" +msgstr "ÙÙŠ الغالب، يتم إرجاع %d من الطلبات ÙÙŠ كل استعلام. تÙرتب الطلبات المرجعة Øسب requested_datetimeØŒ لذا من أجل عرض كل الطلبات، عليك تنÙيذ عمليات بØØ« متعددة باستخدام تواريخ start_date Ùˆend_date متكررة." -#: templates/web/base/open311/index.html:76 +#: templates/web/base/open311/index.html:68 msgid "At the moment only searching for and looking at reports work." msgstr "Øاليا مايعمل هو البØØ« ورؤية البلاغات Ùقط." #: perllib/FixMyStreet/DB/Result/Problem.pm:373 -#: templates/web/zurich/report/_item.html:11 +#: templates/web/zurich/report/_item.html:9 msgid "Awaiting moderation" msgstr "ÙÙŠ إنتظار المشرÙين" @@ -424,22 +419,22 @@ msgstr "الخلÙ" msgid "Ban email address" msgstr "Øظر البريد الإلكتروني" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1276 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1285 #: perllib/FixMyStreet/Cobrand/Zurich.pm:392 #: templates/web/base/admin/bodies.html:1 templates/web/zurich/header.html:64 msgid "Bodies" -msgstr "" +msgstr "الهيئات" #: templates/web/base/admin/flagged.html:17 #: templates/web/base/admin/reports.html:14 #: templates/web/base/admin/users.html:17 msgid "Body" -msgstr "" +msgstr "الهيئة" #: templates/web/base/admin/report_edit.html:34 #: templates/web/base/admin/user-form.html:32 msgid "Body:" -msgstr "" +msgstr "الهيئة:" #: templates/web/base/admin/stats.html:80 msgid "By Date" @@ -447,14 +442,14 @@ msgstr "بالتاريخ" #: templates/web/base/auth/token.html:21 templates/web/base/email_sent.html:18 msgid "Can’t find our email? Check your spam folder – that’s the solution 99% of the time." -msgstr "" +msgstr "لا تستطيع العثور على رسالة البريد الإلكتروني؟ الرجاء الاطلاع على مجلد البريد العشوائي، Ùهذا هو الØÙ„ بنسبة 99%." #: templates/web/base/around/_report_banner.html:5 msgid "Can't see the map? <em>Skip this step</em>" msgstr "لا يمكنك رؤية الخريطة؟ <em>تجاوز هذه الخطوة</em>" #: templates/web/base/admin/body.html:68 -#: templates/web/base/admin/index.html:61 +#: templates/web/base/admin/index.html:54 #: templates/web/base/report/new/category.html:10 #: templates/web/base/report/new/category_wrapper.html:3 #: templates/web/zurich/admin/body.html:14 @@ -465,10 +460,10 @@ msgstr "لا يمكنك رؤية الخريطة؟ <em>تجاوز هذه الخط msgid "Category" msgstr "تصنيÙ" -#: templates/web/base/admin/index.html:59 -#: templates/web/base/admin/index.html:67 +#: templates/web/base/admin/index.html:52 +#: templates/web/base/admin/index.html:60 msgid "Category fix rate for problems > 4 weeks old" -msgstr "تصني٠معدل الإصلاØات لمشاكل مضت عليها 4 أسابيع" +msgstr "معدل إصلاØات الÙئة للمشكلات التي مضى عليها أكثر من 4 أسابيع" #: templates/web/base/admin/body.html:138 #: templates/web/base/admin/category_edit.html:23 @@ -479,7 +474,7 @@ msgstr "تصني٠معدل الإصلاØات لمشاكل مضت عليها 4 msgid "Category:" msgstr "تصنيÙ:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:402 +#: perllib/FixMyStreet/Script/Reports.pm:180 msgid "Category: %s" msgstr "تصنيÙ: %s" @@ -532,7 +527,7 @@ msgstr "" #: templates/web/zurich/admin/response_templates_select.html:6 msgid "Choose a template" -msgstr "" +msgstr "اختيار قالب" #: templates/web/base/admin/stats.html:65 #: templates/web/base/admin/stats.html:71 @@ -540,25 +535,25 @@ msgid "Click here or enter as dd/mm/yyyy" msgstr "اضغط هنا أو ادخل كـ يوم\\شهر\\سنة" #: templates/web/base/around/_report_banner.html:2 -#: templates/web/base/js/translation_strings.html:50 +#: templates/web/base/js/translation_strings.html:55 msgid "Click map to report a problem" msgstr "اضغط على الخريطة للإبلاغ عن مشكلة" #: templates/web/base/email_sent.html:13 msgid "Click the link in our confirmation email to activate your alert." -msgstr "" +msgstr "انقر Ùوق الارتباط المرÙÙ‚ ÙÙŠ رسالة البريد الإلكتروني للتوكيد من أجل تنشيط التنبيه." #: templates/web/base/email_sent.html:9 msgid "Click the link in our confirmation email to publish your problem." -msgstr "" +msgstr "انقر Ùوق الارتباط المرÙÙ‚ ÙÙŠ رسالة البريد الإلكتروني للتوكيد من أجل نشر المشكلة." #: templates/web/base/email_sent.html:11 msgid "Click the link in our confirmation email to publish your update." -msgstr "" +msgstr "انقر Ùوق الارتباط المرÙÙ‚ ÙÙŠ رسالة البريد الإلكتروني للتوكيد من أجل نشر التØديث." #: templates/web/base/auth/token.html:18 msgid "Click the link in our confirmation email to sign in." -msgstr "" +msgstr "انقر Ùوق الارتباط المرÙÙ‚ ÙÙŠ رسالة البريد الإلكتروني للتوكيد من أجل تسجيل الدخول." #: perllib/FixMyStreet/Cobrand/Zurich.pm:196 #: perllib/FixMyStreet/Cobrand/Zurich.pm:969 @@ -567,7 +562,7 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:25 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:144 -#: templates/web/fixmystreet/report/banner.html:15 +#: templates/web/base/report/banner.html:15 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:10 #: templates/web/zurich/admin/header.html:16 @@ -575,7 +570,7 @@ msgstr "" msgid "Closed" msgstr "مغلق" -#: perllib/FixMyStreet/DB/Result/Problem.pm:794 +#: perllib/FixMyStreet/DB/Result/Problem.pm:779 msgid "Closed by council" msgstr "مغلق من الجهة المسئولة" @@ -589,39 +584,40 @@ msgstr "Ø¥Øداثيات" #: templates/web/base/admin/list_updates.html:10 msgid "Cobrand" -msgstr "" +msgstr "علامة تجارية مشتركة" #: templates/web/base/admin/report_edit.html:73 #: templates/web/base/admin/update_edit.html:50 msgid "Cobrand data:" -msgstr "" +msgstr "بيانات العلامة التجارية المشتركة:" #: templates/web/base/admin/report_edit.html:72 #: templates/web/base/admin/update_edit.html:49 msgid "Cobrand:" -msgstr "" +msgstr "علامة تجارية مشتركة:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1283 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1292 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "إعدادت" #: templates/web/base/admin/category_edit.html:55 msgid "Configure Endpoint" -msgstr "" +msgstr "تكوين نقطة النهاية" #: templates/web/base/admin/body.html:72 msgid "Confirm" msgstr "تأكيد" -#: templates/web/base/auth/token.html:1 templates/web/zurich/auth/token.html:1 +#: templates/web/base/auth/token.html:1 msgid "Confirm account" msgstr "أكد الØساب" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:33 -#: templates/web/fixmystreet/report/update-form.html:107 -msgid "Confirm by email below, providing a new password at that point. When you confirm, your password will be updated." -msgstr "" +#: templates/web/base/report/new/form_user_loggedout_password.html:21 +#: templates/web/base/report/update/form_user_loggedout_password.html:20 +#, fuzzy +msgid "Confirm by email instead, providing a new password at that point. When you confirm, your password will be updated." +msgstr "الرجاء التأكيد عبر البريد الإلكتروني أدناه، كما يرجى تقديم كلمة مرور جديدة عند هذه النقطة. بعد التأكيد، سيتم تØديث كلمة المرور." #: templates/web/base/questionnaire/creator_fixed.html:1 #: templates/web/base/tokens/confirm_problem.html:1 @@ -650,35 +646,27 @@ msgid "Confirmed:" msgstr "مؤكد:" #. ("%s is the site name") -#: templates/web/base/faq/faq-en-gb.html:8 templates/web/base/footer.html:24 -#: templates/web/base/open311/index.html:8 -#: templates/web/base/static/privacy.html:10 -#: templates/web/fixmystreet/contact/index.html:12 -#, fuzzy +#: templates/web/base/about/_sidebar.html:6 templates/web/base/footer.html:24 msgid "Contact %s" -msgstr "إتصل بنا" +msgstr "اتصل بـ %s" #: templates/web/base/contact/index.html:1 #: templates/web/base/contact/index.html:2 #: templates/web/base/contact/submit.html:1 -#: templates/web/fixmystreet/contact/index.html:1 -#: templates/web/fixmystreet/contact/index.html:2 msgid "Contact Us" msgstr "إتصل بنا" -#: templates/web/base/contact/index.html:6 -#: templates/web/fixmystreet/contact/index.html:20 +#: templates/web/base/contact/index.html:12 msgid "Contact the team" msgstr "اتصل بÙريق العمل" #: templates/web/zurich/admin/report_edit-sdm.html:40 #: templates/web/zurich/admin/report_edit.html:59 -#, fuzzy msgid "Coordinates:" -msgstr "Ø¥Øداثيات" +msgstr "الإØداثيات:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1420 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1448 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1429 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1457 msgid "Could not find user" msgstr "لم يتمكن من إيجاد المستخدم" @@ -688,30 +676,30 @@ msgstr "لم يتمكن من إيجاد الموقع" #: templates/web/base/admin/list_updates.html:9 msgid "Council" -msgstr "" +msgstr "المجلس" #: templates/web/base/admin/body.html:1 #: templates/web/base/admin/category_edit.html:1 #: templates/web/zurich/admin/body.html:1 msgid "Council contacts for %s" -msgstr "" +msgstr "جهات اتصال المجلس لـ %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:693 +#: perllib/FixMyStreet/DB/Result/Problem.pm:681 msgid "Council ref: %s" -msgstr "" +msgstr "مرجع المجلس: %s" #: templates/web/base/admin/stats.html:84 msgid "Council:" -msgstr "" +msgstr "المجلس:" #: templates/web/base/admin/stats.html:12 #: templates/web/base/admin/stats.html:32 #: templates/web/zurich/admin/stats.html:45 #: templates/web/zurich/admin/stats.html:50 msgid "Count" -msgstr "" +msgstr "العدد" -#: templates/web/base/email_sent.html:1 templates/web/zurich/email_sent.html:1 +#: templates/web/base/email_sent.html:1 msgid "Create a report" msgstr "انشئ بلاغ" @@ -721,9 +709,8 @@ msgid "Create category" msgstr "انشء تصنيÙ" #: templates/web/zurich/admin/template_edit.html:29 -#, fuzzy msgid "Create template" -msgstr "انشئ بلاغ" +msgstr "إنشاء قالب" #: templates/web/base/admin/problem_row.html:34 #: templates/web/zurich/admin/templates.html:10 @@ -749,7 +736,7 @@ msgstr "Øاليا لايوجد جهات مسئولة تم إنشائها." #: perllib/FixMyStreet/Cobrand/Zurich.pm:834 #: templates/web/zurich/admin/report_edit-sdm.html:109 msgid "Customer not contactable" -msgstr "" +msgstr "لا يمكن الاتصال بالعميل" #: templates/web/base/dashboard/index.html:5 #: templates/web/base/dashboard/index.html:7 @@ -758,12 +745,12 @@ msgstr "صÙØØ© المستخدم" #: templates/web/zurich/admin/stats.html:35 msgid "Dealt with by subdivision within 5 working days" -msgstr "" +msgstr "تم التعامل بواسطة القسم الÙرعي ÙÙŠ غضون 5 أيام عمل" -#: perllib/FixMyStreet/App/Controller/Admin.pm:878 +#: perllib/FixMyStreet/App/Controller/Admin.pm:877 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" -msgstr "" +msgstr "Øذ٠القالب" #: templates/web/base/admin/bodies.html:27 #: templates/web/base/admin/body.html:177 @@ -773,7 +760,7 @@ msgstr "" msgid "Deleted" msgstr "Ù…ØذوÙ" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:51 +#: templates/web/base/report/new/form_report.html:45 #: templates/web/zurich/admin/index-dm.html:22 #: templates/web/zurich/admin/index-sdm.html:20 #: templates/web/zurich/admin/reports.html:12 @@ -781,12 +768,11 @@ msgid "Description" msgstr "الوصÙ" #: templates/web/base/js/translation_strings.html:34 -#: templates/web/zurich/report/new/fill_in_details_form.html:42 +#: templates/web/zurich/report/new/fill_in_details_form.html:68 msgid "Details" msgstr "التÙاصيل" #: templates/web/base/admin/report_edit.html:20 -#: templates/web/base/report/new/fill_in_details_form.html:62 #: templates/web/zurich/admin/report_edit-sdm.html:27 #: templates/web/zurich/admin/report_edit.html:29 #: templates/web/zurich/admin/report_edit.html:43 @@ -795,41 +781,42 @@ msgstr "التÙاصيل:" #: templates/web/base/admin/body.html:87 msgid "Devolved" -msgstr "" +msgstr "تم التØويل" #: templates/web/zurich/admin/report_edit-sdm.html:50 #: templates/web/zurich/admin/report_edit.html:69 msgid "Didn't use map" -msgstr "" +msgstr "لم يتم استخدام الخريطة" #: templates/web/base/admin/edit-league.html:8 msgid "Diligency prize league table" -msgstr "" +msgstr "جدول رابطة جائزة العناية بالدقة" #. ("%s is the site name") -#: templates/web/base/auth/general.html:31 -#: templates/web/base/report/new/fill_in_details_form.html:114 -#: templates/web/base/report/update-form.html:87 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:11 -#: templates/web/fixmystreet/report/update-form.html:86 -#, fuzzy +#: templates/web/base/auth/general.html:48 +#: templates/web/base/report/new/form_user_loggedout.html:18 +#: templates/web/base/report/new/oauth_email_form.html:18 +#: templates/web/base/report/update-form.html:29 +#: templates/web/base/report/update/form_user_loggedout.html:17 msgid "Do you have a %s password?" -msgstr "هل لديك كلمة مرور لـ FixMySteetØŸ" +msgstr "هل لديك كلمة مرور %sØŸ" #: templates/web/base/questionnaire/index.html:55 msgid "Don’t know" msgstr "لا أعلم" -#: templates/web/fixmystreet/contact/index.html:118 +#: templates/web/base/contact/index.html:110 msgid "Don't like forms?" msgstr "هل تØب النماذج؟" +#: templates/web/base/js/translation_strings.html:51 +msgid "Drag and drop photos here or <u>click to upload</u>" +msgstr "" + #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:14 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:32 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:30 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:36 msgid "Duplicate" msgstr "مكرر" @@ -882,7 +869,7 @@ msgstr "المØرر" #: templates/web/base/admin/category_edit.html:91 #: templates/web/base/admin/flagged.html:38 #: templates/web/base/admin/users.html:16 -#: templates/web/base/auth/general.html:22 +#: templates/web/base/auth/general.html:39 #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:24 @@ -890,7 +877,7 @@ msgstr "المØرر" msgid "Email" msgstr "البريد الإلكتروني" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1396 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1405 msgid "Email added to abuse list" msgstr "البريد أضي٠إلى لائØØ© المسيئين" @@ -906,7 +893,7 @@ msgstr "تم إنشاء الإخطار بالبريد" msgid "Email alert deleted" msgstr "تم Øذ٠الإخطار بالبريد" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1393 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1402 msgid "Email already in abuse list" msgstr "البريد موجودا سابقا ÙÙŠ لائØØ© المسيئين" @@ -914,41 +901,36 @@ msgstr "البريد موجودا سابقا ÙÙŠ لائØØ© المسيئين" msgid "Email me new local problems" msgstr "راسلني عن المشاكل المØلية الجديدة" -#: templates/web/base/report/display.html:38 -msgid "Email me updates" -msgstr "راسلني عن التØديثات" - #: templates/web/base/admin/category_edit.html:31 #: templates/web/base/admin/report_edit.html:62 #: templates/web/base/admin/update_edit.html:33 #: templates/web/base/admin/user-form.html:20 #: templates/web/base/alert/updates.html:13 -#: templates/web/base/report/display.html:42 #: templates/web/zurich/admin/body.html:47 msgid "Email:" msgstr "البريد الإلكتروني:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:329 +#: perllib/FixMyStreet/Script/Reports.pm:108 msgid "Email: %s" msgstr "البريد الإلكتروني: %s" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:639 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:634 msgid "Empty flat or maisonette" -msgstr "" +msgstr "شقة أو ÙˆØدة سكنية Ùارغة" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:638 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:633 msgid "Empty house or bungalow" -msgstr "" +msgstr "منزل أو بنغَل Ùارغ" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:641 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:636 msgid "Empty office or other commercial" msgstr "مكتب أو عقار تجاري مهجور" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:642 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:637 msgid "Empty pub or bar" msgstr "Øانة مهجورة" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:643 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:638 msgid "Empty public building - school, hospital, etc." msgstr "مبنى عام مهجور - مدرسة، مستشÙى، إلخ." @@ -960,6 +942,10 @@ msgid "" " For more information, see \n" " <a href='https://www.mysociety.org/2013/02/20/open311-extended/' class='admin-offsite-link'>this article</a>." msgstr "" +"الرجاء تمكين <strong>إرسال التØديث عبر Open311</strong> إذا كانت نقطة النهاية سترسل وتستلم التØديثات إلى/من\n" +"التقارير الموجودة. إذا لم تكن متأكدًا، Ùمن المØتمل أنها لا تÙعل ذلك، لذا اترك هذا الخيار بدون تØديد.\n" +"لمزيد من المعلومات، راجع\n" +"<a href='https://www.mysociety.org/2013/02/20/open311-extended/' class='admin-offsite-link'>هذه المقالة</a>." #: templates/web/base/admin/body-form.html:222 #: templates/web/base/admin/body-form.html:223 @@ -968,6 +954,9 @@ msgid "" " different endpoint (and send method) from the body's. For example, if reports for some categories of\n" " problem must be emailed, while others can be sent over Open311." msgstr "" +"الرجاء تمكين هذا الإعداد <strong>يمكن التØويل</strong> ÙÙŠ Øالة وجود جهة اتصال واØدة أو أكثر\n" +"لها نقطة نهاية مختلÙØ© (وأسلوب إرسال مختلÙ) عن نقطة نهاية وأسلوب إرسال الهيئة. على سبيل المثال، إذا كانت تقارير بعض Ùئات\n" +"المشكلة يجب إرسالها عبر البريد الإلكتروني، بينما تقارير أخرى يمكن إرسالها عبر Open311." #: templates/web/base/admin/stats.html:70 msgid "End Date:" @@ -975,13 +964,13 @@ msgstr "تاريخ الإنتهاء:" #: templates/web/base/admin/body-form.html:130 msgid "Endpoint" -msgstr "" +msgstr "نقطة النهاية" #: perllib/FixMyStreet/Cobrand/Zurich.pm:76 msgid "Enter a Zürich street name" -msgstr "" +msgstr "أدخل اسم شارع ÙÙŠ زيورخ" -#: perllib/FixMyStreet/Cobrand/UK.pm:13 +#: perllib/FixMyStreet/Cobrand/UK.pm:14 msgid "Enter a nearby UK postcode, or street name and area" msgstr "أدخل أقرب صندوق بريد بريطاني، أو اسم الشارع والØÙŠ" @@ -999,14 +988,9 @@ msgstr "أدخل أقرب اسم شارع ÙˆØÙŠ" msgid "Enter a nearby street name and area, postal code or district in Delhi" msgstr "أدخل أقرب اسم شارع ÙˆØÙŠ أو صندوق بريد أو منطقة ÙÙŠ دلهي" -#: templates/web/base/report/new/fill_in_details_form.html:152 -#: templates/web/base/report/update-form.html:125 -msgid "Enter a new password:" -msgstr "أدخل كلمة مرور جديدة:" - -#: templates/web/base/auth/general.html:60 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:75 -#: templates/web/fixmystreet/report/update-form.html:123 +#: templates/web/base/auth/general.html:99 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:38 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:13 #: templates/web/zurich/auth/general.html:65 msgid "Enter a password" msgstr "أدخل كلمة المرور:" @@ -1016,28 +1000,28 @@ msgid "Enter details of the problem" msgstr "أدخل تÙاصيل البلاغ" #: templates/web/base/errors/generic.html:1 -#: templates/web/base/errors/generic.html:3 +#: templates/web/base/errors/generic.html:4 #: templates/web/base/tokens/abuse.html:1 #: templates/web/base/tokens/abuse.html:3 #: templates/web/base/tokens/error.html:1 -#: templates/web/base/tokens/error.html:3 +#: templates/web/base/tokens/error.html:5 msgid "Error" msgstr "خطأ" #: templates/web/base/reports/_list-filters.html:12 msgid "Everything" -msgstr "" +msgstr "الكل" #: templates/web/base/admin/body.html:14 #: templates/web/base/admin/category_edit.html:18 msgid "Example postcode %s" msgstr "مثال لصندوق البريد %s" -#: templates/web/base/open311/index.html:94 +#: templates/web/base/open311/index.html:86 msgid "Examples:" msgstr "أمثلة:" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:55 +#: templates/web/base/report/new/form_report.html:49 msgid "Explain what’s wrong, exactly where it is, and how long it’s been there…" msgstr "Ø£Ø´Ø±Ø Ù…Ø§ الخطأ، وبالضبط أين هو، وكم من المدة وهو هناك..." @@ -1045,9 +1029,8 @@ msgstr "Ø£Ø´Ø±Ø Ù…Ø§ الخطأ، وبالضبط أين هو، وكم من ال #: perllib/FixMyStreet/Cobrand/Zurich.pm:922 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:12 -#, fuzzy msgid "Extern" -msgstr "رابط خارجي" +msgstr "خارجي" #: templates/web/base/admin/body-form.html:81 msgid "External URL" @@ -1073,39 +1056,37 @@ msgstr "أول مرة" #: templates/web/base/admin/body.html:48 msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit body details</em> form below." -msgstr "" +msgstr "يمكن Ø¥ØµÙ„Ø§Ø Ø°Ù„Ùƒ عن طريق اختيار <strong>منطقة التغطية</strong> ÙÙŠ نموذج <em>تØرير تÙاصيل الهيئة</em> بالأسÙÙ„." #: templates/web/base/header.html:26 msgid "FixMyStreet" msgstr "Ø£ØµÙ„Ø Ø´Ø§Ø±Ø¹ÙŠ" -#: templates/web/base/admin/index.html:61 +#: templates/web/base/admin/index.html:54 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:24 #: templates/web/base/admin/report_blocks.html:9 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:144 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:34 -#: templates/web/fixmystreet/report/banner.html:12 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:32 +#: templates/web/base/report/banner.html:12 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:38 msgid "Fixed" -msgstr "تم إصلاØها" +msgstr "تم الإصلاØ" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:11 msgid "Fixed - Council" -msgstr "" +msgstr "تم Ø§Ù„Ø¥ØµÙ„Ø§Ø - المجلس" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:10 msgid "Fixed - User" -msgstr "تم إصلاØها - المستخدم" +msgstr "تم Ø§Ù„Ø¥ØµÙ„Ø§Ø - المستخدم" #: templates/web/base/admin/problem_row.html:37 msgid "Fixed:" -msgstr "تم إصلاØها:" +msgstr "تم الإصلاØ:" #: templates/web/base/admin/body-form.html:89 #: templates/web/zurich/admin/body-form.html:36 @@ -1116,7 +1097,7 @@ msgstr "مشار كمØذوÙ" msgid "Flag user" msgstr "مستخدم مشار إليه" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1281 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1290 #: templates/web/base/admin/users.html:19 msgid "Flagged" msgstr "مشار إليهم" @@ -1141,40 +1122,37 @@ msgstr "مشار إليه:" #: templates/web/base/reports/_ward-list.html:3 #: templates/web/fixmystreet/reports/_ward-list.html:4 msgid "Follow a ward link to view only reports within that ward." -msgstr "" +msgstr "اتبع ارتباط الدائرة لعرض التقارير الواقعة ضمن تلك الدائرة Ùقط." #: templates/web/base/admin/body-form.html:65 msgid "For more information, see <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>." msgstr "للمزيد من المعلومات، راجع <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>ÙƒÙŠÙ Ø£ØµÙ„Ø Ø´Ø§Ø±Ø¹ÙŠ يستخدم الخريطة</a>." -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:32 -#: templates/web/fixmystreet/report/update-form.html:106 +#: templates/web/base/report/new/form_user_loggedout_password.html:20 +#: templates/web/base/report/update/form_user_loggedout_password.html:19 msgid "Forgotten your password?" msgstr "هل نسيت كلمة المرور؟" #: perllib/FixMyStreet/Cobrand/Zurich.pm:752 msgid "Forwarded to external body" -msgstr "" +msgstr "تمت إعادة التوجيه إلى هيئة خارجية" #: perllib/FixMyStreet/Cobrand/Zurich.pm:753 msgid "Forwarded wish to external body" -msgstr "" +msgstr "تمت إعادة توجيه الطلب إلى هيئة خارجية" -#: templates/web/base/faq/faq-en-gb.html:1 -#: templates/web/base/faq/faq-en-gb.html:13 -#: templates/web/base/faq/faq-en-gb.html:6 -#: templates/web/base/open311/index.html:6 -#: templates/web/base/static/privacy.html:8 -#: templates/web/fixmystreet/contact/index.html:10 +#: templates/web/base/about/_sidebar.html:4 +#: templates/web/base/about/faq-en-gb.html:1 +#: templates/web/base/about/faq-en-gb.html:5 msgid "Frequently Asked Questions" msgstr "الأسئلة الشائعة" -#: templates/web/base/open311/index.html:136 +#: templates/web/base/open311/index.html:128 msgid "GeoRSS on Google Maps" -msgstr "" +msgstr "موجز GeoRSS على خرائط Google" +#: templates/web/base/report/display_tools.html:11 #: templates/web/fixmystreet/around/_updates.html:3 -#: templates/web/fixmystreet/report/display.html:35 msgid "Get updates" msgstr "اØصل على التØديثات" @@ -1190,7 +1168,7 @@ msgstr "اØصل على التØديثات للمشاكل ÙÙŠ هذه %s" #: templates/web/base/alert/_list.html:82 msgid "Give me an RSS feed" -msgstr "" +msgstr "أرسل لي موجز RSS" #: templates/web/base/questionnaire/completed.html:14 msgid "Glad to hear it’s been fixed!" @@ -1207,13 +1185,13 @@ msgstr "اذهب" msgid "Going to send questionnaire?" msgstr "هل تريد أن ترسل سؤال؟" -#: templates/web/base/admin/index.html:42 +#: templates/web/base/admin/index.html:35 msgid "Graph of problem creation by status over time" -msgstr "" +msgstr "الرسم البياني للإبلاغ عن المشكلات Øسب الØالة مع مرور الوقت" #: templates/web/base/reports/index.html:12 msgid "Greyed-out lines are councils that no longer exist." -msgstr "" +msgstr "الخطوط التي باللون الرمادي الÙØ§ØªØ ØªÙ…Ø«Ù„ مجالس لم تعد موجودة" #: templates/web/base/questionnaire/index.html:46 msgid "Has this problem been fixed?" @@ -1221,10 +1199,10 @@ msgstr "هل أصلØت هذه المشكلة؟" #: templates/web/base/questionnaire/index.html:59 msgid "Have you ever reported a problem to a council before, or is this your first time?" -msgstr "" +msgstr "هل أبلغت عن مشكلة لأØد المجالس من قبل، أم هذه هي المرة الأولى؟" #: templates/web/base/footer.html:15 templates/web/fixmystreet/footer.html:38 -#: templates/web/zurich/faq/faq-de-ch.html:1 +#: templates/web/zurich/about/faq-de-ch.html:1 #: templates/web/zurich/footer.html:22 #: templates/web/zurich/nav_over_content.html:8 msgid "Help" @@ -1275,7 +1253,7 @@ msgstr "كي٠تبلغ عن مشكلة" msgid "How to send successful reports" msgstr "كي٠ترسل بلاغات ناجØØ©" -#: perllib/FixMyStreet/App/Controller/Admin.pm:754 +#: perllib/FixMyStreet/App/Controller/Admin.pm:752 msgid "I am afraid you cannot confirm unconfirmed reports." msgstr "آس٠لايمكنك تأكيد البلاغات الغير مؤكدة." @@ -1293,10 +1271,6 @@ msgstr "لقد Øدثت الآن مشكلة على @fixmystreet" msgid "I'm afraid we couldn't locate your problem in the database.\n" msgstr "نعتذر لك لم نستطع تØديد مشكلتك ÙÙŠ قاعدة البيانات.\n" -#: perllib/FixMyStreet/App/Controller/Tokens.pm:327 -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 "" - #: templates/web/base/admin/flagged.html:14 #: templates/web/base/admin/list_updates.html:6 #: templates/web/base/admin/reports.html:11 @@ -1306,7 +1280,7 @@ msgstr "" #: templates/web/zurich/admin/list_updates.html:38 #: templates/web/zurich/admin/reports.html:11 msgid "ID" -msgstr "" +msgstr "المعرÙ" #: templates/web/base/admin/body-form.html:24 #: templates/web/base/admin/body-form.html:25 @@ -1314,36 +1288,37 @@ msgid "" "Identify a <strong>parent</strong> if this body is itself part of another body.\n" " For basic installations, you don't need to join bodies in this way." msgstr "" +"الرجاء تØديد <strong>عنصر رئيسي</strong> إذا كانت هذه الهيئة Ù†Ùسها جزءًا من هيئة أخرى.\n" +" Ùيما يتعلق بالأنظمة الأساسية المثبتة، Ùإنك لا تØتاج إلى ضم الهيئات بهذه الطريقة." #: templates/web/base/admin/body.html:133 msgid "" "If two or more bodies serve the same location, FixMyStreet combines identical categories into a single entry in\n" " the menu. Make sure you use the same category name in the bodies if you want this to happen." msgstr "" +"إذا كانت توجد هيئتان أو أكثر تخدمان Ù†Ùس الموقع، Ùإن FixMyStreet يجمع الÙئات المتطابقة ÙÙŠ إدخال واØد ÙÙŠ\n" +" القائمة. تأكد من استخدام اسم الÙئة Ù†Ùسها ÙÙŠ الهيئات إذا كنت تريد Øدوث ذلك." #: templates/web/base/questionnaire/completed.html:8 msgid "If you get some more information about the status of your problem, please come back to the site and leave an update." msgstr "إذا Øصلت على معلومات أكثر عن Øالة مشكلتك, الرجاء العودة للموقع ووضع تØديث لذلك." -#: templates/web/base/report/new/councils_text_none.html:2 -#: templates/web/base/report/new/councils_text_none.html:8 +#: templates/web/base/report/new/councils_text_none.html:10 +#: templates/web/base/report/new/councils_text_none.html:9 msgid "If you submit a problem here the subject and details of the problem will be public, but the problem will <strong>not</strong> be reported to the council." -msgstr "" - -#: templates/web/zurich/auth/token.html:19 -#: templates/web/zurich/email_sent.html:7 -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 "إذا كنت تستخدم البريد الإلكتروني عن طريق المتصÙØ Ø£Ùˆ لديك Ù…Ø±Ø´Ø Ù„Ù„Ø§Ø±Ø³Ø§Ø¦Ù„ الغير هامة، ربما تود تÙقد مجلد الرسائل الغير هامة: بعض الأØيان، رسائلنا يشار إليها بذلك." +msgstr "ÙÙŠ Øالة تقديم مشكلة هنا، Ùسيكون عنوان المشكلة وتÙاصيلها عامّين، ولكن <strong>لن</strong> يتم الإبلاغ عن المشكلة للمجلس." #: templates/web/base/questionnaire/index.html:68 msgid "" "If you wish to leave a public update on the problem, please enter it here\n" "(please note it will not be sent to the council)." msgstr "" +"إذا كنت ترغب ÙÙŠ ترك تØديث عام عن المشكلة، Ùالرجاء إدخاله هنا\n" +"(الرجاء ملاØظة أنه لن ÙŠÙرسل إلى المجلس)." #: templates/web/base/admin/body.html:149 msgid "If you're using <strong>a send method that is not email</strong>, enter the service ID (Open311) or equivalent identifier here." -msgstr "" +msgstr "إذا كنت تستخدم <strong>أسلوب إرسال غير البريد الإلكتروني</strong>ØŒ Ùأدخل معر٠الخدمة (Open311) أو المعر٠المقابل له هنا." #: templates/web/base/admin/body-form.html:207 #: templates/web/base/admin/body-form.html:208 @@ -1352,6 +1327,9 @@ msgid "" " its updates. Enable <strong>extended Open311 stauses</strong> if you want to allow extra states to be passed.\n" " Check that your cobrand supports this feature before switching it on." msgstr "" +"ÙÙŠ Øالة تمكين إعداد إرسال التØديث عبر Open311 بالأعلى، Ùإن Open311 يقبل عادة الØالة Ù…ÙØªÙˆØ Ø£Ùˆ مغلق ÙÙŠ \n" +" التØديثات. الرجاء تمكين <strong>Øالات Open311 الموسعة</strong> إذا كنت تريد معالجة Øالات إضاÙية.\n" +" الرجاء التØقق من أن العلامة التجارية المشتركة تدعم هذه الميزة قبل التبديل إليها.." #: templates/web/base/admin/body-form.html:194 #: templates/web/base/admin/body-form.html:195 @@ -1359,6 +1337,8 @@ msgid "" "If you've enabled Open311 update-sending above, enable <strong>suppression of alerts</strong> \n" " if you do <strong>not</strong> want that user to be notified whenever these updates are created." msgstr "" +"ÙÙŠ Øالة تمكين إرسال التØديث عبر Open311 بالأعلى، Ùالرجاء تمكين <strong>منع التنبيهات</strong> \n" +" إذا كنت <strong>لا</strong> تريد إعلام هذا المستخدم عند إنشاء هذه التØديثات." #: templates/web/base/admin/body-form.html:177 #: templates/web/base/admin/body-form.html:178 @@ -1367,145 +1347,142 @@ msgid "" " FixMyStreet <strong>user</strong> will be attributed as the creator of those updates\n" " when they are shown on the site. Enter the ID (number) of that user." msgstr "" +"ÙÙŠ Øالة تمكين إعداد إرسال التØديث عبر Open311 بالأعلى، يجب عليك تØديد \n" +" <strong>مستخدم</strong> FixMyStreet الذي سيوص٠بأنه منشئ هذه التØديثات\n" +" عندما تظهر على الموقع. أدخل معر٠(رقم) هذا المستخدم." #: perllib/FixMyStreet/App/Controller/Contact.pm:133 msgid "Illegal ID" -msgstr "" +msgstr "معر٠غير صالØ" #: perllib/FixMyStreet/App/Controller/Alert.pm:100 msgid "Illegal feed selection" -msgstr "" +msgstr "اختيار موجز غير صالØ" #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:144 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:32 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:30 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:36 msgid "In Progress" -msgstr "" +msgstr "قيد التقدم" #: templates/web/base/admin/flagged.html:39 msgid "In abuse table?" -msgstr "" +msgstr "ÙÙŠ جدول المسيئين؟" -#: templates/web/base/open311/index.html:88 +#: templates/web/base/open311/index.html:80 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 "" +msgstr "إضاÙØ© إلى ذلك، يتم إرجاع السمات التالية التي ليست جزءًا من مواصÙØ© Open311 v2: agency_sent_datetime Ùˆtitle (يرجع أيضًا كجزء من الوصÙ) Ùˆinterface_used Ùˆcomment_count Ùˆrequestor_name (يوجد إذا كان مقدم الطلب Ø³Ù…Ø Ø¨Ø¹Ø±Ø¶ الاسم على هذا الموقع)." #: perllib/FixMyStreet/Cobrand/Zurich.pm:199 #: perllib/FixMyStreet/Cobrand/Zurich.pm:963 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:7 -#: templates/web/fixmystreet/report/banner.html:19 +#: templates/web/base/report/banner.html:19 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:8 msgid "In progress" -msgstr "" +msgstr "قيد التقدم" #: templates/web/base/tokens/confirm_alert.html:11 msgid "Inbox zero, here we come!" -msgstr "" +msgstr "علبة الواردة Ùارغة، ها قد وصلنا!" #: templates/web/zurich/admin/report_edit.html:227 msgid "Include reporter personal details" -msgstr "" +msgstr "تضمين البيانات الشخصية للمبلّغ" #: templates/web/base/admin/stats.html:76 msgid "Include unconfirmed reports" -msgstr "" +msgstr "تضمين التقارير غير المؤكدة" #: perllib/FixMyStreet/App/Controller/Open311.pm:359 msgid "Incorrect has_photo value \"%s\"" -msgstr "" +msgstr "قيمة has_photo غير صØÙŠØØ© \"%s\"" #: templates/web/zurich/admin/list_updates.html:35 msgid "Internal notes" -msgstr "" +msgstr "ملاØظات داخلية" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:16 msgid "Internal referral" -msgstr "" +msgstr "Ø¥Øالة داخلية" #: perllib/FixMyStreet/App/Controller/Open311.pm:344 msgid "Invalid agency_responsible value %s" -msgstr "" +msgstr "قيمة agency_responsible غير صالØØ© %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1201 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1210 msgid "Invalid end date" -msgstr "" +msgstr "تاريخ نهاية غير صالØ" #: perllib/FixMyStreet/App/Controller/Open311.pm:437 msgid "Invalid format %s specified." -msgstr "" +msgstr "التنسيق المØدد %s غير صالØ." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1206 msgid "Invalid start date" -msgstr "" +msgstr "تاريخ البداية غير صالØ" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:5 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:143 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:31 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:29 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:35 msgid "Investigating" -msgstr "" +msgstr "جار٠التØقق" -#: templates/web/fixmystreet/contact/blurb.html:8 +#: templates/web/base/contact/blurb.html:8 msgid "It's often quickest to <a href=\"%s\">check our FAQs</a> and see if the answer is there." -msgstr "" +msgstr "أسرع طريقة عادةً هي <a href=\"%s\">الاطلاع على الأسئلة المتداولة</a> والبØØ« عما إذا كانت الإجابة موجودة هناك أم لا." #: templates/web/base/tokens/confirm_problem.html:14 msgid "It’s on its way to the council right now." -msgstr "" +msgstr "إنه ÙÙŠ الطريق إلى المجلس Øاليًا." #: perllib/FixMyStreet/Cobrand/Zurich.pm:184 msgid "Jurisdiction Unknown" -msgstr "" +msgstr "الصلاØية القضائية غير معروÙØ©" #: perllib/FixMyStreet/Cobrand/Zurich.pm:927 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:15 msgid "Jurisdiction unknown" -msgstr "" +msgstr "الصلاØية القضائية غير معروÙØ©" -#: templates/web/base/auth/general.html:44 -#: templates/web/base/report/new/fill_in_details_form.html:132 -#: templates/web/base/report/update-form.html:105 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:28 -#: templates/web/fixmystreet/report/update-form.html:102 +#: templates/web/base/auth/general.html:80 +#: templates/web/base/report/new/form_user_loggedout_password.html:16 +#: templates/web/base/report/update/form_user_loggedout_password.html:15 #: templates/web/zurich/auth/general.html:40 msgid "Keep me signed in on this computer" -msgstr "" +msgstr "اØتÙظ بتسجيل الدخول على هذا الكمبيوتر" #: templates/web/base/admin/body.html:70 #: templates/web/zurich/admin/body.html:16 msgid "Last editor" -msgstr "" +msgstr "آخر Ù…Øرر" #: templates/web/base/admin/report_edit.html:70 msgid "Last update:" -msgstr "" +msgstr "آخر تØديث" #: templates/web/base/admin/problem_row.html:39 msgid "Last update:" -msgstr "" +msgstr "آخر تØديث:" #: templates/web/base/admin/body-form.html:229 msgid "Leave this blank if all reports to this body should be sent using the same send method (e.g., \"%s\")." -msgstr "" +msgstr "اترك هذا خاليًا إذا كان سيتم إرسال جميع التقارير إلى هذه الهيئة باستخدام Ù†Ùس أسلوب الإرسال (على سبيل المثال \"%s\")." #: templates/web/base/admin/body.html:27 msgid "List all reported problems" -msgstr "" +msgstr "عرض جميع المشكلات المبلّغ عنها" #: templates/web/base/report/new/category_wrapper.html:4 msgid "Loading..." -msgstr "" +msgstr "جار٠التØميل..." #: templates/web/base/alert/choose.html:1 #: templates/web/base/alert/choose.html:3 @@ -1515,28 +1492,29 @@ msgstr "" #: templates/web/base/tokens/confirm_alert.html:1 #: templates/web/fixmystreet/alert/updates.html:1 msgid "Local RSS feeds and email alerts" -msgstr "" +msgstr "مواجز RSS وتنبيهات البريد الإلكتروني المØلية" #: templates/web/base/alert/list.html:1 templates/web/base/alert/list.html:12 #: templates/web/base/alert/list.html:14 templates/web/base/alert/list.html:3 msgid "Local RSS feeds and email alerts for ‘%s’" -msgstr "" +msgstr "مواجز RSS وتنبيهات البريد الإلكتروني المØلية لـ ’%s‘" #: templates/web/base/footer.html:13 templates/web/fixmystreet/footer.html:35 msgid "Local alerts" -msgstr "" +msgstr "التنبيهات المØلية" #: templates/web/base/index-steps.html:25 msgid "Locate the problem on a map of the area" -msgstr "" +msgstr "تØديد موقع المشكلة على خريطة المنطقة" #: templates/web/base/js/translation_strings.html:43 msgid "MAP" -msgstr "" +msgstr "الخريطة" #: templates/web/base/js/translation_strings.html:45 +#: templates/web/base/maps/google-ol.html:13 msgid "Map" -msgstr "" +msgstr "الخريطة" #: templates/web/base/admin/report_edit.html:68 msgid "Mark as sent" @@ -1544,47 +1522,39 @@ msgstr "اشر كمرسلة" #: templates/web/base/admin/user-form.html:44 msgid "Mark users whose behaviour you want to keep a check on as <strong>flagged</strong>." -msgstr "" +msgstr "تØديد المستخدمين الذين تريد وضع علامة على سلوكهم بأنه <strong>مشار إليه</strong>." #: templates/web/base/reports/index.html:24 msgid "Marked fixed/closed in the past eight weeks" -msgstr "" +msgstr "تØديد ما تم إصلاØÙ‡/إغلاقه خلال الأسابيع الثمانية الماضية" #: templates/web/base/reports/index.html:25 msgid "Marked fixed/closed more than eight weeks ago" -msgstr "" +msgstr "تØديد ما تم إصلاØÙ‡/إغلاقه منذ أكثر من ثمانية أسابيع" -#: templates/web/fixmystreet/contact/index.html:106 +#: templates/web/base/contact/index.html:98 msgid "Message" -msgstr "" +msgstr "الرسالة" #: templates/web/zurich/admin/report_edit.html:284 msgid "Message to competent body:" -msgstr "" +msgstr "رسالة إلى الهيئة المختصة:" #: templates/web/zurich/admin/report_edit.html:282 msgid "Message to external body:" -msgstr "" - -#: templates/web/base/contact/index.html:97 -msgid "Message:" -msgstr "" +msgstr "رسالة إلى الهيئة الخارجية:" #: perllib/FixMyStreet/App/Controller/Open311.pm:445 msgid "Missing jurisdiction_id" -msgstr "" +msgstr " jurisdiction_id غير موجود" #: templates/web/zurich/admin/stats.html:34 msgid "Moderated by division within one working day" -msgstr "" +msgstr "تمت المعالجة بواسطة القسم خلال يوم عمل واØد" #: templates/web/base/admin/stats.html:11 msgid "Month" -msgstr "" - -#: templates/web/base/report/display.html:34 -msgid "More problems nearby" -msgstr "" +msgstr "الشهر" #: templates/web/base/admin/bodies.html:21 #: templates/web/base/admin/body-form.html:18 @@ -1593,113 +1563,109 @@ msgstr "" #: templates/web/base/admin/list_updates.html:7 #: templates/web/base/admin/reports.html:13 #: templates/web/base/admin/users.html:15 -#: templates/web/base/auth/general.html:50 +#: templates/web/base/auth/general.html:89 +#: templates/web/base/report/new/form_user_loggedin.html:9 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:7 +#: templates/web/base/report/update/form_name.html:4 #: templates/web/base/reports/index.html:20 -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:9 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:44 -#: templates/web/fixmystreet/report/update-form.html:138 #: templates/web/zurich/admin/body-form.html:4 #: templates/web/zurich/auth/general.html:60 #: templates/web/zurich/report/new/fill_in_details_form.html:82 msgid "Name" -msgstr "" +msgstr "الاسم" #: templates/web/base/admin/report_edit.html:61 #: templates/web/base/admin/update_edit.html:32 #: templates/web/base/admin/user-form.html:18 #: templates/web/zurich/admin/stats.html:41 msgid "Name:" -msgstr "" +msgstr "الاسم:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:328 +#: perllib/FixMyStreet/Script/Reports.pm:107 msgid "Name: %s" -msgstr "" +msgstr "الاسم: %s" #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:160 #: perllib/FixMyStreet/Geocode/OSM.pm:145 msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s" -msgstr "" +msgstr "أقرب طريق مسمى للدبوس الموضوع على الخريطة (يتم إنشاؤه تلقائيًا باستخدام OpenStreetMap): %s%s" -#: perllib/FixMyStreet/Cobrand/UK.pm:127 +#: perllib/FixMyStreet/Cobrand/UK.pm:128 msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" -msgstr "" +msgstr "أقرب رمز بريدي للدبوس الموضوع على الخريطة (يتم إنشاؤه تلقائيًا): %s (على بعد %s متر)" -#: perllib/FixMyStreet/Cobrand/Default.pm:434 -#: perllib/FixMyStreet/Cobrand/Default.pm:474 +#: perllib/FixMyStreet/Cobrand/Default.pm:455 +#: perllib/FixMyStreet/Cobrand/Default.pm:495 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" -msgstr "" +msgstr "أقرب شارع مسمى للدبوس الموضوع على الخريطة (يتم إنشاؤه تلقائيًا باستخدام خرائط Bing): %s" -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:267 +#: perllib/FixMyStreet/Script/Alerts.pm:290 msgid "" "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n" "\n" -msgstr "" - -#: templates/web/zurich/email_sent.html:5 -msgid "Nearly Done! Now check your email..." -msgstr "" +msgstr "أقرب شارع مسمى للدبوس الموضوع على الخريطة (يتم إنشاؤه تلقائيًا باستخدام خرائط Bing): %s\n" #: templates/web/base/auth/token.html:17 templates/web/base/email_sent.html:5 msgid "Nearly done! Now check your email…" -msgstr "" +msgstr "أوشكنا على الانتهاء! راجع البريد الإلكتروني الآن…" #: templates/web/base/reports/index.html:21 msgid "New <br>problems" -msgstr "" +msgstr "المشكلات <br>الجديدة" #: perllib/FixMyStreet/App/Controller/Admin.pm:261 msgid "New body added" -msgstr "" +msgstr "تمت إضاÙØ© هيئة جديدة" #: perllib/FixMyStreet/App/Controller/Admin.pm:387 msgid "New category contact added" -msgstr "" +msgstr "تمت إضاÙØ© جهة اتصال جديدة للÙئة" #: templates/web/zurich/admin/report_edit-sdm.html:113 #: templates/web/zurich/admin/report_edit.html:141 msgid "New internal note:" -msgstr "" +msgstr "ملاØظة داخلية جديدة:" #: db/alert_types.pl:18 db/alert_types.pl:22 msgid "New local problems on FixMyStreet" -msgstr "" +msgstr "مشكلات Ù…Øلية جديدة على FixMyStreet" #: templates/web/zurich/admin/report_edit-sdm.html:117 msgid "New note to DM:" -msgstr "" +msgstr "ملاØظة جديدة لرئيس المنطقة:" #: db/alert_types.pl:38 msgid "New problems for {{COUNCIL}} within {{WARD}} ward on FixMyStreet" -msgstr "" +msgstr "مشكلات جديدة للمجلس {{COUNCIL}} ÙÙŠ دائرة {{WARD}} على FixMyStreet" #: db/alert_types.pl:26 db/alert_types.pl:30 msgid "New problems near {{POSTCODE}} on FixMyStreet" -msgstr "" +msgstr "مشكلات جديدة بالقرب من {{POSTCODE}} على FixMyStreet" #: db/alert_types.pl:10 msgid "New problems on FixMyStreet" -msgstr "" +msgstr "مشكلات جديدة على FixMyStreet" #: db/alert_types.pl:34 msgid "New problems to {{COUNCIL}} on FixMyStreet" -msgstr "" +msgstr "مشكلات جديدة إلى {{COUNCIL}} على FixMyStreet" #: db/alert_types.pl:42 msgid "New problems within {{NAME}}'s boundary on FixMyStreet" -msgstr "" +msgstr "مشكلات جديدة ضمن Øدود {{NAME}} على FixMyStreet" #: templates/web/zurich/admin/index-sdm.html:4 msgid "New reports" -msgstr "" +msgstr "تقارير جديدة" #: templates/web/base/admin/questionnaire.html:24 msgid "New state" -msgstr "" +msgstr "Øالة جديدة" #: templates/web/zurich/admin/template_edit.html:9 #: templates/web/zurich/admin/templates.html:26 msgid "New template" -msgstr "" +msgstr "قالب جديد" #: templates/web/base/pagination.html:13 msgid "Next" @@ -1716,22 +1682,22 @@ msgstr "التالي" #: templates/web/base/admin/report_edit.html:75 #: templates/web/base/admin/update_edit.html:25 #: templates/web/base/questionnaire/creator_fixed.html:16 +#: templates/web/base/questionnaire/index.html:101 #: templates/web/base/questionnaire/index.html:53 -#: templates/web/base/questionnaire/index.html:92 msgid "No" -msgstr "" +msgstr "لا" #: templates/web/base/admin/user-form.html:33 msgid "No body" -msgstr "" +msgstr "لا هيئة" #: templates/web/base/admin/stats.html:85 msgid "No council" -msgstr "" +msgstr "لا مجلس" #: perllib/FixMyStreet/DB/Result/Problem.pm:401 msgid "No council selected" -msgstr "" +msgstr "لم يتم تØديد مجلس" #: templates/web/base/admin/edit-league.html:17 msgid "No edits have yet been made." @@ -1739,20 +1705,20 @@ msgstr "لم تØدث أي تعديلات." #: templates/web/base/admin/flagged.html:25 msgid "No flagged problems found." -msgstr "" +msgstr "لم يتم العثور على مشكلات مشار إليها." #: templates/web/base/admin/flagged.html:58 msgid "No flagged users found." -msgstr "" +msgstr "لم يتم العثور على مستخدمين مشار إليهم." #: templates/web/zurich/admin/report_edit-sdm.html:138 #: templates/web/zurich/admin/report_edit.html:263 msgid "No further updates" -msgstr "" +msgstr "لا توجد تØديثات إضاÙية" #: templates/web/base/js/translation_strings.html:38 msgid "No result returned" -msgstr "" +msgstr "لم يتم إرجاع أي نتائج" #: templates/web/base/admin/body-form.html:60 #: templates/web/base/admin/body-form.html:61 @@ -1760,6 +1726,8 @@ msgid "" "No specific areas are currently available, because the <code>MAPIT_URL</code> in\n" " your config file is not pointing to a live MapIt service." msgstr "" +"لا تتوÙر مناطق معينة Øاليًا، لأن <code>MAPIT_URL</code> ÙÙŠ\n" +" مل٠التكوين لا يشير إلى خدمة MapIt مباشرة." #: templates/web/base/report/_support.html:2 #: templates/web/base/report/_support.html:4 @@ -1768,7 +1736,7 @@ msgstr "لا يوجد داعمون" #: templates/web/base/admin/report_edit.html:41 msgid "None" -msgstr "" +msgstr "بلا" #: templates/web/base/admin/user-form.html:24 #: templates/web/base/admin/user-form.html:25 @@ -1778,97 +1746,96 @@ msgid "" " Depending on the implementation, staff users may have access to the dashboard (summary of\n" " activity across their body), the ability to hide reports or set special report statuses." msgstr "" +"لا يجوز إقران المستخدمين العاديين (العموميين) بأي <strong>هيئة</strong>.<br>\n" +" يمكن إقران المستخدمين الموظÙين المعتمدين بالهيئة التي يمثلونها.<br>\n" +" تبعًا للتنÙيذ، يمكن أن يكون لدى المستخدمين الموظÙين ØÙ‚ الوصول إلى لوØØ© المعلومات (ملخص\n" +" الأنشطة عبر الهيئة التي يمثلونها)ØŒ أو القدرة على إخÙاء التقارير أو تعيين Øالات خاصة للتقارير." #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:13 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:33 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:31 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:37 msgid "Not Responsible" -msgstr "" +msgstr "غير مسؤول" #: perllib/FixMyStreet/Cobrand/Zurich.pm:188 #: perllib/FixMyStreet/Cobrand/Zurich.pm:937 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:13 msgid "Not contactable" -msgstr "" +msgstr "لا يمكن الاتصال به" #: templates/web/zurich/admin/report_edit-sdm.html:108 msgid "Not for my subdivision" -msgstr "" +msgstr "ليس للقسم الÙرعي التابع له" #: templates/web/base/admin/questionnaire.html:6 msgid "Not reported before" -msgstr "" +msgstr "لم يقوموا بالإبلاغ من قبل" #: templates/web/base/report/_main.html:62 msgid "Not reported to council" -msgstr "" +msgstr "لم يتم إبلاغ المجلس" #: templates/web/base/admin/body.html:71 #: templates/web/base/admin/category_edit.html:95 #: templates/web/zurich/admin/body.html:17 msgid "Note" -msgstr "" +msgstr "ملاØظة" #: templates/web/base/admin/stats.html:51 msgid "Note that when including unconfirmed reports we use the date the report was created which may not be in the same month the report was confirmed so the numbers may jump about a little" -msgstr "" +msgstr "لاØظ أنه عند تضمين التقارير غير المؤكدة Ùإننا نستخدم تاريخ إنشاء التقرير والذي قد لا يكون ÙÙŠ Ù†Ùس شهر تأكيد التقرير، لذلك قد تتغير الأرقام قليلاً." #: templates/web/base/admin/body.html:186 #: templates/web/base/admin/category_edit.html:52 #: templates/web/zurich/admin/body.html:53 msgid "Note:" -msgstr "" +msgstr "ملاØظة:" -#: templates/web/base/open311/index.html:73 +#: templates/web/base/open311/index.html:65 msgid "Note: <strong>%s</strong>" msgstr "ملاØظة: <strong>%s</strong>" #: templates/web/zurich/admin/list_updates.html:21 msgid "Notes from SDM to DM" -msgstr "" +msgstr "ملاØظات من رئيس المنطقة الÙرعية لرئيس المنطقة:" -#: templates/web/base/report/new/fill_in_details_form.html:113 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:10 +#: templates/web/base/report/new/form_user_loggedout.html:14 +#: templates/web/base/report/new/form_user_loggedout.html:2 +#: templates/web/base/report/new/oauth_email_form.html:17 msgid "Now to submit your report…" -msgstr "" +msgstr "الآن Øان وقت تقديم التقرير…" -#: templates/web/base/report/update-form.html:86 -#: templates/web/fixmystreet/report/update-form.html:85 +#: templates/web/base/report/update-form.html:28 +#: templates/web/base/report/update/form_user_loggedout.html:13 +#: templates/web/base/report/update/form_user_loggedout.html:2 msgid "Now to submit your update…" -msgstr "" +msgstr "الآن Øان وقت تقديم التØديث…" #: templates/web/base/js/translation_strings.html:42 msgid "OK" -msgstr "" - -#: templates/web/base/report/display.html:28 -#: templates/web/base/report/update.html:17 -msgid "Offensive? Unsuitable? Tell us" -msgstr "" +msgstr "مواÙÙ‚" #: templates/web/base/reports/index.html:23 msgid "Old / unknown <br>problems" -msgstr "" +msgstr "المشكلات القديمة/غير <br>المعروÙØ©" #: templates/web/base/admin/questionnaire.html:24 msgid "Old state" -msgstr "" +msgstr "Øالة قديمة" #: templates/web/base/reports/index.html:25 msgid "Older <br>fixed" -msgstr "" +msgstr "المشكلات القديمة التي تم <br>إصلاØها" #: templates/web/base/reports/index.html:22 msgid "Older <br>problems" -msgstr "" +msgstr "المشكلات <br>القديمة" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:45 +#: templates/web/base/report/new/form_report.html:15 msgid "One-line summary" -msgstr "" +msgstr "ملخص من سطر واØد" #: perllib/FixMyStreet/Cobrand/Zurich.pm:176 #: perllib/FixMyStreet/Cobrand/Zurich.pm:909 @@ -1877,137 +1844,130 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:4 #: templates/web/base/admin/update_edit.html:28 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/report/update-form.html:30 -#: templates/web/fixmystreet/report/update-form.html:28 +#: templates/web/base/report/update/form_update.html:34 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:7 #: templates/web/zurich/admin/update_edit.html:18 msgid "Open" -msgstr "" +msgstr "Ù…ÙتوØ" #: templates/web/base/reports/index.html:22 msgid "Open for more than four weeks, with an update within the past eight weeks" -msgstr "" +msgstr "Ù…ÙØªÙˆØ Ù„Ø£ÙƒØ«Ø± من أربعة أسابيع، مع وجود تØديث خلال الأسابيع الثمانية الماضية" #: templates/web/base/reports/index.html:23 msgid "Open, but not had any update in eight weeks" -msgstr "" +msgstr "Ù…ÙتوØØŒ ولكن لا يوجد أي تØديث خلال ثمانية أسابيع" -#: templates/web/base/open311/index.html:70 +#: templates/web/base/open311/index.html:62 msgid "Open311 API for the mySociety FixMyStreet server" -msgstr "" +msgstr "واجهة Open311 API لخادم mySociety FixMyStreet" -#: templates/web/base/open311/index.html:80 +#: templates/web/base/open311/index.html:72 msgid "Open311 initiative web page" -msgstr "" +msgstr "صÙØØ© ويب مبادرة Open311" -#: templates/web/base/open311/index.html:81 +#: templates/web/base/open311/index.html:73 msgid "Open311 specification" -msgstr "" +msgstr "مواصÙØ© Open311" #: templates/web/base/alert/_list.html:60 msgid "Or problems reported to:" -msgstr "" +msgstr "أو المشكلات المبلغ عنها إلى:" #: templates/web/base/alert/_list.html:36 msgid "Or you can subscribe to an alert based upon what ward or council you’re in:" -msgstr "" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1084 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:673 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:674 -#: perllib/FixMyStreet/DB/Result/Problem.pm:570 -#: perllib/FixMyStreet/DB/Result/Problem.pm:580 +msgstr "أو يمكنك الاشتراك للØصول على تنبيه تبعًا للإدارة أو المجلس الذي تتبعه:" + +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1055 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:669 +#: perllib/FixMyStreet/DB/Result/Problem.pm:558 +#: perllib/FixMyStreet/DB/Result/Problem.pm:568 +#: perllib/FixMyStreet/DB/Result/Problem.pm:578 #: perllib/FixMyStreet/DB/Result/Problem.pm:590 -#: perllib/FixMyStreet/DB/Result/Problem.pm:602 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:397 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:412 +#: perllib/FixMyStreet/Script/Reports.pm:175 +#: perllib/FixMyStreet/Script/Reports.pm:190 msgid "Other" -msgstr "" +msgstr "أخرى" #: templates/web/base/admin/list_updates.html:8 msgid "Owner" -msgstr "" +msgstr "المالك" #: templates/web/base/errors/page_error_404_not_found.html:1 -#: templates/web/base/errors/page_error_404_not_found.html:3 +#: templates/web/base/errors/page_error_404_not_found.html:4 msgid "Page Not Found" -msgstr "" +msgstr "لم يتم العثور على الصÙØØ©" #: templates/web/base/admin/body-form.html:31 #: templates/web/zurich/admin/body-form.html:14 msgid "Parent" -msgstr "" +msgstr "العنصر الرئيسي" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:18 msgid "Partial" -msgstr "" +msgstr "جزئي" -#: templates/web/base/auth/general.html:53 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:68 -#: templates/web/fixmystreet/report/update-form.html:116 +#: templates/web/base/auth/general.html:92 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:31 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:6 #: templates/web/zurich/auth/general.html:32 #: templates/web/zurich/auth/general.html:63 msgid "Password (optional)" -msgstr "" +msgstr "كلمة المرور (اختياري)" #: templates/web/base/auth/change_password.html:25 -#: templates/web/base/auth/general.html:36 +#: templates/web/base/auth/general.html:72 msgid "Password:" -msgstr "" +msgstr "كلمة المرور:" #: templates/web/base/js/translation_strings.html:48 msgid "Permalink" -msgstr "" +msgstr "الارتباط الثابت" #: templates/web/zurich/report/new/fill_in_details_form.html:88 msgid "Phone number" -msgstr "" +msgstr "رقم الهاتÙ" -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:26 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:62 +#: templates/web/base/report/new/form_user_loggedin.html:26 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:25 msgid "Phone number (optional)" -msgstr "" +msgstr "رقم الهات٠(اختياري)" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:306 +#: perllib/FixMyStreet/Script/Reports.pm:83 #: templates/web/base/admin/report_edit.html:63 -#: templates/web/base/report/new/fill_in_details_form.html:198 #: templates/web/zurich/admin/stats.html:39 msgid "Phone:" -msgstr "" +msgstr "الهاتÙ:" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:66 -#: templates/web/fixmystreet/report/update-form.html:59 +#: templates/web/base/questionnaire/index.html:75 +#: templates/web/base/report/new/form_report.html:23 +#: templates/web/base/report/update/form_update.html:6 #: templates/web/zurich/admin/index-dm.html:29 #: templates/web/zurich/admin/index-sdm.html:24 #: templates/web/zurich/admin/reports.html:16 #: templates/web/zurich/admin/stats.html:37 -#: templates/web/zurich/report/new/fill_in_details_form.html:52 +#: templates/web/zurich/report/new/fill_in_details_form.html:45 msgid "Photo" -msgstr "" +msgstr "الصورة" -#: perllib/FixMyStreet/App/Controller/Photo.pm:221 +#: perllib/FixMyStreet/App/Controller/Photo.pm:187 msgid "Photo is required." -msgstr "" +msgstr "الصورة مطلوبة." #: templates/web/base/admin/category_edit.html:48 msgid "Photo required" -msgstr "" - -#: templates/web/base/questionnaire/index.html:80 -#: templates/web/base/report/new/fill_in_details_form.html:84 -#: templates/web/base/report/update-form.html:62 -msgid "Photo:" -msgstr "" +msgstr "الصورة مطلوبة" -#: templates/web/base/alert/list.html:26 +#: templates/web/base/alert/list.html:23 msgid "Photos of recent nearby reports" -msgstr "" +msgstr "صور التقارير القريبة الØديثة" #: templates/web/base/js/translation_strings.html:30 msgid "Place pin on map" -msgstr "" +msgstr "وضع دبوس على الخريطة" #: perllib/FixMyStreet/Cobrand/Zurich.pm:949 #: perllib/FixMyStreet/Cobrand/Zurich.pm:955 @@ -2019,274 +1979,275 @@ msgstr "" #: templates/web/zurich/admin/header.html:9 #: templates/web/zurich/admin/index-dm.html:9 msgid "Planned" -msgstr "" +msgstr "مخطط" #: templates/web/base/report/new/notes.html:5 msgid "Please be polite, concise and to the point." -msgstr "" +msgstr "الرجاء التØلي بالأدب والاختصار والتركيز على الÙكرة." #: templates/web/base/auth/change_password.html:12 #: templates/web/base/auth/change_password.html:17 msgid "Please check the passwords and try again" -msgstr "" - -#: templates/web/zurich/auth/token.html:16 -msgid "Please check your email" -msgstr "" +msgstr "الرجاء التØقق من كلمات المرور وإعادة المØاولة" -#: templates/web/base/auth/general.html:10 -#: templates/web/base/auth/general.html:16 +#: templates/web/base/auth/general.html:27 +#: templates/web/base/auth/general.html:33 #: templates/web/zurich/auth/general.html:3 #: templates/web/zurich/auth/general.html:9 msgid "Please check your email address is correct" -msgstr "" +msgstr "الرجاء التØقق من أن عنوان البريد الإلكتروني صØÙŠØ" #: perllib/FixMyStreet/App/Controller/Admin.pm:343 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:883 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:948 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:878 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:943 #: perllib/FixMyStreet/DB/Result/Problem.pm:412 #: templates/web/base/js/translation_strings.html:9 msgid "Please choose a category" -msgstr "" +msgstr "الرجاء اختيار Ùئة" #: perllib/FixMyStreet/DB/Result/Problem.pm:418 msgid "Please choose a property type" -msgstr "" +msgstr "الرجاء اختيار نوع العقار" #: perllib/FixMyStreet/App/Controller/Admin.pm:378 msgid "Please correct the errors below" -msgstr "" +msgstr "الرجاء تصØÙŠØ Ø§Ù„Ø£Ø®Ø·Ø§Ø¡ التالية" -#: templates/web/base/contact/blurb.html:2 -#: templates/web/fixmystreet/contact/blurb.html:12 +#: templates/web/base/contact/blurb.html:12 msgid "" "Please do <strong>not</strong> report problems through this form; messages go to\n" "the team behind this site, not a council. To report a problem,\n" "please <a href=\"/\">go to the front page</a> and follow the instructions." msgstr "" +"الرجاء <strong>عدم</strong> الإبلاغ عن المشكلات من خلال هذا النموذج؛ Ùالرسائل تذهب إلى\n" +"الÙريق المسؤول عن هذا الموقع وليس إلى المجلس. للإبلاغ عن مشكلة،\n" +"الرجاء <a href=\"/\">الذهاب إلى الصÙØØ© الأمامية</a> واتباع التعليمات." #: templates/web/base/report/new/notes.html:6 msgid "Please do not be abusive — abusing your council devalues the service for all users." -msgstr "" +msgstr "الرجاء عدم إساءة الاستعمال؛ Ùإساءة استعمال المجلس يتسبب ÙÙŠ تقليل قيمة الخدمة المقدمة لكل المستخدمين." #: perllib/FixMyStreet/App/Controller/Admin.pm:346 -#: perllib/FixMyStreet/DB/Result/Comment.pm:126 +#: perllib/FixMyStreet/DB/Result/Comment.pm:125 #: templates/web/base/js/translation_strings.html:2 msgid "Please enter a message" -msgstr "" +msgstr "الرجاء إدخال رسالة" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1091 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1146 +#, fuzzy +msgid "Please enter a name" +msgstr "الرجاء إدخال اسمك" #: templates/web/base/auth/change_password.html:12 #: templates/web/base/auth/change_password.html:15 #: templates/web/base/js/translation_strings.html:19 msgid "Please enter a password" -msgstr "" +msgstr "الرجاء إدخال كلمة مرور" #: perllib/FixMyStreet/App/Controller/Contact.pm:114 #: perllib/FixMyStreet/DB/Result/Problem.pm:395 #: templates/web/base/js/translation_strings.html:3 msgid "Please enter a subject" -msgstr "" +msgstr "الرجاء إدخال موضوع" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1084 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1137 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1087 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1142 #: perllib/FixMyStreet/App/Controller/Admin.pm:345 -#: perllib/FixMyStreet/DB/Result/User.pm:127 +#: perllib/FixMyStreet/DB/Result/User.pm:133 #: templates/web/base/js/translation_strings.html:12 #: templates/web/base/js/translation_strings.html:16 msgid "Please enter a valid email" -msgstr "" +msgstr "الرجاء إدخال بريد إلكتروني صالØ" #: perllib/FixMyStreet/App/Controller/Alert.pm:346 #: perllib/FixMyStreet/App/Controller/Contact.pm:124 msgid "Please enter a valid email address" -msgstr "" +msgstr "الرجاء إدخال عنوان بريد إلكتروني صالØ" #: perllib/FixMyStreet/DB/Result/Problem.pm:398 #: templates/web/base/js/translation_strings.html:4 msgid "Please enter some details" -msgstr "" +msgstr "الرجاء إدخال بعض التÙاصيل" #: perllib/FixMyStreet/App/Controller/Contact.pm:113 -#: perllib/FixMyStreet/DB/Result/User.pm:124 -#: templates/web/base/auth/general.html:10 -#: templates/web/base/auth/general.html:15 +#: perllib/FixMyStreet/DB/Result/User.pm:130 +#: templates/web/base/auth/general.html:27 +#: templates/web/base/auth/general.html:32 #: templates/web/base/js/translation_strings.html:11 #: templates/web/base/js/translation_strings.html:15 #: templates/web/zurich/auth/general.html:3 #: templates/web/zurich/auth/general.html:8 msgid "Please enter your email" -msgstr "" +msgstr "الرجاء إدخال البريد الإلكتروني" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:7 +#: templates/web/base/report/new/form_user_loggedout_email.html:7 #: templates/web/zurich/report/new/fill_in_details_form.html:80 msgid "Please enter your email address" msgstr "الرجاء إدخال عنوان بريدك الإلكتروني" #: templates/web/base/js/translation_strings.html:25 msgid "Please enter your first name" -msgstr "" +msgstr "الرجاء إدخال الاسم الأول" -#: perllib/FixMyStreet/Cobrand/UK.pm:318 +#: perllib/FixMyStreet/Cobrand/UK.pm:319 #: templates/web/base/js/translation_strings.html:7 msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below" -msgstr "" +msgstr "الرجاء إدخال الاسم الكامل؛ Ùالمجالس تØتاج هذه المعلومة - إذا كنت لا ترغب ÙÙŠ إظهار اسمك على الموقع، Ùألغ٠تØديد هذا المربع الموجود بالأسÙÙ„" #: perllib/FixMyStreet/App/Controller/Contact.pm:112 -#: perllib/FixMyStreet/DB/Result/Comment.pm:123 +#: perllib/FixMyStreet/DB/Result/Comment.pm:122 #: perllib/FixMyStreet/DB/Result/Problem.pm:406 -#: perllib/FixMyStreet/DB/Result/User.pm:120 +#: perllib/FixMyStreet/DB/Result/User.pm:126 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter your name" -msgstr "" +msgstr "الرجاء إدخال اسمك" #: templates/web/base/js/translation_strings.html:22 msgid "Please enter your phone number" -msgstr "" +msgstr "الرجاء إدخال رقم الهاتÙ" #: templates/web/base/js/translation_strings.html:26 msgid "Please enter your second name" -msgstr "" +msgstr "الرجاء إدخال الاسم الثاني" #: templates/web/base/js/translation_strings.html:24 msgid "Please enter your title" -msgstr "" +msgstr "الرجاء إدخال اللقب" #: templates/web/base/auth/sign_out.html:5 #: templates/web/zurich/auth/sign_out.html:5 msgid "Please feel free to <a href=\"%s\">sign in again</a>, or go back to the <a href=\"/\">front page</a>." -msgstr "" +msgstr "الرجاء ألا تتردد ÙÙŠ <a href=\"%s\">تسجيل الدخول مرة أخرى</a>ØŒ أو العودة إلى <a href=\"/\">الصÙØØ© الأمامية</a>." #: templates/web/base/report/new/fill_in_details_text.html:1 #: templates/web/base/report/new/fill_in_details_text.html:8 msgid "Please fill in details of the problem below." -msgstr "" +msgstr "الرجاء تعبئة تÙاصيل المشكلة بالأسÙÙ„." -#: templates/web/zurich/report/new/fill_in_details_form.html:46 +#: templates/web/zurich/report/new/fill_in_details_form.html:72 msgid "Please fill in details of the problem." -msgstr "" +msgstr "الرجاء تعبئة تÙاصيل المشكلة." -#: templates/web/base/report/new/fill_in_details_form.html:28 -#: templates/web/fixmystreet/report/new/sidebar.html:7 +#: templates/web/base/report/new/sidebar.html:7 #: templates/web/zurich/report/new/fill_in_details_form.html:20 msgid "Please fill in the form below with details of the problem, and describe the location as precisely as possible in the details box." -msgstr "" +msgstr "الرجاء تعبئة النموذج التالي بتÙاصيل المشكلة، وأدخل وصÙًا للموقع يكون دقيقًا قدر الإمكان ÙÙŠ مربع التÙاصيل." #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:253 msgid "Please indicate whether you'd like to receive another questionnaire" -msgstr "" +msgstr "الرجاء الإشارة إلى ما إذا كنت تريد المشاركة ÙÙŠ استبيان آخر أم لا" -#: templates/web/fixmystreet/report/updates-sidebar-notes.html:4 +#: templates/web/base/report/updates-sidebar-notes.html:2 msgid "Please note that updates are not sent to the council." -msgstr "" +msgstr "الرجاء ملاØظة أن التØديثات لا يتم إرسالها إلى المجلس." -#: templates/web/base/report/update-form.html:7 -msgid "Please note that updates are not sent to the council. If you leave your name it will be public. Your information will only be used in accordance with our <a href=\"/faq#privacy\">privacy policy</a>" -msgstr "" +#: templates/web/base/report/new/oauth_email_form.html:4 +#, fuzzy +msgid "Please note your report has <strong>not yet been sent</strong>." +msgstr "الرجاء ملاØظة أن التقرير <strong>لم يتم إرساله</strong>. اختر Ùئة وأض٠مزيدًا من المعلومات بالأسÙÙ„ØŒ ثم قدّم التقرير." -#: templates/web/base/report/new/fill_in_details_form.html:8 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:21 +#: templates/web/base/report/new/fill_in_details_form.html:20 #: templates/web/zurich/report/new/fill_in_details_form.html:11 msgid "Please note your report has <strong>not yet been sent</strong>. Choose a category and add further information below, then submit." +msgstr "الرجاء ملاØظة أن التقرير <strong>لم يتم إرساله</strong>. اختر Ùئة وأض٠مزيدًا من المعلومات بالأسÙÙ„ØŒ ثم قدّم التقرير." + +#: templates/web/base/report/display.html:26 +msgid "Please note your update has <strong>not yet been posted</strong>." msgstr "" #: templates/web/base/report/new/notes.html:1 #: templates/web/zurich/report/new/notes.html:1 msgid "Please note:" -msgstr "" +msgstr "الرجاء ملاØظة:" #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:256 msgid "Please provide some explanation as to why you're reopening this report" -msgstr "" +msgstr "الرجاء ØªÙˆØ¶ÙŠØ Ø£Ø³Ø¨Ø§Ø¨ تقديم هذا التقرير" #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:263 msgid "Please provide some text as well as a photo" -msgstr "" +msgstr "الرجاء إضاÙØ© بعض التوضيØات وصورة" #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:124 #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249 msgid "Please say whether you've ever reported a problem to your council before" -msgstr "" +msgstr "الرجاء ذكر ما إذا كنت قد أبلغت عن مشكلة إلى المجلس من قبل أم لا" #: templates/web/zurich/admin/report_edit.html:208 msgid "Please select a body." -msgstr "" +msgstr "الرجاء تØديد هيئة." #: perllib/FixMyStreet/App/Controller/Alert.pm:80 msgid "Please select the feed you want" -msgstr "" +msgstr "الرجاء تØديد الموجز الذي تريده" #: perllib/FixMyStreet/App/Controller/Alert.pm:118 msgid "Please select the type of alert you want" -msgstr "" +msgstr "الرجاء تØديد نوع التنبيه الذي تريده" #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:245 msgid "Please state whether or not the problem has been fixed" -msgstr "" +msgstr "الرجاء تØديد ما إذا كانت المشكلة قد تم Øلها أم لا" #: perllib/FixMyStreet/App/Model/PhotoSet.pm:117 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:145 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:147 +#: templates/web/base/js/translation_strings.html:53 msgid "Please upload a JPEG image only" -msgstr "" +msgstr "الرجاء تØميل صورة JPEG Ùقط" #: perllib/FixMyStreet/App/Controller/Contact.pm:115 msgid "Please write a message" -msgstr "" +msgstr "الرجاء كتابة رسالة" -#: templates/web/fixmystreet/report/update-form.html:23 +#: templates/web/base/report/update/form_update.html:29 msgid "Please write your update here" -msgstr "" +msgstr "الرجاء كتابة التØديث هنا" -#: templates/web/base/contact/index.html:100 -#: templates/web/base/report/update-form.html:110 -#: templates/web/base/report/update-form.html:132 -#: templates/web/base/report/update-form.html:72 -#: templates/web/fixmystreet/contact/index.html:113 -#: templates/web/fixmystreet/report/update-form.html:124 -#: templates/web/fixmystreet/report/update-form.html:71 -#: templates/web/fixmystreet/report/update-form.html:97 +#: templates/web/base/contact/index.html:105 +#: templates/web/base/report/update-form.html:24 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:14 +#: templates/web/base/report/update/form_user_loggedout_password.html:10 msgid "Post" -msgstr "" +msgstr "نشر" #: templates/web/base/report/updates.html:15 msgid "Posted anonymously at %s" -msgstr "" +msgstr "نشر بدون تØديد الهوية ÙÙŠ %s" #: templates/web/base/report/updates.html:22 msgid "Posted by %s (<strong>%s</strong>) at %s" -msgstr "" +msgstr "تم النشر بواسطة %s (<strong>%s</strong>) ÙÙŠ %s" #: templates/web/base/report/updates.html:24 msgid "Posted by %s at %s" -msgstr "" +msgstr "تم النشر بواسطة %s ÙÙŠ %s" #: templates/web/base/front/footer-marketing.html:12 msgid "Powered by <a class=\"platform-logo\" href=\"http://fixmystreet.org/\">FixMyStreet Platform</a>" -msgstr "" +msgstr "مشغّل بواسطة <a class=\"platform-logo\" href=\"http://fixmystreet.org/\">نظام FixMyStreet الأساسي</a>" #: templates/web/base/pagination.html:7 msgid "Previous" -msgstr "" +msgstr "السابق" #: templates/web/fixmystreet/footer.html:41 msgid "Privacy" -msgstr "" +msgstr "الخصوصية" -#: templates/web/base/faq/faq-en-gb.html:7 -#: templates/web/base/open311/index.html:7 -#: templates/web/base/static/privacy.html:1 -#: templates/web/base/static/privacy.html:2 -#: templates/web/base/static/privacy.html:9 -#: templates/web/fixmystreet/contact/index.html:11 +#: templates/web/base/about/_sidebar.html:5 +#: templates/web/base/about/privacy.html:1 +#: templates/web/base/about/privacy.html:2 msgid "Privacy and cookies" -msgstr "" +msgstr "الخصوصية وملÙات تعري٠الارتباط" #: templates/web/base/admin/body.html:202 #: templates/web/base/admin/body.html:85 #: templates/web/base/admin/category_edit.html:45 #: templates/web/base/admin/report_edit.html:77 msgid "Private" -msgstr "" +msgstr "خاص" #: templates/web/base/maps/noscript_map.html:59 #: templates/web/zurich/maps/noscript_map.html:57 @@ -2295,74 +2256,74 @@ msgstr "مشكلة" #: templates/web/base/admin/timeline.html:22 msgid "Problem %d created" -msgstr "" +msgstr "تم إنشاء المشكلة %d" #: templates/web/base/admin/timeline.html:24 msgid "Problem %s confirmed" -msgstr "" +msgstr "تم تأكيد المشكلة %s" #: templates/web/base/admin/timeline.html:26 msgid "Problem %s sent to council %s" -msgstr "" +msgstr "تم إرسال المشكلة %s إلى المجلس %s" -#: templates/web/base/admin/index.html:46 +#: templates/web/base/admin/index.html:39 #: templates/web/zurich/admin/index.html:9 msgid "Problem breakdown by state" -msgstr "" +msgstr "تصني٠المشكلة Øسب الØالة" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1055 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1058 msgid "Problem marked as open." -msgstr "" +msgstr "تم وضع علامة \"Ù…ÙتوØ\" على المشكلة." #: templates/web/base/admin/questionnaire.html:21 msgid "Problem state change based on survey results" -msgstr "" +msgstr "يتم تغيير Øالة المشكلة Øسب نتائج الاستطلاع" #: templates/web/base/admin/flagged.html:10 msgid "Problems" -msgstr "" +msgstr "المشكلات" #: templates/web/base/around/_updates.html:1 msgid "Problems in this area" -msgstr "" +msgstr "المشكلات ÙÙŠ هذه المنطقة" -#: templates/web/fixmystreet/report/display.html:43 +#: templates/web/base/report/display_tools.html:19 msgid "Problems nearby" -msgstr "" +msgstr "المشكلات القريبة" -#: templates/web/fixmystreet/report/display.html:41 +#: templates/web/base/report/display_tools.html:17 msgid "Problems on the map" -msgstr "" +msgstr "المشكلات على الخريطة" #: db/alert_types.pl:14 msgid "Problems recently reported fixed on FixMyStreet" -msgstr "" +msgstr "المشكلات المبلّغ عنها مؤخرًا على FixMyStreet" #: templates/web/base/alert/_list.html:21 msgid "Problems within %.1fkm of this location" -msgstr "" +msgstr "المشكلات الموجودة ضمن %.1f كم من هذا الموقع" -#: perllib/FixMyStreet/Cobrand/Default.pm:642 +#: perllib/FixMyStreet/Cobrand/Default.pm:663 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:120 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:139 -#: perllib/FixMyStreet/Cobrand/UK.pm:207 +#: perllib/FixMyStreet/Cobrand/UK.pm:208 msgid "Problems within %s" -msgstr "" +msgstr "المشكلات ضمن Øدود %s" #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:128 -#: perllib/FixMyStreet/Cobrand/UK.pm:221 +#: perllib/FixMyStreet/Cobrand/UK.pm:222 msgid "Problems within %s ward" -msgstr "" +msgstr "المشكلات ضمن Øدود دائرة %s" #. ("First %s is the body name, second %s the site name") #: templates/web/base/reports/body.html:0 #: templates/web/base/reports/body.html:24 msgid "Problems within %s, %s" -msgstr "" +msgstr "المشكلات ضمن Øدود %sØŒ %s" #: templates/web/base/alert/_list.html:42 msgid "Problems within the boundary of:" -msgstr "" +msgstr "المشكلات ضمن Øدود:" #: templates/web/base/admin/report_edit.html:45 msgid "Property address:" @@ -2370,131 +2331,124 @@ msgstr "عنوان الملكية:" #: templates/web/base/report/new/category.html:8 msgid "Property type:" -msgstr "" +msgstr "نوع العقار:" -#: templates/web/base/report/update-form.html:3 -#: templates/web/fixmystreet/report/update-form.html:4 +#: templates/web/base/report/update-form.html:6 msgid "Provide an update" -msgstr "" +msgstr "قدّم تØديثًا" -#: templates/web/base/auth/general.html:56 +#: templates/web/base/auth/general.html:95 msgid "Providing a name and password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." -msgstr "" +msgstr "تقديم الاسم وكلمة المرور اختياري، ولكن Ùعل ذلك ÙŠØªÙŠØ Ù„Ùƒ الإبلاغ عن المشكلات وإضاÙØ© التØديثات وإدارة التقارير بسهولة أكبر." -#: templates/web/base/report/new/fill_in_details_form.html:156 -#: templates/web/base/report/update-form.html:129 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:71 -#: templates/web/fixmystreet/report/update-form.html:119 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:34 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:9 msgid "Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." -msgstr "" +msgstr "تقديم كلمة المرور اختياري، ولكن Ùعل ذلك ÙŠØªÙŠØ Ù„Ùƒ الإبلاغ عن المشكلات وإضاÙØ© التØديثات وإدارة التقارير بسهولة أكبر." #: templates/web/zurich/admin/report_edit.html:245 #: templates/web/zurich/admin/report_edit.html:272 msgid "Public response:" -msgstr "" +msgstr "الاستجابة العامة:" #: templates/web/zurich/admin/report_edit.html:121 #: templates/web/zurich/admin/stats.html:38 msgid "Publish photo" -msgstr "" +msgstr "نشر الصورة" #: templates/web/base/questionnaire/completed.html:1 #: templates/web/base/questionnaire/index.html:0 #: templates/web/base/questionnaire/index.html:12 #: templates/web/base/questionnaire/index.html:5 msgid "Questionnaire" -msgstr "" +msgstr "الاستبيان" #: templates/web/base/admin/timeline.html:30 msgid "Questionnaire %d answered for problem %d, %s to %s" -msgstr "" +msgstr "تمت الإجابة عن الاستبيان %d للمشكلة %dØŒ من %s إلى %s" #: templates/web/base/admin/timeline.html:28 msgid "Questionnaire %d sent for problem %d" -msgstr "" +msgstr "تم إرسال الاستبيان %d للمشكلة %d" #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:200 msgid "Questionnaire filled in by problem reporter" -msgstr "" +msgstr "تمت تعبئة الاستبيان بواسطة المبلّغ عن المشكلة" #: templates/web/base/alert/_list.html:22 #: templates/web/base/around/display_location.html:1 #: templates/web/base/around/display_location.html:3 -#: templates/web/base/report/display.html:50 +#: templates/web/base/report/display_tools.html:34 #: templates/web/base/reports/_rss.html:1 #: templates/web/fixmystreet/alert/updates.html:9 -#: templates/web/fixmystreet/report/display.html:58 msgid "RSS feed" -msgstr "" +msgstr "موجز RSS" -#: perllib/FixMyStreet/Cobrand/UK.pm:250 perllib/FixMyStreet/Cobrand/UK.pm:262 +#: perllib/FixMyStreet/Cobrand/UK.pm:251 perllib/FixMyStreet/Cobrand/UK.pm:263 msgid "RSS feed for %s" -msgstr "" +msgstr "موجز RSS لـ %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:256 perllib/FixMyStreet/Cobrand/UK.pm:268 +#: perllib/FixMyStreet/Cobrand/UK.pm:257 perllib/FixMyStreet/Cobrand/UK.pm:269 msgid "RSS feed for %s ward, %s" -msgstr "" +msgstr "موجز RSS لدائرة %sØŒ %s" #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:155 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:163 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:173 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:181 -#: perllib/FixMyStreet/Cobrand/UK.pm:276 perllib/FixMyStreet/Cobrand/UK.pm:288 +#: perllib/FixMyStreet/Cobrand/UK.pm:277 perllib/FixMyStreet/Cobrand/UK.pm:289 msgid "RSS feed of %s" -msgstr "" +msgstr "موجز RSS لـ %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:281 perllib/FixMyStreet/Cobrand/UK.pm:293 +#: perllib/FixMyStreet/Cobrand/UK.pm:282 perllib/FixMyStreet/Cobrand/UK.pm:294 msgid "RSS feed of %s, within %s ward" -msgstr "" +msgstr "موجز RSS لـ %sØŒ ضمن Øدود دائرة %s" #: templates/web/base/alert/_list.html:22 msgid "RSS feed of nearby problems" -msgstr "" +msgstr "موجز RSS للمشكلات القريبة" #: templates/web/base/reports/_rss.html:1 msgid "RSS feed of problems in this %s" -msgstr "" +msgstr "موجز RSS للمشكلات الموجودة ضمن %s" -#: perllib/FixMyStreet/Cobrand/Default.pm:643 +#: perllib/FixMyStreet/Cobrand/Default.pm:664 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:121 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:138 -#: perllib/FixMyStreet/Cobrand/UK.pm:214 +#: perllib/FixMyStreet/Cobrand/UK.pm:215 msgid "RSS feed of problems within %s" -msgstr "" +msgstr "موجز RSS للمشكلات الموجودة ضمن Øدود %s" #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:127 -#: perllib/FixMyStreet/Cobrand/UK.pm:220 +#: perllib/FixMyStreet/Cobrand/UK.pm:221 msgid "RSS feed of problems within %s ward" -msgstr "" +msgstr "موجز RSS للمشكلات الموجودة ضمن Øدود دائرة %s" #: templates/web/base/around/display_location.html:1 #: templates/web/base/around/display_location.html:4 msgid "RSS feed of recent local problems" -msgstr "" +msgstr "موجز RSS للمشكلات المØلية الØديثة" -#: templates/web/base/report/display.html:50 +#: templates/web/base/report/display_tools.html:34 #: templates/web/fixmystreet/alert/updates.html:9 -#: templates/web/fixmystreet/report/display.html:58 msgid "RSS feed of updates to this problem" -msgstr "" +msgstr "موجز RSS للتØديثات على هذه المشكلة" #: templates/web/base/alert/updates.html:9 -#: templates/web/base/report/display.html:41 +#: templates/web/base/report/display_tools.html:36 #: templates/web/fixmystreet/alert/updates.html:14 -#: templates/web/fixmystreet/report/display.html:60 msgid "Receive email when updates are left on this problem." -msgstr "" +msgstr "استلام بريد إلكتروني عند ترك تØديثات لهذه المشكلة." #. ("%s is the site name") #: templates/web/base/around/display_location.html:0 #: templates/web/base/around/display_location.html:33 -#, fuzzy msgid "Recent local problems, %s" -msgstr "المشاكل المبلغة Øديثا" +msgstr "المشكلات المØلية الØديثة، %s" #: templates/web/base/reports/index.html:24 msgid "Recently <br>fixed" -msgstr "" +msgstr "المشكلات التي تم <br>Øلها مؤخرًا" #: templates/web/base/front/recent.html:11 msgid "Recently reported problems" @@ -2502,111 +2456,108 @@ msgstr "المشاكل المبلغة Øديثا" #: templates/web/zurich/report/new/notes.html:5 msgid "Remember that FixMyStreet is primarily for reporting physical problems that can be fixed. If your problem is not appropriate for submission via this site remember that you can contact your council directly using their own website." -msgstr "" +msgstr "تذكر أن FixMyStreet مخصص ÙÙŠ الأساس للإبلاغ عن المشكلات الÙعلية التي يمكن Øلها. إذا كانت مشكلتك غير مناسبة للتقديم عبر هذا الموقع Ùتذكر أنه يمكنك التواصل مع المجلس مباشرةً باستخدام موقع الويب الخاص به." #: templates/web/base/admin/report_blocks.html:46 msgid "Remove flag" -msgstr "" +msgstr "إزالة الإشارة" -#: templates/web/base/admin/report_edit.html:92 -#: templates/web/base/admin/update_edit.html:62 +#: templates/web/base/admin/report_edit.html:93 +#: templates/web/base/admin/update_edit.html:67 #: templates/web/zurich/admin/update_edit.html:35 msgid "Remove photo (can't be undone!)" -msgstr "" +msgstr "إزالة الصورة (لا يمكن التراجع عن هذا الإجراء!)" #: templates/web/zurich/admin/report_edit.html:243 msgid "Reply to user:" -msgstr "" +msgstr "رد على المستخدم:" #: templates/web/fixmystreet/header_logo.html:2 msgid "Report" -msgstr "" +msgstr "إبلاغ" #: templates/web/base/footer.html:7 templates/web/fixmystreet/footer.html:26 #: templates/web/fixmystreet/header_logo.html:2 #: templates/web/zurich/footer.html:18 #: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" -msgstr "" +msgstr "الإبلاغ عن مشكلة" -#: templates/web/fixmystreet/report/display.html:32 +#: templates/web/base/report/display_tools.html:8 msgid "Report abuse" msgstr "الإبلاغ عن إساءة" #: perllib/FixMyStreet/App/Controller/Rss.pm:291 msgid "Report on %s" -msgstr "" +msgstr "الإبلاغ على %s" #: templates/web/base/report/new/fill_in_details_form.html:1 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:2 +#: templates/web/base/report/new/login_success_form.html:1 +#: templates/web/base/report/new/oauth_email_form.html:1 msgid "Report your problem" -msgstr "" +msgstr "الإبلاغ عن المشكلة" #: templates/web/base/around/intro.html:1 #: templates/web/zurich/around/intro.html:1 msgid "Report, view, or discuss local problems" -msgstr "" +msgstr "الإبلاغ عن المشكلات المØلية أو عرضها أو مناقشتها" -#: perllib/FixMyStreet/DB/Result/Problem.pm:585 -#: templates/web/base/contact/index.html:50 -#: templates/web/fixmystreet/contact/index.html:65 +#: perllib/FixMyStreet/DB/Result/Problem.pm:573 +#: templates/web/base/contact/index.html:57 msgid "Reported anonymously at %s" -msgstr "" +msgstr "تم الإبلاغ عنها بدون تØديد الهوية ÙÙŠ %s" #: templates/web/base/admin/questionnaire.html:5 #: templates/web/base/questionnaire/index.html:62 msgid "Reported before" -msgstr "" +msgstr "تم الإبلاغ عنها من قبل" -#: perllib/FixMyStreet/DB/Result/Problem.pm:608 -#: templates/web/base/contact/index.html:52 -#: templates/web/fixmystreet/contact/index.html:67 +#: perllib/FixMyStreet/DB/Result/Problem.pm:596 +#: templates/web/base/contact/index.html:59 msgid "Reported by %s at %s" -msgstr "" +msgstr "تم الإبلاغ عنها بواسطة %s ÙÙŠ %s" #: templates/web/zurich/admin/report_edit-sdm.html:58 #: templates/web/zurich/admin/report_edit.html:86 -#, fuzzy msgid "Reported by:" -msgstr "تم البلاغ" +msgstr "تم الإبلاغ عنها بواسطة:" #: templates/web/zurich/report/_main.html:2 msgid "Reported in the %s category" -msgstr "" +msgstr "تم الإبلاغ عنها ÙÙŠ الÙئة %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:581 +#: perllib/FixMyStreet/DB/Result/Problem.pm:569 msgid "Reported in the %s category anonymously at %s" -msgstr "" +msgstr "تم الإبلاغ عنها ÙÙŠ الÙئة %s بدون تØديد الهوية ÙÙŠ %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:603 +#: perllib/FixMyStreet/DB/Result/Problem.pm:591 msgid "Reported in the %s category by %s at %s" msgstr "تم البلاغ ÙÙŠ التصني٠%s بواسطة %s ÙÙŠ %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:577 +#: perllib/FixMyStreet/DB/Result/Problem.pm:565 msgid "Reported via %s anonymously at %s" -msgstr "" +msgstr "تم الإبلاغ عنها بواسطة %s بدون تØديد الهوية ÙÙŠ %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:599 +#: perllib/FixMyStreet/DB/Result/Problem.pm:587 msgid "Reported via %s by %s at %s" -msgstr "" +msgstr "تم الإبلاغ عنها عبر %s بواسطة %s ÙÙŠ %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:573 +#: perllib/FixMyStreet/DB/Result/Problem.pm:561 msgid "Reported via %s in the %s category anonymously at %s" -msgstr "" +msgstr "تم الإبلاغ عنها عبر %s ÙÙŠ الÙئة %s بدون تØديد الهوية ÙÙŠ %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:593 +#: perllib/FixMyStreet/DB/Result/Problem.pm:581 msgid "Reported via %s in the %s category by %s at %s" -msgstr "" +msgstr "تم الإبلاغ عنها عبر %s ÙÙŠ الÙئة %s بواسطة %s ÙÙŠ %s" #: templates/web/base/reports/index.html:21 msgid "Reported within the last four weeks" -msgstr "" +msgstr "تم الإبلاغ عنها خلال الأسابيع الأربعة الماضية" #: templates/web/zurich/admin/report_edit-sdm.html:36 #: templates/web/zurich/admin/report_edit.html:55 -#, fuzzy msgid "Reported:" -msgstr "تم البلاغ" +msgstr "تم الإبلاغ:" #: templates/web/base/around/index.html:2 #: templates/web/base/js/translation_strings.html:41 @@ -2614,169 +2565,168 @@ msgstr "تم البلاغ" #: templates/web/base/report/new/fill_in_details.html:5 #: templates/web/zurich/report/new/fill_in_details_form.html:2 msgid "Reporting a problem" -msgstr "" +msgstr "الإبلاغ عن مشكلة" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1277 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1286 #: perllib/FixMyStreet/Cobrand/Zurich.pm:384 #: templates/web/zurich/header.html:60 msgid "Reports" -msgstr "" +msgstr "التقارير" -#: perllib/FixMyStreet/Cobrand/UK.pm:327 perllib/FixMyStreet/Cobrand/UK.pm:331 +#: perllib/FixMyStreet/Cobrand/UK.pm:328 perllib/FixMyStreet/Cobrand/UK.pm:332 msgid "Reports are limited to %s characters in length. Please shorten your report" -msgstr "" +msgstr "يقتصر طول التقارير على %s من الأØرÙ. الرجاء تقصير التقرير" #: templates/web/zurich/admin/index-sdm.html:7 msgid "Reports awaiting approval" -msgstr "" +msgstr "التقارير ÙÙŠ انتظار الاعتماد" #: templates/web/zurich/admin/index-sdm.html:10 msgid "Reports published" -msgstr "" +msgstr "تم نشر التقارير" #: templates/web/base/admin/report_edit.html:67 msgid "Resend report" -msgstr "" +msgstr "إعادة إرسال التقرير" #: templates/web/zurich/admin/template_edit.html:1 #: templates/web/zurich/admin/template_edit.html:4 #: templates/web/zurich/admin/templates.html:1 #: templates/web/zurich/admin/templates.html:3 msgid "Response Templates for %s" -msgstr "" +msgstr "قوالب الاستجابة لـ %s" #: templates/web/base/js/translation_strings.html:28 msgid "Right place?" -msgstr "" +msgstr "المكان صØÙŠØØŸ" #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:167 #: perllib/FixMyStreet/Geocode/OSM.pm:152 msgid "Road operator for this named road (derived from road reference number and type): %s" -msgstr "" +msgstr "مشغل الطرق لهذا الطريق المسمى (يتم اشتقاقه من رقم ونوع مرجع الطريق): %s" #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:164 #: perllib/FixMyStreet/Geocode/OSM.pm:149 msgid "Road operator for this named road (from OpenStreetMap): %s" -msgstr "" +msgstr "مشغل الطرق لهذا الطريق المسمى (من OpenStreetMap): %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1495 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1500 -#: templates/web/base/admin/report_edit.html:88 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1508 +#: templates/web/base/admin/report_edit.html:90 +#: templates/web/base/admin/update_edit.html:64 #: templates/web/zurich/admin/report_edit.html:116 msgid "Rotate Left" -msgstr "" +msgstr "تدوير لليسار" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1495 -#: templates/web/base/admin/report_edit.html:89 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 +#: templates/web/base/admin/report_edit.html:91 +#: templates/web/base/admin/update_edit.html:65 #: templates/web/zurich/admin/report_edit.html:117 msgid "Rotate Right" -msgstr "" +msgstr "تدوير لليمين" #: templates/web/zurich/admin/report_edit.html:388 msgid "Rotating this photo will discard unsaved changes to the report." -msgstr "" +msgstr "سيؤدي تدوير هذه الصورة إلى تجاهل التغييرات غير المØÙوظة ÙÙŠ التقرير." #: templates/web/base/js/translation_strings.html:46 -#: templates/web/base/maps/google-ol.html:13 msgid "Satellite" -msgstr "" +msgstr "القمر الصناعي" #: templates/web/base/admin/body.html:208 #: templates/web/base/admin/category_edit.html:84 #: templates/web/zurich/admin/body.html:59 #: templates/web/zurich/admin/template_edit.html:29 msgid "Save changes" -msgstr "" +msgstr "ØÙظ التغييرات" #: templates/web/base/admin/reports.html:1 #: templates/web/zurich/admin/reports.html:1 msgid "Search Reports" -msgstr "" +msgstr "البØØ« عن تقارير" #: templates/web/base/admin/users.html:1 msgid "Search Users" -msgstr "" +msgstr "البØØ« عن مستخدمين" #: templates/web/zurich/header.html:82 msgid "Search reports" -msgstr "" +msgstr "البØØ« عن تقارير" #: templates/web/base/admin/reports.html:5 #: templates/web/base/admin/users.html:8 #: templates/web/zurich/admin/reports.html:5 msgid "Search:" -msgstr "" +msgstr "بØØ«:" #: templates/web/base/admin/reports.html:26 msgid "Searching found no reports." -msgstr "" +msgstr "لم يعثر البØØ« على أي تقارير." #: templates/web/base/admin/users.html:41 msgid "Searching found no users." -msgstr "" +msgstr "لم يعثر البØØ« عن أي مستخدمين." #: templates/web/base/admin/body-form.html:33 #: templates/web/zurich/admin/body-form.html:16 msgid "Select a body" -msgstr "" +msgstr "تØديد هيئة" #: templates/web/base/reports/index.html:9 msgid "Select a particular council to see the reports sent there." -msgstr "" +msgstr "Øدد مجلسًا معينًا للاطلاع على التقارير المرسلة هناك." #: templates/web/base/admin/body-form.html:71 #: templates/web/zurich/admin/body-form.html:26 msgid "Select an area" -msgstr "" +msgstr "تØديد منطقة" #: templates/web/base/alert/_list.html:10 msgid "Select which type of alert you’d like and click the button for an RSS feed, or enter your email address to subscribe to an email alert." -msgstr "" +msgstr "Øدد نوع التنبيه الذي تريده وانقر Ùوق الزر للØصول على موجز RSS أو أدخل عنوان البريد الإلكتروني للاشتراك ÙÙŠ خدمة التنبيه عبر البريد الإلكتروني." #: perllib/FixMyStreet/Cobrand/Zurich.pm:835 msgid "Sent report back" -msgstr "" +msgstr "تمت إعادة إرسال التقرير" -#: perllib/FixMyStreet/DB/Result/Problem.pm:708 +#: perllib/FixMyStreet/DB/Result/Problem.pm:696 msgid "Sent to %s %s later" -msgstr "" +msgstr "تم الإرسال إلى %s %s لاØقًا" #: templates/web/base/admin/report_edit.html:66 msgid "Sent:" -msgstr "" +msgstr "تم الإرسال:" #: templates/web/base/admin/report_edit.html:71 #: templates/web/zurich/admin/stats.html:45 msgid "Service:" -msgstr "" +msgstr "الخدمة:" -#: templates/web/fixmystreet/report/display.html:38 +#: templates/web/base/report/display_tools.html:14 msgid "Share" -msgstr "" +msgstr "مشاركة" -#: templates/web/base/report/new/fill_in_details_form.html:193 -#: templates/web/base/report/update-form.html:158 -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:23 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:59 -#: templates/web/fixmystreet/report/update-form.html:146 +#: templates/web/base/report/new/form_user_loggedin.html:23 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:22 +#: templates/web/base/report/update/form_name.html:15 msgid "Show my name publicly" -msgstr "" +msgstr "إظهار اسمي للعامة" #: templates/web/base/around/display_location.html:67 msgid "Show old" -msgstr "" +msgstr "إظهار القديم" #: templates/web/base/around/display_location.html:58 msgid "Show pins" -msgstr "" +msgstr "إظهار الدبابيس" +#: templates/web/base/auth/general.html:100 #: templates/web/base/auth/general.html:3 -#: templates/web/base/auth/general.html:40 -#: templates/web/base/auth/general.html:61 +#: templates/web/base/auth/general.html:76 #: templates/web/zurich/auth/general.html:18 #: templates/web/zurich/auth/general.html:35 msgid "Sign in" -msgstr "" +msgstr "تسجيل الدخول" #: templates/web/base/auth/general.html:1 #: templates/web/zurich/auth/general.html:1 @@ -2786,7 +2736,7 @@ msgstr "سجل الدخول أو أنشئ Øساب جديد" #: templates/web/base/auth/sign_out.html:1 #: templates/web/zurich/auth/sign_out.html:1 msgid "Sign out" -msgstr "" +msgstr "تسجيل الخروج" #: templates/web/base/report/new/fill_in_details_text.html:1 msgid "Some categories may require additional information." @@ -2798,132 +2748,140 @@ msgid "" "Some endpoints require an <strong>API key</strong> to indicate that the reports are being\n" " sent from your FixMyStreet installation." msgstr "" +"تتطلب بعض نقاط النهاية <strong>Ù…ÙØªØ§Ø API</strong> للإشارة إلى أن التقارير يتم\n" +" إرسالها إلى لنظام FixMyStreet المثبت." -#: templates/web/base/alert/index.html:42 +#: templates/web/base/alert/index.html:40 msgid "Some photos of recent reports" -msgstr "" +msgstr "بعض صور التقارير الØديثة" #. ('Optional comment for translator') #: perllib/FixMyStreet/App/View/Email.pm:32 #: perllib/FixMyStreet/App/View/Web.pm:52 msgid "Some text to localize" -msgstr "" +msgstr "بعض النص لترجمته" -#: perllib/FixMyStreet/Cobrand/UK.pm:78 +#: perllib/FixMyStreet/Cobrand/UK.pm:79 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover." -msgstr "" +msgstr "عذرًا، يبدو هذا أنه رمز بريدي خاص بإØدى تبعيات التاج البريطاني، ونØÙ† لا نغطي ذلك." #: templates/web/base/auth/token.html:8 msgid "Sorry, that wasn’t a valid link" -msgstr "" +msgstr "عذرًا، لم يكن هذا الارتباط صالØًا" #: templates/web/base/tokens/abuse.html:5 msgid "Sorry, there has been an error confirming your problem." -msgstr "" +msgstr "عذرًا، Øدث خطأ أثناء تأكيد المشكلة." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:221 -#: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:37 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:216 +#: perllib/FixMyStreet/Geocode.pm:38 perllib/FixMyStreet/Geocode/Bing.pm:38 #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:56 #: perllib/FixMyStreet/Geocode/OSM.pm:48 msgid "Sorry, we could not find that location." -msgstr "" +msgstr "عذرًا، لم نستطع العثور على هذا الموقع." -#: perllib/FixMyStreet/Geocode/Bing.pm:34 +#: templates/web/base/auth/general.html:9 +#: templates/web/base/report/display.html:21 +#: templates/web/base/report/new/fill_in_details_form.html:23 +#, fuzzy +msgid "Sorry, we could not log you in. Please fill in the form below." +msgstr "عذرًا، لم نستطع تØليل ذلك الموقع. الرجاء إعادة المØاولة." + +#: perllib/FixMyStreet/Geocode/Bing.pm:35 #: perllib/FixMyStreet/Geocode/Google.pm:45 #: perllib/FixMyStreet/Geocode/Zurich.pm:88 msgid "Sorry, we could not parse that location. Please try again." -msgstr "" +msgstr "عذرًا، لم نستطع تØليل ذلك الموقع. الرجاء إعادة المØاولة." #: perllib/FixMyStreet/App/Model/PhotoSet.pm:134 msgid "Sorry, we couldn't save your image(s), please try again." -msgstr "" +msgstr "عذرًا، لم نستطع ØÙظ الصورة (الصور)ØŒ الرجاء إعادة المØاولة." + +#: perllib/FixMyStreet/App/Controller/AuthSS.pm:301 +#, fuzzy +msgid "Sorry, you can not log in with Facebook. Please try again later." +msgstr "Øدثت مشكلة أثناء عرض هذه الصÙØØ©. الرجاء إعادة المØاولة لاØقًا." #: templates/web/base/admin/stats.html:64 msgid "Start Date:" -msgstr "" +msgstr "تاريخ البداية:" #: templates/web/base/admin/body.html:69 #: templates/web/base/admin/flagged.html:18 #: templates/web/base/admin/list_updates.html:11 #: templates/web/base/admin/reports.html:15 -#: templates/web/fixmystreet/report/update-form.html:26 +#: templates/web/base/report/update/form_update.html:32 msgid "State" -msgstr "" +msgstr "الØالة" #: templates/web/base/admin/report_edit.html:47 #: templates/web/base/admin/update_edit.html:27 -#: templates/web/base/report/update-form.html:28 #: templates/web/zurich/admin/report_edit-sdm.html:73 #: templates/web/zurich/admin/report_edit.html:101 #: templates/web/zurich/admin/report_edit.html:155 #: templates/web/zurich/admin/update_edit.html:17 msgid "State:" -msgstr "" +msgstr "الØالة:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1282 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1291 #: perllib/FixMyStreet/Cobrand/Zurich.pm:387 #: templates/web/base/admin/stats.html:1 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:73 msgid "Stats" -msgstr "" +msgstr "الإØصائيات" #: templates/web/zurich/admin/index-dm.html:23 #: templates/web/zurich/admin/index-sdm.html:21 #: templates/web/zurich/admin/reports.html:13 msgid "Status" -msgstr "" +msgstr "الØالة" #: templates/web/base/report/updates.html:10 msgid "Still open, via questionnaire, %s" -msgstr "" +msgstr "لا تزال Ù…ÙتوØØ©ØŒ عبر الاستبيان، %s" #: templates/web/zurich/admin/report_edit-sdm.html:25 #: templates/web/zurich/admin/report_edit.html:26 msgid "Street View" -msgstr "" +msgstr "عرض الشارع" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:406 +#: perllib/FixMyStreet/Script/Reports.pm:184 msgid "Subcategory: %s" -msgstr "" +msgstr "الÙئة الÙرعية: %s" #: templates/web/zurich/admin/index-dm.html:27 msgid "Subdivision/Body" -msgstr "" +msgstr "القسم الÙرعي/الهيئة" -#: templates/web/fixmystreet/contact/index.html:98 +#: templates/web/base/contact/index.html:90 msgid "Subject" -msgstr "" +msgstr "الموضوع" #: templates/web/base/admin/report_edit.html:19 -#: templates/web/base/contact/index.html:88 -#: templates/web/base/report/new/fill_in_details_form.html:53 #: templates/web/zurich/admin/report_edit.html:39 msgid "Subject:" -msgstr "" +msgstr "الموضوع:" #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/fill_in_details_form.html:137 -#: templates/web/base/report/new/fill_in_details_form.html:159 -#: templates/web/base/report/new/fill_in_details_form.html:96 -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:36 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:23 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:76 +#: templates/web/base/report/new/form_user_loggedin.html:36 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:39 +#: templates/web/base/report/new/form_user_loggedout_password.html:11 #: templates/web/zurich/report/new/fill_in_details_form.html:96 msgid "Submit" -msgstr "" +msgstr "تقديم" -#: templates/web/base/admin/report_edit.html:95 -#: templates/web/base/admin/update_edit.html:65 +#: templates/web/base/admin/report_edit.html:101 +#: templates/web/base/admin/update_edit.html:75 #: templates/web/base/admin/user-form.html:56 #: templates/web/zurich/admin/report_edit-sdm.html:137 #: templates/web/zurich/admin/report_edit.html:268 #: templates/web/zurich/admin/update_edit.html:38 msgid "Submit changes" -msgstr "" +msgstr "تقديم التغييرات" -#: templates/web/base/questionnaire/index.html:97 +#: templates/web/base/questionnaire/index.html:106 msgid "Submit questionnaire" -msgstr "" +msgstr "تقديم الاستبيان" #: perllib/FixMyStreet/Cobrand/Zurich.pm:171 #: perllib/FixMyStreet/Cobrand/Zurich.pm:902 @@ -2937,17 +2895,16 @@ msgid "Submitted" msgstr "تم اضاÙتها" #: templates/web/base/alert/updates.html:17 -#: templates/web/base/report/display.html:46 +#: templates/web/base/report/display_tools.html:41 #: templates/web/fixmystreet/alert/updates.html:23 -#: templates/web/fixmystreet/report/display.html:65 msgid "Subscribe" -msgstr "" +msgstr "اشتراك" #: templates/web/base/alert/_list.html:92 msgid "Subscribe me to an email alert" -msgstr "" +msgstr "اشتراك ÙÙŠ تنبيه البريد الإلكتروني" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1275 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1284 #: perllib/FixMyStreet/Cobrand/Zurich.pm:383 #: templates/web/base/admin/bodies.html:25 #: templates/web/base/admin/index.html:1 @@ -2958,17 +2915,17 @@ msgstr "" #: templates/web/zurich/admin/index.html:1 templates/web/zurich/footer.html:13 #: templates/web/zurich/header.html:57 msgid "Summary" -msgstr "" +msgstr "ملخص" #: templates/web/base/reports/index.html:1 #: templates/web/zurich/reports/index.html:0 #: templates/web/zurich/reports/index.html:4 msgid "Summary reports" -msgstr "" +msgstr "ملخص التقارير" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1279 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1288 msgid "Survey" -msgstr "" +msgstr "استطلاع" #: templates/web/base/admin/questionnaire.html:1 msgid "Survey Results" @@ -2976,93 +2933,94 @@ msgstr "نتائج التصÙØ" #: templates/web/zurich/admin/template_edit.html:7 msgid "Template «%s»" -msgstr "" +msgstr "القالب «%s»" #: perllib/FixMyStreet/Cobrand/Zurich.pm:394 #: templates/web/zurich/header.html:77 -#, fuzzy msgid "Templates" -msgstr "اØصل على التØديثات" +msgstr "القوالب" #: templates/web/base/admin/list_updates.html:12 #: templates/web/zurich/admin/templates.html:9 msgid "Text" -msgstr "" +msgstr "النص" #: templates/web/base/admin/body.html:28 msgid "Text only version" -msgstr "" +msgstr "إصدار نصي Ùقط" #: templates/web/base/admin/update_edit.html:20 #: templates/web/zurich/admin/template_edit.html:24 #: templates/web/zurich/admin/update_edit.html:12 msgid "Text:" -msgstr "" +msgstr "النص:" #: templates/web/base/tokens/confirm_problem.html:12 msgid "Thank you for reporting this issue!" -msgstr "" +msgstr "شكرًا لك للإبلاغ عن هذه المشكلة!" -#: templates/web/base/tokens/error.html:7 +#: templates/web/base/tokens/error.html:6 msgid "Thank you for trying to confirm your update or problem. We seem to have an error ourselves though, so <a href=\"%s\">please let us know what went on</a> and we'll look into it." -msgstr "" +msgstr "شكرًا لك لمØاولة تأكيد التØديث أو المشكلة. مع ذلك يبدو أننا نواجه خطأ، لذا <a href=\"%s\">الرجاء إبلاغنا بما Øدث</a> وسنتØقق من الأمر." #: templates/web/base/tokens/confirm_update.html:15 msgid "Thank you for updating this issue!" -msgstr "" +msgstr "شكرًا لك على تØديث هذه المشكلة!" #: templates/web/base/contact/submit.html:6 #: templates/web/base/questionnaire/completed.html:5 msgid "Thank you for your feedback" -msgstr "" +msgstr "شكرًا لك على تعليقاتك" #: templates/web/base/around/_error_multiple.html:17 msgid "Thanks for uploading your photo. We now need to locate your problem, so please enter a nearby street name or postcode in the box above :" -msgstr "" +msgstr "شكرًا لك على تØميل الصورة. Ù†ØÙ† Ù†Øتاج الآن تØديد موقع المشكلة، لذا يرجى إدخال اسم شارع قريب أو رمز بريدي ÙÙŠ المربع الموجود بالأعلى :" #: templates/web/base/questionnaire/creator_fixed.html:9 msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever reported a problem to a council before?" -msgstr "" +msgstr "شكرًا لك، يسعدنا معرÙØ© أن المشكلة قد ØÙلت! هل يمكنا أن نسألك عما إذا كنت قد أبلغت عن مشكلة للمجلس من قبل؟" #: perllib/FixMyStreet/App/Model/PhotoSet.pm:152 msgid "That image doesn't appear to have uploaded correctly (%s), please try again." -msgstr "" +msgstr "يبدو أنه لم يتم تØميل هذه الصورة بصورة سليمة (%s)ØŒ الرجاء إعادة المØاولة." #: perllib/FixMyStreet/App/Controller/Council.pm:97 msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again." -msgstr "" +msgstr "لا يبدو أن هذا الموقع ضمن صلاØيات المجلس؛ ربما يكون موقعًا بØريًا أو خارج Øدود المØاÙظة. الرجاء إعادة المØاÙظة." #: perllib/FixMyStreet/App/Controller/Location.pm:126 msgid "That location does not appear to be in the UK; please try again." -msgstr "" +msgstr "لا يبدو أن هذا الموقع يقع ÙÙŠ المملكة المتØدة؛ الرجاء إعادة المØاولة." #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:47 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:63 -#: perllib/FixMyStreet/Cobrand/UK.pm:71 +#: perllib/FixMyStreet/Cobrand/UK.pm:72 msgid "That postcode was not recognised, sorry." -msgstr "" +msgstr "لم يتم التعر٠على هذا الرمز البريدي، عذرًا." -#: perllib/FixMyStreet/App/Controller/Admin.pm:726 +#: perllib/FixMyStreet/App/Controller/Admin.pm:724 msgid "That problem has been marked as sent." -msgstr "" +msgstr "تم وضع علامة على هذه المشكلة بأنها Ø£Ùرسلت." -#: perllib/FixMyStreet/App/Controller/Admin.pm:718 +#: perllib/FixMyStreet/App/Controller/Admin.pm:716 msgid "That problem will now be resent." -msgstr "" +msgstr "ستتم إعادة إرسال هذه المشكلة الآن." -#: perllib/FixMyStreet/App/Controller/Report.pm:125 +#: perllib/FixMyStreet/App/Controller/Report.pm:127 msgid "That report cannot be viewed on %s." -msgstr "" +msgstr "لا يمكن عرض هذا التقرير على %s." -#: perllib/FixMyStreet/App/Controller/Report.pm:119 +#: perllib/FixMyStreet/App/Controller/Report.pm:121 msgid "That report has been removed from FixMyStreet." -msgstr "" +msgstr "تمت إزالة هذا التقرير من FixMyStreet." #: templates/web/base/admin/body.html:144 msgid "" "The <strong>email address</strong> is the destination to which reports about this category will be sent. \n" " Other categories for this body may have the same email address." msgstr "" +"<strong>عنوان البريد الإلكتروني</strong> هو الوجهة التي يتم إرسال التقارير المتعلقة بهذه الÙئة إليها. \n" +" قد تكون الÙئات الأخرى لهذه الهيئة معينًا لها Ù†Ùس عنوان البريد الإلكتروني." #: templates/web/base/admin/body-form.html:123 #: templates/web/base/admin/body-form.html:124 @@ -3070,6 +3028,8 @@ msgid "" "The <strong>endpoint</strong> is the URL of the service that FixMyStreet will connect to \n" " when sending reports to this body." msgstr "" +"<strong>نقطة النهاية</strong> هي عنوان URL للخدمة التي سيتصل بها نظام FixMyStreet \n" +" عند إرسال التقارير إلى هذه الهيئة." #: templates/web/base/admin/body-form.html:136 #: templates/web/base/admin/body-form.html:137 @@ -3077,6 +3037,8 @@ msgid "" "The <strong>jurisdiction</strong> is only needed if the endpoint is serving more\n" " than one. If the body is running its own endpoint, you can usually leave this blank." msgstr "" +"<strong>الصلاØية القضائية</strong> مطلوب تØديدها Ùقط إذا كانت نقطة النهاية تخدم أكثر من\n" +" واØدة. إذا كانت الهيئة تدير نقطة النهاية الخاصة بها، Ùيمكن ترك هذا الØقل خاليًا." #: templates/web/base/admin/body-form.html:94 #: templates/web/base/admin/body-form.html:95 @@ -3084,10 +3046,12 @@ msgid "" "The <strong>send method</strong> determines how problem reports will be sent to the body.\n" " If you leave this blank, <strong>send method defaults to email</strong>." msgstr "" +"<strong>أسلوب الإرسال</strong> ÙŠØدد طريقة إرسال التقارير إلى الهيئة.\n" +" ÙÙŠ Øالة ترك هذا الØقل خاليًا، <strong>يتم تعيين أسلوب الإرسال الاÙتراضي على البريد الإلكتروني</strong>." -#: templates/web/base/open311/index.html:90 +#: templates/web/base/open311/index.html:82 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 "" +msgstr "خاصية Open311 v2 التالية: agency_responsibleØŒ تÙستخدم لعرض الإدارات التي استلمت تقرير المشكلة، وعادةً ليست هذه هي طريقة تعري٠السمة ÙÙŠ مواصÙØ© Open311 v2." #: templates/web/base/admin/body-form.html:11 #: templates/web/base/admin/body-form.html:12 @@ -3095,88 +3059,88 @@ msgid "" "The body's <strong>name</strong> identifies the body (for example, <em>Borsetshire District Council</em>)\n" " and may be displayed publically." msgstr "" +"<strong>اسم</strong> الهيئة ÙŠØدد اسم الهيئة (على سبيل المثال، <em>المجلس المØلي لمقاطعة بروستشاير</em>)\n" +" وقد ÙŠÙعرض للعامة." #: templates/web/base/report/new/fill_in_details_text.html:1 #: templates/web/base/report/new/fill_in_details_text.html:3 msgid "The council won’t be able to help unless you leave as much detail as you can. Please describe the exact location of the problem (e.g. on a wall), what it is, how long it has been there, a description (and a photo of the problem if you have one), etc." -msgstr "" +msgstr "لن يتمكن المجلس من تقديم المساعدة ما لم تترك كثيرًا من التÙاصيل بقدر الإمكان. الرجاء تØديد موقع المشكلة بالضبط (على سبيل المثال، على الØائط)ØŒ ونوع المشكلة، والÙترة الزمنية للمشكلة، ووص٠للمشكلة (على سبيل المثال صورة للمشكلة إن كانت متوÙرة)ØŒ إلخ." #: templates/web/base/admin/edit-league.html:3 #: templates/web/base/admin/edit-league.html:4 msgid "The diligency prize league table shows editors' activity (who's been editing the most records)." -msgstr "" +msgstr "يعرض جدول رابطة جائزة العناية بالدقة نشاط المØررين (الأشخاص الذين ÙŠØررون معظم السجلات)." -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:60 -#: perllib/FixMyStreet/App/Controller/Reports.pm:79 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:61 +#: perllib/FixMyStreet/App/Controller/Reports.pm:80 msgid "The error was: %s" -msgstr "" +msgstr "الخطأ هو: %s" -#: templates/web/base/open311/index.html:86 +#: templates/web/base/open311/index.html:78 msgid "The following Open311 v2 attributes are returned for each request: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code and service_name." -msgstr "" +msgstr "يتم إرجاع سمات Open311 v2 التالية لكل طلب: service_request_id Ùˆdescription Ùˆlat Ùˆlong Ùˆmedia_url Ùˆstatus Ùˆrequested_datetime Ùˆupdated_datetime Ùˆservice_code Ùˆservice_name." #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:159 #: perllib/FixMyStreet/Geocode/OSM.pm:144 msgid "The following information about the nearest road might be inaccurate or irrelevant, if the problem is close to several roads or close to a road without a name registered in OpenStreetMap." -msgstr "" +msgstr "المعلومات التالية المتعلقة بأقرب طريق قد تكون غير دقيقة أو غير مناسبة، إذا كانت المشكلة قريبة من عدة طرق أو قريبة من طريق ليس له اسم مسجل ÙÙŠ OpenStreetMap." #: db/alert_types.pl:19 db/alert_types.pl:23 db/alert_types.pl:27 #: db/alert_types.pl:31 msgid "The latest local problems reported by users" -msgstr "" +msgstr "المشكلات المØلية الأخيرة المبلغ عنها بواسطة المستخدمين" #: db/alert_types.pl:35 msgid "The latest problems for {{COUNCIL}} reported by users" -msgstr "" +msgstr "المشكلات الأخيرة المبلغة للمجلس {{COUNCIL}} المبلغ عنها بواسطة المستخدمين" #: db/alert_types.pl:39 msgid "The latest problems for {{COUNCIL}} within {{WARD}} ward reported by users" -msgstr "" +msgstr "المشكلات الأخيرة المبلغ عنها للمجلس {{COUNCIL}} ضمن Øدود دائرة {{WARD}} والمبلغ عنها بواسطة المستخدمين" #: db/alert_types.pl:11 msgid "The latest problems reported by users" -msgstr "" +msgstr "المشكلات الأخيرة المبلغ عنها بواسطة المستخدمين" #: db/alert_types.pl:15 msgid "The latest problems reported fixed by users" -msgstr "" +msgstr "المشكلات الأخيرة المبلغ بأنها Ø£ÙصلØت بواسطة المستخدمين" #: db/alert_types.pl:43 msgid "The latest problems within {{NAME}}'s boundary reported by users" -msgstr "" +msgstr "المشكلات الأخيرة المبلغ عنها ضمن Øدود {{NAME}} والمبلغ عنها بواسطة المستخدمين" #: templates/web/base/auth/token.html:9 msgid "The link might have expired, or maybe you didn’t quite copy and paste it correctly." -msgstr "" +msgstr "من المØتمل أن الارتباط انتهت صلاØيته، أو ربما لم يتم نسخه ولصقه بصورة سليمة." #: templates/web/base/admin/body-form.html:58 msgid "The list of available areas is being provided by the MapIt service at %s." -msgstr "" +msgstr "يتم توÙير قائمة المناطق المتاØØ© بواسطة خدمة MapIt ÙÙŠ %s." #: templates/web/base/auth/change_password.html:12 #: templates/web/base/auth/change_password.html:16 msgid "The passwords do not match" -msgstr "" +msgstr "كلمتا المرور غير متطابقتين" -#: templates/web/base/errors/page_error_404_not_found.html:10 -#: templates/web/base/errors/page_error_404_not_found.html:12 +#: templates/web/base/errors/page_error_404_not_found.html:9 msgid "The requested URL '%s' was not found on this server" -msgstr "" +msgstr "لم يتم العثور على عنوان URL '%s' على هذا الخادم" #: templates/web/base/alert/_list.html:16 msgid "The simplest alert is our geographic one:" -msgstr "" +msgstr "أبسط تنبيه هو التنبيه الجغراÙÙŠ:" #: templates/web/base/report/new/councils_extra_text.html:1 #: templates/web/base/report/new/councils_text_some.html:10 -#: templates/web/base/report/new/fill_in_details_form.html:18 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:14 +#: templates/web/base/report/new/fill_in_details_form.html:13 msgid "The summary and description will also be made public (see our <a href=\"/privacy\">privacy policy</a>)." -msgstr "" +msgstr "سيÙØªØ§Ø Ø§Ù„Ù…Ù„Ø®Øµ والوص٠للعامة أيضًا (راجع <a href=\"/privacy\">سياسة الخصوصية</a>)." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:315 +#: perllib/FixMyStreet/Script/Reports.pm:92 msgid "The user could not locate the problem on a map, but to see the area around the location they entered" -msgstr "" +msgstr "تعذر على المستخدم تØديد موقع المشكلة على الخريطة، ولكن يجب البØØ« عن المنطقة Øول الموقع الذي أدخله" #: templates/web/base/admin/user-form.html:12 #: templates/web/base/admin/user-form.html:13 @@ -3184,44 +3148,46 @@ msgid "" "The user's <strong>name</strong> is displayed publicly on reports that have not been marked <em>anonymous</em>.\n" " Names are not necessarily unique." msgstr "" +"ÙŠÙعرض <strong>اسم</strong> المستخدم بصورة عامة على التقارير التي لم يتم وضع علامة <em>مجهول</em> عليها.\n" +" لا تكون الأسماء Ùريدة بالضرورة." #: templates/web/base/around/on_map_list_items.html:12 #: templates/web/base/my/_problem-list.html:8 #: templates/web/base/reports/_problem-list.html:15 msgid "There are no reports to show." -msgstr "" +msgstr "لا توجد تقارير لعرضها." -#: perllib/FixMyStreet/App/Controller/Reports.pm:76 +#: perllib/FixMyStreet/App/Controller/Reports.pm:77 msgid "There was a problem showing the All Reports page. Please try again later." -msgstr "" +msgstr "Øدثت مشكلة أثناء عرض صÙØØ© \"كل التقارير\". الرجاء إعادة المØاولة لاØقًا." #: perllib/FixMyStreet/App/Controller/Contact.pm:137 -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:59 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:60 msgid "There was a problem showing this page. Please try again later." -msgstr "" +msgstr "Øدثت مشكلة أثناء عرض هذه الصÙØØ©. الرجاء إعادة المØاولة لاØقًا." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:769 -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:134 -#: templates/web/base/auth/general.html:26 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:764 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:138 +#: templates/web/base/auth/general.html:43 #: templates/web/zurich/auth/general.html:28 msgid "There was a problem with your email/password combination. If you cannot remember your password, or do not have one, please fill in the ‘sign in by email’ section of the form." -msgstr "" +msgstr "Øدثت مشكلة ÙÙŠ توليÙØ© البريد الإلكتروني/كلمة المرور. إذا كنت لا تستطيع تذكر كلمة المرور، أو كنت لا تمتلك كلمة مرور، Ùالرجاء تعبئة قسم ‘تسجيل الدخول بواسطة البريد الإلكتروني’ ÙÙŠ النموذج." #: perllib/FixMyStreet/App/Controller/Alert.pm:355 msgid "There was a problem with your email/password combination. Please try again." -msgstr "" +msgstr "Øدثت مشكلة ÙÙŠ توليÙØ© البريد الإلكتروني/كلمة المرور. الرجاء إعادة المØاولة." -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:272 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:336 msgid "There was a problem with your update. Please try again." msgstr "Øدثت مشكلة مع تØديثك. الرجاء المØاولة مرة آخرى." #: perllib/FixMyStreet/App/Controller/Contact.pm:141 msgid "There were problems with your report. Please see below." -msgstr "" +msgstr "Øدثت مشكلات ÙÙŠ التقرير. الرجاء الاطلاع على ما يلي." -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:300 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:371 msgid "There were problems with your update. Please see below." -msgstr "" +msgstr "Øدثت مشكلات ÙÙŠ التØديث. الرجاء الاطلاع على ما يلي." #: templates/web/base/admin/body-form.html:112 #: templates/web/base/admin/body-form.html:113 @@ -3232,10 +3198,15 @@ msgid "" " <a href='https://www.mysociety.org/2013/01/17/open311-explained/' class='admin-offsite-link'>this article</a>.\n" " " msgstr "" +"هذه الإعدادات خاصة بالهيئات التي تستخدم Open311 (أو أي نظام تكامل متطور آخر) لتلقي تقارير المشكلات.<br>\n" +" <strong>لا تØتاج إلى تعيينها إذا كان أسلوب الإرسال هو البريد الإلكتروني</strong>.\n" +" لمزيد من المعلومات عن Open311ØŒ راجع \n" +" <a href='https://www.mysociety.org/2013/01/17/open311-explained/' class='admin-offsite-link'>this article</a>.\n" +" " -#: templates/web/base/open311/index.html:77 +#: templates/web/base/open311/index.html:69 msgid "This API implementation is work in progress and not yet stabilized. It will change without warnings in the future." -msgstr "" +msgstr "تنÙيذ API هذا هو عمل قيد التنÙيذ ولم يستقر Øتى الآن. وسيتغير بدون تØذيرات ÙÙŠ المستقبل." #: templates/web/base/admin/body.html:44 msgid "" @@ -3243,10 +3214,13 @@ msgid "" " Consequently, none of its categories will appear in the drop-down category menu when users report problems.\n" " Currently, users <strong>cannot report problems to this body</strong>." msgstr "" +"لا تغطي هذه الهيئة أي منطقة. وهذا يعني أنه لا توجد لها صلاØية قضائية على المشكلات المبلغ عنها <em>ÙÙŠ أي موقع</em>.\n" +" بالتالي، لن تظهر أي Ùئة من Ùئاتها ÙÙŠ القائمة المنسدلة للÙئات عندما يبلغ المستخدمون عن المشكلات.\n" +" ÙÙŠ الوقت الØالي، <strong>لا يستطيع المستخدمون الإبلاغ عن المشكلات إلى هذه الهيئة</strong>." #: templates/web/base/admin/body.html:54 msgid "This body has no contacts. This means that currently problems reported to this body <strong>will not be sent</strong>." -msgstr "" +msgstr "لا توجد جهات اتصال لهذه الهيئة. هذا يعني أن المشكلات المبلغ عنها Øاليًا إلى هذه الهيئة <strong>لن تÙرسل</strong>." #: templates/web/base/admin/body-form.html:52 #: templates/web/base/admin/body-form.html:53 @@ -3254,141 +3228,122 @@ msgid "" "This body will only be sent reports for problems that are located in the <strong>area covered</strong>.\n" " A body will not receive any reports unless it covers at least one area." msgstr "" +"ستÙرسل إلى هذه الهيئة تقارير المشكلات التي تقع ÙÙŠ <strong>منطقة التغطية</strong> Ùقط.\n" +" لن تتلقى الهيئة أي تقارير ما لم تكن تغطي منطقة واØدة على الأقل." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:413 +#: perllib/FixMyStreet/Script/Reports.pm:191 msgid "This email has been sent to both councils covering the location of the problem, as the user did not categorise it; please ignore it if you're not the correct council to deal with the issue, or let us know what category of problem this is so we can add it to our system." -msgstr "" +msgstr "Ø£Ùرسلت رسالة البريد الإلكتروني إلى كلا المجلسين اللذين يغطيان موقع المشكلة، وبما أن المستخدم لم ÙŠØدد Ùئة المشكلة، Ùالرجاء تجاهلها إذا لم تكن المجلس المختص بمعالجة هذه المشكلة، أو أعلمنا بÙئة المشكلة لنضيÙها إلى النظام." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:416 +#: perllib/FixMyStreet/Script/Reports.pm:194 msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue." -msgstr "" +msgstr "Ø£Ùرسلت رسالة البريد الإلكتروني إلى عدة مجالس تغطي موقع المشكلة، وبما أن الÙئة المØددة مدخلة لجميع المجالس، Ùالرجاء تجاهل المشكلة إذا لم تكن المجلس المختص بالتعامل معها." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:925 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:995 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:920 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:990 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:142 -#: perllib/FixMyStreet/Cobrand/UK.pm:43 +#: perllib/FixMyStreet/Cobrand/UK.pm:44 msgid "This information is required" -msgstr "" +msgstr "هذه المعلومات مطلوبة" #: templates/web/base/debug_header.html:3 msgid "This is a developer site; things might break at any time, and the database will be periodically deleted." -msgstr "" +msgstr "هذا موقع مطور، وقد تتعطل الأمور ÙÙŠ أي وقت، وستÙØذ٠قاعدة البيانات بصورة دورية." #: templates/web/base/reports/index.html:7 msgid "This is a summary of all reports on this site." -msgstr "" - -#: templates/web/zurich/auth/token.html:8 -msgid "This may be because the link is too old or already used, or the address was not copied correctly." -msgstr "" +msgstr "هذا ملخص لكل التقارير الموجودة على هذا الموقع." -#: templates/web/base/report/banner.html:15 -msgid "This problem has been closed" -msgstr "" - -#: templates/web/base/report/banner.html:12 -#: templates/web/base/report/update-form.html:48 -#: templates/web/fixmystreet/report/update-form.html:46 +#: templates/web/base/report/update/form_update.html:52 msgid "This problem has been fixed" -msgstr "" +msgstr "تم Ø¥ØµÙ„Ø§Ø Ù‡Ø°Ù‡ المشكلة" -#: templates/web/base/report/update-form.html:43 -#: templates/web/fixmystreet/report/update-form.html:40 +#: templates/web/base/report/update/form_update.html:46 msgid "This problem has not been fixed" -msgstr "" - -#: templates/web/base/report/banner.html:19 -msgid "This problem is in progress" -msgstr "" - -#: templates/web/base/report/banner.html:9 -msgid "This problem is old and of unknown status." -msgstr "" +msgstr "لم يتم Ø¥ØµÙ„Ø§Ø Ù‡Ø°Ù‡ المشكلة" #: perllib/FixMyStreet/Cobrand/Zurich.pm:168 #: perllib/FixMyStreet/Cobrand/Zurich.pm:169 #: templates/web/zurich/report/_main.html:14 msgid "This report is awaiting moderation." -msgstr "" +msgstr "هذا التقرير ÙÙŠ انتظار اعتماد الإشراÙ." -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:86 +#: perllib/FixMyStreet/Script/Alerts.pm:94 msgid "This report is currently marked as closed." -msgstr "" +msgstr "هذا التقرير عليه علامة \"مغلق\" Øاليًا." -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:84 +#: perllib/FixMyStreet/Script/Alerts.pm:92 msgid "This report is currently marked as fixed." -msgstr "" +msgstr "هذا التقرير عليه علامة \"تم الإصلاØ\" Øاليًا." -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:88 +#: perllib/FixMyStreet/Script/Alerts.pm:96 msgid "This report is currently marked as open." -msgstr "" +msgstr "هذا التقرير عليه علامة \"Ù…ÙتوØ\" Øاليًا." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:326 +#: perllib/FixMyStreet/Script/Reports.pm:105 msgid "This report was submitted anonymously" -msgstr "" +msgstr "تم تقديم هذا التقرير بدون تØديد الهوية" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:308 +#: perllib/FixMyStreet/Script/Reports.pm:85 msgid "This web page also contains a photo of the problem, provided by the user." -msgstr "" +msgstr "تØتوي صÙØØ© الويب هذه على صورة للمشكلة، تم تقديمها بواسطة المستخدم." #: templates/web/zurich/admin/report_edit-sdm.html:123 #: templates/web/zurich/admin/report_edit-sdm.html:76 #: templates/web/zurich/admin/report_edit.html:104 #: templates/web/zurich/admin/report_edit.html:148 msgid "Time spent (in minutes):" -msgstr "" +msgstr "الوقت المستغرق (بالدقائق):" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1278 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1287 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" -msgstr "" +msgstr "المخطط الزمني" #: templates/web/base/admin/flagged.html:15 #: templates/web/base/admin/reports.html:12 #: templates/web/zurich/admin/templates.html:8 msgid "Title" -msgstr "" +msgstr "العنوان" #: templates/web/zurich/admin/template_edit.html:20 msgid "Title:" -msgstr "" +msgstr "العنوان:" #: templates/web/base/alert/index.html:25 msgid "To find out what local alerts we have for you, please enter your %s postcode or street name and area:" -msgstr "" +msgstr "لاكتشا٠التنبيهات المØلية التي لدينا لك، الرجاء إدخال الرمز البريدي لـ %s أو اسم الشارع أو المنطقة:" #: templates/web/base/alert/index.html:27 msgid "To find out what local alerts we have for you, please enter your postcode or street name and area" -msgstr "" +msgstr "لاكتشا٠التنبيهات المØلية التي لدينا لك، الرجاء إدخال الرمز البريدي أو اسم الشارع أو المنطقة" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:314 +#: perllib/FixMyStreet/Script/Reports.pm:91 msgid "To view a map of the precise location of this issue" -msgstr "" +msgstr "لعرض خريطة Ù…ÙˆØ¶Ø Ø¹Ù„ÙŠÙ‡Ø§ الموقع الدقيق لهذه المشكلة" -#: templates/web/base/admin/index.html:61 +#: templates/web/base/admin/index.html:54 #: templates/web/base/admin/questionnaire.html:24 #: templates/web/base/admin/stats.html:24 #: templates/web/base/admin/stats.html:43 #: templates/web/zurich/admin/stats.html:30 msgid "Total" -msgstr "" +msgstr "الإجمالي" #: templates/web/base/js/translation_strings.html:29 msgid "Try again" -msgstr "" +msgstr "أعد المØاولة" #: templates/web/base/contact/submit.html:14 msgid "Try emailing us directly:" -msgstr "" +msgstr "جرّب إرسال البريد الإلكتروني إلينا مباشرةً:" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:12 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:33 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:31 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:37 msgid "Unable to fix" -msgstr "" +msgstr "يتعذر الإصلاØ" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:19 @@ -3397,151 +3352,142 @@ msgstr "" #: templates/web/zurich/admin/report_edit.html:92 #: templates/web/zurich/admin/update_edit.html:18 msgid "Unconfirmed" -msgstr "" +msgstr "غير مؤكد" -#: templates/web/fixmystreet/report/banner.html:9 +#: templates/web/base/report/banner.html:9 msgid "Unknown" -msgstr "" +msgstr "غير معروÙ" #: perllib/FixMyStreet/App/Controller/Rss.pm:173 msgid "Unknown alert type" -msgstr "" +msgstr "نوع تنبيه غير معروÙ" +#: perllib/FixMyStreet/App/Controller/Photo.pm:110 #: templates/web/base/js/translation_strings.html:39 msgid "Unknown error" -msgstr "" +msgstr "خطأ غير معروÙ" -#: perllib/FixMyStreet/App/Controller/Report.pm:103 -#: perllib/FixMyStreet/App/Controller/Report.pm:109 -#: perllib/FixMyStreet/App/Controller/Report.pm:112 +#: perllib/FixMyStreet/App/Controller/Report.pm:105 +#: perllib/FixMyStreet/App/Controller/Report.pm:111 +#: perllib/FixMyStreet/App/Controller/Report.pm:114 msgid "Unknown problem ID" -msgstr "" +msgstr "معر٠المشكلة غير معروÙ" -#: templates/web/fixmystreet/report/update-form.html:19 +#: templates/web/base/report/update/form_update.html:25 msgid "Update" msgstr "تØديث" #: templates/web/base/admin/timeline.html:33 msgid "Update %s created for problem %d; by %s" -msgstr "" +msgstr "تم إنشاء تØديث %s للمشكلة %dØ› بواسطة %s" -#: templates/web/base/contact/index.html:21 -#: templates/web/fixmystreet/contact/index.html:36 +#: templates/web/base/contact/index.html:28 msgid "Update below added anonymously at %s" -msgstr "" +msgstr "تمت إضاÙØ© التØديث التالي بدون تØديد الهوية ÙÙŠ %s" -#: templates/web/base/contact/index.html:23 -#: templates/web/fixmystreet/contact/index.html:38 +#: templates/web/base/contact/index.html:30 msgid "Update below added by %s at %s" -msgstr "" +msgstr "تمت إضاÙØ© التØديث التالي بواسطة %s ÙÙŠ %s" #: templates/web/base/admin/body-form.html:240 #: templates/web/zurich/admin/body-form.html:52 msgid "Update body" -msgstr "" +msgstr "نص التØديث" -#: templates/web/base/admin/index.html:55 +#: templates/web/base/admin/index.html:48 msgid "Update breakdown by state" -msgstr "" +msgstr "تصني٠التØديث Øسب الØالة" #: db/alert_types.pl:7 msgid "Update by {{name}}" -msgstr "" +msgstr "التØديث Øسب {{name}}" #: templates/web/base/admin/update_edit.html:42 #: templates/web/zurich/admin/update_edit.html:25 msgid "Update changed problem state to %s" -msgstr "" +msgstr "غيّر التØديث Øالة المشكلة إلى %s" #: templates/web/base/admin/update_edit.html:44 msgid "Update marked problem as fixed" -msgstr "" +msgstr "أدى التØديث إلى وضع علامة على المشكلة بأنه تم إصلاØها" #: templates/web/base/admin/update_edit.html:46 msgid "Update reopened problem" -msgstr "" +msgstr "أدى التØديث إلى إعادة ÙØªØ Ø§Ù„Ù…Ø´ÙƒÙ„Ø©" #: templates/web/base/admin/body.html:101 msgid "Update statuses" -msgstr "" - -#: templates/web/base/report/update-form.html:22 -msgid "Update:" -msgstr "" +msgstr "Øالات التØديث" #: templates/web/zurich/admin/index-dm.html:23 #: templates/web/zurich/admin/index-sdm.html:21 #: templates/web/zurich/admin/reports.html:13 msgid "Updated" -msgstr "" +msgstr "تم التØديث" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1045 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1103 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1147 -#: perllib/FixMyStreet/App/Controller/Admin.pm:822 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1048 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1108 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1156 +#: perllib/FixMyStreet/App/Controller/Admin.pm:821 #: perllib/FixMyStreet/Cobrand/Zurich.pm:771 #: perllib/FixMyStreet/Cobrand/Zurich.pm:796 #: perllib/FixMyStreet/Cobrand/Zurich.pm:866 msgid "Updated!" -msgstr "" +msgstr "تم التØديث!" #: templates/web/base/admin/list_updates.html:2 -#: templates/web/base/report/update.html:3 -#: templates/web/fixmystreet/report/update.html:5 +#: templates/web/base/report/update.html:5 #: templates/web/zurich/report/updates.html:2 msgid "Updates" -msgstr "" +msgstr "التØديثات" -#: perllib/FixMyStreet/DB/Result/Comment.pm:132 +#: perllib/FixMyStreet/DB/Result/Comment.pm:131 msgid "Updates are limited to %s characters in length. Please shorten your update" -msgstr "" +msgstr "يقتصر طول التØديثات على %s من الأØرÙ. الرجاء تقصير نص التØديث" #: db/alert_types.pl:5 db/alert_types.pl:6 msgid "Updates on {{title}}" -msgstr "" +msgstr "التØديثات على {{title}}" #. ("%s is the site name") #: templates/web/base/report/display.html:0 -#: templates/web/base/report/display.html:5 -#: templates/web/fixmystreet/report/display.html:0 -#: templates/web/fixmystreet/report/display.html:9 -#, fuzzy +#: templates/web/base/report/display.html:9 msgid "Updates to this problem, %s" -msgstr "اØصل على التØديثات لـ %s من المشاكل" +msgstr "التØديثات على هذه المشكلة، %s" #: templates/web/base/admin/body.html:182 msgid "Use the <strong>note</strong> to record details that are only displayed in the admin. Notes are not shown publicly, and are not sent to the body." -msgstr "" +msgstr "استخدم <strong>الملاØظة</strong> لتسجيل التÙاصيل التي لا تÙعرض إلا ÙÙŠ الإدارة. لا تÙعرض الملاØظات بصورة عامة، ولا تÙرسل إلى الهيئة." #: templates/web/zurich/admin/report_edit-sdm.html:48 #: templates/web/zurich/admin/report_edit.html:67 msgid "Used map" -msgstr "" +msgstr "تم استخدام الخريطة" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1452 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1461 msgid "User flag removed" -msgstr "" +msgstr "تمت إزالة إشارة المستخدم" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1424 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1433 msgid "User flagged" -msgstr "" +msgstr "تم وضع إشارة للمستخدم" #: templates/web/base/admin/users.html:5 msgid "User search finds matches in users' names and email addresses." -msgstr "" +msgstr "عثر البØØ« الذي Ù†Ùذه المستخدم على مطابقات ÙÙŠ أسماء المستخدمين وعناوين البريد الإلكتروني." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1280 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1289 #: perllib/FixMyStreet/Cobrand/Zurich.pm:399 #: templates/web/base/admin/flagged.html:29 #: templates/web/zurich/header.html:69 msgid "Users" -msgstr "" +msgstr "المستخدمون" #: perllib/FixMyStreet/App/Controller/Admin.pm:382 #: perllib/FixMyStreet/App/Controller/Admin.pm:412 #: perllib/FixMyStreet/App/Controller/Admin.pm:429 msgid "Values updated" -msgstr "" +msgstr "تم تØديث القيم" #: templates/web/base/admin/report_edit.html:18 #: templates/web/base/admin/update_edit.html:18 @@ -3549,130 +3495,127 @@ msgstr "" #: templates/web/zurich/admin/report_edit.html:22 #: templates/web/zurich/admin/update_edit.html:10 msgid "View report on site" -msgstr "" +msgstr "عرض التقرير على الموقع" #: templates/web/base/reports/body.html:14 msgid "View reports by ward" -msgstr "" +msgstr "عرض التقارير Øسب الدائرة" #: templates/web/base/around/display_location.html:0 #: templates/web/base/around/display_location.html:35 msgid "Viewing a location" -msgstr "" +msgstr "عرض موقع" #: templates/web/base/report/display.html:0 -#: templates/web/fixmystreet/report/display.html:0 msgid "Viewing a problem" -msgstr "" +msgstr "عرض مشكلة" #: templates/web/base/reports/body.html:16 msgid "Wards of this council" -msgstr "" +msgstr "دوائر هذا المجلس" #: templates/web/base/alert/choose.html:6 #: templates/web/base/around/_error_multiple.html:6 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/zurich/auth/token.html:7 -msgid "We have not been able to confirm your account - sorry." -msgstr "" +msgstr "عثرنا على أكثر من مطابقة لهذا الموقع. Ù†ØÙ† نعرض ما يصل إلى عشر مطابقات، Ùالرجاء تجربة بØØ« آخر إذا لم يظهر الموقع هنا." -#: templates/web/zurich/auth/token.html:17 -msgid "We have sent you an email containing a link to confirm your account." -msgstr "" +#: templates/web/base/auth/general.html:6 +#: templates/web/base/report/display.html:27 +#: templates/web/base/report/new/oauth_email_form.html:5 +#, fuzzy +msgid "We need your email address, please give it below." +msgstr "لا نظهر عنوان البريد الإلكتروني أو رقم الهات٠مطلقًا." -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:2 -#: templates/web/fixmystreet/report/update-form.html:77 +#: templates/web/base/report/new/form_user_loggedout_email.html:2 +#: templates/web/base/report/update/form_user_loggedout_email.html:2 msgid "We never show your email" -msgstr "" +msgstr "لن نظهر البريد الإلكتروني مطلقًا" -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:31 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:65 +#: templates/web/base/report/new/form_user_loggedin.html:31 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:28 msgid "We never show your email address or phone number." -msgstr "" +msgstr "لا نظهر عنوان البريد الإلكتروني أو رقم الهات٠مطلقًا." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:422 +#: perllib/FixMyStreet/Script/Reports.pm:200 msgid "We realise this problem might be the responsibility of %s; however, we don't currently have any contact details for them. If you know of an appropriate contact address, please do get in touch." -msgstr "" +msgstr "نعتقد أن هذه المشكلة هي المسؤولة عن %sØ› ولكن لا توجد لدينا أي تÙاصيل اتصال لهم. إذا كنت تعر٠عنوان اتصال مناسبًا، Ùالرجاء التواصل معنا." #: templates/web/base/index-steps.html:31 msgid "We send it to the council on your behalf" -msgstr "" +msgstr "Ù†ØÙ† نرسل ذلك إلى المجلس نيابةً عنك" #: templates/web/base/report/new/notes.html:4 #: templates/web/zurich/report/new/notes.html:4 msgid "We will only use your personal information in accordance with our <a href=\"/privacy\">privacy policy.</a>" -msgstr "" +msgstr "لن نستخدم معلوماتك الشخصية إلا ÙˆÙقًا <a href=\"/privacy\">لسياسة الخصوصية.</a>" #: templates/web/base/questionnaire/completed-open.html:2 msgid "We’re sorry to hear the problem’s not fixed. Why not try writing to your local representatives?" -msgstr "" - -#: templates/web/base/contact/blurb.html:8 -msgid "We'd love to hear what you think about this site. Just fill in the form, or send an email to <a href='mailto:%s'>%s</a>:" -msgstr "" +msgstr "نعتذر عن عدم Ø¥ØµÙ„Ø§Ø Ø§Ù„Ù…Ø´ÙƒÙ„Ø©. لما لا تجرب التواصل مع النواب المØليين؟" #: templates/web/base/contact/submit.html:7 msgid "We’ll get back to you as soon as we can." -msgstr "" +msgstr "سنعود إليك بأسرع ما يمكن." #: templates/web/base/questionnaire/index.html:71 msgid "What was your experience of getting the problem fixed?" -msgstr "" +msgstr "ما انطباعك عن Ø¥ØµÙ„Ø§Ø Ø§Ù„Ù…Ø´ÙƒÙ„Ø©ØŸ" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:49 +#: templates/web/base/report/new/form_report.html:19 msgid "What’s the issue, and where is it?" -msgstr "" +msgstr "ما المشكلة، وأين تقع؟" #: templates/web/base/admin/category_edit.html:90 #: templates/web/zurich/admin/body.html:18 msgid "When edited" -msgstr "" +msgstr "عند التØرير" #: templates/web/base/admin/problem_row.html:35 msgid "When sent" +msgstr "عند الإرسال" + +#: templates/web/base/js/translation_strings.html:50 +msgid "Whoa there Testino! Three photos are enough." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:640 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:635 msgid "Whole block of empty flats" -msgstr "" +msgstr "مجموعة كاملة من الشقق الÙارغة" #: templates/web/base/tokens/confirm_alert.html:7 msgid "Why stop there? <a href=\"/alert\">Set up more alerts</a> for free." -msgstr "" +msgstr "لماذا تتوق٠هنا؟ يمكنك <a href=\"/alert\">إعداد مزيد من التنبيهات</a> مجانًا." #: perllib/FixMyStreet/Cobrand/Zurich.pm:192 #: perllib/FixMyStreet/Cobrand/Zurich.pm:932 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:14 msgid "Wish" -msgstr "" +msgstr "الرغبة" -#: templates/web/base/open311/index.html:92 +#: templates/web/base/open311/index.html:84 msgid "With request searches, it is also possible to search for agency_responsible to limit the requests to those sent to a single administration. The search term is the administration ID provided by <a href=\"%s\">MaPit</a>." -msgstr "" +msgstr "مع عمليات البØØ« عن الطلبات، يمكن أيضًا البØØ« عن agency_responsible لقصر الطلبات على تلك المرسلة إلى إدارة واØدة. Ù…ØµØ·Ù„Ø Ø§Ù„Ø¨ØØ« هو معر٠الإدارة المقدم بواسطة <a href=\"%s\">MaPit</a>." #: templates/web/base/front/footer-marketing.html:17 msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"http://fixmystreet.org\">available at fixmystreet.org</a>." -msgstr "" +msgstr "هل تريد المساهمة ÙÙŠ FixMyStreetØŸ التعليمات البرمجية الخاصة بنا Ù…ÙتوØØ© المصدر <a href=\"http://fixmystreet.org\">ومتاØØ© على fixmystreet.org</a>." -#: templates/web/base/questionnaire/index.html:87 +#: templates/web/base/questionnaire/index.html:96 msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?" -msgstr "" +msgstr "هل تريد المشاركة ÙÙŠ استبيان آخر خلال 4 أسابيع Ùنذكرك بالتØقق من الØالة؟" #: templates/web/base/report/new/notes.html:7 msgid "Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation." -msgstr "" +msgstr "كتابة الرسالة بالأØر٠الكبيرة يجعل قراءتها صعبة، وكذلك الØال مع عدم الالتزام بقواعد الترقيم." #: templates/web/base/report/new/fill_in_details_form.html:4 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:5 msgid "Wrong location? Just click again on the map." -msgstr "" +msgstr "موقع غير صØÙŠØØŸ انقر مرة أخرى على الخريطة." #: templates/web/base/admin/stats.html:10 msgid "Year" -msgstr "" +msgstr "السنة" #: templates/web/base/admin/bodies.html:66 #: templates/web/base/admin/body.html:80 templates/web/base/admin/body.html:82 @@ -3689,42 +3632,39 @@ msgstr "" #: templates/web/base/admin/users.html:31 #: templates/web/base/questionnaire/creator_fixed.html:14 #: templates/web/base/questionnaire/index.html:51 -#: templates/web/base/questionnaire/index.html:90 +#: templates/web/base/questionnaire/index.html:99 msgid "Yes" -msgstr "" +msgstr "نعم" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:17 -#: templates/web/fixmystreet/report/update-form.html:91 +#: templates/web/base/report/new/form_user_loggedout_password.html:5 +#: templates/web/base/report/update/form_user_loggedout_password.html:4 msgid "Yes I have a password" msgstr "نعم لدي كلمة المرور" -#: templates/web/base/contact/index.html:39 -#: templates/web/fixmystreet/contact/index.html:54 +#: templates/web/base/contact/index.html:46 msgid "You are complaining that this problem report was unnecessarily moderated:" -msgstr "" +msgstr "أنت تشتكي من أن تقرير هذه المشكلة تم تعديله بواسطة الإشرا٠دون ضرورة لذلك:" -#: templates/web/base/contact/index.html:41 -#: templates/web/fixmystreet/contact/index.html:56 +#: templates/web/base/contact/index.html:48 msgid "You are reporting the following problem report for being abusive, containing personal information, or similar:" -msgstr "" +msgstr "أنت تبلغ عن تقرير المشكلة التالي بأنه يشتمل على إساءة أو ÙŠØتوي على معلومات شخصية أو شيء من هذا القبل:" -#: templates/web/base/contact/index.html:15 -#: templates/web/fixmystreet/contact/index.html:30 +#: templates/web/base/contact/index.html:22 msgid "You are reporting the following update for being abusive, containing personal information, or similar:" -msgstr "" +msgstr "أنت تبلغ عن التØديث التالي بأنه يشتمل على إساءة أو ÙŠØتوي على معلومات شخصية أو شيء من هذا القبيل:" #: templates/web/zurich/tokens/confirm_problem.html:5 #: templates/web/zurich/tokens/confirm_problem.html:8 msgid "You can <a href=\"%s%s\">view the problem on this site</a>." -msgstr "" +msgstr "يمكنك <a href=\"%s%s\">عرض المشكلة على هذا الموقع</a>." #: templates/web/base/admin/user-form.html:48 msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create." -msgstr "" +msgstr "يمكنك إضاÙØ© البريد الإلكتروني الخاصة بالمستخدم المسيء إلى قائمة المسيئين، وهي تخÙÙŠ تلقائيًا (ولا ترسل مطلقًا) التقارير التي يقومون بإنشائها." -#: templates/web/fixmystreet/contact/index.html:121 +#: templates/web/base/contact/index.html:113 msgid "You can contact technical support on <a href='mailto:%s'>%s</a>" -msgstr "" +msgstr "يمكنك التواصل مع الدعم الÙني عبر <a href='mailto:%s'>%s</a>" #: templates/web/base/admin/flagged.html:5 msgid "" @@ -3732,68 +3672,66 @@ msgid "" " For example, this can useful if you want to keep an eye on a user who has posted inappropriate\n" " reports in the past." msgstr "" +"يمكنك وضع إشارة على أي تقرير أو مستخدم عن طريق تØرير بياناته، وستتم إضاÙته إلى هذه الصÙØØ©.\n" +" على سبيل المثال، يمكن أن يكون ذلك Ù…Ùيدًا إذا كنت تريد مراقبة مستخدم نشر تقارير غير لائقة\n" +" ÙÙŠ الماضي." -#: templates/web/base/report/new/councils_text_none.html:10 -#: templates/web/base/report/new/councils_text_none.html:2 +#: templates/web/base/report/new/councils_text_none.html:12 +#: templates/web/base/report/new/councils_text_none.html:14 #: templates/web/base/report/new/councils_text_some.html:19 #: templates/web/base/report/new/councils_text_some.html:21 msgid "You can help us by finding a contact email address for local problems for %s and emailing it to us at <a href='mailto:%s'>%s</a>." -msgstr "" +msgstr "يمكنك مساعدتنا ÙÙŠ العثور على عنوان بريد إلكتروني لجهة اتصال للمشكلات المØلية المتعلقة بـ %s وإرساله إلينا عبر البريد الإلكتروني على <a href='mailto:%s'>%s</a>." #: templates/web/base/admin/body-form.html:85 msgid "You can mark a body as deleted if you do not want it to be active on the site." -msgstr "" +msgstr "يمكنك وضع علامة الØذ٠على هيئة إذا كنت لا تريدها نشطة على الموقع." #: templates/web/base/js/translation_strings.html:36 msgid "You declined; please fill in the box above" -msgstr "" +msgstr "لقد رÙضت؛ الرجاء تعبئة المربع بالأعلى" #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:38 msgid "You have already answered this questionnaire. If you have a question, please <a href='%s'>get in touch</a>, or <a href='%s'>view your problem</a>.\n" -msgstr "" - -#: templates/web/base/questionnaire/index.html:77 -#: templates/web/base/report/new/fill_in_details_form.html:75 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:73 -msgid "You have already attached a photo to this report, attaching another one will replace it." -msgstr "" +msgstr "لقد أجبت عن هذا الاستبيان بالÙعل. إذا كان لديك سؤال، Ùالرجاء <a href='%s'>التواصل معنا</a>ØŒ أو <a href='%s'>عرض المشكلة</a>.\n" -#: templates/web/base/report/update-form.html:59 -#: templates/web/fixmystreet/report/update-form.html:56 -msgid "You have already attached a photo to this update, attaching another one will replace it." -msgstr "" - -#: templates/web/zurich/report/new/fill_in_details_form.html:61 +#: templates/web/base/report/new/form_report.html:32 +#: templates/web/zurich/report/new/fill_in_details_form.html:55 msgid "You have already attached photos to this report. Note that you can attach a maximum of 3 to this report (if you try to upload more, the oldest will be removed)." -msgstr "" +msgstr "لقد أرÙقت صورًا بهذا التقرير من قبل. لاØظ أنه يمكنك إرÙاق 3 صور ÙƒØد أقصى بهذا التقرير (إذا Øاولت تØميل المزيد من الصور، Ùسيتم Øذ٠الصور القديمة)." + +#: templates/web/base/questionnaire/index.html:83 +#: templates/web/base/report/update/form_update.html:14 +#, fuzzy +msgid "You have already attached photos to this update. Note that you can attach a maximum of 3 to this update (if you try to upload more, the oldest will be removed)." +msgstr "لقد أرÙقت صورًا بهذا التقرير من قبل. لاØظ أنه يمكنك إرÙاق 3 صور ÙƒØد أقصى بهذا التقرير (إذا Øاولت تØميل المزيد من الصور، Ùسيتم Øذ٠الصور القديمة)." #: templates/web/base/auth/sign_out.html:4 #: templates/web/zurich/auth/sign_out.html:3 msgid "You have been signed out" -msgstr "" +msgstr "لقد قمت بتسجيل الخروج" #: templates/web/zurich/report/new/fill_in_details_form.html:13 msgid "You have located the problem at the point marked with a green pin on the map. If this is not the correct location, simply click on the map again. " -msgstr "" +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 "" +msgstr "لقد قمت بتأكيد عنوان البريد الإلكتروني بنجاØ." -#: templates/web/base/report/display.html:20 -#: templates/web/base/report/new/fill_in_details.html:37 -#: templates/web/fixmystreet/report/display.html:17 +#: templates/web/base/report/display.html:17 +#: templates/web/base/report/new/login_success_form.html:3 msgid "You have successfully signed in; please check and confirm your details are accurate:" -msgstr "" +msgstr "لقد قمت بتسجيل الدخول بنجاØØ› الرجاء التØقق من بياناتك وتأكيد أنها دقيقة:" #: templates/web/base/my/my.html:20 msgid "You haven’t created any reports yet. <a href=\"%s\">Report a problem now.</a>" -msgstr "" +msgstr "لم تقم بإنشاء أي تقارير Øتى الآن. <a href=\"%s\">أبلغ عن مشكلة الآن.</a>" #: templates/web/base/admin/index.html:19 msgid "You need to <a href=\"%s\">add some bodies</a> (such as councils or departments) before any reports can be sent." -msgstr "" +msgstr "أنت بØاجة إلى <a href=\"%s\">إضاÙØ© بعض الهيئات</a> (مثل المجالس أو الإدارات) قبل أن تتمكن من إرسال أي تقارير." #: templates/web/base/admin/bodies.html:7 msgid "" @@ -3801,200 +3739,186 @@ msgid "" " the categories of problems they can handle (such as potholes or streetlights) and the\n" " contacts (such as an email address) to which reports are sent." msgstr "" +"أنت بØاجة إلى إضاÙØ© هيئات (مثل مجالس أو إدارات) لكي تتمكن بعد ذلك من إضاÙØ©\n" +" Ùئات المشكلات التي يمكن لهذه الهيئات معالجتها (مثل الØÙر أو Ù…ØµØ§Ø¨ÙŠØ Ø§Ù„Ø´Ø§Ø±Ø¹)\n" +" وجهات الاتصال (مثل عنوان بريد إلكتروني) يمكن إرسال التقارير إليها." #: templates/web/base/admin/report_edit.html:67 msgid "You really want to resend?" -msgstr "" +msgstr "هل ترغب بالÙعل ÙÙŠ إعادة الإرسال؟" #: templates/web/base/my/my.html:0 templates/web/base/my/my.html:15 #: templates/web/base/my/my.html:4 msgid "Your Reports" -msgstr "" +msgstr "التقارير" #: templates/web/base/alert/_list.html:89 +#: templates/web/base/contact/index.html:83 +#: templates/web/base/report/display_tools.html:38 +#: templates/web/base/report/display_tools.html:40 +#: templates/web/base/report/new/form_user_loggedin.html:3 +#: templates/web/base/report/new/form_user_loggedout_email.html:1 +#: templates/web/base/report/update/form_user_loggedout_email.html:1 #: templates/web/fixmystreet/alert/updates.html:19 #: templates/web/fixmystreet/alert/updates.html:22 -#: templates/web/fixmystreet/contact/index.html:91 -#: templates/web/fixmystreet/report/display.html:62 -#: templates/web/fixmystreet/report/display.html:64 -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:3 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:1 -#: templates/web/fixmystreet/report/update-form.html:76 #: templates/web/zurich/report/new/fill_in_details_form.html:76 msgid "Your email" -msgstr "" +msgstr "البريد الإلكتروني" -#: templates/web/base/auth/general.html:28 -#: templates/web/fixmystreet/report/update-form.html:82 +#: templates/web/base/auth/general.html:45 +#: templates/web/base/report/update/form_user_loggedout_email.html:7 #: templates/web/zurich/auth/general.html:30 #: templates/web/zurich/auth/general.html:58 msgid "Your email address" -msgstr "" - -#: templates/web/base/report/new/fill_in_details_form.html:106 -#: templates/web/base/report/update-form.html:81 -msgid "Your email:" -msgstr "" +msgstr "عنوان البريد الإلكتروني" -#: templates/web/fixmystreet/report/updates-sidebar-notes.html:7 +#: templates/web/base/report/updates-sidebar-notes.html:3 msgid "Your information will only be used in accordance with our <a href=\"/privacy\">privacy policy</a>" -msgstr "" +msgstr "لن يتم استخدام معلوماتك إلا ÙˆÙقًا <a href=\"/privacy\">لسياسة الخصوصية</a> الخاصة بنا" -#: templates/web/base/auth/general.html:51 -#: templates/web/fixmystreet/contact/index.html:84 -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:18 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:54 -#: templates/web/fixmystreet/report/update-form.html:142 +#: templates/web/base/auth/general.html:90 +#: templates/web/base/contact/index.html:76 +#: templates/web/base/report/new/form_user_loggedin.html:18 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:17 +#: templates/web/base/report/update/form_name.html:11 #: templates/web/zurich/auth/general.html:61 #: templates/web/zurich/report/new/fill_in_details_form.html:86 msgid "Your name" -msgstr "" +msgstr "الاسم" -#: templates/web/base/contact/index.html:73 -#: templates/web/base/report/new/fill_in_details_form.html:186 -#: templates/web/base/report/update-form.html:152 -msgid "Your name:" -msgstr "" - -#: templates/web/base/auth/general.html:39 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:22 -#: templates/web/fixmystreet/report/update-form.html:96 +#: templates/web/base/auth/general.html:75 +#: templates/web/base/report/new/form_user_loggedout_password.html:10 +#: templates/web/base/report/update/form_user_loggedout_password.html:9 #: templates/web/zurich/auth/general.html:34 msgid "Your password" -msgstr "" +msgstr "كلمة المرور" #: templates/web/base/auth/change_password.html:6 msgid "Your password has been changed" -msgstr "" +msgstr "تم تغيير كلمة المرور" -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:27 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:63 +#: templates/web/base/report/new/form_user_loggedin.html:27 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:26 #: templates/web/zurich/report/new/fill_in_details_form.html:92 msgid "Your phone number" -msgstr "" +msgstr "رقم الهاتÙ" #: templates/web/base/questionnaire/index.html:14 +#, fuzzy msgid "Your report" -msgstr "" +msgstr "التقارير" #: templates/web/base/footer.html:9 templates/web/fixmystreet/footer.html:29 msgid "Your reports" -msgstr "" +msgstr "التقارير" #: templates/web/base/my/my.html:41 msgid "Your updates" -msgstr "" - -#: templates/web/base/contact/index.html:81 -msgid "Your email:" -msgstr "" +msgstr "التØديثات" #: templates/web/base/reports/_list-filters.html:3 -#, fuzzy msgid "all reports" msgstr "كل التقارير" #: templates/web/base/admin/timeline.html:4 msgid "by %s" -msgstr "" +msgstr "بواسطة %s" #: templates/web/base/reports/_list-filters.html:5 -#, fuzzy msgid "closed reports" -msgstr "تقارير مغلقة" +msgstr "التقارير المغلقة" #: templates/web/base/reports/body.html:6 #: templates/web/base/reports/body.html:7 msgid "council" -msgstr "" +msgstr "المجلس" #: templates/web/base/admin/report_edit.html:32 msgid "didn't use map" -msgstr "" +msgstr "لم يتم استخدام الخريطة" #: templates/web/base/alert/index.html:33 #: templates/web/base/around/postcode_form.html:15 msgid "e.g. ‘%s’ or ‘%s’" -msgstr "" +msgstr "على سبيل المثال، ’%s‘ أو ’%s‘" #: templates/web/base/admin/body-form.html:188 #: templates/web/base/admin/flagged.html:51 msgid "edit user" -msgstr "" +msgstr "تØرير المستخدم" #: templates/web/base/reports/_list-filters.html:6 -#, fuzzy msgid "fixed reports" -msgstr "بلاغات تم إصلاØها" +msgstr "التقارير التي تم إصلاØها" -#: templates/web/base/admin/index.html:33 +#: templates/web/base/status/stats.html:20 #: templates/web/zurich/admin/index.html:5 msgid "from %s different users" -msgstr "" +msgstr "من %s من المستخدمين المختلÙين" -#: templates/web/base/report/_item.html:17 -#: templates/web/zurich/report/_item.html:16 +#: templates/web/base/report/_item.html:15 +#: templates/web/zurich/report/_item.html:14 msgid "last updated %s" -msgstr "" +msgstr "آخر تØديث %s" #: perllib/Utils.pm:204 msgid "less than a minute" -msgstr "" +msgstr "أقل من دقيقة واØدة" #: templates/web/base/report/updates.html:57 msgid "marked as a duplicate report" -msgstr "" +msgstr "عليه علامة تقرير مكرر" #: templates/web/base/report/updates.html:47 msgid "marked as action scheduled" -msgstr "" +msgstr "عليه علامة إجراء مجدول" #: templates/web/base/report/updates.html:59 msgid "marked as an internal referral" -msgstr "" +msgstr "عليه علامة Ø¥Øالة داخلية" #: templates/web/base/report/updates.html:49 msgid "marked as closed" -msgstr "" +msgstr "عليه علامة مغلق" #: templates/web/base/report/updates.html:28 #: templates/web/base/report/updates.html:51 msgid "marked as fixed" -msgstr "" +msgstr "عليه علامة تم الإصلاØ" #: templates/web/base/report/updates.html:45 msgid "marked as in progress" -msgstr "" +msgstr "عليه علامة قيد التقدم" #: templates/web/base/report/updates.html:41 msgid "marked as investigating" -msgstr "" +msgstr "عليه علامة جار٠التØقق" #: templates/web/base/report/updates.html:55 msgid "marked as not the council's responsibility" -msgstr "" +msgstr "عليه علامة ليست مسؤولية المجلس" #: templates/web/base/report/updates.html:43 msgid "marked as planned" -msgstr "" +msgstr "عليه علامة مخطط" #: templates/web/base/report/updates.html:53 msgid "marked as unable to fix" -msgstr "" +msgstr "عليه علامة يتعذر الإصلاØ" #: perllib/FixMyStreet/App/Controller/Admin.pm:129 #: templates/web/base/admin/questionnaire.html:15 #: templates/web/base/admin/questionnaire.html:16 msgid "n/a" -msgstr "" +msgstr "غير متاØ" #: templates/web/base/alert/_list.html:85 msgid "or" -msgstr "" +msgstr "أو" #: templates/web/base/js/translation_strings.html:27 msgid "or locate me automatically" -msgstr "" +msgstr "أو تØديد الموقع تلقائيًا" #: templates/web/base/admin/report_edit.html:28 #: templates/web/base/admin/report_edit.html:30 @@ -4009,217 +3933,262 @@ msgstr "" #: templates/web/zurich/admin/report_edit.html:72 #: templates/web/zurich/admin/report_edit.html:74 msgid "originally entered: “%s”" -msgstr "" +msgstr "المÙدخل ÙÙŠ الأصل: “%s”" #: templates/web/base/admin/report_edit.html:43 msgid "other areas:" -msgstr "" +msgstr "مناطق أخرى:" #: templates/web/base/report/updates.html:29 #: templates/web/base/report/updates.html:39 msgid "reopened" -msgstr "" +msgstr "تمت إعادة الÙتØ" #: templates/web/base/header.html:33 templates/web/fixmystreet/header.html:64 #: templates/web/zurich/footer.html:13 msgid "sign out" -msgstr "" +msgstr "تسجيل الخروج" -#: templates/web/base/report/new/fill_in_details_form.html:12 -#: templates/web/base/report/new/fill_in_details_form.html:15 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:10 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:12 +#: templates/web/base/report/new/fill_in_details_form.html:11 +#: templates/web/base/report/new/fill_in_details_form.html:9 msgid "the local council" -msgstr "" +msgstr "المجلس المØلي" #: templates/web/base/report/_main.html:57 #: templates/web/zurich/report/_main.html:5 msgid "there is no pin shown as the user did not use the map" -msgstr "" +msgstr "لا يوجد دبوس مما يعني أن المستخدم لم يستخدم الخريطة" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:398 +#: perllib/FixMyStreet/Script/Reports.pm:176 msgid "this type of local problem" -msgstr "" +msgstr "هذا النوع من المشكلة المØلية" #: perllib/Utils.pm:176 msgid "today" -msgstr "" +msgstr "اليوم" #: templates/web/base/reports/_list-filters.html:4 -#, fuzzy msgid "unfixed reports" -msgstr "بلاغات تم إصلاØها" +msgstr "التقارير التي لم يتم إصلاØها" #: templates/web/base/admin/report_edit.html:32 msgid "used map" -msgstr "" +msgstr "تم استخدام الخريطة" #: templates/web/base/admin/update_edit.html:35 msgid "user is from same council as problem - %d" -msgstr "" +msgstr "المستخدم من Ù†Ùس المجلس مثل المشكلة - %d" #: templates/web/base/admin/update_edit.html:38 msgid "user is problem owner" -msgstr "" +msgstr "المستخدم هو صاØب المشكلة" #: templates/web/base/reports/body.html:0 #: templates/web/base/reports/body.html:3 msgid "ward" -msgstr "" +msgstr "الإدارة" -#: templates/web/base/front/stats.html:17 +#: templates/web/base/front/stats.html:13 #, perl-format msgid "<big>%s</big> report recently" msgid_plural "<big>%s</big> reports recently" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" -msgstr[4] "" -msgstr[5] "" +msgstr[0] "<big>%s</big> تقرير مؤخرًا" +msgstr[1] "<big>%s</big> تقرير مؤخرًا" +msgstr[2] "<big>%s</big> من التقارير مؤخرًا" +msgstr[3] "<big>%s</big> من التقارير مؤخرًا" +msgstr[4] "<big>%s</big> من التقارير مؤخرًا" +msgstr[5] "<big>%s</big> من التقارير مؤخرًا" #: perllib/Utils.pm:223 #, perl-format msgid "%d hour" msgid_plural "%d hours" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" -msgstr[4] "" -msgstr[5] "" +msgstr[0] "%d ساعة" +msgstr[1] "%d ساعة" +msgstr[2] "%d من الساعات" +msgstr[3] "%d من الساعات" +msgstr[4] "%d من الساعات" +msgstr[5] "%d من الساعات" #: templates/web/base/report/_support.html:6 #, perl-format msgid "%d supporter" msgid_plural "%d supporters" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" -msgstr[4] "" -msgstr[5] "" +msgstr[0] "%d من الداعمين" +msgstr[1] "%d داعم" +msgstr[2] "%d من الداعمين" +msgstr[3] "%d من الداعمين" +msgstr[4] "%d من الداعمين" +msgstr[5] "%d من الداعمين" #: perllib/Utils.pm:225 #, perl-format msgid "%d minute" msgid_plural "%d minutes" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" -msgstr[4] "" -msgstr[5] "" - -#: templates/web/base/front/stats.html:29 +msgstr[0] "%d دقيقة" +msgstr[1] "%d دقيقة" +msgstr[2] "%d من الدقائق" +msgstr[3] "%d من الدقائق" +msgstr[4] "%d من الدقائق" +msgstr[5] "%d من الدقائق" + +#: templates/web/base/front/stats.html:25 #, perl-format msgid "<big>%s</big> update on reports" msgid_plural "<big>%s</big> updates on reports" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" -msgstr[4] "" -msgstr[5] "" +msgstr[0] "<big>%s</big> تØديث على التقارير" +msgstr[1] "<big>%s</big> تØديث على التقارير" +msgstr[2] "<big>%s</big> من التØديثات على التقارير" +msgstr[3] "<big>%s</big> من التØديثات على التقارير" +msgstr[4] "<big>%s</big> من التØديثات على التقارير" +msgstr[5] "<big>%s</big> من التØديثات على التقارير" #: templates/web/emptyhomes/report/new/councils_text_none.html:3 #, perl-format msgid "We do not yet have details for the council that covers this location." msgid_plural "We do not yet have details for the councils that cover this location." -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" -msgstr[4] "" -msgstr[5] "" +msgstr[0] "لا توجد لدينا تÙاصيل عن المجلس الذي يغطي هذا الموقع Øتى الآن." +msgstr[1] "لا توجد لدينا تÙاصيل عن المجلس الذي يغطي هذا الموقع Øتى الآن." +msgstr[2] "لا توجد لدينا تÙاصيل عن المجالس التي تغطي هذا الموقع Øتى الآن." +msgstr[3] "لا توجد لدينا تÙاصيل عن المجالس التي تغطي هذا الموقع Øتى الآن." +msgstr[4] "لا توجد لدينا تÙاصيل عن المجالس التي تغطي هذا الموقع Øتى الآن." +msgstr[5] "لا توجد لدينا تÙاصيل عن المجالس التي تغطي هذا الموقع Øتى الآن." #: perllib/Utils.pm:219 #, perl-format msgid "%d week" msgid_plural "%d weeks" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" -msgstr[4] "" -msgstr[5] "" - -#: templates/web/base/front/stats.html:12 +msgstr[0] "%d أسبوع" +msgstr[1] "%d أسبوع" +msgstr[2] "%d من الأسابيع" +msgstr[3] "%d من الأسابيع" +msgstr[4] "%d من الأسابيع" +msgstr[5] "%d من الأسابيع" + +#: templates/web/base/front/stats.html:8 #, perl-format msgid "<big>%s</big> report in past week" msgid_plural "<big>%s</big> reports in past week" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" -msgstr[4] "" -msgstr[5] "" - -#: templates/web/base/front/stats.html:23 +msgstr[0] "<big>%s</big> تقرير ÙÙŠ الأسبوع الماضي" +msgstr[1] "<big>%s</big> تقرير ÙÙŠ الأسبوع الماضي" +msgstr[2] "<big>%s</big> من التقارير ÙÙŠ الأسبوع الماضي" +msgstr[3] "<big>%s</big> من التقارير ÙÙŠ الأسبوع الماضي" +msgstr[4] "<big>%s</big> من التقارير ÙÙŠ الأسبوع الماضي" +msgstr[5] "<big>%s</big> من التقارير ÙÙŠ الأسبوع الماضي" + +#: templates/web/base/front/stats.html:19 #, perl-format msgid "<big>%s</big> fixed in past month" msgid_plural "<big>%s</big> fixed in past month" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" -msgstr[4] "" -msgstr[5] "" +msgstr[0] "<big>%s</big> تقرير تم Øله ÙÙŠ الشهر الماضي" +msgstr[1] "<big>%s</big> تقرير تم Øله ÙÙŠ الشهر الماضي" +msgstr[2] "<big>%s</big> من التقارير التي تم Øلها ÙÙŠ الشهر الماضي" +msgstr[3] "<big>%s</big> من التقارير التي تم Øلها ÙÙŠ الشهر الماضي" +msgstr[4] "<big>%s</big> من التقارير التي تم Øلها ÙÙŠ الشهر الماضي" +msgstr[5] "<big>%s</big> من التقارير التي تم Øلها ÙÙŠ الشهر الماضي" #: perllib/Utils.pm:221 #, perl-format msgid "%d day" msgid_plural "%d days" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" -msgstr[4] "" -msgstr[5] "" +msgstr[0] "%d يوم" +msgstr[1] "%d يوم" +msgstr[2] "%d من الأيام" +msgstr[3] "%d من الأيام" +msgstr[4] "%d من الأيام" +msgstr[5] "%d من الأيام" #: templates/web/base/report/new/councils_text_some.html:13 #, perl-format msgid "We do <strong>not</strong> yet have details for the other council that covers this location." msgid_plural "We do <strong>not</strong> yet have details for the other councils that cover this location." -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" -msgstr[4] "" -msgstr[5] "" +msgstr[0] "<strong>لا</strong> توجد لدينا تÙاصيل عن المجلس الذي يغطي هذا الموقع Øتى الآن." +msgstr[1] "<strong>لا</strong> توجد لدينا تÙاصيل عن المجلس الذي يغطي هذا الموقع Øتى الآن." +msgstr[2] "<strong>لا</strong> توجد لدينا تÙاصيل عن المجالس التي تغطي هذا الموقع Øتى الآن." +msgstr[3] "<strong>لا</strong> توجد لدينا تÙاصيل عن المجالس التي تغطي هذا الموقع Øتى الآن." +msgstr[4] "<strong>لا</strong> توجد لدينا تÙاصيل عن المجالس التي تغطي هذا الموقع Øتى الآن." +msgstr[5] "<strong>لا</strong> توجد لدينا تÙاصيل عن المجالس التي تغطي هذا الموقع Øتى الآن." + +#~ msgid "(we never show your email address or phone number)" +#~ msgstr "(لن نقوم بعرض بريدك الإلكتروني او رقم هاتÙÙƒ المØمول)" + +#~ msgid "(we never show your email)" +#~ msgstr "(لن نقوم بعرض بريدك الإلكتروني)" + +#~ msgid "<strong>No</strong>, let me confirm my report by email:" +#~ msgstr "<strong>لا</strong> دعني أؤكّد بلاغي عبر البريد:" + +#~ msgid "<strong>No</strong>, let me confirm my update by email:" +#~ msgstr "<strong>لا</strong> دعني أؤكّد تØديثي عبر البريد:" + +#~ msgid "Email me updates" +#~ msgstr "راسلني عن التØديثات" + +#~ msgid "Enter a new password:" +#~ msgstr "أدخل كلمة مرور جديدة:" + +#~ 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 "عذرًا، لم نستطع تدقيق هذا الرمز. إذا كنت قد نسخت عنوان URL من رسالة بريد إلكتروني، Ùالرجاء التØقق من أنك نسخته بصورة صØÙŠØØ© تمامًا.\n" + +#~ 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 "إذا كنت تستخدم البريد الإلكتروني عن طريق المتصÙØ Ø£Ùˆ لديك Ù…Ø±Ø´Ø Ù„Ù„Ø§Ø±Ø³Ø§Ø¦Ù„ الغير هامة، ربما تود تÙقد مجلد الرسائل الغير هامة: بعض الأØيان، رسائلنا يشار إليها بذلك." + +#~ msgid "Message:" +#~ msgstr "الرسالة:" + +#~ msgid "More problems nearby" +#~ msgstr "مزيد من المشكلات القريبة" + +#~ msgid "Nearly Done! Now check your email..." +#~ msgstr "أوشكنا على الانتهاء! راجع البريد الإلكتروني الآن..." + +#~ msgid "Offensive? Unsuitable? Tell us" +#~ msgstr "عدواني؟ غير لائق؟ أخبرنا" + +#~ msgid "Photo:" +#~ msgstr "الصورة:" + +#~ msgid "Please check your email" +#~ msgstr "الرجاء التØقق من البريد الإلكتروني" + +#~ msgid "Please note that updates are not sent to the council. If you leave your name it will be public. Your information will only be used in accordance with our <a href=\"/faq#privacy\">privacy policy</a>" +#~ msgstr "الرجاء ملاØظة أن التØديثات لا يتم إرسالها إلى المجلس. Ùإذا تركت اسمك Ùسيظهر للعامة. سيتم استخدام معلوماتك ÙˆÙقًا لـ <a href=\"/faq#privacy\">سياسة الخصوصية</a> الخاصة بنا Ùقط" + +#~ msgid "This may be because the link is too old or already used, or the address was not copied correctly." +#~ msgstr "قد يكون سبب ذلك أن الارتباط قديم جدًا أو اÙستخدÙÙ… بالÙعل، أو أن العنوان لم ÙŠÙنسخ بصورة صØÙŠØØ©." -#~ msgid "(Don't worry — we'll hang on to your alert while you're checking your email.)" -#~ msgstr "(لا تقلق — سو٠نبقي تØذيرك بينما تتÙقد بريدك.)" +#~ msgid "This problem has been closed" +#~ msgstr "تم إغلاق هذه المشكلة" -#~ msgid "(Don't worry — we'll hang on to your problem report while you're checking your email.)" -#~ msgstr "(لا تقلق — سو٠نبقي بلاغك للمشكلة بينما تتÙقد بريدك)" +#~ msgid "This problem is in progress" +#~ msgstr "معالجة المشكلة قيد التقدم" -#~ msgid "(Don't worry — we'll hang on to your update while you're checking your email.)" -#~ msgstr "(لا تقلق — سو٠نبقي تØديثك بينما تتÙقد بريدك.)" +#~ msgid "This problem is old and of unknown status." +#~ msgstr "هذه المشكلة قديمة ÙˆØالتها غير معروÙØ©." -#~ msgid "<small>If you cannot see the map, <a href='%s' rel='nofollow'>skip this step</a>.</small>" -#~ msgstr "<small>إذا كنت لا تستطيع رؤية الخريطة، <a href='%s' rel='nofollow'> Ùتجاوز هذه الخطوة</a>.</small>" +#~ msgid "Update:" +#~ msgstr "التØديث:" -#~ msgid "<strong>No</strong>, I do not, let me sign in by email:" -#~ msgstr "<strong>لا</strong>ØŒ لا أرغب، دعني أسجّل دخولي بالبريد:" +#~ msgid "We have not been able to confirm your account - sorry." +#~ msgstr "تعذر علينا تأكيد الØساب - عذرًا." -#~ msgid "Are you a <strong>developer</strong>? Would you like to contribute to FixMyStreet?" -#~ msgstr "هل أنت <strong>مطور</strong>ØŸ هل تود المساهمة ÙÙŠ FixMyStreetØŸ" +#~ msgid "We have sent you an email containing a link to confirm your account." +#~ msgstr "لقد أرسلنا إليك رسالة بريد إلكتروني تØتوي على ارتباط لتأكيد الØساب." -#~ msgid "Closest nearby problems <small>(within %skm)</small>" -#~ msgstr "أقرب المشاكل <small>(within %skm)</small>" +#~ msgid "We'd love to hear what you think about this site. Just fill in the form, or send an email to <a href='mailto:%s'>%s</a>:" +#~ msgstr "نود أن نعلم رأيك ÙÙŠ هذا الموقع. تÙضل بتعبئة النموذج أو إرسال بريد إلكتروني إلى <a href='mailto:%s'>%s</a>:" -#~ msgid "Contact FixMyStreet" -#~ msgstr "اتصل بـ FixMyStreet" +#~ msgid "You have already attached a photo to this report, attaching another one will replace it." +#~ msgstr "لقد أرÙقت صورة بهذا التقرير من قبل، وسيؤدي إرÙاق صورة أخرى إلى استبدال الصورة الأولى." -#~ msgid "FixMyStreet admin:" -#~ msgstr "إدارة Ø£ØµÙ„Ø Ø´Ø§Ø±Ø¹ÙŠ:" +#~ msgid "You have already attached a photo to this update, attaching another one will replace it." +#~ msgstr "لقد أرÙقت صورة بهذا التØديث من قبل، وسيؤدي إرÙاق صورة أخرى إلى استبدال الصورة الأولى." -#~ msgid "If you do not, your alert will not be activated." -#~ msgstr "إذا لم تÙعل، تØذيرك لن يتم تÙعيله." +#~ msgid "Your email:" +#~ msgstr "البريد الإلكتروني:" -#~ msgid "If you do not, your problem will not be posted." -#~ msgstr "إذا لم تÙعل، مشكلتك لن يتم إدراجها." +#~ msgid "Your name:" +#~ msgstr "الاسم:" -#~ msgid "If you do not, your update will not be posted." -#~ msgstr "إذا لم تÙعل، تØديثك لن يتم إدراجه." +#~ msgid "Your email:" +#~ msgstr "البريد الإلكتروني:" diff --git a/locale/bg_BG.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/bg_BG.UTF-8/LC_MESSAGES/FixMyStreet.po index 48a478a17..19ebd0aa8 100644 --- a/locale/bg_BG.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/bg_BG.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: fixmystreet\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2015-10-23 16:51+0100\n" -"PO-Revision-Date: 2015-07-31 16:31+0000\n" +"POT-Creation-Date: 2016-03-02 13:09+0000\n" +"PO-Revision-Date: 2015-10-23 16:34+0000\n" "Last-Translator: mySociety <transifex@mysociety.org>\n" "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/mysociety/fixmystreet/language/bg_BG/)\n" "Language: bg_BG\n" @@ -20,45 +20,24 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:628 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:411 +#: perllib/FixMyStreet/DB/Result/Problem.pm:616 +#: perllib/FixMyStreet/Script/Reports.pm:189 msgid " and " msgstr "и" #: templates/web/base/report/new/councils_text_all.html:2 -#: templates/web/base/report/new/councils_text_none.html:11 -#: templates/web/base/report/new/councils_text_none.html:2 +#: templates/web/base/report/new/councils_text_none.html:12 +#: templates/web/base/report/new/councils_text_none.html:15 #: templates/web/base/report/new/councils_text_some.html:19 #: templates/web/base/report/new/councils_text_some.html:22 #: templates/web/base/report/new/councils_text_some.html:5 msgid " or " msgstr "или" -#: templates/web/base/admin/index.html:35 -#: templates/web/base/status/index.html:13 -msgid "%s confirmed alerts, %s unconfirmed" -msgstr "%d потвърдени извеÑтиÑ, %d непотвърдени" - -#: templates/web/base/admin/index.html:37 -#: templates/web/base/status/index.html:16 -#: templates/web/zurich/admin/index.html:6 -msgid "%s council contacts – %s confirmed, %s unconfirmed" -msgstr "%d връзка Ñ Ð¾Ð±Ñ‰Ð¸Ð½Ð°Ñ‚Ð° – %d потвърдени, %d непотвърдени" - #: templates/web/base/admin/edit-league.html:12 msgid "%d edits by %s" msgstr "%d редиктарано от %s" -#: templates/web/base/admin/index.html:34 -#: templates/web/base/status/index.html:12 -msgid "%s live updates" -msgstr "%d обновÑване в реално време" - -#: templates/web/base/admin/index.html:36 -#: templates/web/base/status/index.html:14 -msgid "%s questionnaires sent – %s answered (%s%%)" -msgstr "%d изпратени анкети – %d отговорени (%s%%)" - #: templates/web/base/pagination.html:10 msgid "%d to %d of %d" msgstr "%d до %d от %d" @@ -73,25 +52,45 @@ msgstr "%s - Обобщена Ñправка" msgid "%s admin:" msgstr "" +#: templates/web/base/status/stats.html:26 +#, fuzzy +msgid "%s bodies" +msgstr "Райони" + +#: templates/web/base/status/stats.html:24 +msgid "%s confirmed alerts, %s unconfirmed" +msgstr "%s потвърдени извеÑтиÑ, %s непотвърдени" + +#: templates/web/base/status/stats.html:27 +#: templates/web/zurich/admin/index.html:6 +msgid "%s council contacts – %s confirmed, %s unconfirmed" +msgstr "%s връзка Ñ Ð¾Ð±Ñ‰Ð¸Ð½Ð°Ñ‚Ð° – %s потвърдени, %s непотвърдени" + #. ("%s is the site name") #: templates/web/base/alert/index.html:7 -#, fuzzy msgid "" "%s has a variety of RSS feeds and email alerts for local\n" "problems, including alerts for all problems within a particular ward, or all\n" "problems within a certain distance of a particular location." -msgstr "ÐŸÐ¾Ð¿Ñ€Ð°Ð²Ð¸Ð¡Ð¾Ñ„Ð¸Ñ Ð¿Ñ€Ð¸Ñ‚ÐµÐ¶Ð°Ð²Ð° възможноÑти за изпращане на извеÑÑ‚Ð¸Ñ Ð¿Ð¾ RSS и имейл за Ñигналите подадени на териториÑта на СофиÑ, включително и Ñигнали за определен квартал или район или за вÑички Ñигнали намиращи Ñе в близоÑÑ‚ до определено меÑтоположение." +msgstr "" #. ("%s is the site name") #: templates/web/base/alert/index.html:11 -#, fuzzy msgid "" "%s has a variety of RSS feeds and email alerts for local problems, including\n" "alerts for all problems within a particular ward or council, or all problems\n" "within a certain distance of a particular location." -msgstr "ÐŸÐ¾Ð¿Ñ€Ð°Ð²Ð¸Ð¡Ð¾Ñ„Ð¸Ñ Ð¿Ñ€Ð¸Ñ‚ÐµÐ¶Ð°Ð²Ð° възможноÑти за изпращане на извеÑÑ‚Ð¸Ñ Ð¿Ð¾ RSS и имейл за Ñигналите подадени на териториÑта на СофиÑ, включително и Ñигнали за определен квартал или район или за вÑички Ñигнали намиращи Ñе в близоÑÑ‚ до определено меÑтоположение." +msgstr "" + +#: templates/web/base/status/stats.html:23 +msgid "%s live updates" +msgstr "%s обновÑване в реално време" -#: perllib/FixMyStreet/DB/Result/Problem.pm:695 +#: templates/web/base/status/stats.html:25 +msgid "%s questionnaires sent – %s answered (%s%%)" +msgstr "%s изпратени анкети – %s отговорени (%s%%)" + +#: perllib/FixMyStreet/DB/Result/Problem.pm:683 msgid "%s ref: %s" msgstr "%s номер: %s" @@ -106,15 +105,15 @@ msgid "" "for the county council." msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:255 perllib/FixMyStreet/Cobrand/UK.pm:267 +#: perllib/FixMyStreet/Cobrand/UK.pm:256 perllib/FixMyStreet/Cobrand/UK.pm:268 msgid "%s ward, %s" msgstr "%s квартал, %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:564 +#: perllib/FixMyStreet/DB/Result/Problem.pm:552 msgid "%s, reported at %s" msgstr "%s, Ñъобщено на %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:282 perllib/FixMyStreet/Cobrand/UK.pm:294 +#: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295 msgid "%s, within %s ward" msgstr "%s, в %s квартал" @@ -122,7 +121,7 @@ msgstr "%s, в %s квартал" msgid "© <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors" msgstr "" -#: templates/web/zurich/report/new/fill_in_details_form.html:53 +#: templates/web/zurich/report/new/fill_in_details_form.html:46 msgid "(Defect & location of defect)" msgstr "" @@ -133,15 +132,13 @@ msgstr "(Имейлът е маркиран като подаващ обидни #: templates/web/zurich/admin/report_edit-sdm.html:60 #: templates/web/zurich/admin/report_edit.html:88 -#, fuzzy msgid "(No name)" -msgstr "Име" +msgstr "" #: templates/web/zurich/admin/report_edit-sdm.html:67 #: templates/web/zurich/admin/report_edit.html:95 -#, fuzzy msgid "(No phone number)" -msgstr "Телефонен номер" +msgstr "" #: templates/web/base/alert/_list.html:24 msgid "(a default distance which covers roughly 200,000 people)" @@ -149,17 +146,16 @@ msgstr "(разÑтоÑние, което покрива грубо 7 500 жит #. ("%s is a list of distance links, e.g. [2km] / [5km] / [10km] / [20km]") #: templates/web/base/alert/_list.html:29 -#, fuzzy msgid "(alternatively the RSS feed can be customised, within %s)" -msgstr "(като алтернатива RSS емиÑиите могат да бъдат перÑонализирани" +msgstr "" -#: templates/web/base/report/_item.html:27 -#: templates/web/zurich/report/_item.html:21 +#: templates/web/base/report/_item.html:25 +#: templates/web/zurich/report/_item.html:19 msgid "(closed)" msgstr "(затворен)" -#: templates/web/base/report/_item.html:25 -#: templates/web/zurich/report/_item.html:19 +#: templates/web/base/report/_item.html:23 +#: templates/web/zurich/report/_item.html:17 msgid "(fixed)" msgstr "(поправен)" @@ -167,37 +163,28 @@ msgstr "(поправен)" msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)" msgstr "(като графити, дупки по улицата, Ñчупено улично оÑветление)" -#: templates/web/base/report/_item.html:21 +#: templates/web/base/report/_item.html:19 msgid "(not sent to council)" msgstr "(не е изпратен към общината)" -#: templates/web/base/report/new/fill_in_details_form.html:200 #: templates/web/zurich/report/new/fill_in_details_form.html:82 msgid "(optional)" msgstr "(незадължително)" -#: templates/web/fixmystreet/report/public_label.html:1 +#: templates/web/base/report/public_label.html:1 msgid "(public)" msgstr "" -#: templates/web/base/report/_item.html:20 +#: templates/web/base/report/_item.html:18 msgid "(sent to both)" msgstr "(изпратен към двата района)" -#: templates/web/base/report/new/fill_in_details_form.html:194 -msgid "(we never show your email address or phone number)" -msgstr "(ние никога не показваме Ð²Ð°ÑˆÐ¸Ñ Ð¸Ð¼ÐµÐ¹Ð» или телефонен номер)" - -#: templates/web/base/report/update-form.html:159 -msgid "(we never show your email)" -msgstr "(ние никога не показваме Ð²Ð°ÑˆÐ¸Ñ Ð¸Ð¼ÐµÐ¹Ð»)" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:673 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 #: perllib/FixMyStreet/DB/Result/Problem.pm:410 msgid "-- Pick a category --" msgstr "-- Изберете ÐºÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ð¸Ñ --" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:637 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:632 #: perllib/FixMyStreet/DB/Result/Problem.pm:416 msgid "-- Pick a property type --" msgstr "-- Изберете подходÑщ тип --" @@ -216,52 +203,39 @@ msgstr "" msgid "<label>Show %s</label> <label>about %s</label>" msgstr "" -#: templates/web/base/admin/index.html:32 -#: templates/web/base/status/index.html:11 +#: templates/web/base/status/stats.html:18 #: templates/web/zurich/admin/index.html:4 msgid "<strong>%s</strong> live problems" -msgstr "<strong>%d</strong> отворени Ñигнали" +msgstr "<strong>%s</strong> отворени Ñигнали" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:39 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:2 msgid "<strong>No</strong> Let me confirm my report by email" msgstr "<strong>Ðе</strong> Ðека Ð¿Ð¾Ñ‚Ð²ÑŠÑ€Ð´Ñ Ñигнала чрез имейл" -#: templates/web/fixmystreet/report/update-form.html:112 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:2 msgid "<strong>No</strong> Let me confirm my update by email" msgstr "<strong>Ðе</strong> Ðека Ð¿Ð¾Ñ‚Ð²ÑŠÑ€Ð´Ñ Ð°ÐºÑ‚ÑƒÐ°Ð»Ð¸Ð·Ð°Ñ†Ð¸Ñта чрез имейл" -#: templates/web/base/auth/general.html:48 +#: templates/web/base/auth/general.html:87 #: templates/web/zurich/auth/general.html:51 msgid "<strong>No</strong> let me sign in by email" msgstr "<strong>Ðе</strong> Ðека да влÑза в ÑиÑтемата чрез имейл" -#: templates/web/base/report/new/fill_in_details_form.html:145 -msgid "<strong>No</strong>, let me confirm my report by email:" -msgstr "<strong>Ðе</strong> Ðека да Ð¿Ð¾Ñ‚Ð²ÑŠÑ€Ð´Ñ Ñигнала чрез имейл" - -#: templates/web/base/report/update-form.html:118 -msgid "<strong>No</strong>, let me confirm my update by email:" -msgstr "<strong>Ðе</strong> Ðека Ð¿Ð¾Ñ‚Ð²ÑŠÑ€Ð´Ñ Ð¿Ñ€Ð¾Ð¼Ñната чрез имейл:" - -#: templates/web/base/auth/general.html:34 -#: templates/web/base/report/new/fill_in_details_form.html:123 -#: templates/web/base/report/update-form.html:96 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:15 -#: templates/web/fixmystreet/report/update-form.html:89 +#: templates/web/base/auth/general.html:70 +#: templates/web/base/report/new/form_user_loggedout_password.html:3 +#: templates/web/base/report/update/form_user_loggedout_password.html:2 msgid "<strong>Yes</strong> I have a password" msgstr "<strong>Да</strong> Имам парола" -#: templates/web/base/static/about-en-gb.html:1 -#: templates/web/base/static/about-en-gb.html:3 +#: templates/web/base/about/about-en-gb.html:1 +#: templates/web/base/about/about-en-gb.html:3 msgid "About us" msgstr "За наÑ" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:8 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:31 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:29 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:35 msgid "Action Scheduled" msgstr "Сигналът Ñе обработва" @@ -295,14 +269,13 @@ msgstr "ДобавÑне на нова категориÑ" msgid "Add user" msgstr "Добавете потребител" -#: templates/web/base/my/my.html:52 +#: templates/web/base/my/my.html:56 msgid "Added %s" msgstr "Добавено %s" #: templates/web/base/report/new/category_extras.html:9 -#, fuzzy msgid "Additional Information" -msgstr "Очакващ преглед" +msgstr "" #: templates/web/base/auth/change_password.html:29 msgid "Again:" @@ -316,8 +289,7 @@ msgstr "Създадено извеÑтие %d за %s, тип %s, Ñ Ð¿Ð°Ñ€Ð°Ð¼ msgid "Alert %d disabled (created %s)" msgstr "ИзвеÑтието %d е изключено (Ñъздадено на %s)" -#: templates/web/base/report/update-form.html:164 -#: templates/web/fixmystreet/report/update-form.html:150 +#: templates/web/base/report/update/form_name.html:20 msgid "Alert me to future updates" msgstr "ИзвеÑÑ‚Ñвай ме за бъдещи актуализиации" @@ -327,9 +299,8 @@ msgid "All Reports" msgstr "Вички Ñигнали" #: templates/web/zurich/admin/stats.html:5 -#, fuzzy msgid "All Reports as CSV" -msgstr "Вички Ñигнали" +msgstr "" #: templates/web/base/footer.html:11 templates/web/fixmystreet/footer.html:32 #: templates/web/zurich/admin/index-dm.html:12 @@ -350,10 +321,8 @@ msgstr "ЦÑлата информациÑ, коÑто предоÑтавите Ñ #: templates/web/base/report/new/councils_text_all.html:2 #: templates/web/base/report/new/councils_text_all.html:4 -#: templates/web/base/report/new/fill_in_details_form.html:12 -#: templates/web/base/report/new/fill_in_details_form.html:14 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:10 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:11 +#: templates/web/base/report/new/fill_in_details_form.html:10 +#: templates/web/base/report/new/fill_in_details_form.html:9 msgid "All the information you provide here will be sent to <strong>%s</strong>." msgstr "ЦÑлата информациÑ, коÑто предоÑтавите тук, ще бъде изпратена на <strong>%s</strong>." @@ -375,6 +344,10 @@ msgstr "Ðнонимен:" msgid "Are you a developer?" msgstr "Ðко Ñте програмиÑÑ‚?" +#: templates/web/base/js/translation_strings.html:52 +msgid "Are you sure you want to cancel this upload?" +msgstr "" + #: templates/web/base/admin/body-form.html:69 #: templates/web/base/admin/body.html:16 #: templates/web/zurich/admin/body-form.html:24 @@ -387,9 +360,8 @@ msgid "As this is a staging site and %s is false, reports made on this site will msgstr "" #: templates/web/zurich/admin/report_edit.html:213 -#, fuzzy msgid "Assign to competent body:" -msgstr "ПрехвърлÑне към външна община:" +msgstr "" #: templates/web/zurich/admin/report_edit.html:173 #: templates/web/zurich/admin/stats.html:36 @@ -408,16 +380,16 @@ msgstr "ПрехвърлÑне към подразделение:" msgid "Assigned to %s" msgstr "Прехвърлен на %s" -#: templates/web/base/open311/index.html:84 +#: templates/web/base/open311/index.html:76 msgid "At most %d requests are returned in each query. The returned requests are ordered by requested_datetime, so to get all requests, do several searches with rolling start_date and end_date." msgstr "" -#: templates/web/base/open311/index.html:76 +#: templates/web/base/open311/index.html:68 msgid "At the moment only searching for and looking at reports work." msgstr "За момета можете Ñамо да Ñ‚ÑŠÑ€Ñите и преглеждате Ñигнали" #: perllib/FixMyStreet/DB/Result/Problem.pm:373 -#: templates/web/zurich/report/_item.html:11 +#: templates/web/zurich/report/_item.html:9 msgid "Awaiting moderation" msgstr "Очакващ преглед" @@ -429,7 +401,7 @@ msgstr "Ðазад" msgid "Ban email address" msgstr "Забрана на имейл адреÑа" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1276 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1285 #: perllib/FixMyStreet/Cobrand/Zurich.pm:392 #: templates/web/base/admin/bodies.html:1 templates/web/zurich/header.html:64 msgid "Bodies" @@ -459,7 +431,7 @@ msgid "Can't see the map? <em>Skip this step</em>" msgstr "Ðе виждате картата? <em>ПропуÑнете тази Ñтъпка</em>" #: templates/web/base/admin/body.html:68 -#: templates/web/base/admin/index.html:61 +#: templates/web/base/admin/index.html:54 #: templates/web/base/report/new/category.html:10 #: templates/web/base/report/new/category_wrapper.html:3 #: templates/web/zurich/admin/body.html:14 @@ -470,8 +442,8 @@ msgstr "Ðе виждате картата? <em>ПропуÑнете тази Ñ msgid "Category" msgstr "КатегориÑ" -#: templates/web/base/admin/index.html:59 -#: templates/web/base/admin/index.html:67 +#: templates/web/base/admin/index.html:52 +#: templates/web/base/admin/index.html:60 msgid "Category fix rate for problems > 4 weeks old" msgstr "Сигнали подадени преди повече от 4 Ñедмици" @@ -484,7 +456,7 @@ msgstr "Сигнали подадени преди повече от 4 ÑедмРmsgid "Category:" msgstr "КатегориÑ:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:402 +#: perllib/FixMyStreet/Script/Reports.pm:180 msgid "Category: %s" msgstr "КатегориÑ: %s" @@ -543,7 +515,7 @@ msgid "Click here or enter as dd/mm/yyyy" msgstr "Изберете дата или Ñ Ð²ÑŠÐ²ÐµÐ´ÐµÑ‚Ðµ - dd/mm/yyyy" #: templates/web/base/around/_report_banner.html:2 -#: templates/web/base/js/translation_strings.html:50 +#: templates/web/base/js/translation_strings.html:55 msgid "Click map to report a problem" msgstr "Щракнете върху картата, за да Ñъобщите за проблем" @@ -570,7 +542,7 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:25 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:144 -#: templates/web/fixmystreet/report/banner.html:15 +#: templates/web/base/report/banner.html:15 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:10 #: templates/web/zurich/admin/header.html:16 @@ -578,7 +550,7 @@ msgstr "" msgid "Closed" msgstr "Затворен" -#: perllib/FixMyStreet/DB/Result/Problem.pm:794 +#: perllib/FixMyStreet/DB/Result/Problem.pm:779 msgid "Closed by council" msgstr "Затворен от общината" @@ -604,7 +576,7 @@ msgstr "Ð˜Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð·Ð° меÑтната имплементциÑ:" msgid "Cobrand:" msgstr "МеÑтна имплементциÑ" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1283 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1292 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "КонфигурациÑ" @@ -617,13 +589,14 @@ msgstr "Задайте крайна точка" msgid "Confirm" msgstr "Потвърждаване" -#: templates/web/base/auth/token.html:1 templates/web/zurich/auth/token.html:1 +#: templates/web/base/auth/token.html:1 msgid "Confirm account" msgstr "Потвърждаване на акаунта" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:33 -#: templates/web/fixmystreet/report/update-form.html:107 -msgid "Confirm by email below, providing a new password at that point. When you confirm, your password will be updated." +#: templates/web/base/report/new/form_user_loggedout_password.html:21 +#: templates/web/base/report/update/form_user_loggedout_password.html:20 +#, fuzzy +msgid "Confirm by email instead, providing a new password at that point. When you confirm, your password will be updated." msgstr "Потвърдете Ñигнала, въвеждайки имейла Ñи по-долу и въведете нова парола. Когато потвърдите имейла, паролата Ви ще Ñе Ñмени автоматично." #: templates/web/base/questionnaire/creator_fixed.html:1 @@ -653,35 +626,27 @@ msgid "Confirmed:" msgstr "Потвърдени:" #. ("%s is the site name") -#: templates/web/base/faq/faq-en-gb.html:8 templates/web/base/footer.html:24 -#: templates/web/base/open311/index.html:8 -#: templates/web/base/static/privacy.html:10 -#: templates/web/fixmystreet/contact/index.html:12 -#, fuzzy +#: templates/web/base/about/_sidebar.html:6 templates/web/base/footer.html:24 msgid "Contact %s" -msgstr "Връзка Ñ Ð½Ð°Ñ" +msgstr "" #: templates/web/base/contact/index.html:1 #: templates/web/base/contact/index.html:2 #: templates/web/base/contact/submit.html:1 -#: templates/web/fixmystreet/contact/index.html:1 -#: templates/web/fixmystreet/contact/index.html:2 msgid "Contact Us" msgstr "Връзка Ñ Ð½Ð°Ñ" -#: templates/web/base/contact/index.html:6 -#: templates/web/fixmystreet/contact/index.html:20 +#: templates/web/base/contact/index.html:12 msgid "Contact the team" msgstr "Връзка Ñ Ñ‚Ð¸Ð¼Ð°" #: templates/web/zurich/admin/report_edit-sdm.html:40 #: templates/web/zurich/admin/report_edit.html:59 -#, fuzzy msgid "Coordinates:" -msgstr "Координати:" +msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1420 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1448 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1429 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1457 msgid "Could not find user" msgstr "ПотребителÑÑ‚ не е намерен" @@ -699,7 +664,7 @@ msgstr "Община" msgid "Council contacts for %s" msgstr "Контакти на общината за %s " -#: perllib/FixMyStreet/DB/Result/Problem.pm:693 +#: perllib/FixMyStreet/DB/Result/Problem.pm:681 msgid "Council ref: %s" msgstr "входÑщ номер в общината: %s" @@ -714,7 +679,7 @@ msgstr "Община:" msgid "Count" msgstr "Брой" -#: templates/web/base/email_sent.html:1 templates/web/zurich/email_sent.html:1 +#: templates/web/base/email_sent.html:1 msgid "Create a report" msgstr "Подай Ñигнал" @@ -724,9 +689,8 @@ msgid "Create category" msgstr "Създай категориÑ" #: templates/web/zurich/admin/template_edit.html:29 -#, fuzzy msgid "Create template" -msgstr "Подай Ñигнал" +msgstr "" #: templates/web/base/admin/problem_row.html:34 #: templates/web/zurich/admin/templates.html:10 @@ -763,7 +727,7 @@ msgstr "Табло" msgid "Dealt with by subdivision within 5 working days" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:878 +#: perllib/FixMyStreet/App/Controller/Admin.pm:877 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "" @@ -776,7 +740,7 @@ msgstr "" msgid "Deleted" msgstr "Изтрит" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:51 +#: templates/web/base/report/new/form_report.html:45 #: templates/web/zurich/admin/index-dm.html:22 #: templates/web/zurich/admin/index-sdm.html:20 #: templates/web/zurich/admin/reports.html:12 @@ -784,12 +748,11 @@ msgid "Description" msgstr "ОпиÑание" #: templates/web/base/js/translation_strings.html:34 -#: templates/web/zurich/report/new/fill_in_details_form.html:42 +#: templates/web/zurich/report/new/fill_in_details_form.html:68 msgid "Details" msgstr "ИнформациÑ" #: templates/web/base/admin/report_edit.html:20 -#: templates/web/base/report/new/fill_in_details_form.html:62 #: templates/web/zurich/admin/report_edit-sdm.html:27 #: templates/web/zurich/admin/report_edit.html:29 #: templates/web/zurich/admin/report_edit.html:43 @@ -802,38 +765,38 @@ msgstr "Прехвърлен" #: templates/web/zurich/admin/report_edit-sdm.html:50 #: templates/web/zurich/admin/report_edit.html:69 -#, fuzzy msgid "Didn't use map" -msgstr "картата не е била използвана" +msgstr "" #: templates/web/base/admin/edit-league.html:8 msgid "Diligency prize league table" msgstr "Таблица Ñ Ñ€Ð°Ð¹Ð¾Ð½Ð¸Ñ‚Ðµ в СофиÑ" #. ("%s is the site name") -#: templates/web/base/auth/general.html:31 -#: templates/web/base/report/new/fill_in_details_form.html:114 -#: templates/web/base/report/update-form.html:87 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:11 -#: templates/web/fixmystreet/report/update-form.html:86 -#, fuzzy +#: templates/web/base/auth/general.html:48 +#: templates/web/base/report/new/form_user_loggedout.html:18 +#: templates/web/base/report/new/oauth_email_form.html:18 +#: templates/web/base/report/update-form.html:29 +#: templates/web/base/report/update/form_user_loggedout.html:17 msgid "Do you have a %s password?" -msgstr "Имате ли парола за Ñайта?" +msgstr "" #: templates/web/base/questionnaire/index.html:55 msgid "Don’t know" msgstr "Ðе знам" -#: templates/web/fixmystreet/contact/index.html:118 +#: templates/web/base/contact/index.html:110 msgid "Don't like forms?" msgstr "Ðе обичате форми?" +#: templates/web/base/js/translation_strings.html:51 +msgid "Drag and drop photos here or <u>click to upload</u>" +msgstr "" + #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:14 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:32 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:30 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:36 msgid "Duplicate" msgstr "Вече ÑъщеÑтвува" @@ -887,7 +850,7 @@ msgstr "Редактирано от" #: templates/web/base/admin/category_edit.html:91 #: templates/web/base/admin/flagged.html:38 #: templates/web/base/admin/users.html:16 -#: templates/web/base/auth/general.html:22 +#: templates/web/base/auth/general.html:39 #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:24 @@ -895,7 +858,7 @@ msgstr "Редактирано от" msgid "Email" msgstr "Имейл" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1396 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1405 msgid "Email added to abuse list" msgstr "Имейлът е добавен в ÑпиÑъка ÑÑŠÑ Ð·Ð»Ð¾ÑƒÐ¿Ð¾Ñ‚Ñ€ÐµÐ±Ð¸" @@ -911,7 +874,7 @@ msgstr "" msgid "Email alert deleted" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1393 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1402 msgid "Email already in abuse list" msgstr "Имейлът е в ÑпиÑъка ÑÑŠÑ Ð·Ð»Ð¾ÑƒÐ¿Ð¾Ñ‚Ñ€ÐµÐ±Ð¸" @@ -919,41 +882,36 @@ msgstr "Имейлът е в ÑпиÑъка ÑÑŠÑ Ð·Ð»Ð¾ÑƒÐ¿Ð¾Ñ‚Ñ€ÐµÐ±Ð¸" msgid "Email me new local problems" msgstr "Съобщавай ми новите Ñигнали" -#: templates/web/base/report/display.html:38 -msgid "Email me updates" -msgstr "Съобщавай ми за промени" - #: templates/web/base/admin/category_edit.html:31 #: templates/web/base/admin/report_edit.html:62 #: templates/web/base/admin/update_edit.html:33 #: templates/web/base/admin/user-form.html:20 #: templates/web/base/alert/updates.html:13 -#: templates/web/base/report/display.html:42 #: templates/web/zurich/admin/body.html:47 msgid "Email:" msgstr "Имейл:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:329 +#: perllib/FixMyStreet/Script/Reports.pm:108 msgid "Email: %s" msgstr "Имейл: %s" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:639 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:634 msgid "Empty flat or maisonette" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:638 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:633 msgid "Empty house or bungalow" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:641 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:636 msgid "Empty office or other commercial" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:642 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:637 msgid "Empty pub or bar" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:643 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:638 msgid "Empty public building - school, hospital, etc." msgstr "" @@ -986,7 +944,7 @@ msgstr "" msgid "Enter a Zürich street name" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:13 +#: perllib/FixMyStreet/Cobrand/UK.pm:14 msgid "Enter a nearby UK postcode, or street name and area" msgstr "" @@ -1004,14 +962,9 @@ msgstr "Въведете име на улица в близоÑÑ‚ до ваÑ" msgid "Enter a nearby street name and area, postal code or district in Delhi" msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:152 -#: templates/web/base/report/update-form.html:125 -msgid "Enter a new password:" -msgstr "Въведете нова парола:" - -#: templates/web/base/auth/general.html:60 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:75 -#: templates/web/fixmystreet/report/update-form.html:123 +#: templates/web/base/auth/general.html:99 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:38 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:13 #: templates/web/zurich/auth/general.html:65 msgid "Enter a password" msgstr "Въведете парола" @@ -1021,11 +974,11 @@ msgid "Enter details of the problem" msgstr "Въведете Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð·Ð° проблема" #: templates/web/base/errors/generic.html:1 -#: templates/web/base/errors/generic.html:3 +#: templates/web/base/errors/generic.html:4 #: templates/web/base/tokens/abuse.html:1 #: templates/web/base/tokens/abuse.html:3 #: templates/web/base/tokens/error.html:1 -#: templates/web/base/tokens/error.html:3 +#: templates/web/base/tokens/error.html:5 msgid "Error" msgstr "Грешка" @@ -1038,11 +991,11 @@ msgstr "" msgid "Example postcode %s" msgstr "Примерен пощенÑки Ð°Ð´Ñ€ÐµÑ %s" -#: templates/web/base/open311/index.html:94 +#: templates/web/base/open311/index.html:86 msgid "Examples:" msgstr "Примери:" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:55 +#: templates/web/base/report/new/form_report.html:49 msgid "Explain what’s wrong, exactly where it is, and how long it’s been there…" msgstr "" @@ -1083,17 +1036,15 @@ msgstr "" msgid "FixMyStreet" msgstr "ПоправиСофиÑ" -#: templates/web/base/admin/index.html:61 +#: templates/web/base/admin/index.html:54 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:24 #: templates/web/base/admin/report_blocks.html:9 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:144 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:34 -#: templates/web/fixmystreet/report/banner.html:12 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:32 +#: templates/web/base/report/banner.html:12 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:38 msgid "Fixed" msgstr "Поправено" @@ -1120,7 +1071,7 @@ msgstr "Означен като \"изтрит\"" msgid "Flag user" msgstr "Означаване на потребител" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1281 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1290 #: templates/web/base/admin/users.html:19 msgid "Flagged" msgstr "Означен" @@ -1151,36 +1102,31 @@ msgstr "ПоÑледвайте линка за района, за да Ð²Ð¸Ð´Ð¸Ñ msgid "For more information, see <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>." msgstr "За повече информацич вижте <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>Как ÐŸÐ¾Ð¿Ñ€Ð°Ð²Ð¸Ð¡Ð¾Ñ„Ð¸Ñ Ð¸Ð·Ð¿Ð¾Ð»Ð·Ð²Ð° MapIt</a>." -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:32 -#: templates/web/fixmystreet/report/update-form.html:106 +#: templates/web/base/report/new/form_user_loggedout_password.html:20 +#: templates/web/base/report/update/form_user_loggedout_password.html:19 msgid "Forgotten your password?" msgstr "Забравена парола?" #: perllib/FixMyStreet/Cobrand/Zurich.pm:752 -#, fuzzy msgid "Forwarded to external body" -msgstr "ПрехвърлÑне към външна община:" +msgstr "" #: perllib/FixMyStreet/Cobrand/Zurich.pm:753 -#, fuzzy msgid "Forwarded wish to external body" -msgstr "ПрехвърлÑне към външна община:" +msgstr "" -#: templates/web/base/faq/faq-en-gb.html:1 -#: templates/web/base/faq/faq-en-gb.html:13 -#: templates/web/base/faq/faq-en-gb.html:6 -#: templates/web/base/open311/index.html:6 -#: templates/web/base/static/privacy.html:8 -#: templates/web/fixmystreet/contact/index.html:10 +#: templates/web/base/about/_sidebar.html:4 +#: templates/web/base/about/faq-en-gb.html:1 +#: templates/web/base/about/faq-en-gb.html:5 msgid "Frequently Asked Questions" msgstr "ЧеÑто задавани въпроÑи" -#: templates/web/base/open311/index.html:136 +#: templates/web/base/open311/index.html:128 msgid "GeoRSS on Google Maps" msgstr "" +#: templates/web/base/report/display_tools.html:11 #: templates/web/fixmystreet/around/_updates.html:3 -#: templates/web/fixmystreet/report/display.html:35 msgid "Get updates" msgstr "ИзтеглÑне на актуализациите" @@ -1213,7 +1159,7 @@ msgstr "ТърÑи" msgid "Going to send questionnaire?" msgstr "Ще изпратите ли анкетата?" -#: templates/web/base/admin/index.html:42 +#: templates/web/base/admin/index.html:35 msgid "Graph of problem creation by status over time" msgstr "Графика на Ñъздадените Ñигнали по ÑÑ‚Ð°Ñ‚ÑƒÑ Ð²ÑŠÐ² времето" @@ -1232,7 +1178,7 @@ msgstr "" "подавате за първи път?" #: templates/web/base/footer.html:15 templates/web/fixmystreet/footer.html:38 -#: templates/web/zurich/faq/faq-de-ch.html:1 +#: templates/web/zurich/about/faq-de-ch.html:1 #: templates/web/zurich/footer.html:22 #: templates/web/zurich/nav_over_content.html:8 msgid "Help" @@ -1283,7 +1229,7 @@ msgstr "Как да Ñигнализирате за проблем" msgid "How to send successful reports" msgstr "Как да подавате Ñигнали уÑпешно" -#: perllib/FixMyStreet/App/Controller/Admin.pm:754 +#: perllib/FixMyStreet/App/Controller/Admin.pm:752 msgid "I am afraid you cannot confirm unconfirmed reports." msgstr "Ðе можете да потвърдите непотвърден през имейла Ñигнал" @@ -1301,10 +1247,6 @@ msgstr "" msgid "I'm afraid we couldn't locate your problem in the database.\n" msgstr "ВашиÑÑ‚ Ñигнал не беше намерен.\n" -#: perllib/FixMyStreet/App/Controller/Tokens.pm:327 -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 "" - #: templates/web/base/admin/flagged.html:14 #: templates/web/base/admin/list_updates.html:6 #: templates/web/base/admin/reports.html:11 @@ -1333,24 +1275,16 @@ msgstr "" msgid "If you get some more information about the status of your problem, please come back to the site and leave an update." msgstr "" -#: templates/web/base/report/new/councils_text_none.html:2 -#: templates/web/base/report/new/councils_text_none.html:8 +#: templates/web/base/report/new/councils_text_none.html:10 +#: templates/web/base/report/new/councils_text_none.html:9 msgid "If you submit a problem here the subject and details of the problem will be public, but the problem will <strong>not</strong> be reported to the council." msgstr "Ðко Ñигнализирате за проблем тук, той ще бъде доÑтъпен публично, но Ñигналът <strong>нÑма</strong> да бъде изпратен към общината." -#: templates/web/zurich/auth/token.html:19 -#: templates/web/zurich/email_sent.html:7 -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 "Ðко използвате уеб мейл клиент или имате наÑтроени филтри за нежелана поща, Ð¼Ð¾Ð»Ñ Ð¿Ñ€Ð¾Ð²ÐµÑ€ÐµÑ‚Ðµ папките ÑÑŠÑ Ñпам/нежелана поща. ПонÑкога ÑъобщениÑта ни биват маркирани като Ñпам." - #: templates/web/base/questionnaire/index.html:68 -#, fuzzy msgid "" "If you wish to leave a public update on the problem, please enter it here\n" "(please note it will not be sent to the council)." msgstr "" -"Ðко желаете да коментирате публично проблема, Ð¼Ð¾Ð»Ñ Ð½Ð°Ð¿Ñ€Ð°Ð²ÐµÑ‚Ðµ го тук \n" -"(Ð¼Ð¾Ð»Ñ Ð¸Ð¼Ð°Ð¹Ñ‚Ðµ предвид, че тази Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð½Ñма да бъде изпратена на общината)." #: templates/web/base/admin/body.html:149 msgid "If you're using <strong>a send method that is not email</strong>, enter the service ID (Open311) or equivalent identifier here." @@ -1389,10 +1323,8 @@ msgstr "" #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:144 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:32 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:30 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:36 msgid "In Progress" msgstr "Ð’ Ð¿Ñ€Ð¾Ñ†ÐµÑ Ð½Ð° обработка" @@ -1400,7 +1332,7 @@ msgstr "Ð’ Ð¿Ñ€Ð¾Ñ†ÐµÑ Ð½Ð° обработка" msgid "In abuse table?" msgstr "" -#: templates/web/base/open311/index.html:88 +#: templates/web/base/open311/index.html:80 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 "" @@ -1408,7 +1340,7 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/Zurich.pm:963 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:7 -#: templates/web/fixmystreet/report/banner.html:19 +#: templates/web/base/report/banner.html:19 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:8 msgid "In progress" @@ -1443,7 +1375,7 @@ msgstr "Вътрешен номер" msgid "Invalid agency_responsible value %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1201 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1210 msgid "Invalid end date" msgstr "ÐевÑрна дата" @@ -1451,7 +1383,7 @@ msgstr "ÐевÑрна дата" msgid "Invalid format %s specified." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1206 msgid "Invalid start date" msgstr "ÐевÑрна дата" @@ -1459,14 +1391,12 @@ msgstr "ÐевÑрна дата" #: templates/web/base/admin/report_blocks.html:5 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:143 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:31 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:29 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:35 msgid "Investigating" msgstr "Сигналът Ñе разглежда" -#: templates/web/fixmystreet/contact/blurb.html:8 +#: templates/web/base/contact/blurb.html:8 msgid "It's often quickest to <a href=\"%s\">check our FAQs</a> and see if the answer is there." msgstr "ÐœÐ¾Ð»Ñ Ð¿Ñ€Ð¾Ð²ÐµÑ€ÐµÑ‚Ðµ <a href=\"%s\">Ñтраницата Ñ Ñ‡ÐµÑто задавани въпроÑи</a> и вижте дали нÑма да намерите отговор там." @@ -1484,11 +1414,9 @@ msgstr "" msgid "Jurisdiction unknown" msgstr "" -#: templates/web/base/auth/general.html:44 -#: templates/web/base/report/new/fill_in_details_form.html:132 -#: templates/web/base/report/update-form.html:105 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:28 -#: templates/web/fixmystreet/report/update-form.html:102 +#: templates/web/base/auth/general.html:80 +#: templates/web/base/report/new/form_user_loggedout_password.html:16 +#: templates/web/base/report/update/form_user_loggedout_password.html:15 #: templates/web/zurich/auth/general.html:40 msgid "Keep me signed in on this computer" msgstr "Запомни ме" @@ -1546,6 +1474,7 @@ msgid "MAP" msgstr "Карта" #: templates/web/base/js/translation_strings.html:45 +#: templates/web/base/maps/google-ol.html:13 msgid "Map" msgstr "" @@ -1565,23 +1494,17 @@ msgstr "" msgid "Marked fixed/closed more than eight weeks ago" msgstr "" -#: templates/web/fixmystreet/contact/index.html:106 +#: templates/web/base/contact/index.html:98 msgid "Message" msgstr "Съобщение" #: templates/web/zurich/admin/report_edit.html:284 -#, fuzzy msgid "Message to competent body:" -msgstr "ПрехвърлÑне към външна община:" +msgstr "" #: templates/web/zurich/admin/report_edit.html:282 -#, fuzzy msgid "Message to external body:" -msgstr "ПрехвърлÑне към външна община:" - -#: templates/web/base/contact/index.html:97 -msgid "Message:" -msgstr "Съобщение:" +msgstr "" #: perllib/FixMyStreet/App/Controller/Open311.pm:445 msgid "Missing jurisdiction_id" @@ -1595,10 +1518,6 @@ msgstr "" msgid "Month" msgstr "МеÑец" -#: templates/web/base/report/display.html:34 -msgid "More problems nearby" -msgstr "Още Ñигнали наоколо" - #: templates/web/base/admin/bodies.html:21 #: templates/web/base/admin/body-form.html:18 #: templates/web/base/admin/flagged.html:16 @@ -1606,11 +1525,11 @@ msgstr "Още Ñигнали наоколо" #: templates/web/base/admin/list_updates.html:7 #: templates/web/base/admin/reports.html:13 #: templates/web/base/admin/users.html:15 -#: templates/web/base/auth/general.html:50 +#: templates/web/base/auth/general.html:89 +#: templates/web/base/report/new/form_user_loggedin.html:9 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:7 +#: templates/web/base/report/update/form_name.html:4 #: templates/web/base/reports/index.html:20 -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:9 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:44 -#: templates/web/fixmystreet/report/update-form.html:138 #: templates/web/zurich/admin/body-form.html:4 #: templates/web/zurich/auth/general.html:60 #: templates/web/zurich/report/new/fill_in_details_form.html:82 @@ -1624,7 +1543,7 @@ msgstr "Име" msgid "Name:" msgstr "Име:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:328 +#: perllib/FixMyStreet/Script/Reports.pm:107 msgid "Name: %s" msgstr "Име: %s" @@ -1633,29 +1552,24 @@ msgstr "Име: %s" msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:127 +#: perllib/FixMyStreet/Cobrand/UK.pm:128 msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:434 -#: perllib/FixMyStreet/Cobrand/Default.pm:474 +#: perllib/FixMyStreet/Cobrand/Default.pm:455 +#: perllib/FixMyStreet/Cobrand/Default.pm:495 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:267 +#: perllib/FixMyStreet/Script/Alerts.pm:290 msgid "" "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n" "\n" msgstr "" -#: templates/web/zurich/email_sent.html:5 -msgid "Nearly Done! Now check your email..." -msgstr "ÐœÐ¾Ð»Ñ Ð¿Ñ€Ð¾Ð²ÐµÑ€ÐµÑ‚Ðµ имейл адреÑа" - #: templates/web/base/auth/token.html:17 templates/web/base/email_sent.html:5 -#, fuzzy msgid "Nearly done! Now check your email…" -msgstr "ÐœÐ¾Ð»Ñ Ð¿Ñ€Ð¾Ð²ÐµÑ€ÐµÑ‚Ðµ имейл адреÑа" +msgstr "" #: templates/web/base/reports/index.html:21 msgid "New <br>problems" @@ -1712,9 +1626,8 @@ msgstr "Ðово ÑÑŠÑтоÑние" #: templates/web/zurich/admin/template_edit.html:9 #: templates/web/zurich/admin/templates.html:26 -#, fuzzy msgid "New template" -msgstr "Ðово ÑÑŠÑтоÑние" +msgstr "" #: templates/web/base/pagination.html:13 msgid "Next" @@ -1731,8 +1644,8 @@ msgstr "Слеващ" #: templates/web/base/admin/report_edit.html:75 #: templates/web/base/admin/update_edit.html:25 #: templates/web/base/questionnaire/creator_fixed.html:16 +#: templates/web/base/questionnaire/index.html:101 #: templates/web/base/questionnaire/index.html:53 -#: templates/web/base/questionnaire/index.html:92 msgid "No" msgstr "Ðе" @@ -1796,10 +1709,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:13 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:33 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:31 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:37 msgid "Not Responsible" msgstr "" @@ -1838,7 +1749,7 @@ msgstr "" msgid "Note:" msgstr "Бележка:" -#: templates/web/base/open311/index.html:73 +#: templates/web/base/open311/index.html:65 msgid "Note: <strong>%s</strong>" msgstr "Бележка: <strong>%s</strong>" @@ -1846,13 +1757,15 @@ msgstr "Бележка: <strong>%s</strong>" msgid "Notes from SDM to DM" msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:113 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:10 +#: templates/web/base/report/new/form_user_loggedout.html:14 +#: templates/web/base/report/new/form_user_loggedout.html:2 +#: templates/web/base/report/new/oauth_email_form.html:17 msgid "Now to submit your report…" msgstr "Сега да изпратим Ð’Ð°ÑˆÐ¸Ñ Ñигнал…" -#: templates/web/base/report/update-form.html:86 -#: templates/web/fixmystreet/report/update-form.html:85 +#: templates/web/base/report/update-form.html:28 +#: templates/web/base/report/update/form_user_loggedout.html:13 +#: templates/web/base/report/update/form_user_loggedout.html:2 msgid "Now to submit your update…" msgstr "Изпратете актуализациÑта…" @@ -1860,11 +1773,6 @@ msgstr "Изпратете актуализациÑта…" msgid "OK" msgstr "ОК" -#: templates/web/base/report/display.html:28 -#: templates/web/base/report/update.html:17 -msgid "Offensive? Unsuitable? Tell us" -msgstr "Обиден? ÐеподходÑщ? Кажете ни" - #: templates/web/base/reports/index.html:23 msgid "Old / unknown <br>problems" msgstr "Стари/Ðеидентифицирани <br>Ñигнали" @@ -1881,7 +1789,7 @@ msgstr "Поправени преди<br>извеÑтно време" msgid "Older <br>problems" msgstr "Стари <br>Ñигнали" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:45 +#: templates/web/base/report/new/form_report.html:15 msgid "One-line summary" msgstr "" @@ -1892,8 +1800,7 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:4 #: templates/web/base/admin/update_edit.html:28 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/report/update-form.html:30 -#: templates/web/fixmystreet/report/update-form.html:28 +#: templates/web/base/report/update/form_update.html:34 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:7 #: templates/web/zurich/admin/update_edit.html:18 @@ -1908,15 +1815,15 @@ msgstr "" msgid "Open, but not had any update in eight weeks" msgstr "" -#: templates/web/base/open311/index.html:70 +#: templates/web/base/open311/index.html:62 msgid "Open311 API for the mySociety FixMyStreet server" msgstr "" -#: templates/web/base/open311/index.html:80 +#: templates/web/base/open311/index.html:72 msgid "Open311 initiative web page" msgstr "" -#: templates/web/base/open311/index.html:81 +#: templates/web/base/open311/index.html:73 msgid "Open311 specification" msgstr "" @@ -1928,15 +1835,15 @@ msgstr "" msgid "Or you can subscribe to an alert based upon what ward or council you’re in:" msgstr "Или можете да Ñе абонирате за вÑички извеÑÑ‚Ð¸Ñ Ð½Ð° териториÑта на Ð¡Ð¾Ñ„Ð¸Ñ Ð¸Ð»Ð¸ Ñамо за района, в който Ñе намирате." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1084 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:673 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:674 -#: perllib/FixMyStreet/DB/Result/Problem.pm:570 -#: perllib/FixMyStreet/DB/Result/Problem.pm:580 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1055 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:669 +#: perllib/FixMyStreet/DB/Result/Problem.pm:558 +#: perllib/FixMyStreet/DB/Result/Problem.pm:568 +#: perllib/FixMyStreet/DB/Result/Problem.pm:578 #: perllib/FixMyStreet/DB/Result/Problem.pm:590 -#: perllib/FixMyStreet/DB/Result/Problem.pm:602 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:397 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:412 +#: perllib/FixMyStreet/Script/Reports.pm:175 +#: perllib/FixMyStreet/Script/Reports.pm:190 msgid "Other" msgstr "Други" @@ -1945,7 +1852,7 @@ msgid "Owner" msgstr "СобÑтвеник" #: templates/web/base/errors/page_error_404_not_found.html:1 -#: templates/web/base/errors/page_error_404_not_found.html:3 +#: templates/web/base/errors/page_error_404_not_found.html:4 msgid "Page Not Found" msgstr "Страницата не е намерена" @@ -1959,16 +1866,16 @@ msgstr "Община" msgid "Partial" msgstr "ЧаÑтичен" -#: templates/web/base/auth/general.html:53 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:68 -#: templates/web/fixmystreet/report/update-form.html:116 +#: templates/web/base/auth/general.html:92 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:31 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:6 #: templates/web/zurich/auth/general.html:32 #: templates/web/zurich/auth/general.html:63 msgid "Password (optional)" msgstr "Парола (незадължително)" #: templates/web/base/auth/change_password.html:25 -#: templates/web/base/auth/general.html:36 +#: templates/web/base/auth/general.html:72 msgid "Password:" msgstr "Парола:" @@ -1980,45 +1887,37 @@ msgstr "Връзка" msgid "Phone number" msgstr "Телефонен номер" -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:26 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:62 +#: templates/web/base/report/new/form_user_loggedin.html:26 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:25 msgid "Phone number (optional)" msgstr "Телефонен номер (незадължително)" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:306 +#: perllib/FixMyStreet/Script/Reports.pm:83 #: templates/web/base/admin/report_edit.html:63 -#: templates/web/base/report/new/fill_in_details_form.html:198 #: templates/web/zurich/admin/stats.html:39 msgid "Phone:" msgstr "Телефон:" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:66 -#: templates/web/fixmystreet/report/update-form.html:59 +#: templates/web/base/questionnaire/index.html:75 +#: templates/web/base/report/new/form_report.html:23 +#: templates/web/base/report/update/form_update.html:6 #: templates/web/zurich/admin/index-dm.html:29 #: templates/web/zurich/admin/index-sdm.html:24 #: templates/web/zurich/admin/reports.html:16 #: templates/web/zurich/admin/stats.html:37 -#: templates/web/zurich/report/new/fill_in_details_form.html:52 +#: templates/web/zurich/report/new/fill_in_details_form.html:45 msgid "Photo" msgstr "Снимка" -#: perllib/FixMyStreet/App/Controller/Photo.pm:221 -#, fuzzy +#: perllib/FixMyStreet/App/Controller/Photo.pm:187 msgid "Photo is required." -msgstr "Тази Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ðµ необходима" +msgstr "" #: templates/web/base/admin/category_edit.html:48 -#, fuzzy msgid "Photo required" -msgstr "Тази Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ðµ необходима" - -#: templates/web/base/questionnaire/index.html:80 -#: templates/web/base/report/new/fill_in_details_form.html:84 -#: templates/web/base/report/update-form.html:62 -msgid "Photo:" -msgstr "Снимка:" +msgstr "" -#: templates/web/base/alert/list.html:26 +#: templates/web/base/alert/list.html:23 msgid "Photos of recent nearby reports" msgstr "Снимки на Ñкоро подадени Ñигнали" @@ -2047,20 +1946,16 @@ msgstr "ÐœÐ¾Ð»Ñ Ð±ÑŠÐ´ÐµÑ‚Ðµ учтиви, кратки и Ñе придържРmsgid "Please check the passwords and try again" msgstr "ÐœÐ¾Ð»Ñ Ð¿Ñ€Ð¾Ð²ÐµÑ€ÐµÑ‚Ðµ паролите и пробвайте отново" -#: templates/web/zurich/auth/token.html:16 -msgid "Please check your email" -msgstr "ÐœÐ¾Ð»Ñ Ð¿Ñ€Ð¾Ð²ÐµÑ€ÐµÑ‚Ðµ имейл адреÑа" - -#: templates/web/base/auth/general.html:10 -#: templates/web/base/auth/general.html:16 +#: templates/web/base/auth/general.html:27 +#: templates/web/base/auth/general.html:33 #: templates/web/zurich/auth/general.html:3 #: templates/web/zurich/auth/general.html:9 msgid "Please check your email address is correct" msgstr "ÐœÐ¾Ð»Ñ Ð¿Ñ€Ð¾Ð²ÐµÑ€ÐµÑ‚Ðµ дали Ñте въвели коректен имейл адреÑ" #: perllib/FixMyStreet/App/Controller/Admin.pm:343 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:883 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:948 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:878 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:943 #: perllib/FixMyStreet/DB/Result/Problem.pm:412 #: templates/web/base/js/translation_strings.html:9 msgid "Please choose a category" @@ -2074,29 +1969,29 @@ msgstr "" msgid "Please correct the errors below" msgstr "" -#: templates/web/base/contact/blurb.html:2 -#: templates/web/fixmystreet/contact/blurb.html:12 -#, fuzzy +#: templates/web/base/contact/blurb.html:12 msgid "" "Please do <strong>not</strong> report problems through this form; messages go to\n" "the team behind this site, not a council. To report a problem,\n" "please <a href=\"/\">go to the front page</a> and follow the instructions." msgstr "" -"ÐœÐ¾Ð»Ñ <strong>ÐЕ</strong> подавайте Ñигнали през тази форма. \n" -"Ð¢Ñ Ñлужи за връзка Ñ ÐµÐºÐ¸Ð¿Ð° на ПоправиСофиÑ. Ðко иÑкате да \n" -"подадете Ñигнал Ð¼Ð¾Ð»Ñ <a href=\"/\">върнете Ñе в началото</a> и \n" -"Ñледвайте инÑтрукциите." #: templates/web/base/report/new/notes.html:6 msgid "Please do not be abusive — abusing your council devalues the service for all users." msgstr "ÐœÐ¾Ð»Ñ Ð½Ðµ обиждайте никого - обиждайки Общината, Вие обезценÑвате уÑлугата за вÑички потребители." #: perllib/FixMyStreet/App/Controller/Admin.pm:346 -#: perllib/FixMyStreet/DB/Result/Comment.pm:126 +#: perllib/FixMyStreet/DB/Result/Comment.pm:125 #: templates/web/base/js/translation_strings.html:2 msgid "Please enter a message" msgstr "ÐœÐ¾Ð»Ñ Ð²ÑŠÐ²ÐµÐ´ÐµÑ‚Ðµ Ñъобщение" +#: perllib/FixMyStreet/App/Controller/Admin.pm:1091 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1146 +#, fuzzy +msgid "Please enter a name" +msgstr "ÐœÐ¾Ð»Ñ Ð²ÑŠÐ²ÐµÐ´ÐµÑ‚Ðµ име" + #: templates/web/base/auth/change_password.html:12 #: templates/web/base/auth/change_password.html:15 #: templates/web/base/js/translation_strings.html:19 @@ -2109,10 +2004,10 @@ msgstr "ÐœÐ¾Ð»Ñ Ð²ÑŠÐ²ÐµÐ´ÐµÑ‚Ðµ парола" msgid "Please enter a subject" msgstr "ÐœÐ¾Ð»Ñ Ð²ÑŠÐ²ÐµÐ´ÐµÑ‚Ðµ тема" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1084 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1137 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1087 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1142 #: perllib/FixMyStreet/App/Controller/Admin.pm:345 -#: perllib/FixMyStreet/DB/Result/User.pm:127 +#: perllib/FixMyStreet/DB/Result/User.pm:133 #: templates/web/base/js/translation_strings.html:12 #: templates/web/base/js/translation_strings.html:16 msgid "Please enter a valid email" @@ -2129,9 +2024,9 @@ msgid "Please enter some details" msgstr "ÐœÐ¾Ð»Ñ Ð²ÑŠÐ²ÐµÐ´ÐµÑ‚Ðµ информациÑ" #: perllib/FixMyStreet/App/Controller/Contact.pm:113 -#: perllib/FixMyStreet/DB/Result/User.pm:124 -#: templates/web/base/auth/general.html:10 -#: templates/web/base/auth/general.html:15 +#: perllib/FixMyStreet/DB/Result/User.pm:130 +#: templates/web/base/auth/general.html:27 +#: templates/web/base/auth/general.html:32 #: templates/web/base/js/translation_strings.html:11 #: templates/web/base/js/translation_strings.html:15 #: templates/web/zurich/auth/general.html:3 @@ -2139,7 +2034,7 @@ msgstr "ÐœÐ¾Ð»Ñ Ð²ÑŠÐ²ÐµÐ´ÐµÑ‚Ðµ информациÑ" msgid "Please enter your email" msgstr "ÐœÐ¾Ð»Ñ Ð²ÑŠÐ²ÐµÐ´ÐµÑ‚Ðµ имейл" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:7 +#: templates/web/base/report/new/form_user_loggedout_email.html:7 #: templates/web/zurich/report/new/fill_in_details_form.html:80 msgid "Please enter your email address" msgstr "ÐœÐ¾Ð»Ñ Ð²ÑŠÐ²ÐµÐ´ÐµÑ‚Ðµ имейл адреÑ" @@ -2148,15 +2043,15 @@ msgstr "ÐœÐ¾Ð»Ñ Ð²ÑŠÐ²ÐµÐ´ÐµÑ‚Ðµ имейл адреÑ" msgid "Please enter your first name" msgstr "ÐœÐ¾Ð»Ñ Ð²ÑŠÐ²ÐµÐ´ÐµÑ‚Ðµ име" -#: perllib/FixMyStreet/Cobrand/UK.pm:318 +#: perllib/FixMyStreet/Cobrand/UK.pm:319 #: templates/web/base/js/translation_strings.html:7 msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below" msgstr "ÐœÐ¾Ð»Ñ Ð²ÑŠÐ²ÐµÐ´ÐµÑ‚Ðµ цÑлото Ñи име, общината Ñе нуждае от тази Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ - ако не желаете името Ви да Ñе поÑвÑва на Ñайта, Ð¼Ð¾Ð»Ñ Ð¼Ð°Ñ…Ð½ÐµÑ‚Ðµ отметката по-долу" #: perllib/FixMyStreet/App/Controller/Contact.pm:112 -#: perllib/FixMyStreet/DB/Result/Comment.pm:123 +#: perllib/FixMyStreet/DB/Result/Comment.pm:122 #: perllib/FixMyStreet/DB/Result/Problem.pm:406 -#: perllib/FixMyStreet/DB/Result/User.pm:120 +#: perllib/FixMyStreet/DB/Result/User.pm:126 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter your name" msgstr "ÐœÐ¾Ð»Ñ Ð²ÑŠÐ²ÐµÐ´ÐµÑ‚Ðµ име" @@ -2183,12 +2078,11 @@ msgstr "Можете да <a href=\"%s\">влезете отново</a> или msgid "Please fill in details of the problem below." msgstr "ÐœÐ¾Ð»Ñ Ð¿Ð¾Ð¿ÑŠÐ»Ð½ÐµÑ‚Ðµ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð·Ð° проблема." -#: templates/web/zurich/report/new/fill_in_details_form.html:46 +#: templates/web/zurich/report/new/fill_in_details_form.html:72 msgid "Please fill in details of the problem." msgstr "ÐœÐ¾Ð»Ñ Ð¿Ð¾Ð¿ÑŠÐ»Ð½ÐµÑ‚Ðµ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð·Ð° проблема." -#: templates/web/base/report/new/fill_in_details_form.html:28 -#: templates/web/fixmystreet/report/new/sidebar.html:7 +#: templates/web/base/report/new/sidebar.html:7 #: templates/web/zurich/report/new/fill_in_details_form.html:20 msgid "Please fill in the form below with details of the problem, and describe the location as precisely as possible in the details box." msgstr "ÐœÐ¾Ð»Ñ Ð¿Ð¾Ð¿ÑŠÐ»Ð½ÐµÑ‚Ðµ формата Ñ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð·Ð° проблема и опишете меÑтоположението възможно най-точно." @@ -2197,20 +2091,23 @@ msgstr "ÐœÐ¾Ð»Ñ Ð¿Ð¾Ð¿ÑŠÐ»Ð½ÐµÑ‚Ðµ формата Ñ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð·Ð° msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "ÐœÐ¾Ð»Ñ Ð¾Ñ‚Ð±ÐµÐ»ÐµÐ¶ÐµÑ‚Ðµ дали бихте иÑкали да учаÑтвате в друга анкета" -#: templates/web/fixmystreet/report/updates-sidebar-notes.html:4 +#: templates/web/base/report/updates-sidebar-notes.html:2 msgid "Please note that updates are not sent to the council." msgstr "ÐœÐ¾Ð»Ñ Ð¸Ð¼Ð°Ð¹Ñ‚Ðµ предвид, че актуализациите не Ñе изпращат на Общината." -#: templates/web/base/report/update-form.html:7 -msgid "Please note that updates are not sent to the council. If you leave your name it will be public. Your information will only be used in accordance with our <a href=\"/faq#privacy\">privacy policy</a>" -msgstr "ÐœÐ¾Ð»Ñ Ð¸Ð¼Ð°Ð¹Ñ‚Ðµ предвид, че актуализациите не Ñе изпращат на Общината. Тази Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ðµ публична и ще бъде използвана единÑтвено и Ñамо в ÑъответÑтвие Ñ Ð½Ð°ÑˆÐ°Ñ‚Ð° <a href=\"/privacy\">Политика за поверителноÑÑ‚.</a>" +#: templates/web/base/report/new/oauth_email_form.html:4 +msgid "Please note your report has <strong>not yet been sent</strong>." +msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:8 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:21 +#: templates/web/base/report/new/fill_in_details_form.html:20 #: templates/web/zurich/report/new/fill_in_details_form.html:11 msgid "Please note your report has <strong>not yet been sent</strong>. Choose a category and add further information below, then submit." msgstr "" +#: templates/web/base/report/display.html:26 +msgid "Please note your update has <strong>not yet been posted</strong>." +msgstr "" + #: templates/web/base/report/new/notes.html:1 #: templates/web/zurich/report/new/notes.html:1 msgid "Please note:" @@ -2230,9 +2127,8 @@ msgid "Please say whether you've ever reported a problem to your council before" msgstr "ÐœÐ¾Ð»Ñ Ð¾Ñ‚Ð³Ð¾Ð²Ð¾Ñ€ÐµÑ‚Ðµ дали нÑкога Ñте подавали Ñигнал към общината преди." #: templates/web/zurich/admin/report_edit.html:208 -#, fuzzy msgid "Please select a body." -msgstr "Изберете район" +msgstr "" #: perllib/FixMyStreet/App/Controller/Alert.pm:80 msgid "Please select the feed you want" @@ -2249,6 +2145,7 @@ msgstr "ÐœÐ¾Ð»Ñ Ð¿Ð¾Ñочете дали проблемът е бил разр #: perllib/FixMyStreet/App/Model/PhotoSet.pm:117 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:145 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:147 +#: templates/web/base/js/translation_strings.html:53 msgid "Please upload a JPEG image only" msgstr "ÐœÐ¾Ð»Ñ ÐºÐ°Ñ‡Ð²Ð°Ð¹Ñ‚Ðµ Ñамо JPEG изображениÑ" @@ -2256,18 +2153,14 @@ msgstr "ÐœÐ¾Ð»Ñ ÐºÐ°Ñ‡Ð²Ð°Ð¹Ñ‚Ðµ Ñамо JPEG изображениÑ" msgid "Please write a message" msgstr "ÐœÐ¾Ð»Ñ Ð²ÑŠÐ²ÐµÐ´ÐµÑ‚Ðµ Ñъобщение" -#: templates/web/fixmystreet/report/update-form.html:23 +#: templates/web/base/report/update/form_update.html:29 msgid "Please write your update here" msgstr "ÐœÐ¾Ð»Ñ Ð²ÑŠÐ²ÐµÐ´ÐµÑ‚Ðµ новото Ñъобщение тук" -#: templates/web/base/contact/index.html:100 -#: templates/web/base/report/update-form.html:110 -#: templates/web/base/report/update-form.html:132 -#: templates/web/base/report/update-form.html:72 -#: templates/web/fixmystreet/contact/index.html:113 -#: templates/web/fixmystreet/report/update-form.html:124 -#: templates/web/fixmystreet/report/update-form.html:71 -#: templates/web/fixmystreet/report/update-form.html:97 +#: templates/web/base/contact/index.html:105 +#: templates/web/base/report/update-form.html:24 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:14 +#: templates/web/base/report/update/form_user_loggedout_password.html:10 msgid "Post" msgstr "Публикувай" @@ -2295,12 +2188,9 @@ msgstr "Предишно" msgid "Privacy" msgstr "" -#: templates/web/base/faq/faq-en-gb.html:7 -#: templates/web/base/open311/index.html:7 -#: templates/web/base/static/privacy.html:1 -#: templates/web/base/static/privacy.html:2 -#: templates/web/base/static/privacy.html:9 -#: templates/web/fixmystreet/contact/index.html:11 +#: templates/web/base/about/_sidebar.html:5 +#: templates/web/base/about/privacy.html:1 +#: templates/web/base/about/privacy.html:2 msgid "Privacy and cookies" msgstr "" @@ -2328,12 +2218,12 @@ msgstr "Сигналът %s е потвърден" msgid "Problem %s sent to council %s" msgstr "Сигналът %s е подаден към общината %s " -#: templates/web/base/admin/index.html:46 +#: templates/web/base/admin/index.html:39 #: templates/web/zurich/admin/index.html:9 msgid "Problem breakdown by state" msgstr "РазделÑне на Ñигналите по ÑтатуÑи" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1055 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1058 msgid "Problem marked as open." msgstr "Сигналът е маркиран като отворен." @@ -2349,11 +2239,11 @@ msgstr "Сигнали" msgid "Problems in this area" msgstr "Други Ñигнали на тази териториÑ" -#: templates/web/fixmystreet/report/display.html:43 +#: templates/web/base/report/display_tools.html:19 msgid "Problems nearby" msgstr "Други Ñигнали наоколо" -#: templates/web/fixmystreet/report/display.html:41 +#: templates/web/base/report/display_tools.html:17 msgid "Problems on the map" msgstr "Сигнали отбелÑзани върху картата" @@ -2365,24 +2255,23 @@ msgstr "Проблеми Ñигнализирани Ñкоро в Ñайта" msgid "Problems within %.1fkm of this location" msgstr "Сигнали в Ñ€Ð°Ð´Ð¸ÑƒÑ Ð¾Ñ‚ %.1fкм от това меÑтоположение" -#: perllib/FixMyStreet/Cobrand/Default.pm:642 +#: perllib/FixMyStreet/Cobrand/Default.pm:663 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:120 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:139 -#: perllib/FixMyStreet/Cobrand/UK.pm:207 +#: perllib/FixMyStreet/Cobrand/UK.pm:208 msgid "Problems within %s" msgstr "Сигнали в %s" #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:128 -#: perllib/FixMyStreet/Cobrand/UK.pm:221 +#: perllib/FixMyStreet/Cobrand/UK.pm:222 msgid "Problems within %s ward" msgstr "Сигнали в квартал %s" #. ("First %s is the body name, second %s the site name") #: templates/web/base/reports/body.html:0 #: templates/web/base/reports/body.html:24 -#, fuzzy msgid "Problems within %s, %s" -msgstr "Сигнали в %s" +msgstr "" #: templates/web/base/alert/_list.html:42 msgid "Problems within the boundary of:" @@ -2396,19 +2285,16 @@ msgstr "ÐÐ´Ñ€ÐµÑ Ð½Ð° имота:" msgid "Property type:" msgstr "Тип на имота:" -#: templates/web/base/report/update-form.html:3 -#: templates/web/fixmystreet/report/update-form.html:4 +#: templates/web/base/report/update-form.html:6 msgid "Provide an update" msgstr "Въведете Ð¸Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð·Ð° актуализиране" -#: templates/web/base/auth/general.html:56 +#: templates/web/base/auth/general.html:95 msgid "Providing a name and password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." msgstr "Използването на потребителÑко име е опционално, но това ще ви позволи по-леÑно да подавате Ñигнали и да публикувате Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¸ актуализации." -#: templates/web/base/report/new/fill_in_details_form.html:156 -#: templates/web/base/report/update-form.html:129 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:71 -#: templates/web/fixmystreet/report/update-form.html:119 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:34 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:9 msgid "Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." msgstr "Използването на парола е по избор, но това ще ви позволи по-леÑно да подавате Ñигнали и да публикувате и променÑте актуализации." @@ -2444,18 +2330,17 @@ msgstr "Ðнкетата е попълнена от потребителÑ, по #: templates/web/base/alert/_list.html:22 #: templates/web/base/around/display_location.html:1 #: templates/web/base/around/display_location.html:3 -#: templates/web/base/report/display.html:50 +#: templates/web/base/report/display_tools.html:34 #: templates/web/base/reports/_rss.html:1 #: templates/web/fixmystreet/alert/updates.html:9 -#: templates/web/fixmystreet/report/display.html:58 msgid "RSS feed" msgstr "RSS абонамент" -#: perllib/FixMyStreet/Cobrand/UK.pm:250 perllib/FixMyStreet/Cobrand/UK.pm:262 +#: perllib/FixMyStreet/Cobrand/UK.pm:251 perllib/FixMyStreet/Cobrand/UK.pm:263 msgid "RSS feed for %s" msgstr "RSS абонамент за %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:256 perllib/FixMyStreet/Cobrand/UK.pm:268 +#: perllib/FixMyStreet/Cobrand/UK.pm:257 perllib/FixMyStreet/Cobrand/UK.pm:269 msgid "RSS feed for %s ward, %s" msgstr "RSS абонамент за квартал %s, %s" @@ -2463,11 +2348,11 @@ msgstr "RSS абонамент за квартал %s, %s" #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:163 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:173 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:181 -#: perllib/FixMyStreet/Cobrand/UK.pm:276 perllib/FixMyStreet/Cobrand/UK.pm:288 +#: perllib/FixMyStreet/Cobrand/UK.pm:277 perllib/FixMyStreet/Cobrand/UK.pm:289 msgid "RSS feed of %s" msgstr "RSS абонамент за %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:281 perllib/FixMyStreet/Cobrand/UK.pm:293 +#: perllib/FixMyStreet/Cobrand/UK.pm:282 perllib/FixMyStreet/Cobrand/UK.pm:294 msgid "RSS feed of %s, within %s ward" msgstr "RSS абонамент за %s, в квартал %s" @@ -2479,15 +2364,15 @@ msgstr "RSS абонамент за поÑледни проблеми наоко msgid "RSS feed of problems in this %s" msgstr "RSS абонамент за проблеми в този %s" -#: perllib/FixMyStreet/Cobrand/Default.pm:643 +#: perllib/FixMyStreet/Cobrand/Default.pm:664 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:121 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:138 -#: perllib/FixMyStreet/Cobrand/UK.pm:214 +#: perllib/FixMyStreet/Cobrand/UK.pm:215 msgid "RSS feed of problems within %s" msgstr "RSS абонамент за проблеми в %s" #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:127 -#: perllib/FixMyStreet/Cobrand/UK.pm:220 +#: perllib/FixMyStreet/Cobrand/UK.pm:221 msgid "RSS feed of problems within %s ward" msgstr "RSS абонамент за проблеми в квартал %s" @@ -2496,25 +2381,22 @@ msgstr "RSS абонамент за проблеми в квартал %s" msgid "RSS feed of recent local problems" msgstr "RSS абонамент за поÑледни проблеми наоколо" -#: templates/web/base/report/display.html:50 +#: templates/web/base/report/display_tools.html:34 #: templates/web/fixmystreet/alert/updates.html:9 -#: templates/web/fixmystreet/report/display.html:58 msgid "RSS feed of updates to this problem" msgstr "RSS абонамент за актуализации по този проблем" #: templates/web/base/alert/updates.html:9 -#: templates/web/base/report/display.html:41 +#: templates/web/base/report/display_tools.html:36 #: templates/web/fixmystreet/alert/updates.html:14 -#: templates/web/fixmystreet/report/display.html:60 msgid "Receive email when updates are left on this problem." msgstr "Получаване на имейл при Ð°ÐºÑ‚ÑƒÐ°Ð»Ð¸Ð·Ð°Ñ†Ð¸Ñ Ð½Ð° проблема." #. ("%s is the site name") #: templates/web/base/around/display_location.html:0 #: templates/web/base/around/display_location.html:33 -#, fuzzy msgid "Recent local problems, %s" -msgstr "ПоÑледни проблеми наоколо" +msgstr "" #: templates/web/base/reports/index.html:24 msgid "Recently <br>fixed" @@ -2532,16 +2414,15 @@ msgstr "Помнете, че \"ПоправиСофиÑ\" Ñлужи за под msgid "Remove flag" msgstr "Премахване на означението" -#: templates/web/base/admin/report_edit.html:92 -#: templates/web/base/admin/update_edit.html:62 +#: templates/web/base/admin/report_edit.html:93 +#: templates/web/base/admin/update_edit.html:67 #: templates/web/zurich/admin/update_edit.html:35 msgid "Remove photo (can't be undone!)" msgstr "Премахване на Ñнимката (необратимо дейÑтвие)" #: templates/web/zurich/admin/report_edit.html:243 -#, fuzzy msgid "Reply to user:" -msgstr "Ñ€ÐµÐ´Ð°ÐºÑ†Ð¸Ñ Ð½Ð° потребителÑ" +msgstr "" #: templates/web/fixmystreet/header_logo.html:2 msgid "Report" @@ -2554,7 +2435,7 @@ msgstr "" msgid "Report a problem" msgstr "Подайте Ñигнал" -#: templates/web/fixmystreet/report/display.html:32 +#: templates/web/base/report/display_tools.html:8 msgid "Report abuse" msgstr "Сигнализирай за неподходÑщо Ñъдържание" @@ -2563,7 +2444,8 @@ msgid "Report on %s" msgstr "Сигнал за %s " #: templates/web/base/report/new/fill_in_details_form.html:1 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:2 +#: templates/web/base/report/new/login_success_form.html:1 +#: templates/web/base/report/new/oauth_email_form.html:1 msgid "Report your problem" msgstr "" @@ -2572,9 +2454,8 @@ msgstr "" msgid "Report, view, or discuss local problems" msgstr "Сигнализирай, разгледай или коментирай проблеми" -#: perllib/FixMyStreet/DB/Result/Problem.pm:585 -#: templates/web/base/contact/index.html:50 -#: templates/web/fixmystreet/contact/index.html:65 +#: perllib/FixMyStreet/DB/Result/Problem.pm:573 +#: templates/web/base/contact/index.html:57 msgid "Reported anonymously at %s" msgstr "" @@ -2583,43 +2464,41 @@ msgstr "" msgid "Reported before" msgstr "Подавал Ñъм и преди" -#: perllib/FixMyStreet/DB/Result/Problem.pm:608 -#: templates/web/base/contact/index.html:52 -#: templates/web/fixmystreet/contact/index.html:67 +#: perllib/FixMyStreet/DB/Result/Problem.pm:596 +#: templates/web/base/contact/index.html:59 msgid "Reported by %s at %s" msgstr "" #: templates/web/zurich/admin/report_edit-sdm.html:58 #: templates/web/zurich/admin/report_edit.html:86 -#, fuzzy msgid "Reported by:" -msgstr "Подавал Ñъм и преди" +msgstr "" #: templates/web/zurich/report/_main.html:2 msgid "Reported in the %s category" msgstr "Сигналът е подаден в ÐºÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ð¸Ñ %s " -#: perllib/FixMyStreet/DB/Result/Problem.pm:581 +#: perllib/FixMyStreet/DB/Result/Problem.pm:569 msgid "Reported in the %s category anonymously at %s" msgstr "Сигналът е подаден анонимно в ÐºÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ð¸Ñ %s в %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:603 +#: perllib/FixMyStreet/DB/Result/Problem.pm:591 msgid "Reported in the %s category by %s at %s" msgstr "Сигналът е подаден в ÐºÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ð¸Ñ %s от %s в %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:577 +#: perllib/FixMyStreet/DB/Result/Problem.pm:565 msgid "Reported via %s anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:599 +#: perllib/FixMyStreet/DB/Result/Problem.pm:587 msgid "Reported via %s by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:573 +#: perllib/FixMyStreet/DB/Result/Problem.pm:561 msgid "Reported via %s in the %s category anonymously at %s" msgstr "Сигналът е подаден анонимно чрез %s в ÐºÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ð¸Ñ %s в %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:593 +#: perllib/FixMyStreet/DB/Result/Problem.pm:581 msgid "Reported via %s in the %s category by %s at %s" msgstr "Сигналът е подаден чрез %s в ÐºÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ð¸Ñ %s от %s в %s" @@ -2629,9 +2508,8 @@ msgstr "" #: templates/web/zurich/admin/report_edit-sdm.html:36 #: templates/web/zurich/admin/report_edit.html:55 -#, fuzzy msgid "Reported:" -msgstr "Сигнали" +msgstr "" #: templates/web/base/around/index.html:2 #: templates/web/base/js/translation_strings.html:41 @@ -2641,13 +2519,13 @@ msgstr "Сигнали" msgid "Reporting a problem" msgstr "Сигнализиране за проблем" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1277 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1286 #: perllib/FixMyStreet/Cobrand/Zurich.pm:384 #: templates/web/zurich/header.html:60 msgid "Reports" msgstr "Сигнали" -#: perllib/FixMyStreet/Cobrand/UK.pm:327 perllib/FixMyStreet/Cobrand/UK.pm:331 +#: perllib/FixMyStreet/Cobrand/UK.pm:328 perllib/FixMyStreet/Cobrand/UK.pm:332 msgid "Reports are limited to %s characters in length. Please shorten your report" msgstr "" @@ -2684,15 +2562,17 @@ msgstr "" msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1495 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1500 -#: templates/web/base/admin/report_edit.html:88 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1508 +#: templates/web/base/admin/report_edit.html:90 +#: templates/web/base/admin/update_edit.html:64 #: templates/web/zurich/admin/report_edit.html:116 msgid "Rotate Left" msgstr "Завъртане налÑво" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1495 -#: templates/web/base/admin/report_edit.html:89 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 +#: templates/web/base/admin/report_edit.html:91 +#: templates/web/base/admin/update_edit.html:65 #: templates/web/zurich/admin/report_edit.html:117 msgid "Rotate Right" msgstr "Завъртане надÑÑно" @@ -2702,7 +2582,6 @@ msgid "Rotating this photo will discard unsaved changes to the report." msgstr "" #: templates/web/base/js/translation_strings.html:46 -#: templates/web/base/maps/google-ol.html:13 msgid "Satellite" msgstr "" @@ -2755,16 +2634,14 @@ msgid "Select an area" msgstr "Изберете териториÑ" #: templates/web/base/alert/_list.html:10 -#, fuzzy msgid "Select which type of alert you’d like and click the button for an RSS feed, or enter your email address to subscribe to an email alert." -msgstr "Изберете кой тип извеÑÑ‚Ð¸Ñ Ð±Ð¸Ñ…Ñ‚Ðµ иÑкали да получавате и щракнете бутона за RSS емиÑии или въведете имейл адреÑ, за да Ñе абонирате за имейл извеÑтиÑ." +msgstr "" #: perllib/FixMyStreet/Cobrand/Zurich.pm:835 -#, fuzzy msgid "Sent report back" -msgstr "Отворени Ñигнали" +msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:708 +#: perllib/FixMyStreet/DB/Result/Problem.pm:696 msgid "Sent to %s %s later" msgstr "Сигналът е подаден към %s преди %s" @@ -2777,15 +2654,13 @@ msgstr "Изпратени:" msgid "Service:" msgstr "УÑлуга:" -#: templates/web/fixmystreet/report/display.html:38 +#: templates/web/base/report/display_tools.html:14 msgid "Share" msgstr "Сподели" -#: templates/web/base/report/new/fill_in_details_form.html:193 -#: templates/web/base/report/update-form.html:158 -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:23 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:59 -#: templates/web/fixmystreet/report/update-form.html:146 +#: templates/web/base/report/new/form_user_loggedin.html:23 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:22 +#: templates/web/base/report/update/form_name.html:15 msgid "Show my name publicly" msgstr "Показвай името ми публично" @@ -2797,9 +2672,9 @@ msgstr "Показване на Ñтарите" msgid "Show pins" msgstr "Покажи кабърчетата" +#: templates/web/base/auth/general.html:100 #: templates/web/base/auth/general.html:3 -#: templates/web/base/auth/general.html:40 -#: templates/web/base/auth/general.html:61 +#: templates/web/base/auth/general.html:76 #: templates/web/zurich/auth/general.html:18 #: templates/web/zurich/auth/general.html:35 msgid "Sign in" @@ -2826,7 +2701,7 @@ msgid "" " sent from your FixMyStreet installation." msgstr "" -#: templates/web/base/alert/index.html:42 +#: templates/web/base/alert/index.html:40 msgid "Some photos of recent reports" msgstr "ÐÑкои Ñнимки от Ñигнали подадени наÑкоро" @@ -2836,7 +2711,7 @@ msgstr "ÐÑкои Ñнимки от Ñигнали подадени наÑÐºÐ¾Ñ msgid "Some text to localize" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:78 +#: perllib/FixMyStreet/Cobrand/UK.pm:79 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover." msgstr "" @@ -2848,14 +2723,20 @@ msgstr "" msgid "Sorry, there has been an error confirming your problem." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:221 -#: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:37 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:216 +#: perllib/FixMyStreet/Geocode.pm:38 perllib/FixMyStreet/Geocode/Bing.pm:38 #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:56 #: perllib/FixMyStreet/Geocode/OSM.pm:48 msgid "Sorry, we could not find that location." msgstr "" -#: perllib/FixMyStreet/Geocode/Bing.pm:34 +#: templates/web/base/auth/general.html:9 +#: templates/web/base/report/display.html:21 +#: templates/web/base/report/new/fill_in_details_form.html:23 +msgid "Sorry, we could not log you in. Please fill in the form below." +msgstr "" + +#: perllib/FixMyStreet/Geocode/Bing.pm:35 #: perllib/FixMyStreet/Geocode/Google.pm:45 #: perllib/FixMyStreet/Geocode/Zurich.pm:88 msgid "Sorry, we could not parse that location. Please try again." @@ -2865,6 +2746,11 @@ msgstr "" msgid "Sorry, we couldn't save your image(s), please try again." msgstr "" +#: perllib/FixMyStreet/App/Controller/AuthSS.pm:301 +#, fuzzy +msgid "Sorry, you can not log in with Facebook. Please try again later." +msgstr "Възникна проблем при визуализирането на Ñтраницата. ÐœÐ¾Ð»Ñ Ð¿Ñ€Ð¾Ð±Ð²Ð°Ð¹Ñ‚Ðµ по-къÑно." + #: templates/web/base/admin/stats.html:64 msgid "Start Date:" msgstr "Ðачална дата:" @@ -2873,13 +2759,12 @@ msgstr "Ðачална дата:" #: templates/web/base/admin/flagged.html:18 #: templates/web/base/admin/list_updates.html:11 #: templates/web/base/admin/reports.html:15 -#: templates/web/fixmystreet/report/update-form.html:26 +#: templates/web/base/report/update/form_update.html:32 msgid "State" msgstr "" #: templates/web/base/admin/report_edit.html:47 #: templates/web/base/admin/update_edit.html:27 -#: templates/web/base/report/update-form.html:28 #: templates/web/zurich/admin/report_edit-sdm.html:73 #: templates/web/zurich/admin/report_edit.html:101 #: templates/web/zurich/admin/report_edit.html:155 @@ -2887,7 +2772,7 @@ msgstr "" msgid "State:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1282 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1291 #: perllib/FixMyStreet/Cobrand/Zurich.pm:387 #: templates/web/base/admin/stats.html:1 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:73 @@ -2909,7 +2794,7 @@ msgstr "Ð’Ñе още отворен, от анкета, %s " msgid "Street View" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:406 +#: perllib/FixMyStreet/Script/Reports.pm:184 msgid "Subcategory: %s" msgstr "" @@ -2917,30 +2802,25 @@ msgstr "" msgid "Subdivision/Body" msgstr "" -#: templates/web/fixmystreet/contact/index.html:98 +#: templates/web/base/contact/index.html:90 msgid "Subject" msgstr "Тема" #: templates/web/base/admin/report_edit.html:19 -#: templates/web/base/contact/index.html:88 -#: templates/web/base/report/new/fill_in_details_form.html:53 #: templates/web/zurich/admin/report_edit.html:39 msgid "Subject:" msgstr "Тема:" #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/fill_in_details_form.html:137 -#: templates/web/base/report/new/fill_in_details_form.html:159 -#: templates/web/base/report/new/fill_in_details_form.html:96 -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:36 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:23 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:76 +#: templates/web/base/report/new/form_user_loggedin.html:36 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:39 +#: templates/web/base/report/new/form_user_loggedout_password.html:11 #: templates/web/zurich/report/new/fill_in_details_form.html:96 msgid "Submit" msgstr "Изпращане" -#: templates/web/base/admin/report_edit.html:95 -#: templates/web/base/admin/update_edit.html:65 +#: templates/web/base/admin/report_edit.html:101 +#: templates/web/base/admin/update_edit.html:75 #: templates/web/base/admin/user-form.html:56 #: templates/web/zurich/admin/report_edit-sdm.html:137 #: templates/web/zurich/admin/report_edit.html:268 @@ -2948,7 +2828,7 @@ msgstr "Изпращане" msgid "Submit changes" msgstr "Изпращане на промените" -#: templates/web/base/questionnaire/index.html:97 +#: templates/web/base/questionnaire/index.html:106 msgid "Submit questionnaire" msgstr "Изпращане на анкетата" @@ -2964,9 +2844,8 @@ msgid "Submitted" msgstr "Сигналът е потвърден" #: templates/web/base/alert/updates.html:17 -#: templates/web/base/report/display.html:46 +#: templates/web/base/report/display_tools.html:41 #: templates/web/fixmystreet/alert/updates.html:23 -#: templates/web/fixmystreet/report/display.html:65 msgid "Subscribe" msgstr "Ðбониране" @@ -2974,7 +2853,7 @@ msgstr "Ðбониране" msgid "Subscribe me to an email alert" msgstr "Ðбониране за извеÑÑ‚Ñване по имейл" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1275 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1284 #: perllib/FixMyStreet/Cobrand/Zurich.pm:383 #: templates/web/base/admin/bodies.html:25 #: templates/web/base/admin/index.html:1 @@ -2993,7 +2872,7 @@ msgstr "Обобщение" msgid "Summary reports" msgstr "Обобщена Ñправка" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1279 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1288 msgid "Survey" msgstr "Проучване" @@ -3007,9 +2886,8 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/Zurich.pm:394 #: templates/web/zurich/header.html:77 -#, fuzzy msgid "Templates" -msgstr "Ðктуализации" +msgstr "" #: templates/web/base/admin/list_updates.html:12 #: templates/web/zurich/admin/templates.html:9 @@ -3030,7 +2908,7 @@ msgstr "ТекÑÑ‚:" msgid "Thank you for reporting this issue!" msgstr "" -#: templates/web/base/tokens/error.html:7 +#: templates/web/base/tokens/error.html:6 msgid "Thank you for trying to confirm your update or problem. We seem to have an error ourselves though, so <a href=\"%s\">please let us know what went on</a> and we'll look into it." msgstr "" @@ -3065,23 +2943,23 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:47 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:63 -#: perllib/FixMyStreet/Cobrand/UK.pm:71 +#: perllib/FixMyStreet/Cobrand/UK.pm:72 msgid "That postcode was not recognised, sorry." msgstr "ÐœÐ¾Ð»Ñ Ð´Ð° ни извините, този пощенÑки код не беше разпознат." -#: perllib/FixMyStreet/App/Controller/Admin.pm:726 +#: perllib/FixMyStreet/App/Controller/Admin.pm:724 msgid "That problem has been marked as sent." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:718 +#: perllib/FixMyStreet/App/Controller/Admin.pm:716 msgid "That problem will now be resent." msgstr "Сигналът ще бъде препратен." -#: perllib/FixMyStreet/App/Controller/Report.pm:125 +#: perllib/FixMyStreet/App/Controller/Report.pm:127 msgid "That report cannot be viewed on %s." msgstr "Сигналът не може да бъде разгледан %s." -#: perllib/FixMyStreet/App/Controller/Report.pm:119 +#: perllib/FixMyStreet/App/Controller/Report.pm:121 msgid "That report has been removed from FixMyStreet." msgstr "Този Ñигнал е бил изтрит от ПоправиСофиÑ." @@ -3112,7 +2990,7 @@ msgid "" " If you leave this blank, <strong>send method defaults to email</strong>." msgstr "" -#: templates/web/base/open311/index.html:90 +#: templates/web/base/open311/index.html:82 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 "" @@ -3133,12 +3011,12 @@ msgstr "Бихте могли да помогнете на Общината да msgid "The diligency prize league table shows editors' activity (who's been editing the most records)." msgstr "" -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:60 -#: perllib/FixMyStreet/App/Controller/Reports.pm:79 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:61 +#: perllib/FixMyStreet/App/Controller/Reports.pm:80 msgid "The error was: %s" msgstr "Грешката беше: %s" -#: templates/web/base/open311/index.html:86 +#: templates/web/base/open311/index.html:78 msgid "The following Open311 v2 attributes are returned for each request: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code and service_name." msgstr "" @@ -3185,8 +3063,7 @@ msgstr "" msgid "The passwords do not match" msgstr "Паролите не Ñъвпадат" -#: templates/web/base/errors/page_error_404_not_found.html:10 -#: templates/web/base/errors/page_error_404_not_found.html:12 +#: templates/web/base/errors/page_error_404_not_found.html:9 msgid "The requested URL '%s' was not found on this server" msgstr "ТърÑениÑÑ‚ Ð°Ð´Ñ€ÐµÑ '%s' не беше намерен на този Ñървър" @@ -3196,12 +3073,11 @@ msgstr "Можете да получавате извеÑÑ‚Ð¸Ñ Ð½Ð° базатР#: templates/web/base/report/new/councils_extra_text.html:1 #: templates/web/base/report/new/councils_text_some.html:10 -#: templates/web/base/report/new/fill_in_details_form.html:18 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:14 +#: templates/web/base/report/new/fill_in_details_form.html:13 msgid "The summary and description will also be made public (see our <a href=\"/privacy\">privacy policy</a>)." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:315 +#: perllib/FixMyStreet/Script/Reports.pm:92 msgid "The user could not locate the problem on a map, but to see the area around the location they entered" msgstr "" @@ -3220,18 +3096,18 @@ msgstr "" msgid "There are no reports to show." msgstr "" -#: perllib/FixMyStreet/App/Controller/Reports.pm:76 +#: perllib/FixMyStreet/App/Controller/Reports.pm:77 msgid "There was a problem showing the All Reports page. Please try again later." msgstr "Възникна проблем при визуализирането на Ñтраницата Ñ Ð²Ñички Ñигнали. ÐœÐ¾Ð»Ñ Ð¾Ð¿Ð¸Ñ‚Ð°Ð¹Ñ‚Ðµ по-къÑно." #: perllib/FixMyStreet/App/Controller/Contact.pm:137 -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:59 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:60 msgid "There was a problem showing this page. Please try again later." msgstr "Възникна проблем при визуализирането на Ñтраницата. ÐœÐ¾Ð»Ñ Ð¿Ñ€Ð¾Ð±Ð²Ð°Ð¹Ñ‚Ðµ по-къÑно." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:769 -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:134 -#: templates/web/base/auth/general.html:26 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:764 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:138 +#: templates/web/base/auth/general.html:43 #: templates/web/zurich/auth/general.html:28 msgid "There was a problem with your email/password combination. If you cannot remember your password, or do not have one, please fill in the ‘sign in by email’ section of the form." msgstr "Възникна проблем Ñ ÐºÐ¾Ð¼Ð±Ð¸Ð½Ð°Ñ†Ð¸Ñта имейл/парола. Ðко не можете да Ñи Ñпомните паролата или нÑмате такава, Ð¼Ð¾Ð»Ñ Ð¿Ð¾Ð¿ÑŠÐ»Ð½ÐµÑ‚Ðµ ÑекциÑта ‘влизане чрез имейл’." @@ -3240,7 +3116,7 @@ msgstr "Възникна проблем Ñ ÐºÐ¾Ð¼Ð±Ð¸Ð½Ð°Ñ†Ð¸Ñта имейл/Ð msgid "There was a problem with your email/password combination. Please try again." msgstr "Възникна проблем Ñ ÐºÐ¾Ð¼Ð±Ð¸Ð½Ð°Ñ†Ð¸Ñта имейл/парола. ÐœÐ¾Ð»Ñ Ð¾Ð¿Ð¸Ñ‚Ð°Ð¹Ñ‚Ðµ отново." -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:272 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:336 msgid "There was a problem with your update. Please try again." msgstr "Възникна проблем Ñ Ð²Ð°ÑˆÐ°Ñ‚Ð° актуализациÑ. ÐœÐ¾Ð»Ñ Ð¾Ð¿Ð¸Ñ‚Ð°Ð¹Ñ‚Ðµ отново." @@ -3248,7 +3124,7 @@ msgstr "Възникна проблем Ñ Ð²Ð°ÑˆÐ°Ñ‚Ð° Ð°ÐºÑ‚ÑƒÐ°Ð»Ð¸Ð·Ð°Ñ†Ð¸Ñ msgid "There were problems with your report. Please see below." msgstr "Възникна проблем Ñ Ð²Ð°ÑˆÐ°Ñ Ñигнал. ÐœÐ¾Ð»Ñ Ð¾Ð¿Ð¸Ñ‚Ð°Ð¹Ñ‚Ðµ отново." -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:300 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:371 msgid "There were problems with your update. Please see below." msgstr "Възникнаха проблеми Ñ Ð²Ð°ÑˆÐ°Ñ‚Ð° актуализациÑ. ÐœÐ¾Ð»Ñ Ð²Ð¸Ð¶Ñ‚Ðµ по-долу." @@ -3262,7 +3138,7 @@ msgid "" " " msgstr "" -#: templates/web/base/open311/index.html:77 +#: templates/web/base/open311/index.html:69 msgid "This API implementation is work in progress and not yet stabilized. It will change without warnings in the future." msgstr "" @@ -3284,18 +3160,18 @@ msgid "" " A body will not receive any reports unless it covers at least one area." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:413 +#: perllib/FixMyStreet/Script/Reports.pm:191 msgid "This email has been sent to both councils covering the location of the problem, as the user did not categorise it; please ignore it if you're not the correct council to deal with the issue, or let us know what category of problem this is so we can add it to our system." msgstr "Този имейл е изпратен към двете общини покриващи адреÑа на Ñигнала, тъй като Ð¿Ð¾Ñ‚Ñ€ÐµÐ±Ð¸Ñ‚ÐµÐ»Ñ Ð½Ðµ е го е категоризирал. ÐœÐ¾Ð»Ñ Ð½Ðµ го взимайте под внимание ако не Ñте правилната община, коÑто е отговорна за този Ñигнал или ни Ñъобщете под каква ÐºÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ð¸Ñ Ð¿Ð¾Ð¿Ð°Ð´Ð° този Ñигнал, така че да може да Ñ Ð´Ð¾Ð±Ð°Ð²Ð¸Ð¼ в ÑиÑтемата." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:416 +#: perllib/FixMyStreet/Script/Reports.pm:194 msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue." msgstr "Този имейл е изпратен до нÑколко общини покриващи адреÑа на Ñигнала, тъй като категориÑта на Ñигнала Ñъвпада Ñ Ð²Ñички Ñ‚ÑÑ…. ÐœÐ¾Ð»Ñ Ð½Ðµ го взимайте под внимание ако не Ñте правилната община задължена за този тип проблеми." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:925 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:995 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:920 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:990 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:142 -#: perllib/FixMyStreet/Cobrand/UK.pm:43 +#: perllib/FixMyStreet/Cobrand/UK.pm:44 msgid "This information is required" msgstr "Тази Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ðµ необходима" @@ -3307,56 +3183,37 @@ msgstr "" msgid "This is a summary of all reports on this site." msgstr "Това е обобщение на вÑички Ñигнали в Ñайта." -#: templates/web/zurich/auth/token.html:8 -msgid "This may be because the link is too old or already used, or the address was not copied correctly." -msgstr "Това може да е резултат от на оÑтарÑл или използва адреÑ, както и от грешно копиране на адреÑа." - -#: templates/web/base/report/banner.html:15 -msgid "This problem has been closed" -msgstr "Този проблем е затворен." - -#: templates/web/base/report/banner.html:12 -#: templates/web/base/report/update-form.html:48 -#: templates/web/fixmystreet/report/update-form.html:46 +#: templates/web/base/report/update/form_update.html:52 msgid "This problem has been fixed" msgstr "Този проблем е решен." -#: templates/web/base/report/update-form.html:43 -#: templates/web/fixmystreet/report/update-form.html:40 +#: templates/web/base/report/update/form_update.html:46 msgid "This problem has not been fixed" msgstr "Този проблем не е решен." -#: templates/web/base/report/banner.html:19 -msgid "This problem is in progress" -msgstr "Този проблем е в Ð¿Ñ€Ð¾Ñ†ÐµÑ Ð½Ð° обработка." - -#: templates/web/base/report/banner.html:9 -msgid "This problem is old and of unknown status." -msgstr "Този Ñигнал е Ñ Ð½ÐµÐ¸Ð·Ð²ÐµÑтен ÑтатуÑ." - #: perllib/FixMyStreet/Cobrand/Zurich.pm:168 #: perllib/FixMyStreet/Cobrand/Zurich.pm:169 #: templates/web/zurich/report/_main.html:14 msgid "This report is awaiting moderation." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:86 +#: perllib/FixMyStreet/Script/Alerts.pm:94 msgid "This report is currently marked as closed." msgstr "Този Ñигнал е означен ÑÑŠÑ ÑÑ‚Ð°Ñ‚ÑƒÑ Ð·Ð°Ñ‚Ð²Ð¾Ñ€ÐµÐ½." -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:84 +#: perllib/FixMyStreet/Script/Alerts.pm:92 msgid "This report is currently marked as fixed." msgstr "Този Ñигнал е означен ÑÑŠÑ ÑÑ‚Ð°Ñ‚ÑƒÑ Ð¿Ð¾Ð¿Ñ€Ð°Ð²ÐµÐ½." -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:88 +#: perllib/FixMyStreet/Script/Alerts.pm:96 msgid "This report is currently marked as open." msgstr "Този Ñигнал е означен ÑÑŠÑ ÑÑ‚Ð°Ñ‚ÑƒÑ Ð¾Ñ‚Ð²Ð¾Ñ€ÐµÐ½." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:326 +#: perllib/FixMyStreet/Script/Reports.pm:105 msgid "This report was submitted anonymously" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:308 +#: perllib/FixMyStreet/Script/Reports.pm:85 msgid "This web page also contains a photo of the problem, provided by the user." msgstr "Тази Ñтраница Ñъдържа и Ñнимка, изпратена от Ð½Ð°ÑˆÐ¸Ñ Ð¿Ð¾Ñ‚Ñ€ÐµÐ±Ð¸Ñ‚ÐµÐ»." @@ -3367,7 +3224,7 @@ msgstr "Тази Ñтраница Ñъдържа и Ñнимка, изпрате msgid "Time spent (in minutes):" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1278 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1287 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "Времева линиÑ" @@ -3379,24 +3236,22 @@ msgid "Title" msgstr "Заглавие" #: templates/web/zurich/admin/template_edit.html:20 -#, fuzzy msgid "Title:" -msgstr "Заглавие" +msgstr "" #: templates/web/base/alert/index.html:25 -#, fuzzy msgid "To find out what local alerts we have for you, please enter your %s postcode or street name and area:" -msgstr "За да получите нови извеÑтиÑ, Ð¼Ð¾Ð»Ñ Ð²ÑŠÐ²ÐµÐ´ÐµÑ‚Ðµ пощенÑки код или име на улица." +msgstr "" #: templates/web/base/alert/index.html:27 msgid "To find out what local alerts we have for you, please enter your postcode or street name and area" msgstr "За да получите нови извеÑтиÑ, Ð¼Ð¾Ð»Ñ Ð²ÑŠÐ²ÐµÐ´ÐµÑ‚Ðµ пощенÑки код или име на улица." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:314 +#: perllib/FixMyStreet/Script/Reports.pm:91 msgid "To view a map of the precise location of this issue" msgstr "За да видите точното меÑтоположение на проблема върху картата" -#: templates/web/base/admin/index.html:61 +#: templates/web/base/admin/index.html:54 #: templates/web/base/admin/questionnaire.html:24 #: templates/web/base/admin/stats.html:24 #: templates/web/base/admin/stats.html:43 @@ -3414,10 +3269,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:12 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:33 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:31 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:37 msgid "Unable to fix" msgstr "" @@ -3430,7 +3283,7 @@ msgstr "" msgid "Unconfirmed" msgstr "Ðепотвърден" -#: templates/web/fixmystreet/report/banner.html:9 +#: templates/web/base/report/banner.html:9 msgid "Unknown" msgstr "ÐеизвеÑтен" @@ -3438,17 +3291,18 @@ msgstr "ÐеизвеÑтен" msgid "Unknown alert type" msgstr "" +#: perllib/FixMyStreet/App/Controller/Photo.pm:110 #: templates/web/base/js/translation_strings.html:39 msgid "Unknown error" msgstr "Ðепозната грешка" -#: perllib/FixMyStreet/App/Controller/Report.pm:103 -#: perllib/FixMyStreet/App/Controller/Report.pm:109 -#: perllib/FixMyStreet/App/Controller/Report.pm:112 +#: perllib/FixMyStreet/App/Controller/Report.pm:105 +#: perllib/FixMyStreet/App/Controller/Report.pm:111 +#: perllib/FixMyStreet/App/Controller/Report.pm:114 msgid "Unknown problem ID" msgstr "" -#: templates/web/fixmystreet/report/update-form.html:19 +#: templates/web/base/report/update/form_update.html:25 msgid "Update" msgstr "ÐктуализациÑ" @@ -3456,13 +3310,11 @@ msgstr "ÐктуализациÑ" msgid "Update %s created for problem %d; by %s" msgstr "Ðктуализиране на %s ÑъщеÑтвуващ Ñигнал %d; от %s" -#: templates/web/base/contact/index.html:21 -#: templates/web/fixmystreet/contact/index.html:36 +#: templates/web/base/contact/index.html:28 msgid "Update below added anonymously at %s" msgstr "Ðктуализирано анонимно на %s" -#: templates/web/base/contact/index.html:23 -#: templates/web/fixmystreet/contact/index.html:38 +#: templates/web/base/contact/index.html:30 msgid "Update below added by %s at %s" msgstr "Ðктуализирано от %s на %s" @@ -3471,7 +3323,7 @@ msgstr "Ðктуализирано от %s на %s" msgid "Update body" msgstr "" -#: templates/web/base/admin/index.html:55 +#: templates/web/base/admin/index.html:48 msgid "Update breakdown by state" msgstr "" @@ -3496,20 +3348,16 @@ msgstr "ÐÐºÑ‚ÑƒÐ°Ð»Ð¸Ð·Ð°Ñ†Ð¸Ñ Ð½Ð° възобновен Ñигнал" msgid "Update statuses" msgstr "ÐÐºÑ‚ÑƒÐ°Ð»Ð¸Ð·Ð°Ñ†Ð¸Ñ Ð½Ð° ÑтатуÑите" -#: templates/web/base/report/update-form.html:22 -msgid "Update:" -msgstr "ÐктуализациÑ:" - #: templates/web/zurich/admin/index-dm.html:23 #: templates/web/zurich/admin/index-sdm.html:21 #: templates/web/zurich/admin/reports.html:13 msgid "Updated" msgstr "Ðктуализирано!" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1045 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1103 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1147 -#: perllib/FixMyStreet/App/Controller/Admin.pm:822 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1048 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1108 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1156 +#: perllib/FixMyStreet/App/Controller/Admin.pm:821 #: perllib/FixMyStreet/Cobrand/Zurich.pm:771 #: perllib/FixMyStreet/Cobrand/Zurich.pm:796 #: perllib/FixMyStreet/Cobrand/Zurich.pm:866 @@ -3517,13 +3365,12 @@ msgid "Updated!" msgstr "Ðктуализирано!" #: templates/web/base/admin/list_updates.html:2 -#: templates/web/base/report/update.html:3 -#: templates/web/fixmystreet/report/update.html:5 +#: templates/web/base/report/update.html:5 #: templates/web/zurich/report/updates.html:2 msgid "Updates" msgstr "Ðктуализации" -#: perllib/FixMyStreet/DB/Result/Comment.pm:132 +#: perllib/FixMyStreet/DB/Result/Comment.pm:131 msgid "Updates are limited to %s characters in length. Please shorten your update" msgstr "" @@ -3533,12 +3380,9 @@ msgstr "Ðктуализиране на {{title}}" #. ("%s is the site name") #: templates/web/base/report/display.html:0 -#: templates/web/base/report/display.html:5 -#: templates/web/fixmystreet/report/display.html:0 -#: templates/web/fixmystreet/report/display.html:9 -#, fuzzy +#: templates/web/base/report/display.html:9 msgid "Updates to this problem, %s" -msgstr "ИзтеглÑне на актуализациите на %s Ñигналите " +msgstr "" #: templates/web/base/admin/body.html:182 msgid "Use the <strong>note</strong> to record details that are only displayed in the admin. Notes are not shown publicly, and are not sent to the body." @@ -3546,15 +3390,14 @@ msgstr "" #: templates/web/zurich/admin/report_edit-sdm.html:48 #: templates/web/zurich/admin/report_edit.html:67 -#, fuzzy msgid "Used map" -msgstr "използвана е била картата" +msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1452 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1461 msgid "User flag removed" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1424 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1433 msgid "User flagged" msgstr "" @@ -3562,7 +3405,7 @@ msgstr "" msgid "User search finds matches in users' names and email addresses." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1280 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1289 #: perllib/FixMyStreet/Cobrand/Zurich.pm:399 #: templates/web/base/admin/flagged.html:29 #: templates/web/zurich/header.html:69 @@ -3593,7 +3436,6 @@ msgid "Viewing a location" msgstr "Преглед на меÑтоположение" #: templates/web/base/report/display.html:0 -#: templates/web/fixmystreet/report/display.html:0 msgid "Viewing a problem" msgstr "Преглед на Ñигнал" @@ -3606,25 +3448,24 @@ 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 "Ðамерихме повече от едно Ñъвпадение за Вашето меÑтонахождение. Показват Ñе до 10 ÑъвпадениÑ, Ð¼Ð¾Ð»Ñ Ð¾Ð¿Ð¸Ñ‚Ð°Ð¹Ñ‚Ðµ Ñ‚ÑŠÑ€Ñене по друг критерий, ако вашето меÑтоположение, не е Ñред показаните." -#: templates/web/zurich/auth/token.html:7 -msgid "We have not been able to confirm your account - sorry." -msgstr "" - -#: templates/web/zurich/auth/token.html:17 -msgid "We have sent you an email containing a link to confirm your account." -msgstr "Изпратили Ñме Ви имейл, за да потвърдите Ñъздаването на профил." +#: templates/web/base/auth/general.html:6 +#: templates/web/base/report/display.html:27 +#: templates/web/base/report/new/oauth_email_form.html:5 +#, fuzzy +msgid "We need your email address, please give it below." +msgstr "Ðие никога не показваме Ð²Ð°ÑˆÐ¸Ñ Ð¸Ð¼ÐµÐ¹Ð» или телефонен номер." -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:2 -#: templates/web/fixmystreet/report/update-form.html:77 +#: templates/web/base/report/new/form_user_loggedout_email.html:2 +#: templates/web/base/report/update/form_user_loggedout_email.html:2 msgid "We never show your email" msgstr "Ðие никога не показваме Ð²Ð°ÑˆÐ¸Ñ Ð¸Ð¼ÐµÐ¹Ð»" -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:31 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:65 +#: templates/web/base/report/new/form_user_loggedin.html:31 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:28 msgid "We never show your email address or phone number." msgstr "Ðие никога не показваме Ð²Ð°ÑˆÐ¸Ñ Ð¸Ð¼ÐµÐ¹Ð» или телефонен номер." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:422 +#: perllib/FixMyStreet/Script/Reports.pm:200 msgid "We realise this problem might be the responsibility of %s; however, we don't currently have any contact details for them. If you know of an appropriate contact address, please do get in touch." msgstr "" @@ -3641,12 +3482,6 @@ msgstr "Личните Ви данни ще бъдат използвани ед msgid "We’re sorry to hear the problem’s not fixed. Why not try writing to your local representatives?" msgstr "" -#: templates/web/base/contact/blurb.html:8 -msgid "We'd love to hear what you think about this site. Just fill in the form, or send an email to <a href='mailto:%s'>%s</a>:" -msgstr "" -"Ще Ñе раздваме да разберем какво миÑлите за Ñайта. ÐœÐ¾Ð»Ñ Ð¿Ð¾Ð¿ÑŠÐ»Ð½ÐµÑ‚Ðµ формата \n" -"или ни изпратете майл на <a href='mailto:%s'>%s</a>:" - #: templates/web/base/contact/submit.html:7 msgid "We’ll get back to you as soon as we can." msgstr "" @@ -3655,7 +3490,7 @@ msgstr "" msgid "What was your experience of getting the problem fixed?" msgstr "" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:49 +#: templates/web/base/report/new/form_report.html:19 msgid "What’s the issue, and where is it?" msgstr "" @@ -3668,7 +3503,11 @@ msgstr "Редактирано на:" msgid "When sent" msgstr "Изпратен" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:640 +#: templates/web/base/js/translation_strings.html:50 +msgid "Whoa there Testino! Three photos are enough." +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Report/New.pm:635 msgid "Whole block of empty flats" msgstr "" @@ -3683,7 +3522,7 @@ msgstr "" msgid "Wish" msgstr "" -#: templates/web/base/open311/index.html:92 +#: templates/web/base/open311/index.html:84 msgid "With request searches, it is also possible to search for agency_responsible to limit the requests to those sent to a single administration. The search term is the administration ID provided by <a href=\"%s\">MaPit</a>." msgstr "" @@ -3691,7 +3530,7 @@ msgstr "" msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"http://fixmystreet.org\">available at fixmystreet.org</a>." msgstr "" -#: templates/web/base/questionnaire/index.html:87 +#: templates/web/base/questionnaire/index.html:96 msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?" msgstr "Бихте ли иÑкали да получите още една анкета Ñлед 4 Ñедмици, за да ви напомни да проверите ÑтатуÑа?" @@ -3700,7 +3539,6 @@ msgid "Writing your message entirely in block capitals makes it hard to read, as msgstr "ÐœÐ¾Ð»Ñ Ð¿Ð¸ÑˆÐµÑ‚Ðµ на кирилица! ПиÑането Ñамо Ñ Ð³Ð»Ð°Ð²Ð½Ð¸ букви и без препинателни знаци, прави Ñъобщението трудно за разчитане." #: templates/web/base/report/new/fill_in_details_form.html:4 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:5 msgid "Wrong location? Just click again on the map." msgstr "" @@ -3723,27 +3561,24 @@ msgstr "Година" #: templates/web/base/admin/users.html:31 #: templates/web/base/questionnaire/creator_fixed.html:14 #: templates/web/base/questionnaire/index.html:51 -#: templates/web/base/questionnaire/index.html:90 +#: templates/web/base/questionnaire/index.html:99 msgid "Yes" msgstr "Да" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:17 -#: templates/web/fixmystreet/report/update-form.html:91 +#: templates/web/base/report/new/form_user_loggedout_password.html:5 +#: templates/web/base/report/update/form_user_loggedout_password.html:4 msgid "Yes I have a password" msgstr "Да, имам парола" -#: templates/web/base/contact/index.html:39 -#: templates/web/fixmystreet/contact/index.html:54 +#: templates/web/base/contact/index.html:46 msgid "You are complaining that this problem report was unnecessarily moderated:" msgstr "" -#: templates/web/base/contact/index.html:41 -#: templates/web/fixmystreet/contact/index.html:56 +#: templates/web/base/contact/index.html:48 msgid "You are reporting the following problem report for being abusive, containing personal information, or similar:" msgstr "" -#: templates/web/base/contact/index.html:15 -#: templates/web/fixmystreet/contact/index.html:30 +#: templates/web/base/contact/index.html:22 msgid "You are reporting the following update for being abusive, containing personal information, or similar:" msgstr "" @@ -3756,7 +3591,7 @@ msgstr "Можете да <a href=\"%s%s\">разгледате Ñигнала Ð msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create." msgstr "" -#: templates/web/fixmystreet/contact/index.html:121 +#: templates/web/base/contact/index.html:113 msgid "You can contact technical support on <a href='mailto:%s'>%s</a>" msgstr "За техничеÑка поддръжка Ð¼Ð¾Ð»Ñ Ð¿Ð¸ÑˆÐµÑ‚Ðµ ни на <a href='mailto:%s'>%s</a>" @@ -3767,8 +3602,8 @@ msgid "" " reports in the past." msgstr "" -#: templates/web/base/report/new/councils_text_none.html:10 -#: templates/web/base/report/new/councils_text_none.html:2 +#: templates/web/base/report/new/councils_text_none.html:12 +#: templates/web/base/report/new/councils_text_none.html:14 #: templates/web/base/report/new/councils_text_some.html:19 #: templates/web/base/report/new/councils_text_some.html:21 msgid "You can help us by finding a contact email address for local problems for %s and emailing it to us at <a href='mailto:%s'>%s</a>." @@ -3786,21 +3621,16 @@ msgstr "Вие отказахте; Ð¼Ð¾Ð»Ñ Ð¿Ð¾Ð¿ÑŠÐ»Ð½ÐµÑ‚Ðµ полето по msgid "You have already answered this questionnaire. If you have a question, please <a href='%s'>get in touch</a>, or <a href='%s'>view your problem</a>.\n" msgstr "Вече Ñте попълнили тази анкета. Ðко имате въпроÑ, Ð¼Ð¾Ð»Ñ <a href='%s'>Ñвържете Ñе Ñ Ð½Ð°Ñ</a>, или <a href='%s'>прегледайте Ñигнала</a>.\n" -#: templates/web/base/questionnaire/index.html:77 -#: templates/web/base/report/new/fill_in_details_form.html:75 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:73 -msgid "You have already attached a photo to this report, attaching another one will replace it." -msgstr "Вече Ñте прикачили Ñнимка към този Ñигнал. Ðко прикачите нова, то Ñ‚Ñ Ñ‰Ðµ замени ÑъщеÑтвуващата." - -#: templates/web/base/report/update-form.html:59 -#: templates/web/fixmystreet/report/update-form.html:56 -msgid "You have already attached a photo to this update, attaching another one will replace it." -msgstr "Вече Ñте прикачили Ñнимка към актуализациÑта, прикачайки нова ще замените предходната." - -#: templates/web/zurich/report/new/fill_in_details_form.html:61 +#: templates/web/base/report/new/form_report.html:32 +#: templates/web/zurich/report/new/fill_in_details_form.html:55 msgid "You have already attached photos to this report. Note that you can attach a maximum of 3 to this report (if you try to upload more, the oldest will be removed)." msgstr "" +#: templates/web/base/questionnaire/index.html:83 +#: templates/web/base/report/update/form_update.html:14 +msgid "You have already attached photos to this update. Note that you can attach a maximum of 3 to this update (if you try to upload more, the oldest will be removed)." +msgstr "" + #: templates/web/base/auth/sign_out.html:4 #: templates/web/zurich/auth/sign_out.html:3 msgid "You have been signed out" @@ -3815,9 +3645,8 @@ msgstr "Сигналът е локализиран на меÑтоположен msgid "You have successfully confirmed your email address." msgstr "УÑпешно пoтвърдихте ВашиÑÑ‚ имейл адреÑ." -#: templates/web/base/report/display.html:20 -#: templates/web/base/report/new/fill_in_details.html:37 -#: templates/web/fixmystreet/report/display.html:17 +#: templates/web/base/report/display.html:17 +#: templates/web/base/report/new/login_success_form.html:3 msgid "You have successfully signed in; please check and confirm your details are accurate:" msgstr "УÑпешно влÑзохте в ÑиÑтемата; Ð¼Ð¾Ð»Ñ Ð¿Ñ€Ð¾Ð²ÐµÑ€ÐµÑ‚Ðµ и потвърдете коректноÑтта на данните Ñи:" @@ -3849,53 +3678,42 @@ msgid "Your Reports" msgstr "Вашите Сигнали" #: templates/web/base/alert/_list.html:89 +#: templates/web/base/contact/index.html:83 +#: templates/web/base/report/display_tools.html:38 +#: templates/web/base/report/display_tools.html:40 +#: templates/web/base/report/new/form_user_loggedin.html:3 +#: templates/web/base/report/new/form_user_loggedout_email.html:1 +#: templates/web/base/report/update/form_user_loggedout_email.html:1 #: templates/web/fixmystreet/alert/updates.html:19 #: templates/web/fixmystreet/alert/updates.html:22 -#: templates/web/fixmystreet/contact/index.html:91 -#: templates/web/fixmystreet/report/display.html:62 -#: templates/web/fixmystreet/report/display.html:64 -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:3 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:1 -#: templates/web/fixmystreet/report/update-form.html:76 #: templates/web/zurich/report/new/fill_in_details_form.html:76 msgid "Your email" msgstr "Имейл" -#: templates/web/base/auth/general.html:28 -#: templates/web/fixmystreet/report/update-form.html:82 +#: templates/web/base/auth/general.html:45 +#: templates/web/base/report/update/form_user_loggedout_email.html:7 #: templates/web/zurich/auth/general.html:30 #: templates/web/zurich/auth/general.html:58 msgid "Your email address" msgstr "Имейл адреÑ" -#: templates/web/base/report/new/fill_in_details_form.html:106 -#: templates/web/base/report/update-form.html:81 -msgid "Your email:" -msgstr "Имейл:" - -#: templates/web/fixmystreet/report/updates-sidebar-notes.html:7 +#: templates/web/base/report/updates-sidebar-notes.html:3 msgid "Your information will only be used in accordance with our <a href=\"/privacy\">privacy policy</a>" msgstr "Вашата Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ñ‰Ðµ бъде използва Ñамо ÑпрÑмо нашата <a href=\"/privacy\">Политика за поверителноÑÑ‚</a>" -#: templates/web/base/auth/general.html:51 -#: templates/web/fixmystreet/contact/index.html:84 -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:18 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:54 -#: templates/web/fixmystreet/report/update-form.html:142 +#: templates/web/base/auth/general.html:90 +#: templates/web/base/contact/index.html:76 +#: templates/web/base/report/new/form_user_loggedin.html:18 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:17 +#: templates/web/base/report/update/form_name.html:11 #: templates/web/zurich/auth/general.html:61 #: templates/web/zurich/report/new/fill_in_details_form.html:86 msgid "Your name" msgstr "Име" -#: templates/web/base/contact/index.html:73 -#: templates/web/base/report/new/fill_in_details_form.html:186 -#: templates/web/base/report/update-form.html:152 -msgid "Your name:" -msgstr "Име:" - -#: templates/web/base/auth/general.html:39 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:22 -#: templates/web/fixmystreet/report/update-form.html:96 +#: templates/web/base/auth/general.html:75 +#: templates/web/base/report/new/form_user_loggedout_password.html:10 +#: templates/web/base/report/update/form_user_loggedout_password.html:9 #: templates/web/zurich/auth/general.html:34 msgid "Your password" msgstr "Парола" @@ -3904,15 +3722,16 @@ msgstr "Парола" msgid "Your password has been changed" msgstr "Паролата Ви беше променена уÑпешно" -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:27 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:63 +#: templates/web/base/report/new/form_user_loggedin.html:27 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:26 #: templates/web/zurich/report/new/fill_in_details_form.html:92 msgid "Your phone number" msgstr "Телефонен номер" #: templates/web/base/questionnaire/index.html:14 +#, fuzzy msgid "Your report" -msgstr "ВашиÑÑ‚ Ñигнал" +msgstr "Вашите Ñигнали" #: templates/web/base/footer.html:9 templates/web/fixmystreet/footer.html:29 msgid "Your reports" @@ -3922,23 +3741,17 @@ msgstr "Вашите Ñигнали" msgid "Your updates" msgstr "Ðктуализации" -#: templates/web/base/contact/index.html:81 -msgid "Your email:" -msgstr "ВашиÑÑ‚ имейл:" - #: templates/web/base/reports/_list-filters.html:3 -#, fuzzy msgid "all reports" -msgstr "Ð’Ñички Ñигнали" +msgstr "" #: templates/web/base/admin/timeline.html:4 msgid "by %s" msgstr "от %s" #: templates/web/base/reports/_list-filters.html:5 -#, fuzzy msgid "closed reports" -msgstr "Затворени Ñигнали" +msgstr "" #: templates/web/base/reports/body.html:6 #: templates/web/base/reports/body.html:7 @@ -3960,17 +3773,16 @@ msgid "edit user" msgstr "Ñ€ÐµÐ´Ð°ÐºÑ†Ð¸Ñ Ð½Ð° потребителÑ" #: templates/web/base/reports/_list-filters.html:6 -#, fuzzy msgid "fixed reports" -msgstr "Поправени Ñигнали" +msgstr "" -#: templates/web/base/admin/index.html:33 +#: templates/web/base/status/stats.html:20 #: templates/web/zurich/admin/index.html:5 msgid "from %s different users" -msgstr "от %d различни потребители" +msgstr "от %s различни потребители" -#: templates/web/base/report/_item.html:17 -#: templates/web/zurich/report/_item.html:16 +#: templates/web/base/report/_item.html:15 +#: templates/web/zurich/report/_item.html:14 msgid "last updated %s" msgstr "ПоÑледно обновено %s" @@ -4062,10 +3874,8 @@ msgstr "отново отворен" msgid "sign out" msgstr "излизане" -#: templates/web/base/report/new/fill_in_details_form.html:12 -#: templates/web/base/report/new/fill_in_details_form.html:15 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:10 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:12 +#: templates/web/base/report/new/fill_in_details_form.html:11 +#: templates/web/base/report/new/fill_in_details_form.html:9 msgid "the local council" msgstr "меÑтната община" @@ -4074,7 +3884,7 @@ msgstr "меÑтната община" msgid "there is no pin shown as the user did not use the map" msgstr "мÑÑтото не е било отбелÑзано на картата от потребителÑ" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:398 +#: perllib/FixMyStreet/Script/Reports.pm:176 msgid "this type of local problem" msgstr "този тип Ñигнали" @@ -4083,9 +3893,8 @@ msgid "today" msgstr "днеÑ" #: templates/web/base/reports/_list-filters.html:4 -#, fuzzy msgid "unfixed reports" -msgstr "Поправени Ñигнали" +msgstr "" #: templates/web/base/admin/report_edit.html:32 msgid "used map" @@ -4104,7 +3913,7 @@ msgstr "потребителÑÑ‚ е ÑобÑтвеник на Ñигнала" msgid "ward" msgstr "квартал" -#: templates/web/base/front/stats.html:17 +#: templates/web/base/front/stats.html:13 #, perl-format msgid "<big>%s</big> report recently" msgid_plural "<big>%s</big> reports recently" @@ -4132,7 +3941,7 @@ msgid_plural "%d minutes" msgstr[0] "%d минута" msgstr[1] "%d минути" -#: templates/web/base/front/stats.html:29 +#: templates/web/base/front/stats.html:25 #, perl-format msgid "<big>%s</big> update on reports" msgid_plural "<big>%s</big> updates on reports" @@ -4153,14 +3962,14 @@ msgid_plural "%d weeks" msgstr[0] "%d Ñедмица" msgstr[1] "%d Ñедмици" -#: templates/web/base/front/stats.html:12 +#: templates/web/base/front/stats.html:8 #, perl-format msgid "<big>%s</big> report in past week" msgid_plural "<big>%s</big> reports in past week" msgstr[0] "<big>%s</big>Ñигнал за изминалата Ñедмица" msgstr[1] "<big>%s</big>Ñигнали за изминалата Ñедмица" -#: templates/web/base/front/stats.html:23 +#: templates/web/base/front/stats.html:19 #, perl-format msgid "<big>%s</big> fixed in past month" msgid_plural "<big>%s</big> fixed in past month" @@ -4181,101 +3990,82 @@ msgid_plural "We do <strong>not</strong> yet have details for the other councils msgstr[0] "Ð’Ñе още <strong>нÑмаме</strong> Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð·Ð° общината, коÑто ÑтопаниÑва тази териториÑ." msgstr[1] "Ð’Ñе още <strong>нÑмаме</strong> Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð·Ð° общините, които ÑтопаниÑват тази териториÑ." -#~ msgid "(Don't worry — we'll hang on to your alert while you're checking your email.)" -#~ msgstr "(Ðе Ñе притеÑнÑвайте — задържаме извеÑтието докато проверÑвате имейла Ñи.)" - -#~ msgid "(Don't worry — we'll hang on to your problem report while you're checking your email.)" -#~ msgstr "(Ðе Ñе притеÑнÑвайте — задържаме подаването на Ñигнала докато проверÑвате имейла Ñи.)" - -#~ msgid "(Don't worry — we'll hang on to your update while you're checking your email.)" -#~ msgstr "(Ðе Ñе притеÑнÑвайте — задържаме актуализациÑта докато проверÑвате имейла Ñи.)" - -#~ msgid "<small>If you cannot see the map, <a href='%s' rel='nofollow'>skip this step</a>.</small>" -#~ msgstr "<small>Ðко не виждате картата, <a href='%s' rel='nofollow'>пропуÑнете тази Ñтъпка</a>.</small>" - -#~ msgid "<strong>No</strong>, I do not, let me sign in by email:" -#~ msgstr "<strong>Ðе</strong> Ðека да влÑза в ÑиÑтемата чрез имейл" - -#~ msgid "Closest nearby problems <small>(within %skm)</small>" -#~ msgstr "Други Ñигнали в близоÑÑ‚ <small>(within %skm)</small>" - -#~ msgid "Contact FixMyStreet" -#~ msgstr "Свържете Ñе Ñ ÐµÐºÐ¸Ð¿Ð° на ПоправиСофиÑ" - -#~ msgid "FixMyStreet admin:" -#~ msgstr "ÐдминиÑтратор на ПоправиСофиÑ:" +#~ msgid "(we never show your email address or phone number)" +#~ msgstr "(ние никога не показваме Ð²Ð°ÑˆÐ¸Ñ Ð¸Ð¼ÐµÐ¹Ð» или телефонен номер)" -#~ msgid "If you do not, your alert will not be activated." -#~ msgstr "Ð’ противен Ñлучай, уведомлениÑата нÑма да бъдат активирани." +#~ msgid "(we never show your email)" +#~ msgstr "(ние никога не показваме Ð²Ð°ÑˆÐ¸Ñ Ð¸Ð¼ÐµÐ¹Ð»)" -#~ msgid "If you do not, your problem will not be posted." -#~ msgstr "Ð’ противен Ñлучай, вашиÑÑ‚ проблем нÑма да бъде публикуван." +#~ msgid "<strong>No</strong>, let me confirm my report by email:" +#~ msgstr "<strong>Ðе</strong> Ðека да Ð¿Ð¾Ñ‚Ð²ÑŠÑ€Ð´Ñ Ñигнала чрез имейл" -#~ msgid "If you do not, your update will not be posted." -#~ msgstr "Ð’ противен Ñлучай, вашата Ð°ÐºÑ‚ÑƒÐ°Ð»Ð¸Ð·Ð°Ñ†Ð¸Ñ Ð½Ñма да бъде публикувана." +#~ msgid "<strong>No</strong>, let me confirm my update by email:" +#~ msgstr "<strong>Ðе</strong> Ðека Ð¿Ð¾Ñ‚Ð²ÑŠÑ€Ð´Ñ Ð¿Ñ€Ð¾Ð¼Ñната чрез имейл:" -#~ msgid "New update:" -#~ msgstr "Ðова актуализациÑ" +#~ msgid "Email me updates" +#~ msgstr "Съобщавай ми за промени" -#~ msgid "No problems found." -#~ msgstr "ÐÑма намерен Ñигнал." +#~ msgid "Enter a new password:" +#~ msgstr "Въведете нова парола:" -#~ msgid "No problems have been reported yet." -#~ msgstr "Ð’Ñе още нÑма подадени Ñигнали." +#~ 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 "Ðко използвате уеб мейл клиент или имате наÑтроени филтри за нежелана поща, Ð¼Ð¾Ð»Ñ Ð¿Ñ€Ð¾Ð²ÐµÑ€ÐµÑ‚Ðµ папките ÑÑŠÑ Ñпам/нежелана поща. ПонÑкога ÑъобщениÑта ни биват маркирани като Ñпам." -#~ msgid "Now to submit your report… do you have a FixMyStreet password?" -#~ msgstr "Сега да изпратим Ð’Ð°ÑˆÐ¸Ñ Ñигнал… имате ли парола за ПоправиСофиÑ?" +#~ msgid "Message:" +#~ msgstr "Съобщение:" -#~ msgid "Now to submit your update… do you have a FixMyStreet password?" -#~ msgstr "Сега да изпратим Ð’Ð°ÑˆÐ¸Ñ Ñигнал… имате ли парола за Ñайта?" +#~ msgid "More problems nearby" +#~ msgstr "Още Ñигнали наоколо" -#~ msgid "Please <a class=\"tab_link\" href=\"#report\">take a look</a> at the updates that have been left." -#~ msgstr "ÐœÐ¾Ð»Ñ <a class=\"tab_link\" href=\"#report\">погледнете</a> актуализациите." +#~ msgid "Nearly Done! Now check your email..." +#~ msgstr "ÐœÐ¾Ð»Ñ Ð¿Ñ€Ð¾Ð²ÐµÑ€ÐµÑ‚Ðµ имейл адреÑа" -#~ msgid "Please take a look at the updates that have been left." -#~ msgstr "ÐœÐ¾Ð»Ñ Ð¿Ð¾Ð³Ð»ÐµÐ´Ð½ÐµÑ‚Ðµ актуализациите." +#~ msgid "Offensive? Unsuitable? Tell us" +#~ msgstr "Обиден? ÐеподходÑщ? Кажете ни" -#~ msgid "Problems within %s, FixMyStreet" -#~ msgstr "Сигнали в обÑега на %s" +#~ msgid "Photo:" +#~ msgstr "Снимка:" -#~ msgid "Publish the response" -#~ msgstr "Публикувай отговора" +#~ msgid "Please check your email" +#~ msgstr "ÐœÐ¾Ð»Ñ Ð¿Ñ€Ð¾Ð²ÐµÑ€ÐµÑ‚Ðµ имейл адреÑа" -#~ msgid "Reports on and around the map" -#~ msgstr "Сигнали означени върху картата" +#~ msgid "Please note that updates are not sent to the council. If you leave your name it will be public. Your information will only be used in accordance with our <a href=\"/faq#privacy\">privacy policy</a>" +#~ msgstr "ÐœÐ¾Ð»Ñ Ð¸Ð¼Ð°Ð¹Ñ‚Ðµ предвид, че актуализациите не Ñе изпращат на Общината. Тази Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ðµ публична и ще бъде използвана единÑтвено и Ñамо в ÑъответÑтвие Ñ Ð½Ð°ÑˆÐ°Ñ‚Ð° <a href=\"/privacy\">Политика за поверителноÑÑ‚.</a>" -#~ msgid "Sign in by email" -#~ msgstr "Вход Ñ Ð¸Ð¼ÐµÐ¹Ð»" +#~ msgid "This may be because the link is too old or already used, or the address was not copied correctly." +#~ msgstr "Това може да е резултат от на оÑтарÑл или използва адреÑ, както и от грешно копиране на адреÑа." -#~ msgid "Signed in as %s" -#~ msgstr "Вход като %s" +#~ msgid "This problem has been closed" +#~ msgstr "Този проблем е затворен." -#~ msgid "The confirmation email <strong>may</strong> take a few minutes to arrive — <em>please</em> be patient." -#~ msgstr "Това <strong>може</strong> да отнеме нÑколко минути — <em>молÑ</em> бъдете търпеливи." +#~ msgid "This problem is in progress" +#~ msgstr "Този проблем е в Ð¿Ñ€Ð¾Ñ†ÐµÑ Ð½Ð° обработка." -#~ msgid "The details of your problem are available from the other tab above." -#~ msgstr "Ð˜Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð·Ð° Ñигнала можете да намерите в Ñледващата ÑекциÑ." +#~ msgid "This problem is old and of unknown status." +#~ msgstr "Този Ñигнал е Ñ Ð½ÐµÐ¸Ð·Ð²ÐµÑтен ÑтатуÑ." -#~ msgid "The details of your problem are available on the right hand side of this page." -#~ msgstr "ОпиÑанието на Ð²Ð°ÑˆÐ¸Ñ Ñигнал е доÑтъпно от дÑÑната Ñтрана на тази Ñтраница." +#~ msgid "Update:" +#~ msgstr "ÐктуализациÑ:" -#~ msgid "The latest local reports reported by users" -#~ msgstr "Ðай-новите Ñигнали подадени от потребители" +#~ msgid "We have sent you an email containing a link to confirm your account." +#~ msgstr "Изпратили Ñме Ви имейл, за да потвърдите Ñъздаването на профил." -#~ msgid "The latest reports for {{COUNCIL}} reported by users" -#~ msgstr "ПоÑледни Ñигнали за {{COUNCIL}} подадени от потребителите" +#~ msgid "We'd love to hear what you think about this site. Just fill in the form, or send an email to <a href='mailto:%s'>%s</a>:" +#~ msgstr "" +#~ "Ще Ñе раздваме да разберем какво миÑлите за Ñайта. ÐœÐ¾Ð»Ñ Ð¿Ð¾Ð¿ÑŠÐ»Ð½ÐµÑ‚Ðµ формата \n" +#~ "или ни изпратете майл на <a href='mailto:%s'>%s</a>:" -#~ msgid "The latest reports for {{COUNCIL}} within {{WARD}} ward reported by users" -#~ msgstr "ПоÑледни Ñигнали за {{COUNCIL}} обхващаша квартал {{WARD}} подадени от потребителите" +#~ msgid "You have already attached a photo to this report, attaching another one will replace it." +#~ msgstr "Вече Ñте прикачили Ñнимка към този Ñигнал. Ðко прикачите нова, то Ñ‚Ñ Ñ‰Ðµ замени ÑъщеÑтвуващата." -#~ msgid "To <strong>report a problem</strong>, click on the map at the correct location." -#~ msgstr "За да <strong> подадете Ñигнал</strong>, щракнете върху картата на точното меÑтоположение." +#~ msgid "You have already attached a photo to this update, attaching another one will replace it." +#~ msgstr "Вече Ñте прикачили Ñнимка към актуализациÑта, прикачайки нова ще замените предходната." -#~ msgid "User" -#~ msgstr "Потребител" +#~ msgid "Your email:" +#~ msgstr "Имейл:" -#~ msgid "You must now click the link in the email we've just sent you." -#~ msgstr "ÐœÐ¾Ð»Ñ Ð¸Ð·Ð¿Ð¾Ð»Ð·Ð²Ð°Ð¹Ñ‚Ðµ адреÑа, който ви беше изпратен на емейл адреÑа." +#~ msgid "Your name:" +#~ msgstr "Име:" -#~ msgid "Your email address:" -#~ msgstr "Имейл адреÑ:" +#~ msgid "Your email:" +#~ msgstr "ВашиÑÑ‚ имейл:" diff --git a/locale/cs_CZ.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/cs_CZ.UTF-8/LC_MESSAGES/FixMyStreet.po index 22096ce9b..05d448816 100644 --- a/locale/cs_CZ.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/cs_CZ.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: fixmystreet\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2015-10-23 16:51+0100\n" -"PO-Revision-Date: 2015-07-31 16:31+0000\n" +"POT-Creation-Date: 2016-03-02 13:09+0000\n" +"PO-Revision-Date: 2015-10-23 16:38+0000\n" "Last-Translator: mySociety <transifex@mysociety.org>\n" "Language-Team: Czech (Czech Republic) (http://www.transifex.com/mysociety/fixmystreet/language/cs_CZ/)\n" "Language: cs_CZ\n" @@ -18,45 +18,24 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:628 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:411 +#: perllib/FixMyStreet/DB/Result/Problem.pm:616 +#: perllib/FixMyStreet/Script/Reports.pm:189 msgid " and " msgstr " a " #: templates/web/base/report/new/councils_text_all.html:2 -#: templates/web/base/report/new/councils_text_none.html:11 -#: templates/web/base/report/new/councils_text_none.html:2 +#: templates/web/base/report/new/councils_text_none.html:12 +#: templates/web/base/report/new/councils_text_none.html:15 #: templates/web/base/report/new/councils_text_some.html:19 #: templates/web/base/report/new/councils_text_some.html:22 #: templates/web/base/report/new/councils_text_some.html:5 msgid " or " msgstr " nebo " -#: templates/web/base/admin/index.html:35 -#: templates/web/base/status/index.html:13 -msgid "%s confirmed alerts, %s unconfirmed" -msgstr "%d potvrzených upozornÄ›nÃ, %d nepotvrzených" - -#: templates/web/base/admin/index.html:37 -#: templates/web/base/status/index.html:16 -#: templates/web/zurich/admin/index.html:6 -msgid "%s council contacts – %s confirmed, %s unconfirmed" -msgstr "%d úřednÃch kontaktů -%d potvrzených, %d nepotvrzených" - #: templates/web/base/admin/edit-league.html:12 msgid "%d edits by %s" msgstr "%d úprav od %s" -#: templates/web/base/admin/index.html:34 -#: templates/web/base/status/index.html:12 -msgid "%s live updates" -msgstr "%d online aktualizace" - -#: templates/web/base/admin/index.html:36 -#: templates/web/base/status/index.html:14 -msgid "%s questionnaires sent – %s answered (%s%%)" -msgstr "%d dotaznÃky zaslány -%d odpovÄ›dÄ›lo (%s %%)" - #: templates/web/base/pagination.html:10 msgid "%d to %d of %d" msgstr "%d až %d z %d" @@ -71,37 +50,50 @@ msgstr "%s -Souhrnné reporty" msgid "%s admin:" msgstr "" +#: templates/web/base/status/stats.html:26 +#, fuzzy +msgid "%s bodies" +msgstr "Subjekty" + +#: templates/web/base/status/stats.html:24 +msgid "%s confirmed alerts, %s unconfirmed" +msgstr "%s potvrzených upozornÄ›nÃ, %s nepotvrzených" + +#: templates/web/base/status/stats.html:27 +#: templates/web/zurich/admin/index.html:6 +msgid "%s council contacts – %s confirmed, %s unconfirmed" +msgstr "%s úřednÃch kontaktů -%s potvrzených, %s nepotvrzených" + #. ("%s is the site name") #: templates/web/base/alert/index.html:7 -#, fuzzy msgid "" "%s has a variety of RSS feeds and email alerts for local\n" "problems, including alerts for all problems within a particular ward, or all\n" "problems within a certain distance of a particular location." msgstr "" -"FixMyStreet má Å™adu RSS kanálů a e-mailových upozornÄ›nà na mÃstnÃch problémy, vÄetnÄ› \n" -" upozornÄ›nà pro vÅ¡echny problémy v rámci urÄitého oddÄ›lenà nebo úřadu, nebo se vÅ¡emi problémy \n" -" v urÄité vzdálenosti k dané lokalitÄ›." #. ("%s is the site name") #: templates/web/base/alert/index.html:11 -#, fuzzy msgid "" "%s has a variety of RSS feeds and email alerts for local problems, including\n" "alerts for all problems within a particular ward or council, or all problems\n" "within a certain distance of a particular location." msgstr "" -"FixMyStreet má Å™adu RSS kanálů a e-mailových upozornÄ›nà na mÃstnÃch problémy, vÄetnÄ› \n" -" upozornÄ›nà pro vÅ¡echny problémy v rámci urÄitého oddÄ›lenà nebo úřadu, nebo se vÅ¡emi problémy \n" -" v urÄité vzdálenosti k dané lokalitÄ›." -#: perllib/FixMyStreet/DB/Result/Problem.pm:695 +#: templates/web/base/status/stats.html:23 +msgid "%s live updates" +msgstr "%s online aktualizace" + +#: templates/web/base/status/stats.html:25 +msgid "%s questionnaires sent – %s answered (%s%%)" +msgstr "%s dotaznÃky zaslány -%s odpovÄ›dÄ›lo (%s %%)" + +#: perllib/FixMyStreet/DB/Result/Problem.pm:683 msgid "%s ref: %s" msgstr "%s ref: %s" #. ("%s is the site name") #: templates/web/base/alert/_list.html:73 -#, fuzzy msgid "" "%s sends different categories of problem\n" "to the appropriate council, so problems within the boundary of a particular council\n" @@ -110,22 +102,16 @@ msgid "" "council’s alerts, but will only appear in the \"Within the boundary\" alert\n" "for the county council." msgstr "" -"FixMyStreet posÃlá hlášenà různých kategorià problémů\n" -"pÅ™ÃsluÅ¡ným úřadům, takže problémy uvnitÅ™ hranic urÄitého okrsku \n" -"se nemusà shodovat s problémy zaslanými tomuto úřadu. NapÅ™Ãklad, graffiti hlášenà \n" -"bude zasláno do okresnÃho zastupitelstva, takže se objevà v obou okresnÃho \n" -"Rady & rsquo; s upozornÄ›nÃ, ale objevà se pouze v \"v rámci hranice \" alert \n" -"na krajský úřad." -#: perllib/FixMyStreet/Cobrand/UK.pm:255 perllib/FixMyStreet/Cobrand/UK.pm:267 +#: perllib/FixMyStreet/Cobrand/UK.pm:256 perllib/FixMyStreet/Cobrand/UK.pm:268 msgid "%s ward, %s" msgstr "%s, oddÄ›lenÃ, %" -#: perllib/FixMyStreet/DB/Result/Problem.pm:564 +#: perllib/FixMyStreet/DB/Result/Problem.pm:552 msgid "%s, reported at %s" msgstr "%s, nahlášeno %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:282 perllib/FixMyStreet/Cobrand/UK.pm:294 +#: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295 msgid "%s, within %s ward" msgstr "% S, v% s oddÄ›lenÃ" @@ -133,7 +119,7 @@ msgstr "% S, v% s oddÄ›lenÃ" msgid "© <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors" msgstr "" -#: templates/web/zurich/report/new/fill_in_details_form.html:53 +#: templates/web/zurich/report/new/fill_in_details_form.html:46 msgid "(Defect & location of defect)" msgstr "" @@ -144,15 +130,13 @@ msgstr "(E-mailů v tabulce zneužÃvánÃ)" #: templates/web/zurich/admin/report_edit-sdm.html:60 #: templates/web/zurich/admin/report_edit.html:88 -#, fuzzy msgid "(No name)" -msgstr "VaÅ¡e jméno a pÅ™ÃjmenÃ" +msgstr "" #: templates/web/zurich/admin/report_edit-sdm.html:67 #: templates/web/zurich/admin/report_edit.html:95 -#, fuzzy msgid "(No phone number)" -msgstr "VaÅ¡e telefonnà ÄÃslo:" +msgstr "" #: templates/web/base/alert/_list.html:24 msgid "(a default distance which covers roughly 200,000 people)" @@ -160,17 +144,16 @@ msgstr "(Standardnà vzdálenost, která pokrývá zhruba 10.000 lidÃ)" #. ("%s is a list of distance links, e.g. [2km] / [5km] / [10km] / [20km]") #: templates/web/base/alert/_list.html:29 -#, fuzzy msgid "(alternatively the RSS feed can be customised, within %s)" -msgstr "(AlternativnÄ› RSS zdroj lze pÅ™izpůsobit, v rámci" +msgstr "" -#: templates/web/base/report/_item.html:27 -#: templates/web/zurich/report/_item.html:21 +#: templates/web/base/report/_item.html:25 +#: templates/web/zurich/report/_item.html:19 msgid "(closed)" msgstr "(uzavÅ™ené)" -#: templates/web/base/report/_item.html:25 -#: templates/web/zurich/report/_item.html:19 +#: templates/web/base/report/_item.html:23 +#: templates/web/zurich/report/_item.html:17 msgid "(fixed)" msgstr "(vyÅ™eÅ¡eno)" @@ -178,37 +161,28 @@ msgstr "(vyÅ™eÅ¡eno)" msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)" msgstr "(napÅ™. graffiti, rozbité pouliÄnà osvÄ›tlenÃ, dÃry v komunikacÃch a pod. )" -#: templates/web/base/report/_item.html:21 +#: templates/web/base/report/_item.html:19 msgid "(not sent to council)" msgstr "(nenà odesláno na úřad)" -#: templates/web/base/report/new/fill_in_details_form.html:200 #: templates/web/zurich/report/new/fill_in_details_form.html:82 msgid "(optional)" msgstr "(volitelnÄ›)" -#: templates/web/fixmystreet/report/public_label.html:1 +#: templates/web/base/report/public_label.html:1 msgid "(public)" msgstr "(veÅ™ejné)" -#: templates/web/base/report/_item.html:20 +#: templates/web/base/report/_item.html:18 msgid "(sent to both)" msgstr "(odesláno dvoum??)" -#: templates/web/base/report/new/fill_in_details_form.html:194 -msgid "(we never show your email address or phone number)" -msgstr "(váš email a telefonnà ÄÃslo nebudou nikde zveÅ™ejnÄ›ny)" - -#: templates/web/base/report/update-form.html:159 -msgid "(we never show your email)" -msgstr "(váš email nebude nezveÅ™ejnÄ›n)" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:673 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 #: perllib/FixMyStreet/DB/Result/Problem.pm:410 msgid "-- Pick a category --" msgstr "-- Vyberte kategorii --" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:637 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:632 #: perllib/FixMyStreet/DB/Result/Problem.pm:416 msgid "-- Pick a property type --" msgstr "-- Vyberte typ nemovitosti --" @@ -230,52 +204,39 @@ msgstr "" msgid "<label>Show %s</label> <label>about %s</label>" msgstr "" -#: templates/web/base/admin/index.html:32 -#: templates/web/base/status/index.html:11 +#: templates/web/base/status/stats.html:18 #: templates/web/zurich/admin/index.html:4 msgid "<strong>%s</strong> live problems" -msgstr "<strong>%d</strong>NevyÅ™eÅ¡ená hlášenÃ" +msgstr "<strong>%s</strong>NevyÅ™eÅ¡ená hlášenÃ" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:39 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:2 msgid "<strong>No</strong> Let me confirm my report by email" msgstr "<strong>Ne</strong> PotvrdÃm hlášenà e-mailem" -#: templates/web/fixmystreet/report/update-form.html:112 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:2 msgid "<strong>No</strong> Let me confirm my update by email" msgstr "<strong>Ne</strong> PotvrdÃm aktualizaci e-mailem" -#: templates/web/base/auth/general.html:48 +#: templates/web/base/auth/general.html:87 #: templates/web/zurich/auth/general.html:51 msgid "<strong>No</strong> let me sign in by email" msgstr "<strong>Ne</strong> pÅ™ihlásÃm se pomocà e-mailu" -#: templates/web/base/report/new/fill_in_details_form.html:145 -msgid "<strong>No</strong>, let me confirm my report by email:" -msgstr "<strong>Ne</strong>, PotvrdÃm hlášenà prostÅ™ednictvÃm emailu:" - -#: templates/web/base/report/update-form.html:118 -msgid "<strong>No</strong>, let me confirm my update by email:" -msgstr "<strong>Ne</strong>, potvrdÃm aktualizaci pomocà e-mailu:" - -#: templates/web/base/auth/general.html:34 -#: templates/web/base/report/new/fill_in_details_form.html:123 -#: templates/web/base/report/update-form.html:96 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:15 -#: templates/web/fixmystreet/report/update-form.html:89 +#: templates/web/base/auth/general.html:70 +#: templates/web/base/report/new/form_user_loggedout_password.html:3 +#: templates/web/base/report/update/form_user_loggedout_password.html:2 msgid "<strong>Yes</strong> I have a password" msgstr "<strong>Ano</strong> Mám heslo" -#: templates/web/base/static/about-en-gb.html:1 -#: templates/web/base/static/about-en-gb.html:3 +#: templates/web/base/about/about-en-gb.html:1 +#: templates/web/base/about/about-en-gb.html:3 msgid "About us" msgstr "O nás" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:8 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:31 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:29 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:35 msgid "Action Scheduled" msgstr "Akce naplánována" @@ -309,14 +270,13 @@ msgstr "PÅ™idat novou kategorii" msgid "Add user" msgstr "PÅ™idat Uživatele" -#: templates/web/base/my/my.html:52 +#: templates/web/base/my/my.html:56 msgid "Added %s" msgstr "PÅ™idáno %s" #: templates/web/base/report/new/category_extras.html:9 -#, fuzzy msgid "Additional Information" -msgstr "ÄŒeká se na moderovánÃ" +msgstr "" #: templates/web/base/auth/change_password.html:29 msgid "Again:" @@ -330,8 +290,7 @@ msgstr "UpozornÄ›nà %d vytvoÅ™ené pro %s, typu %s, parametry %s / %s" msgid "Alert %d disabled (created %s)" msgstr "UpozornÄ›nà %d zruÅ¡eno (vytvoÅ™eno %s)" -#: templates/web/base/report/update-form.html:164 -#: templates/web/fixmystreet/report/update-form.html:150 +#: templates/web/base/report/update/form_name.html:20 msgid "Alert me to future updates" msgstr "UpozornÄ›te mÄ› na budoucà aktualizace" @@ -341,9 +300,8 @@ msgid "All Reports" msgstr "VÅ¡echna hlášenÃ" #: templates/web/zurich/admin/stats.html:5 -#, fuzzy msgid "All Reports as CSV" -msgstr "VÅ¡echna hlášenÃ" +msgstr "" #: templates/web/base/footer.html:11 templates/web/fixmystreet/footer.html:32 #: templates/web/zurich/admin/index-dm.html:12 @@ -364,10 +322,8 @@ msgstr "VeÅ¡keré vámi poskytnuté informace budou zaslány " #: templates/web/base/report/new/councils_text_all.html:2 #: templates/web/base/report/new/councils_text_all.html:4 -#: templates/web/base/report/new/fill_in_details_form.html:12 -#: templates/web/base/report/new/fill_in_details_form.html:14 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:10 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:11 +#: templates/web/base/report/new/fill_in_details_form.html:10 +#: templates/web/base/report/new/fill_in_details_form.html:9 msgid "All the information you provide here will be sent to <strong>%s</strong>." msgstr "VeÅ¡keré vámi poskytnuté informace budou zaslány <strong>%s</strong>." @@ -389,6 +345,10 @@ msgstr "AnonymnÃ:" msgid "Are you a developer?" msgstr "Jste vývojář?" +#: templates/web/base/js/translation_strings.html:52 +msgid "Are you sure you want to cancel this upload?" +msgstr "" + #: templates/web/base/admin/body-form.html:69 #: templates/web/base/admin/body.html:16 #: templates/web/zurich/admin/body-form.html:24 @@ -401,9 +361,8 @@ msgid "As this is a staging site and %s is false, reports made on this site will msgstr "Vzhledem k tomu, že je ve stavu 'staging site' a %s je 'nepravda', budou reporty vypracované na tÄ›chto stránkách zaslány uživateli, který nahlásil problém a ne kontaktu uvedenému v nastavenà dané oblasti a kategorie." #: templates/web/zurich/admin/report_edit.html:213 -#, fuzzy msgid "Assign to competent body:" -msgstr "PÅ™iÅ™aÄte externà instituci:" +msgstr "" #: templates/web/zurich/admin/report_edit.html:173 #: templates/web/zurich/admin/stats.html:36 @@ -422,16 +381,16 @@ msgstr "PÅ™iÅ™aÄte oddÄ›lenÃ:" msgid "Assigned to %s" msgstr "PÅ™ÃÅ™azeno: %s" -#: templates/web/base/open311/index.html:84 +#: templates/web/base/open311/index.html:76 msgid "At most %d requests are returned in each query. The returned requests are ordered by requested_datetime, so to get all requests, do several searches with rolling start_date and end_date." msgstr "" -#: templates/web/base/open311/index.html:76 +#: templates/web/base/open311/index.html:68 msgid "At the moment only searching for and looking at reports work." msgstr "V souÄasné dobÄ› funguje pouze vyhledávánà a prohlÞenà nahlášených problémů." #: perllib/FixMyStreet/DB/Result/Problem.pm:373 -#: templates/web/zurich/report/_item.html:11 +#: templates/web/zurich/report/_item.html:9 msgid "Awaiting moderation" msgstr "ÄŒeká se na moderovánÃ" @@ -443,7 +402,7 @@ msgstr "ZpÄ›t" msgid "Ban email address" msgstr "Zakázat emailovou adresu" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1276 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1285 #: perllib/FixMyStreet/Cobrand/Zurich.pm:392 #: templates/web/base/admin/bodies.html:1 templates/web/zurich/header.html:64 msgid "Bodies" @@ -473,7 +432,7 @@ msgid "Can't see the map? <em>Skip this step</em>" msgstr "NevidÃte mapu? <em>vynechte tento krok</em>" #: templates/web/base/admin/body.html:68 -#: templates/web/base/admin/index.html:61 +#: templates/web/base/admin/index.html:54 #: templates/web/base/report/new/category.html:10 #: templates/web/base/report/new/category_wrapper.html:3 #: templates/web/zurich/admin/body.html:14 @@ -484,8 +443,8 @@ msgstr "NevidÃte mapu? <em>vynechte tento krok</em>" msgid "Category" msgstr "Katetorie" -#: templates/web/base/admin/index.html:59 -#: templates/web/base/admin/index.html:67 +#: templates/web/base/admin/index.html:52 +#: templates/web/base/admin/index.html:60 msgid "Category fix rate for problems > 4 weeks old" msgstr "Category fix rate for problems > 4 týdny staré" @@ -498,7 +457,7 @@ msgstr "Category fix rate for problems > 4 týdny staré" msgid "Category:" msgstr "Kategorie:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:402 +#: perllib/FixMyStreet/Script/Reports.pm:180 msgid "Category: %s" msgstr "Kategorie: %s" @@ -560,7 +519,7 @@ msgid "Click here or enter as dd/mm/yyyy" msgstr "KliknÄ›te sem nebo vložte dd/mm/rrrr" #: templates/web/base/around/_report_banner.html:2 -#: templates/web/base/js/translation_strings.html:50 +#: templates/web/base/js/translation_strings.html:55 msgid "Click map to report a problem" msgstr "KliknÄ›te na mapu a nahlaste problém" @@ -587,7 +546,7 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:25 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:144 -#: templates/web/fixmystreet/report/banner.html:15 +#: templates/web/base/report/banner.html:15 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:10 #: templates/web/zurich/admin/header.html:16 @@ -595,7 +554,7 @@ msgstr "" msgid "Closed" msgstr "UzavÅ™ena" -#: perllib/FixMyStreet/DB/Result/Problem.pm:794 +#: perllib/FixMyStreet/DB/Result/Problem.pm:779 msgid "Closed by council" msgstr "UzavÅ™ena úřadem" @@ -621,7 +580,7 @@ msgstr "Data motivu:" msgid "Cobrand:" msgstr "Motiv:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1283 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1292 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "NastavenÃ" @@ -634,13 +593,14 @@ msgstr "Nastavenà Endpointu" msgid "Confirm" msgstr "Potvrdit" -#: templates/web/base/auth/token.html:1 templates/web/zurich/auth/token.html:1 +#: templates/web/base/auth/token.html:1 msgid "Confirm account" msgstr "Potvrdit úÄet" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:33 -#: templates/web/fixmystreet/report/update-form.html:107 -msgid "Confirm by email below, providing a new password at that point. When you confirm, your password will be updated." +#: templates/web/base/report/new/form_user_loggedout_password.html:21 +#: templates/web/base/report/update/form_user_loggedout_password.html:20 +#, fuzzy +msgid "Confirm by email instead, providing a new password at that point. When you confirm, your password will be updated." msgstr "PotvrÄte hlášenà nÞe a zadejte si nové heslo. Jakmile potvrdÃte ověřovacà mail, heslo bude aktualizováno a budete pÅ™ihlášeni do systému." #: templates/web/base/questionnaire/creator_fixed.html:1 @@ -670,35 +630,27 @@ msgid "Confirmed:" msgstr "Potvrzeno:" #. ("%s is the site name") -#: templates/web/base/faq/faq-en-gb.html:8 templates/web/base/footer.html:24 -#: templates/web/base/open311/index.html:8 -#: templates/web/base/static/privacy.html:10 -#: templates/web/fixmystreet/contact/index.html:12 -#, fuzzy +#: templates/web/base/about/_sidebar.html:6 templates/web/base/footer.html:24 msgid "Contact %s" -msgstr "Kontaktujte nás" +msgstr "" #: templates/web/base/contact/index.html:1 #: templates/web/base/contact/index.html:2 #: templates/web/base/contact/submit.html:1 -#: templates/web/fixmystreet/contact/index.html:1 -#: templates/web/fixmystreet/contact/index.html:2 msgid "Contact Us" msgstr "Kontaktujte nás" -#: templates/web/base/contact/index.html:6 -#: templates/web/fixmystreet/contact/index.html:20 +#: templates/web/base/contact/index.html:12 msgid "Contact the team" msgstr "Kontaktujte nás!" #: templates/web/zurich/admin/report_edit-sdm.html:40 #: templates/web/zurich/admin/report_edit.html:59 -#, fuzzy msgid "Coordinates:" -msgstr "SouÅ™adnice:" +msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1420 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1448 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1429 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1457 msgid "Could not find user" msgstr "Uživatele nelze najÃt" @@ -716,7 +668,7 @@ msgstr "Úřad" msgid "Council contacts for %s" msgstr "Kontakty na úřad %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:693 +#: perllib/FixMyStreet/DB/Result/Problem.pm:681 msgid "Council ref: %s" msgstr "ÄÃslo jednacÃ: %s" @@ -731,7 +683,7 @@ msgstr "Úřad:" msgid "Count" msgstr "PoÄet" -#: templates/web/base/email_sent.html:1 templates/web/zurich/email_sent.html:1 +#: templates/web/base/email_sent.html:1 msgid "Create a report" msgstr "VytvoÅ™it report" @@ -741,9 +693,8 @@ msgid "Create category" msgstr "VytvoÅ™it kategorii" #: templates/web/zurich/admin/template_edit.html:29 -#, fuzzy msgid "Create template" -msgstr "VytvoÅ™it report" +msgstr "" #: templates/web/base/admin/problem_row.html:34 #: templates/web/zurich/admin/templates.html:10 @@ -780,7 +731,7 @@ msgstr "PÅ™ehledy" msgid "Dealt with by subdivision within 5 working days" msgstr "Odbavované úřadem do 5 pracovnÃch dnů" -#: perllib/FixMyStreet/App/Controller/Admin.pm:878 +#: perllib/FixMyStreet/App/Controller/Admin.pm:877 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "" @@ -793,7 +744,7 @@ msgstr "" msgid "Deleted" msgstr "Smazána" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:51 +#: templates/web/base/report/new/form_report.html:45 #: templates/web/zurich/admin/index-dm.html:22 #: templates/web/zurich/admin/index-sdm.html:20 #: templates/web/zurich/admin/reports.html:12 @@ -801,12 +752,11 @@ msgid "Description" msgstr "Popis" #: templates/web/base/js/translation_strings.html:34 -#: templates/web/zurich/report/new/fill_in_details_form.html:42 +#: templates/web/zurich/report/new/fill_in_details_form.html:68 msgid "Details" msgstr "Podrobnosti" #: templates/web/base/admin/report_edit.html:20 -#: templates/web/base/report/new/fill_in_details_form.html:62 #: templates/web/zurich/admin/report_edit-sdm.html:27 #: templates/web/zurich/admin/report_edit.html:29 #: templates/web/zurich/admin/report_edit.html:43 @@ -819,38 +769,38 @@ msgstr "PÅ™edáno" #: templates/web/zurich/admin/report_edit-sdm.html:50 #: templates/web/zurich/admin/report_edit.html:69 -#, fuzzy msgid "Didn't use map" -msgstr "bez mapy" +msgstr "" #: templates/web/base/admin/edit-league.html:8 msgid "Diligency prize league table" msgstr "Tabulka VÞěhů" #. ("%s is the site name") -#: templates/web/base/auth/general.html:31 -#: templates/web/base/report/new/fill_in_details_form.html:114 -#: templates/web/base/report/update-form.html:87 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:11 -#: templates/web/fixmystreet/report/update-form.html:86 -#, fuzzy +#: templates/web/base/auth/general.html:48 +#: templates/web/base/report/new/form_user_loggedout.html:18 +#: templates/web/base/report/new/oauth_email_form.html:18 +#: templates/web/base/report/update-form.html:29 +#: templates/web/base/report/update/form_user_loggedout.html:17 msgid "Do you have a %s password?" -msgstr "Máte FixMyStreet heslo?" +msgstr "" #: templates/web/base/questionnaire/index.html:55 msgid "Don’t know" msgstr "Nenà známo" -#: templates/web/fixmystreet/contact/index.html:118 +#: templates/web/base/contact/index.html:110 msgid "Don't like forms?" msgstr "Nechcete Å™eÅ¡it formulářem?" +#: templates/web/base/js/translation_strings.html:51 +msgid "Drag and drop photos here or <u>click to upload</u>" +msgstr "" + #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:14 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:32 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:30 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:36 msgid "Duplicate" msgstr "DuplicitnÃ" @@ -900,7 +850,7 @@ msgstr "Úprava" #: templates/web/base/admin/category_edit.html:91 #: templates/web/base/admin/flagged.html:38 #: templates/web/base/admin/users.html:16 -#: templates/web/base/auth/general.html:22 +#: templates/web/base/auth/general.html:39 #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:24 @@ -908,7 +858,7 @@ msgstr "Úprava" msgid "Email" msgstr "E-Mail" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1396 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1405 msgid "Email added to abuse list" msgstr "E-mail pÅ™idán do seznamu zneužÃvánÃ" @@ -924,7 +874,7 @@ msgstr "" msgid "Email alert deleted" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1393 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1402 msgid "Email already in abuse list" msgstr "E-mail je již v seznamu zneužÃvánÃ" @@ -932,41 +882,36 @@ msgstr "E-mail je již v seznamu zneužÃvánÃ" msgid "Email me new local problems" msgstr "Nová lokálnà hlášenà mi poÅ¡lete mailem" -#: templates/web/base/report/display.html:38 -msgid "Email me updates" -msgstr "ZaÅ¡lete aktualizace mailem" - #: templates/web/base/admin/category_edit.html:31 #: templates/web/base/admin/report_edit.html:62 #: templates/web/base/admin/update_edit.html:33 #: templates/web/base/admin/user-form.html:20 #: templates/web/base/alert/updates.html:13 -#: templates/web/base/report/display.html:42 #: templates/web/zurich/admin/body.html:47 msgid "Email:" msgstr "E-mail:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:329 +#: perllib/FixMyStreet/Script/Reports.pm:108 msgid "Email: %s" msgstr "E-mail: %s" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:639 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:634 msgid "Empty flat or maisonette" msgstr "Prázdný byt nebo mesonet" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:638 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:633 msgid "Empty house or bungalow" msgstr "Prázdný dům nebo bungalow" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:641 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:636 msgid "Empty office or other commercial" msgstr "ZavÅ™ená kancelář nebo komerÄnà prostory" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:642 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:637 msgid "Empty pub or bar" msgstr "ZavÅ™ená hospoda nebo bar" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:643 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:638 msgid "Empty public building - school, hospital, etc." msgstr "Prázdná veÅ™ejná budova - Å¡kola, nemocnice a tp." @@ -999,7 +944,7 @@ msgstr "Endpoint" msgid "Enter a Zürich street name" msgstr "Zadejte název ulice" -#: perllib/FixMyStreet/Cobrand/UK.pm:13 +#: perllib/FixMyStreet/Cobrand/UK.pm:14 msgid "Enter a nearby UK postcode, or street name and area" msgstr "Zadejte nejbližšà PSÄŒ, název ulice nebo oblasti" @@ -1017,14 +962,9 @@ msgstr "Zadejte PSÄŒ, název ulice nebo název oblasti" msgid "Enter a nearby street name and area, postal code or district in Delhi" msgstr "Zadejte nejbližšà název ulice, oblasti, PSÄŒ nebo katastrálnà Äásti" -#: templates/web/base/report/new/fill_in_details_form.html:152 -#: templates/web/base/report/update-form.html:125 -msgid "Enter a new password:" -msgstr "Zadejte nové heslo:" - -#: templates/web/base/auth/general.html:60 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:75 -#: templates/web/fixmystreet/report/update-form.html:123 +#: templates/web/base/auth/general.html:99 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:38 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:13 #: templates/web/zurich/auth/general.html:65 msgid "Enter a password" msgstr "Zadejte heslo" @@ -1034,11 +974,11 @@ msgid "Enter details of the problem" msgstr "UveÄte podrobnosti daného problému" #: templates/web/base/errors/generic.html:1 -#: templates/web/base/errors/generic.html:3 +#: templates/web/base/errors/generic.html:4 #: templates/web/base/tokens/abuse.html:1 #: templates/web/base/tokens/abuse.html:3 #: templates/web/base/tokens/error.html:1 -#: templates/web/base/tokens/error.html:3 +#: templates/web/base/tokens/error.html:5 msgid "Error" msgstr "Chyba" @@ -1051,11 +991,11 @@ msgstr "" msgid "Example postcode %s" msgstr "PÅ™Ãklad PSÄŒ %s" -#: templates/web/base/open311/index.html:94 +#: templates/web/base/open311/index.html:86 msgid "Examples:" msgstr "PÅ™Ãklady:" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:55 +#: templates/web/base/report/new/form_report.html:49 msgid "Explain what’s wrong, exactly where it is, and how long it’s been there…" msgstr "VysvÄ›tlete, co je Å¡patnÄ› a kde, pÅ™ÃpadnÄ› jak dlouho to již trvá a tp. ..." @@ -1096,17 +1036,15 @@ msgstr "Pro opravu vyberte <strong>oblast pokrytÃ</strong> v Äásti <em>Editac msgid "FixMyStreet" msgstr "FixMyStreet" -#: templates/web/base/admin/index.html:61 +#: templates/web/base/admin/index.html:54 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:24 #: templates/web/base/admin/report_blocks.html:9 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:144 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:34 -#: templates/web/fixmystreet/report/banner.html:12 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:32 +#: templates/web/base/report/banner.html:12 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:38 msgid "Fixed" msgstr "VyÅ™eÅ¡ené" @@ -1133,7 +1071,7 @@ msgstr "OznaÄené za smazané" msgid "Flag user" msgstr "Sledovat uživatele" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1281 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1290 #: templates/web/base/admin/users.html:19 msgid "Flagged" msgstr "UrÄeno ke sledovánÃ" @@ -1164,36 +1102,31 @@ msgstr "KliknÄ›te na odkaz pro danou oblast, zobrazà se hlášenà pouze z tà msgid "For more information, see <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>." msgstr "VÃce informacà naleznete v Älánku <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>Jak FixMyStreet použÃvá Mapit</a>." -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:32 -#: templates/web/fixmystreet/report/update-form.html:106 +#: templates/web/base/report/new/form_user_loggedout_password.html:20 +#: templates/web/base/report/update/form_user_loggedout_password.html:19 msgid "Forgotten your password?" msgstr "ZapomnÄ›li jste své heslo?" #: perllib/FixMyStreet/Cobrand/Zurich.pm:752 -#, fuzzy msgid "Forwarded to external body" -msgstr "PÅ™iÅ™aÄte externà instituci:" +msgstr "" #: perllib/FixMyStreet/Cobrand/Zurich.pm:753 -#, fuzzy msgid "Forwarded wish to external body" -msgstr "PÅ™iÅ™aÄte externà instituci:" +msgstr "" -#: templates/web/base/faq/faq-en-gb.html:1 -#: templates/web/base/faq/faq-en-gb.html:13 -#: templates/web/base/faq/faq-en-gb.html:6 -#: templates/web/base/open311/index.html:6 -#: templates/web/base/static/privacy.html:8 -#: templates/web/fixmystreet/contact/index.html:10 +#: templates/web/base/about/_sidebar.html:4 +#: templates/web/base/about/faq-en-gb.html:1 +#: templates/web/base/about/faq-en-gb.html:5 msgid "Frequently Asked Questions" msgstr "ÄŒasto kladené dotazy" -#: templates/web/base/open311/index.html:136 +#: templates/web/base/open311/index.html:128 msgid "GeoRSS on Google Maps" msgstr "GeoRSS na Google Mapách" +#: templates/web/base/report/display_tools.html:11 #: templates/web/fixmystreet/around/_updates.html:3 -#: templates/web/fixmystreet/report/display.html:35 msgid "Get updates" msgstr "ZasÃlánà aktualizacÃ" @@ -1226,7 +1159,7 @@ msgstr "OK" msgid "Going to send questionnaire?" msgstr "Odeslat dotaznÃk?" -#: templates/web/base/admin/index.html:42 +#: templates/web/base/admin/index.html:35 msgid "Graph of problem creation by status over time" msgstr "Graf hlášenà v Äase a jejich stavů" @@ -1243,7 +1176,7 @@ msgid "Have you ever reported a problem to a council before, or is this your fir msgstr "Už jste nÄ›kdy pÅ™ed tÃm hlásili problém úřadu a nebo je toto VaÅ¡e hlášenà poprvé?" #: templates/web/base/footer.html:15 templates/web/fixmystreet/footer.html:38 -#: templates/web/zurich/faq/faq-de-ch.html:1 +#: templates/web/zurich/about/faq-de-ch.html:1 #: templates/web/zurich/footer.html:22 #: templates/web/zurich/nav_over_content.html:8 msgid "Help" @@ -1294,7 +1227,7 @@ msgstr "Jak nahlásit problém" msgid "How to send successful reports" msgstr "Anleitung" -#: perllib/FixMyStreet/App/Controller/Admin.pm:754 +#: perllib/FixMyStreet/App/Controller/Admin.pm:752 msgid "I am afraid you cannot confirm unconfirmed reports." msgstr "Bohužel nemůžete potvrdit nepotvrzená hlášenÃ." @@ -1312,10 +1245,6 @@ msgstr "" msgid "I'm afraid we couldn't locate your problem in the database.\n" msgstr "Bohužel, nelze lokalizovat VaÅ¡e hlášenà v databázi.\n" -#: perllib/FixMyStreet/App/Controller/Tokens.pm:327 -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 "Bohužel nelze ověřit platnost. Pokud jste kopÃrovali URL adresu z e-mailové zprávy, prosÃm zkontrolujte jejà správnost.\n" - #: templates/web/base/admin/flagged.html:14 #: templates/web/base/admin/list_updates.html:6 #: templates/web/base/admin/reports.html:11 @@ -1348,25 +1277,16 @@ msgstr "" msgid "If you get some more information about the status of your problem, please come back to the site and leave an update." msgstr "" -#: templates/web/base/report/new/councils_text_none.html:2 -#: templates/web/base/report/new/councils_text_none.html:8 +#: templates/web/base/report/new/councils_text_none.html:10 +#: templates/web/base/report/new/councils_text_none.html:9 msgid "If you submit a problem here the subject and details of the problem will be public, but the problem will <strong>not</strong> be reported to the council." msgstr "Pokud zde zadáte své hlášenÃ, nadpis a podrobnosti hlášenà budou veÅ™ejné, ale hlášenà <strong>nebude</strong> doruÄeno na úřad." -#: templates/web/zurich/auth/token.html:19 -#: templates/web/zurich/email_sent.html:7 -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 "Pokud použÃváte webový e-mail, nebo máte zapnutý filtr <em>nevyžádané poÅ¡ty</em>, zkontrolujte si <em>hromadnou</em> a <em>spam</em> složky. ObÄas jsou naÅ¡e zprávy jsou tÃmto způsobem oznaÄovány." - #: templates/web/base/questionnaire/index.html:68 -#, fuzzy msgid "" "If you wish to leave a public update on the problem, please enter it here\n" "(please note it will not be sent to the council)." msgstr "" -"Pokud chcete zanechat veÅ™ejnou aktualizaci tohoto hlášenÃ, zadejte ji prosÃm zde\n" -"(Takovéto aktualizace nebudou zaslány na úřad). NapÅ™Ãklad, jakou máte\n" -"osobnà zkuÅ¡enost z Å™eÅ¡enà tohoto problému?" #: templates/web/base/admin/body.html:149 msgid "If you're using <strong>a send method that is not email</strong>, enter the service ID (Open311) or equivalent identifier here." @@ -1408,10 +1328,8 @@ msgstr "Neplatný výbÄ›r zdoje" #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:144 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:32 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:30 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:36 msgid "In Progress" msgstr "v Å™eÅ¡enÃ" @@ -1419,7 +1337,7 @@ msgstr "v Å™eÅ¡enÃ" msgid "In abuse table?" msgstr "V tabulce zneužÃvánÃ?" -#: templates/web/base/open311/index.html:88 +#: templates/web/base/open311/index.html:80 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 "KromÄ› toho, tyto atributy, které nejsou souÄástà specifikace Open311 v2 jsou vráceny: agency_sent_datetime název (také vrácený jako souÄást popisu), interface_used, comment_count, requestor_name (pÅ™Ãtomný pouze tehdy, pokud žadatel povolen název, který bude zobrazen na této stránce) ," @@ -1427,7 +1345,7 @@ msgstr "KromÄ› toho, tyto atributy, které nejsou souÄástà specifikace Open31 #: perllib/FixMyStreet/Cobrand/Zurich.pm:963 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:7 -#: templates/web/fixmystreet/report/banner.html:19 +#: templates/web/base/report/banner.html:19 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:8 msgid "In progress" @@ -1462,7 +1380,7 @@ msgstr "Internà postoupenÃ" msgid "Invalid agency_responsible value %s" msgstr "Chybná agency_responsible hodnota %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1201 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1210 msgid "Invalid end date" msgstr "Chybný koneÄný datum" @@ -1470,7 +1388,7 @@ msgstr "Chybný koneÄný datum" msgid "Invalid format %s specified." msgstr "Chybný formát %s specified." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1206 msgid "Invalid start date" msgstr "Chybné poÄáteÄnà datum" @@ -1478,14 +1396,12 @@ msgstr "Chybné poÄáteÄnà datum" #: templates/web/base/admin/report_blocks.html:5 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:143 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:31 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:29 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:35 msgid "Investigating" msgstr "Å etÅ™enÃ" -#: templates/web/fixmystreet/contact/blurb.html:8 +#: templates/web/base/contact/blurb.html:8 msgid "It's often quickest to <a href=\"%s\">check our FAQs</a> and see if the answer is there." msgstr "ÄŒasto bývá nejrychlejÅ¡Ã <a href=\"%s\">zkontrolovat naÅ¡e Otázky a odpovÄ›di</a> a podÃvat se, zda odpovÄ›Ä nenaleznete zde." @@ -1503,11 +1419,9 @@ msgstr "" msgid "Jurisdiction unknown" msgstr "" -#: templates/web/base/auth/general.html:44 -#: templates/web/base/report/new/fill_in_details_form.html:132 -#: templates/web/base/report/update-form.html:105 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:28 -#: templates/web/fixmystreet/report/update-form.html:102 +#: templates/web/base/auth/general.html:80 +#: templates/web/base/report/new/form_user_loggedout_password.html:16 +#: templates/web/base/report/update/form_user_loggedout_password.html:15 #: templates/web/zurich/auth/general.html:40 msgid "Keep me signed in on this computer" msgstr "Ponechte mÄ› pÅ™ihlášeného na tomto poÄÃtaÄi" @@ -1565,6 +1479,7 @@ msgid "MAP" msgstr "MAPA" #: templates/web/base/js/translation_strings.html:45 +#: templates/web/base/maps/google-ol.html:13 msgid "Map" msgstr "Mapa" @@ -1584,23 +1499,17 @@ msgstr "" msgid "Marked fixed/closed more than eight weeks ago" msgstr "" -#: templates/web/fixmystreet/contact/index.html:106 +#: templates/web/base/contact/index.html:98 msgid "Message" msgstr "Zpráva" #: templates/web/zurich/admin/report_edit.html:284 -#, fuzzy msgid "Message to competent body:" -msgstr "PÅ™iÅ™aÄte externà instituci:" +msgstr "" #: templates/web/zurich/admin/report_edit.html:282 -#, fuzzy msgid "Message to external body:" -msgstr "PÅ™iÅ™aÄte externà instituci:" - -#: templates/web/base/contact/index.html:97 -msgid "Message:" -msgstr "Zpráva:" +msgstr "" #: perllib/FixMyStreet/App/Controller/Open311.pm:445 msgid "Missing jurisdiction_id" @@ -1614,10 +1523,6 @@ msgstr "Moderováno oddÄ›lenÃm bÄ›hem jednoho pracovnÃho dne" msgid "Month" msgstr "MÄ›sÃc" -#: templates/web/base/report/display.html:34 -msgid "More problems nearby" -msgstr "DalÅ¡Ã hlášenà z okolÃ" - #: templates/web/base/admin/bodies.html:21 #: templates/web/base/admin/body-form.html:18 #: templates/web/base/admin/flagged.html:16 @@ -1625,11 +1530,11 @@ msgstr "DalÅ¡Ã hlášenà z okolÃ" #: templates/web/base/admin/list_updates.html:7 #: templates/web/base/admin/reports.html:13 #: templates/web/base/admin/users.html:15 -#: templates/web/base/auth/general.html:50 +#: templates/web/base/auth/general.html:89 +#: templates/web/base/report/new/form_user_loggedin.html:9 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:7 +#: templates/web/base/report/update/form_name.html:4 #: templates/web/base/reports/index.html:20 -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:9 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:44 -#: templates/web/fixmystreet/report/update-form.html:138 #: templates/web/zurich/admin/body-form.html:4 #: templates/web/zurich/auth/general.html:60 #: templates/web/zurich/report/new/fill_in_details_form.html:82 @@ -1643,7 +1548,7 @@ msgstr "Jméno" msgid "Name:" msgstr "Jméno:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:328 +#: perllib/FixMyStreet/Script/Reports.pm:107 msgid "Name: %s" msgstr "Jméno: %s" @@ -1652,16 +1557,16 @@ msgstr "Jméno: %s" msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s" msgstr "Nejbližšà pojmenovaná ulice k umÃstÄ›né znaÄce na mapÄ› (automaticky generováno pomocà OpenStreetMap): %s%s" -#: perllib/FixMyStreet/Cobrand/UK.pm:127 +#: perllib/FixMyStreet/Cobrand/UK.pm:128 msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" msgstr "Nejbližšà PSÄŒ k umÃstÄ›né znaÄce na mapÄ› (automaticky generováno) %s (%sm away)" -#: perllib/FixMyStreet/Cobrand/Default.pm:434 -#: perllib/FixMyStreet/Cobrand/Default.pm:474 +#: perllib/FixMyStreet/Cobrand/Default.pm:455 +#: perllib/FixMyStreet/Cobrand/Default.pm:495 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "Nejbližšà cesta k umÃstÄ›né znaÄce na mapÄ› (automaticky generováno pomocà Bing Mapy): %s" -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:267 +#: perllib/FixMyStreet/Script/Alerts.pm:290 msgid "" "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n" "\n" @@ -1669,14 +1574,9 @@ msgstr "" "Nejbližšà cesta k umÃstÄ›né znaÄce na mapÄ› (automaticky generováno pomocà Bing Mapy): %s\n" "\n" -#: templates/web/zurich/email_sent.html:5 -msgid "Nearly Done! Now check your email..." -msgstr "Téměř hotovo! Nynà zkontrolujte svůj e-mail ..." - #: templates/web/base/auth/token.html:17 templates/web/base/email_sent.html:5 -#, fuzzy msgid "Nearly done! Now check your email…" -msgstr "Téměř hotovo! Nynà zkontrolujte svůj e-mail ..." +msgstr "" #: templates/web/base/reports/index.html:21 msgid "New <br>problems" @@ -1700,9 +1600,8 @@ msgid "New local problems on FixMyStreet" msgstr "Nové lokálnà hlášenà na FixMyStreet" #: templates/web/zurich/admin/report_edit-sdm.html:117 -#, fuzzy msgid "New note to DM:" -msgstr "Nová internà poznámka:" +msgstr "" #: db/alert_types.pl:38 msgid "New problems for {{COUNCIL}} within {{WARD}} ward on FixMyStreet" @@ -1734,9 +1633,8 @@ msgstr "Nový stav" #: templates/web/zurich/admin/template_edit.html:9 #: templates/web/zurich/admin/templates.html:26 -#, fuzzy msgid "New template" -msgstr "Nový stav" +msgstr "" #: templates/web/base/pagination.html:13 msgid "Next" @@ -1753,8 +1651,8 @@ msgstr "DalÅ¡Ã" #: templates/web/base/admin/report_edit.html:75 #: templates/web/base/admin/update_edit.html:25 #: templates/web/base/questionnaire/creator_fixed.html:16 +#: templates/web/base/questionnaire/index.html:101 #: templates/web/base/questionnaire/index.html:53 -#: templates/web/base/questionnaire/index.html:92 msgid "No" msgstr "Ne" @@ -1824,10 +1722,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:13 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:33 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:31 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:37 msgid "Not Responsible" msgstr "NezodpovÃdá" @@ -1835,9 +1731,8 @@ msgstr "NezodpovÃdá" #: perllib/FixMyStreet/Cobrand/Zurich.pm:937 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:13 -#, fuzzy msgid "Not contactable" -msgstr "NezodpovÃdá" +msgstr "" #: templates/web/zurich/admin/report_edit-sdm.html:108 msgid "Not for my subdivision" @@ -1867,7 +1762,7 @@ msgstr "Upozorňujeme, že když zahrnujeme nepotvrzená hlášenÃ, použÃvám msgid "Note:" msgstr "Poznámka:" -#: templates/web/base/open311/index.html:73 +#: templates/web/base/open311/index.html:65 msgid "Note: <strong>%s</strong>" msgstr "Poznámka: <strong>%s</strong>" @@ -1875,13 +1770,15 @@ msgstr "Poznámka: <strong>%s</strong>" msgid "Notes from SDM to DM" msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:113 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:10 +#: templates/web/base/report/new/form_user_loggedout.html:14 +#: templates/web/base/report/new/form_user_loggedout.html:2 +#: templates/web/base/report/new/oauth_email_form.html:17 msgid "Now to submit your report…" msgstr "A teÄ staÄà hlášenà odeslat" -#: templates/web/base/report/update-form.html:86 -#: templates/web/fixmystreet/report/update-form.html:85 +#: templates/web/base/report/update-form.html:28 +#: templates/web/base/report/update/form_user_loggedout.html:13 +#: templates/web/base/report/update/form_user_loggedout.html:2 msgid "Now to submit your update…" msgstr "A nynà pro odeslánà aktualizace…" @@ -1889,11 +1786,6 @@ msgstr "A nynà pro odeslánà aktualizace…" msgid "OK" msgstr "OK" -#: templates/web/base/report/display.html:28 -#: templates/web/base/report/update.html:17 -msgid "Offensive? Unsuitable? Tell us" -msgstr "Urážlivé? Nevhodné? ŘeknÄ›te nám" - #: templates/web/base/reports/index.html:23 msgid "Old / unknown <br>problems" msgstr "Staré / neznámé <br>hlášenÃ" @@ -1910,7 +1802,7 @@ msgstr "StarÅ¡Ã <br>vyÅ™eÅ¡ené" msgid "Older <br>problems" msgstr "StarÅ¡Ã <br>hlášenÃ" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:45 +#: templates/web/base/report/new/form_report.html:15 msgid "One-line summary" msgstr "jednořádkový nadpis" @@ -1921,8 +1813,7 @@ msgstr "jednořádkový nadpis" #: templates/web/base/admin/report_blocks.html:4 #: templates/web/base/admin/update_edit.html:28 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/report/update-form.html:30 -#: templates/web/fixmystreet/report/update-form.html:28 +#: templates/web/base/report/update/form_update.html:34 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:7 #: templates/web/zurich/admin/update_edit.html:18 @@ -1937,15 +1828,15 @@ msgstr "" msgid "Open, but not had any update in eight weeks" msgstr "" -#: templates/web/base/open311/index.html:70 +#: templates/web/base/open311/index.html:62 msgid "Open311 API for the mySociety FixMyStreet server" msgstr "Open311 API pro server mySociety FixMyStreet" -#: templates/web/base/open311/index.html:80 +#: templates/web/base/open311/index.html:72 msgid "Open311 initiative web page" msgstr "Úvodnà webová stránka systému Open311" -#: templates/web/base/open311/index.html:81 +#: templates/web/base/open311/index.html:73 msgid "Open311 specification" msgstr "Specifikace systému Open311" @@ -1957,15 +1848,15 @@ msgstr "Nebo problémy hlášené subjektu:" msgid "Or you can subscribe to an alert based upon what ward or council you’re in:" msgstr "Nebo se můžete pÅ™ihlásit k odbÄ›ru vÅ¡ech upozornÄ›nà na hlášenÃ, které jsou v následujÃcÃch oblastech úřadu Äi ÄástÃ:" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1084 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:673 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:674 -#: perllib/FixMyStreet/DB/Result/Problem.pm:570 -#: perllib/FixMyStreet/DB/Result/Problem.pm:580 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1055 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:669 +#: perllib/FixMyStreet/DB/Result/Problem.pm:558 +#: perllib/FixMyStreet/DB/Result/Problem.pm:568 +#: perllib/FixMyStreet/DB/Result/Problem.pm:578 #: perllib/FixMyStreet/DB/Result/Problem.pm:590 -#: perllib/FixMyStreet/DB/Result/Problem.pm:602 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:397 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:412 +#: perllib/FixMyStreet/Script/Reports.pm:175 +#: perllib/FixMyStreet/Script/Reports.pm:190 msgid "Other" msgstr "OstatnÃ" @@ -1974,7 +1865,7 @@ msgid "Owner" msgstr "VlastnÃk" #: templates/web/base/errors/page_error_404_not_found.html:1 -#: templates/web/base/errors/page_error_404_not_found.html:3 +#: templates/web/base/errors/page_error_404_not_found.html:4 msgid "Page Not Found" msgstr "Stránka nenalezena" @@ -1988,16 +1879,16 @@ msgstr "NadÅ™azený subjekt" msgid "Partial" msgstr "ČásteÄnÄ›" -#: templates/web/base/auth/general.html:53 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:68 -#: templates/web/fixmystreet/report/update-form.html:116 +#: templates/web/base/auth/general.html:92 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:31 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:6 #: templates/web/zurich/auth/general.html:32 #: templates/web/zurich/auth/general.html:63 msgid "Password (optional)" msgstr "Heslo (volitelnÄ›)" #: templates/web/base/auth/change_password.html:25 -#: templates/web/base/auth/general.html:36 +#: templates/web/base/auth/general.html:72 msgid "Password:" msgstr "Heslo:" @@ -2009,45 +1900,37 @@ msgstr "Trvalý odkaz" msgid "Phone number" msgstr "Telefonnà ÄÃslo" -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:26 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:62 +#: templates/web/base/report/new/form_user_loggedin.html:26 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:25 msgid "Phone number (optional)" msgstr "Telefonnà ÄÃslo (volitelnÄ›)" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:306 +#: perllib/FixMyStreet/Script/Reports.pm:83 #: templates/web/base/admin/report_edit.html:63 -#: templates/web/base/report/new/fill_in_details_form.html:198 #: templates/web/zurich/admin/stats.html:39 msgid "Phone:" msgstr "Telefon:" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:66 -#: templates/web/fixmystreet/report/update-form.html:59 +#: templates/web/base/questionnaire/index.html:75 +#: templates/web/base/report/new/form_report.html:23 +#: templates/web/base/report/update/form_update.html:6 #: templates/web/zurich/admin/index-dm.html:29 #: templates/web/zurich/admin/index-sdm.html:24 #: templates/web/zurich/admin/reports.html:16 #: templates/web/zurich/admin/stats.html:37 -#: templates/web/zurich/report/new/fill_in_details_form.html:52 +#: templates/web/zurich/report/new/fill_in_details_form.html:45 msgid "Photo" msgstr "Fotografie" -#: perllib/FixMyStreet/App/Controller/Photo.pm:221 -#, fuzzy +#: perllib/FixMyStreet/App/Controller/Photo.pm:187 msgid "Photo is required." -msgstr "Tato informace je vyžadována" +msgstr "" #: templates/web/base/admin/category_edit.html:48 -#, fuzzy msgid "Photo required" -msgstr "Tato informace je vyžadována" - -#: templates/web/base/questionnaire/index.html:80 -#: templates/web/base/report/new/fill_in_details_form.html:84 -#: templates/web/base/report/update-form.html:62 -msgid "Photo:" -msgstr "Fotografie:" +msgstr "" -#: templates/web/base/alert/list.html:26 +#: templates/web/base/alert/list.html:23 msgid "Photos of recent nearby reports" msgstr "Fotografie nedávných okolnÃch hlášenÃ" @@ -2076,20 +1959,16 @@ msgstr "BuÄte prosÃm zdvoÅ™ilÃ, struÄnà a vyjadÅ™ujte se k vÄ›ci." msgid "Please check the passwords and try again" msgstr "Zkontrolujte prosÃm hesla a zkuste znovu" -#: templates/web/zurich/auth/token.html:16 -msgid "Please check your email" -msgstr "Zkontrolujte svůj mail" - -#: templates/web/base/auth/general.html:10 -#: templates/web/base/auth/general.html:16 +#: templates/web/base/auth/general.html:27 +#: templates/web/base/auth/general.html:33 #: templates/web/zurich/auth/general.html:3 #: templates/web/zurich/auth/general.html:9 msgid "Please check your email address is correct" msgstr "Zkontrolujte, zda je vaÅ¡e emailová adresa správná" #: perllib/FixMyStreet/App/Controller/Admin.pm:343 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:883 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:948 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:878 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:943 #: perllib/FixMyStreet/DB/Result/Problem.pm:412 #: templates/web/base/js/translation_strings.html:9 msgid "Please choose a category" @@ -2103,28 +1982,29 @@ msgstr "Zvolte typ nemovitosti" msgid "Please correct the errors below" msgstr "Opravte prosÃm chyby uvedené nÞe" -#: templates/web/base/contact/blurb.html:2 -#: templates/web/fixmystreet/contact/blurb.html:12 -#, fuzzy +#: templates/web/base/contact/blurb.html:12 msgid "" "Please do <strong>not</strong> report problems through this form; messages go to\n" "the team behind this site, not a council. To report a problem,\n" "please <a href=\"/\">go to the front page</a> and follow the instructions." msgstr "" -"<strong>NeposÃlejte</strong> hlášenà problémů prostÅ™ednictvÃm tohoto formuláře: zprávy jsou zasÃlány\n" -"pouze týmuFixMyStreet, ale ne kompetentnÃm úřadům. Pro nahlášenà problémů\n" -"prosÃm <a href=\"/\">pÅ™ejdÄ›te na titulnà stranu</a> a Å™iÄte se instrukcemi." #: templates/web/base/report/new/notes.html:6 msgid "Please do not be abusive — abusing your council devalues the service for all users." msgstr "NezneužÃvejte tento nástroj - zneužÃvánà vaÅ¡eho úřadu znehodnocuje službu pro vÅ¡echny uživatele." #: perllib/FixMyStreet/App/Controller/Admin.pm:346 -#: perllib/FixMyStreet/DB/Result/Comment.pm:126 +#: perllib/FixMyStreet/DB/Result/Comment.pm:125 #: templates/web/base/js/translation_strings.html:2 msgid "Please enter a message" msgstr "prosÃm zadejte zprávu" +#: perllib/FixMyStreet/App/Controller/Admin.pm:1091 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1146 +#, fuzzy +msgid "Please enter a name" +msgstr "Zadejte vaÅ¡e jméno" + #: templates/web/base/auth/change_password.html:12 #: templates/web/base/auth/change_password.html:15 #: templates/web/base/js/translation_strings.html:19 @@ -2137,10 +2017,10 @@ msgstr "ProsÃm zadejte heslo" msgid "Please enter a subject" msgstr "ProsÃm zadejte název" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1084 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1137 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1087 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1142 #: perllib/FixMyStreet/App/Controller/Admin.pm:345 -#: perllib/FixMyStreet/DB/Result/User.pm:127 +#: perllib/FixMyStreet/DB/Result/User.pm:133 #: templates/web/base/js/translation_strings.html:12 #: templates/web/base/js/translation_strings.html:16 msgid "Please enter a valid email" @@ -2157,9 +2037,9 @@ msgid "Please enter some details" msgstr "ProsÃm zadejte podrobnosti" #: perllib/FixMyStreet/App/Controller/Contact.pm:113 -#: perllib/FixMyStreet/DB/Result/User.pm:124 -#: templates/web/base/auth/general.html:10 -#: templates/web/base/auth/general.html:15 +#: perllib/FixMyStreet/DB/Result/User.pm:130 +#: templates/web/base/auth/general.html:27 +#: templates/web/base/auth/general.html:32 #: templates/web/base/js/translation_strings.html:11 #: templates/web/base/js/translation_strings.html:15 #: templates/web/zurich/auth/general.html:3 @@ -2167,7 +2047,7 @@ msgstr "ProsÃm zadejte podrobnosti" msgid "Please enter your email" msgstr "ProsÃm zadejte váš e-mail" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:7 +#: templates/web/base/report/new/form_user_loggedout_email.html:7 #: templates/web/zurich/report/new/fill_in_details_form.html:80 msgid "Please enter your email address" msgstr "ProsÃm zadejte vaÅ¡i emailovou adresu" @@ -2176,15 +2056,15 @@ msgstr "ProsÃm zadejte vaÅ¡i emailovou adresu" msgid "Please enter your first name" msgstr "Zadejte vaÅ¡e jméno" -#: perllib/FixMyStreet/Cobrand/UK.pm:318 +#: perllib/FixMyStreet/Cobrand/UK.pm:319 #: templates/web/base/js/translation_strings.html:7 msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below" msgstr "Zadejte své celé jméno, úřad potÅ™ebuje tyto informace - jestliže si pÅ™ejete, aby VaÅ¡e jméno nebylo na webu zobrazeno, odÅ¡krtnÄ›nte ÄvereÄek nÞe" #: perllib/FixMyStreet/App/Controller/Contact.pm:112 -#: perllib/FixMyStreet/DB/Result/Comment.pm:123 +#: perllib/FixMyStreet/DB/Result/Comment.pm:122 #: perllib/FixMyStreet/DB/Result/Problem.pm:406 -#: perllib/FixMyStreet/DB/Result/User.pm:120 +#: perllib/FixMyStreet/DB/Result/User.pm:126 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter your name" msgstr "Zadejte vaÅ¡e jméno" @@ -2211,12 +2091,11 @@ msgstr "Můžete se kdykoliv znovu <a href=\"%s\">pÅ™ipojit</a>, nebo pÅ™ejÃt msgid "Please fill in details of the problem below." msgstr "ProsÃm, nÞe vyplňte údaje o hlášeném problému." -#: templates/web/zurich/report/new/fill_in_details_form.html:46 +#: templates/web/zurich/report/new/fill_in_details_form.html:72 msgid "Please fill in details of the problem." msgstr "ProsÃm, vyplňte údaje o hlášeném problému." -#: templates/web/base/report/new/fill_in_details_form.html:28 -#: templates/web/fixmystreet/report/new/sidebar.html:7 +#: templates/web/base/report/new/sidebar.html:7 #: templates/web/zurich/report/new/fill_in_details_form.html:20 msgid "Please fill in the form below with details of the problem, and describe the location as precisely as possible in the details box." msgstr "Vyplňte prosÃm nÞe uvedený formulář s údaji o problému, a popiÅ¡te mÃsto tak pÅ™esnÄ›, jak je to možné v poli podrobnosti." @@ -2225,20 +2104,24 @@ msgstr "Vyplňte prosÃm nÞe uvedený formulář s údaji o problému, a popi msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "UveÄte, zda chcete dostat dalÅ¡Ã dotaznÃk" -#: templates/web/fixmystreet/report/updates-sidebar-notes.html:4 +#: templates/web/base/report/updates-sidebar-notes.html:2 msgid "Please note that updates are not sent to the council." msgstr "VezmÄ›te prosÃm na vÄ›domÃ, že aktualizace nejsou odeslány na úřad." -#: templates/web/base/report/update-form.html:7 -msgid "Please note that updates are not sent to the council. If you leave your name it will be public. Your information will only be used in accordance with our <a href=\"/faq#privacy\">privacy policy</a>" -msgstr "VezmÄ›te prosÃm na vÄ›domÃ, že aktualizace nejsou odeslány na úřad. Uvedete-li zde své jméno, bude veÅ™ejnÄ› zobrazené. VaÅ¡e údaje budou použity pouze v souladu s naÅ¡imi <a href=\"/faq#privacy\"> zásadami ochrany osobnÃch údajů </a>" +#: templates/web/base/report/new/oauth_email_form.html:4 +#, fuzzy +msgid "Please note your report has <strong>not yet been sent</strong>." +msgstr "VezmÄ›te prosÃm na vÄ›domÃ, že vaÅ¡e zpráva <strong> jeÅ¡tÄ› nebyla zaslána </strong>. Vyberte si kategorii a pÅ™idejte dalÅ¡Ã informace nÞe, a pak odeÅ¡lete." -#: templates/web/base/report/new/fill_in_details_form.html:8 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:21 +#: templates/web/base/report/new/fill_in_details_form.html:20 #: templates/web/zurich/report/new/fill_in_details_form.html:11 msgid "Please note your report has <strong>not yet been sent</strong>. Choose a category and add further information below, then submit." msgstr "VezmÄ›te prosÃm na vÄ›domÃ, že vaÅ¡e zpráva <strong> jeÅ¡tÄ› nebyla zaslána </strong>. Vyberte si kategorii a pÅ™idejte dalÅ¡Ã informace nÞe, a pak odeÅ¡lete." +#: templates/web/base/report/display.html:26 +msgid "Please note your update has <strong>not yet been posted</strong>." +msgstr "" + #: templates/web/base/report/new/notes.html:1 #: templates/web/zurich/report/new/notes.html:1 msgid "Please note:" @@ -2258,9 +2141,8 @@ msgid "Please say whether you've ever reported a problem to your council before" msgstr "ProsÃm, Å™eknÄ›te, jestli jste nÄ›kdy pÅ™edtÃm hlásili problémy na váš úřad" #: templates/web/zurich/admin/report_edit.html:208 -#, fuzzy msgid "Please select a body." -msgstr "Zvolte subjekt" +msgstr "" #: perllib/FixMyStreet/App/Controller/Alert.pm:80 msgid "Please select the feed you want" @@ -2277,6 +2159,7 @@ msgstr "UveÄte, prosÃm, zda byl Äi nebyl problém vyÅ™eÅ¡en" #: perllib/FixMyStreet/App/Model/PhotoSet.pm:117 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:145 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:147 +#: templates/web/base/js/translation_strings.html:53 msgid "Please upload a JPEG image only" msgstr "ProsÃm, nahrávejte pouze obrázky ve formátu JPEG" @@ -2284,18 +2167,14 @@ msgstr "ProsÃm, nahrávejte pouze obrázky ve formátu JPEG" msgid "Please write a message" msgstr "NapiÅ¡te zprávu" -#: templates/web/fixmystreet/report/update-form.html:23 +#: templates/web/base/report/update/form_update.html:29 msgid "Please write your update here" msgstr "Aktuálnà informace doplňte prosÃm zde" -#: templates/web/base/contact/index.html:100 -#: templates/web/base/report/update-form.html:110 -#: templates/web/base/report/update-form.html:132 -#: templates/web/base/report/update-form.html:72 -#: templates/web/fixmystreet/contact/index.html:113 -#: templates/web/fixmystreet/report/update-form.html:124 -#: templates/web/fixmystreet/report/update-form.html:71 -#: templates/web/fixmystreet/report/update-form.html:97 +#: templates/web/base/contact/index.html:105 +#: templates/web/base/report/update-form.html:24 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:14 +#: templates/web/base/report/update/form_user_loggedout_password.html:10 msgid "Post" msgstr "Odeslat" @@ -2323,12 +2202,9 @@ msgstr "PÅ™edcházejÃcÃ" msgid "Privacy" msgstr "Ochrana osobnÃch údajů" -#: templates/web/base/faq/faq-en-gb.html:7 -#: templates/web/base/open311/index.html:7 -#: templates/web/base/static/privacy.html:1 -#: templates/web/base/static/privacy.html:2 -#: templates/web/base/static/privacy.html:9 -#: templates/web/fixmystreet/contact/index.html:11 +#: templates/web/base/about/_sidebar.html:5 +#: templates/web/base/about/privacy.html:1 +#: templates/web/base/about/privacy.html:2 msgid "Privacy and cookies" msgstr "" @@ -2356,12 +2232,12 @@ msgstr "Hlášenà %s potvrzeno" msgid "Problem %s sent to council %s" msgstr "Hlášenà %s bylo odesláno na úřad %s" -#: templates/web/base/admin/index.html:46 +#: templates/web/base/admin/index.html:39 #: templates/web/zurich/admin/index.html:9 msgid "Problem breakdown by state" msgstr "ÄŒlenÄ›nà hlášenà podle stavu" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1055 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1058 msgid "Problem marked as open." msgstr "Hlášenà bylo oznaÄeno za otevÅ™ené." @@ -2377,11 +2253,11 @@ msgstr "HlášenÃ" msgid "Problems in this area" msgstr "Hlášenà v této oblasti" -#: templates/web/fixmystreet/report/display.html:43 +#: templates/web/base/report/display_tools.html:19 msgid "Problems nearby" msgstr "Hlášenà v okolÃ" -#: templates/web/fixmystreet/report/display.html:41 +#: templates/web/base/report/display_tools.html:17 msgid "Problems on the map" msgstr "Hlášenà na mapÄ›" @@ -2393,24 +2269,23 @@ msgstr "Hlášenà oznaÄená za vyÅ™eÅ¡ená na serveru FixMyStreet" msgid "Problems within %.1fkm of this location" msgstr "Hlášenà v okolà %.1fkm od tohoto mÃsta" -#: perllib/FixMyStreet/Cobrand/Default.pm:642 +#: perllib/FixMyStreet/Cobrand/Default.pm:663 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:120 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:139 -#: perllib/FixMyStreet/Cobrand/UK.pm:207 +#: perllib/FixMyStreet/Cobrand/UK.pm:208 msgid "Problems within %s" msgstr "Hlášenà v oblasti %s" #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:128 -#: perllib/FixMyStreet/Cobrand/UK.pm:221 +#: perllib/FixMyStreet/Cobrand/UK.pm:222 msgid "Problems within %s ward" msgstr "Hlášenà v oblasti %s" #. ("First %s is the body name, second %s the site name") #: templates/web/base/reports/body.html:0 #: templates/web/base/reports/body.html:24 -#, fuzzy msgid "Problems within %s, %s" -msgstr "Hlášenà v oblasti %s" +msgstr "" #: templates/web/base/alert/_list.html:42 msgid "Problems within the boundary of:" @@ -2424,19 +2299,16 @@ msgstr "Adresa nemovitosti:" msgid "Property type:" msgstr "Typ nemovitosti:" -#: templates/web/base/report/update-form.html:3 -#: templates/web/fixmystreet/report/update-form.html:4 +#: templates/web/base/report/update-form.html:6 msgid "Provide an update" msgstr "PoskytnÄ›te aktuálnà informace" -#: templates/web/base/auth/general.html:56 +#: templates/web/base/auth/general.html:95 msgid "Providing a name and password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." msgstr "Poskytnutà jména a hesla je volitelné, zato vám ale umožnà snadnÄ›ji nahlásit problémy, hlásit aktualizace a spravovat svá hlášenÃ." -#: templates/web/base/report/new/fill_in_details_form.html:156 -#: templates/web/base/report/update-form.html:129 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:71 -#: templates/web/fixmystreet/report/update-form.html:119 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:34 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:9 msgid "Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." msgstr "Poskytnutà hesla je volitelné, zato vám ale umožnà snadnÄ›ji nahlásit problémy, hlásit aktualizace a spravovat svá hlášenÃ." @@ -2472,18 +2344,17 @@ msgstr "DotaznÃk vyplňuje uživatel, který podal hlášenà problému" #: templates/web/base/alert/_list.html:22 #: templates/web/base/around/display_location.html:1 #: templates/web/base/around/display_location.html:3 -#: templates/web/base/report/display.html:50 +#: templates/web/base/report/display_tools.html:34 #: templates/web/base/reports/_rss.html:1 #: templates/web/fixmystreet/alert/updates.html:9 -#: templates/web/fixmystreet/report/display.html:58 msgid "RSS feed" msgstr "RSS kanál" -#: perllib/FixMyStreet/Cobrand/UK.pm:250 perllib/FixMyStreet/Cobrand/UK.pm:262 +#: perllib/FixMyStreet/Cobrand/UK.pm:251 perllib/FixMyStreet/Cobrand/UK.pm:263 msgid "RSS feed for %s" msgstr "RSS kanál pro %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:256 perllib/FixMyStreet/Cobrand/UK.pm:268 +#: perllib/FixMyStreet/Cobrand/UK.pm:257 perllib/FixMyStreet/Cobrand/UK.pm:269 msgid "RSS feed for %s ward, %s" msgstr "RSS kanál pro oblast %s, %s" @@ -2491,11 +2362,11 @@ msgstr "RSS kanál pro oblast %s, %s" #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:163 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:173 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:181 -#: perllib/FixMyStreet/Cobrand/UK.pm:276 perllib/FixMyStreet/Cobrand/UK.pm:288 +#: perllib/FixMyStreet/Cobrand/UK.pm:277 perllib/FixMyStreet/Cobrand/UK.pm:289 msgid "RSS feed of %s" msgstr "RSS kanál pro %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:281 perllib/FixMyStreet/Cobrand/UK.pm:293 +#: perllib/FixMyStreet/Cobrand/UK.pm:282 perllib/FixMyStreet/Cobrand/UK.pm:294 msgid "RSS feed of %s, within %s ward" msgstr "RSS kanál pro %s, v oblasti %s " @@ -2507,15 +2378,15 @@ msgstr "RSS kanál hlášenà v okolÃ" msgid "RSS feed of problems in this %s" msgstr "RSS kanál hlášenà v oblasti %s" -#: perllib/FixMyStreet/Cobrand/Default.pm:643 +#: perllib/FixMyStreet/Cobrand/Default.pm:664 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:121 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:138 -#: perllib/FixMyStreet/Cobrand/UK.pm:214 +#: perllib/FixMyStreet/Cobrand/UK.pm:215 msgid "RSS feed of problems within %s" msgstr "RSS kanál hlášenà v oblasti %s" #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:127 -#: perllib/FixMyStreet/Cobrand/UK.pm:220 +#: perllib/FixMyStreet/Cobrand/UK.pm:221 msgid "RSS feed of problems within %s ward" msgstr "RSS kanál hlášenà v oblasti %s " @@ -2524,25 +2395,22 @@ msgstr "RSS kanál hlášenà v oblasti %s " msgid "RSS feed of recent local problems" msgstr "RSS kanál aktuálnÃch lokálnÃch hlášenÃ" -#: templates/web/base/report/display.html:50 +#: templates/web/base/report/display_tools.html:34 #: templates/web/fixmystreet/alert/updates.html:9 -#: templates/web/fixmystreet/report/display.html:58 msgid "RSS feed of updates to this problem" msgstr "RSS kanál aktualizacà tohoto hlášenÃ" #: templates/web/base/alert/updates.html:9 -#: templates/web/base/report/display.html:41 +#: templates/web/base/report/display_tools.html:36 #: templates/web/fixmystreet/alert/updates.html:14 -#: templates/web/fixmystreet/report/display.html:60 msgid "Receive email when updates are left on this problem." msgstr "Dostávat e-mail, když je hlášenà aktualizováno." #. ("%s is the site name") #: templates/web/base/around/display_location.html:0 #: templates/web/base/around/display_location.html:33 -#, fuzzy msgid "Recent local problems, %s" -msgstr "Aktuálnà lokálnà hlášenÃ, FixMyStreet" +msgstr "" #: templates/web/base/reports/index.html:24 msgid "Recently <br>fixed" @@ -2560,16 +2428,15 @@ msgstr "UvÄ›domte si, že FixMyStreet je pÅ™edevÅ¡Ãm pro hlášenà fyzických msgid "Remove flag" msgstr "Odstranit pÅ™Ãznak" -#: templates/web/base/admin/report_edit.html:92 -#: templates/web/base/admin/update_edit.html:62 +#: templates/web/base/admin/report_edit.html:93 +#: templates/web/base/admin/update_edit.html:67 #: templates/web/zurich/admin/update_edit.html:35 msgid "Remove photo (can't be undone!)" msgstr "Odstranit fotografii (nelze vrátit zpÄ›t!)" #: templates/web/zurich/admin/report_edit.html:243 -#, fuzzy msgid "Reply to user:" -msgstr "editace uživatele" +msgstr "" #: templates/web/fixmystreet/header_logo.html:2 msgid "Report" @@ -2582,7 +2449,7 @@ msgstr "" msgid "Report a problem" msgstr "Nahlásit problém" -#: templates/web/fixmystreet/report/display.html:32 +#: templates/web/base/report/display_tools.html:8 msgid "Report abuse" msgstr "Nevhodný obsah" @@ -2591,7 +2458,8 @@ msgid "Report on %s" msgstr "Hlášenà na webu %s" #: templates/web/base/report/new/fill_in_details_form.html:1 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:2 +#: templates/web/base/report/new/login_success_form.html:1 +#: templates/web/base/report/new/oauth_email_form.html:1 msgid "Report your problem" msgstr "Nahlášenà problému" @@ -2600,9 +2468,8 @@ msgstr "Nahlášenà problému" msgid "Report, view, or discuss local problems" msgstr "HlášenÃ, zobrazenà a diskuse nad lokálnÃmi problémy" -#: perllib/FixMyStreet/DB/Result/Problem.pm:585 -#: templates/web/base/contact/index.html:50 -#: templates/web/fixmystreet/contact/index.html:65 +#: perllib/FixMyStreet/DB/Result/Problem.pm:573 +#: templates/web/base/contact/index.html:57 msgid "Reported anonymously at %s" msgstr "Nahlášeno anonymnÄ› v %s" @@ -2611,43 +2478,41 @@ msgstr "Nahlášeno anonymnÄ› v %s" msgid "Reported before" msgstr "Hlásil(a) jsem již dÅ™Ãve" -#: perllib/FixMyStreet/DB/Result/Problem.pm:608 -#: templates/web/base/contact/index.html:52 -#: templates/web/fixmystreet/contact/index.html:67 +#: perllib/FixMyStreet/DB/Result/Problem.pm:596 +#: templates/web/base/contact/index.html:59 msgid "Reported by %s at %s" msgstr "Nahlášeno uživatelem %s, urÄeno pro %s" #: templates/web/zurich/admin/report_edit-sdm.html:58 #: templates/web/zurich/admin/report_edit.html:86 -#, fuzzy msgid "Reported by:" -msgstr "Nahlášeno uživatelem" +msgstr "" #: templates/web/zurich/report/_main.html:2 msgid "Reported in the %s category" msgstr "Nahlášeno v kategorii %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:581 +#: perllib/FixMyStreet/DB/Result/Problem.pm:569 msgid "Reported in the %s category anonymously at %s" msgstr "Nahlášeno anonymnÄ› v %s v kategorii %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:603 +#: perllib/FixMyStreet/DB/Result/Problem.pm:591 msgid "Reported in the %s category by %s at %s" msgstr "Nahlášeno v kategorii %s uživatelem %s v %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:577 +#: perllib/FixMyStreet/DB/Result/Problem.pm:565 msgid "Reported via %s anonymously at %s" msgstr "Nahlášeno prostÅ™ednictvÃm %s anonymnÄ› v %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:599 +#: perllib/FixMyStreet/DB/Result/Problem.pm:587 msgid "Reported via %s by %s at %s" msgstr "Nahlášeno prostÅ™ednictvÃm %s uživatelem %s v %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:573 +#: perllib/FixMyStreet/DB/Result/Problem.pm:561 msgid "Reported via %s in the %s category anonymously at %s" msgstr "Nahlášeno prostÅ™ednictvÃm %s v kategorii %s anonymnÄ› v %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:593 +#: perllib/FixMyStreet/DB/Result/Problem.pm:581 msgid "Reported via %s in the %s category by %s at %s" msgstr "Nahlášeno prostÅ™ednictvÃm %s v kategorii %s uživatelem %s v %s" @@ -2657,9 +2522,8 @@ msgstr "" #: templates/web/zurich/admin/report_edit-sdm.html:36 #: templates/web/zurich/admin/report_edit.html:55 -#, fuzzy msgid "Reported:" -msgstr "Nahlášeno uživatelem" +msgstr "" #: templates/web/base/around/index.html:2 #: templates/web/base/js/translation_strings.html:41 @@ -2669,13 +2533,13 @@ msgstr "Nahlášeno uživatelem" msgid "Reporting a problem" msgstr "Hlášenà problému" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1277 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1286 #: perllib/FixMyStreet/Cobrand/Zurich.pm:384 #: templates/web/zurich/header.html:60 msgid "Reports" msgstr "HlášenÃ" -#: perllib/FixMyStreet/Cobrand/UK.pm:327 perllib/FixMyStreet/Cobrand/UK.pm:331 +#: perllib/FixMyStreet/Cobrand/UK.pm:328 perllib/FixMyStreet/Cobrand/UK.pm:332 msgid "Reports are limited to %s characters in length. Please shorten your report" msgstr "Délka hlášenà je omezena na %s znaků. ProsÃm, zkraÅ¥te své hlášenÃ" @@ -2712,15 +2576,17 @@ msgstr "" msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1495 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1500 -#: templates/web/base/admin/report_edit.html:88 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1508 +#: templates/web/base/admin/report_edit.html:90 +#: templates/web/base/admin/update_edit.html:64 #: templates/web/zurich/admin/report_edit.html:116 msgid "Rotate Left" msgstr "OtoÄit doleva" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1495 -#: templates/web/base/admin/report_edit.html:89 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 +#: templates/web/base/admin/report_edit.html:91 +#: templates/web/base/admin/update_edit.html:65 #: templates/web/zurich/admin/report_edit.html:117 msgid "Rotate Right" msgstr "OtoÄit doprava" @@ -2730,7 +2596,6 @@ msgid "Rotating this photo will discard unsaved changes to the report." msgstr "" #: templates/web/base/js/translation_strings.html:46 -#: templates/web/base/maps/google-ol.html:13 msgid "Satellite" msgstr "SatelitnÃ" @@ -2783,16 +2648,14 @@ msgid "Select an area" msgstr "Zvolte oblast" #: templates/web/base/alert/_list.html:10 -#, fuzzy msgid "Select which type of alert you’d like and click the button for an RSS feed, or enter your email address to subscribe to an email alert." -msgstr "Vyberte, jaký typ upozornÄ›nà chcete a kliknÄ›te na tlaÄÃtko pro RSS kanály, nebo zadejte svou e-mailovou adresu k odbÄ›ru e-mailového upozornÄ›nÃ." +msgstr "" #: perllib/FixMyStreet/Cobrand/Zurich.pm:835 -#, fuzzy msgid "Sent report back" -msgstr "OtevÅ™ená hlášenÃ" +msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:708 +#: perllib/FixMyStreet/DB/Result/Problem.pm:696 msgid "Sent to %s %s later" msgstr "odesláno do %s o %s pozdÄ›ji" @@ -2805,15 +2668,13 @@ msgstr "Odeslat:" msgid "Service:" msgstr "Služba:" -#: templates/web/fixmystreet/report/display.html:38 +#: templates/web/base/report/display_tools.html:14 msgid "Share" msgstr "SdÃlet" -#: templates/web/base/report/new/fill_in_details_form.html:193 -#: templates/web/base/report/update-form.html:158 -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:23 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:59 -#: templates/web/fixmystreet/report/update-form.html:146 +#: templates/web/base/report/new/form_user_loggedin.html:23 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:22 +#: templates/web/base/report/update/form_name.html:15 msgid "Show my name publicly" msgstr "Zobrazit moje jméno veÅ™ejnÄ›" @@ -2825,9 +2686,9 @@ msgstr "Zobrazit stará" msgid "Show pins" msgstr "Zobrazit znaÄky" +#: templates/web/base/auth/general.html:100 #: templates/web/base/auth/general.html:3 -#: templates/web/base/auth/general.html:40 -#: templates/web/base/auth/general.html:61 +#: templates/web/base/auth/general.html:76 #: templates/web/zurich/auth/general.html:18 #: templates/web/zurich/auth/general.html:35 msgid "Sign in" @@ -2854,7 +2715,7 @@ msgid "" " sent from your FixMyStreet installation." msgstr "" -#: templates/web/base/alert/index.html:42 +#: templates/web/base/alert/index.html:40 msgid "Some photos of recent reports" msgstr "NÄ›které fotografie souÄasných hlášenÃ" @@ -2864,7 +2725,7 @@ msgstr "NÄ›které fotografie souÄasných hlášenÃ" msgid "Some text to localize" msgstr "Specifický název pro lokalizaci" -#: perllib/FixMyStreet/Cobrand/UK.pm:78 +#: perllib/FixMyStreet/Cobrand/UK.pm:79 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover." msgstr "Je nám lÃto, že se zdá, že toto PSÄŒ nepokrýváme." @@ -2876,23 +2737,34 @@ msgstr "" msgid "Sorry, there has been an error confirming your problem." msgstr "Omlouváme se, doÅ¡lo k chybÄ› potvrzujÃcà váš problém." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:221 -#: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:37 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:216 +#: perllib/FixMyStreet/Geocode.pm:38 perllib/FixMyStreet/Geocode/Bing.pm:38 #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:56 #: perllib/FixMyStreet/Geocode/OSM.pm:48 msgid "Sorry, we could not find that location." msgstr "Nemůžeme bohužel nalézt tuto lokalitu." -#: perllib/FixMyStreet/Geocode/Bing.pm:34 +#: templates/web/base/auth/general.html:9 +#: templates/web/base/report/display.html:21 +#: templates/web/base/report/new/fill_in_details_form.html:23 +#, fuzzy +msgid "Sorry, we could not log you in. Please fill in the form below." +msgstr "Omlouváme se, nelze lokalizovat. Zkuste jeÅ¡tÄ› jednou." + +#: perllib/FixMyStreet/Geocode/Bing.pm:35 #: perllib/FixMyStreet/Geocode/Google.pm:45 #: perllib/FixMyStreet/Geocode/Zurich.pm:88 msgid "Sorry, we could not parse that location. Please try again." msgstr "Omlouváme se, nelze lokalizovat. Zkuste jeÅ¡tÄ› jednou." #: perllib/FixMyStreet/App/Model/PhotoSet.pm:134 -#, fuzzy msgid "Sorry, we couldn't save your image(s), please try again." -msgstr "Omlouváme se, nelze lokalizovat. Zkuste jeÅ¡tÄ› jednou." +msgstr "" + +#: perllib/FixMyStreet/App/Controller/AuthSS.pm:301 +#, fuzzy +msgid "Sorry, you can not log in with Facebook. Please try again later." +msgstr "Nastal problém v zobrazenà této stránky. ProsÃm, zkuste pozdÄ›ji." #: templates/web/base/admin/stats.html:64 msgid "Start Date:" @@ -2902,13 +2774,12 @@ msgstr "PoÄáteÄnà datum:" #: templates/web/base/admin/flagged.html:18 #: templates/web/base/admin/list_updates.html:11 #: templates/web/base/admin/reports.html:15 -#: templates/web/fixmystreet/report/update-form.html:26 +#: templates/web/base/report/update/form_update.html:32 msgid "State" msgstr "Stav" #: templates/web/base/admin/report_edit.html:47 #: templates/web/base/admin/update_edit.html:27 -#: templates/web/base/report/update-form.html:28 #: templates/web/zurich/admin/report_edit-sdm.html:73 #: templates/web/zurich/admin/report_edit.html:101 #: templates/web/zurich/admin/report_edit.html:155 @@ -2916,7 +2787,7 @@ msgstr "Stav" msgid "State:" msgstr "Stav:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1282 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1291 #: perllib/FixMyStreet/Cobrand/Zurich.pm:387 #: templates/web/base/admin/stats.html:1 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:73 @@ -2938,7 +2809,7 @@ msgstr "Stále otevÅ™eno, prostÅ™ednictvÃm dotaznÃku, %s" msgid "Street View" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:406 +#: perllib/FixMyStreet/Script/Reports.pm:184 msgid "Subcategory: %s" msgstr "Podkategorie: %s" @@ -2946,30 +2817,25 @@ msgstr "Podkategorie: %s" msgid "Subdivision/Body" msgstr "OddÄ›lenÃ/Instituce" -#: templates/web/fixmystreet/contact/index.html:98 +#: templates/web/base/contact/index.html:90 msgid "Subject" msgstr "PÅ™edmÄ›t" #: templates/web/base/admin/report_edit.html:19 -#: templates/web/base/contact/index.html:88 -#: templates/web/base/report/new/fill_in_details_form.html:53 #: templates/web/zurich/admin/report_edit.html:39 msgid "Subject:" msgstr "PÅ™edmÄ›t:" #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/fill_in_details_form.html:137 -#: templates/web/base/report/new/fill_in_details_form.html:159 -#: templates/web/base/report/new/fill_in_details_form.html:96 -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:36 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:23 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:76 +#: templates/web/base/report/new/form_user_loggedin.html:36 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:39 +#: templates/web/base/report/new/form_user_loggedout_password.html:11 #: templates/web/zurich/report/new/fill_in_details_form.html:96 msgid "Submit" msgstr "Odeslat" -#: templates/web/base/admin/report_edit.html:95 -#: templates/web/base/admin/update_edit.html:65 +#: templates/web/base/admin/report_edit.html:101 +#: templates/web/base/admin/update_edit.html:75 #: templates/web/base/admin/user-form.html:56 #: templates/web/zurich/admin/report_edit-sdm.html:137 #: templates/web/zurich/admin/report_edit.html:268 @@ -2977,7 +2843,7 @@ msgstr "Odeslat" msgid "Submit changes" msgstr "Odeslat zmÄ›ny" -#: templates/web/base/questionnaire/index.html:97 +#: templates/web/base/questionnaire/index.html:106 msgid "Submit questionnaire" msgstr "Odeslat dotaznÃk" @@ -2993,9 +2859,8 @@ msgid "Submitted" msgstr "Odesláno" #: templates/web/base/alert/updates.html:17 -#: templates/web/base/report/display.html:46 +#: templates/web/base/report/display_tools.html:41 #: templates/web/fixmystreet/alert/updates.html:23 -#: templates/web/fixmystreet/report/display.html:65 msgid "Subscribe" msgstr "PÅ™ihlásit se k odbÄ›ru" @@ -3003,7 +2868,7 @@ msgstr "PÅ™ihlásit se k odbÄ›ru" msgid "Subscribe me to an email alert" msgstr "PÅ™ihlásit se k odbÄ›ru emailových upozornÄ›nÃ" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1275 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1284 #: perllib/FixMyStreet/Cobrand/Zurich.pm:383 #: templates/web/base/admin/bodies.html:25 #: templates/web/base/admin/index.html:1 @@ -3022,7 +2887,7 @@ msgstr "PÅ™ehled" msgid "Summary reports" msgstr "Souhrnný pÅ™ehled" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1279 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1288 msgid "Survey" msgstr "Průzkum" @@ -3036,9 +2901,8 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/Zurich.pm:394 #: templates/web/zurich/header.html:77 -#, fuzzy msgid "Templates" -msgstr "Aktualizace" +msgstr "" #: templates/web/base/admin/list_updates.html:12 #: templates/web/zurich/admin/templates.html:9 @@ -3059,7 +2923,7 @@ msgstr "Text:" msgid "Thank you for reporting this issue!" msgstr "" -#: templates/web/base/tokens/error.html:7 +#: templates/web/base/tokens/error.html:6 msgid "Thank you for trying to confirm your update or problem. We seem to have an error ourselves though, so <a href=\"%s\">please let us know what went on</a> and we'll look into it." msgstr "DÄ›kujeme, že se snažÃte poslat aktualizaci nebo hlášenÃ. Zdá se, že máme sami chybu v systému, tak <a href=\"%s\">, prosÃm, dejte nám vÄ›dÄ›t, co se dÄ›je </a> a my se na to podÃváme." @@ -3094,23 +2958,23 @@ msgstr "To mÃsto se nezdá být v ÄŒeské republice; prosÃm zkuste to znovu." #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:47 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:63 -#: perllib/FixMyStreet/Cobrand/UK.pm:71 +#: perllib/FixMyStreet/Cobrand/UK.pm:72 msgid "That postcode was not recognised, sorry." msgstr "Omlouváme se, ale poÅ¡tovnà smÄ›rovacà ÄÃslo nebylo rozpoznáno." -#: perllib/FixMyStreet/App/Controller/Admin.pm:726 +#: perllib/FixMyStreet/App/Controller/Admin.pm:724 msgid "That problem has been marked as sent." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:718 +#: perllib/FixMyStreet/App/Controller/Admin.pm:716 msgid "That problem will now be resent." msgstr "Hlášenà bude nynà opÄ›t odesláno." -#: perllib/FixMyStreet/App/Controller/Report.pm:125 +#: perllib/FixMyStreet/App/Controller/Report.pm:127 msgid "That report cannot be viewed on %s." msgstr "Tento report nemůže být zobrazen na %s." -#: perllib/FixMyStreet/App/Controller/Report.pm:119 +#: perllib/FixMyStreet/App/Controller/Report.pm:121 msgid "That report has been removed from FixMyStreet." msgstr "Toto hlášenà bylo vyjmuto z FixMyStreet." @@ -3145,7 +3009,7 @@ msgid "" " If you leave this blank, <strong>send method defaults to email</strong>." msgstr "" -#: templates/web/base/open311/index.html:90 +#: templates/web/base/open311/index.html:82 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 "" @@ -3168,12 +3032,12 @@ msgstr "Úřad nebude moci pomoci, pokud ve svém hlášenà nezadáte dostatek msgid "The diligency prize league table shows editors' activity (who's been editing the most records)." msgstr "Tabulka VÃtÄ›zů ukazuje aktivity editorů (kdo editoval nejvÃce záznamů)." -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:60 -#: perllib/FixMyStreet/App/Controller/Reports.pm:79 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:61 +#: perllib/FixMyStreet/App/Controller/Reports.pm:80 msgid "The error was: %s" msgstr "Nastala chyba: %s" -#: templates/web/base/open311/index.html:86 +#: templates/web/base/open311/index.html:78 msgid "The following Open311 v2 attributes are returned for each request: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code and service_name." msgstr "" @@ -3220,8 +3084,7 @@ msgstr "Seznam oblastà byl povolen službou MapIt na adrese %s." msgid "The passwords do not match" msgstr "Heslo se neshoduje" -#: templates/web/base/errors/page_error_404_not_found.html:10 -#: templates/web/base/errors/page_error_404_not_found.html:12 +#: templates/web/base/errors/page_error_404_not_found.html:9 msgid "The requested URL '%s' was not found on this server" msgstr "Požadovaná adresa URL '%s' nebyla na tomto serveru nalezena" @@ -3231,12 +3094,11 @@ msgstr "NejjednoduÅ¡Å¡Ã upozornÄ›nà je jedno z naÅ¡ich geografických:" #: templates/web/base/report/new/councils_extra_text.html:1 #: templates/web/base/report/new/councils_text_some.html:10 -#: templates/web/base/report/new/fill_in_details_form.html:18 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:14 +#: templates/web/base/report/new/fill_in_details_form.html:13 msgid "The summary and description will also be made public (see our <a href=\"/privacy\">privacy policy</a>)." msgstr "Souhrn a popisy budou také veÅ™ejné (ÄtÄ›te naÅ¡e<a href=\"/privacy\">zásady ochrany osobnÃch údajů</a>)" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:315 +#: perllib/FixMyStreet/Script/Reports.pm:92 msgid "The user could not locate the problem on a map, but to see the area around the location they entered" msgstr "Uživatel nemohl lokalizovat problém v mapÄ›, ale je zobrazeno okolà lokality pÅ™i zadánà hlášenÃ" @@ -3255,18 +3117,18 @@ msgstr "" msgid "There are no reports to show." msgstr "" -#: perllib/FixMyStreet/App/Controller/Reports.pm:76 +#: perllib/FixMyStreet/App/Controller/Reports.pm:77 msgid "There was a problem showing the All Reports page. Please try again later." msgstr "Nastal problém v zobrazenà stránky VÅ¡echna hlášenÃ. ProsÃm, zkuste pozdÄ›ji." #: perllib/FixMyStreet/App/Controller/Contact.pm:137 -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:59 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:60 msgid "There was a problem showing this page. Please try again later." msgstr "Nastal problém v zobrazenà této stránky. ProsÃm, zkuste pozdÄ›ji." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:769 -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:134 -#: templates/web/base/auth/general.html:26 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:764 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:138 +#: templates/web/base/auth/general.html:43 #: templates/web/zurich/auth/general.html:28 msgid "There was a problem with your email/password combination. If you cannot remember your password, or do not have one, please fill in the ‘sign in by email’ section of the form." msgstr "Byl problém s kombinacà e-mailu a hesla. Pokud si nemůžete vzpomenout na své heslo, nebo ho jeÅ¡tÄ› nemáte, zadejte ho v sekci lsquo, pÅ™ihlášenà se prostÅ™ednictvÃm e-mailu & rsquo; tohoto formuláře." @@ -3275,7 +3137,7 @@ msgstr "Byl problém s kombinacà e-mailu a hesla. Pokud si nemůžete vzpomenou msgid "There was a problem with your email/password combination. Please try again." msgstr "Nastal problém s kombinacà VaÅ¡Ã e-mailové adresy a hesla. ProsÃm zkuste znovu." -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:272 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:336 msgid "There was a problem with your update. Please try again." msgstr "Nastal problém s vaÅ¡Ã aktualizacÃ. ProsÃm opakujte jeÅ¡tÄ› jednou." @@ -3283,7 +3145,7 @@ msgstr "Nastal problém s vaÅ¡Ã aktualizacÃ. ProsÃm opakujte jeÅ¡tÄ› jednou." msgid "There were problems with your report. Please see below." msgstr "Nastal problém s vaÅ¡Ãm hlášenÃm. ProsÃm, pÅ™eÄtÄ›te si informace nÞe." -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:300 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:371 msgid "There were problems with your update. Please see below." msgstr "Nastal problém s VaÅ¡Ã aktualizacÃ. ProsÃm, pÅ™eÄtÄ›te si informace nÞe." @@ -3302,7 +3164,7 @@ msgstr "" " <a href='https://www.mysociety.org/2013/01/17/open311-explained/' class='admin-offsite-link'>tento Älánek </a>. \n" " " -#: templates/web/base/open311/index.html:77 +#: templates/web/base/open311/index.html:69 msgid "This API implementation is work in progress and not yet stabilized. It will change without warnings in the future." msgstr "Na implementaci API se stále pracuje a nenà dosud stabilnÃ. V budoucnu se může bez upozornÄ›nà zmÄ›nit." @@ -3329,18 +3191,18 @@ msgstr "" "Tomuto úřadu budou zasálána pouze hlášenà o problémech, která jsou umÃstÄ›na v <strong> oblasti pokrytÃ</strong>. \n" " Úřad nebude dostávat žádné zprávy, pokud nepokrývá alespoň jednu vybranou oblast." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:413 +#: perllib/FixMyStreet/Script/Reports.pm:191 msgid "This email has been sent to both councils covering the location of the problem, as the user did not categorise it; please ignore it if you're not the correct council to deal with the issue, or let us know what category of problem this is so we can add it to our system." msgstr "Tento e-mail byl odeslán na oba úřady působÃcà v dané lokalitÄ›, protože uživatel hlášenà nekategorizoval. ProsÃm ignorujte, pokud nejste oprávnÄ›ný úřad kompetentnà řeÅ¡it nahlášený problém nebo nám dejte vÄ›dÄ›t, jaká je to kategorie problémů a kdo jà má na starosti, my jà doplnÃme do naÅ¡eho systému." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:416 +#: perllib/FixMyStreet/Script/Reports.pm:194 msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue." msgstr "Tento e-mail byl odeslán na nÄ›kolik úřadů působÃcÃch v dané lokalitÄ›, protože zvolená kategorie hlášenà je uvedena pro vÅ¡echny z nich. ProsÃm ignorujte, pokud nejste oprávnÄ›ný úřad kompetentnà řeÅ¡it nahlášený problém." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:925 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:995 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:920 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:990 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:142 -#: perllib/FixMyStreet/Cobrand/UK.pm:43 +#: perllib/FixMyStreet/Cobrand/UK.pm:44 msgid "This information is required" msgstr "Tato informace je vyžadována" @@ -3352,56 +3214,37 @@ msgstr "Toto je vývojářský web; vÄ›ci mohou kdykoli pÅ™estat fungovat, data msgid "This is a summary of all reports on this site." msgstr "Zde je souhrn vÅ¡ech hlášenà na tomto webu." -#: templates/web/zurich/auth/token.html:8 -msgid "This may be because the link is too old or already used, or the address was not copied correctly." -msgstr "To může být proto, že odkaz je pÅ™ÃliÅ¡ starý nebo již použitý, nebo adresa nebyla správnÄ› zkopÃrována." - -#: templates/web/base/report/banner.html:15 -msgid "This problem has been closed" -msgstr "Hlášenà bylo uzavÅ™eno" - -#: templates/web/base/report/banner.html:12 -#: templates/web/base/report/update-form.html:48 -#: templates/web/fixmystreet/report/update-form.html:46 +#: templates/web/base/report/update/form_update.html:52 msgid "This problem has been fixed" msgstr "Hlášenà bylo vyÅ™eÅ¡eno" -#: templates/web/base/report/update-form.html:43 -#: templates/web/fixmystreet/report/update-form.html:40 +#: templates/web/base/report/update/form_update.html:46 msgid "This problem has not been fixed" msgstr "Hlášenà nemohlo být vyÅ™eÅ¡eno" -#: templates/web/base/report/banner.html:19 -msgid "This problem is in progress" -msgstr "ŘeÅ¡enà hlášenà probÃhá" - -#: templates/web/base/report/banner.html:9 -msgid "This problem is old and of unknown status." -msgstr "Hlášenà je zastaralé a nenà znám stav." - #: perllib/FixMyStreet/Cobrand/Zurich.pm:168 #: perllib/FixMyStreet/Cobrand/Zurich.pm:169 #: templates/web/zurich/report/_main.html:14 msgid "This report is awaiting moderation." msgstr "Hlášenà Äeká na moderovánà operátorem." -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:86 +#: perllib/FixMyStreet/Script/Alerts.pm:94 msgid "This report is currently marked as closed." msgstr "Hlášenà je aktuálnÄ› oznaÄené za uzavÅ™ené." -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:84 +#: perllib/FixMyStreet/Script/Alerts.pm:92 msgid "This report is currently marked as fixed." msgstr "Hlášenà je aktuálnÄ› oznaÄené za vyÅ™eÅ¡ené." -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:88 +#: perllib/FixMyStreet/Script/Alerts.pm:96 msgid "This report is currently marked as open." msgstr "Hlášenà je aktuálnÄ› oznaÄené za otevÅ™ené." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:326 +#: perllib/FixMyStreet/Script/Reports.pm:105 msgid "This report was submitted anonymously" msgstr "Hlášenà bylo zasláno anonymnÄ›." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:308 +#: perllib/FixMyStreet/Script/Reports.pm:85 msgid "This web page also contains a photo of the problem, provided by the user." msgstr "Webová stránka také obsahuje fotografii hlášenÃ, poskytnutou uživatelem." @@ -3412,7 +3255,7 @@ msgstr "Webová stránka také obsahuje fotografii hlášenÃ, poskytnutou uživ msgid "Time spent (in minutes):" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1278 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1287 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "ÄŒasová osa" @@ -3424,24 +3267,22 @@ msgid "Title" msgstr "Nadpis" #: templates/web/zurich/admin/template_edit.html:20 -#, fuzzy msgid "Title:" -msgstr "Nadpis" +msgstr "" #: templates/web/base/alert/index.html:25 -#, fuzzy msgid "To find out what local alerts we have for you, please enter your %s postcode or street name and area:" -msgstr "Pokud chcete zjistit, jaká mÃstnà upozornÄ›nà jsme pro Vás pÅ™ipravili, prosÃm, zadejte své poÅ¡tovnà smÄ›rovacà ÄÃslo nebo název ulice Äi oblasti" +msgstr "" #: templates/web/base/alert/index.html:27 msgid "To find out what local alerts we have for you, please enter your postcode or street name and area" msgstr "Pokud chcete zjistit, jaká mÃstnà upozornÄ›nà jsme pro Vás pÅ™ipravili, prosÃm, zadejte své poÅ¡tovnà smÄ›rovacà ÄÃslo nebo název ulice Äi oblasti" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:314 +#: perllib/FixMyStreet/Script/Reports.pm:91 msgid "To view a map of the precise location of this issue" msgstr "Pro zobrazenà mapy pÅ™esného umÃstÄ›nà tohoto problému" -#: templates/web/base/admin/index.html:61 +#: templates/web/base/admin/index.html:54 #: templates/web/base/admin/questionnaire.html:24 #: templates/web/base/admin/stats.html:24 #: templates/web/base/admin/stats.html:43 @@ -3459,10 +3300,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:12 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:33 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:31 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:37 msgid "Unable to fix" msgstr "Nelze opravit" @@ -3475,7 +3314,7 @@ msgstr "Nelze opravit" msgid "Unconfirmed" msgstr "Nepotvrzeno" -#: templates/web/fixmystreet/report/banner.html:9 +#: templates/web/base/report/banner.html:9 msgid "Unknown" msgstr "Neznámé" @@ -3483,17 +3322,18 @@ msgstr "Neznámé" msgid "Unknown alert type" msgstr "Neznámý typ upozornÄ›nÃ" +#: perllib/FixMyStreet/App/Controller/Photo.pm:110 #: templates/web/base/js/translation_strings.html:39 msgid "Unknown error" msgstr "Neznámá chyba" -#: perllib/FixMyStreet/App/Controller/Report.pm:103 -#: perllib/FixMyStreet/App/Controller/Report.pm:109 -#: perllib/FixMyStreet/App/Controller/Report.pm:112 +#: perllib/FixMyStreet/App/Controller/Report.pm:105 +#: perllib/FixMyStreet/App/Controller/Report.pm:111 +#: perllib/FixMyStreet/App/Controller/Report.pm:114 msgid "Unknown problem ID" msgstr "Neznámé ID hlášenÃ" -#: templates/web/fixmystreet/report/update-form.html:19 +#: templates/web/base/report/update/form_update.html:25 msgid "Update" msgstr "Aktualizovat" @@ -3501,13 +3341,11 @@ msgstr "Aktualizovat" msgid "Update %s created for problem %d; by %s" msgstr "Aktualizujte %s pro hlášenà %d; vytvoÅ™ené uživatelem %s" -#: templates/web/base/contact/index.html:21 -#: templates/web/fixmystreet/contact/index.html:36 +#: templates/web/base/contact/index.html:28 msgid "Update below added anonymously at %s" msgstr "Aktualizace nÞe byly pÅ™idána anonymnÄ› v %s" -#: templates/web/base/contact/index.html:23 -#: templates/web/fixmystreet/contact/index.html:38 +#: templates/web/base/contact/index.html:30 msgid "Update below added by %s at %s" msgstr "Aktualizace nÞe byly pÅ™idána uživatelem %s v %s" @@ -3516,7 +3354,7 @@ msgstr "Aktualizace nÞe byly pÅ™idána uživatelem %s v %s" msgid "Update body" msgstr "Aktualizace subjektu" -#: templates/web/base/admin/index.html:55 +#: templates/web/base/admin/index.html:48 msgid "Update breakdown by state" msgstr "Aktualizované ÄlenÄ›nà podle stavu" @@ -3541,20 +3379,16 @@ msgstr "Aktualizovat znovu otevÅ™ené hlášenÃ" msgid "Update statuses" msgstr "Aktualizovat status" -#: templates/web/base/report/update-form.html:22 -msgid "Update:" -msgstr "Aktualizace:" - #: templates/web/zurich/admin/index-dm.html:23 #: templates/web/zurich/admin/index-sdm.html:21 #: templates/web/zurich/admin/reports.html:13 msgid "Updated" msgstr "Aktualizováno" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1045 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1103 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1147 -#: perllib/FixMyStreet/App/Controller/Admin.pm:822 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1048 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1108 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1156 +#: perllib/FixMyStreet/App/Controller/Admin.pm:821 #: perllib/FixMyStreet/Cobrand/Zurich.pm:771 #: perllib/FixMyStreet/Cobrand/Zurich.pm:796 #: perllib/FixMyStreet/Cobrand/Zurich.pm:866 @@ -3562,13 +3396,12 @@ msgid "Updated!" msgstr "Aktualizováno!" #: templates/web/base/admin/list_updates.html:2 -#: templates/web/base/report/update.html:3 -#: templates/web/fixmystreet/report/update.html:5 +#: templates/web/base/report/update.html:5 #: templates/web/zurich/report/updates.html:2 msgid "Updates" msgstr "Aktualizace" -#: perllib/FixMyStreet/DB/Result/Comment.pm:132 +#: perllib/FixMyStreet/DB/Result/Comment.pm:131 msgid "Updates are limited to %s characters in length. Please shorten your update" msgstr "Aktualizace je omezena na %s znaků jejà délky. ProsÃm, zkraÅ¥te ji" @@ -3578,12 +3411,9 @@ msgstr "Aktualizace hlášenà {{title}}" #. ("%s is the site name") #: templates/web/base/report/display.html:0 -#: templates/web/base/report/display.html:5 -#: templates/web/fixmystreet/report/display.html:0 -#: templates/web/fixmystreet/report/display.html:9 -#, fuzzy +#: templates/web/base/report/display.html:9 msgid "Updates to this problem, %s" -msgstr "Aktualizace tohoto hlášenÃ, FixMyStreet" +msgstr "" #: templates/web/base/admin/body.html:182 msgid "Use the <strong>note</strong> to record details that are only displayed in the admin. Notes are not shown publicly, and are not sent to the body." @@ -3591,15 +3421,14 @@ msgstr "<strong> Poznámka </strong> sloužà pro záznam ifnormacÃ, které jso #: templates/web/zurich/admin/report_edit-sdm.html:48 #: templates/web/zurich/admin/report_edit.html:67 -#, fuzzy msgid "Used map" -msgstr "použitá mapa" +msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1452 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1461 msgid "User flag removed" msgstr "Uživatel vyjmut ze sledovánÃ" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1424 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1433 msgid "User flagged" msgstr "Uživatel sledován" @@ -3607,7 +3436,7 @@ msgstr "Uživatel sledován" msgid "User search finds matches in users' names and email addresses." msgstr "PÅ™i vyhledávánà byly nalezeny shody v uživatelských jménech nebo e-mailových adresách." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1280 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1289 #: perllib/FixMyStreet/Cobrand/Zurich.pm:399 #: templates/web/base/admin/flagged.html:29 #: templates/web/zurich/header.html:69 @@ -3638,7 +3467,6 @@ msgid "Viewing a location" msgstr "Zobrazenà oblastÃ" #: templates/web/base/report/display.html:0 -#: templates/web/fixmystreet/report/display.html:0 msgid "Viewing a problem" msgstr "Zobrazenà hlášenÃ" @@ -3651,25 +3479,24 @@ msgstr "OddÄ›lenà tohoto úřadu" 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 "NaÅ¡li jsme vÃce než jednu shodu pro požadovanou lokalitu. NabÃzÃme až 10 možných lokalit. UpÅ™esnÄ›te prosÃm vyhledávánÃ, pokud zde požadovanou lokalitu nenaleznete." -#: templates/web/zurich/auth/token.html:7 -msgid "We have not been able to confirm your account - sorry." -msgstr "Omlouváme se, nebyli jsme schopni potvrdit Váš úÄet." - -#: templates/web/zurich/auth/token.html:17 -msgid "We have sent you an email containing a link to confirm your account." -msgstr "Odeslali jsme Vámi e-mail s odkazem pro potvrzenà vaÅ¡eho úÄtu." +#: templates/web/base/auth/general.html:6 +#: templates/web/base/report/display.html:27 +#: templates/web/base/report/new/oauth_email_form.html:5 +#, fuzzy +msgid "We need your email address, please give it below." +msgstr "Váš email a telefonnà ÄÃslo nebudou nikde zveÅ™ejnÄ›ny." -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:2 -#: templates/web/fixmystreet/report/update-form.html:77 +#: templates/web/base/report/new/form_user_loggedout_email.html:2 +#: templates/web/base/report/update/form_user_loggedout_email.html:2 msgid "We never show your email" msgstr "váš email nebude nezveÅ™ejnÄ›n" -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:31 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:65 +#: templates/web/base/report/new/form_user_loggedin.html:31 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:28 msgid "We never show your email address or phone number." msgstr "Váš email a telefonnà ÄÃslo nebudou nikde zveÅ™ejnÄ›ny." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:422 +#: perllib/FixMyStreet/Script/Reports.pm:200 msgid "We realise this problem might be the responsibility of %s; however, we don't currently have any contact details for them. If you know of an appropriate contact address, please do get in touch." msgstr "UvÄ›domujeme si, že za tento problém by mohl být odpovÄ›dný % s; NicménÄ›, nemáme na nÄ› v souÄasné dobÄ› žádné kontaktnà údaje. Pokud pÅ™ÃsluÅ¡né kontakty znáte, sem s nimi. " @@ -3686,10 +3513,6 @@ msgstr "Osobnà údaje budeme použÃvat pouze v souladu s naÅ¡imi <a href=\"/pr msgid "We’re sorry to hear the problem’s not fixed. Why not try writing to your local representatives?" msgstr "" -#: templates/web/base/contact/blurb.html:8 -msgid "We'd love to hear what you think about this site. Just fill in the form, or send an email to <a href='mailto:%s'>%s</a>:" -msgstr "Rádi bychom znali Váš názor, co si myslÃte o tomto webu. StaÄà vyplnit formulář, nebo poÅ¡lete e-mail na <a href='mailto:%s'>% s </a>:" - #: templates/web/base/contact/submit.html:7 msgid "We’ll get back to you as soon as we can." msgstr "" @@ -3698,7 +3521,7 @@ msgstr "" msgid "What was your experience of getting the problem fixed?" msgstr "" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:49 +#: templates/web/base/report/new/form_report.html:19 msgid "What’s the issue, and where is it?" msgstr "Co je to za problém, a kde to je?" @@ -3711,7 +3534,11 @@ msgstr "Editováno:" msgid "When sent" msgstr "Odesláno:" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:640 +#: templates/web/base/js/translation_strings.html:50 +msgid "Whoa there Testino! Three photos are enough." +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Report/New.pm:635 msgid "Whole block of empty flats" msgstr "Celý blok prázdných bytů" @@ -3726,7 +3553,7 @@ msgstr "" msgid "Wish" msgstr "" -#: templates/web/base/open311/index.html:92 +#: templates/web/base/open311/index.html:84 msgid "With request searches, it is also possible to search for agency_responsible to limit the requests to those sent to a single administration. The search term is the administration ID provided by <a href=\"%s\">MaPit</a>." msgstr "V požadavku pro vyhledávánà je možné hledat s parametrem 'agency_responsible' a omezit požadavky vrácené zpÄ›t do administrace. Hledaný výraz je administrativnà ID poskytnuté službou<a href=\"%s\"> MaPit </a>." @@ -3734,7 +3561,7 @@ msgstr "V požadavku pro vyhledávánà je možné hledat s parametrem 'agency msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"http://fixmystreet.org\">available at fixmystreet.org</a>." msgstr "Chcete se podÃlet na rozvoji projektu FixMyStreet? Náš kód je open source a je k dispozici na <a href=\"http://fixmystreet.org\">fixmystreet.org </a>." -#: templates/web/base/questionnaire/index.html:87 +#: templates/web/base/questionnaire/index.html:96 msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?" msgstr "Můžeme Vám za mÄ›sÃc odeslat dalÅ¡Ã dotaznÃk, který Vám pÅ™ipomene zkontrolovat stav VaÅ¡eho hlášenÃ?" @@ -3743,7 +3570,6 @@ msgid "Writing your message entirely in block capitals makes it hard to read, as msgstr "Psanà zprávy pouze hůlkovým pÃsmem je těžké ÄÃst, stejnÄ› jako chybÄ›jÃcà interpunkce." #: templates/web/base/report/new/fill_in_details_form.html:4 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:5 msgid "Wrong location? Just click again on the map." msgstr "Chybná poloha? StaÄà v mapÄ› pÅ™ekliknout na jiné mÃsto." @@ -3766,27 +3592,24 @@ msgstr "Rok" #: templates/web/base/admin/users.html:31 #: templates/web/base/questionnaire/creator_fixed.html:14 #: templates/web/base/questionnaire/index.html:51 -#: templates/web/base/questionnaire/index.html:90 +#: templates/web/base/questionnaire/index.html:99 msgid "Yes" msgstr "Ano" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:17 -#: templates/web/fixmystreet/report/update-form.html:91 +#: templates/web/base/report/new/form_user_loggedout_password.html:5 +#: templates/web/base/report/update/form_user_loggedout_password.html:4 msgid "Yes I have a password" msgstr "Ano mám heslo" -#: templates/web/base/contact/index.html:39 -#: templates/web/fixmystreet/contact/index.html:54 +#: templates/web/base/contact/index.html:46 msgid "You are complaining that this problem report was unnecessarily moderated:" msgstr "Stěžujete si, že toto hlášenà bylo bezdůvodnÄ› moderováno:" -#: templates/web/base/contact/index.html:41 -#: templates/web/fixmystreet/contact/index.html:56 +#: templates/web/base/contact/index.html:48 msgid "You are reporting the following problem report for being abusive, containing personal information, or similar:" msgstr "UpozornÄ›nà na nÞe uvedené hlášenÃ, které může být urážlivé, obsahujÃcà osobnà údaje Äi jiné nevhodné vyjádÅ™enÃ." -#: templates/web/base/contact/index.html:15 -#: templates/web/fixmystreet/contact/index.html:30 +#: templates/web/base/contact/index.html:22 msgid "You are reporting the following update for being abusive, containing personal information, or similar:" msgstr "Upozorňuji na nÞe uvedený záznam, který může obsahovat urážlivé nebo osobnà informace, pÅ™ÃpadnÄ› jiný problematický text:" @@ -3799,7 +3622,7 @@ msgstr "Můžete <a href=\"%s%s\">zobrazit hlášenà na tomto webu</a>." msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create." msgstr "Můžete pÅ™idat e-mail zneužÃvajÃcÃho uživatele do seznamu zneužÃvánà a hlášenà tÄ›chto uživatelů budou skryty (nikdy nebudou odesÃlány)." -#: templates/web/fixmystreet/contact/index.html:121 +#: templates/web/base/contact/index.html:113 msgid "You can contact technical support on <a href='mailto:%s'>%s</a>" msgstr "Můžete kontaktovat technickou podporu <a href='mailto:%s'>%s</a>" @@ -3812,8 +3635,8 @@ msgstr "" "Můžete pÅ™i editaci zpráv nebo uživatelů nastavit pÅ™Ãznak pro sledovánà a oni budou uvedeny na této stránce. \n" " T máže být napÅ™Ãklad užiteÄné, pokud chcete sledovat uživatele, kteřà v minulosti publikovali nevhodný obsah." -#: templates/web/base/report/new/councils_text_none.html:10 -#: templates/web/base/report/new/councils_text_none.html:2 +#: templates/web/base/report/new/councils_text_none.html:12 +#: templates/web/base/report/new/councils_text_none.html:14 #: templates/web/base/report/new/councils_text_some.html:19 #: templates/web/base/report/new/councils_text_some.html:21 msgid "You can help us by finding a contact email address for local problems for %s and emailing it to us at <a href='mailto:%s'>%s</a>." @@ -3831,21 +3654,16 @@ msgstr "OdmÃtnuto; vyplňte rámeÄek nahoÅ™e" msgid "You have already answered this questionnaire. If you have a question, please <a href='%s'>get in touch</a>, or <a href='%s'>view your problem</a>.\n" msgstr "Na tento dotaznÃk jste již odpovÄ›dÄ›li. Máte-li dotazy, prosÃm <a href='%s'>spojte se s námi</a>, nebo si můžete <a href='%s'>zobrazit hlášenÃ</a>.\n" -#: templates/web/base/questionnaire/index.html:77 -#: templates/web/base/report/new/fill_in_details_form.html:75 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:73 -msgid "You have already attached a photo to this report, attaching another one will replace it." -msgstr "Pro toto hlášenà již máte pÅ™ipojenou fotografii, pÅ™ipojenÃm dalÅ¡Ã dojde k jejÃmu nahrazenÃ." - -#: templates/web/base/report/update-form.html:59 -#: templates/web/fixmystreet/report/update-form.html:56 -msgid "You have already attached a photo to this update, attaching another one will replace it." -msgstr "Pro tuto aktualizaci již máte pÅ™ipojenou fotografii, pÅ™ipojenÃm dalÅ¡Ã dojde k jejÃmu nahrazenÃ." - -#: templates/web/zurich/report/new/fill_in_details_form.html:61 +#: templates/web/base/report/new/form_report.html:32 +#: templates/web/zurich/report/new/fill_in_details_form.html:55 msgid "You have already attached photos to this report. Note that you can attach a maximum of 3 to this report (if you try to upload more, the oldest will be removed)." msgstr "" +#: templates/web/base/questionnaire/index.html:83 +#: templates/web/base/report/update/form_update.html:14 +msgid "You have already attached photos to this update. Note that you can attach a maximum of 3 to this update (if you try to upload more, the oldest will be removed)." +msgstr "" + #: templates/web/base/auth/sign_out.html:4 #: templates/web/zurich/auth/sign_out.html:3 msgid "You have been signed out" @@ -3860,9 +3678,8 @@ msgstr "Lokalizovali jste hlášenà do mÃsta oznaÄeném zelenou znaÄkou v m msgid "You have successfully confirmed your email address." msgstr "ÚspěšnÄ› jste potvrdili svou e-mailovou adresu." -#: templates/web/base/report/display.html:20 -#: templates/web/base/report/new/fill_in_details.html:37 -#: templates/web/fixmystreet/report/display.html:17 +#: templates/web/base/report/display.html:17 +#: templates/web/base/report/new/login_success_form.html:3 msgid "You have successfully signed in; please check and confirm your details are accurate:" msgstr "Byli jste úspěšnÄ› pÅ™ihlášeni; zkontrolujte a potvrÄte zda jsou podrobnosti pÅ™esné:" @@ -3894,53 +3711,42 @@ msgid "Your Reports" msgstr "VaÅ¡e hlášenÃ" #: templates/web/base/alert/_list.html:89 +#: templates/web/base/contact/index.html:83 +#: templates/web/base/report/display_tools.html:38 +#: templates/web/base/report/display_tools.html:40 +#: templates/web/base/report/new/form_user_loggedin.html:3 +#: templates/web/base/report/new/form_user_loggedout_email.html:1 +#: templates/web/base/report/update/form_user_loggedout_email.html:1 #: templates/web/fixmystreet/alert/updates.html:19 #: templates/web/fixmystreet/alert/updates.html:22 -#: templates/web/fixmystreet/contact/index.html:91 -#: templates/web/fixmystreet/report/display.html:62 -#: templates/web/fixmystreet/report/display.html:64 -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:3 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:1 -#: templates/web/fixmystreet/report/update-form.html:76 #: templates/web/zurich/report/new/fill_in_details_form.html:76 msgid "Your email" msgstr "Váš e-mail" -#: templates/web/base/auth/general.html:28 -#: templates/web/fixmystreet/report/update-form.html:82 +#: templates/web/base/auth/general.html:45 +#: templates/web/base/report/update/form_user_loggedout_email.html:7 #: templates/web/zurich/auth/general.html:30 #: templates/web/zurich/auth/general.html:58 msgid "Your email address" msgstr "VaÅ¡e e-mailová adresa" -#: templates/web/base/report/new/fill_in_details_form.html:106 -#: templates/web/base/report/update-form.html:81 -msgid "Your email:" -msgstr "Váš e-mail:" - -#: templates/web/fixmystreet/report/updates-sidebar-notes.html:7 +#: templates/web/base/report/updates-sidebar-notes.html:3 msgid "Your information will only be used in accordance with our <a href=\"/privacy\">privacy policy</a>" msgstr "Vámi poskytnuté informace budou použity pouze v souladu se <a href=\"/privacy\">zásadami ochrany osobnÃch údajů</a>" -#: templates/web/base/auth/general.html:51 -#: templates/web/fixmystreet/contact/index.html:84 -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:18 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:54 -#: templates/web/fixmystreet/report/update-form.html:142 +#: templates/web/base/auth/general.html:90 +#: templates/web/base/contact/index.html:76 +#: templates/web/base/report/new/form_user_loggedin.html:18 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:17 +#: templates/web/base/report/update/form_name.html:11 #: templates/web/zurich/auth/general.html:61 #: templates/web/zurich/report/new/fill_in_details_form.html:86 msgid "Your name" msgstr "VaÅ¡e jméno a pÅ™ÃjmenÃ" -#: templates/web/base/contact/index.html:73 -#: templates/web/base/report/new/fill_in_details_form.html:186 -#: templates/web/base/report/update-form.html:152 -msgid "Your name:" -msgstr "VaÅ¡e jméno:" - -#: templates/web/base/auth/general.html:39 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:22 -#: templates/web/fixmystreet/report/update-form.html:96 +#: templates/web/base/auth/general.html:75 +#: templates/web/base/report/new/form_user_loggedout_password.html:10 +#: templates/web/base/report/update/form_user_loggedout_password.html:9 #: templates/web/zurich/auth/general.html:34 msgid "Your password" msgstr "VaÅ¡e heslo" @@ -3949,13 +3755,14 @@ msgstr "VaÅ¡e heslo" msgid "Your password has been changed" msgstr "VaÅ¡e heslo bylo zmÄ›nÄ›no" -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:27 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:63 +#: templates/web/base/report/new/form_user_loggedin.html:27 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:26 #: templates/web/zurich/report/new/fill_in_details_form.html:92 msgid "Your phone number" msgstr "VaÅ¡e telefonnà ÄÃslo:" #: templates/web/base/questionnaire/index.html:14 +#, fuzzy msgid "Your report" msgstr "VaÅ¡e hlášenÃ" @@ -3967,23 +3774,17 @@ msgstr "VaÅ¡e hlášenÃ" msgid "Your updates" msgstr "VaÅ¡e aktualizace" -#: templates/web/base/contact/index.html:81 -msgid "Your email:" -msgstr "Váš e-mail:" - #: templates/web/base/reports/_list-filters.html:3 -#, fuzzy msgid "all reports" -msgstr "VÅ¡echna hlášenÃ" +msgstr "" #: templates/web/base/admin/timeline.html:4 msgid "by %s" msgstr "uživatelem %s" #: templates/web/base/reports/_list-filters.html:5 -#, fuzzy msgid "closed reports" -msgstr "UzavÅ™ená hlášenÃ" +msgstr "" #: templates/web/base/reports/body.html:6 #: templates/web/base/reports/body.html:7 @@ -4005,17 +3806,16 @@ msgid "edit user" msgstr "editace uživatele" #: templates/web/base/reports/_list-filters.html:6 -#, fuzzy msgid "fixed reports" -msgstr "Hlášenà - VyÅ™eÅ¡ené" +msgstr "" -#: templates/web/base/admin/index.html:33 +#: templates/web/base/status/stats.html:20 #: templates/web/zurich/admin/index.html:5 msgid "from %s different users" -msgstr "od %d různých uživatelů" +msgstr "od %s různých uživatelů" -#: templates/web/base/report/_item.html:17 -#: templates/web/zurich/report/_item.html:16 +#: templates/web/base/report/_item.html:15 +#: templates/web/zurich/report/_item.html:14 msgid "last updated %s" msgstr "naposledy upravené %s" @@ -4107,10 +3907,8 @@ msgstr "znovu otevÅ™eno" msgid "sign out" msgstr "odhlásit" -#: templates/web/base/report/new/fill_in_details_form.html:12 -#: templates/web/base/report/new/fill_in_details_form.html:15 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:10 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:12 +#: templates/web/base/report/new/fill_in_details_form.html:11 +#: templates/web/base/report/new/fill_in_details_form.html:9 msgid "the local council" msgstr "mÃstnà úřad" @@ -4119,7 +3917,7 @@ msgstr "mÃstnà úřad" msgid "there is no pin shown as the user did not use the map" msgstr "V mapÄ› se nenalézajà žádné znaÄky hlášenà od uživatelů" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:398 +#: perllib/FixMyStreet/Script/Reports.pm:176 msgid "this type of local problem" msgstr "tento typ lokálnÃho problému" @@ -4128,9 +3926,8 @@ msgid "today" msgstr "dnes" #: templates/web/base/reports/_list-filters.html:4 -#, fuzzy msgid "unfixed reports" -msgstr "Hlášenà - VyÅ™eÅ¡ené" +msgstr "" #: templates/web/base/admin/report_edit.html:32 msgid "used map" @@ -4149,7 +3946,7 @@ msgstr "uživatel je vlastnÃkem hlášenÃ" msgid "ward" msgstr "okrsek" -#: templates/web/base/front/stats.html:17 +#: templates/web/base/front/stats.html:13 #, perl-format msgid "<big>%s</big> report recently" msgid_plural "<big>%s</big> reports recently" @@ -4181,7 +3978,7 @@ msgstr[0] "%d minuta" msgstr[1] "%d minuty" msgstr[2] "%d minut" -#: templates/web/base/front/stats.html:29 +#: templates/web/base/front/stats.html:25 #, perl-format msgid "<big>%s</big> update on reports" msgid_plural "<big>%s</big> updates on reports" @@ -4205,7 +4002,7 @@ msgstr[0] "%d týden" msgstr[1] "%d týdny" msgstr[2] "%d týdnů" -#: templates/web/base/front/stats.html:12 +#: templates/web/base/front/stats.html:8 #, perl-format msgid "<big>%s</big> report in past week" msgid_plural "<big>%s</big> reports in past week" @@ -4213,7 +4010,7 @@ msgstr[0] "<big>%s</big> hlášenà minulý týden" msgstr[1] "<big>%s</big> hlášenà minulý týden" msgstr[2] "<big>%s</big> hlášenà minulý týden" -#: templates/web/base/front/stats.html:23 +#: templates/web/base/front/stats.html:19 #, perl-format msgid "<big>%s</big> fixed in past month" msgid_plural "<big>%s</big> fixed in past month" @@ -4237,137 +4034,86 @@ msgstr[0] "Doposud <strong>nemáme</strong> podrobnosti o dalÅ¡Ãm úřadÄ›, kt msgstr[1] "Doposud <strong>nemáme</strong> podrobnosti o dalÅ¡Ãch úřadech, které jsou za tuto oblast zodpovÄ›dné." msgstr[2] "Doposud <strong>nemáme</strong> podrobnosti o dalÅ¡Ãch úřadech, které jsou za tuto oblast zodpovÄ›dné." -#~ msgid "(Don't worry — we'll hang on to your alert while you're checking your email.)" -#~ msgstr "(NemÄ›jte obavy - upozornÄ›nà bude uchováno do doby potvrzenà e-mailem.)" - -#~ msgid "(Don't worry — we'll hang on to your problem report while you're checking your email.)" -#~ msgstr "(NemÄ›jte obavy - hlášenà bude uchováno do doby potvrzenà e-mailem.)" - -#~ msgid "(Don't worry — we'll hang on to your update while you're checking your email.)" -#~ msgstr "(NemÄ›jte obavy - hlášenà bude uchováno do doby potvrzenà e-mailem.)" - -#~ msgid "<small>If you cannot see the map, <a href='%s' rel='nofollow'>skip this step</a>.</small>" -#~ msgstr "<small>Pokud nevidÃte mapu, <a href='%s' rel='nofollow'>vynechte tento krok</a>.</small>" - -#~ msgid "<strong>No</strong>, I do not, let me sign in by email:" -#~ msgstr "<strong>Ne</strong>, pÅ™ihlásÃm se pomocà e-mailu:" - -#~ msgid "Are you a <strong>developer</strong>? Would you like to contribute to FixMyStreet?" -#~ msgstr "Jste <strong>vývojář</strong>? Nechcete se pÅ™idat a podpoÅ™it FixMyStreet?" - -#~ msgid "Closest nearby problems <small>(within %skm)</small>" -#~ msgstr "Nejbližšà hlášenà <small>( v okolà %s km)</small>" - -#~ msgid "Contact FixMyStreet" -#~ msgstr "Kontaktujte FixMyStreet" - -#~ msgid "Do you have a FixMyBarangay password?" -#~ msgstr "Máte FixMyBarangay heslo?" - -#~ msgid "FixMyStreet admin:" -#~ msgstr "FixMyStreet administrace:" - -#~ msgid "If you do not, your alert will not be activated." -#~ msgstr "Pokud to neudÄ›láte, vaÅ¡e upozornÄ›nà nebude aktivováno." - -#~ msgid "If you do not, your problem will not be posted." -#~ msgstr "Pokud to neudÄ›láte, VaÅ¡e hlášenà nebude odesláno." - -#~ msgid "If you do not, your update will not be posted." -#~ msgstr "Pokud to neudÄ›láte, VaÅ¡e aktualizace nebude odeslána." - -#~ msgid "New local reports on reportemptyhomes.com" -#~ msgstr "Nová lokálnà hlášenà na reportemptyhomes.com" - -#~ msgid "New reports for {{COUNCIL}} within {{WARD}} ward on reportemptyhomes.com" -#~ msgstr "Nová hlášenà pro {{COUNCIL}} , oblast {{WARD}} na reportemptyhomes.com" - -#~ msgid "New reports on reportemptyhomes.com" -#~ msgstr "Nová hlášenà na reportemptyhomes.com" - -#~ msgid "New reports on reportemptyhomes.com near {{POSTCODE}}" -#~ msgstr "Nová hlášenà na reportemptyhomes.com v oblasti PSÄŒ {{POSTCODE}}" - -#~ msgid "New reports to {{COUNCIL}} on reportemptyhomes.com" -#~ msgstr "Nová hlášenà pro {{COUNCIL}} na reportemptyhomes.com" +#~ msgid "(we never show your email address or phone number)" +#~ msgstr "(váš email a telefonnà ÄÃslo nebudou nikde zveÅ™ejnÄ›ny)" -#~ msgid "New reports within {{NAME}}'s boundary on reportemptyhomes.com" -#~ msgstr "Nová hlášenà pro oblast {{NAME}} na reportemptyhomes.com" +#~ msgid "(we never show your email)" +#~ msgstr "(váš email nebude nezveÅ™ejnÄ›n)" -#~ msgid "New update:" -#~ msgstr "Nové aktualizace:" +#~ msgid "<strong>No</strong>, let me confirm my report by email:" +#~ msgstr "<strong>Ne</strong>, PotvrdÃm hlášenà prostÅ™ednictvÃm emailu:" -#~ msgid "No problems found." -#~ msgstr "Nenalezena žádná hlášenÃ." +#~ msgid "<strong>No</strong>, let me confirm my update by email:" +#~ msgstr "<strong>Ne</strong>, potvrdÃm aktualizaci pomocà e-mailu:" -#~ msgid "No problems have been reported yet." -#~ msgstr "Doposud nebylo nic nahlášeno." +#~ msgid "Email me updates" +#~ msgstr "ZaÅ¡lete aktualizace mailem" -#~ msgid "Now to submit your report… do you have a FixMyStreet password?" -#~ msgstr "A nynà odeÅ¡lete hlášenà t… máte FixMyStreet heslo?" +#~ msgid "Enter a new password:" +#~ msgstr "Zadejte nové heslo:" -#~ msgid "Now to submit your update… do you have a FixMyStreet password?" -#~ msgstr "A nynà pro odeslánà aktualizace t… máte FixMyStreet heslo?" +#~ 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 "Bohužel nelze ověřit platnost. Pokud jste kopÃrovali URL adresu z e-mailové zprávy, prosÃm zkontrolujte jejà správnost.\n" -#~ msgid "Our code is open source and <a href=\"http://github.com/mysociety/fixmystreet\">available on GitHub</a>." -#~ msgstr "Náš zdrojový kód je open source a <a href=\"http://github.com/mysociety/fixmystreet\">je dostupný na GitHub</a>." +#~ 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 "Pokud použÃváte webový e-mail, nebo máte zapnutý filtr <em>nevyžádané poÅ¡ty</em>, zkontrolujte si <em>hromadnou</em> a <em>spam</em> složky. ObÄas jsou naÅ¡e zprávy jsou tÃmto způsobem oznaÄovány." -#~ msgid "Please take a look at the updates that have been left." -#~ msgstr "VÄ›nujte prosÃm pozornost aktualizacÃm, které zde byly zanechány." +#~ msgid "Message:" +#~ msgstr "Zpráva:" -#~ msgid "Problems within %s, FixMyStreet" -#~ msgstr "Hlášenà v oblasti %s, FixMyStreet" +#~ msgid "More problems nearby" +#~ msgstr "DalÅ¡Ã hlášenà z okolÃ" -#~ msgid "Properties recently reported as put back to use on reportemptyhomes.com" -#~ msgstr "Nemovitosti na reportemptyhomes.com nahlášené k navrácenà k opÄ›tovnému užÃvánÃ" +#~ msgid "Nearly Done! Now check your email..." +#~ msgstr "Téměř hotovo! Nynà zkontrolujte svůj e-mail ..." -#~ msgid "Publish the response" -#~ msgstr "Publikovat reakci" +#~ msgid "Offensive? Unsuitable? Tell us" +#~ msgstr "Urážlivé? Nevhodné? ŘeknÄ›te nám" -#~ msgid "Reported %s, to %s" -#~ msgstr "Nahlášeno uživatelem %s, urÄeno pro %s" +#~ msgid "Photo:" +#~ msgstr "Fotografie:" -#~ msgid "Reports on and around the map" -#~ msgstr "Hlášenà v mapÄ›" +#~ msgid "Please check your email" +#~ msgstr "Zkontrolujte svůj mail" -#~ msgid "Sign in by email" -#~ msgstr "PÅ™ihlásit se pomocà e-mailu" +#~ msgid "Please note that updates are not sent to the council. If you leave your name it will be public. Your information will only be used in accordance with our <a href=\"/faq#privacy\">privacy policy</a>" +#~ msgstr "VezmÄ›te prosÃm na vÄ›domÃ, že aktualizace nejsou odeslány na úřad. Uvedete-li zde své jméno, bude veÅ™ejnÄ› zobrazené. VaÅ¡e údaje budou použity pouze v souladu s naÅ¡imi <a href=\"/faq#privacy\"> zásadami ochrany osobnÃch údajů </a>" -#~ msgid "Signed in as %s" -#~ msgstr "PÅ™ihlášen as %s" +#~ msgid "This may be because the link is too old or already used, or the address was not copied correctly." +#~ msgstr "To může být proto, že odkaz je pÅ™ÃliÅ¡ starý nebo již použitý, nebo adresa nebyla správnÄ› zkopÃrována." -#~ msgid "The confirmation email <strong>may</strong> take a few minutes to arrive — <em>please</em> be patient." -#~ msgstr "Zaslánà potvrzovacÃho e-mailu <strong> může </strong> trvat nÄ›kolik minut, & ndash; <em> prosÃm </em>, buÄte trpÄ›livÃ." +#~ msgid "This problem has been closed" +#~ msgstr "Hlášenà bylo uzavÅ™eno" -#~ msgid "The details of your problem are available from the other tab above." -#~ msgstr "Podrobnosti vaÅ¡eho hlášenà jsou dostupné v záložce nahoÅ™e." +#~ msgid "This problem is in progress" +#~ msgstr "ŘeÅ¡enà hlášenà probÃhá" -#~ msgid "The details of your problem are available on the right hand side of this page." -#~ msgstr "Podrobnosti vaÅ¡eho hlášenà jsou dostupné na pravé stranÄ› této stránky." +#~ msgid "This problem is old and of unknown status." +#~ msgstr "Hlášenà je zastaralé a nenà znám stav." -#~ msgid "The latest local reports reported by users" -#~ msgstr "Poslednà lokálnà hlášenà od uživatelů" +#~ msgid "Update:" +#~ msgstr "Aktualizace:" -#~ msgid "The latest properties reported back to use by users" -#~ msgstr "Poslednà nemovitosti hlášené uživateli jako zpÄ›t pÅ™edané k užÃvánÃ" +#~ msgid "We have not been able to confirm your account - sorry." +#~ msgstr "Omlouváme se, nebyli jsme schopni potvrdit Váš úÄet." -#~ msgid "The latest reports for {{COUNCIL}} reported by users" -#~ msgstr "Poslednà hlášenà uživatelů pro {{COUNCIL}} " +#~ msgid "We have sent you an email containing a link to confirm your account." +#~ msgstr "Odeslali jsme Vámi e-mail s odkazem pro potvrzenà vaÅ¡eho úÄtu." -#~ msgid "The latest reports for {{COUNCIL}} within {{WARD}} ward reported by users" -#~ msgstr "Poslednà hlášenà uživatelů pro {{COUNCIL}} v oblasti {{WARD}} " +#~ msgid "We'd love to hear what you think about this site. Just fill in the form, or send an email to <a href='mailto:%s'>%s</a>:" +#~ msgstr "Rádi bychom znali Váš názor, co si myslÃte o tomto webu. StaÄà vyplnit formulář, nebo poÅ¡lete e-mail na <a href='mailto:%s'>% s </a>:" -#~ msgid "The latest reports within {{NAME}}'s boundary reported by users" -#~ msgstr "Poslednà hlášenà uživatelů pro {{NAME}}" +#~ msgid "You have already attached a photo to this report, attaching another one will replace it." +#~ msgstr "Pro toto hlášenà již máte pÅ™ipojenou fotografii, pÅ™ipojenÃm dalÅ¡Ã dojde k jejÃmu nahrazenÃ." -#~ msgid "To <strong>report a problem</strong>, click on the map at the correct location." -#~ msgstr "Pro <Strong> nahlášenà problému </strong>, kliknÄ›te na mapÄ› na správném mÃstÄ›." +#~ msgid "You have already attached a photo to this update, attaching another one will replace it." +#~ msgstr "Pro tuto aktualizaci již máte pÅ™ipojenou fotografii, pÅ™ipojenÃm dalÅ¡Ã dojde k jejÃmu nahrazenÃ." -#~ msgid "User" -#~ msgstr "Uživatel" +#~ msgid "Your email:" +#~ msgstr "Váš e-mail:" -#~ msgid "You must now click the link in the email we've just sent you." -#~ msgstr "MusÃte kliknout na link v emailové zprávÄ›, kterou jsme Vám právÄ› poslali." +#~ msgid "Your name:" +#~ msgstr "VaÅ¡e jméno:" -#~ msgid "Your email address:" -#~ msgstr "VaÅ¡e e-mailová adresa:" +#~ msgid "Your email:" +#~ msgstr "Váš e-mail:" diff --git a/locale/cy.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/cy.UTF-8/LC_MESSAGES/FixMyStreet.po index 1b853b11f..14f1829f5 100644 --- a/locale/cy.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/cy.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: fixmystreet\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2015-10-23 16:51+0100\n" -"PO-Revision-Date: 2015-08-12 14:08+0000\n" -"Last-Translator: ciaran\n" +"POT-Creation-Date: 2016-03-02 13:09+0000\n" +"PO-Revision-Date: 2015-10-23 16:38+0000\n" +"Last-Translator: mySociety <transifex@mysociety.org>\n" "Language-Team: Welsh (http://www.transifex.com/mysociety/fixmystreet/language/cy/)\n" "Language: cy\n" "MIME-Version: 1.0\n" @@ -19,45 +19,24 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:628 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:411 +#: perllib/FixMyStreet/DB/Result/Problem.pm:616 +#: perllib/FixMyStreet/Script/Reports.pm:189 msgid " and " msgstr "a" #: templates/web/base/report/new/councils_text_all.html:2 -#: templates/web/base/report/new/councils_text_none.html:11 -#: templates/web/base/report/new/councils_text_none.html:2 +#: templates/web/base/report/new/councils_text_none.html:12 +#: templates/web/base/report/new/councils_text_none.html:15 #: templates/web/base/report/new/councils_text_some.html:19 #: templates/web/base/report/new/councils_text_some.html:22 #: templates/web/base/report/new/councils_text_some.html:5 msgid " or " msgstr "neu" -#: templates/web/base/admin/index.html:35 -#: templates/web/base/status/index.html:13 -msgid "%s confirmed alerts, %s unconfirmed" -msgstr "%d hysbysiad wedi ei gadarnhau, %d heb ei gadarnhau" - -#: templates/web/base/admin/index.html:37 -#: templates/web/base/status/index.html:16 -#: templates/web/zurich/admin/index.html:6 -msgid "%s council contacts – %s confirmed, %s unconfirmed" -msgstr "" - #: templates/web/base/admin/edit-league.html:12 msgid "%d edits by %s" msgstr "" -#: templates/web/base/admin/index.html:34 -#: templates/web/base/status/index.html:12 -msgid "%s live updates" -msgstr "%d diweddariad byw" - -#: templates/web/base/admin/index.html:36 -#: templates/web/base/status/index.html:14 -msgid "%s questionnaires sent – %s answered (%s%%)" -msgstr "" - #: templates/web/base/pagination.html:10 msgid "%d to %d of %d" msgstr "%d i %d o %d" @@ -72,31 +51,46 @@ msgstr "%s - Adroddiadau" msgid "%s admin:" msgstr "" +#: templates/web/base/status/stats.html:26 +#, fuzzy +msgid "%s bodies" +msgstr "Cyrff" + +#: templates/web/base/status/stats.html:24 +msgid "%s confirmed alerts, %s unconfirmed" +msgstr "%s hysbysiad wedi ei gadarnhau, %s heb ei gadarnhau" + +#: templates/web/base/status/stats.html:27 +#: templates/web/zurich/admin/index.html:6 +#, fuzzy +msgid "%s council contacts – %s confirmed, %s unconfirmed" +msgstr "%s hysbysiad wedi ei gadarnhau, %s heb ei gadarnhau" + #. ("%s is the site name") #: templates/web/base/alert/index.html:7 -#, fuzzy msgid "" "%s has a variety of RSS feeds and email alerts for local\n" "problems, including alerts for all problems within a particular ward, or all\n" "problems within a certain distance of a particular location." msgstr "" -"Cynigia FixMyStreet amryw o ffrydiau RSS a hysbysiadau e-bost ar gyfer problemau lleol, gan gynnwys\n" -"hysbysiadau am bob problem o fewn ward neu gyngor penodol, neu bob problem\n" -"o fewn pellter penodol o leoliad penodol." #. ("%s is the site name") #: templates/web/base/alert/index.html:11 -#, fuzzy msgid "" "%s has a variety of RSS feeds and email alerts for local problems, including\n" "alerts for all problems within a particular ward or council, or all problems\n" "within a certain distance of a particular location." msgstr "" -"Cynigia FixMyStreet amryw o ffrydiau RSS a hysbysiadau e-bost ar gyfer problemau lleol, gan gynnwys\n" -"hysbysiadau am bob problem o fewn ward neu gyngor penodol, neu bob problem\n" -"o fewn pellter penodol o leoliad penodol." -#: perllib/FixMyStreet/DB/Result/Problem.pm:695 +#: templates/web/base/status/stats.html:23 +msgid "%s live updates" +msgstr "%s diweddariad byw" + +#: templates/web/base/status/stats.html:25 +msgid "%s questionnaires sent – %s answered (%s%%)" +msgstr "" + +#: perllib/FixMyStreet/DB/Result/Problem.pm:683 msgid "%s ref: %s" msgstr "" @@ -111,15 +105,15 @@ msgid "" "for the county council." msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:255 perllib/FixMyStreet/Cobrand/UK.pm:267 +#: perllib/FixMyStreet/Cobrand/UK.pm:256 perllib/FixMyStreet/Cobrand/UK.pm:268 msgid "%s ward, %s" msgstr "ward %s, %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:564 +#: perllib/FixMyStreet/DB/Result/Problem.pm:552 msgid "%s, reported at %s" msgstr "%s, adroddwyd am %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:282 perllib/FixMyStreet/Cobrand/UK.pm:294 +#: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295 msgid "%s, within %s ward" msgstr "%s, o fewn ward %s" @@ -127,7 +121,7 @@ msgstr "%s, o fewn ward %s" msgid "© <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors" msgstr "" -#: templates/web/zurich/report/new/fill_in_details_form.html:53 +#: templates/web/zurich/report/new/fill_in_details_form.html:46 msgid "(Defect & location of defect)" msgstr "" @@ -138,15 +132,13 @@ msgstr "" #: templates/web/zurich/admin/report_edit-sdm.html:60 #: templates/web/zurich/admin/report_edit.html:88 -#, fuzzy msgid "(No name)" -msgstr "Eich enw" +msgstr "" #: templates/web/zurich/admin/report_edit-sdm.html:67 #: templates/web/zurich/admin/report_edit.html:95 -#, fuzzy msgid "(No phone number)" -msgstr "Eich rhif ffôn" +msgstr "" #: templates/web/base/alert/_list.html:24 msgid "(a default distance which covers roughly 200,000 people)" @@ -154,17 +146,16 @@ msgstr "" #. ("%s is a list of distance links, e.g. [2km] / [5km] / [10km] / [20km]") #: templates/web/base/alert/_list.html:29 -#, fuzzy msgid "(alternatively the RSS feed can be customised, within %s)" -msgstr "(fel arall gellir addasu'r ffrwd RSS, o fewn" +msgstr "" -#: templates/web/base/report/_item.html:27 -#: templates/web/zurich/report/_item.html:21 +#: templates/web/base/report/_item.html:25 +#: templates/web/zurich/report/_item.html:19 msgid "(closed)" msgstr "(ar gau)" -#: templates/web/base/report/_item.html:25 -#: templates/web/zurich/report/_item.html:19 +#: templates/web/base/report/_item.html:23 +#: templates/web/zurich/report/_item.html:17 msgid "(fixed)" msgstr "(wedi trwsio)" @@ -172,37 +163,28 @@ msgstr "(wedi trwsio)" msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)" msgstr "" -#: templates/web/base/report/_item.html:21 +#: templates/web/base/report/_item.html:19 msgid "(not sent to council)" msgstr "(heb ei anfon at y cyngor)" -#: templates/web/base/report/new/fill_in_details_form.html:200 #: templates/web/zurich/report/new/fill_in_details_form.html:82 msgid "(optional)" msgstr "(dewisol)" -#: templates/web/fixmystreet/report/public_label.html:1 +#: templates/web/base/report/public_label.html:1 msgid "(public)" msgstr "(cyhoeddus)" -#: templates/web/base/report/_item.html:20 +#: templates/web/base/report/_item.html:18 msgid "(sent to both)" msgstr "(anfonwyd i'r ddau)" -#: templates/web/base/report/new/fill_in_details_form.html:194 -msgid "(we never show your email address or phone number)" -msgstr "(ni ddatgelir eich cyfeiriad e-bost na rhif ffôn)" - -#: templates/web/base/report/update-form.html:159 -msgid "(we never show your email)" -msgstr "(ni ddatgelir eich e-bost)" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:673 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 #: perllib/FixMyStreet/DB/Result/Problem.pm:410 msgid "-- Pick a category --" msgstr "-- Dewiswch gategori --" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:637 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:632 #: perllib/FixMyStreet/DB/Result/Problem.pm:416 msgid "-- Pick a property type --" msgstr "-- Dewiswch fath o eiddo --" @@ -221,52 +203,39 @@ msgstr "" msgid "<label>Show %s</label> <label>about %s</label>" msgstr "" -#: templates/web/base/admin/index.html:32 -#: templates/web/base/status/index.html:11 +#: templates/web/base/status/stats.html:18 #: templates/web/zurich/admin/index.html:4 msgid "<strong>%s</strong> live problems" -msgstr "<strong>%d</strong> o broblemau byw" +msgstr "<strong>%s</strong> o broblemau byw" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:39 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:2 msgid "<strong>No</strong> Let me confirm my report by email" msgstr "<strong>Nac oes</strong>, gadewch i fi gadarnhau'r adroddiad drwy e-bost" -#: templates/web/fixmystreet/report/update-form.html:112 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:2 msgid "<strong>No</strong> Let me confirm my update by email" msgstr "<strong>Nac oes</strong>, gadewch i fi gadarnhau'r diweddariad drwy e-bost" -#: templates/web/base/auth/general.html:48 +#: templates/web/base/auth/general.html:87 #: templates/web/zurich/auth/general.html:51 msgid "<strong>No</strong> let me sign in by email" msgstr "<strong>Nac oes</strong>, gadewch i fi fewngofnodi drwy e-bost" -#: templates/web/base/report/new/fill_in_details_form.html:145 -msgid "<strong>No</strong>, let me confirm my report by email:" -msgstr "<strong>Nac oes</strong>, gadewch i fi gadarnhau'r adroddiad drwy e-bost:" - -#: templates/web/base/report/update-form.html:118 -msgid "<strong>No</strong>, let me confirm my update by email:" -msgstr "<strong>Nac oes</strong>, gadewch i fi gadarnhau'r diweddariad drwy e-bost:" - -#: templates/web/base/auth/general.html:34 -#: templates/web/base/report/new/fill_in_details_form.html:123 -#: templates/web/base/report/update-form.html:96 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:15 -#: templates/web/fixmystreet/report/update-form.html:89 +#: templates/web/base/auth/general.html:70 +#: templates/web/base/report/new/form_user_loggedout_password.html:3 +#: templates/web/base/report/update/form_user_loggedout_password.html:2 msgid "<strong>Yes</strong> I have a password" msgstr "<strong>Oes</strong>, mae gen i gyfrinair" -#: templates/web/base/static/about-en-gb.html:1 -#: templates/web/base/static/about-en-gb.html:3 +#: templates/web/base/about/about-en-gb.html:1 +#: templates/web/base/about/about-en-gb.html:3 msgid "About us" msgstr "Amdanom" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:8 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:31 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:29 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:35 msgid "Action Scheduled" msgstr "" @@ -297,7 +266,7 @@ msgstr "Ychwanegu categori newydd" msgid "Add user" msgstr "Ychwanegu defnyddiwr" -#: templates/web/base/my/my.html:52 +#: templates/web/base/my/my.html:56 msgid "Added %s" msgstr "Ychwanegwyd %s" @@ -317,8 +286,7 @@ msgstr "" msgid "Alert %d disabled (created %s)" msgstr "Analluogwyd yr hysbysiad %d (créwyd %s)" -#: templates/web/base/report/update-form.html:164 -#: templates/web/fixmystreet/report/update-form.html:150 +#: templates/web/base/report/update/form_name.html:20 msgid "Alert me to future updates" msgstr "Rhoi gwybod am ddiweddariadau i ddod" @@ -328,9 +296,8 @@ msgid "All Reports" msgstr "Pob adroddiad" #: templates/web/zurich/admin/stats.html:5 -#, fuzzy msgid "All Reports as CSV" -msgstr "Pob adroddiad" +msgstr "" #: templates/web/base/footer.html:11 templates/web/fixmystreet/footer.html:32 #: templates/web/zurich/admin/index-dm.html:12 @@ -351,10 +318,8 @@ msgstr "Anfonir yr holl wybodaeth a roddir yma at" #: templates/web/base/report/new/councils_text_all.html:2 #: templates/web/base/report/new/councils_text_all.html:4 -#: templates/web/base/report/new/fill_in_details_form.html:12 -#: templates/web/base/report/new/fill_in_details_form.html:14 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:10 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:11 +#: templates/web/base/report/new/fill_in_details_form.html:10 +#: templates/web/base/report/new/fill_in_details_form.html:9 msgid "All the information you provide here will be sent to <strong>%s</strong>." msgstr "Anfonir yr holl wybodaeth a roddir yma at <strong>%s</strong>." @@ -376,6 +341,10 @@ msgstr "Dienw:" msgid "Are you a developer?" msgstr "Ydych chi'n ddatblygwr?" +#: templates/web/base/js/translation_strings.html:52 +msgid "Are you sure you want to cancel this upload?" +msgstr "" + #: templates/web/base/admin/body-form.html:69 #: templates/web/base/admin/body.html:16 #: templates/web/zurich/admin/body-form.html:24 @@ -408,16 +377,16 @@ msgstr "" msgid "Assigned to %s" msgstr "" -#: templates/web/base/open311/index.html:84 +#: templates/web/base/open311/index.html:76 msgid "At most %d requests are returned in each query. The returned requests are ordered by requested_datetime, so to get all requests, do several searches with rolling start_date and end_date." msgstr "" -#: templates/web/base/open311/index.html:76 +#: templates/web/base/open311/index.html:68 msgid "At the moment only searching for and looking at reports work." msgstr "" #: perllib/FixMyStreet/DB/Result/Problem.pm:373 -#: templates/web/zurich/report/_item.html:11 +#: templates/web/zurich/report/_item.html:9 msgid "Awaiting moderation" msgstr "" @@ -429,7 +398,7 @@ msgstr "Yn ôl" msgid "Ban email address" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1276 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1285 #: perllib/FixMyStreet/Cobrand/Zurich.pm:392 #: templates/web/base/admin/bodies.html:1 templates/web/zurich/header.html:64 msgid "Bodies" @@ -459,7 +428,7 @@ msgid "Can't see the map? <em>Skip this step</em>" msgstr "" #: templates/web/base/admin/body.html:68 -#: templates/web/base/admin/index.html:61 +#: templates/web/base/admin/index.html:54 #: templates/web/base/report/new/category.html:10 #: templates/web/base/report/new/category_wrapper.html:3 #: templates/web/zurich/admin/body.html:14 @@ -470,8 +439,8 @@ msgstr "" msgid "Category" msgstr "Categori" -#: templates/web/base/admin/index.html:59 -#: templates/web/base/admin/index.html:67 +#: templates/web/base/admin/index.html:52 +#: templates/web/base/admin/index.html:60 msgid "Category fix rate for problems > 4 weeks old" msgstr "" @@ -484,7 +453,7 @@ msgstr "" msgid "Category:" msgstr "Categori:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:402 +#: perllib/FixMyStreet/Script/Reports.pm:180 msgid "Category: %s" msgstr "Categori: %s" @@ -534,7 +503,7 @@ msgid "Click here or enter as dd/mm/yyyy" msgstr "Cliciwch yma neu rhowch fel dd/mm/bbbb" #: templates/web/base/around/_report_banner.html:2 -#: templates/web/base/js/translation_strings.html:50 +#: templates/web/base/js/translation_strings.html:55 msgid "Click map to report a problem" msgstr "Cliciwch ar y map i adrodd problem" @@ -561,7 +530,7 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:25 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:144 -#: templates/web/fixmystreet/report/banner.html:15 +#: templates/web/base/report/banner.html:15 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:10 #: templates/web/zurich/admin/header.html:16 @@ -569,7 +538,7 @@ msgstr "" msgid "Closed" msgstr "Ar gau" -#: perllib/FixMyStreet/DB/Result/Problem.pm:794 +#: perllib/FixMyStreet/DB/Result/Problem.pm:779 msgid "Closed by council" msgstr "Caewyd gan y cyngor" @@ -595,7 +564,7 @@ msgstr "" msgid "Cobrand:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1283 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1292 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "" @@ -608,13 +577,14 @@ msgstr "" msgid "Confirm" msgstr "Cadarnhau" -#: templates/web/base/auth/token.html:1 templates/web/zurich/auth/token.html:1 +#: templates/web/base/auth/token.html:1 msgid "Confirm account" msgstr "" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:33 -#: templates/web/fixmystreet/report/update-form.html:107 -msgid "Confirm by email below, providing a new password at that point. When you confirm, your password will be updated." +#: templates/web/base/report/new/form_user_loggedout_password.html:21 +#: templates/web/base/report/update/form_user_loggedout_password.html:20 +#, fuzzy +msgid "Confirm by email instead, providing a new password at that point. When you confirm, your password will be updated." msgstr "Cadarnhewch drwy e-bost isod, gan ddarparu cyfrinair newydd bryd hynny. Diweddarir eich cyfrinair pan fyddwch yn cadarnhau." #: templates/web/base/questionnaire/creator_fixed.html:1 @@ -644,35 +614,27 @@ msgid "Confirmed:" msgstr "Cadarnhawyd:" #. ("%s is the site name") -#: templates/web/base/faq/faq-en-gb.html:8 templates/web/base/footer.html:24 -#: templates/web/base/open311/index.html:8 -#: templates/web/base/static/privacy.html:10 -#: templates/web/fixmystreet/contact/index.html:12 -#, fuzzy +#: templates/web/base/about/_sidebar.html:6 templates/web/base/footer.html:24 msgid "Contact %s" -msgstr "Cysylltu â ni" +msgstr "" #: templates/web/base/contact/index.html:1 #: templates/web/base/contact/index.html:2 #: templates/web/base/contact/submit.html:1 -#: templates/web/fixmystreet/contact/index.html:1 -#: templates/web/fixmystreet/contact/index.html:2 msgid "Contact Us" msgstr "Cysylltu â ni" -#: templates/web/base/contact/index.html:6 -#: templates/web/fixmystreet/contact/index.html:20 +#: templates/web/base/contact/index.html:12 msgid "Contact the team" msgstr "Cysylltu â'r tîm" #: templates/web/zurich/admin/report_edit-sdm.html:40 #: templates/web/zurich/admin/report_edit.html:59 -#, fuzzy msgid "Coordinates:" -msgstr "Cyfesurynnau:" +msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1420 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1448 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1429 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1457 msgid "Could not find user" msgstr "Methu dod o hyd i'r defnyddiwr" @@ -690,7 +652,7 @@ msgstr "Cyngor" msgid "Council contacts for %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:693 +#: perllib/FixMyStreet/DB/Result/Problem.pm:681 msgid "Council ref: %s" msgstr "" @@ -705,7 +667,7 @@ msgstr "Cyngor:" msgid "Count" msgstr "" -#: templates/web/base/email_sent.html:1 templates/web/zurich/email_sent.html:1 +#: templates/web/base/email_sent.html:1 msgid "Create a report" msgstr "Creu adroddiad" @@ -715,9 +677,8 @@ msgid "Create category" msgstr "Creu categori" #: templates/web/zurich/admin/template_edit.html:29 -#, fuzzy msgid "Create template" -msgstr "Creu adroddiad" +msgstr "" #: templates/web/base/admin/problem_row.html:34 #: templates/web/zurich/admin/templates.html:10 @@ -754,7 +715,7 @@ msgstr "" msgid "Dealt with by subdivision within 5 working days" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:878 +#: perllib/FixMyStreet/App/Controller/Admin.pm:877 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "" @@ -767,7 +728,7 @@ msgstr "" msgid "Deleted" msgstr "Dilëwyd" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:51 +#: templates/web/base/report/new/form_report.html:45 #: templates/web/zurich/admin/index-dm.html:22 #: templates/web/zurich/admin/index-sdm.html:20 #: templates/web/zurich/admin/reports.html:12 @@ -775,12 +736,11 @@ msgid "Description" msgstr "Disgrifiad" #: templates/web/base/js/translation_strings.html:34 -#: templates/web/zurich/report/new/fill_in_details_form.html:42 +#: templates/web/zurich/report/new/fill_in_details_form.html:68 msgid "Details" msgstr "Manylion" #: templates/web/base/admin/report_edit.html:20 -#: templates/web/base/report/new/fill_in_details_form.html:62 #: templates/web/zurich/admin/report_edit-sdm.html:27 #: templates/web/zurich/admin/report_edit.html:29 #: templates/web/zurich/admin/report_edit.html:43 @@ -801,29 +761,30 @@ msgid "Diligency prize league table" msgstr "" #. ("%s is the site name") -#: templates/web/base/auth/general.html:31 -#: templates/web/base/report/new/fill_in_details_form.html:114 -#: templates/web/base/report/update-form.html:87 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:11 -#: templates/web/fixmystreet/report/update-form.html:86 -#, fuzzy +#: templates/web/base/auth/general.html:48 +#: templates/web/base/report/new/form_user_loggedout.html:18 +#: templates/web/base/report/new/oauth_email_form.html:18 +#: templates/web/base/report/update-form.html:29 +#: templates/web/base/report/update/form_user_loggedout.html:17 msgid "Do you have a %s password?" -msgstr "Oes gennych chi gyfrinair FixMyStreet?" +msgstr "" #: templates/web/base/questionnaire/index.html:55 msgid "Don’t know" msgstr "" -#: templates/web/fixmystreet/contact/index.html:118 +#: templates/web/base/contact/index.html:110 msgid "Don't like forms?" msgstr "" +#: templates/web/base/js/translation_strings.html:51 +msgid "Drag and drop photos here or <u>click to upload</u>" +msgstr "" + #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:14 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:32 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:30 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:36 msgid "Duplicate" msgstr "Lluosogi" @@ -873,7 +834,7 @@ msgstr "Golygydd" #: templates/web/base/admin/category_edit.html:91 #: templates/web/base/admin/flagged.html:38 #: templates/web/base/admin/users.html:16 -#: templates/web/base/auth/general.html:22 +#: templates/web/base/auth/general.html:39 #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:24 @@ -881,7 +842,7 @@ msgstr "Golygydd" msgid "Email" msgstr "E-bost" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1396 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1405 msgid "Email added to abuse list" msgstr "Ychwanegwyd yr e-bost at y rhestr camddefnydd" @@ -897,7 +858,7 @@ msgstr "Crëwyd hysbysiad e-bost" msgid "Email alert deleted" msgstr "Dilëwyd hysbysiad e-bost" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1393 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1402 msgid "Email already in abuse list" msgstr "E-bost eisoes yn y rhestr camddefnydd" @@ -905,41 +866,36 @@ msgstr "E-bost eisoes yn y rhestr camddefnydd" msgid "Email me new local problems" msgstr "Rhoi gwybod i fi am broblemau lleol newydd drwy e-bost" -#: templates/web/base/report/display.html:38 -msgid "Email me updates" -msgstr "Anfon diweddariadau ataf drwy e-bost" - #: templates/web/base/admin/category_edit.html:31 #: templates/web/base/admin/report_edit.html:62 #: templates/web/base/admin/update_edit.html:33 #: templates/web/base/admin/user-form.html:20 #: templates/web/base/alert/updates.html:13 -#: templates/web/base/report/display.html:42 #: templates/web/zurich/admin/body.html:47 msgid "Email:" msgstr "E-bost:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:329 +#: perllib/FixMyStreet/Script/Reports.pm:108 msgid "Email: %s" msgstr "E-bost: %s" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:639 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:634 msgid "Empty flat or maisonette" msgstr "Fflat wag" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:638 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:633 msgid "Empty house or bungalow" msgstr "TÅ· neu fyngalo gwag" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:641 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:636 msgid "Empty office or other commercial" msgstr "Swyddfa neu adeilad masnachol arall gwag" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:642 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:637 msgid "Empty pub or bar" msgstr "Tafarn neu far gwag" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:643 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:638 msgid "Empty public building - school, hospital, etc." msgstr "Adeilad cyhoeddus gwag - ysgol, ysbyty, ac ati." @@ -972,7 +928,7 @@ msgstr "" msgid "Enter a Zürich street name" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:13 +#: perllib/FixMyStreet/Cobrand/UK.pm:14 msgid "Enter a nearby UK postcode, or street name and area" msgstr "Rhowch god post DU, neu enw stryd ac ardal" @@ -990,14 +946,9 @@ msgstr "Rhowch enw stryd ac ardal gerllaw" msgid "Enter a nearby street name and area, postal code or district in Delhi" msgstr "Rhowch enw stryd ac ardal gerllaw, cod post neu ardal yn Delhi" -#: templates/web/base/report/new/fill_in_details_form.html:152 -#: templates/web/base/report/update-form.html:125 -msgid "Enter a new password:" -msgstr "Rhowch gyfrinair newydd:" - -#: templates/web/base/auth/general.html:60 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:75 -#: templates/web/fixmystreet/report/update-form.html:123 +#: templates/web/base/auth/general.html:99 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:38 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:13 #: templates/web/zurich/auth/general.html:65 msgid "Enter a password" msgstr "Rhowch gyfrinair" @@ -1007,11 +958,11 @@ msgid "Enter details of the problem" msgstr "Rhowch fanylion am y broblem" #: templates/web/base/errors/generic.html:1 -#: templates/web/base/errors/generic.html:3 +#: templates/web/base/errors/generic.html:4 #: templates/web/base/tokens/abuse.html:1 #: templates/web/base/tokens/abuse.html:3 #: templates/web/base/tokens/error.html:1 -#: templates/web/base/tokens/error.html:3 +#: templates/web/base/tokens/error.html:5 msgid "Error" msgstr "Gwall" @@ -1024,11 +975,11 @@ msgstr "" msgid "Example postcode %s" msgstr "Cod post enghreifftiol %s" -#: templates/web/base/open311/index.html:94 +#: templates/web/base/open311/index.html:86 msgid "Examples:" msgstr "Enghraifft:" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:55 +#: templates/web/base/report/new/form_report.html:49 msgid "Explain what’s wrong, exactly where it is, and how long it’s been there…" msgstr "Esboniwch beth sy'n bod, ble'n union mae'r broblem, ac ers faint o amser mae hi yna..." @@ -1036,9 +987,8 @@ msgstr "Esboniwch beth sy'n bod, ble'n union mae'r broblem, ac ers faint o amser #: perllib/FixMyStreet/Cobrand/Zurich.pm:922 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:12 -#, fuzzy msgid "Extern" -msgstr "URL allanol" +msgstr "" #: templates/web/base/admin/body-form.html:81 msgid "External URL" @@ -1070,17 +1020,15 @@ msgstr "" msgid "FixMyStreet" msgstr "FixMyStreet" -#: templates/web/base/admin/index.html:61 +#: templates/web/base/admin/index.html:54 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:24 #: templates/web/base/admin/report_blocks.html:9 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:144 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:34 -#: templates/web/fixmystreet/report/banner.html:12 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:32 +#: templates/web/base/report/banner.html:12 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:38 msgid "Fixed" msgstr "" @@ -1107,7 +1055,7 @@ msgstr "" msgid "Flag user" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1281 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1290 #: templates/web/base/admin/users.html:19 msgid "Flagged" msgstr "" @@ -1138,8 +1086,8 @@ msgstr "" msgid "For more information, see <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>." msgstr "" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:32 -#: templates/web/fixmystreet/report/update-form.html:106 +#: templates/web/base/report/new/form_user_loggedout_password.html:20 +#: templates/web/base/report/update/form_user_loggedout_password.html:19 msgid "Forgotten your password?" msgstr "Wedi anghofio eich cyfrinair?" @@ -1151,21 +1099,18 @@ msgstr "" msgid "Forwarded wish to external body" msgstr "" -#: templates/web/base/faq/faq-en-gb.html:1 -#: templates/web/base/faq/faq-en-gb.html:13 -#: templates/web/base/faq/faq-en-gb.html:6 -#: templates/web/base/open311/index.html:6 -#: templates/web/base/static/privacy.html:8 -#: templates/web/fixmystreet/contact/index.html:10 +#: templates/web/base/about/_sidebar.html:4 +#: templates/web/base/about/faq-en-gb.html:1 +#: templates/web/base/about/faq-en-gb.html:5 msgid "Frequently Asked Questions" msgstr "Cwestiynau a ofynnir yn aml" -#: templates/web/base/open311/index.html:136 +#: templates/web/base/open311/index.html:128 msgid "GeoRSS on Google Maps" msgstr "GeoRSS ar Google Maps" +#: templates/web/base/report/display_tools.html:11 #: templates/web/fixmystreet/around/_updates.html:3 -#: templates/web/fixmystreet/report/display.html:35 msgid "Get updates" msgstr "Derbyn diweddariadau" @@ -1198,7 +1143,7 @@ msgstr "" msgid "Going to send questionnaire?" msgstr "" -#: templates/web/base/admin/index.html:42 +#: templates/web/base/admin/index.html:35 msgid "Graph of problem creation by status over time" msgstr "" @@ -1215,7 +1160,7 @@ msgid "Have you ever reported a problem to a council before, or is this your fir msgstr "Ydych chi wedi adrodd problem at y cyngor o'r blaen, neu ai dyma eich tro cyntaf?" #: templates/web/base/footer.html:15 templates/web/fixmystreet/footer.html:38 -#: templates/web/zurich/faq/faq-de-ch.html:1 +#: templates/web/zurich/about/faq-de-ch.html:1 #: templates/web/zurich/footer.html:22 #: templates/web/zurich/nav_over_content.html:8 msgid "Help" @@ -1266,7 +1211,7 @@ msgstr "Sut i adrodd problem" msgid "How to send successful reports" msgstr "Sut i anfon adroddiadau llwyddiannus" -#: perllib/FixMyStreet/App/Controller/Admin.pm:754 +#: perllib/FixMyStreet/App/Controller/Admin.pm:752 msgid "I am afraid you cannot confirm unconfirmed reports." msgstr "Yn anffodus, ni allwch gadarnhau adroddiadau heb eu cadarnhau." @@ -1284,10 +1229,6 @@ msgstr "Dwi newydd ddiweddaru problem ar @fixmystreet" msgid "I'm afraid we couldn't locate your problem in the database.\n" msgstr "" -#: perllib/FixMyStreet/App/Controller/Tokens.pm:327 -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 "" - #: templates/web/base/admin/flagged.html:14 #: templates/web/base/admin/list_updates.html:6 #: templates/web/base/admin/reports.html:11 @@ -1316,16 +1257,11 @@ msgstr "" msgid "If you get some more information about the status of your problem, please come back to the site and leave an update." msgstr "Os cewch chi ragor o wybodaeth am statws eich problem, dychwelwch i'r wefan i adael diweddariad." -#: templates/web/base/report/new/councils_text_none.html:2 -#: templates/web/base/report/new/councils_text_none.html:8 +#: templates/web/base/report/new/councils_text_none.html:10 +#: templates/web/base/report/new/councils_text_none.html:9 msgid "If you submit a problem here the subject and details of the problem will be public, but the problem will <strong>not</strong> be reported to the council." msgstr "Os cyflwynwch chi broblem yma, bydd y pwnc a manylion y broblem yn gyhoeddus, ond <strong>ni</strong> chaiff y broblem ei hanfon at y cyngor." -#: templates/web/zurich/auth/token.html:19 -#: templates/web/zurich/email_sent.html:7 -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 "Os ydych chi'n defnyddio e-bost drwy'r we neu os oes gennych chi hidlydd sothach, gwiriwch eich plygellau e-bost sothach: o bryd i'w gilydd, deuir o hyd i'n negeseuon yno." - #: templates/web/base/questionnaire/index.html:68 msgid "" "If you wish to leave a public update on the problem, please enter it here\n" @@ -1369,10 +1305,8 @@ msgstr "" #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:144 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:32 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:30 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:36 msgid "In Progress" msgstr "Ar y gweill" @@ -1380,7 +1314,7 @@ msgstr "Ar y gweill" msgid "In abuse table?" msgstr "" -#: templates/web/base/open311/index.html:88 +#: templates/web/base/open311/index.html:80 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 "" @@ -1388,7 +1322,7 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/Zurich.pm:963 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:7 -#: templates/web/fixmystreet/report/banner.html:19 +#: templates/web/base/report/banner.html:19 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:8 msgid "In progress" @@ -1423,7 +1357,7 @@ msgstr "" msgid "Invalid agency_responsible value %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1201 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1210 msgid "Invalid end date" msgstr "Dyddiad dod i ben annilys" @@ -1431,7 +1365,7 @@ msgstr "Dyddiad dod i ben annilys" msgid "Invalid format %s specified." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1206 msgid "Invalid start date" msgstr "Dyddiad cychwyn annilys" @@ -1439,14 +1373,12 @@ msgstr "Dyddiad cychwyn annilys" #: templates/web/base/admin/report_blocks.html:5 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:143 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:31 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:29 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:35 msgid "Investigating" msgstr "" -#: templates/web/fixmystreet/contact/blurb.html:8 +#: templates/web/base/contact/blurb.html:8 msgid "It's often quickest to <a href=\"%s\">check our FAQs</a> and see if the answer is there." msgstr "" @@ -1464,11 +1396,9 @@ msgstr "" msgid "Jurisdiction unknown" msgstr "" -#: templates/web/base/auth/general.html:44 -#: templates/web/base/report/new/fill_in_details_form.html:132 -#: templates/web/base/report/update-form.html:105 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:28 -#: templates/web/fixmystreet/report/update-form.html:102 +#: templates/web/base/auth/general.html:80 +#: templates/web/base/report/new/form_user_loggedout_password.html:16 +#: templates/web/base/report/update/form_user_loggedout_password.html:15 #: templates/web/zurich/auth/general.html:40 msgid "Keep me signed in on this computer" msgstr "Cadw fi wedi mewngofnodi ar y cyfrifiadur hwn" @@ -1526,6 +1456,7 @@ msgid "MAP" msgstr "MAP" #: templates/web/base/js/translation_strings.html:45 +#: templates/web/base/maps/google-ol.html:13 msgid "Map" msgstr "Map" @@ -1545,7 +1476,7 @@ msgstr "" msgid "Marked fixed/closed more than eight weeks ago" msgstr "" -#: templates/web/fixmystreet/contact/index.html:106 +#: templates/web/base/contact/index.html:98 msgid "Message" msgstr "Neges" @@ -1557,10 +1488,6 @@ msgstr "" msgid "Message to external body:" msgstr "" -#: templates/web/base/contact/index.html:97 -msgid "Message:" -msgstr "Neges:" - #: perllib/FixMyStreet/App/Controller/Open311.pm:445 msgid "Missing jurisdiction_id" msgstr "jurisdiction_id coll" @@ -1573,10 +1500,6 @@ msgstr "" msgid "Month" msgstr "Mis" -#: templates/web/base/report/display.html:34 -msgid "More problems nearby" -msgstr "Rhagor o broblemau gerllaw" - #: templates/web/base/admin/bodies.html:21 #: templates/web/base/admin/body-form.html:18 #: templates/web/base/admin/flagged.html:16 @@ -1584,11 +1507,11 @@ msgstr "Rhagor o broblemau gerllaw" #: templates/web/base/admin/list_updates.html:7 #: templates/web/base/admin/reports.html:13 #: templates/web/base/admin/users.html:15 -#: templates/web/base/auth/general.html:50 +#: templates/web/base/auth/general.html:89 +#: templates/web/base/report/new/form_user_loggedin.html:9 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:7 +#: templates/web/base/report/update/form_name.html:4 #: templates/web/base/reports/index.html:20 -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:9 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:44 -#: templates/web/fixmystreet/report/update-form.html:138 #: templates/web/zurich/admin/body-form.html:4 #: templates/web/zurich/auth/general.html:60 #: templates/web/zurich/report/new/fill_in_details_form.html:82 @@ -1602,7 +1525,7 @@ msgstr "Enw" msgid "Name:" msgstr "Enw:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:328 +#: perllib/FixMyStreet/Script/Reports.pm:107 msgid "Name: %s" msgstr "Enw: %s" @@ -1611,29 +1534,24 @@ msgstr "Enw: %s" msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:127 +#: perllib/FixMyStreet/Cobrand/UK.pm:128 msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:434 -#: perllib/FixMyStreet/Cobrand/Default.pm:474 +#: perllib/FixMyStreet/Cobrand/Default.pm:455 +#: perllib/FixMyStreet/Cobrand/Default.pm:495 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:267 +#: perllib/FixMyStreet/Script/Alerts.pm:290 msgid "" "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n" "\n" msgstr "" -#: templates/web/zurich/email_sent.html:5 -msgid "Nearly Done! Now check your email..." -msgstr "Bron yna! Nawr gwiriwch eich e-bost..." - #: templates/web/base/auth/token.html:17 templates/web/base/email_sent.html:5 -#, fuzzy msgid "Nearly done! Now check your email…" -msgstr "Bron yna! Nawr gwiriwch eich e-bost..." +msgstr "" #: templates/web/base/reports/index.html:21 msgid "New <br>problems" @@ -1657,9 +1575,8 @@ msgid "New local problems on FixMyStreet" msgstr "Problemau lleol newydd ar FixMyStreet" #: templates/web/zurich/admin/report_edit-sdm.html:117 -#, fuzzy msgid "New note to DM:" -msgstr "Nodyn mewnol newydd:" +msgstr "" #: db/alert_types.pl:38 msgid "New problems for {{COUNCIL}} within {{WARD}} ward on FixMyStreet" @@ -1691,9 +1608,8 @@ msgstr "" #: templates/web/zurich/admin/template_edit.html:9 #: templates/web/zurich/admin/templates.html:26 -#, fuzzy msgid "New template" -msgstr "Diweddariad newydd:" +msgstr "" #: templates/web/base/pagination.html:13 msgid "Next" @@ -1710,8 +1626,8 @@ msgstr "Nesaf" #: templates/web/base/admin/report_edit.html:75 #: templates/web/base/admin/update_edit.html:25 #: templates/web/base/questionnaire/creator_fixed.html:16 +#: templates/web/base/questionnaire/index.html:101 #: templates/web/base/questionnaire/index.html:53 -#: templates/web/base/questionnaire/index.html:92 msgid "No" msgstr "" @@ -1775,10 +1691,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:13 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:33 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:31 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:37 msgid "Not Responsible" msgstr "" @@ -1817,7 +1731,7 @@ msgstr "" msgid "Note:" msgstr "Nodyn:" -#: templates/web/base/open311/index.html:73 +#: templates/web/base/open311/index.html:65 msgid "Note: <strong>%s</strong>" msgstr "Nodyn: <strong>%s</strong>" @@ -1825,13 +1739,15 @@ msgstr "Nodyn: <strong>%s</strong>" msgid "Notes from SDM to DM" msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:113 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:10 +#: templates/web/base/report/new/form_user_loggedout.html:14 +#: templates/web/base/report/new/form_user_loggedout.html:2 +#: templates/web/base/report/new/oauth_email_form.html:17 msgid "Now to submit your report…" msgstr "Nawr i gyflwyno eich adroddiad…" -#: templates/web/base/report/update-form.html:86 -#: templates/web/fixmystreet/report/update-form.html:85 +#: templates/web/base/report/update-form.html:28 +#: templates/web/base/report/update/form_user_loggedout.html:13 +#: templates/web/base/report/update/form_user_loggedout.html:2 msgid "Now to submit your update…" msgstr "Nawr i gyflwyno eich diweddariad…" @@ -1839,11 +1755,6 @@ msgstr "Nawr i gyflwyno eich diweddariad…" msgid "OK" msgstr "Iawn" -#: templates/web/base/report/display.html:28 -#: templates/web/base/report/update.html:17 -msgid "Offensive? Unsuitable? Tell us" -msgstr "Sarhaus? Anaddas? Dywedwch wrthym" - #: templates/web/base/reports/index.html:23 msgid "Old / unknown <br>problems" msgstr "Problemau <br>hen/anhysbys" @@ -1860,7 +1771,7 @@ msgstr "Trwsiwyd <br>o'r blaen" msgid "Older <br>problems" msgstr "Problemau <br>hÅ·n" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:45 +#: templates/web/base/report/new/form_report.html:15 msgid "One-line summary" msgstr "Crynodeb byr" @@ -1871,8 +1782,7 @@ msgstr "Crynodeb byr" #: templates/web/base/admin/report_blocks.html:4 #: templates/web/base/admin/update_edit.html:28 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/report/update-form.html:30 -#: templates/web/fixmystreet/report/update-form.html:28 +#: templates/web/base/report/update/form_update.html:34 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:7 #: templates/web/zurich/admin/update_edit.html:18 @@ -1887,15 +1797,15 @@ msgstr "Ar agor am fwy na phedair wythnos, gyda diweddariad o fewn yr wyth wythn msgid "Open, but not had any update in eight weeks" msgstr "Ar agor, ond heb ddiweddariad o fewn yr wyth wythnos ddiwethaf" -#: templates/web/base/open311/index.html:70 +#: templates/web/base/open311/index.html:62 msgid "Open311 API for the mySociety FixMyStreet server" msgstr "API Open311 i weinydd mySociety FixMyStreet" -#: templates/web/base/open311/index.html:80 +#: templates/web/base/open311/index.html:72 msgid "Open311 initiative web page" msgstr "gwefan menter Open311" -#: templates/web/base/open311/index.html:81 +#: templates/web/base/open311/index.html:73 msgid "Open311 specification" msgstr "" @@ -1907,15 +1817,15 @@ msgstr "" msgid "Or you can subscribe to an alert based upon what ward or council you’re in:" msgstr "Neu gallwch danysgrifio i hysbysiad yn seiliedig ar eich ward neu etholaeth:" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1084 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:673 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:674 -#: perllib/FixMyStreet/DB/Result/Problem.pm:570 -#: perllib/FixMyStreet/DB/Result/Problem.pm:580 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1055 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:669 +#: perllib/FixMyStreet/DB/Result/Problem.pm:558 +#: perllib/FixMyStreet/DB/Result/Problem.pm:568 +#: perllib/FixMyStreet/DB/Result/Problem.pm:578 #: perllib/FixMyStreet/DB/Result/Problem.pm:590 -#: perllib/FixMyStreet/DB/Result/Problem.pm:602 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:397 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:412 +#: perllib/FixMyStreet/Script/Reports.pm:175 +#: perllib/FixMyStreet/Script/Reports.pm:190 msgid "Other" msgstr "" @@ -1924,7 +1834,7 @@ msgid "Owner" msgstr "" #: templates/web/base/errors/page_error_404_not_found.html:1 -#: templates/web/base/errors/page_error_404_not_found.html:3 +#: templates/web/base/errors/page_error_404_not_found.html:4 msgid "Page Not Found" msgstr "Ni chanfuwyd y dudalen" @@ -1938,16 +1848,16 @@ msgstr "Rhiant" msgid "Partial" msgstr "Rhannol" -#: templates/web/base/auth/general.html:53 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:68 -#: templates/web/fixmystreet/report/update-form.html:116 +#: templates/web/base/auth/general.html:92 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:31 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:6 #: templates/web/zurich/auth/general.html:32 #: templates/web/zurich/auth/general.html:63 msgid "Password (optional)" msgstr "Cyfrinair (dewisol)" #: templates/web/base/auth/change_password.html:25 -#: templates/web/base/auth/general.html:36 +#: templates/web/base/auth/general.html:72 msgid "Password:" msgstr "Cyfrinair:" @@ -1959,45 +1869,37 @@ msgstr "Dolen barhaol" msgid "Phone number" msgstr "Rhif ffôn" -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:26 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:62 +#: templates/web/base/report/new/form_user_loggedin.html:26 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:25 msgid "Phone number (optional)" msgstr "Rhif ffôn (dewisol)" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:306 +#: perllib/FixMyStreet/Script/Reports.pm:83 #: templates/web/base/admin/report_edit.html:63 -#: templates/web/base/report/new/fill_in_details_form.html:198 #: templates/web/zurich/admin/stats.html:39 msgid "Phone:" msgstr "Ffôn:" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:66 -#: templates/web/fixmystreet/report/update-form.html:59 +#: templates/web/base/questionnaire/index.html:75 +#: templates/web/base/report/new/form_report.html:23 +#: templates/web/base/report/update/form_update.html:6 #: templates/web/zurich/admin/index-dm.html:29 #: templates/web/zurich/admin/index-sdm.html:24 #: templates/web/zurich/admin/reports.html:16 #: templates/web/zurich/admin/stats.html:37 -#: templates/web/zurich/report/new/fill_in_details_form.html:52 +#: templates/web/zurich/report/new/fill_in_details_form.html:45 msgid "Photo" msgstr "Llun" -#: perllib/FixMyStreet/App/Controller/Photo.pm:221 -#, fuzzy +#: perllib/FixMyStreet/App/Controller/Photo.pm:187 msgid "Photo is required." -msgstr "Mae'r wybodaeth hon yn ofynnol" +msgstr "" #: templates/web/base/admin/category_edit.html:48 -#, fuzzy msgid "Photo required" -msgstr "Mae'r wybodaeth hon yn ofynnol" - -#: templates/web/base/questionnaire/index.html:80 -#: templates/web/base/report/new/fill_in_details_form.html:84 -#: templates/web/base/report/update-form.html:62 -msgid "Photo:" -msgstr "Llun:" +msgstr "" -#: templates/web/base/alert/list.html:26 +#: templates/web/base/alert/list.html:23 msgid "Photos of recent nearby reports" msgstr "Lluniau o adroddiadau diweddar gerllaw" @@ -2026,20 +1928,16 @@ msgstr "Byddwch yn gwrtais, yn gryno ac yn berthnasol." msgid "Please check the passwords and try again" msgstr "" -#: templates/web/zurich/auth/token.html:16 -msgid "Please check your email" -msgstr "" - -#: templates/web/base/auth/general.html:10 -#: templates/web/base/auth/general.html:16 +#: templates/web/base/auth/general.html:27 +#: templates/web/base/auth/general.html:33 #: templates/web/zurich/auth/general.html:3 #: templates/web/zurich/auth/general.html:9 msgid "Please check your email address is correct" msgstr "" #: perllib/FixMyStreet/App/Controller/Admin.pm:343 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:883 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:948 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:878 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:943 #: perllib/FixMyStreet/DB/Result/Problem.pm:412 #: templates/web/base/js/translation_strings.html:9 msgid "Please choose a category" @@ -2053,8 +1951,7 @@ msgstr "" msgid "Please correct the errors below" msgstr "" -#: templates/web/base/contact/blurb.html:2 -#: templates/web/fixmystreet/contact/blurb.html:12 +#: templates/web/base/contact/blurb.html:12 msgid "" "Please do <strong>not</strong> report problems through this form; messages go to\n" "the team behind this site, not a council. To report a problem,\n" @@ -2066,11 +1963,17 @@ msgid "Please do not be abusive — abusing your council devalues the s msgstr "Peidiwch â bod yn sarhaus — byddai sarhau eich cyngor yn dibrisio'r gwasanaeth i bawb." #: perllib/FixMyStreet/App/Controller/Admin.pm:346 -#: perllib/FixMyStreet/DB/Result/Comment.pm:126 +#: perllib/FixMyStreet/DB/Result/Comment.pm:125 #: templates/web/base/js/translation_strings.html:2 msgid "Please enter a message" msgstr "Rhowch neges" +#: perllib/FixMyStreet/App/Controller/Admin.pm:1091 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1146 +#, fuzzy +msgid "Please enter a name" +msgstr "Rhowch eich enw" + #: templates/web/base/auth/change_password.html:12 #: templates/web/base/auth/change_password.html:15 #: templates/web/base/js/translation_strings.html:19 @@ -2083,10 +1986,10 @@ msgstr "Rhowch gyfrinair" msgid "Please enter a subject" msgstr "Rhowch bwnc" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1084 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1137 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1087 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1142 #: perllib/FixMyStreet/App/Controller/Admin.pm:345 -#: perllib/FixMyStreet/DB/Result/User.pm:127 +#: perllib/FixMyStreet/DB/Result/User.pm:133 #: templates/web/base/js/translation_strings.html:12 #: templates/web/base/js/translation_strings.html:16 msgid "Please enter a valid email" @@ -2103,9 +2006,9 @@ msgid "Please enter some details" msgstr "Rhowch fanylion" #: perllib/FixMyStreet/App/Controller/Contact.pm:113 -#: perllib/FixMyStreet/DB/Result/User.pm:124 -#: templates/web/base/auth/general.html:10 -#: templates/web/base/auth/general.html:15 +#: perllib/FixMyStreet/DB/Result/User.pm:130 +#: templates/web/base/auth/general.html:27 +#: templates/web/base/auth/general.html:32 #: templates/web/base/js/translation_strings.html:11 #: templates/web/base/js/translation_strings.html:15 #: templates/web/zurich/auth/general.html:3 @@ -2113,7 +2016,7 @@ msgstr "Rhowch fanylion" msgid "Please enter your email" msgstr "Rhowch eich e-bost" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:7 +#: templates/web/base/report/new/form_user_loggedout_email.html:7 #: templates/web/zurich/report/new/fill_in_details_form.html:80 msgid "Please enter your email address" msgstr "Rhowch eich cyfeiriad e-bost" @@ -2122,15 +2025,15 @@ msgstr "Rhowch eich cyfeiriad e-bost" msgid "Please enter your first name" msgstr "Rhowch eich enw cyntaf" -#: perllib/FixMyStreet/Cobrand/UK.pm:318 +#: perllib/FixMyStreet/Cobrand/UK.pm:319 #: templates/web/base/js/translation_strings.html:7 msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below" msgstr "Rhowch eich enw llawn, mae angen y wybodaeth hon ar y cyngor – os na hoffech ddatgelu eich enw ar y wefan, dad-diciwch y blwch isod" #: perllib/FixMyStreet/App/Controller/Contact.pm:112 -#: perllib/FixMyStreet/DB/Result/Comment.pm:123 +#: perllib/FixMyStreet/DB/Result/Comment.pm:122 #: perllib/FixMyStreet/DB/Result/Problem.pm:406 -#: perllib/FixMyStreet/DB/Result/User.pm:120 +#: perllib/FixMyStreet/DB/Result/User.pm:126 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter your name" msgstr "Rhowch eich enw" @@ -2157,12 +2060,11 @@ msgstr "Croeso i chi <a href=\"%s\">ailfewngofnodi</a>, neu fynd yn ôl i'r <a h msgid "Please fill in details of the problem below." msgstr "Rhowch fanylion am y broblem isod." -#: templates/web/zurich/report/new/fill_in_details_form.html:46 +#: templates/web/zurich/report/new/fill_in_details_form.html:72 msgid "Please fill in details of the problem." msgstr "Rhowch fanylion am y broblem." -#: templates/web/base/report/new/fill_in_details_form.html:28 -#: templates/web/fixmystreet/report/new/sidebar.html:7 +#: templates/web/base/report/new/sidebar.html:7 #: templates/web/zurich/report/new/fill_in_details_form.html:20 msgid "Please fill in the form below with details of the problem, and describe the location as precisely as possible in the details box." msgstr "" @@ -2171,20 +2073,23 @@ msgstr "" msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "" -#: templates/web/fixmystreet/report/updates-sidebar-notes.html:4 +#: templates/web/base/report/updates-sidebar-notes.html:2 msgid "Please note that updates are not sent to the council." msgstr "Noder na chaiff diweddariadau eu hanfon at y cyngor." -#: templates/web/base/report/update-form.html:7 -msgid "Please note that updates are not sent to the council. If you leave your name it will be public. Your information will only be used in accordance with our <a href=\"/faq#privacy\">privacy policy</a>" +#: templates/web/base/report/new/oauth_email_form.html:4 +msgid "Please note your report has <strong>not yet been sent</strong>." msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:8 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:21 +#: templates/web/base/report/new/fill_in_details_form.html:20 #: templates/web/zurich/report/new/fill_in_details_form.html:11 msgid "Please note your report has <strong>not yet been sent</strong>. Choose a category and add further information below, then submit." msgstr "" +#: templates/web/base/report/display.html:26 +msgid "Please note your update has <strong>not yet been posted</strong>." +msgstr "" + #: templates/web/base/report/new/notes.html:1 #: templates/web/zurich/report/new/notes.html:1 msgid "Please note:" @@ -2204,9 +2109,8 @@ msgid "Please say whether you've ever reported a problem to your council before" msgstr "Dywedwch wrthym a ydych wedi adrodd problem i'ch cyngor o'r blaen" #: templates/web/zurich/admin/report_edit.html:208 -#, fuzzy msgid "Please select a body." -msgstr "Dewiswch y ffrwd hoffech chi ei chael" +msgstr "" #: perllib/FixMyStreet/App/Controller/Alert.pm:80 msgid "Please select the feed you want" @@ -2223,6 +2127,7 @@ msgstr "Dywedwch a gafodd y broblem ei thrwsio" #: perllib/FixMyStreet/App/Model/PhotoSet.pm:117 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:145 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:147 +#: templates/web/base/js/translation_strings.html:53 msgid "Please upload a JPEG image only" msgstr "Uwchlwythwch lun JPEG yn unig" @@ -2230,18 +2135,14 @@ msgstr "Uwchlwythwch lun JPEG yn unig" msgid "Please write a message" msgstr "Ysgrifennwch neges" -#: templates/web/fixmystreet/report/update-form.html:23 +#: templates/web/base/report/update/form_update.html:29 msgid "Please write your update here" msgstr "Ysgrifennwch eich diweddariad yma" -#: templates/web/base/contact/index.html:100 -#: templates/web/base/report/update-form.html:110 -#: templates/web/base/report/update-form.html:132 -#: templates/web/base/report/update-form.html:72 -#: templates/web/fixmystreet/contact/index.html:113 -#: templates/web/fixmystreet/report/update-form.html:124 -#: templates/web/fixmystreet/report/update-form.html:71 -#: templates/web/fixmystreet/report/update-form.html:97 +#: templates/web/base/contact/index.html:105 +#: templates/web/base/report/update-form.html:24 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:14 +#: templates/web/base/report/update/form_user_loggedout_password.html:10 msgid "Post" msgstr "" @@ -2269,12 +2170,9 @@ msgstr "Blaenorol" msgid "Privacy" msgstr "Preifatrwydd" -#: templates/web/base/faq/faq-en-gb.html:7 -#: templates/web/base/open311/index.html:7 -#: templates/web/base/static/privacy.html:1 -#: templates/web/base/static/privacy.html:2 -#: templates/web/base/static/privacy.html:9 -#: templates/web/fixmystreet/contact/index.html:11 +#: templates/web/base/about/_sidebar.html:5 +#: templates/web/base/about/privacy.html:1 +#: templates/web/base/about/privacy.html:2 msgid "Privacy and cookies" msgstr "" @@ -2302,12 +2200,12 @@ msgstr "Cadarnhawyd y broblem %s" msgid "Problem %s sent to council %s" msgstr "Anfonwyd y broblem %s at y cyngor" -#: templates/web/base/admin/index.html:46 +#: templates/web/base/admin/index.html:39 #: templates/web/zurich/admin/index.html:9 msgid "Problem breakdown by state" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1055 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1058 msgid "Problem marked as open." msgstr "" @@ -2323,11 +2221,11 @@ msgstr "Problemau" msgid "Problems in this area" msgstr "Problemau yn yr ardal hon" -#: templates/web/fixmystreet/report/display.html:43 +#: templates/web/base/report/display_tools.html:19 msgid "Problems nearby" msgstr "Problemau gerllaw" -#: templates/web/fixmystreet/report/display.html:41 +#: templates/web/base/report/display_tools.html:17 msgid "Problems on the map" msgstr "Problemau ar y map" @@ -2339,24 +2237,23 @@ msgstr "" msgid "Problems within %.1fkm of this location" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:642 +#: perllib/FixMyStreet/Cobrand/Default.pm:663 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:120 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:139 -#: perllib/FixMyStreet/Cobrand/UK.pm:207 +#: perllib/FixMyStreet/Cobrand/UK.pm:208 msgid "Problems within %s" msgstr "Problemau yn %s" #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:128 -#: perllib/FixMyStreet/Cobrand/UK.pm:221 +#: perllib/FixMyStreet/Cobrand/UK.pm:222 msgid "Problems within %s ward" msgstr "Problemau yn ward %s" #. ("First %s is the body name, second %s the site name") #: templates/web/base/reports/body.html:0 #: templates/web/base/reports/body.html:24 -#, fuzzy msgid "Problems within %s, %s" -msgstr "Problemau yn %s" +msgstr "" #: templates/web/base/alert/_list.html:42 msgid "Problems within the boundary of:" @@ -2370,19 +2267,16 @@ msgstr "Cyfeiriad yr eiddo:" msgid "Property type:" msgstr "Math o eiddo:" -#: templates/web/base/report/update-form.html:3 -#: templates/web/fixmystreet/report/update-form.html:4 +#: templates/web/base/report/update-form.html:6 msgid "Provide an update" msgstr "Darparu diweddariad" -#: templates/web/base/auth/general.html:56 +#: templates/web/base/auth/general.html:95 msgid "Providing a name and password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." msgstr "Mae darparu enw a chyfrinair yn ddewisol, ond bydd yn eich galluogi i adrodd problemau'n haws, gadael diweddariadau a rheoli eich adroddiadau." -#: templates/web/base/report/new/fill_in_details_form.html:156 -#: templates/web/base/report/update-form.html:129 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:71 -#: templates/web/fixmystreet/report/update-form.html:119 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:34 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:9 msgid "Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." msgstr "Mae darparu cyfrinair yn ddewisol, ond bydd yn eich galluogi i adrodd problemau'n haws, gadael diweddariadau a rheoli eich adroddiadau." @@ -2418,18 +2312,17 @@ msgstr "" #: templates/web/base/alert/_list.html:22 #: templates/web/base/around/display_location.html:1 #: templates/web/base/around/display_location.html:3 -#: templates/web/base/report/display.html:50 +#: templates/web/base/report/display_tools.html:34 #: templates/web/base/reports/_rss.html:1 #: templates/web/fixmystreet/alert/updates.html:9 -#: templates/web/fixmystreet/report/display.html:58 msgid "RSS feed" msgstr "Ffrwd RSS" -#: perllib/FixMyStreet/Cobrand/UK.pm:250 perllib/FixMyStreet/Cobrand/UK.pm:262 +#: perllib/FixMyStreet/Cobrand/UK.pm:251 perllib/FixMyStreet/Cobrand/UK.pm:263 msgid "RSS feed for %s" msgstr "Ffrwd RSS ar gyfer %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:256 perllib/FixMyStreet/Cobrand/UK.pm:268 +#: perllib/FixMyStreet/Cobrand/UK.pm:257 perllib/FixMyStreet/Cobrand/UK.pm:269 msgid "RSS feed for %s ward, %s" msgstr "Ffrwd RSS ar gyfer ward %s, %s" @@ -2437,11 +2330,11 @@ msgstr "Ffrwd RSS ar gyfer ward %s, %s" #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:163 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:173 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:181 -#: perllib/FixMyStreet/Cobrand/UK.pm:276 perllib/FixMyStreet/Cobrand/UK.pm:288 +#: perllib/FixMyStreet/Cobrand/UK.pm:277 perllib/FixMyStreet/Cobrand/UK.pm:289 msgid "RSS feed of %s" msgstr "Ffrwd RSS %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:281 perllib/FixMyStreet/Cobrand/UK.pm:293 +#: perllib/FixMyStreet/Cobrand/UK.pm:282 perllib/FixMyStreet/Cobrand/UK.pm:294 msgid "RSS feed of %s, within %s ward" msgstr "Ffrwd RSS %s, o fewn ward %s" @@ -2453,15 +2346,15 @@ msgstr "Ffrwd RSS o broblemau gerllaw" msgid "RSS feed of problems in this %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:643 +#: perllib/FixMyStreet/Cobrand/Default.pm:664 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:121 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:138 -#: perllib/FixMyStreet/Cobrand/UK.pm:214 +#: perllib/FixMyStreet/Cobrand/UK.pm:215 msgid "RSS feed of problems within %s" msgstr "Ffrwd RSS o broblemau yn %s" #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:127 -#: perllib/FixMyStreet/Cobrand/UK.pm:220 +#: perllib/FixMyStreet/Cobrand/UK.pm:221 msgid "RSS feed of problems within %s ward" msgstr "Ffrwd RSS o broblemau o fewn ward %s" @@ -2470,25 +2363,22 @@ msgstr "Ffrwd RSS o broblemau o fewn ward %s" msgid "RSS feed of recent local problems" msgstr "Ffrwd RSS o broblemau lleol diweddar" -#: templates/web/base/report/display.html:50 +#: templates/web/base/report/display_tools.html:34 #: templates/web/fixmystreet/alert/updates.html:9 -#: templates/web/fixmystreet/report/display.html:58 msgid "RSS feed of updates to this problem" msgstr "Ffrwd RSS o ddiweddariadau i'r broblem hon" #: templates/web/base/alert/updates.html:9 -#: templates/web/base/report/display.html:41 +#: templates/web/base/report/display_tools.html:36 #: templates/web/fixmystreet/alert/updates.html:14 -#: templates/web/fixmystreet/report/display.html:60 msgid "Receive email when updates are left on this problem." msgstr "Derbyn e-bost pan fydd diweddariadau i'r broblem hon." #. ("%s is the site name") #: templates/web/base/around/display_location.html:0 #: templates/web/base/around/display_location.html:33 -#, fuzzy msgid "Recent local problems, %s" -msgstr "Problemau lleol diweddar, FixMyStreet" +msgstr "" #: templates/web/base/reports/index.html:24 msgid "Recently <br>fixed" @@ -2506,8 +2396,8 @@ msgstr "" msgid "Remove flag" msgstr "" -#: templates/web/base/admin/report_edit.html:92 -#: templates/web/base/admin/update_edit.html:62 +#: templates/web/base/admin/report_edit.html:93 +#: templates/web/base/admin/update_edit.html:67 #: templates/web/zurich/admin/update_edit.html:35 msgid "Remove photo (can't be undone!)" msgstr "" @@ -2527,7 +2417,7 @@ msgstr "" msgid "Report a problem" msgstr "Adrodd problem" -#: templates/web/fixmystreet/report/display.html:32 +#: templates/web/base/report/display_tools.html:8 msgid "Report abuse" msgstr "Adrodd camddefnydd" @@ -2536,7 +2426,8 @@ msgid "Report on %s" msgstr "Adroddwyd ar %s" #: templates/web/base/report/new/fill_in_details_form.html:1 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:2 +#: templates/web/base/report/new/login_success_form.html:1 +#: templates/web/base/report/new/oauth_email_form.html:1 msgid "Report your problem" msgstr "Adrodd eich problem" @@ -2545,9 +2436,8 @@ msgstr "Adrodd eich problem" msgid "Report, view, or discuss local problems" msgstr "Adrodd, gweld, neu drafod problemau lleol" -#: perllib/FixMyStreet/DB/Result/Problem.pm:585 -#: templates/web/base/contact/index.html:50 -#: templates/web/fixmystreet/contact/index.html:65 +#: perllib/FixMyStreet/DB/Result/Problem.pm:573 +#: templates/web/base/contact/index.html:57 msgid "Reported anonymously at %s" msgstr "Adroddwyd yn ddienw am %s" @@ -2556,43 +2446,41 @@ msgstr "Adroddwyd yn ddienw am %s" msgid "Reported before" msgstr "Adroddwyd eisoes" -#: perllib/FixMyStreet/DB/Result/Problem.pm:608 -#: templates/web/base/contact/index.html:52 -#: templates/web/fixmystreet/contact/index.html:67 +#: perllib/FixMyStreet/DB/Result/Problem.pm:596 +#: templates/web/base/contact/index.html:59 msgid "Reported by %s at %s" msgstr "Adroddwyd gan %s am %s" #: templates/web/zurich/admin/report_edit-sdm.html:58 #: templates/web/zurich/admin/report_edit.html:86 -#, fuzzy msgid "Reported by:" -msgstr "Adroddwyd %s" +msgstr "" #: templates/web/zurich/report/_main.html:2 msgid "Reported in the %s category" msgstr "Adroddwyd yn y categori %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:581 +#: perllib/FixMyStreet/DB/Result/Problem.pm:569 msgid "Reported in the %s category anonymously at %s" msgstr "Adroddwyd yn y categori %s yn ddienw am %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:603 +#: perllib/FixMyStreet/DB/Result/Problem.pm:591 msgid "Reported in the %s category by %s at %s" msgstr "Adroddwyd yn y categori %s am %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:577 +#: perllib/FixMyStreet/DB/Result/Problem.pm:565 msgid "Reported via %s anonymously at %s" msgstr "Adroddwyd drwy %s yn ddienw am %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:599 +#: perllib/FixMyStreet/DB/Result/Problem.pm:587 msgid "Reported via %s by %s at %s" msgstr "Adroddwyd drwy %s gan %s am %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:573 +#: perllib/FixMyStreet/DB/Result/Problem.pm:561 msgid "Reported via %s in the %s category anonymously at %s" msgstr "Adroddwyd drwy %s yn y categori %s yn ddienw am %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:593 +#: perllib/FixMyStreet/DB/Result/Problem.pm:581 msgid "Reported via %s in the %s category by %s at %s" msgstr "Adroddwyd drwy %s yn y categori %s am %s" @@ -2602,9 +2490,8 @@ msgstr "Adroddwyd o fewn y bedair wythnos ddiwethaf" #: templates/web/zurich/admin/report_edit-sdm.html:36 #: templates/web/zurich/admin/report_edit.html:55 -#, fuzzy msgid "Reported:" -msgstr "Adroddwyd %s" +msgstr "" #: templates/web/base/around/index.html:2 #: templates/web/base/js/translation_strings.html:41 @@ -2614,13 +2501,13 @@ msgstr "Adroddwyd %s" msgid "Reporting a problem" msgstr "Adrodd problem" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1277 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1286 #: perllib/FixMyStreet/Cobrand/Zurich.pm:384 #: templates/web/zurich/header.html:60 msgid "Reports" msgstr "Adroddiadau" -#: perllib/FixMyStreet/Cobrand/UK.pm:327 perllib/FixMyStreet/Cobrand/UK.pm:331 +#: perllib/FixMyStreet/Cobrand/UK.pm:328 perllib/FixMyStreet/Cobrand/UK.pm:332 msgid "Reports are limited to %s characters in length. Please shorten your report" msgstr "" @@ -2657,15 +2544,17 @@ msgstr "" msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1495 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1500 -#: templates/web/base/admin/report_edit.html:88 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1508 +#: templates/web/base/admin/report_edit.html:90 +#: templates/web/base/admin/update_edit.html:64 #: templates/web/zurich/admin/report_edit.html:116 msgid "Rotate Left" msgstr "Cylchdroi i'r chwith" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1495 -#: templates/web/base/admin/report_edit.html:89 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 +#: templates/web/base/admin/report_edit.html:91 +#: templates/web/base/admin/update_edit.html:65 #: templates/web/zurich/admin/report_edit.html:117 msgid "Rotate Right" msgstr "Cylchdroi i'r dde" @@ -2675,7 +2564,6 @@ msgid "Rotating this photo will discard unsaved changes to the report." msgstr "" #: templates/web/base/js/translation_strings.html:46 -#: templates/web/base/maps/google-ol.html:13 msgid "Satellite" msgstr "" @@ -2732,11 +2620,10 @@ msgid "Select which type of alert you’d like and click the button for an RSS f msgstr "" #: perllib/FixMyStreet/Cobrand/Zurich.pm:835 -#, fuzzy msgid "Sent report back" -msgstr "Adroddiadau ar agor" +msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:708 +#: perllib/FixMyStreet/DB/Result/Problem.pm:696 msgid "Sent to %s %s later" msgstr "" @@ -2749,15 +2636,13 @@ msgstr "Anfonwyd:" msgid "Service:" msgstr "Gwasanaeth:" -#: templates/web/fixmystreet/report/display.html:38 +#: templates/web/base/report/display_tools.html:14 msgid "Share" msgstr "Rhannu" -#: templates/web/base/report/new/fill_in_details_form.html:193 -#: templates/web/base/report/update-form.html:158 -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:23 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:59 -#: templates/web/fixmystreet/report/update-form.html:146 +#: templates/web/base/report/new/form_user_loggedin.html:23 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:22 +#: templates/web/base/report/update/form_name.html:15 msgid "Show my name publicly" msgstr "Dangos fy enw yn gyhoeddus" @@ -2769,9 +2654,9 @@ msgstr "Dangos yr hen rai" msgid "Show pins" msgstr "Dangos piniau" +#: templates/web/base/auth/general.html:100 #: templates/web/base/auth/general.html:3 -#: templates/web/base/auth/general.html:40 -#: templates/web/base/auth/general.html:61 +#: templates/web/base/auth/general.html:76 #: templates/web/zurich/auth/general.html:18 #: templates/web/zurich/auth/general.html:35 msgid "Sign in" @@ -2798,7 +2683,7 @@ msgid "" " sent from your FixMyStreet installation." msgstr "" -#: templates/web/base/alert/index.html:42 +#: templates/web/base/alert/index.html:40 msgid "Some photos of recent reports" msgstr "Lluniau o adroddiadau diweddar" @@ -2808,7 +2693,7 @@ msgstr "Lluniau o adroddiadau diweddar" msgid "Some text to localize" msgstr "Testun i'w leoleiddio" -#: perllib/FixMyStreet/Cobrand/UK.pm:78 +#: perllib/FixMyStreet/Cobrand/UK.pm:79 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover." msgstr "" @@ -2820,14 +2705,20 @@ msgstr "" msgid "Sorry, there has been an error confirming your problem." msgstr "Mae'n ddrwg gennym, bu gwall tra'n cadarnhau eich problem." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:221 -#: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:37 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:216 +#: perllib/FixMyStreet/Geocode.pm:38 perllib/FixMyStreet/Geocode/Bing.pm:38 #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:56 #: perllib/FixMyStreet/Geocode/OSM.pm:48 msgid "Sorry, we could not find that location." msgstr "Mae'n ddrwg gennym, ni allwn ddod o hyd i'r lleoliad hwnnw." -#: perllib/FixMyStreet/Geocode/Bing.pm:34 +#: templates/web/base/auth/general.html:9 +#: templates/web/base/report/display.html:21 +#: templates/web/base/report/new/fill_in_details_form.html:23 +msgid "Sorry, we could not log you in. Please fill in the form below." +msgstr "" + +#: perllib/FixMyStreet/Geocode/Bing.pm:35 #: perllib/FixMyStreet/Geocode/Google.pm:45 #: perllib/FixMyStreet/Geocode/Zurich.pm:88 msgid "Sorry, we could not parse that location. Please try again." @@ -2837,6 +2728,11 @@ msgstr "" msgid "Sorry, we couldn't save your image(s), please try again." msgstr "" +#: perllib/FixMyStreet/App/Controller/AuthSS.pm:301 +#, fuzzy +msgid "Sorry, you can not log in with Facebook. Please try again later." +msgstr "Bu gwall dangos y dudalen hon. Rhowch gynnig arall arni nes ymlaen." + #: templates/web/base/admin/stats.html:64 msgid "Start Date:" msgstr "Dyddiad cychwyn:" @@ -2845,13 +2741,12 @@ msgstr "Dyddiad cychwyn:" #: templates/web/base/admin/flagged.html:18 #: templates/web/base/admin/list_updates.html:11 #: templates/web/base/admin/reports.html:15 -#: templates/web/fixmystreet/report/update-form.html:26 +#: templates/web/base/report/update/form_update.html:32 msgid "State" msgstr "Cyflwr" #: templates/web/base/admin/report_edit.html:47 #: templates/web/base/admin/update_edit.html:27 -#: templates/web/base/report/update-form.html:28 #: templates/web/zurich/admin/report_edit-sdm.html:73 #: templates/web/zurich/admin/report_edit.html:101 #: templates/web/zurich/admin/report_edit.html:155 @@ -2859,7 +2754,7 @@ msgstr "Cyflwr" msgid "State:" msgstr "Cyflwr:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1282 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1291 #: perllib/FixMyStreet/Cobrand/Zurich.pm:387 #: templates/web/base/admin/stats.html:1 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:73 @@ -2881,7 +2776,7 @@ msgstr "Ar agor o hyd, drwy holiadur, %s" msgid "Street View" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:406 +#: perllib/FixMyStreet/Script/Reports.pm:184 msgid "Subcategory: %s" msgstr "Is-gategori: %s" @@ -2889,30 +2784,25 @@ msgstr "Is-gategori: %s" msgid "Subdivision/Body" msgstr "" -#: templates/web/fixmystreet/contact/index.html:98 +#: templates/web/base/contact/index.html:90 msgid "Subject" msgstr "Pwnc" #: templates/web/base/admin/report_edit.html:19 -#: templates/web/base/contact/index.html:88 -#: templates/web/base/report/new/fill_in_details_form.html:53 #: templates/web/zurich/admin/report_edit.html:39 msgid "Subject:" msgstr "Pwnc:" #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/fill_in_details_form.html:137 -#: templates/web/base/report/new/fill_in_details_form.html:159 -#: templates/web/base/report/new/fill_in_details_form.html:96 -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:36 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:23 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:76 +#: templates/web/base/report/new/form_user_loggedin.html:36 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:39 +#: templates/web/base/report/new/form_user_loggedout_password.html:11 #: templates/web/zurich/report/new/fill_in_details_form.html:96 msgid "Submit" msgstr "Cyflwyno" -#: templates/web/base/admin/report_edit.html:95 -#: templates/web/base/admin/update_edit.html:65 +#: templates/web/base/admin/report_edit.html:101 +#: templates/web/base/admin/update_edit.html:75 #: templates/web/base/admin/user-form.html:56 #: templates/web/zurich/admin/report_edit-sdm.html:137 #: templates/web/zurich/admin/report_edit.html:268 @@ -2920,7 +2810,7 @@ msgstr "Cyflwyno" msgid "Submit changes" msgstr "Cyflwyno newidiadau" -#: templates/web/base/questionnaire/index.html:97 +#: templates/web/base/questionnaire/index.html:106 msgid "Submit questionnaire" msgstr "Cyflwyno'r holiadur" @@ -2936,9 +2826,8 @@ msgid "Submitted" msgstr "Cyflwynwyd" #: templates/web/base/alert/updates.html:17 -#: templates/web/base/report/display.html:46 +#: templates/web/base/report/display_tools.html:41 #: templates/web/fixmystreet/alert/updates.html:23 -#: templates/web/fixmystreet/report/display.html:65 msgid "Subscribe" msgstr "Tanysgrifio" @@ -2946,7 +2835,7 @@ msgstr "Tanysgrifio" msgid "Subscribe me to an email alert" msgstr "Tanysgrifio i hysbysiad e-bost" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1275 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1284 #: perllib/FixMyStreet/Cobrand/Zurich.pm:383 #: templates/web/base/admin/bodies.html:25 #: templates/web/base/admin/index.html:1 @@ -2965,7 +2854,7 @@ msgstr "Crynodeb" msgid "Summary reports" msgstr "Adroddiadau" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1279 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1288 msgid "Survey" msgstr "Arolwg" @@ -2979,9 +2868,8 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/Zurich.pm:394 #: templates/web/zurich/header.html:77 -#, fuzzy msgid "Templates" -msgstr "Diweddariadau" +msgstr "" #: templates/web/base/admin/list_updates.html:12 #: templates/web/zurich/admin/templates.html:9 @@ -3002,7 +2890,7 @@ msgstr "Testun:" msgid "Thank you for reporting this issue!" msgstr "Diolch am adrodd y broblem hon!" -#: templates/web/base/tokens/error.html:7 +#: templates/web/base/tokens/error.html:6 msgid "Thank you for trying to confirm your update or problem. We seem to have an error ourselves though, so <a href=\"%s\">please let us know what went on</a> and we'll look into it." msgstr "" @@ -3037,23 +2925,23 @@ msgstr "Mae'n ymddangos nad yw'r lleoliad hwnnw yn y DU; rhowch gynnig arall arn #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:47 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:63 -#: perllib/FixMyStreet/Cobrand/UK.pm:71 +#: perllib/FixMyStreet/Cobrand/UK.pm:72 msgid "That postcode was not recognised, sorry." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:726 +#: perllib/FixMyStreet/App/Controller/Admin.pm:724 msgid "That problem has been marked as sent." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:718 +#: perllib/FixMyStreet/App/Controller/Admin.pm:716 msgid "That problem will now be resent." msgstr "Ailanfonir y broblem nawr." -#: perllib/FixMyStreet/App/Controller/Report.pm:125 +#: perllib/FixMyStreet/App/Controller/Report.pm:127 msgid "That report cannot be viewed on %s." msgstr "Ni ellir gweld yr adroddiad hwnnw ar %s." -#: perllib/FixMyStreet/App/Controller/Report.pm:119 +#: perllib/FixMyStreet/App/Controller/Report.pm:121 msgid "That report has been removed from FixMyStreet." msgstr "Tynnwyd yr adroddiad oddi ar FixMyStreet." @@ -3084,7 +2972,7 @@ msgid "" " If you leave this blank, <strong>send method defaults to email</strong>." msgstr "" -#: templates/web/base/open311/index.html:90 +#: templates/web/base/open311/index.html:82 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 "" @@ -3105,12 +2993,12 @@ msgstr "" msgid "The diligency prize league table shows editors' activity (who's been editing the most records)." msgstr "" -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:60 -#: perllib/FixMyStreet/App/Controller/Reports.pm:79 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:61 +#: perllib/FixMyStreet/App/Controller/Reports.pm:80 msgid "The error was: %s" msgstr "Y gwall oedd: %s" -#: templates/web/base/open311/index.html:86 +#: templates/web/base/open311/index.html:78 msgid "The following Open311 v2 attributes are returned for each request: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code and service_name." msgstr "" @@ -3157,8 +3045,7 @@ msgstr "" msgid "The passwords do not match" msgstr "Nid yw'r cyfrineiriau'n cyfateb" -#: templates/web/base/errors/page_error_404_not_found.html:10 -#: templates/web/base/errors/page_error_404_not_found.html:12 +#: templates/web/base/errors/page_error_404_not_found.html:9 msgid "The requested URL '%s' was not found on this server" msgstr "Ni chanfuwyd yr URL '%s' ar y gweinydd hwn" @@ -3168,12 +3055,11 @@ msgstr "Yr hysbysiad symlaf yw'r un daearyddol:" #: templates/web/base/report/new/councils_extra_text.html:1 #: templates/web/base/report/new/councils_text_some.html:10 -#: templates/web/base/report/new/fill_in_details_form.html:18 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:14 +#: templates/web/base/report/new/fill_in_details_form.html:13 msgid "The summary and description will also be made public (see our <a href=\"/privacy\">privacy policy</a>)." msgstr "Bydd y crynodeb a'r disgrifiad yn gyhoeddus (gweler ein <a href=\"/privacy\">polisi preifatrwydd</a>)." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:315 +#: perllib/FixMyStreet/Script/Reports.pm:92 msgid "The user could not locate the problem on a map, but to see the area around the location they entered" msgstr "" @@ -3190,18 +3076,18 @@ msgstr "" msgid "There are no reports to show." msgstr "Nid oes unrhyw adroddiadau i'w dangos." -#: perllib/FixMyStreet/App/Controller/Reports.pm:76 +#: perllib/FixMyStreet/App/Controller/Reports.pm:77 msgid "There was a problem showing the All Reports page. Please try again later." msgstr "" #: perllib/FixMyStreet/App/Controller/Contact.pm:137 -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:59 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:60 msgid "There was a problem showing this page. Please try again later." msgstr "Bu gwall dangos y dudalen hon. Rhowch gynnig arall arni nes ymlaen." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:769 -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:134 -#: templates/web/base/auth/general.html:26 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:764 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:138 +#: templates/web/base/auth/general.html:43 #: templates/web/zurich/auth/general.html:28 msgid "There was a problem with your email/password combination. If you cannot remember your password, or do not have one, please fill in the ‘sign in by email’ section of the form." msgstr "Bu problem gyda'r e-bost neu gyfrinair. Os na allwch gofio eich cyfrinair, neu os nad oes un gennych, llenwch ddarn ‘mewngofnodi drwy e-bost’ y ffurflen." @@ -3210,7 +3096,7 @@ msgstr "Bu problem gyda'r e-bost neu gyfrinair. Os na allwch gofio eich cyfrinai msgid "There was a problem with your email/password combination. Please try again." msgstr "Bu gwall gyda'r e-bost neu'r cyfrinair. Rhowch gynnig arall arni." -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:272 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:336 msgid "There was a problem with your update. Please try again." msgstr "Bu gwall gyda'r diweddariad. Rhowch gynnig arall arni." @@ -3218,7 +3104,7 @@ msgstr "Bu gwall gyda'r diweddariad. Rhowch gynnig arall arni." msgid "There were problems with your report. Please see below." msgstr "Bu gwallau gyda'r adroddiad. Gwelwch isod." -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:300 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:371 msgid "There were problems with your update. Please see below." msgstr "Bu gwallau gyda'r diweddariad. Gwelwch isod." @@ -3232,7 +3118,7 @@ msgid "" " " msgstr "" -#: templates/web/base/open311/index.html:77 +#: templates/web/base/open311/index.html:69 msgid "This API implementation is work in progress and not yet stabilized. It will change without warnings in the future." msgstr "" @@ -3254,18 +3140,18 @@ msgid "" " A body will not receive any reports unless it covers at least one area." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:413 +#: perllib/FixMyStreet/Script/Reports.pm:191 msgid "This email has been sent to both councils covering the location of the problem, as the user did not categorise it; please ignore it if you're not the correct council to deal with the issue, or let us know what category of problem this is so we can add it to our system." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:416 +#: perllib/FixMyStreet/Script/Reports.pm:194 msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:925 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:995 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:920 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:990 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:142 -#: perllib/FixMyStreet/Cobrand/UK.pm:43 +#: perllib/FixMyStreet/Cobrand/UK.pm:44 msgid "This information is required" msgstr "Mae'r wybodaeth hon yn ofynnol" @@ -3277,56 +3163,37 @@ msgstr "" msgid "This is a summary of all reports on this site." msgstr "Dyma grynodeb o'r holl adroddiadau ar y wefan hon." -#: templates/web/zurich/auth/token.html:8 -msgid "This may be because the link is too old or already used, or the address was not copied correctly." -msgstr "" - -#: templates/web/base/report/banner.html:15 -msgid "This problem has been closed" -msgstr "Caewyd y broblem hon" - -#: templates/web/base/report/banner.html:12 -#: templates/web/base/report/update-form.html:48 -#: templates/web/fixmystreet/report/update-form.html:46 +#: templates/web/base/report/update/form_update.html:52 msgid "This problem has been fixed" msgstr "Trwsiwyd y broblem hon" -#: templates/web/base/report/update-form.html:43 -#: templates/web/fixmystreet/report/update-form.html:40 +#: templates/web/base/report/update/form_update.html:46 msgid "This problem has not been fixed" msgstr "Ni thrwsiwyd y broblem hon" -#: templates/web/base/report/banner.html:19 -msgid "This problem is in progress" -msgstr "Mae'r broblem hon ar y gweill" - -#: templates/web/base/report/banner.html:9 -msgid "This problem is old and of unknown status." -msgstr "mae'r broblem hon yn hen a'i statws yn anhysbys." - #: perllib/FixMyStreet/Cobrand/Zurich.pm:168 #: perllib/FixMyStreet/Cobrand/Zurich.pm:169 #: templates/web/zurich/report/_main.html:14 msgid "This report is awaiting moderation." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:86 +#: perllib/FixMyStreet/Script/Alerts.pm:94 msgid "This report is currently marked as closed." msgstr "Mae'r adroddiad hwn wedi'i nodi ar gau." -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:84 +#: perllib/FixMyStreet/Script/Alerts.pm:92 msgid "This report is currently marked as fixed." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:88 +#: perllib/FixMyStreet/Script/Alerts.pm:96 msgid "This report is currently marked as open." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:326 +#: perllib/FixMyStreet/Script/Reports.pm:105 msgid "This report was submitted anonymously" msgstr "Cyflwynwyd yr adroddiad yn ddienw" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:308 +#: perllib/FixMyStreet/Script/Reports.pm:85 msgid "This web page also contains a photo of the problem, provided by the user." msgstr "Mae'r dudalen we hon yn cynnwys llun o'r broblem, a ddarparwyd gan y defnyddiwr." @@ -3337,7 +3204,7 @@ msgstr "Mae'r dudalen we hon yn cynnwys llun o'r broblem, a ddarparwyd gan y def msgid "Time spent (in minutes):" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1278 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1287 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "Llinell amser" @@ -3349,9 +3216,8 @@ msgid "Title" msgstr "Teitl" #: templates/web/zurich/admin/template_edit.html:20 -#, fuzzy msgid "Title:" -msgstr "Teitl" +msgstr "" #: templates/web/base/alert/index.html:25 msgid "To find out what local alerts we have for you, please enter your %s postcode or street name and area:" @@ -3361,11 +3227,11 @@ msgstr "" msgid "To find out what local alerts we have for you, please enter your postcode or street name and area" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:314 +#: perllib/FixMyStreet/Script/Reports.pm:91 msgid "To view a map of the precise location of this issue" msgstr "" -#: templates/web/base/admin/index.html:61 +#: templates/web/base/admin/index.html:54 #: templates/web/base/admin/questionnaire.html:24 #: templates/web/base/admin/stats.html:24 #: templates/web/base/admin/stats.html:43 @@ -3383,10 +3249,8 @@ msgstr "Ceisiwch anfon e-bost atom yn uniongyrchol:" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:12 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:33 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:31 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:37 msgid "Unable to fix" msgstr "Methu trwsio" @@ -3399,7 +3263,7 @@ msgstr "Methu trwsio" msgid "Unconfirmed" msgstr "Heb ei gadarnhau" -#: templates/web/fixmystreet/report/banner.html:9 +#: templates/web/base/report/banner.html:9 msgid "Unknown" msgstr "Anhysbys" @@ -3407,17 +3271,18 @@ msgstr "Anhysbys" msgid "Unknown alert type" msgstr "" +#: perllib/FixMyStreet/App/Controller/Photo.pm:110 #: templates/web/base/js/translation_strings.html:39 msgid "Unknown error" msgstr "Gwall anhysbys" -#: perllib/FixMyStreet/App/Controller/Report.pm:103 -#: perllib/FixMyStreet/App/Controller/Report.pm:109 -#: perllib/FixMyStreet/App/Controller/Report.pm:112 +#: perllib/FixMyStreet/App/Controller/Report.pm:105 +#: perllib/FixMyStreet/App/Controller/Report.pm:111 +#: perllib/FixMyStreet/App/Controller/Report.pm:114 msgid "Unknown problem ID" msgstr "" -#: templates/web/fixmystreet/report/update-form.html:19 +#: templates/web/base/report/update/form_update.html:25 msgid "Update" msgstr "" @@ -3425,13 +3290,11 @@ msgstr "" msgid "Update %s created for problem %d; by %s" msgstr "" -#: templates/web/base/contact/index.html:21 -#: templates/web/fixmystreet/contact/index.html:36 +#: templates/web/base/contact/index.html:28 msgid "Update below added anonymously at %s" msgstr "" -#: templates/web/base/contact/index.html:23 -#: templates/web/fixmystreet/contact/index.html:38 +#: templates/web/base/contact/index.html:30 msgid "Update below added by %s at %s" msgstr "" @@ -3440,7 +3303,7 @@ msgstr "" msgid "Update body" msgstr "" -#: templates/web/base/admin/index.html:55 +#: templates/web/base/admin/index.html:48 msgid "Update breakdown by state" msgstr "" @@ -3465,20 +3328,16 @@ msgstr "" msgid "Update statuses" msgstr "" -#: templates/web/base/report/update-form.html:22 -msgid "Update:" -msgstr "" - #: templates/web/zurich/admin/index-dm.html:23 #: templates/web/zurich/admin/index-sdm.html:21 #: templates/web/zurich/admin/reports.html:13 msgid "Updated" msgstr "Diweddarwyd" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1045 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1103 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1147 -#: perllib/FixMyStreet/App/Controller/Admin.pm:822 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1048 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1108 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1156 +#: perllib/FixMyStreet/App/Controller/Admin.pm:821 #: perllib/FixMyStreet/Cobrand/Zurich.pm:771 #: perllib/FixMyStreet/Cobrand/Zurich.pm:796 #: perllib/FixMyStreet/Cobrand/Zurich.pm:866 @@ -3486,13 +3345,12 @@ msgid "Updated!" msgstr "Diweddarwyd!" #: templates/web/base/admin/list_updates.html:2 -#: templates/web/base/report/update.html:3 -#: templates/web/fixmystreet/report/update.html:5 +#: templates/web/base/report/update.html:5 #: templates/web/zurich/report/updates.html:2 msgid "Updates" msgstr "Diweddariadau" -#: perllib/FixMyStreet/DB/Result/Comment.pm:132 +#: perllib/FixMyStreet/DB/Result/Comment.pm:131 msgid "Updates are limited to %s characters in length. Please shorten your update" msgstr "" @@ -3502,12 +3360,9 @@ msgstr "Diweddariadau ar {{title}}" #. ("%s is the site name") #: templates/web/base/report/display.html:0 -#: templates/web/base/report/display.html:5 -#: templates/web/fixmystreet/report/display.html:0 -#: templates/web/fixmystreet/report/display.html:9 -#, fuzzy +#: templates/web/base/report/display.html:9 msgid "Updates to this problem, %s" -msgstr "Diweddariadau i'r broblem hon, FixMyStreet" +msgstr "" #: templates/web/base/admin/body.html:182 msgid "Use the <strong>note</strong> to record details that are only displayed in the admin. Notes are not shown publicly, and are not sent to the body." @@ -3518,11 +3373,11 @@ msgstr "Defnyddiwch y <strong>nodyn</strong> i gofnodi manylion a ddangosir yma msgid "Used map" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1452 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1461 msgid "User flag removed" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1424 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1433 msgid "User flagged" msgstr "" @@ -3530,7 +3385,7 @@ msgstr "" msgid "User search finds matches in users' names and email addresses." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1280 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1289 #: perllib/FixMyStreet/Cobrand/Zurich.pm:399 #: templates/web/base/admin/flagged.html:29 #: templates/web/zurich/header.html:69 @@ -3561,7 +3416,6 @@ msgid "Viewing a location" msgstr "" #: templates/web/base/report/display.html:0 -#: templates/web/fixmystreet/report/display.html:0 msgid "Viewing a problem" msgstr "" @@ -3574,25 +3428,24 @@ msgstr "Wardiau'r cyngor hwn" 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/zurich/auth/token.html:7 -msgid "We have not been able to confirm your account - sorry." -msgstr "Doedd hi ddim yn bosib i ni gadarnhau eich cyfrif - mae'n ddrwg gennym." - -#: templates/web/zurich/auth/token.html:17 -msgid "We have sent you an email containing a link to confirm your account." -msgstr "Rydym wedi anfon e-bost atoch sy'n cynnwys dolen i gadarnhau eich cyfrif." +#: templates/web/base/auth/general.html:6 +#: templates/web/base/report/display.html:27 +#: templates/web/base/report/new/oauth_email_form.html:5 +#, fuzzy +msgid "We need your email address, please give it below." +msgstr "(ni ddatgelir eich cyfeiriad e-bost na rhif ffôn)" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:2 -#: templates/web/fixmystreet/report/update-form.html:77 +#: templates/web/base/report/new/form_user_loggedout_email.html:2 +#: templates/web/base/report/update/form_user_loggedout_email.html:2 msgid "We never show your email" msgstr "Ni ddatgelir eich e-bost" -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:31 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:65 +#: templates/web/base/report/new/form_user_loggedin.html:31 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:28 msgid "We never show your email address or phone number." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:422 +#: perllib/FixMyStreet/Script/Reports.pm:200 msgid "We realise this problem might be the responsibility of %s; however, we don't currently have any contact details for them. If you know of an appropriate contact address, please do get in touch." msgstr "" @@ -3609,10 +3462,6 @@ msgstr "Rydym ond yn defnyddio eich gwybodaeth bersonol yn unol â'n <a href=\" msgid "We’re sorry to hear the problem’s not fixed. Why not try writing to your local representatives?" msgstr "" -#: templates/web/base/contact/blurb.html:8 -msgid "We'd love to hear what you think about this site. Just fill in the form, or send an email to <a href='mailto:%s'>%s</a>:" -msgstr "Carem glywed eich barn am y wefan hon. Llenwch y ffurflen, neu anfonwch e-bost at <a href='mailto:%s'>%s</a>:" - #: templates/web/base/contact/submit.html:7 msgid "We’ll get back to you as soon as we can." msgstr "Ymatebwn cyn gynted â phosib." @@ -3621,7 +3470,7 @@ msgstr "Ymatebwn cyn gynted â phosib." msgid "What was your experience of getting the problem fixed?" msgstr "" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:49 +#: templates/web/base/report/new/form_report.html:19 msgid "What’s the issue, and where is it?" msgstr "Beth yw'r broblem, a ble mae hi?" @@ -3634,7 +3483,11 @@ msgstr "" msgid "When sent" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:640 +#: templates/web/base/js/translation_strings.html:50 +msgid "Whoa there Testino! Three photos are enough." +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Report/New.pm:635 msgid "Whole block of empty flats" msgstr "" @@ -3649,7 +3502,7 @@ msgstr "" msgid "Wish" msgstr "" -#: templates/web/base/open311/index.html:92 +#: templates/web/base/open311/index.html:84 msgid "With request searches, it is also possible to search for agency_responsible to limit the requests to those sent to a single administration. The search term is the administration ID provided by <a href=\"%s\">MaPit</a>." msgstr "" @@ -3657,7 +3510,7 @@ msgstr "" msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"http://fixmystreet.org\">available at fixmystreet.org</a>." msgstr "" -#: templates/web/base/questionnaire/index.html:87 +#: templates/web/base/questionnaire/index.html:96 msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?" msgstr "Hoffech chi dderbyn holiadur arall ymhen 4 wythnos, i'ch atgoffa i wirio'r statws?" @@ -3666,7 +3519,6 @@ msgid "Writing your message entirely in block capitals makes it hard to read, as msgstr "Mae ysgrifennu eich holl neges mewn priflythrennau yn ei gwneud hi'n anodd i'w darllen, ac felly hefyd diffyg atalnodi." #: templates/web/base/report/new/fill_in_details_form.html:4 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:5 msgid "Wrong location? Just click again on the map." msgstr "Lleoliad anghywir? Cliciwch ar y map eto." @@ -3689,27 +3541,24 @@ msgstr "Blwyddyn" #: templates/web/base/admin/users.html:31 #: templates/web/base/questionnaire/creator_fixed.html:14 #: templates/web/base/questionnaire/index.html:51 -#: templates/web/base/questionnaire/index.html:90 +#: templates/web/base/questionnaire/index.html:99 msgid "Yes" msgstr "" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:17 -#: templates/web/fixmystreet/report/update-form.html:91 +#: templates/web/base/report/new/form_user_loggedout_password.html:5 +#: templates/web/base/report/update/form_user_loggedout_password.html:4 msgid "Yes I have a password" msgstr "Oes, mae gen i gyfrinair" -#: templates/web/base/contact/index.html:39 -#: templates/web/fixmystreet/contact/index.html:54 +#: templates/web/base/contact/index.html:46 msgid "You are complaining that this problem report was unnecessarily moderated:" msgstr "" -#: templates/web/base/contact/index.html:41 -#: templates/web/fixmystreet/contact/index.html:56 +#: templates/web/base/contact/index.html:48 msgid "You are reporting the following problem report for being abusive, containing personal information, or similar:" msgstr "" -#: templates/web/base/contact/index.html:15 -#: templates/web/fixmystreet/contact/index.html:30 +#: templates/web/base/contact/index.html:22 msgid "You are reporting the following update for being abusive, containing personal information, or similar:" msgstr "" @@ -3722,7 +3571,7 @@ msgstr "Gallwch <a href=\"%s%s\">weld y broblem ar y wefan hon</a>." msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create." msgstr "" -#: templates/web/fixmystreet/contact/index.html:121 +#: templates/web/base/contact/index.html:113 msgid "You can contact technical support on <a href='mailto:%s'>%s</a>" msgstr "Gallwch gysylltu â'n tîm cymorth technegol drwy <a href='mailto:%s'>%s</a>" @@ -3733,8 +3582,8 @@ msgid "" " reports in the past." msgstr "" -#: templates/web/base/report/new/councils_text_none.html:10 -#: templates/web/base/report/new/councils_text_none.html:2 +#: templates/web/base/report/new/councils_text_none.html:12 +#: templates/web/base/report/new/councils_text_none.html:14 #: templates/web/base/report/new/councils_text_some.html:19 #: templates/web/base/report/new/councils_text_some.html:21 msgid "You can help us by finding a contact email address for local problems for %s and emailing it to us at <a href='mailto:%s'>%s</a>." @@ -3752,21 +3601,16 @@ msgstr "Gwrthodoch chi; llenwch y blwch uchod" msgid "You have already answered this questionnaire. If you have a question, please <a href='%s'>get in touch</a>, or <a href='%s'>view your problem</a>.\n" msgstr "" -#: templates/web/base/questionnaire/index.html:77 -#: templates/web/base/report/new/fill_in_details_form.html:75 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:73 -msgid "You have already attached a photo to this report, attaching another one will replace it." -msgstr "Rydych wedi atodi llun i'r adroddiad hwn eisoes, byddai atodi un arall yn ei amnewid." - -#: templates/web/base/report/update-form.html:59 -#: templates/web/fixmystreet/report/update-form.html:56 -msgid "You have already attached a photo to this update, attaching another one will replace it." -msgstr "Rydych wedi atodi llun i'r diweddariad hwn eisoes, byddai atodi un arall yn ei amnewid." - -#: templates/web/zurich/report/new/fill_in_details_form.html:61 +#: templates/web/base/report/new/form_report.html:32 +#: templates/web/zurich/report/new/fill_in_details_form.html:55 msgid "You have already attached photos to this report. Note that you can attach a maximum of 3 to this report (if you try to upload more, the oldest will be removed)." msgstr "" +#: templates/web/base/questionnaire/index.html:83 +#: templates/web/base/report/update/form_update.html:14 +msgid "You have already attached photos to this update. Note that you can attach a maximum of 3 to this update (if you try to upload more, the oldest will be removed)." +msgstr "" + #: templates/web/base/auth/sign_out.html:4 #: templates/web/zurich/auth/sign_out.html:3 msgid "You have been signed out" @@ -3781,9 +3625,8 @@ msgstr "" msgid "You have successfully confirmed your email address." msgstr "" -#: templates/web/base/report/display.html:20 -#: templates/web/base/report/new/fill_in_details.html:37 -#: templates/web/fixmystreet/report/display.html:17 +#: templates/web/base/report/display.html:17 +#: templates/web/base/report/new/login_success_form.html:3 msgid "You have successfully signed in; please check and confirm your details are accurate:" msgstr "Mewngofnodwyd yn llwyddiannus; gwiriwch a chadarnhewch fod eich manylion yn gywir:" @@ -3812,53 +3655,42 @@ msgid "Your Reports" msgstr "Eich adroddiadau" #: templates/web/base/alert/_list.html:89 +#: templates/web/base/contact/index.html:83 +#: templates/web/base/report/display_tools.html:38 +#: templates/web/base/report/display_tools.html:40 +#: templates/web/base/report/new/form_user_loggedin.html:3 +#: templates/web/base/report/new/form_user_loggedout_email.html:1 +#: templates/web/base/report/update/form_user_loggedout_email.html:1 #: templates/web/fixmystreet/alert/updates.html:19 #: templates/web/fixmystreet/alert/updates.html:22 -#: templates/web/fixmystreet/contact/index.html:91 -#: templates/web/fixmystreet/report/display.html:62 -#: templates/web/fixmystreet/report/display.html:64 -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:3 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:1 -#: templates/web/fixmystreet/report/update-form.html:76 #: templates/web/zurich/report/new/fill_in_details_form.html:76 msgid "Your email" msgstr "Eich e-bost" -#: templates/web/base/auth/general.html:28 -#: templates/web/fixmystreet/report/update-form.html:82 +#: templates/web/base/auth/general.html:45 +#: templates/web/base/report/update/form_user_loggedout_email.html:7 #: templates/web/zurich/auth/general.html:30 #: templates/web/zurich/auth/general.html:58 msgid "Your email address" msgstr "Eich cyfeiriad e-bost" -#: templates/web/base/report/new/fill_in_details_form.html:106 -#: templates/web/base/report/update-form.html:81 -msgid "Your email:" -msgstr "Eich e-bost:" - -#: templates/web/fixmystreet/report/updates-sidebar-notes.html:7 +#: templates/web/base/report/updates-sidebar-notes.html:3 msgid "Your information will only be used in accordance with our <a href=\"/privacy\">privacy policy</a>" msgstr "" -#: templates/web/base/auth/general.html:51 -#: templates/web/fixmystreet/contact/index.html:84 -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:18 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:54 -#: templates/web/fixmystreet/report/update-form.html:142 +#: templates/web/base/auth/general.html:90 +#: templates/web/base/contact/index.html:76 +#: templates/web/base/report/new/form_user_loggedin.html:18 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:17 +#: templates/web/base/report/update/form_name.html:11 #: templates/web/zurich/auth/general.html:61 #: templates/web/zurich/report/new/fill_in_details_form.html:86 msgid "Your name" msgstr "Eich enw" -#: templates/web/base/contact/index.html:73 -#: templates/web/base/report/new/fill_in_details_form.html:186 -#: templates/web/base/report/update-form.html:152 -msgid "Your name:" -msgstr "Eich enw:" - -#: templates/web/base/auth/general.html:39 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:22 -#: templates/web/fixmystreet/report/update-form.html:96 +#: templates/web/base/auth/general.html:75 +#: templates/web/base/report/new/form_user_loggedout_password.html:10 +#: templates/web/base/report/update/form_user_loggedout_password.html:9 #: templates/web/zurich/auth/general.html:34 msgid "Your password" msgstr "Eich cyfrinair" @@ -3867,15 +3699,16 @@ msgstr "Eich cyfrinair" msgid "Your password has been changed" msgstr "Newidiwyd eich cyfrinair" -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:27 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:63 +#: templates/web/base/report/new/form_user_loggedin.html:27 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:26 #: templates/web/zurich/report/new/fill_in_details_form.html:92 msgid "Your phone number" msgstr "Eich rhif ffôn" #: templates/web/base/questionnaire/index.html:14 +#, fuzzy msgid "Your report" -msgstr "Eich adroddiad" +msgstr "Eich adroddiadau" #: templates/web/base/footer.html:9 templates/web/fixmystreet/footer.html:29 msgid "Your reports" @@ -3885,23 +3718,17 @@ msgstr "Eich adroddiadau" msgid "Your updates" msgstr "Eich diweddariadau" -#: templates/web/base/contact/index.html:81 -msgid "Your email:" -msgstr "Eich e-bost:" - #: templates/web/base/reports/_list-filters.html:3 -#, fuzzy msgid "all reports" -msgstr "Pob adroddiad" +msgstr "" #: templates/web/base/admin/timeline.html:4 msgid "by %s" msgstr "gan %s" #: templates/web/base/reports/_list-filters.html:5 -#, fuzzy msgid "closed reports" -msgstr "Adroddiadau ar gau" +msgstr "" #: templates/web/base/reports/body.html:6 #: templates/web/base/reports/body.html:7 @@ -3923,17 +3750,16 @@ msgid "edit user" msgstr "" #: templates/web/base/reports/_list-filters.html:6 -#, fuzzy msgid "fixed reports" -msgstr "Adroddiadau newydd" +msgstr "" -#: templates/web/base/admin/index.html:33 +#: templates/web/base/status/stats.html:20 #: templates/web/zurich/admin/index.html:5 msgid "from %s different users" msgstr "" -#: templates/web/base/report/_item.html:17 -#: templates/web/zurich/report/_item.html:16 +#: templates/web/base/report/_item.html:15 +#: templates/web/zurich/report/_item.html:14 msgid "last updated %s" msgstr "diweddarwyd ddiwethaf %s" @@ -4025,10 +3851,8 @@ msgstr "ailagorwyd" msgid "sign out" msgstr "allgofnodi" -#: templates/web/base/report/new/fill_in_details_form.html:12 -#: templates/web/base/report/new/fill_in_details_form.html:15 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:10 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:12 +#: templates/web/base/report/new/fill_in_details_form.html:11 +#: templates/web/base/report/new/fill_in_details_form.html:9 msgid "the local council" msgstr "y cyngor lleol" @@ -4037,7 +3861,7 @@ msgstr "y cyngor lleol" msgid "there is no pin shown as the user did not use the map" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:398 +#: perllib/FixMyStreet/Script/Reports.pm:176 msgid "this type of local problem" msgstr "" @@ -4046,9 +3870,8 @@ msgid "today" msgstr "heddiw" #: templates/web/base/reports/_list-filters.html:4 -#, fuzzy msgid "unfixed reports" -msgstr "Adroddiadau newydd" +msgstr "" #: templates/web/base/admin/report_edit.html:32 msgid "used map" @@ -4067,7 +3890,7 @@ msgstr "" msgid "ward" msgstr "ward" -#: templates/web/base/front/stats.html:17 +#: templates/web/base/front/stats.html:13 #, perl-format msgid "<big>%s</big> report recently" msgid_plural "<big>%s</big> reports recently" @@ -4103,7 +3926,7 @@ msgstr[1] "%d funud" msgstr[2] "%d o funudau" msgstr[3] "%d munud" -#: templates/web/base/front/stats.html:29 +#: templates/web/base/front/stats.html:25 #, perl-format msgid "<big>%s</big> update on reports" msgid_plural "<big>%s</big> updates on reports" @@ -4130,7 +3953,7 @@ msgstr[1] "%d wythnos" msgstr[2] "%d o wythnosau" msgstr[3] "%d wythnos" -#: templates/web/base/front/stats.html:12 +#: templates/web/base/front/stats.html:8 #, perl-format msgid "<big>%s</big> report in past week" msgid_plural "<big>%s</big> reports in past week" @@ -4139,7 +3962,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: templates/web/base/front/stats.html:23 +#: templates/web/base/front/stats.html:19 #, perl-format msgid "<big>%s</big> fixed in past month" msgid_plural "<big>%s</big> fixed in past month" @@ -4166,110 +3989,68 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#~ msgid "(Don't worry — we'll hang on to your alert while you're checking your email.)" -#~ msgstr "(Peidiwch â phoeni, cadwn eich hysbysiad tra eich bod chi'n gwirio eich e-bost.)" - -#~ msgid "(Don't worry — we'll hang on to your problem report while you're checking your email.)" -#~ msgstr "(Peidiwch â phoeni; cadwn eich adroddiad tra eich bod chi'n gwirio eich e-bost.)" - -#~ msgid "(Don't worry — we'll hang on to your update while you're checking your email.)" -#~ msgstr "(Peidiwch â phoeni; cadwn eich diweddariad tra eich bod chi'n gwirio eich e-bost.)" - -#~ msgid "<strong>No</strong>, I do not, let me sign in by email:" -#~ msgstr "<strong>Nac oes</strong>, gadewch i fi fewngofnodi drwy e-bost:" - -#~ msgid "Are you a <strong>developer</strong>? Would you like to contribute to FixMyStreet?" -#~ msgstr "Ydych chi'n <strong>ddatblygwr</strong>? Hoffech chi gyfrannu at FixMyStreet?" - -#~ msgid "Closest nearby problems <small>(within %skm)</small>" -#~ msgstr "Problemau agosaf gerllaw <small>(o fewn %skm)</small>" - -#~ msgid "Contact FixMyStreet" -#~ msgstr "Cysylltu â FixMyStreet" - -#~ msgid "Do you have a FixMyBarangay password?" -#~ msgstr "Oes gennych chi gyfrinair FixMyBarangay?" - -#~ msgid "FixMyStreet admin:" -#~ msgstr "Gweinyddwr FixMyStreet:" - -#~ msgid "If you do not, your alert will not be activated." -#~ msgstr "Os na, ni chaiff eich hysbysiad ei fywiogi." - -#~ msgid "If you do not, your problem will not be posted." -#~ msgstr "Os na, ni chaiff eich problem ei phostio." - -#~ msgid "If you do not, your update will not be posted." -#~ msgstr "Os na, ni chaiff eich diweddariad ei bostio." - -#~ msgid "New local reports on reportemptyhomes.com" -#~ msgstr "Adroddiadau lleol newydd ar reportemptyhomes.com" - -#~ msgid "New reports for {{COUNCIL}} within {{WARD}} ward on reportemptyhomes.com" -#~ msgstr "Adroddiadau newydd i {{COUNCIL}} o fewn ward {{WARD}} ar reportemptyhomes.com" - -#~ msgid "New reports on reportemptyhomes.com" -#~ msgstr "Adroddiadau newydd ar reportemptyhomes.com" +#~ msgid "(we never show your email)" +#~ msgstr "(ni ddatgelir eich e-bost)" -#~ msgid "New reports on reportemptyhomes.com near {{POSTCODE}}" -#~ msgstr "Adroddiadau newydd ar reportemptyhomes.com gerllaw {{POSTCODE}}" +#~ msgid "<strong>No</strong>, let me confirm my report by email:" +#~ msgstr "<strong>Nac oes</strong>, gadewch i fi gadarnhau'r adroddiad drwy e-bost:" -#~ msgid "New reports to {{COUNCIL}} on reportemptyhomes.com" -#~ msgstr "Adroddiadau newydd i {{COUNCIL}} ar reportemptyhomes.com" +#~ msgid "<strong>No</strong>, let me confirm my update by email:" +#~ msgstr "<strong>Nac oes</strong>, gadewch i fi gadarnhau'r diweddariad drwy e-bost:" -#~ msgid "New reports within {{NAME}}'s boundary on reportemptyhomes.com" -#~ msgstr "Adroddiadau newydd o fewn ffiniau {{NAME}} ar reportemptyhomes.com" +#~ msgid "Email me updates" +#~ msgstr "Anfon diweddariadau ataf drwy e-bost" -#~ msgid "No problems found." -#~ msgstr "Ni chanfuwyd problemau." +#~ msgid "Enter a new password:" +#~ msgstr "Rhowch gyfrinair newydd:" -#~ msgid "No problems have been reported yet." -#~ msgstr "Ni adroddwyd unrhyw broblemau eto." +#~ 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 "Os ydych chi'n defnyddio e-bost drwy'r we neu os oes gennych chi hidlydd sothach, gwiriwch eich plygellau e-bost sothach: o bryd i'w gilydd, deuir o hyd i'n negeseuon yno." -#~ msgid "Now to submit your report… do you have a FixMyStreet password?" -#~ msgstr "Nawr i gyflwyno eich adroddiad… oes gennych chi gyfrinair FixMyStreet?" +#~ msgid "Message:" +#~ msgstr "Neges:" -#~ msgid "Now to submit your update… do you have a FixMyStreet password?" -#~ msgstr "Nawr i gyflwyno eich diweddariad… oes gennych chi gyfrinair FixMyStreet?" +#~ msgid "More problems nearby" +#~ msgstr "Rhagor o broblemau gerllaw" -#~ msgid "Our code is open source and <a href=\"http://github.com/mysociety/fixmystreet\">available on GitHub</a>." -#~ msgstr "Mae ein cod yn agored ac mae <a href=\"http://github.com/mysociety/fixmystreet\">ar gael ar GitHub</a>." +#~ msgid "Nearly Done! Now check your email..." +#~ msgstr "Bron yna! Nawr gwiriwch eich e-bost..." -#~ msgid "Please take a look at the updates that have been left." -#~ msgstr "Cymerwch olwg ar y diweddariadau." +#~ msgid "Offensive? Unsuitable? Tell us" +#~ msgstr "Sarhaus? Anaddas? Dywedwch wrthym" -#~ msgid "Problems within %s, FixMyStreet" -#~ msgstr "Problemau yn %s, FixMyStreet" +#~ msgid "Photo:" +#~ msgstr "Llun:" -#~ msgid "Publish the response" -#~ msgstr "Cyhoeddi'r ymateb" +#~ msgid "This problem has been closed" +#~ msgstr "Caewyd y broblem hon" -#~ msgid "Reported %s, to %s" -#~ msgstr "Adroddwyd %s, i %s" +#~ msgid "This problem is in progress" +#~ msgstr "Mae'r broblem hon ar y gweill" -#~ msgid "Sign in by email" -#~ msgstr "Mewngofnodi drwy e-bost" +#~ msgid "This problem is old and of unknown status." +#~ msgstr "mae'r broblem hon yn hen a'i statws yn anhysbys." -#~ msgid "Signed in as %s" -#~ msgstr "Mewngofnodwyd fel %s" +#~ msgid "We have not been able to confirm your account - sorry." +#~ msgstr "Doedd hi ddim yn bosib i ni gadarnhau eich cyfrif - mae'n ddrwg gennym." -#~ msgid "The details of your problem are available from the other tab above." -#~ msgstr "Gellir gweld manylion eich problem yn y tab arall uchod." +#~ msgid "We have sent you an email containing a link to confirm your account." +#~ msgstr "Rydym wedi anfon e-bost atoch sy'n cynnwys dolen i gadarnhau eich cyfrif." -#~ msgid "The details of your problem are available on the right hand side of this page." -#~ msgstr "Mae manylion eich problem ar gael i'w gweld ar ochr dde'r dudalen hon." +#~ msgid "We'd love to hear what you think about this site. Just fill in the form, or send an email to <a href='mailto:%s'>%s</a>:" +#~ msgstr "Carem glywed eich barn am y wefan hon. Llenwch y ffurflen, neu anfonwch e-bost at <a href='mailto:%s'>%s</a>:" -#~ msgid "The latest local reports reported by users" -#~ msgstr "Yr adroddiadau lleol diweddaraf a adroddwyd gan ddefnyddwyr" +#~ msgid "You have already attached a photo to this report, attaching another one will replace it." +#~ msgstr "Rydych wedi atodi llun i'r adroddiad hwn eisoes, byddai atodi un arall yn ei amnewid." -#~ msgid "To <strong>report a problem</strong>, click on the map at the correct location." -#~ msgstr "I <strong>adrodd problem</strong>, cliciwch ar y lleoliad cywir ar y map." +#~ msgid "You have already attached a photo to this update, attaching another one will replace it." +#~ msgstr "Rydych wedi atodi llun i'r diweddariad hwn eisoes, byddai atodi un arall yn ei amnewid." -#~ msgid "User" -#~ msgstr "Defnyddiwr" +#~ msgid "Your email:" +#~ msgstr "Eich e-bost:" -#~ msgid "You must now click the link in the email we've just sent you." -#~ msgstr "Nawr mae'n rhaid i chi glicio ar y ddolen yn yr e-bost anfonon ni atoch chi." +#~ msgid "Your name:" +#~ msgstr "Eich enw:" -#~ msgid "Your email address:" -#~ msgstr "Eich cyfeiriad e-bost:" +#~ msgid "Your email:" +#~ msgstr "Eich e-bost:" diff --git a/locale/da_DK.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/da_DK.UTF-8/LC_MESSAGES/FixMyStreet.po index 1f09b03b9..b097e4ab1 100644 --- a/locale/da_DK.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/da_DK.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -6,7 +6,7 @@ # Translators: # Guttorm Flatabø <post@guttormflatabo.com>, 2013 # Keld Simonsen <keld@rap.dk>, 2015 -# oeyrvin <oeyrvin@hagan.no>, 2015 +# Ole-Erik Yrvin <oeyrvin@gmail.com>, 2015 # Ørjan Vøllestad <orjanv@gmail.com>, 2014 # pere <pere-transifex@hungry.com>, 2012,2015 # Petter Reinholdtsen <pere@hungry.com>, 2011 @@ -14,9 +14,9 @@ msgid "" msgstr "" "Project-Id-Version: fixmystreet\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2015-10-23 16:51+0100\n" -"PO-Revision-Date: 2015-08-04 21:51+0000\n" -"Last-Translator: Keld Simonsen <keld@rap.rap.dk>\n" +"POT-Creation-Date: 2016-03-02 13:09+0000\n" +"PO-Revision-Date: 2015-10-23 16:35+0000\n" +"Last-Translator: mySociety <transifex@mysociety.org>\n" "Language-Team: Danish (Denmark) (http://www.transifex.com/mysociety/fixmystreet/language/da_DK/)\n" "Language: da_DK\n" "MIME-Version: 1.0\n" @@ -24,45 +24,24 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:628 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:411 +#: perllib/FixMyStreet/DB/Result/Problem.pm:616 +#: perllib/FixMyStreet/Script/Reports.pm:189 msgid " and " msgstr " og " #: templates/web/base/report/new/councils_text_all.html:2 -#: templates/web/base/report/new/councils_text_none.html:11 -#: templates/web/base/report/new/councils_text_none.html:2 +#: templates/web/base/report/new/councils_text_none.html:12 +#: templates/web/base/report/new/councils_text_none.html:15 #: templates/web/base/report/new/councils_text_some.html:19 #: templates/web/base/report/new/councils_text_some.html:22 #: templates/web/base/report/new/councils_text_some.html:5 msgid " or " msgstr " eller " -#: templates/web/base/admin/index.html:35 -#: templates/web/base/status/index.html:13 -msgid "%s confirmed alerts, %s unconfirmed" -msgstr "%d bekræftede varsler, %d ubekræftede" - -#: templates/web/base/admin/index.html:37 -#: templates/web/base/status/index.html:16 -#: templates/web/zurich/admin/index.html:6 -msgid "%s council contacts – %s confirmed, %s unconfirmed" -msgstr "%d myndighedskontakter – %d bekræftet, %d ubekræftet" - #: templates/web/base/admin/edit-league.html:12 msgid "%d edits by %s" msgstr "%d redigeringer af %s" -#: templates/web/base/admin/index.html:34 -#: templates/web/base/status/index.html:12 -msgid "%s live updates" -msgstr "%d aktive opdateringer" - -#: templates/web/base/admin/index.html:36 -#: templates/web/base/status/index.html:14 -msgid "%s questionnaires sent – %s answered (%s%%)" -msgstr "%d spørgeskemaer sendt – %d besvaret (%s%%)" - #: templates/web/base/pagination.html:10 msgid "%d to %d of %d" msgstr "%d til %d af %d" @@ -77,35 +56,50 @@ msgstr "%s - opsummeringsrapporter" msgid "%s admin:" msgstr "" +#: templates/web/base/status/stats.html:26 +#, fuzzy +msgid "%s bodies" +msgstr "Administrationer" + +#: templates/web/base/status/stats.html:24 +msgid "%s confirmed alerts, %s unconfirmed" +msgstr "%s bekræftede varsler, %s ubekræftede" + +#: templates/web/base/status/stats.html:27 +#: templates/web/zurich/admin/index.html:6 +msgid "%s council contacts – %s confirmed, %s unconfirmed" +msgstr "%s myndighedskontakter – %s bekræftet, %s ubekræftet" + #. ("%s is the site name") #: templates/web/base/alert/index.html:7 -#, fuzzy msgid "" "%s has a variety of RSS feeds and email alerts for local\n" "problems, including alerts for all problems within a particular ward, or all\n" "problems within a certain distance of a particular location." msgstr "" -"FixMinVej har forskellige RSS-strømme og e-postlister om lokale problemer, dette inkluderer problemer meldt indenfor en bestemt bydel eller myndighed, eller et omrÃ¥de med problemer\n" -"indenfor en angivet distance fra en bestemt position." #. ("%s is the site name") #: templates/web/base/alert/index.html:11 -#, fuzzy msgid "" "%s has a variety of RSS feeds and email alerts for local problems, including\n" "alerts for all problems within a particular ward or council, or all problems\n" "within a certain distance of a particular location." msgstr "" -"FixMinVej har forskellige RSS-strømme og e-postlister om lokale problemer, dette inkluderer problemer meldt indenfor en bestemt bydel eller myndighed, eller et omrÃ¥de med problemer\n" -"indenfor en angivet distance fra en bestemt position." -#: perllib/FixMyStreet/DB/Result/Problem.pm:695 +#: templates/web/base/status/stats.html:23 +msgid "%s live updates" +msgstr "%s aktive opdateringer" + +#: templates/web/base/status/stats.html:25 +msgid "%s questionnaires sent – %s answered (%s%%)" +msgstr "%s spørgeskemaer sendt – %s besvaret (%s%%)" + +#: perllib/FixMyStreet/DB/Result/Problem.pm:683 msgid "%s ref: %s" msgstr "%s ref: %s" #. ("%s is the site name") #: templates/web/base/alert/_list.html:73 -#, fuzzy msgid "" "%s sends different categories of problem\n" "to the appropriate council, so problems within the boundary of a particular council\n" @@ -113,17 +107,17 @@ msgid "" "will be sent to the district council, so will appear in both of the district\n" "council’s alerts, but will only appear in the \"Within the boundary\" alert\n" "for the county council." -msgstr "FixMinVej sender forskellige kategorier af problemer til forskellige myndigheder, problemer som gælder flere myndigheder bliver sendt til alle dem det angÃ¥r." +msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:255 perllib/FixMyStreet/Cobrand/UK.pm:267 +#: perllib/FixMyStreet/Cobrand/UK.pm:256 perllib/FixMyStreet/Cobrand/UK.pm:268 msgid "%s ward, %s" msgstr "%s bydel, %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:564 +#: perllib/FixMyStreet/DB/Result/Problem.pm:552 msgid "%s, reported at %s" msgstr "%s, rapporteret %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:282 perllib/FixMyStreet/Cobrand/UK.pm:294 +#: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295 msgid "%s, within %s ward" msgstr "%s, indefor bydel %s" @@ -131,7 +125,7 @@ msgstr "%s, indefor bydel %s" msgid "© <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors" msgstr "© <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> -bidragsydere" -#: templates/web/zurich/report/new/fill_in_details_form.html:53 +#: templates/web/zurich/report/new/fill_in_details_form.html:46 msgid "(Defect & location of defect)" msgstr "" @@ -142,15 +136,13 @@ msgstr "(Epost i misbrugstabellen)" #: templates/web/zurich/admin/report_edit-sdm.html:60 #: templates/web/zurich/admin/report_edit.html:88 -#, fuzzy msgid "(No name)" -msgstr "Dit navn" +msgstr "" #: templates/web/zurich/admin/report_edit-sdm.html:67 #: templates/web/zurich/admin/report_edit.html:95 -#, fuzzy msgid "(No phone number)" -msgstr "Dit telefonnummer" +msgstr "" #: templates/web/base/alert/_list.html:24 msgid "(a default distance which covers roughly 200,000 people)" @@ -158,17 +150,16 @@ msgstr "(en standardafstand som dækker en befolkning pÃ¥ omtrent 200.000)" #. ("%s is a list of distance links, e.g. [2km] / [5km] / [10km] / [20km]") #: templates/web/base/alert/_list.html:29 -#, fuzzy msgid "(alternatively the RSS feed can be customised, within %s)" -msgstr "(alternativt kan RSS-strømmen tilpasses, indenfor" +msgstr "" -#: templates/web/base/report/_item.html:27 -#: templates/web/zurich/report/_item.html:21 +#: templates/web/base/report/_item.html:25 +#: templates/web/zurich/report/_item.html:19 msgid "(closed)" msgstr "(lukket)" -#: templates/web/base/report/_item.html:25 -#: templates/web/zurich/report/_item.html:19 +#: templates/web/base/report/_item.html:23 +#: templates/web/zurich/report/_item.html:17 msgid "(fixed)" msgstr "(løst)" @@ -176,37 +167,28 @@ msgstr "(løst)" msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)" msgstr "(som graffite, affald, hul i vejen, eller ødelagt gadelys)" -#: templates/web/base/report/_item.html:21 +#: templates/web/base/report/_item.html:19 msgid "(not sent to council)" msgstr "(ikke rapporteret til myndigheden)" -#: templates/web/base/report/new/fill_in_details_form.html:200 #: templates/web/zurich/report/new/fill_in_details_form.html:82 msgid "(optional)" msgstr "(valgfrit)" -#: templates/web/fixmystreet/report/public_label.html:1 +#: templates/web/base/report/public_label.html:1 msgid "(public)" msgstr "(offentlig)" -#: templates/web/base/report/_item.html:20 +#: templates/web/base/report/_item.html:18 msgid "(sent to both)" msgstr "(sendt til begge)" -#: templates/web/base/report/new/fill_in_details_form.html:194 -msgid "(we never show your email address or phone number)" -msgstr "(vi viser aldrig din e-postadresse eller dit telefonnummer)" - -#: templates/web/base/report/update-form.html:159 -msgid "(we never show your email)" -msgstr "(vi viser aldrig din e-postadresse)" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:673 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 #: perllib/FixMyStreet/DB/Result/Problem.pm:410 msgid "-- Pick a category --" msgstr "-- Vælg en kategori --" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:637 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:632 #: perllib/FixMyStreet/DB/Result/Problem.pm:416 msgid "-- Pick a property type --" msgstr "-- Vælg en ejendomsstype --" @@ -225,52 +207,39 @@ msgstr "<code>MAPIT_URL</code> er sat, (<code>%s</code>) men ingen <code>MAPIT_T msgid "<label>Show %s</label> <label>about %s</label>" msgstr "" -#: templates/web/base/admin/index.html:32 -#: templates/web/base/status/index.html:11 +#: templates/web/base/status/stats.html:18 #: templates/web/zurich/admin/index.html:4 msgid "<strong>%s</strong> live problems" -msgstr "<strong>%d</strong> aktive problemer" +msgstr "<strong>%s</strong> aktive problemer" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:39 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:2 msgid "<strong>No</strong> Let me confirm my report by email" msgstr "<strong>Nej</strong> Lad mig bekræfte min rapport med e-post" -#: templates/web/fixmystreet/report/update-form.html:112 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:2 msgid "<strong>No</strong> Let me confirm my update by email" msgstr "<strong>Nej</strong> Lad mig bekræfte min opdatering med e-post" -#: templates/web/base/auth/general.html:48 +#: templates/web/base/auth/general.html:87 #: templates/web/zurich/auth/general.html:51 msgid "<strong>No</strong> let me sign in by email" msgstr "<strong>Nej</strong>, lad mig logge ind med e-post:" -#: templates/web/base/report/new/fill_in_details_form.html:145 -msgid "<strong>No</strong>, let me confirm my report by email:" -msgstr "<strong>Nej</strong>, lad mig bekræfte min rapport med e-post:" - -#: templates/web/base/report/update-form.html:118 -msgid "<strong>No</strong>, let me confirm my update by email:" -msgstr "<strong>Nej</strong>, lad mig bekræfte min opdatering med e-post:" - -#: templates/web/base/auth/general.html:34 -#: templates/web/base/report/new/fill_in_details_form.html:123 -#: templates/web/base/report/update-form.html:96 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:15 -#: templates/web/fixmystreet/report/update-form.html:89 +#: templates/web/base/auth/general.html:70 +#: templates/web/base/report/new/form_user_loggedout_password.html:3 +#: templates/web/base/report/update/form_user_loggedout_password.html:2 msgid "<strong>Yes</strong> I have a password" msgstr "<strong>Ja</strong>, jeg har en adgangskode" -#: templates/web/base/static/about-en-gb.html:1 -#: templates/web/base/static/about-en-gb.html:3 +#: templates/web/base/about/about-en-gb.html:1 +#: templates/web/base/about/about-en-gb.html:3 msgid "About us" msgstr "Om os" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:8 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:31 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:29 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:35 msgid "Action Scheduled" msgstr "Handling planlagt" @@ -301,14 +270,13 @@ msgstr "Tilføj ny kategori" msgid "Add user" msgstr "Tilføj bruger" -#: templates/web/base/my/my.html:52 +#: templates/web/base/my/my.html:56 msgid "Added %s" msgstr "Tilføjede %s" #: templates/web/base/report/new/category_extras.html:9 -#, fuzzy msgid "Additional Information" -msgstr "Afventer moderation" +msgstr "" #: templates/web/base/auth/change_password.html:29 msgid "Again:" @@ -322,8 +290,7 @@ msgstr "Varsel %d oprettet for %s, type %s, parameter %s / %s" msgid "Alert %d disabled (created %s)" msgstr "Varsel %d koblet fra (oprettet %s)" -#: templates/web/base/report/update-form.html:164 -#: templates/web/fixmystreet/report/update-form.html:150 +#: templates/web/base/report/update/form_name.html:20 msgid "Alert me to future updates" msgstr "Send mig varsel ved fremtidige opdateringer" @@ -333,9 +300,8 @@ msgid "All Reports" msgstr "Alle rapporter" #: templates/web/zurich/admin/stats.html:5 -#, fuzzy msgid "All Reports as CSV" -msgstr "Alle rapporter" +msgstr "" #: templates/web/base/footer.html:11 templates/web/fixmystreet/footer.html:32 #: templates/web/zurich/admin/index-dm.html:12 @@ -356,10 +322,8 @@ msgstr "Al informationen du har lagt ind her vil blive sendt til" #: templates/web/base/report/new/councils_text_all.html:2 #: templates/web/base/report/new/councils_text_all.html:4 -#: templates/web/base/report/new/fill_in_details_form.html:12 -#: templates/web/base/report/new/fill_in_details_form.html:14 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:10 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:11 +#: templates/web/base/report/new/fill_in_details_form.html:10 +#: templates/web/base/report/new/fill_in_details_form.html:9 msgid "All the information you provide here will be sent to <strong>%s</strong>." msgstr "All informationen du har lagt ind her vil blive sendt til <strong>%s</strong>." @@ -381,6 +345,10 @@ msgstr "Anonym:" msgid "Are you a developer?" msgstr "Er du en udvikler?" +#: templates/web/base/js/translation_strings.html:52 +msgid "Are you sure you want to cancel this upload?" +msgstr "" + #: templates/web/base/admin/body-form.html:69 #: templates/web/base/admin/body.html:16 #: templates/web/zurich/admin/body-form.html:24 @@ -393,9 +361,8 @@ msgid "As this is a staging site and %s is false, reports made on this site will msgstr "Da reproduktionsstedet og %s ikke stemmer, vil beskeden som er lavet her, blive sendt til problemrapportøren, og ikke til kontakten som er givet for beskedformÃ¥let." #: templates/web/zurich/admin/report_edit.html:213 -#, fuzzy msgid "Assign to competent body:" -msgstr "Tildel til ekstern myndighed:" +msgstr "" #: templates/web/zurich/admin/report_edit.html:173 #: templates/web/zurich/admin/stats.html:36 @@ -414,16 +381,16 @@ msgstr "Tildelt underafdeling:" msgid "Assigned to %s" msgstr "Tildelt %s" -#: templates/web/base/open311/index.html:84 +#: templates/web/base/open311/index.html:76 msgid "At most %d requests are returned in each query. The returned requests are ordered by requested_datetime, so to get all requests, do several searches with rolling start_date and end_date." msgstr "Højst %d forespørgsler bliver returneret i hver forespørgsel. De returnerede forespørgsler bliver sorteret pÃ¥ requested_datetime, sÃ¥ man mÃ¥ lave flere søgninger med rullende start_date og end_date for at fÃ¥ fat pÃ¥ alle forespørgslerne." -#: templates/web/base/open311/index.html:76 +#: templates/web/base/open311/index.html:68 msgid "At the moment only searching for and looking at reports work." msgstr "For øjeblikket er det kun søgning efter og at visning af rapporter som fungerer." #: perllib/FixMyStreet/DB/Result/Problem.pm:373 -#: templates/web/zurich/report/_item.html:11 +#: templates/web/zurich/report/_item.html:9 msgid "Awaiting moderation" msgstr "Afventer moderation" @@ -435,7 +402,7 @@ msgstr "Tilbage" msgid "Ban email address" msgstr "Bandlys epostadresse" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1276 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1285 #: perllib/FixMyStreet/Cobrand/Zurich.pm:392 #: templates/web/base/admin/bodies.html:1 templates/web/zurich/header.html:64 msgid "Bodies" @@ -465,7 +432,7 @@ msgid "Can't see the map? <em>Skip this step</em>" msgstr "Hvis du ikke kan se kortet, <em>sÃ¥ overspring dette trin</em>." #: templates/web/base/admin/body.html:68 -#: templates/web/base/admin/index.html:61 +#: templates/web/base/admin/index.html:54 #: templates/web/base/report/new/category.html:10 #: templates/web/base/report/new/category_wrapper.html:3 #: templates/web/zurich/admin/body.html:14 @@ -476,8 +443,8 @@ msgstr "Hvis du ikke kan se kortet, <em>sÃ¥ overspring dette trin</em>." msgid "Category" msgstr "Kategori" -#: templates/web/base/admin/index.html:59 -#: templates/web/base/admin/index.html:67 +#: templates/web/base/admin/index.html:52 +#: templates/web/base/admin/index.html:60 msgid "Category fix rate for problems > 4 weeks old" msgstr "Løsningsrate fordelt pÃ¥ kategori for problemer > 4 uger gamle" @@ -490,7 +457,7 @@ msgstr "Løsningsrate fordelt pÃ¥ kategori for problemer > 4 uger gamle" msgid "Category:" msgstr "Kategori:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:402 +#: perllib/FixMyStreet/Script/Reports.pm:180 msgid "Category: %s" msgstr "Kategori: %s" @@ -549,7 +516,7 @@ msgid "Click here or enter as dd/mm/yyyy" msgstr "Klik her eller indtast dato pÃ¥ formatet dd/mm/åååå" #: templates/web/base/around/_report_banner.html:2 -#: templates/web/base/js/translation_strings.html:50 +#: templates/web/base/js/translation_strings.html:55 msgid "Click map to report a problem" msgstr "Klik i kortet for at rapportere et problem" @@ -576,7 +543,7 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:25 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:144 -#: templates/web/fixmystreet/report/banner.html:15 +#: templates/web/base/report/banner.html:15 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:10 #: templates/web/zurich/admin/header.html:16 @@ -584,7 +551,7 @@ msgstr "" msgid "Closed" msgstr "Lukket" -#: perllib/FixMyStreet/DB/Result/Problem.pm:794 +#: perllib/FixMyStreet/DB/Result/Problem.pm:779 msgid "Closed by council" msgstr "Lukket af myndigheden" @@ -610,7 +577,7 @@ msgstr "Mærkevaresamarbejdsdata:" msgid "Cobrand:" msgstr "Mærkevaresamarbejde:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1283 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1292 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "Opsætning" @@ -623,13 +590,14 @@ msgstr "Opsæt endepunkt" msgid "Confirm" msgstr "Bekræft" -#: templates/web/base/auth/token.html:1 templates/web/zurich/auth/token.html:1 +#: templates/web/base/auth/token.html:1 msgid "Confirm account" msgstr "Bekræft konto" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:33 -#: templates/web/fixmystreet/report/update-form.html:107 -msgid "Confirm by email below, providing a new password at that point. When you confirm, your password will be updated." +#: templates/web/base/report/new/form_user_loggedout_password.html:21 +#: templates/web/base/report/update/form_user_loggedout_password.html:20 +#, fuzzy +msgid "Confirm by email instead, providing a new password at that point. When you confirm, your password will be updated." msgstr "Bekræft via epost nedenfor, og angiv en ny adgangskode der. NÃ¥r du har bekræftet vil adgangskode dit blive opdatert." #: templates/web/base/questionnaire/creator_fixed.html:1 @@ -659,35 +627,27 @@ msgid "Confirmed:" msgstr "Bekræftet:" #. ("%s is the site name") -#: templates/web/base/faq/faq-en-gb.html:8 templates/web/base/footer.html:24 -#: templates/web/base/open311/index.html:8 -#: templates/web/base/static/privacy.html:10 -#: templates/web/fixmystreet/contact/index.html:12 -#, fuzzy +#: templates/web/base/about/_sidebar.html:6 templates/web/base/footer.html:24 msgid "Contact %s" -msgstr "Kontakt os" +msgstr "" #: templates/web/base/contact/index.html:1 #: templates/web/base/contact/index.html:2 #: templates/web/base/contact/submit.html:1 -#: templates/web/fixmystreet/contact/index.html:1 -#: templates/web/fixmystreet/contact/index.html:2 msgid "Contact Us" msgstr "Kontakt os" -#: templates/web/base/contact/index.html:6 -#: templates/web/fixmystreet/contact/index.html:20 +#: templates/web/base/contact/index.html:12 msgid "Contact the team" msgstr "Kontakt projektgruppen" #: templates/web/zurich/admin/report_edit-sdm.html:40 #: templates/web/zurich/admin/report_edit.html:59 -#, fuzzy msgid "Coordinates:" -msgstr "Koordinater:" +msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1420 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1448 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1429 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1457 msgid "Could not find user" msgstr "Kunne ikke finde bruger" @@ -705,7 +665,7 @@ msgstr "Administration" msgid "Council contacts for %s" msgstr "Administrationskontakter for %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:693 +#: perllib/FixMyStreet/DB/Result/Problem.pm:681 msgid "Council ref: %s" msgstr "myndighedsreference: %s" @@ -720,7 +680,7 @@ msgstr "Administration:" msgid "Count" msgstr "Antal" -#: templates/web/base/email_sent.html:1 templates/web/zurich/email_sent.html:1 +#: templates/web/base/email_sent.html:1 msgid "Create a report" msgstr "Lav en rapport" @@ -730,9 +690,8 @@ msgid "Create category" msgstr "Lav kategori" #: templates/web/zurich/admin/template_edit.html:29 -#, fuzzy msgid "Create template" -msgstr "Lav en rapport" +msgstr "" #: templates/web/base/admin/problem_row.html:34 #: templates/web/zurich/admin/templates.html:10 @@ -769,7 +728,7 @@ msgstr "Oversigt" msgid "Dealt with by subdivision within 5 working days" msgstr "Behandlet af underafdeling inden 5 arbejdsdage" -#: perllib/FixMyStreet/App/Controller/Admin.pm:878 +#: perllib/FixMyStreet/App/Controller/Admin.pm:877 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "" @@ -782,7 +741,7 @@ msgstr "" msgid "Deleted" msgstr "Slettet" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:51 +#: templates/web/base/report/new/form_report.html:45 #: templates/web/zurich/admin/index-dm.html:22 #: templates/web/zurich/admin/index-sdm.html:20 #: templates/web/zurich/admin/reports.html:12 @@ -790,12 +749,11 @@ msgid "Description" msgstr "Beskrivelse" #: templates/web/base/js/translation_strings.html:34 -#: templates/web/zurich/report/new/fill_in_details_form.html:42 +#: templates/web/zurich/report/new/fill_in_details_form.html:68 msgid "Details" msgstr "Detaljer" #: templates/web/base/admin/report_edit.html:20 -#: templates/web/base/report/new/fill_in_details_form.html:62 #: templates/web/zurich/admin/report_edit-sdm.html:27 #: templates/web/zurich/admin/report_edit.html:29 #: templates/web/zurich/admin/report_edit.html:43 @@ -808,38 +766,38 @@ msgstr "Delegeret" #: templates/web/zurich/admin/report_edit-sdm.html:50 #: templates/web/zurich/admin/report_edit.html:69 -#, fuzzy msgid "Didn't use map" -msgstr "brugte ikke kort" +msgstr "" #: templates/web/base/admin/edit-league.html:8 msgid "Diligency prize league table" msgstr "Arbejdsheste" #. ("%s is the site name") -#: templates/web/base/auth/general.html:31 -#: templates/web/base/report/new/fill_in_details_form.html:114 -#: templates/web/base/report/update-form.html:87 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:11 -#: templates/web/fixmystreet/report/update-form.html:86 -#, fuzzy +#: templates/web/base/auth/general.html:48 +#: templates/web/base/report/new/form_user_loggedout.html:18 +#: templates/web/base/report/new/oauth_email_form.html:18 +#: templates/web/base/report/update-form.html:29 +#: templates/web/base/report/update/form_user_loggedout.html:17 msgid "Do you have a %s password?" -msgstr "Har du en FixMinVej-adgangskode?" +msgstr "" #: templates/web/base/questionnaire/index.html:55 msgid "Don’t know" msgstr "Véd ikke" -#: templates/web/fixmystreet/contact/index.html:118 +#: templates/web/base/contact/index.html:110 msgid "Don't like forms?" msgstr "Kan du ikke lide skemaer?" +#: templates/web/base/js/translation_strings.html:51 +msgid "Drag and drop photos here or <u>click to upload</u>" +msgstr "" + #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:14 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:32 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:30 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:36 msgid "Duplicate" msgstr "Duplikat" @@ -892,7 +850,7 @@ msgstr "Opdateret af" #: templates/web/base/admin/category_edit.html:91 #: templates/web/base/admin/flagged.html:38 #: templates/web/base/admin/users.html:16 -#: templates/web/base/auth/general.html:22 +#: templates/web/base/auth/general.html:39 #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:24 @@ -900,7 +858,7 @@ msgstr "Opdateret af" msgid "Email" msgstr "E-post" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1396 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1405 msgid "Email added to abuse list" msgstr "Epost lagt til misbrugsliste" @@ -916,7 +874,7 @@ msgstr "Epostvarsel laget" msgid "Email alert deleted" msgstr "Epostvarsel slettet" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1393 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1402 msgid "Email already in abuse list" msgstr "Epost allerede i misbrugslisten" @@ -924,41 +882,36 @@ msgstr "Epost allerede i misbrugslisten" msgid "Email me new local problems" msgstr "Send mig e-post om lokale problemer" -#: templates/web/base/report/display.html:38 -msgid "Email me updates" -msgstr "Send mig opdateringer" - #: templates/web/base/admin/category_edit.html:31 #: templates/web/base/admin/report_edit.html:62 #: templates/web/base/admin/update_edit.html:33 #: templates/web/base/admin/user-form.html:20 #: templates/web/base/alert/updates.html:13 -#: templates/web/base/report/display.html:42 #: templates/web/zurich/admin/body.html:47 msgid "Email:" msgstr "E-post:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:329 +#: perllib/FixMyStreet/Script/Reports.pm:108 msgid "Email: %s" msgstr "E-post: %s" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:639 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:634 msgid "Empty flat or maisonette" msgstr "Tom lejlighed" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:638 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:633 msgid "Empty house or bungalow" msgstr "Tomt hus eller bungalow" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:641 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:636 msgid "Empty office or other commercial" msgstr "Tomt kontor eller forretningsbygning" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:642 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:637 msgid "Empty pub or bar" msgstr "Tom pub eller bar" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:643 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:638 msgid "Empty public building - school, hospital, etc." msgstr "Tom offentlig bygning - skole, sygehus, etc." @@ -997,7 +950,7 @@ msgstr "Endepunkt" msgid "Enter a Zürich street name" msgstr "Indtast et vejnavn i Zürich" -#: perllib/FixMyStreet/Cobrand/UK.pm:13 +#: perllib/FixMyStreet/Cobrand/UK.pm:14 msgid "Enter a nearby UK postcode, or street name and area" msgstr "Indtast et britisk postnummer i nærheden, eller vejnavn og sted" @@ -1015,14 +968,9 @@ msgstr "Indtast et vejnavn og sted" msgid "Enter a nearby street name and area, postal code or district in Delhi" msgstr "Vælg et nærliggende gadenavn og omrÃ¥de, postnummer eller distrikt i Delhi" -#: templates/web/base/report/new/fill_in_details_form.html:152 -#: templates/web/base/report/update-form.html:125 -msgid "Enter a new password:" -msgstr "Indtast en ny adgangskode:" - -#: templates/web/base/auth/general.html:60 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:75 -#: templates/web/fixmystreet/report/update-form.html:123 +#: templates/web/base/auth/general.html:99 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:38 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:13 #: templates/web/zurich/auth/general.html:65 msgid "Enter a password" msgstr "Indtast en ny adgangskode" @@ -1032,11 +980,11 @@ msgid "Enter details of the problem" msgstr "Indtast detaljer om problemet" #: templates/web/base/errors/generic.html:1 -#: templates/web/base/errors/generic.html:3 +#: templates/web/base/errors/generic.html:4 #: templates/web/base/tokens/abuse.html:1 #: templates/web/base/tokens/abuse.html:3 #: templates/web/base/tokens/error.html:1 -#: templates/web/base/tokens/error.html:3 +#: templates/web/base/tokens/error.html:5 msgid "Error" msgstr "Fejl" @@ -1049,11 +997,11 @@ msgstr "" msgid "Example postcode %s" msgstr "Eksempel-postnummer %s" -#: templates/web/base/open311/index.html:94 +#: templates/web/base/open311/index.html:86 msgid "Examples:" msgstr "Eksempler:" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:55 +#: templates/web/base/report/new/form_report.html:49 msgid "Explain what’s wrong, exactly where it is, and how long it’s been there…" msgstr "Forklar hvad som er galt, nøjagtigt hvor det er og hvor længe det har været galt..." @@ -1061,9 +1009,8 @@ msgstr "Forklar hvad som er galt, nøjagtigt hvor det er og hvor længe det har #: perllib/FixMyStreet/Cobrand/Zurich.pm:922 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:12 -#, fuzzy msgid "Extern" -msgstr "Eksternt link" +msgstr "" #: templates/web/base/admin/body-form.html:81 msgid "External URL" @@ -1095,17 +1042,15 @@ msgstr "Fiks dette ved at vælge en <strong>area covered</strong> i <em> Edit bo msgid "FixMyStreet" msgstr "FixMinVej" -#: templates/web/base/admin/index.html:61 +#: templates/web/base/admin/index.html:54 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:24 #: templates/web/base/admin/report_blocks.html:9 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:144 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:34 -#: templates/web/fixmystreet/report/banner.html:12 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:32 +#: templates/web/base/report/banner.html:12 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:38 msgid "Fixed" msgstr "Løst" @@ -1132,7 +1077,7 @@ msgstr "Markér som slettet" msgid "Flag user" msgstr "Markér bruger" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1281 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1290 #: templates/web/base/admin/users.html:19 msgid "Flagged" msgstr "Markeret:" @@ -1163,36 +1108,31 @@ msgstr "Følg en bydelslænke for at kun se rapporter indenfor denne bydel." msgid "For more information, see <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>." msgstr "For mere information, se <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>Hvordan FixMyStreet bruger Mapit</a>." -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:32 -#: templates/web/fixmystreet/report/update-form.html:106 +#: templates/web/base/report/new/form_user_loggedout_password.html:20 +#: templates/web/base/report/update/form_user_loggedout_password.html:19 msgid "Forgotten your password?" msgstr "Glemt din adgangskode?" #: perllib/FixMyStreet/Cobrand/Zurich.pm:752 -#, fuzzy msgid "Forwarded to external body" -msgstr "Tildel til ekstern myndighed:" +msgstr "" #: perllib/FixMyStreet/Cobrand/Zurich.pm:753 -#, fuzzy msgid "Forwarded wish to external body" -msgstr "Tildel til ekstern myndighed:" +msgstr "" -#: templates/web/base/faq/faq-en-gb.html:1 -#: templates/web/base/faq/faq-en-gb.html:13 -#: templates/web/base/faq/faq-en-gb.html:6 -#: templates/web/base/open311/index.html:6 -#: templates/web/base/static/privacy.html:8 -#: templates/web/fixmystreet/contact/index.html:10 +#: templates/web/base/about/_sidebar.html:4 +#: templates/web/base/about/faq-en-gb.html:1 +#: templates/web/base/about/faq-en-gb.html:5 msgid "Frequently Asked Questions" msgstr "Ofte spurgte spørgsmÃ¥l" -#: templates/web/base/open311/index.html:136 +#: templates/web/base/open311/index.html:128 msgid "GeoRSS on Google Maps" msgstr "GeoRSS pÃ¥ Google Maps" +#: templates/web/base/report/display_tools.html:11 #: templates/web/fixmystreet/around/_updates.html:3 -#: templates/web/fixmystreet/report/display.html:35 msgid "Get updates" msgstr "FÃ¥ opdateringer" @@ -1225,7 +1165,7 @@ msgstr "Søg" msgid "Going to send questionnaire?" msgstr "Skal der sendes spørgeskema?" -#: templates/web/base/admin/index.html:42 +#: templates/web/base/admin/index.html:35 msgid "Graph of problem creation by status over time" msgstr "Graf over problemoprettelse fordelt pÃ¥ status over tid" @@ -1242,7 +1182,7 @@ msgid "Have you ever reported a problem to a council before, or is this your fir msgstr "Har du rapporteret et problem til en myndighed før, eller er dette første gang?" #: templates/web/base/footer.html:15 templates/web/fixmystreet/footer.html:38 -#: templates/web/zurich/faq/faq-de-ch.html:1 +#: templates/web/zurich/about/faq-de-ch.html:1 #: templates/web/zurich/footer.html:22 #: templates/web/zurich/nav_over_content.html:8 msgid "Help" @@ -1293,7 +1233,7 @@ msgstr "Hvordan rapporteres et problem" msgid "How to send successful reports" msgstr "Hvordan indsendes rapporter som er løst" -#: perllib/FixMyStreet/App/Controller/Admin.pm:754 +#: perllib/FixMyStreet/App/Controller/Admin.pm:752 msgid "I am afraid you cannot confirm unconfirmed reports." msgstr "Jeg er bange for at du ikke kan bekræfte ubekræftede rapporter." @@ -1311,10 +1251,6 @@ msgstr "Jeg opdaterede netop et problem pÃ¥ @fixminvej" msgid "I'm afraid we couldn't locate your problem in the database.\n" msgstr "Jeg er bange for at vi ikke kunne finde dit problem i databasen.\n" -#: perllib/FixMyStreet/App/Controller/Tokens.pm:327 -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 "Jeg er bange for at vi ikke kunne verificere denne reference. Hvis du kopierede webadressen fra en e-post, kontrollér at du har kopieret den korrekt.\n" - #: templates/web/base/admin/flagged.html:14 #: templates/web/base/admin/list_updates.html:6 #: templates/web/base/admin/reports.html:11 @@ -1343,25 +1279,16 @@ msgstr "Hvis to eller flere instanser er lokaliseret pÃ¥ samme sted, kombinerer msgid "If you get some more information about the status of your problem, please come back to the site and leave an update." msgstr "Hvis du fÃ¥r mere information om status for dit problem, sÃ¥ vær sød at komme tilbage til netstedet og lav en opdatering." -#: templates/web/base/report/new/councils_text_none.html:2 -#: templates/web/base/report/new/councils_text_none.html:8 +#: templates/web/base/report/new/councils_text_none.html:10 +#: templates/web/base/report/new/councils_text_none.html:9 msgid "If you submit a problem here the subject and details of the problem will be public, but the problem will <strong>not</strong> be reported to the council." msgstr "Hvis du indsender et problem her, sÃ¥ vil emne og detaljer for problemet være offentlig, men problemet vil <strong>ikke</strong> blive rapportert til myndigheden." -#: templates/web/zurich/auth/token.html:19 -#: templates/web/zurich/email_sent.html:7 -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 "Hvis du bruger web-baseret e-post eller har filtre for affalds-e-post pÃ¥ din e-postkonto, skal du i nogen tilfælde se efter vores beskeder der." - #: templates/web/base/questionnaire/index.html:68 -#, fuzzy msgid "" "If you wish to leave a public update on the problem, please enter it here\n" "(please note it will not be sent to the council)." msgstr "" -"Hvis du ønsker at tilføje en offentlig kommentar pÃ¥ problemet, sÃ¥ tilføj den her\n" -"(denne bliver ikke sendt til myndigheden). Du kan for eksempel\n" -"dele din erfaring med hvordan dit problem blev løst." #: templates/web/base/admin/body.html:149 msgid "If you're using <strong>a send method that is not email</strong>, enter the service ID (Open311) or equivalent identifier here." @@ -1407,10 +1334,8 @@ msgstr "Ugyldigt valg af feed" #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:144 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:32 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:30 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:36 msgid "In Progress" msgstr "Under Udførelse" @@ -1418,7 +1343,7 @@ msgstr "Under Udførelse" msgid "In abuse table?" msgstr "I misbrugstabel?" -#: templates/web/base/open311/index.html:88 +#: templates/web/base/open311/index.html:80 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 "Yderligere bliver følgende attributter, som ikke er del af Open311 v2-specifikationen, returneret: agency_sent_datetime, title (ogsÃ¥ returneret som del af description), interface_used, comment_count, requestor_name (kun tilstede hvis indsender tillod at navnet kunne vises pÃ¥ dette netsted)." @@ -1426,7 +1351,7 @@ msgstr "Yderligere bliver følgende attributter, som ikke er del af Open311 v2-s #: perllib/FixMyStreet/Cobrand/Zurich.pm:963 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:7 -#: templates/web/fixmystreet/report/banner.html:19 +#: templates/web/base/report/banner.html:19 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:8 msgid "In progress" @@ -1461,7 +1386,7 @@ msgstr "Intern reference" msgid "Invalid agency_responsible value %s" msgstr "Ugyldig agency_responsible-værdi %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1201 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1210 msgid "Invalid end date" msgstr "Ugyldig slut-dato" @@ -1469,7 +1394,7 @@ msgstr "Ugyldig slut-dato" msgid "Invalid format %s specified." msgstr "Ugyldigt format %s angivet." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1206 msgid "Invalid start date" msgstr "Ugyldig startdato" @@ -1477,14 +1402,12 @@ msgstr "Ugyldig startdato" #: templates/web/base/admin/report_blocks.html:5 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:143 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:31 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:29 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:35 msgid "Investigating" msgstr "Undersøges" -#: templates/web/fixmystreet/contact/blurb.html:8 +#: templates/web/base/contact/blurb.html:8 msgid "It's often quickest to <a href=\"%s\">check our FAQs</a> and see if the answer is there." msgstr "Det er ofte hurtigst at <a href=\"%s\">tjekke vores FAQ</a> og se om svaret er der." @@ -1502,11 +1425,9 @@ msgstr "" msgid "Jurisdiction unknown" msgstr "" -#: templates/web/base/auth/general.html:44 -#: templates/web/base/report/new/fill_in_details_form.html:132 -#: templates/web/base/report/update-form.html:105 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:28 -#: templates/web/fixmystreet/report/update-form.html:102 +#: templates/web/base/auth/general.html:80 +#: templates/web/base/report/new/form_user_loggedout_password.html:16 +#: templates/web/base/report/update/form_user_loggedout_password.html:15 #: templates/web/zurich/auth/general.html:40 msgid "Keep me signed in on this computer" msgstr "Husk min indlogning pÃ¥ denne datamaskine" @@ -1564,6 +1485,7 @@ msgid "MAP" msgstr "KORT" #: templates/web/base/js/translation_strings.html:45 +#: templates/web/base/maps/google-ol.html:13 msgid "Map" msgstr "Kort" @@ -1583,23 +1505,17 @@ msgstr "Markeret som løst/lukket indenfor de seneste otte uger" msgid "Marked fixed/closed more than eight weeks ago" msgstr "Markeret som løst/lukket for mere end otte uger siden" -#: templates/web/fixmystreet/contact/index.html:106 +#: templates/web/base/contact/index.html:98 msgid "Message" msgstr "Besked" #: templates/web/zurich/admin/report_edit.html:284 -#, fuzzy msgid "Message to competent body:" -msgstr "Tildel til ekstern myndighed:" +msgstr "" #: templates/web/zurich/admin/report_edit.html:282 -#, fuzzy msgid "Message to external body:" -msgstr "Tildel til ekstern myndighed:" - -#: templates/web/base/contact/index.html:97 -msgid "Message:" -msgstr "Besked:" +msgstr "" #: perllib/FixMyStreet/App/Controller/Open311.pm:445 msgid "Missing jurisdiction_id" @@ -1613,10 +1529,6 @@ msgstr "Modereret af afdeling inden for en arbejdsdag" msgid "Month" msgstr "MÃ¥ned" -#: templates/web/base/report/display.html:34 -msgid "More problems nearby" -msgstr "Flere problemer i nærheden" - #: templates/web/base/admin/bodies.html:21 #: templates/web/base/admin/body-form.html:18 #: templates/web/base/admin/flagged.html:16 @@ -1624,11 +1536,11 @@ msgstr "Flere problemer i nærheden" #: templates/web/base/admin/list_updates.html:7 #: templates/web/base/admin/reports.html:13 #: templates/web/base/admin/users.html:15 -#: templates/web/base/auth/general.html:50 +#: templates/web/base/auth/general.html:89 +#: templates/web/base/report/new/form_user_loggedin.html:9 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:7 +#: templates/web/base/report/update/form_name.html:4 #: templates/web/base/reports/index.html:20 -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:9 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:44 -#: templates/web/fixmystreet/report/update-form.html:138 #: templates/web/zurich/admin/body-form.html:4 #: templates/web/zurich/auth/general.html:60 #: templates/web/zurich/report/new/fill_in_details_form.html:82 @@ -1642,7 +1554,7 @@ msgstr "Navn" msgid "Name:" msgstr "Navn:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:328 +#: perllib/FixMyStreet/Script/Reports.pm:107 msgid "Name: %s" msgstr "Navn: %s" @@ -1651,16 +1563,16 @@ msgstr "Navn: %s" msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s" msgstr "Nærmeste navngivne vej til nÃ¥len placeret pÃ¥ kortet (automatisk genereret ved hjælp af OpenStreetMap): %s%s" -#: perllib/FixMyStreet/Cobrand/UK.pm:127 +#: perllib/FixMyStreet/Cobrand/UK.pm:128 msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" msgstr "Nærmeste postnummer for nÃ¥len placeret pÃ¥ kortet (automatisk genereret): %s (%sm væk)" -#: perllib/FixMyStreet/Cobrand/Default.pm:434 -#: perllib/FixMyStreet/Cobrand/Default.pm:474 +#: perllib/FixMyStreet/Cobrand/Default.pm:455 +#: perllib/FixMyStreet/Cobrand/Default.pm:495 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "Nærmeste vej for nÃ¥len placeret pÃ¥ kortet (automatisk genereret ved hjælp af Bing Maps): %s" -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:267 +#: perllib/FixMyStreet/Script/Alerts.pm:290 msgid "" "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n" "\n" @@ -1668,14 +1580,9 @@ msgstr "" "Nærmeste vej for nÃ¥len placeret pÃ¥ kortet (automatisk genereret ved hjælp af Bing Maps) er: %s\n" "\n" -#: templates/web/zurich/email_sent.html:5 -msgid "Nearly Done! Now check your email..." -msgstr "Nesten færdig! Nu skal du tjekke din e-post..." - #: templates/web/base/auth/token.html:17 templates/web/base/email_sent.html:5 -#, fuzzy msgid "Nearly done! Now check your email…" -msgstr "Nesten færdig! Nu skal du tjekke din e-post..." +msgstr "" #: templates/web/base/reports/index.html:21 msgid "New <br>problems" @@ -1699,9 +1606,8 @@ msgid "New local problems on FixMyStreet" msgstr "Nye lokale problemer pÃ¥ FixMinVej" #: templates/web/zurich/admin/report_edit-sdm.html:117 -#, fuzzy msgid "New note to DM:" -msgstr "Nyt internt notat:" +msgstr "" #: db/alert_types.pl:38 msgid "New problems for {{COUNCIL}} within {{WARD}} ward on FixMyStreet" @@ -1733,9 +1639,8 @@ msgstr "Ny tilstand" #: templates/web/zurich/admin/template_edit.html:9 #: templates/web/zurich/admin/templates.html:26 -#, fuzzy msgid "New template" -msgstr "Ny tilstand" +msgstr "" #: templates/web/base/pagination.html:13 msgid "Next" @@ -1752,8 +1657,8 @@ msgstr "Næste" #: templates/web/base/admin/report_edit.html:75 #: templates/web/base/admin/update_edit.html:25 #: templates/web/base/questionnaire/creator_fixed.html:16 +#: templates/web/base/questionnaire/index.html:101 #: templates/web/base/questionnaire/index.html:53 -#: templates/web/base/questionnaire/index.html:92 msgid "No" msgstr "Nej" @@ -1824,10 +1729,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:13 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:33 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:31 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:37 msgid "Not Responsible" msgstr "Ikke ansvarlig" @@ -1835,9 +1738,8 @@ msgstr "Ikke ansvarlig" #: perllib/FixMyStreet/Cobrand/Zurich.pm:937 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:13 -#, fuzzy msgid "Not contactable" -msgstr "Ikke ansvarlig" +msgstr "" #: templates/web/zurich/admin/report_edit-sdm.html:108 msgid "Not for my subdivision" @@ -1867,7 +1769,7 @@ msgstr "Bemærk at nÃ¥r vi medtager ubekræftede rapporter sÃ¥ bruges datoen som msgid "Note:" msgstr "Bemærk:" -#: templates/web/base/open311/index.html:73 +#: templates/web/base/open311/index.html:65 msgid "Note: <strong>%s</strong>" msgstr "Note: <strong>%d</strong>" @@ -1875,13 +1777,15 @@ msgstr "Note: <strong>%d</strong>" msgid "Notes from SDM to DM" msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:113 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:10 +#: templates/web/base/report/new/form_user_loggedout.html:14 +#: templates/web/base/report/new/form_user_loggedout.html:2 +#: templates/web/base/report/new/oauth_email_form.html:17 msgid "Now to submit your report…" msgstr "PÃ¥ tide at sende din rapport…" -#: templates/web/base/report/update-form.html:86 -#: templates/web/fixmystreet/report/update-form.html:85 +#: templates/web/base/report/update-form.html:28 +#: templates/web/base/report/update/form_user_loggedout.html:13 +#: templates/web/base/report/update/form_user_loggedout.html:2 msgid "Now to submit your update…" msgstr "PÃ¥ tide at registrere din opdatering…" @@ -1889,11 +1793,6 @@ msgstr "PÃ¥ tide at registrere din opdatering…" msgid "OK" msgstr "OK" -#: templates/web/base/report/display.html:28 -#: templates/web/base/report/update.html:17 -msgid "Offensive? Unsuitable? Tell us" -msgstr "Stødende? Upassende? Giv os besked" - #: templates/web/base/reports/index.html:23 msgid "Old / unknown <br>problems" msgstr "Gamle / ukendte <br>problemer" @@ -1910,7 +1809,7 @@ msgstr "Ældre <br>løste" msgid "Older <br>problems" msgstr "Ældre <br>problemer" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:45 +#: templates/web/base/report/new/form_report.html:15 msgid "One-line summary" msgstr "Enlinjers opsummering" @@ -1921,8 +1820,7 @@ msgstr "Enlinjers opsummering" #: templates/web/base/admin/report_blocks.html:4 #: templates/web/base/admin/update_edit.html:28 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/report/update-form.html:30 -#: templates/web/fixmystreet/report/update-form.html:28 +#: templates/web/base/report/update/form_update.html:34 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:7 #: templates/web/zurich/admin/update_edit.html:18 @@ -1937,15 +1835,15 @@ msgstr "Ã…ben i mere end fire uger, med en opdatering inden for de seneste otte msgid "Open, but not had any update in eight weeks" msgstr "Ã…ben, men uden nogen opdatering i otte uger" -#: templates/web/base/open311/index.html:70 +#: templates/web/base/open311/index.html:62 msgid "Open311 API for the mySociety FixMyStreet server" msgstr "Open311-API for mySocietys FixMinVej-server" -#: templates/web/base/open311/index.html:80 +#: templates/web/base/open311/index.html:72 msgid "Open311 initiative web page" msgstr "Open311-initiativets netside" -#: templates/web/base/open311/index.html:81 +#: templates/web/base/open311/index.html:73 msgid "Open311 specification" msgstr "Open311-specifikation" @@ -1957,15 +1855,15 @@ msgstr "Eller problemer meldt til:" msgid "Or you can subscribe to an alert based upon what ward or council you’re in:" msgstr "Eller du kan abonnere pÃ¥ varsel baseret pÃ¥ bydel eller myndighed du hører ind under:" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1084 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:673 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:674 -#: perllib/FixMyStreet/DB/Result/Problem.pm:570 -#: perllib/FixMyStreet/DB/Result/Problem.pm:580 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1055 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:669 +#: perllib/FixMyStreet/DB/Result/Problem.pm:558 +#: perllib/FixMyStreet/DB/Result/Problem.pm:568 +#: perllib/FixMyStreet/DB/Result/Problem.pm:578 #: perllib/FixMyStreet/DB/Result/Problem.pm:590 -#: perllib/FixMyStreet/DB/Result/Problem.pm:602 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:397 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:412 +#: perllib/FixMyStreet/Script/Reports.pm:175 +#: perllib/FixMyStreet/Script/Reports.pm:190 msgid "Other" msgstr "Andet" @@ -1974,7 +1872,7 @@ msgid "Owner" msgstr "Ejer" #: templates/web/base/errors/page_error_404_not_found.html:1 -#: templates/web/base/errors/page_error_404_not_found.html:3 +#: templates/web/base/errors/page_error_404_not_found.html:4 msgid "Page Not Found" msgstr "Fandt ikke siden" @@ -1988,16 +1886,16 @@ msgstr "Forælder" msgid "Partial" msgstr "Delvis" -#: templates/web/base/auth/general.html:53 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:68 -#: templates/web/fixmystreet/report/update-form.html:116 +#: templates/web/base/auth/general.html:92 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:31 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:6 #: templates/web/zurich/auth/general.html:32 #: templates/web/zurich/auth/general.html:63 msgid "Password (optional)" msgstr "Adgangskode (valgfrit)" #: templates/web/base/auth/change_password.html:25 -#: templates/web/base/auth/general.html:36 +#: templates/web/base/auth/general.html:72 msgid "Password:" msgstr "Adgangskode:" @@ -2009,45 +1907,37 @@ msgstr "Permalink" msgid "Phone number" msgstr "Telefonnummer" -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:26 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:62 +#: templates/web/base/report/new/form_user_loggedin.html:26 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:25 msgid "Phone number (optional)" msgstr "Telefonnummer (valgfrit)" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:306 +#: perllib/FixMyStreet/Script/Reports.pm:83 #: templates/web/base/admin/report_edit.html:63 -#: templates/web/base/report/new/fill_in_details_form.html:198 #: templates/web/zurich/admin/stats.html:39 msgid "Phone:" msgstr "Telefon:" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:66 -#: templates/web/fixmystreet/report/update-form.html:59 +#: templates/web/base/questionnaire/index.html:75 +#: templates/web/base/report/new/form_report.html:23 +#: templates/web/base/report/update/form_update.html:6 #: templates/web/zurich/admin/index-dm.html:29 #: templates/web/zurich/admin/index-sdm.html:24 #: templates/web/zurich/admin/reports.html:16 #: templates/web/zurich/admin/stats.html:37 -#: templates/web/zurich/report/new/fill_in_details_form.html:52 +#: templates/web/zurich/report/new/fill_in_details_form.html:45 msgid "Photo" msgstr "Billed" -#: perllib/FixMyStreet/App/Controller/Photo.pm:221 -#, fuzzy +#: perllib/FixMyStreet/App/Controller/Photo.pm:187 msgid "Photo is required." -msgstr "Denne information er pÃ¥krævet" +msgstr "" #: templates/web/base/admin/category_edit.html:48 -#, fuzzy msgid "Photo required" -msgstr "Denne information er pÃ¥krævet" - -#: templates/web/base/questionnaire/index.html:80 -#: templates/web/base/report/new/fill_in_details_form.html:84 -#: templates/web/base/report/update-form.html:62 -msgid "Photo:" -msgstr "Billed:" +msgstr "" -#: templates/web/base/alert/list.html:26 +#: templates/web/base/alert/list.html:23 msgid "Photos of recent nearby reports" msgstr "Billeder af nye problemer i nærheden" @@ -2076,20 +1966,16 @@ msgstr "Vær høflig, præcis og kortfattet." msgid "Please check the passwords and try again" msgstr "Venligst kontrollér adgangskoderne og prøv igen" -#: templates/web/zurich/auth/token.html:16 -msgid "Please check your email" -msgstr "Venligst kontrollér e-posten du angav" - -#: templates/web/base/auth/general.html:10 -#: templates/web/base/auth/general.html:16 +#: templates/web/base/auth/general.html:27 +#: templates/web/base/auth/general.html:33 #: templates/web/zurich/auth/general.html:3 #: templates/web/zurich/auth/general.html:9 msgid "Please check your email address is correct" msgstr "Venligst kontrollér at du har skrevet en gyldig e-postadresse" #: perllib/FixMyStreet/App/Controller/Admin.pm:343 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:883 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:948 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:878 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:943 #: perllib/FixMyStreet/DB/Result/Problem.pm:412 #: templates/web/base/js/translation_strings.html:9 msgid "Please choose a category" @@ -2103,28 +1989,29 @@ msgstr "Vælg en type egenskab" msgid "Please correct the errors below" msgstr "Husk at rette op pÃ¥ fejlene nedenfor." -#: templates/web/base/contact/blurb.html:2 -#: templates/web/fixmystreet/contact/blurb.html:12 -#, fuzzy +#: templates/web/base/contact/blurb.html:12 msgid "" "Please do <strong>not</strong> report problems through this form; messages go to\n" "the team behind this site, not a council. To report a problem,\n" "please <a href=\"/\">go to the front page</a> and follow the instructions." msgstr "" -"Venligst <strong>ikke</strong> rapportér fejl via denne side; beskederne gÃ¥r til\n" -"gruppen som stÃ¥r bag FixMinVej, og ikke til en myndighed. For at rapportere et problem\n" -"sÃ¥ <a href=\"/\">gÃ¥ til forsiden</a> og følg instruktionene." #: templates/web/base/report/new/notes.html:6 msgid "Please do not be abusive — abusing your council devalues the service for all users." msgstr "Vær ikke ufin — at skælde ud pÃ¥ din myndighed skader værdien af tjenesten for alle brugerne." #: perllib/FixMyStreet/App/Controller/Admin.pm:346 -#: perllib/FixMyStreet/DB/Result/Comment.pm:126 +#: perllib/FixMyStreet/DB/Result/Comment.pm:125 #: templates/web/base/js/translation_strings.html:2 msgid "Please enter a message" msgstr "Venligst indlæg en besked" +#: perllib/FixMyStreet/App/Controller/Admin.pm:1091 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1146 +#, fuzzy +msgid "Please enter a name" +msgstr "Angiv dit navn" + #: templates/web/base/auth/change_password.html:12 #: templates/web/base/auth/change_password.html:15 #: templates/web/base/js/translation_strings.html:19 @@ -2137,10 +2024,10 @@ msgstr "Indtast en adgangskode" msgid "Please enter a subject" msgstr "Venligst angiv et emne" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1084 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1137 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1087 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1142 #: perllib/FixMyStreet/App/Controller/Admin.pm:345 -#: perllib/FixMyStreet/DB/Result/User.pm:127 +#: perllib/FixMyStreet/DB/Result/User.pm:133 #: templates/web/base/js/translation_strings.html:12 #: templates/web/base/js/translation_strings.html:16 msgid "Please enter a valid email" @@ -2157,9 +2044,9 @@ msgid "Please enter some details" msgstr "Angiv oplysninger om problemet" #: perllib/FixMyStreet/App/Controller/Contact.pm:113 -#: perllib/FixMyStreet/DB/Result/User.pm:124 -#: templates/web/base/auth/general.html:10 -#: templates/web/base/auth/general.html:15 +#: perllib/FixMyStreet/DB/Result/User.pm:130 +#: templates/web/base/auth/general.html:27 +#: templates/web/base/auth/general.html:32 #: templates/web/base/js/translation_strings.html:11 #: templates/web/base/js/translation_strings.html:15 #: templates/web/zurich/auth/general.html:3 @@ -2167,7 +2054,7 @@ msgstr "Angiv oplysninger om problemet" msgid "Please enter your email" msgstr "Angiv din e-post" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:7 +#: templates/web/base/report/new/form_user_loggedout_email.html:7 #: templates/web/zurich/report/new/fill_in_details_form.html:80 msgid "Please enter your email address" msgstr "Venligst angiv din e-postadresse" @@ -2176,15 +2063,15 @@ msgstr "Venligst angiv din e-postadresse" msgid "Please enter your first name" msgstr "Venligst angiv dit fornavn" -#: perllib/FixMyStreet/Cobrand/UK.pm:318 +#: perllib/FixMyStreet/Cobrand/UK.pm:319 #: templates/web/base/js/translation_strings.html:7 msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below" msgstr "Venligst angiv dit fulde navn, myndigheder som modtager dit problem har brug for dette - hvis du ikke ønsker at dit navn skal vises, sÃ¥ fjern hakket nedenfor" #: perllib/FixMyStreet/App/Controller/Contact.pm:112 -#: perllib/FixMyStreet/DB/Result/Comment.pm:123 +#: perllib/FixMyStreet/DB/Result/Comment.pm:122 #: perllib/FixMyStreet/DB/Result/Problem.pm:406 -#: perllib/FixMyStreet/DB/Result/User.pm:120 +#: perllib/FixMyStreet/DB/Result/User.pm:126 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter your name" msgstr "Angiv dit navn" @@ -2211,12 +2098,11 @@ msgstr "Du kan ogsÃ¥ <a href=\"%s\">logge ind igen</a> eller gÃ¥ tilbage til <a msgid "Please fill in details of the problem below." msgstr "Venligst udfyld detaljer om problemet nedenfor" -#: templates/web/zurich/report/new/fill_in_details_form.html:46 +#: templates/web/zurich/report/new/fill_in_details_form.html:72 msgid "Please fill in details of the problem." msgstr "Venligst udfyld detaljer om problemet." -#: templates/web/base/report/new/fill_in_details_form.html:28 -#: templates/web/fixmystreet/report/new/sidebar.html:7 +#: templates/web/base/report/new/sidebar.html:7 #: templates/web/zurich/report/new/fill_in_details_form.html:20 msgid "Please fill in the form below with details of the problem, and describe the location as precisely as possible in the details box." msgstr "" @@ -2227,20 +2113,24 @@ msgstr "" msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "Venligst indikér om du ønsker at modtage et nyt spørgeskema" -#: templates/web/fixmystreet/report/updates-sidebar-notes.html:4 +#: templates/web/base/report/updates-sidebar-notes.html:2 msgid "Please note that updates are not sent to the council." msgstr "Vær opmærksom pÃ¥ at opdateringer ikke bliver videresendt til myndigheden." -#: templates/web/base/report/update-form.html:7 -msgid "Please note that updates are not sent to the council. If you leave your name it will be public. Your information will only be used in accordance with our <a href=\"/faq#privacy\">privacy policy</a>" -msgstr "Venligst bemærk at opdateringer ikke bliver sendt til myndigheden. Hvis du vedlægger dit navnet sÃ¥ vil det være offentlig tilgængeligt. Din information vil kun blive brugt i henhold til vores <a href=\"/faq#privacy\">privatlivspolicy</a>" +#: templates/web/base/report/new/oauth_email_form.html:4 +#, fuzzy +msgid "Please note your report has <strong>not yet been sent</strong>." +msgstr "Bemærk at din rapport <strong>endnu ikke er sendt</strong. Vælg en kategori og tilføj mere information nedenfor før du sender den ind." -#: templates/web/base/report/new/fill_in_details_form.html:8 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:21 +#: templates/web/base/report/new/fill_in_details_form.html:20 #: templates/web/zurich/report/new/fill_in_details_form.html:11 msgid "Please note your report has <strong>not yet been sent</strong>. Choose a category and add further information below, then submit." msgstr "Bemærk at din rapport <strong>endnu ikke er sendt</strong. Vælg en kategori og tilføj mere information nedenfor før du sender den ind." +#: templates/web/base/report/display.html:26 +msgid "Please note your update has <strong>not yet been posted</strong>." +msgstr "" + #: templates/web/base/report/new/notes.html:1 #: templates/web/zurich/report/new/notes.html:1 msgid "Please note:" @@ -2260,9 +2150,8 @@ msgid "Please say whether you've ever reported a problem to your council before" msgstr "Venligst oplys om du har rapporteret et problem til din myndighed tidligere" #: templates/web/zurich/admin/report_edit.html:208 -#, fuzzy msgid "Please select a body." -msgstr "Vælg en myndighed" +msgstr "" #: perllib/FixMyStreet/App/Controller/Alert.pm:80 msgid "Please select the feed you want" @@ -2279,6 +2168,7 @@ msgstr "Venligs angiv om dette problem er blevet fikset eller ikke" #: perllib/FixMyStreet/App/Model/PhotoSet.pm:117 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:145 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:147 +#: templates/web/base/js/translation_strings.html:53 msgid "Please upload a JPEG image only" msgstr "Venligst læg kun JPEG-bilder op" @@ -2286,18 +2176,14 @@ msgstr "Venligst læg kun JPEG-bilder op" msgid "Please write a message" msgstr "Indtast en besked" -#: templates/web/fixmystreet/report/update-form.html:23 +#: templates/web/base/report/update/form_update.html:29 msgid "Please write your update here" msgstr "Indtast venligst din opdatering her" -#: templates/web/base/contact/index.html:100 -#: templates/web/base/report/update-form.html:110 -#: templates/web/base/report/update-form.html:132 -#: templates/web/base/report/update-form.html:72 -#: templates/web/fixmystreet/contact/index.html:113 -#: templates/web/fixmystreet/report/update-form.html:124 -#: templates/web/fixmystreet/report/update-form.html:71 -#: templates/web/fixmystreet/report/update-form.html:97 +#: templates/web/base/contact/index.html:105 +#: templates/web/base/report/update-form.html:24 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:14 +#: templates/web/base/report/update/form_user_loggedout_password.html:10 msgid "Post" msgstr "Indsend" @@ -2325,12 +2211,9 @@ msgstr "Forrige" msgid "Privacy" msgstr "Personliv" -#: templates/web/base/faq/faq-en-gb.html:7 -#: templates/web/base/open311/index.html:7 -#: templates/web/base/static/privacy.html:1 -#: templates/web/base/static/privacy.html:2 -#: templates/web/base/static/privacy.html:9 -#: templates/web/fixmystreet/contact/index.html:11 +#: templates/web/base/about/_sidebar.html:5 +#: templates/web/base/about/privacy.html:1 +#: templates/web/base/about/privacy.html:2 msgid "Privacy and cookies" msgstr "" @@ -2358,12 +2241,12 @@ msgstr "Problem %s bekræftet" msgid "Problem %s sent to council %s" msgstr "Problem %s sendt til myndighed %s" -#: templates/web/base/admin/index.html:46 +#: templates/web/base/admin/index.html:39 #: templates/web/zurich/admin/index.html:9 msgid "Problem breakdown by state" msgstr "Tilstandsfordeling af problemer" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1055 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1058 msgid "Problem marked as open." msgstr "Problem markeret som Ã¥bent." @@ -2379,11 +2262,11 @@ msgstr "Problemer" msgid "Problems in this area" msgstr "Problemer i dette omrÃ¥de" -#: templates/web/fixmystreet/report/display.html:43 +#: templates/web/base/report/display_tools.html:19 msgid "Problems nearby" msgstr "Problemer i nærheden" -#: templates/web/fixmystreet/report/display.html:41 +#: templates/web/base/report/display_tools.html:17 msgid "Problems on the map" msgstr "Problemer pÃ¥ kortet" @@ -2395,24 +2278,23 @@ msgstr "Problemer nyligt rapporteret fikset pÃ¥ FixMinVej" msgid "Problems within %.1fkm of this location" msgstr "Problemer indenfor %.1fkm fra denne positionen" -#: perllib/FixMyStreet/Cobrand/Default.pm:642 +#: perllib/FixMyStreet/Cobrand/Default.pm:663 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:120 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:139 -#: perllib/FixMyStreet/Cobrand/UK.pm:207 +#: perllib/FixMyStreet/Cobrand/UK.pm:208 msgid "Problems within %s" msgstr "Problemer indenfor %s" #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:128 -#: perllib/FixMyStreet/Cobrand/UK.pm:221 +#: perllib/FixMyStreet/Cobrand/UK.pm:222 msgid "Problems within %s ward" msgstr "Problemer indenfor %s bydel" #. ("First %s is the body name, second %s the site name") #: templates/web/base/reports/body.html:0 #: templates/web/base/reports/body.html:24 -#, fuzzy msgid "Problems within %s, %s" -msgstr "Problemer indenfor %s" +msgstr "" #: templates/web/base/alert/_list.html:42 msgid "Problems within the boundary of:" @@ -2426,19 +2308,16 @@ msgstr "Ejendomsadresse:" msgid "Property type:" msgstr "Type egenskab:" -#: templates/web/base/report/update-form.html:3 -#: templates/web/fixmystreet/report/update-form.html:4 +#: templates/web/base/report/update-form.html:6 msgid "Provide an update" msgstr "Bidrag med en opdatering" -#: templates/web/base/auth/general.html:56 +#: templates/web/base/auth/general.html:95 msgid "Providing a name and password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." msgstr "Det er valgfrit at angive navn og adgangskode, men hvis du gør det kan du nemmere rapportere problemer, lave opdateringer og hÃ¥ndtere dine rapporter." -#: templates/web/base/report/new/fill_in_details_form.html:156 -#: templates/web/base/report/update-form.html:129 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:71 -#: templates/web/fixmystreet/report/update-form.html:119 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:34 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:9 msgid "Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." msgstr "Det er valgfrit at angive en adgangskode, men hvis du gør det vil det blive nemmere for dig at rapportere problemer, lave opdateringer og hÃ¥ndtere dine rapporter" @@ -2474,18 +2353,17 @@ msgstr "Spørgeskema udfyldt af fejlrapportøren" #: templates/web/base/alert/_list.html:22 #: templates/web/base/around/display_location.html:1 #: templates/web/base/around/display_location.html:3 -#: templates/web/base/report/display.html:50 +#: templates/web/base/report/display_tools.html:34 #: templates/web/base/reports/_rss.html:1 #: templates/web/fixmystreet/alert/updates.html:9 -#: templates/web/fixmystreet/report/display.html:58 msgid "RSS feed" msgstr "RSS-strøm" -#: perllib/FixMyStreet/Cobrand/UK.pm:250 perllib/FixMyStreet/Cobrand/UK.pm:262 +#: perllib/FixMyStreet/Cobrand/UK.pm:251 perllib/FixMyStreet/Cobrand/UK.pm:263 msgid "RSS feed for %s" msgstr "RSS-strøm for %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:256 perllib/FixMyStreet/Cobrand/UK.pm:268 +#: perllib/FixMyStreet/Cobrand/UK.pm:257 perllib/FixMyStreet/Cobrand/UK.pm:269 msgid "RSS feed for %s ward, %s" msgstr "RSS-strøm for %s bydel, %s" @@ -2493,11 +2371,11 @@ msgstr "RSS-strøm for %s bydel, %s" #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:163 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:173 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:181 -#: perllib/FixMyStreet/Cobrand/UK.pm:276 perllib/FixMyStreet/Cobrand/UK.pm:288 +#: perllib/FixMyStreet/Cobrand/UK.pm:277 perllib/FixMyStreet/Cobrand/UK.pm:289 msgid "RSS feed of %s" msgstr "RSS-strøm fra %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:281 perllib/FixMyStreet/Cobrand/UK.pm:293 +#: perllib/FixMyStreet/Cobrand/UK.pm:282 perllib/FixMyStreet/Cobrand/UK.pm:294 msgid "RSS feed of %s, within %s ward" msgstr "RSS-strøm af %s, indenfor %s bydel" @@ -2509,15 +2387,15 @@ msgstr "RSS-strøm med problemer i nærheden" msgid "RSS feed of problems in this %s" msgstr "RSS-strøm for problemer i denne %s" -#: perllib/FixMyStreet/Cobrand/Default.pm:643 +#: perllib/FixMyStreet/Cobrand/Default.pm:664 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:121 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:138 -#: perllib/FixMyStreet/Cobrand/UK.pm:214 +#: perllib/FixMyStreet/Cobrand/UK.pm:215 msgid "RSS feed of problems within %s" msgstr "RSS-strøm for problemer indenfor %s" #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:127 -#: perllib/FixMyStreet/Cobrand/UK.pm:220 +#: perllib/FixMyStreet/Cobrand/UK.pm:221 msgid "RSS feed of problems within %s ward" msgstr "RSS-strøm for problemer indenfor %s bydel" @@ -2526,25 +2404,22 @@ msgstr "RSS-strøm for problemer indenfor %s bydel" msgid "RSS feed of recent local problems" msgstr "RSS-strøm med nylige lokale problemer" -#: templates/web/base/report/display.html:50 +#: templates/web/base/report/display_tools.html:34 #: templates/web/fixmystreet/alert/updates.html:9 -#: templates/web/fixmystreet/report/display.html:58 msgid "RSS feed of updates to this problem" msgstr "RSS-strøm med opdateringer for dette problem" #: templates/web/base/alert/updates.html:9 -#: templates/web/base/report/display.html:41 +#: templates/web/base/report/display_tools.html:36 #: templates/web/fixmystreet/alert/updates.html:14 -#: templates/web/fixmystreet/report/display.html:60 msgid "Receive email when updates are left on this problem." msgstr "Modtag e-post nÃ¥r der er opdateringer pÃ¥ dette problem" #. ("%s is the site name") #: templates/web/base/around/display_location.html:0 #: templates/web/base/around/display_location.html:33 -#, fuzzy msgid "Recent local problems, %s" -msgstr "Nylige lokale problemer, FixMinVej." +msgstr "" #: templates/web/base/reports/index.html:24 msgid "Recently <br>fixed" @@ -2562,16 +2437,15 @@ msgstr "Husk at FixMinVej primært er lavet for at rapportere fysiske problemer msgid "Remove flag" msgstr "Fjern markering" -#: templates/web/base/admin/report_edit.html:92 -#: templates/web/base/admin/update_edit.html:62 +#: templates/web/base/admin/report_edit.html:93 +#: templates/web/base/admin/update_edit.html:67 #: templates/web/zurich/admin/update_edit.html:35 msgid "Remove photo (can't be undone!)" msgstr "Fjern billede (kan ikke fortrydes!)" #: templates/web/zurich/admin/report_edit.html:243 -#, fuzzy msgid "Reply to user:" -msgstr "redigér bruger" +msgstr "" #: templates/web/fixmystreet/header_logo.html:2 msgid "Report" @@ -2584,7 +2458,7 @@ msgstr "Rapport" msgid "Report a problem" msgstr "Rapportér et problem" -#: templates/web/fixmystreet/report/display.html:32 +#: templates/web/base/report/display_tools.html:8 msgid "Report abuse" msgstr "Rapportér misbrug" @@ -2593,7 +2467,8 @@ msgid "Report on %s" msgstr "Rapport pÃ¥ %s" #: templates/web/base/report/new/fill_in_details_form.html:1 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:2 +#: templates/web/base/report/new/login_success_form.html:1 +#: templates/web/base/report/new/oauth_email_form.html:1 msgid "Report your problem" msgstr "Rapportér dit problem" @@ -2602,9 +2477,8 @@ msgstr "Rapportér dit problem" msgid "Report, view, or discuss local problems" msgstr "Rapportér, find eller diskutér lokale problemer" -#: perllib/FixMyStreet/DB/Result/Problem.pm:585 -#: templates/web/base/contact/index.html:50 -#: templates/web/fixmystreet/contact/index.html:65 +#: perllib/FixMyStreet/DB/Result/Problem.pm:573 +#: templates/web/base/contact/index.html:57 msgid "Reported anonymously at %s" msgstr "Rapporteret anonymt %s" @@ -2613,43 +2487,41 @@ msgstr "Rapporteret anonymt %s" msgid "Reported before" msgstr "Rapporteret tidligere" -#: perllib/FixMyStreet/DB/Result/Problem.pm:608 -#: templates/web/base/contact/index.html:52 -#: templates/web/fixmystreet/contact/index.html:67 +#: perllib/FixMyStreet/DB/Result/Problem.pm:596 +#: templates/web/base/contact/index.html:59 msgid "Reported by %s at %s" msgstr "Publiceret af %s %s" #: templates/web/zurich/admin/report_edit-sdm.html:58 #: templates/web/zurich/admin/report_edit.html:86 -#, fuzzy msgid "Reported by:" -msgstr "Rapporteret %s" +msgstr "" #: templates/web/zurich/report/_main.html:2 msgid "Reported in the %s category" msgstr "Rapporteret i kategorien %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:581 +#: perllib/FixMyStreet/DB/Result/Problem.pm:569 msgid "Reported in the %s category anonymously at %s" msgstr "Rapporteret i kategorien %s anonymt %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:603 +#: perllib/FixMyStreet/DB/Result/Problem.pm:591 msgid "Reported in the %s category by %s at %s" msgstr "Rapporteret i kategorien %s af %s %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:577 +#: perllib/FixMyStreet/DB/Result/Problem.pm:565 msgid "Reported via %s anonymously at %s" msgstr "Publiceret af %s anonymt %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:599 +#: perllib/FixMyStreet/DB/Result/Problem.pm:587 msgid "Reported via %s by %s at %s" msgstr "Rapporteret af %s af %s %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:573 +#: perllib/FixMyStreet/DB/Result/Problem.pm:561 msgid "Reported via %s in the %s category anonymously at %s" msgstr "Rapporteret af %s i kategorien %s anonymt %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:593 +#: perllib/FixMyStreet/DB/Result/Problem.pm:581 msgid "Reported via %s in the %s category by %s at %s" msgstr "Rapporteret af %s i kategorien %s af %s %s" @@ -2659,9 +2531,8 @@ msgstr "Rapporteret inden for de seneste fire uger" #: templates/web/zurich/admin/report_edit-sdm.html:36 #: templates/web/zurich/admin/report_edit.html:55 -#, fuzzy msgid "Reported:" -msgstr "Rapporteret %s" +msgstr "" #: templates/web/base/around/index.html:2 #: templates/web/base/js/translation_strings.html:41 @@ -2671,13 +2542,13 @@ msgstr "Rapporteret %s" msgid "Reporting a problem" msgstr "Rapporterer et problem" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1277 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1286 #: perllib/FixMyStreet/Cobrand/Zurich.pm:384 #: templates/web/zurich/header.html:60 msgid "Reports" msgstr "Rapporter" -#: perllib/FixMyStreet/Cobrand/UK.pm:327 perllib/FixMyStreet/Cobrand/UK.pm:331 +#: perllib/FixMyStreet/Cobrand/UK.pm:328 perllib/FixMyStreet/Cobrand/UK.pm:332 msgid "Reports are limited to %s characters in length. Please shorten your report" msgstr "Rapporterne begrænses til %s tegn. Rapporten skal forkortes." @@ -2714,15 +2585,17 @@ msgstr "Vejoperatør for denne navngivne vej (udledt af vejens referencenummer o msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "Vejoperatør for denne navngivne vej (fra OpenStreetMap): %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1495 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1500 -#: templates/web/base/admin/report_edit.html:88 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1508 +#: templates/web/base/admin/report_edit.html:90 +#: templates/web/base/admin/update_edit.html:64 #: templates/web/zurich/admin/report_edit.html:116 msgid "Rotate Left" msgstr "Rotér til venstre" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1495 -#: templates/web/base/admin/report_edit.html:89 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 +#: templates/web/base/admin/report_edit.html:91 +#: templates/web/base/admin/update_edit.html:65 #: templates/web/zurich/admin/report_edit.html:117 msgid "Rotate Right" msgstr "Rotér til højre" @@ -2732,7 +2605,6 @@ msgid "Rotating this photo will discard unsaved changes to the report." msgstr "" #: templates/web/base/js/translation_strings.html:46 -#: templates/web/base/maps/google-ol.html:13 msgid "Satellite" msgstr "Satelit" @@ -2785,16 +2657,14 @@ msgid "Select an area" msgstr "Vælg et omrÃ¥de" #: templates/web/base/alert/_list.html:10 -#, fuzzy msgid "Select which type of alert you’d like and click the button for an RSS feed, or enter your email address to subscribe to an email alert." -msgstr "Vælg hvilken type varsel du ønsker og klik pÃ¥ knappen for en RSS-kilde, eller indtast din e-postadresse for at abonnere pÃ¥ et e-postvarsel." +msgstr "" #: perllib/FixMyStreet/Cobrand/Zurich.pm:835 -#, fuzzy msgid "Sent report back" -msgstr "Ã…bne rapporter" +msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:708 +#: perllib/FixMyStreet/DB/Result/Problem.pm:696 msgid "Sent to %s %s later" msgstr "Sendt til %s %s senere" @@ -2807,15 +2677,13 @@ msgstr "Sendt:" msgid "Service:" msgstr "Tjeneste:" -#: templates/web/fixmystreet/report/display.html:38 +#: templates/web/base/report/display_tools.html:14 msgid "Share" msgstr "Del" -#: templates/web/base/report/new/fill_in_details_form.html:193 -#: templates/web/base/report/update-form.html:158 -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:23 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:59 -#: templates/web/fixmystreet/report/update-form.html:146 +#: templates/web/base/report/new/form_user_loggedin.html:23 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:22 +#: templates/web/base/report/update/form_name.html:15 msgid "Show my name publicly" msgstr "Vis mit navn offentligt" @@ -2827,9 +2695,9 @@ msgstr "Vis gamle" msgid "Show pins" msgstr "Vis nÃ¥le" +#: templates/web/base/auth/general.html:100 #: templates/web/base/auth/general.html:3 -#: templates/web/base/auth/general.html:40 -#: templates/web/base/auth/general.html:61 +#: templates/web/base/auth/general.html:76 #: templates/web/zurich/auth/general.html:18 #: templates/web/zurich/auth/general.html:35 msgid "Sign in" @@ -2859,7 +2727,7 @@ msgstr "" "</strong> for at indikere at rapporterne bliver sendt\n" "fra din FixMinVej installation." -#: templates/web/base/alert/index.html:42 +#: templates/web/base/alert/index.html:40 msgid "Some photos of recent reports" msgstr "Nogen billeder af nylig meldte problemer" @@ -2869,7 +2737,7 @@ msgstr "Nogen billeder af nylig meldte problemer" msgid "Some text to localize" msgstr "Noget tekst at oversætte" -#: perllib/FixMyStreet/Cobrand/UK.pm:78 +#: perllib/FixMyStreet/Cobrand/UK.pm:79 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover." msgstr "Beklager det ser ud til at være et \"Crown dependency\"-postnummer, som vi ikke dækker." @@ -2881,23 +2749,34 @@ msgstr "" msgid "Sorry, there has been an error confirming your problem." msgstr "Beklager, men der opstod et problem nÃ¥r vi forsøgte at bekræfte din problemrapport" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:221 -#: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:37 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:216 +#: perllib/FixMyStreet/Geocode.pm:38 perllib/FixMyStreet/Geocode/Bing.pm:38 #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:56 #: perllib/FixMyStreet/Geocode/OSM.pm:48 msgid "Sorry, we could not find that location." msgstr "Beklager, men vi kunne ikke finde dette sted." -#: perllib/FixMyStreet/Geocode/Bing.pm:34 +#: templates/web/base/auth/general.html:9 +#: templates/web/base/report/display.html:21 +#: templates/web/base/report/new/fill_in_details_form.html:23 +#, fuzzy +msgid "Sorry, we could not log you in. Please fill in the form below." +msgstr "Beklager, men vi kunne ikke tolke den position. Prøv venligst igen." + +#: perllib/FixMyStreet/Geocode/Bing.pm:35 #: perllib/FixMyStreet/Geocode/Google.pm:45 #: perllib/FixMyStreet/Geocode/Zurich.pm:88 msgid "Sorry, we could not parse that location. Please try again." msgstr "Beklager, men vi kunne ikke tolke den position. Prøv venligst igen." #: perllib/FixMyStreet/App/Model/PhotoSet.pm:134 -#, fuzzy msgid "Sorry, we couldn't save your image(s), please try again." -msgstr "Beklager, men vi kunne ikke tolke den position. Prøv venligst igen." +msgstr "" + +#: perllib/FixMyStreet/App/Controller/AuthSS.pm:301 +#, fuzzy +msgid "Sorry, you can not log in with Facebook. Please try again later." +msgstr "Der var problemer med at vise denne side. Venligst prøv igen senere." #: templates/web/base/admin/stats.html:64 msgid "Start Date:" @@ -2907,13 +2786,12 @@ msgstr "Start-dato:" #: templates/web/base/admin/flagged.html:18 #: templates/web/base/admin/list_updates.html:11 #: templates/web/base/admin/reports.html:15 -#: templates/web/fixmystreet/report/update-form.html:26 +#: templates/web/base/report/update/form_update.html:32 msgid "State" msgstr "Tilstand" #: templates/web/base/admin/report_edit.html:47 #: templates/web/base/admin/update_edit.html:27 -#: templates/web/base/report/update-form.html:28 #: templates/web/zurich/admin/report_edit-sdm.html:73 #: templates/web/zurich/admin/report_edit.html:101 #: templates/web/zurich/admin/report_edit.html:155 @@ -2921,7 +2799,7 @@ msgstr "Tilstand" msgid "State:" msgstr "Tilstand:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1282 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1291 #: perllib/FixMyStreet/Cobrand/Zurich.pm:387 #: templates/web/base/admin/stats.html:1 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:73 @@ -2943,7 +2821,7 @@ msgstr "Fortsat Ã¥ben via spørgeskema, %s" msgid "Street View" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:406 +#: perllib/FixMyStreet/Script/Reports.pm:184 msgid "Subcategory: %s" msgstr "Underkategori: %s" @@ -2951,30 +2829,25 @@ msgstr "Underkategori: %s" msgid "Subdivision/Body" msgstr "Underafdeling/myndighed" -#: templates/web/fixmystreet/contact/index.html:98 +#: templates/web/base/contact/index.html:90 msgid "Subject" msgstr "Emne" #: templates/web/base/admin/report_edit.html:19 -#: templates/web/base/contact/index.html:88 -#: templates/web/base/report/new/fill_in_details_form.html:53 #: templates/web/zurich/admin/report_edit.html:39 msgid "Subject:" msgstr "Emne:" #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/fill_in_details_form.html:137 -#: templates/web/base/report/new/fill_in_details_form.html:159 -#: templates/web/base/report/new/fill_in_details_form.html:96 -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:36 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:23 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:76 +#: templates/web/base/report/new/form_user_loggedin.html:36 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:39 +#: templates/web/base/report/new/form_user_loggedout_password.html:11 #: templates/web/zurich/report/new/fill_in_details_form.html:96 msgid "Submit" msgstr "Send ind" -#: templates/web/base/admin/report_edit.html:95 -#: templates/web/base/admin/update_edit.html:65 +#: templates/web/base/admin/report_edit.html:101 +#: templates/web/base/admin/update_edit.html:75 #: templates/web/base/admin/user-form.html:56 #: templates/web/zurich/admin/report_edit-sdm.html:137 #: templates/web/zurich/admin/report_edit.html:268 @@ -2982,7 +2855,7 @@ msgstr "Send ind" msgid "Submit changes" msgstr "Indsend ændringer" -#: templates/web/base/questionnaire/index.html:97 +#: templates/web/base/questionnaire/index.html:106 msgid "Submit questionnaire" msgstr "Indsend spørgeskema" @@ -2998,9 +2871,8 @@ msgid "Submitted" msgstr "Sendt ind" #: templates/web/base/alert/updates.html:17 -#: templates/web/base/report/display.html:46 +#: templates/web/base/report/display_tools.html:41 #: templates/web/fixmystreet/alert/updates.html:23 -#: templates/web/fixmystreet/report/display.html:65 msgid "Subscribe" msgstr "Abonnér" @@ -3008,7 +2880,7 @@ msgstr "Abonnér" msgid "Subscribe me to an email alert" msgstr "Jeg ønsker at abonnere pÃ¥ e-postvarsel" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1275 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1284 #: perllib/FixMyStreet/Cobrand/Zurich.pm:383 #: templates/web/base/admin/bodies.html:25 #: templates/web/base/admin/index.html:1 @@ -3027,7 +2899,7 @@ msgstr "Opsummering" msgid "Summary reports" msgstr "Opsummeringsrapporter" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1279 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1288 msgid "Survey" msgstr "Spørgeundersøgelse" @@ -3041,9 +2913,8 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/Zurich.pm:394 #: templates/web/zurich/header.html:77 -#, fuzzy msgid "Templates" -msgstr "Opdateringer" +msgstr "" #: templates/web/base/admin/list_updates.html:12 #: templates/web/zurich/admin/templates.html:9 @@ -3064,7 +2935,7 @@ msgstr "Tekst:" msgid "Thank you for reporting this issue!" msgstr "Tak for at du rapporterede dette problem!" -#: templates/web/base/tokens/error.html:7 +#: templates/web/base/tokens/error.html:6 msgid "Thank you for trying to confirm your update or problem. We seem to have an error ourselves though, so <a href=\"%s\">please let us know what went on</a> and we'll look into it." msgstr "Tak for at du forsøger at bekræfte din opdatering eller dit problem. Vi ser ud til at have en fejl hos os, sÃ¥ <a href=\"%s\">vær sød at fortælle os hvad som skete</a> sÃ¥ skal vi se pÃ¥ sagen." @@ -3099,23 +2970,23 @@ msgstr "Det sted virker ikke til at være i Storbritannien. Venligst prøv igen. #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:47 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:63 -#: perllib/FixMyStreet/Cobrand/UK.pm:71 +#: perllib/FixMyStreet/Cobrand/UK.pm:72 msgid "That postcode was not recognised, sorry." msgstr "Det postnummer blev ikke genkendt, beklager." -#: perllib/FixMyStreet/App/Controller/Admin.pm:726 +#: perllib/FixMyStreet/App/Controller/Admin.pm:724 msgid "That problem has been marked as sent." msgstr "Det problem er blevet markeret som sendt." -#: perllib/FixMyStreet/App/Controller/Admin.pm:718 +#: perllib/FixMyStreet/App/Controller/Admin.pm:716 msgid "That problem will now be resent." msgstr "Det problem vil nu blive sendt igen." -#: perllib/FixMyStreet/App/Controller/Report.pm:125 +#: perllib/FixMyStreet/App/Controller/Report.pm:127 msgid "That report cannot be viewed on %s." msgstr "Denne rapport kan ikke vises pÃ¥ %s." -#: perllib/FixMyStreet/App/Controller/Report.pm:119 +#: perllib/FixMyStreet/App/Controller/Report.pm:121 msgid "That report has been removed from FixMyStreet." msgstr "Den rapport er blevet fjernet fra FixMinVej." @@ -3154,7 +3025,7 @@ msgstr "" "<Strong>Sendemetoden</strong> bestemmer hvordan problembeskeder bliver sendt til myndigheden.\n" "Hvis du lader dette stÃ¥ tomt, <strong>er sendemetoden som standard til e-post</strong>." -#: templates/web/base/open311/index.html:90 +#: templates/web/base/open311/index.html:82 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 "Open311 v2-atributten agency_responsible bruges for at opliste myndighederne som modtog problemrapporten, noget som ikke helt stemmer med hvordan atributten er defineret i Open311 v2-specifikationen." @@ -3181,12 +3052,12 @@ msgstr "" msgid "The diligency prize league table shows editors' activity (who's been editing the most records)." msgstr "The diligency prize league tabellen viser redaktørernes aktivitet, (hvem som har redigeret flest)." -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:60 -#: perllib/FixMyStreet/App/Controller/Reports.pm:79 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:61 +#: perllib/FixMyStreet/App/Controller/Reports.pm:80 msgid "The error was: %s" msgstr "Fejlen var: %s" -#: templates/web/base/open311/index.html:86 +#: templates/web/base/open311/index.html:78 msgid "The following Open311 v2 attributes are returned for each request: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code and service_name." msgstr "De følgende Open311 v2-atributter bliver returneret for hver forespørgsel: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code og service_name." @@ -3233,8 +3104,7 @@ msgstr "Listen over tilgængelige omrÃ¥der kommer fra MapIt-tjenesten pÃ¥ %s." msgid "The passwords do not match" msgstr "Adgangskoderne er ikke ens" -#: templates/web/base/errors/page_error_404_not_found.html:10 -#: templates/web/base/errors/page_error_404_not_found.html:12 +#: templates/web/base/errors/page_error_404_not_found.html:9 msgid "The requested URL '%s' was not found on this server" msgstr "Den forespurgte URL '%s' blev ikke fundet pÃ¥ denne server" @@ -3244,12 +3114,11 @@ msgstr "Den simpleste besked er vores geografiske:" #: templates/web/base/report/new/councils_extra_text.html:1 #: templates/web/base/report/new/councils_text_some.html:10 -#: templates/web/base/report/new/fill_in_details_form.html:18 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:14 +#: templates/web/base/report/new/fill_in_details_form.html:13 msgid "The summary and description will also be made public (see our <a href=\"/privacy\">privacy policy</a>)." msgstr "Opsummeringen og beskrivelsen vil ogsÃ¥ blive offentliggjort (se vores <a href=\"/privacy\">personvernregler</a>)." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:315 +#: perllib/FixMyStreet/Script/Reports.pm:92 msgid "The user could not locate the problem on a map, but to see the area around the location they entered" msgstr "Brugeren kunne ikke placere problemet pÃ¥ et kort, men kontrollér omrÃ¥det omkring stedet de angav" @@ -3268,18 +3137,18 @@ msgstr "" msgid "There are no reports to show." msgstr "Der er ingen rapporter at vise." -#: perllib/FixMyStreet/App/Controller/Reports.pm:76 +#: perllib/FixMyStreet/App/Controller/Reports.pm:77 msgid "There was a problem showing the All Reports page. Please try again later." msgstr "Der var problemer med at vise 'Alle rapporter'-siden. Venligst prøv igen senere." #: perllib/FixMyStreet/App/Controller/Contact.pm:137 -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:59 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:60 msgid "There was a problem showing this page. Please try again later." msgstr "Der var problemer med at vise denne side. Venligst prøv igen senere." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:769 -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:134 -#: templates/web/base/auth/general.html:26 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:764 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:138 +#: templates/web/base/auth/general.html:43 #: templates/web/zurich/auth/general.html:28 msgid "There was a problem with your email/password combination. If you cannot remember your password, or do not have one, please fill in the ‘sign in by email’ section of the form." msgstr "Der var problemer med din e-post/adgangskode-kombination. Hvis du har glemt din adgangskode, eller hvis du ikke har en, sÃ¥ udfyld venligst 'Log ind via e-post'-delen af skemaet" @@ -3288,7 +3157,7 @@ msgstr "Der var problemer med din e-post/adgangskode-kombination. Hvis du har gl msgid "There was a problem with your email/password combination. Please try again." msgstr "Der var problemer med din epost/adgangskode-kombination. Vær sød at forsøge igen." -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:272 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:336 msgid "There was a problem with your update. Please try again." msgstr "Der var problemer med din opdatering. Vær sød at forsøge igen." @@ -3296,7 +3165,7 @@ msgstr "Der var problemer med din opdatering. Vær sød at forsøge igen." msgid "There were problems with your report. Please see below." msgstr "Der var problemer med din rapport. Venligst se nedenfor." -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:300 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:371 msgid "There were problems with your update. Please see below." msgstr "Der var problemer med din opdatering. Venligst se nedenfor." @@ -3314,7 +3183,7 @@ msgstr "" "For mere information om Open311, se\n" "<a href='https://www.mysociety.org/2013/01/17/open311-explained/' class='admin-offsite-link'>denne artikel</a>." -#: templates/web/base/open311/index.html:77 +#: templates/web/base/open311/index.html:69 msgid "This API implementation is work in progress and not yet stabilized. It will change without warnings in the future." msgstr "Denne API-implementation er under udarbejdelse og endnu ikke stabil. Den vil ændre sig uden varsel i fremtiden." @@ -3341,18 +3210,18 @@ msgstr "" "Denne instans fÃ¥r kun rapporter for problemer som er lokaliseret i <strong>area covered</strong>.\n" "En instans vil ikke fÃ¥ nogen beskeder hvis det ikke dækker mindst ét omrÃ¥de." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:413 +#: perllib/FixMyStreet/Script/Reports.pm:191 msgid "This email has been sent to both councils covering the location of the problem, as the user did not categorise it; please ignore it if you're not the correct council to deal with the issue, or let us know what category of problem this is so we can add it to our system." msgstr "Denne e-post er blevet sendt til begge myndigheder som dækker stedet for problemet, da brugeren ikke kategoriserede det. Vær sød at ignorere den hvis I ikke er korrekt myndighed for at hÃ¥ndtere denne sag, eller give os besked om hvilken kategori af problemer dette er, sÃ¥ vi kan tilføje det i vores system." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:416 +#: perllib/FixMyStreet/Script/Reports.pm:194 msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue." msgstr "Denne e-post er blevet sendt til flere myndigheder som dækker stedet for problemet, da den valgte kategori er tilgængelig for disse. Vær sød at ignorere e-posten hvis I ikke er korrekt myndighed for at hÃ¥ndtere denne sag." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:925 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:995 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:920 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:990 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:142 -#: perllib/FixMyStreet/Cobrand/UK.pm:43 +#: perllib/FixMyStreet/Cobrand/UK.pm:44 msgid "This information is required" msgstr "Denne information er pÃ¥krævet" @@ -3364,56 +3233,37 @@ msgstr "Dette er et udviklernetsted.Ting kan gÃ¥ i stykker nÃ¥r som helst og dat msgid "This is a summary of all reports on this site." msgstr "Dette er en oplistning af alle problemerne i denne tjeneste." -#: templates/web/zurich/auth/token.html:8 -msgid "This may be because the link is too old or already used, or the address was not copied correctly." -msgstr "Dette kan være fordi lænken er for gammel eller allerede brugt, eller at lænken ikke blev kopieret rigtigt." - -#: templates/web/base/report/banner.html:15 -msgid "This problem has been closed" -msgstr "Dette problem er lukket" - -#: templates/web/base/report/banner.html:12 -#: templates/web/base/report/update-form.html:48 -#: templates/web/fixmystreet/report/update-form.html:46 +#: templates/web/base/report/update/form_update.html:52 msgid "This problem has been fixed" msgstr "Dette problem er løst" -#: templates/web/base/report/update-form.html:43 -#: templates/web/fixmystreet/report/update-form.html:40 +#: templates/web/base/report/update/form_update.html:46 msgid "This problem has not been fixed" msgstr "Dette problem er ikke blevet løst" -#: templates/web/base/report/banner.html:19 -msgid "This problem is in progress" -msgstr "Dette problemet er under udførelse" - -#: templates/web/base/report/banner.html:9 -msgid "This problem is old and of unknown status." -msgstr "Dette problem er gammelt og med ukendt status." - #: perllib/FixMyStreet/Cobrand/Zurich.pm:168 #: perllib/FixMyStreet/Cobrand/Zurich.pm:169 #: templates/web/zurich/report/_main.html:14 msgid "This report is awaiting moderation." msgstr "Denne rapport afventer moderation" -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:86 +#: perllib/FixMyStreet/Script/Alerts.pm:94 msgid "This report is currently marked as closed." msgstr "Denne rapport er for tiden markeret som lukket." -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:84 +#: perllib/FixMyStreet/Script/Alerts.pm:92 msgid "This report is currently marked as fixed." msgstr "Denne rapport er for tiden markeret som fikset." -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:88 +#: perllib/FixMyStreet/Script/Alerts.pm:96 msgid "This report is currently marked as open." msgstr "Denne rapport er for tiden markeret som Ã¥ben." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:326 +#: perllib/FixMyStreet/Script/Reports.pm:105 msgid "This report was submitted anonymously" msgstr "Denne rapport blev rapporteret anonymt" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:308 +#: perllib/FixMyStreet/Script/Reports.pm:85 msgid "This web page also contains a photo of the problem, provided by the user." msgstr "Denne netside indeholder ogsÃ¥ et billede af problemet, sendt ind af brugeren." @@ -3424,7 +3274,7 @@ msgstr "Denne netside indeholder ogsÃ¥ et billede af problemet, sendt ind af bru msgid "Time spent (in minutes):" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1278 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1287 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "Tidslinje" @@ -3436,24 +3286,22 @@ msgid "Title" msgstr "Titel" #: templates/web/zurich/admin/template_edit.html:20 -#, fuzzy msgid "Title:" -msgstr "Titel" +msgstr "" #: templates/web/base/alert/index.html:25 -#, fuzzy msgid "To find out what local alerts we have for you, please enter your %s postcode or street name and area:" -msgstr "Du finder lokale problemer ved at søge pÃ¥ dit postnummer, vejnavn eller sted" +msgstr "" #: templates/web/base/alert/index.html:27 msgid "To find out what local alerts we have for you, please enter your postcode or street name and area" msgstr "Du finder lokale problemer ved at søge pÃ¥ dit postnummer, vejnavn eller sted" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:314 +#: perllib/FixMyStreet/Script/Reports.pm:91 msgid "To view a map of the precise location of this issue" msgstr "For at se et kort med en mere præsis placering for dette problem." -#: templates/web/base/admin/index.html:61 +#: templates/web/base/admin/index.html:54 #: templates/web/base/admin/questionnaire.html:24 #: templates/web/base/admin/stats.html:24 #: templates/web/base/admin/stats.html:43 @@ -3471,10 +3319,8 @@ msgstr "Forsøg at sende epost direkte til os:" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:12 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:33 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:31 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:37 msgid "Unable to fix" msgstr "Kan ikke fikses" @@ -3487,7 +3333,7 @@ msgstr "Kan ikke fikses" msgid "Unconfirmed" msgstr "Ubekræftet" -#: templates/web/fixmystreet/report/banner.html:9 +#: templates/web/base/report/banner.html:9 msgid "Unknown" msgstr "Ukendt" @@ -3495,17 +3341,18 @@ msgstr "Ukendt" msgid "Unknown alert type" msgstr "Ukendt varsel-type" +#: perllib/FixMyStreet/App/Controller/Photo.pm:110 #: templates/web/base/js/translation_strings.html:39 msgid "Unknown error" msgstr "Ukendt fejl" -#: perllib/FixMyStreet/App/Controller/Report.pm:103 -#: perllib/FixMyStreet/App/Controller/Report.pm:109 -#: perllib/FixMyStreet/App/Controller/Report.pm:112 +#: perllib/FixMyStreet/App/Controller/Report.pm:105 +#: perllib/FixMyStreet/App/Controller/Report.pm:111 +#: perllib/FixMyStreet/App/Controller/Report.pm:114 msgid "Unknown problem ID" msgstr "Ukendt problem-Id" -#: templates/web/fixmystreet/report/update-form.html:19 +#: templates/web/base/report/update/form_update.html:25 msgid "Update" msgstr "Opdatering" @@ -3513,13 +3360,11 @@ msgstr "Opdatering" msgid "Update %s created for problem %d; by %s" msgstr "Opdatering %s oprettet for problem %d, af %s" -#: templates/web/base/contact/index.html:21 -#: templates/web/fixmystreet/contact/index.html:36 +#: templates/web/base/contact/index.html:28 msgid "Update below added anonymously at %s" msgstr "Opdateringen nedenfor lagt ind anonymt %s" -#: templates/web/base/contact/index.html:23 -#: templates/web/fixmystreet/contact/index.html:38 +#: templates/web/base/contact/index.html:30 msgid "Update below added by %s at %s" msgstr "Opdateringen nedenfor tilføjet af %s %s" @@ -3528,7 +3373,7 @@ msgstr "Opdateringen nedenfor tilføjet af %s %s" msgid "Update body" msgstr "Opdatér myndighed" -#: templates/web/base/admin/index.html:55 +#: templates/web/base/admin/index.html:48 msgid "Update breakdown by state" msgstr "Tilstandsfordeling for opdateringer" @@ -3553,20 +3398,16 @@ msgstr "En opdatering gennÃ¥bnede problemet" msgid "Update statuses" msgstr "Opdatér tilstanden" -#: templates/web/base/report/update-form.html:22 -msgid "Update:" -msgstr "Opdatering:" - #: templates/web/zurich/admin/index-dm.html:23 #: templates/web/zurich/admin/index-sdm.html:21 #: templates/web/zurich/admin/reports.html:13 msgid "Updated" msgstr "Opdateret" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1045 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1103 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1147 -#: perllib/FixMyStreet/App/Controller/Admin.pm:822 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1048 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1108 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1156 +#: perllib/FixMyStreet/App/Controller/Admin.pm:821 #: perllib/FixMyStreet/Cobrand/Zurich.pm:771 #: perllib/FixMyStreet/Cobrand/Zurich.pm:796 #: perllib/FixMyStreet/Cobrand/Zurich.pm:866 @@ -3574,13 +3415,12 @@ msgid "Updated!" msgstr "Opdateret!" #: templates/web/base/admin/list_updates.html:2 -#: templates/web/base/report/update.html:3 -#: templates/web/fixmystreet/report/update.html:5 +#: templates/web/base/report/update.html:5 #: templates/web/zurich/report/updates.html:2 msgid "Updates" msgstr "Opdateringer" -#: perllib/FixMyStreet/DB/Result/Comment.pm:132 +#: perllib/FixMyStreet/DB/Result/Comment.pm:131 msgid "Updates are limited to %s characters in length. Please shorten your update" msgstr "Opdateringer er begrænset til %s tegn i længde. Venligst skriv en kortere tekst." @@ -3590,12 +3430,9 @@ msgstr "Opdateringer af {{title}}" #. ("%s is the site name") #: templates/web/base/report/display.html:0 -#: templates/web/base/report/display.html:5 -#: templates/web/fixmystreet/report/display.html:0 -#: templates/web/fixmystreet/report/display.html:9 -#, fuzzy +#: templates/web/base/report/display.html:9 msgid "Updates to this problem, %s" -msgstr "Opdateringer for dette problem, FixMinVej" +msgstr "" #: templates/web/base/admin/body.html:182 msgid "Use the <strong>note</strong> to record details that are only displayed in the admin. Notes are not shown publicly, and are not sent to the body." @@ -3603,15 +3440,14 @@ msgstr "Brug <strong>notater</strong> for at notere detaljer som skal vises i ad #: templates/web/zurich/admin/report_edit-sdm.html:48 #: templates/web/zurich/admin/report_edit.html:67 -#, fuzzy msgid "Used map" -msgstr "brugte kort" +msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1452 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1461 msgid "User flag removed" msgstr "Brugermarkering fjernet" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1424 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1433 msgid "User flagged" msgstr "Bruger markeret" @@ -3619,7 +3455,7 @@ msgstr "Bruger markeret" msgid "User search finds matches in users' names and email addresses." msgstr "Brugersøgning finder træf pÃ¥ brugernavne og epostadresser. " -#: perllib/FixMyStreet/App/Controller/Admin.pm:1280 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1289 #: perllib/FixMyStreet/Cobrand/Zurich.pm:399 #: templates/web/base/admin/flagged.html:29 #: templates/web/zurich/header.html:69 @@ -3650,7 +3486,6 @@ msgid "Viewing a location" msgstr "Ser pÃ¥ et sted" #: templates/web/base/report/display.html:0 -#: templates/web/fixmystreet/report/display.html:0 msgid "Viewing a problem" msgstr "Ser pÃ¥ et problem" @@ -3663,25 +3498,24 @@ msgstr "Bydele indenfor denne myndighed" 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 "Vi fandt mere en et træf for dette sted. Vi viser op til ti træf, sÃ¥ forsøg en anden søgning hvis dit sted ikke er her." -#: templates/web/zurich/auth/token.html:7 -msgid "We have not been able to confirm your account - sorry." -msgstr "Vi har ikke kunnet bekræfte din konto - beklager." - -#: templates/web/zurich/auth/token.html:17 -msgid "We have sent you an email containing a link to confirm your account." -msgstr "Vi har sendt dig en epost som indeholder link for at bekræfte din konto." +#: templates/web/base/auth/general.html:6 +#: templates/web/base/report/display.html:27 +#: templates/web/base/report/new/oauth_email_form.html:5 +#, fuzzy +msgid "We need your email address, please give it below." +msgstr "Vi viser aldrig din e-postadresse eller dit telefonnummer" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:2 -#: templates/web/fixmystreet/report/update-form.html:77 +#: templates/web/base/report/new/form_user_loggedout_email.html:2 +#: templates/web/base/report/update/form_user_loggedout_email.html:2 msgid "We never show your email" msgstr "Vi viser aldrig din e-postadresse" -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:31 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:65 +#: templates/web/base/report/new/form_user_loggedin.html:31 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:28 msgid "We never show your email address or phone number." msgstr "Vi viser aldrig din e-postadresse eller dit telefonnummer" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:422 +#: perllib/FixMyStreet/Script/Reports.pm:200 msgid "We realise this problem might be the responsibility of %s; however, we don't currently have any contact details for them. If you know of an appropriate contact address, please do get in touch." msgstr "Vi indser at %s kan være ansvarlig for dette problem, men vi mangler for tiden kontaktinformation for dem. Hvis du kender en egnet kontaktadresse, sÃ¥ tag kontakt med os." @@ -3698,10 +3532,6 @@ msgstr "Vi vil kun bruge personlig information om dig i henhold til vore <a href msgid "We’re sorry to hear the problem’s not fixed. Why not try writing to your local representatives?" msgstr "Vi er kede af at høre at problemet ikke er løst. Hvad med at forsøge at skrive til dine lokale repræsentanter?" -#: templates/web/base/contact/blurb.html:8 -msgid "We'd love to hear what you think about this site. Just fill in the form, or send an email to <a href='mailto:%s'>%s</a>:" -msgstr "Vi ønsker at fÃ¥ din tilbagemelding om hvad du mener om denne tjeneste. Bare udfyld skemaet, eller send en e-post <a href='mailto:%s'>%s</a>:" - #: templates/web/base/contact/submit.html:7 msgid "We’ll get back to you as soon as we can." msgstr "Vi tager kontakt med dig sÃ¥ snart vi kan." @@ -3710,7 +3540,7 @@ msgstr "Vi tager kontakt med dig sÃ¥ snart vi kan." msgid "What was your experience of getting the problem fixed?" msgstr "" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:49 +#: templates/web/base/report/new/form_report.html:19 msgid "What’s the issue, and where is it?" msgstr "Hvad er problemet og hvor er det?" @@ -3723,7 +3553,11 @@ msgstr "HvornÃ¥r redigeret" msgid "When sent" msgstr "HvornÃ¥r sendt" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:640 +#: templates/web/base/js/translation_strings.html:50 +msgid "Whoa there Testino! Three photos are enough." +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Report/New.pm:635 msgid "Whole block of empty flats" msgstr "Hel blok med tomme lejligheder" @@ -3738,7 +3572,7 @@ msgstr "Hvorfor stoppe der? <a href=\"/alert\">Sæt flere varsler</a> op gratis msgid "Wish" msgstr "" -#: templates/web/base/open311/index.html:92 +#: templates/web/base/open311/index.html:84 msgid "With request searches, it is also possible to search for agency_responsible to limit the requests to those sent to a single administration. The search term is the administration ID provided by <a href=\"%s\">MaPit</a>." msgstr "NÃ¥r du søger efter forespørgsler, sÃ¥ er det ogsÃ¥ muligt at søge efter agency_responsible for at begrænse det til forespørgsler som er sendt til en enkelt admindstration. Søgtetermen er administrations-IDen som angivet af <a href=\"%s\">MaPit</a>." @@ -3746,7 +3580,7 @@ msgstr "NÃ¥r du søger efter forespørgsler, sÃ¥ er det ogsÃ¥ muligt at søge ef msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"http://fixmystreet.org\">available at fixmystreet.org</a>." msgstr "Kunne du tænke dig at bidrage til FixMinVej? Vores kKildekoden er frit programmel og <a href=\"http://fixmystreet.org\">tilgængelig via fixmystreet.org</a>." -#: templates/web/base/questionnaire/index.html:87 +#: templates/web/base/questionnaire/index.html:96 msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?" msgstr "Kunne du tænke dig at modtage en ny forespørgsel om 4 uger, som minder dig om at tjekke status?" @@ -3755,7 +3589,6 @@ msgid "Writing your message entirely in block capitals makes it hard to read, as msgstr "NÃ¥r du skriver din besked med kun store bogstaver bliver den vanskelig at læse. Det samme gælder manglende tegnsætning." #: templates/web/base/report/new/fill_in_details_form.html:4 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:5 msgid "Wrong location? Just click again on the map." msgstr "Forkert sted? Bare klik igen pÃ¥ kortet." @@ -3778,27 +3611,24 @@ msgstr "Ã…r" #: templates/web/base/admin/users.html:31 #: templates/web/base/questionnaire/creator_fixed.html:14 #: templates/web/base/questionnaire/index.html:51 -#: templates/web/base/questionnaire/index.html:90 +#: templates/web/base/questionnaire/index.html:99 msgid "Yes" msgstr "Ja" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:17 -#: templates/web/fixmystreet/report/update-form.html:91 +#: templates/web/base/report/new/form_user_loggedout_password.html:5 +#: templates/web/base/report/update/form_user_loggedout_password.html:4 msgid "Yes I have a password" msgstr "Ja, jeg har en adgangskode" -#: templates/web/base/contact/index.html:39 -#: templates/web/fixmystreet/contact/index.html:54 +#: templates/web/base/contact/index.html:46 msgid "You are complaining that this problem report was unnecessarily moderated:" msgstr "Du klager over at denne problemrapport blev modereret uden grund:" -#: templates/web/base/contact/index.html:41 -#: templates/web/fixmystreet/contact/index.html:56 +#: templates/web/base/contact/index.html:48 msgid "You are reporting the following problem report for being abusive, containing personal information, or similar:" msgstr "Du rapporterer at følgende problem er stødende, indeholder personlig information eller lignende:" -#: templates/web/base/contact/index.html:15 -#: templates/web/fixmystreet/contact/index.html:30 +#: templates/web/base/contact/index.html:22 msgid "You are reporting the following update for being abusive, containing personal information, or similar:" msgstr "Du rapporterer at følgende opdatering er stødende, indeholder personlig information, eller lignende:" @@ -3811,7 +3641,7 @@ msgstr "Du kan <a href=\"%s%s\">læse om problemet pÃ¥ denne side</a>." msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create." msgstr "Du kan føje en misbrugers epostadresse til misbrugslisten, hvilket automatisk skjuler (og aldrig sender) rapporter vedkommende opretter." -#: templates/web/fixmystreet/contact/index.html:121 +#: templates/web/base/contact/index.html:113 msgid "You can contact technical support on <a href='mailto:%s'>%s</a>" msgstr "Du kan kontakte teknisk support via <a href='mailto:%s'>%s</a>" @@ -3824,8 +3654,8 @@ msgstr "" "Du kan markere alle beskeder eller brugere ved at redigere dem, og de bliver ført op pÃ¥ denne side.\n" "For eksempel kan dette være nyttigt hvis du ønsker at holde et øje med en bruger som tidligere har indsendt upassende beskeder. " -#: templates/web/base/report/new/councils_text_none.html:10 -#: templates/web/base/report/new/councils_text_none.html:2 +#: templates/web/base/report/new/councils_text_none.html:12 +#: templates/web/base/report/new/councils_text_none.html:14 #: templates/web/base/report/new/councils_text_some.html:19 #: templates/web/base/report/new/councils_text_some.html:21 msgid "You can help us by finding a contact email address for local problems for %s and emailing it to us at <a href='mailto:%s'>%s</a>." @@ -3843,21 +3673,16 @@ msgstr "Du afviste; venligst udfyld boksen ovenfor" msgid "You have already answered this questionnaire. If you have a question, please <a href='%s'>get in touch</a>, or <a href='%s'>view your problem</a>.\n" msgstr "Du har allerede besvaret dette spørgeskema. Hvis du har spørgsmÃ¥l, venligst <a href='%s'>tag kontakt</a>, eller <a href='%s'>se pÃ¥ dit problem</a>.\n" -#: templates/web/base/questionnaire/index.html:77 -#: templates/web/base/report/new/fill_in_details_form.html:75 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:73 -msgid "You have already attached a photo to this report, attaching another one will replace it." -msgstr "Du har allerede vedlagt et billede til dette problem. At vedlægge et andet vil erstatte dette." - -#: templates/web/base/report/update-form.html:59 -#: templates/web/fixmystreet/report/update-form.html:56 -msgid "You have already attached a photo to this update, attaching another one will replace it." -msgstr "Du har allerede vedlagt et billede til denne opdatering. At vedlægge et andet vil erstatte dette." - -#: templates/web/zurich/report/new/fill_in_details_form.html:61 +#: templates/web/base/report/new/form_report.html:32 +#: templates/web/zurich/report/new/fill_in_details_form.html:55 msgid "You have already attached photos to this report. Note that you can attach a maximum of 3 to this report (if you try to upload more, the oldest will be removed)." msgstr "" +#: templates/web/base/questionnaire/index.html:83 +#: templates/web/base/report/update/form_update.html:14 +msgid "You have already attached photos to this update. Note that you can attach a maximum of 3 to this update (if you try to upload more, the oldest will be removed)." +msgstr "" + #: templates/web/base/auth/sign_out.html:4 #: templates/web/zurich/auth/sign_out.html:3 msgid "You have been signed out" @@ -3872,9 +3697,8 @@ msgstr "Du har placeret problemet ved punktet i kortet som er markeret med en gr msgid "You have successfully confirmed your email address." msgstr "Du har nu lykkes med at bekræfte din e-postadresse." -#: templates/web/base/report/display.html:20 -#: templates/web/base/report/new/fill_in_details.html:37 -#: templates/web/fixmystreet/report/display.html:17 +#: templates/web/base/report/display.html:17 +#: templates/web/base/report/new/login_success_form.html:3 msgid "You have successfully signed in; please check and confirm your details are accurate:" msgstr "Du har lykkes med at logge ind. Venligst kontrollér og bekræft at dine detaljer er korrekte:" @@ -3905,53 +3729,42 @@ msgid "Your Reports" msgstr "Dine rapporter" #: templates/web/base/alert/_list.html:89 +#: templates/web/base/contact/index.html:83 +#: templates/web/base/report/display_tools.html:38 +#: templates/web/base/report/display_tools.html:40 +#: templates/web/base/report/new/form_user_loggedin.html:3 +#: templates/web/base/report/new/form_user_loggedout_email.html:1 +#: templates/web/base/report/update/form_user_loggedout_email.html:1 #: templates/web/fixmystreet/alert/updates.html:19 #: templates/web/fixmystreet/alert/updates.html:22 -#: templates/web/fixmystreet/contact/index.html:91 -#: templates/web/fixmystreet/report/display.html:62 -#: templates/web/fixmystreet/report/display.html:64 -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:3 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:1 -#: templates/web/fixmystreet/report/update-form.html:76 #: templates/web/zurich/report/new/fill_in_details_form.html:76 msgid "Your email" msgstr "Din e-post" -#: templates/web/base/auth/general.html:28 -#: templates/web/fixmystreet/report/update-form.html:82 +#: templates/web/base/auth/general.html:45 +#: templates/web/base/report/update/form_user_loggedout_email.html:7 #: templates/web/zurich/auth/general.html:30 #: templates/web/zurich/auth/general.html:58 msgid "Your email address" msgstr "Din e-postadresse" -#: templates/web/base/report/new/fill_in_details_form.html:106 -#: templates/web/base/report/update-form.html:81 -msgid "Your email:" -msgstr "Din e-post" - -#: templates/web/fixmystreet/report/updates-sidebar-notes.html:7 +#: templates/web/base/report/updates-sidebar-notes.html:3 msgid "Your information will only be used in accordance with our <a href=\"/privacy\">privacy policy</a>" msgstr "Vi vil kun bruge personlig information om dig i henhold til vores <a href=\"/faq#privacy\">privatlivsregler.</a>" -#: templates/web/base/auth/general.html:51 -#: templates/web/fixmystreet/contact/index.html:84 -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:18 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:54 -#: templates/web/fixmystreet/report/update-form.html:142 +#: templates/web/base/auth/general.html:90 +#: templates/web/base/contact/index.html:76 +#: templates/web/base/report/new/form_user_loggedin.html:18 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:17 +#: templates/web/base/report/update/form_name.html:11 #: templates/web/zurich/auth/general.html:61 #: templates/web/zurich/report/new/fill_in_details_form.html:86 msgid "Your name" msgstr "Dit navn" -#: templates/web/base/contact/index.html:73 -#: templates/web/base/report/new/fill_in_details_form.html:186 -#: templates/web/base/report/update-form.html:152 -msgid "Your name:" -msgstr "Dit navn:" - -#: templates/web/base/auth/general.html:39 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:22 -#: templates/web/fixmystreet/report/update-form.html:96 +#: templates/web/base/auth/general.html:75 +#: templates/web/base/report/new/form_user_loggedout_password.html:10 +#: templates/web/base/report/update/form_user_loggedout_password.html:9 #: templates/web/zurich/auth/general.html:34 msgid "Your password" msgstr "Din adgangskode" @@ -3960,15 +3773,16 @@ msgstr "Din adgangskode" msgid "Your password has been changed" msgstr "Din adgangskode er blevet ændret" -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:27 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:63 +#: templates/web/base/report/new/form_user_loggedin.html:27 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:26 #: templates/web/zurich/report/new/fill_in_details_form.html:92 msgid "Your phone number" msgstr "Dit telefonnummer" #: templates/web/base/questionnaire/index.html:14 +#, fuzzy msgid "Your report" -msgstr "Dine rapporter" +msgstr "Dine opdateringer" #: templates/web/base/footer.html:9 templates/web/fixmystreet/footer.html:29 msgid "Your reports" @@ -3978,23 +3792,17 @@ msgstr "Dine opdateringer" msgid "Your updates" msgstr "Dine opdateringer" -#: templates/web/base/contact/index.html:81 -msgid "Your email:" -msgstr "Din e-post:" - #: templates/web/base/reports/_list-filters.html:3 -#, fuzzy msgid "all reports" -msgstr "Alle rapporter" +msgstr "" #: templates/web/base/admin/timeline.html:4 msgid "by %s" msgstr "af %s" #: templates/web/base/reports/_list-filters.html:5 -#, fuzzy msgid "closed reports" -msgstr "Fiksede rapporter" +msgstr "" #: templates/web/base/reports/body.html:6 #: templates/web/base/reports/body.html:7 @@ -4016,17 +3824,16 @@ msgid "edit user" msgstr "redigér bruger" #: templates/web/base/reports/_list-filters.html:6 -#, fuzzy msgid "fixed reports" -msgstr "Fiksede rapporter" +msgstr "" -#: templates/web/base/admin/index.html:33 +#: templates/web/base/status/stats.html:20 #: templates/web/zurich/admin/index.html:5 msgid "from %s different users" -msgstr "fra %d forskellige brugere" +msgstr "fra %s forskellige brugere" -#: templates/web/base/report/_item.html:17 -#: templates/web/zurich/report/_item.html:16 +#: templates/web/base/report/_item.html:15 +#: templates/web/zurich/report/_item.html:14 msgid "last updated %s" msgstr "sidst opdateret %s" @@ -4118,10 +3925,8 @@ msgstr "Ã¥bnet igen" msgid "sign out" msgstr "log ud" -#: templates/web/base/report/new/fill_in_details_form.html:12 -#: templates/web/base/report/new/fill_in_details_form.html:15 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:10 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:12 +#: templates/web/base/report/new/fill_in_details_form.html:11 +#: templates/web/base/report/new/fill_in_details_form.html:9 msgid "the local council" msgstr "den lokale myndighed" @@ -4130,7 +3935,7 @@ msgstr "den lokale myndighed" msgid "there is no pin shown as the user did not use the map" msgstr "Der vises ingen nÃ¥l pÃ¥ grund af at brugeren ikke brugte kortet" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:398 +#: perllib/FixMyStreet/Script/Reports.pm:176 msgid "this type of local problem" msgstr "denne type lokalt problem" @@ -4139,9 +3944,8 @@ msgid "today" msgstr "idag" #: templates/web/base/reports/_list-filters.html:4 -#, fuzzy msgid "unfixed reports" -msgstr "Fiksede rapporter" +msgstr "" #: templates/web/base/admin/report_edit.html:32 msgid "used map" @@ -4160,7 +3964,7 @@ msgstr "bruger er ejer af problemet" msgid "ward" msgstr "bydel" -#: templates/web/base/front/stats.html:17 +#: templates/web/base/front/stats.html:13 #, perl-format msgid "<big>%s</big> report recently" msgid_plural "<big>%s</big> reports recently" @@ -4188,7 +3992,7 @@ msgid_plural "%d minutes" msgstr[0] "%d minut" msgstr[1] "%d minutter" -#: templates/web/base/front/stats.html:29 +#: templates/web/base/front/stats.html:25 #, perl-format msgid "<big>%s</big> update on reports" msgid_plural "<big>%s</big> updates on reports" @@ -4209,14 +4013,14 @@ msgid_plural "%d weeks" msgstr[0] "%d uge" msgstr[1] "%d uger" -#: templates/web/base/front/stats.html:12 +#: templates/web/base/front/stats.html:8 #, perl-format msgid "<big>%s</big> report in past week" msgid_plural "<big>%s</big> reports in past week" msgstr[0] "<big>%s</big> rapport sidste uge" msgstr[1] "<big>%s</big> rapporter sidste uge" -#: templates/web/base/front/stats.html:23 +#: templates/web/base/front/stats.html:19 #, perl-format msgid "<big>%s</big> fixed in past month" msgid_plural "<big>%s</big> fixed in past month" @@ -4237,140 +4041,86 @@ msgid_plural "We do <strong>not</strong> yet have details for the other councils msgstr[0] "Vi har endnu <strong>ikke</strong> detaljerne for den anden myndighed som dækker dette sted." msgstr[1] "Vi har endnu <strong>ikke</strong> detaljerne for de andre myndigheder som dækker dette sted." -#~ msgid "(Don't worry — we'll hang on to your alert while you're checking your email.)" -#~ msgstr "(Tag det roligt; vi ser pÃ¥ dit varsel mens du tjekker din e-mail.)" - -#~ msgid "(Don't worry — we'll hang on to your problem report while you're checking your email.)" -#~ msgstr "(Tag det roligt — vi ser pÃ¥ din problemrapport mens du tjekker din email.)" - -#~ msgid "(Don't worry — we'll hang on to your update while you're checking your email.)" -#~ msgstr "(Tag det roligt — vi ser pÃ¥ din opdatering mens du tjekker din email.)" - -#~ msgid "<small>If you cannot see the map, <a href='%s' rel='nofollow'>skip this step</a>.</small>" -#~ msgstr "<small>Hvis du ikke kan se kortet, <a href='%s' rel='nofollow'>sÃ¥ spring dette trin over</a>.</small>" - -#~ msgid "<strong>No</strong>, I do not, let me sign in by email:" -#~ msgstr "<strong>Nej</strong>, det gør jeg ikke. La mig logge ind med e-post:" - -#~ msgid "Are you a <strong>developer</strong>? Would you like to contribute to FixMyStreet?" -#~ msgstr "Er du en <strong>udvikler</strong>? Kunne du tænke dig at bidrage til FixMinVej?" - -#~ msgid "Closest nearby problems <small>(within %skm)</small>" -#~ msgstr "De nærmeste problemer <small>(inden for %skm)</small>" - -#~ msgid "Contact FixMyStreet" -#~ msgstr "Kontakt FixMinVej" - -#~ msgid "Do you have a FixMyBarangay password?" -#~ msgstr "Har du en FixMyBarangay-adgangskode?" - -#~ msgid "FixMyStreet admin:" -#~ msgstr "FixMinVej-administrator:" - -#~ msgid "If you do not, your alert will not be activated." -#~ msgstr "Hvis du ikke gør dette, vil dit varsel ikke blive aktiveret" - -#~ msgid "If you do not, your problem will not be posted." -#~ msgstr "Hvis du ikke gør dette, vil din rapport ikke blive publiceret" - -#~ msgid "If you do not, your update will not be posted." -#~ msgstr "Hvis du ikke gør dette, vil din opdatering ikke blive publiceret" - -#~ msgid "New local reports on reportemptyhomes.com" -#~ msgstr "Nye lokale rapporter pÃ¥ reportemptyhomes.com" - -#~ msgid "New reports for {{COUNCIL}} within {{WARD}} ward on reportemptyhomes.com" -#~ msgstr "Nye rapporter for {{COUNCIL}} indenfor {{WARD}} bydel pÃ¥ reportemptyhomes.com" - -#~ msgid "New reports on reportemptyhomes.com" -#~ msgstr "Nye rapporter pÃ¥ reportemptyhomes.com" - -#~ msgid "New reports on reportemptyhomes.com near {{POSTCODE}}" -#~ msgstr "Nye rapporter pÃ¥ reportemptyhomes.com nær postnummer {{POSTCODE}}" - -#~ msgid "New reports to {{COUNCIL}} on reportemptyhomes.com" -#~ msgstr "Nye rapporter til {{COUNCIL}} pÃ¥ reportemptyhomes.com" - -#~ msgid "New reports within {{NAME}}'s boundary on reportemptyhomes.com" -#~ msgstr "Nye rapporter indenfor grænsen til {{NAME}} pÃ¥ reportemptyhomes.com" +#~ msgid "(we never show your email address or phone number)" +#~ msgstr "(vi viser aldrig din e-postadresse eller dit telefonnummer)" -#~ msgid "New update:" -#~ msgstr "Ny opdatering:" +#~ msgid "(we never show your email)" +#~ msgstr "(vi viser aldrig din e-postadresse)" -#~ msgid "No problems found." -#~ msgstr "Ingen problemer blev fundet." +#~ msgid "<strong>No</strong>, let me confirm my report by email:" +#~ msgstr "<strong>Nej</strong>, lad mig bekræfte min rapport med e-post:" -#~ msgid "No problems have been reported yet." -#~ msgstr "Ingen problemer er rapporteret" +#~ msgid "<strong>No</strong>, let me confirm my update by email:" +#~ msgstr "<strong>Nej</strong>, lad mig bekræfte min opdatering med e-post:" -#~ msgid "Now to submit your report… do you have a FixMyStreet password?" -#~ msgstr "PÃ¥ tide at sende din rapport… har du en FixMinVej-adgangskode?" +#~ msgid "Email me updates" +#~ msgstr "Send mig opdateringer" -#~ msgid "Now to submit your update… do you have a FixMyStreet password?" -#~ msgstr "PÃ¥ tide at registrere din opdatering… har du en FixMinVej-adgangskode?" +#~ msgid "Enter a new password:" +#~ msgstr "Indtast en ny adgangskode:" -#~ msgid "Our code is open source and <a href=\"http://github.com/mysociety/fixmystreet\">available on GitHub</a>." -#~ msgstr "Vores kildekode er frit programmel og <a href=\"http://github.com/mysociety/fixmystreet\">tilgængelig pÃ¥ GitHub</a>." +#~ 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 "Jeg er bange for at vi ikke kunne verificere denne reference. Hvis du kopierede webadressen fra en e-post, kontrollér at du har kopieret den korrekt.\n" -#~ msgid "Please <a class=\"tab_link\" href=\"#report\">take a look</a> at the updates that have been left." -#~ msgstr "Venligst <a class=\"tab_link\" href=\"#report\">gennemse</a> opdateringene som er blevet lagt ind." +#~ 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 "Hvis du bruger web-baseret e-post eller har filtre for affalds-e-post pÃ¥ din e-postkonto, skal du i nogen tilfælde se efter vores beskeder der." -#~ msgid "Please take a look at the updates that have been left." -#~ msgstr "Venligst gennemse opdateringerne som er blevet lagt ind." +#~ msgid "Message:" +#~ msgstr "Besked:" -#~ msgid "Problems within %s, FixMyStreet" -#~ msgstr "Problemer indenfor %s, Fiksgatami" +#~ msgid "More problems nearby" +#~ msgstr "Flere problemer i nærheden" -#~ msgid "Properties recently reported as put back to use on reportemptyhomes.com" -#~ msgstr "Ejendomme nyligt rapporteret som gÃ¥et tilbage i brug pÃ¥ reportemptyhomes.com" +#~ msgid "Nearly Done! Now check your email..." +#~ msgstr "Nesten færdig! Nu skal du tjekke din e-post..." -#~ msgid "Publish the response" -#~ msgstr "Publicér svar" +#~ msgid "Offensive? Unsuitable? Tell us" +#~ msgstr "Stødende? Upassende? Giv os besked" -#~ msgid "Reported %s, to %s" -#~ msgstr "Rapporteret %s, til %s" +#~ msgid "Photo:" +#~ msgstr "Billed:" -#~ msgid "Reports on and around the map" -#~ msgstr "Problemer pÃ¥ og omkring kortet" +#~ msgid "Please check your email" +#~ msgstr "Venligst kontrollér e-posten du angav" -#~ msgid "Sign in by email" -#~ msgstr "Log ind via epost" +#~ msgid "Please note that updates are not sent to the council. If you leave your name it will be public. Your information will only be used in accordance with our <a href=\"/faq#privacy\">privacy policy</a>" +#~ msgstr "Venligst bemærk at opdateringer ikke bliver sendt til myndigheden. Hvis du vedlægger dit navnet sÃ¥ vil det være offentlig tilgængeligt. Din information vil kun blive brugt i henhold til vores <a href=\"/faq#privacy\">privatlivspolicy</a>" -#~ msgid "Signed in as %s" -#~ msgstr "Logget ind som %s" +#~ msgid "This may be because the link is too old or already used, or the address was not copied correctly." +#~ msgstr "Dette kan være fordi lænken er for gammel eller allerede brugt, eller at lænken ikke blev kopieret rigtigt." -#~ msgid "The confirmation email <strong>may</strong> take a few minutes to arrive — <em>please</em> be patient." -#~ msgstr "Bekræftelses-e-posten <strong>kan</strong> tage nogen fÃ¥ minutter før den kommer frem — sÃ¥ vær tÃ¥lmodig." +#~ msgid "This problem has been closed" +#~ msgstr "Dette problem er lukket" -#~ msgid "The details of your problem are available from the other tab above." -#~ msgstr "Detaljerne om dit problem er tilgængelige under den anden fane ovenfor." +#~ msgid "This problem is in progress" +#~ msgstr "Dette problemet er under udførelse" -#~ msgid "The details of your problem are available on the right hand side of this page." -#~ msgstr "Detaljerne om dit problem er tilgængelig pÃ¥ højre kant af denne side." +#~ msgid "This problem is old and of unknown status." +#~ msgstr "Dette problem er gammelt og med ukendt status." -#~ msgid "The latest local reports reported by users" -#~ msgstr "De sidste lokale rapporter rapporteret af brugere" +#~ msgid "Update:" +#~ msgstr "Opdatering:" -#~ msgid "The latest properties reported back to use by users" -#~ msgstr "De sidste ejendomme rapporteret tilbage i brug af brugere" +#~ msgid "We have not been able to confirm your account - sorry." +#~ msgstr "Vi har ikke kunnet bekræfte din konto - beklager." -#~ msgid "The latest reports for {{COUNCIL}} reported by users" -#~ msgstr "De sidste rapporter for {{COUNCIL}} rapporteret af brugere" +#~ msgid "We have sent you an email containing a link to confirm your account." +#~ msgstr "Vi har sendt dig en epost som indeholder link for at bekræfte din konto." -#~ msgid "The latest reports for {{COUNCIL}} within {{WARD}} ward reported by users" -#~ msgstr "De sidste rapporter for {{COUNCIL}} indenfor {{WARD}} bydel rapporteret af brugere" +#~ msgid "We'd love to hear what you think about this site. Just fill in the form, or send an email to <a href='mailto:%s'>%s</a>:" +#~ msgstr "Vi ønsker at fÃ¥ din tilbagemelding om hvad du mener om denne tjeneste. Bare udfyld skemaet, eller send en e-post <a href='mailto:%s'>%s</a>:" -#~ msgid "The latest reports within {{NAME}}'s boundary reported by users" -#~ msgstr "De sidste rapporter indenfor grænsen til {{NAME}} rapporteret af brugere" +#~ msgid "You have already attached a photo to this report, attaching another one will replace it." +#~ msgstr "Du har allerede vedlagt et billede til dette problem. At vedlægge et andet vil erstatte dette." -#~ msgid "To <strong>report a problem</strong>, click on the map at the correct location." -#~ msgstr "For at <strong>rapportere et problem</strong>, sÃ¥ klik pÃ¥ rette sted pÃ¥ kortet." +#~ msgid "You have already attached a photo to this update, attaching another one will replace it." +#~ msgstr "Du har allerede vedlagt et billede til denne opdatering. At vedlægge et andet vil erstatte dette." -#~ msgid "User" -#~ msgstr "Bruger" +#~ msgid "Your email:" +#~ msgstr "Din e-post" -#~ msgid "You must now click the link in the email we've just sent you." -#~ msgstr "Du skal nu Ã¥bne lænken i e-posten vi netop har sendt dig." +#~ msgid "Your name:" +#~ msgstr "Dit navn:" -#~ msgid "Your email address:" -#~ msgstr "Din e-postadresse:" +#~ msgid "Your email:" +#~ msgstr "Din e-post:" diff --git a/locale/de_CH.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/de_CH.UTF-8/LC_MESSAGES/FixMyStreet.po index a66aed935..b2bc5c658 100644 --- a/locale/de_CH.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/de_CH.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -8,52 +8,34 @@ msgid "" msgstr "" "Project-Id-Version: fixmystreet\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2015-10-08 15:34+0100\n" -"PO-Revision-Date: 2015-10-15 16:22+0100\n" +"POT-Creation-Date: 2016-03-02 13:09+0000\n" +"PO-Revision-Date: 2015-10-23 16:37+0000\n" "Last-Translator: mySociety <transifex@mysociety.org>\n" -"Language-Team: German (Switzerland) (http://www.transifex.com/projects/p/fixmystreet/language/de_CH/)\n" +"Language-Team: German (Switzerland) (http://www.transifex.com/mysociety/fixmystreet/language/de_CH/)\n" "Language: de_CH\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 1.7.6\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:628 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:408 +#: perllib/FixMyStreet/DB/Result/Problem.pm:616 +#: perllib/FixMyStreet/Script/Reports.pm:189 msgid " and " msgstr "und" #: templates/web/base/report/new/councils_text_all.html:2 -#: templates/web/base/report/new/councils_text_none.html:11 -#: templates/web/base/report/new/councils_text_none.html:2 +#: templates/web/base/report/new/councils_text_none.html:12 +#: templates/web/base/report/new/councils_text_none.html:15 #: templates/web/base/report/new/councils_text_some.html:19 #: templates/web/base/report/new/councils_text_some.html:22 #: templates/web/base/report/new/councils_text_some.html:5 msgid " or " msgstr "oder" -#: templates/web/base/admin/index.html:35 -msgid "%s confirmed alerts, %s unconfirmed" -msgstr "" - -#: templates/web/base/admin/index.html:37 -#: templates/web/zurich/admin/index.html:6 -msgid "%s council contacts – %s confirmed, %s unconfirmed" -msgstr "" - #: templates/web/base/admin/edit-league.html:12 msgid "%d edits by %s" msgstr "" -#: templates/web/base/admin/index.html:34 -msgid "%s live updates" -msgstr "" - -#: templates/web/base/admin/index.html:36 -msgid "%s questionnaires sent – %s answered (%s%%)" -msgstr "" - #: templates/web/base/pagination.html:10 msgid "%d to %d of %d" msgstr "%d bis %d von %d" @@ -68,6 +50,20 @@ msgstr "Alle Meldungen" msgid "%s admin:" msgstr "" +#: templates/web/base/status/stats.html:26 +#, fuzzy +msgid "%s bodies" +msgstr "Externe Adressen" + +#: templates/web/base/status/stats.html:24 +msgid "%s confirmed alerts, %s unconfirmed" +msgstr "" + +#: templates/web/base/status/stats.html:27 +#: templates/web/zurich/admin/index.html:6 +msgid "%s council contacts – %s confirmed, %s unconfirmed" +msgstr "" + #. ("%s is the site name") #: templates/web/base/alert/index.html:7 msgid "" @@ -84,7 +80,16 @@ msgid "" "within a certain distance of a particular location." msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:695 +#: templates/web/base/status/stats.html:23 +#, fuzzy +msgid "%s live updates" +msgstr "Schicken Sie mir Aktualisierungen" + +#: templates/web/base/status/stats.html:25 +msgid "%s questionnaires sent – %s answered (%s%%)" +msgstr "" + +#: perllib/FixMyStreet/DB/Result/Problem.pm:683 msgid "%s ref: %s" msgstr "" @@ -99,15 +104,15 @@ msgid "" "for the county council." msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:255 perllib/FixMyStreet/Cobrand/UK.pm:267 +#: perllib/FixMyStreet/Cobrand/UK.pm:256 perllib/FixMyStreet/Cobrand/UK.pm:268 msgid "%s ward, %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:564 +#: perllib/FixMyStreet/DB/Result/Problem.pm:552 msgid "%s, reported at %s" msgstr "Gemeldet von %s um %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:282 perllib/FixMyStreet/Cobrand/UK.pm:294 +#: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295 msgid "%s, within %s ward" msgstr "" @@ -115,9 +120,9 @@ msgstr "" msgid "© <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors" msgstr "" -#: templates/web/zurich/report/new/fill_in_details_form.html:53 +#: templates/web/zurich/report/new/fill_in_details_form.html:46 msgid "(Defect & location of defect)" -msgstr "(Schaden & Ort des Schadens)" +msgstr "" #: templates/web/base/admin/report_blocks.html:41 #: templates/web/base/admin/users.html:31 @@ -143,13 +148,13 @@ msgstr "" msgid "(alternatively the RSS feed can be customised, within %s)" msgstr "" -#: templates/web/base/report/_item.html:27 -#: templates/web/zurich/report/_item.html:21 +#: templates/web/base/report/_item.html:25 +#: templates/web/zurich/report/_item.html:19 msgid "(closed)" msgstr "(beantwortet)" -#: templates/web/base/report/_item.html:25 -#: templates/web/zurich/report/_item.html:19 +#: templates/web/base/report/_item.html:23 +#: templates/web/zurich/report/_item.html:17 msgid "(fixed)" msgstr "(beantwortet)" @@ -157,37 +162,28 @@ msgstr "(beantwortet)" msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)" msgstr "(z.B. illegale Deponien, Strassenschäden, Graffitis usw.)" -#: templates/web/base/report/_item.html:21 +#: templates/web/base/report/_item.html:19 msgid "(not sent to council)" msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:200 #: templates/web/zurich/report/new/fill_in_details_form.html:82 msgid "(optional)" msgstr "(optional)" -#: templates/web/fixmystreet/report/public_label.html:1 +#: templates/web/base/report/public_label.html:1 msgid "(public)" msgstr "" -#: templates/web/base/report/_item.html:20 +#: templates/web/base/report/_item.html:18 msgid "(sent to both)" msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:194 -msgid "(we never show your email address or phone number)" -msgstr "(Ihre E-Mail Adresse und Telefonnummer werden nie angezeigt)" - -#: templates/web/base/report/update-form.html:159 -msgid "(we never show your email)" -msgstr "(Ihre E-Mail Adresse wird nie angezeigt)" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:673 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 #: perllib/FixMyStreet/DB/Result/Problem.pm:410 msgid "-- Pick a category --" msgstr "-- Wählen Sie eine Kategorie --" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:637 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:632 #: perllib/FixMyStreet/DB/Result/Problem.pm:416 msgid "-- Pick a property type --" msgstr "" @@ -204,53 +200,41 @@ msgstr "" #. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories") #: templates/web/base/reports/_list-filters.html:27 msgid "<label>Show %s</label> <label>about %s</label>" -msgstr "<label>Zeige %s</label> <label>über %s</label>" +msgstr "" -#: templates/web/base/admin/index.html:32 +#: templates/web/base/status/stats.html:18 #: templates/web/zurich/admin/index.html:4 msgid "<strong>%s</strong> live problems" -msgstr "<strong>%d</strong> Meldungen Total" +msgstr "<strong>%s</strong> Meldungen Total" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:39 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:2 msgid "<strong>No</strong> Let me confirm my report by email" msgstr "Meldung per E-Mail bestätigen" -#: templates/web/fixmystreet/report/update-form.html:112 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:2 msgid "<strong>No</strong> Let me confirm my update by email" msgstr "" -#: templates/web/base/auth/general.html:48 +#: templates/web/base/auth/general.html:87 #: templates/web/zurich/auth/general.html:51 msgid "<strong>No</strong> let me sign in by email" msgstr "Neu Registrieren" -#: templates/web/base/report/new/fill_in_details_form.html:145 -msgid "<strong>No</strong>, let me confirm my report by email:" -msgstr "" - -#: templates/web/base/report/update-form.html:118 -msgid "<strong>No</strong>, let me confirm my update by email:" -msgstr "" - -#: templates/web/base/auth/general.html:34 -#: templates/web/base/report/new/fill_in_details_form.html:123 -#: templates/web/base/report/update-form.html:96 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:15 -#: templates/web/fixmystreet/report/update-form.html:89 +#: templates/web/base/auth/general.html:70 +#: templates/web/base/report/new/form_user_loggedout_password.html:3 +#: templates/web/base/report/update/form_user_loggedout_password.html:2 msgid "<strong>Yes</strong> I have a password" msgstr "Passwort" -#: templates/web/base/static/about-en-gb.html:1 -#: templates/web/base/static/about-en-gb.html:3 +#: templates/web/base/about/about-en-gb.html:1 +#: templates/web/base/about/about-en-gb.html:3 msgid "About us" msgstr "Über uns" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:8 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:31 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:29 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:35 msgid "Action Scheduled" msgstr "" @@ -281,7 +265,7 @@ msgstr "Füge neue Kategorie hinzu" msgid "Add user" msgstr "User hinzufügen" -#: templates/web/base/my/my.html:52 +#: templates/web/base/my/my.html:56 msgid "Added %s" msgstr "" @@ -301,8 +285,7 @@ msgstr "" msgid "Alert %d disabled (created %s)" msgstr "" -#: templates/web/base/report/update-form.html:164 -#: templates/web/fixmystreet/report/update-form.html:150 +#: templates/web/base/report/update/form_name.html:20 msgid "Alert me to future updates" msgstr "" @@ -334,10 +317,8 @@ msgstr "" #: templates/web/base/report/new/councils_text_all.html:2 #: templates/web/base/report/new/councils_text_all.html:4 -#: templates/web/base/report/new/fill_in_details_form.html:12 -#: templates/web/base/report/new/fill_in_details_form.html:14 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:10 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:11 +#: templates/web/base/report/new/fill_in_details_form.html:10 +#: templates/web/base/report/new/fill_in_details_form.html:9 msgid "All the information you provide here will be sent to <strong>%s</strong>." msgstr "" @@ -359,6 +340,10 @@ msgstr "Anonym" msgid "Are you a developer?" msgstr "" +#: templates/web/base/js/translation_strings.html:52 +msgid "Are you sure you want to cancel this upload?" +msgstr "" + #: templates/web/base/admin/body-form.html:69 #: templates/web/base/admin/body.html:16 #: templates/web/zurich/admin/body-form.html:24 @@ -391,16 +376,16 @@ msgstr "An Fachbereich zuweisen" msgid "Assigned to %s" msgstr "Besten Dank für Ihre Meldung. Wir haben Ihr Anliegen an %s weitergeleitet, da es nicht in den Zuständigkeitsbereich der am Pilot beteiligten Fachbereiche fällt.<br/>Freundliche Grüsse <br/>Ihre Stadt Zürich" -#: templates/web/base/open311/index.html:84 +#: templates/web/base/open311/index.html:76 msgid "At most %d requests are returned in each query. The returned requests are ordered by requested_datetime, so to get all requests, do several searches with rolling start_date and end_date." msgstr "" -#: templates/web/base/open311/index.html:76 +#: templates/web/base/open311/index.html:68 msgid "At the moment only searching for and looking at reports work." msgstr "" #: perllib/FixMyStreet/DB/Result/Problem.pm:373 -#: templates/web/zurich/report/_item.html:11 +#: templates/web/zurich/report/_item.html:9 msgid "Awaiting moderation" msgstr "Ãœberprüfung ausstehend" @@ -412,7 +397,7 @@ msgstr "Zurück" msgid "Ban email address" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1274 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1285 #: perllib/FixMyStreet/Cobrand/Zurich.pm:392 #: templates/web/base/admin/bodies.html:1 templates/web/zurich/header.html:64 msgid "Bodies" @@ -435,14 +420,14 @@ msgstr "" #: templates/web/base/auth/token.html:21 templates/web/base/email_sent.html:18 msgid "Can’t find our email? Check your spam folder – that’s the solution 99% of the time." -msgstr "Falls Sie kein E-Mail erhalten haben, überprüfen Sie bitte Ihren Spamordner." +msgstr "" #: templates/web/base/around/_report_banner.html:5 msgid "Can't see the map? <em>Skip this step</em>" msgstr "Karte nicht sichtbar? <em>Überspringen Sie diesen Schritt</em>" #: templates/web/base/admin/body.html:68 -#: templates/web/base/admin/index.html:62 +#: templates/web/base/admin/index.html:54 #: templates/web/base/report/new/category.html:10 #: templates/web/base/report/new/category_wrapper.html:3 #: templates/web/zurich/admin/body.html:14 @@ -453,6 +438,7 @@ msgstr "Karte nicht sichtbar? <em>Überspringen Sie diesen Schritt</em>" msgid "Category" msgstr "Kategorie" +#: templates/web/base/admin/index.html:52 #: templates/web/base/admin/index.html:60 msgid "Category fix rate for problems > 4 weeks old" msgstr "" @@ -466,7 +452,7 @@ msgstr "" msgid "Category:" msgstr "Kategorie:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:399 +#: perllib/FixMyStreet/Script/Reports.pm:180 msgid "Category: %s" msgstr "Kategorie: %s" @@ -516,25 +502,25 @@ msgid "Click here or enter as dd/mm/yyyy" msgstr "" #: templates/web/base/around/_report_banner.html:2 -#: templates/web/base/js/translation_strings.html:50 +#: templates/web/base/js/translation_strings.html:55 msgid "Click map to report a problem" msgstr "Schaden lokalisieren" #: templates/web/base/email_sent.html:13 msgid "Click the link in our confirmation email to activate your alert." -msgstr "Klicken Sie auf den Link im Bestätigungsmail um diese Benachrichtigung zu aktivieren." +msgstr "" #: templates/web/base/email_sent.html:9 msgid "Click the link in our confirmation email to publish your problem." -msgstr "Klicken Sie auf den Link im Bestätigungsmail um über den Bearbeitungsstand Ihrer Meldung informiert zu bleiben." +msgstr "" #: templates/web/base/email_sent.html:11 msgid "Click the link in our confirmation email to publish your update." -msgstr "Klicken Sie auf den Link im Bestätigungsmail um diese Überarbeitung zu veröffentlichen." +msgstr "" #: templates/web/base/auth/token.html:18 msgid "Click the link in our confirmation email to sign in." -msgstr "Klicken Sie auf den Link im Bestätigungsemail um sich anzumelden." +msgstr "" #: perllib/FixMyStreet/Cobrand/Zurich.pm:196 #: perllib/FixMyStreet/Cobrand/Zurich.pm:969 @@ -543,7 +529,7 @@ msgstr "Klicken Sie auf den Link im Bestätigungsemail um sich anzumelden." #: templates/web/base/admin/report_blocks.html:25 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:144 -#: templates/web/fixmystreet/report/banner.html:15 +#: templates/web/base/report/banner.html:15 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:10 #: templates/web/zurich/admin/header.html:16 @@ -551,7 +537,7 @@ msgstr "Klicken Sie auf den Link im Bestätigungsemail um sich anzumelden." msgid "Closed" msgstr "Beantwortet" -#: perllib/FixMyStreet/DB/Result/Problem.pm:794 +#: perllib/FixMyStreet/DB/Result/Problem.pm:779 msgid "Closed by council" msgstr "" @@ -577,7 +563,7 @@ msgstr "" msgid "Cobrand:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1281 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1292 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "" @@ -592,11 +578,11 @@ msgstr "Bestätigen" #: templates/web/base/auth/token.html:1 msgid "Confirm account" -msgstr "Account bestätigen" +msgstr "" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:33 -#: templates/web/fixmystreet/report/update-form.html:107 -msgid "Confirm by email below, providing a new password at that point. When you confirm, your password will be updated." +#: templates/web/base/report/new/form_user_loggedout_password.html:21 +#: templates/web/base/report/update/form_user_loggedout_password.html:20 +msgid "Confirm by email instead, providing a new password at that point. When you confirm, your password will be updated." msgstr "" #: templates/web/base/questionnaire/creator_fixed.html:1 @@ -626,23 +612,17 @@ msgid "Confirmed:" msgstr "Bestätigt:" #. ("%s is the site name") -#: templates/web/base/faq/faq-en-gb.html:8 templates/web/base/footer.html:24 -#: templates/web/base/open311/index.html:8 -#: templates/web/base/static/privacy.html:10 -#: templates/web/fixmystreet/contact/index.html:12 +#: templates/web/base/about/_sidebar.html:6 templates/web/base/footer.html:24 msgid "Contact %s" -msgstr "%s kontaktieren" +msgstr "" #: templates/web/base/contact/index.html:1 #: templates/web/base/contact/index.html:2 #: templates/web/base/contact/submit.html:1 -#: templates/web/fixmystreet/contact/index.html:1 -#: templates/web/fixmystreet/contact/index.html:2 msgid "Contact Us" msgstr "" -#: templates/web/base/contact/index.html:6 -#: templates/web/fixmystreet/contact/index.html:20 +#: templates/web/base/contact/index.html:12 msgid "Contact the team" msgstr "" @@ -651,8 +631,8 @@ msgstr "" msgid "Coordinates:" msgstr "Koordinaten" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1418 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1446 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1429 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1457 msgid "Could not find user" msgstr "" @@ -670,7 +650,7 @@ msgstr "" msgid "Council contacts for %s" msgstr "Kontaktdetails von %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:693 +#: perllib/FixMyStreet/DB/Result/Problem.pm:681 msgid "Council ref: %s" msgstr "" @@ -733,7 +713,7 @@ msgstr "" msgid "Dealt with by subdivision within 5 working days" msgstr "Innerhalb von fünf Arbeitstagen abgeschlossen" -#: perllib/FixMyStreet/App/Controller/Admin.pm:876 +#: perllib/FixMyStreet/App/Controller/Admin.pm:877 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "Vorlage löschen" @@ -746,7 +726,7 @@ msgstr "Vorlage löschen" msgid "Deleted" msgstr "Gelöscht" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:51 +#: templates/web/base/report/new/form_report.html:45 #: templates/web/zurich/admin/index-dm.html:22 #: templates/web/zurich/admin/index-sdm.html:20 #: templates/web/zurich/admin/reports.html:12 @@ -754,12 +734,11 @@ msgid "Description" msgstr "Beschreibung" #: templates/web/base/js/translation_strings.html:34 -#: templates/web/zurich/report/new/fill_in_details_form.html:42 +#: templates/web/zurich/report/new/fill_in_details_form.html:68 msgid "Details" msgstr "Beschreibung" #: templates/web/base/admin/report_edit.html:20 -#: templates/web/base/report/new/fill_in_details_form.html:62 #: templates/web/zurich/admin/report_edit-sdm.html:27 #: templates/web/zurich/admin/report_edit.html:29 #: templates/web/zurich/admin/report_edit.html:43 @@ -780,28 +759,30 @@ msgid "Diligency prize league table" msgstr "Weiss ich nicht" #. ("%s is the site name") -#: templates/web/base/auth/general.html:31 -#: templates/web/base/report/new/fill_in_details_form.html:114 -#: templates/web/base/report/update-form.html:87 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:11 -#: templates/web/fixmystreet/report/update-form.html:86 +#: templates/web/base/auth/general.html:48 +#: templates/web/base/report/new/form_user_loggedout.html:18 +#: templates/web/base/report/new/oauth_email_form.html:18 +#: templates/web/base/report/update-form.html:29 +#: templates/web/base/report/update/form_user_loggedout.html:17 msgid "Do you have a %s password?" -msgstr "Haben Sie ein %s Passwort?" +msgstr "" #: templates/web/base/questionnaire/index.html:55 msgid "Don’t know" msgstr "" -#: templates/web/fixmystreet/contact/index.html:118 +#: templates/web/base/contact/index.html:110 msgid "Don't like forms?" msgstr "" +#: templates/web/base/js/translation_strings.html:51 +msgid "Drag and drop photos here or <u>click to upload</u>" +msgstr "" + #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:14 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:32 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:30 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:36 msgid "Duplicate" msgstr "" @@ -851,7 +832,7 @@ msgstr "" #: templates/web/base/admin/category_edit.html:91 #: templates/web/base/admin/flagged.html:38 #: templates/web/base/admin/users.html:16 -#: templates/web/base/auth/general.html:22 +#: templates/web/base/auth/general.html:39 #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:24 @@ -859,7 +840,7 @@ msgstr "" msgid "Email" msgstr "E-Mail" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1394 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1405 msgid "Email added to abuse list" msgstr "" @@ -875,7 +856,7 @@ msgstr "E-Mail Benachrichtigung erstellt" msgid "Email alert deleted" msgstr "E-Mail Benachrichtigung gelöscht" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1391 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1402 msgid "Email already in abuse list" msgstr "" @@ -883,41 +864,36 @@ msgstr "" msgid "Email me new local problems" msgstr "" -#: templates/web/base/report/display.html:38 -msgid "Email me updates" -msgstr "Schicken Sie mir Aktualisierungen" - #: templates/web/base/admin/category_edit.html:31 #: templates/web/base/admin/report_edit.html:62 #: templates/web/base/admin/update_edit.html:33 #: templates/web/base/admin/user-form.html:20 #: templates/web/base/alert/updates.html:13 -#: templates/web/base/report/display.html:42 #: templates/web/zurich/admin/body.html:47 msgid "Email:" msgstr "E-mail:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:326 +#: perllib/FixMyStreet/Script/Reports.pm:108 msgid "Email: %s" msgstr "E-mail:" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:639 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:634 msgid "Empty flat or maisonette" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:638 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:633 msgid "Empty house or bungalow" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:641 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:636 msgid "Empty office or other commercial" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:642 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:637 msgid "Empty pub or bar" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:643 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:638 msgid "Empty public building - school, hospital, etc." msgstr "" @@ -950,7 +926,7 @@ msgstr "" msgid "Enter a Zürich street name" msgstr "Ungefähre Adresse des Schadens" -#: perllib/FixMyStreet/Cobrand/UK.pm:13 +#: perllib/FixMyStreet/Cobrand/UK.pm:14 msgid "Enter a nearby UK postcode, or street name and area" msgstr "Geben Sie eine Adresse an" @@ -968,14 +944,9 @@ msgstr "Ungefähre Adresse des Schadens" msgid "Enter a nearby street name and area, postal code or district in Delhi" msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:152 -#: templates/web/base/report/update-form.html:125 -msgid "Enter a new password:" -msgstr "" - -#: templates/web/base/auth/general.html:60 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:75 -#: templates/web/fixmystreet/report/update-form.html:123 +#: templates/web/base/auth/general.html:99 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:38 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:13 #: templates/web/zurich/auth/general.html:65 msgid "Enter a password" msgstr "Ihr Passwort" @@ -985,28 +956,28 @@ msgid "Enter details of the problem" msgstr "Beschreiben Sie den Schaden" #: templates/web/base/errors/generic.html:1 -#: templates/web/base/errors/generic.html:3 +#: templates/web/base/errors/generic.html:4 #: templates/web/base/tokens/abuse.html:1 #: templates/web/base/tokens/abuse.html:3 #: templates/web/base/tokens/error.html:1 -#: templates/web/base/tokens/error.html:3 +#: templates/web/base/tokens/error.html:5 msgid "Error" msgstr "Fehler" #: templates/web/base/reports/_list-filters.html:12 msgid "Everything" -msgstr "Alles" +msgstr "" #: templates/web/base/admin/body.html:14 #: templates/web/base/admin/category_edit.html:18 msgid "Example postcode %s" msgstr "Beispieladresse" -#: templates/web/base/open311/index.html:94 +#: templates/web/base/open311/index.html:86 msgid "Examples:" msgstr "Beispiele:" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:55 +#: templates/web/base/report/new/form_report.html:49 msgid "Explain what’s wrong, exactly where it is, and how long it’s been there…" msgstr "" @@ -1047,17 +1018,15 @@ msgstr "" msgid "FixMyStreet" msgstr "" -#: templates/web/base/admin/index.html:62 +#: templates/web/base/admin/index.html:54 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:24 #: templates/web/base/admin/report_blocks.html:9 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:144 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:34 -#: templates/web/fixmystreet/report/banner.html:12 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:32 +#: templates/web/base/report/banner.html:12 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:38 msgid "Fixed" msgstr "Beantwortet" @@ -1084,7 +1053,7 @@ msgstr "Als gelöscht markieren" msgid "Flag user" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1279 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1290 #: templates/web/base/admin/users.html:19 msgid "Flagged" msgstr "" @@ -1115,8 +1084,8 @@ msgstr "" msgid "For more information, see <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>." msgstr "" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:32 -#: templates/web/fixmystreet/report/update-form.html:106 +#: templates/web/base/report/new/form_user_loggedout_password.html:20 +#: templates/web/base/report/update/form_user_loggedout_password.html:19 msgid "Forgotten your password?" msgstr "Ihr Passwort" @@ -1128,21 +1097,18 @@ msgstr "An externe Stelle weitergeleitet" msgid "Forwarded wish to external body" msgstr "Wunsch an externe Stelle weitergeleitet" -#: templates/web/base/faq/faq-en-gb.html:1 -#: templates/web/base/faq/faq-en-gb.html:13 -#: templates/web/base/faq/faq-en-gb.html:6 -#: templates/web/base/open311/index.html:6 -#: templates/web/base/static/privacy.html:8 -#: templates/web/fixmystreet/contact/index.html:10 +#: templates/web/base/about/_sidebar.html:4 +#: templates/web/base/about/faq-en-gb.html:1 +#: templates/web/base/about/faq-en-gb.html:5 msgid "Frequently Asked Questions" msgstr "Hilfe" -#: templates/web/base/open311/index.html:136 +#: templates/web/base/open311/index.html:128 msgid "GeoRSS on Google Maps" msgstr "" +#: templates/web/base/report/display_tools.html:11 #: templates/web/fixmystreet/around/_updates.html:3 -#: templates/web/fixmystreet/report/display.html:35 msgid "Get updates" msgstr "" @@ -1175,7 +1141,7 @@ msgstr "Los" msgid "Going to send questionnaire?" msgstr "" -#: templates/web/base/admin/index.html:42 +#: templates/web/base/admin/index.html:35 msgid "Graph of problem creation by status over time" msgstr "Grafik der Meldungen nach Status und Zeit" @@ -1192,7 +1158,7 @@ msgid "Have you ever reported a problem to a council before, or is this your fir msgstr "" #: templates/web/base/footer.html:15 templates/web/fixmystreet/footer.html:38 -#: templates/web/zurich/faq/faq-de-ch.html:1 +#: templates/web/zurich/about/faq-de-ch.html:1 #: templates/web/zurich/footer.html:22 #: templates/web/zurich/nav_over_content.html:8 msgid "Help" @@ -1261,10 +1227,6 @@ msgstr "" msgid "I'm afraid we couldn't locate your problem in the database.\n" msgstr "" -#: perllib/FixMyStreet/App/Controller/Tokens.pm:327 -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 URL kopiert haben.\n" - #: templates/web/base/admin/flagged.html:14 #: templates/web/base/admin/list_updates.html:6 #: templates/web/base/admin/reports.html:11 @@ -1293,8 +1255,8 @@ msgstr "" msgid "If you get some more information about the status of your problem, please come back to the site and leave an update." msgstr "" -#: templates/web/base/report/new/councils_text_none.html:2 -#: templates/web/base/report/new/councils_text_none.html:8 +#: templates/web/base/report/new/councils_text_none.html:10 +#: templates/web/base/report/new/councils_text_none.html:9 msgid "If you submit a problem here the subject and details of the problem will be public, but the problem will <strong>not</strong> be reported to the council." msgstr "" @@ -1341,10 +1303,8 @@ msgstr "" #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:144 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:32 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:30 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:36 msgid "In Progress" msgstr "In Bearbeitung" @@ -1352,7 +1312,7 @@ msgstr "In Bearbeitung" msgid "In abuse table?" msgstr "" -#: templates/web/base/open311/index.html:88 +#: templates/web/base/open311/index.html:80 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 "" @@ -1360,7 +1320,7 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/Zurich.pm:963 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:7 -#: templates/web/fixmystreet/report/banner.html:19 +#: templates/web/base/report/banner.html:19 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:8 msgid "In progress" @@ -1395,7 +1355,7 @@ msgstr "" msgid "Invalid agency_responsible value %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1199 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1210 msgid "Invalid end date" msgstr "Ung&ultiges Enddatum" @@ -1403,7 +1363,7 @@ msgstr "Ung&ultiges Enddatum" msgid "Invalid format %s specified." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1195 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1206 msgid "Invalid start date" msgstr "Ung&ultiges Startdatum" @@ -1411,14 +1371,12 @@ msgstr "Ung&ultiges Startdatum" #: templates/web/base/admin/report_blocks.html:5 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:143 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:31 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:29 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:35 msgid "Investigating" msgstr "" -#: templates/web/fixmystreet/contact/blurb.html:8 +#: templates/web/base/contact/blurb.html:8 msgid "It's often quickest to <a href=\"%s\">check our FAQs</a> and see if the answer is there." msgstr "" @@ -1436,11 +1394,9 @@ msgstr "Zuständigkeit unbekannt" msgid "Jurisdiction unknown" msgstr "Zuständigkeit unbekannt" -#: templates/web/base/auth/general.html:44 -#: templates/web/base/report/new/fill_in_details_form.html:132 -#: templates/web/base/report/update-form.html:105 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:28 -#: templates/web/fixmystreet/report/update-form.html:102 +#: templates/web/base/auth/general.html:80 +#: templates/web/base/report/new/form_user_loggedout_password.html:16 +#: templates/web/base/report/update/form_user_loggedout_password.html:15 #: templates/web/zurich/auth/general.html:40 msgid "Keep me signed in on this computer" msgstr "Angemeldet bleiben" @@ -1498,6 +1454,7 @@ msgid "MAP" msgstr "" #: templates/web/base/js/translation_strings.html:45 +#: templates/web/base/maps/google-ol.html:13 msgid "Map" msgstr "" @@ -1517,7 +1474,7 @@ msgstr "" msgid "Marked fixed/closed more than eight weeks ago" msgstr "" -#: templates/web/fixmystreet/contact/index.html:106 +#: templates/web/base/contact/index.html:98 msgid "Message" msgstr "Nachricht" @@ -1529,10 +1486,6 @@ msgstr "Nachricht an zuständige Stelle" msgid "Message to external body:" msgstr "Nachricht an zuständige Stelle" -#: templates/web/base/contact/index.html:97 -msgid "Message:" -msgstr "Nachricht:" - #: perllib/FixMyStreet/App/Controller/Open311.pm:445 msgid "Missing jurisdiction_id" msgstr "" @@ -1545,10 +1498,6 @@ msgstr "Innerhalb eines Arbeitstages moderiert" msgid "Month" msgstr "Monat" -#: templates/web/base/report/display.html:34 -msgid "More problems nearby" -msgstr "Meldungen in der Nähe" - #: templates/web/base/admin/bodies.html:21 #: templates/web/base/admin/body-form.html:18 #: templates/web/base/admin/flagged.html:16 @@ -1556,11 +1505,11 @@ msgstr "Meldungen in der Nähe" #: templates/web/base/admin/list_updates.html:7 #: templates/web/base/admin/reports.html:13 #: templates/web/base/admin/users.html:15 -#: templates/web/base/auth/general.html:50 +#: templates/web/base/auth/general.html:89 +#: templates/web/base/report/new/form_user_loggedin.html:9 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:7 +#: templates/web/base/report/update/form_name.html:4 #: templates/web/base/reports/index.html:20 -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:9 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:44 -#: templates/web/fixmystreet/report/update-form.html:138 #: templates/web/zurich/admin/body-form.html:4 #: templates/web/zurich/auth/general.html:60 #: templates/web/zurich/report/new/fill_in_details_form.html:82 @@ -1574,7 +1523,7 @@ msgstr "Name" msgid "Name:" msgstr "Name:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:325 +#: perllib/FixMyStreet/Script/Reports.pm:107 msgid "Name: %s" msgstr "Name: %s" @@ -1583,16 +1532,16 @@ msgstr "Name: %s" msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:127 +#: perllib/FixMyStreet/Cobrand/UK.pm:128 msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:434 -#: perllib/FixMyStreet/Cobrand/Default.pm:474 +#: perllib/FixMyStreet/Cobrand/Default.pm:455 +#: perllib/FixMyStreet/Cobrand/Default.pm:495 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:267 +#: perllib/FixMyStreet/Script/Alerts.pm:290 msgid "" "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n" "\n" @@ -1600,17 +1549,17 @@ msgstr "" #: templates/web/base/auth/token.html:17 templates/web/base/email_sent.html:5 msgid "Nearly done! Now check your email…" -msgstr "Fast Fertig! Bitte checken Sie Ihre Mailbox..." +msgstr "" #: templates/web/base/reports/index.html:21 msgid "New <br>problems" msgstr "Neue <br>Meldungen" -#: perllib/FixMyStreet/App/Controller/Admin.pm:259 +#: perllib/FixMyStreet/App/Controller/Admin.pm:261 msgid "New body added" msgstr "Neue Organisation hinzugefügt" -#: perllib/FixMyStreet/App/Controller/Admin.pm:385 +#: perllib/FixMyStreet/App/Controller/Admin.pm:387 msgid "New category contact added" msgstr "" @@ -1675,8 +1624,8 @@ msgstr "Weiter" #: templates/web/base/admin/report_edit.html:75 #: templates/web/base/admin/update_edit.html:25 #: templates/web/base/questionnaire/creator_fixed.html:16 +#: templates/web/base/questionnaire/index.html:101 #: templates/web/base/questionnaire/index.html:53 -#: templates/web/base/questionnaire/index.html:92 msgid "No" msgstr "Nein" @@ -1740,10 +1689,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:13 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:33 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:31 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:37 msgid "Not Responsible" msgstr "" @@ -1782,7 +1729,7 @@ msgstr "" msgid "Note:" msgstr "" -#: templates/web/base/open311/index.html:73 +#: templates/web/base/open311/index.html:65 msgid "Note: <strong>%s</strong>" msgstr "" @@ -1790,13 +1737,15 @@ msgstr "" msgid "Notes from SDM to DM" msgstr "Nachrichten an die Kommunikationstelle" -#: templates/web/base/report/new/fill_in_details_form.html:113 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:10 +#: templates/web/base/report/new/form_user_loggedout.html:14 +#: templates/web/base/report/new/form_user_loggedout.html:2 +#: templates/web/base/report/new/oauth_email_form.html:17 msgid "Now to submit your report…" msgstr "" -#: templates/web/base/report/update-form.html:86 -#: templates/web/fixmystreet/report/update-form.html:85 +#: templates/web/base/report/update-form.html:28 +#: templates/web/base/report/update/form_user_loggedout.html:13 +#: templates/web/base/report/update/form_user_loggedout.html:2 msgid "Now to submit your update…" msgstr "" @@ -1804,11 +1753,6 @@ msgstr "" msgid "OK" msgstr "" -#: templates/web/base/report/display.html:28 -#: templates/web/base/report/update.html:17 -msgid "Offensive? Unsuitable? Tell us" -msgstr "" - #: templates/web/base/reports/index.html:23 msgid "Old / unknown <br>problems" msgstr "" @@ -1825,7 +1769,7 @@ msgstr "" msgid "Older <br>problems" msgstr "" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:45 +#: templates/web/base/report/new/form_report.html:15 msgid "One-line summary" msgstr "" @@ -1836,8 +1780,7 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:4 #: templates/web/base/admin/update_edit.html:28 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/report/update-form.html:30 -#: templates/web/fixmystreet/report/update-form.html:28 +#: templates/web/base/report/update/form_update.html:34 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:7 #: templates/web/zurich/admin/update_edit.html:18 @@ -1852,15 +1795,15 @@ msgstr "" msgid "Open, but not had any update in eight weeks" msgstr "" -#: templates/web/base/open311/index.html:70 +#: templates/web/base/open311/index.html:62 msgid "Open311 API for the mySociety FixMyStreet server" msgstr "" -#: templates/web/base/open311/index.html:80 +#: templates/web/base/open311/index.html:72 msgid "Open311 initiative web page" msgstr "" -#: templates/web/base/open311/index.html:81 +#: templates/web/base/open311/index.html:73 msgid "Open311 specification" msgstr "" @@ -1872,15 +1815,15 @@ msgstr "" msgid "Or you can subscribe to an alert based upon what ward or council you’re in:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1084 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:673 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:674 -#: perllib/FixMyStreet/DB/Result/Problem.pm:570 -#: perllib/FixMyStreet/DB/Result/Problem.pm:580 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1055 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:669 +#: perllib/FixMyStreet/DB/Result/Problem.pm:558 +#: perllib/FixMyStreet/DB/Result/Problem.pm:568 +#: perllib/FixMyStreet/DB/Result/Problem.pm:578 #: perllib/FixMyStreet/DB/Result/Problem.pm:590 -#: perllib/FixMyStreet/DB/Result/Problem.pm:602 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:394 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:409 +#: perllib/FixMyStreet/Script/Reports.pm:175 +#: perllib/FixMyStreet/Script/Reports.pm:190 msgid "Other" msgstr "" @@ -1889,7 +1832,7 @@ msgid "Owner" msgstr "Besitzer" #: templates/web/base/errors/page_error_404_not_found.html:1 -#: templates/web/base/errors/page_error_404_not_found.html:3 +#: templates/web/base/errors/page_error_404_not_found.html:4 msgid "Page Not Found" msgstr "" @@ -1903,16 +1846,16 @@ msgstr "Gehört zu" msgid "Partial" msgstr "" -#: templates/web/base/auth/general.html:53 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:68 -#: templates/web/fixmystreet/report/update-form.html:116 +#: templates/web/base/auth/general.html:92 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:31 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:6 #: templates/web/zurich/auth/general.html:32 #: templates/web/zurich/auth/general.html:63 msgid "Password (optional)" msgstr "Passwort" #: templates/web/base/auth/change_password.html:25 -#: templates/web/base/auth/general.html:36 +#: templates/web/base/auth/general.html:72 msgid "Password:" msgstr "" @@ -1924,29 +1867,29 @@ msgstr "" msgid "Phone number" msgstr "Telefonnummer" -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:26 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:62 +#: templates/web/base/report/new/form_user_loggedin.html:26 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:25 msgid "Phone number (optional)" msgstr "Telefonnummer (optional)" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:303 +#: perllib/FixMyStreet/Script/Reports.pm:83 #: templates/web/base/admin/report_edit.html:63 -#: templates/web/base/report/new/fill_in_details_form.html:198 #: templates/web/zurich/admin/stats.html:39 msgid "Phone:" msgstr "Telefonnummer:" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:66 -#: templates/web/fixmystreet/report/update-form.html:59 +#: templates/web/base/questionnaire/index.html:75 +#: templates/web/base/report/new/form_report.html:23 +#: templates/web/base/report/update/form_update.html:6 #: templates/web/zurich/admin/index-dm.html:29 #: templates/web/zurich/admin/index-sdm.html:24 #: templates/web/zurich/admin/reports.html:16 #: templates/web/zurich/admin/stats.html:37 -#: templates/web/zurich/report/new/fill_in_details_form.html:52 +#: templates/web/zurich/report/new/fill_in_details_form.html:45 msgid "Photo" msgstr "Foto" -#: perllib/FixMyStreet/App/Controller/Photo.pm:221 +#: perllib/FixMyStreet/App/Controller/Photo.pm:187 msgid "Photo is required." msgstr "Foto wird benötigt" @@ -1954,13 +1897,7 @@ msgstr "Foto wird benötigt" msgid "Photo required" msgstr "Foto benötigt" -#: templates/web/base/questionnaire/index.html:80 -#: templates/web/base/report/new/fill_in_details_form.html:84 -#: templates/web/base/report/update-form.html:62 -msgid "Photo:" -msgstr "Foto:" - -#: templates/web/base/alert/list.html:26 +#: templates/web/base/alert/list.html:23 msgid "Photos of recent nearby reports" msgstr "Fotos von neuen Meldungen in der Nähe" @@ -1989,16 +1926,16 @@ msgstr "Bitte seien Sie freundlich und prägnant." msgid "Please check the passwords and try again" msgstr "" -#: templates/web/base/auth/general.html:10 -#: templates/web/base/auth/general.html:16 +#: templates/web/base/auth/general.html:27 +#: templates/web/base/auth/general.html:33 #: templates/web/zurich/auth/general.html:3 #: templates/web/zurich/auth/general.html:9 msgid "Please check your email address is correct" msgstr "Bitte überprüfen Sie ob Ihre E-Mail Adresse korrekt ist" -#: perllib/FixMyStreet/App/Controller/Admin.pm:341 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:883 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:948 +#: perllib/FixMyStreet/App/Controller/Admin.pm:343 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:878 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:943 #: perllib/FixMyStreet/DB/Result/Problem.pm:412 #: templates/web/base/js/translation_strings.html:9 msgid "Please choose a category" @@ -2008,12 +1945,11 @@ msgstr "Bitte wählen Sie eine Kategorie" msgid "Please choose a property type" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:376 +#: perllib/FixMyStreet/App/Controller/Admin.pm:378 msgid "Please correct the errors below" msgstr "" -#: templates/web/base/contact/blurb.html:2 -#: templates/web/fixmystreet/contact/blurb.html:12 +#: templates/web/base/contact/blurb.html:12 msgid "" "Please do <strong>not</strong> report problems through this form; messages go to\n" "the team behind this site, not a council. To report a problem,\n" @@ -2024,12 +1960,18 @@ msgstr "" msgid "Please do not be abusive — abusing your council devalues the service for all users." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:344 -#: perllib/FixMyStreet/DB/Result/Comment.pm:126 +#: perllib/FixMyStreet/App/Controller/Admin.pm:346 +#: perllib/FixMyStreet/DB/Result/Comment.pm:125 #: templates/web/base/js/translation_strings.html:2 msgid "Please enter a message" msgstr "" +#: perllib/FixMyStreet/App/Controller/Admin.pm:1091 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1146 +#, fuzzy +msgid "Please enter a name" +msgstr "Bitte geben Sie Ihren Namen an" + #: templates/web/base/auth/change_password.html:12 #: templates/web/base/auth/change_password.html:15 #: templates/web/base/js/translation_strings.html:19 @@ -2042,10 +1984,10 @@ msgstr "Obligatorisches Feld" msgid "Please enter a subject" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1082 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1135 -#: perllib/FixMyStreet/App/Controller/Admin.pm:343 -#: perllib/FixMyStreet/DB/Result/User.pm:127 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1087 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1142 +#: perllib/FixMyStreet/App/Controller/Admin.pm:345 +#: perllib/FixMyStreet/DB/Result/User.pm:133 #: templates/web/base/js/translation_strings.html:12 #: templates/web/base/js/translation_strings.html:16 msgid "Please enter a valid email" @@ -2062,9 +2004,9 @@ msgid "Please enter some details" msgstr "Bitte geben Sie einige Details an" #: perllib/FixMyStreet/App/Controller/Contact.pm:113 -#: perllib/FixMyStreet/DB/Result/User.pm:124 -#: templates/web/base/auth/general.html:10 -#: templates/web/base/auth/general.html:15 +#: perllib/FixMyStreet/DB/Result/User.pm:130 +#: templates/web/base/auth/general.html:27 +#: templates/web/base/auth/general.html:32 #: templates/web/base/js/translation_strings.html:11 #: templates/web/base/js/translation_strings.html:15 #: templates/web/zurich/auth/general.html:3 @@ -2072,7 +2014,7 @@ msgstr "Bitte geben Sie einige Details an" msgid "Please enter your email" msgstr "Ihre E-Mail Adresse" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:7 +#: templates/web/base/report/new/form_user_loggedout_email.html:7 #: templates/web/zurich/report/new/fill_in_details_form.html:80 msgid "Please enter your email address" msgstr "Ihre E-Mail Adresse" @@ -2081,15 +2023,15 @@ msgstr "Ihre E-Mail Adresse" msgid "Please enter your first name" msgstr "Bitte geben Sie Ihren Namen an" -#: perllib/FixMyStreet/Cobrand/UK.pm:318 +#: perllib/FixMyStreet/Cobrand/UK.pm:319 #: templates/web/base/js/translation_strings.html:7 msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below" msgstr "" #: perllib/FixMyStreet/App/Controller/Contact.pm:112 -#: perllib/FixMyStreet/DB/Result/Comment.pm:123 +#: perllib/FixMyStreet/DB/Result/Comment.pm:122 #: perllib/FixMyStreet/DB/Result/Problem.pm:406 -#: perllib/FixMyStreet/DB/Result/User.pm:120 +#: perllib/FixMyStreet/DB/Result/User.pm:126 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter your name" msgstr "Bitte geben Sie Ihren Namen an" @@ -2116,12 +2058,11 @@ msgstr "<a href=\"%s\">Erneut anmelden</a> oder <a href=\"/\">zurück zur St msgid "Please fill in details of the problem below." msgstr "" -#: templates/web/zurich/report/new/fill_in_details_form.html:46 +#: templates/web/zurich/report/new/fill_in_details_form.html:72 msgid "Please fill in details of the problem." msgstr "Beschreiben Sie den Schaden." -#: templates/web/base/report/new/fill_in_details_form.html:28 -#: templates/web/fixmystreet/report/new/sidebar.html:7 +#: templates/web/base/report/new/sidebar.html:7 #: templates/web/zurich/report/new/fill_in_details_form.html:20 msgid "Please fill in the form below with details of the problem, and describe the location as precisely as possible in the details box." msgstr "Füllen Sie das Formular mit den Details des Schadens aus und beschreiben Sie den Ort des Schadens möglichst genau." @@ -2130,20 +2071,23 @@ msgstr "Füllen Sie das Formular mit den Details des Schadens aus und beschr msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "" -#: templates/web/fixmystreet/report/updates-sidebar-notes.html:4 +#: templates/web/base/report/updates-sidebar-notes.html:2 msgid "Please note that updates are not sent to the council." msgstr "" -#: templates/web/base/report/update-form.html:7 -msgid "Please note that updates are not sent to the council. If you leave your name it will be public. Your information will only be used in accordance with our <a href=\"/faq#privacy\">privacy policy</a>" +#: templates/web/base/report/new/oauth_email_form.html:4 +msgid "Please note your report has <strong>not yet been sent</strong>." msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:8 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:21 +#: templates/web/base/report/new/fill_in_details_form.html:20 #: templates/web/zurich/report/new/fill_in_details_form.html:11 msgid "Please note your report has <strong>not yet been sent</strong>. Choose a category and add further information below, then submit." msgstr "" +#: templates/web/base/report/display.html:26 +msgid "Please note your update has <strong>not yet been posted</strong>." +msgstr "" + #: templates/web/base/report/new/notes.html:1 #: templates/web/zurich/report/new/notes.html:1 msgid "Please note:" @@ -2181,6 +2125,7 @@ msgstr "" #: perllib/FixMyStreet/App/Model/PhotoSet.pm:117 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:145 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:147 +#: templates/web/base/js/translation_strings.html:53 msgid "Please upload a JPEG image only" msgstr "Bitte laden Sie nur JPEG Bilder hoch." @@ -2188,18 +2133,14 @@ msgstr "Bitte laden Sie nur JPEG Bilder hoch." msgid "Please write a message" msgstr "" -#: templates/web/fixmystreet/report/update-form.html:23 +#: templates/web/base/report/update/form_update.html:29 msgid "Please write your update here" msgstr "" -#: templates/web/base/contact/index.html:100 -#: templates/web/base/report/update-form.html:110 -#: templates/web/base/report/update-form.html:132 -#: templates/web/base/report/update-form.html:72 -#: templates/web/fixmystreet/contact/index.html:113 -#: templates/web/fixmystreet/report/update-form.html:124 -#: templates/web/fixmystreet/report/update-form.html:71 -#: templates/web/fixmystreet/report/update-form.html:97 +#: templates/web/base/contact/index.html:105 +#: templates/web/base/report/update-form.html:24 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:14 +#: templates/web/base/report/update/form_user_loggedout_password.html:10 msgid "Post" msgstr "" @@ -2227,12 +2168,9 @@ msgstr "Zurück" msgid "Privacy" msgstr "" -#: templates/web/base/faq/faq-en-gb.html:7 -#: templates/web/base/open311/index.html:7 -#: templates/web/base/static/privacy.html:1 -#: templates/web/base/static/privacy.html:2 -#: templates/web/base/static/privacy.html:9 -#: templates/web/fixmystreet/contact/index.html:11 +#: templates/web/base/about/_sidebar.html:5 +#: templates/web/base/about/privacy.html:1 +#: templates/web/base/about/privacy.html:2 msgid "Privacy and cookies" msgstr "" @@ -2260,12 +2198,12 @@ msgstr "" msgid "Problem %s sent to council %s" msgstr "" -#: templates/web/base/admin/index.html:46 +#: templates/web/base/admin/index.html:39 #: templates/web/zurich/admin/index.html:9 msgid "Problem breakdown by state" msgstr "Meldungen nach Status sortiert" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1053 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1058 msgid "Problem marked as open." msgstr "" @@ -2281,11 +2219,11 @@ msgstr "Meldungen" msgid "Problems in this area" msgstr "Meldungen in dieser Gegend" -#: templates/web/fixmystreet/report/display.html:43 +#: templates/web/base/report/display_tools.html:19 msgid "Problems nearby" msgstr "Meldungen in der Nähe" -#: templates/web/fixmystreet/report/display.html:41 +#: templates/web/base/report/display_tools.html:17 msgid "Problems on the map" msgstr "Meldungen auf der Karte" @@ -2297,15 +2235,15 @@ msgstr "Meldungen, welche kürzlich beantwortet wurden" msgid "Problems within %.1fkm of this location" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:642 +#: perllib/FixMyStreet/Cobrand/Default.pm:663 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:120 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:139 -#: perllib/FixMyStreet/Cobrand/UK.pm:207 +#: perllib/FixMyStreet/Cobrand/UK.pm:208 msgid "Problems within %s" msgstr "Meldungen innerhalb %s" #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:128 -#: perllib/FixMyStreet/Cobrand/UK.pm:221 +#: perllib/FixMyStreet/Cobrand/UK.pm:222 msgid "Problems within %s ward" msgstr "" @@ -2313,7 +2251,7 @@ msgstr "" #: templates/web/base/reports/body.html:0 #: templates/web/base/reports/body.html:24 msgid "Problems within %s, %s" -msgstr "Meldungen innerhalb %s" +msgstr "" #: templates/web/base/alert/_list.html:42 msgid "Problems within the boundary of:" @@ -2327,19 +2265,16 @@ msgstr "" msgid "Property type:" msgstr "" -#: templates/web/base/report/update-form.html:3 -#: templates/web/fixmystreet/report/update-form.html:4 +#: templates/web/base/report/update-form.html:6 msgid "Provide an update" msgstr "Meldung aktualisieren" -#: templates/web/base/auth/general.html:56 +#: templates/web/base/auth/general.html:95 msgid "Providing a name and password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:156 -#: templates/web/base/report/update-form.html:129 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:71 -#: templates/web/fixmystreet/report/update-form.html:119 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:34 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:9 msgid "Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." msgstr "" @@ -2375,18 +2310,17 @@ msgstr "" #: templates/web/base/alert/_list.html:22 #: templates/web/base/around/display_location.html:1 #: templates/web/base/around/display_location.html:3 -#: templates/web/base/report/display.html:50 +#: templates/web/base/report/display_tools.html:34 #: templates/web/base/reports/_rss.html:1 #: templates/web/fixmystreet/alert/updates.html:9 -#: templates/web/fixmystreet/report/display.html:58 msgid "RSS feed" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:250 perllib/FixMyStreet/Cobrand/UK.pm:262 +#: perllib/FixMyStreet/Cobrand/UK.pm:251 perllib/FixMyStreet/Cobrand/UK.pm:263 msgid "RSS feed for %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:256 perllib/FixMyStreet/Cobrand/UK.pm:268 +#: perllib/FixMyStreet/Cobrand/UK.pm:257 perllib/FixMyStreet/Cobrand/UK.pm:269 msgid "RSS feed for %s ward, %s" msgstr "" @@ -2394,11 +2328,11 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:163 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:173 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:181 -#: perllib/FixMyStreet/Cobrand/UK.pm:276 perllib/FixMyStreet/Cobrand/UK.pm:288 +#: perllib/FixMyStreet/Cobrand/UK.pm:277 perllib/FixMyStreet/Cobrand/UK.pm:289 msgid "RSS feed of %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:281 perllib/FixMyStreet/Cobrand/UK.pm:293 +#: perllib/FixMyStreet/Cobrand/UK.pm:282 perllib/FixMyStreet/Cobrand/UK.pm:294 msgid "RSS feed of %s, within %s ward" msgstr "" @@ -2410,15 +2344,15 @@ msgstr "" msgid "RSS feed of problems in this %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:643 +#: perllib/FixMyStreet/Cobrand/Default.pm:664 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:121 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:138 -#: perllib/FixMyStreet/Cobrand/UK.pm:214 +#: perllib/FixMyStreet/Cobrand/UK.pm:215 msgid "RSS feed of problems within %s" msgstr "" #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:127 -#: perllib/FixMyStreet/Cobrand/UK.pm:220 +#: perllib/FixMyStreet/Cobrand/UK.pm:221 msgid "RSS feed of problems within %s ward" msgstr "" @@ -2427,16 +2361,14 @@ msgstr "" msgid "RSS feed of recent local problems" msgstr "" -#: templates/web/base/report/display.html:50 +#: templates/web/base/report/display_tools.html:34 #: templates/web/fixmystreet/alert/updates.html:9 -#: templates/web/fixmystreet/report/display.html:58 msgid "RSS feed of updates to this problem" msgstr "" #: templates/web/base/alert/updates.html:9 -#: templates/web/base/report/display.html:41 +#: templates/web/base/report/display_tools.html:36 #: templates/web/fixmystreet/alert/updates.html:14 -#: templates/web/fixmystreet/report/display.html:60 msgid "Receive email when updates are left on this problem." msgstr "Erhalten Sie Aktualisierungen dieser Meldung." @@ -2444,7 +2376,7 @@ msgstr "Erhalten Sie Aktualisierungen dieser Meldung." #: templates/web/base/around/display_location.html:0 #: templates/web/base/around/display_location.html:33 msgid "Recent local problems, %s" -msgstr "Kürzlich erfasste Meldungen:" +msgstr "" #: templates/web/base/reports/index.html:24 msgid "Recently <br>fixed" @@ -2462,8 +2394,8 @@ msgstr "«Züri wie neu» dient dazu Schäden an der Infrastrukt msgid "Remove flag" msgstr "" -#: templates/web/base/admin/report_edit.html:92 -#: templates/web/base/admin/update_edit.html:62 +#: templates/web/base/admin/report_edit.html:93 +#: templates/web/base/admin/update_edit.html:67 #: templates/web/zurich/admin/update_edit.html:35 msgid "Remove photo (can't be undone!)" msgstr "" @@ -2483,7 +2415,7 @@ msgstr "Meldung" msgid "Report a problem" msgstr "Eine Meldung erfassen" -#: templates/web/fixmystreet/report/display.html:32 +#: templates/web/base/report/display_tools.html:8 msgid "Report abuse" msgstr "Missbrauch melden" @@ -2492,7 +2424,8 @@ msgid "Report on %s" msgstr "" #: templates/web/base/report/new/fill_in_details_form.html:1 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:2 +#: templates/web/base/report/new/login_success_form.html:1 +#: templates/web/base/report/new/oauth_email_form.html:1 msgid "Report your problem" msgstr "" @@ -2501,9 +2434,8 @@ msgstr "" msgid "Report, view, or discuss local problems" msgstr "Melden Sie Schäden an der Infrastruktur von Zürich" -#: perllib/FixMyStreet/DB/Result/Problem.pm:585 -#: templates/web/base/contact/index.html:50 -#: templates/web/fixmystreet/contact/index.html:65 +#: perllib/FixMyStreet/DB/Result/Problem.pm:573 +#: templates/web/base/contact/index.html:57 msgid "Reported anonymously at %s" msgstr "Anonym gemeldet um" @@ -2512,9 +2444,8 @@ msgstr "Anonym gemeldet um" msgid "Reported before" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:608 -#: templates/web/base/contact/index.html:52 -#: templates/web/fixmystreet/contact/index.html:67 +#: perllib/FixMyStreet/DB/Result/Problem.pm:596 +#: templates/web/base/contact/index.html:59 msgid "Reported by %s at %s" msgstr "Gemeldet von %s um %s" @@ -2527,33 +2458,33 @@ msgstr "Gemeldet von" msgid "Reported in the %s category" msgstr "In der Kategorie %s gemeldet" -#: perllib/FixMyStreet/DB/Result/Problem.pm:581 +#: perllib/FixMyStreet/DB/Result/Problem.pm:569 msgid "Reported in the %s category anonymously at %s" msgstr "In der Kategorie %s um %s gemeldet" -#: perllib/FixMyStreet/DB/Result/Problem.pm:603 +#: perllib/FixMyStreet/DB/Result/Problem.pm:591 msgid "Reported in the %s category by %s at %s" msgstr "Gemeldet in der Kategorie %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:577 +#: perllib/FixMyStreet/DB/Result/Problem.pm:565 msgid "Reported via %s anonymously at %s" msgstr "Anonym gemeldet von %s um %s " -#: perllib/FixMyStreet/DB/Result/Problem.pm:599 +#: perllib/FixMyStreet/DB/Result/Problem.pm:587 msgid "Reported via %s by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:573 +#: perllib/FixMyStreet/DB/Result/Problem.pm:561 msgid "Reported via %s in the %s category anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:593 +#: perllib/FixMyStreet/DB/Result/Problem.pm:581 msgid "Reported via %s in the %s category by %s at %s" msgstr "" #: templates/web/base/reports/index.html:21 msgid "Reported within the last four weeks" -msgstr "In den letzten 4 Wochen gemeldet" +msgstr "" #: templates/web/zurich/admin/report_edit-sdm.html:36 #: templates/web/zurich/admin/report_edit.html:55 @@ -2568,13 +2499,13 @@ msgstr "Gemeldet" msgid "Reporting a problem" msgstr "Ihre Meldung" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1275 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1286 #: perllib/FixMyStreet/Cobrand/Zurich.pm:384 #: templates/web/zurich/header.html:60 msgid "Reports" msgstr "Meldungen" -#: perllib/FixMyStreet/Cobrand/UK.pm:327 perllib/FixMyStreet/Cobrand/UK.pm:331 +#: perllib/FixMyStreet/Cobrand/UK.pm:328 perllib/FixMyStreet/Cobrand/UK.pm:332 msgid "Reports are limited to %s characters in length. Please shorten your report" msgstr "" @@ -2611,15 +2542,17 @@ msgstr "" msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1493 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1498 -#: templates/web/base/admin/report_edit.html:88 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1508 +#: templates/web/base/admin/report_edit.html:90 +#: templates/web/base/admin/update_edit.html:64 #: templates/web/zurich/admin/report_edit.html:116 msgid "Rotate Left" msgstr "Links drehen" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1493 -#: templates/web/base/admin/report_edit.html:89 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 +#: templates/web/base/admin/report_edit.html:91 +#: templates/web/base/admin/update_edit.html:65 #: templates/web/zurich/admin/report_edit.html:117 msgid "Rotate Right" msgstr "Rechts drehen" @@ -2629,7 +2562,6 @@ msgid "Rotating this photo will discard unsaved changes to the report." msgstr "Durch das Drehen des Fotos gehen nicht gespeicherte Änderungen verloren." #: templates/web/base/js/translation_strings.html:46 -#: templates/web/base/maps/google-ol.html:13 msgid "Satellite" msgstr "" @@ -2689,7 +2621,7 @@ msgstr "" msgid "Sent report back" msgstr "Meldung zurückgewiesen" -#: perllib/FixMyStreet/DB/Result/Problem.pm:708 +#: perllib/FixMyStreet/DB/Result/Problem.pm:696 msgid "Sent to %s %s later" msgstr "" @@ -2702,15 +2634,13 @@ msgstr "Gesendet:" msgid "Service:" msgstr "Gerät" -#: templates/web/fixmystreet/report/display.html:38 +#: templates/web/base/report/display_tools.html:14 msgid "Share" msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:193 -#: templates/web/base/report/update-form.html:158 -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:23 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:59 -#: templates/web/fixmystreet/report/update-form.html:146 +#: templates/web/base/report/new/form_user_loggedin.html:23 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:22 +#: templates/web/base/report/update/form_name.html:15 msgid "Show my name publicly" msgstr "" @@ -2722,9 +2652,9 @@ msgstr "" msgid "Show pins" msgstr "Zeige Stecknadeln" +#: templates/web/base/auth/general.html:100 #: templates/web/base/auth/general.html:3 -#: templates/web/base/auth/general.html:40 -#: templates/web/base/auth/general.html:61 +#: templates/web/base/auth/general.html:76 #: templates/web/zurich/auth/general.html:18 #: templates/web/zurich/auth/general.html:35 msgid "Sign in" @@ -2742,7 +2672,7 @@ msgstr "Ausloggen" #: templates/web/base/report/new/fill_in_details_text.html:1 msgid "Some categories may require additional information." -msgstr "Einige Kategorien benötigen eventuell zusätzliche Informationen." +msgstr "" #: templates/web/base/admin/body-form.html:149 #: templates/web/base/admin/body-form.html:150 @@ -2751,36 +2681,43 @@ msgid "" " sent from your FixMyStreet installation." msgstr "" -#: templates/web/base/alert/index.html:42 +#: templates/web/base/alert/index.html:40 msgid "Some photos of recent reports" msgstr "" #. ('Optional comment for translator') #: perllib/FixMyStreet/App/View/Email.pm:32 -#: perllib/FixMyStreet/App/View/Web.pm:43 +#: perllib/FixMyStreet/App/View/Web.pm:52 msgid "Some text to localize" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:78 +#: perllib/FixMyStreet/Cobrand/UK.pm:79 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover." msgstr "" #: templates/web/base/auth/token.html:8 msgid "Sorry, that wasn’t a valid link" -msgstr "Entschuldigung, dieser Link ist ungültig" +msgstr "" #: templates/web/base/tokens/abuse.html:5 msgid "Sorry, there has been an error confirming your problem." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:221 -#: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:37 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:216 +#: perllib/FixMyStreet/Geocode.pm:38 perllib/FixMyStreet/Geocode/Bing.pm:38 #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:56 #: perllib/FixMyStreet/Geocode/OSM.pm:48 msgid "Sorry, we could not find that location." msgstr "Diese Adresse wurde nicht gefunden." -#: perllib/FixMyStreet/Geocode/Bing.pm:34 +#: templates/web/base/auth/general.html:9 +#: templates/web/base/report/display.html:21 +#: templates/web/base/report/new/fill_in_details_form.html:23 +#, fuzzy +msgid "Sorry, we could not log you in. Please fill in the form below." +msgstr "Diese Adresse wurde nicht gefunden." + +#: perllib/FixMyStreet/Geocode/Bing.pm:35 #: perllib/FixMyStreet/Geocode/Google.pm:45 #: perllib/FixMyStreet/Geocode/Zurich.pm:88 msgid "Sorry, we could not parse that location. Please try again." @@ -2788,7 +2725,12 @@ msgstr "Diese Adresse wurde nicht gefunden." #: perllib/FixMyStreet/App/Model/PhotoSet.pm:134 msgid "Sorry, we couldn't save your image(s), please try again." -msgstr "Ihre Bilder konnten nicht gespeichert werden. Bitte versuchen Sie es nochmals." +msgstr "" + +#: perllib/FixMyStreet/App/Controller/AuthSS.pm:301 +#, fuzzy +msgid "Sorry, you can not log in with Facebook. Please try again later." +msgstr "Diese Adresse wurde nicht gefunden." #: templates/web/base/admin/stats.html:64 msgid "Start Date:" @@ -2798,13 +2740,12 @@ msgstr "" #: templates/web/base/admin/flagged.html:18 #: templates/web/base/admin/list_updates.html:11 #: templates/web/base/admin/reports.html:15 -#: templates/web/fixmystreet/report/update-form.html:26 +#: templates/web/base/report/update/form_update.html:32 msgid "State" msgstr "Status" #: templates/web/base/admin/report_edit.html:47 #: templates/web/base/admin/update_edit.html:27 -#: templates/web/base/report/update-form.html:28 #: templates/web/zurich/admin/report_edit-sdm.html:73 #: templates/web/zurich/admin/report_edit.html:101 #: templates/web/zurich/admin/report_edit.html:155 @@ -2812,7 +2753,7 @@ msgstr "Status" msgid "State:" msgstr "Status" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1280 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1291 #: perllib/FixMyStreet/Cobrand/Zurich.pm:387 #: templates/web/base/admin/stats.html:1 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:73 @@ -2834,7 +2775,7 @@ msgstr "" msgid "Street View" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:403 +#: perllib/FixMyStreet/Script/Reports.pm:184 msgid "Subcategory: %s" msgstr "" @@ -2842,30 +2783,25 @@ msgstr "" msgid "Subdivision/Body" msgstr "FB/Externe" -#: templates/web/fixmystreet/contact/index.html:98 +#: templates/web/base/contact/index.html:90 msgid "Subject" msgstr "Titel" #: templates/web/base/admin/report_edit.html:19 -#: templates/web/base/contact/index.html:88 -#: templates/web/base/report/new/fill_in_details_form.html:53 #: templates/web/zurich/admin/report_edit.html:39 msgid "Subject:" msgstr "Titel" #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/fill_in_details_form.html:137 -#: templates/web/base/report/new/fill_in_details_form.html:159 -#: templates/web/base/report/new/fill_in_details_form.html:96 -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:36 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:23 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:76 +#: templates/web/base/report/new/form_user_loggedin.html:36 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:39 +#: templates/web/base/report/new/form_user_loggedout_password.html:11 #: templates/web/zurich/report/new/fill_in_details_form.html:96 msgid "Submit" msgstr "Abschicken" -#: templates/web/base/admin/report_edit.html:95 -#: templates/web/base/admin/update_edit.html:65 +#: templates/web/base/admin/report_edit.html:101 +#: templates/web/base/admin/update_edit.html:75 #: templates/web/base/admin/user-form.html:56 #: templates/web/zurich/admin/report_edit-sdm.html:137 #: templates/web/zurich/admin/report_edit.html:268 @@ -2873,7 +2809,7 @@ msgstr "Abschicken" msgid "Submit changes" msgstr "Speichern" -#: templates/web/base/questionnaire/index.html:97 +#: templates/web/base/questionnaire/index.html:106 msgid "Submit questionnaire" msgstr "" @@ -2889,9 +2825,8 @@ msgid "Submitted" msgstr "Erfasst" #: templates/web/base/alert/updates.html:17 -#: templates/web/base/report/display.html:46 +#: templates/web/base/report/display_tools.html:41 #: templates/web/fixmystreet/alert/updates.html:23 -#: templates/web/fixmystreet/report/display.html:65 msgid "Subscribe" msgstr "" @@ -2899,10 +2834,12 @@ msgstr "" msgid "Subscribe me to an email alert" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1273 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1284 #: perllib/FixMyStreet/Cobrand/Zurich.pm:383 #: templates/web/base/admin/bodies.html:25 #: templates/web/base/admin/index.html:1 +#: templates/web/base/status/index.html:1 +#: templates/web/base/status/index.html:3 #: 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:13 @@ -2916,7 +2853,7 @@ msgstr "Zusammenfassung" msgid "Summary reports" msgstr "Alle Meldungen" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1277 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1288 msgid "Survey" msgstr "" @@ -2952,7 +2889,7 @@ msgstr "" msgid "Thank you for reporting this issue!" msgstr "" -#: templates/web/base/tokens/error.html:7 +#: templates/web/base/tokens/error.html:6 msgid "Thank you for trying to confirm your update or problem. We seem to have an error ourselves though, so <a href=\"%s\">please let us know what went on</a> and we'll look into it." msgstr "" @@ -2987,23 +2924,23 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:47 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:63 -#: perllib/FixMyStreet/Cobrand/UK.pm:71 +#: perllib/FixMyStreet/Cobrand/UK.pm:72 msgid "That postcode was not recognised, sorry." msgstr "" #: perllib/FixMyStreet/App/Controller/Admin.pm:724 msgid "That problem has been marked as sent." -msgstr "Die Meldung wurde als gesendet markiert." +msgstr "" #: perllib/FixMyStreet/App/Controller/Admin.pm:716 msgid "That problem will now be resent." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:125 +#: perllib/FixMyStreet/App/Controller/Report.pm:127 msgid "That report cannot be viewed on %s." msgstr "Diese Meldung wurde von «Züri wie neu» entfernt." -#: perllib/FixMyStreet/App/Controller/Report.pm:119 +#: perllib/FixMyStreet/App/Controller/Report.pm:121 msgid "That report has been removed from FixMyStreet." msgstr "Diese Meldung wurde von «Züri wie neu» entfernt." @@ -3034,7 +2971,7 @@ msgid "" " If you leave this blank, <strong>send method defaults to email</strong>." msgstr "" -#: templates/web/base/open311/index.html:90 +#: templates/web/base/open311/index.html:82 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 "" @@ -3055,12 +2992,12 @@ msgstr "Bitte machen Sie so genaue Angaben wie möglich: Beschreiben Sie die msgid "The diligency prize league table shows editors' activity (who's been editing the most records)." msgstr "" -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:60 -#: perllib/FixMyStreet/App/Controller/Reports.pm:79 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:61 +#: perllib/FixMyStreet/App/Controller/Reports.pm:80 msgid "The error was: %s" msgstr "" -#: templates/web/base/open311/index.html:86 +#: templates/web/base/open311/index.html:78 msgid "The following Open311 v2 attributes are returned for each request: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code and service_name." msgstr "" @@ -3096,7 +3033,7 @@ msgstr "" #: templates/web/base/auth/token.html:9 msgid "The link might have expired, or maybe you didn’t quite copy and paste it correctly." -msgstr "Der Link ist entweder abgelaufen, oder er wurde nicht korrekt kopiert." +msgstr "" #: templates/web/base/admin/body-form.html:58 msgid "The list of available areas is being provided by the MapIt service at %s." @@ -3107,8 +3044,7 @@ msgstr "" msgid "The passwords do not match" msgstr "" -#: templates/web/base/errors/page_error_404_not_found.html:10 -#: templates/web/base/errors/page_error_404_not_found.html:12 +#: templates/web/base/errors/page_error_404_not_found.html:9 msgid "The requested URL '%s' was not found on this server" msgstr "" @@ -3118,12 +3054,11 @@ msgstr "" #: templates/web/base/report/new/councils_extra_text.html:1 #: templates/web/base/report/new/councils_text_some.html:10 -#: templates/web/base/report/new/fill_in_details_form.html:18 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:14 +#: templates/web/base/report/new/fill_in_details_form.html:13 msgid "The summary and description will also be made public (see our <a href=\"/privacy\">privacy policy</a>)." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:312 +#: perllib/FixMyStreet/Script/Reports.pm:92 msgid "The user could not locate the problem on a map, but to see the area around the location they entered" msgstr "" @@ -3140,18 +3075,18 @@ msgstr "" msgid "There are no reports to show." msgstr "" -#: perllib/FixMyStreet/App/Controller/Reports.pm:76 +#: perllib/FixMyStreet/App/Controller/Reports.pm:77 msgid "There was a problem showing the All Reports page. Please try again later." msgstr "" #: perllib/FixMyStreet/App/Controller/Contact.pm:137 -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:59 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:60 msgid "There was a problem showing this page. Please try again later." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:769 -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:134 -#: templates/web/base/auth/general.html:26 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:764 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:138 +#: templates/web/base/auth/general.html:43 #: templates/web/zurich/auth/general.html:28 msgid "There was a problem with your email/password combination. If you cannot remember your password, or do not have one, please fill in the ‘sign in by email’ section of the form." msgstr "Ihre E-Mail/Passwort Kombination war ungültig. Bitte versuchen Sie es erneut oder wenden Sie sich an den Administrator." @@ -3160,7 +3095,7 @@ msgstr "Ihre E-Mail/Passwort Kombination war ungültig. Bitte versuchen Sie msgid "There was a problem with your email/password combination. Please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:272 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:336 msgid "There was a problem with your update. Please try again." msgstr "" @@ -3168,7 +3103,7 @@ msgstr "" msgid "There were problems with your report. Please see below." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:300 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:371 msgid "There were problems with your update. Please see below." msgstr "" @@ -3182,7 +3117,7 @@ msgid "" " " msgstr "" -#: templates/web/base/open311/index.html:77 +#: templates/web/base/open311/index.html:69 msgid "This API implementation is work in progress and not yet stabilized. It will change without warnings in the future." msgstr "" @@ -3204,18 +3139,18 @@ msgid "" " A body will not receive any reports unless it covers at least one area." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:410 +#: perllib/FixMyStreet/Script/Reports.pm:191 msgid "This email has been sent to both councils covering the location of the problem, as the user did not categorise it; please ignore it if you're not the correct council to deal with the issue, or let us know what category of problem this is so we can add it to our system." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:413 +#: perllib/FixMyStreet/Script/Reports.pm:194 msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:925 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:995 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:920 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:990 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:142 -#: perllib/FixMyStreet/Cobrand/UK.pm:43 +#: perllib/FixMyStreet/Cobrand/UK.pm:44 msgid "This information is required" msgstr "Diese Information wird benötigt" @@ -3227,52 +3162,37 @@ msgstr "" msgid "This is a summary of all reports on this site." msgstr "" -#: templates/web/base/report/banner.html:15 -msgid "This problem has been closed" -msgstr "" - -#: templates/web/base/report/banner.html:12 -#: templates/web/base/report/update-form.html:48 -#: templates/web/fixmystreet/report/update-form.html:46 +#: templates/web/base/report/update/form_update.html:52 msgid "This problem has been fixed" msgstr "Dieser Schaden wurde behoben" -#: templates/web/base/report/update-form.html:43 -#: templates/web/fixmystreet/report/update-form.html:40 +#: templates/web/base/report/update/form_update.html:46 msgid "This problem has not been fixed" msgstr "Dieser Schaden wurde nicht behoben" -#: templates/web/base/report/banner.html:19 -msgid "This problem is in progress" -msgstr "Dieser Schaden ist in Bearbeitung" - -#: templates/web/base/report/banner.html:9 -msgid "This problem is old and of unknown status." -msgstr "Dieses Problem ist alt und hat einen unbekannten Status" - #: perllib/FixMyStreet/Cobrand/Zurich.pm:168 #: perllib/FixMyStreet/Cobrand/Zurich.pm:169 #: templates/web/zurich/report/_main.html:14 msgid "This report is awaiting moderation." msgstr "Überprüfung ausstehend" -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:86 +#: perllib/FixMyStreet/Script/Alerts.pm:94 msgid "This report is currently marked as closed." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:84 +#: perllib/FixMyStreet/Script/Alerts.pm:92 msgid "This report is currently marked as fixed." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:88 +#: perllib/FixMyStreet/Script/Alerts.pm:96 msgid "This report is currently marked as open." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:323 +#: perllib/FixMyStreet/Script/Reports.pm:105 msgid "This report was submitted anonymously" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:305 +#: perllib/FixMyStreet/Script/Reports.pm:85 msgid "This web page also contains a photo of the problem, provided by the user." msgstr "" @@ -3283,7 +3203,7 @@ msgstr "" msgid "Time spent (in minutes):" msgstr "Aufwand (in Minuten)" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1276 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1287 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "" @@ -3300,17 +3220,17 @@ msgstr "Titel" #: templates/web/base/alert/index.html:25 msgid "To find out what local alerts we have for you, please enter your %s postcode or street name and area:" -msgstr "Geben Sie Ihre Adresse an, um über Meldungen in Ihrer Nähe informiert zu werden." +msgstr "" #: templates/web/base/alert/index.html:27 msgid "To find out what local alerts we have for you, please enter your postcode or street name and area" msgstr "Geben Sie eine Adresse an" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:311 +#: perllib/FixMyStreet/Script/Reports.pm:91 msgid "To view a map of the precise location of this issue" msgstr "" -#: templates/web/base/admin/index.html:62 +#: templates/web/base/admin/index.html:54 #: templates/web/base/admin/questionnaire.html:24 #: templates/web/base/admin/stats.html:24 #: templates/web/base/admin/stats.html:43 @@ -3328,10 +3248,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:12 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:33 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:31 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:37 msgid "Unable to fix" msgstr "" @@ -3344,7 +3262,7 @@ msgstr "" msgid "Unconfirmed" msgstr "Unbestätigt" -#: templates/web/fixmystreet/report/banner.html:9 +#: templates/web/base/report/banner.html:9 msgid "Unknown" msgstr "Unbekannt" @@ -3352,17 +3270,18 @@ msgstr "Unbekannt" msgid "Unknown alert type" msgstr "" +#: perllib/FixMyStreet/App/Controller/Photo.pm:110 #: templates/web/base/js/translation_strings.html:39 msgid "Unknown error" msgstr "Unbekannter Fehler" -#: perllib/FixMyStreet/App/Controller/Report.pm:103 -#: perllib/FixMyStreet/App/Controller/Report.pm:109 -#: perllib/FixMyStreet/App/Controller/Report.pm:112 +#: perllib/FixMyStreet/App/Controller/Report.pm:105 +#: perllib/FixMyStreet/App/Controller/Report.pm:111 +#: perllib/FixMyStreet/App/Controller/Report.pm:114 msgid "Unknown problem ID" msgstr "" -#: templates/web/fixmystreet/report/update-form.html:19 +#: templates/web/base/report/update/form_update.html:25 msgid "Update" msgstr "Speichern" @@ -3370,13 +3289,11 @@ msgstr "Speichern" msgid "Update %s created for problem %d; by %s" msgstr "" -#: templates/web/base/contact/index.html:21 -#: templates/web/fixmystreet/contact/index.html:36 +#: templates/web/base/contact/index.html:28 msgid "Update below added anonymously at %s" msgstr "" -#: templates/web/base/contact/index.html:23 -#: templates/web/fixmystreet/contact/index.html:38 +#: templates/web/base/contact/index.html:30 msgid "Update below added by %s at %s" msgstr "" @@ -3385,7 +3302,7 @@ msgstr "" msgid "Update body" msgstr "Speichern" -#: templates/web/base/admin/index.html:55 +#: templates/web/base/admin/index.html:48 msgid "Update breakdown by state" msgstr "" @@ -3410,20 +3327,16 @@ msgstr "" msgid "Update statuses" msgstr "" -#: templates/web/base/report/update-form.html:22 -msgid "Update:" -msgstr "" - #: templates/web/zurich/admin/index-dm.html:23 #: templates/web/zurich/admin/index-sdm.html:21 #: templates/web/zurich/admin/reports.html:13 msgid "Updated" msgstr "Aktualisiert" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1043 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1101 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1145 -#: perllib/FixMyStreet/App/Controller/Admin.pm:820 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1048 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1108 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1156 +#: perllib/FixMyStreet/App/Controller/Admin.pm:821 #: perllib/FixMyStreet/Cobrand/Zurich.pm:771 #: perllib/FixMyStreet/Cobrand/Zurich.pm:796 #: perllib/FixMyStreet/Cobrand/Zurich.pm:866 @@ -3431,13 +3344,12 @@ msgid "Updated!" msgstr "Aktualisiert!" #: templates/web/base/admin/list_updates.html:2 -#: templates/web/base/report/update.html:3 -#: templates/web/fixmystreet/report/update.html:5 +#: templates/web/base/report/update.html:5 #: templates/web/zurich/report/updates.html:2 msgid "Updates" msgstr "Antwort" -#: perllib/FixMyStreet/DB/Result/Comment.pm:132 +#: perllib/FixMyStreet/DB/Result/Comment.pm:131 msgid "Updates are limited to %s characters in length. Please shorten your update" msgstr "" @@ -3447,11 +3359,9 @@ msgstr "" #. ("%s is the site name") #: templates/web/base/report/display.html:0 -#: templates/web/base/report/display.html:5 -#: templates/web/fixmystreet/report/display.html:0 -#: templates/web/fixmystreet/report/display.html:9 +#: templates/web/base/report/display.html:9 msgid "Updates to this problem, %s" -msgstr "Änderungen an dieser Meldung, %s" +msgstr "" #: templates/web/base/admin/body.html:182 msgid "Use the <strong>note</strong> to record details that are only displayed in the admin. Notes are not shown publicly, and are not sent to the body." @@ -3462,11 +3372,11 @@ msgstr "" msgid "Used map" msgstr "Karte verwendet" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1450 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1461 msgid "User flag removed" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1422 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1433 msgid "User flagged" msgstr "" @@ -3474,16 +3384,16 @@ msgstr "" msgid "User search finds matches in users' names and email addresses." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1278 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1289 #: perllib/FixMyStreet/Cobrand/Zurich.pm:399 #: templates/web/base/admin/flagged.html:29 #: templates/web/zurich/header.html:69 msgid "Users" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:380 -#: perllib/FixMyStreet/App/Controller/Admin.pm:410 -#: perllib/FixMyStreet/App/Controller/Admin.pm:427 +#: perllib/FixMyStreet/App/Controller/Admin.pm:382 +#: perllib/FixMyStreet/App/Controller/Admin.pm:412 +#: perllib/FixMyStreet/App/Controller/Admin.pm:429 msgid "Values updated" msgstr "" @@ -3505,9 +3415,8 @@ msgid "Viewing a location" msgstr "Meldung erfassen" #: templates/web/base/report/display.html:0 -#: templates/web/fixmystreet/report/display.html:0 msgid "Viewing a problem" -msgstr "Meldung anschauen" +msgstr "" #: templates/web/base/reports/body.html:16 msgid "Wards of this council" @@ -3518,17 +3427,24 @@ 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 "Ihre Anfrage ergab mehr als eine mögliche Adresse. Die ersten zehn Treffer werden unten aufgelistet." -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:2 -#: templates/web/fixmystreet/report/update-form.html:77 +#: templates/web/base/auth/general.html:6 +#: templates/web/base/report/display.html:27 +#: templates/web/base/report/new/oauth_email_form.html:5 +#, fuzzy +msgid "We need your email address, please give it below." +msgstr "Ihre E-Mail Adresse oder Telefonnummer werden nie angezeigt" + +#: templates/web/base/report/new/form_user_loggedout_email.html:2 +#: templates/web/base/report/update/form_user_loggedout_email.html:2 msgid "We never show your email" msgstr "Ihr E-Mail wird nie angezeigt" -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:31 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:65 +#: templates/web/base/report/new/form_user_loggedin.html:31 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:28 msgid "We never show your email address or phone number." msgstr "Ihre E-Mail Adresse oder Telefonnummer werden nie angezeigt" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:419 +#: perllib/FixMyStreet/Script/Reports.pm:200 msgid "We realise this problem might be the responsibility of %s; however, we don't currently have any contact details for them. If you know of an appropriate contact address, please do get in touch." msgstr "" @@ -3545,10 +3461,6 @@ msgstr "Ihre persönlichen Angaben werden nur für interne Zwecke verwen msgid "We’re sorry to hear the problem’s not fixed. Why not try writing to your local representatives?" msgstr "" -#: templates/web/base/contact/blurb.html:8 -msgid "We'd love to hear what you think about this site. Just fill in the form, or send an email to <a href='mailto:%s'>%s</a>:" -msgstr "" - #: templates/web/base/contact/submit.html:7 msgid "We’ll get back to you as soon as we can." msgstr "" @@ -3557,7 +3469,7 @@ msgstr "" msgid "What was your experience of getting the problem fixed?" msgstr "" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:49 +#: templates/web/base/report/new/form_report.html:19 msgid "What’s the issue, and where is it?" msgstr "" @@ -3570,7 +3482,11 @@ msgstr "Wann editiert" msgid "When sent" msgstr "Wann gesendet" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:640 +#: templates/web/base/js/translation_strings.html:50 +msgid "Whoa there Testino! Three photos are enough." +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Report/New.pm:635 msgid "Whole block of empty flats" msgstr "" @@ -3585,7 +3501,7 @@ msgstr "" msgid "Wish" msgstr "Wunsch" -#: templates/web/base/open311/index.html:92 +#: templates/web/base/open311/index.html:84 msgid "With request searches, it is also possible to search for agency_responsible to limit the requests to those sent to a single administration. The search term is the administration ID provided by <a href=\"%s\">MaPit</a>." msgstr "" @@ -3593,7 +3509,7 @@ msgstr "" msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"http://fixmystreet.org\">available at fixmystreet.org</a>." msgstr "" -#: templates/web/base/questionnaire/index.html:87 +#: templates/web/base/questionnaire/index.html:96 msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?" msgstr "" @@ -3602,7 +3518,6 @@ msgid "Writing your message entirely in block capitals makes it hard to read, as msgstr "Meldungen gänzlich in Grossbuchstaben zu schreiben macht diese unleserlich. Ebenso wenn keine Satzzeichen verwendet werden." #: templates/web/base/report/new/fill_in_details_form.html:4 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:5 msgid "Wrong location? Just click again on the map." msgstr "" @@ -3625,27 +3540,24 @@ msgstr "Jahr" #: templates/web/base/admin/users.html:31 #: templates/web/base/questionnaire/creator_fixed.html:14 #: templates/web/base/questionnaire/index.html:51 -#: templates/web/base/questionnaire/index.html:90 +#: templates/web/base/questionnaire/index.html:99 msgid "Yes" msgstr "Ja" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:17 -#: templates/web/fixmystreet/report/update-form.html:91 +#: templates/web/base/report/new/form_user_loggedout_password.html:5 +#: templates/web/base/report/update/form_user_loggedout_password.html:4 msgid "Yes I have a password" msgstr "" -#: templates/web/base/contact/index.html:39 -#: templates/web/fixmystreet/contact/index.html:54 +#: templates/web/base/contact/index.html:46 msgid "You are complaining that this problem report was unnecessarily moderated:" msgstr "" -#: templates/web/base/contact/index.html:41 -#: templates/web/fixmystreet/contact/index.html:56 +#: templates/web/base/contact/index.html:48 msgid "You are reporting the following problem report for being abusive, containing personal information, or similar:" msgstr "" -#: templates/web/base/contact/index.html:15 -#: templates/web/fixmystreet/contact/index.html:30 +#: templates/web/base/contact/index.html:22 msgid "You are reporting the following update for being abusive, containing personal information, or similar:" msgstr "" @@ -3658,7 +3570,7 @@ msgstr "Danke! Sie können Ihre aktualisierte Meldung <a href=\"%s%s\">auf d msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create." msgstr "" -#: templates/web/fixmystreet/contact/index.html:121 +#: templates/web/base/contact/index.html:113 msgid "You can contact technical support on <a href='mailto:%s'>%s</a>" msgstr "" @@ -3669,8 +3581,8 @@ msgid "" " reports in the past." msgstr "" -#: templates/web/base/report/new/councils_text_none.html:10 -#: templates/web/base/report/new/councils_text_none.html:2 +#: templates/web/base/report/new/councils_text_none.html:12 +#: templates/web/base/report/new/councils_text_none.html:14 #: templates/web/base/report/new/councils_text_some.html:19 #: templates/web/base/report/new/councils_text_some.html:21 msgid "You can help us by finding a contact email address for local problems for %s and emailing it to us at <a href='mailto:%s'>%s</a>." @@ -3688,21 +3600,17 @@ msgstr "Nicht freigeschaltet; Bitte geben Sie eine Adresse an" msgid "You have already answered this questionnaire. If you have a question, please <a href='%s'>get in touch</a>, or <a href='%s'>view your problem</a>.\n" msgstr "" -#: templates/web/base/questionnaire/index.html:77 -#: templates/web/base/report/new/fill_in_details_form.html:75 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:73 -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/base/report/update-form.html:59 -#: templates/web/fixmystreet/report/update-form.html:56 -msgid "You have already attached a photo to this update, attaching another one will replace it." -msgstr "" - -#: templates/web/zurich/report/new/fill_in_details_form.html:61 +#: templates/web/base/report/new/form_report.html:32 +#: templates/web/zurich/report/new/fill_in_details_form.html:55 msgid "You have already attached photos to this report. Note that you can attach a maximum of 3 to this report (if you try to upload more, the oldest will be removed)." msgstr "Sie haben dieser Meldung bereits Fotos angehängt. Sie können maximal 3 Fotos anhängen (wenn Sie mehr anhängen, wird das Älteste entfernt)." +#: templates/web/base/questionnaire/index.html:83 +#: templates/web/base/report/update/form_update.html:14 +#, fuzzy +msgid "You have already attached photos to this update. Note that you can attach a maximum of 3 to this update (if you try to upload more, the oldest will be removed)." +msgstr "Sie haben dieser Meldung bereits Fotos angehängt. Sie können maximal 3 Fotos anhängen (wenn Sie mehr anhängen, wird das Älteste entfernt)." + #: templates/web/base/auth/sign_out.html:4 #: templates/web/zurich/auth/sign_out.html:3 msgid "You have been signed out" @@ -3717,9 +3625,8 @@ msgstr "Der grüne Punkt lokalisiert Ihre Meldung auf der Karte. Falls diese msgid "You have successfully confirmed your email address." msgstr "Sie haben Ihre Meldung erfolgreich bestätigt. " -#: templates/web/base/report/display.html:20 -#: templates/web/base/report/new/fill_in_details.html:37 -#: templates/web/fixmystreet/report/display.html:17 +#: templates/web/base/report/display.html:17 +#: templates/web/base/report/new/login_success_form.html:3 msgid "You have successfully signed in; please check and confirm your details are accurate:" msgstr "" @@ -3748,53 +3655,42 @@ msgid "Your Reports" msgstr "Ihre Meldungen" #: templates/web/base/alert/_list.html:89 +#: templates/web/base/contact/index.html:83 +#: templates/web/base/report/display_tools.html:38 +#: templates/web/base/report/display_tools.html:40 +#: templates/web/base/report/new/form_user_loggedin.html:3 +#: templates/web/base/report/new/form_user_loggedout_email.html:1 +#: templates/web/base/report/update/form_user_loggedout_email.html:1 #: templates/web/fixmystreet/alert/updates.html:19 #: templates/web/fixmystreet/alert/updates.html:22 -#: templates/web/fixmystreet/contact/index.html:91 -#: templates/web/fixmystreet/report/display.html:62 -#: templates/web/fixmystreet/report/display.html:64 -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:3 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:1 -#: templates/web/fixmystreet/report/update-form.html:76 #: templates/web/zurich/report/new/fill_in_details_form.html:76 msgid "Your email" msgstr "E-Mail Adresse" -#: templates/web/base/auth/general.html:28 -#: templates/web/fixmystreet/report/update-form.html:82 +#: templates/web/base/auth/general.html:45 +#: templates/web/base/report/update/form_user_loggedout_email.html:7 #: templates/web/zurich/auth/general.html:30 #: templates/web/zurich/auth/general.html:58 msgid "Your email address" msgstr "Ihre E-Mail Adresse" -#: templates/web/base/report/new/fill_in_details_form.html:106 -#: templates/web/base/report/update-form.html:81 -msgid "Your email:" -msgstr "Ihre E-Mail" - -#: templates/web/fixmystreet/report/updates-sidebar-notes.html:7 +#: templates/web/base/report/updates-sidebar-notes.html:3 msgid "Your information will only be used in accordance with our <a href=\"/privacy\">privacy policy</a>" msgstr "Wir verwenden Ihre persönlichen Daten nur entsprechend unserer <a href=\"/faq#privacy\">Datenschutzrichtlinien.</a>" -#: templates/web/base/auth/general.html:51 -#: templates/web/fixmystreet/contact/index.html:84 -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:18 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:54 -#: templates/web/fixmystreet/report/update-form.html:142 +#: templates/web/base/auth/general.html:90 +#: templates/web/base/contact/index.html:76 +#: templates/web/base/report/new/form_user_loggedin.html:18 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:17 +#: templates/web/base/report/update/form_name.html:11 #: templates/web/zurich/auth/general.html:61 #: templates/web/zurich/report/new/fill_in_details_form.html:86 msgid "Your name" msgstr "Ihr Name" -#: templates/web/base/contact/index.html:73 -#: templates/web/base/report/new/fill_in_details_form.html:186 -#: templates/web/base/report/update-form.html:152 -msgid "Your name:" -msgstr "Ihr Name" - -#: templates/web/base/auth/general.html:39 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:22 -#: templates/web/fixmystreet/report/update-form.html:96 +#: templates/web/base/auth/general.html:75 +#: templates/web/base/report/new/form_user_loggedout_password.html:10 +#: templates/web/base/report/update/form_user_loggedout_password.html:9 #: templates/web/zurich/auth/general.html:34 msgid "Your password" msgstr "Ihr Passwort" @@ -3803,15 +3699,16 @@ msgstr "Ihr Passwort" msgid "Your password has been changed" msgstr "Ihr Passwort wurde geändert" -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:27 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:63 +#: templates/web/base/report/new/form_user_loggedin.html:27 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:26 #: templates/web/zurich/report/new/fill_in_details_form.html:92 msgid "Your phone number" msgstr "Ihre Telefonnummer" #: templates/web/base/questionnaire/index.html:14 +#, fuzzy msgid "Your report" -msgstr "Ihre Meldung" +msgstr "Ihre Meldungen" #: templates/web/base/footer.html:9 templates/web/fixmystreet/footer.html:29 msgid "Your reports" @@ -3821,13 +3718,9 @@ msgstr "Ihre Meldungen" msgid "Your updates" msgstr "" -#: templates/web/base/contact/index.html:81 -msgid "Your email:" -msgstr "Ihre E-Mail Adresse" - #: templates/web/base/reports/_list-filters.html:3 msgid "all reports" -msgstr "Alle Meldungen" +msgstr "" #: templates/web/base/admin/timeline.html:4 msgid "by %s" @@ -3835,7 +3728,7 @@ msgstr "" #: templates/web/base/reports/_list-filters.html:5 msgid "closed reports" -msgstr "Abgeschlossene Meldungen" +msgstr "" #: templates/web/base/reports/body.html:6 #: templates/web/base/reports/body.html:7 @@ -3858,15 +3751,15 @@ msgstr "" #: templates/web/base/reports/_list-filters.html:6 msgid "fixed reports" -msgstr "Beantwortete Meldungen" +msgstr "" -#: templates/web/base/admin/index.html:33 +#: templates/web/base/status/stats.html:20 #: templates/web/zurich/admin/index.html:5 msgid "from %s different users" -msgstr "von %d verschiedenen Personen" +msgstr "von %s verschiedenen Personen" -#: templates/web/base/report/_item.html:17 -#: templates/web/zurich/report/_item.html:16 +#: templates/web/base/report/_item.html:15 +#: templates/web/zurich/report/_item.html:14 msgid "last updated %s" msgstr "letzte Bearbeitung %s" @@ -3958,10 +3851,8 @@ msgstr "" msgid "sign out" msgstr "ausloggen" -#: templates/web/base/report/new/fill_in_details_form.html:12 -#: templates/web/base/report/new/fill_in_details_form.html:15 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:10 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:12 +#: templates/web/base/report/new/fill_in_details_form.html:11 +#: templates/web/base/report/new/fill_in_details_form.html:9 msgid "the local council" msgstr "" @@ -3970,7 +3861,7 @@ msgstr "" msgid "there is no pin shown as the user did not use the map" msgstr "Es wird keine Stecknadel angezeigt, da der User die Karte nicht benützt hat" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:395 +#: perllib/FixMyStreet/Script/Reports.pm:176 msgid "this type of local problem" msgstr "" @@ -3980,7 +3871,7 @@ msgstr "heute" #: templates/web/base/reports/_list-filters.html:4 msgid "unfixed reports" -msgstr "Offene Meldungen" +msgstr "" #: templates/web/base/admin/report_edit.html:32 msgid "used map" @@ -3992,14 +3883,14 @@ msgstr "" #: templates/web/base/admin/update_edit.html:38 msgid "user is problem owner" -msgstr "Der User ist der Eigner der Meldung" +msgstr "" #: templates/web/base/reports/body.html:0 #: templates/web/base/reports/body.html:3 msgid "ward" msgstr "" -#: templates/web/base/front/stats.html:17 +#: templates/web/base/front/stats.html:13 #, perl-format msgid "<big>%s</big> report recently" msgid_plural "<big>%s</big> reports recently" @@ -4027,7 +3918,7 @@ msgid_plural "%d minutes" msgstr[0] "%d Minute" msgstr[1] "%d Minuten" -#: templates/web/base/front/stats.html:29 +#: templates/web/base/front/stats.html:25 #, perl-format msgid "<big>%s</big> update on reports" msgid_plural "<big>%s</big> updates on reports" @@ -4048,14 +3939,14 @@ msgid_plural "%d weeks" msgstr[0] "%d Woche" msgstr[1] "%d Wochen" -#: templates/web/base/front/stats.html:12 +#: templates/web/base/front/stats.html:8 #, perl-format msgid "<big>%s</big> report in past week" msgid_plural "<big>%s</big> reports in past week" msgstr[0] "<big>%s</big> Meldung in der letzten Woche" msgstr[1] "<big>%s</big> Meldungen in der letzten Woche" -#: templates/web/base/front/stats.html:23 +#: templates/web/base/front/stats.html:19 #, perl-format msgid "<big>%s</big> fixed in past month" msgid_plural "<big>%s</big> fixed in past month" @@ -4076,47 +3967,50 @@ msgid_plural "We do <strong>not</strong> yet have details for the other councils msgstr[0] "" msgstr[1] "" -#~ msgid "<small>If you cannot see the map, <a href='%s' rel='nofollow'>skip this step</a>.</small>" -#~ msgstr "Karte nicht sichtbar? <a href='%s' rel='nofollow'>Überspringen</a>.</small>" +#~ msgid "(we never show your email address or phone number)" +#~ msgstr "(Ihre E-Mail Adresse und Telefonnummer werden nie angezeigt)" + +#~ msgid "(we never show your email)" +#~ msgstr "(Ihre E-Mail Adresse wird nie angezeigt)" + +#~ 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 URL kopiert haben.\n" #~ 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 "Falls Sie kein E-Mail erhalten, überprüfend Sie bitte Ihren Spam-Ordner." -#~ msgid "No problems found." -#~ msgstr "Keine Meldungen gefunden." +#~ msgid "Message:" +#~ msgstr "Nachricht:" + +#~ msgid "More problems nearby" +#~ msgstr "Meldungen in der Nähe" -#~ msgid "No problems have been reported yet." -#~ msgstr "Bisher wurden noch keine Meldungen erfasst." +#~ msgid "Nearly Done! Now check your email..." +#~ msgstr "Fast Fertig! Bitte checken Sie Ihre Mailbox..." -#~ msgid "Open reports" -#~ msgstr "Offene Meldungen" +#~ msgid "Photo:" +#~ msgstr "Foto:" #~ msgid "Please check your email" #~ msgstr "Bitte überprüfen Sie Ihr E-Mail" -#~ 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." +#~ msgid "This problem is in progress" +#~ msgstr "Dieser Schaden ist in Bearbeitung" -#~ msgid "You must now click the link in the email we've just sent you." -#~ msgstr "Sie können Ihre Meldung bestätigen, indem Sie auf den Link im E-Mail klicken." +#~ msgid "This problem is old and of unknown status." +#~ msgstr "Dieses Problem ist alt und hat einen unbekannten Status" -#~ msgid "Your email address:" -#~ msgstr "Ihre E-Mail Adresse" - -#~ msgid "Edit templates" -#~ msgstr "Vorlagen editieren" - -#~ msgid "Publish the response" -#~ msgstr "Antwort veröffentlichen" +#~ 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." -#~ msgid "Templates:" -#~ msgstr "Vorlagen:" +#~ 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." -#~ msgid "New update:" -#~ msgstr "Neue Antwort" +#~ msgid "Your email:" +#~ msgstr "Ihre E-Mail" -#~ msgid "Please upload a JPEG image only\n" -#~ msgstr "Bitte laden Sie nur JPEG Bilder hoch\n" +#~ msgid "Your name:" +#~ msgstr "Ihr Name" -#~ msgid "Thank you — you can <a href=\"%s\">view your updated problem</a> on the site." -#~ msgstr "Danke — Sie können Ihre aktualisierte Meldung <a href=\"%s\">auf der Webseite anschauen</a>." +#~ msgid "Your email:" +#~ msgstr "Ihre E-Mail Adresse" diff --git a/locale/de_DE.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/de_DE.UTF-8/LC_MESSAGES/FixMyStreet.po index 3bd046cdb..f0dde036f 100644 --- a/locale/de_DE.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/de_DE.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -10,9 +10,9 @@ msgid "" msgstr "" "Project-Id-Version: fixmystreet\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2015-10-23 16:51+0100\n" -"PO-Revision-Date: 2015-07-31 16:31+0000\n" -"Last-Translator: mySociety <transifex@mysociety.org>\n" +"POT-Creation-Date: 2016-03-02 13:09+0000\n" +"PO-Revision-Date: 2015-10-23 17:54+0000\n" +"Last-Translator: Ettore Atalan <atalanttore@googlemail.com>\n" "Language-Team: German (Germany) (http://www.transifex.com/mysociety/fixmystreet/language/de_DE/)\n" "Language: de_DE\n" "MIME-Version: 1.0\n" @@ -20,45 +20,24 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:628 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:411 +#: perllib/FixMyStreet/DB/Result/Problem.pm:616 +#: perllib/FixMyStreet/Script/Reports.pm:189 msgid " and " msgstr "und" #: templates/web/base/report/new/councils_text_all.html:2 -#: templates/web/base/report/new/councils_text_none.html:11 -#: templates/web/base/report/new/councils_text_none.html:2 +#: templates/web/base/report/new/councils_text_none.html:12 +#: templates/web/base/report/new/councils_text_none.html:15 #: templates/web/base/report/new/councils_text_some.html:19 #: templates/web/base/report/new/councils_text_some.html:22 #: templates/web/base/report/new/councils_text_some.html:5 msgid " or " msgstr "oder" -#: templates/web/base/admin/index.html:35 -#: templates/web/base/status/index.html:13 -msgid "%s confirmed alerts, %s unconfirmed" -msgstr "%d bestätigte Alarme, %d unbestätigt" - -#: templates/web/base/admin/index.html:37 -#: templates/web/base/status/index.html:16 -#: templates/web/zurich/admin/index.html:6 -msgid "%s council contacts – %s confirmed, %s unconfirmed" -msgstr "" - #: templates/web/base/admin/edit-league.html:12 msgid "%d edits by %s" msgstr "%d bearbeitet von %s" -#: templates/web/base/admin/index.html:34 -#: templates/web/base/status/index.html:12 -msgid "%s live updates" -msgstr "%d Aktualisierungen in Echtzeit" - -#: templates/web/base/admin/index.html:36 -#: templates/web/base/status/index.html:14 -msgid "%s questionnaires sent – %s answered (%s%%)" -msgstr "%d Fragebögen versandt – %d beantwortet (%s%%)" - #: templates/web/base/pagination.html:10 msgid "%d to %d of %d" msgstr "%d an %d von %d" @@ -73,6 +52,19 @@ msgstr "%s - Zusammenfassungen" msgid "%s admin:" msgstr "" +#: templates/web/base/status/stats.html:26 +msgid "%s bodies" +msgstr "" + +#: templates/web/base/status/stats.html:24 +msgid "%s confirmed alerts, %s unconfirmed" +msgstr "%s bestätigte Alarme, %s unbestätigt" + +#: templates/web/base/status/stats.html:27 +#: templates/web/zurich/admin/index.html:6 +msgid "%s council contacts – %s confirmed, %s unconfirmed" +msgstr "" + #. ("%s is the site name") #: templates/web/base/alert/index.html:7 msgid "" @@ -89,7 +81,15 @@ msgid "" "within a certain distance of a particular location." msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:695 +#: templates/web/base/status/stats.html:23 +msgid "%s live updates" +msgstr "%s Aktualisierungen in Echtzeit" + +#: templates/web/base/status/stats.html:25 +msgid "%s questionnaires sent – %s answered (%s%%)" +msgstr "%s Fragebögen versandt – %s beantwortet (%s%%)" + +#: perllib/FixMyStreet/DB/Result/Problem.pm:683 msgid "%s ref: %s" msgstr "%s ref: %s" @@ -104,23 +104,23 @@ msgid "" "for the county council." msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:255 perllib/FixMyStreet/Cobrand/UK.pm:267 +#: perllib/FixMyStreet/Cobrand/UK.pm:256 perllib/FixMyStreet/Cobrand/UK.pm:268 msgid "%s ward, %s" msgstr "%s Stadtteil, %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:564 +#: perllib/FixMyStreet/DB/Result/Problem.pm:552 msgid "%s, reported at %s" msgstr "%s, gemeldet am %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:282 perllib/FixMyStreet/Cobrand/UK.pm:294 +#: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295 msgid "%s, within %s ward" msgstr "" #: perllib/FixMyStreet/Map/OSM.pm:42 msgid "© <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors" -msgstr "" +msgstr "© <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a>-Beitragende" -#: templates/web/zurich/report/new/fill_in_details_form.html:53 +#: templates/web/zurich/report/new/fill_in_details_form.html:46 msgid "(Defect & location of defect)" msgstr "" @@ -131,15 +131,13 @@ msgstr "" #: templates/web/zurich/admin/report_edit-sdm.html:60 #: templates/web/zurich/admin/report_edit.html:88 -#, fuzzy msgid "(No name)" -msgstr "Ihr Name" +msgstr "(Kein Name)" #: templates/web/zurich/admin/report_edit-sdm.html:67 #: templates/web/zurich/admin/report_edit.html:95 -#, fuzzy msgid "(No phone number)" -msgstr "Ihre Telefonnummer" +msgstr "(Keine Telefonnummer)" #: templates/web/base/alert/_list.html:24 msgid "(a default distance which covers roughly 200,000 people)" @@ -150,13 +148,13 @@ msgstr "" msgid "(alternatively the RSS feed can be customised, within %s)" msgstr "" -#: templates/web/base/report/_item.html:27 -#: templates/web/zurich/report/_item.html:21 +#: templates/web/base/report/_item.html:25 +#: templates/web/zurich/report/_item.html:19 msgid "(closed)" msgstr "(geschlossen)" -#: templates/web/base/report/_item.html:25 -#: templates/web/zurich/report/_item.html:19 +#: templates/web/base/report/_item.html:23 +#: templates/web/zurich/report/_item.html:17 msgid "(fixed)" msgstr "(gelöst)" @@ -164,37 +162,28 @@ msgstr "(gelöst)" msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)" msgstr "(z.B. illegale Deponien, Strassenschäden, Graffitis usw.)" -#: templates/web/base/report/_item.html:21 +#: templates/web/base/report/_item.html:19 msgid "(not sent to council)" msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:200 #: templates/web/zurich/report/new/fill_in_details_form.html:82 msgid "(optional)" msgstr "(optional)" -#: templates/web/fixmystreet/report/public_label.html:1 +#: templates/web/base/report/public_label.html:1 msgid "(public)" msgstr "(öffentlich)" -#: templates/web/base/report/_item.html:20 +#: templates/web/base/report/_item.html:18 msgid "(sent to both)" msgstr "(gesendet an beide)" -#: templates/web/base/report/new/fill_in_details_form.html:194 -msgid "(we never show your email address or phone number)" -msgstr "(ihre eMail-Adresse oder Telefonnummer werden nie angezeigt)" - -#: templates/web/base/report/update-form.html:159 -msgid "(we never show your email)" -msgstr "(ihre eMail-Adresse wird nie angezeigt)" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:673 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 #: perllib/FixMyStreet/DB/Result/Problem.pm:410 msgid "-- Pick a category --" msgstr "-- Wählen Sie eine Kategorie --" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:637 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:632 #: perllib/FixMyStreet/DB/Result/Problem.pm:416 msgid "-- Pick a property type --" msgstr "" @@ -213,52 +202,39 @@ msgstr "" msgid "<label>Show %s</label> <label>about %s</label>" msgstr "" -#: templates/web/base/admin/index.html:32 -#: templates/web/base/status/index.html:11 +#: templates/web/base/status/stats.html:18 #: templates/web/zurich/admin/index.html:4 msgid "<strong>%s</strong> live problems" msgstr "" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:39 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:2 msgid "<strong>No</strong> Let me confirm my report by email" msgstr "" -#: templates/web/fixmystreet/report/update-form.html:112 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:2 msgid "<strong>No</strong> Let me confirm my update by email" msgstr "" -#: templates/web/base/auth/general.html:48 +#: templates/web/base/auth/general.html:87 #: templates/web/zurich/auth/general.html:51 msgid "<strong>No</strong> let me sign in by email" msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:145 -msgid "<strong>No</strong>, let me confirm my report by email:" -msgstr "" - -#: templates/web/base/report/update-form.html:118 -msgid "<strong>No</strong>, let me confirm my update by email:" -msgstr "" - -#: templates/web/base/auth/general.html:34 -#: templates/web/base/report/new/fill_in_details_form.html:123 -#: templates/web/base/report/update-form.html:96 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:15 -#: templates/web/fixmystreet/report/update-form.html:89 +#: templates/web/base/auth/general.html:70 +#: templates/web/base/report/new/form_user_loggedout_password.html:3 +#: templates/web/base/report/update/form_user_loggedout_password.html:2 msgid "<strong>Yes</strong> I have a password" msgstr "<strong>Ja</strong>, ich habe ein Passwort" -#: templates/web/base/static/about-en-gb.html:1 -#: templates/web/base/static/about-en-gb.html:3 +#: templates/web/base/about/about-en-gb.html:1 +#: templates/web/base/about/about-en-gb.html:3 msgid "About us" msgstr "Über uns" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:8 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:31 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:29 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:35 msgid "Action Scheduled" msgstr "Aktion geplant" @@ -289,14 +265,13 @@ msgstr "Füge neue Kategorie hinzu" msgid "Add user" msgstr "Benutzer hinzufügen" -#: templates/web/base/my/my.html:52 +#: templates/web/base/my/my.html:56 msgid "Added %s" msgstr "%s hinzugefügt" #: templates/web/base/report/new/category_extras.html:9 -#, fuzzy msgid "Additional Information" -msgstr "Wartet auf Moderation" +msgstr "Zusätzliche Informationen" #: templates/web/base/auth/change_password.html:29 msgid "Again:" @@ -310,8 +285,7 @@ msgstr "" msgid "Alert %d disabled (created %s)" msgstr "Alarm %d deaktiviert (erstellt %s)" -#: templates/web/base/report/update-form.html:164 -#: templates/web/fixmystreet/report/update-form.html:150 +#: templates/web/base/report/update/form_name.html:20 msgid "Alert me to future updates" msgstr "" @@ -321,9 +295,8 @@ msgid "All Reports" msgstr "Alle Meldungen" #: templates/web/zurich/admin/stats.html:5 -#, fuzzy msgid "All Reports as CSV" -msgstr "Alle Meldungen" +msgstr "Alle Berichte als CSV" #: templates/web/base/footer.html:11 templates/web/fixmystreet/footer.html:32 #: templates/web/zurich/admin/index-dm.html:12 @@ -344,10 +317,8 @@ msgstr "" #: templates/web/base/report/new/councils_text_all.html:2 #: templates/web/base/report/new/councils_text_all.html:4 -#: templates/web/base/report/new/fill_in_details_form.html:12 -#: templates/web/base/report/new/fill_in_details_form.html:14 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:10 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:11 +#: templates/web/base/report/new/fill_in_details_form.html:10 +#: templates/web/base/report/new/fill_in_details_form.html:9 msgid "All the information you provide here will be sent to <strong>%s</strong>." msgstr "" @@ -369,6 +340,10 @@ msgstr "Anonym:" msgid "Are you a developer?" msgstr "Sind Sie ein Entwickler?" +#: templates/web/base/js/translation_strings.html:52 +msgid "Are you sure you want to cancel this upload?" +msgstr "" + #: templates/web/base/admin/body-form.html:69 #: templates/web/base/admin/body.html:16 #: templates/web/zurich/admin/body-form.html:24 @@ -401,16 +376,16 @@ msgstr "" msgid "Assigned to %s" msgstr "" -#: templates/web/base/open311/index.html:84 +#: templates/web/base/open311/index.html:76 msgid "At most %d requests are returned in each query. The returned requests are ordered by requested_datetime, so to get all requests, do several searches with rolling start_date and end_date." msgstr "" -#: templates/web/base/open311/index.html:76 +#: templates/web/base/open311/index.html:68 msgid "At the moment only searching for and looking at reports work." msgstr "" #: perllib/FixMyStreet/DB/Result/Problem.pm:373 -#: templates/web/zurich/report/_item.html:11 +#: templates/web/zurich/report/_item.html:9 msgid "Awaiting moderation" msgstr "Wartet auf Moderation" @@ -422,7 +397,7 @@ msgstr "Zurück" msgid "Ban email address" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1276 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1285 #: perllib/FixMyStreet/Cobrand/Zurich.pm:392 #: templates/web/base/admin/bodies.html:1 templates/web/zurich/header.html:64 msgid "Bodies" @@ -452,7 +427,7 @@ msgid "Can't see the map? <em>Skip this step</em>" msgstr "" #: templates/web/base/admin/body.html:68 -#: templates/web/base/admin/index.html:61 +#: templates/web/base/admin/index.html:54 #: templates/web/base/report/new/category.html:10 #: templates/web/base/report/new/category_wrapper.html:3 #: templates/web/zurich/admin/body.html:14 @@ -463,8 +438,8 @@ msgstr "" msgid "Category" msgstr "Kategorie" -#: templates/web/base/admin/index.html:59 -#: templates/web/base/admin/index.html:67 +#: templates/web/base/admin/index.html:52 +#: templates/web/base/admin/index.html:60 msgid "Category fix rate for problems > 4 weeks old" msgstr "" @@ -477,7 +452,7 @@ msgstr "" msgid "Category:" msgstr "Kategorie:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:402 +#: perllib/FixMyStreet/Script/Reports.pm:180 msgid "Category: %s" msgstr "Kategorie: %s" @@ -519,7 +494,7 @@ msgstr "" #: templates/web/zurich/admin/response_templates_select.html:6 msgid "Choose a template" -msgstr "" +msgstr "Wählen Sie eine Vorlage aus" #: templates/web/base/admin/stats.html:65 #: templates/web/base/admin/stats.html:71 @@ -527,7 +502,7 @@ msgid "Click here or enter as dd/mm/yyyy" msgstr "" #: templates/web/base/around/_report_banner.html:2 -#: templates/web/base/js/translation_strings.html:50 +#: templates/web/base/js/translation_strings.html:55 msgid "Click map to report a problem" msgstr "Klicken Sie in die Karte um eine Meldung zu erfassen" @@ -554,7 +529,7 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:25 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:144 -#: templates/web/fixmystreet/report/banner.html:15 +#: templates/web/base/report/banner.html:15 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:10 #: templates/web/zurich/admin/header.html:16 @@ -562,7 +537,7 @@ msgstr "" msgid "Closed" msgstr "Geschlossen" -#: perllib/FixMyStreet/DB/Result/Problem.pm:794 +#: perllib/FixMyStreet/DB/Result/Problem.pm:779 msgid "Closed by council" msgstr "" @@ -588,7 +563,7 @@ msgstr "" msgid "Cobrand:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1283 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1292 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "Konfiguration" @@ -601,13 +576,13 @@ msgstr "Endpunkt konfigurieren" msgid "Confirm" msgstr "Bestätigen" -#: templates/web/base/auth/token.html:1 templates/web/zurich/auth/token.html:1 +#: templates/web/base/auth/token.html:1 msgid "Confirm account" msgstr "Konto bestätigen" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:33 -#: templates/web/fixmystreet/report/update-form.html:107 -msgid "Confirm by email below, providing a new password at that point. When you confirm, your password will be updated." +#: templates/web/base/report/new/form_user_loggedout_password.html:21 +#: templates/web/base/report/update/form_user_loggedout_password.html:20 +msgid "Confirm by email instead, providing a new password at that point. When you confirm, your password will be updated." msgstr "" #: templates/web/base/questionnaire/creator_fixed.html:1 @@ -637,35 +612,27 @@ msgid "Confirmed:" msgstr "Bestätigt:" #. ("%s is the site name") -#: templates/web/base/faq/faq-en-gb.html:8 templates/web/base/footer.html:24 -#: templates/web/base/open311/index.html:8 -#: templates/web/base/static/privacy.html:10 -#: templates/web/fixmystreet/contact/index.html:12 -#, fuzzy +#: templates/web/base/about/_sidebar.html:6 templates/web/base/footer.html:24 msgid "Contact %s" -msgstr "Kontaktieren Sie uns" +msgstr "%s kontaktieren" #: templates/web/base/contact/index.html:1 #: templates/web/base/contact/index.html:2 #: templates/web/base/contact/submit.html:1 -#: templates/web/fixmystreet/contact/index.html:1 -#: templates/web/fixmystreet/contact/index.html:2 msgid "Contact Us" msgstr "Kontaktieren Sie uns" -#: templates/web/base/contact/index.html:6 -#: templates/web/fixmystreet/contact/index.html:20 +#: templates/web/base/contact/index.html:12 msgid "Contact the team" msgstr "Kontaktieren Sie das Team" #: templates/web/zurich/admin/report_edit-sdm.html:40 #: templates/web/zurich/admin/report_edit.html:59 -#, fuzzy msgid "Coordinates:" msgstr "Koordinaten:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1420 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1448 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1429 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1457 msgid "Could not find user" msgstr "Benutzer konnte nicht gefunden werden" @@ -675,7 +642,7 @@ msgstr "" #: templates/web/base/admin/list_updates.html:9 msgid "Council" -msgstr "" +msgstr "Rat" #: templates/web/base/admin/body.html:1 #: templates/web/base/admin/category_edit.html:1 @@ -683,13 +650,13 @@ msgstr "" msgid "Council contacts for %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:693 +#: perllib/FixMyStreet/DB/Result/Problem.pm:681 msgid "Council ref: %s" msgstr "" #: templates/web/base/admin/stats.html:84 msgid "Council:" -msgstr "" +msgstr "Rat:" #: templates/web/base/admin/stats.html:12 #: templates/web/base/admin/stats.html:32 @@ -698,7 +665,7 @@ msgstr "" msgid "Count" msgstr "Anzahl" -#: templates/web/base/email_sent.html:1 templates/web/zurich/email_sent.html:1 +#: templates/web/base/email_sent.html:1 msgid "Create a report" msgstr "Erfasse eine Meldung" @@ -708,9 +675,8 @@ msgid "Create category" msgstr "Kategorie erstellen" #: templates/web/zurich/admin/template_edit.html:29 -#, fuzzy msgid "Create template" -msgstr "Erfasse eine Meldung" +msgstr "Vorlage erstellen" #: templates/web/base/admin/problem_row.html:34 #: templates/web/zurich/admin/templates.html:10 @@ -747,10 +713,10 @@ msgstr "Ãœbersichtsseite" msgid "Dealt with by subdivision within 5 working days" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:878 +#: perllib/FixMyStreet/App/Controller/Admin.pm:877 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" -msgstr "" +msgstr "Vorlage löschen" #: templates/web/base/admin/bodies.html:27 #: templates/web/base/admin/body.html:177 @@ -760,7 +726,7 @@ msgstr "" msgid "Deleted" msgstr "Gelöscht" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:51 +#: templates/web/base/report/new/form_report.html:45 #: templates/web/zurich/admin/index-dm.html:22 #: templates/web/zurich/admin/index-sdm.html:20 #: templates/web/zurich/admin/reports.html:12 @@ -768,12 +734,11 @@ msgid "Description" msgstr "Beschreibung" #: templates/web/base/js/translation_strings.html:34 -#: templates/web/zurich/report/new/fill_in_details_form.html:42 +#: templates/web/zurich/report/new/fill_in_details_form.html:68 msgid "Details" msgstr "Beschreibung" #: templates/web/base/admin/report_edit.html:20 -#: templates/web/base/report/new/fill_in_details_form.html:62 #: templates/web/zurich/admin/report_edit-sdm.html:27 #: templates/web/zurich/admin/report_edit.html:29 #: templates/web/zurich/admin/report_edit.html:43 @@ -786,38 +751,38 @@ msgstr "" #: templates/web/zurich/admin/report_edit-sdm.html:50 #: templates/web/zurich/admin/report_edit.html:69 -#, fuzzy msgid "Didn't use map" -msgstr "hat Karte nicht verwendet" +msgstr "" #: templates/web/base/admin/edit-league.html:8 msgid "Diligency prize league table" msgstr "Weiss ich nicht" #. ("%s is the site name") -#: templates/web/base/auth/general.html:31 -#: templates/web/base/report/new/fill_in_details_form.html:114 -#: templates/web/base/report/update-form.html:87 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:11 -#: templates/web/fixmystreet/report/update-form.html:86 -#, fuzzy +#: templates/web/base/auth/general.html:48 +#: templates/web/base/report/new/form_user_loggedout.html:18 +#: templates/web/base/report/new/oauth_email_form.html:18 +#: templates/web/base/report/update-form.html:29 +#: templates/web/base/report/update/form_user_loggedout.html:17 msgid "Do you have a %s password?" -msgstr "Haben Sie ein FixMyStreet-Passwort?" +msgstr "" #: templates/web/base/questionnaire/index.html:55 msgid "Don’t know" msgstr "Weiß ich nicht" -#: templates/web/fixmystreet/contact/index.html:118 +#: templates/web/base/contact/index.html:110 msgid "Don't like forms?" msgstr "Sie mögen keine Formulare?" +#: templates/web/base/js/translation_strings.html:51 +msgid "Drag and drop photos here or <u>click to upload</u>" +msgstr "" + #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:14 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:32 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:30 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:36 msgid "Duplicate" msgstr "Duplizieren" @@ -867,7 +832,7 @@ msgstr "Editor" #: templates/web/base/admin/category_edit.html:91 #: templates/web/base/admin/flagged.html:38 #: templates/web/base/admin/users.html:16 -#: templates/web/base/auth/general.html:22 +#: templates/web/base/auth/general.html:39 #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:24 @@ -875,7 +840,7 @@ msgstr "Editor" msgid "Email" msgstr "E-Mail" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1396 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1405 msgid "Email added to abuse list" msgstr "" @@ -891,7 +856,7 @@ msgstr "E-Mail-Benachrichtigung erstellt" msgid "Email alert deleted" msgstr "E-Mail-Benachrichtigung gelöscht" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1393 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1402 msgid "Email already in abuse list" msgstr "" @@ -899,41 +864,36 @@ msgstr "" msgid "Email me new local problems" msgstr "" -#: templates/web/base/report/display.html:38 -msgid "Email me updates" -msgstr "Schicken sie mir Aktualisierungen" - #: templates/web/base/admin/category_edit.html:31 #: templates/web/base/admin/report_edit.html:62 #: templates/web/base/admin/update_edit.html:33 #: templates/web/base/admin/user-form.html:20 #: templates/web/base/alert/updates.html:13 -#: templates/web/base/report/display.html:42 #: templates/web/zurich/admin/body.html:47 msgid "Email:" msgstr "E-Mail:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:329 +#: perllib/FixMyStreet/Script/Reports.pm:108 msgid "Email: %s" msgstr "E-Mail: %s" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:639 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:634 msgid "Empty flat or maisonette" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:638 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:633 msgid "Empty house or bungalow" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:641 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:636 msgid "Empty office or other commercial" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:642 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:637 msgid "Empty pub or bar" msgstr "Leere Kneipe oder Bar" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:643 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:638 msgid "Empty public building - school, hospital, etc." msgstr "" @@ -966,7 +926,7 @@ msgstr "Endpunkt" msgid "Enter a Zürich street name" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:13 +#: perllib/FixMyStreet/Cobrand/UK.pm:14 msgid "Enter a nearby UK postcode, or street name and area" msgstr "" @@ -984,14 +944,9 @@ msgstr "Geben Sie eine Adresse an" msgid "Enter a nearby street name and area, postal code or district in Delhi" msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:152 -#: templates/web/base/report/update-form.html:125 -msgid "Enter a new password:" -msgstr "Geben Sie ein neues Passwort ein:" - -#: templates/web/base/auth/general.html:60 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:75 -#: templates/web/fixmystreet/report/update-form.html:123 +#: templates/web/base/auth/general.html:99 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:38 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:13 #: templates/web/zurich/auth/general.html:65 msgid "Enter a password" msgstr "Geben Sie ein Passwort ein" @@ -1001,28 +956,28 @@ msgid "Enter details of the problem" msgstr "Beschreiben sie den Mangel" #: templates/web/base/errors/generic.html:1 -#: templates/web/base/errors/generic.html:3 +#: templates/web/base/errors/generic.html:4 #: templates/web/base/tokens/abuse.html:1 #: templates/web/base/tokens/abuse.html:3 #: templates/web/base/tokens/error.html:1 -#: templates/web/base/tokens/error.html:3 +#: templates/web/base/tokens/error.html:5 msgid "Error" msgstr "Fehler" #: templates/web/base/reports/_list-filters.html:12 msgid "Everything" -msgstr "" +msgstr "Alles" #: templates/web/base/admin/body.html:14 #: templates/web/base/admin/category_edit.html:18 msgid "Example postcode %s" msgstr "Beispieladresse" -#: templates/web/base/open311/index.html:94 +#: templates/web/base/open311/index.html:86 msgid "Examples:" msgstr "Beispiele:" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:55 +#: templates/web/base/report/new/form_report.html:49 msgid "Explain what’s wrong, exactly where it is, and how long it’s been there…" msgstr "" @@ -1031,11 +986,11 @@ msgstr "" #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:12 msgid "Extern" -msgstr "" +msgstr "Extern" #: templates/web/base/admin/body-form.html:81 msgid "External URL" -msgstr "" +msgstr "Externe URL" #: templates/web/base/admin/category_edit.html:27 #: templates/web/base/admin/report_edit.html:74 @@ -1063,17 +1018,15 @@ msgstr "" msgid "FixMyStreet" msgstr "FixMyStreet" -#: templates/web/base/admin/index.html:61 +#: templates/web/base/admin/index.html:54 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:24 #: templates/web/base/admin/report_blocks.html:9 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:144 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:34 -#: templates/web/fixmystreet/report/banner.html:12 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:32 +#: templates/web/base/report/banner.html:12 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:38 msgid "Fixed" msgstr "Gelöst" @@ -1100,7 +1053,7 @@ msgstr "" msgid "Flag user" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1281 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1290 #: templates/web/base/admin/users.html:19 msgid "Flagged" msgstr "" @@ -1131,8 +1084,8 @@ msgstr "" msgid "For more information, see <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>." msgstr "" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:32 -#: templates/web/fixmystreet/report/update-form.html:106 +#: templates/web/base/report/new/form_user_loggedout_password.html:20 +#: templates/web/base/report/update/form_user_loggedout_password.html:19 msgid "Forgotten your password?" msgstr "Passwort vergessen?" @@ -1144,21 +1097,18 @@ msgstr "" msgid "Forwarded wish to external body" msgstr "" -#: templates/web/base/faq/faq-en-gb.html:1 -#: templates/web/base/faq/faq-en-gb.html:13 -#: templates/web/base/faq/faq-en-gb.html:6 -#: templates/web/base/open311/index.html:6 -#: templates/web/base/static/privacy.html:8 -#: templates/web/fixmystreet/contact/index.html:10 +#: templates/web/base/about/_sidebar.html:4 +#: templates/web/base/about/faq-en-gb.html:1 +#: templates/web/base/about/faq-en-gb.html:5 msgid "Frequently Asked Questions" msgstr "Häufig gestellte Fragen" -#: templates/web/base/open311/index.html:136 +#: templates/web/base/open311/index.html:128 msgid "GeoRSS on Google Maps" msgstr "GeoRSS auf Google Maps" +#: templates/web/base/report/display_tools.html:11 #: templates/web/fixmystreet/around/_updates.html:3 -#: templates/web/fixmystreet/report/display.html:35 msgid "Get updates" msgstr "Aktualisierungen holen" @@ -1191,7 +1141,7 @@ msgstr "Los" msgid "Going to send questionnaire?" msgstr "" -#: templates/web/base/admin/index.html:42 +#: templates/web/base/admin/index.html:35 msgid "Graph of problem creation by status over time" msgstr "" @@ -1208,7 +1158,7 @@ msgid "Have you ever reported a problem to a council before, or is this your fir msgstr "" #: templates/web/base/footer.html:15 templates/web/fixmystreet/footer.html:38 -#: templates/web/zurich/faq/faq-de-ch.html:1 +#: templates/web/zurich/about/faq-de-ch.html:1 #: templates/web/zurich/footer.html:22 #: templates/web/zurich/nav_over_content.html:8 msgid "Help" @@ -1259,7 +1209,7 @@ msgstr "Erfasse eine neue Meldung:" msgid "How to send successful reports" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:754 +#: perllib/FixMyStreet/App/Controller/Admin.pm:752 msgid "I am afraid you cannot confirm unconfirmed reports." msgstr "" @@ -1277,10 +1227,6 @@ msgstr "" msgid "I'm afraid we couldn't locate your problem in the database.\n" msgstr "" -#: perllib/FixMyStreet/App/Controller/Tokens.pm:327 -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 URL kopiert haben.\n" - #: templates/web/base/admin/flagged.html:14 #: templates/web/base/admin/list_updates.html:6 #: templates/web/base/admin/reports.html:11 @@ -1309,16 +1255,11 @@ msgstr "" msgid "If you get some more information about the status of your problem, please come back to the site and leave an update." msgstr "" -#: templates/web/base/report/new/councils_text_none.html:2 -#: templates/web/base/report/new/councils_text_none.html:8 +#: templates/web/base/report/new/councils_text_none.html:10 +#: templates/web/base/report/new/councils_text_none.html:9 msgid "If you submit a problem here the subject and details of the problem will be public, but the problem will <strong>not</strong> be reported to the council." msgstr "" -#: templates/web/zurich/auth/token.html:19 -#: templates/web/zurich/email_sent.html:7 -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 "" - #: templates/web/base/questionnaire/index.html:68 msgid "" "If you wish to leave a public update on the problem, please enter it here\n" @@ -1362,10 +1303,8 @@ msgstr "" #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:144 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:32 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:30 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:36 msgid "In Progress" msgstr "In Bearbeitung" @@ -1373,7 +1312,7 @@ msgstr "In Bearbeitung" msgid "In abuse table?" msgstr "" -#: templates/web/base/open311/index.html:88 +#: templates/web/base/open311/index.html:80 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 "" @@ -1381,7 +1320,7 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/Zurich.pm:963 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:7 -#: templates/web/fixmystreet/report/banner.html:19 +#: templates/web/base/report/banner.html:19 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:8 msgid "In progress" @@ -1416,7 +1355,7 @@ msgstr "" msgid "Invalid agency_responsible value %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1201 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1210 msgid "Invalid end date" msgstr "Ung&ultiges Enddatum" @@ -1424,7 +1363,7 @@ msgstr "Ung&ultiges Enddatum" msgid "Invalid format %s specified." msgstr "Ungültiges Format %s angegeben." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1206 msgid "Invalid start date" msgstr "Ung&ultiges Startdatum" @@ -1432,14 +1371,12 @@ msgstr "Ung&ultiges Startdatum" #: templates/web/base/admin/report_blocks.html:5 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:143 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:31 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:29 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:35 msgid "Investigating" msgstr "Untersuchen" -#: templates/web/fixmystreet/contact/blurb.html:8 +#: templates/web/base/contact/blurb.html:8 msgid "It's often quickest to <a href=\"%s\">check our FAQs</a> and see if the answer is there." msgstr "" @@ -1457,11 +1394,9 @@ msgstr "" msgid "Jurisdiction unknown" msgstr "" -#: templates/web/base/auth/general.html:44 -#: templates/web/base/report/new/fill_in_details_form.html:132 -#: templates/web/base/report/update-form.html:105 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:28 -#: templates/web/fixmystreet/report/update-form.html:102 +#: templates/web/base/auth/general.html:80 +#: templates/web/base/report/new/form_user_loggedout_password.html:16 +#: templates/web/base/report/update/form_user_loggedout_password.html:15 #: templates/web/zurich/auth/general.html:40 msgid "Keep me signed in on this computer" msgstr "" @@ -1519,12 +1454,13 @@ msgid "MAP" msgstr "KARTE" #: templates/web/base/js/translation_strings.html:45 +#: templates/web/base/maps/google-ol.html:13 msgid "Map" msgstr "Karte" #: templates/web/base/admin/report_edit.html:68 msgid "Mark as sent" -msgstr "" +msgstr "Als gesendet markieren" #: templates/web/base/admin/user-form.html:44 msgid "Mark users whose behaviour you want to keep a check on as <strong>flagged</strong>." @@ -1538,7 +1474,7 @@ msgstr "" msgid "Marked fixed/closed more than eight weeks ago" msgstr "" -#: templates/web/fixmystreet/contact/index.html:106 +#: templates/web/base/contact/index.html:98 msgid "Message" msgstr "Nachricht" @@ -1550,10 +1486,6 @@ msgstr "" msgid "Message to external body:" msgstr "" -#: templates/web/base/contact/index.html:97 -msgid "Message:" -msgstr "Nachricht:" - #: perllib/FixMyStreet/App/Controller/Open311.pm:445 msgid "Missing jurisdiction_id" msgstr "Fehlendes jurisdiction_id" @@ -1566,10 +1498,6 @@ msgstr "" msgid "Month" msgstr "Monat" -#: templates/web/base/report/display.html:34 -msgid "More problems nearby" -msgstr "Meldungen in der Nähe" - #: templates/web/base/admin/bodies.html:21 #: templates/web/base/admin/body-form.html:18 #: templates/web/base/admin/flagged.html:16 @@ -1577,11 +1505,11 @@ msgstr "Meldungen in der Nähe" #: templates/web/base/admin/list_updates.html:7 #: templates/web/base/admin/reports.html:13 #: templates/web/base/admin/users.html:15 -#: templates/web/base/auth/general.html:50 +#: templates/web/base/auth/general.html:89 +#: templates/web/base/report/new/form_user_loggedin.html:9 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:7 +#: templates/web/base/report/update/form_name.html:4 #: templates/web/base/reports/index.html:20 -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:9 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:44 -#: templates/web/fixmystreet/report/update-form.html:138 #: templates/web/zurich/admin/body-form.html:4 #: templates/web/zurich/auth/general.html:60 #: templates/web/zurich/report/new/fill_in_details_form.html:82 @@ -1595,7 +1523,7 @@ msgstr "Name" msgid "Name:" msgstr "Name:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:328 +#: perllib/FixMyStreet/Script/Reports.pm:107 msgid "Name: %s" msgstr "Name: %s" @@ -1604,29 +1532,24 @@ msgstr "Name: %s" msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:127 +#: perllib/FixMyStreet/Cobrand/UK.pm:128 msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:434 -#: perllib/FixMyStreet/Cobrand/Default.pm:474 +#: perllib/FixMyStreet/Cobrand/Default.pm:455 +#: perllib/FixMyStreet/Cobrand/Default.pm:495 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:267 +#: perllib/FixMyStreet/Script/Alerts.pm:290 msgid "" "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n" "\n" msgstr "" -#: templates/web/zurich/email_sent.html:5 -msgid "Nearly Done! Now check your email..." -msgstr "Fast Fertig! Bitte checken Sie ihre Mailbox..." - #: templates/web/base/auth/token.html:17 templates/web/base/email_sent.html:5 -#, fuzzy msgid "Nearly done! Now check your email…" -msgstr "Fast Fertig! Bitte checken Sie ihre Mailbox..." +msgstr "" #: templates/web/base/reports/index.html:21 msgid "New <br>problems" @@ -1650,9 +1573,8 @@ msgid "New local problems on FixMyStreet" msgstr "" #: templates/web/zurich/admin/report_edit-sdm.html:117 -#, fuzzy msgid "New note to DM:" -msgstr "Neue interne Anmerkung:" +msgstr "" #: db/alert_types.pl:38 msgid "New problems for {{COUNCIL}} within {{WARD}} ward on FixMyStreet" @@ -1684,9 +1606,8 @@ msgstr "Neuer Status" #: templates/web/zurich/admin/template_edit.html:9 #: templates/web/zurich/admin/templates.html:26 -#, fuzzy msgid "New template" -msgstr "Neuer Status" +msgstr "Neue Vorlage" #: templates/web/base/pagination.html:13 msgid "Next" @@ -1703,8 +1624,8 @@ msgstr "Weiter" #: templates/web/base/admin/report_edit.html:75 #: templates/web/base/admin/update_edit.html:25 #: templates/web/base/questionnaire/creator_fixed.html:16 +#: templates/web/base/questionnaire/index.html:101 #: templates/web/base/questionnaire/index.html:53 -#: templates/web/base/questionnaire/index.html:92 msgid "No" msgstr "Nein" @@ -1714,11 +1635,11 @@ msgstr "" #: templates/web/base/admin/stats.html:85 msgid "No council" -msgstr "" +msgstr "Kein Rat" #: perllib/FixMyStreet/DB/Result/Problem.pm:401 msgid "No council selected" -msgstr "" +msgstr "Kein Rat ausgewählt" #: templates/web/base/admin/edit-league.html:17 msgid "No edits have yet been made." @@ -1768,10 +1689,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:13 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:33 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:31 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:37 msgid "Not Responsible" msgstr "Nicht verantwortlich" @@ -1779,9 +1698,8 @@ msgstr "Nicht verantwortlich" #: perllib/FixMyStreet/Cobrand/Zurich.pm:937 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:13 -#, fuzzy msgid "Not contactable" -msgstr "Nicht verantwortlich" +msgstr "Nicht kontaktierbar" #: templates/web/zurich/admin/report_edit-sdm.html:108 msgid "Not for my subdivision" @@ -1811,7 +1729,7 @@ msgstr "" msgid "Note:" msgstr "Anmerkung:" -#: templates/web/base/open311/index.html:73 +#: templates/web/base/open311/index.html:65 msgid "Note: <strong>%s</strong>" msgstr "Anmerkung: <strong>%s</strong>" @@ -1819,13 +1737,15 @@ msgstr "Anmerkung: <strong>%s</strong>" msgid "Notes from SDM to DM" msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:113 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:10 +#: templates/web/base/report/new/form_user_loggedout.html:14 +#: templates/web/base/report/new/form_user_loggedout.html:2 +#: templates/web/base/report/new/oauth_email_form.html:17 msgid "Now to submit your report…" msgstr "" -#: templates/web/base/report/update-form.html:86 -#: templates/web/fixmystreet/report/update-form.html:85 +#: templates/web/base/report/update-form.html:28 +#: templates/web/base/report/update/form_user_loggedout.html:13 +#: templates/web/base/report/update/form_user_loggedout.html:2 msgid "Now to submit your update…" msgstr "" @@ -1833,11 +1753,6 @@ msgstr "" msgid "OK" msgstr "OK" -#: templates/web/base/report/display.html:28 -#: templates/web/base/report/update.html:17 -msgid "Offensive? Unsuitable? Tell us" -msgstr "" - #: templates/web/base/reports/index.html:23 msgid "Old / unknown <br>problems" msgstr "Alte / unbekannte <br>Probleme" @@ -1854,7 +1769,7 @@ msgstr "" msgid "Older <br>problems" msgstr "Ältere <br>Probleme" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:45 +#: templates/web/base/report/new/form_report.html:15 msgid "One-line summary" msgstr "" @@ -1865,8 +1780,7 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:4 #: templates/web/base/admin/update_edit.html:28 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/report/update-form.html:30 -#: templates/web/fixmystreet/report/update-form.html:28 +#: templates/web/base/report/update/form_update.html:34 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:7 #: templates/web/zurich/admin/update_edit.html:18 @@ -1881,15 +1795,15 @@ msgstr "" msgid "Open, but not had any update in eight weeks" msgstr "" -#: templates/web/base/open311/index.html:70 +#: templates/web/base/open311/index.html:62 msgid "Open311 API for the mySociety FixMyStreet server" msgstr "" -#: templates/web/base/open311/index.html:80 +#: templates/web/base/open311/index.html:72 msgid "Open311 initiative web page" msgstr "" -#: templates/web/base/open311/index.html:81 +#: templates/web/base/open311/index.html:73 msgid "Open311 specification" msgstr "" @@ -1901,15 +1815,15 @@ msgstr "" msgid "Or you can subscribe to an alert based upon what ward or council you’re in:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1084 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:673 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:674 -#: perllib/FixMyStreet/DB/Result/Problem.pm:570 -#: perllib/FixMyStreet/DB/Result/Problem.pm:580 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1055 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:669 +#: perllib/FixMyStreet/DB/Result/Problem.pm:558 +#: perllib/FixMyStreet/DB/Result/Problem.pm:568 +#: perllib/FixMyStreet/DB/Result/Problem.pm:578 #: perllib/FixMyStreet/DB/Result/Problem.pm:590 -#: perllib/FixMyStreet/DB/Result/Problem.pm:602 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:397 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:412 +#: perllib/FixMyStreet/Script/Reports.pm:175 +#: perllib/FixMyStreet/Script/Reports.pm:190 msgid "Other" msgstr "Andere" @@ -1918,7 +1832,7 @@ msgid "Owner" msgstr "Besitzer" #: templates/web/base/errors/page_error_404_not_found.html:1 -#: templates/web/base/errors/page_error_404_not_found.html:3 +#: templates/web/base/errors/page_error_404_not_found.html:4 msgid "Page Not Found" msgstr "Seite nicht gefunden" @@ -1932,16 +1846,16 @@ msgstr "Ãœbergeordnet" msgid "Partial" msgstr "Teilweise" -#: templates/web/base/auth/general.html:53 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:68 -#: templates/web/fixmystreet/report/update-form.html:116 +#: templates/web/base/auth/general.html:92 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:31 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:6 #: templates/web/zurich/auth/general.html:32 #: templates/web/zurich/auth/general.html:63 msgid "Password (optional)" msgstr "Passwort (optional)" #: templates/web/base/auth/change_password.html:25 -#: templates/web/base/auth/general.html:36 +#: templates/web/base/auth/general.html:72 msgid "Password:" msgstr "Passwort:" @@ -1953,51 +1867,43 @@ msgstr "Permalink" msgid "Phone number" msgstr "Telefonnummer" -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:26 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:62 +#: templates/web/base/report/new/form_user_loggedin.html:26 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:25 msgid "Phone number (optional)" msgstr "Telefonnummer (optional)" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:306 +#: perllib/FixMyStreet/Script/Reports.pm:83 #: templates/web/base/admin/report_edit.html:63 -#: templates/web/base/report/new/fill_in_details_form.html:198 #: templates/web/zurich/admin/stats.html:39 msgid "Phone:" msgstr "Telefonnummer:" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:66 -#: templates/web/fixmystreet/report/update-form.html:59 +#: templates/web/base/questionnaire/index.html:75 +#: templates/web/base/report/new/form_report.html:23 +#: templates/web/base/report/update/form_update.html:6 #: templates/web/zurich/admin/index-dm.html:29 #: templates/web/zurich/admin/index-sdm.html:24 #: templates/web/zurich/admin/reports.html:16 #: templates/web/zurich/admin/stats.html:37 -#: templates/web/zurich/report/new/fill_in_details_form.html:52 +#: templates/web/zurich/report/new/fill_in_details_form.html:45 msgid "Photo" msgstr "Foto" -#: perllib/FixMyStreet/App/Controller/Photo.pm:221 -#, fuzzy +#: perllib/FixMyStreet/App/Controller/Photo.pm:187 msgid "Photo is required." -msgstr "Diese Information wird benötigt" +msgstr "Foto ist erforderlich." #: templates/web/base/admin/category_edit.html:48 -#, fuzzy msgid "Photo required" -msgstr "Diese Information wird benötigt" - -#: templates/web/base/questionnaire/index.html:80 -#: templates/web/base/report/new/fill_in_details_form.html:84 -#: templates/web/base/report/update-form.html:62 -msgid "Photo:" -msgstr "Foto:" +msgstr "Foto erforderlich" -#: templates/web/base/alert/list.html:26 +#: templates/web/base/alert/list.html:23 msgid "Photos of recent nearby reports" msgstr "Fotos von neuen Meldungen in der Nähe" #: templates/web/base/js/translation_strings.html:30 msgid "Place pin on map" -msgstr "" +msgstr "Stecknadel auf Karte platzieren" #: perllib/FixMyStreet/Cobrand/Zurich.pm:949 #: perllib/FixMyStreet/Cobrand/Zurich.pm:955 @@ -2020,20 +1926,16 @@ msgstr "Bitte seien Sie freundlich und prägnant." msgid "Please check the passwords and try again" msgstr "" -#: templates/web/zurich/auth/token.html:16 -msgid "Please check your email" -msgstr "Bitte überprüfen sie ihre eMail" - -#: templates/web/base/auth/general.html:10 -#: templates/web/base/auth/general.html:16 +#: templates/web/base/auth/general.html:27 +#: templates/web/base/auth/general.html:33 #: templates/web/zurich/auth/general.html:3 #: templates/web/zurich/auth/general.html:9 msgid "Please check your email address is correct" msgstr "Bitte überprüfen Sie ob Ihre eMail-Adresse korrekt ist" #: perllib/FixMyStreet/App/Controller/Admin.pm:343 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:883 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:948 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:878 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:943 #: perllib/FixMyStreet/DB/Result/Problem.pm:412 #: templates/web/base/js/translation_strings.html:9 msgid "Please choose a category" @@ -2045,10 +1947,9 @@ msgstr "Bitte wählen Sie eine Eigentumsart" #: perllib/FixMyStreet/App/Controller/Admin.pm:378 msgid "Please correct the errors below" -msgstr "" +msgstr "Bitte korrigieren Sie die Fehler unten" -#: templates/web/base/contact/blurb.html:2 -#: templates/web/fixmystreet/contact/blurb.html:12 +#: templates/web/base/contact/blurb.html:12 msgid "" "Please do <strong>not</strong> report problems through this form; messages go to\n" "the team behind this site, not a council. To report a problem,\n" @@ -2060,11 +1961,17 @@ msgid "Please do not be abusive — abusing your council devalues the s msgstr "" #: perllib/FixMyStreet/App/Controller/Admin.pm:346 -#: perllib/FixMyStreet/DB/Result/Comment.pm:126 +#: perllib/FixMyStreet/DB/Result/Comment.pm:125 #: templates/web/base/js/translation_strings.html:2 msgid "Please enter a message" msgstr "Bitte geben Sie eine Nachricht ein" +#: perllib/FixMyStreet/App/Controller/Admin.pm:1091 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1146 +#, fuzzy +msgid "Please enter a name" +msgstr "Bitte geben Sie Ihren Namen an" + #: templates/web/base/auth/change_password.html:12 #: templates/web/base/auth/change_password.html:15 #: templates/web/base/js/translation_strings.html:19 @@ -2077,10 +1984,10 @@ msgstr "Bitte geben Sie ein Passwort ein" msgid "Please enter a subject" msgstr "Bitte geben Sie einen Betreff ein" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1084 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1137 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1087 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1142 #: perllib/FixMyStreet/App/Controller/Admin.pm:345 -#: perllib/FixMyStreet/DB/Result/User.pm:127 +#: perllib/FixMyStreet/DB/Result/User.pm:133 #: templates/web/base/js/translation_strings.html:12 #: templates/web/base/js/translation_strings.html:16 msgid "Please enter a valid email" @@ -2097,9 +2004,9 @@ msgid "Please enter some details" msgstr "Bitte geben Sie einiges Details an" #: perllib/FixMyStreet/App/Controller/Contact.pm:113 -#: perllib/FixMyStreet/DB/Result/User.pm:124 -#: templates/web/base/auth/general.html:10 -#: templates/web/base/auth/general.html:15 +#: perllib/FixMyStreet/DB/Result/User.pm:130 +#: templates/web/base/auth/general.html:27 +#: templates/web/base/auth/general.html:32 #: templates/web/base/js/translation_strings.html:11 #: templates/web/base/js/translation_strings.html:15 #: templates/web/zurich/auth/general.html:3 @@ -2107,7 +2014,7 @@ msgstr "Bitte geben Sie einiges Details an" msgid "Please enter your email" msgstr "Bitte geben Sie Ihre eMail-Adresse an" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:7 +#: templates/web/base/report/new/form_user_loggedout_email.html:7 #: templates/web/zurich/report/new/fill_in_details_form.html:80 msgid "Please enter your email address" msgstr "Bitte geben Sie eine Ihre eMail-Adresse an" @@ -2116,15 +2023,15 @@ msgstr "Bitte geben Sie eine Ihre eMail-Adresse an" msgid "Please enter your first name" msgstr "Bitte geben Sie Ihren Vornamen ein" -#: perllib/FixMyStreet/Cobrand/UK.pm:318 +#: perllib/FixMyStreet/Cobrand/UK.pm:319 #: templates/web/base/js/translation_strings.html:7 msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below" msgstr "" #: perllib/FixMyStreet/App/Controller/Contact.pm:112 -#: perllib/FixMyStreet/DB/Result/Comment.pm:123 +#: perllib/FixMyStreet/DB/Result/Comment.pm:122 #: perllib/FixMyStreet/DB/Result/Problem.pm:406 -#: perllib/FixMyStreet/DB/Result/User.pm:120 +#: perllib/FixMyStreet/DB/Result/User.pm:126 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter your name" msgstr "Bitte geben Sie Ihren Namen an" @@ -2151,12 +2058,11 @@ msgstr "" msgid "Please fill in details of the problem below." msgstr "" -#: templates/web/zurich/report/new/fill_in_details_form.html:46 +#: templates/web/zurich/report/new/fill_in_details_form.html:72 msgid "Please fill in details of the problem." msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:28 -#: templates/web/fixmystreet/report/new/sidebar.html:7 +#: templates/web/base/report/new/sidebar.html:7 #: templates/web/zurich/report/new/fill_in_details_form.html:20 msgid "Please fill in the form below with details of the problem, and describe the location as precisely as possible in the details box." msgstr "" @@ -2165,20 +2071,23 @@ msgstr "" msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "" -#: templates/web/fixmystreet/report/updates-sidebar-notes.html:4 +#: templates/web/base/report/updates-sidebar-notes.html:2 msgid "Please note that updates are not sent to the council." msgstr "" -#: templates/web/base/report/update-form.html:7 -msgid "Please note that updates are not sent to the council. If you leave your name it will be public. Your information will only be used in accordance with our <a href=\"/faq#privacy\">privacy policy</a>" +#: templates/web/base/report/new/oauth_email_form.html:4 +msgid "Please note your report has <strong>not yet been sent</strong>." msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:8 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:21 +#: templates/web/base/report/new/fill_in_details_form.html:20 #: templates/web/zurich/report/new/fill_in_details_form.html:11 msgid "Please note your report has <strong>not yet been sent</strong>. Choose a category and add further information below, then submit." msgstr "" +#: templates/web/base/report/display.html:26 +msgid "Please note your update has <strong>not yet been posted</strong>." +msgstr "" + #: templates/web/base/report/new/notes.html:1 #: templates/web/zurich/report/new/notes.html:1 msgid "Please note:" @@ -2198,9 +2107,8 @@ msgid "Please say whether you've ever reported a problem to your council before" msgstr "" #: templates/web/zurich/admin/report_edit.html:208 -#, fuzzy msgid "Please select a body." -msgstr "Bitte geben Sie ein Passwort ein" +msgstr "" #: perllib/FixMyStreet/App/Controller/Alert.pm:80 msgid "Please select the feed you want" @@ -2217,6 +2125,7 @@ msgstr "" #: perllib/FixMyStreet/App/Model/PhotoSet.pm:117 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:145 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:147 +#: templates/web/base/js/translation_strings.html:53 msgid "Please upload a JPEG image only" msgstr "Bitte nur ein JPEG-BIld hochladen" @@ -2224,18 +2133,14 @@ msgstr "Bitte nur ein JPEG-BIld hochladen" msgid "Please write a message" msgstr "Bitte schreiben Sie eine Nachricht" -#: templates/web/fixmystreet/report/update-form.html:23 +#: templates/web/base/report/update/form_update.html:29 msgid "Please write your update here" msgstr "Bitte schreiben Sie hier Ihre Aktualisierung" -#: templates/web/base/contact/index.html:100 -#: templates/web/base/report/update-form.html:110 -#: templates/web/base/report/update-form.html:132 -#: templates/web/base/report/update-form.html:72 -#: templates/web/fixmystreet/contact/index.html:113 -#: templates/web/fixmystreet/report/update-form.html:124 -#: templates/web/fixmystreet/report/update-form.html:71 -#: templates/web/fixmystreet/report/update-form.html:97 +#: templates/web/base/contact/index.html:105 +#: templates/web/base/report/update-form.html:24 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:14 +#: templates/web/base/report/update/form_user_loggedout_password.html:10 msgid "Post" msgstr "" @@ -2263,14 +2168,11 @@ msgstr "Vorherige" msgid "Privacy" msgstr "Datenschutz" -#: templates/web/base/faq/faq-en-gb.html:7 -#: templates/web/base/open311/index.html:7 -#: templates/web/base/static/privacy.html:1 -#: templates/web/base/static/privacy.html:2 -#: templates/web/base/static/privacy.html:9 -#: templates/web/fixmystreet/contact/index.html:11 +#: templates/web/base/about/_sidebar.html:5 +#: templates/web/base/about/privacy.html:1 +#: templates/web/base/about/privacy.html:2 msgid "Privacy and cookies" -msgstr "" +msgstr "Datenschutz und Cookies" #: templates/web/base/admin/body.html:202 #: templates/web/base/admin/body.html:85 @@ -2296,12 +2198,12 @@ msgstr "Problem %s bestätigt" msgid "Problem %s sent to council %s" msgstr "" -#: templates/web/base/admin/index.html:46 +#: templates/web/base/admin/index.html:39 #: templates/web/zurich/admin/index.html:9 msgid "Problem breakdown by state" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1055 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1058 msgid "Problem marked as open." msgstr "Problem als offen markiert." @@ -2317,11 +2219,11 @@ msgstr "Meldungen" msgid "Problems in this area" msgstr "Meldungen in dieser Gegend" -#: templates/web/fixmystreet/report/display.html:43 +#: templates/web/base/report/display_tools.html:19 msgid "Problems nearby" msgstr "Meldungen in der Nähe" -#: templates/web/fixmystreet/report/display.html:41 +#: templates/web/base/report/display_tools.html:17 msgid "Problems on the map" msgstr "Meldungen auf der Karte" @@ -2333,24 +2235,23 @@ msgstr "Meldungen, welche kürzlich gelöst wurden" msgid "Problems within %.1fkm of this location" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:642 +#: perllib/FixMyStreet/Cobrand/Default.pm:663 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:120 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:139 -#: perllib/FixMyStreet/Cobrand/UK.pm:207 +#: perllib/FixMyStreet/Cobrand/UK.pm:208 msgid "Problems within %s" msgstr "Meldungen innerhalb %s" #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:128 -#: perllib/FixMyStreet/Cobrand/UK.pm:221 +#: perllib/FixMyStreet/Cobrand/UK.pm:222 msgid "Problems within %s ward" msgstr "" #. ("First %s is the body name, second %s the site name") #: templates/web/base/reports/body.html:0 #: templates/web/base/reports/body.html:24 -#, fuzzy msgid "Problems within %s, %s" -msgstr "Meldungen innerhalb %s" +msgstr "" #: templates/web/base/alert/_list.html:42 msgid "Problems within the boundary of:" @@ -2364,19 +2265,16 @@ msgstr "Immobilien-Adresse:" msgid "Property type:" msgstr "Eigentumstyp" -#: templates/web/base/report/update-form.html:3 -#: templates/web/fixmystreet/report/update-form.html:4 +#: templates/web/base/report/update-form.html:6 msgid "Provide an update" msgstr "Meldung aktualisieren" -#: templates/web/base/auth/general.html:56 +#: templates/web/base/auth/general.html:95 msgid "Providing a name and password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:156 -#: templates/web/base/report/update-form.html:129 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:71 -#: templates/web/fixmystreet/report/update-form.html:119 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:34 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:9 msgid "Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." msgstr "" @@ -2412,18 +2310,17 @@ msgstr "" #: templates/web/base/alert/_list.html:22 #: templates/web/base/around/display_location.html:1 #: templates/web/base/around/display_location.html:3 -#: templates/web/base/report/display.html:50 +#: templates/web/base/report/display_tools.html:34 #: templates/web/base/reports/_rss.html:1 #: templates/web/fixmystreet/alert/updates.html:9 -#: templates/web/fixmystreet/report/display.html:58 msgid "RSS feed" msgstr "RSS-Feed" -#: perllib/FixMyStreet/Cobrand/UK.pm:250 perllib/FixMyStreet/Cobrand/UK.pm:262 +#: perllib/FixMyStreet/Cobrand/UK.pm:251 perllib/FixMyStreet/Cobrand/UK.pm:263 msgid "RSS feed for %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:256 perllib/FixMyStreet/Cobrand/UK.pm:268 +#: perllib/FixMyStreet/Cobrand/UK.pm:257 perllib/FixMyStreet/Cobrand/UK.pm:269 msgid "RSS feed for %s ward, %s" msgstr "" @@ -2431,11 +2328,11 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:163 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:173 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:181 -#: perllib/FixMyStreet/Cobrand/UK.pm:276 perllib/FixMyStreet/Cobrand/UK.pm:288 +#: perllib/FixMyStreet/Cobrand/UK.pm:277 perllib/FixMyStreet/Cobrand/UK.pm:289 msgid "RSS feed of %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:281 perllib/FixMyStreet/Cobrand/UK.pm:293 +#: perllib/FixMyStreet/Cobrand/UK.pm:282 perllib/FixMyStreet/Cobrand/UK.pm:294 msgid "RSS feed of %s, within %s ward" msgstr "" @@ -2447,15 +2344,15 @@ msgstr "" msgid "RSS feed of problems in this %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:643 +#: perllib/FixMyStreet/Cobrand/Default.pm:664 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:121 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:138 -#: perllib/FixMyStreet/Cobrand/UK.pm:214 +#: perllib/FixMyStreet/Cobrand/UK.pm:215 msgid "RSS feed of problems within %s" msgstr "" #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:127 -#: perllib/FixMyStreet/Cobrand/UK.pm:220 +#: perllib/FixMyStreet/Cobrand/UK.pm:221 msgid "RSS feed of problems within %s ward" msgstr "" @@ -2464,25 +2361,22 @@ msgstr "" msgid "RSS feed of recent local problems" msgstr "" -#: templates/web/base/report/display.html:50 +#: templates/web/base/report/display_tools.html:34 #: templates/web/fixmystreet/alert/updates.html:9 -#: templates/web/fixmystreet/report/display.html:58 msgid "RSS feed of updates to this problem" msgstr "" #: templates/web/base/alert/updates.html:9 -#: templates/web/base/report/display.html:41 +#: templates/web/base/report/display_tools.html:36 #: templates/web/fixmystreet/alert/updates.html:14 -#: templates/web/fixmystreet/report/display.html:60 msgid "Receive email when updates are left on this problem." msgstr "Erhalten Sie Aktualisierungen dieser Meldung." #. ("%s is the site name") #: templates/web/base/around/display_location.html:0 #: templates/web/base/around/display_location.html:33 -#, fuzzy msgid "Recent local problems, %s" -msgstr "Kürzlich erfasste Meldungen" +msgstr "" #: templates/web/base/reports/index.html:24 msgid "Recently <br>fixed" @@ -2500,20 +2394,19 @@ msgstr "Fix My Zürich wird primär dafür verwendet, physische M&au msgid "Remove flag" msgstr "" -#: templates/web/base/admin/report_edit.html:92 -#: templates/web/base/admin/update_edit.html:62 +#: templates/web/base/admin/report_edit.html:93 +#: templates/web/base/admin/update_edit.html:67 #: templates/web/zurich/admin/update_edit.html:35 msgid "Remove photo (can't be undone!)" msgstr "Foto entfernen (kann nicht rückgängig gemacht werden!)" #: templates/web/zurich/admin/report_edit.html:243 -#, fuzzy msgid "Reply to user:" -msgstr "Benutzer bearbeiten" +msgstr "" #: templates/web/fixmystreet/header_logo.html:2 msgid "Report" -msgstr "" +msgstr "Bericht" #: templates/web/base/footer.html:7 templates/web/fixmystreet/footer.html:26 #: templates/web/fixmystreet/header_logo.html:2 @@ -2522,7 +2415,7 @@ msgstr "" msgid "Report a problem" msgstr "Eine Meldung erfassen" -#: templates/web/fixmystreet/report/display.html:32 +#: templates/web/base/report/display_tools.html:8 msgid "Report abuse" msgstr "Missbrauch melden" @@ -2531,7 +2424,8 @@ msgid "Report on %s" msgstr "Bericht auf %s" #: templates/web/base/report/new/fill_in_details_form.html:1 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:2 +#: templates/web/base/report/new/login_success_form.html:1 +#: templates/web/base/report/new/oauth_email_form.html:1 msgid "Report your problem" msgstr "" @@ -2540,9 +2434,8 @@ msgstr "" msgid "Report, view, or discuss local problems" msgstr "Melden sie Mängel an der Infrastruktur von Zürich" -#: perllib/FixMyStreet/DB/Result/Problem.pm:585 -#: templates/web/base/contact/index.html:50 -#: templates/web/fixmystreet/contact/index.html:65 +#: perllib/FixMyStreet/DB/Result/Problem.pm:573 +#: templates/web/base/contact/index.html:57 msgid "Reported anonymously at %s" msgstr "Anonym gemeldet um" @@ -2551,43 +2444,41 @@ msgstr "Anonym gemeldet um" msgid "Reported before" msgstr "Vorher berichtet" -#: perllib/FixMyStreet/DB/Result/Problem.pm:608 -#: templates/web/base/contact/index.html:52 -#: templates/web/fixmystreet/contact/index.html:67 +#: perllib/FixMyStreet/DB/Result/Problem.pm:596 +#: templates/web/base/contact/index.html:59 msgid "Reported by %s at %s" msgstr "Gemeldet von %s um %s" #: templates/web/zurich/admin/report_edit-sdm.html:58 #: templates/web/zurich/admin/report_edit.html:86 -#, fuzzy msgid "Reported by:" -msgstr "Vorher berichtet" +msgstr "Gemeldet von:" #: templates/web/zurich/report/_main.html:2 msgid "Reported in the %s category" -msgstr "" +msgstr "Gemeldet in der Kategorie %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:581 +#: perllib/FixMyStreet/DB/Result/Problem.pm:569 msgid "Reported in the %s category anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:603 +#: perllib/FixMyStreet/DB/Result/Problem.pm:591 msgid "Reported in the %s category by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:577 +#: perllib/FixMyStreet/DB/Result/Problem.pm:565 msgid "Reported via %s anonymously at %s" msgstr "Anonym gemeldet von %s um %s " -#: perllib/FixMyStreet/DB/Result/Problem.pm:599 +#: perllib/FixMyStreet/DB/Result/Problem.pm:587 msgid "Reported via %s by %s at %s" msgstr "Gemeldet von %s um %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:573 +#: perllib/FixMyStreet/DB/Result/Problem.pm:561 msgid "Reported via %s in the %s category anonymously at %s" msgstr "Anonym gemeldet von %s um %s " -#: perllib/FixMyStreet/DB/Result/Problem.pm:593 +#: perllib/FixMyStreet/DB/Result/Problem.pm:581 msgid "Reported via %s in the %s category by %s at %s" msgstr "Gemeldet von %s um %s" @@ -2597,9 +2488,8 @@ msgstr "" #: templates/web/zurich/admin/report_edit-sdm.html:36 #: templates/web/zurich/admin/report_edit.html:55 -#, fuzzy msgid "Reported:" -msgstr "Berichte" +msgstr "Gemeldet:" #: templates/web/base/around/index.html:2 #: templates/web/base/js/translation_strings.html:41 @@ -2609,13 +2499,13 @@ msgstr "Berichte" msgid "Reporting a problem" msgstr "Verfassen Sie eine Meldung" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1277 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1286 #: perllib/FixMyStreet/Cobrand/Zurich.pm:384 #: templates/web/zurich/header.html:60 msgid "Reports" msgstr "Berichte" -#: perllib/FixMyStreet/Cobrand/UK.pm:327 perllib/FixMyStreet/Cobrand/UK.pm:331 +#: perllib/FixMyStreet/Cobrand/UK.pm:328 perllib/FixMyStreet/Cobrand/UK.pm:332 msgid "Reports are limited to %s characters in length. Please shorten your report" msgstr "" @@ -2652,15 +2542,17 @@ msgstr "" msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1495 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1500 -#: templates/web/base/admin/report_edit.html:88 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1508 +#: templates/web/base/admin/report_edit.html:90 +#: templates/web/base/admin/update_edit.html:64 #: templates/web/zurich/admin/report_edit.html:116 msgid "Rotate Left" msgstr "Nach links drehen" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1495 -#: templates/web/base/admin/report_edit.html:89 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 +#: templates/web/base/admin/report_edit.html:91 +#: templates/web/base/admin/update_edit.html:65 #: templates/web/zurich/admin/report_edit.html:117 msgid "Rotate Right" msgstr "Nach rechts drehen" @@ -2670,7 +2562,6 @@ msgid "Rotating this photo will discard unsaved changes to the report." msgstr "" #: templates/web/base/js/translation_strings.html:46 -#: templates/web/base/maps/google-ol.html:13 msgid "Satellite" msgstr "Satellit" @@ -2727,11 +2618,10 @@ msgid "Select which type of alert you’d like and click the button for an RSS f msgstr "" #: perllib/FixMyStreet/Cobrand/Zurich.pm:835 -#, fuzzy msgid "Sent report back" -msgstr "Offene Berichte" +msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:708 +#: perllib/FixMyStreet/DB/Result/Problem.pm:696 msgid "Sent to %s %s later" msgstr "" @@ -2744,15 +2634,13 @@ msgstr "Gesendet:" msgid "Service:" msgstr "Dienst:" -#: templates/web/fixmystreet/report/display.html:38 +#: templates/web/base/report/display_tools.html:14 msgid "Share" msgstr "Teilen" -#: templates/web/base/report/new/fill_in_details_form.html:193 -#: templates/web/base/report/update-form.html:158 -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:23 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:59 -#: templates/web/fixmystreet/report/update-form.html:146 +#: templates/web/base/report/new/form_user_loggedin.html:23 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:22 +#: templates/web/base/report/update/form_name.html:15 msgid "Show my name publicly" msgstr "Meinen Namen öffentlich anzeigen" @@ -2764,9 +2652,9 @@ msgstr "Alte anzeigen" msgid "Show pins" msgstr "Zeige Stecknadeln" +#: templates/web/base/auth/general.html:100 #: templates/web/base/auth/general.html:3 -#: templates/web/base/auth/general.html:40 -#: templates/web/base/auth/general.html:61 +#: templates/web/base/auth/general.html:76 #: templates/web/zurich/auth/general.html:18 #: templates/web/zurich/auth/general.html:35 msgid "Sign in" @@ -2793,7 +2681,7 @@ msgid "" " sent from your FixMyStreet installation." msgstr "" -#: templates/web/base/alert/index.html:42 +#: templates/web/base/alert/index.html:40 msgid "Some photos of recent reports" msgstr "" @@ -2803,7 +2691,7 @@ msgstr "" msgid "Some text to localize" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:78 +#: perllib/FixMyStreet/Cobrand/UK.pm:79 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover." msgstr "" @@ -2815,14 +2703,20 @@ msgstr "" msgid "Sorry, there has been an error confirming your problem." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:221 -#: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:37 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:216 +#: perllib/FixMyStreet/Geocode.pm:38 perllib/FixMyStreet/Geocode/Bing.pm:38 #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:56 #: perllib/FixMyStreet/Geocode/OSM.pm:48 msgid "Sorry, we could not find that location." msgstr "" -#: perllib/FixMyStreet/Geocode/Bing.pm:34 +#: templates/web/base/auth/general.html:9 +#: templates/web/base/report/display.html:21 +#: templates/web/base/report/new/fill_in_details_form.html:23 +msgid "Sorry, we could not log you in. Please fill in the form below." +msgstr "" + +#: perllib/FixMyStreet/Geocode/Bing.pm:35 #: perllib/FixMyStreet/Geocode/Google.pm:45 #: perllib/FixMyStreet/Geocode/Zurich.pm:88 msgid "Sorry, we could not parse that location. Please try again." @@ -2832,6 +2726,10 @@ msgstr "" msgid "Sorry, we couldn't save your image(s), please try again." msgstr "" +#: perllib/FixMyStreet/App/Controller/AuthSS.pm:301 +msgid "Sorry, you can not log in with Facebook. Please try again later." +msgstr "" + #: templates/web/base/admin/stats.html:64 msgid "Start Date:" msgstr "Startdatum:" @@ -2840,13 +2738,12 @@ msgstr "Startdatum:" #: templates/web/base/admin/flagged.html:18 #: templates/web/base/admin/list_updates.html:11 #: templates/web/base/admin/reports.html:15 -#: templates/web/fixmystreet/report/update-form.html:26 +#: templates/web/base/report/update/form_update.html:32 msgid "State" msgstr "Status" #: templates/web/base/admin/report_edit.html:47 #: templates/web/base/admin/update_edit.html:27 -#: templates/web/base/report/update-form.html:28 #: templates/web/zurich/admin/report_edit-sdm.html:73 #: templates/web/zurich/admin/report_edit.html:101 #: templates/web/zurich/admin/report_edit.html:155 @@ -2854,7 +2751,7 @@ msgstr "Status" msgid "State:" msgstr "Status:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1282 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1291 #: perllib/FixMyStreet/Cobrand/Zurich.pm:387 #: templates/web/base/admin/stats.html:1 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:73 @@ -2874,9 +2771,9 @@ msgstr "" #: templates/web/zurich/admin/report_edit-sdm.html:25 #: templates/web/zurich/admin/report_edit.html:26 msgid "Street View" -msgstr "" +msgstr "Straßenansicht" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:406 +#: perllib/FixMyStreet/Script/Reports.pm:184 msgid "Subcategory: %s" msgstr "Unterkategorie: %s" @@ -2884,30 +2781,25 @@ msgstr "Unterkategorie: %s" msgid "Subdivision/Body" msgstr "" -#: templates/web/fixmystreet/contact/index.html:98 +#: templates/web/base/contact/index.html:90 msgid "Subject" msgstr "Titel" #: templates/web/base/admin/report_edit.html:19 -#: templates/web/base/contact/index.html:88 -#: templates/web/base/report/new/fill_in_details_form.html:53 #: templates/web/zurich/admin/report_edit.html:39 msgid "Subject:" msgstr "Titel:" #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/fill_in_details_form.html:137 -#: templates/web/base/report/new/fill_in_details_form.html:159 -#: templates/web/base/report/new/fill_in_details_form.html:96 -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:36 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:23 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:76 +#: templates/web/base/report/new/form_user_loggedin.html:36 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:39 +#: templates/web/base/report/new/form_user_loggedout_password.html:11 #: templates/web/zurich/report/new/fill_in_details_form.html:96 msgid "Submit" msgstr "Abschicken" -#: templates/web/base/admin/report_edit.html:95 -#: templates/web/base/admin/update_edit.html:65 +#: templates/web/base/admin/report_edit.html:101 +#: templates/web/base/admin/update_edit.html:75 #: templates/web/base/admin/user-form.html:56 #: templates/web/zurich/admin/report_edit-sdm.html:137 #: templates/web/zurich/admin/report_edit.html:268 @@ -2915,7 +2807,7 @@ msgstr "Abschicken" msgid "Submit changes" msgstr "Änderungen senden" -#: templates/web/base/questionnaire/index.html:97 +#: templates/web/base/questionnaire/index.html:106 msgid "Submit questionnaire" msgstr "Fragebogen absenden" @@ -2931,9 +2823,8 @@ msgid "Submitted" msgstr "Gesendet" #: templates/web/base/alert/updates.html:17 -#: templates/web/base/report/display.html:46 +#: templates/web/base/report/display_tools.html:41 #: templates/web/fixmystreet/alert/updates.html:23 -#: templates/web/fixmystreet/report/display.html:65 msgid "Subscribe" msgstr "Abonnieren" @@ -2941,7 +2832,7 @@ msgstr "Abonnieren" msgid "Subscribe me to an email alert" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1275 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1284 #: perllib/FixMyStreet/Cobrand/Zurich.pm:383 #: templates/web/base/admin/bodies.html:25 #: templates/web/base/admin/index.html:1 @@ -2960,7 +2851,7 @@ msgstr "Zusammenfassung" msgid "Summary reports" msgstr "Zusammenfassungsberichte" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1279 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1288 msgid "Survey" msgstr "Umfrage" @@ -2974,9 +2865,8 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/Zurich.pm:394 #: templates/web/zurich/header.html:77 -#, fuzzy msgid "Templates" -msgstr "Aktualisierungen" +msgstr "Vorlagen" #: templates/web/base/admin/list_updates.html:12 #: templates/web/zurich/admin/templates.html:9 @@ -2997,7 +2887,7 @@ msgstr "Text:" msgid "Thank you for reporting this issue!" msgstr "" -#: templates/web/base/tokens/error.html:7 +#: templates/web/base/tokens/error.html:6 msgid "Thank you for trying to confirm your update or problem. We seem to have an error ourselves though, so <a href=\"%s\">please let us know what went on</a> and we'll look into it." msgstr "" @@ -3032,23 +2922,23 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:47 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:63 -#: perllib/FixMyStreet/Cobrand/UK.pm:71 +#: perllib/FixMyStreet/Cobrand/UK.pm:72 msgid "That postcode was not recognised, sorry." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:726 +#: perllib/FixMyStreet/App/Controller/Admin.pm:724 msgid "That problem has been marked as sent." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:718 +#: perllib/FixMyStreet/App/Controller/Admin.pm:716 msgid "That problem will now be resent." msgstr "Das Problem wird jetzt erneut gesendet." -#: perllib/FixMyStreet/App/Controller/Report.pm:125 +#: perllib/FixMyStreet/App/Controller/Report.pm:127 msgid "That report cannot be viewed on %s." msgstr "Dieser Bericht kann nicht auf %s angeschaut werden." -#: perllib/FixMyStreet/App/Controller/Report.pm:119 +#: perllib/FixMyStreet/App/Controller/Report.pm:121 msgid "That report has been removed from FixMyStreet." msgstr "Diese Meldung wurde von Fix My Zürich entfernt." @@ -3079,7 +2969,7 @@ msgid "" " If you leave this blank, <strong>send method defaults to email</strong>." msgstr "" -#: templates/web/base/open311/index.html:90 +#: templates/web/base/open311/index.html:82 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 "" @@ -3100,12 +2990,12 @@ msgstr "" msgid "The diligency prize league table shows editors' activity (who's been editing the most records)." msgstr "" -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:60 -#: perllib/FixMyStreet/App/Controller/Reports.pm:79 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:61 +#: perllib/FixMyStreet/App/Controller/Reports.pm:80 msgid "The error was: %s" msgstr "Der Fehler war: %s" -#: templates/web/base/open311/index.html:86 +#: templates/web/base/open311/index.html:78 msgid "The following Open311 v2 attributes are returned for each request: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code and service_name." msgstr "" @@ -3152,8 +3042,7 @@ msgstr "" msgid "The passwords do not match" msgstr "Die Passwörter stimmen nicht überein" -#: templates/web/base/errors/page_error_404_not_found.html:10 -#: templates/web/base/errors/page_error_404_not_found.html:12 +#: templates/web/base/errors/page_error_404_not_found.html:9 msgid "The requested URL '%s' was not found on this server" msgstr "" @@ -3163,12 +3052,11 @@ msgstr "" #: templates/web/base/report/new/councils_extra_text.html:1 #: templates/web/base/report/new/councils_text_some.html:10 -#: templates/web/base/report/new/fill_in_details_form.html:18 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:14 +#: templates/web/base/report/new/fill_in_details_form.html:13 msgid "The summary and description will also be made public (see our <a href=\"/privacy\">privacy policy</a>)." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:315 +#: perllib/FixMyStreet/Script/Reports.pm:92 msgid "The user could not locate the problem on a map, but to see the area around the location they entered" msgstr "" @@ -3185,18 +3073,18 @@ msgstr "" msgid "There are no reports to show." msgstr "" -#: perllib/FixMyStreet/App/Controller/Reports.pm:76 +#: perllib/FixMyStreet/App/Controller/Reports.pm:77 msgid "There was a problem showing the All Reports page. Please try again later." msgstr "" #: perllib/FixMyStreet/App/Controller/Contact.pm:137 -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:59 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:60 msgid "There was a problem showing this page. Please try again later." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:769 -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:134 -#: templates/web/base/auth/general.html:26 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:764 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:138 +#: templates/web/base/auth/general.html:43 #: templates/web/zurich/auth/general.html:28 msgid "There was a problem with your email/password combination. If you cannot remember your password, or do not have one, please fill in the ‘sign in by email’ section of the form." msgstr "" @@ -3205,7 +3093,7 @@ msgstr "" msgid "There was a problem with your email/password combination. Please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:272 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:336 msgid "There was a problem with your update. Please try again." msgstr "Es gab ein Problem mit Ihrer Aktualisierung. Bitte versuchen Sie es erneut." @@ -3213,7 +3101,7 @@ msgstr "Es gab ein Problem mit Ihrer Aktualisierung. Bitte versuchen Sie es erne msgid "There were problems with your report. Please see below." msgstr "Es gab ein Problem mit Ihrem Bericht. Bitte versuchen Sie es erneut." -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:300 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:371 msgid "There were problems with your update. Please see below." msgstr "Es gab Probleme mit Ihrer Aktualisierung. Bitte versuchen Sie es erneut." @@ -3227,7 +3115,7 @@ msgid "" " " msgstr "" -#: templates/web/base/open311/index.html:77 +#: templates/web/base/open311/index.html:69 msgid "This API implementation is work in progress and not yet stabilized. It will change without warnings in the future." msgstr "" @@ -3249,18 +3137,18 @@ msgid "" " A body will not receive any reports unless it covers at least one area." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:413 +#: perllib/FixMyStreet/Script/Reports.pm:191 msgid "This email has been sent to both councils covering the location of the problem, as the user did not categorise it; please ignore it if you're not the correct council to deal with the issue, or let us know what category of problem this is so we can add it to our system." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:416 +#: perllib/FixMyStreet/Script/Reports.pm:194 msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:925 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:995 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:920 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:990 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:142 -#: perllib/FixMyStreet/Cobrand/UK.pm:43 +#: perllib/FixMyStreet/Cobrand/UK.pm:44 msgid "This information is required" msgstr "Diese Information wird benötigt" @@ -3272,56 +3160,37 @@ msgstr "" msgid "This is a summary of all reports on this site." msgstr "" -#: templates/web/zurich/auth/token.html:8 -msgid "This may be because the link is too old or already used, or the address was not copied correctly." -msgstr "" - -#: templates/web/base/report/banner.html:15 -msgid "This problem has been closed" -msgstr "Dieses Problem wurde geschlossen" - -#: templates/web/base/report/banner.html:12 -#: templates/web/base/report/update-form.html:48 -#: templates/web/fixmystreet/report/update-form.html:46 +#: templates/web/base/report/update/form_update.html:52 msgid "This problem has been fixed" msgstr "Dieser Mangel wurde behoben" -#: templates/web/base/report/update-form.html:43 -#: templates/web/fixmystreet/report/update-form.html:40 +#: templates/web/base/report/update/form_update.html:46 msgid "This problem has not been fixed" msgstr "Dieser Mangel wurde nicht behoben" -#: templates/web/base/report/banner.html:19 -msgid "This problem is in progress" -msgstr "Dieser Mangel ist in Bearbeitung" - -#: templates/web/base/report/banner.html:9 -msgid "This problem is old and of unknown status." -msgstr "Dieses Problem ist alt und hat einen unbekannten Status" - #: perllib/FixMyStreet/Cobrand/Zurich.pm:168 #: perllib/FixMyStreet/Cobrand/Zurich.pm:169 #: templates/web/zurich/report/_main.html:14 msgid "This report is awaiting moderation." msgstr "Dieser Bericht wartet auf Moderation." -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:86 +#: perllib/FixMyStreet/Script/Alerts.pm:94 msgid "This report is currently marked as closed." msgstr "Dieser Bericht ist aktuell als geschlossen markiert." -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:84 +#: perllib/FixMyStreet/Script/Alerts.pm:92 msgid "This report is currently marked as fixed." msgstr "Dieser Bericht ist aktuell als behoben markiert." -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:88 +#: perllib/FixMyStreet/Script/Alerts.pm:96 msgid "This report is currently marked as open." msgstr "Dieser Bericht ist aktuell als offen markiert." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:326 +#: perllib/FixMyStreet/Script/Reports.pm:105 msgid "This report was submitted anonymously" -msgstr "" +msgstr "Dieser Bericht wurde anonym abgesendet" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:308 +#: perllib/FixMyStreet/Script/Reports.pm:85 msgid "This web page also contains a photo of the problem, provided by the user." msgstr "" @@ -3332,7 +3201,7 @@ msgstr "" msgid "Time spent (in minutes):" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1278 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1287 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "Zeitleiste" @@ -3344,9 +3213,8 @@ msgid "Title" msgstr "Titel" #: templates/web/zurich/admin/template_edit.html:20 -#, fuzzy msgid "Title:" -msgstr "Titel" +msgstr "Titel:" #: templates/web/base/alert/index.html:25 msgid "To find out what local alerts we have for you, please enter your %s postcode or street name and area:" @@ -3356,11 +3224,11 @@ msgstr "" msgid "To find out what local alerts we have for you, please enter your postcode or street name and area" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:314 +#: perllib/FixMyStreet/Script/Reports.pm:91 msgid "To view a map of the precise location of this issue" msgstr "" -#: templates/web/base/admin/index.html:61 +#: templates/web/base/admin/index.html:54 #: templates/web/base/admin/questionnaire.html:24 #: templates/web/base/admin/stats.html:24 #: templates/web/base/admin/stats.html:43 @@ -3378,10 +3246,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:12 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:33 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:31 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:37 msgid "Unable to fix" msgstr "Kann nicht behoben werden" @@ -3394,7 +3260,7 @@ msgstr "Kann nicht behoben werden" msgid "Unconfirmed" msgstr "Unbestätigt" -#: templates/web/fixmystreet/report/banner.html:9 +#: templates/web/base/report/banner.html:9 msgid "Unknown" msgstr "Unbekannt" @@ -3402,17 +3268,18 @@ msgstr "Unbekannt" msgid "Unknown alert type" msgstr "Unbekannter Benachrichtigungstyp" +#: perllib/FixMyStreet/App/Controller/Photo.pm:110 #: templates/web/base/js/translation_strings.html:39 msgid "Unknown error" msgstr "Unbekannter Fehler" -#: perllib/FixMyStreet/App/Controller/Report.pm:103 -#: perllib/FixMyStreet/App/Controller/Report.pm:109 -#: perllib/FixMyStreet/App/Controller/Report.pm:112 +#: perllib/FixMyStreet/App/Controller/Report.pm:105 +#: perllib/FixMyStreet/App/Controller/Report.pm:111 +#: perllib/FixMyStreet/App/Controller/Report.pm:114 msgid "Unknown problem ID" msgstr "Unbekannte Problemkennung" -#: templates/web/fixmystreet/report/update-form.html:19 +#: templates/web/base/report/update/form_update.html:25 msgid "Update" msgstr "Beschreibung" @@ -3420,13 +3287,11 @@ msgstr "Beschreibung" msgid "Update %s created for problem %d; by %s" msgstr "" -#: templates/web/base/contact/index.html:21 -#: templates/web/fixmystreet/contact/index.html:36 +#: templates/web/base/contact/index.html:28 msgid "Update below added anonymously at %s" msgstr "" -#: templates/web/base/contact/index.html:23 -#: templates/web/fixmystreet/contact/index.html:38 +#: templates/web/base/contact/index.html:30 msgid "Update below added by %s at %s" msgstr "" @@ -3435,7 +3300,7 @@ msgstr "" msgid "Update body" msgstr "" -#: templates/web/base/admin/index.html:55 +#: templates/web/base/admin/index.html:48 msgid "Update breakdown by state" msgstr "" @@ -3460,20 +3325,16 @@ msgstr "" msgid "Update statuses" msgstr "" -#: templates/web/base/report/update-form.html:22 -msgid "Update:" -msgstr "Aktualisierung:" - #: templates/web/zurich/admin/index-dm.html:23 #: templates/web/zurich/admin/index-sdm.html:21 #: templates/web/zurich/admin/reports.html:13 msgid "Updated" msgstr "Aktualisiert" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1045 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1103 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1147 -#: perllib/FixMyStreet/App/Controller/Admin.pm:822 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1048 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1108 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1156 +#: perllib/FixMyStreet/App/Controller/Admin.pm:821 #: perllib/FixMyStreet/Cobrand/Zurich.pm:771 #: perllib/FixMyStreet/Cobrand/Zurich.pm:796 #: perllib/FixMyStreet/Cobrand/Zurich.pm:866 @@ -3481,13 +3342,12 @@ msgid "Updated!" msgstr "Aktualisiert!" #: templates/web/base/admin/list_updates.html:2 -#: templates/web/base/report/update.html:3 -#: templates/web/fixmystreet/report/update.html:5 +#: templates/web/base/report/update.html:5 #: templates/web/zurich/report/updates.html:2 msgid "Updates" msgstr "Aktualisierungen" -#: perllib/FixMyStreet/DB/Result/Comment.pm:132 +#: perllib/FixMyStreet/DB/Result/Comment.pm:131 msgid "Updates are limited to %s characters in length. Please shorten your update" msgstr "" @@ -3497,12 +3357,9 @@ msgstr "Aktualisierungen auf {{title}}" #. ("%s is the site name") #: templates/web/base/report/display.html:0 -#: templates/web/base/report/display.html:5 -#: templates/web/fixmystreet/report/display.html:0 -#: templates/web/fixmystreet/report/display.html:9 -#, fuzzy +#: templates/web/base/report/display.html:9 msgid "Updates to this problem, %s" -msgstr "Aktualisierungen von %s Problemen holen" +msgstr "Aktualisierungen für dieses Problem, %s" #: templates/web/base/admin/body.html:182 msgid "Use the <strong>note</strong> to record details that are only displayed in the admin. Notes are not shown publicly, and are not sent to the body." @@ -3513,11 +3370,11 @@ msgstr "" msgid "Used map" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1452 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1461 msgid "User flag removed" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1424 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1433 msgid "User flagged" msgstr "" @@ -3525,7 +3382,7 @@ msgstr "" msgid "User search finds matches in users' names and email addresses." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1280 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1289 #: perllib/FixMyStreet/Cobrand/Zurich.pm:399 #: templates/web/base/admin/flagged.html:29 #: templates/web/zurich/header.html:69 @@ -3556,7 +3413,6 @@ msgid "Viewing a location" msgstr "" #: templates/web/base/report/display.html:0 -#: templates/web/fixmystreet/report/display.html:0 msgid "Viewing a problem" msgstr "" @@ -3569,25 +3425,24 @@ 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/zurich/auth/token.html:7 -msgid "We have not been able to confirm your account - sorry." -msgstr "" - -#: templates/web/zurich/auth/token.html:17 -msgid "We have sent you an email containing a link to confirm your account." -msgstr "" +#: templates/web/base/auth/general.html:6 +#: templates/web/base/report/display.html:27 +#: templates/web/base/report/new/oauth_email_form.html:5 +#, fuzzy +msgid "We need your email address, please give it below." +msgstr "Ihre eMail-Adresse oder Telefonnummer werden nie angezeigt" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:2 -#: templates/web/fixmystreet/report/update-form.html:77 +#: templates/web/base/report/new/form_user_loggedout_email.html:2 +#: templates/web/base/report/update/form_user_loggedout_email.html:2 msgid "We never show your email" msgstr "Ihre eMail wird nie angezeigt" -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:31 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:65 +#: templates/web/base/report/new/form_user_loggedin.html:31 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:28 msgid "We never show your email address or phone number." msgstr "Ihre eMail-Adresse oder Telefonnummer werden nie angezeigt" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:422 +#: perllib/FixMyStreet/Script/Reports.pm:200 msgid "We realise this problem might be the responsibility of %s; however, we don't currently have any contact details for them. If you know of an appropriate contact address, please do get in touch." msgstr "" @@ -3604,10 +3459,6 @@ msgstr "" msgid "We’re sorry to hear the problem’s not fixed. Why not try writing to your local representatives?" msgstr "" -#: templates/web/base/contact/blurb.html:8 -msgid "We'd love to hear what you think about this site. Just fill in the form, or send an email to <a href='mailto:%s'>%s</a>:" -msgstr "" - #: templates/web/base/contact/submit.html:7 msgid "We’ll get back to you as soon as we can." msgstr "" @@ -3616,7 +3467,7 @@ msgstr "" msgid "What was your experience of getting the problem fixed?" msgstr "" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:49 +#: templates/web/base/report/new/form_report.html:19 msgid "What’s the issue, and where is it?" msgstr "" @@ -3629,7 +3480,11 @@ msgstr "Wann editiert" msgid "When sent" msgstr "Wann gesendet" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:640 +#: templates/web/base/js/translation_strings.html:50 +msgid "Whoa there Testino! Three photos are enough." +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Report/New.pm:635 msgid "Whole block of empty flats" msgstr "" @@ -3642,9 +3497,9 @@ msgstr "" #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:14 msgid "Wish" -msgstr "" +msgstr "Wunsch" -#: templates/web/base/open311/index.html:92 +#: templates/web/base/open311/index.html:84 msgid "With request searches, it is also possible to search for agency_responsible to limit the requests to those sent to a single administration. The search term is the administration ID provided by <a href=\"%s\">MaPit</a>." msgstr "" @@ -3652,7 +3507,7 @@ msgstr "" msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"http://fixmystreet.org\">available at fixmystreet.org</a>." msgstr "" -#: templates/web/base/questionnaire/index.html:87 +#: templates/web/base/questionnaire/index.html:96 msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?" msgstr "" @@ -3661,7 +3516,6 @@ msgid "Writing your message entirely in block capitals makes it hard to read, as msgstr "Meldungen gänzlich in Grossbuchstaben zu schreiben macht diese unleserlich. Ebenso wenn keine Satzzeichen verwendet werden." #: templates/web/base/report/new/fill_in_details_form.html:4 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:5 msgid "Wrong location? Just click again on the map." msgstr "" @@ -3684,27 +3538,24 @@ msgstr "Jahr" #: templates/web/base/admin/users.html:31 #: templates/web/base/questionnaire/creator_fixed.html:14 #: templates/web/base/questionnaire/index.html:51 -#: templates/web/base/questionnaire/index.html:90 +#: templates/web/base/questionnaire/index.html:99 msgid "Yes" msgstr "Ja" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:17 -#: templates/web/fixmystreet/report/update-form.html:91 +#: templates/web/base/report/new/form_user_loggedout_password.html:5 +#: templates/web/base/report/update/form_user_loggedout_password.html:4 msgid "Yes I have a password" msgstr "Ja, ich habe ein Passwort" -#: templates/web/base/contact/index.html:39 -#: templates/web/fixmystreet/contact/index.html:54 +#: templates/web/base/contact/index.html:46 msgid "You are complaining that this problem report was unnecessarily moderated:" msgstr "" -#: templates/web/base/contact/index.html:41 -#: templates/web/fixmystreet/contact/index.html:56 +#: templates/web/base/contact/index.html:48 msgid "You are reporting the following problem report for being abusive, containing personal information, or similar:" msgstr "" -#: templates/web/base/contact/index.html:15 -#: templates/web/fixmystreet/contact/index.html:30 +#: templates/web/base/contact/index.html:22 msgid "You are reporting the following update for being abusive, containing personal information, or similar:" msgstr "" @@ -3717,7 +3568,7 @@ msgstr "" msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create." msgstr "" -#: templates/web/fixmystreet/contact/index.html:121 +#: templates/web/base/contact/index.html:113 msgid "You can contact technical support on <a href='mailto:%s'>%s</a>" msgstr "" @@ -3728,8 +3579,8 @@ msgid "" " reports in the past." msgstr "" -#: templates/web/base/report/new/councils_text_none.html:10 -#: templates/web/base/report/new/councils_text_none.html:2 +#: templates/web/base/report/new/councils_text_none.html:12 +#: templates/web/base/report/new/councils_text_none.html:14 #: templates/web/base/report/new/councils_text_some.html:19 #: templates/web/base/report/new/councils_text_some.html:21 msgid "You can help us by finding a contact email address for local problems for %s and emailing it to us at <a href='mailto:%s'>%s</a>." @@ -3747,19 +3598,14 @@ msgstr "" msgid "You have already answered this questionnaire. If you have a question, please <a href='%s'>get in touch</a>, or <a href='%s'>view your problem</a>.\n" msgstr "" -#: templates/web/base/questionnaire/index.html:77 -#: templates/web/base/report/new/fill_in_details_form.html:75 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:73 -msgid "You have already attached a photo to this report, attaching another one will replace it." -msgstr "" - -#: templates/web/base/report/update-form.html:59 -#: templates/web/fixmystreet/report/update-form.html:56 -msgid "You have already attached a photo to this update, attaching another one will replace it." +#: templates/web/base/report/new/form_report.html:32 +#: templates/web/zurich/report/new/fill_in_details_form.html:55 +msgid "You have already attached photos to this report. Note that you can attach a maximum of 3 to this report (if you try to upload more, the oldest will be removed)." msgstr "" -#: templates/web/zurich/report/new/fill_in_details_form.html:61 -msgid "You have already attached photos to this report. Note that you can attach a maximum of 3 to this report (if you try to upload more, the oldest will be removed)." +#: templates/web/base/questionnaire/index.html:83 +#: templates/web/base/report/update/form_update.html:14 +msgid "You have already attached photos to this update. Note that you can attach a maximum of 3 to this update (if you try to upload more, the oldest will be removed)." msgstr "" #: templates/web/base/auth/sign_out.html:4 @@ -3776,9 +3622,8 @@ msgstr "Der gr¨ne Pin auf der Karte repräsentiert ihre Meldung. Falls d msgid "You have successfully confirmed your email address." msgstr "Sie haben Ihre E-Mail-Adresse erfolgreich bestätigt." -#: templates/web/base/report/display.html:20 -#: templates/web/base/report/new/fill_in_details.html:37 -#: templates/web/fixmystreet/report/display.html:17 +#: templates/web/base/report/display.html:17 +#: templates/web/base/report/new/login_success_form.html:3 msgid "You have successfully signed in; please check and confirm your details are accurate:" msgstr "" @@ -3807,53 +3652,42 @@ msgid "Your Reports" msgstr "Ihre Berichte" #: templates/web/base/alert/_list.html:89 +#: templates/web/base/contact/index.html:83 +#: templates/web/base/report/display_tools.html:38 +#: templates/web/base/report/display_tools.html:40 +#: templates/web/base/report/new/form_user_loggedin.html:3 +#: templates/web/base/report/new/form_user_loggedout_email.html:1 +#: templates/web/base/report/update/form_user_loggedout_email.html:1 #: templates/web/fixmystreet/alert/updates.html:19 #: templates/web/fixmystreet/alert/updates.html:22 -#: templates/web/fixmystreet/contact/index.html:91 -#: templates/web/fixmystreet/report/display.html:62 -#: templates/web/fixmystreet/report/display.html:64 -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:3 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:1 -#: templates/web/fixmystreet/report/update-form.html:76 #: templates/web/zurich/report/new/fill_in_details_form.html:76 msgid "Your email" msgstr "Ihre eMail" -#: templates/web/base/auth/general.html:28 -#: templates/web/fixmystreet/report/update-form.html:82 +#: templates/web/base/auth/general.html:45 +#: templates/web/base/report/update/form_user_loggedout_email.html:7 #: templates/web/zurich/auth/general.html:30 #: templates/web/zurich/auth/general.html:58 msgid "Your email address" msgstr "Ihre eMail-Adresse" -#: templates/web/base/report/new/fill_in_details_form.html:106 -#: templates/web/base/report/update-form.html:81 -msgid "Your email:" -msgstr "Ihre eMail:" - -#: templates/web/fixmystreet/report/updates-sidebar-notes.html:7 +#: templates/web/base/report/updates-sidebar-notes.html:3 msgid "Your information will only be used in accordance with our <a href=\"/privacy\">privacy policy</a>" msgstr "" -#: templates/web/base/auth/general.html:51 -#: templates/web/fixmystreet/contact/index.html:84 -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:18 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:54 -#: templates/web/fixmystreet/report/update-form.html:142 +#: templates/web/base/auth/general.html:90 +#: templates/web/base/contact/index.html:76 +#: templates/web/base/report/new/form_user_loggedin.html:18 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:17 +#: templates/web/base/report/update/form_name.html:11 #: templates/web/zurich/auth/general.html:61 #: templates/web/zurich/report/new/fill_in_details_form.html:86 msgid "Your name" msgstr "Ihr Name" -#: templates/web/base/contact/index.html:73 -#: templates/web/base/report/new/fill_in_details_form.html:186 -#: templates/web/base/report/update-form.html:152 -msgid "Your name:" -msgstr "Ihr Name:" - -#: templates/web/base/auth/general.html:39 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:22 -#: templates/web/fixmystreet/report/update-form.html:96 +#: templates/web/base/auth/general.html:75 +#: templates/web/base/report/new/form_user_loggedout_password.html:10 +#: templates/web/base/report/update/form_user_loggedout_password.html:9 #: templates/web/zurich/auth/general.html:34 msgid "Your password" msgstr "Ihr Passwort" @@ -3862,15 +3696,16 @@ msgstr "Ihr Passwort" msgid "Your password has been changed" msgstr "Ihr Passwort wurde geändert" -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:27 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:63 +#: templates/web/base/report/new/form_user_loggedin.html:27 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:26 #: templates/web/zurich/report/new/fill_in_details_form.html:92 msgid "Your phone number" msgstr "Ihre Telefonnummer" #: templates/web/base/questionnaire/index.html:14 +#, fuzzy msgid "Your report" -msgstr "Ihre Meldung" +msgstr "Ihre Meldungen" #: templates/web/base/footer.html:9 templates/web/fixmystreet/footer.html:29 msgid "Your reports" @@ -3880,28 +3715,22 @@ msgstr "Ihre Meldungen" msgid "Your updates" msgstr "Ihre Aktualisierungen" -#: templates/web/base/contact/index.html:81 -msgid "Your email:" -msgstr "Ihre E-Mail-Adresse:" - #: templates/web/base/reports/_list-filters.html:3 -#, fuzzy msgid "all reports" -msgstr "Alle Meldungen" +msgstr "alle Berichte" #: templates/web/base/admin/timeline.html:4 msgid "by %s" msgstr "von %s" #: templates/web/base/reports/_list-filters.html:5 -#, fuzzy msgid "closed reports" -msgstr "Geschlossene Berichte" +msgstr "geschlossene Berichte" #: templates/web/base/reports/body.html:6 #: templates/web/base/reports/body.html:7 msgid "council" -msgstr "" +msgstr "Rat" #: templates/web/base/admin/report_edit.html:32 msgid "didn't use map" @@ -3918,17 +3747,16 @@ msgid "edit user" msgstr "Benutzer bearbeiten" #: templates/web/base/reports/_list-filters.html:6 -#, fuzzy msgid "fixed reports" -msgstr "Neue Berichte" +msgstr "" -#: templates/web/base/admin/index.html:33 +#: templates/web/base/status/stats.html:20 #: templates/web/zurich/admin/index.html:5 msgid "from %s different users" -msgstr "von %d verschiedenen Benutzern" +msgstr "von %s verschiedenen Benutzern" -#: templates/web/base/report/_item.html:17 -#: templates/web/zurich/report/_item.html:16 +#: templates/web/base/report/_item.html:15 +#: templates/web/zurich/report/_item.html:14 msgid "last updated %s" msgstr "zuletzt aktualisiert %s" @@ -4020,10 +3848,8 @@ msgstr "erneut geöffnet" msgid "sign out" msgstr "ausloggen" -#: templates/web/base/report/new/fill_in_details_form.html:12 -#: templates/web/base/report/new/fill_in_details_form.html:15 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:10 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:12 +#: templates/web/base/report/new/fill_in_details_form.html:11 +#: templates/web/base/report/new/fill_in_details_form.html:9 msgid "the local council" msgstr "" @@ -4032,7 +3858,7 @@ msgstr "" msgid "there is no pin shown as the user did not use the map" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:398 +#: perllib/FixMyStreet/Script/Reports.pm:176 msgid "this type of local problem" msgstr "" @@ -4041,9 +3867,8 @@ msgid "today" msgstr "heute" #: templates/web/base/reports/_list-filters.html:4 -#, fuzzy msgid "unfixed reports" -msgstr "Neue Berichte" +msgstr "" #: templates/web/base/admin/report_edit.html:32 msgid "used map" @@ -4062,7 +3887,7 @@ msgstr "Benutzer ist Problemeigentümer" msgid "ward" msgstr "" -#: templates/web/base/front/stats.html:17 +#: templates/web/base/front/stats.html:13 #, perl-format msgid "<big>%s</big> report recently" msgid_plural "<big>%s</big> reports recently" @@ -4090,7 +3915,7 @@ msgid_plural "%d minutes" msgstr[0] "%d Minute" msgstr[1] "%d Minuten" -#: templates/web/base/front/stats.html:29 +#: templates/web/base/front/stats.html:25 #, perl-format msgid "<big>%s</big> update on reports" msgid_plural "<big>%s</big> updates on reports" @@ -4111,14 +3936,14 @@ msgid_plural "%d weeks" msgstr[0] "%d Woche" msgstr[1] "%d Wochen" -#: templates/web/base/front/stats.html:12 +#: templates/web/base/front/stats.html:8 #, perl-format msgid "<big>%s</big> report in past week" msgid_plural "<big>%s</big> reports in past week" msgstr[0] "<big>%s</big> Meldung in der letzten Woche" msgstr[1] "<big>%s</big> Meldungen in der letzten Woche" -#: templates/web/base/front/stats.html:23 +#: templates/web/base/front/stats.html:19 #, perl-format msgid "<big>%s</big> fixed in past month" msgid_plural "<big>%s</big> fixed in past month" @@ -4139,47 +3964,53 @@ msgid_plural "We do <strong>not</strong> yet have details for the other councils msgstr[0] "" msgstr[1] "" -#~ msgid "Contact FixMyStreet" -#~ msgstr "FixMyStreet kontaktieren" +#~ msgid "(we never show your email address or phone number)" +#~ msgstr "(ihre eMail-Adresse oder Telefonnummer werden nie angezeigt)" + +#~ msgid "(we never show your email)" +#~ msgstr "(ihre eMail-Adresse wird nie angezeigt)" + +#~ msgid "Email me updates" +#~ msgstr "Schicken sie mir Aktualisierungen" -#~ msgid "Do you have a FixMyBarangay password?" -#~ msgstr "Haben Sie ein FixMyBarangay-Passwort?" +#~ msgid "Enter a new password:" +#~ msgstr "Geben Sie ein neues Passwort ein:" -#~ msgid "FixMyStreet admin:" -#~ msgstr "FixMyStreet-Administrator:" +#~ 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 URL kopiert haben.\n" -#~ msgid "New local reports on reportemptyhomes.com" -#~ msgstr "Neue lokale Berichte auf reportemptyhomes.com" +#~ msgid "Message:" +#~ msgstr "Nachricht:" -#~ msgid "New reports on reportemptyhomes.com" -#~ msgstr "Neue Berichte auf reportemptyhomes.com" +#~ msgid "More problems nearby" +#~ msgstr "Meldungen in der Nähe" -#~ msgid "New reports to {{COUNCIL}} on reportemptyhomes.com" -#~ msgstr "Neue Berichte an {{COUNCIL}} auf reportemptyhomes.com" +#~ msgid "Nearly Done! Now check your email..." +#~ msgstr "Fast Fertig! Bitte checken Sie ihre Mailbox..." -#~ msgid "New reports within {{NAME}}'s boundary on reportemptyhomes.com" -#~ msgstr "Neue Berichte innerhalb {{NAME}}s Grenze auf reportemptyhomes.com" +#~ msgid "Photo:" +#~ msgstr "Foto:" -#~ msgid "New update:" -#~ msgstr "Neue Aktualisierung:" +#~ msgid "Please check your email" +#~ msgstr "Bitte überprüfen sie ihre eMail" -#~ msgid "No problems found." -#~ msgstr "Keine Meldungen gefunden." +#~ msgid "This problem has been closed" +#~ msgstr "Dieses Problem wurde geschlossen" -#~ msgid "No problems have been reported yet." -#~ msgstr "Bisher wurden noch keine Meldungen erfasst." +#~ msgid "This problem is in progress" +#~ msgstr "Dieser Mangel ist in Bearbeitung" -#~ msgid "Problems within %s, FixMyStreet" -#~ msgstr "Probleme innerhalb %s, FixMyStreet" +#~ msgid "This problem is old and of unknown status." +#~ msgstr "Dieses Problem ist alt und hat einen unbekannten Status" -#~ msgid "Sign in by email" -#~ msgstr "Per E-Mail anmelden" +#~ msgid "Update:" +#~ msgstr "Aktualisierung:" -#~ msgid "Signed in as %s" -#~ msgstr "Angemeldet als %s" +#~ msgid "Your email:" +#~ msgstr "Ihre eMail:" -#~ msgid "User" -#~ msgstr "Benutzer" +#~ msgid "Your name:" +#~ msgstr "Ihr Name:" -#~ msgid "Your email address:" -#~ msgstr "Ihre eMail-Adresse:" +#~ msgid "Your email:" +#~ msgstr "Ihre E-Mail-Adresse:" diff --git a/locale/el_GR.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/el_GR.UTF-8/LC_MESSAGES/FixMyStreet.po index 1b28c0ff9..825da0a18 100644 --- a/locale/el_GR.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/el_GR.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -6,7 +6,6 @@ # Translators: # Adrian Pappas <pappasadrian@gmail.com>, 2015 # basanas1606, 2015 -# basanas1606, 2015 # Theodore D <diamaltho@gmail.com>, 2015 # Vassilis Perantzakis <vaspervnp@yahoo.gr>, 2015 # Σίμος ΔαλκυÏιάδης <press@pirateparty.gr>, 2015 @@ -14,9 +13,9 @@ msgid "" msgstr "" "Project-Id-Version: fixmystreet\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2015-10-23 16:51+0100\n" -"PO-Revision-Date: 2015-10-12 11:18+0000\n" -"Last-Translator: Adrian Pappas <pappasadrian@gmail.com>\n" +"POT-Creation-Date: 2016-03-02 13:09+0000\n" +"PO-Revision-Date: 2015-10-23 16:38+0000\n" +"Last-Translator: mySociety <transifex@mysociety.org>\n" "Language-Team: Greek (Greece) (http://www.transifex.com/mysociety/fixmystreet/language/el_GR/)\n" "Language: el_GR\n" "MIME-Version: 1.0\n" @@ -24,45 +23,24 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:628 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:411 +#: perllib/FixMyStreet/DB/Result/Problem.pm:616 +#: perllib/FixMyStreet/Script/Reports.pm:189 msgid " and " msgstr "και" #: templates/web/base/report/new/councils_text_all.html:2 -#: templates/web/base/report/new/councils_text_none.html:11 -#: templates/web/base/report/new/councils_text_none.html:2 +#: templates/web/base/report/new/councils_text_none.html:12 +#: templates/web/base/report/new/councils_text_none.html:15 #: templates/web/base/report/new/councils_text_some.html:19 #: templates/web/base/report/new/councils_text_some.html:22 #: templates/web/base/report/new/councils_text_some.html:5 msgid " or " msgstr "ή" -#: templates/web/base/admin/index.html:35 -#: templates/web/base/status/index.html:13 -msgid "%s confirmed alerts, %s unconfirmed" -msgstr "%d επιβεβαιωμÎνες ειδοποιήσεις, %d μη επιβεβαιωμÎνες" - -#: templates/web/base/admin/index.html:37 -#: templates/web/base/status/index.html:16 -#: templates/web/zurich/admin/index.html:6 -msgid "%s council contacts – %s confirmed, %s unconfirmed" -msgstr "%d επαφÎÏ‚ υπηÏεσίας – %d επιβεβαιωμÎνες, %d ανεπιβεβαίωτες" - #: templates/web/base/admin/edit-league.html:12 msgid "%d edits by %s" msgstr "%d επεξεÏγασίες από "%s"" -#: templates/web/base/admin/index.html:34 -#: templates/web/base/status/index.html:12 -msgid "%s live updates" -msgstr "%d ζωντανÎÏ‚ ενημεÏώσεις" - -#: templates/web/base/admin/index.html:36 -#: templates/web/base/status/index.html:14 -msgid "%s questionnaires sent – %s answered (%s%%)" -msgstr "στάλθηκαν %d εÏωτηματολόγια – %d απαντήθηκαν (%s%%)" - #: templates/web/base/pagination.html:10 msgid "%d to %d of %d" msgstr "%d μÎχÏι %d από %d" @@ -77,31 +55,50 @@ msgstr "%s - ΣυνοπτικÎÏ‚ αναφοÏÎÏ‚" msgid "%s admin:" msgstr "" +#: templates/web/base/status/stats.html:26 +#, fuzzy +msgid "%s bodies" +msgstr "Τομείς" + +#: templates/web/base/status/stats.html:24 +msgid "%s confirmed alerts, %s unconfirmed" +msgstr "%s επιβεβαιωμÎνες ειδοποιήσεις, %s μη επιβεβαιωμÎνες" + +#: templates/web/base/status/stats.html:27 +#: templates/web/zurich/admin/index.html:6 +msgid "%s council contacts – %s confirmed, %s unconfirmed" +msgstr "%s επαφÎÏ‚ υπηÏεσίας – %s επιβεβαιωμÎνες, %s ανεπιβεβαίωτες" + #. ("%s is the site name") #: templates/web/base/alert/index.html:7 -#, fuzzy msgid "" "%s has a variety of RSS feeds and email alerts for local\n" "problems, including alerts for all problems within a particular ward, or all\n" "problems within a certain distance of a particular location." -msgstr "Το FixMyStreet Îχει μία ποικιλία από πηγÎÏ‚ RSS και ειδοποιήσεις μÎσω email για τα τοπικά Ï€Ïοβλήματα, καθώς και ειδοποιήσεις για Îναν συγκεκÏιμÎνο τομÎα ή υπηÏεσία, ή για όλα τα Ï€Ïοβλήματα σε μια οÏισμÎνη ακτίνα απόστασης από κάποια τοποθεσία." +msgstr "" #. ("%s is the site name") #: templates/web/base/alert/index.html:11 -#, fuzzy msgid "" "%s has a variety of RSS feeds and email alerts for local problems, including\n" "alerts for all problems within a particular ward or council, or all problems\n" "within a certain distance of a particular location." -msgstr "Το FixMyStreet Îχει μία ποικιλία από πηγÎÏ‚ RSS και ειδοποιήσεις μÎσω email για τα τοπικά Ï€Ïοβλήματα, καθώς και ειδοποιήσεις για Îναν συγκεκÏιμÎνο τομÎα ή υπηÏεσία, ή για όλα τα Ï€Ïοβλήματα σε μια οÏισμÎνη ακτίνα απόστασης από κάποια τοποθεσία." +msgstr "" + +#: templates/web/base/status/stats.html:23 +msgid "%s live updates" +msgstr "%s ζωντανÎÏ‚ ενημεÏώσεις" -#: perllib/FixMyStreet/DB/Result/Problem.pm:695 +#: templates/web/base/status/stats.html:25 +msgid "%s questionnaires sent – %s answered (%s%%)" +msgstr "στάλθηκαν %s εÏωτηματολόγια – %s απαντήθηκαν (%s%%)" + +#: perllib/FixMyStreet/DB/Result/Problem.pm:683 msgid "%s ref: %s" msgstr "%s αναφ.: %s" #. ("%s is the site name") #: templates/web/base/alert/_list.html:73 -#, fuzzy msgid "" "%s sends different categories of problem\n" "to the appropriate council, so problems within the boundary of a particular council\n" @@ -110,18 +107,16 @@ msgid "" "council’s alerts, but will only appear in the \"Within the boundary\" alert\n" "for the county council." msgstr "" -"Το FixMyStreet στÎλνει διαφοÏετικÎÏ‚ κατηγοÏίες Ï€Ïοβλημάτων\n" -"στις κατάλληλες υπηÏεσίες, οπότε κάποια Ï€Ïοβλήματα που στÎλνονται σε μία υπηÏεσία μποÏεί να μην ταιÏιάζουν με τα Ï€ÏοκαθοÏισμÎνα ÏŒÏια της αÏμοδιότητάς της. Για παÏάδειγμα, μια αναφοÏά για Îνα graffiti θα σταλεί στην υπηÏεσία που είναι αÏμόδια για την πεÏιοχή, άÏα θα εμφανίζεται και στις δÏο κατηγοÏίες ειδοποιήσεων της υπηÏεσίας, ενώ όσον αφοÏά την επικεφαλής υπηÏεσία θα εμφανίζεται μόνο στην κατηγοÏία ειδοποιήσεων \"Εντός του τομÎα ευθÏνης\"." -#: perllib/FixMyStreet/Cobrand/UK.pm:255 perllib/FixMyStreet/Cobrand/UK.pm:267 +#: perllib/FixMyStreet/Cobrand/UK.pm:256 perllib/FixMyStreet/Cobrand/UK.pm:268 msgid "%s ward, %s" msgstr "%s πεÏιοχή, %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:564 +#: perllib/FixMyStreet/DB/Result/Problem.pm:552 msgid "%s, reported at %s" msgstr "%s, Îγινε αναφοÏά στο "%s"" -#: perllib/FixMyStreet/Cobrand/UK.pm:282 perllib/FixMyStreet/Cobrand/UK.pm:294 +#: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295 msgid "%s, within %s ward" msgstr "%s, στην πεÏιοχή %quot;%s"" @@ -129,7 +124,7 @@ msgstr "%s, στην πεÏιοχή %quot;%s"" msgid "© <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors" msgstr "© <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> και συνεÏγάτες" -#: templates/web/zurich/report/new/fill_in_details_form.html:53 +#: templates/web/zurich/report/new/fill_in_details_form.html:46 msgid "(Defect & location of defect)" msgstr "" @@ -140,15 +135,13 @@ msgstr "(το email βÏίσκεται στη μαÏÏη λίστα)" #: templates/web/zurich/admin/report_edit-sdm.html:60 #: templates/web/zurich/admin/report_edit.html:88 -#, fuzzy msgid "(No name)" -msgstr "Το όνομά σου" +msgstr "" #: templates/web/zurich/admin/report_edit-sdm.html:67 #: templates/web/zurich/admin/report_edit.html:95 -#, fuzzy msgid "(No phone number)" -msgstr "Ο αÏιθμός τηλεφώνου σου" +msgstr "" #: templates/web/base/alert/_list.html:24 msgid "(a default distance which covers roughly 200,000 people)" @@ -156,17 +149,16 @@ msgstr "(αντιστοιχεί σε πεÏιοχή όπου κατοικοÏν #. ("%s is a list of distance links, e.g. [2km] / [5km] / [10km] / [20km]") #: templates/web/base/alert/_list.html:29 -#, fuzzy msgid "(alternatively the RSS feed can be customised, within %s)" -msgstr "(εναλλακτικά, μποÏείς να λαμβάνεις ειδοποιήσεις για ζητήματα σε ακτίνα " +msgstr "" -#: templates/web/base/report/_item.html:27 -#: templates/web/zurich/report/_item.html:21 +#: templates/web/base/report/_item.html:25 +#: templates/web/zurich/report/_item.html:19 msgid "(closed)" msgstr "(Îκλεισε)" -#: templates/web/base/report/_item.html:25 -#: templates/web/zurich/report/_item.html:19 +#: templates/web/base/report/_item.html:23 +#: templates/web/zurich/report/_item.html:17 msgid "(fixed)" msgstr "(διοÏθώθηκε)" @@ -174,37 +166,28 @@ msgstr "(διοÏθώθηκε)" msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)" msgstr "(όπως graffiti, παÏατημÎνα σκουπίδια, σπασμÎνες πλάκες πεζοδÏομίου ή καμÎνα φώτα δÏόμων)" -#: templates/web/base/report/_item.html:21 +#: templates/web/base/report/_item.html:19 msgid "(not sent to council)" msgstr "(δεν αποστάλθηκε σε υπηÏεσία)" -#: templates/web/base/report/new/fill_in_details_form.html:200 #: templates/web/zurich/report/new/fill_in_details_form.html:82 msgid "(optional)" msgstr "(Ï€ÏοαιÏετικό)" -#: templates/web/fixmystreet/report/public_label.html:1 +#: templates/web/base/report/public_label.html:1 msgid "(public)" msgstr "(φαίνεται δημόσια)" -#: templates/web/base/report/_item.html:20 +#: templates/web/base/report/_item.html:18 msgid "(sent to both)" msgstr "(στάλθηκε και στις δÏο)" -#: templates/web/base/report/new/fill_in_details_form.html:194 -msgid "(we never show your email address or phone number)" -msgstr "(δεν φαίνεται ποτΠτο email ή ο τηλεφωνικός αÏιθμός σου)" - -#: templates/web/base/report/update-form.html:159 -msgid "(we never show your email)" -msgstr "(δεν φαίνεται ποτΠτο email σου)" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:673 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 #: perllib/FixMyStreet/DB/Result/Problem.pm:410 msgid "-- Pick a category --" msgstr "-- Διάλεξε κατηγοÏία --" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:637 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:632 #: perllib/FixMyStreet/DB/Result/Problem.pm:416 msgid "-- Pick a property type --" msgstr "-- Διάλεξε είδος ακινήτου --" @@ -226,52 +209,39 @@ msgstr "" msgid "<label>Show %s</label> <label>about %s</label>" msgstr "" -#: templates/web/base/admin/index.html:32 -#: templates/web/base/status/index.html:11 +#: templates/web/base/status/stats.html:18 #: templates/web/zurich/admin/index.html:4 msgid "<strong>%s</strong> live problems" -msgstr "<strong>%d</strong> Ï€Ïοβλήματα Ï„ÏŽÏα" +msgstr "<strong>%s</strong> Ï€Ïοβλήματα Ï„ÏŽÏα" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:39 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:2 msgid "<strong>No</strong> Let me confirm my report by email" msgstr "<strong>Όχι</strong> Îα γίνει επιβεβαίωση της αναφοÏάς μÎσω email" -#: templates/web/fixmystreet/report/update-form.html:112 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:2 msgid "<strong>No</strong> Let me confirm my update by email" msgstr "<strong>Όχι</strong> Îα γίνει επιβεβαίωση της ενημÎÏωσης μÎσω email" -#: templates/web/base/auth/general.html:48 +#: templates/web/base/auth/general.html:87 #: templates/web/zurich/auth/general.html:51 msgid "<strong>No</strong> let me sign in by email" msgstr "<strong>Όχι</strong> να συνδεθώ μÎσω email" -#: templates/web/base/report/new/fill_in_details_form.html:145 -msgid "<strong>No</strong>, let me confirm my report by email:" -msgstr "<strong>Όχι<strong>, να γίνει επιβεβαίωση της αναφοÏάς μÎσω email:" - -#: templates/web/base/report/update-form.html:118 -msgid "<strong>No</strong>, let me confirm my update by email:" -msgstr "<strong>Όχι</strong>, να γίνει επιβεβαίωση της ενημÎÏωσης μÎσω email:" - -#: templates/web/base/auth/general.html:34 -#: templates/web/base/report/new/fill_in_details_form.html:123 -#: templates/web/base/report/update-form.html:96 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:15 -#: templates/web/fixmystreet/report/update-form.html:89 +#: templates/web/base/auth/general.html:70 +#: templates/web/base/report/new/form_user_loggedout_password.html:3 +#: templates/web/base/report/update/form_user_loggedout_password.html:2 msgid "<strong>Yes</strong> I have a password" msgstr "<strong>Îαι</strong> Îχω κωδικό Ï€Ïόσβασης" -#: templates/web/base/static/about-en-gb.html:1 -#: templates/web/base/static/about-en-gb.html:3 +#: templates/web/base/about/about-en-gb.html:1 +#: templates/web/base/about/about-en-gb.html:3 msgid "About us" msgstr "Σχετικά με εμάς" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:8 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:31 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:29 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:35 msgid "Action Scheduled" msgstr "Η ΔÏάση Î ÏογÏαμματίστηκε" @@ -304,14 +274,13 @@ msgstr "Î Ïοσθήκη νÎας κατηγοÏίας" msgid "Add user" msgstr "Î Ïοσθήκη χÏήστη" -#: templates/web/base/my/my.html:52 +#: templates/web/base/my/my.html:56 msgid "Added %s" msgstr "Î ÏοστÎθηκε %s" #: templates/web/base/report/new/category_extras.html:9 -#, fuzzy msgid "Additional Information" -msgstr "Σε αναμονή ελÎγχου" +msgstr "" #: templates/web/base/auth/change_password.html:29 msgid "Again:" @@ -325,8 +294,7 @@ msgstr "Η ειδοποίηση %d δημιουÏγήθηκε για το " msgid "Alert %d disabled (created %s)" msgstr "Η ειδοποίηση %d απενεÏγοποιήθηκε (δημιουÏγήθηκε %s)" -#: templates/web/base/report/update-form.html:164 -#: templates/web/fixmystreet/report/update-form.html:150 +#: templates/web/base/report/update/form_name.html:20 msgid "Alert me to future updates" msgstr "ΕιδοποίησΠμε για μελλοντικÎÏ‚ ενημεÏώσεις" @@ -336,9 +304,8 @@ msgid "All Reports" msgstr "Όλες οι ΑναφοÏÎÏ‚" #: templates/web/zurich/admin/stats.html:5 -#, fuzzy msgid "All Reports as CSV" -msgstr "Όλες οι ΑναφοÏÎÏ‚" +msgstr "" #: templates/web/base/footer.html:11 templates/web/fixmystreet/footer.html:32 #: templates/web/zurich/admin/index-dm.html:12 @@ -359,10 +326,8 @@ msgstr "Όλες οι πληÏοφοÏίες που καταχωÏήθηκαν Î #: templates/web/base/report/new/councils_text_all.html:2 #: templates/web/base/report/new/councils_text_all.html:4 -#: templates/web/base/report/new/fill_in_details_form.html:12 -#: templates/web/base/report/new/fill_in_details_form.html:14 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:10 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:11 +#: templates/web/base/report/new/fill_in_details_form.html:10 +#: templates/web/base/report/new/fill_in_details_form.html:9 msgid "All the information you provide here will be sent to <strong>%s</strong>." msgstr "Όλες οι πληÏοφοÏίες που καταχωÏήθηκαν εδώ θα αποσταλοÏν στο <strong>"%s"</strong>." @@ -384,6 +349,10 @@ msgstr "Ανώνυμος:" msgid "Are you a developer?" msgstr "Είσαι Ï€ÏογÏαμματιστής;" +#: templates/web/base/js/translation_strings.html:52 +msgid "Are you sure you want to cancel this upload?" +msgstr "" + #: templates/web/base/admin/body-form.html:69 #: templates/web/base/admin/body.html:16 #: templates/web/zurich/admin/body-form.html:24 @@ -396,9 +365,8 @@ msgid "As this is a staging site and %s is false, reports made on this site will msgstr "ΔεδομÎνου ότι αυτό είναι Îνα δοκιμαστικό site και το %s είναι ψευδÎÏ‚, οι αναφοÏÎÏ‚ που γίνονται σε αυτό το site θα σταλοÏν στις δοκιμαστικÎÏ‚ αναφοÏÎÏ‚ Ï€Ïοβλημάτων και όχι στην κανονική επαφή που υπάÏχει για την κατηγοÏία αναφοÏάς των Ï€Ïοβλημάτων." #: templates/web/zurich/admin/report_edit.html:213 -#, fuzzy msgid "Assign to competent body:" -msgstr "Ανάθεση σε εξωτεÏικό τομÎα:" +msgstr "" #: templates/web/zurich/admin/report_edit.html:173 #: templates/web/zurich/admin/stats.html:36 @@ -417,16 +385,16 @@ msgstr "Ανάθεση στο τμήμα:" msgid "Assigned to %s" msgstr "ΑνατÎθηκε στο "%s"" -#: templates/web/base/open311/index.html:84 +#: templates/web/base/open311/index.html:76 msgid "At most %d requests are returned in each query. The returned requests are ordered by requested_datetime, so to get all requests, do several searches with rolling start_date and end_date." msgstr "Σε κάθε αναζήτηση επιστÏÎφονται το Ï€Î¿Î»Ï %d αιτήματα. Τα αιτήματα που επιστÏÎφονται ταξινομοÏνται κατά requested_datetime, οπότε για να λάβεις όλα τα αιτήματα, κάνε μεÏικÎÏ‚ αναζητήσεις αλλάζοντας το start_date και το end_date." -#: templates/web/base/open311/index.html:76 +#: templates/web/base/open311/index.html:68 msgid "At the moment only searching for and looking at reports work." msgstr "Αυτή τη στιγμή λειτουÏγοÏν μόνο η αναζήτηση και η Ï€Ïοβολή αναφοÏών." #: perllib/FixMyStreet/DB/Result/Problem.pm:373 -#: templates/web/zurich/report/_item.html:11 +#: templates/web/zurich/report/_item.html:9 msgid "Awaiting moderation" msgstr "Σε αναμονή ελÎγχου" @@ -438,7 +406,7 @@ msgstr "Πίσω" msgid "Ban email address" msgstr "Αποκλεισμός της διεÏθυνσης email" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1276 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1285 #: perllib/FixMyStreet/Cobrand/Zurich.pm:392 #: templates/web/base/admin/bodies.html:1 templates/web/zurich/header.html:64 msgid "Bodies" @@ -468,7 +436,7 @@ msgid "Can't see the map? <em>Skip this step</em>" msgstr "Δεν μποÏείς να δεις τον χάÏτη; <em>ΠαÏάλειψη βήματος</em>" #: templates/web/base/admin/body.html:68 -#: templates/web/base/admin/index.html:61 +#: templates/web/base/admin/index.html:54 #: templates/web/base/report/new/category.html:10 #: templates/web/base/report/new/category_wrapper.html:3 #: templates/web/zurich/admin/body.html:14 @@ -479,8 +447,8 @@ msgstr "Δεν μποÏείς να δεις τον χάÏτη; <em>ΠαÏάλεΠmsgid "Category" msgstr "ΚατηγοÏία" -#: templates/web/base/admin/index.html:59 -#: templates/web/base/admin/index.html:67 +#: templates/web/base/admin/index.html:52 +#: templates/web/base/admin/index.html:60 msgid "Category fix rate for problems > 4 weeks old" msgstr "ÎœÎσος ÏŒÏος διόÏθωσης Ï€Ïοβλημάτων για την κατηγοÏία > 4 εβδομάδες" @@ -493,7 +461,7 @@ msgstr "ÎœÎσος ÏŒÏος διόÏθωσης Ï€Ïοβλημάτων για Ï„Î msgid "Category:" msgstr "ΚατηγοÏία:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:402 +#: perllib/FixMyStreet/Script/Reports.pm:180 msgid "Category: %s" msgstr "ΚατηγοÏία: %s" @@ -552,7 +520,7 @@ msgid "Click here or enter as dd/mm/yyyy" msgstr "Κάνε κλικ εδώ ή κάνε εισαγωγή με τη μοÏφή ηη/μμ/εεεε" #: templates/web/base/around/_report_banner.html:2 -#: templates/web/base/js/translation_strings.html:50 +#: templates/web/base/js/translation_strings.html:55 msgid "Click map to report a problem" msgstr "Κάνε κλικ στον χάÏτη για να αναφÎÏεις Îνα Ï€Ïόβλημα" @@ -579,7 +547,7 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:25 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:144 -#: templates/web/fixmystreet/report/banner.html:15 +#: templates/web/base/report/banner.html:15 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:10 #: templates/web/zurich/admin/header.html:16 @@ -587,7 +555,7 @@ msgstr "" msgid "Closed" msgstr "Κλειστό" -#: perllib/FixMyStreet/DB/Result/Problem.pm:794 +#: perllib/FixMyStreet/DB/Result/Problem.pm:779 msgid "Closed by council" msgstr "Κλειστό από την υπηÏεσία" @@ -613,7 +581,7 @@ msgstr "ΔεδομÎνα Ï€ÏοστεθÎντος σήματος:" msgid "Cobrand:" msgstr "Î ÏοστεθÎν σήμα:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1283 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1292 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "Ρυθμίσεις" @@ -626,13 +594,14 @@ msgstr "ΡÏθμιση σημείου τεÏματισμοÏ" msgid "Confirm" msgstr "Επιβεβαίωση" -#: templates/web/base/auth/token.html:1 templates/web/zurich/auth/token.html:1 +#: templates/web/base/auth/token.html:1 msgid "Confirm account" msgstr "Επιβεβαίωση λογαÏιασμοÏ" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:33 -#: templates/web/fixmystreet/report/update-form.html:107 -msgid "Confirm by email below, providing a new password at that point. When you confirm, your password will be updated." +#: templates/web/base/report/new/form_user_loggedout_password.html:21 +#: templates/web/base/report/update/form_user_loggedout_password.html:20 +#, fuzzy +msgid "Confirm by email instead, providing a new password at that point. When you confirm, your password will be updated." msgstr "Κάνε επιβεβαίωση μÎσω email παÏακάτω, εισάγοντας Îναν νÎο κωδικό Ï€Ïόσβασης. Όταν γίνει η επιβεβαίωση, ο κωδικός Ï€Ïόσβασης θα αλλάξει." #: templates/web/base/questionnaire/creator_fixed.html:1 @@ -662,35 +631,27 @@ msgid "Confirmed:" msgstr "Επιβεβαιώθηκε:" #. ("%s is the site name") -#: templates/web/base/faq/faq-en-gb.html:8 templates/web/base/footer.html:24 -#: templates/web/base/open311/index.html:8 -#: templates/web/base/static/privacy.html:10 -#: templates/web/fixmystreet/contact/index.html:12 -#, fuzzy +#: templates/web/base/about/_sidebar.html:6 templates/web/base/footer.html:24 msgid "Contact %s" -msgstr "Επικοινώνησε με εμάς" +msgstr "" #: templates/web/base/contact/index.html:1 #: templates/web/base/contact/index.html:2 #: templates/web/base/contact/submit.html:1 -#: templates/web/fixmystreet/contact/index.html:1 -#: templates/web/fixmystreet/contact/index.html:2 msgid "Contact Us" msgstr "Επικοινώνησε με εμάς" -#: templates/web/base/contact/index.html:6 -#: templates/web/fixmystreet/contact/index.html:20 +#: templates/web/base/contact/index.html:12 msgid "Contact the team" msgstr "Επικοινώνησε με την ομάδα διαχείÏισης" #: templates/web/zurich/admin/report_edit-sdm.html:40 #: templates/web/zurich/admin/report_edit.html:59 -#, fuzzy msgid "Coordinates:" -msgstr "ΣυντεταγμÎνες:" +msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1420 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1448 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1429 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1457 msgid "Could not find user" msgstr "Δεν είναι δυνατή η εÏÏεση χÏήστη" @@ -708,7 +669,7 @@ msgstr "ΥπηÏεσία" msgid "Council contacts for %s" msgstr "ΕπαφÎÏ‚ υπηÏεσίας για "%s"" -#: perllib/FixMyStreet/DB/Result/Problem.pm:693 +#: perllib/FixMyStreet/DB/Result/Problem.pm:681 msgid "Council ref: %s" msgstr "υπηÏεσία αναφ.: %s" @@ -723,7 +684,7 @@ msgstr "ΥπηÏεσία:" msgid "Count" msgstr "ΚαταμÎÏ„Ïηση" -#: templates/web/base/email_sent.html:1 templates/web/zurich/email_sent.html:1 +#: templates/web/base/email_sent.html:1 msgid "Create a report" msgstr "ΔημιουÏγία αναφοÏάς" @@ -733,9 +694,8 @@ msgid "Create category" msgstr "ΔημιουÏγία κατηγοÏίας" #: templates/web/zurich/admin/template_edit.html:29 -#, fuzzy msgid "Create template" -msgstr "ΔημιουÏγία αναφοÏάς" +msgstr "" #: templates/web/base/admin/problem_row.html:34 #: templates/web/zurich/admin/templates.html:10 @@ -772,7 +732,7 @@ msgstr "Πίνακας ΕλÎγχου" msgid "Dealt with by subdivision within 5 working days" msgstr "Εξετάστηκε από το τμήμα μÎσα σε 5 εÏγάσιμες ημÎÏες" -#: perllib/FixMyStreet/App/Controller/Admin.pm:878 +#: perllib/FixMyStreet/App/Controller/Admin.pm:877 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "" @@ -785,7 +745,7 @@ msgstr "" msgid "Deleted" msgstr "ΔιαγÏαμμÎνα" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:51 +#: templates/web/base/report/new/form_report.html:45 #: templates/web/zurich/admin/index-dm.html:22 #: templates/web/zurich/admin/index-sdm.html:20 #: templates/web/zurich/admin/reports.html:12 @@ -793,12 +753,11 @@ msgid "Description" msgstr "ΠεÏιγÏαφή" #: templates/web/base/js/translation_strings.html:34 -#: templates/web/zurich/report/new/fill_in_details_form.html:42 +#: templates/web/zurich/report/new/fill_in_details_form.html:68 msgid "Details" msgstr "ΠληÏοφοÏίες" #: templates/web/base/admin/report_edit.html:20 -#: templates/web/base/report/new/fill_in_details_form.html:62 #: templates/web/zurich/admin/report_edit-sdm.html:27 #: templates/web/zurich/admin/report_edit.html:29 #: templates/web/zurich/admin/report_edit.html:43 @@ -811,38 +770,38 @@ msgstr "Μεταβιβάστηκε" #: templates/web/zurich/admin/report_edit-sdm.html:50 #: templates/web/zurich/admin/report_edit.html:69 -#, fuzzy msgid "Didn't use map" -msgstr "δεν χÏησιμοποιήθηκε χάÏτης" +msgstr "" #: templates/web/base/admin/edit-league.html:8 msgid "Diligency prize league table" msgstr "Πίνακας βÏαβείων επιμÎλειας" #. ("%s is the site name") -#: templates/web/base/auth/general.html:31 -#: templates/web/base/report/new/fill_in_details_form.html:114 -#: templates/web/base/report/update-form.html:87 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:11 -#: templates/web/fixmystreet/report/update-form.html:86 -#, fuzzy +#: templates/web/base/auth/general.html:48 +#: templates/web/base/report/new/form_user_loggedout.html:18 +#: templates/web/base/report/new/oauth_email_form.html:18 +#: templates/web/base/report/update-form.html:29 +#: templates/web/base/report/update/form_user_loggedout.html:17 msgid "Do you have a %s password?" -msgstr "Έχεις κωδικό Ï€Ïόσβασης για το FixMyStreet;" +msgstr "" #: templates/web/base/questionnaire/index.html:55 msgid "Don’t know" msgstr "Δεν γνωÏίζω" -#: templates/web/fixmystreet/contact/index.html:118 +#: templates/web/base/contact/index.html:110 msgid "Don't like forms?" msgstr "Δεν σου αÏÎσουν οι φόÏμες;" +#: templates/web/base/js/translation_strings.html:51 +msgid "Drag and drop photos here or <u>click to upload</u>" +msgstr "" + #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:14 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:32 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:30 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:36 msgid "Duplicate" msgstr "Διπλότυπο" @@ -895,7 +854,7 @@ msgstr "ΕπεξεÏγαστής" #: templates/web/base/admin/category_edit.html:91 #: templates/web/base/admin/flagged.html:38 #: templates/web/base/admin/users.html:16 -#: templates/web/base/auth/general.html:22 +#: templates/web/base/auth/general.html:39 #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:24 @@ -903,7 +862,7 @@ msgstr "ΕπεξεÏγαστής" msgid "Email" msgstr "Email" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1396 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1405 msgid "Email added to abuse list" msgstr "Το Email Ï€ÏοστÎθηκε στην μαÏÏη λίστα" @@ -919,7 +878,7 @@ msgstr "Η ειδοποίηση μÎσω email δημιουÏγήθηκε" msgid "Email alert deleted" msgstr "Η ειδοποίηση μÎσω email διεγÏάφη" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1393 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1402 msgid "Email already in abuse list" msgstr "Το Email είναι ήδη στην μαÏÏη λίστα" @@ -927,41 +886,36 @@ msgstr "Το Email είναι ήδη στην μαÏÏη λίστα" msgid "Email me new local problems" msgstr "Στείλε μου email για νÎα Ï€Ïοβλήματα της πεÏιοχής" -#: templates/web/base/report/display.html:38 -msgid "Email me updates" -msgstr "Στείλτε Email για ενημεÏώσεις" - #: templates/web/base/admin/category_edit.html:31 #: templates/web/base/admin/report_edit.html:62 #: templates/web/base/admin/update_edit.html:33 #: templates/web/base/admin/user-form.html:20 #: templates/web/base/alert/updates.html:13 -#: templates/web/base/report/display.html:42 #: templates/web/zurich/admin/body.html:47 msgid "Email:" msgstr "Email:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:329 +#: perllib/FixMyStreet/Script/Reports.pm:108 msgid "Email: %s" msgstr "Email: %s" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:639 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:634 msgid "Empty flat or maisonette" msgstr "Άδειο διαμÎÏισμα ή μεζονÎτα" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:638 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:633 msgid "Empty house or bungalow" msgstr "Άδειο σπίτι ή μονοκατοικία" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:641 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:636 msgid "Empty office or other commercial" msgstr "Άδειο γÏαφείο ή άλλος χώÏος εμποÏικής χÏήσης" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:642 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:637 msgid "Empty pub or bar" msgstr "Άδειο μπαÏ" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:643 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:638 msgid "Empty public building - school, hospital, etc." msgstr "Άδειο δημόσιο κτήÏιο - σχολείο, νοσοκομείο, κτλ." @@ -1001,7 +955,7 @@ msgstr "Σημείο τεÏματισμοÏ" msgid "Enter a Zürich street name" msgstr "Δώσε μια ονομασία για την οδό" -#: perllib/FixMyStreet/Cobrand/UK.pm:13 +#: perllib/FixMyStreet/Cobrand/UK.pm:14 msgid "Enter a nearby UK postcode, or street name and area" msgstr "ΓÏάψε Îναν κοντινό ταχυδÏομικό κώδικα, οδό ή πεÏιοχή" @@ -1019,14 +973,9 @@ msgstr "ΓÏάψε μία κοντινή οδό ή πεÏιοχή" msgid "Enter a nearby street name and area, postal code or district in Delhi" msgstr "ΓÏάψε μία κοντινή οδό, πεÏιοχή, ταχυδÏομικό κώδικα ή πεÏιφÎÏεια" -#: templates/web/base/report/new/fill_in_details_form.html:152 -#: templates/web/base/report/update-form.html:125 -msgid "Enter a new password:" -msgstr "ΓÏάψε Îνα νÎο κωδικό Ï€Ïόσβασης:" - -#: templates/web/base/auth/general.html:60 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:75 -#: templates/web/fixmystreet/report/update-form.html:123 +#: templates/web/base/auth/general.html:99 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:38 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:13 #: templates/web/zurich/auth/general.html:65 msgid "Enter a password" msgstr "ΓÏάψε Îνα κωδικό Ï€Ïόσβασης" @@ -1036,11 +985,11 @@ msgid "Enter details of the problem" msgstr "ΓÏάψε λεπτομÎÏειες σχετικά με το Ï€Ïόβλημα" #: templates/web/base/errors/generic.html:1 -#: templates/web/base/errors/generic.html:3 +#: templates/web/base/errors/generic.html:4 #: templates/web/base/tokens/abuse.html:1 #: templates/web/base/tokens/abuse.html:3 #: templates/web/base/tokens/error.html:1 -#: templates/web/base/tokens/error.html:3 +#: templates/web/base/tokens/error.html:5 msgid "Error" msgstr "Σφάλμα" @@ -1053,11 +1002,11 @@ msgstr "" msgid "Example postcode %s" msgstr "ΠαÏάδειγμα ταχυδÏÎ¿Î¼Î¹ÎºÎ¿Ï ÎºÏŽÎ´Î¹ÎºÎ± %s" -#: templates/web/base/open311/index.html:94 +#: templates/web/base/open311/index.html:86 msgid "Examples:" msgstr "ΠαÏαδείγματα:" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:55 +#: templates/web/base/report/new/form_report.html:49 msgid "Explain what’s wrong, exactly where it is, and how long it’s been there…" msgstr "Εξήγησε ποιο είναι το Ï€Ïόβλημα, που βÏίσκεται ακÏιβώς και για πόσο καιÏÏŒ υπάÏχει..." @@ -1065,9 +1014,8 @@ msgstr "Εξήγησε ποιο είναι το Ï€Ïόβλημα, που βÏÎ¯Ï #: perllib/FixMyStreet/Cobrand/Zurich.pm:922 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:12 -#, fuzzy msgid "Extern" -msgstr "ΕξωτεÏικός ΣÏνδεσμος" +msgstr "" #: templates/web/base/admin/body-form.html:81 msgid "External URL" @@ -1099,17 +1047,15 @@ msgstr "ΔιόÏθωσΠτο επιλÎγοντας μία <strong>πεÏιοχ msgid "FixMyStreet" msgstr "FixMyStreet" -#: templates/web/base/admin/index.html:61 +#: templates/web/base/admin/index.html:54 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:24 #: templates/web/base/admin/report_blocks.html:9 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:144 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:34 -#: templates/web/fixmystreet/report/banner.html:12 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:32 +#: templates/web/base/report/banner.html:12 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:38 msgid "Fixed" msgstr "ΔιοÏθώθηκε" @@ -1136,7 +1082,7 @@ msgstr "Σήμανση ως διαγÏαμμÎνο" msgid "Flag user" msgstr "Επισήμανση χÏήστη" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1281 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1290 #: templates/web/base/admin/users.html:19 msgid "Flagged" msgstr "ΕπισημασμÎνα" @@ -1167,36 +1113,31 @@ msgstr "ΑκολοÏθησε Îνα σÏνδεσμο πεÏιοχής για νΠmsgid "For more information, see <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>." msgstr "Για πεÏισσότεÏες πληÏοφοÏίες, δες <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>Î ÏŽÏ‚ το FixMyStreet χÏησιμοποιεί το Mapit (στα Αγγλικά)</a>." -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:32 -#: templates/web/fixmystreet/report/update-form.html:106 +#: templates/web/base/report/new/form_user_loggedout_password.html:20 +#: templates/web/base/report/update/form_user_loggedout_password.html:19 msgid "Forgotten your password?" msgstr "ΞÎχασες τον κωδικό Ï€Ïόσβασής σου;" #: perllib/FixMyStreet/Cobrand/Zurich.pm:752 -#, fuzzy msgid "Forwarded to external body" -msgstr "Ανάθεση σε εξωτεÏικό τομÎα:" +msgstr "" #: perllib/FixMyStreet/Cobrand/Zurich.pm:753 -#, fuzzy msgid "Forwarded wish to external body" -msgstr "Ανάθεση σε εξωτεÏικό τομÎα:" +msgstr "" -#: templates/web/base/faq/faq-en-gb.html:1 -#: templates/web/base/faq/faq-en-gb.html:13 -#: templates/web/base/faq/faq-en-gb.html:6 -#: templates/web/base/open311/index.html:6 -#: templates/web/base/static/privacy.html:8 -#: templates/web/fixmystreet/contact/index.html:10 +#: templates/web/base/about/_sidebar.html:4 +#: templates/web/base/about/faq-en-gb.html:1 +#: templates/web/base/about/faq-en-gb.html:5 msgid "Frequently Asked Questions" msgstr "ΣυχνÎÏ‚ ΕÏωτήσεις" -#: templates/web/base/open311/index.html:136 +#: templates/web/base/open311/index.html:128 msgid "GeoRSS on Google Maps" msgstr "GeoRSS στους ΧάÏτες Google" +#: templates/web/base/report/display_tools.html:11 #: templates/web/fixmystreet/around/_updates.html:3 -#: templates/web/fixmystreet/report/display.html:35 msgid "Get updates" msgstr "Λήψη ενημεÏώσεων" @@ -1229,7 +1170,7 @@ msgstr "ΕμπÏός" msgid "Going to send questionnaire?" msgstr "ΣκοπεÏεις να στείλεις εÏωτηματολόγιο;" -#: templates/web/base/admin/index.html:42 +#: templates/web/base/admin/index.html:35 msgid "Graph of problem creation by status over time" msgstr "ΓÏάφημα της δημιουÏγίας Ï€Ïοβλημάτων (κατάσταση Ï€Ïος χÏόνος)" @@ -1246,7 +1187,7 @@ msgid "Have you ever reported a problem to a council before, or is this your fir msgstr "Έχεις αναφÎÏει ποτΠξανά Îνα Ï€Ïόβλημα στην υπηÏεσία ή αυτή είναι η Ï€Ïώτη φοÏά;" #: templates/web/base/footer.html:15 templates/web/fixmystreet/footer.html:38 -#: templates/web/zurich/faq/faq-de-ch.html:1 +#: templates/web/zurich/about/faq-de-ch.html:1 #: templates/web/zurich/footer.html:22 #: templates/web/zurich/nav_over_content.html:8 msgid "Help" @@ -1297,7 +1238,7 @@ msgstr "Î ÏŽÏ‚ να αναφÎÏεις Îνα Ï€Ïόβλημα" msgid "How to send successful reports" msgstr "Î ÏŽÏ‚ να στείλεις επιτυχημÎνες αναφοÏÎÏ‚" -#: perllib/FixMyStreet/App/Controller/Admin.pm:754 +#: perllib/FixMyStreet/App/Controller/Admin.pm:752 msgid "I am afraid you cannot confirm unconfirmed reports." msgstr "ΦοβοÏμαστε ότι δε γίνεται να επιβεβαιώσεις ανεπιβεβαίωτες αναφοÏÎÏ‚." @@ -1315,10 +1256,6 @@ msgstr "Μόλις ενημÎÏωσα Îνα Ï€Ïόβλημα στο @fixmystree msgid "I'm afraid we couldn't locate your problem in the database.\n" msgstr "Δεν μποÏÎσαμε να εντοπίσουμε το Ï€Ïόβλημά σου στην βάση δεδομÎνων.\n" -#: perllib/FixMyStreet/App/Controller/Tokens.pm:327 -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 "ΦοβοÏμαστε ότι δεν μποÏÎσαμε να επαληθεÏσουμε αυτό το token. Αν αντÎγÏαψες τη διεÏθυνση URL από κάποιο email, παÏακαλοÏμε Îλεγξε ότι την αντÎγÏαψες επακÏιβώς.\n" - #: templates/web/base/admin/flagged.html:14 #: templates/web/base/admin/list_updates.html:6 #: templates/web/base/admin/reports.html:11 @@ -1349,22 +1286,16 @@ msgstr "Αν δÏο ή πεÏισσότεÏοι τομείς υπηÏετοÏν msgid "If you get some more information about the status of your problem, please come back to the site and leave an update." msgstr "Αν μάθεις πεÏισσότεÏες πληÏοφοÏίες για την κατάσταση του Ï€Ïοβλήματός σου, σε παÏακαλοÏμε να επιστÏÎψεις στην ιστοσελίδα και να γÏάψεις μια σχετική ενημÎÏωση." -#: templates/web/base/report/new/councils_text_none.html:2 -#: templates/web/base/report/new/councils_text_none.html:8 +#: templates/web/base/report/new/councils_text_none.html:10 +#: templates/web/base/report/new/councils_text_none.html:9 msgid "If you submit a problem here the subject and details of the problem will be public, but the problem will <strong>not</strong> be reported to the council." msgstr "Αν υποβάλεις Îνα Ï€Ïόβλημα εδώ, το θÎμα και οι λεπτομÎÏειες του Ï€Ïοβλήματος θα είναι δημόσιες, αλλά το Ï€Ïόβλημα <strong>δεν</strong> θα υποβληθεί στην υπηÏεσία." -#: templates/web/zurich/auth/token.html:19 -#: templates/web/zurich/email_sent.html:7 -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 "Αν χÏησιμοποιείς διαδικτυακό email ή Îχεις φίλτÏα \"ανεπιθÏμητης αλληλογÏαφίας\", Îλεγξε τους φακÎλους ανεπιθÏμητων/spam email: μεÏικÎÏ‚ φοÏÎÏ‚, τα μηνÏματά μας επισημαίνονται Îτσι." - #: templates/web/base/questionnaire/index.html:68 -#, fuzzy msgid "" "If you wish to leave a public update on the problem, please enter it here\n" "(please note it will not be sent to the council)." -msgstr "Αν επιθυμείς να αφήσεις μία δημόσια ενημÎÏωση για το Ï€Ïόβλημα, παÏακαλοÏμε γÏάψ' την εδώ (σημείωση: δεν θα αποσταλεί στην υπηÏεσία). Για παÏάδειγμα, ποια ήταν η εμπειÏία που είχες για την διόÏθωση του Ï€Ïοβλήματος;" +msgstr "" #: templates/web/base/admin/body.html:149 msgid "If you're using <strong>a send method that is not email</strong>, enter the service ID (Open311) or equivalent identifier here." @@ -1405,10 +1336,8 @@ msgstr "ΛανθασμÎνη επιλογή Ïοής" #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:144 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:32 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:30 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:36 msgid "In Progress" msgstr "Σε ΕξÎλιξη" @@ -1416,7 +1345,7 @@ msgstr "Σε ΕξÎλιξη" msgid "In abuse table?" msgstr "Î’Ïίσκεται στον πίνακα καταχÏήσεων;" -#: templates/web/base/open311/index.html:88 +#: templates/web/base/open311/index.html:80 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 "ΕπιπλÎον, θα επιστÏαφοÏν οι παÏακάτω ιδιότητες που δεν πεÏιλαμβάνονται στις Ï€ÏοδιαγÏαφÎÏ‚ του Open311 v2: agency_sent_datetime, title (επιστÏÎφεται επίσης ως μÎÏος της πεÏιγÏαφής), interface_used, comment_count, requestor_name (υπάÏχει μόνο εφόσον ο αιτών επιτÏÎψει την εμφάνιση του ονόματός του στην ιστοσελίδα)." @@ -1424,7 +1353,7 @@ msgstr "ΕπιπλÎον, θα επιστÏαφοÏν οι παÏακάτω ιδ #: perllib/FixMyStreet/Cobrand/Zurich.pm:963 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:7 -#: templates/web/fixmystreet/report/banner.html:19 +#: templates/web/base/report/banner.html:19 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:8 msgid "In progress" @@ -1459,7 +1388,7 @@ msgstr "ΕσωτεÏική αναφοÏά" msgid "Invalid agency_responsible value %s" msgstr "ΕσφαλμÎνη τιμή agency_responsible %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1201 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1210 msgid "Invalid end date" msgstr "ΛανθασμÎνη ημεÏομηνία λήξης" @@ -1467,7 +1396,7 @@ msgstr "ΛανθασμÎνη ημεÏομηνία λήξης" msgid "Invalid format %s specified." msgstr "ΛανθασμÎνη μοÏφοποίηση %s." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1206 msgid "Invalid start date" msgstr "ΛανθασμÎνη ημεÏομηνία ÎναÏξης" @@ -1475,14 +1404,12 @@ msgstr "ΛανθασμÎνη ημεÏομηνία ÎναÏξης" #: templates/web/base/admin/report_blocks.html:5 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:143 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:31 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:29 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:35 msgid "Investigating" msgstr "Γίνεται διεÏεÏνηση" -#: templates/web/fixmystreet/contact/blurb.html:8 +#: templates/web/base/contact/blurb.html:8 msgid "It's often quickest to <a href=\"%s\">check our FAQs</a> and see if the answer is there." msgstr "Συχνά είναι γÏηγοÏότεÏο να <a href=\"%s\">ελÎγξεις τις ΣυχνÎÏ‚ ΕÏωτήσεις</a> για να δεις αν η απάντηση που ψάχνεις βÏίσκεται εκεί." @@ -1500,11 +1427,9 @@ msgstr "" msgid "Jurisdiction unknown" msgstr "" -#: templates/web/base/auth/general.html:44 -#: templates/web/base/report/new/fill_in_details_form.html:132 -#: templates/web/base/report/update-form.html:105 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:28 -#: templates/web/fixmystreet/report/update-form.html:102 +#: templates/web/base/auth/general.html:80 +#: templates/web/base/report/new/form_user_loggedout_password.html:16 +#: templates/web/base/report/update/form_user_loggedout_password.html:15 #: templates/web/zurich/auth/general.html:40 msgid "Keep me signed in on this computer" msgstr "Îα παÏαμείνω συνδεδεμÎνος από αυτήν τη συσκευή" @@ -1562,6 +1487,7 @@ msgid "MAP" msgstr "ΧΑΡΤΗΣ" #: templates/web/base/js/translation_strings.html:45 +#: templates/web/base/maps/google-ol.html:13 msgid "Map" msgstr "ΧάÏτης" @@ -1581,23 +1507,17 @@ msgstr "Σημείωση ως επιδιοÏθωμÎνο/κλειστό μÎσα msgid "Marked fixed/closed more than eight weeks ago" msgstr "Σημείωση ως επιδιοÏθωμÎνο/κλειστό πιο Ï€Ïιν από οκτώ εβδομάδες" -#: templates/web/fixmystreet/contact/index.html:106 +#: templates/web/base/contact/index.html:98 msgid "Message" msgstr "Μήνυμα" #: templates/web/zurich/admin/report_edit.html:284 -#, fuzzy msgid "Message to competent body:" -msgstr "Ανάθεση σε εξωτεÏικό τομÎα:" +msgstr "" #: templates/web/zurich/admin/report_edit.html:282 -#, fuzzy msgid "Message to external body:" -msgstr "Ανάθεση σε εξωτεÏικό τομÎα:" - -#: templates/web/base/contact/index.html:97 -msgid "Message:" -msgstr "Μήνυμα:" +msgstr "" #: perllib/FixMyStreet/App/Controller/Open311.pm:445 msgid "Missing jurisdiction_id" @@ -1611,10 +1531,6 @@ msgstr "ΕλÎγχθηκε από το τμήμα μÎσα σε μία εÏÎ³Î¬Ï msgid "Month" msgstr "Μήνας" -#: templates/web/base/report/display.html:34 -msgid "More problems nearby" -msgstr "ΠεÏισσότεÏα Ï€Ïοβλήματα στην πεÏιοχή" - #: templates/web/base/admin/bodies.html:21 #: templates/web/base/admin/body-form.html:18 #: templates/web/base/admin/flagged.html:16 @@ -1622,11 +1538,11 @@ msgstr "ΠεÏισσότεÏα Ï€Ïοβλήματα στην πεÏιοχή" #: templates/web/base/admin/list_updates.html:7 #: templates/web/base/admin/reports.html:13 #: templates/web/base/admin/users.html:15 -#: templates/web/base/auth/general.html:50 +#: templates/web/base/auth/general.html:89 +#: templates/web/base/report/new/form_user_loggedin.html:9 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:7 +#: templates/web/base/report/update/form_name.html:4 #: templates/web/base/reports/index.html:20 -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:9 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:44 -#: templates/web/fixmystreet/report/update-form.html:138 #: templates/web/zurich/admin/body-form.html:4 #: templates/web/zurich/auth/general.html:60 #: templates/web/zurich/report/new/fill_in_details_form.html:82 @@ -1640,7 +1556,7 @@ msgstr "Όνομα" msgid "Name:" msgstr "Όνομα:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:328 +#: perllib/FixMyStreet/Script/Reports.pm:107 msgid "Name: %s" msgstr "Όνομα: %s" @@ -1649,16 +1565,16 @@ msgstr "Όνομα: %s" msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s" msgstr "Η οδός που βÏίσκεται πλησιÎστεÏα στην καÏφίτσα που τοποθετήθηκε στον χάÏτη (παÏÎχεται αυτόματα από το OpenStreetMap): %s%s" -#: perllib/FixMyStreet/Cobrand/UK.pm:127 +#: perllib/FixMyStreet/Cobrand/UK.pm:128 msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" msgstr "Ο ταχυδÏομικός κώδικας που βÏίσκεται πλησιÎστεÏα στην καÏφίτσα που τοποθετήθηκε στον χάÏτη (παÏÎχεται αυτόματα): %s (%sm μακÏιά)" -#: perllib/FixMyStreet/Cobrand/Default.pm:434 -#: perllib/FixMyStreet/Cobrand/Default.pm:474 +#: perllib/FixMyStreet/Cobrand/Default.pm:455 +#: perllib/FixMyStreet/Cobrand/Default.pm:495 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "Η οδός που βÏίσκεται πλησιÎστεÏα στην καÏφίτσα που τοποθετήθηκε στον χάÏτη (παÏÎχεται αυτόματα από το Bing Maps): %s" -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:267 +#: perllib/FixMyStreet/Script/Alerts.pm:290 msgid "" "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n" "\n" @@ -1666,14 +1582,9 @@ msgstr "" "Η οδός που βÏίσκεται πλησιÎστεÏα στην καÏφίτσα που τοποθετήθηκε στον χάÏτη (παÏÎχεται αυτόματα από το Bing Maps): %s\n" "\n" -#: templates/web/zurich/email_sent.html:5 -msgid "Nearly Done! Now check your email..." -msgstr "Σχεδόν τελειώσαμε! ΤώÏα Îλεγξε το email σου..." - #: templates/web/base/auth/token.html:17 templates/web/base/email_sent.html:5 -#, fuzzy msgid "Nearly done! Now check your email…" -msgstr "Σχεδόν τελειώσαμε! ΤώÏα Îλεγξε το email σου..." +msgstr "" #: templates/web/base/reports/index.html:21 msgid "New <br>problems" @@ -1697,9 +1608,8 @@ msgid "New local problems on FixMyStreet" msgstr "ÎÎα τοπικά Ï€Ïοβλήματα στο FixMyStreet" #: templates/web/zurich/admin/report_edit-sdm.html:117 -#, fuzzy msgid "New note to DM:" -msgstr "ÎÎα εσωτεÏική σημείωση:" +msgstr "" #: db/alert_types.pl:38 msgid "New problems for {{COUNCIL}} within {{WARD}} ward on FixMyStreet" @@ -1731,9 +1641,8 @@ msgstr "ÎÎα κατάσταση" #: templates/web/zurich/admin/template_edit.html:9 #: templates/web/zurich/admin/templates.html:26 -#, fuzzy msgid "New template" -msgstr "ÎÎα κατάσταση" +msgstr "" #: templates/web/base/pagination.html:13 msgid "Next" @@ -1750,8 +1659,8 @@ msgstr "Επόμενο" #: templates/web/base/admin/report_edit.html:75 #: templates/web/base/admin/update_edit.html:25 #: templates/web/base/questionnaire/creator_fixed.html:16 +#: templates/web/base/questionnaire/index.html:101 #: templates/web/base/questionnaire/index.html:53 -#: templates/web/base/questionnaire/index.html:92 msgid "No" msgstr "Όχι" @@ -1818,10 +1727,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:13 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:33 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:31 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:37 msgid "Not Responsible" msgstr "Δεν είναι ΥπεÏθυνος" @@ -1829,9 +1736,8 @@ msgstr "Δεν είναι ΥπεÏθυνος" #: perllib/FixMyStreet/Cobrand/Zurich.pm:937 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:13 -#, fuzzy msgid "Not contactable" -msgstr "Δεν είναι ΥπεÏθυνος" +msgstr "" #: templates/web/zurich/admin/report_edit-sdm.html:108 msgid "Not for my subdivision" @@ -1861,7 +1767,7 @@ msgstr "Όταν συμπεÏιλαμβάνουμε ανεπιβεβαίωτες msgid "Note:" msgstr "Σημείωση:" -#: templates/web/base/open311/index.html:73 +#: templates/web/base/open311/index.html:65 msgid "Note: <strong>%s</strong>" msgstr "Σημείωση: <strong>%s</strong>" @@ -1869,13 +1775,15 @@ msgstr "Σημείωση: <strong>%s</strong>" msgid "Notes from SDM to DM" msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:113 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:10 +#: templates/web/base/report/new/form_user_loggedout.html:14 +#: templates/web/base/report/new/form_user_loggedout.html:2 +#: templates/web/base/report/new/oauth_email_form.html:17 msgid "Now to submit your report…" msgstr "ΤώÏα, για να υποβάλεις την αναφοÏά σου…" -#: templates/web/base/report/update-form.html:86 -#: templates/web/fixmystreet/report/update-form.html:85 +#: templates/web/base/report/update-form.html:28 +#: templates/web/base/report/update/form_user_loggedout.html:13 +#: templates/web/base/report/update/form_user_loggedout.html:2 msgid "Now to submit your update…" msgstr "ΤώÏα, για να υποβάλεις την ενημÎÏωσή σου…" @@ -1883,11 +1791,6 @@ msgstr "ΤώÏα, για να υποβάλεις την ενημÎÏωσή ÏƒÎ¿Ï msgid "OK" msgstr "ΟΚ" -#: templates/web/base/report/display.html:28 -#: templates/web/base/report/update.html:17 -msgid "Offensive? Unsuitable? Tell us" -msgstr "Î Ïοσβλητικό; Ακατάλληλο; Πες μας" - #: templates/web/base/reports/index.html:23 msgid "Old / unknown <br>problems" msgstr "Παλιά / άγνωστα <br>Ï€Ïοβλήματα" @@ -1904,7 +1807,7 @@ msgstr "Παλιά <br>διοÏθωμÎνα" msgid "Older <br>problems" msgstr "Παλιά <br>Ï€Ïοβλήματα" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:45 +#: templates/web/base/report/new/form_report.html:15 msgid "One-line summary" msgstr "ΠεÏίληψη μιας γÏαμμής" @@ -1915,8 +1818,7 @@ msgstr "ΠεÏίληψη μιας γÏαμμής" #: templates/web/base/admin/report_blocks.html:4 #: templates/web/base/admin/update_edit.html:28 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/report/update-form.html:30 -#: templates/web/fixmystreet/report/update-form.html:28 +#: templates/web/base/report/update/form_update.html:34 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:7 #: templates/web/zurich/admin/update_edit.html:18 @@ -1931,15 +1833,15 @@ msgstr "Ανοιχτό για πάνω από Ï„ÎσσεÏις ÎµÎ²Î´Î¿Î¼Î¬Î´ÎµÏ msgid "Open, but not had any update in eight weeks" msgstr "Ανοιχτό, αλλά δεν Îγινε κάποια ενημÎÏωση εδώ και οκτώ εβδομάδες" -#: templates/web/base/open311/index.html:70 +#: templates/web/base/open311/index.html:62 msgid "Open311 API for the mySociety FixMyStreet server" msgstr "Open311 API για τον server του mySociety FixMyStreet" -#: templates/web/base/open311/index.html:80 +#: templates/web/base/open311/index.html:72 msgid "Open311 initiative web page" msgstr "ΑÏχική σελίδα του Open311" -#: templates/web/base/open311/index.html:81 +#: templates/web/base/open311/index.html:73 msgid "Open311 specification" msgstr "Î ÏοδιαγÏαφÎÏ‚ Open311" @@ -1951,15 +1853,15 @@ msgstr "Ή Ï€Ïοβλήματα που αναφÎÏθηκαν σε:" msgid "Or you can subscribe to an alert based upon what ward or council you’re in:" msgstr "Ή μποÏείς να λαμβάνεις ειδοποιήσεις που αφοÏοÏν μία συγκεκÏιμÎνη υπηÏεσία της πεÏιοχής:" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1084 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:673 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:674 -#: perllib/FixMyStreet/DB/Result/Problem.pm:570 -#: perllib/FixMyStreet/DB/Result/Problem.pm:580 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1055 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:669 +#: perllib/FixMyStreet/DB/Result/Problem.pm:558 +#: perllib/FixMyStreet/DB/Result/Problem.pm:568 +#: perllib/FixMyStreet/DB/Result/Problem.pm:578 #: perllib/FixMyStreet/DB/Result/Problem.pm:590 -#: perllib/FixMyStreet/DB/Result/Problem.pm:602 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:397 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:412 +#: perllib/FixMyStreet/Script/Reports.pm:175 +#: perllib/FixMyStreet/Script/Reports.pm:190 msgid "Other" msgstr "Άλλα" @@ -1968,7 +1870,7 @@ msgid "Owner" msgstr "Ιδιοκτήτης" #: templates/web/base/errors/page_error_404_not_found.html:1 -#: templates/web/base/errors/page_error_404_not_found.html:3 +#: templates/web/base/errors/page_error_404_not_found.html:4 msgid "Page Not Found" msgstr "Η σελίδα δεν βÏÎθηκε" @@ -1982,16 +1884,16 @@ msgstr "Πηγή" msgid "Partial" msgstr "Εν μÎÏει" -#: templates/web/base/auth/general.html:53 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:68 -#: templates/web/fixmystreet/report/update-form.html:116 +#: templates/web/base/auth/general.html:92 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:31 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:6 #: templates/web/zurich/auth/general.html:32 #: templates/web/zurich/auth/general.html:63 msgid "Password (optional)" msgstr "Κωδικός Ï€Ïόσβασης (Ï€ÏοαιÏετικό)" #: templates/web/base/auth/change_password.html:25 -#: templates/web/base/auth/general.html:36 +#: templates/web/base/auth/general.html:72 msgid "Password:" msgstr "ÎÎος κωδικός Ï€Ïόσβασης:" @@ -2003,45 +1905,37 @@ msgstr "ΣÏνδεσμος" msgid "Phone number" msgstr "ΑÏιθμός τηλεφώνου" -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:26 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:62 +#: templates/web/base/report/new/form_user_loggedin.html:26 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:25 msgid "Phone number (optional)" msgstr "ΑÏιθμός τηλεφώνου (Ï€ÏοαιÏετικό)" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:306 +#: perllib/FixMyStreet/Script/Reports.pm:83 #: templates/web/base/admin/report_edit.html:63 -#: templates/web/base/report/new/fill_in_details_form.html:198 #: templates/web/zurich/admin/stats.html:39 msgid "Phone:" msgstr "ΤηλÎφωνο:" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:66 -#: templates/web/fixmystreet/report/update-form.html:59 +#: templates/web/base/questionnaire/index.html:75 +#: templates/web/base/report/new/form_report.html:23 +#: templates/web/base/report/update/form_update.html:6 #: templates/web/zurich/admin/index-dm.html:29 #: templates/web/zurich/admin/index-sdm.html:24 #: templates/web/zurich/admin/reports.html:16 #: templates/web/zurich/admin/stats.html:37 -#: templates/web/zurich/report/new/fill_in_details_form.html:52 +#: templates/web/zurich/report/new/fill_in_details_form.html:45 msgid "Photo" msgstr "ΦωτογÏαφία" -#: perllib/FixMyStreet/App/Controller/Photo.pm:221 -#, fuzzy +#: perllib/FixMyStreet/App/Controller/Photo.pm:187 msgid "Photo is required." -msgstr "Αυτή η πληÏοφοÏία απαιτείται" +msgstr "" #: templates/web/base/admin/category_edit.html:48 -#, fuzzy msgid "Photo required" -msgstr "Αυτή η πληÏοφοÏία απαιτείται" - -#: templates/web/base/questionnaire/index.html:80 -#: templates/web/base/report/new/fill_in_details_form.html:84 -#: templates/web/base/report/update-form.html:62 -msgid "Photo:" -msgstr "ΦωτογÏαφία:" +msgstr "" -#: templates/web/base/alert/list.html:26 +#: templates/web/base/alert/list.html:23 msgid "Photos of recent nearby reports" msgstr "ΦωτογÏαφίες από κοντινÎÏ‚ και Ï€Ïόσφατες αναφοÏÎÏ‚" @@ -2070,20 +1964,16 @@ msgstr "ΠαÏακαλοÏμε να είσαι ευγενικός, συνοπτΠmsgid "Please check the passwords and try again" msgstr "ΠαÏακαλοÏμε Îλεγξε τους κωδικοÏÏ‚ Ï€Ïόσβασης και Ï€Ïοσπάθησε πάλι." -#: templates/web/zurich/auth/token.html:16 -msgid "Please check your email" -msgstr "ΠαÏακαλοÏμε Îλεγξε το email σου" - -#: templates/web/base/auth/general.html:10 -#: templates/web/base/auth/general.html:16 +#: templates/web/base/auth/general.html:27 +#: templates/web/base/auth/general.html:33 #: templates/web/zurich/auth/general.html:3 #: templates/web/zurich/auth/general.html:9 msgid "Please check your email address is correct" msgstr "ΠαÏακαλοÏμε Îλεγξε αν η διεÏθυνση email είναι σωστή" #: perllib/FixMyStreet/App/Controller/Admin.pm:343 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:883 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:948 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:878 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:943 #: perllib/FixMyStreet/DB/Result/Problem.pm:412 #: templates/web/base/js/translation_strings.html:9 msgid "Please choose a category" @@ -2097,25 +1987,29 @@ msgstr "ΠαÏακαλοÏμε επίλεξε Îνα είδος ακινήτου msgid "Please correct the errors below" msgstr "ΠαÏακαλοÏμε διόÏθωσε τα παÏακάτω λάθη" -#: templates/web/base/contact/blurb.html:2 -#: templates/web/fixmystreet/contact/blurb.html:12 -#, fuzzy +#: templates/web/base/contact/blurb.html:12 msgid "" "Please do <strong>not</strong> report problems through this form; messages go to\n" "the team behind this site, not a council. To report a problem,\n" "please <a href=\"/\">go to the front page</a> and follow the instructions." -msgstr "ΠαÏακαλοÏμε <strong>μην</strong> αναφÎÏεις Ï€Ïοβλήματα μÎσω αυτής της φόÏμας. Τα μηνÏματα πηγαίνουν απευθείας στην ομάδα που βÏίσκεται πίσω από το FixMyStreet, όχι σε κάποια υπηÏεσία. Για να αναφÎÏεις Îνα Ï€Ïόβλημα, παÏακαλοÏμε <a href=\"/\">πήγαινε στην αÏχική σελίδα</a> και ακολοÏθησε τις οδηγίες." +msgstr "" #: templates/web/base/report/new/notes.html:6 msgid "Please do not be abusive — abusing your council devalues the service for all users." msgstr "ΠαÏακαλοÏμε να μην κάνεις κατάχÏηση — η κατάχÏηση της υπηÏεσίας υποβαθμίζει την αξία της για όλους τους χÏήστες." #: perllib/FixMyStreet/App/Controller/Admin.pm:346 -#: perllib/FixMyStreet/DB/Result/Comment.pm:126 +#: perllib/FixMyStreet/DB/Result/Comment.pm:125 #: templates/web/base/js/translation_strings.html:2 msgid "Please enter a message" msgstr "ΠαÏακαλοÏμε γÏάψε Îνα μήνυμα" +#: perllib/FixMyStreet/App/Controller/Admin.pm:1091 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1146 +#, fuzzy +msgid "Please enter a name" +msgstr "ΠαÏακαλοÏμε γÏάψε το όνομά σου" + #: templates/web/base/auth/change_password.html:12 #: templates/web/base/auth/change_password.html:15 #: templates/web/base/js/translation_strings.html:19 @@ -2128,10 +2022,10 @@ msgstr "ΠαÏακαλοÏμε γÏάψε Îναν κωδικό Ï€Ïόσβαση msgid "Please enter a subject" msgstr "ΠαÏακαλοÏμε γÏάψε Îνα θÎμα" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1084 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1137 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1087 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1142 #: perllib/FixMyStreet/App/Controller/Admin.pm:345 -#: perllib/FixMyStreet/DB/Result/User.pm:127 +#: perllib/FixMyStreet/DB/Result/User.pm:133 #: templates/web/base/js/translation_strings.html:12 #: templates/web/base/js/translation_strings.html:16 msgid "Please enter a valid email" @@ -2148,9 +2042,9 @@ msgid "Please enter some details" msgstr "ΠαÏακαλοÏμε γÏάψε μεÏικÎÏ‚ λεπτομÎÏειες" #: perllib/FixMyStreet/App/Controller/Contact.pm:113 -#: perllib/FixMyStreet/DB/Result/User.pm:124 -#: templates/web/base/auth/general.html:10 -#: templates/web/base/auth/general.html:15 +#: perllib/FixMyStreet/DB/Result/User.pm:130 +#: templates/web/base/auth/general.html:27 +#: templates/web/base/auth/general.html:32 #: templates/web/base/js/translation_strings.html:11 #: templates/web/base/js/translation_strings.html:15 #: templates/web/zurich/auth/general.html:3 @@ -2158,7 +2052,7 @@ msgstr "ΠαÏακαλοÏμε γÏάψε μεÏικÎÏ‚ λεπτομÎÏÎµÎ¹ÎµÏ msgid "Please enter your email" msgstr "ΠαÏακαλοÏμε γÏάψε το email σου" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:7 +#: templates/web/base/report/new/form_user_loggedout_email.html:7 #: templates/web/zurich/report/new/fill_in_details_form.html:80 msgid "Please enter your email address" msgstr "ΠαÏακαλοÏμε γÏάψε τη διεÏθυνση email σου" @@ -2167,15 +2061,15 @@ msgstr "ΠαÏακαλοÏμε γÏάψε τη διεÏθυνση email σου" msgid "Please enter your first name" msgstr "ΠαÏακαλοÏμε γÏάψε το όνομά σου" -#: perllib/FixMyStreet/Cobrand/UK.pm:318 +#: perllib/FixMyStreet/Cobrand/UK.pm:319 #: templates/web/base/js/translation_strings.html:7 msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below" msgstr "ΠαÏακαλοÏμε γÏάψε το ονοματεπώνυμό σου, οι υπηÏεσίες χÏειάζονται αυτή την πληÏοφοÏία – αν δεν επιθυμείς να εμφανίζεται το όνομά σου στην ιστοσελίδα, ξετσÎκαÏε το πεδίο παÏακάτω" #: perllib/FixMyStreet/App/Controller/Contact.pm:112 -#: perllib/FixMyStreet/DB/Result/Comment.pm:123 +#: perllib/FixMyStreet/DB/Result/Comment.pm:122 #: perllib/FixMyStreet/DB/Result/Problem.pm:406 -#: perllib/FixMyStreet/DB/Result/User.pm:120 +#: perllib/FixMyStreet/DB/Result/User.pm:126 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter your name" msgstr "ΠαÏακαλοÏμε γÏάψε το όνομά σου" @@ -2202,12 +2096,11 @@ msgstr "Μη διστάσεις να <a href=\"%s\">συνδεθείς ξανά< msgid "Please fill in details of the problem below." msgstr "ΠαÏακαλοÏμε συμπλήÏωσε τις λεπτομÎÏειες του Ï€Ïοβλήματος παÏακάτω." -#: templates/web/zurich/report/new/fill_in_details_form.html:46 +#: templates/web/zurich/report/new/fill_in_details_form.html:72 msgid "Please fill in details of the problem." msgstr "ΠαÏακαλοÏμε συμπλήÏωσε τις λεπτομÎÏειες του Ï€Ïοβλήματος." -#: templates/web/base/report/new/fill_in_details_form.html:28 -#: templates/web/fixmystreet/report/new/sidebar.html:7 +#: templates/web/base/report/new/sidebar.html:7 #: templates/web/zurich/report/new/fill_in_details_form.html:20 msgid "Please fill in the form below with details of the problem, and describe the location as precisely as possible in the details box." msgstr "ΠαÏακαλοÏμε συμπλήÏωσε την παÏακάτω φόÏμα με τις λεπτομÎÏειες του Ï€Ïοβλήματος, και πεÏίγÏαψε την τοποθεσία όσο ακÏιβÎστεÏα γίνεται στο πεδίο με τις λεπτομÎÏειες." @@ -2216,20 +2109,24 @@ msgstr "ΠαÏακαλοÏμε συμπλήÏωσε την παÏακάτω φό msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "ΠαÏακαλοÏμε σήμανε αν θα ήθελες να λάβεις άλλο εÏωτηματολόγιο" -#: templates/web/fixmystreet/report/updates-sidebar-notes.html:4 +#: templates/web/base/report/updates-sidebar-notes.html:2 msgid "Please note that updates are not sent to the council." msgstr "ΠαÏακαλοÏμε σημείωσε ότι οι ενημεÏώσεις δεν στÎλνονται στην υπηÏεσία." -#: templates/web/base/report/update-form.html:7 -msgid "Please note that updates are not sent to the council. If you leave your name it will be public. Your information will only be used in accordance with our <a href=\"/faq#privacy\">privacy policy</a>" -msgstr "ΠαÏακαλοÏμε σημείωσε ότι οι ενημεÏώσεις δεν στÎλνονται στην υπηÏεσία. Αν αφήσεις το όνομά σου θα είναι δημόσιο. Οι πληÏοφοÏίες θα χÏησιμοποιηθοÏν μόνο σÏμφωνα με την <a href=\"/faq#privacy\">πολιτική αποÏÏήτου</a>" +#: templates/web/base/report/new/oauth_email_form.html:4 +#, fuzzy +msgid "Please note your report has <strong>not yet been sent</strong>." +msgstr "ΠαÏακαλοÏμε σημείωσε ότι η αναφοÏά σου <strong>δεν Îχει αποσταλεί ακόμη</strong>. Επίλεξε μια κατηγοÏία και Î±Ï†Î¿Ï Ï€ÏοσθÎσεις πεÏαιτÎÏω πληÏοφοÏίες παÏακάτω, κάνε υποβολή." -#: templates/web/base/report/new/fill_in_details_form.html:8 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:21 +#: templates/web/base/report/new/fill_in_details_form.html:20 #: templates/web/zurich/report/new/fill_in_details_form.html:11 msgid "Please note your report has <strong>not yet been sent</strong>. Choose a category and add further information below, then submit." msgstr "ΠαÏακαλοÏμε σημείωσε ότι η αναφοÏά σου <strong>δεν Îχει αποσταλεί ακόμη</strong>. Επίλεξε μια κατηγοÏία και Î±Ï†Î¿Ï Ï€ÏοσθÎσεις πεÏαιτÎÏω πληÏοφοÏίες παÏακάτω, κάνε υποβολή." +#: templates/web/base/report/display.html:26 +msgid "Please note your update has <strong>not yet been posted</strong>." +msgstr "" + #: templates/web/base/report/new/notes.html:1 #: templates/web/zurich/report/new/notes.html:1 msgid "Please note:" @@ -2249,9 +2146,8 @@ msgid "Please say whether you've ever reported a problem to your council before" msgstr "ΠαÏακαλοÏμε πες αν Îχεις ξαναναφÎÏει Îνα Ï€Ïόβλημα στην υπηÏεσία στο παÏελθόν" #: templates/web/zurich/admin/report_edit.html:208 -#, fuzzy msgid "Please select a body." -msgstr "Επίλεξε Îνα σώμα" +msgstr "" #: perllib/FixMyStreet/App/Controller/Alert.pm:80 msgid "Please select the feed you want" @@ -2268,6 +2164,7 @@ msgstr "ΠαÏακαλοÏμε δήλωσε αν το Ï€Ïόβλημα Îχει #: perllib/FixMyStreet/App/Model/PhotoSet.pm:117 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:145 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:147 +#: templates/web/base/js/translation_strings.html:53 msgid "Please upload a JPEG image only" msgstr "ΠαÏακαλοÏμε ανÎβασε μία εικόνα JPEG μόνο" @@ -2275,18 +2172,14 @@ msgstr "ΠαÏακαλοÏμε ανÎβασε μία εικόνα JPEG μόνο" msgid "Please write a message" msgstr "ΠαÏακαλοÏμε γÏάψε Îνα μήνυμα" -#: templates/web/fixmystreet/report/update-form.html:23 +#: templates/web/base/report/update/form_update.html:29 msgid "Please write your update here" msgstr "ΠαÏακαλοÏμε γÏάψε την ενημÎÏωσή σου εδώ" -#: templates/web/base/contact/index.html:100 -#: templates/web/base/report/update-form.html:110 -#: templates/web/base/report/update-form.html:132 -#: templates/web/base/report/update-form.html:72 -#: templates/web/fixmystreet/contact/index.html:113 -#: templates/web/fixmystreet/report/update-form.html:124 -#: templates/web/fixmystreet/report/update-form.html:71 -#: templates/web/fixmystreet/report/update-form.html:97 +#: templates/web/base/contact/index.html:105 +#: templates/web/base/report/update-form.html:24 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:14 +#: templates/web/base/report/update/form_user_loggedout_password.html:10 msgid "Post" msgstr "Δημοσίευση" @@ -2314,12 +2207,9 @@ msgstr "Î ÏοηγοÏμενα" msgid "Privacy" msgstr "Ιδιωτικότητα" -#: templates/web/base/faq/faq-en-gb.html:7 -#: templates/web/base/open311/index.html:7 -#: templates/web/base/static/privacy.html:1 -#: templates/web/base/static/privacy.html:2 -#: templates/web/base/static/privacy.html:9 -#: templates/web/fixmystreet/contact/index.html:11 +#: templates/web/base/about/_sidebar.html:5 +#: templates/web/base/about/privacy.html:1 +#: templates/web/base/about/privacy.html:2 msgid "Privacy and cookies" msgstr "" @@ -2347,12 +2237,12 @@ msgstr "Το Ï€Ïόβλημα %s επιβεβαιώθηκε" msgid "Problem %s sent to council %s" msgstr "Το Ï€Ïόβλημα %s στάλθηκε στην υπηÏεσία %s" -#: templates/web/base/admin/index.html:46 +#: templates/web/base/admin/index.html:39 #: templates/web/zurich/admin/index.html:9 msgid "Problem breakdown by state" msgstr "Ανάλυση Ï€Ïοβλήματος ανά κατάσταση" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1055 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1058 msgid "Problem marked as open." msgstr "Το Ï€Ïόβλημα επισημάνθηκε ως ανοιχτό." @@ -2368,11 +2258,11 @@ msgstr "Î Ïοβλήματα" msgid "Problems in this area" msgstr "Î Ïοβλήματα στην πεÏιοχή" -#: templates/web/fixmystreet/report/display.html:43 +#: templates/web/base/report/display_tools.html:19 msgid "Problems nearby" msgstr "Κοντινά Ï€Ïοβλήματα" -#: templates/web/fixmystreet/report/display.html:41 +#: templates/web/base/report/display_tools.html:17 msgid "Problems on the map" msgstr "Î Ïοβλήματα στον χάÏτη" @@ -2384,24 +2274,23 @@ msgstr "Î Ïοσφάτως αναφεÏθÎντα Ï€Ïοβλήματα διοÏÎ msgid "Problems within %.1fkm of this location" msgstr "Λήψη ειδοποιήσεων για Ï€Ïοβλήματα σε ακτίνα %.1f χλμ από εδώ" -#: perllib/FixMyStreet/Cobrand/Default.pm:642 +#: perllib/FixMyStreet/Cobrand/Default.pm:663 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:120 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:139 -#: perllib/FixMyStreet/Cobrand/UK.pm:207 +#: perllib/FixMyStreet/Cobrand/UK.pm:208 msgid "Problems within %s" msgstr "Î Ïοβλήματα στο "%s"" #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:128 -#: perllib/FixMyStreet/Cobrand/UK.pm:221 +#: perllib/FixMyStreet/Cobrand/UK.pm:222 msgid "Problems within %s ward" msgstr "Î Ïοβλήματα στην πεÏιοχή "%s"" #. ("First %s is the body name, second %s the site name") #: templates/web/base/reports/body.html:0 #: templates/web/base/reports/body.html:24 -#, fuzzy msgid "Problems within %s, %s" -msgstr "Î Ïοβλήματα στο "%s"" +msgstr "" #: templates/web/base/alert/_list.html:42 msgid "Problems within the boundary of:" @@ -2415,19 +2304,16 @@ msgstr "ΔιεÏθυνση ακινήτου:" msgid "Property type:" msgstr "Είδος ακινήτου:" -#: templates/web/base/report/update-form.html:3 -#: templates/web/fixmystreet/report/update-form.html:4 +#: templates/web/base/report/update-form.html:6 msgid "Provide an update" msgstr "Δώσε μια ενημÎÏωση" -#: templates/web/base/auth/general.html:56 +#: templates/web/base/auth/general.html:95 msgid "Providing a name and password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." msgstr "Η εισαγωγή ονόματος και ÎºÏ‰Î´Î¹ÎºÎ¿Ï Ï€Ïόσβασης είναι Ï€ÏοαιÏετική, αλλά Îτσι θα σου είναι ευκολότεÏο να αναφÎÏεις Ï€Ïοβλήματα, να αφήνεις ενημεÏώσεις και να διαχειÏίζεσαι τις αναφοÏÎÏ‚ σου." -#: templates/web/base/report/new/fill_in_details_form.html:156 -#: templates/web/base/report/update-form.html:129 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:71 -#: templates/web/fixmystreet/report/update-form.html:119 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:34 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:9 msgid "Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." msgstr "Η εισαγωγή ÎºÏ‰Î´Î¹ÎºÎ¿Ï Ï€Ïόσβασης είναι Ï€ÏοαιÏετική, αλλά Îτσι θα σου είναι ευκολότεÏο να αναφÎÏεις Ï€Ïοβλήματα, να αφήνεις ενημεÏώσεις και να διαχειÏίζεσαι τις αναφοÏÎÏ‚ σου." @@ -2463,18 +2349,17 @@ msgstr "Το εÏωτηματολόγιο συμπληÏώθηκε από τον #: templates/web/base/alert/_list.html:22 #: templates/web/base/around/display_location.html:1 #: templates/web/base/around/display_location.html:3 -#: templates/web/base/report/display.html:50 +#: templates/web/base/report/display_tools.html:34 #: templates/web/base/reports/_rss.html:1 #: templates/web/fixmystreet/alert/updates.html:9 -#: templates/web/fixmystreet/report/display.html:58 msgid "RSS feed" msgstr "Ροή RSS" -#: perllib/FixMyStreet/Cobrand/UK.pm:250 perllib/FixMyStreet/Cobrand/UK.pm:262 +#: perllib/FixMyStreet/Cobrand/UK.pm:251 perllib/FixMyStreet/Cobrand/UK.pm:263 msgid "RSS feed for %s" msgstr "Ροή RSS για "%s"" -#: perllib/FixMyStreet/Cobrand/UK.pm:256 perllib/FixMyStreet/Cobrand/UK.pm:268 +#: perllib/FixMyStreet/Cobrand/UK.pm:257 perllib/FixMyStreet/Cobrand/UK.pm:269 msgid "RSS feed for %s ward, %s" msgstr "Ροή RSS για την πεÏιοχή %s, %s" @@ -2482,11 +2367,11 @@ msgstr "Ροή RSS για την πεÏιοχή %s, %s" #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:163 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:173 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:181 -#: perllib/FixMyStreet/Cobrand/UK.pm:276 perllib/FixMyStreet/Cobrand/UK.pm:288 +#: perllib/FixMyStreet/Cobrand/UK.pm:277 perllib/FixMyStreet/Cobrand/UK.pm:289 msgid "RSS feed of %s" msgstr "Ροή RSS από %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:281 perllib/FixMyStreet/Cobrand/UK.pm:293 +#: perllib/FixMyStreet/Cobrand/UK.pm:282 perllib/FixMyStreet/Cobrand/UK.pm:294 msgid "RSS feed of %s, within %s ward" msgstr "Ροή RSS από %s, στην πεÏιοχή "%s"" @@ -2498,15 +2383,15 @@ msgstr "Ροή RSS για κοντινά Ï€Ïοβλήματα" msgid "RSS feed of problems in this %s" msgstr "Ροή RSS για Ï€Ïοβλήματα σε αυτό το "%s"" -#: perllib/FixMyStreet/Cobrand/Default.pm:643 +#: perllib/FixMyStreet/Cobrand/Default.pm:664 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:121 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:138 -#: perllib/FixMyStreet/Cobrand/UK.pm:214 +#: perllib/FixMyStreet/Cobrand/UK.pm:215 msgid "RSS feed of problems within %s" msgstr "Ροή RSS για Ï€Ïοβλήματα στο "%s"" #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:127 -#: perllib/FixMyStreet/Cobrand/UK.pm:220 +#: perllib/FixMyStreet/Cobrand/UK.pm:221 msgid "RSS feed of problems within %s ward" msgstr "Ροή RSS για Ï€Ïοβλήματα στην πεÏιοχή "%s"" @@ -2515,25 +2400,22 @@ msgstr "Ροή RSS για Ï€Ïοβλήματα στην πεÏιοχή "%s& msgid "RSS feed of recent local problems" msgstr "Ροή RSS για Ï€Ïόσφατα τοπικά Ï€Ïοβλήματα" -#: templates/web/base/report/display.html:50 +#: templates/web/base/report/display_tools.html:34 #: templates/web/fixmystreet/alert/updates.html:9 -#: templates/web/fixmystreet/report/display.html:58 msgid "RSS feed of updates to this problem" msgstr "Ροή RSS για ενημεÏώσεις σε αυτό το Ï€Ïόβλημα" #: templates/web/base/alert/updates.html:9 -#: templates/web/base/report/display.html:41 +#: templates/web/base/report/display_tools.html:36 #: templates/web/fixmystreet/alert/updates.html:14 -#: templates/web/fixmystreet/report/display.html:60 msgid "Receive email when updates are left on this problem." msgstr "Λήψη email όταν γίνονται ενημεÏώσεις για αυτό το Ï€Ïόβλημα" #. ("%s is the site name") #: templates/web/base/around/display_location.html:0 #: templates/web/base/around/display_location.html:33 -#, fuzzy msgid "Recent local problems, %s" -msgstr "Î Ïόσφατα τοπικά Ï€Ïοβλήματα, FixMyStreet" +msgstr "" #: templates/web/base/reports/index.html:24 msgid "Recently <br>fixed" @@ -2551,16 +2433,15 @@ msgstr "Θυμήσου ότι το FixMyStreet Îχει ως Ï€ÏωταÏÏ‡Î¹ÎºÏ msgid "Remove flag" msgstr "ΑφαίÏεση σήμανσης" -#: templates/web/base/admin/report_edit.html:92 -#: templates/web/base/admin/update_edit.html:62 +#: templates/web/base/admin/report_edit.html:93 +#: templates/web/base/admin/update_edit.html:67 #: templates/web/zurich/admin/update_edit.html:35 msgid "Remove photo (can't be undone!)" msgstr "ΑφαίÏεση φωτογÏαφίας (δεν αναιÏείται!)" #: templates/web/zurich/admin/report_edit.html:243 -#, fuzzy msgid "Reply to user:" -msgstr "επεξεÏγασία χÏήστη" +msgstr "" #: templates/web/fixmystreet/header_logo.html:2 msgid "Report" @@ -2573,7 +2454,7 @@ msgstr "ΑναφοÏά" msgid "Report a problem" msgstr "ΑναφοÏά Ï€Ïοβλήματος" -#: templates/web/fixmystreet/report/display.html:32 +#: templates/web/base/report/display_tools.html:8 msgid "Report abuse" msgstr "ΑναφοÏά κατάχÏησης" @@ -2582,7 +2463,8 @@ msgid "Report on %s" msgstr "ΑναφοÏά στο "%s"" #: templates/web/base/report/new/fill_in_details_form.html:1 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:2 +#: templates/web/base/report/new/login_success_form.html:1 +#: templates/web/base/report/new/oauth_email_form.html:1 msgid "Report your problem" msgstr "ΑνάφεÏε το Ï€Ïόβλημά σου" @@ -2591,9 +2473,8 @@ msgstr "ΑνάφεÏε το Ï€Ïόβλημά σου" msgid "Report, view, or discuss local problems" msgstr "ΑνάφεÏε, δες ή συζήτησε τα τοπικά Ï€Ïοβλήματα" -#: perllib/FixMyStreet/DB/Result/Problem.pm:585 -#: templates/web/base/contact/index.html:50 -#: templates/web/fixmystreet/contact/index.html:65 +#: perllib/FixMyStreet/DB/Result/Problem.pm:573 +#: templates/web/base/contact/index.html:57 msgid "Reported anonymously at %s" msgstr "ΑναφÎÏθηκε ανώνυμα στις %s" @@ -2602,43 +2483,41 @@ msgstr "ΑναφÎÏθηκε ανώνυμα στις %s" msgid "Reported before" msgstr "ΑναφÎÏθηκε Ï€ÏοηγουμÎνως" -#: perllib/FixMyStreet/DB/Result/Problem.pm:608 -#: templates/web/base/contact/index.html:52 -#: templates/web/fixmystreet/contact/index.html:67 +#: perllib/FixMyStreet/DB/Result/Problem.pm:596 +#: templates/web/base/contact/index.html:59 msgid "Reported by %s at %s" msgstr "ΑναφÎÏθηκε από %s στις %s" #: templates/web/zurich/admin/report_edit-sdm.html:58 #: templates/web/zurich/admin/report_edit.html:86 -#, fuzzy msgid "Reported by:" -msgstr "ΑναφÎÏθηκε %s" +msgstr "" #: templates/web/zurich/report/_main.html:2 msgid "Reported in the %s category" msgstr "ΑναφÎÏθηκε στην κατηγοÏία %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:581 +#: perllib/FixMyStreet/DB/Result/Problem.pm:569 msgid "Reported in the %s category anonymously at %s" msgstr "ΑναφÎÏθηκε στην κατηγοÏία %s, ανώνυμα στις %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:603 +#: perllib/FixMyStreet/DB/Result/Problem.pm:591 msgid "Reported in the %s category by %s at %s" msgstr "ΑναφÎÏθηκε στην κατηγοÏία %s από τον %s στις %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:577 +#: perllib/FixMyStreet/DB/Result/Problem.pm:565 msgid "Reported via %s anonymously at %s" msgstr "ΑναφÎÏθηκε μÎσω %s ανώνυμα στις %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:599 +#: perllib/FixMyStreet/DB/Result/Problem.pm:587 msgid "Reported via %s by %s at %s" msgstr "ΑναφÎÏθηκε μÎσω %s από τον %s στις %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:573 +#: perllib/FixMyStreet/DB/Result/Problem.pm:561 msgid "Reported via %s in the %s category anonymously at %s" msgstr "ΑναφÎÏθηκε μÎσω %s στην κατηγοÏία %s ανώνυμα στις %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:593 +#: perllib/FixMyStreet/DB/Result/Problem.pm:581 msgid "Reported via %s in the %s category by %s at %s" msgstr "ΑναφÎÏθηκε μÎσω %s στην κατηγοÏία %s από τον %s στις %s" @@ -2648,9 +2527,8 @@ msgstr "ΑναφÎÏθηκε μÎσα στις τελευταίες Ï„ÎÏƒÏƒÎµÏ #: templates/web/zurich/admin/report_edit-sdm.html:36 #: templates/web/zurich/admin/report_edit.html:55 -#, fuzzy msgid "Reported:" -msgstr "ΑναφÎÏθηκε %s" +msgstr "" #: templates/web/base/around/index.html:2 #: templates/web/base/js/translation_strings.html:41 @@ -2660,13 +2538,13 @@ msgstr "ΑναφÎÏθηκε %s" msgid "Reporting a problem" msgstr "ΑναφοÏά Ï€Ïοβλήματος" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1277 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1286 #: perllib/FixMyStreet/Cobrand/Zurich.pm:384 #: templates/web/zurich/header.html:60 msgid "Reports" msgstr "ΑναφοÏÎÏ‚" -#: perllib/FixMyStreet/Cobrand/UK.pm:327 perllib/FixMyStreet/Cobrand/UK.pm:331 +#: perllib/FixMyStreet/Cobrand/UK.pm:328 perllib/FixMyStreet/Cobrand/UK.pm:332 msgid "Reports are limited to %s characters in length. Please shorten your report" msgstr "Οι αναφοÏÎÏ‚ Îχουν ÏŒÏιο %s χαÏακτήÏων. ΠαÏακαλοÏμε συντόμευσε την αναφοÏά σου" @@ -2703,15 +2581,17 @@ msgstr "ΧειÏιστής δÏόμου για την ονομασμÎνη Î¿Î´Ï msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "ΧειÏιστής δÏόμου για την ονομασμÎνη οδο (από το OpenStreetMap): %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1495 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1500 -#: templates/web/base/admin/report_edit.html:88 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1508 +#: templates/web/base/admin/report_edit.html:90 +#: templates/web/base/admin/update_edit.html:64 #: templates/web/zurich/admin/report_edit.html:116 msgid "Rotate Left" msgstr "ΠεÏιστÏοφή αÏιστεÏά" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1495 -#: templates/web/base/admin/report_edit.html:89 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 +#: templates/web/base/admin/report_edit.html:91 +#: templates/web/base/admin/update_edit.html:65 #: templates/web/zurich/admin/report_edit.html:117 msgid "Rotate Right" msgstr "ΠεÏιστÏοφή δεξιά" @@ -2721,7 +2601,6 @@ msgid "Rotating this photo will discard unsaved changes to the report." msgstr "" #: templates/web/base/js/translation_strings.html:46 -#: templates/web/base/maps/google-ol.html:13 msgid "Satellite" msgstr "ΔοÏυφόÏος" @@ -2774,16 +2653,14 @@ msgid "Select an area" msgstr "Διάλεξε μια πεÏιοχή" #: templates/web/base/alert/_list.html:10 -#, fuzzy msgid "Select which type of alert you’d like and click the button for an RSS feed, or enter your email address to subscribe to an email alert." -msgstr "Διάλεξε ποιο είδος ειδοποίησης θα Ï€ÏοτιμοÏσες και μετά κάνε κλικ στο κουμπί για να οδηγηθείς σε μία Ïοή RSS, ή γÏάψε τη διεÏθυνση email σου για να ειδοποιείσαι μÎσω email." +msgstr "" #: perllib/FixMyStreet/Cobrand/Zurich.pm:835 -#, fuzzy msgid "Sent report back" -msgstr "ΑνοιχτÎÏ‚ αναφοÏÎÏ‚" +msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:708 +#: perllib/FixMyStreet/DB/Result/Problem.pm:696 msgid "Sent to %s %s later" msgstr "Στάλθηκε στο %s %s αÏγότεÏα" @@ -2796,15 +2673,13 @@ msgstr "Στάλθηκε:" msgid "Service:" msgstr "ΥπηÏεσία:" -#: templates/web/fixmystreet/report/display.html:38 +#: templates/web/base/report/display_tools.html:14 msgid "Share" msgstr "Κοινοποίηση" -#: templates/web/base/report/new/fill_in_details_form.html:193 -#: templates/web/base/report/update-form.html:158 -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:23 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:59 -#: templates/web/fixmystreet/report/update-form.html:146 +#: templates/web/base/report/new/form_user_loggedin.html:23 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:22 +#: templates/web/base/report/update/form_name.html:15 msgid "Show my name publicly" msgstr "Δημόσια Ï€Ïοβολή του ονόματός μου" @@ -2816,9 +2691,9 @@ msgstr "Î Ïοβολή παλαιότεÏων" msgid "Show pins" msgstr "Î Ïοβολή καÏφιτσών" +#: templates/web/base/auth/general.html:100 #: templates/web/base/auth/general.html:3 -#: templates/web/base/auth/general.html:40 -#: templates/web/base/auth/general.html:61 +#: templates/web/base/auth/general.html:76 #: templates/web/zurich/auth/general.html:18 #: templates/web/zurich/auth/general.html:35 msgid "Sign in" @@ -2845,7 +2720,7 @@ msgid "" " sent from your FixMyStreet installation." msgstr "ΜεÏικά σημεία τεÏÎ¼Î±Ï„Î¹ÏƒÎ¼Î¿Ï Î¯ÏƒÏ‰Ï‚ απαιτοÏν Îνα <strong>κλειδί API</strong> για να σημαίνεται ότι οι αναφοÏÎÏ‚ στÎλνονται από την δική σου εγκατάσταση FixMyStreet." -#: templates/web/base/alert/index.html:42 +#: templates/web/base/alert/index.html:40 msgid "Some photos of recent reports" msgstr "ΜεÏικÎÏ‚ φωτογÏαφίες από Ï€Ïόσφατες αναφοÏÎÏ‚" @@ -2855,7 +2730,7 @@ msgstr "ΜεÏικÎÏ‚ φωτογÏαφίες από Ï€Ïόσφατες αναφ msgid "Some text to localize" msgstr "Κείμενο για εντοπισμό" -#: perllib/FixMyStreet/Cobrand/UK.pm:78 +#: perllib/FixMyStreet/Cobrand/UK.pm:79 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover." msgstr "Συγνώμη, φαίνεται πως αυτός ο ταχυδÏομικός κώδικας είναι Crown dependency postcode, δεν καλÏπτουμε Ï„Îτοιους ΤΚ," @@ -2867,23 +2742,34 @@ msgstr "" msgid "Sorry, there has been an error confirming your problem." msgstr "Συγνώμη, υπήÏξε βλάβη στην επιβεβαίωση του Ï€Ïοβλήματός σου." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:221 -#: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:37 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:216 +#: perllib/FixMyStreet/Geocode.pm:38 perllib/FixMyStreet/Geocode/Bing.pm:38 #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:56 #: perllib/FixMyStreet/Geocode/OSM.pm:48 msgid "Sorry, we could not find that location." msgstr "Συγνώμη, δεν μποÏÎσαμε να βÏοÏμε αυτήν την τοποθεσία." -#: perllib/FixMyStreet/Geocode/Bing.pm:34 +#: templates/web/base/auth/general.html:9 +#: templates/web/base/report/display.html:21 +#: templates/web/base/report/new/fill_in_details_form.html:23 +#, fuzzy +msgid "Sorry, we could not log you in. Please fill in the form below." +msgstr "Συγνώμη, δεν μποÏÎσαμε να αναλÏσουμε αυτήν την τοποθεσία. ΠαÏακαλοÏμε Ï€Ïοσπάθησε ξανά." + +#: perllib/FixMyStreet/Geocode/Bing.pm:35 #: perllib/FixMyStreet/Geocode/Google.pm:45 #: perllib/FixMyStreet/Geocode/Zurich.pm:88 msgid "Sorry, we could not parse that location. Please try again." msgstr "Συγνώμη, δεν μποÏÎσαμε να αναλÏσουμε αυτήν την τοποθεσία. ΠαÏακαλοÏμε Ï€Ïοσπάθησε ξανά." #: perllib/FixMyStreet/App/Model/PhotoSet.pm:134 -#, fuzzy msgid "Sorry, we couldn't save your image(s), please try again." -msgstr "Συγνώμη, δεν μποÏÎσαμε να αναλÏσουμε αυτήν την τοποθεσία. ΠαÏακαλοÏμε Ï€Ïοσπάθησε ξανά." +msgstr "" + +#: perllib/FixMyStreet/App/Controller/AuthSS.pm:301 +#, fuzzy +msgid "Sorry, you can not log in with Facebook. Please try again later." +msgstr "ΥπήÏξε Ï€Ïόβλημα στην Ï€Ïοβολή αυτής της σελίδας. ΠαÏακαλοÏμε Ï€Ïοσπάθησε αÏγότεÏα." #: templates/web/base/admin/stats.html:64 msgid "Start Date:" @@ -2893,13 +2779,12 @@ msgstr "ΗμεÏομηνία ΈναÏξης:" #: templates/web/base/admin/flagged.html:18 #: templates/web/base/admin/list_updates.html:11 #: templates/web/base/admin/reports.html:15 -#: templates/web/fixmystreet/report/update-form.html:26 +#: templates/web/base/report/update/form_update.html:32 msgid "State" msgstr "Κατάσταση" #: templates/web/base/admin/report_edit.html:47 #: templates/web/base/admin/update_edit.html:27 -#: templates/web/base/report/update-form.html:28 #: templates/web/zurich/admin/report_edit-sdm.html:73 #: templates/web/zurich/admin/report_edit.html:101 #: templates/web/zurich/admin/report_edit.html:155 @@ -2907,7 +2792,7 @@ msgstr "Κατάσταση" msgid "State:" msgstr "Κατάσταση:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1282 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1291 #: perllib/FixMyStreet/Cobrand/Zurich.pm:387 #: templates/web/base/admin/stats.html:1 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:73 @@ -2929,7 +2814,7 @@ msgstr "Ακόμη ανοιχτό, μÎσω εÏωτηματολογίου, %s" msgid "Street View" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:406 +#: perllib/FixMyStreet/Script/Reports.pm:184 msgid "Subcategory: %s" msgstr "ΥποκατηγοÏία: %s" @@ -2937,30 +2822,25 @@ msgstr "ΥποκατηγοÏία: %s" msgid "Subdivision/Body" msgstr "Τμήμα/Σώμα" -#: templates/web/fixmystreet/contact/index.html:98 +#: templates/web/base/contact/index.html:90 msgid "Subject" msgstr "ΘÎμα" #: templates/web/base/admin/report_edit.html:19 -#: templates/web/base/contact/index.html:88 -#: templates/web/base/report/new/fill_in_details_form.html:53 #: templates/web/zurich/admin/report_edit.html:39 msgid "Subject:" msgstr "ΘÎμα:" #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/fill_in_details_form.html:137 -#: templates/web/base/report/new/fill_in_details_form.html:159 -#: templates/web/base/report/new/fill_in_details_form.html:96 -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:36 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:23 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:76 +#: templates/web/base/report/new/form_user_loggedin.html:36 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:39 +#: templates/web/base/report/new/form_user_loggedout_password.html:11 #: templates/web/zurich/report/new/fill_in_details_form.html:96 msgid "Submit" msgstr "Υποβολή" -#: templates/web/base/admin/report_edit.html:95 -#: templates/web/base/admin/update_edit.html:65 +#: templates/web/base/admin/report_edit.html:101 +#: templates/web/base/admin/update_edit.html:75 #: templates/web/base/admin/user-form.html:56 #: templates/web/zurich/admin/report_edit-sdm.html:137 #: templates/web/zurich/admin/report_edit.html:268 @@ -2968,7 +2848,7 @@ msgstr "Υποβολή" msgid "Submit changes" msgstr "Υποβολή αλλαγών" -#: templates/web/base/questionnaire/index.html:97 +#: templates/web/base/questionnaire/index.html:106 msgid "Submit questionnaire" msgstr "Υποβολή εÏωτηματολογίου" @@ -2984,9 +2864,8 @@ msgid "Submitted" msgstr "Υποβλήθηκε" #: templates/web/base/alert/updates.html:17 -#: templates/web/base/report/display.html:46 +#: templates/web/base/report/display_tools.html:41 #: templates/web/fixmystreet/alert/updates.html:23 -#: templates/web/fixmystreet/report/display.html:65 msgid "Subscribe" msgstr "Γίνε συνδÏομητής" @@ -2994,7 +2873,7 @@ msgstr "Γίνε συνδÏομητής" msgid "Subscribe me to an email alert" msgstr "Γίνε συνδÏομητής σε ειδοποιήσεις μÎσω email" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1275 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1284 #: perllib/FixMyStreet/Cobrand/Zurich.pm:383 #: templates/web/base/admin/bodies.html:25 #: templates/web/base/admin/index.html:1 @@ -3013,7 +2892,7 @@ msgstr "ΠεÏίληψη" msgid "Summary reports" msgstr "ΠεÏιληπτικÎÏ‚ αναφοÏÎÏ‚" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1279 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1288 msgid "Survey" msgstr "ΈÏευνα" @@ -3027,9 +2906,8 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/Zurich.pm:394 #: templates/web/zurich/header.html:77 -#, fuzzy msgid "Templates" -msgstr "ΕνημεÏώσεις" +msgstr "" #: templates/web/base/admin/list_updates.html:12 #: templates/web/zurich/admin/templates.html:9 @@ -3050,7 +2928,7 @@ msgstr "Κείμενο:" msgid "Thank you for reporting this issue!" msgstr "ΕυχαÏιστοÏμε που ανÎφεÏες αυτό το ζήτημα!" -#: templates/web/base/tokens/error.html:7 +#: templates/web/base/tokens/error.html:6 msgid "Thank you for trying to confirm your update or problem. We seem to have an error ourselves though, so <a href=\"%s\">please let us know what went on</a> and we'll look into it." msgstr "ΕυχαÏιστοÏμε που Ï€Ïοσπάθησες να επιβεβαιώσεις την ενημÎÏωση ή το Ï€Ïόβλημά σου. Μάλλον όμως εμφανίστηκε σε εμάς κάποια βλάβη, οπότε <a href=\"%s\">παÏακαλοÏμε ενημÎÏωσΠμας για το τι Îγινε</a> και θα το κοιτάξουμε." @@ -3085,23 +2963,23 @@ msgstr "Η τοποθεσία δεν φαίνεται να βÏίσκεται σ #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:47 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:63 -#: perllib/FixMyStreet/Cobrand/UK.pm:71 +#: perllib/FixMyStreet/Cobrand/UK.pm:72 msgid "That postcode was not recognised, sorry." msgstr "Ο ταχυδÏομικός κώδικας δεν αναγνωÏίστηκε, λυποÏμαστε." -#: perllib/FixMyStreet/App/Controller/Admin.pm:726 +#: perllib/FixMyStreet/App/Controller/Admin.pm:724 msgid "That problem has been marked as sent." msgstr "Αυτό το Ï€Ïόβλημα Îχει σημειωθεί ως απεσταλμÎνο." -#: perllib/FixMyStreet/App/Controller/Admin.pm:718 +#: perllib/FixMyStreet/App/Controller/Admin.pm:716 msgid "That problem will now be resent." msgstr "Το Ï€Ïόβλημα Ï„ÏŽÏα θα αποσταλθεί ξανά." -#: perllib/FixMyStreet/App/Controller/Report.pm:125 +#: perllib/FixMyStreet/App/Controller/Report.pm:127 msgid "That report cannot be viewed on %s." msgstr "Η αναφοÏά δεν μποÏεί να Ï€Ïοβληθεί σε %s." -#: perllib/FixMyStreet/App/Controller/Report.pm:119 +#: perllib/FixMyStreet/App/Controller/Report.pm:121 msgid "That report has been removed from FixMyStreet." msgstr "Η αναφοÏά αφαιÏÎθηκε από το FixMyStreet." @@ -3136,7 +3014,7 @@ msgstr "" "Η <strong>μÎθοδος αποστολής</strong> αποφασίζει πώς θα στÎλνονται οι αναφοÏÎÏ‚ Ï€Ïοβλημάτων στο σώμα.\n" "Αν την αφήσεις κενή, <strong>η Ï€ÏοεπιλεγμÎνη μÎθοδος αποστολής είναι μÎσω email</strong>." -#: templates/web/base/open311/index.html:90 +#: templates/web/base/open311/index.html:82 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 "Η ιδιότητα agency_responsible του Open311 v2 χÏησιμοποιείται για να καταγÏάφονται οι υπηÏεσίες που Îλαβαν την αναφοÏά Ï€Ïοβλήματος, που δεν είναι ακÏιβώς ο Ï„Ïόπος με τον οποίο οÏίζεται αυτή η ιδιότητα στις Ï€ÏοδιαγÏαφÎÏ‚ του Open311 v2." @@ -3159,12 +3037,12 @@ msgstr "Η υπηÏεσία δεν θα μποÏÎσει να βοηθήσει Î msgid "The diligency prize league table shows editors' activity (who's been editing the most records)." msgstr "Ο πίνακας βÏαβείων επιμÎλειας δείχνει τη δÏαστηÏιότητα των συντακτών (ποιος Îχει συντάξει τις πεÏισσότεÏες καταγÏαφÎÏ‚)." -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:60 -#: perllib/FixMyStreet/App/Controller/Reports.pm:79 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:61 +#: perllib/FixMyStreet/App/Controller/Reports.pm:80 msgid "The error was: %s" msgstr "Το σφάλμα ήταν: %s" -#: templates/web/base/open311/index.html:86 +#: templates/web/base/open311/index.html:78 msgid "The following Open311 v2 attributes are returned for each request: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code and service_name." msgstr "Οι παÏακάτω ιδιότητες του Open311 v2 επιστÏÎφονται για κάθε αίτημα: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code και service_name." @@ -3211,8 +3089,7 @@ msgstr "Η λίστα των διαθÎσιμων πεÏιοχών παÏÎÏ‡ÎµÏ msgid "The passwords do not match" msgstr "Οι κωδικοί Ï€Ïόσβασης δεν ταιÏιάζουν" -#: templates/web/base/errors/page_error_404_not_found.html:10 -#: templates/web/base/errors/page_error_404_not_found.html:12 +#: templates/web/base/errors/page_error_404_not_found.html:9 msgid "The requested URL '%s' was not found on this server" msgstr "Η ζητοÏμενη διεÏθυνση URL '%s' δε βÏÎθηκε στον server" @@ -3222,12 +3099,11 @@ msgstr "Για να λαμβάνεις ειδοποιήσεις που αφοÏÎ #: templates/web/base/report/new/councils_extra_text.html:1 #: templates/web/base/report/new/councils_text_some.html:10 -#: templates/web/base/report/new/fill_in_details_form.html:18 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:14 +#: templates/web/base/report/new/fill_in_details_form.html:13 msgid "The summary and description will also be made public (see our <a href=\"/privacy\">privacy policy</a>)." msgstr "Η πεÏίληψη και η πεÏιγÏαφή θα είναι επίσης δημόσιες (δες την <a href=\"/privacy\">πολιτική αποÏÏήτου</a>)." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:315 +#: perllib/FixMyStreet/Script/Reports.pm:92 msgid "The user could not locate the problem on a map, but to see the area around the location they entered" msgstr "Ο χÏήστης δεν μποÏÎσε να εντοπίσει το Ï€Ïόβλημα στον χάÏτη, αλλά για να δει την πεÏιοχή κοντά στην τοποθεσία ÎγÏαψε" @@ -3246,18 +3122,18 @@ msgstr "" msgid "There are no reports to show." msgstr "Δεν υπάÏχουν αναφοÏÎÏ‚ Ï€Ïος εμφάνιση." -#: perllib/FixMyStreet/App/Controller/Reports.pm:76 +#: perllib/FixMyStreet/App/Controller/Reports.pm:77 msgid "There was a problem showing the All Reports page. Please try again later." msgstr "ΥπήÏξε Ï€Ïόβλημα στην Ï€Ïοβολή της σελίδας Όλες οι ΑναφοÏÎÏ‚. ΠαÏακαλοÏμε Ï€Ïοσπάθησε ξανά αÏγότεÏα." #: perllib/FixMyStreet/App/Controller/Contact.pm:137 -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:59 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:60 msgid "There was a problem showing this page. Please try again later." msgstr "ΥπήÏξε Ï€Ïόβλημα στην Ï€Ïοβολή αυτής της σελίδας. ΠαÏακαλοÏμε Ï€Ïοσπάθησε αÏγότεÏα." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:769 -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:134 -#: templates/web/base/auth/general.html:26 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:764 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:138 +#: templates/web/base/auth/general.html:43 #: templates/web/zurich/auth/general.html:28 msgid "There was a problem with your email/password combination. If you cannot remember your password, or do not have one, please fill in the ‘sign in by email’ section of the form." msgstr "ΥπήÏξε Ï€Ïόβλημα με το συνδυασμό του email/ÎºÏ‰Î´Î¹ÎºÎ¿Ï Ï€Ïόσβασής σου. Αν δεν μποÏείς να θυμηθείς τον κωδικό σου, ή δεν Îχεις, παÏακαλοÏμε συμπλήÏωσε τον τομÎα ‘σÏνδεση μÎσω email’ αυτής της φόÏμας." @@ -3266,7 +3142,7 @@ msgstr "ΥπήÏξε Ï€Ïόβλημα με το συνδυασμό του email/ msgid "There was a problem with your email/password combination. Please try again." msgstr "ΥπήÏξε Ï€Ïόβλημα με τον συνδυασμό email/ÎºÏ‰Î´Î¹ÎºÎ¿Ï Ï€Ïόσβασης. ΠαÏακαλοÏμε Ï€Ïοσπάθησε ξανά." -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:272 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:336 msgid "There was a problem with your update. Please try again." msgstr "ΥπήÏξε Ï€Ïόβλημα με την ενημÎÏωσή σου. ΠαÏακαλοÏμε Ï€Ïοσπάθησε ξανά." @@ -3274,7 +3150,7 @@ msgstr "ΥπήÏξε Ï€Ïόβλημα με την ενημÎÏωσή σου. Î Î msgid "There were problems with your report. Please see below." msgstr "ΥπήÏξαν Ï€Ïοβλήματα με την αναφοÏά σου. ΠαÏακαλοÏμε δες παÏακάτω." -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:300 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:371 msgid "There were problems with your update. Please see below." msgstr "ΥπήÏξαν Ï€Ïοβλήματα με την ενημÎÏωσή σου. ΠαÏακαλοÏμε δες παÏακάτω." @@ -3291,7 +3167,7 @@ msgstr "" "<strong>Δεν χÏειάζεται να τις Ïυθμίσεις αν η ÎœÎθοδος Αποστολής είναι μÎσω email.</strong>\n" "Για πεÏισσότεÏες πληÏοφοÏίες σχετικά με το Open311, δες <a href='https://www.mysociety.org/2013/01/17/open311-explained/' class='admin-offsite-link'>αυτό το άÏθÏο</a>." -#: templates/web/base/open311/index.html:77 +#: templates/web/base/open311/index.html:69 msgid "This API implementation is work in progress and not yet stabilized. It will change without warnings in the future." msgstr "Αυτή η υλοποίηση του API είναι ÎÏγο σε εξÎλιξη και δεν είναι ακόμη σταθεÏή. Θα αλλάξει χωÏίς Ï€Ïοειδοποιήσεις στο μÎλλον." @@ -3318,18 +3194,18 @@ msgstr "" "Αυτή η υπηÏεσία θα δÎχεται μόνο αναφοÏÎÏ‚ για Ï€Ïοβλήματα που βÏίσκονται στην <strong>πεÏιοχή αÏμοδιότητας της</strong>.\n" "Μια υπηÏεσία δεν θα δÎχεται καμία αναφοÏά, εκτός αν είναι αÏμόδια για τουλάχιστον μία πεÏιοχή." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:413 +#: perllib/FixMyStreet/Script/Reports.pm:191 msgid "This email has been sent to both councils covering the location of the problem, as the user did not categorise it; please ignore it if you're not the correct council to deal with the issue, or let us know what category of problem this is so we can add it to our system." msgstr "Αυτό το email στάλθηκε και στις δÏο υπηÏεσίες που είναι αÏμόδιες για την τοποθεσία του Ï€Ïοβλήματος, μιας και ο χÏήστης δεν το κατηγοÏιοποίησε. ΠαÏακαλοÏμε αγνόησΠτο αν η υπηÏεσία σου δεν είναι αÏμόδια για την αντιμετώπιση του ζητήματος, ή ενημÎÏωσΠμας για τη σωστή κατηγοÏία του Ï€Ïοβλήματος ώστε να την Ï€ÏοσθÎσουμε στο σÏστημα." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:416 +#: perllib/FixMyStreet/Script/Reports.pm:194 msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue." msgstr "Αυτό το email στάλθηκε σε πολλÎÏ‚ υπηÏεσίες που είναι αÏμόδιες για την τοποθεσία του Ï€Ïοβλήματος, Î±Ï†Î¿Ï Î· επιλεγμÎνη κατηγοÏία συμπεÏιλαμβάνεται σε κάθε μια από αυτÎÏ‚. ΠαÏακαλοÏμε αγνόησΠτο αν η υπηÏεσία σου δεν είναι αÏμόδια για την αντιμετώπιση του ζητήματος." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:925 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:995 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:920 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:990 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:142 -#: perllib/FixMyStreet/Cobrand/UK.pm:43 +#: perllib/FixMyStreet/Cobrand/UK.pm:44 msgid "This information is required" msgstr "Αυτή η πληÏοφοÏία απαιτείται" @@ -3341,56 +3217,37 @@ msgstr "Αυτή είναι μια ιστοσελίδα για Ï€ÏογÏαμμΠmsgid "This is a summary of all reports on this site." msgstr "Αυτή είναι μια πεÏίληψη όλων των αναφοÏών σε αυτή την ιστοσελίδα" -#: templates/web/zurich/auth/token.html:8 -msgid "This may be because the link is too old or already used, or the address was not copied correctly." -msgstr "Αυτό ίσως συμβαίνει επειδή ο σÏνδεσμος είναι παλιός ή ήδη χÏησιμοποιημÎνος, ή επειδή η διεÏθυνση δεν αντιγÏάφηκε σωστά." - -#: templates/web/base/report/banner.html:15 -msgid "This problem has been closed" -msgstr "Αυτό το Ï€Ïόβλημα Îχει κλείσει" - -#: templates/web/base/report/banner.html:12 -#: templates/web/base/report/update-form.html:48 -#: templates/web/fixmystreet/report/update-form.html:46 +#: templates/web/base/report/update/form_update.html:52 msgid "This problem has been fixed" msgstr "Αυτό το Ï€Ïόβλημα Îχει διοÏθωθεί" -#: templates/web/base/report/update-form.html:43 -#: templates/web/fixmystreet/report/update-form.html:40 +#: templates/web/base/report/update/form_update.html:46 msgid "This problem has not been fixed" msgstr "Αυτό το Ï€Ïόβλημα δεν Îχει διοÏθωθεί" -#: templates/web/base/report/banner.html:19 -msgid "This problem is in progress" -msgstr "Αυτό το Ï€Ïόβλημα βÏίσκεται σε εξÎλιξη" - -#: templates/web/base/report/banner.html:9 -msgid "This problem is old and of unknown status." -msgstr "Αυτό το Ï€Ïόβλημα είναι παλιό και σε άγνωστη κατάσταση." - #: perllib/FixMyStreet/Cobrand/Zurich.pm:168 #: perllib/FixMyStreet/Cobrand/Zurich.pm:169 #: templates/web/zurich/report/_main.html:14 msgid "This report is awaiting moderation." msgstr "Αυτή η αναφοÏά αναμÎνει ÎγκÏιση." -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:86 +#: perllib/FixMyStreet/Script/Alerts.pm:94 msgid "This report is currently marked as closed." msgstr "Αυτή η αναφοÏά είναι Ï€Ïος το παÏόν καταχωÏημÎνη ως κλειστή." -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:84 +#: perllib/FixMyStreet/Script/Alerts.pm:92 msgid "This report is currently marked as fixed." msgstr "Αυτή η αναφοÏά είναι Ï€Ïος το παÏόν καταχωÏημÎνη ως διοÏθωμÎνη." -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:88 +#: perllib/FixMyStreet/Script/Alerts.pm:96 msgid "This report is currently marked as open." msgstr "Αυτή η αναφοÏά είναι Ï€Ïος το παÏόν καταχωÏημÎνη ως ανοιχτή." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:326 +#: perllib/FixMyStreet/Script/Reports.pm:105 msgid "This report was submitted anonymously" msgstr "Αυτή η αναφοÏά υποβλήθηκε ανώνυμα" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:308 +#: perllib/FixMyStreet/Script/Reports.pm:85 msgid "This web page also contains a photo of the problem, provided by the user." msgstr "Αυτή η ιστοσελίδα πεÏιÎχει επίσης μία φωτογÏαφία του Ï€Ïοβλήματος, που παÏÎχεται από το χÏήστη." @@ -3401,7 +3258,7 @@ msgstr "Αυτή η ιστοσελίδα πεÏιÎχει επίσης μία φ msgid "Time spent (in minutes):" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1278 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1287 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "ΧÏονοδιάγÏαμμα" @@ -3413,24 +3270,22 @@ msgid "Title" msgstr "Τίτλος" #: templates/web/zurich/admin/template_edit.html:20 -#, fuzzy msgid "Title:" -msgstr "Τίτλος" +msgstr "" #: templates/web/base/alert/index.html:25 -#, fuzzy msgid "To find out what local alerts we have for you, please enter your %s postcode or street name and area:" -msgstr "Για να βÏεις τις τοπικÎÏ‚ ειδοποιήσεις που υπάÏχουν για σÎνα, παÏακαλοÏμε γÏάψε τον ταχυδÏομικό σου κώδικα, την οδό ή την πεÏιοχή σου." +msgstr "" #: templates/web/base/alert/index.html:27 msgid "To find out what local alerts we have for you, please enter your postcode or street name and area" msgstr "Για να βÏεις τις τοπικÎÏ‚ ειδοποιήσεις που υπάÏχουν για σÎνα, παÏακαλοÏμε γÏάψε τον ταχυδÏομικό σου κώδικα, την οδό ή την πεÏιοχή σου." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:314 +#: perllib/FixMyStreet/Script/Reports.pm:91 msgid "To view a map of the precise location of this issue" msgstr "Για την Ï€Ïοβολή ενός χάÏτη με την ακÏιβή τοποθεσία του ζητήματος" -#: templates/web/base/admin/index.html:61 +#: templates/web/base/admin/index.html:54 #: templates/web/base/admin/questionnaire.html:24 #: templates/web/base/admin/stats.html:24 #: templates/web/base/admin/stats.html:43 @@ -3448,10 +3303,8 @@ msgstr "Στείλε μας Îνα email:" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:12 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:33 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:31 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:37 msgid "Unable to fix" msgstr "Δεν είναι εφικτή η διόÏθωση" @@ -3464,7 +3317,7 @@ msgstr "Δεν είναι εφικτή η διόÏθωση" msgid "Unconfirmed" msgstr "Ανεπιβεβαίωτο" -#: templates/web/fixmystreet/report/banner.html:9 +#: templates/web/base/report/banner.html:9 msgid "Unknown" msgstr "Άγνωστο" @@ -3472,17 +3325,18 @@ msgstr "Άγνωστο" msgid "Unknown alert type" msgstr "Άγνωστο είδος ειδοποίησης" +#: perllib/FixMyStreet/App/Controller/Photo.pm:110 #: templates/web/base/js/translation_strings.html:39 msgid "Unknown error" msgstr "Άγνωστο σφάλμα" -#: perllib/FixMyStreet/App/Controller/Report.pm:103 -#: perllib/FixMyStreet/App/Controller/Report.pm:109 -#: perllib/FixMyStreet/App/Controller/Report.pm:112 +#: perllib/FixMyStreet/App/Controller/Report.pm:105 +#: perllib/FixMyStreet/App/Controller/Report.pm:111 +#: perllib/FixMyStreet/App/Controller/Report.pm:114 msgid "Unknown problem ID" msgstr "Άγνωστη ταυτότητα Ï€Ïοβλήματος" -#: templates/web/fixmystreet/report/update-form.html:19 +#: templates/web/base/report/update/form_update.html:25 msgid "Update" msgstr "ΕνημÎÏωση" @@ -3490,13 +3344,11 @@ msgstr "ΕνημÎÏωση" msgid "Update %s created for problem %d; by %s" msgstr "Η ενημÎÏωση %s δημιουÏγήθηκε για το Ï€Ïόβλημα %d από %s" -#: templates/web/base/contact/index.html:21 -#: templates/web/fixmystreet/contact/index.html:36 +#: templates/web/base/contact/index.html:28 msgid "Update below added anonymously at %s" msgstr "Η παÏακάτω ενημÎÏωση Ï€ÏοστÎθηκε ανώνυμα στις %s" -#: templates/web/base/contact/index.html:23 -#: templates/web/fixmystreet/contact/index.html:38 +#: templates/web/base/contact/index.html:30 msgid "Update below added by %s at %s" msgstr "Η παÏακάτω ενημÎÏωση Ï€ÏοστÎθηκε από %s στις %s" @@ -3505,7 +3357,7 @@ msgstr "Η παÏακάτω ενημÎÏωση Ï€ÏοστÎθηκε από %s σ msgid "Update body" msgstr "ΕνημÎÏωση σώματος" -#: templates/web/base/admin/index.html:55 +#: templates/web/base/admin/index.html:48 msgid "Update breakdown by state" msgstr "Ανάλυση ενημÎÏωσης ανά κατάσταση" @@ -3530,20 +3382,16 @@ msgstr "Η ενημÎÏωση άνοιξε ξανά το Ï€Ïόβλημα" msgid "Update statuses" msgstr "Καταστάσεις ενημÎÏωσης" -#: templates/web/base/report/update-form.html:22 -msgid "Update:" -msgstr "ΕνημÎÏωση:" - #: templates/web/zurich/admin/index-dm.html:23 #: templates/web/zurich/admin/index-sdm.html:21 #: templates/web/zurich/admin/reports.html:13 msgid "Updated" msgstr "ΕνημεÏώθηκε" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1045 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1103 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1147 -#: perllib/FixMyStreet/App/Controller/Admin.pm:822 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1048 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1108 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1156 +#: perllib/FixMyStreet/App/Controller/Admin.pm:821 #: perllib/FixMyStreet/Cobrand/Zurich.pm:771 #: perllib/FixMyStreet/Cobrand/Zurich.pm:796 #: perllib/FixMyStreet/Cobrand/Zurich.pm:866 @@ -3551,13 +3399,12 @@ msgid "Updated!" msgstr "ΕνημεÏώθηκε!" #: templates/web/base/admin/list_updates.html:2 -#: templates/web/base/report/update.html:3 -#: templates/web/fixmystreet/report/update.html:5 +#: templates/web/base/report/update.html:5 #: templates/web/zurich/report/updates.html:2 msgid "Updates" msgstr "ΕνημεÏώσεις" -#: perllib/FixMyStreet/DB/Result/Comment.pm:132 +#: perllib/FixMyStreet/DB/Result/Comment.pm:131 msgid "Updates are limited to %s characters in length. Please shorten your update" msgstr "Οι ενημεÏώσεις Îχουν ÏŒÏιο χαÏακτήÏων %s. ΠαÏακαλοÏμε συντόμευσε την ενημÎÏωσή σου" @@ -3567,12 +3414,9 @@ msgstr "ΕνημεÏώσεις για {{title}}" #. ("%s is the site name") #: templates/web/base/report/display.html:0 -#: templates/web/base/report/display.html:5 -#: templates/web/fixmystreet/report/display.html:0 -#: templates/web/fixmystreet/report/display.html:9 -#, fuzzy +#: templates/web/base/report/display.html:9 msgid "Updates to this problem, %s" -msgstr "ΕνημεÏώσεις για το Ï€Ïόβλημα, FixMyStreet" +msgstr "" #: templates/web/base/admin/body.html:182 msgid "Use the <strong>note</strong> to record details that are only displayed in the admin. Notes are not shown publicly, and are not sent to the body." @@ -3580,15 +3424,14 @@ msgstr "ΧÏησιμοποίησε την <strong>σημείωση</strong> γι #: templates/web/zurich/admin/report_edit-sdm.html:48 #: templates/web/zurich/admin/report_edit.html:67 -#, fuzzy msgid "Used map" -msgstr "χάÏτης σε χÏήση" +msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1452 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1461 msgid "User flag removed" msgstr "Η επισήμανση του χÏήστη αφαιÏÎθηκε" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1424 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1433 msgid "User flagged" msgstr "Ο χÏήστης επισημάνθηκε" @@ -3596,7 +3439,7 @@ msgstr "Ο χÏήστης επισημάνθηκε" msgid "User search finds matches in users' names and email addresses." msgstr "Η αναζήτηση χÏηστών βÏίσκει αποτελÎσματα για ονόματα χÏηστών και διευθÏνσεις email." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1280 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1289 #: perllib/FixMyStreet/Cobrand/Zurich.pm:399 #: templates/web/base/admin/flagged.html:29 #: templates/web/zurich/header.html:69 @@ -3627,7 +3470,6 @@ msgid "Viewing a location" msgstr "Î Ïοβάλλεται μία τοποθεσία" #: templates/web/base/report/display.html:0 -#: templates/web/fixmystreet/report/display.html:0 msgid "Viewing a problem" msgstr "Î Ïοβάλλεται Îνα Ï€Ïόβλημα" @@ -3640,25 +3482,24 @@ 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 "Î’Ïήκαμε παÏαπάνω από Îνα αποτÎλεσμα για αυτήν την τοποθεσία. Εδώ παÏουσιάζουμε 10 αποτελÎσματα, παÏακαλοÏμε δοκίμασε άλλη αναζήτηση αν δε βÏήκες αυτό που Îψαχνες." -#: templates/web/zurich/auth/token.html:7 -msgid "We have not been able to confirm your account - sorry." -msgstr "Δεν μποÏÎσαμε να επιβεβαιώσουμε το λογαÏιασμό σου - συγγνώμη." - -#: templates/web/zurich/auth/token.html:17 -msgid "We have sent you an email containing a link to confirm your account." -msgstr "Σου στείλαμε Îνα email με Îνα σÏνδεσμο για την επιβεβαίωση του λογαÏÎ¹Î±ÏƒÎ¼Î¿Ï ÏƒÎ¿Ï…." +#: templates/web/base/auth/general.html:6 +#: templates/web/base/report/display.html:27 +#: templates/web/base/report/new/oauth_email_form.html:5 +#, fuzzy +msgid "We need your email address, please give it below." +msgstr "Δε δείχνουμε ποτΠτο email ή το τηλÎφωνό σου" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:2 -#: templates/web/fixmystreet/report/update-form.html:77 +#: templates/web/base/report/new/form_user_loggedout_email.html:2 +#: templates/web/base/report/update/form_user_loggedout_email.html:2 msgid "We never show your email" msgstr "Δε δείχνουμε ποτΠτο email σου" -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:31 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:65 +#: templates/web/base/report/new/form_user_loggedin.html:31 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:28 msgid "We never show your email address or phone number." msgstr "Δε δείχνουμε ποτΠτο email ή το τηλÎφωνό σου" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:422 +#: perllib/FixMyStreet/Script/Reports.pm:200 msgid "We realise this problem might be the responsibility of %s; however, we don't currently have any contact details for them. If you know of an appropriate contact address, please do get in touch." msgstr "Καταλαβαίνουμε ότι το Ï€Ïόβλημα ίσως είναι στην ευθÏνη του %s. Ωστόσο, μÎχÏι στιγμής δεν Îχουμε πληÏοφοÏίες επικοινωνίας μαζί τους. Αν γνωÏίζεις μία κατάλληλη διεÏθυνση επικοινωνίας, παÏακαλοÏμε επικοινώνησε μαζί τους." @@ -3675,10 +3516,6 @@ msgstr "Θα χÏησιμοποιήσουμε τις Ï€ÏοσωπικÎÏ‚ σου msgid "We’re sorry to hear the problem’s not fixed. Why not try writing to your local representatives?" msgstr "ΛυποÏμαστε που το Ï€Ïόβλημα δε λÏθηκε. Γιατί δε δοκιμάζετε να επικοινωνήσετε απευθείας με τις τοπικÎÏ‚ αÏχÎÏ‚;" -#: templates/web/base/contact/blurb.html:8 -msgid "We'd love to hear what you think about this site. Just fill in the form, or send an email to <a href='mailto:%s'>%s</a>:" -msgstr "Θα θÎλαμε να ακοÏσουμε τι σκÎφτεσαι για αυτόν τον ιστότοπο. Απλά συμπλήÏωσε την φόÏμα ή στείλε μας e-mail στο <a href='mailto:%s'>%s</a>:" - #: templates/web/base/contact/submit.html:7 msgid "We’ll get back to you as soon as we can." msgstr "Θα σου απαντήσουμε όσο το δυνατόν συντομότεÏα." @@ -3687,7 +3524,7 @@ msgstr "Θα σου απαντήσουμε όσο το δυνατόν συντο msgid "What was your experience of getting the problem fixed?" msgstr "" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:49 +#: templates/web/base/report/new/form_report.html:19 msgid "What’s the issue, and where is it?" msgstr "Ποιο είναι το θÎμα και που βÏίσκεται;" @@ -3700,7 +3537,11 @@ msgstr "Όταν διοÏθώθηκε" msgid "When sent" msgstr "Όταν αποστάλθηκε " -#: perllib/FixMyStreet/App/Controller/Report/New.pm:640 +#: templates/web/base/js/translation_strings.html:50 +msgid "Whoa there Testino! Three photos are enough." +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Report/New.pm:635 msgid "Whole block of empty flats" msgstr "ΟλόκληÏο τετÏάγωνο από άδεια διαμεÏίσματα" @@ -3715,7 +3556,7 @@ msgstr "Μόνο αυτό? <a href=\"/alert\">Î Ïόσθεσε πεÏισσότΠmsgid "Wish" msgstr "" -#: templates/web/base/open311/index.html:92 +#: templates/web/base/open311/index.html:84 msgid "With request searches, it is also possible to search for agency_responsible to limit the requests to those sent to a single administration. The search term is the administration ID provided by <a href=\"%s\">MaPit</a>." msgstr "Με τις αναζητήσεις αιτημάτων, είναι επίσης δυνατό να αναζητήσεις με το πεδίο agency_responsible πεÏιοÏίζοντας τα αποτελÎσματα στις αιτήσεις που στÎλνονται σε Îναν συγκεκÏιμÎνο τομÎα. Ο ÏŒÏος αναζήτησης είναι ο Κωδικός (ID) ενός τομÎα που παÏÎχεται από το <a href=\"%s\">MapIt</a>." @@ -3723,7 +3564,7 @@ msgstr "Με τις αναζητήσεις αιτημάτων, είναι επί msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"http://fixmystreet.org\">available at fixmystreet.org</a>." msgstr "Θα ήθελες να συνεισφÎÏεις στο FixMyStreet; Ο κώδικας μας είναι ανοιχτής πηγής και <a href=\"http://fixmystreet.org\">διαθÎσιμος στο fixmystreet.org</a>." -#: templates/web/base/questionnaire/index.html:87 +#: templates/web/base/questionnaire/index.html:96 msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?" msgstr "Θα ήθελες να λάβεις και άλλο εÏωτηματολόγιο σε 4 εβδομάδες, για να σου υπενθυμίσει να ελÎγξεις την Ï„ÏÎχουσα κατάσταση;" @@ -3732,7 +3573,6 @@ msgid "Writing your message entirely in block capitals makes it hard to read, as msgstr "Îα χÏησιμοποιείς τα κατάλληλα σημεία στίξης και να αποφεÏγεις να γÏάφεις μόνο με κεφαλαία γÏάμματα, ώστε το μήνυμά σου να είναι εÏκολο στην ανάγνωση." #: templates/web/base/report/new/fill_in_details_form.html:4 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:5 msgid "Wrong location? Just click again on the map." msgstr "Λάθος γεωγÏαφική τοποθεσία; Απλά κάνε κλικ ξανά πάνω στον χάÏτη." @@ -3755,27 +3595,24 @@ msgstr "Έτος" #: templates/web/base/admin/users.html:31 #: templates/web/base/questionnaire/creator_fixed.html:14 #: templates/web/base/questionnaire/index.html:51 -#: templates/web/base/questionnaire/index.html:90 +#: templates/web/base/questionnaire/index.html:99 msgid "Yes" msgstr "Îαι" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:17 -#: templates/web/fixmystreet/report/update-form.html:91 +#: templates/web/base/report/new/form_user_loggedout_password.html:5 +#: templates/web/base/report/update/form_user_loggedout_password.html:4 msgid "Yes I have a password" msgstr "Îαι Îχω κωδικό Ï€Ïόσβασης" -#: templates/web/base/contact/index.html:39 -#: templates/web/fixmystreet/contact/index.html:54 +#: templates/web/base/contact/index.html:46 msgid "You are complaining that this problem report was unnecessarily moderated:" msgstr "ΠαÏαπονιÎσαι ότι, αυτή η αναφοÏά Ï€Ïοβλήματος διαγÏάφτηκε από τον διαχειÏιστή χωÏίς λόγο: " -#: templates/web/base/contact/index.html:41 -#: templates/web/fixmystreet/contact/index.html:56 +#: templates/web/base/contact/index.html:48 msgid "You are reporting the following problem report for being abusive, containing personal information, or similar:" msgstr "Με το παÏόν, δηλώνεις ότι η παÏακάτω αναφοÏά Ï€Ïοβλήματος είναι καταχÏηστική, πεÏιÎχει Ï€ÏοσωπικÎÏ‚ πληÏοφοÏίες ή κάτι παÏόμοιο:" -#: templates/web/base/contact/index.html:15 -#: templates/web/fixmystreet/contact/index.html:30 +#: templates/web/base/contact/index.html:22 msgid "You are reporting the following update for being abusive, containing personal information, or similar:" msgstr "Με το παÏόν, δηλώνεις ότι η παÏακάτω ενημÎÏωση είναι καταχÏηστική, πεÏιÎχει Ï€ÏοσωπικÎÏ‚ πληÏοφοÏίες ή κάτι παÏόμοιο: " @@ -3788,7 +3625,7 @@ msgstr "ΜποÏείς να <a href=\"%s%s\">δεις το Ï€Ïόβλημα σε msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create." msgstr "ΜποÏείς να Ï€ÏοσθÎσεις την ηλεκτÏονική διεÏθυνση ενός καταχÏÎ·ÏƒÏ„Î¹ÎºÎ¿Ï Ï‡Ïήστη στην λίστα καταχÏήσεων, κάτι που αυτόματα θα αποκÏÏπτει (και δεν θα αποστÎλλει) αναφοÏÎÏ‚ που αυτός δημιουÏγεί." -#: templates/web/fixmystreet/contact/index.html:121 +#: templates/web/base/contact/index.html:113 msgid "You can contact technical support on <a href='mailto:%s'>%s</a>" msgstr "ΜποÏείς να επικοινωνήσεις για τεχνική υποστήÏιξη στο <a href='mailto:%s'>%s</a>" @@ -3802,8 +3639,8 @@ msgstr "" "Για παÏάδειγμα, αυτό θα ήταν χÏήσιμο αν θα ήθελες να παÏακολουθήσεις κάποιον χÏήστη που καταχώÏησε ακατάλληλες\n" "αναφοÏÎÏ‚ στο παÏελθόν." -#: templates/web/base/report/new/councils_text_none.html:10 -#: templates/web/base/report/new/councils_text_none.html:2 +#: templates/web/base/report/new/councils_text_none.html:12 +#: templates/web/base/report/new/councils_text_none.html:14 #: templates/web/base/report/new/councils_text_some.html:19 #: templates/web/base/report/new/councils_text_some.html:21 msgid "You can help us by finding a contact email address for local problems for %s and emailing it to us at <a href='mailto:%s'>%s</a>." @@ -3821,21 +3658,16 @@ msgstr "Έχεις υποχωÏήσει - παÏακαλοÏμε συμπλήÏÏ msgid "You have already answered this questionnaire. If you have a question, please <a href='%s'>get in touch</a>, or <a href='%s'>view your problem</a>.\n" msgstr "Έχεις ήδη απαντήσεις σε αυτό το εÏωτηματολόγιο. Αν Îχεις κάποιος αποÏία, παÏακαλοÏμε <a href='%s'>επικοινώνησε</a>, ή <a href='%s'>δες το Ï€Ïόβλημά σου</a>.\n" -#: templates/web/base/questionnaire/index.html:77 -#: templates/web/base/report/new/fill_in_details_form.html:75 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:73 -msgid "You have already attached a photo to this report, attaching another one will replace it." -msgstr "Έχεις ήδη Ï€ÏοσθÎσει μια φωτογÏαφία σε αυτή την αναφοÏά, αν Ï€ÏοσθÎσεις μια καινοÏÏια θα την αντικαταστήσει. " - -#: templates/web/base/report/update-form.html:59 -#: templates/web/fixmystreet/report/update-form.html:56 -msgid "You have already attached a photo to this update, attaching another one will replace it." -msgstr "Έχεις ήδη Ï€ÏοσθÎσει μια φωτογÏαφία σε αυτή την αναφοÏά, αν Ï€ÏοσθÎσεις μια καινοÏÏια θα την αντικαταστήσει. " - -#: templates/web/zurich/report/new/fill_in_details_form.html:61 +#: templates/web/base/report/new/form_report.html:32 +#: templates/web/zurich/report/new/fill_in_details_form.html:55 msgid "You have already attached photos to this report. Note that you can attach a maximum of 3 to this report (if you try to upload more, the oldest will be removed)." msgstr "" +#: templates/web/base/questionnaire/index.html:83 +#: templates/web/base/report/update/form_update.html:14 +msgid "You have already attached photos to this update. Note that you can attach a maximum of 3 to this update (if you try to upload more, the oldest will be removed)." +msgstr "" + #: templates/web/base/auth/sign_out.html:4 #: templates/web/zurich/auth/sign_out.html:3 msgid "You have been signed out" @@ -3850,9 +3682,8 @@ msgstr "Έχεις σημειώσει την τοποθεσία του Ï€ÏοβΠmsgid "You have successfully confirmed your email address." msgstr "Επιβεβαίωσες την διεÏθυνση email σου επιτυχώς." -#: templates/web/base/report/display.html:20 -#: templates/web/base/report/new/fill_in_details.html:37 -#: templates/web/fixmystreet/report/display.html:17 +#: templates/web/base/report/display.html:17 +#: templates/web/base/report/new/login_success_form.html:3 msgid "You have successfully signed in; please check and confirm your details are accurate:" msgstr "Έχεις με επιτυχία εγγÏαφεί, παÏακαλοÏμε Îλεγξε και επιβεβαίωσε αν οι λεπτομÎÏειες είναι σωστÎÏ‚:" @@ -3884,53 +3715,42 @@ msgid "Your Reports" msgstr "Οι ΑναφοÏÎÏ‚ σου" #: templates/web/base/alert/_list.html:89 +#: templates/web/base/contact/index.html:83 +#: templates/web/base/report/display_tools.html:38 +#: templates/web/base/report/display_tools.html:40 +#: templates/web/base/report/new/form_user_loggedin.html:3 +#: templates/web/base/report/new/form_user_loggedout_email.html:1 +#: templates/web/base/report/update/form_user_loggedout_email.html:1 #: templates/web/fixmystreet/alert/updates.html:19 #: templates/web/fixmystreet/alert/updates.html:22 -#: templates/web/fixmystreet/contact/index.html:91 -#: templates/web/fixmystreet/report/display.html:62 -#: templates/web/fixmystreet/report/display.html:64 -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:3 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:1 -#: templates/web/fixmystreet/report/update-form.html:76 #: templates/web/zurich/report/new/fill_in_details_form.html:76 msgid "Your email" msgstr "Το e-mail σου" -#: templates/web/base/auth/general.html:28 -#: templates/web/fixmystreet/report/update-form.html:82 +#: templates/web/base/auth/general.html:45 +#: templates/web/base/report/update/form_user_loggedout_email.html:7 #: templates/web/zurich/auth/general.html:30 #: templates/web/zurich/auth/general.html:58 msgid "Your email address" msgstr "Η διεÏθυνση του e-mail σου" -#: templates/web/base/report/new/fill_in_details_form.html:106 -#: templates/web/base/report/update-form.html:81 -msgid "Your email:" -msgstr "Το e-mail σου:" - -#: templates/web/fixmystreet/report/updates-sidebar-notes.html:7 +#: templates/web/base/report/updates-sidebar-notes.html:3 msgid "Your information will only be used in accordance with our <a href=\"/privacy\">privacy policy</a>" msgstr "Οι πληÏοφοÏίες σου θα χÏησιμοποιηθοÏν μόνο σÏμφωνα με την <a href=\"/privacy\">πολιτική αποÏÏήτου</a>" -#: templates/web/base/auth/general.html:51 -#: templates/web/fixmystreet/contact/index.html:84 -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:18 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:54 -#: templates/web/fixmystreet/report/update-form.html:142 +#: templates/web/base/auth/general.html:90 +#: templates/web/base/contact/index.html:76 +#: templates/web/base/report/new/form_user_loggedin.html:18 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:17 +#: templates/web/base/report/update/form_name.html:11 #: templates/web/zurich/auth/general.html:61 #: templates/web/zurich/report/new/fill_in_details_form.html:86 msgid "Your name" msgstr "Το όνομά σου" -#: templates/web/base/contact/index.html:73 -#: templates/web/base/report/new/fill_in_details_form.html:186 -#: templates/web/base/report/update-form.html:152 -msgid "Your name:" -msgstr "Το όνομά σου:" - -#: templates/web/base/auth/general.html:39 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:22 -#: templates/web/fixmystreet/report/update-form.html:96 +#: templates/web/base/auth/general.html:75 +#: templates/web/base/report/new/form_user_loggedout_password.html:10 +#: templates/web/base/report/update/form_user_loggedout_password.html:9 #: templates/web/zurich/auth/general.html:34 msgid "Your password" msgstr "Ο κωδικός σου" @@ -3939,15 +3759,16 @@ msgstr "Ο κωδικός σου" msgid "Your password has been changed" msgstr "Ο κωδικός σου Îχει αλλάξει" -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:27 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:63 +#: templates/web/base/report/new/form_user_loggedin.html:27 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:26 #: templates/web/zurich/report/new/fill_in_details_form.html:92 msgid "Your phone number" msgstr "Ο αÏιθμός τηλεφώνου σου" #: templates/web/base/questionnaire/index.html:14 +#, fuzzy msgid "Your report" -msgstr "Η αναφοÏά σου" +msgstr "Οι αναφοÏÎÏ‚ σου" #: templates/web/base/footer.html:9 templates/web/fixmystreet/footer.html:29 msgid "Your reports" @@ -3957,23 +3778,17 @@ msgstr "Οι αναφοÏÎÏ‚ σου" msgid "Your updates" msgstr "Οι ενημεÏώσεις σου" -#: templates/web/base/contact/index.html:81 -msgid "Your email:" -msgstr "Το e-mail σου:" - #: templates/web/base/reports/_list-filters.html:3 -#, fuzzy msgid "all reports" -msgstr "Όλες οι αναφοÏÎÏ‚" +msgstr "" #: templates/web/base/admin/timeline.html:4 msgid "by %s" msgstr "από %s" #: templates/web/base/reports/_list-filters.html:5 -#, fuzzy msgid "closed reports" -msgstr "ΚλειστÎÏ‚ αναφοÏÎÏ‚" +msgstr "" #: templates/web/base/reports/body.html:6 #: templates/web/base/reports/body.html:7 @@ -3995,17 +3810,16 @@ msgid "edit user" msgstr "επεξεÏγασία χÏήστη" #: templates/web/base/reports/_list-filters.html:6 -#, fuzzy msgid "fixed reports" -msgstr "ΑναφοÏÎÏ‚ για ΔιοÏθωμÎνα" +msgstr "" -#: templates/web/base/admin/index.html:33 +#: templates/web/base/status/stats.html:20 #: templates/web/zurich/admin/index.html:5 msgid "from %s different users" -msgstr "από %d διαφοÏετικοÏÏ‚ χÏήστες" +msgstr "από %s διαφοÏετικοÏÏ‚ χÏήστες" -#: templates/web/base/report/_item.html:17 -#: templates/web/zurich/report/_item.html:16 +#: templates/web/base/report/_item.html:15 +#: templates/web/zurich/report/_item.html:14 msgid "last updated %s" msgstr "τελευταία ενημÎÏωση %s" @@ -4097,10 +3911,8 @@ msgstr "άνοιξε ξανά" msgid "sign out" msgstr "Îξοδος" -#: templates/web/base/report/new/fill_in_details_form.html:12 -#: templates/web/base/report/new/fill_in_details_form.html:15 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:10 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:12 +#: templates/web/base/report/new/fill_in_details_form.html:11 +#: templates/web/base/report/new/fill_in_details_form.html:9 msgid "the local council" msgstr "η τοπική υπηÏεσία" @@ -4109,7 +3921,7 @@ msgstr "η τοπική υπηÏεσία" msgid "there is no pin shown as the user did not use the map" msgstr "δεν υπάÏχει καÏφίτσα στον χάÏτη επειδή ο χÏήστης δεν χÏησιμοποίησε τον χάÏτη" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:398 +#: perllib/FixMyStreet/Script/Reports.pm:176 msgid "this type of local problem" msgstr "αυτή η κατηγοÏία Ï„Î¿Ï€Î¹ÎºÎ¿Ï Ï€Ïοβλήματος" @@ -4118,9 +3930,8 @@ msgid "today" msgstr "σήμεÏα" #: templates/web/base/reports/_list-filters.html:4 -#, fuzzy msgid "unfixed reports" -msgstr "ΑναφοÏÎÏ‚ για ΔιοÏθωμÎνα" +msgstr "" #: templates/web/base/admin/report_edit.html:32 msgid "used map" @@ -4139,7 +3950,7 @@ msgstr "ο χÏήστης είναι ο ιδιοκτήτης του Ï€Ïοβλή msgid "ward" msgstr "πτÎÏυγα" -#: templates/web/base/front/stats.html:17 +#: templates/web/base/front/stats.html:13 #, perl-format msgid "<big>%s</big> report recently" msgid_plural "<big>%s</big> reports recently" @@ -4167,7 +3978,7 @@ msgid_plural "%d minutes" msgstr[0] "%d λεπτό" msgstr[1] "%d λεπτά" -#: templates/web/base/front/stats.html:29 +#: templates/web/base/front/stats.html:25 #, perl-format msgid "<big>%s</big> update on reports" msgid_plural "<big>%s</big> updates on reports" @@ -4188,14 +3999,14 @@ msgid_plural "%d weeks" msgstr[0] "%d εβδομάδα" msgstr[1] "%d εβδομάδες" -#: templates/web/base/front/stats.html:12 +#: templates/web/base/front/stats.html:8 #, perl-format msgid "<big>%s</big> report in past week" msgid_plural "<big>%s</big> reports in past week" msgstr[0] "<big>%s</big> αναφοÏά μÎσα στην Ï€ÏοηγοÏμενη εβδομάδα" msgstr[1] "<big>%s</big> αναφοÏÎÏ‚ μÎσα στην Ï€ÏοηγοÏμενη εβδομάδα" -#: templates/web/base/front/stats.html:23 +#: templates/web/base/front/stats.html:19 #, perl-format msgid "<big>%s</big> fixed in past month" msgid_plural "<big>%s</big> fixed in past month" @@ -4216,140 +4027,86 @@ msgid_plural "We do <strong>not</strong> yet have details for the other councils msgstr[0] "<strong>Δεν</strong> Îχουμε ακόμη λεπτομÎÏειες για το άλλο συμβοÏλιο που είναι αÏμόδια σε αυτήν την τοποθεσία." msgstr[1] "<strong>Δεν</strong> Îχουμε ακόμη λεπτομÎÏειες για τις υπόλοιπες υπηÏεσίες που είναι αÏμόδιες για αυτήν την τοποθεσία." -#~ msgid "(Don't worry — we'll hang on to your alert while you're checking your email.)" -#~ msgstr "(Μην ανησυχείς — θα παÏαμείνουμε στην ειδοποίησή σου μÎχÏι να ελÎγξεις το email σου.)" - -#~ msgid "(Don't worry — we'll hang on to your problem report while you're checking your email.)" -#~ msgstr "(Μην ανησυχείς — θα παÏαμείνουμε στην αναφοÏά του Ï€Ïοβλήματός σου μÎχÏι να ελÎγξεις το email σου.)" - -#~ msgid "(Don't worry — we'll hang on to your update while you're checking your email.)" -#~ msgstr "(Μην ανησυχείς — θα παÏαμείνουμε στην ενημÎÏωσή σου μÎχÏι να ελÎγξεις το email σου.)" - -#~ msgid "<small>If you cannot see the map, <a href='%s' rel='nofollow'>skip this step</a>.</small>" -#~ msgstr "<small>Αν δεν μποÏείς να δεις τον χάÏτη, <a href='%s' rel='nofollow'>παÏάλειψε αυτό το βήμα</a>.</small>" - -#~ msgid "<strong>No</strong>, I do not, let me sign in by email:" -#~ msgstr "<strong>Όχι<strong>, να συνδεθώ μÎσω email:" - -#~ msgid "Are you a <strong>developer</strong>? Would you like to contribute to FixMyStreet?" -#~ msgstr "Είσαι <strong>Ï€ÏογÏαμματιστής</strong>; Θα ήθελες να συνεισφÎÏεις στο FixMyStreet;" - -#~ msgid "Closest nearby problems <small>(within %skm)</small>" -#~ msgstr "ΚοντινότεÏα Ï€Ïοβλήματα <small>(σε ακτίνα %s χλμ)</small>" - -#~ msgid "Contact FixMyStreet" -#~ msgstr "Επικοινωνία με το FixMyStreet" - -#~ msgid "Do you have a FixMyBarangay password?" -#~ msgstr "Έχεις κωδικό Ï€Ïόσβασης για το FixMyBarangay;" - -#~ msgid "FixMyStreet admin:" -#~ msgstr "ΔιαχειÏιστής FixMyStreet:" - -#~ msgid "If you do not, your alert will not be activated." -#~ msgstr "Αλλιώς, η ειδοποίησή σας δεν θα υποβληθεί." - -#~ msgid "If you do not, your problem will not be posted." -#~ msgstr "Αλλιώς, το Ï€Ïόβλημα δεν θα υποβληθεί." - -#~ msgid "If you do not, your update will not be posted." -#~ msgstr "Αλλιώς, η ενημÎÏωση δεν θα υποβληθεί." - -#~ msgid "New local reports on reportemptyhomes.com" -#~ msgstr "ÎÎες τοπικÎÏ‚ αναφοÏÎÏ‚ στο reportemptyhomes.com" - -#~ msgid "New reports for {{COUNCIL}} within {{WARD}} ward on reportemptyhomes.com" -#~ msgstr "ÎÎες αναφοÏÎÏ‚ για το {{COUNCIL}} στην πεÏιοχή {{WARD}} στο reportemptyhomes.com" - -#~ msgid "New reports on reportemptyhomes.com" -#~ msgstr "ÎÎες αναφοÏÎÏ‚ στο reportemptyhomes.com" - -#~ msgid "New reports on reportemptyhomes.com near {{POSTCODE}}" -#~ msgstr "ÎÎες αναφοÏÎÏ‚ στο reportemptyhomes.com κοντά στο {{POSTCODE}}" - -#~ msgid "New reports to {{COUNCIL}} on reportemptyhomes.com" -#~ msgstr "ÎÎες αναφοÏÎÏ‚ για το {{COUNCIL}} στο reportemptyhomes.com" - -#~ msgid "New reports within {{NAME}}'s boundary on reportemptyhomes.com" -#~ msgstr "ÎÎες αναφοÏÎÏ‚ στα ÏŒÏια του {{NAME}} στο reportemptyhomes.com" +#~ msgid "(we never show your email address or phone number)" +#~ msgstr "(δεν φαίνεται ποτΠτο email ή ο τηλεφωνικός αÏιθμός σου)" -#~ msgid "New update:" -#~ msgstr "ÎÎα ενημÎÏωση:" +#~ msgid "(we never show your email)" +#~ msgstr "(δεν φαίνεται ποτΠτο email σου)" -#~ msgid "No problems found." -#~ msgstr "Δε βÏÎθηκαν Ï€Ïοβλήματα" +#~ msgid "<strong>No</strong>, let me confirm my report by email:" +#~ msgstr "<strong>Όχι<strong>, να γίνει επιβεβαίωση της αναφοÏάς μÎσω email:" -#~ msgid "No problems have been reported yet." -#~ msgstr "Δεν Îχει αναφεÏθεί κανÎνα Ï€Ïόβλημα μÎχÏι στιγμής." +#~ msgid "<strong>No</strong>, let me confirm my update by email:" +#~ msgstr "<strong>Όχι</strong>, να γίνει επιβεβαίωση της ενημÎÏωσης μÎσω email:" -#~ msgid "Now to submit your report… do you have a FixMyStreet password?" -#~ msgstr "ΤώÏα, για να υποβάλεις την αναφοÏά σου… Îχεις κωδικό στο FixMyStreet;" +#~ msgid "Email me updates" +#~ msgstr "Στείλτε Email για ενημεÏώσεις" -#~ msgid "Now to submit your update… do you have a FixMyStreet password?" -#~ msgstr "ΤώÏα, για να υποβάλεις την ενημÎÏωσή σου… Îχεις κωδικό στο FixMyStreet;" +#~ msgid "Enter a new password:" +#~ msgstr "ΓÏάψε Îνα νÎο κωδικό Ï€Ïόσβασης:" -#~ msgid "Our code is open source and <a href=\"http://github.com/mysociety/fixmystreet\">available on GitHub</a>." -#~ msgstr "Ο κώδικάς μας είναι open source και είναι <a href=\"http://github.com/mysociety/fixmystreet\">διαθÎσιμος στο GitHub</a>." +#~ 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 "ΦοβοÏμαστε ότι δεν μποÏÎσαμε να επαληθεÏσουμε αυτό το token. Αν αντÎγÏαψες τη διεÏθυνση URL από κάποιο email, παÏακαλοÏμε Îλεγξε ότι την αντÎγÏαψες επακÏιβώς.\n" -#~ msgid "Please <a class=\"tab_link\" href=\"#report\">take a look</a> at the updates that have been left." -#~ msgstr "ΠαÏακαλοÏμε <a class=\"tab_link\" href=\"#report\">Ïίξε μια ματιά</a> στις ενημεÏώσεις που Îχουν μείνει." +#~ 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 "Αν χÏησιμοποιείς διαδικτυακό email ή Îχεις φίλτÏα \"ανεπιθÏμητης αλληλογÏαφίας\", Îλεγξε τους φακÎλους ανεπιθÏμητων/spam email: μεÏικÎÏ‚ φοÏÎÏ‚, τα μηνÏματά μας επισημαίνονται Îτσι." -#~ msgid "Please take a look at the updates that have been left." -#~ msgstr "ΠαÏακαλοÏμε Ïίξε μια ματιά στις ενημεÏώσεις που Îχουν μείνει" +#~ msgid "Message:" +#~ msgstr "Μήνυμα:" -#~ msgid "Problems within %s, FixMyStreet" -#~ msgstr "Î Ïοβλήματα σε ακτίνα %s, FixMyStreet" +#~ msgid "More problems nearby" +#~ msgstr "ΠεÏισσότεÏα Ï€Ïοβλήματα στην πεÏιοχή" -#~ msgid "Properties recently reported as put back to use on reportemptyhomes.com" -#~ msgstr "Ιδιοκτησίες που Ï€Ïόσφατα αναφÎÏθηκε ότι επαναλειτουÏγοÏν στο reportemptyhomes.com" +#~ msgid "Nearly Done! Now check your email..." +#~ msgstr "Σχεδόν τελειώσαμε! ΤώÏα Îλεγξε το email σου..." -#~ msgid "Publish the response" -#~ msgstr "Δημοσίευσε την απάντηση" +#~ msgid "Offensive? Unsuitable? Tell us" +#~ msgstr "Î Ïοσβλητικό; Ακατάλληλο; Πες μας" -#~ msgid "Reported %s, to %s" -#~ msgstr "ΑναφÎÏθηκε %s, στο %s" +#~ msgid "Photo:" +#~ msgstr "ΦωτογÏαφία:" -#~ msgid "Reports on and around the map" -#~ msgstr "ΑναφοÏÎÏ‚ κοντά στον χάÏτη" +#~ msgid "Please check your email" +#~ msgstr "ΠαÏακαλοÏμε Îλεγξε το email σου" -#~ msgid "Sign in by email" -#~ msgstr "ΣÏνδεση μÎσω email" +#~ msgid "Please note that updates are not sent to the council. If you leave your name it will be public. Your information will only be used in accordance with our <a href=\"/faq#privacy\">privacy policy</a>" +#~ msgstr "ΠαÏακαλοÏμε σημείωσε ότι οι ενημεÏώσεις δεν στÎλνονται στην υπηÏεσία. Αν αφήσεις το όνομά σου θα είναι δημόσιο. Οι πληÏοφοÏίες θα χÏησιμοποιηθοÏν μόνο σÏμφωνα με την <a href=\"/faq#privacy\">πολιτική αποÏÏήτου</a>" -#~ msgid "Signed in as %s" -#~ msgstr "ΣυνδεδεμÎνος ως %s" +#~ msgid "This may be because the link is too old or already used, or the address was not copied correctly." +#~ msgstr "Αυτό ίσως συμβαίνει επειδή ο σÏνδεσμος είναι παλιός ή ήδη χÏησιμοποιημÎνος, ή επειδή η διεÏθυνση δεν αντιγÏάφηκε σωστά." -#~ msgid "The confirmation email <strong>may</strong> take a few minutes to arrive — <em>please</em> be patient." -#~ msgstr "<strong>Ίσως</strong> χÏειαστοÏν μεÏικά λεπτά για να φτάσει το email επιβεβαίωσης — <em>παÏακαλοÏμε</em> να είσαι υπομονετικός." +#~ msgid "This problem has been closed" +#~ msgstr "Αυτό το Ï€Ïόβλημα Îχει κλείσει" -#~ msgid "The details of your problem are available from the other tab above." -#~ msgstr "Οι λεπτομÎÏειες του Ï€Ïοβλήματός σου είναι διαθÎσιμες από την άλλη καÏÏ„Îλα παÏαπάνω." +#~ msgid "This problem is in progress" +#~ msgstr "Αυτό το Ï€Ïόβλημα βÏίσκεται σε εξÎλιξη" -#~ msgid "The details of your problem are available on the right hand side of this page." -#~ msgstr "Οι λεπτομÎÏειες του Ï€Ïοβλήματός σου είναι διαθÎσιμες στην δεξιά πλευÏά αυτής της σελίδας." +#~ msgid "This problem is old and of unknown status." +#~ msgstr "Αυτό το Ï€Ïόβλημα είναι παλιό και σε άγνωστη κατάσταση." -#~ msgid "The latest local reports reported by users" -#~ msgstr "Οι πιο Ï€Ïόσφατες τοπικÎÏ‚ αναφοÏÎÏ‚ που αναφÎÏθηκαν από χÏήστες" +#~ msgid "Update:" +#~ msgstr "ΕνημÎÏωση:" -#~ msgid "The latest properties reported back to use by users" -#~ msgstr "Οι πιο Ï€Ïόσφατες ιδιοκτησίες που αναφÎÏθηκε από χÏήστες ότι επαναλειτουÏγοÏν" +#~ msgid "We have not been able to confirm your account - sorry." +#~ msgstr "Δεν μποÏÎσαμε να επιβεβαιώσουμε το λογαÏιασμό σου - συγγνώμη." -#~ msgid "The latest reports for {{COUNCIL}} reported by users" -#~ msgstr "Οι πιο Ï€Ïόσφατες αναφοÏÎÏ‚ για το {{COUNCIL}} που αναφÎÏθηκαν από χÏήστες" +#~ msgid "We have sent you an email containing a link to confirm your account." +#~ msgstr "Σου στείλαμε Îνα email με Îνα σÏνδεσμο για την επιβεβαίωση του λογαÏÎ¹Î±ÏƒÎ¼Î¿Ï ÏƒÎ¿Ï…." -#~ msgid "The latest reports for {{COUNCIL}} within {{WARD}} ward reported by users" -#~ msgstr "Οι πιο Ï€Ïόσφατες αναφοÏÎÏ‚ για το {{COUNCIL}} στην πεÏιοχή {{WARD}} που αναφÎÏθηκαν από χÏήστες" +#~ msgid "We'd love to hear what you think about this site. Just fill in the form, or send an email to <a href='mailto:%s'>%s</a>:" +#~ msgstr "Θα θÎλαμε να ακοÏσουμε τι σκÎφτεσαι για αυτόν τον ιστότοπο. Απλά συμπλήÏωσε την φόÏμα ή στείλε μας e-mail στο <a href='mailto:%s'>%s</a>:" -#~ msgid "The latest reports within {{NAME}}'s boundary reported by users" -#~ msgstr "Οι πιο Ï€Ïόσφατες αναφοÏÎÏ‚ στα ÏŒÏια του {{NAME}} που αναφÎÏθηκαν από χÏήστες" +#~ msgid "You have already attached a photo to this report, attaching another one will replace it." +#~ msgstr "Έχεις ήδη Ï€ÏοσθÎσει μια φωτογÏαφία σε αυτή την αναφοÏά, αν Ï€ÏοσθÎσεις μια καινοÏÏια θα την αντικαταστήσει. " -#~ msgid "To <strong>report a problem</strong>, click on the map at the correct location." -#~ msgstr "Για να <strong>αναφÎÏεις Îνα Ï€Ïόβλημα</strong>, κάνε κλικ στον χάÏτη στη σωστή τοποθεσία." +#~ msgid "You have already attached a photo to this update, attaching another one will replace it." +#~ msgstr "Έχεις ήδη Ï€ÏοσθÎσει μια φωτογÏαφία σε αυτή την αναφοÏά, αν Ï€ÏοσθÎσεις μια καινοÏÏια θα την αντικαταστήσει. " -#~ msgid "User" -#~ msgstr "ΧÏήστης" +#~ msgid "Your email:" +#~ msgstr "Το e-mail σου:" -#~ msgid "You must now click the link in the email we've just sent you." -#~ msgstr "Θα Ï€ÏÎπει να κάνεις κλικ πάνω στον σÏνδεσμο που σου αποστείλαμε μόλις Ï„ÏŽÏα στο e-mail σου. " +#~ msgid "Your name:" +#~ msgstr "Το όνομά σου:" -#~ msgid "Your email address:" -#~ msgstr "Η διεÏθυνση του e-mail σου:" +#~ msgid "Your email:" +#~ msgstr "Το e-mail σου:" diff --git a/locale/es.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/es.UTF-8/LC_MESSAGES/FixMyStreet.po index 481751c47..8349e3388 100644 --- a/locale/es.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/es.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -13,55 +13,34 @@ msgid "" msgstr "" "Project-Id-Version: fixmystreet\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2015-10-23 16:51+0100\n" -"PO-Revision-Date: 2015-09-11 09:05+0000\n" -"Last-Translator: Pedro Prieto martÃn <pedro.prieto-martin@ckyosei.org>\n" -"Language-Team: Spanish (http://www.transifex.com/mysociety/fixmystreet/language/es/)\n" -"Language: es\n" +"POT-Creation-Date: 2016-03-02 13:09+0000\n" +"PO-Revision-Date: 2015-10-23 16:37+0000\n" +"Last-Translator: mySociety <transifex@mysociety.org>\n" +"Language-Team: Spanish (Spain) (http://www.transifex.com/mysociety/fixmystreet/language/es_ES/)\n" +"Language: es_ES\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:628 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:411 +#: perllib/FixMyStreet/DB/Result/Problem.pm:616 +#: perllib/FixMyStreet/Script/Reports.pm:189 msgid " and " msgstr " y " #: templates/web/base/report/new/councils_text_all.html:2 -#: templates/web/base/report/new/councils_text_none.html:11 -#: templates/web/base/report/new/councils_text_none.html:2 +#: templates/web/base/report/new/councils_text_none.html:12 +#: templates/web/base/report/new/councils_text_none.html:15 #: templates/web/base/report/new/councils_text_some.html:19 #: templates/web/base/report/new/councils_text_some.html:22 #: templates/web/base/report/new/councils_text_some.html:5 msgid " or " msgstr " o " -#: templates/web/base/admin/index.html:35 -#: templates/web/base/status/index.html:13 -msgid "%s confirmed alerts, %s unconfirmed" -msgstr "%d alertas confirmadas, %d sin confirmar" - -#: templates/web/base/admin/index.html:37 -#: templates/web/base/status/index.html:16 -#: templates/web/zurich/admin/index.html:6 -msgid "%s council contacts – %s confirmed, %s unconfirmed" -msgstr "%d contactos en Ayuntamiento – %d confirmados, %d sin confirmar" - #: templates/web/base/admin/edit-league.html:12 msgid "%d edits by %s" msgstr "%d ediciones por %s" -#: templates/web/base/admin/index.html:34 -#: templates/web/base/status/index.html:12 -msgid "%s live updates" -msgstr "%d actualizaciones en vivo" - -#: templates/web/base/admin/index.html:36 -#: templates/web/base/status/index.html:14 -msgid "%s questionnaires sent – %s answered (%s%%)" -msgstr "%d cuestionarios enviados – %d respondidos (%s%%)" - #: templates/web/base/pagination.html:10 msgid "%d to %d of %d" msgstr "%d a %d de %d" @@ -76,37 +55,50 @@ msgstr "%s - Informes de notificación" msgid "%s admin:" msgstr "" +#: templates/web/base/status/stats.html:26 +#, fuzzy +msgid "%s bodies" +msgstr "Órganos administrativos" + +#: templates/web/base/status/stats.html:24 +msgid "%s confirmed alerts, %s unconfirmed" +msgstr "%s alertas confirmadas, %s sin confirmar" + +#: templates/web/base/status/stats.html:27 +#: templates/web/zurich/admin/index.html:6 +msgid "%s council contacts – %s confirmed, %s unconfirmed" +msgstr "%s contactos en Ayuntamiento – %s confirmados, %s sin confirmar" + #. ("%s is the site name") #: templates/web/base/alert/index.html:7 -#, fuzzy msgid "" "%s has a variety of RSS feeds and email alerts for local\n" "problems, including alerts for all problems within a particular ward, or all\n" "problems within a certain distance of a particular location." msgstr "" -"FixMyStreet dispone de varias listados RSS y de alertas por email de los problemas locales, incluyendo\n" -"alertas de todos los problemas dentro de un distrito o ayuntamiento concreto, o de todos los problemas \n" -"a una cierta distancia de un punto determinado." #. ("%s is the site name") #: templates/web/base/alert/index.html:11 -#, fuzzy msgid "" "%s has a variety of RSS feeds and email alerts for local problems, including\n" "alerts for all problems within a particular ward or council, or all problems\n" "within a certain distance of a particular location." msgstr "" -"FixMyStreet dispone de varias listados RSS y de alertas por email de los problemas locales, incluyendo\n" -"alertas de todos los problemas dentro de un distrito o ayuntamiento concreto, o de todos los problemas \n" -"a una cierta distancia de un punto determinado." -#: perllib/FixMyStreet/DB/Result/Problem.pm:695 +#: templates/web/base/status/stats.html:23 +msgid "%s live updates" +msgstr "%s actualizaciones en vivo" + +#: templates/web/base/status/stats.html:25 +msgid "%s questionnaires sent – %s answered (%s%%)" +msgstr "%s cuestionarios enviados – %s respondidos (%s%%)" + +#: perllib/FixMyStreet/DB/Result/Problem.pm:683 msgid "%s ref: %s" msgstr "%s ref: %s" #. ("%s is the site name") #: templates/web/base/alert/_list.html:73 -#, fuzzy msgid "" "%s sends different categories of problem\n" "to the appropriate council, so problems within the boundary of a particular council\n" @@ -115,20 +107,16 @@ msgid "" "council’s alerts, but will only appear in the \"Within the boundary\" alert\n" "for the county council." msgstr "" -"FixMyStreet envÃa problemas de diferentes categorÃas\n" -"al organismo administrativo apropiado, por lo que problemas notificados dentro de los lÃmites de un ayuntamiento\n" -"podrÃan no aparecer en la lista de problemas enviados a dicho ayuntamiento. Por ejemplo, una notificación de pintadas\n" -"podrÃa ser enviada directamente a la Diputación Provincial, por lo que aparecerÃa en las áreas tanto del ayuntamiento como de la provincia, pero no aparecerá en la lista de problemas enviados al ayuntamiento." -#: perllib/FixMyStreet/Cobrand/UK.pm:255 perllib/FixMyStreet/Cobrand/UK.pm:267 +#: perllib/FixMyStreet/Cobrand/UK.pm:256 perllib/FixMyStreet/Cobrand/UK.pm:268 msgid "%s ward, %s" msgstr "%s barrio, %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:564 +#: perllib/FixMyStreet/DB/Result/Problem.pm:552 msgid "%s, reported at %s" msgstr "%s, reportado el %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:282 perllib/FixMyStreet/Cobrand/UK.pm:294 +#: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295 msgid "%s, within %s ward" msgstr "%s, en %s barrio" @@ -136,7 +124,7 @@ msgstr "%s, en %s barrio" msgid "© <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors" msgstr "© colaboradores <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a>" -#: templates/web/zurich/report/new/fill_in_details_form.html:53 +#: templates/web/zurich/report/new/fill_in_details_form.html:46 msgid "(Defect & location of defect)" msgstr "" @@ -147,15 +135,13 @@ msgstr "(email registrado en la tabla de abusos)" #: templates/web/zurich/admin/report_edit-sdm.html:60 #: templates/web/zurich/admin/report_edit.html:88 -#, fuzzy msgid "(No name)" -msgstr "Su nombre" +msgstr "" #: templates/web/zurich/admin/report_edit-sdm.html:67 #: templates/web/zurich/admin/report_edit.html:95 -#, fuzzy msgid "(No phone number)" -msgstr "Su número de teléfono" +msgstr "" #: templates/web/base/alert/_list.html:24 msgid "(a default distance which covers roughly 200,000 people)" @@ -163,17 +149,16 @@ msgstr "(distancia que cubre aproximadamente 200.000 personas)" #. ("%s is a list of distance links, e.g. [2km] / [5km] / [10km] / [20km]") #: templates/web/base/alert/_list.html:29 -#, fuzzy msgid "(alternatively the RSS feed can be customised, within %s)" -msgstr "(puedes ajustar la distancia a" +msgstr "" -#: templates/web/base/report/_item.html:27 -#: templates/web/zurich/report/_item.html:21 +#: templates/web/base/report/_item.html:25 +#: templates/web/zurich/report/_item.html:19 msgid "(closed)" msgstr "(cerrado)" -#: templates/web/base/report/_item.html:25 -#: templates/web/zurich/report/_item.html:19 +#: templates/web/base/report/_item.html:23 +#: templates/web/zurich/report/_item.html:17 msgid "(fixed)" msgstr "(arreglado)" @@ -181,37 +166,28 @@ msgstr "(arreglado)" msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)" msgstr "(como pintadas, basuras, pavimento o alumbrado rotos)" -#: templates/web/base/report/_item.html:21 +#: templates/web/base/report/_item.html:19 msgid "(not sent to council)" msgstr "(no enviadas al ayuntamiento)" -#: templates/web/base/report/new/fill_in_details_form.html:200 #: templates/web/zurich/report/new/fill_in_details_form.html:82 msgid "(optional)" msgstr "(opcional)" -#: templates/web/fixmystreet/report/public_label.html:1 +#: templates/web/base/report/public_label.html:1 msgid "(public)" msgstr "(público)" -#: templates/web/base/report/_item.html:20 +#: templates/web/base/report/_item.html:18 msgid "(sent to both)" msgstr "(enviado a ambos)" -#: templates/web/base/report/new/fill_in_details_form.html:194 -msgid "(we never show your email address or phone number)" -msgstr "(nunca mostramos su email ni su número de teléfono públicamente)" - -#: templates/web/base/report/update-form.html:159 -msgid "(we never show your email)" -msgstr "(nunca mostramos su email públicamente)" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:673 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 #: perllib/FixMyStreet/DB/Result/Problem.pm:410 msgid "-- Pick a category --" msgstr "-- Escoja una categorÃa --" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:637 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:632 #: perllib/FixMyStreet/DB/Result/Problem.pm:416 msgid "-- Pick a property type --" msgstr "-- Escoja un tipo de propiedad --" @@ -233,52 +209,39 @@ msgstr "" msgid "<label>Show %s</label> <label>about %s</label>" msgstr "" -#: templates/web/base/admin/index.html:32 -#: templates/web/base/status/index.html:11 +#: templates/web/base/status/stats.html:18 #: templates/web/zurich/admin/index.html:4 msgid "<strong>%s</strong> live problems" -msgstr "<strong>%d</strong> notificaciones en curso" +msgstr "<strong>%s</strong> notificaciones en curso" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:39 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:2 msgid "<strong>No</strong> Let me confirm my report by email" msgstr "<strong>No</strong>- confirmar mi notificación por email" -#: templates/web/fixmystreet/report/update-form.html:112 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:2 msgid "<strong>No</strong> Let me confirm my update by email" msgstr "<strong>No</strong>- confirmar mi actualización por email" -#: templates/web/base/auth/general.html:48 +#: templates/web/base/auth/general.html:87 #: templates/web/zurich/auth/general.html:51 msgid "<strong>No</strong> let me sign in by email" msgstr "<strong>No</strong>- permÃtanme registrarme por email" -#: templates/web/base/report/new/fill_in_details_form.html:145 -msgid "<strong>No</strong>, let me confirm my report by email:" -msgstr "<strong>No</strong>- confirmar mi notificación por email:" - -#: templates/web/base/report/update-form.html:118 -msgid "<strong>No</strong>, let me confirm my update by email:" -msgstr "<strong>No</strong>- confirmar mi actualización por email:" - -#: templates/web/base/auth/general.html:34 -#: templates/web/base/report/new/fill_in_details_form.html:123 -#: templates/web/base/report/update-form.html:96 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:15 -#: templates/web/fixmystreet/report/update-form.html:89 +#: templates/web/base/auth/general.html:70 +#: templates/web/base/report/new/form_user_loggedout_password.html:3 +#: templates/web/base/report/update/form_user_loggedout_password.html:2 msgid "<strong>Yes</strong> I have a password" msgstr "<strong>SÃ</strong>- tengo una contraseña" -#: templates/web/base/static/about-en-gb.html:1 -#: templates/web/base/static/about-en-gb.html:3 +#: templates/web/base/about/about-en-gb.html:1 +#: templates/web/base/about/about-en-gb.html:3 msgid "About us" msgstr "¿Quiénes somos?" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:8 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:31 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:29 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:35 msgid "Action Scheduled" msgstr "Acción programada" @@ -312,14 +275,13 @@ msgstr "Agregar nueva categorÃa" msgid "Add user" msgstr "Añadir un usuario" -#: templates/web/base/my/my.html:52 +#: templates/web/base/my/my.html:56 msgid "Added %s" msgstr "Añadido %s" #: templates/web/base/report/new/category_extras.html:9 -#, fuzzy msgid "Additional Information" -msgstr "En espera de revisión" +msgstr "" #: templates/web/base/auth/change_password.html:29 msgid "Again:" @@ -333,8 +295,7 @@ msgstr "Alerta %d creada por %s, tipo %s, parámetros %s / %s" msgid "Alert %d disabled (created %s)" msgstr "Alerta %d desactivada (creada %s)" -#: templates/web/base/report/update-form.html:164 -#: templates/web/fixmystreet/report/update-form.html:150 +#: templates/web/base/report/update/form_name.html:20 msgid "Alert me to future updates" msgstr "Notificadme actualizaciones futuras" @@ -344,9 +305,8 @@ msgid "All Reports" msgstr "Todas las notificaciones" #: templates/web/zurich/admin/stats.html:5 -#, fuzzy msgid "All Reports as CSV" -msgstr "Todas las notificaciones" +msgstr "" #: templates/web/base/footer.html:11 templates/web/fixmystreet/footer.html:32 #: templates/web/zurich/admin/index-dm.html:12 @@ -367,10 +327,8 @@ msgstr "Toda la información que proporcione será enviada a" #: templates/web/base/report/new/councils_text_all.html:2 #: templates/web/base/report/new/councils_text_all.html:4 -#: templates/web/base/report/new/fill_in_details_form.html:12 -#: templates/web/base/report/new/fill_in_details_form.html:14 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:10 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:11 +#: templates/web/base/report/new/fill_in_details_form.html:10 +#: templates/web/base/report/new/fill_in_details_form.html:9 msgid "All the information you provide here will be sent to <strong>%s</strong>." msgstr "Toda la información que proporcione será enviada al <strong>%s</strong>." @@ -392,6 +350,10 @@ msgstr "Anónimo:" msgid "Are you a developer?" msgstr "¿Eres programador?" +#: templates/web/base/js/translation_strings.html:52 +msgid "Are you sure you want to cancel this upload?" +msgstr "" + #: templates/web/base/admin/body-form.html:69 #: templates/web/base/admin/body.html:16 #: templates/web/zurich/admin/body-form.html:24 @@ -404,9 +366,8 @@ msgid "As this is a staging site and %s is false, reports made on this site will msgstr "Puesto que éste es un servidor de integración y %s es falsa, las notificaciones serán enviados al email del propio informante, no al contacto establecido para la categorÃa de problema." #: templates/web/zurich/admin/report_edit.html:213 -#, fuzzy msgid "Assign to competent body:" -msgstr "Asignar a un órgano externo:" +msgstr "" #: templates/web/zurich/admin/report_edit.html:173 #: templates/web/zurich/admin/stats.html:36 @@ -425,16 +386,16 @@ msgstr "Asigne a la subdivisión:" msgid "Assigned to %s" msgstr "Asignado a %s" -#: templates/web/base/open311/index.html:84 +#: templates/web/base/open311/index.html:76 msgid "At most %d requests are returned in each query. The returned requests are ordered by requested_datetime, so to get all requests, do several searches with rolling start_date and end_date." msgstr "Se devuelven hasta %d solicitudes en cada consulta. Dichas solicitudes se ordenan de acuerdo a la fecha de comienzo, asà que para obtener todas las solicitudes es necesario hacer varias solicitudes ajustando la fecha de comienzo y final." -#: templates/web/base/open311/index.html:76 +#: templates/web/base/open311/index.html:68 msgid "At the moment only searching for and looking at reports work." msgstr "Por el momento sólo funcionan la búsqueda y consulta de notificaciones." #: perllib/FixMyStreet/DB/Result/Problem.pm:373 -#: templates/web/zurich/report/_item.html:11 +#: templates/web/zurich/report/_item.html:9 msgid "Awaiting moderation" msgstr "En espera de revisión" @@ -446,7 +407,7 @@ msgstr "Atras" msgid "Ban email address" msgstr "Suspender este email" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1276 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1285 #: perllib/FixMyStreet/Cobrand/Zurich.pm:392 #: templates/web/base/admin/bodies.html:1 templates/web/zurich/header.html:64 msgid "Bodies" @@ -476,7 +437,7 @@ msgid "Can't see the map? <em>Skip this step</em>" msgstr "¿No puedes ver el mapa? <em>Salte este paso</em>" #: templates/web/base/admin/body.html:68 -#: templates/web/base/admin/index.html:61 +#: templates/web/base/admin/index.html:54 #: templates/web/base/report/new/category.html:10 #: templates/web/base/report/new/category_wrapper.html:3 #: templates/web/zurich/admin/body.html:14 @@ -487,8 +448,8 @@ msgstr "¿No puedes ver el mapa? <em>Salte este paso</em>" msgid "Category" msgstr "CategorÃa" -#: templates/web/base/admin/index.html:59 -#: templates/web/base/admin/index.html:67 +#: templates/web/base/admin/index.html:52 +#: templates/web/base/admin/index.html:60 msgid "Category fix rate for problems > 4 weeks old" msgstr "Ratio de arreglo de problemas > 4 semanas" @@ -501,7 +462,7 @@ msgstr "Ratio de arreglo de problemas > 4 semanas" msgid "Category:" msgstr "CategorÃa:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:402 +#: perllib/FixMyStreet/Script/Reports.pm:180 msgid "Category: %s" msgstr "CategorÃa: %s" @@ -564,7 +525,7 @@ msgid "Click here or enter as dd/mm/yyyy" msgstr "Haga click aqui o introduzca dd/mm/yyyy" #: templates/web/base/around/_report_banner.html:2 -#: templates/web/base/js/translation_strings.html:50 +#: templates/web/base/js/translation_strings.html:55 msgid "Click map to report a problem" msgstr "Haga clic en el mapa para notificar un problema" @@ -591,7 +552,7 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:25 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:144 -#: templates/web/fixmystreet/report/banner.html:15 +#: templates/web/base/report/banner.html:15 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:10 #: templates/web/zurich/admin/header.html:16 @@ -599,7 +560,7 @@ msgstr "" msgid "Closed" msgstr "Cerrada" -#: perllib/FixMyStreet/DB/Result/Problem.pm:794 +#: perllib/FixMyStreet/DB/Result/Problem.pm:779 msgid "Closed by council" msgstr "Cerrada por el Ayuntamiento" @@ -625,7 +586,7 @@ msgstr "Datos cobrand:" msgid "Cobrand:" msgstr "Cobrand:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1283 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1292 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "Configuración" @@ -638,13 +599,14 @@ msgstr "Configurar punto" msgid "Confirm" msgstr "Confirmar" -#: templates/web/base/auth/token.html:1 templates/web/zurich/auth/token.html:1 +#: templates/web/base/auth/token.html:1 msgid "Confirm account" msgstr "Confirmar cuenta" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:33 -#: templates/web/fixmystreet/report/update-form.html:107 -msgid "Confirm by email below, providing a new password at that point. When you confirm, your password will be updated." +#: templates/web/base/report/new/form_user_loggedout_password.html:21 +#: templates/web/base/report/update/form_user_loggedout_password.html:20 +#, fuzzy +msgid "Confirm by email instead, providing a new password at that point. When you confirm, your password will be updated." msgstr "Confirme por email, proporcionando una nueva contraseña. Al confirmar, su contraseña se actualizará." #: templates/web/base/questionnaire/creator_fixed.html:1 @@ -674,35 +636,27 @@ msgid "Confirmed:" msgstr "Confirmada:" #. ("%s is the site name") -#: templates/web/base/faq/faq-en-gb.html:8 templates/web/base/footer.html:24 -#: templates/web/base/open311/index.html:8 -#: templates/web/base/static/privacy.html:10 -#: templates/web/fixmystreet/contact/index.html:12 -#, fuzzy +#: templates/web/base/about/_sidebar.html:6 templates/web/base/footer.html:24 msgid "Contact %s" -msgstr "Contáctenos" +msgstr "" #: templates/web/base/contact/index.html:1 #: templates/web/base/contact/index.html:2 #: templates/web/base/contact/submit.html:1 -#: templates/web/fixmystreet/contact/index.html:1 -#: templates/web/fixmystreet/contact/index.html:2 msgid "Contact Us" msgstr "Contáctenos" -#: templates/web/base/contact/index.html:6 -#: templates/web/fixmystreet/contact/index.html:20 +#: templates/web/base/contact/index.html:12 msgid "Contact the team" msgstr "Contactar con el equipo" #: templates/web/zurich/admin/report_edit-sdm.html:40 #: templates/web/zurich/admin/report_edit.html:59 -#, fuzzy msgid "Coordinates:" -msgstr "Coordenadas:" +msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1420 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1448 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1429 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1457 msgid "Could not find user" msgstr "No se pudo encontrar el usuario" @@ -720,7 +674,7 @@ msgstr "Ayuntamiento" msgid "Council contacts for %s" msgstr "Contactos del ayuntamiento para %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:693 +#: perllib/FixMyStreet/DB/Result/Problem.pm:681 msgid "Council ref: %s" msgstr "Referencia del ayuntamiento: %s" @@ -735,7 +689,7 @@ msgstr "Ayuntamiento:" msgid "Count" msgstr "Total" -#: templates/web/base/email_sent.html:1 templates/web/zurich/email_sent.html:1 +#: templates/web/base/email_sent.html:1 msgid "Create a report" msgstr "Crear una notificación" @@ -745,9 +699,8 @@ msgid "Create category" msgstr "Crear una categorÃa" #: templates/web/zurich/admin/template_edit.html:29 -#, fuzzy msgid "Create template" -msgstr "Crear una notificación" +msgstr "" #: templates/web/base/admin/problem_row.html:34 #: templates/web/zurich/admin/templates.html:10 @@ -784,7 +737,7 @@ msgstr "Cuadro de mando" msgid "Dealt with by subdivision within 5 working days" msgstr "Tratado por el departamento dentro de los 5 dÃas hábiles" -#: perllib/FixMyStreet/App/Controller/Admin.pm:878 +#: perllib/FixMyStreet/App/Controller/Admin.pm:877 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "" @@ -797,7 +750,7 @@ msgstr "" msgid "Deleted" msgstr "Eliminado" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:51 +#: templates/web/base/report/new/form_report.html:45 #: templates/web/zurich/admin/index-dm.html:22 #: templates/web/zurich/admin/index-sdm.html:20 #: templates/web/zurich/admin/reports.html:12 @@ -805,12 +758,11 @@ msgid "Description" msgstr "Descripción" #: templates/web/base/js/translation_strings.html:34 -#: templates/web/zurich/report/new/fill_in_details_form.html:42 +#: templates/web/zurich/report/new/fill_in_details_form.html:68 msgid "Details" msgstr "Detalles" #: templates/web/base/admin/report_edit.html:20 -#: templates/web/base/report/new/fill_in_details_form.html:62 #: templates/web/zurich/admin/report_edit-sdm.html:27 #: templates/web/zurich/admin/report_edit.html:29 #: templates/web/zurich/admin/report_edit.html:43 @@ -823,38 +775,38 @@ msgstr "Transferido" #: templates/web/zurich/admin/report_edit-sdm.html:50 #: templates/web/zurich/admin/report_edit.html:69 -#, fuzzy msgid "Didn't use map" -msgstr "no utilizó mapa" +msgstr "" #: templates/web/base/admin/edit-league.html:8 msgid "Diligency prize league table" msgstr "Ranking de premios a la constancia" #. ("%s is the site name") -#: templates/web/base/auth/general.html:31 -#: templates/web/base/report/new/fill_in_details_form.html:114 -#: templates/web/base/report/update-form.html:87 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:11 -#: templates/web/fixmystreet/report/update-form.html:86 -#, fuzzy +#: templates/web/base/auth/general.html:48 +#: templates/web/base/report/new/form_user_loggedout.html:18 +#: templates/web/base/report/new/oauth_email_form.html:18 +#: templates/web/base/report/update-form.html:29 +#: templates/web/base/report/update/form_user_loggedout.html:17 msgid "Do you have a %s password?" -msgstr "¿Tiene una contraseña FixMyStreet?" +msgstr "" #: templates/web/base/questionnaire/index.html:55 msgid "Don’t know" msgstr "No lo sé" -#: templates/web/fixmystreet/contact/index.html:118 +#: templates/web/base/contact/index.html:110 msgid "Don't like forms?" msgstr "¿No te gustan los formularios?" +#: templates/web/base/js/translation_strings.html:51 +msgid "Drag and drop photos here or <u>click to upload</u>" +msgstr "" + #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:14 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:32 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:30 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:36 msgid "Duplicate" msgstr "Duplicado" @@ -907,7 +859,7 @@ msgstr "Editor" #: templates/web/base/admin/category_edit.html:91 #: templates/web/base/admin/flagged.html:38 #: templates/web/base/admin/users.html:16 -#: templates/web/base/auth/general.html:22 +#: templates/web/base/auth/general.html:39 #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:24 @@ -915,7 +867,7 @@ msgstr "Editor" msgid "Email" msgstr "Email:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1396 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1405 msgid "Email added to abuse list" msgstr "Email añadido a lista de abusones" @@ -931,7 +883,7 @@ msgstr "Creada alerta de email" msgid "Email alert deleted" msgstr "Borrada alerta de email" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1393 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1402 msgid "Email already in abuse list" msgstr "Email ya incluido en la lista de abusones" @@ -939,41 +891,36 @@ msgstr "Email ya incluido en la lista de abusones" msgid "Email me new local problems" msgstr "Reciba por email notificaciones sobre los nuevos problemas" -#: templates/web/base/report/display.html:38 -msgid "Email me updates" -msgstr "Recibir por email actualizaciones" - #: templates/web/base/admin/category_edit.html:31 #: templates/web/base/admin/report_edit.html:62 #: templates/web/base/admin/update_edit.html:33 #: templates/web/base/admin/user-form.html:20 #: templates/web/base/alert/updates.html:13 -#: templates/web/base/report/display.html:42 #: templates/web/zurich/admin/body.html:47 msgid "Email:" msgstr "Email:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:329 +#: perllib/FixMyStreet/Script/Reports.pm:108 msgid "Email: %s" msgstr "Email: %s" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:639 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:634 msgid "Empty flat or maisonette" msgstr "Piso o duplex vacÃo" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:638 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:633 msgid "Empty house or bungalow" msgstr "Casa o bungalow vacÃo" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:641 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:636 msgid "Empty office or other commercial" msgstr "Oficina u otros establecimientos comerciales vacÃos" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:642 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:637 msgid "Empty pub or bar" msgstr "Pub o bar vacÃo" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:643 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:638 msgid "Empty public building - school, hospital, etc." msgstr "Edificio público vacÃo - escuela, hospital, etc" @@ -1013,7 +960,7 @@ msgstr "Punto final" msgid "Enter a Zürich street name" msgstr "Introduzca un nombre de calle de Zürich" -#: perllib/FixMyStreet/Cobrand/UK.pm:13 +#: perllib/FixMyStreet/Cobrand/UK.pm:14 msgid "Enter a nearby UK postcode, or street name and area" msgstr "Introduzca un código postal cercano, o el nombre de la calle y el área" @@ -1031,14 +978,9 @@ msgstr "Introduzca el nombre de una calle cercana" msgid "Enter a nearby street name and area, postal code or district in Delhi" msgstr "Introduzca un nombre de calle cercana y área, código postal o distrito en Nueva Delhi" -#: templates/web/base/report/new/fill_in_details_form.html:152 -#: templates/web/base/report/update-form.html:125 -msgid "Enter a new password:" -msgstr "Introduzca una nueva contraseña:" - -#: templates/web/base/auth/general.html:60 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:75 -#: templates/web/fixmystreet/report/update-form.html:123 +#: templates/web/base/auth/general.html:99 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:38 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:13 #: templates/web/zurich/auth/general.html:65 msgid "Enter a password" msgstr "Introduzca una contraseña" @@ -1048,11 +990,11 @@ msgid "Enter details of the problem" msgstr "Introduzca detalles del problema" #: templates/web/base/errors/generic.html:1 -#: templates/web/base/errors/generic.html:3 +#: templates/web/base/errors/generic.html:4 #: templates/web/base/tokens/abuse.html:1 #: templates/web/base/tokens/abuse.html:3 #: templates/web/base/tokens/error.html:1 -#: templates/web/base/tokens/error.html:3 +#: templates/web/base/tokens/error.html:5 msgid "Error" msgstr "Error" @@ -1065,11 +1007,11 @@ msgstr "" msgid "Example postcode %s" msgstr "Ejemplo de código postal %s" -#: templates/web/base/open311/index.html:94 +#: templates/web/base/open311/index.html:86 msgid "Examples:" msgstr "Ejemplos:" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:55 +#: templates/web/base/report/new/form_report.html:49 msgid "Explain what’s wrong, exactly where it is, and how long it’s been there…" msgstr "Explique el problema o incidencia, su localización exacta, cuánto tiempo lleva ahÃ..." @@ -1077,9 +1019,8 @@ msgstr "Explique el problema o incidencia, su localización exacta, cuánto tiem #: perllib/FixMyStreet/Cobrand/Zurich.pm:922 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:12 -#, fuzzy msgid "Extern" -msgstr "URL Externo" +msgstr "" #: templates/web/base/admin/body-form.html:81 msgid "External URL" @@ -1111,17 +1052,15 @@ msgstr "Arreglar esto eligiendo un <strong>área cubierta</ strong> en el formul msgid "FixMyStreet" msgstr "FixMyStreet" -#: templates/web/base/admin/index.html:61 +#: templates/web/base/admin/index.html:54 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:24 #: templates/web/base/admin/report_blocks.html:9 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:144 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:34 -#: templates/web/fixmystreet/report/banner.html:12 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:32 +#: templates/web/base/report/banner.html:12 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:38 msgid "Fixed" msgstr "Arreglado" @@ -1148,7 +1087,7 @@ msgstr "Marcar como borrado" msgid "Flag user" msgstr "Marca usuario" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1281 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1290 #: templates/web/base/admin/users.html:19 msgid "Flagged" msgstr "Marcado" @@ -1179,36 +1118,31 @@ msgstr "Haga clic en el enlace de un barrio para ver solo sus notificaciones." msgid "For more information, see <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>." msgstr "Para más información, vea <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>Cómo FixMyStreet usa Mapit</a>." -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:32 -#: templates/web/fixmystreet/report/update-form.html:106 +#: templates/web/base/report/new/form_user_loggedout_password.html:20 +#: templates/web/base/report/update/form_user_loggedout_password.html:19 msgid "Forgotten your password?" msgstr "¿Olvidó su contraseña?" #: perllib/FixMyStreet/Cobrand/Zurich.pm:752 -#, fuzzy msgid "Forwarded to external body" -msgstr "Asignar a un órgano externo:" +msgstr "" #: perllib/FixMyStreet/Cobrand/Zurich.pm:753 -#, fuzzy msgid "Forwarded wish to external body" -msgstr "Asignar a un órgano externo:" +msgstr "" -#: templates/web/base/faq/faq-en-gb.html:1 -#: templates/web/base/faq/faq-en-gb.html:13 -#: templates/web/base/faq/faq-en-gb.html:6 -#: templates/web/base/open311/index.html:6 -#: templates/web/base/static/privacy.html:8 -#: templates/web/fixmystreet/contact/index.html:10 +#: templates/web/base/about/_sidebar.html:4 +#: templates/web/base/about/faq-en-gb.html:1 +#: templates/web/base/about/faq-en-gb.html:5 msgid "Frequently Asked Questions" msgstr "Listado de Preguntas Frecuentes" -#: templates/web/base/open311/index.html:136 +#: templates/web/base/open311/index.html:128 msgid "GeoRSS on Google Maps" msgstr "GeoRSS en Google Maps" +#: templates/web/base/report/display_tools.html:11 #: templates/web/fixmystreet/around/_updates.html:3 -#: templates/web/fixmystreet/report/display.html:35 msgid "Get updates" msgstr "Recibe actualizaciones" @@ -1241,7 +1175,7 @@ msgstr "Ir" msgid "Going to send questionnaire?" msgstr "¿Va a enviar cuestionario?" -#: templates/web/base/admin/index.html:42 +#: templates/web/base/admin/index.html:35 msgid "Graph of problem creation by status over time" msgstr "Gráfico temporal de creación problemas por estado" @@ -1258,7 +1192,7 @@ msgid "Have you ever reported a problem to a council before, or is this your fir msgstr "¿Alguna vez informó de un problema a un Ayuntamiento antes, o es su primera vez?" #: templates/web/base/footer.html:15 templates/web/fixmystreet/footer.html:38 -#: templates/web/zurich/faq/faq-de-ch.html:1 +#: templates/web/zurich/about/faq-de-ch.html:1 #: templates/web/zurich/footer.html:22 #: templates/web/zurich/nav_over_content.html:8 msgid "Help" @@ -1309,7 +1243,7 @@ msgstr "Cómo notificar un problema" msgid "How to send successful reports" msgstr "¿Cómo enviar informes exitosos?" -#: perllib/FixMyStreet/App/Controller/Admin.pm:754 +#: perllib/FixMyStreet/App/Controller/Admin.pm:752 msgid "I am afraid you cannot confirm unconfirmed reports." msgstr "No puede confirmar alertas no confirmadas." @@ -1327,10 +1261,6 @@ msgstr "Acabo de actualizar un problema en @fixmystreet" msgid "I'm afraid we couldn't locate your problem in the database.\n" msgstr "No se ha podido localizar su problema en la base de datos.\n" -#: perllib/FixMyStreet/App/Controller/Tokens.pm:327 -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 "No se ha podido verificar token. Si ha copiado la URL de un email, compruebe por favor que lo copió correctamente.\n" - #: templates/web/base/admin/flagged.html:14 #: templates/web/base/admin/list_updates.html:6 #: templates/web/base/admin/reports.html:11 @@ -1363,24 +1293,16 @@ msgstr "" msgid "If you get some more information about the status of your problem, please come back to the site and leave an update." msgstr "Si usted consigue algo más de información sobre el estado del problema, por favor regrese a esta web y añádale una actualización." -#: templates/web/base/report/new/councils_text_none.html:2 -#: templates/web/base/report/new/councils_text_none.html:8 +#: templates/web/base/report/new/councils_text_none.html:10 +#: templates/web/base/report/new/councils_text_none.html:9 msgid "If you submit a problem here the subject and details of the problem will be public, but the problem will <strong>not</strong> be reported to the council." msgstr "Si notifica un problema aquÃ, estará visible en la web, pero <strong>no se enviará</strong> una notificación automática a ningún organismo administrativo." -#: templates/web/zurich/auth/token.html:19 -#: templates/web/zurich/email_sent.html:7 -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 "Es recomendable que compruebe su carpeta de \"spam\", ya que a veces nuestros mensajes son identificados erróneamente como \"correo no deseado\"." - #: templates/web/base/questionnaire/index.html:68 -#, fuzzy msgid "" "If you wish to leave a public update on the problem, please enter it here\n" "(please note it will not be sent to the council)." msgstr "" -"Si desea actualizar el problema, por favor hágalo aquÃ, pero tenga en cuenta que no se enviará al Ayuntamiento. PodrÃa compartir, por ejemplo \n" -"cómo fue su experiencia con la resolución del problema." #: templates/web/base/admin/body.html:149 msgid "If you're using <strong>a send method that is not email</strong>, enter the service ID (Open311) or equivalent identifier here." @@ -1427,10 +1349,8 @@ msgstr "Selección de listado incorrecta" #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:144 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:32 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:30 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:36 msgid "In Progress" msgstr "Procesando" @@ -1438,7 +1358,7 @@ msgstr "Procesando" msgid "In abuse table?" msgstr "¿En tabla de abusones?" -#: templates/web/base/open311/index.html:88 +#: templates/web/base/open311/index.html:80 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 "Los siguientes atributos, que no forman parte de la especificación Open311 v2, son adicionalmente devueltos: agency_sent_datetime, title (también se devuelve como parte de la descripción), interface_used, comment_count, requestor_name (solo si el solicitante permitió que el nombre que se mostrará en el sitio)." @@ -1446,7 +1366,7 @@ msgstr "Los siguientes atributos, que no forman parte de la especificación Open #: perllib/FixMyStreet/Cobrand/Zurich.pm:963 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:7 -#: templates/web/fixmystreet/report/banner.html:19 +#: templates/web/base/report/banner.html:19 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:8 msgid "In progress" @@ -1481,7 +1401,7 @@ msgstr "Remisión interna" msgid "Invalid agency_responsible value %s" msgstr "Valor inválido para agency_responsible %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1201 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1210 msgid "Invalid end date" msgstr "Fecha de fin inválida" @@ -1489,7 +1409,7 @@ msgstr "Fecha de fin inválida" msgid "Invalid format %s specified." msgstr "Especificado un formato no válido %s." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1206 msgid "Invalid start date" msgstr "Fecha de inicio no válida" @@ -1497,14 +1417,12 @@ msgstr "Fecha de inicio no válida" #: templates/web/base/admin/report_blocks.html:5 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:143 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:31 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:29 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:35 msgid "Investigating" msgstr "Investigando" -#: templates/web/fixmystreet/contact/blurb.html:8 +#: templates/web/base/contact/blurb.html:8 msgid "It's often quickest to <a href=\"%s\">check our FAQs</a> and see if the answer is there." msgstr "A menudo es más rápido <a href=\"%s\">consultar nuestro Listado de Preguntas Frecuentes</a> y ver si la respuesta está allÃ." @@ -1522,11 +1440,9 @@ msgstr "" msgid "Jurisdiction unknown" msgstr "" -#: templates/web/base/auth/general.html:44 -#: templates/web/base/report/new/fill_in_details_form.html:132 -#: templates/web/base/report/update-form.html:105 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:28 -#: templates/web/fixmystreet/report/update-form.html:102 +#: templates/web/base/auth/general.html:80 +#: templates/web/base/report/new/form_user_loggedout_password.html:16 +#: templates/web/base/report/update/form_user_loggedout_password.html:15 #: templates/web/zurich/auth/general.html:40 msgid "Keep me signed in on this computer" msgstr "Mantener mi sesión abierta en este ordenador" @@ -1584,6 +1500,7 @@ msgid "MAP" msgstr "MAPA" #: templates/web/base/js/translation_strings.html:45 +#: templates/web/base/maps/google-ol.html:13 msgid "Map" msgstr " Mapa" @@ -1603,23 +1520,17 @@ msgstr "Marcado como resuelto/cerrado en las últimas ocho semanas" msgid "Marked fixed/closed more than eight weeks ago" msgstr "Marcado como resuelto/cerrado hace más de ocho semanas" -#: templates/web/fixmystreet/contact/index.html:106 +#: templates/web/base/contact/index.html:98 msgid "Message" msgstr "Mensaje:" #: templates/web/zurich/admin/report_edit.html:284 -#, fuzzy msgid "Message to competent body:" -msgstr "Asignar a un órgano externo:" +msgstr "" #: templates/web/zurich/admin/report_edit.html:282 -#, fuzzy msgid "Message to external body:" -msgstr "Asignar a un órgano externo:" - -#: templates/web/base/contact/index.html:97 -msgid "Message:" -msgstr "Mensaje:" +msgstr "" #: perllib/FixMyStreet/App/Controller/Open311.pm:445 msgid "Missing jurisdiction_id" @@ -1633,10 +1544,6 @@ msgstr "Moderado por el organismo durante el siguiente dÃa laborable" msgid "Month" msgstr "Mes" -#: templates/web/base/report/display.html:34 -msgid "More problems nearby" -msgstr "Más problemas cercanos" - #: templates/web/base/admin/bodies.html:21 #: templates/web/base/admin/body-form.html:18 #: templates/web/base/admin/flagged.html:16 @@ -1644,11 +1551,11 @@ msgstr "Más problemas cercanos" #: templates/web/base/admin/list_updates.html:7 #: templates/web/base/admin/reports.html:13 #: templates/web/base/admin/users.html:15 -#: templates/web/base/auth/general.html:50 +#: templates/web/base/auth/general.html:89 +#: templates/web/base/report/new/form_user_loggedin.html:9 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:7 +#: templates/web/base/report/update/form_name.html:4 #: templates/web/base/reports/index.html:20 -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:9 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:44 -#: templates/web/fixmystreet/report/update-form.html:138 #: templates/web/zurich/admin/body-form.html:4 #: templates/web/zurich/auth/general.html:60 #: templates/web/zurich/report/new/fill_in_details_form.html:82 @@ -1662,7 +1569,7 @@ msgstr "Nombre" msgid "Name:" msgstr "Nombre:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:328 +#: perllib/FixMyStreet/Script/Reports.pm:107 msgid "Name: %s" msgstr "Nombre: %s" @@ -1671,16 +1578,16 @@ msgstr "Nombre: %s" msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s" msgstr "Nombre de la calle más cercana al marcador colocado en el mapa (se genera automáticamente utilizando OpenStreetMap): %s%s" -#: perllib/FixMyStreet/Cobrand/UK.pm:127 +#: perllib/FixMyStreet/Cobrand/UK.pm:128 msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" msgstr "Código Postal más cercano al marcador colocado en el mapa (generado automáticamente): %s (%sm de distancia)" -#: perllib/FixMyStreet/Cobrand/Default.pm:434 -#: perllib/FixMyStreet/Cobrand/Default.pm:474 +#: perllib/FixMyStreet/Cobrand/Default.pm:455 +#: perllib/FixMyStreet/Cobrand/Default.pm:495 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "Camino más cercano al marcador colocado en el mapa (generado automáticamente por Bing Maps): %s" -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:267 +#: perllib/FixMyStreet/Script/Alerts.pm:290 msgid "" "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n" "\n" @@ -1688,14 +1595,9 @@ msgstr "" "Camino más cercano al pin colocado en el mapa (generada automáticamente por Bing Maps): %s\n" "\n" -#: templates/web/zurich/email_sent.html:5 -msgid "Nearly Done! Now check your email..." -msgstr "¡Ya casi ha terminado! Busque ahora en su email el mensaje de confirmación..." - #: templates/web/base/auth/token.html:17 templates/web/base/email_sent.html:5 -#, fuzzy msgid "Nearly done! Now check your email…" -msgstr "¡Ya casi ha terminado! Busque ahora en su email el mensaje de confirmación..." +msgstr "" #: templates/web/base/reports/index.html:21 msgid "New <br>problems" @@ -1719,9 +1621,8 @@ msgid "New local problems on FixMyStreet" msgstr "Nuevos problemas locales en FixMyStreet" #: templates/web/zurich/admin/report_edit-sdm.html:117 -#, fuzzy msgid "New note to DM:" -msgstr "Nueva nota interna:" +msgstr "" #: db/alert_types.pl:38 msgid "New problems for {{COUNCIL}} within {{WARD}} ward on FixMyStreet" @@ -1753,9 +1654,8 @@ msgstr "Nuevo estado" #: templates/web/zurich/admin/template_edit.html:9 #: templates/web/zurich/admin/templates.html:26 -#, fuzzy msgid "New template" -msgstr "Nuevo estado" +msgstr "" #: templates/web/base/pagination.html:13 msgid "Next" @@ -1772,8 +1672,8 @@ msgstr "Siguiente" #: templates/web/base/admin/report_edit.html:75 #: templates/web/base/admin/update_edit.html:25 #: templates/web/base/questionnaire/creator_fixed.html:16 +#: templates/web/base/questionnaire/index.html:101 #: templates/web/base/questionnaire/index.html:53 -#: templates/web/base/questionnaire/index.html:92 msgid "No" msgstr "No" @@ -1843,10 +1743,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:13 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:33 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:31 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:37 msgid "Not Responsible" msgstr "No responsable" @@ -1854,9 +1752,8 @@ msgstr "No responsable" #: perllib/FixMyStreet/Cobrand/Zurich.pm:937 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:13 -#, fuzzy msgid "Not contactable" -msgstr "No responsable" +msgstr "" #: templates/web/zurich/admin/report_edit-sdm.html:108 msgid "Not for my subdivision" @@ -1886,7 +1783,7 @@ msgstr "Tenga en cuenta que al incluir notificaciones no confirmadas usamos la f msgid "Note:" msgstr "Nota:" -#: templates/web/base/open311/index.html:73 +#: templates/web/base/open311/index.html:65 msgid "Note: <strong>%s</strong>" msgstr "Nota: <strong>%s</strong>" @@ -1894,13 +1791,15 @@ msgstr "Nota: <strong>%s</strong>" msgid "Notes from SDM to DM" msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:113 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:10 +#: templates/web/base/report/new/form_user_loggedout.html:14 +#: templates/web/base/report/new/form_user_loggedout.html:2 +#: templates/web/base/report/new/oauth_email_form.html:17 msgid "Now to submit your report…" msgstr "Ahora a enviar tu notificación…" -#: templates/web/base/report/update-form.html:86 -#: templates/web/fixmystreet/report/update-form.html:85 +#: templates/web/base/report/update-form.html:28 +#: templates/web/base/report/update/form_user_loggedout.html:13 +#: templates/web/base/report/update/form_user_loggedout.html:2 msgid "Now to submit your update…" msgstr "Ahora a enviar tu notificación…" @@ -1908,11 +1807,6 @@ msgstr "Ahora a enviar tu notificación…" msgid "OK" msgstr "OK" -#: templates/web/base/report/display.html:28 -#: templates/web/base/report/update.html:17 -msgid "Offensive? Unsuitable? Tell us" -msgstr "¿Ofensiva? ¿Inadecuada? AvÃsanos" - #: templates/web/base/reports/index.html:23 msgid "Old / unknown <br>problems" msgstr "Problemas<br>Antiguos / desconocidos" @@ -1929,7 +1823,7 @@ msgstr "Antiguo <br>arreglado" msgid "Older <br>problems" msgstr "Problemas <br>antiguos" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:45 +#: templates/web/base/report/new/form_report.html:15 msgid "One-line summary" msgstr "Resumen" @@ -1940,8 +1834,7 @@ msgstr "Resumen" #: templates/web/base/admin/report_blocks.html:4 #: templates/web/base/admin/update_edit.html:28 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/report/update-form.html:30 -#: templates/web/fixmystreet/report/update-form.html:28 +#: templates/web/base/report/update/form_update.html:34 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:7 #: templates/web/zurich/admin/update_edit.html:18 @@ -1956,15 +1849,15 @@ msgstr "Abierto por más de cuatro semanas, con una actualización en las últim msgid "Open, but not had any update in eight weeks" msgstr "Abierto, pero no ha sido actualizado en ocho semanas" -#: templates/web/base/open311/index.html:70 +#: templates/web/base/open311/index.html:62 msgid "Open311 API for the mySociety FixMyStreet server" msgstr "API Open311 para el servidor FixMyStreet de mySociety" -#: templates/web/base/open311/index.html:80 +#: templates/web/base/open311/index.html:72 msgid "Open311 initiative web page" msgstr "Página web de la iniciativa Open311" -#: templates/web/base/open311/index.html:81 +#: templates/web/base/open311/index.html:73 msgid "Open311 specification" msgstr "Especificación Open311" @@ -1976,15 +1869,15 @@ msgstr "O problemas notificados a:" msgid "Or you can subscribe to an alert based upon what ward or council you’re in:" msgstr "O puede suscribirse a una alerta basada en el barrio o ayuntamiento en que te encuentras:" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1084 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:673 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:674 -#: perllib/FixMyStreet/DB/Result/Problem.pm:570 -#: perllib/FixMyStreet/DB/Result/Problem.pm:580 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1055 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:669 +#: perllib/FixMyStreet/DB/Result/Problem.pm:558 +#: perllib/FixMyStreet/DB/Result/Problem.pm:568 +#: perllib/FixMyStreet/DB/Result/Problem.pm:578 #: perllib/FixMyStreet/DB/Result/Problem.pm:590 -#: perllib/FixMyStreet/DB/Result/Problem.pm:602 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:397 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:412 +#: perllib/FixMyStreet/Script/Reports.pm:175 +#: perllib/FixMyStreet/Script/Reports.pm:190 msgid "Other" msgstr "Otros" @@ -1993,7 +1886,7 @@ msgid "Owner" msgstr "Propietario" #: templates/web/base/errors/page_error_404_not_found.html:1 -#: templates/web/base/errors/page_error_404_not_found.html:3 +#: templates/web/base/errors/page_error_404_not_found.html:4 msgid "Page Not Found" msgstr "Página no encontrada" @@ -2007,16 +1900,16 @@ msgstr "Padre" msgid "Partial" msgstr "Parcial" -#: templates/web/base/auth/general.html:53 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:68 -#: templates/web/fixmystreet/report/update-form.html:116 +#: templates/web/base/auth/general.html:92 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:31 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:6 #: templates/web/zurich/auth/general.html:32 #: templates/web/zurich/auth/general.html:63 msgid "Password (optional)" msgstr "Contraseña (opcional)" #: templates/web/base/auth/change_password.html:25 -#: templates/web/base/auth/general.html:36 +#: templates/web/base/auth/general.html:72 msgid "Password:" msgstr "Contraseña:" @@ -2028,45 +1921,37 @@ msgstr "Enlace permanente" msgid "Phone number" msgstr "Número de teléfono" -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:26 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:62 +#: templates/web/base/report/new/form_user_loggedin.html:26 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:25 msgid "Phone number (optional)" msgstr "Número de teléfono (opcional)" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:306 +#: perllib/FixMyStreet/Script/Reports.pm:83 #: templates/web/base/admin/report_edit.html:63 -#: templates/web/base/report/new/fill_in_details_form.html:198 #: templates/web/zurich/admin/stats.html:39 msgid "Phone:" msgstr "Teléfono:" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:66 -#: templates/web/fixmystreet/report/update-form.html:59 +#: templates/web/base/questionnaire/index.html:75 +#: templates/web/base/report/new/form_report.html:23 +#: templates/web/base/report/update/form_update.html:6 #: templates/web/zurich/admin/index-dm.html:29 #: templates/web/zurich/admin/index-sdm.html:24 #: templates/web/zurich/admin/reports.html:16 #: templates/web/zurich/admin/stats.html:37 -#: templates/web/zurich/report/new/fill_in_details_form.html:52 +#: templates/web/zurich/report/new/fill_in_details_form.html:45 msgid "Photo" msgstr "Foto" -#: perllib/FixMyStreet/App/Controller/Photo.pm:221 -#, fuzzy +#: perllib/FixMyStreet/App/Controller/Photo.pm:187 msgid "Photo is required." -msgstr "Esta información es necesaria" +msgstr "" #: templates/web/base/admin/category_edit.html:48 -#, fuzzy msgid "Photo required" -msgstr "Esta información es necesaria" - -#: templates/web/base/questionnaire/index.html:80 -#: templates/web/base/report/new/fill_in_details_form.html:84 -#: templates/web/base/report/update-form.html:62 -msgid "Photo:" -msgstr "Foto:" +msgstr "" -#: templates/web/base/alert/list.html:26 +#: templates/web/base/alert/list.html:23 msgid "Photos of recent nearby reports" msgstr "Fotos de notificaciones cercanas recientes" @@ -2095,20 +1980,16 @@ msgstr "Por favor, sea cortés, conciso y vaya al grano." msgid "Please check the passwords and try again" msgstr "Por favor, comprueba la contraseña e inténtalo de nuevo" -#: templates/web/zurich/auth/token.html:16 -msgid "Please check your email" -msgstr "Por favor, consulte su email" - -#: templates/web/base/auth/general.html:10 -#: templates/web/base/auth/general.html:16 +#: templates/web/base/auth/general.html:27 +#: templates/web/base/auth/general.html:33 #: templates/web/zurich/auth/general.html:3 #: templates/web/zurich/auth/general.html:9 msgid "Please check your email address is correct" msgstr "Por favor, compruebe que su dirección de email es correcta" #: perllib/FixMyStreet/App/Controller/Admin.pm:343 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:883 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:948 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:878 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:943 #: perllib/FixMyStreet/DB/Result/Problem.pm:412 #: templates/web/base/js/translation_strings.html:9 msgid "Please choose a category" @@ -2122,30 +2003,29 @@ msgstr "Por favor, elija un tipo de propiedad" msgid "Please correct the errors below" msgstr "Por favor, corrija los errores a continuación" -#: templates/web/base/contact/blurb.html:2 -#: templates/web/fixmystreet/contact/blurb.html:12 -#, fuzzy +#: templates/web/base/contact/blurb.html:12 msgid "" "Please do <strong>not</strong> report problems through this form; messages go to\n" "the team behind this site, not a council. To report a problem,\n" "please <a href=\"/\">go to the front page</a> and follow the instructions." msgstr "" -"Por favor <strong>no</strong> notifique problemas con este formulario. \n" -"Los mensajes van\n" -"al equipo técnico que opera esta web, no a un ayuntamiento.\n" -"Para notificar un problema,\n" -"por favor <a href=\"/\">vaya a la página principal</a> y siga las instrucciones." #: templates/web/base/report/new/notes.html:6 msgid "Please do not be abusive — abusing your council devalues the service for all users." msgstr "Por favor notifique incidencias relevantes y no abuse; abusando de su ayuntamiento degrada su capacidad de servicio a toda la ciudadanÃa." #: perllib/FixMyStreet/App/Controller/Admin.pm:346 -#: perllib/FixMyStreet/DB/Result/Comment.pm:126 +#: perllib/FixMyStreet/DB/Result/Comment.pm:125 #: templates/web/base/js/translation_strings.html:2 msgid "Please enter a message" msgstr "Por favor escriba su mensaje." +#: perllib/FixMyStreet/App/Controller/Admin.pm:1091 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1146 +#, fuzzy +msgid "Please enter a name" +msgstr "Por favor, introduzca su nombre" + #: templates/web/base/auth/change_password.html:12 #: templates/web/base/auth/change_password.html:15 #: templates/web/base/js/translation_strings.html:19 @@ -2158,10 +2038,10 @@ msgstr "Por favor, introduzca una contraseña" msgid "Please enter a subject" msgstr "Por favor, introduzca un tÃtulo" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1084 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1137 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1087 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1142 #: perllib/FixMyStreet/App/Controller/Admin.pm:345 -#: perllib/FixMyStreet/DB/Result/User.pm:127 +#: perllib/FixMyStreet/DB/Result/User.pm:133 #: templates/web/base/js/translation_strings.html:12 #: templates/web/base/js/translation_strings.html:16 msgid "Please enter a valid email" @@ -2178,9 +2058,9 @@ msgid "Please enter some details" msgstr "Por favor, describa los detalles más relevantes" #: perllib/FixMyStreet/App/Controller/Contact.pm:113 -#: perllib/FixMyStreet/DB/Result/User.pm:124 -#: templates/web/base/auth/general.html:10 -#: templates/web/base/auth/general.html:15 +#: perllib/FixMyStreet/DB/Result/User.pm:130 +#: templates/web/base/auth/general.html:27 +#: templates/web/base/auth/general.html:32 #: templates/web/base/js/translation_strings.html:11 #: templates/web/base/js/translation_strings.html:15 #: templates/web/zurich/auth/general.html:3 @@ -2188,7 +2068,7 @@ msgstr "Por favor, describa los detalles más relevantes" msgid "Please enter your email" msgstr "Por favor, introduzca su dirección de email" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:7 +#: templates/web/base/report/new/form_user_loggedout_email.html:7 #: templates/web/zurich/report/new/fill_in_details_form.html:80 msgid "Please enter your email address" msgstr "Por favor introduzca su email" @@ -2197,15 +2077,15 @@ msgstr "Por favor introduzca su email" msgid "Please enter your first name" msgstr "Por favor, indique su nombre" -#: perllib/FixMyStreet/Cobrand/UK.pm:318 +#: perllib/FixMyStreet/Cobrand/UK.pm:319 #: templates/web/base/js/translation_strings.html:7 msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below" msgstr "Por favor escriba su nombre completo, ya que los ayuntamientos necesitan esta información. Si usted NO desea que su nombre aparecerá en la página, desactive la casilla de abajo" #: perllib/FixMyStreet/App/Controller/Contact.pm:112 -#: perllib/FixMyStreet/DB/Result/Comment.pm:123 +#: perllib/FixMyStreet/DB/Result/Comment.pm:122 #: perllib/FixMyStreet/DB/Result/Problem.pm:406 -#: perllib/FixMyStreet/DB/Result/User.pm:120 +#: perllib/FixMyStreet/DB/Result/User.pm:126 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter your name" msgstr "Por favor, introduzca su nombre" @@ -2232,12 +2112,11 @@ msgstr "Por favor, siéntase libre para <a href=\"%s\">acceder nuevamente</a> o msgid "Please fill in details of the problem below." msgstr "Por favor proporcione a continuación las informaciones sobre el problema." -#: templates/web/zurich/report/new/fill_in_details_form.html:46 +#: templates/web/zurich/report/new/fill_in_details_form.html:72 msgid "Please fill in details of the problem." msgstr "Por favor proporcione las informaciones sobre el problema." -#: templates/web/base/report/new/fill_in_details_form.html:28 -#: templates/web/fixmystreet/report/new/sidebar.html:7 +#: templates/web/base/report/new/sidebar.html:7 #: templates/web/zurich/report/new/fill_in_details_form.html:20 msgid "Please fill in the form below with details of the problem, and describe the location as precisely as possible in the details box." msgstr "Por favor, complete el siguiente formulario con los detalles del problema y describa la ubicación con la mayor precisión posible en el cuadro de detalles." @@ -2246,20 +2125,24 @@ msgstr "Por favor, complete el siguiente formulario con los detalles del problem msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "Por favor, indique si le gustarÃa recibir algún otro cuestionario" -#: templates/web/fixmystreet/report/updates-sidebar-notes.html:4 +#: templates/web/base/report/updates-sidebar-notes.html:2 msgid "Please note that updates are not sent to the council." msgstr "Tenga en cuenta que las actualizaciones no son enviadas al ayuntamiento." -#: templates/web/base/report/update-form.html:7 -msgid "Please note that updates are not sent to the council. If you leave your name it will be public. Your information will only be used in accordance with our <a href=\"/faq#privacy\">privacy policy</a>" -msgstr "Tenga en cuenta que las actualizaciones no se envÃan al ayuntamiento. Si usted deja su nombre será público. Su información sólo será usada de acuerdo con nuestra <a href=\"/faq#privacy\">polÃtica de privacidad</a>" +#: templates/web/base/report/new/oauth_email_form.html:4 +#, fuzzy +msgid "Please note your report has <strong>not yet been sent</strong>." +msgstr "Por favor, tenga en cuenta la notificación <strong>no ha sido enviada aún</strong>. Elija una categorÃa y añada más información a continuación antes de enviar." -#: templates/web/base/report/new/fill_in_details_form.html:8 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:21 +#: templates/web/base/report/new/fill_in_details_form.html:20 #: templates/web/zurich/report/new/fill_in_details_form.html:11 msgid "Please note your report has <strong>not yet been sent</strong>. Choose a category and add further information below, then submit." msgstr "Por favor, tenga en cuenta la notificación <strong>no ha sido enviada aún</strong>. Elija una categorÃa y añada más información a continuación antes de enviar." +#: templates/web/base/report/display.html:26 +msgid "Please note your update has <strong>not yet been posted</strong>." +msgstr "" + #: templates/web/base/report/new/notes.html:1 #: templates/web/zurich/report/new/notes.html:1 msgid "Please note:" @@ -2279,9 +2162,8 @@ msgid "Please say whether you've ever reported a problem to your council before" msgstr "Por favor, indique si ha notificado un problema al ayuntamiento alguna vez." #: templates/web/zurich/admin/report_edit.html:208 -#, fuzzy msgid "Please select a body." -msgstr "Selecciona un órgano administrativo" +msgstr "" #: perllib/FixMyStreet/App/Controller/Alert.pm:80 msgid "Please select the feed you want" @@ -2298,6 +2180,7 @@ msgstr "Por favor, indique si el problema se ha solucionado" #: perllib/FixMyStreet/App/Model/PhotoSet.pm:117 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:145 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:147 +#: templates/web/base/js/translation_strings.html:53 msgid "Please upload a JPEG image only" msgstr "Por favor, suba una imagen JPEG" @@ -2305,18 +2188,14 @@ msgstr "Por favor, suba una imagen JPEG" msgid "Please write a message" msgstr "Por favor, escriba un mensaje" -#: templates/web/fixmystreet/report/update-form.html:23 +#: templates/web/base/report/update/form_update.html:29 msgid "Please write your update here" msgstr "Por favor, escriba su actualización aquÃ" -#: templates/web/base/contact/index.html:100 -#: templates/web/base/report/update-form.html:110 -#: templates/web/base/report/update-form.html:132 -#: templates/web/base/report/update-form.html:72 -#: templates/web/fixmystreet/contact/index.html:113 -#: templates/web/fixmystreet/report/update-form.html:124 -#: templates/web/fixmystreet/report/update-form.html:71 -#: templates/web/fixmystreet/report/update-form.html:97 +#: templates/web/base/contact/index.html:105 +#: templates/web/base/report/update-form.html:24 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:14 +#: templates/web/base/report/update/form_user_loggedout_password.html:10 msgid "Post" msgstr "Publicar" @@ -2344,12 +2223,9 @@ msgstr "Previo" msgid "Privacy" msgstr "Privacidad" -#: templates/web/base/faq/faq-en-gb.html:7 -#: templates/web/base/open311/index.html:7 -#: templates/web/base/static/privacy.html:1 -#: templates/web/base/static/privacy.html:2 -#: templates/web/base/static/privacy.html:9 -#: templates/web/fixmystreet/contact/index.html:11 +#: templates/web/base/about/_sidebar.html:5 +#: templates/web/base/about/privacy.html:1 +#: templates/web/base/about/privacy.html:2 msgid "Privacy and cookies" msgstr "" @@ -2377,12 +2253,12 @@ msgstr "Problema %s confirmado" msgid "Problem %s sent to council %s" msgstr "Problema %s enviado al Ayuntamiento %s" -#: templates/web/base/admin/index.html:46 +#: templates/web/base/admin/index.html:39 #: templates/web/zurich/admin/index.html:9 msgid "Problem breakdown by state" msgstr "Desglose de problemas según estado" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1055 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1058 msgid "Problem marked as open." msgstr "Problema marcado como abierto." @@ -2398,11 +2274,11 @@ msgstr "Problemas" msgid "Problems in this area" msgstr "Problemas en este área" -#: templates/web/fixmystreet/report/display.html:43 +#: templates/web/base/report/display_tools.html:19 msgid "Problems nearby" msgstr "Problemas cercanos" -#: templates/web/fixmystreet/report/display.html:41 +#: templates/web/base/report/display_tools.html:17 msgid "Problems on the map" msgstr "Problemas en el mapa" @@ -2414,24 +2290,23 @@ msgstr "Problemas recientemente notificados como arreglados en FixMyStreet" msgid "Problems within %.1fkm of this location" msgstr "Problemas en %.1fkm alrededor" -#: perllib/FixMyStreet/Cobrand/Default.pm:642 +#: perllib/FixMyStreet/Cobrand/Default.pm:663 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:120 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:139 -#: perllib/FixMyStreet/Cobrand/UK.pm:207 +#: perllib/FixMyStreet/Cobrand/UK.pm:208 msgid "Problems within %s" msgstr "Problemas en %s" #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:128 -#: perllib/FixMyStreet/Cobrand/UK.pm:221 +#: perllib/FixMyStreet/Cobrand/UK.pm:222 msgid "Problems within %s ward" msgstr "Problemas en el barrio %s" #. ("First %s is the body name, second %s the site name") #: templates/web/base/reports/body.html:0 #: templates/web/base/reports/body.html:24 -#, fuzzy msgid "Problems within %s, %s" -msgstr "Problemas en %s" +msgstr "" #: templates/web/base/alert/_list.html:42 msgid "Problems within the boundary of:" @@ -2445,19 +2320,16 @@ msgstr "Dirección de la propiedad:" msgid "Property type:" msgstr "Tipo de propiedad:" -#: templates/web/base/report/update-form.html:3 -#: templates/web/fixmystreet/report/update-form.html:4 +#: templates/web/base/report/update-form.html:6 msgid "Provide an update" msgstr "Proporcionar una actualización" -#: templates/web/base/auth/general.html:56 +#: templates/web/base/auth/general.html:95 msgid "Providing a name and password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." msgstr "Proporcionar un nombre y una contraseña es opcional, pero hacerlo le permitirá notificar y actualizar los problemas más fácilmente, asà como administrar sus informes." -#: templates/web/base/report/new/fill_in_details_form.html:156 -#: templates/web/base/report/update-form.html:129 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:71 -#: templates/web/fixmystreet/report/update-form.html:119 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:34 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:9 msgid "Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." msgstr "Proporcionar una contraseña es opcional, pero hacerlo le permitirá notificar y actualizar los problemas más fácilmente, asà como administrar sus informes." @@ -2493,18 +2365,17 @@ msgstr "Cuestionario cumplimentado por el notificador problema" #: templates/web/base/alert/_list.html:22 #: templates/web/base/around/display_location.html:1 #: templates/web/base/around/display_location.html:3 -#: templates/web/base/report/display.html:50 +#: templates/web/base/report/display_tools.html:34 #: templates/web/base/reports/_rss.html:1 #: templates/web/fixmystreet/alert/updates.html:9 -#: templates/web/fixmystreet/report/display.html:58 msgid "RSS feed" msgstr "Listado RSS" -#: perllib/FixMyStreet/Cobrand/UK.pm:250 perllib/FixMyStreet/Cobrand/UK.pm:262 +#: perllib/FixMyStreet/Cobrand/UK.pm:251 perllib/FixMyStreet/Cobrand/UK.pm:263 msgid "RSS feed for %s" msgstr "Listado RSS para %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:256 perllib/FixMyStreet/Cobrand/UK.pm:268 +#: perllib/FixMyStreet/Cobrand/UK.pm:257 perllib/FixMyStreet/Cobrand/UK.pm:269 msgid "RSS feed for %s ward, %s" msgstr "Listado RSS para %s del barrio, %s" @@ -2512,11 +2383,11 @@ msgstr "Listado RSS para %s del barrio, %s" #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:163 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:173 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:181 -#: perllib/FixMyStreet/Cobrand/UK.pm:276 perllib/FixMyStreet/Cobrand/UK.pm:288 +#: perllib/FixMyStreet/Cobrand/UK.pm:277 perllib/FixMyStreet/Cobrand/UK.pm:289 msgid "RSS feed of %s" msgstr "Listado RSS para %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:281 perllib/FixMyStreet/Cobrand/UK.pm:293 +#: perllib/FixMyStreet/Cobrand/UK.pm:282 perllib/FixMyStreet/Cobrand/UK.pm:294 msgid "RSS feed of %s, within %s ward" msgstr "Listado RSS para %s, en el barrio %s" @@ -2528,15 +2399,15 @@ msgstr "Listado RSS de los problemas cercanos" msgid "RSS feed of problems in this %s" msgstr "Listado RSS de los problemas en este %s" -#: perllib/FixMyStreet/Cobrand/Default.pm:643 +#: perllib/FixMyStreet/Cobrand/Default.pm:664 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:121 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:138 -#: perllib/FixMyStreet/Cobrand/UK.pm:214 +#: perllib/FixMyStreet/Cobrand/UK.pm:215 msgid "RSS feed of problems within %s" msgstr "Listado RSS de los problemas dentro de %s" #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:127 -#: perllib/FixMyStreet/Cobrand/UK.pm:220 +#: perllib/FixMyStreet/Cobrand/UK.pm:221 msgid "RSS feed of problems within %s ward" msgstr "Listado RSS de los problemas dentro del barrio %s" @@ -2545,25 +2416,22 @@ msgstr "Listado RSS de los problemas dentro del barrio %s" msgid "RSS feed of recent local problems" msgstr "Listado RSS de los problemas locales más recientes" -#: templates/web/base/report/display.html:50 +#: templates/web/base/report/display_tools.html:34 #: templates/web/fixmystreet/alert/updates.html:9 -#: templates/web/fixmystreet/report/display.html:58 msgid "RSS feed of updates to this problem" msgstr "Listado RSS de actualizaciones sobre este problema" #: templates/web/base/alert/updates.html:9 -#: templates/web/base/report/display.html:41 +#: templates/web/base/report/display_tools.html:36 #: templates/web/fixmystreet/alert/updates.html:14 -#: templates/web/fixmystreet/report/display.html:60 msgid "Receive email when updates are left on this problem." msgstr "Reciba un correo cuando se dejen actualizaciones sobre este problema." #. ("%s is the site name") #: templates/web/base/around/display_location.html:0 #: templates/web/base/around/display_location.html:33 -#, fuzzy msgid "Recent local problems, %s" -msgstr "Problemas locales recientes, FixMyStreet" +msgstr "" #: templates/web/base/reports/index.html:24 msgid "Recently <br>fixed" @@ -2581,16 +2449,15 @@ msgstr "Recuerde que FixMyStreet es principalmente para informar sobre problemas msgid "Remove flag" msgstr "Eliminar marca" -#: templates/web/base/admin/report_edit.html:92 -#: templates/web/base/admin/update_edit.html:62 +#: templates/web/base/admin/report_edit.html:93 +#: templates/web/base/admin/update_edit.html:67 #: templates/web/zurich/admin/update_edit.html:35 msgid "Remove photo (can't be undone!)" msgstr "Quitar foto (¡no se puede deshacer!)" #: templates/web/zurich/admin/report_edit.html:243 -#, fuzzy msgid "Reply to user:" -msgstr "editar usuario" +msgstr "" #: templates/web/fixmystreet/header_logo.html:2 msgid "Report" @@ -2603,7 +2470,7 @@ msgstr "Notificar" msgid "Report a problem" msgstr "Notificar un problema" -#: templates/web/fixmystreet/report/display.html:32 +#: templates/web/base/report/display_tools.html:8 msgid "Report abuse" msgstr "Denunciar abuso" @@ -2612,7 +2479,8 @@ msgid "Report on %s" msgstr "Notificar sobre %s" #: templates/web/base/report/new/fill_in_details_form.html:1 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:2 +#: templates/web/base/report/new/login_success_form.html:1 +#: templates/web/base/report/new/oauth_email_form.html:1 msgid "Report your problem" msgstr "Notifique su incidencia" @@ -2621,9 +2489,8 @@ msgstr "Notifique su incidencia" msgid "Report, view, or discuss local problems" msgstr "Notifique, consulte o discuta problemas locales" -#: perllib/FixMyStreet/DB/Result/Problem.pm:585 -#: templates/web/base/contact/index.html:50 -#: templates/web/fixmystreet/contact/index.html:65 +#: perllib/FixMyStreet/DB/Result/Problem.pm:573 +#: templates/web/base/contact/index.html:57 msgid "Reported anonymously at %s" msgstr "Notificado anónimamente en %s" @@ -2632,43 +2499,41 @@ msgstr "Notificado anónimamente en %s" msgid "Reported before" msgstr "Notificado con anterioridad" -#: perllib/FixMyStreet/DB/Result/Problem.pm:608 -#: templates/web/base/contact/index.html:52 -#: templates/web/fixmystreet/contact/index.html:67 +#: perllib/FixMyStreet/DB/Result/Problem.pm:596 +#: templates/web/base/contact/index.html:59 msgid "Reported by %s at %s" msgstr "Notificado por %s en %s" #: templates/web/zurich/admin/report_edit-sdm.html:58 #: templates/web/zurich/admin/report_edit.html:86 -#, fuzzy msgid "Reported by:" -msgstr "Notificado %s" +msgstr "" #: templates/web/zurich/report/_main.html:2 msgid "Reported in the %s category" msgstr "Notificado en la categorÃa %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:581 +#: perllib/FixMyStreet/DB/Result/Problem.pm:569 msgid "Reported in the %s category anonymously at %s" msgstr "Notificado anónimamente en la categorÃa %s en %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:603 +#: perllib/FixMyStreet/DB/Result/Problem.pm:591 msgid "Reported in the %s category by %s at %s" msgstr "Notificado en la categorÃa %s por %s en %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:577 +#: perllib/FixMyStreet/DB/Result/Problem.pm:565 msgid "Reported via %s anonymously at %s" msgstr "Notificado anónimamente vÃa %s en %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:599 +#: perllib/FixMyStreet/DB/Result/Problem.pm:587 msgid "Reported via %s by %s at %s" msgstr "Notificado vÃa %s por %s en %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:573 +#: perllib/FixMyStreet/DB/Result/Problem.pm:561 msgid "Reported via %s in the %s category anonymously at %s" msgstr "Notificado anónimamente vÃa %s en la categorÃa %s en %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:593 +#: perllib/FixMyStreet/DB/Result/Problem.pm:581 msgid "Reported via %s in the %s category by %s at %s" msgstr "Notificado vÃa %s en la categorÃa %s por %s en %s" @@ -2678,9 +2543,8 @@ msgstr "Notificado en las últimas cuatro semanas" #: templates/web/zurich/admin/report_edit-sdm.html:36 #: templates/web/zurich/admin/report_edit.html:55 -#, fuzzy msgid "Reported:" -msgstr "Notificado %s" +msgstr "" #: templates/web/base/around/index.html:2 #: templates/web/base/js/translation_strings.html:41 @@ -2690,13 +2554,13 @@ msgstr "Notificado %s" msgid "Reporting a problem" msgstr "Notificando un problema" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1277 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1286 #: perllib/FixMyStreet/Cobrand/Zurich.pm:384 #: templates/web/zurich/header.html:60 msgid "Reports" msgstr "Notificaciones" -#: perllib/FixMyStreet/Cobrand/UK.pm:327 perllib/FixMyStreet/Cobrand/UK.pm:331 +#: perllib/FixMyStreet/Cobrand/UK.pm:328 perllib/FixMyStreet/Cobrand/UK.pm:332 msgid "Reports are limited to %s characters in length. Please shorten your report" msgstr "Las notificaciones tienen una longitud máxima de %s. Por favor, acorte su notificación." @@ -2733,15 +2597,17 @@ msgstr "Operador responsable de este camino (derivado del número de referencia msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "Operador responsable de este camino (de OpenStreetMap): %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1495 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1500 -#: templates/web/base/admin/report_edit.html:88 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1508 +#: templates/web/base/admin/report_edit.html:90 +#: templates/web/base/admin/update_edit.html:64 #: templates/web/zurich/admin/report_edit.html:116 msgid "Rotate Left" msgstr "Rotar a la izquierda" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1495 -#: templates/web/base/admin/report_edit.html:89 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 +#: templates/web/base/admin/report_edit.html:91 +#: templates/web/base/admin/update_edit.html:65 #: templates/web/zurich/admin/report_edit.html:117 msgid "Rotate Right" msgstr "Rotar a la derecha" @@ -2751,7 +2617,6 @@ msgid "Rotating this photo will discard unsaved changes to the report." msgstr "" #: templates/web/base/js/translation_strings.html:46 -#: templates/web/base/maps/google-ol.html:13 msgid "Satellite" msgstr "Satélite" @@ -2804,16 +2669,14 @@ msgid "Select an area" msgstr "Seleccione un área" #: templates/web/base/alert/_list.html:10 -#, fuzzy msgid "Select which type of alert you’d like and click the button for an RSS feed, or enter your email address to subscribe to an email alert." -msgstr "Seleccione el tipo de alerta que desea y haga clic en el botón correspondiente a un feed RSS o introduzca su dirección de e-mail para suscribirse a alerta por correo electrónico." +msgstr "" #: perllib/FixMyStreet/Cobrand/Zurich.pm:835 -#, fuzzy msgid "Sent report back" -msgstr "Notificaciones abiertas" +msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:708 +#: perllib/FixMyStreet/DB/Result/Problem.pm:696 msgid "Sent to %s %s later" msgstr "Enviado a %s %s después" @@ -2826,15 +2689,13 @@ msgstr "Enviado:" msgid "Service:" msgstr "Servicio:" -#: templates/web/fixmystreet/report/display.html:38 +#: templates/web/base/report/display_tools.html:14 msgid "Share" msgstr "Compartir" -#: templates/web/base/report/new/fill_in_details_form.html:193 -#: templates/web/base/report/update-form.html:158 -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:23 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:59 -#: templates/web/fixmystreet/report/update-form.html:146 +#: templates/web/base/report/new/form_user_loggedin.html:23 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:22 +#: templates/web/base/report/update/form_name.html:15 msgid "Show my name publicly" msgstr "Mostrar mi nombre públicamente" @@ -2846,9 +2707,9 @@ msgstr "Mostrar antiguos" msgid "Show pins" msgstr "Mostrar marcadores" +#: templates/web/base/auth/general.html:100 #: templates/web/base/auth/general.html:3 -#: templates/web/base/auth/general.html:40 -#: templates/web/base/auth/general.html:61 +#: templates/web/base/auth/general.html:76 #: templates/web/zurich/auth/general.html:18 #: templates/web/zurich/auth/general.html:35 msgid "Sign in" @@ -2877,7 +2738,7 @@ msgstr "" "Algunos puntos finales requieren una clave de <strong>API</ strong> para indicar que las notificaciones provienen\n" "de tu sistema FixMyStreet." -#: templates/web/base/alert/index.html:42 +#: templates/web/base/alert/index.html:40 msgid "Some photos of recent reports" msgstr "Algunas fotos de notificaciones recientes" @@ -2887,7 +2748,7 @@ msgstr "Algunas fotos de notificaciones recientes" msgid "Some text to localize" msgstr "Algún texto para localizar" -#: perllib/FixMyStreet/Cobrand/UK.pm:78 +#: perllib/FixMyStreet/Cobrand/UK.pm:79 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover." msgstr "Lo sentimos, ése parece ser un código postal dependiente de La Corona, que no soportamos." @@ -2899,23 +2760,34 @@ msgstr "" msgid "Sorry, there has been an error confirming your problem." msgstr "Lo sentimos, hubo un error confirmando su notificación." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:221 -#: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:37 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:216 +#: perllib/FixMyStreet/Geocode.pm:38 perllib/FixMyStreet/Geocode/Bing.pm:38 #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:56 #: perllib/FixMyStreet/Geocode/OSM.pm:48 msgid "Sorry, we could not find that location." msgstr "Lo sentimos, no hemos podido encontrar ese lugar." -#: perllib/FixMyStreet/Geocode/Bing.pm:34 +#: templates/web/base/auth/general.html:9 +#: templates/web/base/report/display.html:21 +#: templates/web/base/report/new/fill_in_details_form.html:23 +#, fuzzy +msgid "Sorry, we could not log you in. Please fill in the form below." +msgstr "Lo sentimos, pero no pudo analizar esa ubicación. Por favor, inténtelo de nuevo." + +#: perllib/FixMyStreet/Geocode/Bing.pm:35 #: perllib/FixMyStreet/Geocode/Google.pm:45 #: perllib/FixMyStreet/Geocode/Zurich.pm:88 msgid "Sorry, we could not parse that location. Please try again." msgstr "Lo sentimos, pero no pudo analizar esa ubicación. Por favor, inténtelo de nuevo." #: perllib/FixMyStreet/App/Model/PhotoSet.pm:134 -#, fuzzy msgid "Sorry, we couldn't save your image(s), please try again." -msgstr "Lo sentimos, pero no pudo analizar esa ubicación. Por favor, inténtelo de nuevo." +msgstr "" + +#: perllib/FixMyStreet/App/Controller/AuthSS.pm:301 +#, fuzzy +msgid "Sorry, you can not log in with Facebook. Please try again later." +msgstr "Hubo un problema mostrando esta página. Por favor, inténtelo de nuevo más tarde." #: templates/web/base/admin/stats.html:64 msgid "Start Date:" @@ -2925,13 +2797,12 @@ msgstr "Fecha de inicio:" #: templates/web/base/admin/flagged.html:18 #: templates/web/base/admin/list_updates.html:11 #: templates/web/base/admin/reports.html:15 -#: templates/web/fixmystreet/report/update-form.html:26 +#: templates/web/base/report/update/form_update.html:32 msgid "State" msgstr "Estado" #: templates/web/base/admin/report_edit.html:47 #: templates/web/base/admin/update_edit.html:27 -#: templates/web/base/report/update-form.html:28 #: templates/web/zurich/admin/report_edit-sdm.html:73 #: templates/web/zurich/admin/report_edit.html:101 #: templates/web/zurich/admin/report_edit.html:155 @@ -2939,7 +2810,7 @@ msgstr "Estado" msgid "State:" msgstr "Estado/Prov.:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1282 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1291 #: perllib/FixMyStreet/Cobrand/Zurich.pm:387 #: templates/web/base/admin/stats.html:1 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:73 @@ -2961,7 +2832,7 @@ msgstr "Sigue abierta, a través de cuestionario, %s" msgid "Street View" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:406 +#: perllib/FixMyStreet/Script/Reports.pm:184 msgid "Subcategory: %s" msgstr "Subcategoria: %s" @@ -2969,30 +2840,25 @@ msgstr "Subcategoria: %s" msgid "Subdivision/Body" msgstr "Subdivisión/Órgano" -#: templates/web/fixmystreet/contact/index.html:98 +#: templates/web/base/contact/index.html:90 msgid "Subject" msgstr "TÃtulo" #: templates/web/base/admin/report_edit.html:19 -#: templates/web/base/contact/index.html:88 -#: templates/web/base/report/new/fill_in_details_form.html:53 #: templates/web/zurich/admin/report_edit.html:39 msgid "Subject:" msgstr "TÃtulo:" #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/fill_in_details_form.html:137 -#: templates/web/base/report/new/fill_in_details_form.html:159 -#: templates/web/base/report/new/fill_in_details_form.html:96 -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:36 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:23 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:76 +#: templates/web/base/report/new/form_user_loggedin.html:36 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:39 +#: templates/web/base/report/new/form_user_loggedout_password.html:11 #: templates/web/zurich/report/new/fill_in_details_form.html:96 msgid "Submit" msgstr "Enviar" -#: templates/web/base/admin/report_edit.html:95 -#: templates/web/base/admin/update_edit.html:65 +#: templates/web/base/admin/report_edit.html:101 +#: templates/web/base/admin/update_edit.html:75 #: templates/web/base/admin/user-form.html:56 #: templates/web/zurich/admin/report_edit-sdm.html:137 #: templates/web/zurich/admin/report_edit.html:268 @@ -3000,7 +2866,7 @@ msgstr "Enviar" msgid "Submit changes" msgstr "Enviar cambios" -#: templates/web/base/questionnaire/index.html:97 +#: templates/web/base/questionnaire/index.html:106 msgid "Submit questionnaire" msgstr "Enviar cuestionario" @@ -3016,9 +2882,8 @@ msgid "Submitted" msgstr "Enviado" #: templates/web/base/alert/updates.html:17 -#: templates/web/base/report/display.html:46 +#: templates/web/base/report/display_tools.html:41 #: templates/web/fixmystreet/alert/updates.html:23 -#: templates/web/fixmystreet/report/display.html:65 msgid "Subscribe" msgstr "Suscribirse" @@ -3026,7 +2891,7 @@ msgstr "Suscribirse" msgid "Subscribe me to an email alert" msgstr "SuscrÃbeme a alertas por email" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1275 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1284 #: perllib/FixMyStreet/Cobrand/Zurich.pm:383 #: templates/web/base/admin/bodies.html:25 #: templates/web/base/admin/index.html:1 @@ -3045,7 +2910,7 @@ msgstr "Resumen" msgid "Summary reports" msgstr "Resumen de notificaciones" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1279 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1288 msgid "Survey" msgstr "Encuesta" @@ -3059,9 +2924,8 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/Zurich.pm:394 #: templates/web/zurich/header.html:77 -#, fuzzy msgid "Templates" -msgstr "Actualizaciones" +msgstr "" #: templates/web/base/admin/list_updates.html:12 #: templates/web/zurich/admin/templates.html:9 @@ -3082,7 +2946,7 @@ msgstr "Texto:" msgid "Thank you for reporting this issue!" msgstr "¡Gracias por notificar esta incidencia!" -#: templates/web/base/tokens/error.html:7 +#: templates/web/base/tokens/error.html:6 msgid "Thank you for trying to confirm your update or problem. We seem to have an error ourselves though, so <a href=\"%s\">please let us know what went on</a> and we'll look into it." msgstr "Gracias por tratar de confirmar la actualización o problema. Parece que tenemos un error interno, asà que <a href=\"%s\"> por favor, háganos saber lo que pasó </a> y echaremos un vistazo." @@ -3117,23 +2981,23 @@ msgstr "Esa localización no parece ser de UK, por favor inténtelo de nuevo." #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:47 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:63 -#: perllib/FixMyStreet/Cobrand/UK.pm:71 +#: perllib/FixMyStreet/Cobrand/UK.pm:72 msgid "That postcode was not recognised, sorry." msgstr "Ese código postal no fue reconocido, lo siento." -#: perllib/FixMyStreet/App/Controller/Admin.pm:726 +#: perllib/FixMyStreet/App/Controller/Admin.pm:724 msgid "That problem has been marked as sent." msgstr "El problema se ha marcado como enviado." -#: perllib/FixMyStreet/App/Controller/Admin.pm:718 +#: perllib/FixMyStreet/App/Controller/Admin.pm:716 msgid "That problem will now be resent." msgstr "El problema ahora será reenviado." -#: perllib/FixMyStreet/App/Controller/Report.pm:125 +#: perllib/FixMyStreet/App/Controller/Report.pm:127 msgid "That report cannot be viewed on %s." msgstr "Esa notificación no se puede ver en %s." -#: perllib/FixMyStreet/App/Controller/Report.pm:119 +#: perllib/FixMyStreet/App/Controller/Report.pm:121 msgid "That report has been removed from FixMyStreet." msgstr "Esa notificación ha sido eliminada de FixMyStreet." @@ -3170,7 +3034,7 @@ msgstr "" "El <strong>método de envÃo</strong> determina como serán enviados las notificaciones al organismo.\n" "Si está en blanco, el método de envÃo por defecto será por <strong>email</strong>." -#: templates/web/base/open311/index.html:90 +#: templates/web/base/open311/index.html:82 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 "El atributo Open311 v2 agency_responsible se utiliza para listar las administraciones que han recibido la notificación de problemas, que no es exactamente la forma en que se define dicho atributo en la especificación Open311 v2." @@ -3193,12 +3057,12 @@ msgstr "El ayuntamiento necesita la mayor cantidad de detalles posibles para ate msgid "The diligency prize league table shows editors' activity (who's been editing the most records)." msgstr "Los premios a la responsabilidad muestran la actividad de los editores (quién ha editado más registros)." -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:60 -#: perllib/FixMyStreet/App/Controller/Reports.pm:79 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:61 +#: perllib/FixMyStreet/App/Controller/Reports.pm:80 msgid "The error was: %s" msgstr "El error fue: %s" -#: templates/web/base/open311/index.html:86 +#: templates/web/base/open311/index.html:78 msgid "The following Open311 v2 attributes are returned for each request: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code and service_name." msgstr "Los siguientes atributos Open311 v2 son devueltos para cada petición: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code y service_name." @@ -3245,8 +3109,7 @@ msgstr "La lista de áreas disponibles está siendo ofrecida por el servicio Map msgid "The passwords do not match" msgstr "Las contraseñas no coinciden." -#: templates/web/base/errors/page_error_404_not_found.html:10 -#: templates/web/base/errors/page_error_404_not_found.html:12 +#: templates/web/base/errors/page_error_404_not_found.html:9 msgid "The requested URL '%s' was not found on this server" msgstr "La URL solicitada, '%s', no fue encontrada en el servidor" @@ -3256,12 +3119,11 @@ msgstr "La alerta más sencilla es nuestra alerta geográfica:" #: templates/web/base/report/new/councils_extra_text.html:1 #: templates/web/base/report/new/councils_text_some.html:10 -#: templates/web/base/report/new/fill_in_details_form.html:18 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:14 +#: templates/web/base/report/new/fill_in_details_form.html:13 msgid "The summary and description will also be made public (see our <a href=\"/privacy\">privacy policy</a>)." msgstr "El resumen y la descripción también se harán públicos (consulte nuestra <a href=\"/privacy\">polÃtica de privacidad</a>)." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:315 +#: perllib/FixMyStreet/Script/Reports.pm:92 msgid "The user could not locate the problem on a map, but to see the area around the location they entered" msgstr "El usuario no pudo situar el problema en el mapa, salvo para ver el área alrededor de la localización que introdujo." @@ -3280,18 +3142,18 @@ msgstr "" msgid "There are no reports to show." msgstr "No hay ninguna notificación que mostrar." -#: perllib/FixMyStreet/App/Controller/Reports.pm:76 +#: perllib/FixMyStreet/App/Controller/Reports.pm:77 msgid "There was a problem showing the All Reports page. Please try again later." msgstr "Hubo un problema mostrando la página de Todas las Notificaciones. Por favor, inténtelo de nuevo más tarde." #: perllib/FixMyStreet/App/Controller/Contact.pm:137 -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:59 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:60 msgid "There was a problem showing this page. Please try again later." msgstr "Hubo un problema mostrando esta página. Por favor, inténtelo de nuevo más tarde." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:769 -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:134 -#: templates/web/base/auth/general.html:26 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:764 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:138 +#: templates/web/base/auth/general.html:43 #: templates/web/zurich/auth/general.html:28 msgid "There was a problem with your email/password combination. If you cannot remember your password, or do not have one, please fill in the ‘sign in by email’ section of the form." msgstr "Hubo un problema con su email/contraseña. Si no recuerda o no tiene contraseña, por favor rellene la sección 'registrarme con email' del formulario." @@ -3300,7 +3162,7 @@ msgstr "Hubo un problema con su email/contraseña. Si no recuerda o no tiene con msgid "There was a problem with your email/password combination. Please try again." msgstr "Hubo un problema con su email/contraseña. Por favor, inténtelo de nuevo." -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:272 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:336 msgid "There was a problem with your update. Please try again." msgstr "Hubo un problema con su actualización. Por favor, inténtelo de nuevo." @@ -3308,7 +3170,7 @@ msgstr "Hubo un problema con su actualización. Por favor, inténtelo de nuevo." msgid "There were problems with your report. Please see below." msgstr "Hubo problemas con su notificación. Por favor, vea más abajo." -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:300 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:371 msgid "There were problems with your update. Please see below." msgstr "Hubo problemas con su actualización. Por favor, vea más abajo." @@ -3326,7 +3188,7 @@ msgstr "" "Para obtener más información sobre Open311, consulte\n" "<a href='https://www.mysociety.org/2013/01/17/open311-explained/' class='admin-offsite-link'>este documento</a>." -#: templates/web/base/open311/index.html:77 +#: templates/web/base/open311/index.html:69 msgid "This API implementation is work in progress and not yet stabilized. It will change without warnings in the future." msgstr "Esta implementación de la API es un trabajo aún en progreso y no es estable todavÃa. Se cambiará sin advertencias en el futuro." @@ -3353,18 +3215,18 @@ msgstr "" "A este organismo sólo se enviarán informes de problemas que se encuentran en el <strong>área cubierta</strong>.\n" "Un organismo no recibirá ningún informe salvo que represente al menos un área." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:413 +#: perllib/FixMyStreet/Script/Reports.pm:191 msgid "This email has been sent to both councils covering the location of the problem, as the user did not categorise it; please ignore it if you're not the correct council to deal with the issue, or let us know what category of problem this is so we can add it to our system." msgstr "Este correo electrónico ha sido enviado a los dos ayuntamientos que cubren la ubicación del problema, ya que el usuario no lo categorizó. Por favor, haga caso omiso del mismo si usted no es el organismo administrativo responsable de este problema, o háganos saber qué clase de problema es para que lo podamos añadir a nuestro sistema." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:416 +#: perllib/FixMyStreet/Script/Reports.pm:194 msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue." msgstr "Este correo electrónico ha sido enviado a varios consejos que cubren la ubicación del problema, pues la categorÃa de problema seleccionada por el usuario se proporciona para todos ellos. Por favor, si usted no pertenece al órgano administrativo responsable de resolver esta incidencia haga caso omiso de este mensaje." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:925 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:995 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:920 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:990 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:142 -#: perllib/FixMyStreet/Cobrand/UK.pm:43 +#: perllib/FixMyStreet/Cobrand/UK.pm:44 msgid "This information is required" msgstr "Esta información es necesaria" @@ -3376,56 +3238,37 @@ msgstr "Este es un sitio para desarrolladores, las cosas podrÃan romperse en cu msgid "This is a summary of all reports on this site." msgstr "Este es un resumen de todos los informes en esta web." -#: templates/web/zurich/auth/token.html:8 -msgid "This may be because the link is too old or already used, or the address was not copied correctly." -msgstr "Esto puede deberse a que el enlace es demasiado antiguo o ya utilizado, o a que la dirección no se haya copiado correctamente." - -#: templates/web/base/report/banner.html:15 -msgid "This problem has been closed" -msgstr "Este problema ha sido cerrado" - -#: templates/web/base/report/banner.html:12 -#: templates/web/base/report/update-form.html:48 -#: templates/web/fixmystreet/report/update-form.html:46 +#: templates/web/base/report/update/form_update.html:52 msgid "This problem has been fixed" msgstr "Este problema se ha arreglado" -#: templates/web/base/report/update-form.html:43 -#: templates/web/fixmystreet/report/update-form.html:40 +#: templates/web/base/report/update/form_update.html:46 msgid "This problem has not been fixed" msgstr "Este problema no se ha arreglado" -#: templates/web/base/report/banner.html:19 -msgid "This problem is in progress" -msgstr "Este problema se encuentra en progreso" - -#: templates/web/base/report/banner.html:9 -msgid "This problem is old and of unknown status." -msgstr "Este problema es antiguo y de estatus desconocido." - #: perllib/FixMyStreet/Cobrand/Zurich.pm:168 #: perllib/FixMyStreet/Cobrand/Zurich.pm:169 #: templates/web/zurich/report/_main.html:14 msgid "This report is awaiting moderation." msgstr "Esta notificación está pendiente de moderación." -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:86 +#: perllib/FixMyStreet/Script/Alerts.pm:94 msgid "This report is currently marked as closed." msgstr "Esta notificación está marcada como cerrada." -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:84 +#: perllib/FixMyStreet/Script/Alerts.pm:92 msgid "This report is currently marked as fixed." msgstr "Esta notificación está marcada como arreglada." -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:88 +#: perllib/FixMyStreet/Script/Alerts.pm:96 msgid "This report is currently marked as open." msgstr "Esta notificación está marcada como abierta." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:326 +#: perllib/FixMyStreet/Script/Reports.pm:105 msgid "This report was submitted anonymously" msgstr "Esta notificación se ha presentado de forma anónima." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:308 +#: perllib/FixMyStreet/Script/Reports.pm:85 msgid "This web page also contains a photo of the problem, provided by the user." msgstr "Esta página web también contiene una foto del problema, proporcionada por el usuario." @@ -3436,7 +3279,7 @@ msgstr "Esta página web también contiene una foto del problema, proporcionada msgid "Time spent (in minutes):" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1278 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1287 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "CronologÃa" @@ -3448,24 +3291,22 @@ msgid "Title" msgstr "TÃtulo" #: templates/web/zurich/admin/template_edit.html:20 -#, fuzzy msgid "Title:" -msgstr "TÃtulo" +msgstr "" #: templates/web/base/alert/index.html:25 -#, fuzzy msgid "To find out what local alerts we have for you, please enter your %s postcode or street name and area:" -msgstr "Para saber cuáles son las alertas locales que tenemos para usted, por favor introduzca su código postal o el nombre de la calle y el área" +msgstr "" #: templates/web/base/alert/index.html:27 msgid "To find out what local alerts we have for you, please enter your postcode or street name and area" msgstr "Para saber cuáles son las alertas locales que tenemos para usted, por favor introduzca su código postal o el nombre de la calle y el área" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:314 +#: perllib/FixMyStreet/Script/Reports.pm:91 msgid "To view a map of the precise location of this issue" msgstr "Para ver un mapa de la ubicación precisa de este problema" -#: templates/web/base/admin/index.html:61 +#: templates/web/base/admin/index.html:54 #: templates/web/base/admin/questionnaire.html:24 #: templates/web/base/admin/stats.html:24 #: templates/web/base/admin/stats.html:43 @@ -3483,10 +3324,8 @@ msgstr "Pruebe enviándonos un correo directamente:" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:12 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:33 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:31 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:37 msgid "Unable to fix" msgstr "Incapaz de arreglarlo" @@ -3499,7 +3338,7 @@ msgstr "Incapaz de arreglarlo" msgid "Unconfirmed" msgstr "Sin confirmar" -#: templates/web/fixmystreet/report/banner.html:9 +#: templates/web/base/report/banner.html:9 msgid "Unknown" msgstr "Desconocido" @@ -3507,17 +3346,18 @@ msgstr "Desconocido" msgid "Unknown alert type" msgstr "Tipo de alerta desconocida" +#: perllib/FixMyStreet/App/Controller/Photo.pm:110 #: templates/web/base/js/translation_strings.html:39 msgid "Unknown error" msgstr "Error desconocido" -#: perllib/FixMyStreet/App/Controller/Report.pm:103 -#: perllib/FixMyStreet/App/Controller/Report.pm:109 -#: perllib/FixMyStreet/App/Controller/Report.pm:112 +#: perllib/FixMyStreet/App/Controller/Report.pm:105 +#: perllib/FixMyStreet/App/Controller/Report.pm:111 +#: perllib/FixMyStreet/App/Controller/Report.pm:114 msgid "Unknown problem ID" msgstr "ID de problema desconocido" -#: templates/web/fixmystreet/report/update-form.html:19 +#: templates/web/base/report/update/form_update.html:25 msgid "Update" msgstr "Actualizar" @@ -3525,13 +3365,11 @@ msgstr "Actualizar" msgid "Update %s created for problem %d; by %s" msgstr "Actualización %s creada para el problema %d; por %s" -#: templates/web/base/contact/index.html:21 -#: templates/web/fixmystreet/contact/index.html:36 +#: templates/web/base/contact/index.html:28 msgid "Update below added anonymously at %s" msgstr "La actualización de abajo fue añadida de forma anónima en %s" -#: templates/web/base/contact/index.html:23 -#: templates/web/fixmystreet/contact/index.html:38 +#: templates/web/base/contact/index.html:30 msgid "Update below added by %s at %s" msgstr "La actualización de abajo fue añadida por %s en %s" @@ -3540,7 +3378,7 @@ msgstr "La actualización de abajo fue añadida por %s en %s" msgid "Update body" msgstr "Actualizar órgano" -#: templates/web/base/admin/index.html:55 +#: templates/web/base/admin/index.html:48 msgid "Update breakdown by state" msgstr "Actualizar desglose por estado" @@ -3565,20 +3403,16 @@ msgstr "La actualización reabrió el problema" msgid "Update statuses" msgstr "Actualización de estados" -#: templates/web/base/report/update-form.html:22 -msgid "Update:" -msgstr "Actualizar:" - #: templates/web/zurich/admin/index-dm.html:23 #: templates/web/zurich/admin/index-sdm.html:21 #: templates/web/zurich/admin/reports.html:13 msgid "Updated" msgstr "Actualizado" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1045 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1103 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1147 -#: perllib/FixMyStreet/App/Controller/Admin.pm:822 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1048 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1108 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1156 +#: perllib/FixMyStreet/App/Controller/Admin.pm:821 #: perllib/FixMyStreet/Cobrand/Zurich.pm:771 #: perllib/FixMyStreet/Cobrand/Zurich.pm:796 #: perllib/FixMyStreet/Cobrand/Zurich.pm:866 @@ -3586,13 +3420,12 @@ msgid "Updated!" msgstr "¡Actualizado!" #: templates/web/base/admin/list_updates.html:2 -#: templates/web/base/report/update.html:3 -#: templates/web/fixmystreet/report/update.html:5 +#: templates/web/base/report/update.html:5 #: templates/web/zurich/report/updates.html:2 msgid "Updates" msgstr "Actualizaciones" -#: perllib/FixMyStreet/DB/Result/Comment.pm:132 +#: perllib/FixMyStreet/DB/Result/Comment.pm:131 msgid "Updates are limited to %s characters in length. Please shorten your update" msgstr "Las actualizaciones están limitadas a %s caracteres. Por favor acorte su actualización." @@ -3602,12 +3435,9 @@ msgstr "Actualizaciones en {{title}}" #. ("%s is the site name") #: templates/web/base/report/display.html:0 -#: templates/web/base/report/display.html:5 -#: templates/web/fixmystreet/report/display.html:0 -#: templates/web/fixmystreet/report/display.html:9 -#, fuzzy +#: templates/web/base/report/display.html:9 msgid "Updates to this problem, %s" -msgstr "Actualizaciones para este problema, FixMyStreet" +msgstr "" #: templates/web/base/admin/body.html:182 msgid "Use the <strong>note</strong> to record details that are only displayed in the admin. Notes are not shown publicly, and are not sent to the body." @@ -3615,15 +3445,14 @@ msgstr "Usa la <strong>nota</strong> para guardar detalles que sólo serán desp #: templates/web/zurich/admin/report_edit-sdm.html:48 #: templates/web/zurich/admin/report_edit.html:67 -#, fuzzy msgid "Used map" -msgstr "mapa utilizado" +msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1452 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1461 msgid "User flag removed" msgstr "Eliminada marca de usuario" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1424 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1433 msgid "User flagged" msgstr "Usuario marcado" @@ -3631,7 +3460,7 @@ msgstr "Usuario marcado" msgid "User search finds matches in users' names and email addresses." msgstr "La búsqueda ha encontrado coincidencias en nombres de usuarios y direcciones de email." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1280 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1289 #: perllib/FixMyStreet/Cobrand/Zurich.pm:399 #: templates/web/base/admin/flagged.html:29 #: templates/web/zurich/header.html:69 @@ -3662,7 +3491,6 @@ msgid "Viewing a location" msgstr "Visualizando una ubicación" #: templates/web/base/report/display.html:0 -#: templates/web/fixmystreet/report/display.html:0 msgid "Viewing a problem" msgstr "Visualizando un problema" @@ -3675,25 +3503,24 @@ msgstr "Barrios de este ayuntamiento" 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 "Hemos encontrado más de una coincidencia para esa ubicación. Se muestran un máximo de diez. Prueba una búsqueda diferente si no encuentra aquà su ubicación." -#: templates/web/zurich/auth/token.html:7 -msgid "We have not been able to confirm your account - sorry." -msgstr "No hemos podido confirmar su cuenta - lo sentimos." - -#: templates/web/zurich/auth/token.html:17 -msgid "We have sent you an email containing a link to confirm your account." -msgstr "Le hemos enviado un email con un enlace para confirmar su cuenta." +#: templates/web/base/auth/general.html:6 +#: templates/web/base/report/display.html:27 +#: templates/web/base/report/new/oauth_email_form.html:5 +#, fuzzy +msgid "We need your email address, please give it below." +msgstr "Nunca mostramos su dirección de email o número de teléfono." -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:2 -#: templates/web/fixmystreet/report/update-form.html:77 +#: templates/web/base/report/new/form_user_loggedout_email.html:2 +#: templates/web/base/report/update/form_user_loggedout_email.html:2 msgid "We never show your email" msgstr "Nunca mostramos su dirección de email" -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:31 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:65 +#: templates/web/base/report/new/form_user_loggedin.html:31 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:28 msgid "We never show your email address or phone number." msgstr "Nunca mostramos su dirección de email o número de teléfono." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:422 +#: perllib/FixMyStreet/Script/Reports.pm:200 msgid "We realise this problem might be the responsibility of %s; however, we don't currently have any contact details for them. If you know of an appropriate contact address, please do get in touch." msgstr "Somos conscientes de este problema podrÃa ser responsabilidad de %s; sin embargo, actualmente no disponemos de sus datos de contacto. Si conoce la dirección de contacto adecuada, por favor contáctenos." @@ -3710,10 +3537,6 @@ msgstr "Sólo utilizaremos su información personal de acuerdo a nuestra <a href msgid "We’re sorry to hear the problem’s not fixed. Why not try writing to your local representatives?" msgstr "Lamentamos que el problema no esté arreglado. ¿Por qué no prueba a escribir directamente a sus representantes locales?" -#: templates/web/base/contact/blurb.html:8 -msgid "We'd love to hear what you think about this site. Just fill in the form, or send an email to <a href='mailto:%s'>%s</a>:" -msgstr "Nos encantarÃa saber lo que piensa acerca de esta web. Sólo tienes que rellenar el formulario o enviar un correo electrónico a <a href='mailto:%s'>%s</a>:" - #: templates/web/base/contact/submit.html:7 msgid "We’ll get back to you as soon as we can." msgstr "Gracias por sus comentarios. ¡Nos pondremos en contacto con usted tan pronto como nos sea posible!" @@ -3722,7 +3545,7 @@ msgstr "Gracias por sus comentarios. ¡Nos pondremos en contacto con usted tan p msgid "What was your experience of getting the problem fixed?" msgstr "" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:49 +#: templates/web/base/report/new/form_report.html:19 msgid "What’s the issue, and where is it?" msgstr "¿Cuál es el problema y dónde está?" @@ -3735,7 +3558,11 @@ msgstr "Una vez editada" msgid "When sent" msgstr "Una vez enviada" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:640 +#: templates/web/base/js/translation_strings.html:50 +msgid "Whoa there Testino! Three photos are enough." +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Report/New.pm:635 msgid "Whole block of empty flats" msgstr "Bloque de pisos vacÃos" @@ -3750,7 +3577,7 @@ msgstr "¿Por qué detenerse ahÃ? <a href=\"/alert\">Configure más alertas</a> msgid "Wish" msgstr "" -#: templates/web/base/open311/index.html:92 +#: templates/web/base/open311/index.html:84 msgid "With request searches, it is also possible to search for agency_responsible to limit the requests to those sent to a single administration. The search term is the administration ID provided by <a href=\"%s\">MaPit</a>." msgstr "En las búsquedas de solicitudes, es también posible buscar por agency_responsible para limitar las solicitudes a las enviados a una sola administración. El término de búsqueda es el ID de administración proporcionada por <a href=\"%s\">MapIT</a>." @@ -3758,7 +3585,7 @@ msgstr "En las búsquedas de solicitudes, es también posible buscar por agency_ msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"http://fixmystreet.org\">available at fixmystreet.org</a>." msgstr "¿Quieres contribuir a mejorar FixMyStreet? Nuestro código es abierto y está <a href=\"http://fixmystreet.org\">disponible en fixmystreet.org</a>." -#: templates/web/base/questionnaire/index.html:87 +#: templates/web/base/questionnaire/index.html:96 msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?" msgstr "¿Quieres recibir otro cuestionario en 4 semanas, recordándote que debes comprobar el estado?" @@ -3767,7 +3594,6 @@ msgid "Writing your message entirely in block capitals makes it hard to read, as msgstr "Escribir su mensaje completamente en mayúsculas o sin signos de puntuación hace que sea difÃcil de leer." #: templates/web/base/report/new/fill_in_details_form.html:4 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:5 msgid "Wrong location? Just click again on the map." msgstr "¿Ubicación incorrecta? Haga clic de nuevo en el mapa, en el lugar correcto." @@ -3790,27 +3616,24 @@ msgstr "Año" #: templates/web/base/admin/users.html:31 #: templates/web/base/questionnaire/creator_fixed.html:14 #: templates/web/base/questionnaire/index.html:51 -#: templates/web/base/questionnaire/index.html:90 +#: templates/web/base/questionnaire/index.html:99 msgid "Yes" msgstr "SÃ" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:17 -#: templates/web/fixmystreet/report/update-form.html:91 +#: templates/web/base/report/new/form_user_loggedout_password.html:5 +#: templates/web/base/report/update/form_user_loggedout_password.html:4 msgid "Yes I have a password" msgstr "SÃ, tengo una contraseña" -#: templates/web/base/contact/index.html:39 -#: templates/web/fixmystreet/contact/index.html:54 +#: templates/web/base/contact/index.html:46 msgid "You are complaining that this problem report was unnecessarily moderated:" msgstr "Usted se está quejando de que la notificación fue innecesariamente moderada:" -#: templates/web/base/contact/index.html:41 -#: templates/web/fixmystreet/contact/index.html:56 +#: templates/web/base/contact/index.html:48 msgid "You are reporting the following problem report for being abusive, containing personal information, or similar:" msgstr "Estás denunciando la siguiente notificación por ser abusiva, contener información personal, o similar:" -#: templates/web/base/contact/index.html:15 -#: templates/web/fixmystreet/contact/index.html:30 +#: templates/web/base/contact/index.html:22 msgid "You are reporting the following update for being abusive, containing personal information, or similar:" msgstr "Estás denunciando la siguiente actualización por ser abusiva, contener información personal, o similar:" @@ -3823,7 +3646,7 @@ msgstr "Usted puede <a href=\"%s%s\">ver el problema en este sitio</a>." msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create." msgstr "Puede agregar email del usuario abusivo a la lista de abusones, que oculta de forma automática (y nunca envÃa) los informes que crean." -#: templates/web/fixmystreet/contact/index.html:121 +#: templates/web/base/contact/index.html:113 msgid "You can contact technical support on <a href='mailto:%s'>%s</a>" msgstr "Puede ponerse en contacto con el soporte técnico en <a href='mailto:%s'>%s</a>" @@ -3837,8 +3660,8 @@ msgstr "" "Por ejemplo, si quiere tener vigilado a un usuario que envió algún informe\n" "inapropiado anteriormente." -#: templates/web/base/report/new/councils_text_none.html:10 -#: templates/web/base/report/new/councils_text_none.html:2 +#: templates/web/base/report/new/councils_text_none.html:12 +#: templates/web/base/report/new/councils_text_none.html:14 #: templates/web/base/report/new/councils_text_some.html:19 #: templates/web/base/report/new/councils_text_some.html:21 msgid "You can help us by finding a contact email address for local problems for %s and emailing it to us at <a href='mailto:%s'>%s</a>." @@ -3856,21 +3679,16 @@ msgstr "Usted rechazó finalmente; por favor, rellene el formulario de arriba" msgid "You have already answered this questionnaire. If you have a question, please <a href='%s'>get in touch</a>, or <a href='%s'>view your problem</a>.\n" msgstr "Ya respondió a esta encuesta. Si tiene alguna pregunta, por favor, <a href='%s'>póngase en contacto con nosotros</a>, o <a href ='%s'>vea su problema</a>.\n" -#: templates/web/base/questionnaire/index.html:77 -#: templates/web/base/report/new/fill_in_details_form.html:75 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:73 -msgid "You have already attached a photo to this report, attaching another one will replace it." -msgstr "Ya ha adjuntado una foto para esta notificación, adjuntando otra reemplazará la anterior." - -#: templates/web/base/report/update-form.html:59 -#: templates/web/fixmystreet/report/update-form.html:56 -msgid "You have already attached a photo to this update, attaching another one will replace it." -msgstr "Ya ha adjuntado una foto para esta actualización, adjuntando otra reemplazará la anterior." - -#: templates/web/zurich/report/new/fill_in_details_form.html:61 +#: templates/web/base/report/new/form_report.html:32 +#: templates/web/zurich/report/new/fill_in_details_form.html:55 msgid "You have already attached photos to this report. Note that you can attach a maximum of 3 to this report (if you try to upload more, the oldest will be removed)." msgstr "" +#: templates/web/base/questionnaire/index.html:83 +#: templates/web/base/report/update/form_update.html:14 +msgid "You have already attached photos to this update. Note that you can attach a maximum of 3 to this update (if you try to upload more, the oldest will be removed)." +msgstr "" + #: templates/web/base/auth/sign_out.html:4 #: templates/web/zurich/auth/sign_out.html:3 msgid "You have been signed out" @@ -3885,9 +3703,8 @@ msgstr "Has ubicado el problema en el punto marcado con el pin verde en el mapa. msgid "You have successfully confirmed your email address." msgstr "Ha confirmado correctamente su dirección de correo electrónico." -#: templates/web/base/report/display.html:20 -#: templates/web/base/report/new/fill_in_details.html:37 -#: templates/web/fixmystreet/report/display.html:17 +#: templates/web/base/report/display.html:17 +#: templates/web/base/report/new/login_success_form.html:3 msgid "You have successfully signed in; please check and confirm your details are accurate:" msgstr "Ha iniciado sesión correctamente, por favor revise y confirme si sus detalles son correctos:" @@ -3919,53 +3736,42 @@ msgid "Your Reports" msgstr "Sus notificaciones" #: templates/web/base/alert/_list.html:89 +#: templates/web/base/contact/index.html:83 +#: templates/web/base/report/display_tools.html:38 +#: templates/web/base/report/display_tools.html:40 +#: templates/web/base/report/new/form_user_loggedin.html:3 +#: templates/web/base/report/new/form_user_loggedout_email.html:1 +#: templates/web/base/report/update/form_user_loggedout_email.html:1 #: templates/web/fixmystreet/alert/updates.html:19 #: templates/web/fixmystreet/alert/updates.html:22 -#: templates/web/fixmystreet/contact/index.html:91 -#: templates/web/fixmystreet/report/display.html:62 -#: templates/web/fixmystreet/report/display.html:64 -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:3 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:1 -#: templates/web/fixmystreet/report/update-form.html:76 #: templates/web/zurich/report/new/fill_in_details_form.html:76 msgid "Your email" msgstr "Su email:" -#: templates/web/base/auth/general.html:28 -#: templates/web/fixmystreet/report/update-form.html:82 +#: templates/web/base/auth/general.html:45 +#: templates/web/base/report/update/form_user_loggedout_email.html:7 #: templates/web/zurich/auth/general.html:30 #: templates/web/zurich/auth/general.html:58 msgid "Your email address" msgstr "Su dirección de email" -#: templates/web/base/report/new/fill_in_details_form.html:106 -#: templates/web/base/report/update-form.html:81 -msgid "Your email:" -msgstr "Su email:" - -#: templates/web/fixmystreet/report/updates-sidebar-notes.html:7 +#: templates/web/base/report/updates-sidebar-notes.html:3 msgid "Your information will only be used in accordance with our <a href=\"/privacy\">privacy policy</a>" msgstr "Su información sólo será usada de acuerdo con nuestra <a href=\"/privacy\">polÃtica de privacidad</a>" -#: templates/web/base/auth/general.html:51 -#: templates/web/fixmystreet/contact/index.html:84 -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:18 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:54 -#: templates/web/fixmystreet/report/update-form.html:142 +#: templates/web/base/auth/general.html:90 +#: templates/web/base/contact/index.html:76 +#: templates/web/base/report/new/form_user_loggedin.html:18 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:17 +#: templates/web/base/report/update/form_name.html:11 #: templates/web/zurich/auth/general.html:61 #: templates/web/zurich/report/new/fill_in_details_form.html:86 msgid "Your name" msgstr "Su nombre" -#: templates/web/base/contact/index.html:73 -#: templates/web/base/report/new/fill_in_details_form.html:186 -#: templates/web/base/report/update-form.html:152 -msgid "Your name:" -msgstr "Su nombre:" - -#: templates/web/base/auth/general.html:39 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:22 -#: templates/web/fixmystreet/report/update-form.html:96 +#: templates/web/base/auth/general.html:75 +#: templates/web/base/report/new/form_user_loggedout_password.html:10 +#: templates/web/base/report/update/form_user_loggedout_password.html:9 #: templates/web/zurich/auth/general.html:34 msgid "Your password" msgstr "Su contraseña" @@ -3974,15 +3780,16 @@ msgstr "Su contraseña" msgid "Your password has been changed" msgstr "Su contraseña ha cambiado" -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:27 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:63 +#: templates/web/base/report/new/form_user_loggedin.html:27 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:26 #: templates/web/zurich/report/new/fill_in_details_form.html:92 msgid "Your phone number" msgstr "Su número de teléfono" #: templates/web/base/questionnaire/index.html:14 +#, fuzzy msgid "Your report" -msgstr "Su notificación" +msgstr "Sus notificaciones" #: templates/web/base/footer.html:9 templates/web/fixmystreet/footer.html:29 msgid "Your reports" @@ -3992,23 +3799,17 @@ msgstr "Sus notificaciones" msgid "Your updates" msgstr "Sus actualizaciones" -#: templates/web/base/contact/index.html:81 -msgid "Your email:" -msgstr "Su email:" - #: templates/web/base/reports/_list-filters.html:3 -#, fuzzy msgid "all reports" -msgstr "Todas las notificaciones" +msgstr "" #: templates/web/base/admin/timeline.html:4 msgid "by %s" msgstr "por %s" #: templates/web/base/reports/_list-filters.html:5 -#, fuzzy msgid "closed reports" -msgstr "Notificaciones cerrados" +msgstr "" #: templates/web/base/reports/body.html:6 #: templates/web/base/reports/body.html:7 @@ -4030,17 +3831,16 @@ msgid "edit user" msgstr "editar usuario" #: templates/web/base/reports/_list-filters.html:6 -#, fuzzy msgid "fixed reports" -msgstr "Notificaciones arregladas" +msgstr "" -#: templates/web/base/admin/index.html:33 +#: templates/web/base/status/stats.html:20 #: templates/web/zurich/admin/index.html:5 msgid "from %s different users" -msgstr "de %d usuarios diferentes" +msgstr "de %s usuarios diferentes" -#: templates/web/base/report/_item.html:17 -#: templates/web/zurich/report/_item.html:16 +#: templates/web/base/report/_item.html:15 +#: templates/web/zurich/report/_item.html:14 msgid "last updated %s" msgstr "ultima actualización %s" @@ -4132,10 +3932,8 @@ msgstr "reabierto" msgid "sign out" msgstr "salir" -#: templates/web/base/report/new/fill_in_details_form.html:12 -#: templates/web/base/report/new/fill_in_details_form.html:15 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:10 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:12 +#: templates/web/base/report/new/fill_in_details_form.html:11 +#: templates/web/base/report/new/fill_in_details_form.html:9 msgid "the local council" msgstr "ayuntamiento" @@ -4144,7 +3942,7 @@ msgstr "ayuntamiento" msgid "there is no pin shown as the user did not use the map" msgstr "no hay marcador porque el usuario no usó el mapa" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:398 +#: perllib/FixMyStreet/Script/Reports.pm:176 msgid "this type of local problem" msgstr "este tipo de problema local" @@ -4153,9 +3951,8 @@ msgid "today" msgstr "hoy" #: templates/web/base/reports/_list-filters.html:4 -#, fuzzy msgid "unfixed reports" -msgstr "Notificaciones arregladas" +msgstr "" #: templates/web/base/admin/report_edit.html:32 msgid "used map" @@ -4174,7 +3971,7 @@ msgstr "El usuario es el propietario del problema" msgid "ward" msgstr "barrio" -#: templates/web/base/front/stats.html:17 +#: templates/web/base/front/stats.html:13 #, perl-format msgid "<big>%s</big> report recently" msgid_plural "<big>%s</big> reports recently" @@ -4202,7 +3999,7 @@ msgid_plural "%d minutes" msgstr[0] "%d minuto" msgstr[1] "%d minutos" -#: templates/web/base/front/stats.html:29 +#: templates/web/base/front/stats.html:25 #, perl-format msgid "<big>%s</big> update on reports" msgid_plural "<big>%s</big> updates on reports" @@ -4223,14 +4020,14 @@ msgid_plural "%d weeks" msgstr[0] "%d semana" msgstr[1] "%d semanas" -#: templates/web/base/front/stats.html:12 +#: templates/web/base/front/stats.html:8 #, perl-format msgid "<big>%s</big> report in past week" msgid_plural "<big>%s</big> reports in past week" msgstr[0] "<big>%s</big> notificadas la semana pasada" msgstr[1] "<big>%s</big> notificaciones la semana pasada" -#: templates/web/base/front/stats.html:23 +#: templates/web/base/front/stats.html:19 #, perl-format msgid "<big>%s</big> fixed in past month" msgid_plural "<big>%s</big> fixed in past month" @@ -4251,140 +4048,86 @@ msgid_plural "We do <strong>not</strong> yet have details for the other councils msgstr[0] "TodavÃa <strong>no</strong> tenemos detalles para el Ayuntamiento que cubre esta zona." msgstr[1] "TodavÃa <strong>no</strong> tenemos información sobre el ayuntamiento que cubre este área." -#~ msgid "(Don't worry — we'll hang on to your alert while you're checking your email.)" -#~ msgstr "(No se preocupe — guardaremos su alerta mientras usted revisa su email)" - -#~ msgid "(Don't worry — we'll hang on to your problem report while you're checking your email.)" -#~ msgstr "(No se preocupe — guardaremos su notificación mientras revisa su email)" - -#~ msgid "(Don't worry — we'll hang on to your update while you're checking your email.)" -#~ msgstr "(No se preocupe — guardaremos su actualización mientras revisa su email)" - -#~ msgid "<small>If you cannot see the map, <a href='%s' rel='nofollow'>skip this step</a>.</small>" -#~ msgstr "<small>Si no puede ver el mapa, <a href='%s' rel='nofollow'> omita este paso</a>.</small>" - -#~ msgid "<strong>No</strong>, I do not, let me sign in by email:" -#~ msgstr "<strong>No</strong>, no tengo, permÃtanme registrarme por email:" - -#~ msgid "Are you a <strong>developer</strong>? Would you like to contribute to FixMyStreet?" -#~ msgstr "¿Eres <strong>programador</strong>? ¿Te gustarÃa contribuir a FixMyStreet?" - -#~ msgid "Closest nearby problems <small>(within %skm)</small>" -#~ msgstr "Problemas cercanos <small>(dentro de %%s km)</small>" - -#~ msgid "Contact FixMyStreet" -#~ msgstr "Contactar con FixMyStreet" - -#~ msgid "Do you have a FixMyBarangay password?" -#~ msgstr "¿Tiene una contraseña FixMyBarangay?" - -#~ msgid "FixMyStreet admin:" -#~ msgstr "Admin FixMyStreet:" - -#~ msgid "If you do not, your alert will not be activated." -#~ msgstr "En caso contrario, no se activará su alerta." - -#~ msgid "If you do not, your problem will not be posted." -#~ msgstr "En caso contrario, no se publicará su notificación." - -#~ msgid "If you do not, your update will not be posted." -#~ msgstr "En caso contrario, no se publicará su actualización." - -#~ msgid "New local reports on reportemptyhomes.com" -#~ msgstr "Nuevas notificaciones locales en reportemptyhomes.com" - -#~ msgid "New reports for {{COUNCIL}} within {{WARD}} ward on reportemptyhomes.com" -#~ msgstr "Nuevas notificaciones en {{COUNCIL}} para el barrio {{WARD}} en reportemptyhomes.com" - -#~ msgid "New reports on reportemptyhomes.com" -#~ msgstr "Nuevas notificaciones en reportemptyhomes.com" - -#~ msgid "New reports on reportemptyhomes.com near {{POSTCODE}}" -#~ msgstr "Nuevas notificaciones en reportemptyhome.com cerca de {{POSTCODE}}" - -#~ msgid "New reports to {{COUNCIL}} on reportemptyhomes.com" -#~ msgstr "Nuevas notificaciones en {{COUNCIL}} en reportemptyhomes.com" - -#~ msgid "New reports within {{NAME}}'s boundary on reportemptyhomes.com" -#~ msgstr "Nuevas notificaciones dentro de los lÃmites de {{NAME}} en reportemptyhomes.com" +#~ msgid "(we never show your email address or phone number)" +#~ msgstr "(nunca mostramos su email ni su número de teléfono públicamente)" -#~ msgid "New update:" -#~ msgstr "Nueva actualización" +#~ msgid "(we never show your email)" +#~ msgstr "(nunca mostramos su email públicamente)" -#~ msgid "No problems found." -#~ msgstr "No se han encontrado problemas." +#~ msgid "<strong>No</strong>, let me confirm my report by email:" +#~ msgstr "<strong>No</strong>- confirmar mi notificación por email:" -#~ msgid "No problems have been reported yet." -#~ msgstr "No se han notificado problemas todavÃa." +#~ msgid "<strong>No</strong>, let me confirm my update by email:" +#~ msgstr "<strong>No</strong>- confirmar mi actualización por email:" -#~ msgid "Now to submit your report… do you have a FixMyStreet password?" -#~ msgstr "Ahora a enviar tu notificación… ¿tienes una contraseña en FixMyStreet?" +#~ msgid "Email me updates" +#~ msgstr "Recibir por email actualizaciones" -#~ msgid "Now to submit your update… do you have a FixMyStreet password?" -#~ msgstr "Ahora a enviar tu notificación… ¿tienes una contraseña en FixMyStreet?" +#~ msgid "Enter a new password:" +#~ msgstr "Introduzca una nueva contraseña:" -#~ msgid "Our code is open source and <a href=\"http://github.com/mysociety/fixmystreet\">available on GitHub</a>." -#~ msgstr "Nuestro código es open source y <a href=\"http://github.com/mysociety/fixmystreet\">está disponible en GitHub</a>." +#~ 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 "No se ha podido verificar token. Si ha copiado la URL de un email, compruebe por favor que lo copió correctamente.\n" -#~ msgid "Please <a class=\"tab_link\" href=\"#report\">take a look</a> at the updates that have been left." -#~ msgstr "Por favor, <a class=\"tab_link\" href=\"#report\">eche un vistazo</a> a las actualizaciones que se han recibido." +#~ 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 "Es recomendable que compruebe su carpeta de \"spam\", ya que a veces nuestros mensajes son identificados erróneamente como \"correo no deseado\"." -#~ msgid "Please take a look at the updates that have been left." -#~ msgstr "Por favor eche un vistazo a las actualizaciones que se han recibido." +#~ msgid "Message:" +#~ msgstr "Mensaje:" -#~ msgid "Problems within %s, FixMyStreet" -#~ msgstr "Problemas en %s, FixMyStreet" +#~ msgid "More problems nearby" +#~ msgstr "Más problemas cercanos" -#~ msgid "Properties recently reported as put back to use on reportemptyhomes.com" -#~ msgstr "Propiedades recientemente notificadas como vueltas a usar en reportemptyhomes.com" +#~ msgid "Nearly Done! Now check your email..." +#~ msgstr "¡Ya casi ha terminado! Busque ahora en su email el mensaje de confirmación..." -#~ msgid "Publish the response" -#~ msgstr "Publicar respuesta" +#~ msgid "Offensive? Unsuitable? Tell us" +#~ msgstr "¿Ofensiva? ¿Inadecuada? AvÃsanos" -#~ msgid "Reported %s, to %s" -#~ msgstr "Notificado %s, a %s" +#~ msgid "Photo:" +#~ msgstr "Foto:" -#~ msgid "Reports on and around the map" -#~ msgstr "Notificaciones en y alrededor del mapa" +#~ msgid "Please check your email" +#~ msgstr "Por favor, consulte su email" -#~ msgid "Sign in by email" -#~ msgstr "Iniciar sesión con email" +#~ msgid "Please note that updates are not sent to the council. If you leave your name it will be public. Your information will only be used in accordance with our <a href=\"/faq#privacy\">privacy policy</a>" +#~ msgstr "Tenga en cuenta que las actualizaciones no se envÃan al ayuntamiento. Si usted deja su nombre será público. Su información sólo será usada de acuerdo con nuestra <a href=\"/faq#privacy\">polÃtica de privacidad</a>" -#~ msgid "Signed in as %s" -#~ msgstr "Conectado como %s" +#~ msgid "This may be because the link is too old or already used, or the address was not copied correctly." +#~ msgstr "Esto puede deberse a que el enlace es demasiado antiguo o ya utilizado, o a que la dirección no se haya copiado correctamente." -#~ msgid "The confirmation email <strong>may</strong> take a few minutes to arrive — <em>please</em> be patient." -#~ msgstr "El email de confirmación podrÃa tardar unos minutos en llegar - por favor, sea paciente." +#~ msgid "This problem has been closed" +#~ msgstr "Este problema ha sido cerrado" -#~ msgid "The details of your problem are available from the other tab above." -#~ msgstr "Los detalles de su problema están disponibles en la otra pestaña de arriba." +#~ msgid "This problem is in progress" +#~ msgstr "Este problema se encuentra en progreso" -#~ msgid "The details of your problem are available on the right hand side of this page." -#~ msgstr "Los detalles de su problema están disponibles en el lado derecho de esta página." +#~ msgid "This problem is old and of unknown status." +#~ msgstr "Este problema es antiguo y de estatus desconocido." -#~ msgid "The latest local reports reported by users" -#~ msgstr "Últimas notificaciones recibidas de los usuarios" +#~ msgid "Update:" +#~ msgstr "Actualizar:" -#~ msgid "The latest properties reported back to use by users" -#~ msgstr "Últimas propiedades notificadas por los usuarios como nuevamente en uso" +#~ msgid "We have not been able to confirm your account - sorry." +#~ msgstr "No hemos podido confirmar su cuenta - lo sentimos." -#~ msgid "The latest reports for {{COUNCIL}} reported by users" -#~ msgstr "Últimas notificaciones para {{COUNCIL}} recibidas de los usuarios" +#~ msgid "We have sent you an email containing a link to confirm your account." +#~ msgstr "Le hemos enviado un email con un enlace para confirmar su cuenta." -#~ msgid "The latest reports for {{COUNCIL}} within {{WARD}} ward reported by users" -#~ msgstr "Últimas notificaciones de {{COUNCIL}} en el barrio de {{WARD}} recibidas de los usuarios" +#~ msgid "We'd love to hear what you think about this site. Just fill in the form, or send an email to <a href='mailto:%s'>%s</a>:" +#~ msgstr "Nos encantarÃa saber lo que piensa acerca de esta web. Sólo tienes que rellenar el formulario o enviar un correo electrónico a <a href='mailto:%s'>%s</a>:" -#~ msgid "The latest reports within {{NAME}}'s boundary reported by users" -#~ msgstr "Últimas notificaciones en los lÃmites de {{NAME}} recibidas de los usuarios" +#~ msgid "You have already attached a photo to this report, attaching another one will replace it." +#~ msgstr "Ya ha adjuntado una foto para esta notificación, adjuntando otra reemplazará la anterior." -#~ msgid "To <strong>report a problem</strong>, click on the map at the correct location." -#~ msgstr "Para <strong>notificar un problema</strong>, haz clic en el mapa en la ubicación correcta." +#~ msgid "You have already attached a photo to this update, attaching another one will replace it." +#~ msgstr "Ya ha adjuntado una foto para esta actualización, adjuntando otra reemplazará la anterior." -#~ msgid "User" -#~ msgstr "Usuario" +#~ msgid "Your email:" +#~ msgstr "Su email:" -#~ msgid "You must now click the link in the email we've just sent you." -#~ msgstr "Debe hacer clic en el enlace incluido en el mensaje." +#~ msgid "Your name:" +#~ msgstr "Su nombre:" -#~ msgid "Your email address:" -#~ msgstr "Su dirección de email:" +#~ msgid "Your email:" +#~ msgstr "Su email:" diff --git a/locale/fr_FR.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/fr_FR.UTF-8/LC_MESSAGES/FixMyStreet.po index aebef33e8..56dcbc1b0 100644 --- a/locale/fr_FR.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/fr_FR.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -5,15 +5,15 @@ # # Translators: # Christophe Ocivélo Saint-Etienne <ocivelo@gmail.com>, 2014 -# fixmystreetfr <fixmystreet@fixmystreet.fr>, 2014-2015 +# fixmystreetfr <fixmystreet@fixmystreet.fr>, 2015 # mySociety <transifex@mysociety.org>, 2015 # Tim Morley <>, 2012 msgid "" msgstr "" "Project-Id-Version: fixmystreet\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2015-10-23 16:51+0100\n" -"PO-Revision-Date: 2015-10-10 19:23+0000\n" +"POT-Creation-Date: 2016-03-02 13:09+0000\n" +"PO-Revision-Date: 2015-12-22 22:34+0000\n" "Last-Translator: fixmystreetfr <fixmystreet@fixmystreet.fr>\n" "Language-Team: French (France) (http://www.transifex.com/mysociety/fixmystreet/language/fr_FR/)\n" "Language: fr_FR\n" @@ -22,45 +22,24 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:628 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:411 +#: perllib/FixMyStreet/DB/Result/Problem.pm:616 +#: perllib/FixMyStreet/Script/Reports.pm:189 msgid " and " msgstr " et " #: templates/web/base/report/new/councils_text_all.html:2 -#: templates/web/base/report/new/councils_text_none.html:11 -#: templates/web/base/report/new/councils_text_none.html:2 +#: templates/web/base/report/new/councils_text_none.html:12 +#: templates/web/base/report/new/councils_text_none.html:15 #: templates/web/base/report/new/councils_text_some.html:19 #: templates/web/base/report/new/councils_text_some.html:22 #: templates/web/base/report/new/councils_text_some.html:5 msgid " or " msgstr " ou " -#: templates/web/base/admin/index.html:35 -#: templates/web/base/status/index.html:13 -msgid "%s confirmed alerts, %s unconfirmed" -msgstr "%d alertes confirmées, %d non confirmées " - -#: templates/web/base/admin/index.html:37 -#: templates/web/base/status/index.html:16 -#: templates/web/zurich/admin/index.html:6 -msgid "%s council contacts – %s confirmed, %s unconfirmed" -msgstr "%d contacts administratifs – %d confirmés, %d non confirmés" - #: templates/web/base/admin/edit-league.html:12 msgid "%d edits by %s" msgstr "%d changements par %s" -#: templates/web/base/admin/index.html:34 -#: templates/web/base/status/index.html:12 -msgid "%s live updates" -msgstr "%d mises à jour en temps réel" - -#: templates/web/base/admin/index.html:36 -#: templates/web/base/status/index.html:14 -msgid "%s questionnaires sent – %s answered (%s%%)" -msgstr "%d questionnaires envoyés – %d complétés (%s%%)" - #: templates/web/base/pagination.html:10 msgid "%d to %d of %d" msgstr "de %d à %d de %d" @@ -73,39 +52,58 @@ msgstr "%s - Rapports sommaires" #. ("%s here is the site name") #: templates/web/base/admin/header.html:10 msgid "%s admin:" -msgstr "" +msgstr "%s admin:" + +#: templates/web/base/status/stats.html:26 +#, fuzzy +msgid "%s bodies" +msgstr "Interlocuteurs" + +#: templates/web/base/status/stats.html:24 +msgid "%s confirmed alerts, %s unconfirmed" +msgstr "%s alertes confirmées, %s non confirmées " + +#: templates/web/base/status/stats.html:27 +#: templates/web/zurich/admin/index.html:6 +msgid "%s council contacts – %s confirmed, %s unconfirmed" +msgstr "%s contacts administratifs – %s confirmés, %s non confirmés" #. ("%s is the site name") #: templates/web/base/alert/index.html:7 -#, fuzzy msgid "" "%s has a variety of RSS feeds and email alerts for local\n" "problems, including alerts for all problems within a particular ward, or all\n" "problems within a certain distance of a particular location." msgstr "" -"FixMyStreet.fr a une variété de flux RSS et d'alertes par email pour les problèmes locaux qui comprennent\n" -"des alertes pour tous les problèmes dans une commune, ou tous les problèmes inclus\n" -"dans une certaine distance d'un endroit précis'." +"%s a une variété de flux RSS et d'alertes par email pour les\n" +"problèmes, y compris les alertes pour tous les problèmes dans un quartier particulier, ou tout\n" +"problèmes à une certaine distance d'un lieu particulier." #. ("%s is the site name") #: templates/web/base/alert/index.html:11 -#, fuzzy msgid "" "%s has a variety of RSS feeds and email alerts for local problems, including\n" "alerts for all problems within a particular ward or council, or all problems\n" "within a certain distance of a particular location." msgstr "" -"FixMyStreet.fr a une variété de flux RSS et d'alertes par email pour les problèmes locaux qui comprennent\n" -"des alertes pour tous les problèmes dans une commune, ou tous les problèmes inclus\n" -"dans une certaine distance d'un endroit précis'." +"%s a une variété de flux RSS et alertes par courriel pour les problèmes locaux, y compris les\n" +"alertes pour tous les problèmes au sein d'un service ou d'un conseil particulier, ou tous les problèmes\n" +"à une certaine distance d'un emplacement particulier." + +#: templates/web/base/status/stats.html:23 +msgid "%s live updates" +msgstr "%s mises à jour en temps réel" + +#: templates/web/base/status/stats.html:25 +msgid "%s questionnaires sent – %s answered (%s%%)" +msgstr "%s questionnaires envoyés – %s complétés (%s%%)" -#: perllib/FixMyStreet/DB/Result/Problem.pm:695 +#: perllib/FixMyStreet/DB/Result/Problem.pm:683 msgid "%s ref: %s" msgstr "%s réf : %s" #. ("%s is the site name") #: templates/web/base/alert/_list.html:73 -#, fuzzy msgid "" "%s sends different categories of problem\n" "to the appropriate council, so problems within the boundary of a particular council\n" @@ -114,21 +112,20 @@ msgid "" "council’s alerts, but will only appear in the \"Within the boundary\" alert\n" "for the county council." msgstr "" -"FixMyStreet.fr envoie les différentes catégories de problèmes\n" -"à l'administration appropriée, ce qui veut dire que tous les problèmes à l'intérieur\n" -"d'une commune ne seront pas toujours ceux envoyés à la commune. Par exemple, un\n" -"nid de poule sur une route nationale sera envoyée aux Ponts et Chausséees et apparaitra\n" -"dans les deux les alertes des Ponts et Chaussées, mais uniquement dans l'alerte « À l'intérieur de » pour la commune." +"%s envoie différentes catégories de problème\n" +"a l'administration appropriée. Les problèmes à la limite d'une administration\n" +"pourraient ne pas correspondre aux problèmes envoyés à cette administration. Par exemple, un rapport\n" +" graffiti sera envoyé a l'administration de district, et apparaîtrait dans les deux administrations." -#: perllib/FixMyStreet/Cobrand/UK.pm:255 perllib/FixMyStreet/Cobrand/UK.pm:267 +#: perllib/FixMyStreet/Cobrand/UK.pm:256 perllib/FixMyStreet/Cobrand/UK.pm:268 msgid "%s ward, %s" msgstr "Localité %s, %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:564 +#: perllib/FixMyStreet/DB/Result/Problem.pm:552 msgid "%s, reported at %s" msgstr "%s, rapporté %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:282 perllib/FixMyStreet/Cobrand/UK.pm:294 +#: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295 msgid "%s, within %s ward" msgstr "%s, dans la localité %s" @@ -136,9 +133,9 @@ msgstr "%s, dans la localité %s" msgid "© <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors" msgstr "© <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributeurs" -#: templates/web/zurich/report/new/fill_in_details_form.html:53 +#: templates/web/zurich/report/new/fill_in_details_form.html:46 msgid "(Defect & location of defect)" -msgstr "" +msgstr "(Défaut & amp; emplacement du défaut)" #: templates/web/base/admin/report_blocks.html:41 #: templates/web/base/admin/users.html:31 @@ -147,15 +144,13 @@ msgstr "(email dans la liste des abus)" #: templates/web/zurich/admin/report_edit-sdm.html:60 #: templates/web/zurich/admin/report_edit.html:88 -#, fuzzy msgid "(No name)" -msgstr "Votre nom" +msgstr "(Sans Nom)" #: templates/web/zurich/admin/report_edit-sdm.html:67 #: templates/web/zurich/admin/report_edit.html:95 -#, fuzzy msgid "(No phone number)" -msgstr "Votre numéro de téléphone" +msgstr "(Sans numéro de téléphone)" #: templates/web/base/alert/_list.html:24 msgid "(a default distance which covers roughly 200,000 people)" @@ -163,17 +158,16 @@ msgstr "(une distance par défaut qui couvre environs 200 000 personnes)" #. ("%s is a list of distance links, e.g. [2km] / [5km] / [10km] / [20km]") #: templates/web/base/alert/_list.html:29 -#, fuzzy msgid "(alternatively the RSS feed can be customised, within %s)" -msgstr "(sinon, le flux RSS peut être personnalisé, dans l’intervalle de'" +msgstr "(alternativement le flux RSS peut être personnalisé, dans %s)" -#: templates/web/base/report/_item.html:27 -#: templates/web/zurich/report/_item.html:21 +#: templates/web/base/report/_item.html:25 +#: templates/web/zurich/report/_item.html:19 msgid "(closed)" msgstr "(fermé)" -#: templates/web/base/report/_item.html:25 -#: templates/web/zurich/report/_item.html:19 +#: templates/web/base/report/_item.html:23 +#: templates/web/zurich/report/_item.html:17 msgid "(fixed)" msgstr "(résolu)" @@ -181,37 +175,28 @@ msgstr "(résolu)" msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)" msgstr "(comme des graffitis, immondices, trottoirs abimés ou éclairage public)" -#: templates/web/base/report/_item.html:21 +#: templates/web/base/report/_item.html:19 msgid "(not sent to council)" msgstr "(non signalé à l’administration)" -#: templates/web/base/report/new/fill_in_details_form.html:200 #: templates/web/zurich/report/new/fill_in_details_form.html:82 msgid "(optional)" msgstr "(facultatif)" -#: templates/web/fixmystreet/report/public_label.html:1 +#: templates/web/base/report/public_label.html:1 msgid "(public)" msgstr "(public)" -#: templates/web/base/report/_item.html:20 +#: templates/web/base/report/_item.html:18 msgid "(sent to both)" msgstr "(envoyé aux deux)" -#: templates/web/base/report/new/fill_in_details_form.html:194 -msgid "(we never show your email address or phone number)" -msgstr "(nous n’affichons jamais votre email ou numéro de téléphone)" - -#: templates/web/base/report/update-form.html:159 -msgid "(we never show your email)" -msgstr "(nous n’affichons jamais votre email)" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:673 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 #: perllib/FixMyStreet/DB/Result/Problem.pm:410 msgid "-- Pick a category --" msgstr "-- Choisissez une catégorie --" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:637 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:632 #: perllib/FixMyStreet/DB/Result/Problem.pm:416 msgid "-- Pick a property type --" msgstr "-- Choisissez un type de propriété --" @@ -231,54 +216,41 @@ msgstr "" #. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories") #: templates/web/base/reports/_list-filters.html:27 msgid "<label>Show %s</label> <label>about %s</label>" -msgstr "" +msgstr "<label>Afficher %s</ label> <label>à propos de %s</ label>" -#: templates/web/base/admin/index.html:32 -#: templates/web/base/status/index.html:11 +#: templates/web/base/status/stats.html:18 #: templates/web/zurich/admin/index.html:4 msgid "<strong>%s</strong> live problems" -msgstr "<strong>%d</strong> problèmes actifs" +msgstr "<strong>%s</strong> problèmes actifs" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:39 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:2 msgid "<strong>No</strong> Let me confirm my report by email" msgstr "<strong>Non</strong>, laissez-moi confirmer mon rapport par email :" -#: templates/web/fixmystreet/report/update-form.html:112 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:2 msgid "<strong>No</strong> Let me confirm my update by email" msgstr "<strong>Non</strong>, laissez-moi confirmer ma mise à jour par email :" -#: templates/web/base/auth/general.html:48 +#: templates/web/base/auth/general.html:87 #: templates/web/zurich/auth/general.html:51 msgid "<strong>No</strong> let me sign in by email" msgstr "<strong>Non</strong>, laissez-moi m'authentifier par email :" -#: templates/web/base/report/new/fill_in_details_form.html:145 -msgid "<strong>No</strong>, let me confirm my report by email:" -msgstr "<strong>Non</strong>, laissez-moi confirmer mon rapport par email :" - -#: templates/web/base/report/update-form.html:118 -msgid "<strong>No</strong>, let me confirm my update by email:" -msgstr "<strong>Non</strong>, laissez-moi confirmer ma mise à jour par email :" - -#: templates/web/base/auth/general.html:34 -#: templates/web/base/report/new/fill_in_details_form.html:123 -#: templates/web/base/report/update-form.html:96 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:15 -#: templates/web/fixmystreet/report/update-form.html:89 +#: templates/web/base/auth/general.html:70 +#: templates/web/base/report/new/form_user_loggedout_password.html:3 +#: templates/web/base/report/update/form_user_loggedout_password.html:2 msgid "<strong>Yes</strong> I have a password" msgstr "<strong>Oui</strong>, j'ai un mot de passe :" -#: templates/web/base/static/about-en-gb.html:1 -#: templates/web/base/static/about-en-gb.html:3 +#: templates/web/base/about/about-en-gb.html:1 +#: templates/web/base/about/about-en-gb.html:3 msgid "About us" msgstr "À propos" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:8 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:31 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:29 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:35 msgid "Action Scheduled" msgstr "Action programmée" @@ -312,14 +284,13 @@ msgstr "Ajouter une nouvelle catégorie" msgid "Add user" msgstr "Ajouter un utilisateur" -#: templates/web/base/my/my.html:52 +#: templates/web/base/my/my.html:56 msgid "Added %s" msgstr "Ajouté %s" #: templates/web/base/report/new/category_extras.html:9 -#, fuzzy msgid "Additional Information" -msgstr "Attendant une modération" +msgstr "Information Supplémentaire" #: templates/web/base/auth/change_password.html:29 msgid "Again:" @@ -333,8 +304,7 @@ msgstr "Alerte %d créée pour %s, type %s, paramètres %s / %s" msgid "Alert %d disabled (created %s)" msgstr "Alerte %d désactivée (création %s)" -#: templates/web/base/report/update-form.html:164 -#: templates/web/fixmystreet/report/update-form.html:150 +#: templates/web/base/report/update/form_name.html:20 msgid "Alert me to future updates" msgstr "M'alerter de futures mises à jour" @@ -344,9 +314,8 @@ msgid "All Reports" msgstr "Tous les rapports" #: templates/web/zurich/admin/stats.html:5 -#, fuzzy msgid "All Reports as CSV" -msgstr "Tous les rapports" +msgstr "Tous les rapports au format CSV" #: templates/web/base/footer.html:11 templates/web/fixmystreet/footer.html:32 #: templates/web/zurich/admin/index-dm.html:12 @@ -367,10 +336,8 @@ msgstr "Toutes les informations que vous fournissez ici seront envoyées à " #: templates/web/base/report/new/councils_text_all.html:2 #: templates/web/base/report/new/councils_text_all.html:4 -#: templates/web/base/report/new/fill_in_details_form.html:12 -#: templates/web/base/report/new/fill_in_details_form.html:14 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:10 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:11 +#: templates/web/base/report/new/fill_in_details_form.html:10 +#: templates/web/base/report/new/fill_in_details_form.html:9 msgid "All the information you provide here will be sent to <strong>%s</strong>." msgstr "Toutes les informations que vous fournissez ici seront envoyées à <strong>%s</strong>." @@ -392,6 +359,10 @@ msgstr "Anonyme :" msgid "Are you a developer?" msgstr "Vous êtes un développeur ?" +#: templates/web/base/js/translation_strings.html:52 +msgid "Are you sure you want to cancel this upload?" +msgstr "" + #: templates/web/base/admin/body-form.html:69 #: templates/web/base/admin/body.html:16 #: templates/web/zurich/admin/body-form.html:24 @@ -404,9 +375,8 @@ msgid "As this is a staging site and %s is false, reports made on this site will msgstr "Comme ceci est un site de développement et %s est un test, les rapports produits sur ce site seront envoyés au gestionnaire du problème FixMyStreet et non le contact de l'administration indiqué pour la catégorie choisie." #: templates/web/zurich/admin/report_edit.html:213 -#, fuzzy msgid "Assign to competent body:" -msgstr "Affecté à un \"interlocuteur\" externe:" +msgstr "Attribuer à l'organisme compétent:" #: templates/web/zurich/admin/report_edit.html:173 #: templates/web/zurich/admin/stats.html:36 @@ -425,16 +395,16 @@ msgstr "Affecté à la subdivision:" msgid "Assigned to %s" msgstr "Affecté à %s" -#: templates/web/base/open311/index.html:84 +#: templates/web/base/open311/index.html:76 msgid "At most %d requests are returned in each query. The returned requests are ordered by requested_datetime, so to get all requests, do several searches with rolling start_date and end_date." msgstr "Un maximum de %d requètes sont renvoyées pour chaque tentative. Les requètes sont triées par requested_datetime; pour obtenir toutes les requètes, faites plusieurs recherches avec une succession de start_date et end_date." -#: templates/web/base/open311/index.html:76 +#: templates/web/base/open311/index.html:68 msgid "At the moment only searching for and looking at reports work." msgstr "Pour le moment, seul la recherche et la consultation de rapports sont supportés." #: perllib/FixMyStreet/DB/Result/Problem.pm:373 -#: templates/web/zurich/report/_item.html:11 +#: templates/web/zurich/report/_item.html:9 msgid "Awaiting moderation" msgstr "Attendant une modération" @@ -446,7 +416,7 @@ msgstr "Retour" msgid "Ban email address" msgstr "Bannir l'adresse mail" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1276 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1285 #: perllib/FixMyStreet/Cobrand/Zurich.pm:392 #: templates/web/base/admin/bodies.html:1 templates/web/zurich/header.html:64 msgid "Bodies" @@ -469,14 +439,14 @@ msgstr "Par Date" #: templates/web/base/auth/token.html:21 templates/web/base/email_sent.html:18 msgid "Can’t find our email? Check your spam folder – that’s the solution 99% of the time." -msgstr "" +msgstr "Si vous ne trouvez pas notre e-mail? Vérifiez dans votre dossier spam." #: templates/web/base/around/_report_banner.html:5 msgid "Can't see the map? <em>Skip this step</em>" msgstr "Vous ne pouvez pas voir le plan ? <em>Sautez cette étape</em>" #: templates/web/base/admin/body.html:68 -#: templates/web/base/admin/index.html:61 +#: templates/web/base/admin/index.html:54 #: templates/web/base/report/new/category.html:10 #: templates/web/base/report/new/category_wrapper.html:3 #: templates/web/zurich/admin/body.html:14 @@ -487,8 +457,8 @@ msgstr "Vous ne pouvez pas voir le plan ? <em>Sautez cette étape</em>" msgid "Category" msgstr "Catégorie" -#: templates/web/base/admin/index.html:59 -#: templates/web/base/admin/index.html:67 +#: templates/web/base/admin/index.html:52 +#: templates/web/base/admin/index.html:60 msgid "Category fix rate for problems > 4 weeks old" msgstr "Taux de résolution pour les problèmes > 4 semaines" @@ -501,7 +471,7 @@ msgstr "Taux de résolution pour les problèmes > 4 semaines" msgid "Category:" msgstr "Catégorie :" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:402 +#: perllib/FixMyStreet/Script/Reports.pm:180 msgid "Category: %s" msgstr "Catégorie : %s" @@ -557,7 +527,7 @@ msgstr "" #: templates/web/zurich/admin/response_templates_select.html:6 msgid "Choose a template" -msgstr "" +msgstr "Choisissez un modèle" #: templates/web/base/admin/stats.html:65 #: templates/web/base/admin/stats.html:71 @@ -565,25 +535,25 @@ msgid "Click here or enter as dd/mm/yyyy" msgstr "Cliquer ici ou saisir au format jj/mm/aaaa" #: templates/web/base/around/_report_banner.html:2 -#: templates/web/base/js/translation_strings.html:50 +#: templates/web/base/js/translation_strings.html:55 msgid "Click map to report a problem" msgstr "Cliquez sur le plan pour signaler un problème" #: templates/web/base/email_sent.html:13 msgid "Click the link in our confirmation email to activate your alert." -msgstr "" +msgstr "Cliquez sur le lien dans notre courriel de confirmation pour activer votre alerte." #: templates/web/base/email_sent.html:9 msgid "Click the link in our confirmation email to publish your problem." -msgstr "" +msgstr "Cliquez sur le lien dans notre courriel de confirmation pour publier votre problème." #: templates/web/base/email_sent.html:11 msgid "Click the link in our confirmation email to publish your update." -msgstr "" +msgstr "Cliquez sur le lien dans notre courriel de confirmation pour publier votre mise à jour." #: templates/web/base/auth/token.html:18 msgid "Click the link in our confirmation email to sign in." -msgstr "" +msgstr "Cliquez sur le lien dans notre courriel de confirmation pour vous connecter." #: perllib/FixMyStreet/Cobrand/Zurich.pm:196 #: perllib/FixMyStreet/Cobrand/Zurich.pm:969 @@ -592,7 +562,7 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:25 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:144 -#: templates/web/fixmystreet/report/banner.html:15 +#: templates/web/base/report/banner.html:15 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:10 #: templates/web/zurich/admin/header.html:16 @@ -600,7 +570,7 @@ msgstr "" msgid "Closed" msgstr "Clos" -#: perllib/FixMyStreet/DB/Result/Problem.pm:794 +#: perllib/FixMyStreet/DB/Result/Problem.pm:779 msgid "Closed by council" msgstr "Clos par l'administration" @@ -626,7 +596,7 @@ msgstr "Données de collaboration :" msgid "Cobrand:" msgstr "Collaboration :" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1283 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1292 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "Configuration" @@ -639,13 +609,14 @@ msgstr "Configurez Endpoint" msgid "Confirm" msgstr "Confirmer" -#: templates/web/base/auth/token.html:1 templates/web/zurich/auth/token.html:1 +#: templates/web/base/auth/token.html:1 msgid "Confirm account" msgstr "Confirmer le compte" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:33 -#: templates/web/fixmystreet/report/update-form.html:107 -msgid "Confirm by email below, providing a new password at that point. When you confirm, your password will be updated." +#: templates/web/base/report/new/form_user_loggedout_password.html:21 +#: templates/web/base/report/update/form_user_loggedout_password.html:20 +#, fuzzy +msgid "Confirm by email instead, providing a new password at that point. When you confirm, your password will be updated." msgstr "Confirmer par courriel ci-dessous, en fournissant un nouveau mot de passe à ce moment. Losque vous confirmerez, votre mot de passe sera mis à jour." #: templates/web/base/questionnaire/creator_fixed.html:1 @@ -675,35 +646,27 @@ msgid "Confirmed:" msgstr "Confirmé :" #. ("%s is the site name") -#: templates/web/base/faq/faq-en-gb.html:8 templates/web/base/footer.html:24 -#: templates/web/base/open311/index.html:8 -#: templates/web/base/static/privacy.html:10 -#: templates/web/fixmystreet/contact/index.html:12 -#, fuzzy +#: templates/web/base/about/_sidebar.html:6 templates/web/base/footer.html:24 msgid "Contact %s" -msgstr "Nous contacter" +msgstr "Contacter %s" #: templates/web/base/contact/index.html:1 #: templates/web/base/contact/index.html:2 #: templates/web/base/contact/submit.html:1 -#: templates/web/fixmystreet/contact/index.html:1 -#: templates/web/fixmystreet/contact/index.html:2 msgid "Contact Us" msgstr "Nous contacter" -#: templates/web/base/contact/index.html:6 -#: templates/web/fixmystreet/contact/index.html:20 +#: templates/web/base/contact/index.html:12 msgid "Contact the team" msgstr "Contacter l'équipe" #: templates/web/zurich/admin/report_edit-sdm.html:40 #: templates/web/zurich/admin/report_edit.html:59 -#, fuzzy msgid "Coordinates:" -msgstr "Coordonnées" +msgstr "Coordonnées:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1420 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1448 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1429 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1457 msgid "Could not find user" msgstr "Impossible de trouver l'utilisateur" @@ -721,7 +684,7 @@ msgstr "Administration" msgid "Council contacts for %s" msgstr "Contacts de l'administration pour %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:693 +#: perllib/FixMyStreet/DB/Result/Problem.pm:681 msgid "Council ref: %s" msgstr "Ref. de la mairie : %s" @@ -736,7 +699,7 @@ msgstr "Administration :" msgid "Count" msgstr "Nombre" -#: templates/web/base/email_sent.html:1 templates/web/zurich/email_sent.html:1 +#: templates/web/base/email_sent.html:1 msgid "Create a report" msgstr "Créer un rapport" @@ -746,9 +709,8 @@ msgid "Create category" msgstr "Créer une catégorie" #: templates/web/zurich/admin/template_edit.html:29 -#, fuzzy msgid "Create template" -msgstr "Créer un rapport" +msgstr "Créer un modèle" #: templates/web/base/admin/problem_row.html:34 #: templates/web/zurich/admin/templates.html:10 @@ -774,7 +736,7 @@ msgstr "Pour l'instant, aucun intelocuteur n'a été créé." #: perllib/FixMyStreet/Cobrand/Zurich.pm:834 #: templates/web/zurich/admin/report_edit-sdm.html:109 msgid "Customer not contactable" -msgstr "" +msgstr "Le client est injoignable" #: templates/web/base/dashboard/index.html:5 #: templates/web/base/dashboard/index.html:7 @@ -785,10 +747,10 @@ msgstr "Tableau de bord" msgid "Dealt with by subdivision within 5 working days" msgstr "Traité par la subdivision dans les 5 jours ouvrables" -#: perllib/FixMyStreet/App/Controller/Admin.pm:878 +#: perllib/FixMyStreet/App/Controller/Admin.pm:877 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" -msgstr "" +msgstr "Supprimer le modèle" #: templates/web/base/admin/bodies.html:27 #: templates/web/base/admin/body.html:177 @@ -798,7 +760,7 @@ msgstr "" msgid "Deleted" msgstr "Effacé" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:51 +#: templates/web/base/report/new/form_report.html:45 #: templates/web/zurich/admin/index-dm.html:22 #: templates/web/zurich/admin/index-sdm.html:20 #: templates/web/zurich/admin/reports.html:12 @@ -806,12 +768,11 @@ msgid "Description" msgstr "Description" #: templates/web/base/js/translation_strings.html:34 -#: templates/web/zurich/report/new/fill_in_details_form.html:42 +#: templates/web/zurich/report/new/fill_in_details_form.html:68 msgid "Details" msgstr "Détails :" #: templates/web/base/admin/report_edit.html:20 -#: templates/web/base/report/new/fill_in_details_form.html:62 #: templates/web/zurich/admin/report_edit-sdm.html:27 #: templates/web/zurich/admin/report_edit.html:29 #: templates/web/zurich/admin/report_edit.html:43 @@ -824,38 +785,38 @@ msgstr "Transféré(e)" #: templates/web/zurich/admin/report_edit-sdm.html:50 #: templates/web/zurich/admin/report_edit.html:69 -#, fuzzy msgid "Didn't use map" -msgstr "n'a pas utilisé le plan" +msgstr "Ne pas utiliser la carte" #: templates/web/base/admin/edit-league.html:8 msgid "Diligency prize league table" msgstr "Tableau d'honneur de la réactivité" #. ("%s is the site name") -#: templates/web/base/auth/general.html:31 -#: templates/web/base/report/new/fill_in_details_form.html:114 -#: templates/web/base/report/update-form.html:87 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:11 -#: templates/web/fixmystreet/report/update-form.html:86 -#, fuzzy +#: templates/web/base/auth/general.html:48 +#: templates/web/base/report/new/form_user_loggedout.html:18 +#: templates/web/base/report/new/oauth_email_form.html:18 +#: templates/web/base/report/update-form.html:29 +#: templates/web/base/report/update/form_user_loggedout.html:17 msgid "Do you have a %s password?" -msgstr "Avez-vous un mot de passe FixMyStreet ?" +msgstr "Avez-vous un mot de passe %s ?" #: templates/web/base/questionnaire/index.html:55 msgid "Don’t know" msgstr "Je ne sais pas" -#: templates/web/fixmystreet/contact/index.html:118 +#: templates/web/base/contact/index.html:110 msgid "Don't like forms?" msgstr "Vous n'aimez pas les formulaires ?" +#: templates/web/base/js/translation_strings.html:51 +msgid "Drag and drop photos here or <u>click to upload</u>" +msgstr "" + #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:14 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:32 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:30 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:36 msgid "Duplicate" msgstr "Dupliqué" @@ -908,7 +869,7 @@ msgstr "Éditeur" #: templates/web/base/admin/category_edit.html:91 #: templates/web/base/admin/flagged.html:38 #: templates/web/base/admin/users.html:16 -#: templates/web/base/auth/general.html:22 +#: templates/web/base/auth/general.html:39 #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:24 @@ -916,7 +877,7 @@ msgstr "Éditeur" msgid "Email" msgstr "Email" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1396 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1405 msgid "Email added to abuse list" msgstr "Email rajouté à la liste des abus" @@ -932,7 +893,7 @@ msgstr "Alerte E-mail créé" msgid "Email alert deleted" msgstr "Alerte E-mail supprimé" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1393 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1402 msgid "Email already in abuse list" msgstr "Email déjà présent dans la liste des abus" @@ -940,41 +901,36 @@ msgstr "Email déjà présent dans la liste des abus" msgid "Email me new local problems" msgstr "Envoyez-moi les nouveaux problèmes locaux" -#: templates/web/base/report/display.html:38 -msgid "Email me updates" -msgstr "Envoyez-moi les mises à jour" - #: templates/web/base/admin/category_edit.html:31 #: templates/web/base/admin/report_edit.html:62 #: templates/web/base/admin/update_edit.html:33 #: templates/web/base/admin/user-form.html:20 #: templates/web/base/alert/updates.html:13 -#: templates/web/base/report/display.html:42 #: templates/web/zurich/admin/body.html:47 msgid "Email:" msgstr "Email :" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:329 +#: perllib/FixMyStreet/Script/Reports.pm:108 msgid "Email: %s" msgstr "Courriel: %s" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:639 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:634 msgid "Empty flat or maisonette" msgstr "appartement ou maisonnette vide" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:638 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:633 msgid "Empty house or bungalow" msgstr "maison ou bungalow vide" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:641 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:636 msgid "Empty office or other commercial" msgstr "bureau ou commerce vide" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:642 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:637 msgid "Empty pub or bar" msgstr "pub ou bar vide" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:643 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:638 msgid "Empty public building - school, hospital, etc." msgstr "bâtiment public - école - hôpital, etc non renseigné." @@ -1013,7 +969,7 @@ msgstr "destinataire" msgid "Enter a Zürich street name" msgstr "Saisir un nom de rue Zücomplet" -#: perllib/FixMyStreet/Cobrand/UK.pm:13 +#: perllib/FixMyStreet/Cobrand/UK.pm:14 msgid "Enter a nearby UK postcode, or street name and area" msgstr "Saisir un code postal proche, ou un nom de rue ou de localité" @@ -1031,14 +987,9 @@ msgstr "Saisissez un nom de rue proche, la localité ou le code postal" msgid "Enter a nearby street name and area, postal code or district in Delhi" msgstr "Saisissez un nom de rue proche et une localité, le code postal et le district de Delhi" -#: templates/web/base/report/new/fill_in_details_form.html:152 -#: templates/web/base/report/update-form.html:125 -msgid "Enter a new password:" -msgstr "Saisissez un nouveau mot de passe :" - -#: templates/web/base/auth/general.html:60 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:75 -#: templates/web/fixmystreet/report/update-form.html:123 +#: templates/web/base/auth/general.html:99 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:38 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:13 #: templates/web/zurich/auth/general.html:65 msgid "Enter a password" msgstr "Saisissez un mot de passe :" @@ -1048,28 +999,28 @@ msgid "Enter details of the problem" msgstr "Saisissez les détails du problème" #: templates/web/base/errors/generic.html:1 -#: templates/web/base/errors/generic.html:3 +#: templates/web/base/errors/generic.html:4 #: templates/web/base/tokens/abuse.html:1 #: templates/web/base/tokens/abuse.html:3 #: templates/web/base/tokens/error.html:1 -#: templates/web/base/tokens/error.html:3 +#: templates/web/base/tokens/error.html:5 msgid "Error" msgstr "Erreur" #: templates/web/base/reports/_list-filters.html:12 msgid "Everything" -msgstr "" +msgstr "Tout" #: templates/web/base/admin/body.html:14 #: templates/web/base/admin/category_edit.html:18 msgid "Example postcode %s" msgstr "Exemple de code postal %s" -#: templates/web/base/open311/index.html:94 +#: templates/web/base/open311/index.html:86 msgid "Examples:" msgstr "Exemples :" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:55 +#: templates/web/base/report/new/form_report.html:49 msgid "Explain what’s wrong, exactly where it is, and how long it’s been there…" msgstr "Expliquez ce qui ne va pas, sa position exact, et depuis combien de temps..." @@ -1077,9 +1028,8 @@ msgstr "Expliquez ce qui ne va pas, sa position exact, et depuis combien de temp #: perllib/FixMyStreet/Cobrand/Zurich.pm:922 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:12 -#, fuzzy msgid "Extern" -msgstr "URL externe" +msgstr "Externe" #: templates/web/base/admin/body-form.html:81 msgid "External URL" @@ -1111,17 +1061,15 @@ msgstr "Résoudre ceci en chosissant une <strong>zone couverte</strong> dans le msgid "FixMyStreet" msgstr "FixMyStreet" -#: templates/web/base/admin/index.html:61 +#: templates/web/base/admin/index.html:54 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:24 #: templates/web/base/admin/report_blocks.html:9 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:144 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:34 -#: templates/web/fixmystreet/report/banner.html:12 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:32 +#: templates/web/base/report/banner.html:12 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:38 msgid "Fixed" msgstr "Résolu" @@ -1148,7 +1096,7 @@ msgstr "Signaler comme supprimé" msgid "Flag user" msgstr "Signaler l'usager" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1281 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1290 #: templates/web/base/admin/users.html:19 msgid "Flagged" msgstr "Signalé" @@ -1179,36 +1127,31 @@ msgstr "Suivez un lien de localité pour voir uniquement les rapports à l'inté msgid "For more information, see <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>." msgstr "Pour plus d'information, Lire <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>comment FixMyStreet utilise Mapit</a>." -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:32 -#: templates/web/fixmystreet/report/update-form.html:106 +#: templates/web/base/report/new/form_user_loggedout_password.html:20 +#: templates/web/base/report/update/form_user_loggedout_password.html:19 msgid "Forgotten your password?" msgstr "Vous avez oublié votre mot de passe? " #: perllib/FixMyStreet/Cobrand/Zurich.pm:752 -#, fuzzy msgid "Forwarded to external body" -msgstr "Affecté à un \"interlocuteur\" externe:" +msgstr "Transmis à l'administration" #: perllib/FixMyStreet/Cobrand/Zurich.pm:753 -#, fuzzy msgid "Forwarded wish to external body" -msgstr "Affecté à un \"interlocuteur\" externe:" +msgstr "Souhait transmis à l'administration" -#: templates/web/base/faq/faq-en-gb.html:1 -#: templates/web/base/faq/faq-en-gb.html:13 -#: templates/web/base/faq/faq-en-gb.html:6 -#: templates/web/base/open311/index.html:6 -#: templates/web/base/static/privacy.html:8 -#: templates/web/fixmystreet/contact/index.html:10 +#: templates/web/base/about/_sidebar.html:4 +#: templates/web/base/about/faq-en-gb.html:1 +#: templates/web/base/about/faq-en-gb.html:5 msgid "Frequently Asked Questions" msgstr "Foire Aux Questions" -#: templates/web/base/open311/index.html:136 +#: templates/web/base/open311/index.html:128 msgid "GeoRSS on Google Maps" msgstr "GeoRSS sur Google Maps" +#: templates/web/base/report/display_tools.html:11 #: templates/web/fixmystreet/around/_updates.html:3 -#: templates/web/fixmystreet/report/display.html:35 msgid "Get updates" msgstr "Recevoir les mises à jour" @@ -1241,7 +1184,7 @@ msgstr "Ok" msgid "Going to send questionnaire?" msgstr "Envoi du questionnaire ?" -#: templates/web/base/admin/index.html:42 +#: templates/web/base/admin/index.html:35 msgid "Graph of problem creation by status over time" msgstr "Graphique historique des problèmes créés, par statut" @@ -1258,7 +1201,7 @@ msgid "Have you ever reported a problem to a council before, or is this your fir msgstr "Est-ce que vous aviez déjà signalé un problème à une administration, ou est-ce que c'est votre première fois ?" #: templates/web/base/footer.html:15 templates/web/fixmystreet/footer.html:38 -#: templates/web/zurich/faq/faq-de-ch.html:1 +#: templates/web/zurich/about/faq-de-ch.html:1 #: templates/web/zurich/footer.html:22 #: templates/web/zurich/nav_over_content.html:8 msgid "Help" @@ -1309,7 +1252,7 @@ msgstr "Comment signaler un problème" msgid "How to send successful reports" msgstr "Comment envoyer des rapports réussis" -#: perllib/FixMyStreet/App/Controller/Admin.pm:754 +#: perllib/FixMyStreet/App/Controller/Admin.pm:752 msgid "I am afraid you cannot confirm unconfirmed reports." msgstr "Je suis désolé, vous ne pouvez pas confirmer des rapports non validés" @@ -1327,10 +1270,6 @@ msgstr "Je viens de mettre à jour un problème sur @fixmystreet" msgid "I'm afraid we couldn't locate your problem in the database.\n" msgstr "Je suis désolé, nous n'avons pas trouvé votre problème dans notre base de données.\n" -#: perllib/FixMyStreet/App/Controller/Tokens.pm:327 -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 "Je suis désolé, nous n'avons pas pu valider cet accusé de réception. Si vous avez copié cette adresse d'un email, merci de vérifier que vous n'avez pas fait d'erreur.\n" - #: templates/web/base/admin/flagged.html:14 #: templates/web/base/admin/list_updates.html:6 #: templates/web/base/admin/reports.html:11 @@ -1359,25 +1298,18 @@ msgstr "Si deux interlocuteurs ou plus servent le même lieu, FixMyStreet combin msgid "If you get some more information about the status of your problem, please come back to the site and leave an update." msgstr "Si vous obtenez un peu plus d'informations sur l'état de votre problème, s'il vous plaît revenez sur le site et effectuez une mise à jour." -#: templates/web/base/report/new/councils_text_none.html:2 -#: templates/web/base/report/new/councils_text_none.html:8 +#: templates/web/base/report/new/councils_text_none.html:10 +#: templates/web/base/report/new/councils_text_none.html:9 msgid "If you submit a problem here the subject and details of the problem will be public, but the problem will <strong>not</strong> be reported to the council." msgstr "Si vous signalez un problème ici, le sujet et les détails seront publics, mais le problème ne sera <strong>pas</strong> signalé à l'administration." -#: templates/web/zurich/auth/token.html:19 -#: templates/web/zurich/email_sent.html:7 -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 "Si vous consultez vos emails sur un site web ou que vous utilisez un filtre antispam, vérifiez peut-être votre boîte Spam/Courrier indésirable : nos messages sont parfois filtrés par erreur." - #: templates/web/base/questionnaire/index.html:68 -#, fuzzy msgid "" "If you wish to leave a public update on the problem, please enter it here\n" "(please note it will not be sent to the council)." msgstr "" -"Si vous souhaitez laisser une actualisation publique sur le problème, merci de l'entrer ici\n" -"(merci de noter que la mise à jour ne sera pas envoyée à l'administration). Par exemple, quelle\n" -"était votre impression de la résolution de problème ?" +"Si vous souhaitez effectuer une mise à jour publique concernant ce problème, s'il vous plaît renseigné le ici\n" +"(Veuillez noter qu'elle ne sera pas envoyée à l'administration)." #: templates/web/base/admin/body.html:149 msgid "If you're using <strong>a send method that is not email</strong>, enter the service ID (Open311) or equivalent identifier here." @@ -1423,10 +1355,8 @@ msgstr "Sélection de flux invalide" #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:144 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:32 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:30 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:36 msgid "In Progress" msgstr "En cours" @@ -1434,7 +1364,7 @@ msgstr "En cours" msgid "In abuse table?" msgstr "En table d'abus ?" -#: templates/web/base/open311/index.html:88 +#: templates/web/base/open311/index.html:80 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 "En plus, les attributs suivants qui ne font pas partie de la spécification Open311 v2 sont renvoyés : agency_sent_datetime, title (qui est aussi renvoyé dans la description), interface_used, comment_count, requestor_name (seulement s'il est présent et que le requérant nous a autorisé à l'afficher sur le site)" @@ -1442,7 +1372,7 @@ msgstr "En plus, les attributs suivants qui ne font pas partie de la spécificat #: perllib/FixMyStreet/Cobrand/Zurich.pm:963 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:7 -#: templates/web/fixmystreet/report/banner.html:19 +#: templates/web/base/report/banner.html:19 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:8 msgid "In progress" @@ -1477,7 +1407,7 @@ msgstr "Référence interne" msgid "Invalid agency_responsible value %s" msgstr "Valeur agency_responsible invalide \"%s\"" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1201 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1210 msgid "Invalid end date" msgstr "Date de fin invalide" @@ -1485,7 +1415,7 @@ msgstr "Date de fin invalide" msgid "Invalid format %s specified." msgstr "Format spécifié %s invalide" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1206 msgid "Invalid start date" msgstr "Date de début invalide" @@ -1493,14 +1423,12 @@ msgstr "Date de début invalide" #: templates/web/base/admin/report_blocks.html:5 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:143 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:31 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:29 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:35 msgid "Investigating" msgstr "En examen" -#: templates/web/fixmystreet/contact/blurb.html:8 +#: templates/web/base/contact/blurb.html:8 msgid "It's often quickest to <a href=\"%s\">check our FAQs</a> and see if the answer is there." msgstr "Il est souvent plus rapide <a href=\"%s\">de parcourir notre FAQs</a> et d'y chercher la réponse." @@ -1510,19 +1438,17 @@ msgstr "Il est sur le chemin de l’administration en ce moment." #: perllib/FixMyStreet/Cobrand/Zurich.pm:184 msgid "Jurisdiction Unknown" -msgstr "" +msgstr "Zone d'administration Inconnue" #: perllib/FixMyStreet/Cobrand/Zurich.pm:927 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:15 msgid "Jurisdiction unknown" -msgstr "" +msgstr "Zone d'administration Inconnue" -#: templates/web/base/auth/general.html:44 -#: templates/web/base/report/new/fill_in_details_form.html:132 -#: templates/web/base/report/update-form.html:105 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:28 -#: templates/web/fixmystreet/report/update-form.html:102 +#: templates/web/base/auth/general.html:80 +#: templates/web/base/report/new/form_user_loggedout_password.html:16 +#: templates/web/base/report/update/form_user_loggedout_password.html:15 #: templates/web/zurich/auth/general.html:40 msgid "Keep me signed in on this computer" msgstr "Se souvenir de moi sur cet ordinateur" @@ -1580,6 +1506,7 @@ msgid "MAP" msgstr "CARTE" #: templates/web/base/js/translation_strings.html:45 +#: templates/web/base/maps/google-ol.html:13 msgid "Map" msgstr "Carte" @@ -1599,23 +1526,17 @@ msgstr "Marqué fixé / fermé depuis les huit dernières semaines" msgid "Marked fixed/closed more than eight weeks ago" msgstr "Marqué fixé / fermé depuis plus de huit semaines" -#: templates/web/fixmystreet/contact/index.html:106 +#: templates/web/base/contact/index.html:98 msgid "Message" msgstr "Message" #: templates/web/zurich/admin/report_edit.html:284 -#, fuzzy msgid "Message to competent body:" -msgstr "Affecté à un \"interlocuteur\" externe:" +msgstr "Message à l'organisme compétent:" #: templates/web/zurich/admin/report_edit.html:282 -#, fuzzy msgid "Message to external body:" -msgstr "Affecté à un \"interlocuteur\" externe:" - -#: templates/web/base/contact/index.html:97 -msgid "Message:" -msgstr "Message :" +msgstr "Message à l'organisme externe compétent:" #: perllib/FixMyStreet/App/Controller/Open311.pm:445 msgid "Missing jurisdiction_id" @@ -1629,10 +1550,6 @@ msgstr "Modéré par division dans le délai d'un jour ouvrable" msgid "Month" msgstr "Mois" -#: templates/web/base/report/display.html:34 -msgid "More problems nearby" -msgstr "Encore plus de problèmes aux alentours" - #: templates/web/base/admin/bodies.html:21 #: templates/web/base/admin/body-form.html:18 #: templates/web/base/admin/flagged.html:16 @@ -1640,11 +1557,11 @@ msgstr "Encore plus de problèmes aux alentours" #: templates/web/base/admin/list_updates.html:7 #: templates/web/base/admin/reports.html:13 #: templates/web/base/admin/users.html:15 -#: templates/web/base/auth/general.html:50 +#: templates/web/base/auth/general.html:89 +#: templates/web/base/report/new/form_user_loggedin.html:9 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:7 +#: templates/web/base/report/update/form_name.html:4 #: templates/web/base/reports/index.html:20 -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:9 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:44 -#: templates/web/fixmystreet/report/update-form.html:138 #: templates/web/zurich/admin/body-form.html:4 #: templates/web/zurich/auth/general.html:60 #: templates/web/zurich/report/new/fill_in_details_form.html:82 @@ -1658,7 +1575,7 @@ msgstr "Nom" msgid "Name:" msgstr "Nom :" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:328 +#: perllib/FixMyStreet/Script/Reports.pm:107 msgid "Name: %s" msgstr "Nom: %s" @@ -1667,16 +1584,16 @@ msgstr "Nom: %s" msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s" msgstr "Route la plus proche de l'épingle placée sur le plan (génerée automatiquement à partir d'OpenStreetMap): %s%s" -#: perllib/FixMyStreet/Cobrand/UK.pm:127 +#: perllib/FixMyStreet/Cobrand/UK.pm:128 msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" msgstr "Code postal le plus proche de l'épingle placée sur le plan (géneré automatiquement): %s (à %sm d'ici)" -#: perllib/FixMyStreet/Cobrand/Default.pm:434 -#: perllib/FixMyStreet/Cobrand/Default.pm:474 +#: perllib/FixMyStreet/Cobrand/Default.pm:455 +#: perllib/FixMyStreet/Cobrand/Default.pm:495 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "Route la plus proche de l'épingle placée sur le plan (génerée automatiquement à partir de Bing Maps): %s%s" -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:267 +#: perllib/FixMyStreet/Script/Alerts.pm:290 msgid "" "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n" "\n" @@ -1684,14 +1601,9 @@ msgstr "" "Route la plus proche de l'épingle placée sur le plan (génerée automatiquement à partir de Bing Maps): %s\n" "\n" -#: templates/web/zurich/email_sent.html:5 -msgid "Nearly Done! Now check your email..." -msgstr "Presque fini! Maintenant allez voir vos emails…" - #: templates/web/base/auth/token.html:17 templates/web/base/email_sent.html:5 -#, fuzzy msgid "Nearly done! Now check your email…" -msgstr "Presque fini! Maintenant allez voir vos emails…" +msgstr "Presque fini! Maintenant, veuillez vérifier votre email" #: templates/web/base/reports/index.html:21 msgid "New <br>problems" @@ -1715,9 +1627,8 @@ msgid "New local problems on FixMyStreet" msgstr "Nouveaux problèmes locaux sur FixMyStreet.fr" #: templates/web/zurich/admin/report_edit-sdm.html:117 -#, fuzzy msgid "New note to DM:" -msgstr "Nouvelle note interne:" +msgstr "Nouvelle note à DM:" #: db/alert_types.pl:38 msgid "New problems for {{COUNCIL}} within {{WARD}} ward on FixMyStreet" @@ -1749,9 +1660,8 @@ msgstr "Nouvel état" #: templates/web/zurich/admin/template_edit.html:9 #: templates/web/zurich/admin/templates.html:26 -#, fuzzy msgid "New template" -msgstr "Nouvel état" +msgstr "Nouveau modèle" #: templates/web/base/pagination.html:13 msgid "Next" @@ -1768,8 +1678,8 @@ msgstr "Suivant" #: templates/web/base/admin/report_edit.html:75 #: templates/web/base/admin/update_edit.html:25 #: templates/web/base/questionnaire/creator_fixed.html:16 +#: templates/web/base/questionnaire/index.html:101 #: templates/web/base/questionnaire/index.html:53 -#: templates/web/base/questionnaire/index.html:92 msgid "No" msgstr "Non" @@ -1839,10 +1749,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:13 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:33 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:31 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:37 msgid "Not Responsible" msgstr "Pas responsable" @@ -1850,9 +1758,8 @@ msgstr "Pas responsable" #: perllib/FixMyStreet/Cobrand/Zurich.pm:937 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:13 -#, fuzzy msgid "Not contactable" -msgstr "Pas responsable" +msgstr "injoignable" #: templates/web/zurich/admin/report_edit-sdm.html:108 msgid "Not for my subdivision" @@ -1882,21 +1789,23 @@ msgstr "Notez que quand les rapports non confirmés sont inclus nous utilisons l msgid "Note:" msgstr "Note :" -#: templates/web/base/open311/index.html:73 +#: templates/web/base/open311/index.html:65 msgid "Note: <strong>%s</strong>" msgstr "Note : <strong>%s</strong>" #: templates/web/zurich/admin/list_updates.html:21 msgid "Notes from SDM to DM" -msgstr "" +msgstr "Notes du SDM pour DM" -#: templates/web/base/report/new/fill_in_details_form.html:113 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:10 +#: templates/web/base/report/new/form_user_loggedout.html:14 +#: templates/web/base/report/new/form_user_loggedout.html:2 +#: templates/web/base/report/new/oauth_email_form.html:17 msgid "Now to submit your report…" msgstr "Maintenant pour envoyer votre rapport…" -#: templates/web/base/report/update-form.html:86 -#: templates/web/fixmystreet/report/update-form.html:85 +#: templates/web/base/report/update-form.html:28 +#: templates/web/base/report/update/form_user_loggedout.html:13 +#: templates/web/base/report/update/form_user_loggedout.html:2 msgid "Now to submit your update…" msgstr "Now to submit your mise à jour…" @@ -1904,11 +1813,6 @@ msgstr "Now to submit your mise à jour…" msgid "OK" msgstr "OK" -#: templates/web/base/report/display.html:28 -#: templates/web/base/report/update.html:17 -msgid "Offensive? Unsuitable? Tell us" -msgstr "Offensant ? Inapproprié ? Dites-le nous" - #: templates/web/base/reports/index.html:23 msgid "Old / unknown <br>problems" msgstr "Probèmes<br /> anciens / inconnus" @@ -1925,7 +1829,7 @@ msgstr "Anciens <br />résolus" msgid "Older <br>problems" msgstr "Anciens <br />problèmes" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:45 +#: templates/web/base/report/new/form_report.html:15 msgid "One-line summary" msgstr "Résumé" @@ -1936,8 +1840,7 @@ msgstr "Résumé" #: templates/web/base/admin/report_blocks.html:4 #: templates/web/base/admin/update_edit.html:28 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/report/update-form.html:30 -#: templates/web/fixmystreet/report/update-form.html:28 +#: templates/web/base/report/update/form_update.html:34 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:7 #: templates/web/zurich/admin/update_edit.html:18 @@ -1952,15 +1855,15 @@ msgstr "Ouvrez pendant plus de quatre semaines, avec une mise à jour au cours d msgid "Open, but not had any update in eight weeks" msgstr "Ouvert, mais sans mise à jour depuis huit semaines" -#: templates/web/base/open311/index.html:70 +#: templates/web/base/open311/index.html:62 msgid "Open311 API for the mySociety FixMyStreet server" msgstr "API Open311 pour le serveur FixMyStreet.fr" -#: templates/web/base/open311/index.html:80 +#: templates/web/base/open311/index.html:72 msgid "Open311 initiative web page" msgstr "Page web de l'initiative Open311" -#: templates/web/base/open311/index.html:81 +#: templates/web/base/open311/index.html:73 msgid "Open311 specification" msgstr "Spécification Open311" @@ -1972,15 +1875,15 @@ msgstr "Ou problèmes signalés à  :" msgid "Or you can subscribe to an alert based upon what ward or council you’re in:" msgstr "Ou vous pouvez vous abonner à une alerte en fonction de la commune dans laquelle vous êtes :" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1084 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:673 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:674 -#: perllib/FixMyStreet/DB/Result/Problem.pm:570 -#: perllib/FixMyStreet/DB/Result/Problem.pm:580 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1055 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:669 +#: perllib/FixMyStreet/DB/Result/Problem.pm:558 +#: perllib/FixMyStreet/DB/Result/Problem.pm:568 +#: perllib/FixMyStreet/DB/Result/Problem.pm:578 #: perllib/FixMyStreet/DB/Result/Problem.pm:590 -#: perllib/FixMyStreet/DB/Result/Problem.pm:602 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:397 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:412 +#: perllib/FixMyStreet/Script/Reports.pm:175 +#: perllib/FixMyStreet/Script/Reports.pm:190 msgid "Other" msgstr "Autres" @@ -1989,7 +1892,7 @@ msgid "Owner" msgstr "Propriétaire" #: templates/web/base/errors/page_error_404_not_found.html:1 -#: templates/web/base/errors/page_error_404_not_found.html:3 +#: templates/web/base/errors/page_error_404_not_found.html:4 msgid "Page Not Found" msgstr "Page Introuvable" @@ -2003,66 +1906,58 @@ msgstr "Parent" msgid "Partial" msgstr "Partiel" -#: templates/web/base/auth/general.html:53 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:68 -#: templates/web/fixmystreet/report/update-form.html:116 +#: templates/web/base/auth/general.html:92 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:31 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:6 #: templates/web/zurich/auth/general.html:32 #: templates/web/zurich/auth/general.html:63 msgid "Password (optional)" msgstr "Mot de passe (facultatif)" #: templates/web/base/auth/change_password.html:25 -#: templates/web/base/auth/general.html:36 +#: templates/web/base/auth/general.html:72 msgid "Password:" msgstr "Mot de passe :" #: templates/web/base/js/translation_strings.html:48 msgid "Permalink" -msgstr "Permalien" +msgstr "Lien permanent" #: templates/web/zurich/report/new/fill_in_details_form.html:88 msgid "Phone number" msgstr "Numéro de téléphone" -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:26 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:62 +#: templates/web/base/report/new/form_user_loggedin.html:26 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:25 msgid "Phone number (optional)" msgstr "Téléphone (facultatif)" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:306 +#: perllib/FixMyStreet/Script/Reports.pm:83 #: templates/web/base/admin/report_edit.html:63 -#: templates/web/base/report/new/fill_in_details_form.html:198 #: templates/web/zurich/admin/stats.html:39 msgid "Phone:" msgstr "Téléphone" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:66 -#: templates/web/fixmystreet/report/update-form.html:59 +#: templates/web/base/questionnaire/index.html:75 +#: templates/web/base/report/new/form_report.html:23 +#: templates/web/base/report/update/form_update.html:6 #: templates/web/zurich/admin/index-dm.html:29 #: templates/web/zurich/admin/index-sdm.html:24 #: templates/web/zurich/admin/reports.html:16 #: templates/web/zurich/admin/stats.html:37 -#: templates/web/zurich/report/new/fill_in_details_form.html:52 +#: templates/web/zurich/report/new/fill_in_details_form.html:45 msgid "Photo" msgstr "Photo" -#: perllib/FixMyStreet/App/Controller/Photo.pm:221 -#, fuzzy +#: perllib/FixMyStreet/App/Controller/Photo.pm:187 msgid "Photo is required." -msgstr "Ces renseignements sont nécessaires" +msgstr "La photo est nécessaire." #: templates/web/base/admin/category_edit.html:48 -#, fuzzy msgid "Photo required" -msgstr "Ces renseignements sont nécessaires" +msgstr "Photo requise" -#: templates/web/base/questionnaire/index.html:80 -#: templates/web/base/report/new/fill_in_details_form.html:84 -#: templates/web/base/report/update-form.html:62 -msgid "Photo:" -msgstr "Photo :" - -#: templates/web/base/alert/list.html:26 +#: templates/web/base/alert/list.html:23 msgid "Photos of recent nearby reports" msgstr "Photos de rapports récents à proximité" @@ -2091,20 +1986,16 @@ msgstr "Merci d'être poli, concis et précis." msgid "Please check the passwords and try again" msgstr "Merci de vérifier les mots de passe et de réessayer" -#: templates/web/zurich/auth/token.html:16 -msgid "Please check your email" -msgstr "Merci de consulter vos emails" - -#: templates/web/base/auth/general.html:10 -#: templates/web/base/auth/general.html:16 +#: templates/web/base/auth/general.html:27 +#: templates/web/base/auth/general.html:33 #: templates/web/zurich/auth/general.html:3 #: templates/web/zurich/auth/general.html:9 msgid "Please check your email address is correct" msgstr "Merci de vérifier que votre adresse email est correcte" #: perllib/FixMyStreet/App/Controller/Admin.pm:343 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:883 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:948 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:878 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:943 #: perllib/FixMyStreet/DB/Result/Problem.pm:412 #: templates/web/base/js/translation_strings.html:9 msgid "Please choose a category" @@ -2118,28 +2009,32 @@ msgstr "Merci de choisir un type de propriété" msgid "Please correct the errors below" msgstr "Merci de corriger les erreurs ci-dessous" -#: templates/web/base/contact/blurb.html:2 -#: templates/web/fixmystreet/contact/blurb.html:12 -#, fuzzy +#: templates/web/base/contact/blurb.html:12 msgid "" "Please do <strong>not</strong> report problems through this form; messages go to\n" "the team behind this site, not a council. To report a problem,\n" "please <a href=\"/\">go to the front page</a> and follow the instructions." msgstr "" -"Merci de ne <strong>pas</strong> rapporter des problèmes via ce formulaires; ces\n" -"messages sont envoyés à l'équipe de FixMyStreet.fr, pas à une administration. Pour signaler un,\n" -"problème, merci <a href=\"/\">d'aller à la première page</a> et de suivre les instructions." +"S'il vous plaît <strong> n'utilisez pas </ strong> ce formulaire pour signaler un problème\n" +"l'équipe contacter n'est pas une administration. Pour signaler un problème,\n" +"c'est ici <a href=\"/\"> Signaler un problème </a> et suivez les instructions." #: templates/web/base/report/new/notes.html:6 msgid "Please do not be abusive — abusing your council devalues the service for all users." -msgstr "Merci de ne pas injurieux — Calomnier l'administration dévalue le service pour tous les utilisateurs." +msgstr "Merci de ne pas être injurieux — Calomnier l'administration dévalue le service pour tous les utilisateurs." #: perllib/FixMyStreet/App/Controller/Admin.pm:346 -#: perllib/FixMyStreet/DB/Result/Comment.pm:126 +#: perllib/FixMyStreet/DB/Result/Comment.pm:125 #: templates/web/base/js/translation_strings.html:2 msgid "Please enter a message" msgstr "Merci d'entrer un message" +#: perllib/FixMyStreet/App/Controller/Admin.pm:1091 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1146 +#, fuzzy +msgid "Please enter a name" +msgstr "Merci de saisir votre nom" + #: templates/web/base/auth/change_password.html:12 #: templates/web/base/auth/change_password.html:15 #: templates/web/base/js/translation_strings.html:19 @@ -2152,10 +2047,10 @@ msgstr "Merci d'entrer un mot de passe :" msgid "Please enter a subject" msgstr "Merci d'enter un sujet" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1084 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1137 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1087 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1142 #: perllib/FixMyStreet/App/Controller/Admin.pm:345 -#: perllib/FixMyStreet/DB/Result/User.pm:127 +#: perllib/FixMyStreet/DB/Result/User.pm:133 #: templates/web/base/js/translation_strings.html:12 #: templates/web/base/js/translation_strings.html:16 msgid "Please enter a valid email" @@ -2172,9 +2067,9 @@ msgid "Please enter some details" msgstr "Merci d'entrer quelques détails" #: perllib/FixMyStreet/App/Controller/Contact.pm:113 -#: perllib/FixMyStreet/DB/Result/User.pm:124 -#: templates/web/base/auth/general.html:10 -#: templates/web/base/auth/general.html:15 +#: perllib/FixMyStreet/DB/Result/User.pm:130 +#: templates/web/base/auth/general.html:27 +#: templates/web/base/auth/general.html:32 #: templates/web/base/js/translation_strings.html:11 #: templates/web/base/js/translation_strings.html:15 #: templates/web/zurich/auth/general.html:3 @@ -2182,7 +2077,7 @@ msgstr "Merci d'entrer quelques détails" msgid "Please enter your email" msgstr "Merci d'entrer votre email" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:7 +#: templates/web/base/report/new/form_user_loggedout_email.html:7 #: templates/web/zurich/report/new/fill_in_details_form.html:80 msgid "Please enter your email address" msgstr "Merci d'entrer votre adresse email" @@ -2191,15 +2086,15 @@ msgstr "Merci d'entrer votre adresse email" msgid "Please enter your first name" msgstr "Saisissez votre prénom" -#: perllib/FixMyStreet/Cobrand/UK.pm:318 +#: perllib/FixMyStreet/Cobrand/UK.pm:319 #: templates/web/base/js/translation_strings.html:7 msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below" msgstr "Merci de saisir votre nom complet, les administrations ont besoin de cette information. Si vous ne souhaitez pas que votre nom soit affiché sur ce site, décochez la case ci-dessous" #: perllib/FixMyStreet/App/Controller/Contact.pm:112 -#: perllib/FixMyStreet/DB/Result/Comment.pm:123 +#: perllib/FixMyStreet/DB/Result/Comment.pm:122 #: perllib/FixMyStreet/DB/Result/Problem.pm:406 -#: perllib/FixMyStreet/DB/Result/User.pm:120 +#: perllib/FixMyStreet/DB/Result/User.pm:126 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter your name" msgstr "Merci de saisir votre nom" @@ -2226,12 +2121,11 @@ msgstr "Vous pouvez vous <a href=\"%s\">connecter à nouveau</a>, ou retourner à msgid "Please fill in details of the problem below." msgstr "Merci d'entrer les détails du problème ci-dessous" -#: templates/web/zurich/report/new/fill_in_details_form.html:46 +#: templates/web/zurich/report/new/fill_in_details_form.html:72 msgid "Please fill in details of the problem." msgstr "Merci d'entrer les détails du problème." -#: templates/web/base/report/new/fill_in_details_form.html:28 -#: templates/web/fixmystreet/report/new/sidebar.html:7 +#: templates/web/base/report/new/sidebar.html:7 #: templates/web/zurich/report/new/fill_in_details_form.html:20 msgid "Please fill in the form below with details of the problem, and describe the location as precisely as possible in the details box." msgstr "Merci de remplir le formulaire ci-dessous avec les détails du problème, et de décrir l'emplacement aussi précisément que possible dans les détails." @@ -2240,20 +2134,24 @@ msgstr "Merci de remplir le formulaire ci-dessous avec les détails du problème msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "Merci d'indiquer si vous souhaitez recevoir un autre questionnaire" -#: templates/web/fixmystreet/report/updates-sidebar-notes.html:4 +#: templates/web/base/report/updates-sidebar-notes.html:2 msgid "Please note that updates are not sent to the council." msgstr "Nous vous informons que les mises à jour ne sont pas envoyées à l'administration." -#: templates/web/base/report/update-form.html:7 -msgid "Please note that updates are not sent to the council. If you leave your name it will be public. Your information will only be used in accordance with our <a href=\"/faq#privacy\">privacy policy</a>" -msgstr "Merci de bien noter que les mises à jour ne sont pas envoyées à l'administration. Si vous laissez votre nom, il sera public. Vos informations seront uniquement utilisées conformément à nore <a href=\"/faq#privacy\">politique de confidentialité</a>" +#: templates/web/base/report/new/oauth_email_form.html:4 +#, fuzzy +msgid "Please note your report has <strong>not yet been sent</strong>." +msgstr "Merci de noter que votre rapport n'a <strong>pas</strong> été envoyé. Choisissez une catégorie et rajoutez des informations supplémentaires ci-dessous, puis envoyez." -#: templates/web/base/report/new/fill_in_details_form.html:8 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:21 +#: templates/web/base/report/new/fill_in_details_form.html:20 #: templates/web/zurich/report/new/fill_in_details_form.html:11 msgid "Please note your report has <strong>not yet been sent</strong>. Choose a category and add further information below, then submit." msgstr "Merci de noter que votre rapport n'a <strong>pas</strong> été envoyé. Choisissez une catégorie et rajoutez des informations supplémentaires ci-dessous, puis envoyez." +#: templates/web/base/report/display.html:26 +msgid "Please note your update has <strong>not yet been posted</strong>." +msgstr "" + #: templates/web/base/report/new/notes.html:1 #: templates/web/zurich/report/new/notes.html:1 msgid "Please note:" @@ -2273,9 +2171,8 @@ msgid "Please say whether you've ever reported a problem to your council before" msgstr "Merci de nous dire si vous avez signalé un problème à une administration auparavant." #: templates/web/zurich/admin/report_edit.html:208 -#, fuzzy msgid "Please select a body." -msgstr "Sélectionnez un interlocuteur" +msgstr "Veuillez sélectionner une administration." #: perllib/FixMyStreet/App/Controller/Alert.pm:80 msgid "Please select the feed you want" @@ -2292,6 +2189,7 @@ msgstr "Merci de préciser si le problème a été réglé ou non." #: perllib/FixMyStreet/App/Model/PhotoSet.pm:117 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:145 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:147 +#: templates/web/base/js/translation_strings.html:53 msgid "Please upload a JPEG image only" msgstr "Merci de charger uniquement des images JPEG" @@ -2299,18 +2197,14 @@ msgstr "Merci de charger uniquement des images JPEG" msgid "Please write a message" msgstr "Merci de saisir un message" -#: templates/web/fixmystreet/report/update-form.html:23 +#: templates/web/base/report/update/form_update.html:29 msgid "Please write your update here" msgstr "Merci d'écrire votre mise à jour ici" -#: templates/web/base/contact/index.html:100 -#: templates/web/base/report/update-form.html:110 -#: templates/web/base/report/update-form.html:132 -#: templates/web/base/report/update-form.html:72 -#: templates/web/fixmystreet/contact/index.html:113 -#: templates/web/fixmystreet/report/update-form.html:124 -#: templates/web/fixmystreet/report/update-form.html:71 -#: templates/web/fixmystreet/report/update-form.html:97 +#: templates/web/base/contact/index.html:105 +#: templates/web/base/report/update-form.html:24 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:14 +#: templates/web/base/report/update/form_user_loggedout_password.html:10 msgid "Post" msgstr "Envoyer" @@ -2328,7 +2222,7 @@ msgstr "Signalé par %s à %s" #: templates/web/base/front/footer-marketing.html:12 msgid "Powered by <a class=\"platform-logo\" href=\"http://fixmystreet.org/\">FixMyStreet Platform</a>" -msgstr "" +msgstr "Powered by <a class=\"platform-logo\" href=\"http://fixmystreet.org/\">FixMyStreet Platform</a>" #: templates/web/base/pagination.html:7 msgid "Previous" @@ -2338,14 +2232,11 @@ msgstr "Précédent" msgid "Privacy" msgstr "Confidentialité" -#: templates/web/base/faq/faq-en-gb.html:7 -#: templates/web/base/open311/index.html:7 -#: templates/web/base/static/privacy.html:1 -#: templates/web/base/static/privacy.html:2 -#: templates/web/base/static/privacy.html:9 -#: templates/web/fixmystreet/contact/index.html:11 +#: templates/web/base/about/_sidebar.html:5 +#: templates/web/base/about/privacy.html:1 +#: templates/web/base/about/privacy.html:2 msgid "Privacy and cookies" -msgstr "" +msgstr "Vie privée et cookies" #: templates/web/base/admin/body.html:202 #: templates/web/base/admin/body.html:85 @@ -2371,12 +2262,12 @@ msgstr "Problème %d confirmé" msgid "Problem %s sent to council %s" msgstr "Problème %d signalé à l’administration %s" -#: templates/web/base/admin/index.html:46 +#: templates/web/base/admin/index.html:39 #: templates/web/zurich/admin/index.html:9 msgid "Problem breakdown by state" msgstr "Répartition des problèmes par état" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1055 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1058 msgid "Problem marked as open." msgstr "Problème signalé comme ouvert." @@ -2392,11 +2283,11 @@ msgstr "Problèmes" msgid "Problems in this area" msgstr "Problèmes dans cette zone" -#: templates/web/fixmystreet/report/display.html:43 +#: templates/web/base/report/display_tools.html:19 msgid "Problems nearby" msgstr "Problèmes aux alentours" -#: templates/web/fixmystreet/report/display.html:41 +#: templates/web/base/report/display_tools.html:17 msgid "Problems on the map" msgstr "Problèmes sur la carte" @@ -2408,24 +2299,23 @@ msgstr "Problèmes récemment signalés sur FixMyStreet.fr" msgid "Problems within %.1fkm of this location" msgstr "Problèmes à moins de %.1fkm de ce lieu" -#: perllib/FixMyStreet/Cobrand/Default.pm:642 +#: perllib/FixMyStreet/Cobrand/Default.pm:663 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:120 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:139 -#: perllib/FixMyStreet/Cobrand/UK.pm:207 +#: perllib/FixMyStreet/Cobrand/UK.pm:208 msgid "Problems within %s" msgstr "Problèmes à l'intérieur de %s" #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:128 -#: perllib/FixMyStreet/Cobrand/UK.pm:221 +#: perllib/FixMyStreet/Cobrand/UK.pm:222 msgid "Problems within %s ward" msgstr "Problèmes dans la localité %s" #. ("First %s is the body name, second %s the site name") #: templates/web/base/reports/body.html:0 #: templates/web/base/reports/body.html:24 -#, fuzzy msgid "Problems within %s, %s" -msgstr "Problèmes à l'intérieur de %s" +msgstr "Problèmes dans %s, %s" #: templates/web/base/alert/_list.html:42 msgid "Problems within the boundary of:" @@ -2439,19 +2329,16 @@ msgstr "Adresse de propriété:" msgid "Property type:" msgstr "Type de propriété:" -#: templates/web/base/report/update-form.html:3 -#: templates/web/fixmystreet/report/update-form.html:4 +#: templates/web/base/report/update-form.html:6 msgid "Provide an update" msgstr "Apporter une mise à jour" -#: templates/web/base/auth/general.html:56 +#: templates/web/base/auth/general.html:95 msgid "Providing a name and password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." msgstr "Fournir un nom et un mot de passe est optionnel, mais cela vous permettra de soumettre des problèmes, faire des mises à jour et gérer les rapports plus facilement." -#: templates/web/base/report/new/fill_in_details_form.html:156 -#: templates/web/base/report/update-form.html:129 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:71 -#: templates/web/fixmystreet/report/update-form.html:119 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:34 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:9 msgid "Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." msgstr "Un mot de passe n'est pas obligatoire, mais vous permettra de créer, mettre à jour et administrer vos rapports plus facilement." @@ -2487,18 +2374,17 @@ msgstr "Questionnaire rempli par le requérant" #: templates/web/base/alert/_list.html:22 #: templates/web/base/around/display_location.html:1 #: templates/web/base/around/display_location.html:3 -#: templates/web/base/report/display.html:50 +#: templates/web/base/report/display_tools.html:34 #: templates/web/base/reports/_rss.html:1 #: templates/web/fixmystreet/alert/updates.html:9 -#: templates/web/fixmystreet/report/display.html:58 msgid "RSS feed" msgstr "Flux RSS" -#: perllib/FixMyStreet/Cobrand/UK.pm:250 perllib/FixMyStreet/Cobrand/UK.pm:262 +#: perllib/FixMyStreet/Cobrand/UK.pm:251 perllib/FixMyStreet/Cobrand/UK.pm:263 msgid "RSS feed for %s" msgstr "Flux RSS pour %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:256 perllib/FixMyStreet/Cobrand/UK.pm:268 +#: perllib/FixMyStreet/Cobrand/UK.pm:257 perllib/FixMyStreet/Cobrand/UK.pm:269 msgid "RSS feed for %s ward, %s" msgstr "Flux RSS pour la localité %s, %s" @@ -2506,11 +2392,11 @@ msgstr "Flux RSS pour la localité %s, %s" #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:163 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:173 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:181 -#: perllib/FixMyStreet/Cobrand/UK.pm:276 perllib/FixMyStreet/Cobrand/UK.pm:288 +#: perllib/FixMyStreet/Cobrand/UK.pm:277 perllib/FixMyStreet/Cobrand/UK.pm:289 msgid "RSS feed of %s" msgstr "Flux RSS de %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:281 perllib/FixMyStreet/Cobrand/UK.pm:293 +#: perllib/FixMyStreet/Cobrand/UK.pm:282 perllib/FixMyStreet/Cobrand/UK.pm:294 msgid "RSS feed of %s, within %s ward" msgstr "Flux RSS de %s, dans la localité %s" @@ -2522,15 +2408,15 @@ msgstr "Flux RSS de problèmes à proximité" msgid "RSS feed of problems in this %s" msgstr "Flux RSS des problèmes à l'intérieur de cette %s" -#: perllib/FixMyStreet/Cobrand/Default.pm:643 +#: perllib/FixMyStreet/Cobrand/Default.pm:664 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:121 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:138 -#: perllib/FixMyStreet/Cobrand/UK.pm:214 +#: perllib/FixMyStreet/Cobrand/UK.pm:215 msgid "RSS feed of problems within %s" msgstr "Flux RSS des problèmes à l'intérieur de %s" #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:127 -#: perllib/FixMyStreet/Cobrand/UK.pm:220 +#: perllib/FixMyStreet/Cobrand/UK.pm:221 msgid "RSS feed of problems within %s ward" msgstr "Flux RSS de problèmes à l'intérieur de la localité %s" @@ -2539,25 +2425,22 @@ msgstr "Flux RSS de problèmes à l'intérieur de la localité %s" msgid "RSS feed of recent local problems" msgstr "Flux RSS des problèmes locaux récents" -#: templates/web/base/report/display.html:50 +#: templates/web/base/report/display_tools.html:34 #: templates/web/fixmystreet/alert/updates.html:9 -#: templates/web/fixmystreet/report/display.html:58 msgid "RSS feed of updates to this problem" msgstr "Flux RSS des mises à jour pour ce problème" #: templates/web/base/alert/updates.html:9 -#: templates/web/base/report/display.html:41 +#: templates/web/base/report/display_tools.html:36 #: templates/web/fixmystreet/alert/updates.html:14 -#: templates/web/fixmystreet/report/display.html:60 msgid "Receive email when updates are left on this problem." msgstr "Etre informé par courriel lorsque ce problème est mis à jour." #. ("%s is the site name") #: templates/web/base/around/display_location.html:0 #: templates/web/base/around/display_location.html:33 -#, fuzzy msgid "Recent local problems, %s" -msgstr "Problèmes locaux récents, FixMyStreet.fr" +msgstr "Les problèmes récents, %s" #: templates/web/base/reports/index.html:24 msgid "Recently <br>fixed" @@ -2575,16 +2458,15 @@ msgstr "Rappelez-vous que FixMyStreet est principalement destiné au signalement msgid "Remove flag" msgstr "Effacer le signalement" -#: templates/web/base/admin/report_edit.html:92 -#: templates/web/base/admin/update_edit.html:62 +#: templates/web/base/admin/report_edit.html:93 +#: templates/web/base/admin/update_edit.html:67 #: templates/web/zurich/admin/update_edit.html:35 msgid "Remove photo (can't be undone!)" msgstr "Effacer la photo (ne peut pas être annulé !)" #: templates/web/zurich/admin/report_edit.html:243 -#, fuzzy msgid "Reply to user:" -msgstr "saisissez l'utilisateur" +msgstr "Répondre à l'utilisateur:" #: templates/web/fixmystreet/header_logo.html:2 msgid "Report" @@ -2597,7 +2479,7 @@ msgstr "Rapport" msgid "Report a problem" msgstr "Signaler un problème" -#: templates/web/fixmystreet/report/display.html:32 +#: templates/web/base/report/display_tools.html:8 msgid "Report abuse" msgstr "Signaler un abus" @@ -2606,7 +2488,8 @@ msgid "Report on %s" msgstr "Signaler sur %s" #: templates/web/base/report/new/fill_in_details_form.html:1 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:2 +#: templates/web/base/report/new/login_success_form.html:1 +#: templates/web/base/report/new/oauth_email_form.html:1 msgid "Report your problem" msgstr "Signaler votre problème" @@ -2615,9 +2498,8 @@ msgstr "Signaler votre problème" msgid "Report, view, or discuss local problems" msgstr "Signalez et suivez les problèmes locaux" -#: perllib/FixMyStreet/DB/Result/Problem.pm:585 -#: templates/web/base/contact/index.html:50 -#: templates/web/fixmystreet/contact/index.html:65 +#: perllib/FixMyStreet/DB/Result/Problem.pm:573 +#: templates/web/base/contact/index.html:57 msgid "Reported anonymously at %s" msgstr "Signalé anonymement à %s" @@ -2626,43 +2508,41 @@ msgstr "Signalé anonymement à %s" msgid "Reported before" msgstr "Signalé avant" -#: perllib/FixMyStreet/DB/Result/Problem.pm:608 -#: templates/web/base/contact/index.html:52 -#: templates/web/fixmystreet/contact/index.html:67 +#: perllib/FixMyStreet/DB/Result/Problem.pm:596 +#: templates/web/base/contact/index.html:59 msgid "Reported by %s at %s" msgstr "Signalé par %s à %s" #: templates/web/zurich/admin/report_edit-sdm.html:58 #: templates/web/zurich/admin/report_edit.html:86 -#, fuzzy msgid "Reported by:" -msgstr "Signalé %s" +msgstr "Rapporté par:" #: templates/web/zurich/report/_main.html:2 msgid "Reported in the %s category" msgstr "Rapporté dans la catégorie %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:581 +#: perllib/FixMyStreet/DB/Result/Problem.pm:569 msgid "Reported in the %s category anonymously at %s" msgstr "Signalé dans la catégorie %s anonymement à %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:603 +#: perllib/FixMyStreet/DB/Result/Problem.pm:591 msgid "Reported in the %s category by %s at %s" msgstr "Signalé dans la catégorie %s par %s à %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:577 +#: perllib/FixMyStreet/DB/Result/Problem.pm:565 msgid "Reported via %s anonymously at %s" msgstr "Signalé par %s anonymement à %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:599 +#: perllib/FixMyStreet/DB/Result/Problem.pm:587 msgid "Reported via %s by %s at %s" msgstr "Signalé par %s par %s à %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:573 +#: perllib/FixMyStreet/DB/Result/Problem.pm:561 msgid "Reported via %s in the %s category anonymously at %s" msgstr "Signalé par %s dans la catégorie %s anonymement à %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:593 +#: perllib/FixMyStreet/DB/Result/Problem.pm:581 msgid "Reported via %s in the %s category by %s at %s" msgstr "Signalé par %s dans la catégorie %s par %s" @@ -2672,9 +2552,8 @@ msgstr "Publié depuis quatre semaines" #: templates/web/zurich/admin/report_edit-sdm.html:36 #: templates/web/zurich/admin/report_edit.html:55 -#, fuzzy msgid "Reported:" -msgstr "Signalé %s" +msgstr "Remis:" #: templates/web/base/around/index.html:2 #: templates/web/base/js/translation_strings.html:41 @@ -2684,13 +2563,13 @@ msgstr "Signalé %s" msgid "Reporting a problem" msgstr "Signalisation d'un problème" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1277 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1286 #: perllib/FixMyStreet/Cobrand/Zurich.pm:384 #: templates/web/zurich/header.html:60 msgid "Reports" msgstr "Rapports" -#: perllib/FixMyStreet/Cobrand/UK.pm:327 perllib/FixMyStreet/Cobrand/UK.pm:331 +#: perllib/FixMyStreet/Cobrand/UK.pm:328 perllib/FixMyStreet/Cobrand/UK.pm:332 msgid "Reports are limited to %s characters in length. Please shorten your report" msgstr "Les rapports sont limités à %s caractères de long. Merci de raccourcir votre texte" @@ -2711,7 +2590,7 @@ msgstr "Renvoyer le rapport" #: templates/web/zurich/admin/templates.html:1 #: templates/web/zurich/admin/templates.html:3 msgid "Response Templates for %s" -msgstr "" +msgstr "Modèles de réponse pour %s" #: templates/web/base/js/translation_strings.html:28 msgid "Right place?" @@ -2727,25 +2606,26 @@ msgstr "L'opérateur pour cette route (déterminé à partir de la référence e msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "L'opérateur pour cette route (selon OpenStreetMAp): %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1495 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1500 -#: templates/web/base/admin/report_edit.html:88 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1508 +#: templates/web/base/admin/report_edit.html:90 +#: templates/web/base/admin/update_edit.html:64 #: templates/web/zurich/admin/report_edit.html:116 msgid "Rotate Left" msgstr "Pivoter à gauche" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1495 -#: templates/web/base/admin/report_edit.html:89 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 +#: templates/web/base/admin/report_edit.html:91 +#: templates/web/base/admin/update_edit.html:65 #: templates/web/zurich/admin/report_edit.html:117 msgid "Rotate Right" msgstr "Pivoter à droite" #: templates/web/zurich/admin/report_edit.html:388 msgid "Rotating this photo will discard unsaved changes to the report." -msgstr "" +msgstr "La rotation de cette photo annulera les modifications non enregistrées dans le rapport." #: templates/web/base/js/translation_strings.html:46 -#: templates/web/base/maps/google-ol.html:13 msgid "Satellite" msgstr "Satellite" @@ -2798,16 +2678,14 @@ msgid "Select an area" msgstr "Sélectionnez une zone" #: templates/web/base/alert/_list.html:10 -#, fuzzy msgid "Select which type of alert you’d like and click the button for an RSS feed, or enter your email address to subscribe to an email alert." -msgstr "Sélectionnez le type d'alerte que vous souhaitez et cliquez sur le bouton d'un flux RSS, ou entrez votre adresse e-mail pour vous abonner à une alerte e-mail." +msgstr "Sélectionnez le type d'alerte que vous souhaitez et cliquez sur le bouton pour obtenir un flux RSS ou entrez votre adresse e-mail pour vous abonner à une alerte email." #: perllib/FixMyStreet/Cobrand/Zurich.pm:835 -#, fuzzy msgid "Sent report back" -msgstr "Rapports ouverts" +msgstr "Envoyé le rapport en retour" -#: perllib/FixMyStreet/DB/Result/Problem.pm:708 +#: perllib/FixMyStreet/DB/Result/Problem.pm:696 msgid "Sent to %s %s later" msgstr "Envoyé à %s %s plus tard)" @@ -2820,15 +2698,13 @@ msgstr "Envoyé :" msgid "Service:" msgstr "Service:" -#: templates/web/fixmystreet/report/display.html:38 +#: templates/web/base/report/display_tools.html:14 msgid "Share" msgstr "Partagez" -#: templates/web/base/report/new/fill_in_details_form.html:193 -#: templates/web/base/report/update-form.html:158 -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:23 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:59 -#: templates/web/fixmystreet/report/update-form.html:146 +#: templates/web/base/report/new/form_user_loggedin.html:23 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:22 +#: templates/web/base/report/update/form_name.html:15 msgid "Show my name publicly" msgstr "Afficher mon nom publiquement" @@ -2840,9 +2716,9 @@ msgstr "Montrer les anciens" msgid "Show pins" msgstr "Montrer les épingles" +#: templates/web/base/auth/general.html:100 #: templates/web/base/auth/general.html:3 -#: templates/web/base/auth/general.html:40 -#: templates/web/base/auth/general.html:61 +#: templates/web/base/auth/general.html:76 #: templates/web/zurich/auth/general.html:18 #: templates/web/zurich/auth/general.html:35 msgid "Sign in" @@ -2871,7 +2747,7 @@ msgstr "" "Certains destinataires nécessitent une <strong>clé API </strong> pour indiquer que les rapports \n" "sont envoyés depuis votre application FixMyStreet." -#: templates/web/base/alert/index.html:42 +#: templates/web/base/alert/index.html:40 msgid "Some photos of recent reports" msgstr "Photos de rapports récents" @@ -2881,35 +2757,46 @@ msgstr "Photos de rapports récents" msgid "Some text to localize" msgstr "Du texte pour localiser" -#: perllib/FixMyStreet/Cobrand/UK.pm:78 +#: perllib/FixMyStreet/Cobrand/UK.pm:79 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover." msgstr "Désolé, ceci semble être un code postal d'une dépendance de la Couronne, que nous ne couvrons pas." #: templates/web/base/auth/token.html:8 msgid "Sorry, that wasn’t a valid link" -msgstr "" +msgstr "Désolé, cela n'est pas un lien valide" #: templates/web/base/tokens/abuse.html:5 msgid "Sorry, there has been an error confirming your problem." msgstr "Désolé, il n'y a eu une erreur lors de la confirmation de votre problème." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:221 -#: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:37 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:216 +#: perllib/FixMyStreet/Geocode.pm:38 perllib/FixMyStreet/Geocode/Bing.pm:38 #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:56 #: perllib/FixMyStreet/Geocode/OSM.pm:48 msgid "Sorry, we could not find that location." msgstr "Désolé, nous n'avons pas pu trouver cet emplacement." -#: perllib/FixMyStreet/Geocode/Bing.pm:34 +#: templates/web/base/auth/general.html:9 +#: templates/web/base/report/display.html:21 +#: templates/web/base/report/new/fill_in_details_form.html:23 +#, fuzzy +msgid "Sorry, we could not log you in. Please fill in the form below." +msgstr "Désolé, nous n'avons pas pu trouver cet emplacement. Merci de réessayer." + +#: perllib/FixMyStreet/Geocode/Bing.pm:35 #: perllib/FixMyStreet/Geocode/Google.pm:45 #: perllib/FixMyStreet/Geocode/Zurich.pm:88 msgid "Sorry, we could not parse that location. Please try again." msgstr "Désolé, nous n'avons pas pu trouver cet emplacement. Merci de réessayer." #: perllib/FixMyStreet/App/Model/PhotoSet.pm:134 -#, fuzzy msgid "Sorry, we couldn't save your image(s), please try again." -msgstr "Désolé, nous n'avons pas pu trouver cet emplacement. Merci de réessayer." +msgstr "Désolé, nous ne pouvions pas enregistrer votre image(s), veuillez essayer à nouveau." + +#: perllib/FixMyStreet/App/Controller/AuthSS.pm:301 +#, fuzzy +msgid "Sorry, you can not log in with Facebook. Please try again later." +msgstr "Il y a eu un problème pour afficher cette page. Merci de réessayer ultérieurement." #: templates/web/base/admin/stats.html:64 msgid "Start Date:" @@ -2919,13 +2806,12 @@ msgstr "Date de début:" #: templates/web/base/admin/flagged.html:18 #: templates/web/base/admin/list_updates.html:11 #: templates/web/base/admin/reports.html:15 -#: templates/web/fixmystreet/report/update-form.html:26 +#: templates/web/base/report/update/form_update.html:32 msgid "State" msgstr "État actuel" #: templates/web/base/admin/report_edit.html:47 #: templates/web/base/admin/update_edit.html:27 -#: templates/web/base/report/update-form.html:28 #: templates/web/zurich/admin/report_edit-sdm.html:73 #: templates/web/zurich/admin/report_edit.html:101 #: templates/web/zurich/admin/report_edit.html:155 @@ -2933,7 +2819,7 @@ msgstr "État actuel" msgid "State:" msgstr "État actuel :" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1282 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1291 #: perllib/FixMyStreet/Cobrand/Zurich.pm:387 #: templates/web/base/admin/stats.html:1 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:73 @@ -2953,9 +2839,9 @@ msgstr "Encore ouvert, via le questionnaire, %s" #: templates/web/zurich/admin/report_edit-sdm.html:25 #: templates/web/zurich/admin/report_edit.html:26 msgid "Street View" -msgstr "" +msgstr "Street View" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:406 +#: perllib/FixMyStreet/Script/Reports.pm:184 msgid "Subcategory: %s" msgstr "Sous-catégorie: %s" @@ -2963,30 +2849,25 @@ msgstr "Sous-catégorie: %s" msgid "Subdivision/Body" msgstr "Subdivision/Interlocuteur" -#: templates/web/fixmystreet/contact/index.html:98 +#: templates/web/base/contact/index.html:90 msgid "Subject" msgstr "Sujet" #: templates/web/base/admin/report_edit.html:19 -#: templates/web/base/contact/index.html:88 -#: templates/web/base/report/new/fill_in_details_form.html:53 #: templates/web/zurich/admin/report_edit.html:39 msgid "Subject:" msgstr "Sujet :" #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/fill_in_details_form.html:137 -#: templates/web/base/report/new/fill_in_details_form.html:159 -#: templates/web/base/report/new/fill_in_details_form.html:96 -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:36 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:23 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:76 +#: templates/web/base/report/new/form_user_loggedin.html:36 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:39 +#: templates/web/base/report/new/form_user_loggedout_password.html:11 #: templates/web/zurich/report/new/fill_in_details_form.html:96 msgid "Submit" msgstr "Envoyer" -#: templates/web/base/admin/report_edit.html:95 -#: templates/web/base/admin/update_edit.html:65 +#: templates/web/base/admin/report_edit.html:101 +#: templates/web/base/admin/update_edit.html:75 #: templates/web/base/admin/user-form.html:56 #: templates/web/zurich/admin/report_edit-sdm.html:137 #: templates/web/zurich/admin/report_edit.html:268 @@ -2994,7 +2875,7 @@ msgstr "Envoyer" msgid "Submit changes" msgstr "Envoyer les modifications" -#: templates/web/base/questionnaire/index.html:97 +#: templates/web/base/questionnaire/index.html:106 msgid "Submit questionnaire" msgstr "Envoi du questionnaire" @@ -3010,9 +2891,8 @@ msgid "Submitted" msgstr "Soumis" #: templates/web/base/alert/updates.html:17 -#: templates/web/base/report/display.html:46 +#: templates/web/base/report/display_tools.html:41 #: templates/web/fixmystreet/alert/updates.html:23 -#: templates/web/fixmystreet/report/display.html:65 msgid "Subscribe" msgstr "S'abonner" @@ -3020,7 +2900,7 @@ msgstr "S'abonner" msgid "Subscribe me to an email alert" msgstr "Abonnez moi à une alerte par email" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1275 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1284 #: perllib/FixMyStreet/Cobrand/Zurich.pm:383 #: templates/web/base/admin/bodies.html:25 #: templates/web/base/admin/index.html:1 @@ -3039,7 +2919,7 @@ msgstr "Résumé" msgid "Summary reports" msgstr "Rapports résumés" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1279 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1288 msgid "Survey" msgstr "Enquête" @@ -3049,13 +2929,12 @@ msgstr "Résultats de l'enquête" #: templates/web/zurich/admin/template_edit.html:7 msgid "Template «%s»" -msgstr "" +msgstr "Modèle «%s»" #: perllib/FixMyStreet/Cobrand/Zurich.pm:394 #: templates/web/zurich/header.html:77 -#, fuzzy msgid "Templates" -msgstr "Mises à jour" +msgstr "Modèles" #: templates/web/base/admin/list_updates.html:12 #: templates/web/zurich/admin/templates.html:9 @@ -3076,7 +2955,7 @@ msgstr "Texte :" msgid "Thank you for reporting this issue!" msgstr "Merci d’avoir signalé ce problème!" -#: templates/web/base/tokens/error.html:7 +#: templates/web/base/tokens/error.html:6 msgid "Thank you for trying to confirm your update or problem. We seem to have an error ourselves though, so <a href=\"%s\">please let us know what went on</a> and we'll look into it." msgstr "Merci d'essayer de confirmer votre mise à jour ou un problème. Nous semblons rencontrer une erreur de notre côté ; s'il vous plaît, <a href=\"%s\">dites-nous nous ce qui s'est passé</a> et nous nous pencherons sur la question." @@ -3111,23 +2990,23 @@ msgstr "Ce lieu ne semble pas ce trouver au Royaume-Uni; Merci de le saisir à n #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:47 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:63 -#: perllib/FixMyStreet/Cobrand/UK.pm:71 +#: perllib/FixMyStreet/Cobrand/UK.pm:72 msgid "That postcode was not recognised, sorry." msgstr "Ce code postal n'a pas été reconnu, désolé." -#: perllib/FixMyStreet/App/Controller/Admin.pm:726 +#: perllib/FixMyStreet/App/Controller/Admin.pm:724 msgid "That problem has been marked as sent." msgstr "Ce problème a été marqué comme envoyé." -#: perllib/FixMyStreet/App/Controller/Admin.pm:718 +#: perllib/FixMyStreet/App/Controller/Admin.pm:716 msgid "That problem will now be resent." msgstr "Ce problème va maintenant être renvoyé." -#: perllib/FixMyStreet/App/Controller/Report.pm:125 +#: perllib/FixMyStreet/App/Controller/Report.pm:127 msgid "That report cannot be viewed on %s." msgstr "Ce rapport ne peut pas être vu sur %s." -#: perllib/FixMyStreet/App/Controller/Report.pm:119 +#: perllib/FixMyStreet/App/Controller/Report.pm:121 msgid "That report has been removed from FixMyStreet." msgstr "Ce rapport a été retiré de FixMyStreet.fr." @@ -3166,7 +3045,7 @@ msgstr "" "La <strong>méthode d'envoi</strong> détermine comment les rapports seront envoyés à l'interlocuteur.\n" "Si vous laissez le champ vide, <strong>la méthode d'envoi par défaut sera le courriel </strong>." -#: templates/web/base/open311/index.html:90 +#: templates/web/base/open311/index.html:82 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 "L'attribut Open311 v2 agency_responsible est utilisé pour lister les administrations qui ont reçu le rapport de problème, ce qui n'est pas tout à fait la façon dont l'attribut est défini dans la spécification Open311 v2." @@ -3189,12 +3068,12 @@ msgstr "L'administration ne pourra intervenir que si vous laissez autant de dét msgid "The diligency prize league table shows editors' activity (who's been editing the most records)." msgstr "Le classement du prix d'assiduité montre l'activité des utilisateurs (qui écrit le plus de rapports)." -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:60 -#: perllib/FixMyStreet/App/Controller/Reports.pm:79 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:61 +#: perllib/FixMyStreet/App/Controller/Reports.pm:80 msgid "The error was: %s" msgstr "L'erreur était : %s" -#: templates/web/base/open311/index.html:86 +#: templates/web/base/open311/index.html:78 msgid "The following Open311 v2 attributes are returned for each request: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code and service_name." msgstr "Les attributs Open311 v2 suivants sont retournés pour chaque requête : service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code et service_name." @@ -3230,7 +3109,7 @@ msgstr "Les derniers problèmes à l'intérieur de {{NAME}} rapportés par les u #: templates/web/base/auth/token.html:9 msgid "The link might have expired, or maybe you didn’t quite copy and paste it correctly." -msgstr "" +msgstr "Le lien à expiré, ou peut-être vous ne l’avez pas copier coller correctement." #: templates/web/base/admin/body-form.html:58 msgid "The list of available areas is being provided by the MapIt service at %s." @@ -3241,8 +3120,7 @@ msgstr "La liste des zones disponibles est donnée par le service Mapit de %s. " msgid "The passwords do not match" msgstr "Les mots de passe ne correspondent pas" -#: templates/web/base/errors/page_error_404_not_found.html:10 -#: templates/web/base/errors/page_error_404_not_found.html:12 +#: templates/web/base/errors/page_error_404_not_found.html:9 msgid "The requested URL '%s' was not found on this server" msgstr "L'URL demandée « %s » n'a pas été trouvée sur ce serveur" @@ -3252,12 +3130,11 @@ msgstr "La plus simple de nos alertes est la géographique :" #: templates/web/base/report/new/councils_extra_text.html:1 #: templates/web/base/report/new/councils_text_some.html:10 -#: templates/web/base/report/new/fill_in_details_form.html:18 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:14 +#: templates/web/base/report/new/fill_in_details_form.html:13 msgid "The summary and description will also be made public (see our <a href=\"/privacy\">privacy policy</a>)." msgstr "Le résumé et la description seront également rendus publics (voir notre <a href=\"/privacy\"> politique de confidentialité </a>)." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:315 +#: perllib/FixMyStreet/Script/Reports.pm:92 msgid "The user could not locate the problem on a map, but to see the area around the location they entered" msgstr "L'utilisateur n'a pas pu localiser le problème sur une carte, mais pour voir la zone autour de l'endroit qu'il ou elle a entré" @@ -3276,18 +3153,18 @@ msgstr "" msgid "There are no reports to show." msgstr "Il n'y a pas de rapports à montrer." -#: perllib/FixMyStreet/App/Controller/Reports.pm:76 +#: perllib/FixMyStreet/App/Controller/Reports.pm:77 msgid "There was a problem showing the All Reports page. Please try again later." msgstr "Il y a eu un problème pour montrer la page tous les rapports. Réessayez s'il vous plaît ultérieurement." #: perllib/FixMyStreet/App/Controller/Contact.pm:137 -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:59 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:60 msgid "There was a problem showing this page. Please try again later." msgstr "Il y a eu un problème pour afficher cette page. Merci de réessayer ultérieurement." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:769 -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:134 -#: templates/web/base/auth/general.html:26 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:764 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:138 +#: templates/web/base/auth/general.html:43 #: templates/web/zurich/auth/general.html:28 msgid "There was a problem with your email/password combination. If you cannot remember your password, or do not have one, please fill in the ‘sign in by email’ section of the form." msgstr "Il y a un problème avec votre combinaison email / mot de passe. Si vous ne pouvez pas vous souvenir de votre mot de passe, ou n'en avez pas, remplissez s'il vous plaît la section « s'authentifier par email » du formulaire." @@ -3296,7 +3173,7 @@ msgstr "Il y a un problème avec votre combinaison email / mot de passe. Si vous msgid "There was a problem with your email/password combination. Please try again." msgstr "Il y a un problème avec votre combinaison email / mot de passe. Réessayez s'il vous plaît." -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:272 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:336 msgid "There was a problem with your update. Please try again." msgstr "Il y a un problème avec votre mise à jour. Réessayez s'il vous plaît." @@ -3304,7 +3181,7 @@ msgstr "Il y a un problème avec votre mise à jour. Réessayez s'il vous plaît msgid "There were problems with your report. Please see below." msgstr "Il y a un problème avec votre rapport. Voir s'il vous plaît plus bas." -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:300 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:371 msgid "There were problems with your update. Please see below." msgstr "Il y a un problème avec votre mise à jour. Voir s'il vous plaît plus bas." @@ -3321,7 +3198,7 @@ msgstr "" "Pour plus d' information, lire \n" "<a href='https://www.mysociety.org/2013/02/20/open311-extended/' class='admin-offsite-link'>cet article</a>. %s" -#: templates/web/base/open311/index.html:77 +#: templates/web/base/open311/index.html:69 msgid "This API implementation is work in progress and not yet stabilized. It will change without warnings in the future." msgstr "Cette implémentation de l'API est en cours de travaux et n'est pas encore stabilisée. Elle est susceptible de changer sans avertissement préalable à l'avenir." @@ -3348,18 +3225,18 @@ msgstr "" "Cet intelocuteur recevra seulement des rapports pour des problèmes qui sont situés sur sa <strong>zone couverte</strong>.\n" "Un interlocuteur ne recevra aucun rapport tant qu'il ne couvre aucune zone." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:413 +#: perllib/FixMyStreet/Script/Reports.pm:191 msgid "This email has been sent to both councils covering the location of the problem, as the user did not categorise it; please ignore it if you're not the correct council to deal with the issue, or let us know what category of problem this is so we can add it to our system." msgstr "Cet email a été envoyé aux deux administrations couvrant l'emplacement du problème parce que l'utilisateur ne l'a pas classé ; ignorez-le s'il vous plaît si vous n'êtes pas l'administration responsable pour la question, ou faites-nous savoir la bonne catégorie de problèmes afin que nous puissions l'ajouter à notre système." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:416 +#: perllib/FixMyStreet/Script/Reports.pm:194 msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue." msgstr "Cet email a été envoyé à plus d'une administration couvrant l'emplacement du problème, la catégorie de problème choisie par l'utilisateur étant présente pour chacune d'entre elles ; ignorez-le s'il vous plaît si vous n'êtes pas l'administration responsable pour la question." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:925 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:995 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:920 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:990 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:142 -#: perllib/FixMyStreet/Cobrand/UK.pm:43 +#: perllib/FixMyStreet/Cobrand/UK.pm:44 msgid "This information is required" msgstr "Ces renseignements sont nécessaires" @@ -3371,56 +3248,37 @@ msgstr "Ceci est un site en développement, le service peut être interrompu à msgid "This is a summary of all reports on this site." msgstr "Ceci est un résumé de tous les rapports pour ce site." -#: templates/web/zurich/auth/token.html:8 -msgid "This may be because the link is too old or already used, or the address was not copied correctly." -msgstr "C'est peut-être parce que le lien est trop ancien ou déjà utilisé, ou l'adresse n'a pas été saisie correctement." - -#: templates/web/base/report/banner.html:15 -msgid "This problem has been closed" -msgstr "Ce problème a été clos" - -#: templates/web/base/report/banner.html:12 -#: templates/web/base/report/update-form.html:48 -#: templates/web/fixmystreet/report/update-form.html:46 +#: templates/web/base/report/update/form_update.html:52 msgid "This problem has been fixed" msgstr "Ce problème a été résolu" -#: templates/web/base/report/update-form.html:43 -#: templates/web/fixmystreet/report/update-form.html:40 +#: templates/web/base/report/update/form_update.html:46 msgid "This problem has not been fixed" msgstr "Ce problème n'a pas été résolu" -#: templates/web/base/report/banner.html:19 -msgid "This problem is in progress" -msgstr "Ce problème est en cours" - -#: templates/web/base/report/banner.html:9 -msgid "This problem is old and of unknown status." -msgstr "Ce problème est vieux et de statut inconnu." - #: perllib/FixMyStreet/Cobrand/Zurich.pm:168 #: perllib/FixMyStreet/Cobrand/Zurich.pm:169 #: templates/web/zurich/report/_main.html:14 msgid "This report is awaiting moderation." msgstr "Ce rapport attend une modération." -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:86 +#: perllib/FixMyStreet/Script/Alerts.pm:94 msgid "This report is currently marked as closed." msgstr "Ce rapport est actuellement marqué comme fermé." -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:84 +#: perllib/FixMyStreet/Script/Alerts.pm:92 msgid "This report is currently marked as fixed." msgstr "Ce rapport est actuellement marqué comme résolu." -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:88 +#: perllib/FixMyStreet/Script/Alerts.pm:96 msgid "This report is currently marked as open." msgstr "Ce rapport est actuellement marqué comme ouvert." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:326 +#: perllib/FixMyStreet/Script/Reports.pm:105 msgid "This report was submitted anonymously" msgstr "Ce rapport a été soumis anonymement" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:308 +#: perllib/FixMyStreet/Script/Reports.pm:85 msgid "This web page also contains a photo of the problem, provided by the user." msgstr "Cette page Web contient également une photo du problème, fournie par l'utilisateur." @@ -3429,9 +3287,9 @@ msgstr "Cette page Web contient également une photo du problème, fournie par l #: templates/web/zurich/admin/report_edit.html:104 #: templates/web/zurich/admin/report_edit.html:148 msgid "Time spent (in minutes):" -msgstr "" +msgstr "Le temps passé (en minutes):" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1278 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1287 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "Chronologie" @@ -3443,24 +3301,22 @@ msgid "Title" msgstr "Titre" #: templates/web/zurich/admin/template_edit.html:20 -#, fuzzy msgid "Title:" -msgstr "Titre" +msgstr "Titre:" #: templates/web/base/alert/index.html:25 -#, fuzzy msgid "To find out what local alerts we have for you, please enter your %s postcode or street name and area:" -msgstr "Pour afficher les alertes qui vous concernent, saisissez votre code postal ou le nom d'une rue et une localité" +msgstr "Pour savoir quelles sont les alertes locales pour vous, s'il vous plaît entrez le code postal de votre %s, le nom de la rue et de la commune:" #: templates/web/base/alert/index.html:27 msgid "To find out what local alerts we have for you, please enter your postcode or street name and area" msgstr "Pour afficher les alertes qui vous concernent, saisissez votre code postal ou le nom d'une rue et une localité" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:314 +#: perllib/FixMyStreet/Script/Reports.pm:91 msgid "To view a map of the precise location of this issue" msgstr "Pour voir une carte de l'emplacement précis de ce problème" -#: templates/web/base/admin/index.html:61 +#: templates/web/base/admin/index.html:54 #: templates/web/base/admin/questionnaire.html:24 #: templates/web/base/admin/stats.html:24 #: templates/web/base/admin/stats.html:43 @@ -3478,10 +3334,8 @@ msgstr "Essayez en nous envoyant un e-mail directement:" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:12 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:33 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:31 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:37 msgid "Unable to fix" msgstr "Ne peut être résolu" @@ -3494,7 +3348,7 @@ msgstr "Ne peut être résolu" msgid "Unconfirmed" msgstr "Non confirmé" -#: templates/web/fixmystreet/report/banner.html:9 +#: templates/web/base/report/banner.html:9 msgid "Unknown" msgstr "Inconnu" @@ -3502,17 +3356,18 @@ msgstr "Inconnu" msgid "Unknown alert type" msgstr "Type d'alerte inconnu" +#: perllib/FixMyStreet/App/Controller/Photo.pm:110 #: templates/web/base/js/translation_strings.html:39 msgid "Unknown error" msgstr "erreur inconnue" -#: perllib/FixMyStreet/App/Controller/Report.pm:103 -#: perllib/FixMyStreet/App/Controller/Report.pm:109 -#: perllib/FixMyStreet/App/Controller/Report.pm:112 +#: perllib/FixMyStreet/App/Controller/Report.pm:105 +#: perllib/FixMyStreet/App/Controller/Report.pm:111 +#: perllib/FixMyStreet/App/Controller/Report.pm:114 msgid "Unknown problem ID" msgstr "ID de problème inconnu" -#: templates/web/fixmystreet/report/update-form.html:19 +#: templates/web/base/report/update/form_update.html:25 msgid "Update" msgstr "Mise à jour" @@ -3520,13 +3375,11 @@ msgstr "Mise à jour" msgid "Update %s created for problem %d; by %s" msgstr "Mise à jour %s créée pour le problème %d; par %s" -#: templates/web/base/contact/index.html:21 -#: templates/web/fixmystreet/contact/index.html:36 +#: templates/web/base/contact/index.html:28 msgid "Update below added anonymously at %s" msgstr "Mise à jour ci-dessous ajoutée anonymement à %s" -#: templates/web/base/contact/index.html:23 -#: templates/web/fixmystreet/contact/index.html:38 +#: templates/web/base/contact/index.html:30 msgid "Update below added by %s at %s" msgstr "Mise à jour ci-dessous ajoutée par %s à %s" @@ -3535,7 +3388,7 @@ msgstr "Mise à jour ci-dessous ajoutée par %s à %s" msgid "Update body" msgstr "Interlocuteur pour la mise à jour " -#: templates/web/base/admin/index.html:55 +#: templates/web/base/admin/index.html:48 msgid "Update breakdown by state" msgstr "Répartition des problèmes par état" @@ -3560,20 +3413,16 @@ msgstr "Mettre a jour le problème réouvert" msgid "Update statuses" msgstr "Mettre à jour les statuts" -#: templates/web/base/report/update-form.html:22 -msgid "Update:" -msgstr "Mise à jour :" - #: templates/web/zurich/admin/index-dm.html:23 #: templates/web/zurich/admin/index-sdm.html:21 #: templates/web/zurich/admin/reports.html:13 msgid "Updated" msgstr "Mis à jour" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1045 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1103 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1147 -#: perllib/FixMyStreet/App/Controller/Admin.pm:822 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1048 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1108 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1156 +#: perllib/FixMyStreet/App/Controller/Admin.pm:821 #: perllib/FixMyStreet/Cobrand/Zurich.pm:771 #: perllib/FixMyStreet/Cobrand/Zurich.pm:796 #: perllib/FixMyStreet/Cobrand/Zurich.pm:866 @@ -3581,13 +3430,12 @@ msgid "Updated!" msgstr "Mis à jour !" #: templates/web/base/admin/list_updates.html:2 -#: templates/web/base/report/update.html:3 -#: templates/web/fixmystreet/report/update.html:5 +#: templates/web/base/report/update.html:5 #: templates/web/zurich/report/updates.html:2 msgid "Updates" msgstr "Mises à jour" -#: perllib/FixMyStreet/DB/Result/Comment.pm:132 +#: perllib/FixMyStreet/DB/Result/Comment.pm:131 msgid "Updates are limited to %s characters in length. Please shorten your update" msgstr "Les mises à jour sont limitées à %s caractères de long. Merci de raccourcir votre texte" @@ -3597,12 +3445,9 @@ msgstr "Mises à jour sur {{title}}" #. ("%s is the site name") #: templates/web/base/report/display.html:0 -#: templates/web/base/report/display.html:5 -#: templates/web/fixmystreet/report/display.html:0 -#: templates/web/fixmystreet/report/display.html:9 -#, fuzzy +#: templates/web/base/report/display.html:9 msgid "Updates to this problem, %s" -msgstr "Mises à jour pour ce problème, FixMyStreet.fr" +msgstr "Mises à jour de ce problème, %s" #: templates/web/base/admin/body.html:182 msgid "Use the <strong>note</strong> to record details that are only displayed in the admin. Notes are not shown publicly, and are not sent to the body." @@ -3610,15 +3455,14 @@ msgstr "Utiliser la <strong>note</strong> pour enregistrer des détails qui sont #: templates/web/zurich/admin/report_edit-sdm.html:48 #: templates/web/zurich/admin/report_edit.html:67 -#, fuzzy msgid "Used map" -msgstr "plan utilisé" +msgstr "Carte utilisée" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1452 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1461 msgid "User flag removed" msgstr "Utilisateur dé–signalé" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1424 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1433 msgid "User flagged" msgstr "Utilisateur signalé" @@ -3626,7 +3470,7 @@ msgstr "Utilisateur signalé" msgid "User search finds matches in users' names and email addresses." msgstr "La recherche utilisateurs parcourt les noms et adresses courriel." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1280 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1289 #: perllib/FixMyStreet/Cobrand/Zurich.pm:399 #: templates/web/base/admin/flagged.html:29 #: templates/web/zurich/header.html:69 @@ -3657,7 +3501,6 @@ msgid "Viewing a location" msgstr "Consultation d'un lieu" #: templates/web/base/report/display.html:0 -#: templates/web/fixmystreet/report/display.html:0 msgid "Viewing a problem" msgstr "Consultation d'un problème" @@ -3670,25 +3513,24 @@ msgstr "Localités de cette administration" 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 "Nous avons trouvé plus d'une correspondance pour cet endroit. Nous montrons jusqu'à dix résultats, essayez s'il vous plaît une recherche différente si le vôtre n'est pas ici." -#: templates/web/zurich/auth/token.html:7 -msgid "We have not been able to confirm your account - sorry." -msgstr "Nous n'avons pas pu confirmé votre compte - désolé." - -#: templates/web/zurich/auth/token.html:17 -msgid "We have sent you an email containing a link to confirm your account." -msgstr "Nous vous avons envoyé un email contenant un lien pour confirmer votre compte." +#: templates/web/base/auth/general.html:6 +#: templates/web/base/report/display.html:27 +#: templates/web/base/report/new/oauth_email_form.html:5 +#, fuzzy +msgid "We need your email address, please give it below." +msgstr "Nous n’affichons jamais votre email ou numéro de téléphone." -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:2 -#: templates/web/fixmystreet/report/update-form.html:77 +#: templates/web/base/report/new/form_user_loggedout_email.html:2 +#: templates/web/base/report/update/form_user_loggedout_email.html:2 msgid "We never show your email" msgstr "Nous n’affichons jamais votre email" -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:31 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:65 +#: templates/web/base/report/new/form_user_loggedin.html:31 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:28 msgid "We never show your email address or phone number." msgstr "Nous n’affichons jamais votre email ou numéro de téléphone." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:422 +#: perllib/FixMyStreet/Script/Reports.pm:200 msgid "We realise this problem might be the responsibility of %s; however, we don't currently have any contact details for them. If you know of an appropriate contact address, please do get in touch." msgstr "Nous sommes conscients que ce problème pourrait être la responsabilité de %s, mais nous n'avons actuellement pas leurs coordonnées. Si vous connaissez une adresse de contact approprié, faites-le nous savoir s'il vous plaît." @@ -3705,19 +3547,15 @@ msgstr "Nous utiliserons vos informations personnelles en accord avec notre <a msgid "We’re sorry to hear the problem’s not fixed. Why not try writing to your local representatives?" msgstr "Nous sommes désolés d’apprendre que le problème n&esquo;est pas résolu. Pourquoi ne pas essayer d'écrire directement à vos élus locaux ?" -#: templates/web/base/contact/blurb.html:8 -msgid "We'd love to hear what you think about this site. Just fill in the form, or send an email to <a href='mailto:%s'>%s</a>:" -msgstr "Nous aimerions beaucoup savoir ce que vous pensez de ce site. Il suffit de remplir ce formulaire, ou envoyez un email à <a href='mailto:%s'>%s</a>:" - #: templates/web/base/contact/submit.html:7 msgid "We’ll get back to you as soon as we can." msgstr "Nous reviendrons vers vous dès que nous le pouvons." #: templates/web/base/questionnaire/index.html:71 msgid "What was your experience of getting the problem fixed?" -msgstr "" +msgstr "Quelle a été votre expérience concernant la résolution du problème?" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:49 +#: templates/web/base/report/new/form_report.html:19 msgid "What’s the issue, and where is it?" msgstr "Quel est le problème, et où est-il?" @@ -3730,7 +3568,11 @@ msgstr "Édité le" msgid "When sent" msgstr "Envoyé le" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:640 +#: templates/web/base/js/translation_strings.html:50 +msgid "Whoa there Testino! Three photos are enough." +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Report/New.pm:635 msgid "Whole block of empty flats" msgstr "Tout le bloc d'appartements vides" @@ -3743,9 +3585,9 @@ msgstr "Pourquoi arrêter là ? <a href=\"/alert\"> déclarer plus d’alert #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:14 msgid "Wish" -msgstr "" +msgstr "Souhait" -#: templates/web/base/open311/index.html:92 +#: templates/web/base/open311/index.html:84 msgid "With request searches, it is also possible to search for agency_responsible to limit the requests to those sent to a single administration. The search term is the administration ID provided by <a href=\"%s\">MaPit</a>." msgstr "Avec les recherches à requètes, il est également possible de rechercher des agency_responsible pour limiter les demandes à celles qui sont envoyées à une administration unique. Le terme de recherche est l'ID de l'administration fourni par <a href=\"%s\">MapIt</a>." @@ -3753,7 +3595,7 @@ msgstr "Avec les recherches à requètes, il est également possible de recherch msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"http://fixmystreet.org\">available at fixmystreet.org</a>." msgstr "Aimeriez-vous contribuer à FixMyStreet? Notre code est open source et <a href=\"http://fixmystreetf.org\"> disponible sur fixmystreet.org </a>" -#: templates/web/base/questionnaire/index.html:87 +#: templates/web/base/questionnaire/index.html:96 msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?" msgstr "Aimeriez-vous recevoir un autre questionnaire dans 4 semaines, pour vous rappeler de vérifier l'état?" @@ -3762,7 +3604,6 @@ msgid "Writing your message entirely in block capitals makes it hard to read, as msgstr "Si vous rédigez votre message entièrement en capitales, ou sans ponctuation, il sera difficile à lire." #: templates/web/base/report/new/fill_in_details_form.html:4 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:5 msgid "Wrong location? Just click again on the map." msgstr "Mauvais emplacement? Il suffit de cliquer à nouveau sur la carte." @@ -3785,27 +3626,24 @@ msgstr "Année" #: templates/web/base/admin/users.html:31 #: templates/web/base/questionnaire/creator_fixed.html:14 #: templates/web/base/questionnaire/index.html:51 -#: templates/web/base/questionnaire/index.html:90 +#: templates/web/base/questionnaire/index.html:99 msgid "Yes" msgstr "Oui" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:17 -#: templates/web/fixmystreet/report/update-form.html:91 +#: templates/web/base/report/new/form_user_loggedout_password.html:5 +#: templates/web/base/report/update/form_user_loggedout_password.html:4 msgid "Yes I have a password" msgstr "Oui j'ai un mot de passe" -#: templates/web/base/contact/index.html:39 -#: templates/web/fixmystreet/contact/index.html:54 +#: templates/web/base/contact/index.html:46 msgid "You are complaining that this problem report was unnecessarily moderated:" msgstr "Vous ne comprenez pas les raisons pour lesquelles ce rapport a été inutilement retiré:" -#: templates/web/base/contact/index.html:41 -#: templates/web/fixmystreet/contact/index.html:56 +#: templates/web/base/contact/index.html:48 msgid "You are reporting the following problem report for being abusive, containing personal information, or similar:" msgstr "Vous signalez le rapport de problème suivant comme étant violent, contenant des renseignements personnels, ou similaires :" -#: templates/web/base/contact/index.html:15 -#: templates/web/fixmystreet/contact/index.html:30 +#: templates/web/base/contact/index.html:22 msgid "You are reporting the following update for being abusive, containing personal information, or similar:" msgstr "Vous signalez la mise à jour suivante comme étant violente, contenant des renseignements personnels, ou similaires :" @@ -3818,7 +3656,7 @@ msgstr "Vous pouvez <a href=\"%s%s\">consulter le problème sur ce site</a>." msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create." msgstr "Vous pouvez ajouter un courriel d'utilisateur abusif dans la liste des abus, qui cache automatiquement (et n'envoie jamais) les rapports qu'ils crèent." -#: templates/web/fixmystreet/contact/index.html:121 +#: templates/web/base/contact/index.html:113 msgid "You can contact technical support on <a href='mailto:%s'>%s</a>" msgstr "Vous pouvez contacte le support technique par le courriel <a href='mailto:%s'>%s</a>" @@ -3832,8 +3670,8 @@ msgstr "" "Par exemple, ce la peut être utile si vous voulez garder un Å“il sur un utilisateur qui a envoyé des rapports inappropriés \n" "par le passé." -#: templates/web/base/report/new/councils_text_none.html:10 -#: templates/web/base/report/new/councils_text_none.html:2 +#: templates/web/base/report/new/councils_text_none.html:12 +#: templates/web/base/report/new/councils_text_none.html:14 #: templates/web/base/report/new/councils_text_some.html:19 #: templates/web/base/report/new/councils_text_some.html:21 msgid "You can help us by finding a contact email address for local problems for %s and emailing it to us at <a href='mailto:%s'>%s</a>." @@ -3851,20 +3689,16 @@ msgstr "Vous avez refusé; merci de remplir le champ ci-dessus" msgid "You have already answered this questionnaire. If you have a question, please <a href='%s'>get in touch</a>, or <a href='%s'>view your problem</a>.\n" msgstr "Vous avez déjà répondu à ce questionnaire. Si vous avez une question, <a href='%s'>entrez en contact avec nous</a>, ou <a href='%s'>affichez votre problème</a>.\n" -#: templates/web/base/questionnaire/index.html:77 -#: templates/web/base/report/new/fill_in_details_form.html:75 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:73 -msgid "You have already attached a photo to this report, attaching another one will replace it." -msgstr "Vous avez déjà joint une photo à ce rapport, en joindre un autre la remplacera." - -#: templates/web/base/report/update-form.html:59 -#: templates/web/fixmystreet/report/update-form.html:56 -msgid "You have already attached a photo to this update, attaching another one will replace it." -msgstr "Vous avez déjà joint une photo à cette mise à jour, en joindre un autre la remplacera." - -#: templates/web/zurich/report/new/fill_in_details_form.html:61 +#: templates/web/base/report/new/form_report.html:32 +#: templates/web/zurich/report/new/fill_in_details_form.html:55 msgid "You have already attached photos to this report. Note that you can attach a maximum of 3 to this report (if you try to upload more, the oldest will be removed)." -msgstr "" +msgstr "Vous avez déjà joint les photos de ce rapport. Notez que vous pouvez joindre un maximum de 3 photos par déclaration (si vous en télécharger plus, le plus ancien est supprimé)." + +#: templates/web/base/questionnaire/index.html:83 +#: templates/web/base/report/update/form_update.html:14 +#, fuzzy +msgid "You have already attached photos to this update. Note that you can attach a maximum of 3 to this update (if you try to upload more, the oldest will be removed)." +msgstr "Vous avez déjà joint les photos de ce rapport. Notez que vous pouvez joindre un maximum de 3 photos par déclaration (si vous en télécharger plus, le plus ancien est supprimé)." #: templates/web/base/auth/sign_out.html:4 #: templates/web/zurich/auth/sign_out.html:3 @@ -3880,9 +3714,8 @@ msgstr "Vous avez localisé le problème au point marqué avec une épingle vert msgid "You have successfully confirmed your email address." msgstr "Votre adresse courriel a bien été confirmée." -#: templates/web/base/report/display.html:20 -#: templates/web/base/report/new/fill_in_details.html:37 -#: templates/web/fixmystreet/report/display.html:17 +#: templates/web/base/report/display.html:17 +#: templates/web/base/report/new/login_success_form.html:3 msgid "You have successfully signed in; please check and confirm your details are accurate:" msgstr "Vous avez réussi à vous connecter ; veuillez vérifier et confirmer que vos coordonnées sont exactes :" @@ -3911,53 +3744,42 @@ msgid "Your Reports" msgstr "Vos rapports" #: templates/web/base/alert/_list.html:89 +#: templates/web/base/contact/index.html:83 +#: templates/web/base/report/display_tools.html:38 +#: templates/web/base/report/display_tools.html:40 +#: templates/web/base/report/new/form_user_loggedin.html:3 +#: templates/web/base/report/new/form_user_loggedout_email.html:1 +#: templates/web/base/report/update/form_user_loggedout_email.html:1 #: templates/web/fixmystreet/alert/updates.html:19 #: templates/web/fixmystreet/alert/updates.html:22 -#: templates/web/fixmystreet/contact/index.html:91 -#: templates/web/fixmystreet/report/display.html:62 -#: templates/web/fixmystreet/report/display.html:64 -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:3 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:1 -#: templates/web/fixmystreet/report/update-form.html:76 #: templates/web/zurich/report/new/fill_in_details_form.html:76 msgid "Your email" msgstr "Votre email" -#: templates/web/base/auth/general.html:28 -#: templates/web/fixmystreet/report/update-form.html:82 +#: templates/web/base/auth/general.html:45 +#: templates/web/base/report/update/form_user_loggedout_email.html:7 #: templates/web/zurich/auth/general.html:30 #: templates/web/zurich/auth/general.html:58 msgid "Your email address" msgstr "Votre adresse email" -#: templates/web/base/report/new/fill_in_details_form.html:106 -#: templates/web/base/report/update-form.html:81 -msgid "Your email:" -msgstr "Votre email:" - -#: templates/web/fixmystreet/report/updates-sidebar-notes.html:7 +#: templates/web/base/report/updates-sidebar-notes.html:3 msgid "Your information will only be used in accordance with our <a href=\"/privacy\">privacy policy</a>" msgstr "Votre information sera utilisée seulement en accord avec notre <a href=\"/privacy\">politique de confidentialité</a>" -#: templates/web/base/auth/general.html:51 -#: templates/web/fixmystreet/contact/index.html:84 -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:18 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:54 -#: templates/web/fixmystreet/report/update-form.html:142 +#: templates/web/base/auth/general.html:90 +#: templates/web/base/contact/index.html:76 +#: templates/web/base/report/new/form_user_loggedin.html:18 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:17 +#: templates/web/base/report/update/form_name.html:11 #: templates/web/zurich/auth/general.html:61 #: templates/web/zurich/report/new/fill_in_details_form.html:86 msgid "Your name" msgstr "Votre nom" -#: templates/web/base/contact/index.html:73 -#: templates/web/base/report/new/fill_in_details_form.html:186 -#: templates/web/base/report/update-form.html:152 -msgid "Your name:" -msgstr "Votre nom :" - -#: templates/web/base/auth/general.html:39 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:22 -#: templates/web/fixmystreet/report/update-form.html:96 +#: templates/web/base/auth/general.html:75 +#: templates/web/base/report/new/form_user_loggedout_password.html:10 +#: templates/web/base/report/update/form_user_loggedout_password.html:9 #: templates/web/zurich/auth/general.html:34 msgid "Your password" msgstr "Votre mot de passe" @@ -3966,15 +3788,16 @@ msgstr "Votre mot de passe" msgid "Your password has been changed" msgstr "Votre mot de passe a été changé" -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:27 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:63 +#: templates/web/base/report/new/form_user_loggedin.html:27 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:26 #: templates/web/zurich/report/new/fill_in_details_form.html:92 msgid "Your phone number" msgstr "Votre numéro de téléphone" #: templates/web/base/questionnaire/index.html:14 +#, fuzzy msgid "Your report" -msgstr "Votre rapport" +msgstr "Vos rapports" #: templates/web/base/footer.html:9 templates/web/fixmystreet/footer.html:29 msgid "Your reports" @@ -3984,23 +3807,17 @@ msgstr "Vos rapports" msgid "Your updates" msgstr "Vos mises à jour" -#: templates/web/base/contact/index.html:81 -msgid "Your email:" -msgstr "votre email :" - #: templates/web/base/reports/_list-filters.html:3 -#, fuzzy msgid "all reports" -msgstr "Tous les rapports" +msgstr "tous les rapports" #: templates/web/base/admin/timeline.html:4 msgid "by %s" msgstr "par %s" #: templates/web/base/reports/_list-filters.html:5 -#, fuzzy msgid "closed reports" -msgstr "Rapports clos" +msgstr "rapports fermés" #: templates/web/base/reports/body.html:6 #: templates/web/base/reports/body.html:7 @@ -4022,17 +3839,16 @@ msgid "edit user" msgstr "saisissez l'utilisateur" #: templates/web/base/reports/_list-filters.html:6 -#, fuzzy msgid "fixed reports" -msgstr "Rapports résolus" +msgstr "rapports résolus" -#: templates/web/base/admin/index.html:33 +#: templates/web/base/status/stats.html:20 #: templates/web/zurich/admin/index.html:5 msgid "from %s different users" -msgstr "de %d utilisateurs différents" +msgstr "de %s utilisateurs différents" -#: templates/web/base/report/_item.html:17 -#: templates/web/zurich/report/_item.html:16 +#: templates/web/base/report/_item.html:15 +#: templates/web/zurich/report/_item.html:14 msgid "last updated %s" msgstr "dernière mise à jour %s" @@ -4124,10 +3940,8 @@ msgstr "réouvert" msgid "sign out" msgstr "déconnexion" -#: templates/web/base/report/new/fill_in_details_form.html:12 -#: templates/web/base/report/new/fill_in_details_form.html:15 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:10 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:12 +#: templates/web/base/report/new/fill_in_details_form.html:11 +#: templates/web/base/report/new/fill_in_details_form.html:9 msgid "the local council" msgstr "L'administration locale" @@ -4136,7 +3950,7 @@ msgstr "L'administration locale" msgid "there is no pin shown as the user did not use the map" msgstr "Il n'y a aucune épingle affichée parce que l'utilisateur n'a pas utilisé la carte" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:398 +#: perllib/FixMyStreet/Script/Reports.pm:176 msgid "this type of local problem" msgstr "Ce type de problème local" @@ -4145,9 +3959,8 @@ msgid "today" msgstr "aujourd'hui" #: templates/web/base/reports/_list-filters.html:4 -#, fuzzy msgid "unfixed reports" -msgstr "Rapports résolus" +msgstr "rapports non résolus" #: templates/web/base/admin/report_edit.html:32 msgid "used map" @@ -4166,7 +3979,7 @@ msgstr "L'utilisateur est propriétaire du problème" msgid "ward" msgstr "localité" -#: templates/web/base/front/stats.html:17 +#: templates/web/base/front/stats.html:13 #, perl-format msgid "<big>%s</big> report recently" msgid_plural "<big>%s</big> reports recently" @@ -4194,7 +4007,7 @@ msgid_plural "%d minutes" msgstr[0] "%d minute" msgstr[1] "%d minutes" -#: templates/web/base/front/stats.html:29 +#: templates/web/base/front/stats.html:25 #, perl-format msgid "<big>%s</big> update on reports" msgid_plural "<big>%s</big> updates on reports" @@ -4215,14 +4028,14 @@ msgid_plural "%d weeks" msgstr[0] "%d semaine" msgstr[1] "%d semaines" -#: templates/web/base/front/stats.html:12 +#: templates/web/base/front/stats.html:8 #, perl-format msgid "<big>%s</big> report in past week" msgid_plural "<big>%s</big> reports in past week" msgstr[0] "<big>%s</big> rapport la semaine passée" msgstr[1] "<big>%s</big> rapports la semaine passée" -#: templates/web/base/front/stats.html:23 +#: templates/web/base/front/stats.html:19 #, perl-format msgid "<big>%s</big> fixed in past month" msgid_plural "<big>%s</big> fixed in past month" @@ -4243,140 +4056,86 @@ msgid_plural "We do <strong>not</strong> yet have details for the other councils msgstr[0] "Nous n'avons pas encore de détails pour l'autre administration responsable de ce lieu." msgstr[1] "Nous n'avons pas encore de détails pour les autres administrations responsables de ce lieu." -#~ msgid "(Don't worry — we'll hang on to your alert while you're checking your email.)" -#~ msgstr "(Pas d'inquiétude— nous conservons votre alerte pendant que vous vérifiez votre adresse courriel.)" - -#~ msgid "(Don't worry — we'll hang on to your problem report while you're checking your email.)" -#~ msgstr "(Pas d'inquiétude— nous conservons votre rapport pendant que vous vérifiez votre adresse courriel.)" - -#~ msgid "(Don't worry — we'll hang on to your update while you're checking your email.)" -#~ msgstr "(Pas d'inquiétude— nous conservons votre mise à jour pendant que vous vérifiez votre adresse courriel.)" - -#~ msgid "<small>If you cannot see the map, <a href='%s' rel='nofollow'>skip this step</a>.</small>" -#~ msgstr "<small>Si vous ne pouvez pas voir le plan, <a href='%s' rel='nofollow'>sautez cette étape</a>.</small>" - -#~ msgid "<strong>No</strong>, I do not, let me sign in by email:" -#~ msgstr "<strong>Non</strong>, je n'en ai pas, laissez-moi m'authentifier par email :" - -#~ msgid "Are you a <strong>developer</strong>? Would you like to contribute to FixMyStreet?" -#~ msgstr "Vous êtes un <strong>développeur</strong> ? Vous aimeriez contribuer à FixMyStreet ?" - -#~ msgid "Closest nearby problems <small>(within %skm)</small>" -#~ msgstr "Problèmes clos à proximité <small>(dans l'intervalle de %skm)</small>" - -#~ msgid "Contact FixMyStreet" -#~ msgstr "Contacter FixMyStreet" - -#~ msgid "Do you have a FixMyBarangay password?" -#~ msgstr "Avez-vous un mot de passe FixMyBarangay?" - -#~ msgid "FixMyStreet admin:" -#~ msgstr "Administrateur FixMyStreet.fr" - -#~ msgid "If you do not, your alert will not be activated." -#~ msgstr "Si vous ne le faites pas, votre alerte ne sera pas activée" - -#~ msgid "If you do not, your problem will not be posted." -#~ msgstr "Si vous ne le faites pas, votre problème ne sera pas envoyé." - -#~ msgid "If you do not, your update will not be posted." -#~ msgstr "Si vous ne le faites pas, votre mise à jour ne sera pas envoyée." - -#~ msgid "New local reports on reportemptyhomes.com" -#~ msgstr "Nouveaux rapports local sur reportemptyhomes.com" - -#~ msgid "New reports for {{COUNCIL}} within {{WARD}} ward on reportemptyhomes.com" -#~ msgstr "Nouveaux rapports pour {{COUNCIL}} au sein de {{WARD}} sur reportemptyhomes.com" - -#~ msgid "New reports on reportemptyhomes.com" -#~ msgstr "Nouveaux rapports sur reportemptyhomes.com" - -#~ msgid "New reports on reportemptyhomes.com near {{POSTCODE}}" -#~ msgstr "Nouveaux rapports sur reportemptyhomes.com près de {{POSTCODE}}" - -#~ msgid "New reports to {{COUNCIL}} on reportemptyhomes.com" -#~ msgstr "Nouveaux rapports à {{COUNCIL}} sur reportemptyhomes.com" - -#~ msgid "New reports within {{NAME}}'s boundary on reportemptyhomes.com" -#~ msgstr "De nouveaux rapports au sein de {{name}} 's sur reportemptyhomes.com" +#~ msgid "(we never show your email address or phone number)" +#~ msgstr "(nous n’affichons jamais votre email ou numéro de téléphone)" -#~ msgid "New update:" -#~ msgstr "Nouvelle mise à jour:" +#~ msgid "(we never show your email)" +#~ msgstr "(nous n’affichons jamais votre email)" -#~ msgid "No problems found." -#~ msgstr "Aucun problème trouvé." +#~ msgid "<strong>No</strong>, let me confirm my report by email:" +#~ msgstr "<strong>Non</strong>, laissez-moi confirmer mon rapport par email :" -#~ msgid "No problems have been reported yet." -#~ msgstr "Aucun problème n'a encore été signalé." +#~ msgid "<strong>No</strong>, let me confirm my update by email:" +#~ msgstr "<strong>Non</strong>, laissez-moi confirmer ma mise à jour par email :" -#~ msgid "Now to submit your report… do you have a FixMyStreet password?" -#~ msgstr "Maintenant pour envoyer votre rapport… avez-vous un mot de passe FixMyStreet.fr ?" +#~ msgid "Email me updates" +#~ msgstr "Envoyez-moi les mises à jour" -#~ msgid "Now to submit your update… do you have a FixMyStreet password?" -#~ msgstr "Maintenant pour envoyer votre mise à jour… avez-vous un mot de passe FixMyStreet.fr ?" +#~ msgid "Enter a new password:" +#~ msgstr "Saisissez un nouveau mot de passe :" -#~ msgid "Our code is open source and <a href=\"http://github.com/mysociety/fixmystreet\">available on GitHub</a>." -#~ msgstr "Notre code est open source et <a href=\"http://github.com/grischard/fixmystreet\">disponible sur GitHub</a>." +#~ 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 "Je suis désolé, nous n'avons pas pu valider cet accusé de réception. Si vous avez copié cette adresse d'un email, merci de vérifier que vous n'avez pas fait d'erreur.\n" -#~ msgid "Please <a class=\"tab_link\" href=\"#report\">take a look</a> at the updates that have been left." -#~ msgstr "Merci de <a class=\"tab_link\" href=\"#report\">consulter</a> aux mises à jour qui ont été faites." +#~ 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 "Si vous consultez vos emails sur un site web ou que vous utilisez un filtre antispam, vérifiez peut-être votre boîte Spam/Courrier indésirable : nos messages sont parfois filtrés par erreur." -#~ msgid "Please take a look at the updates that have been left." -#~ msgstr "Merci de consulter les mises à jour qui ont été laissées." +#~ msgid "Message:" +#~ msgstr "Message :" -#~ msgid "Problems within %s, FixMyStreet" -#~ msgstr "Problèmes à l'intérieur de %s, FixMyStreet.fr" +#~ msgid "More problems nearby" +#~ msgstr "Encore plus de problèmes aux alentours" -#~ msgid "Properties recently reported as put back to use on reportemptyhomes.com" -#~ msgstr "Propriétés récemments rapportés à remettrent en visibilité sur reportemptyhomes.com" +#~ msgid "Nearly Done! Now check your email..." +#~ msgstr "Presque fini! Maintenant allez voir vos emails…" -#~ msgid "Publish the response" -#~ msgstr "Publier la réponse" +#~ msgid "Offensive? Unsuitable? Tell us" +#~ msgstr "Offensant ? Inapproprié ? Dites-le nous" -#~ msgid "Reported %s, to %s" -#~ msgstr "Signalé %s, à %s" +#~ msgid "Photo:" +#~ msgstr "Photo :" -#~ msgid "Reports on and around the map" -#~ msgstr "Rapports sur et autour de la carte" +#~ msgid "Please check your email" +#~ msgstr "Merci de consulter vos emails" -#~ msgid "Sign in by email" -#~ msgstr "S'authentifier par email" +#~ msgid "Please note that updates are not sent to the council. If you leave your name it will be public. Your information will only be used in accordance with our <a href=\"/faq#privacy\">privacy policy</a>" +#~ msgstr "Merci de bien noter que les mises à jour ne sont pas envoyées à l'administration. Si vous laissez votre nom, il sera public. Vos informations seront uniquement utilisées conformément à nore <a href=\"/faq#privacy\">politique de confidentialité</a>" -#~ msgid "Signed in as %s" -#~ msgstr "Connecté en tant que %s" +#~ msgid "This may be because the link is too old or already used, or the address was not copied correctly." +#~ msgstr "C'est peut-être parce que le lien est trop ancien ou déjà utilisé, ou l'adresse n'a pas été saisie correctement." -#~ msgid "The confirmation email <strong>may</strong> take a few minutes to arrive — <em>please</em> be patient." -#~ msgstr "L'email de confirmation <strong>peut</strong> prendre quelques minutes pour arriver — <em>merci</em> de patienter." +#~ msgid "This problem has been closed" +#~ msgstr "Ce problème a été clos" -#~ msgid "The details of your problem are available from the other tab above." -#~ msgstr "Les détails de votre problème sont disponibles à partir de l'onglet autre au-dessus." +#~ msgid "This problem is in progress" +#~ msgstr "Ce problème est en cours" -#~ msgid "The details of your problem are available on the right hand side of this page." -#~ msgstr "Les détails de votre problème sont disponibles sur le côté droit de cette page." +#~ msgid "This problem is old and of unknown status." +#~ msgstr "Ce problème est vieux et de statut inconnu." -#~ msgid "The latest local reports reported by users" -#~ msgstr "Les derniers rapports locaux rapportés par les utilisateurs" +#~ msgid "Update:" +#~ msgstr "Mise à jour :" -#~ msgid "The latest properties reported back to use by users" -#~ msgstr "Les dernières propriétés libres rapportées par les utilisateurs" +#~ msgid "We have not been able to confirm your account - sorry." +#~ msgstr "Nous n'avons pas pu confirmé votre compte - désolé." -#~ msgid "The latest reports for {{COUNCIL}} reported by users" -#~ msgstr "Les derniers rapports pour {{COUNCIL}} rapportés par les utilisateurs" +#~ msgid "We have sent you an email containing a link to confirm your account." +#~ msgstr "Nous vous avons envoyé un email contenant un lien pour confirmer votre compte." -#~ msgid "The latest reports for {{COUNCIL}} within {{WARD}} ward reported by users" -#~ msgstr "Les derniers rapports pour {{COUNCIL}} dans {{WARD}} rapportés par les utilisateurs" +#~ msgid "We'd love to hear what you think about this site. Just fill in the form, or send an email to <a href='mailto:%s'>%s</a>:" +#~ msgstr "Nous aimerions beaucoup savoir ce que vous pensez de ce site. Il suffit de remplir ce formulaire, ou envoyez un email à <a href='mailto:%s'>%s</a>:" -#~ msgid "The latest reports within {{NAME}}'s boundary reported by users" -#~ msgstr "Les derniers rapports à l'intérieur de {{NAME}} rapportés par les utilisateurs" +#~ msgid "You have already attached a photo to this report, attaching another one will replace it." +#~ msgstr "Vous avez déjà joint une photo à ce rapport, en joindre un autre la remplacera." -#~ msgid "To <strong>report a problem</strong>, click on the map at the correct location." -#~ msgstr "Pour <strong>signaler un problème</strong>, cliquez sur la carte à l'emplacement correct." +#~ msgid "You have already attached a photo to this update, attaching another one will replace it." +#~ msgstr "Vous avez déjà joint une photo à cette mise à jour, en joindre un autre la remplacera." -#~ msgid "User" -#~ msgstr "Utilisateur" +#~ msgid "Your email:" +#~ msgstr "Votre email:" -#~ msgid "You must now click the link in the email we've just sent you." -#~ msgstr "Vous devez maintenant cliquer sur le lien que nous venons de vous envoyer par courriel." +#~ msgid "Your name:" +#~ msgstr "Votre nom :" -#~ msgid "Your email address:" -#~ msgstr "Votre adresse mail:" +#~ msgid "Your email:" +#~ msgstr "votre email :" diff --git a/locale/he_IL.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/he_IL.UTF-8/LC_MESSAGES/FixMyStreet.po index 6969b6ac1..53b96b578 100644 --- a/locale/he_IL.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/he_IL.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: fixmystreet\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2015-10-23 16:51+0100\n" -"PO-Revision-Date: 2015-07-31 16:31+0000\n" +"POT-Creation-Date: 2016-03-02 13:09+0000\n" +"PO-Revision-Date: 2015-10-23 16:37+0000\n" "Last-Translator: mySociety <transifex@mysociety.org>\n" "Language-Team: Hebrew (Israel) (http://www.transifex.com/mysociety/fixmystreet/language/he_IL/)\n" "Language: he_IL\n" @@ -19,45 +19,24 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:628 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:411 +#: perllib/FixMyStreet/DB/Result/Problem.pm:616 +#: perllib/FixMyStreet/Script/Reports.pm:189 msgid " and " msgstr "" #: templates/web/base/report/new/councils_text_all.html:2 -#: templates/web/base/report/new/councils_text_none.html:11 -#: templates/web/base/report/new/councils_text_none.html:2 +#: templates/web/base/report/new/councils_text_none.html:12 +#: templates/web/base/report/new/councils_text_none.html:15 #: templates/web/base/report/new/councils_text_some.html:19 #: templates/web/base/report/new/councils_text_some.html:22 #: templates/web/base/report/new/councils_text_some.html:5 msgid " or " msgstr "×ו" -#: templates/web/base/admin/index.html:35 -#: templates/web/base/status/index.html:13 -msgid "%s confirmed alerts, %s unconfirmed" -msgstr "" - -#: templates/web/base/admin/index.html:37 -#: templates/web/base/status/index.html:16 -#: templates/web/zurich/admin/index.html:6 -msgid "%s council contacts – %s confirmed, %s unconfirmed" -msgstr "" - #: templates/web/base/admin/edit-league.html:12 msgid "%d edits by %s" msgstr "" -#: templates/web/base/admin/index.html:34 -#: templates/web/base/status/index.html:12 -msgid "%s live updates" -msgstr "" - -#: templates/web/base/admin/index.html:36 -#: templates/web/base/status/index.html:14 -msgid "%s questionnaires sent – %s answered (%s%%)" -msgstr "" - #: templates/web/base/pagination.html:10 msgid "%d to %d of %d" msgstr "" @@ -72,6 +51,19 @@ msgstr "" msgid "%s admin:" msgstr "" +#: templates/web/base/status/stats.html:26 +msgid "%s bodies" +msgstr "" + +#: templates/web/base/status/stats.html:24 +msgid "%s confirmed alerts, %s unconfirmed" +msgstr "" + +#: templates/web/base/status/stats.html:27 +#: templates/web/zurich/admin/index.html:6 +msgid "%s council contacts – %s confirmed, %s unconfirmed" +msgstr "" + #. ("%s is the site name") #: templates/web/base/alert/index.html:7 msgid "" @@ -88,7 +80,16 @@ msgid "" "within a certain distance of a particular location." msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:695 +#: templates/web/base/status/stats.html:23 +#, fuzzy +msgid "%s live updates" +msgstr "שלח לי דו×ר ××œ×§×˜×¨×•× ×™ על ×¢×“×›×•× ×™×" + +#: templates/web/base/status/stats.html:25 +msgid "%s questionnaires sent – %s answered (%s%%)" +msgstr "" + +#: perllib/FixMyStreet/DB/Result/Problem.pm:683 msgid "%s ref: %s" msgstr "" @@ -103,15 +104,15 @@ msgid "" "for the county council." msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:255 perllib/FixMyStreet/Cobrand/UK.pm:267 +#: perllib/FixMyStreet/Cobrand/UK.pm:256 perllib/FixMyStreet/Cobrand/UK.pm:268 msgid "%s ward, %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:564 +#: perllib/FixMyStreet/DB/Result/Problem.pm:552 msgid "%s, reported at %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:282 perllib/FixMyStreet/Cobrand/UK.pm:294 +#: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295 msgid "%s, within %s ward" msgstr "" @@ -119,7 +120,7 @@ msgstr "" msgid "© <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors" msgstr "" -#: templates/web/zurich/report/new/fill_in_details_form.html:53 +#: templates/web/zurich/report/new/fill_in_details_form.html:46 msgid "(Defect & location of defect)" msgstr "" @@ -147,13 +148,13 @@ msgstr "" msgid "(alternatively the RSS feed can be customised, within %s)" msgstr "" -#: templates/web/base/report/_item.html:27 -#: templates/web/zurich/report/_item.html:21 +#: templates/web/base/report/_item.html:25 +#: templates/web/zurich/report/_item.html:19 msgid "(closed)" msgstr "" -#: templates/web/base/report/_item.html:25 -#: templates/web/zurich/report/_item.html:19 +#: templates/web/base/report/_item.html:23 +#: templates/web/zurich/report/_item.html:17 msgid "(fixed)" msgstr "" @@ -161,37 +162,28 @@ msgstr "" msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)" msgstr "" -#: templates/web/base/report/_item.html:21 +#: templates/web/base/report/_item.html:19 msgid "(not sent to council)" msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:200 #: templates/web/zurich/report/new/fill_in_details_form.html:82 msgid "(optional)" msgstr "" -#: templates/web/fixmystreet/report/public_label.html:1 +#: templates/web/base/report/public_label.html:1 msgid "(public)" msgstr "" -#: templates/web/base/report/_item.html:20 +#: templates/web/base/report/_item.html:18 msgid "(sent to both)" msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:194 -msgid "(we never show your email address or phone number)" -msgstr "" - -#: templates/web/base/report/update-form.html:159 -msgid "(we never show your email)" -msgstr "" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:673 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 #: perllib/FixMyStreet/DB/Result/Problem.pm:410 msgid "-- Pick a category --" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:637 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:632 #: perllib/FixMyStreet/DB/Result/Problem.pm:416 msgid "-- Pick a property type --" msgstr "" @@ -210,52 +202,39 @@ msgstr "" msgid "<label>Show %s</label> <label>about %s</label>" msgstr "" -#: templates/web/base/admin/index.html:32 -#: templates/web/base/status/index.html:11 +#: templates/web/base/status/stats.html:18 #: templates/web/zurich/admin/index.html:4 msgid "<strong>%s</strong> live problems" msgstr "" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:39 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:2 msgid "<strong>No</strong> Let me confirm my report by email" msgstr "" -#: templates/web/fixmystreet/report/update-form.html:112 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:2 msgid "<strong>No</strong> Let me confirm my update by email" msgstr "" -#: templates/web/base/auth/general.html:48 +#: templates/web/base/auth/general.html:87 #: templates/web/zurich/auth/general.html:51 msgid "<strong>No</strong> let me sign in by email" msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:145 -msgid "<strong>No</strong>, let me confirm my report by email:" -msgstr "" - -#: templates/web/base/report/update-form.html:118 -msgid "<strong>No</strong>, let me confirm my update by email:" -msgstr "" - -#: templates/web/base/auth/general.html:34 -#: templates/web/base/report/new/fill_in_details_form.html:123 -#: templates/web/base/report/update-form.html:96 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:15 -#: templates/web/fixmystreet/report/update-form.html:89 +#: templates/web/base/auth/general.html:70 +#: templates/web/base/report/new/form_user_loggedout_password.html:3 +#: templates/web/base/report/update/form_user_loggedout_password.html:2 msgid "<strong>Yes</strong> I have a password" msgstr "" -#: templates/web/base/static/about-en-gb.html:1 -#: templates/web/base/static/about-en-gb.html:3 +#: templates/web/base/about/about-en-gb.html:1 +#: templates/web/base/about/about-en-gb.html:3 msgid "About us" msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:8 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:31 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:29 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:35 msgid "Action Scheduled" msgstr "" @@ -286,7 +265,7 @@ msgstr "" msgid "Add user" msgstr "" -#: templates/web/base/my/my.html:52 +#: templates/web/base/my/my.html:56 msgid "Added %s" msgstr "" @@ -306,8 +285,7 @@ msgstr "" msgid "Alert %d disabled (created %s)" msgstr "" -#: templates/web/base/report/update-form.html:164 -#: templates/web/fixmystreet/report/update-form.html:150 +#: templates/web/base/report/update/form_name.html:20 msgid "Alert me to future updates" msgstr "" @@ -339,10 +317,8 @@ msgstr "" #: templates/web/base/report/new/councils_text_all.html:2 #: templates/web/base/report/new/councils_text_all.html:4 -#: templates/web/base/report/new/fill_in_details_form.html:12 -#: templates/web/base/report/new/fill_in_details_form.html:14 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:10 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:11 +#: templates/web/base/report/new/fill_in_details_form.html:10 +#: templates/web/base/report/new/fill_in_details_form.html:9 msgid "All the information you provide here will be sent to <strong>%s</strong>." msgstr "" @@ -364,6 +340,10 @@ msgstr "" msgid "Are you a developer?" msgstr "" +#: templates/web/base/js/translation_strings.html:52 +msgid "Are you sure you want to cancel this upload?" +msgstr "" + #: templates/web/base/admin/body-form.html:69 #: templates/web/base/admin/body.html:16 #: templates/web/zurich/admin/body-form.html:24 @@ -396,16 +376,16 @@ msgstr "" msgid "Assigned to %s" msgstr "" -#: templates/web/base/open311/index.html:84 +#: templates/web/base/open311/index.html:76 msgid "At most %d requests are returned in each query. The returned requests are ordered by requested_datetime, so to get all requests, do several searches with rolling start_date and end_date." msgstr "" -#: templates/web/base/open311/index.html:76 +#: templates/web/base/open311/index.html:68 msgid "At the moment only searching for and looking at reports work." msgstr "" #: perllib/FixMyStreet/DB/Result/Problem.pm:373 -#: templates/web/zurich/report/_item.html:11 +#: templates/web/zurich/report/_item.html:9 msgid "Awaiting moderation" msgstr "" @@ -417,7 +397,7 @@ msgstr "" msgid "Ban email address" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1276 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1285 #: perllib/FixMyStreet/Cobrand/Zurich.pm:392 #: templates/web/base/admin/bodies.html:1 templates/web/zurich/header.html:64 msgid "Bodies" @@ -447,7 +427,7 @@ msgid "Can't see the map? <em>Skip this step</em>" msgstr "" #: templates/web/base/admin/body.html:68 -#: templates/web/base/admin/index.html:61 +#: templates/web/base/admin/index.html:54 #: templates/web/base/report/new/category.html:10 #: templates/web/base/report/new/category_wrapper.html:3 #: templates/web/zurich/admin/body.html:14 @@ -458,8 +438,8 @@ msgstr "" msgid "Category" msgstr "" -#: templates/web/base/admin/index.html:59 -#: templates/web/base/admin/index.html:67 +#: templates/web/base/admin/index.html:52 +#: templates/web/base/admin/index.html:60 msgid "Category fix rate for problems > 4 weeks old" msgstr "" @@ -472,7 +452,7 @@ msgstr "" msgid "Category:" msgstr "קטגוריה" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:402 +#: perllib/FixMyStreet/Script/Reports.pm:180 msgid "Category: %s" msgstr "קטגוריה: %s" @@ -522,7 +502,7 @@ msgid "Click here or enter as dd/mm/yyyy" msgstr "" #: templates/web/base/around/_report_banner.html:2 -#: templates/web/base/js/translation_strings.html:50 +#: templates/web/base/js/translation_strings.html:55 msgid "Click map to report a problem" msgstr "" @@ -549,7 +529,7 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:25 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:144 -#: templates/web/fixmystreet/report/banner.html:15 +#: templates/web/base/report/banner.html:15 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:10 #: templates/web/zurich/admin/header.html:16 @@ -557,7 +537,7 @@ msgstr "" msgid "Closed" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:794 +#: perllib/FixMyStreet/DB/Result/Problem.pm:779 msgid "Closed by council" msgstr "" @@ -583,7 +563,7 @@ msgstr "" msgid "Cobrand:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1283 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1292 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "תצורה" @@ -596,13 +576,13 @@ msgstr "" msgid "Confirm" msgstr "×שר" -#: templates/web/base/auth/token.html:1 templates/web/zurich/auth/token.html:1 +#: templates/web/base/auth/token.html:1 msgid "Confirm account" msgstr "×שר חשבון" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:33 -#: templates/web/fixmystreet/report/update-form.html:107 -msgid "Confirm by email below, providing a new password at that point. When you confirm, your password will be updated." +#: templates/web/base/report/new/form_user_loggedout_password.html:21 +#: templates/web/base/report/update/form_user_loggedout_password.html:20 +msgid "Confirm by email instead, providing a new password at that point. When you confirm, your password will be updated." msgstr "" #: templates/web/base/questionnaire/creator_fixed.html:1 @@ -632,24 +612,17 @@ msgid "Confirmed:" msgstr "×ישר:" #. ("%s is the site name") -#: templates/web/base/faq/faq-en-gb.html:8 templates/web/base/footer.html:24 -#: templates/web/base/open311/index.html:8 -#: templates/web/base/static/privacy.html:10 -#: templates/web/fixmystreet/contact/index.html:12 -#, fuzzy +#: templates/web/base/about/_sidebar.html:6 templates/web/base/footer.html:24 msgid "Contact %s" -msgstr "צור קשר" +msgstr "" #: templates/web/base/contact/index.html:1 #: templates/web/base/contact/index.html:2 #: templates/web/base/contact/submit.html:1 -#: templates/web/fixmystreet/contact/index.html:1 -#: templates/web/fixmystreet/contact/index.html:2 msgid "Contact Us" msgstr "צור קשר" -#: templates/web/base/contact/index.html:6 -#: templates/web/fixmystreet/contact/index.html:20 +#: templates/web/base/contact/index.html:12 msgid "Contact the team" msgstr "" @@ -658,8 +631,8 @@ msgstr "" msgid "Coordinates:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1420 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1448 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1429 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1457 msgid "Could not find user" msgstr "" @@ -677,7 +650,7 @@ msgstr "עירייה" msgid "Council contacts for %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:693 +#: perllib/FixMyStreet/DB/Result/Problem.pm:681 msgid "Council ref: %s" msgstr "" @@ -692,7 +665,7 @@ msgstr "" msgid "Count" msgstr "ספירה" -#: templates/web/base/email_sent.html:1 templates/web/zurich/email_sent.html:1 +#: templates/web/base/email_sent.html:1 msgid "Create a report" msgstr "צור דו\"×—" @@ -702,9 +675,8 @@ msgid "Create category" msgstr "צור קטגוריה" #: templates/web/zurich/admin/template_edit.html:29 -#, fuzzy msgid "Create template" -msgstr "צור דו\"×—" +msgstr "" #: templates/web/base/admin/problem_row.html:34 #: templates/web/zurich/admin/templates.html:10 @@ -741,7 +713,7 @@ msgstr "" msgid "Dealt with by subdivision within 5 working days" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:878 +#: perllib/FixMyStreet/App/Controller/Admin.pm:877 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "" @@ -754,7 +726,7 @@ msgstr "" msgid "Deleted" msgstr "× ×ž×—×§" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:51 +#: templates/web/base/report/new/form_report.html:45 #: templates/web/zurich/admin/index-dm.html:22 #: templates/web/zurich/admin/index-sdm.html:20 #: templates/web/zurich/admin/reports.html:12 @@ -762,12 +734,11 @@ msgid "Description" msgstr "תי×ור" #: templates/web/base/js/translation_strings.html:34 -#: templates/web/zurich/report/new/fill_in_details_form.html:42 +#: templates/web/zurich/report/new/fill_in_details_form.html:68 msgid "Details" msgstr "פרטי×" #: templates/web/base/admin/report_edit.html:20 -#: templates/web/base/report/new/fill_in_details_form.html:62 #: templates/web/zurich/admin/report_edit-sdm.html:27 #: templates/web/zurich/admin/report_edit.html:29 #: templates/web/zurich/admin/report_edit.html:43 @@ -788,11 +759,11 @@ msgid "Diligency prize league table" msgstr "" #. ("%s is the site name") -#: templates/web/base/auth/general.html:31 -#: templates/web/base/report/new/fill_in_details_form.html:114 -#: templates/web/base/report/update-form.html:87 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:11 -#: templates/web/fixmystreet/report/update-form.html:86 +#: templates/web/base/auth/general.html:48 +#: templates/web/base/report/new/form_user_loggedout.html:18 +#: templates/web/base/report/new/oauth_email_form.html:18 +#: templates/web/base/report/update-form.html:29 +#: templates/web/base/report/update/form_user_loggedout.html:17 msgid "Do you have a %s password?" msgstr "" @@ -800,16 +771,18 @@ msgstr "" msgid "Don’t know" msgstr "" -#: templates/web/fixmystreet/contact/index.html:118 +#: templates/web/base/contact/index.html:110 msgid "Don't like forms?" msgstr "×œ× ×והב טפסי×?" +#: templates/web/base/js/translation_strings.html:51 +msgid "Drag and drop photos here or <u>click to upload</u>" +msgstr "" + #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:14 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:32 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:30 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:36 msgid "Duplicate" msgstr "כפול" @@ -859,7 +832,7 @@ msgstr "עורך" #: templates/web/base/admin/category_edit.html:91 #: templates/web/base/admin/flagged.html:38 #: templates/web/base/admin/users.html:16 -#: templates/web/base/auth/general.html:22 +#: templates/web/base/auth/general.html:39 #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:24 @@ -867,7 +840,7 @@ msgstr "עורך" msgid "Email" msgstr "דו×ר ××œ×§×˜×¨×•× ×™" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1396 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1405 msgid "Email added to abuse list" msgstr "דו×ר ××œ×§×˜×¨×•× ×™ הוסף לרשימת ×”×ž×©×ª×ž×©×™× ×œ×¨×¢×”" @@ -883,7 +856,7 @@ msgstr "" msgid "Email alert deleted" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1393 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1402 msgid "Email already in abuse list" msgstr "דו×ר ××œ×§×˜×¨×•× ×™ כבר ברשימת ×”×ž×©×ª×ž×©×™× ×œ×¨×¢×”" @@ -891,41 +864,36 @@ msgstr "דו×ר ××œ×§×˜×¨×•× ×™ כבר ברשימת ×”×ž×©×ª×ž×©×™× ×œ×¨×¢×”" msgid "Email me new local problems" msgstr "שלח לי דו×ר ××œ×§×˜×¨×•× ×™ על בעיות מקומיות חדשות" -#: templates/web/base/report/display.html:38 -msgid "Email me updates" -msgstr "שלח לי דו×ר ××œ×§×˜×¨×•× ×™ על ×¢×“×›×•× ×™×" - #: templates/web/base/admin/category_edit.html:31 #: templates/web/base/admin/report_edit.html:62 #: templates/web/base/admin/update_edit.html:33 #: templates/web/base/admin/user-form.html:20 #: templates/web/base/alert/updates.html:13 -#: templates/web/base/report/display.html:42 #: templates/web/zurich/admin/body.html:47 msgid "Email:" msgstr "דו×ר ××œ×§×˜×¨×•× ×™:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:329 +#: perllib/FixMyStreet/Script/Reports.pm:108 msgid "Email: %s" msgstr "דו×ר ××œ×§×˜×¨×•× ×™: %s" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:639 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:634 msgid "Empty flat or maisonette" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:638 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:633 msgid "Empty house or bungalow" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:641 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:636 msgid "Empty office or other commercial" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:642 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:637 msgid "Empty pub or bar" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:643 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:638 msgid "Empty public building - school, hospital, etc." msgstr "" @@ -958,7 +926,7 @@ msgstr "" msgid "Enter a Zürich street name" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:13 +#: perllib/FixMyStreet/Cobrand/UK.pm:14 msgid "Enter a nearby UK postcode, or street name and area" msgstr "" @@ -976,14 +944,9 @@ msgstr "" msgid "Enter a nearby street name and area, postal code or district in Delhi" msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:152 -#: templates/web/base/report/update-form.html:125 -msgid "Enter a new password:" -msgstr "" - -#: templates/web/base/auth/general.html:60 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:75 -#: templates/web/fixmystreet/report/update-form.html:123 +#: templates/web/base/auth/general.html:99 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:38 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:13 #: templates/web/zurich/auth/general.html:65 msgid "Enter a password" msgstr "" @@ -993,11 +956,11 @@ msgid "Enter details of the problem" msgstr "" #: templates/web/base/errors/generic.html:1 -#: templates/web/base/errors/generic.html:3 +#: templates/web/base/errors/generic.html:4 #: templates/web/base/tokens/abuse.html:1 #: templates/web/base/tokens/abuse.html:3 #: templates/web/base/tokens/error.html:1 -#: templates/web/base/tokens/error.html:3 +#: templates/web/base/tokens/error.html:5 msgid "Error" msgstr "" @@ -1010,11 +973,11 @@ msgstr "" msgid "Example postcode %s" msgstr "" -#: templates/web/base/open311/index.html:94 +#: templates/web/base/open311/index.html:86 msgid "Examples:" msgstr "" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:55 +#: templates/web/base/report/new/form_report.html:49 msgid "Explain what’s wrong, exactly where it is, and how long it’s been there…" msgstr "" @@ -1055,17 +1018,15 @@ msgstr "" msgid "FixMyStreet" msgstr "" -#: templates/web/base/admin/index.html:61 +#: templates/web/base/admin/index.html:54 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:24 #: templates/web/base/admin/report_blocks.html:9 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:144 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:34 -#: templates/web/fixmystreet/report/banner.html:12 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:32 +#: templates/web/base/report/banner.html:12 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:38 msgid "Fixed" msgstr "" @@ -1092,7 +1053,7 @@ msgstr "" msgid "Flag user" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1281 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1290 #: templates/web/base/admin/users.html:19 msgid "Flagged" msgstr "" @@ -1123,8 +1084,8 @@ msgstr "" msgid "For more information, see <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>." msgstr "" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:32 -#: templates/web/fixmystreet/report/update-form.html:106 +#: templates/web/base/report/new/form_user_loggedout_password.html:20 +#: templates/web/base/report/update/form_user_loggedout_password.html:19 msgid "Forgotten your password?" msgstr "" @@ -1136,21 +1097,18 @@ msgstr "" msgid "Forwarded wish to external body" msgstr "" -#: templates/web/base/faq/faq-en-gb.html:1 -#: templates/web/base/faq/faq-en-gb.html:13 -#: templates/web/base/faq/faq-en-gb.html:6 -#: templates/web/base/open311/index.html:6 -#: templates/web/base/static/privacy.html:8 -#: templates/web/fixmystreet/contact/index.html:10 +#: templates/web/base/about/_sidebar.html:4 +#: templates/web/base/about/faq-en-gb.html:1 +#: templates/web/base/about/faq-en-gb.html:5 msgid "Frequently Asked Questions" msgstr "" -#: templates/web/base/open311/index.html:136 +#: templates/web/base/open311/index.html:128 msgid "GeoRSS on Google Maps" msgstr "" +#: templates/web/base/report/display_tools.html:11 #: templates/web/fixmystreet/around/_updates.html:3 -#: templates/web/fixmystreet/report/display.html:35 msgid "Get updates" msgstr "" @@ -1183,7 +1141,7 @@ msgstr "" msgid "Going to send questionnaire?" msgstr "" -#: templates/web/base/admin/index.html:42 +#: templates/web/base/admin/index.html:35 msgid "Graph of problem creation by status over time" msgstr "" @@ -1200,7 +1158,7 @@ msgid "Have you ever reported a problem to a council before, or is this your fir msgstr "" #: templates/web/base/footer.html:15 templates/web/fixmystreet/footer.html:38 -#: templates/web/zurich/faq/faq-de-ch.html:1 +#: templates/web/zurich/about/faq-de-ch.html:1 #: templates/web/zurich/footer.html:22 #: templates/web/zurich/nav_over_content.html:8 msgid "Help" @@ -1251,7 +1209,7 @@ msgstr "" msgid "How to send successful reports" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:754 +#: perllib/FixMyStreet/App/Controller/Admin.pm:752 msgid "I am afraid you cannot confirm unconfirmed reports." msgstr "" @@ -1269,10 +1227,6 @@ msgstr "" msgid "I'm afraid we couldn't locate your problem in the database.\n" msgstr "" -#: perllib/FixMyStreet/App/Controller/Tokens.pm:327 -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 "" - #: templates/web/base/admin/flagged.html:14 #: templates/web/base/admin/list_updates.html:6 #: templates/web/base/admin/reports.html:11 @@ -1301,16 +1255,11 @@ msgstr "" msgid "If you get some more information about the status of your problem, please come back to the site and leave an update." msgstr "" -#: templates/web/base/report/new/councils_text_none.html:2 -#: templates/web/base/report/new/councils_text_none.html:8 +#: templates/web/base/report/new/councils_text_none.html:10 +#: templates/web/base/report/new/councils_text_none.html:9 msgid "If you submit a problem here the subject and details of the problem will be public, but the problem will <strong>not</strong> be reported to the council." msgstr "" -#: templates/web/zurich/auth/token.html:19 -#: templates/web/zurich/email_sent.html:7 -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 "" - #: templates/web/base/questionnaire/index.html:68 msgid "" "If you wish to leave a public update on the problem, please enter it here\n" @@ -1354,10 +1303,8 @@ msgstr "" #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:144 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:32 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:30 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:36 msgid "In Progress" msgstr "" @@ -1365,7 +1312,7 @@ msgstr "" msgid "In abuse table?" msgstr "" -#: templates/web/base/open311/index.html:88 +#: templates/web/base/open311/index.html:80 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 "" @@ -1373,7 +1320,7 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/Zurich.pm:963 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:7 -#: templates/web/fixmystreet/report/banner.html:19 +#: templates/web/base/report/banner.html:19 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:8 msgid "In progress" @@ -1408,7 +1355,7 @@ msgstr "" msgid "Invalid agency_responsible value %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1201 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1210 msgid "Invalid end date" msgstr "" @@ -1416,7 +1363,7 @@ msgstr "" msgid "Invalid format %s specified." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1206 msgid "Invalid start date" msgstr "" @@ -1424,14 +1371,12 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:5 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:143 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:31 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:29 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:35 msgid "Investigating" msgstr "" -#: templates/web/fixmystreet/contact/blurb.html:8 +#: templates/web/base/contact/blurb.html:8 msgid "It's often quickest to <a href=\"%s\">check our FAQs</a> and see if the answer is there." msgstr "" @@ -1449,11 +1394,9 @@ msgstr "" msgid "Jurisdiction unknown" msgstr "" -#: templates/web/base/auth/general.html:44 -#: templates/web/base/report/new/fill_in_details_form.html:132 -#: templates/web/base/report/update-form.html:105 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:28 -#: templates/web/fixmystreet/report/update-form.html:102 +#: templates/web/base/auth/general.html:80 +#: templates/web/base/report/new/form_user_loggedout_password.html:16 +#: templates/web/base/report/update/form_user_loggedout_password.html:15 #: templates/web/zurich/auth/general.html:40 msgid "Keep me signed in on this computer" msgstr "" @@ -1511,6 +1454,7 @@ msgid "MAP" msgstr "" #: templates/web/base/js/translation_strings.html:45 +#: templates/web/base/maps/google-ol.html:13 msgid "Map" msgstr "" @@ -1530,7 +1474,7 @@ msgstr "" msgid "Marked fixed/closed more than eight weeks ago" msgstr "" -#: templates/web/fixmystreet/contact/index.html:106 +#: templates/web/base/contact/index.html:98 msgid "Message" msgstr "" @@ -1542,10 +1486,6 @@ msgstr "" msgid "Message to external body:" msgstr "" -#: templates/web/base/contact/index.html:97 -msgid "Message:" -msgstr "" - #: perllib/FixMyStreet/App/Controller/Open311.pm:445 msgid "Missing jurisdiction_id" msgstr "" @@ -1558,10 +1498,6 @@ msgstr "" msgid "Month" msgstr "" -#: templates/web/base/report/display.html:34 -msgid "More problems nearby" -msgstr "" - #: templates/web/base/admin/bodies.html:21 #: templates/web/base/admin/body-form.html:18 #: templates/web/base/admin/flagged.html:16 @@ -1569,11 +1505,11 @@ msgstr "" #: templates/web/base/admin/list_updates.html:7 #: templates/web/base/admin/reports.html:13 #: templates/web/base/admin/users.html:15 -#: templates/web/base/auth/general.html:50 +#: templates/web/base/auth/general.html:89 +#: templates/web/base/report/new/form_user_loggedin.html:9 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:7 +#: templates/web/base/report/update/form_name.html:4 #: templates/web/base/reports/index.html:20 -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:9 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:44 -#: templates/web/fixmystreet/report/update-form.html:138 #: templates/web/zurich/admin/body-form.html:4 #: templates/web/zurich/auth/general.html:60 #: templates/web/zurich/report/new/fill_in_details_form.html:82 @@ -1587,7 +1523,7 @@ msgstr "" msgid "Name:" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:328 +#: perllib/FixMyStreet/Script/Reports.pm:107 msgid "Name: %s" msgstr "" @@ -1596,25 +1532,21 @@ msgstr "" msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:127 +#: perllib/FixMyStreet/Cobrand/UK.pm:128 msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:434 -#: perllib/FixMyStreet/Cobrand/Default.pm:474 +#: perllib/FixMyStreet/Cobrand/Default.pm:455 +#: perllib/FixMyStreet/Cobrand/Default.pm:495 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:267 +#: perllib/FixMyStreet/Script/Alerts.pm:290 msgid "" "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n" "\n" msgstr "" -#: templates/web/zurich/email_sent.html:5 -msgid "Nearly Done! Now check your email..." -msgstr "" - #: templates/web/base/auth/token.html:17 templates/web/base/email_sent.html:5 msgid "Nearly done! Now check your email…" msgstr "" @@ -1692,8 +1624,8 @@ msgstr "" #: templates/web/base/admin/report_edit.html:75 #: templates/web/base/admin/update_edit.html:25 #: templates/web/base/questionnaire/creator_fixed.html:16 +#: templates/web/base/questionnaire/index.html:101 #: templates/web/base/questionnaire/index.html:53 -#: templates/web/base/questionnaire/index.html:92 msgid "No" msgstr "" @@ -1757,10 +1689,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:13 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:33 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:31 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:37 msgid "Not Responsible" msgstr "" @@ -1799,7 +1729,7 @@ msgstr "" msgid "Note:" msgstr "" -#: templates/web/base/open311/index.html:73 +#: templates/web/base/open311/index.html:65 msgid "Note: <strong>%s</strong>" msgstr "" @@ -1807,13 +1737,15 @@ msgstr "" msgid "Notes from SDM to DM" msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:113 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:10 +#: templates/web/base/report/new/form_user_loggedout.html:14 +#: templates/web/base/report/new/form_user_loggedout.html:2 +#: templates/web/base/report/new/oauth_email_form.html:17 msgid "Now to submit your report…" msgstr "" -#: templates/web/base/report/update-form.html:86 -#: templates/web/fixmystreet/report/update-form.html:85 +#: templates/web/base/report/update-form.html:28 +#: templates/web/base/report/update/form_user_loggedout.html:13 +#: templates/web/base/report/update/form_user_loggedout.html:2 msgid "Now to submit your update…" msgstr "" @@ -1821,11 +1753,6 @@ msgstr "" msgid "OK" msgstr "" -#: templates/web/base/report/display.html:28 -#: templates/web/base/report/update.html:17 -msgid "Offensive? Unsuitable? Tell us" -msgstr "" - #: templates/web/base/reports/index.html:23 msgid "Old / unknown <br>problems" msgstr "" @@ -1842,7 +1769,7 @@ msgstr "" msgid "Older <br>problems" msgstr "" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:45 +#: templates/web/base/report/new/form_report.html:15 msgid "One-line summary" msgstr "" @@ -1853,8 +1780,7 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:4 #: templates/web/base/admin/update_edit.html:28 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/report/update-form.html:30 -#: templates/web/fixmystreet/report/update-form.html:28 +#: templates/web/base/report/update/form_update.html:34 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:7 #: templates/web/zurich/admin/update_edit.html:18 @@ -1869,15 +1795,15 @@ msgstr "" msgid "Open, but not had any update in eight weeks" msgstr "" -#: templates/web/base/open311/index.html:70 +#: templates/web/base/open311/index.html:62 msgid "Open311 API for the mySociety FixMyStreet server" msgstr "" -#: templates/web/base/open311/index.html:80 +#: templates/web/base/open311/index.html:72 msgid "Open311 initiative web page" msgstr "" -#: templates/web/base/open311/index.html:81 +#: templates/web/base/open311/index.html:73 msgid "Open311 specification" msgstr "" @@ -1889,15 +1815,15 @@ msgstr "" msgid "Or you can subscribe to an alert based upon what ward or council you’re in:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1084 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:673 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:674 -#: perllib/FixMyStreet/DB/Result/Problem.pm:570 -#: perllib/FixMyStreet/DB/Result/Problem.pm:580 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1055 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:669 +#: perllib/FixMyStreet/DB/Result/Problem.pm:558 +#: perllib/FixMyStreet/DB/Result/Problem.pm:568 +#: perllib/FixMyStreet/DB/Result/Problem.pm:578 #: perllib/FixMyStreet/DB/Result/Problem.pm:590 -#: perllib/FixMyStreet/DB/Result/Problem.pm:602 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:397 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:412 +#: perllib/FixMyStreet/Script/Reports.pm:175 +#: perllib/FixMyStreet/Script/Reports.pm:190 msgid "Other" msgstr "" @@ -1906,7 +1832,7 @@ msgid "Owner" msgstr "" #: templates/web/base/errors/page_error_404_not_found.html:1 -#: templates/web/base/errors/page_error_404_not_found.html:3 +#: templates/web/base/errors/page_error_404_not_found.html:4 msgid "Page Not Found" msgstr "" @@ -1920,16 +1846,16 @@ msgstr "" msgid "Partial" msgstr "" -#: templates/web/base/auth/general.html:53 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:68 -#: templates/web/fixmystreet/report/update-form.html:116 +#: templates/web/base/auth/general.html:92 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:31 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:6 #: templates/web/zurich/auth/general.html:32 #: templates/web/zurich/auth/general.html:63 msgid "Password (optional)" msgstr "" #: templates/web/base/auth/change_password.html:25 -#: templates/web/base/auth/general.html:36 +#: templates/web/base/auth/general.html:72 msgid "Password:" msgstr "" @@ -1941,29 +1867,29 @@ msgstr "" msgid "Phone number" msgstr "" -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:26 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:62 +#: templates/web/base/report/new/form_user_loggedin.html:26 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:25 msgid "Phone number (optional)" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:306 +#: perllib/FixMyStreet/Script/Reports.pm:83 #: templates/web/base/admin/report_edit.html:63 -#: templates/web/base/report/new/fill_in_details_form.html:198 #: templates/web/zurich/admin/stats.html:39 msgid "Phone:" msgstr "" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:66 -#: templates/web/fixmystreet/report/update-form.html:59 +#: templates/web/base/questionnaire/index.html:75 +#: templates/web/base/report/new/form_report.html:23 +#: templates/web/base/report/update/form_update.html:6 #: templates/web/zurich/admin/index-dm.html:29 #: templates/web/zurich/admin/index-sdm.html:24 #: templates/web/zurich/admin/reports.html:16 #: templates/web/zurich/admin/stats.html:37 -#: templates/web/zurich/report/new/fill_in_details_form.html:52 +#: templates/web/zurich/report/new/fill_in_details_form.html:45 msgid "Photo" msgstr "" -#: perllib/FixMyStreet/App/Controller/Photo.pm:221 +#: perllib/FixMyStreet/App/Controller/Photo.pm:187 msgid "Photo is required." msgstr "" @@ -1971,13 +1897,7 @@ msgstr "" msgid "Photo required" msgstr "" -#: templates/web/base/questionnaire/index.html:80 -#: templates/web/base/report/new/fill_in_details_form.html:84 -#: templates/web/base/report/update-form.html:62 -msgid "Photo:" -msgstr "" - -#: templates/web/base/alert/list.html:26 +#: templates/web/base/alert/list.html:23 msgid "Photos of recent nearby reports" msgstr "" @@ -2006,20 +1926,16 @@ msgstr "" msgid "Please check the passwords and try again" msgstr "" -#: templates/web/zurich/auth/token.html:16 -msgid "Please check your email" -msgstr "" - -#: templates/web/base/auth/general.html:10 -#: templates/web/base/auth/general.html:16 +#: templates/web/base/auth/general.html:27 +#: templates/web/base/auth/general.html:33 #: templates/web/zurich/auth/general.html:3 #: templates/web/zurich/auth/general.html:9 msgid "Please check your email address is correct" msgstr "" #: perllib/FixMyStreet/App/Controller/Admin.pm:343 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:883 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:948 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:878 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:943 #: perllib/FixMyStreet/DB/Result/Problem.pm:412 #: templates/web/base/js/translation_strings.html:9 msgid "Please choose a category" @@ -2033,8 +1949,7 @@ msgstr "" msgid "Please correct the errors below" msgstr "" -#: templates/web/base/contact/blurb.html:2 -#: templates/web/fixmystreet/contact/blurb.html:12 +#: templates/web/base/contact/blurb.html:12 msgid "" "Please do <strong>not</strong> report problems through this form; messages go to\n" "the team behind this site, not a council. To report a problem,\n" @@ -2046,11 +1961,16 @@ msgid "Please do not be abusive — abusing your council devalues the s msgstr "" #: perllib/FixMyStreet/App/Controller/Admin.pm:346 -#: perllib/FixMyStreet/DB/Result/Comment.pm:126 +#: perllib/FixMyStreet/DB/Result/Comment.pm:125 #: templates/web/base/js/translation_strings.html:2 msgid "Please enter a message" msgstr "" +#: perllib/FixMyStreet/App/Controller/Admin.pm:1091 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1146 +msgid "Please enter a name" +msgstr "" + #: templates/web/base/auth/change_password.html:12 #: templates/web/base/auth/change_password.html:15 #: templates/web/base/js/translation_strings.html:19 @@ -2063,10 +1983,10 @@ msgstr "" msgid "Please enter a subject" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1084 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1137 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1087 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1142 #: perllib/FixMyStreet/App/Controller/Admin.pm:345 -#: perllib/FixMyStreet/DB/Result/User.pm:127 +#: perllib/FixMyStreet/DB/Result/User.pm:133 #: templates/web/base/js/translation_strings.html:12 #: templates/web/base/js/translation_strings.html:16 msgid "Please enter a valid email" @@ -2083,9 +2003,9 @@ msgid "Please enter some details" msgstr "" #: perllib/FixMyStreet/App/Controller/Contact.pm:113 -#: perllib/FixMyStreet/DB/Result/User.pm:124 -#: templates/web/base/auth/general.html:10 -#: templates/web/base/auth/general.html:15 +#: perllib/FixMyStreet/DB/Result/User.pm:130 +#: templates/web/base/auth/general.html:27 +#: templates/web/base/auth/general.html:32 #: templates/web/base/js/translation_strings.html:11 #: templates/web/base/js/translation_strings.html:15 #: templates/web/zurich/auth/general.html:3 @@ -2093,7 +2013,7 @@ msgstr "" msgid "Please enter your email" msgstr "" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:7 +#: templates/web/base/report/new/form_user_loggedout_email.html:7 #: templates/web/zurich/report/new/fill_in_details_form.html:80 msgid "Please enter your email address" msgstr "" @@ -2102,15 +2022,15 @@ msgstr "" msgid "Please enter your first name" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:318 +#: perllib/FixMyStreet/Cobrand/UK.pm:319 #: templates/web/base/js/translation_strings.html:7 msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below" msgstr "" #: perllib/FixMyStreet/App/Controller/Contact.pm:112 -#: perllib/FixMyStreet/DB/Result/Comment.pm:123 +#: perllib/FixMyStreet/DB/Result/Comment.pm:122 #: perllib/FixMyStreet/DB/Result/Problem.pm:406 -#: perllib/FixMyStreet/DB/Result/User.pm:120 +#: perllib/FixMyStreet/DB/Result/User.pm:126 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter your name" msgstr "" @@ -2137,12 +2057,11 @@ msgstr "" msgid "Please fill in details of the problem below." msgstr "" -#: templates/web/zurich/report/new/fill_in_details_form.html:46 +#: templates/web/zurich/report/new/fill_in_details_form.html:72 msgid "Please fill in details of the problem." msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:28 -#: templates/web/fixmystreet/report/new/sidebar.html:7 +#: templates/web/base/report/new/sidebar.html:7 #: templates/web/zurich/report/new/fill_in_details_form.html:20 msgid "Please fill in the form below with details of the problem, and describe the location as precisely as possible in the details box." msgstr "" @@ -2151,20 +2070,23 @@ msgstr "" msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "" -#: templates/web/fixmystreet/report/updates-sidebar-notes.html:4 +#: templates/web/base/report/updates-sidebar-notes.html:2 msgid "Please note that updates are not sent to the council." msgstr "" -#: templates/web/base/report/update-form.html:7 -msgid "Please note that updates are not sent to the council. If you leave your name it will be public. Your information will only be used in accordance with our <a href=\"/faq#privacy\">privacy policy</a>" +#: templates/web/base/report/new/oauth_email_form.html:4 +msgid "Please note your report has <strong>not yet been sent</strong>." msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:8 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:21 +#: templates/web/base/report/new/fill_in_details_form.html:20 #: templates/web/zurich/report/new/fill_in_details_form.html:11 msgid "Please note your report has <strong>not yet been sent</strong>. Choose a category and add further information below, then submit." msgstr "" +#: templates/web/base/report/display.html:26 +msgid "Please note your update has <strong>not yet been posted</strong>." +msgstr "" + #: templates/web/base/report/new/notes.html:1 #: templates/web/zurich/report/new/notes.html:1 msgid "Please note:" @@ -2202,6 +2124,7 @@ msgstr "" #: perllib/FixMyStreet/App/Model/PhotoSet.pm:117 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:145 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:147 +#: templates/web/base/js/translation_strings.html:53 msgid "Please upload a JPEG image only" msgstr "" @@ -2209,18 +2132,14 @@ msgstr "" msgid "Please write a message" msgstr "" -#: templates/web/fixmystreet/report/update-form.html:23 +#: templates/web/base/report/update/form_update.html:29 msgid "Please write your update here" msgstr "" -#: templates/web/base/contact/index.html:100 -#: templates/web/base/report/update-form.html:110 -#: templates/web/base/report/update-form.html:132 -#: templates/web/base/report/update-form.html:72 -#: templates/web/fixmystreet/contact/index.html:113 -#: templates/web/fixmystreet/report/update-form.html:124 -#: templates/web/fixmystreet/report/update-form.html:71 -#: templates/web/fixmystreet/report/update-form.html:97 +#: templates/web/base/contact/index.html:105 +#: templates/web/base/report/update-form.html:24 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:14 +#: templates/web/base/report/update/form_user_loggedout_password.html:10 msgid "Post" msgstr "" @@ -2248,12 +2167,9 @@ msgstr "" msgid "Privacy" msgstr "" -#: templates/web/base/faq/faq-en-gb.html:7 -#: templates/web/base/open311/index.html:7 -#: templates/web/base/static/privacy.html:1 -#: templates/web/base/static/privacy.html:2 -#: templates/web/base/static/privacy.html:9 -#: templates/web/fixmystreet/contact/index.html:11 +#: templates/web/base/about/_sidebar.html:5 +#: templates/web/base/about/privacy.html:1 +#: templates/web/base/about/privacy.html:2 msgid "Privacy and cookies" msgstr "" @@ -2281,12 +2197,12 @@ msgstr "" msgid "Problem %s sent to council %s" msgstr "" -#: templates/web/base/admin/index.html:46 +#: templates/web/base/admin/index.html:39 #: templates/web/zurich/admin/index.html:9 msgid "Problem breakdown by state" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1055 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1058 msgid "Problem marked as open." msgstr "" @@ -2302,11 +2218,11 @@ msgstr "" msgid "Problems in this area" msgstr "" -#: templates/web/fixmystreet/report/display.html:43 +#: templates/web/base/report/display_tools.html:19 msgid "Problems nearby" msgstr "" -#: templates/web/fixmystreet/report/display.html:41 +#: templates/web/base/report/display_tools.html:17 msgid "Problems on the map" msgstr "" @@ -2318,15 +2234,15 @@ msgstr "" msgid "Problems within %.1fkm of this location" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:642 +#: perllib/FixMyStreet/Cobrand/Default.pm:663 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:120 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:139 -#: perllib/FixMyStreet/Cobrand/UK.pm:207 +#: perllib/FixMyStreet/Cobrand/UK.pm:208 msgid "Problems within %s" msgstr "" #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:128 -#: perllib/FixMyStreet/Cobrand/UK.pm:221 +#: perllib/FixMyStreet/Cobrand/UK.pm:222 msgid "Problems within %s ward" msgstr "" @@ -2348,19 +2264,16 @@ msgstr "" msgid "Property type:" msgstr "" -#: templates/web/base/report/update-form.html:3 -#: templates/web/fixmystreet/report/update-form.html:4 +#: templates/web/base/report/update-form.html:6 msgid "Provide an update" msgstr "" -#: templates/web/base/auth/general.html:56 +#: templates/web/base/auth/general.html:95 msgid "Providing a name and password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:156 -#: templates/web/base/report/update-form.html:129 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:71 -#: templates/web/fixmystreet/report/update-form.html:119 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:34 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:9 msgid "Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." msgstr "" @@ -2396,18 +2309,17 @@ msgstr "" #: templates/web/base/alert/_list.html:22 #: templates/web/base/around/display_location.html:1 #: templates/web/base/around/display_location.html:3 -#: templates/web/base/report/display.html:50 +#: templates/web/base/report/display_tools.html:34 #: templates/web/base/reports/_rss.html:1 #: templates/web/fixmystreet/alert/updates.html:9 -#: templates/web/fixmystreet/report/display.html:58 msgid "RSS feed" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:250 perllib/FixMyStreet/Cobrand/UK.pm:262 +#: perllib/FixMyStreet/Cobrand/UK.pm:251 perllib/FixMyStreet/Cobrand/UK.pm:263 msgid "RSS feed for %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:256 perllib/FixMyStreet/Cobrand/UK.pm:268 +#: perllib/FixMyStreet/Cobrand/UK.pm:257 perllib/FixMyStreet/Cobrand/UK.pm:269 msgid "RSS feed for %s ward, %s" msgstr "" @@ -2415,11 +2327,11 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:163 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:173 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:181 -#: perllib/FixMyStreet/Cobrand/UK.pm:276 perllib/FixMyStreet/Cobrand/UK.pm:288 +#: perllib/FixMyStreet/Cobrand/UK.pm:277 perllib/FixMyStreet/Cobrand/UK.pm:289 msgid "RSS feed of %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:281 perllib/FixMyStreet/Cobrand/UK.pm:293 +#: perllib/FixMyStreet/Cobrand/UK.pm:282 perllib/FixMyStreet/Cobrand/UK.pm:294 msgid "RSS feed of %s, within %s ward" msgstr "" @@ -2431,15 +2343,15 @@ msgstr "" msgid "RSS feed of problems in this %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:643 +#: perllib/FixMyStreet/Cobrand/Default.pm:664 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:121 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:138 -#: perllib/FixMyStreet/Cobrand/UK.pm:214 +#: perllib/FixMyStreet/Cobrand/UK.pm:215 msgid "RSS feed of problems within %s" msgstr "" #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:127 -#: perllib/FixMyStreet/Cobrand/UK.pm:220 +#: perllib/FixMyStreet/Cobrand/UK.pm:221 msgid "RSS feed of problems within %s ward" msgstr "" @@ -2448,25 +2360,22 @@ msgstr "" msgid "RSS feed of recent local problems" msgstr "" -#: templates/web/base/report/display.html:50 +#: templates/web/base/report/display_tools.html:34 #: templates/web/fixmystreet/alert/updates.html:9 -#: templates/web/fixmystreet/report/display.html:58 msgid "RSS feed of updates to this problem" msgstr "" #: templates/web/base/alert/updates.html:9 -#: templates/web/base/report/display.html:41 +#: templates/web/base/report/display_tools.html:36 #: templates/web/fixmystreet/alert/updates.html:14 -#: templates/web/fixmystreet/report/display.html:60 msgid "Receive email when updates are left on this problem." msgstr "" #. ("%s is the site name") #: templates/web/base/around/display_location.html:0 #: templates/web/base/around/display_location.html:33 -#, fuzzy msgid "Recent local problems, %s" -msgstr "שלח לי דו×ר ××œ×§×˜×¨×•× ×™ על בעיות מקומיות חדשות" +msgstr "" #: templates/web/base/reports/index.html:24 msgid "Recently <br>fixed" @@ -2484,8 +2393,8 @@ msgstr "" msgid "Remove flag" msgstr "" -#: templates/web/base/admin/report_edit.html:92 -#: templates/web/base/admin/update_edit.html:62 +#: templates/web/base/admin/report_edit.html:93 +#: templates/web/base/admin/update_edit.html:67 #: templates/web/zurich/admin/update_edit.html:35 msgid "Remove photo (can't be undone!)" msgstr "" @@ -2505,7 +2414,7 @@ msgstr "" msgid "Report a problem" msgstr "" -#: templates/web/fixmystreet/report/display.html:32 +#: templates/web/base/report/display_tools.html:8 msgid "Report abuse" msgstr "" @@ -2514,7 +2423,8 @@ msgid "Report on %s" msgstr "" #: templates/web/base/report/new/fill_in_details_form.html:1 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:2 +#: templates/web/base/report/new/login_success_form.html:1 +#: templates/web/base/report/new/oauth_email_form.html:1 msgid "Report your problem" msgstr "" @@ -2523,9 +2433,8 @@ msgstr "" msgid "Report, view, or discuss local problems" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:585 -#: templates/web/base/contact/index.html:50 -#: templates/web/fixmystreet/contact/index.html:65 +#: perllib/FixMyStreet/DB/Result/Problem.pm:573 +#: templates/web/base/contact/index.html:57 msgid "Reported anonymously at %s" msgstr "" @@ -2534,9 +2443,8 @@ msgstr "" msgid "Reported before" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:608 -#: templates/web/base/contact/index.html:52 -#: templates/web/fixmystreet/contact/index.html:67 +#: perllib/FixMyStreet/DB/Result/Problem.pm:596 +#: templates/web/base/contact/index.html:59 msgid "Reported by %s at %s" msgstr "" @@ -2549,27 +2457,27 @@ msgstr "" msgid "Reported in the %s category" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:581 +#: perllib/FixMyStreet/DB/Result/Problem.pm:569 msgid "Reported in the %s category anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:603 +#: perllib/FixMyStreet/DB/Result/Problem.pm:591 msgid "Reported in the %s category by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:577 +#: perllib/FixMyStreet/DB/Result/Problem.pm:565 msgid "Reported via %s anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:599 +#: perllib/FixMyStreet/DB/Result/Problem.pm:587 msgid "Reported via %s by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:573 +#: perllib/FixMyStreet/DB/Result/Problem.pm:561 msgid "Reported via %s in the %s category anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:593 +#: perllib/FixMyStreet/DB/Result/Problem.pm:581 msgid "Reported via %s in the %s category by %s at %s" msgstr "" @@ -2590,13 +2498,13 @@ msgstr "" msgid "Reporting a problem" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1277 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1286 #: perllib/FixMyStreet/Cobrand/Zurich.pm:384 #: templates/web/zurich/header.html:60 msgid "Reports" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:327 perllib/FixMyStreet/Cobrand/UK.pm:331 +#: perllib/FixMyStreet/Cobrand/UK.pm:328 perllib/FixMyStreet/Cobrand/UK.pm:332 msgid "Reports are limited to %s characters in length. Please shorten your report" msgstr "" @@ -2633,15 +2541,17 @@ msgstr "" msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1495 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1500 -#: templates/web/base/admin/report_edit.html:88 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1508 +#: templates/web/base/admin/report_edit.html:90 +#: templates/web/base/admin/update_edit.html:64 #: templates/web/zurich/admin/report_edit.html:116 msgid "Rotate Left" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1495 -#: templates/web/base/admin/report_edit.html:89 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 +#: templates/web/base/admin/report_edit.html:91 +#: templates/web/base/admin/update_edit.html:65 #: templates/web/zurich/admin/report_edit.html:117 msgid "Rotate Right" msgstr "" @@ -2651,7 +2561,6 @@ msgid "Rotating this photo will discard unsaved changes to the report." msgstr "" #: templates/web/base/js/translation_strings.html:46 -#: templates/web/base/maps/google-ol.html:13 msgid "Satellite" msgstr "" @@ -2711,7 +2620,7 @@ msgstr "" msgid "Sent report back" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:708 +#: perllib/FixMyStreet/DB/Result/Problem.pm:696 msgid "Sent to %s %s later" msgstr "" @@ -2724,15 +2633,13 @@ msgstr "" msgid "Service:" msgstr "" -#: templates/web/fixmystreet/report/display.html:38 +#: templates/web/base/report/display_tools.html:14 msgid "Share" msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:193 -#: templates/web/base/report/update-form.html:158 -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:23 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:59 -#: templates/web/fixmystreet/report/update-form.html:146 +#: templates/web/base/report/new/form_user_loggedin.html:23 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:22 +#: templates/web/base/report/update/form_name.html:15 msgid "Show my name publicly" msgstr "" @@ -2744,9 +2651,9 @@ msgstr "" msgid "Show pins" msgstr "" +#: templates/web/base/auth/general.html:100 #: templates/web/base/auth/general.html:3 -#: templates/web/base/auth/general.html:40 -#: templates/web/base/auth/general.html:61 +#: templates/web/base/auth/general.html:76 #: templates/web/zurich/auth/general.html:18 #: templates/web/zurich/auth/general.html:35 msgid "Sign in" @@ -2773,7 +2680,7 @@ msgid "" " sent from your FixMyStreet installation." msgstr "" -#: templates/web/base/alert/index.html:42 +#: templates/web/base/alert/index.html:40 msgid "Some photos of recent reports" msgstr "" @@ -2783,7 +2690,7 @@ msgstr "" msgid "Some text to localize" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:78 +#: perllib/FixMyStreet/Cobrand/UK.pm:79 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover." msgstr "" @@ -2795,14 +2702,20 @@ msgstr "" msgid "Sorry, there has been an error confirming your problem." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:221 -#: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:37 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:216 +#: perllib/FixMyStreet/Geocode.pm:38 perllib/FixMyStreet/Geocode/Bing.pm:38 #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:56 #: perllib/FixMyStreet/Geocode/OSM.pm:48 msgid "Sorry, we could not find that location." msgstr "" -#: perllib/FixMyStreet/Geocode/Bing.pm:34 +#: templates/web/base/auth/general.html:9 +#: templates/web/base/report/display.html:21 +#: templates/web/base/report/new/fill_in_details_form.html:23 +msgid "Sorry, we could not log you in. Please fill in the form below." +msgstr "" + +#: perllib/FixMyStreet/Geocode/Bing.pm:35 #: perllib/FixMyStreet/Geocode/Google.pm:45 #: perllib/FixMyStreet/Geocode/Zurich.pm:88 msgid "Sorry, we could not parse that location. Please try again." @@ -2812,6 +2725,10 @@ msgstr "" msgid "Sorry, we couldn't save your image(s), please try again." msgstr "" +#: perllib/FixMyStreet/App/Controller/AuthSS.pm:301 +msgid "Sorry, you can not log in with Facebook. Please try again later." +msgstr "" + #: templates/web/base/admin/stats.html:64 msgid "Start Date:" msgstr "" @@ -2820,13 +2737,12 @@ msgstr "" #: templates/web/base/admin/flagged.html:18 #: templates/web/base/admin/list_updates.html:11 #: templates/web/base/admin/reports.html:15 -#: templates/web/fixmystreet/report/update-form.html:26 +#: templates/web/base/report/update/form_update.html:32 msgid "State" msgstr "" #: templates/web/base/admin/report_edit.html:47 #: templates/web/base/admin/update_edit.html:27 -#: templates/web/base/report/update-form.html:28 #: templates/web/zurich/admin/report_edit-sdm.html:73 #: templates/web/zurich/admin/report_edit.html:101 #: templates/web/zurich/admin/report_edit.html:155 @@ -2834,7 +2750,7 @@ msgstr "" msgid "State:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1282 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1291 #: perllib/FixMyStreet/Cobrand/Zurich.pm:387 #: templates/web/base/admin/stats.html:1 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:73 @@ -2856,7 +2772,7 @@ msgstr "" msgid "Street View" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:406 +#: perllib/FixMyStreet/Script/Reports.pm:184 msgid "Subcategory: %s" msgstr "" @@ -2864,30 +2780,25 @@ msgstr "" msgid "Subdivision/Body" msgstr "" -#: templates/web/fixmystreet/contact/index.html:98 +#: templates/web/base/contact/index.html:90 msgid "Subject" msgstr "" #: templates/web/base/admin/report_edit.html:19 -#: templates/web/base/contact/index.html:88 -#: templates/web/base/report/new/fill_in_details_form.html:53 #: templates/web/zurich/admin/report_edit.html:39 msgid "Subject:" msgstr "" #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/fill_in_details_form.html:137 -#: templates/web/base/report/new/fill_in_details_form.html:159 -#: templates/web/base/report/new/fill_in_details_form.html:96 -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:36 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:23 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:76 +#: templates/web/base/report/new/form_user_loggedin.html:36 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:39 +#: templates/web/base/report/new/form_user_loggedout_password.html:11 #: templates/web/zurich/report/new/fill_in_details_form.html:96 msgid "Submit" msgstr "" -#: templates/web/base/admin/report_edit.html:95 -#: templates/web/base/admin/update_edit.html:65 +#: templates/web/base/admin/report_edit.html:101 +#: templates/web/base/admin/update_edit.html:75 #: templates/web/base/admin/user-form.html:56 #: templates/web/zurich/admin/report_edit-sdm.html:137 #: templates/web/zurich/admin/report_edit.html:268 @@ -2895,7 +2806,7 @@ msgstr "" msgid "Submit changes" msgstr "" -#: templates/web/base/questionnaire/index.html:97 +#: templates/web/base/questionnaire/index.html:106 msgid "Submit questionnaire" msgstr "" @@ -2911,9 +2822,8 @@ msgid "Submitted" msgstr "" #: templates/web/base/alert/updates.html:17 -#: templates/web/base/report/display.html:46 +#: templates/web/base/report/display_tools.html:41 #: templates/web/fixmystreet/alert/updates.html:23 -#: templates/web/fixmystreet/report/display.html:65 msgid "Subscribe" msgstr "" @@ -2921,7 +2831,7 @@ msgstr "" msgid "Subscribe me to an email alert" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1275 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1284 #: perllib/FixMyStreet/Cobrand/Zurich.pm:383 #: templates/web/base/admin/bodies.html:25 #: templates/web/base/admin/index.html:1 @@ -2940,7 +2850,7 @@ msgstr "" msgid "Summary reports" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1279 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1288 msgid "Survey" msgstr "" @@ -2976,7 +2886,7 @@ msgstr "" msgid "Thank you for reporting this issue!" msgstr "" -#: templates/web/base/tokens/error.html:7 +#: templates/web/base/tokens/error.html:6 msgid "Thank you for trying to confirm your update or problem. We seem to have an error ourselves though, so <a href=\"%s\">please let us know what went on</a> and we'll look into it." msgstr "" @@ -3011,23 +2921,23 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:47 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:63 -#: perllib/FixMyStreet/Cobrand/UK.pm:71 +#: perllib/FixMyStreet/Cobrand/UK.pm:72 msgid "That postcode was not recognised, sorry." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:726 +#: perllib/FixMyStreet/App/Controller/Admin.pm:724 msgid "That problem has been marked as sent." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:718 +#: perllib/FixMyStreet/App/Controller/Admin.pm:716 msgid "That problem will now be resent." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:125 +#: perllib/FixMyStreet/App/Controller/Report.pm:127 msgid "That report cannot be viewed on %s." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:119 +#: perllib/FixMyStreet/App/Controller/Report.pm:121 msgid "That report has been removed from FixMyStreet." msgstr "" @@ -3058,7 +2968,7 @@ msgid "" " If you leave this blank, <strong>send method defaults to email</strong>." msgstr "" -#: templates/web/base/open311/index.html:90 +#: templates/web/base/open311/index.html:82 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 "" @@ -3079,12 +2989,12 @@ msgstr "" msgid "The diligency prize league table shows editors' activity (who's been editing the most records)." msgstr "" -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:60 -#: perllib/FixMyStreet/App/Controller/Reports.pm:79 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:61 +#: perllib/FixMyStreet/App/Controller/Reports.pm:80 msgid "The error was: %s" msgstr "" -#: templates/web/base/open311/index.html:86 +#: templates/web/base/open311/index.html:78 msgid "The following Open311 v2 attributes are returned for each request: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code and service_name." msgstr "" @@ -3131,8 +3041,7 @@ msgstr "" msgid "The passwords do not match" msgstr "" -#: templates/web/base/errors/page_error_404_not_found.html:10 -#: templates/web/base/errors/page_error_404_not_found.html:12 +#: templates/web/base/errors/page_error_404_not_found.html:9 msgid "The requested URL '%s' was not found on this server" msgstr "" @@ -3142,12 +3051,11 @@ msgstr "" #: templates/web/base/report/new/councils_extra_text.html:1 #: templates/web/base/report/new/councils_text_some.html:10 -#: templates/web/base/report/new/fill_in_details_form.html:18 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:14 +#: templates/web/base/report/new/fill_in_details_form.html:13 msgid "The summary and description will also be made public (see our <a href=\"/privacy\">privacy policy</a>)." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:315 +#: perllib/FixMyStreet/Script/Reports.pm:92 msgid "The user could not locate the problem on a map, but to see the area around the location they entered" msgstr "" @@ -3164,18 +3072,18 @@ msgstr "" msgid "There are no reports to show." msgstr "" -#: perllib/FixMyStreet/App/Controller/Reports.pm:76 +#: perllib/FixMyStreet/App/Controller/Reports.pm:77 msgid "There was a problem showing the All Reports page. Please try again later." msgstr "" #: perllib/FixMyStreet/App/Controller/Contact.pm:137 -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:59 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:60 msgid "There was a problem showing this page. Please try again later." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:769 -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:134 -#: templates/web/base/auth/general.html:26 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:764 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:138 +#: templates/web/base/auth/general.html:43 #: templates/web/zurich/auth/general.html:28 msgid "There was a problem with your email/password combination. If you cannot remember your password, or do not have one, please fill in the ‘sign in by email’ section of the form." msgstr "" @@ -3184,7 +3092,7 @@ msgstr "" msgid "There was a problem with your email/password combination. Please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:272 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:336 msgid "There was a problem with your update. Please try again." msgstr "" @@ -3192,7 +3100,7 @@ msgstr "" msgid "There were problems with your report. Please see below." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:300 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:371 msgid "There were problems with your update. Please see below." msgstr "" @@ -3206,7 +3114,7 @@ msgid "" " " msgstr "" -#: templates/web/base/open311/index.html:77 +#: templates/web/base/open311/index.html:69 msgid "This API implementation is work in progress and not yet stabilized. It will change without warnings in the future." msgstr "" @@ -3228,18 +3136,18 @@ msgid "" " A body will not receive any reports unless it covers at least one area." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:413 +#: perllib/FixMyStreet/Script/Reports.pm:191 msgid "This email has been sent to both councils covering the location of the problem, as the user did not categorise it; please ignore it if you're not the correct council to deal with the issue, or let us know what category of problem this is so we can add it to our system." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:416 +#: perllib/FixMyStreet/Script/Reports.pm:194 msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:925 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:995 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:920 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:990 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:142 -#: perllib/FixMyStreet/Cobrand/UK.pm:43 +#: perllib/FixMyStreet/Cobrand/UK.pm:44 msgid "This information is required" msgstr "" @@ -3251,56 +3159,37 @@ msgstr "" msgid "This is a summary of all reports on this site." msgstr "" -#: templates/web/zurich/auth/token.html:8 -msgid "This may be because the link is too old or already used, or the address was not copied correctly." -msgstr "" - -#: templates/web/base/report/banner.html:15 -msgid "This problem has been closed" -msgstr "" - -#: templates/web/base/report/banner.html:12 -#: templates/web/base/report/update-form.html:48 -#: templates/web/fixmystreet/report/update-form.html:46 +#: templates/web/base/report/update/form_update.html:52 msgid "This problem has been fixed" msgstr "" -#: templates/web/base/report/update-form.html:43 -#: templates/web/fixmystreet/report/update-form.html:40 +#: templates/web/base/report/update/form_update.html:46 msgid "This problem has not been fixed" msgstr "" -#: templates/web/base/report/banner.html:19 -msgid "This problem is in progress" -msgstr "" - -#: templates/web/base/report/banner.html:9 -msgid "This problem is old and of unknown status." -msgstr "" - #: perllib/FixMyStreet/Cobrand/Zurich.pm:168 #: perllib/FixMyStreet/Cobrand/Zurich.pm:169 #: templates/web/zurich/report/_main.html:14 msgid "This report is awaiting moderation." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:86 +#: perllib/FixMyStreet/Script/Alerts.pm:94 msgid "This report is currently marked as closed." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:84 +#: perllib/FixMyStreet/Script/Alerts.pm:92 msgid "This report is currently marked as fixed." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:88 +#: perllib/FixMyStreet/Script/Alerts.pm:96 msgid "This report is currently marked as open." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:326 +#: perllib/FixMyStreet/Script/Reports.pm:105 msgid "This report was submitted anonymously" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:308 +#: perllib/FixMyStreet/Script/Reports.pm:85 msgid "This web page also contains a photo of the problem, provided by the user." msgstr "" @@ -3311,7 +3200,7 @@ msgstr "" msgid "Time spent (in minutes):" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1278 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1287 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "" @@ -3334,11 +3223,11 @@ msgstr "" msgid "To find out what local alerts we have for you, please enter your postcode or street name and area" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:314 +#: perllib/FixMyStreet/Script/Reports.pm:91 msgid "To view a map of the precise location of this issue" msgstr "" -#: templates/web/base/admin/index.html:61 +#: templates/web/base/admin/index.html:54 #: templates/web/base/admin/questionnaire.html:24 #: templates/web/base/admin/stats.html:24 #: templates/web/base/admin/stats.html:43 @@ -3356,10 +3245,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:12 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:33 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:31 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:37 msgid "Unable to fix" msgstr "" @@ -3372,7 +3259,7 @@ msgstr "" msgid "Unconfirmed" msgstr "" -#: templates/web/fixmystreet/report/banner.html:9 +#: templates/web/base/report/banner.html:9 msgid "Unknown" msgstr "" @@ -3380,17 +3267,18 @@ msgstr "" msgid "Unknown alert type" msgstr "" +#: perllib/FixMyStreet/App/Controller/Photo.pm:110 #: templates/web/base/js/translation_strings.html:39 msgid "Unknown error" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:103 -#: perllib/FixMyStreet/App/Controller/Report.pm:109 -#: perllib/FixMyStreet/App/Controller/Report.pm:112 +#: perllib/FixMyStreet/App/Controller/Report.pm:105 +#: perllib/FixMyStreet/App/Controller/Report.pm:111 +#: perllib/FixMyStreet/App/Controller/Report.pm:114 msgid "Unknown problem ID" msgstr "" -#: templates/web/fixmystreet/report/update-form.html:19 +#: templates/web/base/report/update/form_update.html:25 msgid "Update" msgstr "" @@ -3398,13 +3286,11 @@ msgstr "" msgid "Update %s created for problem %d; by %s" msgstr "" -#: templates/web/base/contact/index.html:21 -#: templates/web/fixmystreet/contact/index.html:36 +#: templates/web/base/contact/index.html:28 msgid "Update below added anonymously at %s" msgstr "" -#: templates/web/base/contact/index.html:23 -#: templates/web/fixmystreet/contact/index.html:38 +#: templates/web/base/contact/index.html:30 msgid "Update below added by %s at %s" msgstr "" @@ -3413,7 +3299,7 @@ msgstr "" msgid "Update body" msgstr "" -#: templates/web/base/admin/index.html:55 +#: templates/web/base/admin/index.html:48 msgid "Update breakdown by state" msgstr "" @@ -3438,20 +3324,16 @@ msgstr "" msgid "Update statuses" msgstr "" -#: templates/web/base/report/update-form.html:22 -msgid "Update:" -msgstr "" - #: templates/web/zurich/admin/index-dm.html:23 #: templates/web/zurich/admin/index-sdm.html:21 #: templates/web/zurich/admin/reports.html:13 msgid "Updated" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1045 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1103 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1147 -#: perllib/FixMyStreet/App/Controller/Admin.pm:822 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1048 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1108 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1156 +#: perllib/FixMyStreet/App/Controller/Admin.pm:821 #: perllib/FixMyStreet/Cobrand/Zurich.pm:771 #: perllib/FixMyStreet/Cobrand/Zurich.pm:796 #: perllib/FixMyStreet/Cobrand/Zurich.pm:866 @@ -3459,13 +3341,12 @@ msgid "Updated!" msgstr "" #: templates/web/base/admin/list_updates.html:2 -#: templates/web/base/report/update.html:3 -#: templates/web/fixmystreet/report/update.html:5 +#: templates/web/base/report/update.html:5 #: templates/web/zurich/report/updates.html:2 msgid "Updates" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:132 +#: perllib/FixMyStreet/DB/Result/Comment.pm:131 msgid "Updates are limited to %s characters in length. Please shorten your update" msgstr "" @@ -3475,9 +3356,7 @@ msgstr "" #. ("%s is the site name") #: templates/web/base/report/display.html:0 -#: templates/web/base/report/display.html:5 -#: templates/web/fixmystreet/report/display.html:0 -#: templates/web/fixmystreet/report/display.html:9 +#: templates/web/base/report/display.html:9 msgid "Updates to this problem, %s" msgstr "" @@ -3490,11 +3369,11 @@ msgstr "" msgid "Used map" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1452 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1461 msgid "User flag removed" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1424 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1433 msgid "User flagged" msgstr "" @@ -3502,7 +3381,7 @@ msgstr "" msgid "User search finds matches in users' names and email addresses." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1280 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1289 #: perllib/FixMyStreet/Cobrand/Zurich.pm:399 #: templates/web/base/admin/flagged.html:29 #: templates/web/zurich/header.html:69 @@ -3533,7 +3412,6 @@ msgid "Viewing a location" msgstr "" #: templates/web/base/report/display.html:0 -#: templates/web/fixmystreet/report/display.html:0 msgid "Viewing a problem" msgstr "" @@ -3546,25 +3424,23 @@ 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/zurich/auth/token.html:7 -msgid "We have not been able to confirm your account - sorry." -msgstr "" - -#: templates/web/zurich/auth/token.html:17 -msgid "We have sent you an email containing a link to confirm your account." +#: templates/web/base/auth/general.html:6 +#: templates/web/base/report/display.html:27 +#: templates/web/base/report/new/oauth_email_form.html:5 +msgid "We need your email address, please give it below." msgstr "" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:2 -#: templates/web/fixmystreet/report/update-form.html:77 +#: templates/web/base/report/new/form_user_loggedout_email.html:2 +#: templates/web/base/report/update/form_user_loggedout_email.html:2 msgid "We never show your email" msgstr "" -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:31 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:65 +#: templates/web/base/report/new/form_user_loggedin.html:31 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:28 msgid "We never show your email address or phone number." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:422 +#: perllib/FixMyStreet/Script/Reports.pm:200 msgid "We realise this problem might be the responsibility of %s; however, we don't currently have any contact details for them. If you know of an appropriate contact address, please do get in touch." msgstr "" @@ -3581,10 +3457,6 @@ msgstr "" msgid "We’re sorry to hear the problem’s not fixed. Why not try writing to your local representatives?" msgstr "" -#: templates/web/base/contact/blurb.html:8 -msgid "We'd love to hear what you think about this site. Just fill in the form, or send an email to <a href='mailto:%s'>%s</a>:" -msgstr "" - #: templates/web/base/contact/submit.html:7 msgid "We’ll get back to you as soon as we can." msgstr "" @@ -3593,7 +3465,7 @@ msgstr "" msgid "What was your experience of getting the problem fixed?" msgstr "" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:49 +#: templates/web/base/report/new/form_report.html:19 msgid "What’s the issue, and where is it?" msgstr "" @@ -3606,7 +3478,11 @@ msgstr "" msgid "When sent" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:640 +#: templates/web/base/js/translation_strings.html:50 +msgid "Whoa there Testino! Three photos are enough." +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Report/New.pm:635 msgid "Whole block of empty flats" msgstr "" @@ -3621,7 +3497,7 @@ msgstr "" msgid "Wish" msgstr "" -#: templates/web/base/open311/index.html:92 +#: templates/web/base/open311/index.html:84 msgid "With request searches, it is also possible to search for agency_responsible to limit the requests to those sent to a single administration. The search term is the administration ID provided by <a href=\"%s\">MaPit</a>." msgstr "" @@ -3629,7 +3505,7 @@ msgstr "" msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"http://fixmystreet.org\">available at fixmystreet.org</a>." msgstr "" -#: templates/web/base/questionnaire/index.html:87 +#: templates/web/base/questionnaire/index.html:96 msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?" msgstr "" @@ -3638,7 +3514,6 @@ msgid "Writing your message entirely in block capitals makes it hard to read, as msgstr "" #: templates/web/base/report/new/fill_in_details_form.html:4 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:5 msgid "Wrong location? Just click again on the map." msgstr "" @@ -3661,27 +3536,24 @@ msgstr "" #: templates/web/base/admin/users.html:31 #: templates/web/base/questionnaire/creator_fixed.html:14 #: templates/web/base/questionnaire/index.html:51 -#: templates/web/base/questionnaire/index.html:90 +#: templates/web/base/questionnaire/index.html:99 msgid "Yes" msgstr "" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:17 -#: templates/web/fixmystreet/report/update-form.html:91 +#: templates/web/base/report/new/form_user_loggedout_password.html:5 +#: templates/web/base/report/update/form_user_loggedout_password.html:4 msgid "Yes I have a password" msgstr "" -#: templates/web/base/contact/index.html:39 -#: templates/web/fixmystreet/contact/index.html:54 +#: templates/web/base/contact/index.html:46 msgid "You are complaining that this problem report was unnecessarily moderated:" msgstr "" -#: templates/web/base/contact/index.html:41 -#: templates/web/fixmystreet/contact/index.html:56 +#: templates/web/base/contact/index.html:48 msgid "You are reporting the following problem report for being abusive, containing personal information, or similar:" msgstr "" -#: templates/web/base/contact/index.html:15 -#: templates/web/fixmystreet/contact/index.html:30 +#: templates/web/base/contact/index.html:22 msgid "You are reporting the following update for being abusive, containing personal information, or similar:" msgstr "" @@ -3694,7 +3566,7 @@ msgstr "" msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create." msgstr "" -#: templates/web/fixmystreet/contact/index.html:121 +#: templates/web/base/contact/index.html:113 msgid "You can contact technical support on <a href='mailto:%s'>%s</a>" msgstr "" @@ -3705,8 +3577,8 @@ msgid "" " reports in the past." msgstr "" -#: templates/web/base/report/new/councils_text_none.html:10 -#: templates/web/base/report/new/councils_text_none.html:2 +#: templates/web/base/report/new/councils_text_none.html:12 +#: templates/web/base/report/new/councils_text_none.html:14 #: templates/web/base/report/new/councils_text_some.html:19 #: templates/web/base/report/new/councils_text_some.html:21 msgid "You can help us by finding a contact email address for local problems for %s and emailing it to us at <a href='mailto:%s'>%s</a>." @@ -3724,19 +3596,14 @@ msgstr "" msgid "You have already answered this questionnaire. If you have a question, please <a href='%s'>get in touch</a>, or <a href='%s'>view your problem</a>.\n" msgstr "" -#: templates/web/base/questionnaire/index.html:77 -#: templates/web/base/report/new/fill_in_details_form.html:75 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:73 -msgid "You have already attached a photo to this report, attaching another one will replace it." -msgstr "" - -#: templates/web/base/report/update-form.html:59 -#: templates/web/fixmystreet/report/update-form.html:56 -msgid "You have already attached a photo to this update, attaching another one will replace it." +#: templates/web/base/report/new/form_report.html:32 +#: templates/web/zurich/report/new/fill_in_details_form.html:55 +msgid "You have already attached photos to this report. Note that you can attach a maximum of 3 to this report (if you try to upload more, the oldest will be removed)." msgstr "" -#: templates/web/zurich/report/new/fill_in_details_form.html:61 -msgid "You have already attached photos to this report. Note that you can attach a maximum of 3 to this report (if you try to upload more, the oldest will be removed)." +#: templates/web/base/questionnaire/index.html:83 +#: templates/web/base/report/update/form_update.html:14 +msgid "You have already attached photos to this update. Note that you can attach a maximum of 3 to this update (if you try to upload more, the oldest will be removed)." msgstr "" #: templates/web/base/auth/sign_out.html:4 @@ -3753,9 +3620,8 @@ msgstr "" msgid "You have successfully confirmed your email address." msgstr "" -#: templates/web/base/report/display.html:20 -#: templates/web/base/report/new/fill_in_details.html:37 -#: templates/web/fixmystreet/report/display.html:17 +#: templates/web/base/report/display.html:17 +#: templates/web/base/report/new/login_success_form.html:3 msgid "You have successfully signed in; please check and confirm your details are accurate:" msgstr "" @@ -3784,53 +3650,42 @@ msgid "Your Reports" msgstr "" #: templates/web/base/alert/_list.html:89 +#: templates/web/base/contact/index.html:83 +#: templates/web/base/report/display_tools.html:38 +#: templates/web/base/report/display_tools.html:40 +#: templates/web/base/report/new/form_user_loggedin.html:3 +#: templates/web/base/report/new/form_user_loggedout_email.html:1 +#: templates/web/base/report/update/form_user_loggedout_email.html:1 #: templates/web/fixmystreet/alert/updates.html:19 #: templates/web/fixmystreet/alert/updates.html:22 -#: templates/web/fixmystreet/contact/index.html:91 -#: templates/web/fixmystreet/report/display.html:62 -#: templates/web/fixmystreet/report/display.html:64 -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:3 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:1 -#: templates/web/fixmystreet/report/update-form.html:76 #: templates/web/zurich/report/new/fill_in_details_form.html:76 msgid "Your email" msgstr "" -#: templates/web/base/auth/general.html:28 -#: templates/web/fixmystreet/report/update-form.html:82 +#: templates/web/base/auth/general.html:45 +#: templates/web/base/report/update/form_user_loggedout_email.html:7 #: templates/web/zurich/auth/general.html:30 #: templates/web/zurich/auth/general.html:58 msgid "Your email address" msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:106 -#: templates/web/base/report/update-form.html:81 -msgid "Your email:" -msgstr "" - -#: templates/web/fixmystreet/report/updates-sidebar-notes.html:7 +#: templates/web/base/report/updates-sidebar-notes.html:3 msgid "Your information will only be used in accordance with our <a href=\"/privacy\">privacy policy</a>" msgstr "" -#: templates/web/base/auth/general.html:51 -#: templates/web/fixmystreet/contact/index.html:84 -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:18 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:54 -#: templates/web/fixmystreet/report/update-form.html:142 +#: templates/web/base/auth/general.html:90 +#: templates/web/base/contact/index.html:76 +#: templates/web/base/report/new/form_user_loggedin.html:18 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:17 +#: templates/web/base/report/update/form_name.html:11 #: templates/web/zurich/auth/general.html:61 #: templates/web/zurich/report/new/fill_in_details_form.html:86 msgid "Your name" msgstr "" -#: templates/web/base/contact/index.html:73 -#: templates/web/base/report/new/fill_in_details_form.html:186 -#: templates/web/base/report/update-form.html:152 -msgid "Your name:" -msgstr "" - -#: templates/web/base/auth/general.html:39 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:22 -#: templates/web/fixmystreet/report/update-form.html:96 +#: templates/web/base/auth/general.html:75 +#: templates/web/base/report/new/form_user_loggedout_password.html:10 +#: templates/web/base/report/update/form_user_loggedout_password.html:9 #: templates/web/zurich/auth/general.html:34 msgid "Your password" msgstr "" @@ -3839,15 +3694,16 @@ msgstr "" msgid "Your password has been changed" msgstr "" -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:27 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:63 +#: templates/web/base/report/new/form_user_loggedin.html:27 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:26 #: templates/web/zurich/report/new/fill_in_details_form.html:92 msgid "Your phone number" msgstr "" #: templates/web/base/questionnaire/index.html:14 +#, fuzzy msgid "Your report" -msgstr "" +msgstr "צור דו\"×—" #: templates/web/base/footer.html:9 templates/web/fixmystreet/footer.html:29 msgid "Your reports" @@ -3857,14 +3713,9 @@ msgstr "" msgid "Your updates" msgstr "" -#: templates/web/base/contact/index.html:81 -msgid "Your email:" -msgstr "" - #: templates/web/base/reports/_list-filters.html:3 -#, fuzzy msgid "all reports" -msgstr "צור דו\"×—" +msgstr "" #: templates/web/base/admin/timeline.html:4 msgid "by %s" @@ -3897,13 +3748,13 @@ msgstr "" msgid "fixed reports" msgstr "" -#: templates/web/base/admin/index.html:33 +#: templates/web/base/status/stats.html:20 #: templates/web/zurich/admin/index.html:5 msgid "from %s different users" msgstr "" -#: templates/web/base/report/_item.html:17 -#: templates/web/zurich/report/_item.html:16 +#: templates/web/base/report/_item.html:15 +#: templates/web/zurich/report/_item.html:14 msgid "last updated %s" msgstr "" @@ -3995,10 +3846,8 @@ msgstr "" msgid "sign out" msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:12 -#: templates/web/base/report/new/fill_in_details_form.html:15 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:10 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:12 +#: templates/web/base/report/new/fill_in_details_form.html:11 +#: templates/web/base/report/new/fill_in_details_form.html:9 msgid "the local council" msgstr "" @@ -4007,7 +3856,7 @@ msgstr "" msgid "there is no pin shown as the user did not use the map" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:398 +#: perllib/FixMyStreet/Script/Reports.pm:176 msgid "this type of local problem" msgstr "" @@ -4036,7 +3885,7 @@ msgstr "" msgid "ward" msgstr "" -#: templates/web/base/front/stats.html:17 +#: templates/web/base/front/stats.html:13 #, perl-format msgid "<big>%s</big> report recently" msgid_plural "<big>%s</big> reports recently" @@ -4064,7 +3913,7 @@ msgid_plural "%d minutes" msgstr[0] "" msgstr[1] "" -#: templates/web/base/front/stats.html:29 +#: templates/web/base/front/stats.html:25 #, perl-format msgid "<big>%s</big> update on reports" msgid_plural "<big>%s</big> updates on reports" @@ -4085,14 +3934,14 @@ msgid_plural "%d weeks" msgstr[0] "" msgstr[1] "" -#: templates/web/base/front/stats.html:12 +#: templates/web/base/front/stats.html:8 #, perl-format msgid "<big>%s</big> report in past week" msgid_plural "<big>%s</big> reports in past week" msgstr[0] "" msgstr[1] "" -#: templates/web/base/front/stats.html:23 +#: templates/web/base/front/stats.html:19 #, perl-format msgid "<big>%s</big> fixed in past month" msgid_plural "<big>%s</big> fixed in past month" diff --git a/locale/hr.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/hr.UTF-8/LC_MESSAGES/FixMyStreet.po index 14f43cfc5..71da5eca7 100644 --- a/locale/hr.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/hr.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: fixmystreet\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2015-10-23 16:51+0100\n" -"PO-Revision-Date: 2015-07-31 16:31+0000\n" +"POT-Creation-Date: 2016-03-02 13:09+0000\n" +"PO-Revision-Date: 2015-10-23 16:35+0000\n" "Last-Translator: mySociety <transifex@mysociety.org>\n" "Language-Team: Croatian (http://www.transifex.com/mysociety/fixmystreet/language/hr/)\n" "Language: hr\n" @@ -20,45 +20,24 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:628 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:411 +#: perllib/FixMyStreet/DB/Result/Problem.pm:616 +#: perllib/FixMyStreet/Script/Reports.pm:189 msgid " and " msgstr "i" #: templates/web/base/report/new/councils_text_all.html:2 -#: templates/web/base/report/new/councils_text_none.html:11 -#: templates/web/base/report/new/councils_text_none.html:2 +#: templates/web/base/report/new/councils_text_none.html:12 +#: templates/web/base/report/new/councils_text_none.html:15 #: templates/web/base/report/new/councils_text_some.html:19 #: templates/web/base/report/new/councils_text_some.html:22 #: templates/web/base/report/new/councils_text_some.html:5 msgid " or " msgstr "ili" -#: templates/web/base/admin/index.html:35 -#: templates/web/base/status/index.html:13 -msgid "%s confirmed alerts, %s unconfirmed" -msgstr "%d potvrÄ‘ena upozorenja, %d nepotvrÄ‘ena" - -#: templates/web/base/admin/index.html:37 -#: templates/web/base/status/index.html:16 -#: templates/web/zurich/admin/index.html:6 -msgid "%s council contacts – %s confirmed, %s unconfirmed" -msgstr "%d kontakti vijeća – %d potvrÄ‘eni, %d nepotvrÄ‘eni" - #: templates/web/base/admin/edit-league.html:12 msgid "%d edits by %s" msgstr "%d izmjene od strane %s" -#: templates/web/base/admin/index.html:34 -#: templates/web/base/status/index.html:12 -msgid "%s live updates" -msgstr "%d ažuriranje uživo" - -#: templates/web/base/admin/index.html:36 -#: templates/web/base/status/index.html:14 -msgid "%s questionnaires sent – %s answered (%s%%)" -msgstr "%d Upitnici poslani – %d odgovoreno (%s%%)" - #: templates/web/base/pagination.html:10 msgid "%d to %d of %d" msgstr "" @@ -73,37 +52,49 @@ msgstr "%s - Sažetak izvješća" msgid "%s admin:" msgstr "" +#: templates/web/base/status/stats.html:26 +msgid "%s bodies" +msgstr "" + +#: templates/web/base/status/stats.html:24 +msgid "%s confirmed alerts, %s unconfirmed" +msgstr "%s potvrÄ‘ena upozorenja, %s nepotvrÄ‘ena" + +#: templates/web/base/status/stats.html:27 +#: templates/web/zurich/admin/index.html:6 +msgid "%s council contacts – %s confirmed, %s unconfirmed" +msgstr "%s kontakti vijeća – %s potvrÄ‘eni, %s nepotvrÄ‘eni" + #. ("%s is the site name") #: templates/web/base/alert/index.html:7 -#, fuzzy msgid "" "%s has a variety of RSS feeds and email alerts for local\n" "problems, including alerts for all problems within a particular ward, or all\n" "problems within a certain distance of a particular location." msgstr "" -"Popravi.to ima niz RSS i e-mail upozorenja za lokalne probleme, ukljuÄujući\n" -"upozorenja za sve probleme u odreÄ‘enom odjelu ili vijeću ili za sve probleme\n" -"na odreÄ‘enoj udaljenosti od pojedine lokaciji." #. ("%s is the site name") #: templates/web/base/alert/index.html:11 -#, fuzzy msgid "" "%s has a variety of RSS feeds and email alerts for local problems, including\n" "alerts for all problems within a particular ward or council, or all problems\n" "within a certain distance of a particular location." msgstr "" -"Popravi.to ima niz RSS i e-mail upozorenja za lokalne probleme, ukljuÄujući\n" -"upozorenja za sve probleme u odreÄ‘enom odjelu ili vijeću ili za sve probleme\n" -"na odreÄ‘enoj udaljenosti od pojedine lokaciji." -#: perllib/FixMyStreet/DB/Result/Problem.pm:695 +#: templates/web/base/status/stats.html:23 +msgid "%s live updates" +msgstr "%s ažuriranje uživo" + +#: templates/web/base/status/stats.html:25 +msgid "%s questionnaires sent – %s answered (%s%%)" +msgstr "%s Upitnici poslani – %s odgovoreno (%s%%)" + +#: perllib/FixMyStreet/DB/Result/Problem.pm:683 msgid "%s ref: %s" msgstr "%s ref: %s" #. ("%s is the site name") #: templates/web/base/alert/_list.html:73 -#, fuzzy msgid "" "%s sends different categories of problem\n" "to the appropriate council, so problems within the boundary of a particular council\n" @@ -112,21 +103,16 @@ msgid "" "council’s alerts, but will only appear in the \"Within the boundary\" alert\n" "for the county council." msgstr "" -"Popravi.to Å¡alje razliÄite kategorije problema\n" -"odreÄ‘enom odgovornom tijelu, tako da problemi u granicama odreÄ‘enog odgovornog tijela\n" -"možda ne odgovaraju problemima koji su poslani odgovornog tijelu.Na primjer, prijave grafita\n" -"bit će poslane općinskom vijeću i tako će se pojaviti u upozorenjima za oba vijeća’ ali će se samo pojaviti u upozorenju \"Unutar granica\" \n" -"županijskog vijeća." -#: perllib/FixMyStreet/Cobrand/UK.pm:255 perllib/FixMyStreet/Cobrand/UK.pm:267 +#: perllib/FixMyStreet/Cobrand/UK.pm:256 perllib/FixMyStreet/Cobrand/UK.pm:268 msgid "%s ward, %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:564 +#: perllib/FixMyStreet/DB/Result/Problem.pm:552 msgid "%s, reported at %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:282 perllib/FixMyStreet/Cobrand/UK.pm:294 +#: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295 msgid "%s, within %s ward" msgstr "" @@ -134,7 +120,7 @@ msgstr "" msgid "© <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors" msgstr "" -#: templates/web/zurich/report/new/fill_in_details_form.html:53 +#: templates/web/zurich/report/new/fill_in_details_form.html:46 msgid "(Defect & location of defect)" msgstr "" @@ -145,15 +131,13 @@ msgstr "(Email na crnoj listi)" #: templates/web/zurich/admin/report_edit-sdm.html:60 #: templates/web/zurich/admin/report_edit.html:88 -#, fuzzy msgid "(No name)" -msgstr "Ime" +msgstr "" #: templates/web/zurich/admin/report_edit-sdm.html:67 #: templates/web/zurich/admin/report_edit.html:95 -#, fuzzy msgid "(No phone number)" -msgstr "VaÅ¡ broj telefona" +msgstr "" #: templates/web/base/alert/_list.html:24 msgid "(a default distance which covers roughly 200,000 people)" @@ -161,17 +145,16 @@ msgstr "(zadana udaljenost koja obuhvaća približno 200,000 stanovnika)" #. ("%s is a list of distance links, e.g. [2km] / [5km] / [10km] / [20km]") #: templates/web/base/alert/_list.html:29 -#, fuzzy msgid "(alternatively the RSS feed can be customised, within %s)" -msgstr "(u suprotnom RSS feed može biti podeÅ¡en, unutar" +msgstr "" -#: templates/web/base/report/_item.html:27 -#: templates/web/zurich/report/_item.html:21 +#: templates/web/base/report/_item.html:25 +#: templates/web/zurich/report/_item.html:19 msgid "(closed)" msgstr "(zatvoreno)" -#: templates/web/base/report/_item.html:25 -#: templates/web/zurich/report/_item.html:19 +#: templates/web/base/report/_item.html:23 +#: templates/web/zurich/report/_item.html:17 msgid "(fixed)" msgstr "(popravljeno)" @@ -179,37 +162,28 @@ msgstr "(popravljeno)" msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)" msgstr "(grafiti, ilegalno odlaganje otpada, oÅ¡tećeni kolnici, klupe, lampe...)" -#: templates/web/base/report/_item.html:21 +#: templates/web/base/report/_item.html:19 msgid "(not sent to council)" msgstr "(nije poslano odgovornom tijelu)" -#: templates/web/base/report/new/fill_in_details_form.html:200 #: templates/web/zurich/report/new/fill_in_details_form.html:82 msgid "(optional)" msgstr "(nije obavezno)" -#: templates/web/fixmystreet/report/public_label.html:1 +#: templates/web/base/report/public_label.html:1 msgid "(public)" msgstr "" -#: templates/web/base/report/_item.html:20 +#: templates/web/base/report/_item.html:18 msgid "(sent to both)" msgstr "(poslano na obje adrese)" -#: templates/web/base/report/new/fill_in_details_form.html:194 -msgid "(we never show your email address or phone number)" -msgstr "(vaÅ¡u email adresu i broj telefona držimo u tajnosti)" - -#: templates/web/base/report/update-form.html:159 -msgid "(we never show your email)" -msgstr "(vaÅ¡ email držimo u tajnosti)" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:673 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 #: perllib/FixMyStreet/DB/Result/Problem.pm:410 msgid "-- Pick a category --" msgstr "-- Izaberi kategoriju --" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:637 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:632 #: perllib/FixMyStreet/DB/Result/Problem.pm:416 msgid "-- Pick a property type --" msgstr "-- Izaberite vrstu posjeda --" @@ -228,52 +202,39 @@ msgstr "" msgid "<label>Show %s</label> <label>about %s</label>" msgstr "" -#: templates/web/base/admin/index.html:32 -#: templates/web/base/status/index.html:11 +#: templates/web/base/status/stats.html:18 #: templates/web/zurich/admin/index.html:4 msgid "<strong>%s</strong> live problems" -msgstr "<strong>%d</strong> postojeći problemi" +msgstr "<strong>%s</strong> postojeći problemi" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:39 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:2 msgid "<strong>No</strong> Let me confirm my report by email" msgstr "<strong>No</strong> Potvrdi moju prijavu e-mailom" -#: templates/web/fixmystreet/report/update-form.html:112 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:2 msgid "<strong>No</strong> Let me confirm my update by email" msgstr "<strong>No</strong> Potvrdi moje ažuriranje e-mailom" -#: templates/web/base/auth/general.html:48 +#: templates/web/base/auth/general.html:87 #: templates/web/zurich/auth/general.html:51 msgid "<strong>No</strong> let me sign in by email" msgstr "<strong>No</strong> prijavi se e-mailom" -#: templates/web/base/report/new/fill_in_details_form.html:145 -msgid "<strong>No</strong>, let me confirm my report by email:" -msgstr "<strong>No</strong>, potvrdi moju prijavu e-mailom:" - -#: templates/web/base/report/update-form.html:118 -msgid "<strong>No</strong>, let me confirm my update by email:" -msgstr "<strong>No</strong>, potvrdi moje ažuriranje e-mailom:" - -#: templates/web/base/auth/general.html:34 -#: templates/web/base/report/new/fill_in_details_form.html:123 -#: templates/web/base/report/update-form.html:96 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:15 -#: templates/web/fixmystreet/report/update-form.html:89 +#: templates/web/base/auth/general.html:70 +#: templates/web/base/report/new/form_user_loggedout_password.html:3 +#: templates/web/base/report/update/form_user_loggedout_password.html:2 msgid "<strong>Yes</strong> I have a password" msgstr "<strong>Da</strong> Imam password" -#: templates/web/base/static/about-en-gb.html:1 -#: templates/web/base/static/about-en-gb.html:3 +#: templates/web/base/about/about-en-gb.html:1 +#: templates/web/base/about/about-en-gb.html:3 msgid "About us" msgstr "O nama" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:8 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:31 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:29 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:35 msgid "Action Scheduled" msgstr "" @@ -304,7 +265,7 @@ msgstr "Dodaj novu kategoriju" msgid "Add user" msgstr "" -#: templates/web/base/my/my.html:52 +#: templates/web/base/my/my.html:56 msgid "Added %s" msgstr "Dodano %s" @@ -324,8 +285,7 @@ msgstr "Upozorenje %d kreirano za %s, tip %s, parametri%s / %s" msgid "Alert %d disabled (created %s)" msgstr "Upozorenje %d onemogućeno (kreirano%s)" -#: templates/web/base/report/update-form.html:164 -#: templates/web/fixmystreet/report/update-form.html:150 +#: templates/web/base/report/update/form_name.html:20 msgid "Alert me to future updates" msgstr "Javi mi buduće promjene" @@ -335,9 +295,8 @@ msgid "All Reports" msgstr "Sve Prijave" #: templates/web/zurich/admin/stats.html:5 -#, fuzzy msgid "All Reports as CSV" -msgstr "Sve Prijave" +msgstr "" #: templates/web/base/footer.html:11 templates/web/fixmystreet/footer.html:32 #: templates/web/zurich/admin/index-dm.html:12 @@ -358,10 +317,8 @@ msgstr "Sve uneÅ¡ene informacije bit će poslane na" #: templates/web/base/report/new/councils_text_all.html:2 #: templates/web/base/report/new/councils_text_all.html:4 -#: templates/web/base/report/new/fill_in_details_form.html:12 -#: templates/web/base/report/new/fill_in_details_form.html:14 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:10 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:11 +#: templates/web/base/report/new/fill_in_details_form.html:10 +#: templates/web/base/report/new/fill_in_details_form.html:9 msgid "All the information you provide here will be sent to <strong>%s</strong>." msgstr "Sve informacije koje nam dostavite bit će proslijeÄ‘ene <strong>%s</strong>." @@ -383,6 +340,10 @@ msgstr "Anonimno:" msgid "Are you a developer?" msgstr "Jeste li programer?" +#: templates/web/base/js/translation_strings.html:52 +msgid "Are you sure you want to cancel this upload?" +msgstr "" + #: templates/web/base/admin/body-form.html:69 #: templates/web/base/admin/body.html:16 #: templates/web/zurich/admin/body-form.html:24 @@ -415,16 +376,16 @@ msgstr "" msgid "Assigned to %s" msgstr "" -#: templates/web/base/open311/index.html:84 +#: templates/web/base/open311/index.html:76 msgid "At most %d requests are returned in each query. The returned requests are ordered by requested_datetime, so to get all requests, do several searches with rolling start_date and end_date." msgstr "Većinom %d su zahtjevi vraćeni na query. Vraćeni zahtjevi poredani su prema traženom_datumu, pa da biste dobili sve zahtjeve, pretražite nekoliko puta sa pomiÄnim datumom_poÄetka i zavrÅ¡etka_." -#: templates/web/base/open311/index.html:76 +#: templates/web/base/open311/index.html:68 msgid "At the moment only searching for and looking at reports work." msgstr "TrenutaÄno radi samo pretraživanje i pregledavanje prijava." #: perllib/FixMyStreet/DB/Result/Problem.pm:373 -#: templates/web/zurich/report/_item.html:11 +#: templates/web/zurich/report/_item.html:9 msgid "Awaiting moderation" msgstr "" @@ -436,7 +397,7 @@ msgstr "" msgid "Ban email address" msgstr "Onemogući e-mail adrese" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1276 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1285 #: perllib/FixMyStreet/Cobrand/Zurich.pm:392 #: templates/web/base/admin/bodies.html:1 templates/web/zurich/header.html:64 msgid "Bodies" @@ -466,7 +427,7 @@ msgid "Can't see the map? <em>Skip this step</em>" msgstr "Ne možete vidjeti mapu? <em>PreskoÄi ovaj korak</em>" #: templates/web/base/admin/body.html:68 -#: templates/web/base/admin/index.html:61 +#: templates/web/base/admin/index.html:54 #: templates/web/base/report/new/category.html:10 #: templates/web/base/report/new/category_wrapper.html:3 #: templates/web/zurich/admin/body.html:14 @@ -477,8 +438,8 @@ msgstr "Ne možete vidjeti mapu? <em>PreskoÄi ovaj korak</em>" msgid "Category" msgstr "Kategorija" -#: templates/web/base/admin/index.html:59 -#: templates/web/base/admin/index.html:67 +#: templates/web/base/admin/index.html:52 +#: templates/web/base/admin/index.html:60 msgid "Category fix rate for problems > 4 weeks old" msgstr " Postotak popravaka za kategoriju > staro 4 tjedna" @@ -491,7 +452,7 @@ msgstr " Postotak popravaka za kategoriju > staro 4 tjedna" msgid "Category:" msgstr "Kategorija:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:402 +#: perllib/FixMyStreet/Script/Reports.pm:180 msgid "Category: %s" msgstr "Kategorija: %s" @@ -541,7 +502,7 @@ msgid "Click here or enter as dd/mm/yyyy" msgstr "" #: templates/web/base/around/_report_banner.html:2 -#: templates/web/base/js/translation_strings.html:50 +#: templates/web/base/js/translation_strings.html:55 msgid "Click map to report a problem" msgstr "Kliknite mapu da prijavite problem" @@ -568,7 +529,7 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:25 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:144 -#: templates/web/fixmystreet/report/banner.html:15 +#: templates/web/base/report/banner.html:15 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:10 #: templates/web/zurich/admin/header.html:16 @@ -576,7 +537,7 @@ msgstr "" msgid "Closed" msgstr "Zatvoreno" -#: perllib/FixMyStreet/DB/Result/Problem.pm:794 +#: perllib/FixMyStreet/DB/Result/Problem.pm:779 msgid "Closed by council" msgstr "Zatvorilo je odgovorno tijelo" @@ -602,7 +563,7 @@ msgstr "Cobrand podaci:" msgid "Cobrand:" msgstr "Cobrand:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1283 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1292 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "" @@ -615,13 +576,14 @@ msgstr "Konfiguriraj Endpoint" msgid "Confirm" msgstr "Potvrdi" -#: templates/web/base/auth/token.html:1 templates/web/zurich/auth/token.html:1 +#: templates/web/base/auth/token.html:1 msgid "Confirm account" msgstr "Potvrdi raÄun" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:33 -#: templates/web/fixmystreet/report/update-form.html:107 -msgid "Confirm by email below, providing a new password at that point. When you confirm, your password will be updated." +#: templates/web/base/report/new/form_user_loggedout_password.html:21 +#: templates/web/base/report/update/form_user_loggedout_password.html:20 +#, fuzzy +msgid "Confirm by email instead, providing a new password at that point. When you confirm, your password will be updated." msgstr "Potvrdi pomoću dolje navedene e-mail adrese, a potom upiÅ¡i novu lozinku. Nakon potvrde tvoja će lozinka biti ažurirana. " #: templates/web/base/questionnaire/creator_fixed.html:1 @@ -651,35 +613,27 @@ msgid "Confirmed:" msgstr "PotvrÄ‘eno:" #. ("%s is the site name") -#: templates/web/base/faq/faq-en-gb.html:8 templates/web/base/footer.html:24 -#: templates/web/base/open311/index.html:8 -#: templates/web/base/static/privacy.html:10 -#: templates/web/fixmystreet/contact/index.html:12 -#, fuzzy +#: templates/web/base/about/_sidebar.html:6 templates/web/base/footer.html:24 msgid "Contact %s" -msgstr "Kontaktiraj nas" +msgstr "" #: templates/web/base/contact/index.html:1 #: templates/web/base/contact/index.html:2 #: templates/web/base/contact/submit.html:1 -#: templates/web/fixmystreet/contact/index.html:1 -#: templates/web/fixmystreet/contact/index.html:2 msgid "Contact Us" msgstr "Kontaktiraj nas" -#: templates/web/base/contact/index.html:6 -#: templates/web/fixmystreet/contact/index.html:20 +#: templates/web/base/contact/index.html:12 msgid "Contact the team" msgstr "Kontaktiraj tim" #: templates/web/zurich/admin/report_edit-sdm.html:40 #: templates/web/zurich/admin/report_edit.html:59 -#, fuzzy msgid "Coordinates:" -msgstr "Koordinate:" +msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1420 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1448 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1429 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1457 msgid "Could not find user" msgstr "Nepoznati korisnik" @@ -697,7 +651,7 @@ msgstr "Vijeće" msgid "Council contacts for %s" msgstr "Kontakti vijeća za %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:693 +#: perllib/FixMyStreet/DB/Result/Problem.pm:681 msgid "Council ref: %s" msgstr "odgovorno tijelo ref: %s" @@ -712,7 +666,7 @@ msgstr "Vijeće:" msgid "Count" msgstr "BrojaÄ" -#: templates/web/base/email_sent.html:1 templates/web/zurich/email_sent.html:1 +#: templates/web/base/email_sent.html:1 msgid "Create a report" msgstr "Kreiraj izvješće" @@ -722,9 +676,8 @@ msgid "Create category" msgstr "Kreiraj kategoriju" #: templates/web/zurich/admin/template_edit.html:29 -#, fuzzy msgid "Create template" -msgstr "Kreiraj izvješće" +msgstr "" #: templates/web/base/admin/problem_row.html:34 #: templates/web/zurich/admin/templates.html:10 @@ -761,7 +714,7 @@ msgstr "Nadzorna ploÄa" msgid "Dealt with by subdivision within 5 working days" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:878 +#: perllib/FixMyStreet/App/Controller/Admin.pm:877 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "" @@ -774,7 +727,7 @@ msgstr "" msgid "Deleted" msgstr "Izbrisano" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:51 +#: templates/web/base/report/new/form_report.html:45 #: templates/web/zurich/admin/index-dm.html:22 #: templates/web/zurich/admin/index-sdm.html:20 #: templates/web/zurich/admin/reports.html:12 @@ -782,12 +735,11 @@ msgid "Description" msgstr "" #: templates/web/base/js/translation_strings.html:34 -#: templates/web/zurich/report/new/fill_in_details_form.html:42 +#: templates/web/zurich/report/new/fill_in_details_form.html:68 msgid "Details" msgstr "Detalji" #: templates/web/base/admin/report_edit.html:20 -#: templates/web/base/report/new/fill_in_details_form.html:62 #: templates/web/zurich/admin/report_edit-sdm.html:27 #: templates/web/zurich/admin/report_edit.html:29 #: templates/web/zurich/admin/report_edit.html:43 @@ -800,38 +752,38 @@ msgstr "PreneÅ¡eno" #: templates/web/zurich/admin/report_edit-sdm.html:50 #: templates/web/zurich/admin/report_edit.html:69 -#, fuzzy msgid "Didn't use map" -msgstr "nije koriÅ¡tena karta" +msgstr "" #: templates/web/base/admin/edit-league.html:8 msgid "Diligency prize league table" msgstr "" #. ("%s is the site name") -#: templates/web/base/auth/general.html:31 -#: templates/web/base/report/new/fill_in_details_form.html:114 -#: templates/web/base/report/update-form.html:87 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:11 -#: templates/web/fixmystreet/report/update-form.html:86 -#, fuzzy +#: templates/web/base/auth/general.html:48 +#: templates/web/base/report/new/form_user_loggedout.html:18 +#: templates/web/base/report/new/oauth_email_form.html:18 +#: templates/web/base/report/update-form.html:29 +#: templates/web/base/report/update/form_user_loggedout.html:17 msgid "Do you have a %s password?" -msgstr "ImaÅ¡ li popravi.to lozinku?" +msgstr "" #: templates/web/base/questionnaire/index.html:55 msgid "Don’t know" msgstr "Ne’znam" -#: templates/web/fixmystreet/contact/index.html:118 +#: templates/web/base/contact/index.html:110 msgid "Don't like forms?" msgstr "" +#: templates/web/base/js/translation_strings.html:51 +msgid "Drag and drop photos here or <u>click to upload</u>" +msgstr "" + #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:14 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:32 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:30 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:36 msgid "Duplicate" msgstr "" @@ -881,7 +833,7 @@ msgstr "Urednik" #: templates/web/base/admin/category_edit.html:91 #: templates/web/base/admin/flagged.html:38 #: templates/web/base/admin/users.html:16 -#: templates/web/base/auth/general.html:22 +#: templates/web/base/auth/general.html:39 #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:24 @@ -889,7 +841,7 @@ msgstr "Urednik" msgid "Email" msgstr "E-mail" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1396 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1405 msgid "Email added to abuse list" msgstr "E-mail dodan na listu zloupotrebe" @@ -905,7 +857,7 @@ msgstr "" msgid "Email alert deleted" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1393 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1402 msgid "Email already in abuse list" msgstr "E-mail je već na listi zloupotrebe" @@ -913,41 +865,36 @@ msgstr "E-mail je već na listi zloupotrebe" msgid "Email me new local problems" msgstr "PoÅ¡alji nam e-mail o novom lokalnom problemu" -#: templates/web/base/report/display.html:38 -msgid "Email me updates" -msgstr "PoÅ¡alji mi e-mail o ažuriranjima" - #: templates/web/base/admin/category_edit.html:31 #: templates/web/base/admin/report_edit.html:62 #: templates/web/base/admin/update_edit.html:33 #: templates/web/base/admin/user-form.html:20 #: templates/web/base/alert/updates.html:13 -#: templates/web/base/report/display.html:42 #: templates/web/zurich/admin/body.html:47 msgid "Email:" msgstr "E-mail:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:329 +#: perllib/FixMyStreet/Script/Reports.pm:108 msgid "Email: %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:639 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:634 msgid "Empty flat or maisonette" msgstr "Prazan stan ili kućica" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:638 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:633 msgid "Empty house or bungalow" msgstr "Prazna kuća ili bungalov" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:641 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:636 msgid "Empty office or other commercial" msgstr "Prazan ured ili poslovni prostor" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:642 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:637 msgid "Empty pub or bar" msgstr "Prazan kafić ili bar" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:643 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:638 msgid "Empty public building - school, hospital, etc." msgstr "Prazne javne zgrade - Å¡kola, bolnica, itd." @@ -980,7 +927,7 @@ msgstr "" msgid "Enter a Zürich street name" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:13 +#: perllib/FixMyStreet/Cobrand/UK.pm:14 msgid "Enter a nearby UK postcode, or street name and area" msgstr "Unesi obližnji poÅ¡tanski broj ili ime ulice i kvarta" @@ -998,14 +945,9 @@ msgstr "Unesi ime obližnje ulice i kvarta" msgid "Enter a nearby street name and area, postal code or district in Delhi" msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:152 -#: templates/web/base/report/update-form.html:125 -msgid "Enter a new password:" -msgstr "Unesi novu lozinku:" - -#: templates/web/base/auth/general.html:60 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:75 -#: templates/web/fixmystreet/report/update-form.html:123 +#: templates/web/base/auth/general.html:99 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:38 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:13 #: templates/web/zurich/auth/general.html:65 msgid "Enter a password" msgstr "Unesi lozinku" @@ -1015,11 +957,11 @@ msgid "Enter details of the problem" msgstr "Unesi detalje o problemu" #: templates/web/base/errors/generic.html:1 -#: templates/web/base/errors/generic.html:3 +#: templates/web/base/errors/generic.html:4 #: templates/web/base/tokens/abuse.html:1 #: templates/web/base/tokens/abuse.html:3 #: templates/web/base/tokens/error.html:1 -#: templates/web/base/tokens/error.html:3 +#: templates/web/base/tokens/error.html:5 msgid "Error" msgstr "GreÅ¡ka" @@ -1032,11 +974,11 @@ msgstr "" msgid "Example postcode %s" msgstr "Primjer poÅ¡tanskog broja %s" -#: templates/web/base/open311/index.html:94 +#: templates/web/base/open311/index.html:86 msgid "Examples:" msgstr "Primjeri:" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:55 +#: templates/web/base/report/new/form_report.html:49 msgid "Explain what’s wrong, exactly where it is, and how long it’s been there…" msgstr "" @@ -1077,17 +1019,15 @@ msgstr "" msgid "FixMyStreet" msgstr "Popravi.to" -#: templates/web/base/admin/index.html:61 +#: templates/web/base/admin/index.html:54 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:24 #: templates/web/base/admin/report_blocks.html:9 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:144 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:34 -#: templates/web/fixmystreet/report/banner.html:12 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:32 +#: templates/web/base/report/banner.html:12 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:38 msgid "Fixed" msgstr "Popravljeno" @@ -1114,7 +1054,7 @@ msgstr "" msgid "Flag user" msgstr "OznaÄi korisnika" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1281 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1290 #: templates/web/base/admin/users.html:19 msgid "Flagged" msgstr "OznaÄen" @@ -1145,8 +1085,8 @@ msgstr "" msgid "For more information, see <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>." msgstr "" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:32 -#: templates/web/fixmystreet/report/update-form.html:106 +#: templates/web/base/report/new/form_user_loggedout_password.html:20 +#: templates/web/base/report/update/form_user_loggedout_password.html:19 msgid "Forgotten your password?" msgstr "Zaboravili ste Å¡ifru?" @@ -1158,21 +1098,18 @@ msgstr "" msgid "Forwarded wish to external body" msgstr "" -#: templates/web/base/faq/faq-en-gb.html:1 -#: templates/web/base/faq/faq-en-gb.html:13 -#: templates/web/base/faq/faq-en-gb.html:6 -#: templates/web/base/open311/index.html:6 -#: templates/web/base/static/privacy.html:8 -#: templates/web/fixmystreet/contact/index.html:10 +#: templates/web/base/about/_sidebar.html:4 +#: templates/web/base/about/faq-en-gb.html:1 +#: templates/web/base/about/faq-en-gb.html:5 msgid "Frequently Asked Questions" msgstr "ÄŒesto postavljana pitanja" -#: templates/web/base/open311/index.html:136 +#: templates/web/base/open311/index.html:128 msgid "GeoRSS on Google Maps" msgstr "GeoRSS na Google Mapama" +#: templates/web/base/report/display_tools.html:11 #: templates/web/fixmystreet/around/_updates.html:3 -#: templates/web/fixmystreet/report/display.html:35 msgid "Get updates" msgstr "Primite ažuriranja" @@ -1205,7 +1142,7 @@ msgstr "Idi" msgid "Going to send questionnaire?" msgstr "PoÅ¡alji upitnik?" -#: templates/web/base/admin/index.html:42 +#: templates/web/base/admin/index.html:35 msgid "Graph of problem creation by status over time" msgstr "Grafikon nastanka problema prema položaju tijekom vremena" @@ -1222,7 +1159,7 @@ msgid "Have you ever reported a problem to a council before, or is this your fir msgstr "Jeste li prije prijavljivali problem odgovornom tijelu ili je ovo prvi put?" #: templates/web/base/footer.html:15 templates/web/fixmystreet/footer.html:38 -#: templates/web/zurich/faq/faq-de-ch.html:1 +#: templates/web/zurich/about/faq-de-ch.html:1 #: templates/web/zurich/footer.html:22 #: templates/web/zurich/nav_over_content.html:8 msgid "Help" @@ -1273,7 +1210,7 @@ msgstr "Kako prijaviti problem" msgid "How to send successful reports" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:754 +#: perllib/FixMyStreet/App/Controller/Admin.pm:752 msgid "I am afraid you cannot confirm unconfirmed reports." msgstr "Nažalost, ne možeÅ¡ potvrditi nepotvrÄ‘ena izvješća" @@ -1291,10 +1228,6 @@ msgstr "" msgid "I'm afraid we couldn't locate your problem in the database.\n" msgstr "Nažalost, ne možemo locirati tvoj problem u bazi podataka.âŽ\n" -#: perllib/FixMyStreet/App/Controller/Tokens.pm:327 -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 "Nažalost, ne možemo provjeriti token. Ako ste kopirali URL iz e-maila, molimo provjeriti da ste ga toÄno kopirali. \n" - #: templates/web/base/admin/flagged.html:14 #: templates/web/base/admin/list_updates.html:6 #: templates/web/base/admin/reports.html:11 @@ -1323,24 +1256,16 @@ msgstr "" msgid "If you get some more information about the status of your problem, please come back to the site and leave an update." msgstr "" -#: templates/web/base/report/new/councils_text_none.html:2 -#: templates/web/base/report/new/councils_text_none.html:8 +#: templates/web/base/report/new/councils_text_none.html:10 +#: templates/web/base/report/new/councils_text_none.html:9 msgid "If you submit a problem here the subject and details of the problem will be public, but the problem will <strong>not</strong> be reported to the council." msgstr "Ako iznesete problem ovdje sadržaj i detalji problema bit će javni, ali će problem <strong>not</strong> biti prijavljen vijeću." -#: templates/web/zurich/auth/token.html:19 -#: templates/web/zurich/email_sent.html:7 -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 "Ako koristite e-mail na Webu ili 'junk mail' filtere, provjerite svoje bulk / spam mail mape: ponekad su naÅ¡e poruke oznaÄene na taj naÄin." - #: templates/web/base/questionnaire/index.html:68 -#, fuzzy msgid "" "If you wish to leave a public update on the problem, please enter it here\n" "(please note it will not be sent to the council)." msgstr "" -"Ako želite iznijeti javno ažuriranje o problemu, molimo unesite ga ovdje\n" -"(imajte na umu da neće biti poslano odgovornom tijelu). Na primjer, kakvo je vaÅ¡e miÅ¡ljenje o rjeÅ¡avanju problema?" #: templates/web/base/admin/body.html:149 msgid "If you're using <strong>a send method that is not email</strong>, enter the service ID (Open311) or equivalent identifier here." @@ -1379,10 +1304,8 @@ msgstr "Ilegalan odabir izvora" #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:144 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:32 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:30 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:36 msgid "In Progress" msgstr "U tijeku" @@ -1390,7 +1313,7 @@ msgstr "U tijeku" msgid "In abuse table?" msgstr "" -#: templates/web/base/open311/index.html:88 +#: templates/web/base/open311/index.html:80 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 "Nadalje, sljedeća svojstva koja nisu dio Open311 v2 specifikacija su vraćena: agencijski _poslano_datum-vrijeme, naslov (takoÄ‘er vraćen kao dio opisa), suÄelje_koriÅ¡teno, brojaÄ_komentara, ime_pretražitelja(prisutno samo ako je tražitelj dopustio prikaz imena na ovoj stranici)." @@ -1398,7 +1321,7 @@ msgstr "Nadalje, sljedeća svojstva koja nisu dio Open311 v2 specifikacija su vr #: perllib/FixMyStreet/Cobrand/Zurich.pm:963 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:7 -#: templates/web/fixmystreet/report/banner.html:19 +#: templates/web/base/report/banner.html:19 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:8 msgid "In progress" @@ -1433,7 +1356,7 @@ msgstr "" msgid "Invalid agency_responsible value %s" msgstr "Nevažeća odgovorna_vrijednost agencije %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1201 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1210 msgid "Invalid end date" msgstr "Nevažeći datum zavrÅ¡etka" @@ -1441,7 +1364,7 @@ msgstr "Nevažeći datum zavrÅ¡etka" msgid "Invalid format %s specified." msgstr "Naveden nevažeći %s format." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1206 msgid "Invalid start date" msgstr "Nevažeći datum poÄetka" @@ -1449,14 +1372,12 @@ msgstr "Nevažeći datum poÄetka" #: templates/web/base/admin/report_blocks.html:5 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:143 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:31 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:29 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:35 msgid "Investigating" msgstr "Istražujem" -#: templates/web/fixmystreet/contact/blurb.html:8 +#: templates/web/base/contact/blurb.html:8 msgid "It's often quickest to <a href=\"%s\">check our FAQs</a> and see if the answer is there." msgstr "" @@ -1474,11 +1395,9 @@ msgstr "" msgid "Jurisdiction unknown" msgstr "" -#: templates/web/base/auth/general.html:44 -#: templates/web/base/report/new/fill_in_details_form.html:132 -#: templates/web/base/report/update-form.html:105 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:28 -#: templates/web/fixmystreet/report/update-form.html:102 +#: templates/web/base/auth/general.html:80 +#: templates/web/base/report/new/form_user_loggedout_password.html:16 +#: templates/web/base/report/update/form_user_loggedout_password.html:15 #: templates/web/zurich/auth/general.html:40 msgid "Keep me signed in on this computer" msgstr "Ostani prijavljen na ovom raÄunalu" @@ -1536,6 +1455,7 @@ msgid "MAP" msgstr "" #: templates/web/base/js/translation_strings.html:45 +#: templates/web/base/maps/google-ol.html:13 msgid "Map" msgstr "" @@ -1555,7 +1475,7 @@ msgstr "" msgid "Marked fixed/closed more than eight weeks ago" msgstr "" -#: templates/web/fixmystreet/contact/index.html:106 +#: templates/web/base/contact/index.html:98 msgid "Message" msgstr "Poruka" @@ -1567,10 +1487,6 @@ msgstr "" msgid "Message to external body:" msgstr "" -#: templates/web/base/contact/index.html:97 -msgid "Message:" -msgstr "Poruka:" - #: perllib/FixMyStreet/App/Controller/Open311.pm:445 msgid "Missing jurisdiction_id" msgstr "Nedostaje nadležni_ID" @@ -1583,10 +1499,6 @@ msgstr "" msgid "Month" msgstr "Mjesec" -#: templates/web/base/report/display.html:34 -msgid "More problems nearby" -msgstr "ViÅ¡e problema u blizini" - #: templates/web/base/admin/bodies.html:21 #: templates/web/base/admin/body-form.html:18 #: templates/web/base/admin/flagged.html:16 @@ -1594,11 +1506,11 @@ msgstr "ViÅ¡e problema u blizini" #: templates/web/base/admin/list_updates.html:7 #: templates/web/base/admin/reports.html:13 #: templates/web/base/admin/users.html:15 -#: templates/web/base/auth/general.html:50 +#: templates/web/base/auth/general.html:89 +#: templates/web/base/report/new/form_user_loggedin.html:9 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:7 +#: templates/web/base/report/update/form_name.html:4 #: templates/web/base/reports/index.html:20 -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:9 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:44 -#: templates/web/fixmystreet/report/update-form.html:138 #: templates/web/zurich/admin/body-form.html:4 #: templates/web/zurich/auth/general.html:60 #: templates/web/zurich/report/new/fill_in_details_form.html:82 @@ -1612,7 +1524,7 @@ msgstr "Ime" msgid "Name:" msgstr "Ime:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:328 +#: perllib/FixMyStreet/Script/Reports.pm:107 msgid "Name: %s" msgstr "" @@ -1621,16 +1533,16 @@ msgstr "" msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s" msgstr "Najbliža imenovana cesta smjeÅ¡tena pokraj oznake na mapi (automatski generirano pomoću OpenStreetMap): %s%s" -#: perllib/FixMyStreet/Cobrand/UK.pm:127 +#: perllib/FixMyStreet/Cobrand/UK.pm:128 msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" msgstr "Najbliži poÅ¡tanski broj pokraj oznake na mapi (automatski generiran): %s (%sm away)" -#: perllib/FixMyStreet/Cobrand/Default.pm:434 -#: perllib/FixMyStreet/Cobrand/Default.pm:474 +#: perllib/FixMyStreet/Cobrand/Default.pm:455 +#: perllib/FixMyStreet/Cobrand/Default.pm:495 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "Najbliža cesta smjeÅ¡tena pokraj oznake na mapi (automatski generirano pomoću Bing Maps): %s" -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:267 +#: perllib/FixMyStreet/Script/Alerts.pm:290 msgid "" "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n" "\n" @@ -1638,14 +1550,9 @@ msgstr "" "Najbliža cesta smjeÅ¡tena pokraj oznake na mapi (automatically generated by Bing Maps): %s\n" "\n" -#: templates/web/zurich/email_sent.html:5 -msgid "Nearly Done! Now check your email..." -msgstr "Skoro uÄinjeno! Sada provjeri svoj e-mail..." - #: templates/web/base/auth/token.html:17 templates/web/base/email_sent.html:5 -#, fuzzy msgid "Nearly done! Now check your email…" -msgstr "Skoro uÄinjeno! Sada provjeri svoj e-mail..." +msgstr "" #: templates/web/base/reports/index.html:21 msgid "New <br>problems" @@ -1702,9 +1609,8 @@ msgstr "Novo stanje" #: templates/web/zurich/admin/template_edit.html:9 #: templates/web/zurich/admin/templates.html:26 -#, fuzzy msgid "New template" -msgstr "Novo stanje" +msgstr "" #: templates/web/base/pagination.html:13 msgid "Next" @@ -1721,8 +1627,8 @@ msgstr "" #: templates/web/base/admin/report_edit.html:75 #: templates/web/base/admin/update_edit.html:25 #: templates/web/base/questionnaire/creator_fixed.html:16 +#: templates/web/base/questionnaire/index.html:101 #: templates/web/base/questionnaire/index.html:53 -#: templates/web/base/questionnaire/index.html:92 msgid "No" msgstr "Ne" @@ -1786,10 +1692,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:13 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:33 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:31 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:37 msgid "Not Responsible" msgstr "" @@ -1828,7 +1732,7 @@ msgstr "Imajte na umu da kada ukljuÄujemo nepotvrÄ‘ene prijave koristimo datum msgid "Note:" msgstr "Napomena:" -#: templates/web/base/open311/index.html:73 +#: templates/web/base/open311/index.html:65 msgid "Note: <strong>%s</strong>" msgstr "Napomena: <strong>%s</strong>" @@ -1836,13 +1740,15 @@ msgstr "Napomena: <strong>%s</strong>" msgid "Notes from SDM to DM" msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:113 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:10 +#: templates/web/base/report/new/form_user_loggedout.html:14 +#: templates/web/base/report/new/form_user_loggedout.html:2 +#: templates/web/base/report/new/oauth_email_form.html:17 msgid "Now to submit your report…" msgstr "Podnesite svoju prijavu…" -#: templates/web/base/report/update-form.html:86 -#: templates/web/fixmystreet/report/update-form.html:85 +#: templates/web/base/report/update-form.html:28 +#: templates/web/base/report/update/form_user_loggedout.html:13 +#: templates/web/base/report/update/form_user_loggedout.html:2 msgid "Now to submit your update…" msgstr "PoÅ¡aljite svoje ažuriranje…" @@ -1850,11 +1756,6 @@ msgstr "PoÅ¡aljite svoje ažuriranje…" msgid "OK" msgstr "" -#: templates/web/base/report/display.html:28 -#: templates/web/base/report/update.html:17 -msgid "Offensive? Unsuitable? Tell us" -msgstr "Uvredljivo? Neprikladno? Recite nam" - #: templates/web/base/reports/index.html:23 msgid "Old / unknown <br>problems" msgstr "Stari / nepoznati <br>problemi" @@ -1871,7 +1772,7 @@ msgstr "Starije <br>popravljeno" msgid "Older <br>problems" msgstr "Stariji <br>problemi" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:45 +#: templates/web/base/report/new/form_report.html:15 msgid "One-line summary" msgstr "" @@ -1882,8 +1783,7 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:4 #: templates/web/base/admin/update_edit.html:28 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/report/update-form.html:30 -#: templates/web/fixmystreet/report/update-form.html:28 +#: templates/web/base/report/update/form_update.html:34 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:7 #: templates/web/zurich/admin/update_edit.html:18 @@ -1898,15 +1798,15 @@ msgstr "" msgid "Open, but not had any update in eight weeks" msgstr "" -#: templates/web/base/open311/index.html:70 +#: templates/web/base/open311/index.html:62 msgid "Open311 API for the mySociety FixMyStreet server" msgstr "Open311 API za Popravi.to server" -#: templates/web/base/open311/index.html:80 +#: templates/web/base/open311/index.html:72 msgid "Open311 initiative web page" msgstr "Open311 prvotna web stranica" -#: templates/web/base/open311/index.html:81 +#: templates/web/base/open311/index.html:73 msgid "Open311 specification" msgstr "Open311 specifikacija" @@ -1918,15 +1818,15 @@ msgstr "Ili problemi prijavljeni:" msgid "Or you can subscribe to an alert based upon what ward or council you’re in:" msgstr "Ili se možete pretplatiti na upozorenja unutar vaÅ¡eg vijeća ’:" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1084 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:673 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:674 -#: perllib/FixMyStreet/DB/Result/Problem.pm:570 -#: perllib/FixMyStreet/DB/Result/Problem.pm:580 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1055 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:669 +#: perllib/FixMyStreet/DB/Result/Problem.pm:558 +#: perllib/FixMyStreet/DB/Result/Problem.pm:568 +#: perllib/FixMyStreet/DB/Result/Problem.pm:578 #: perllib/FixMyStreet/DB/Result/Problem.pm:590 -#: perllib/FixMyStreet/DB/Result/Problem.pm:602 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:397 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:412 +#: perllib/FixMyStreet/Script/Reports.pm:175 +#: perllib/FixMyStreet/Script/Reports.pm:190 msgid "Other" msgstr "Drugo" @@ -1935,7 +1835,7 @@ msgid "Owner" msgstr "Vlasnik" #: templates/web/base/errors/page_error_404_not_found.html:1 -#: templates/web/base/errors/page_error_404_not_found.html:3 +#: templates/web/base/errors/page_error_404_not_found.html:4 msgid "Page Not Found" msgstr "Stranica nije pronaÄ‘ena" @@ -1949,16 +1849,16 @@ msgstr "" msgid "Partial" msgstr "DjelomiÄno" -#: templates/web/base/auth/general.html:53 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:68 -#: templates/web/fixmystreet/report/update-form.html:116 +#: templates/web/base/auth/general.html:92 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:31 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:6 #: templates/web/zurich/auth/general.html:32 #: templates/web/zurich/auth/general.html:63 msgid "Password (optional)" msgstr "Lozinka (neobvezno)" #: templates/web/base/auth/change_password.html:25 -#: templates/web/base/auth/general.html:36 +#: templates/web/base/auth/general.html:72 msgid "Password:" msgstr "Lozinka:" @@ -1970,45 +1870,37 @@ msgstr "" msgid "Phone number" msgstr "" -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:26 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:62 +#: templates/web/base/report/new/form_user_loggedin.html:26 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:25 msgid "Phone number (optional)" msgstr "Telefonski broj (neobavezan)" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:306 +#: perllib/FixMyStreet/Script/Reports.pm:83 #: templates/web/base/admin/report_edit.html:63 -#: templates/web/base/report/new/fill_in_details_form.html:198 #: templates/web/zurich/admin/stats.html:39 msgid "Phone:" msgstr "Telefon:" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:66 -#: templates/web/fixmystreet/report/update-form.html:59 +#: templates/web/base/questionnaire/index.html:75 +#: templates/web/base/report/new/form_report.html:23 +#: templates/web/base/report/update/form_update.html:6 #: templates/web/zurich/admin/index-dm.html:29 #: templates/web/zurich/admin/index-sdm.html:24 #: templates/web/zurich/admin/reports.html:16 #: templates/web/zurich/admin/stats.html:37 -#: templates/web/zurich/report/new/fill_in_details_form.html:52 +#: templates/web/zurich/report/new/fill_in_details_form.html:45 msgid "Photo" msgstr "Slika" -#: perllib/FixMyStreet/App/Controller/Photo.pm:221 -#, fuzzy +#: perllib/FixMyStreet/App/Controller/Photo.pm:187 msgid "Photo is required." -msgstr "Potrebna informacija" +msgstr "" #: templates/web/base/admin/category_edit.html:48 -#, fuzzy msgid "Photo required" -msgstr "Potrebna informacija" - -#: templates/web/base/questionnaire/index.html:80 -#: templates/web/base/report/new/fill_in_details_form.html:84 -#: templates/web/base/report/update-form.html:62 -msgid "Photo:" -msgstr "Slika:" +msgstr "" -#: templates/web/base/alert/list.html:26 +#: templates/web/base/alert/list.html:23 msgid "Photos of recent nearby reports" msgstr "Fotografije posljednjih obližnjih prijava" @@ -2037,20 +1929,16 @@ msgstr "Molimo da budete pristojni, jezgroviti i jasni." msgid "Please check the passwords and try again" msgstr "Provjeri lozinku i pokuÅ¡aj ponovno" -#: templates/web/zurich/auth/token.html:16 -msgid "Please check your email" -msgstr "Provjeri svoj e-mail" - -#: templates/web/base/auth/general.html:10 -#: templates/web/base/auth/general.html:16 +#: templates/web/base/auth/general.html:27 +#: templates/web/base/auth/general.html:33 #: templates/web/zurich/auth/general.html:3 #: templates/web/zurich/auth/general.html:9 msgid "Please check your email address is correct" msgstr "Provjerite je li vaÅ¡a e-mail adresa toÄna" #: perllib/FixMyStreet/App/Controller/Admin.pm:343 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:883 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:948 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:878 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:943 #: perllib/FixMyStreet/DB/Result/Problem.pm:412 #: templates/web/base/js/translation_strings.html:9 msgid "Please choose a category" @@ -2064,28 +1952,29 @@ msgstr "Izaberi tip imovine" msgid "Please correct the errors below" msgstr "" -#: templates/web/base/contact/blurb.html:2 -#: templates/web/fixmystreet/contact/blurb.html:12 -#, fuzzy +#: templates/web/base/contact/blurb.html:12 msgid "" "Please do <strong>not</strong> report problems through this form; messages go to\n" "the team behind this site, not a council. To report a problem,\n" "please <a href=\"/\">go to the front page</a> and follow the instructions." msgstr "" -"Molimo<strong>not</strong> prijavite probleme pomoću sljedećeg obrasca; poruke idu\n" -"timu Popravi.to, ne odgovornom tijelu. Kako biste prijavili problem,\n" -"molimo<a href=\"/\">idite na poÄetnu stranicu</a> i slijedite upute." #: templates/web/base/report/new/notes.html:6 msgid "Please do not be abusive — abusing your council devalues the service for all users." msgstr "" #: perllib/FixMyStreet/App/Controller/Admin.pm:346 -#: perllib/FixMyStreet/DB/Result/Comment.pm:126 +#: perllib/FixMyStreet/DB/Result/Comment.pm:125 #: templates/web/base/js/translation_strings.html:2 msgid "Please enter a message" msgstr "Unesi poruku" +#: perllib/FixMyStreet/App/Controller/Admin.pm:1091 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1146 +#, fuzzy +msgid "Please enter a name" +msgstr "Unesite svoje ime" + #: templates/web/base/auth/change_password.html:12 #: templates/web/base/auth/change_password.html:15 #: templates/web/base/js/translation_strings.html:19 @@ -2098,10 +1987,10 @@ msgstr "Unesi lozinku" msgid "Please enter a subject" msgstr "Unesi predmet" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1084 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1137 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1087 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1142 #: perllib/FixMyStreet/App/Controller/Admin.pm:345 -#: perllib/FixMyStreet/DB/Result/User.pm:127 +#: perllib/FixMyStreet/DB/Result/User.pm:133 #: templates/web/base/js/translation_strings.html:12 #: templates/web/base/js/translation_strings.html:16 msgid "Please enter a valid email" @@ -2118,9 +2007,9 @@ msgid "Please enter some details" msgstr "Unesi detalje" #: perllib/FixMyStreet/App/Controller/Contact.pm:113 -#: perllib/FixMyStreet/DB/Result/User.pm:124 -#: templates/web/base/auth/general.html:10 -#: templates/web/base/auth/general.html:15 +#: perllib/FixMyStreet/DB/Result/User.pm:130 +#: templates/web/base/auth/general.html:27 +#: templates/web/base/auth/general.html:32 #: templates/web/base/js/translation_strings.html:11 #: templates/web/base/js/translation_strings.html:15 #: templates/web/zurich/auth/general.html:3 @@ -2128,7 +2017,7 @@ msgstr "Unesi detalje" msgid "Please enter your email" msgstr "Unesi svoj e-mail" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:7 +#: templates/web/base/report/new/form_user_loggedout_email.html:7 #: templates/web/zurich/report/new/fill_in_details_form.html:80 msgid "Please enter your email address" msgstr "Unesi svoju e-mail adresu" @@ -2137,15 +2026,15 @@ msgstr "Unesi svoju e-mail adresu" msgid "Please enter your first name" msgstr "Unesi svoje ime" -#: perllib/FixMyStreet/Cobrand/UK.pm:318 +#: perllib/FixMyStreet/Cobrand/UK.pm:319 #: templates/web/base/js/translation_strings.html:7 msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below" msgstr "Molimo unesite svoje puno ime, odgovorno tijelo treba ovu informaciju – ako ne želite da vaÅ¡e ime bude prikazano na stranici, odznaÄite kvadratić ispod" #: perllib/FixMyStreet/App/Controller/Contact.pm:112 -#: perllib/FixMyStreet/DB/Result/Comment.pm:123 +#: perllib/FixMyStreet/DB/Result/Comment.pm:122 #: perllib/FixMyStreet/DB/Result/Problem.pm:406 -#: perllib/FixMyStreet/DB/Result/User.pm:120 +#: perllib/FixMyStreet/DB/Result/User.pm:126 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter your name" msgstr "Unesite svoje ime" @@ -2172,12 +2061,11 @@ msgstr "" msgid "Please fill in details of the problem below." msgstr "Popunite detalje o problemu u nastavku." -#: templates/web/zurich/report/new/fill_in_details_form.html:46 +#: templates/web/zurich/report/new/fill_in_details_form.html:72 msgid "Please fill in details of the problem." msgstr "Popunite detalje o problemu u nastavku." -#: templates/web/base/report/new/fill_in_details_form.html:28 -#: templates/web/fixmystreet/report/new/sidebar.html:7 +#: templates/web/base/report/new/sidebar.html:7 #: templates/web/zurich/report/new/fill_in_details_form.html:20 msgid "Please fill in the form below with details of the problem, and describe the location as precisely as possible in the details box." msgstr "Popunite detalje o problemu u nastavku i opiÅ¡ite lokaciju Å¡to preciznije." @@ -2186,20 +2074,24 @@ msgstr "Popunite detalje o problemu u nastavku i opiÅ¡ite lokaciju Å¡to precizni msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "Molimo navedite želite li primiti novi upitnik" -#: templates/web/fixmystreet/report/updates-sidebar-notes.html:4 +#: templates/web/base/report/updates-sidebar-notes.html:2 msgid "Please note that updates are not sent to the council." msgstr "Napominjemo da se ažuriranja ne Å¡alju odgovornom tijelu." -#: templates/web/base/report/update-form.html:7 -msgid "Please note that updates are not sent to the council. If you leave your name it will be public. Your information will only be used in accordance with our <a href=\"/faq#privacy\">privacy policy</a>" -msgstr "Napominjemo da se ažuriranja ne Å¡alju odgovornom tijelu. Ako navedete svoje ime, bit će vidljivo. VaÅ¡e informacije će biti koriÅ¡tene u skladu s naÅ¡im <a href=\"/faq#privacy\">pravilima o privatnosti</a>" +#: templates/web/base/report/new/oauth_email_form.html:4 +#, fuzzy +msgid "Please note your report has <strong>not yet been sent</strong>." +msgstr "Napominjemo da vaÅ¡a prijava <strong>joÅ¡ nije poslana</strong>. Izaberite kategoriju i navedite dodatne informacije u nastavku te zatim potvrdite." -#: templates/web/base/report/new/fill_in_details_form.html:8 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:21 +#: templates/web/base/report/new/fill_in_details_form.html:20 #: templates/web/zurich/report/new/fill_in_details_form.html:11 msgid "Please note your report has <strong>not yet been sent</strong>. Choose a category and add further information below, then submit." msgstr "Napominjemo da vaÅ¡a prijava <strong>joÅ¡ nije poslana</strong>. Izaberite kategoriju i navedite dodatne informacije u nastavku te zatim potvrdite." +#: templates/web/base/report/display.html:26 +msgid "Please note your update has <strong>not yet been posted</strong>." +msgstr "" + #: templates/web/base/report/new/notes.html:1 #: templates/web/zurich/report/new/notes.html:1 msgid "Please note:" @@ -2219,9 +2111,8 @@ msgid "Please say whether you've ever reported a problem to your council before" msgstr "Jeste li do sada ikada prijavljivali problem odgovoronom tijelu" #: templates/web/zurich/admin/report_edit.html:208 -#, fuzzy msgid "Please select a body." -msgstr "Izaberite izvor koji želite" +msgstr "" #: perllib/FixMyStreet/App/Controller/Alert.pm:80 msgid "Please select the feed you want" @@ -2238,6 +2129,7 @@ msgstr "Navedite je li problem rjeÅ¡en " #: perllib/FixMyStreet/App/Model/PhotoSet.pm:117 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:145 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:147 +#: templates/web/base/js/translation_strings.html:53 msgid "Please upload a JPEG image only" msgstr "Molimo uÄitajte samo JPEG slike" @@ -2245,18 +2137,14 @@ msgstr "Molimo uÄitajte samo JPEG slike" msgid "Please write a message" msgstr "NapiÅ¡i poruku" -#: templates/web/fixmystreet/report/update-form.html:23 +#: templates/web/base/report/update/form_update.html:29 msgid "Please write your update here" msgstr "Ovdje ažurirajte" -#: templates/web/base/contact/index.html:100 -#: templates/web/base/report/update-form.html:110 -#: templates/web/base/report/update-form.html:132 -#: templates/web/base/report/update-form.html:72 -#: templates/web/fixmystreet/contact/index.html:113 -#: templates/web/fixmystreet/report/update-form.html:124 -#: templates/web/fixmystreet/report/update-form.html:71 -#: templates/web/fixmystreet/report/update-form.html:97 +#: templates/web/base/contact/index.html:105 +#: templates/web/base/report/update-form.html:24 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:14 +#: templates/web/base/report/update/form_user_loggedout_password.html:10 msgid "Post" msgstr "Objavi" @@ -2284,12 +2172,9 @@ msgstr "" msgid "Privacy" msgstr "" -#: templates/web/base/faq/faq-en-gb.html:7 -#: templates/web/base/open311/index.html:7 -#: templates/web/base/static/privacy.html:1 -#: templates/web/base/static/privacy.html:2 -#: templates/web/base/static/privacy.html:9 -#: templates/web/fixmystreet/contact/index.html:11 +#: templates/web/base/about/_sidebar.html:5 +#: templates/web/base/about/privacy.html:1 +#: templates/web/base/about/privacy.html:2 msgid "Privacy and cookies" msgstr "" @@ -2317,12 +2202,12 @@ msgstr "Problem %s potvrÄ‘en" msgid "Problem %s sent to council %s" msgstr "Problem %s poslan odgovornom tijelu %s" -#: templates/web/base/admin/index.html:46 +#: templates/web/base/admin/index.html:39 #: templates/web/zurich/admin/index.html:9 msgid "Problem breakdown by state" msgstr "Analiza problema prema stanju" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1055 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1058 msgid "Problem marked as open." msgstr "Problem oznaÄen kao otvoren." @@ -2338,11 +2223,11 @@ msgstr "Problemi" msgid "Problems in this area" msgstr "Problemi u ovom podruÄju" -#: templates/web/fixmystreet/report/display.html:43 +#: templates/web/base/report/display_tools.html:19 msgid "Problems nearby" msgstr "Okolni problemi" -#: templates/web/fixmystreet/report/display.html:41 +#: templates/web/base/report/display_tools.html:17 msgid "Problems on the map" msgstr "Problemi na mapi" @@ -2354,24 +2239,23 @@ msgstr "Problems nedavno prijavljeni kao popravljeni na Popravi.to" msgid "Problems within %.1fkm of this location" msgstr "Problemi unutar%.1fkm od ove lokacije" -#: perllib/FixMyStreet/Cobrand/Default.pm:642 +#: perllib/FixMyStreet/Cobrand/Default.pm:663 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:120 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:139 -#: perllib/FixMyStreet/Cobrand/UK.pm:207 +#: perllib/FixMyStreet/Cobrand/UK.pm:208 msgid "Problems within %s" msgstr "Problemi unutar %s" #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:128 -#: perllib/FixMyStreet/Cobrand/UK.pm:221 +#: perllib/FixMyStreet/Cobrand/UK.pm:222 msgid "Problems within %s ward" msgstr "Problemi unutar %s ward" #. ("First %s is the body name, second %s the site name") #: templates/web/base/reports/body.html:0 #: templates/web/base/reports/body.html:24 -#, fuzzy msgid "Problems within %s, %s" -msgstr "Problemi unutar %s" +msgstr "" #: templates/web/base/alert/_list.html:42 msgid "Problems within the boundary of:" @@ -2385,19 +2269,16 @@ msgstr "" msgid "Property type:" msgstr "Tip objekta:" -#: templates/web/base/report/update-form.html:3 -#: templates/web/fixmystreet/report/update-form.html:4 +#: templates/web/base/report/update-form.html:6 msgid "Provide an update" msgstr "Ažuriranje" -#: templates/web/base/auth/general.html:56 +#: templates/web/base/auth/general.html:95 msgid "Providing a name and password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:156 -#: templates/web/base/report/update-form.html:129 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:71 -#: templates/web/fixmystreet/report/update-form.html:119 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:34 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:9 msgid "Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." msgstr "Lozinka nije obvezna, ali će vam omogućiti lakÅ¡e prijavljivanje problema, ažuriranja i upravljanje vaÅ¡im izvješćima." @@ -2433,18 +2314,17 @@ msgstr "Upitnik popunila osoba koja je prijavila problem" #: templates/web/base/alert/_list.html:22 #: templates/web/base/around/display_location.html:1 #: templates/web/base/around/display_location.html:3 -#: templates/web/base/report/display.html:50 +#: templates/web/base/report/display_tools.html:34 #: templates/web/base/reports/_rss.html:1 #: templates/web/fixmystreet/alert/updates.html:9 -#: templates/web/fixmystreet/report/display.html:58 msgid "RSS feed" msgstr "RSS izvor" -#: perllib/FixMyStreet/Cobrand/UK.pm:250 perllib/FixMyStreet/Cobrand/UK.pm:262 +#: perllib/FixMyStreet/Cobrand/UK.pm:251 perllib/FixMyStreet/Cobrand/UK.pm:263 msgid "RSS feed for %s" msgstr "RSS izvor za %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:256 perllib/FixMyStreet/Cobrand/UK.pm:268 +#: perllib/FixMyStreet/Cobrand/UK.pm:257 perllib/FixMyStreet/Cobrand/UK.pm:269 msgid "RSS feed for %s ward, %s" msgstr "RSS izvor za %s ward, %s" @@ -2452,11 +2332,11 @@ msgstr "RSS izvor za %s ward, %s" #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:163 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:173 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:181 -#: perllib/FixMyStreet/Cobrand/UK.pm:276 perllib/FixMyStreet/Cobrand/UK.pm:288 +#: perllib/FixMyStreet/Cobrand/UK.pm:277 perllib/FixMyStreet/Cobrand/UK.pm:289 msgid "RSS feed of %s" msgstr "RSS izvor za %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:281 perllib/FixMyStreet/Cobrand/UK.pm:293 +#: perllib/FixMyStreet/Cobrand/UK.pm:282 perllib/FixMyStreet/Cobrand/UK.pm:294 msgid "RSS feed of %s, within %s ward" msgstr "RSS izvor za %s, unutar %s ward" @@ -2468,15 +2348,15 @@ msgstr "RSS izvor za okolne probleme" msgid "RSS feed of problems in this %s" msgstr "RSS izvor za probleme u ovom %s" -#: perllib/FixMyStreet/Cobrand/Default.pm:643 +#: perllib/FixMyStreet/Cobrand/Default.pm:664 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:121 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:138 -#: perllib/FixMyStreet/Cobrand/UK.pm:214 +#: perllib/FixMyStreet/Cobrand/UK.pm:215 msgid "RSS feed of problems within %s" msgstr "RSS izvor za probleme unutar %s" #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:127 -#: perllib/FixMyStreet/Cobrand/UK.pm:220 +#: perllib/FixMyStreet/Cobrand/UK.pm:221 msgid "RSS feed of problems within %s ward" msgstr "RSS izvor za probleme unutar %s ward" @@ -2485,25 +2365,22 @@ msgstr "RSS izvor za probleme unutar %s ward" msgid "RSS feed of recent local problems" msgstr "RSS izvor za nedavne lokalne probleme" -#: templates/web/base/report/display.html:50 +#: templates/web/base/report/display_tools.html:34 #: templates/web/fixmystreet/alert/updates.html:9 -#: templates/web/fixmystreet/report/display.html:58 msgid "RSS feed of updates to this problem" msgstr "RSS izvor za ažuriranja ovog problema" #: templates/web/base/alert/updates.html:9 -#: templates/web/base/report/display.html:41 +#: templates/web/base/report/display_tools.html:36 #: templates/web/fixmystreet/alert/updates.html:14 -#: templates/web/fixmystreet/report/display.html:60 msgid "Receive email when updates are left on this problem." msgstr "Primite e-mail s ažuriranjima ovog problema" #. ("%s is the site name") #: templates/web/base/around/display_location.html:0 #: templates/web/base/around/display_location.html:33 -#, fuzzy msgid "Recent local problems, %s" -msgstr "Nedavni lokalni problemi, Popravi.to" +msgstr "" #: templates/web/base/reports/index.html:24 msgid "Recently <br>fixed" @@ -2521,8 +2398,8 @@ msgstr "Popravi.to prvenstveno služi za izvjeÅ¡tavanje fiziÄkih problema koji msgid "Remove flag" msgstr "Ukloni oznaku" -#: templates/web/base/admin/report_edit.html:92 -#: templates/web/base/admin/update_edit.html:62 +#: templates/web/base/admin/report_edit.html:93 +#: templates/web/base/admin/update_edit.html:67 #: templates/web/zurich/admin/update_edit.html:35 msgid "Remove photo (can't be undone!)" msgstr "Ukloni fotografiju (nije moguće poniÅ¡titi!)" @@ -2542,7 +2419,7 @@ msgstr "" msgid "Report a problem" msgstr "Prijavi problem" -#: templates/web/fixmystreet/report/display.html:32 +#: templates/web/base/report/display_tools.html:8 msgid "Report abuse" msgstr "Prijavi zloupotrebu" @@ -2551,7 +2428,8 @@ msgid "Report on %s" msgstr "Prijava za %s" #: templates/web/base/report/new/fill_in_details_form.html:1 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:2 +#: templates/web/base/report/new/login_success_form.html:1 +#: templates/web/base/report/new/oauth_email_form.html:1 msgid "Report your problem" msgstr "" @@ -2560,9 +2438,8 @@ msgstr "" msgid "Report, view, or discuss local problems" msgstr "Prijavi, pregledaj ili raspravljaj o lokalnim problemima" -#: perllib/FixMyStreet/DB/Result/Problem.pm:585 -#: templates/web/base/contact/index.html:50 -#: templates/web/fixmystreet/contact/index.html:65 +#: perllib/FixMyStreet/DB/Result/Problem.pm:573 +#: templates/web/base/contact/index.html:57 msgid "Reported anonymously at %s" msgstr "Prijavljeno anonimno %s" @@ -2571,43 +2448,41 @@ msgstr "Prijavljeno anonimno %s" msgid "Reported before" msgstr "Prije prijavljeno" -#: perllib/FixMyStreet/DB/Result/Problem.pm:608 -#: templates/web/base/contact/index.html:52 -#: templates/web/fixmystreet/contact/index.html:67 +#: perllib/FixMyStreet/DB/Result/Problem.pm:596 +#: templates/web/base/contact/index.html:59 msgid "Reported by %s at %s" msgstr "Prijavio %s za %s" #: templates/web/zurich/admin/report_edit-sdm.html:58 #: templates/web/zurich/admin/report_edit.html:86 -#, fuzzy msgid "Reported by:" -msgstr "Prijavljeno %s" +msgstr "" #: templates/web/zurich/report/_main.html:2 msgid "Reported in the %s category" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:581 +#: perllib/FixMyStreet/DB/Result/Problem.pm:569 msgid "Reported in the %s category anonymously at %s" msgstr "Prijavljeno %s u kategoriju anonimno u %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:603 +#: perllib/FixMyStreet/DB/Result/Problem.pm:591 msgid "Reported in the %s category by %s at %s" msgstr "Prijavio %s u kategoriju %s u %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:577 +#: perllib/FixMyStreet/DB/Result/Problem.pm:565 msgid "Reported via %s anonymously at %s" msgstr "Prijavio %s anonimno %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:599 +#: perllib/FixMyStreet/DB/Result/Problem.pm:587 msgid "Reported via %s by %s at %s" msgstr "Prijavio %s %s u %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:573 +#: perllib/FixMyStreet/DB/Result/Problem.pm:561 msgid "Reported via %s in the %s category anonymously at %s" msgstr "Prijavio %s u kategoriju %s anonimno u %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:593 +#: perllib/FixMyStreet/DB/Result/Problem.pm:581 msgid "Reported via %s in the %s category by %s at %s" msgstr "Prijavio %s u %s kategoriju %s u %s" @@ -2617,9 +2492,8 @@ msgstr "" #: templates/web/zurich/admin/report_edit-sdm.html:36 #: templates/web/zurich/admin/report_edit.html:55 -#, fuzzy msgid "Reported:" -msgstr "Prijavljeno %s" +msgstr "" #: templates/web/base/around/index.html:2 #: templates/web/base/js/translation_strings.html:41 @@ -2629,13 +2503,13 @@ msgstr "Prijavljeno %s" msgid "Reporting a problem" msgstr "Prijavljivanje problema" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1277 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1286 #: perllib/FixMyStreet/Cobrand/Zurich.pm:384 #: templates/web/zurich/header.html:60 msgid "Reports" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:327 perllib/FixMyStreet/Cobrand/UK.pm:331 +#: perllib/FixMyStreet/Cobrand/UK.pm:328 perllib/FixMyStreet/Cobrand/UK.pm:332 msgid "Reports are limited to %s characters in length. Please shorten your report" msgstr "" @@ -2672,15 +2546,17 @@ msgstr "Cestovni operater za ovu imenovanu cestu (izveden iz cestovnog referentn msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "Cestovni operater za ovu imenovanu cestu (sa OpenStreetMap): %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1495 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1500 -#: templates/web/base/admin/report_edit.html:88 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1508 +#: templates/web/base/admin/report_edit.html:90 +#: templates/web/base/admin/update_edit.html:64 #: templates/web/zurich/admin/report_edit.html:116 msgid "Rotate Left" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1495 -#: templates/web/base/admin/report_edit.html:89 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 +#: templates/web/base/admin/report_edit.html:91 +#: templates/web/base/admin/update_edit.html:65 #: templates/web/zurich/admin/report_edit.html:117 msgid "Rotate Right" msgstr "" @@ -2690,7 +2566,6 @@ msgid "Rotating this photo will discard unsaved changes to the report." msgstr "" #: templates/web/base/js/translation_strings.html:46 -#: templates/web/base/maps/google-ol.html:13 msgid "Satellite" msgstr "" @@ -2743,16 +2618,14 @@ msgid "Select an area" msgstr "" #: templates/web/base/alert/_list.html:10 -#, fuzzy msgid "Select which type of alert you’d like and click the button for an RSS feed, or enter your email address to subscribe to an email alert." -msgstr "Odaberite tip upozorenja i kliknite na gumb za RSS izvor, ili unesite svoju e-mail adresu kako biste se pretplatili na e-mail upozorenja." +msgstr "" #: perllib/FixMyStreet/Cobrand/Zurich.pm:835 -#, fuzzy msgid "Sent report back" -msgstr "Otvori izvješća" +msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:708 +#: perllib/FixMyStreet/DB/Result/Problem.pm:696 msgid "Sent to %s %s later" msgstr "PoÅ¡alji %s %s naknadno" @@ -2765,15 +2638,13 @@ msgstr "Poslano:" msgid "Service:" msgstr "Servis:" -#: templates/web/fixmystreet/report/display.html:38 +#: templates/web/base/report/display_tools.html:14 msgid "Share" msgstr "Podijeli" -#: templates/web/base/report/new/fill_in_details_form.html:193 -#: templates/web/base/report/update-form.html:158 -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:23 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:59 -#: templates/web/fixmystreet/report/update-form.html:146 +#: templates/web/base/report/new/form_user_loggedin.html:23 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:22 +#: templates/web/base/report/update/form_name.html:15 msgid "Show my name publicly" msgstr "Prikaži moje ime javno" @@ -2785,9 +2656,9 @@ msgstr "Prikaži staro" msgid "Show pins" msgstr "Prikaži pinove" +#: templates/web/base/auth/general.html:100 #: templates/web/base/auth/general.html:3 -#: templates/web/base/auth/general.html:40 -#: templates/web/base/auth/general.html:61 +#: templates/web/base/auth/general.html:76 #: templates/web/zurich/auth/general.html:18 #: templates/web/zurich/auth/general.html:35 msgid "Sign in" @@ -2814,7 +2685,7 @@ msgid "" " sent from your FixMyStreet installation." msgstr "" -#: templates/web/base/alert/index.html:42 +#: templates/web/base/alert/index.html:40 msgid "Some photos of recent reports" msgstr "Fotografije nedavnih prijava" @@ -2824,7 +2695,7 @@ msgstr "Fotografije nedavnih prijava" msgid "Some text to localize" msgstr "Tekst za lakÅ¡u lokalizaciju" -#: perllib/FixMyStreet/Cobrand/UK.pm:78 +#: perllib/FixMyStreet/Cobrand/UK.pm:79 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover." msgstr "Žao nam je,ne pokrivamo podruÄje na kojem se nalazi taj problem." @@ -2836,23 +2707,34 @@ msgstr "" msgid "Sorry, there has been an error confirming your problem." msgstr "Žao nam je, doÅ¡lo je do greÅ¡ke pri potvrÄ‘ivanju problema." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:221 -#: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:37 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:216 +#: perllib/FixMyStreet/Geocode.pm:38 perllib/FixMyStreet/Geocode/Bing.pm:38 #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:56 #: perllib/FixMyStreet/Geocode/OSM.pm:48 msgid "Sorry, we could not find that location." msgstr "Žao nam je, ne možemo pronaći tu lokaciju." -#: perllib/FixMyStreet/Geocode/Bing.pm:34 +#: templates/web/base/auth/general.html:9 +#: templates/web/base/report/display.html:21 +#: templates/web/base/report/new/fill_in_details_form.html:23 +#, fuzzy +msgid "Sorry, we could not log you in. Please fill in the form below." +msgstr "Žao nam je, nije moguće analizirati tu lokaciju. Molimo pokuÅ¡ajte ponovno." + +#: perllib/FixMyStreet/Geocode/Bing.pm:35 #: perllib/FixMyStreet/Geocode/Google.pm:45 #: perllib/FixMyStreet/Geocode/Zurich.pm:88 msgid "Sorry, we could not parse that location. Please try again." msgstr "Žao nam je, nije moguće analizirati tu lokaciju. Molimo pokuÅ¡ajte ponovno." #: perllib/FixMyStreet/App/Model/PhotoSet.pm:134 -#, fuzzy msgid "Sorry, we couldn't save your image(s), please try again." -msgstr "Žao nam je, nije moguće analizirati tu lokaciju. Molimo pokuÅ¡ajte ponovno." +msgstr "" + +#: perllib/FixMyStreet/App/Controller/AuthSS.pm:301 +#, fuzzy +msgid "Sorry, you can not log in with Facebook. Please try again later." +msgstr "DoÅ¡lo je do problema pri uÄitavanju ove stranice. Molimo pokuÅ¡ajte ponovno." #: templates/web/base/admin/stats.html:64 msgid "Start Date:" @@ -2862,13 +2744,12 @@ msgstr "" #: templates/web/base/admin/flagged.html:18 #: templates/web/base/admin/list_updates.html:11 #: templates/web/base/admin/reports.html:15 -#: templates/web/fixmystreet/report/update-form.html:26 +#: templates/web/base/report/update/form_update.html:32 msgid "State" msgstr "Stanje" #: templates/web/base/admin/report_edit.html:47 #: templates/web/base/admin/update_edit.html:27 -#: templates/web/base/report/update-form.html:28 #: templates/web/zurich/admin/report_edit-sdm.html:73 #: templates/web/zurich/admin/report_edit.html:101 #: templates/web/zurich/admin/report_edit.html:155 @@ -2876,7 +2757,7 @@ msgstr "Stanje" msgid "State:" msgstr "Stanje:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1282 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1291 #: perllib/FixMyStreet/Cobrand/Zurich.pm:387 #: templates/web/base/admin/stats.html:1 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:73 @@ -2898,7 +2779,7 @@ msgstr "I dalje otvoreno, putem upitnika %s" msgid "Street View" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:406 +#: perllib/FixMyStreet/Script/Reports.pm:184 msgid "Subcategory: %s" msgstr "" @@ -2906,30 +2787,25 @@ msgstr "" msgid "Subdivision/Body" msgstr "" -#: templates/web/fixmystreet/contact/index.html:98 +#: templates/web/base/contact/index.html:90 msgid "Subject" msgstr "Predmet" #: templates/web/base/admin/report_edit.html:19 -#: templates/web/base/contact/index.html:88 -#: templates/web/base/report/new/fill_in_details_form.html:53 #: templates/web/zurich/admin/report_edit.html:39 msgid "Subject:" msgstr "Predmet:" #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/fill_in_details_form.html:137 -#: templates/web/base/report/new/fill_in_details_form.html:159 -#: templates/web/base/report/new/fill_in_details_form.html:96 -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:36 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:23 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:76 +#: templates/web/base/report/new/form_user_loggedin.html:36 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:39 +#: templates/web/base/report/new/form_user_loggedout_password.html:11 #: templates/web/zurich/report/new/fill_in_details_form.html:96 msgid "Submit" msgstr "PoÅ¡alji" -#: templates/web/base/admin/report_edit.html:95 -#: templates/web/base/admin/update_edit.html:65 +#: templates/web/base/admin/report_edit.html:101 +#: templates/web/base/admin/update_edit.html:75 #: templates/web/base/admin/user-form.html:56 #: templates/web/zurich/admin/report_edit-sdm.html:137 #: templates/web/zurich/admin/report_edit.html:268 @@ -2937,7 +2813,7 @@ msgstr "PoÅ¡alji" msgid "Submit changes" msgstr "PoÅ¡alji promjene" -#: templates/web/base/questionnaire/index.html:97 +#: templates/web/base/questionnaire/index.html:106 msgid "Submit questionnaire" msgstr "PoÅ¡alji upitnik" @@ -2953,9 +2829,8 @@ msgid "Submitted" msgstr "" #: templates/web/base/alert/updates.html:17 -#: templates/web/base/report/display.html:46 +#: templates/web/base/report/display_tools.html:41 #: templates/web/fixmystreet/alert/updates.html:23 -#: templates/web/fixmystreet/report/display.html:65 msgid "Subscribe" msgstr "Pretplati se" @@ -2963,7 +2838,7 @@ msgstr "Pretplati se" msgid "Subscribe me to an email alert" msgstr "Pretplati se na e-mail upozorenja" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1275 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1284 #: perllib/FixMyStreet/Cobrand/Zurich.pm:383 #: templates/web/base/admin/bodies.html:25 #: templates/web/base/admin/index.html:1 @@ -2982,7 +2857,7 @@ msgstr "Sažetak" msgid "Summary reports" msgstr "Sažetak prijava" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1279 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1288 msgid "Survey" msgstr "" @@ -2996,9 +2871,8 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/Zurich.pm:394 #: templates/web/zurich/header.html:77 -#, fuzzy msgid "Templates" -msgstr "Ažuriranja" +msgstr "" #: templates/web/base/admin/list_updates.html:12 #: templates/web/zurich/admin/templates.html:9 @@ -3019,7 +2893,7 @@ msgstr "Tekst:" msgid "Thank you for reporting this issue!" msgstr "" -#: templates/web/base/tokens/error.html:7 +#: templates/web/base/tokens/error.html:6 msgid "Thank you for trying to confirm your update or problem. We seem to have an error ourselves though, so <a href=\"%s\">please let us know what went on</a> and we'll look into it." msgstr "Zahvaljujemo se na pokuÅ¡aju slanja vaÅ¡e nadopune ili problema. Izgleda da imamo problem pa<a href=\"%s\">vas molimo da nam pojasnite Å¡to se dogodilo</a> te ćemo pokuÅ¡ati popraviti." @@ -3054,23 +2928,23 @@ msgstr "Lokacija se ne nalazi u Hrvatskoj. Molimo pokuÅ¡ajte ponovno." #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:47 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:63 -#: perllib/FixMyStreet/Cobrand/UK.pm:71 +#: perllib/FixMyStreet/Cobrand/UK.pm:72 msgid "That postcode was not recognised, sorry." msgstr "Žao nam je, poÅ¡tanski broj nije prepoznat." -#: perllib/FixMyStreet/App/Controller/Admin.pm:726 +#: perllib/FixMyStreet/App/Controller/Admin.pm:724 msgid "That problem has been marked as sent." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:718 +#: perllib/FixMyStreet/App/Controller/Admin.pm:716 msgid "That problem will now be resent." msgstr "Navedeni problem će biti ponovno poslan" -#: perllib/FixMyStreet/App/Controller/Report.pm:125 +#: perllib/FixMyStreet/App/Controller/Report.pm:127 msgid "That report cannot be viewed on %s." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:119 +#: perllib/FixMyStreet/App/Controller/Report.pm:121 msgid "That report has been removed from FixMyStreet." msgstr "Navedena prijava je uklonjena s Popravi.to" @@ -3101,7 +2975,7 @@ msgid "" " If you leave this blank, <strong>send method defaults to email</strong>." msgstr "" -#: templates/web/base/open311/index.html:90 +#: templates/web/base/open311/index.html:82 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 "Open311 v2 atribut agency_responsible koristi se za popis uprava koje su zaprimile prijavu problema te ne odgovara posve naÄinu na koji je atribut definiran u specifikaciji Open311 v2." @@ -3122,12 +2996,12 @@ msgstr "" msgid "The diligency prize league table shows editors' activity (who's been editing the most records)." msgstr "" -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:60 -#: perllib/FixMyStreet/App/Controller/Reports.pm:79 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:61 +#: perllib/FixMyStreet/App/Controller/Reports.pm:80 msgid "The error was: %s" msgstr "GreÅ¡ka je: %s" -#: templates/web/base/open311/index.html:86 +#: templates/web/base/open311/index.html:78 msgid "The following Open311 v2 attributes are returned for each request: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code and service_name." msgstr "" @@ -3174,8 +3048,7 @@ msgstr "" msgid "The passwords do not match" msgstr "Lozinke se ne podudaraju" -#: templates/web/base/errors/page_error_404_not_found.html:10 -#: templates/web/base/errors/page_error_404_not_found.html:12 +#: templates/web/base/errors/page_error_404_not_found.html:9 msgid "The requested URL '%s' was not found on this server" msgstr "Traženi URL '%s' nije pronaÄ‘en na ovom serveru" @@ -3185,12 +3058,11 @@ msgstr "Dojavljivanja problema preko karte:" #: templates/web/base/report/new/councils_extra_text.html:1 #: templates/web/base/report/new/councils_text_some.html:10 -#: templates/web/base/report/new/fill_in_details_form.html:18 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:14 +#: templates/web/base/report/new/fill_in_details_form.html:13 msgid "The summary and description will also be made public (see our <a href=\"/privacy\">privacy policy</a>)." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:315 +#: perllib/FixMyStreet/Script/Reports.pm:92 msgid "The user could not locate the problem on a map, but to see the area around the location they entered" msgstr "Korisnik nije mogao locirati problem na karti, ali možete vidjeti podruÄje oko navedene lokacije" @@ -3207,18 +3079,18 @@ msgstr "" msgid "There are no reports to show." msgstr "" -#: perllib/FixMyStreet/App/Controller/Reports.pm:76 +#: perllib/FixMyStreet/App/Controller/Reports.pm:77 msgid "There was a problem showing the All Reports page. Please try again later." msgstr "DoÅ¡lo je do problema pri uÄitavanju svih prijava. Molimo pokuÅ¡ajte ponovno." #: perllib/FixMyStreet/App/Controller/Contact.pm:137 -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:59 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:60 msgid "There was a problem showing this page. Please try again later." msgstr "DoÅ¡lo je do problema pri uÄitavanju ove stranice. Molimo pokuÅ¡ajte ponovno." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:769 -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:134 -#: templates/web/base/auth/general.html:26 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:764 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:138 +#: templates/web/base/auth/general.html:43 #: templates/web/zurich/auth/general.html:28 msgid "There was a problem with your email/password combination. If you cannot remember your password, or do not have one, please fill in the ‘sign in by email’ section of the form." msgstr "DoÅ¡lo je do problema s kombinacijom VaÅ¡eg e-maila i lozinke.Ako se ne možete sjetiti ili nemate lozinku, molimo odaberite ‘ model prijave putem e-maila ’." @@ -3227,7 +3099,7 @@ msgstr "DoÅ¡lo je do problema s kombinacijom VaÅ¡eg e-maila i lozinke.Ako se ne msgid "There was a problem with your email/password combination. Please try again." msgstr "DoÅ¡lo je do problema s kombinacijom VaÅ¡e e-maila i lozinke. Molimo pokuÅ¡ajte ponovno." -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:272 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:336 msgid "There was a problem with your update. Please try again." msgstr "DoÅ¡lo je do problema pri ažuriranju. Molimo pokuÅ¡ajte ponovno." @@ -3235,7 +3107,7 @@ msgstr "DoÅ¡lo je do problema pri ažuriranju. Molimo pokuÅ¡ajte ponovno." msgid "There were problems with your report. Please see below." msgstr "DoÅ¡lo je do problema pri prijavi. Detalje pogledajte u nastavku." -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:300 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:371 msgid "There were problems with your update. Please see below." msgstr "DoÅ¡lo je do problema pri ažuriranju. Detalje pogledajte u nastavku." @@ -3249,7 +3121,7 @@ msgid "" " " msgstr "" -#: templates/web/base/open311/index.html:77 +#: templates/web/base/open311/index.html:69 msgid "This API implementation is work in progress and not yet stabilized. It will change without warnings in the future." msgstr "Razvoj API implementacije je u tijeku te joÅ¡ nije stabilizrana. Ubuduće će se mijenjati bez upozorenja." @@ -3271,18 +3143,18 @@ msgid "" " A body will not receive any reports unless it covers at least one area." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:413 +#: perllib/FixMyStreet/Script/Reports.pm:191 msgid "This email has been sent to both councils covering the location of the problem, as the user did not categorise it; please ignore it if you're not the correct council to deal with the issue, or let us know what category of problem this is so we can add it to our system." msgstr "Kako korisnik nije kategorizirao problem ,ovaj e-mail poslan je oboma odgovornim tijelima koji pokrivaju mjesto problema. Molimo vas da zanemarite e-mail ukoliko problem ne ulazi u vaÅ¡e podruÄje ili nam javite o kakvoj je kategoriji problema rijeÄ kako bismo ga unijeli u naÅ¡ sustav." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:416 +#: perllib/FixMyStreet/Script/Reports.pm:194 msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue." msgstr "Kako je odabrana kategorija predviÄ‘ena za viÅ¡e odgovornih tijela, ovaj e-mail poslan je na adrese nekoliko ureda koje prekrivaju mjesto problema. Molimo vas da zanemarite e-mail ukoliko niste nadležni za ovaj problem." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:925 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:995 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:920 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:990 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:142 -#: perllib/FixMyStreet/Cobrand/UK.pm:43 +#: perllib/FixMyStreet/Cobrand/UK.pm:44 msgid "This information is required" msgstr "Potrebna informacija" @@ -3294,56 +3166,37 @@ msgstr "Ovo je stranica za razvojne programere; ovdje se sve može prekinuti u b msgid "This is a summary of all reports on this site." msgstr "" -#: templates/web/zurich/auth/token.html:8 -msgid "This may be because the link is too old or already used, or the address was not copied correctly." -msgstr "" - -#: templates/web/base/report/banner.html:15 -msgid "This problem has been closed" -msgstr "Problem je zatvoren" - -#: templates/web/base/report/banner.html:12 -#: templates/web/base/report/update-form.html:48 -#: templates/web/fixmystreet/report/update-form.html:46 +#: templates/web/base/report/update/form_update.html:52 msgid "This problem has been fixed" msgstr "Problem je rijeÅ¡en" -#: templates/web/base/report/update-form.html:43 -#: templates/web/fixmystreet/report/update-form.html:40 +#: templates/web/base/report/update/form_update.html:46 msgid "This problem has not been fixed" msgstr "Problem joÅ¡ nije rijeÅ¡en" -#: templates/web/base/report/banner.html:19 -msgid "This problem is in progress" -msgstr "Problem je i dalje aktualan" - -#: templates/web/base/report/banner.html:9 -msgid "This problem is old and of unknown status." -msgstr "Odabrani problem je star i nismo upoznati s trenutnim stanjem." - #: perllib/FixMyStreet/Cobrand/Zurich.pm:168 #: perllib/FixMyStreet/Cobrand/Zurich.pm:169 #: templates/web/zurich/report/_main.html:14 msgid "This report is awaiting moderation." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:86 +#: perllib/FixMyStreet/Script/Alerts.pm:94 msgid "This report is currently marked as closed." msgstr "Ova prijava je trenutno oznaÄena kao zatvorena." -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:84 +#: perllib/FixMyStreet/Script/Alerts.pm:92 msgid "This report is currently marked as fixed." msgstr "Prijava je trenutno oznaÄena kao popravljena." -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:88 +#: perllib/FixMyStreet/Script/Alerts.pm:96 msgid "This report is currently marked as open." msgstr "Prijava je trenutno oznaÄena kao otvorena." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:326 +#: perllib/FixMyStreet/Script/Reports.pm:105 msgid "This report was submitted anonymously" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:308 +#: perllib/FixMyStreet/Script/Reports.pm:85 msgid "This web page also contains a photo of the problem, provided by the user." msgstr "Stranica sadrži i fotografiju problem, dodanu od strane korisnika." @@ -3354,7 +3207,7 @@ msgstr "Stranica sadrži i fotografiju problem, dodanu od strane korisnika." msgid "Time spent (in minutes):" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1278 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1287 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "Vremenska skala" @@ -3366,24 +3219,22 @@ msgid "Title" msgstr "Naslov" #: templates/web/zurich/admin/template_edit.html:20 -#, fuzzy msgid "Title:" -msgstr "Naslov" +msgstr "" #: templates/web/base/alert/index.html:25 -#, fuzzy msgid "To find out what local alerts we have for you, please enter your %s postcode or street name and area:" -msgstr "Kako biste vidjeli lokalne probleme,molimo Vas da unesete poÅ¡tanski broj ili naziv ulice i podruÄje." +msgstr "" #: templates/web/base/alert/index.html:27 msgid "To find out what local alerts we have for you, please enter your postcode or street name and area" msgstr "Kako biste vidjeli lokalne probleme,molimo Vas da unesete poÅ¡tanski broj ili naziv ulice i podruÄje." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:314 +#: perllib/FixMyStreet/Script/Reports.pm:91 msgid "To view a map of the precise location of this issue" msgstr "Karta toÄne lokacije ovog problema" -#: templates/web/base/admin/index.html:61 +#: templates/web/base/admin/index.html:54 #: templates/web/base/admin/questionnaire.html:24 #: templates/web/base/admin/stats.html:24 #: templates/web/base/admin/stats.html:43 @@ -3401,10 +3252,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:12 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:33 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:31 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:37 msgid "Unable to fix" msgstr "" @@ -3417,7 +3266,7 @@ msgstr "" msgid "Unconfirmed" msgstr "NepotvrÄ‘eno" -#: templates/web/fixmystreet/report/banner.html:9 +#: templates/web/base/report/banner.html:9 msgid "Unknown" msgstr "Nepoznato" @@ -3425,17 +3274,18 @@ msgstr "Nepoznato" msgid "Unknown alert type" msgstr "Nepoznat tip upozorenja" +#: perllib/FixMyStreet/App/Controller/Photo.pm:110 #: templates/web/base/js/translation_strings.html:39 msgid "Unknown error" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:103 -#: perllib/FixMyStreet/App/Controller/Report.pm:109 -#: perllib/FixMyStreet/App/Controller/Report.pm:112 +#: perllib/FixMyStreet/App/Controller/Report.pm:105 +#: perllib/FixMyStreet/App/Controller/Report.pm:111 +#: perllib/FixMyStreet/App/Controller/Report.pm:114 msgid "Unknown problem ID" msgstr "Nepoznat IB problema" -#: templates/web/fixmystreet/report/update-form.html:19 +#: templates/web/base/report/update/form_update.html:25 msgid "Update" msgstr "Ažuriranje" @@ -3443,13 +3293,11 @@ msgstr "Ažuriranje" msgid "Update %s created for problem %d; by %s" msgstr "Problem %s ažurirao %d; korisnik %s" -#: templates/web/base/contact/index.html:21 -#: templates/web/fixmystreet/contact/index.html:36 +#: templates/web/base/contact/index.html:28 msgid "Update below added anonymously at %s" msgstr "Ažuriranje u nastavku dodao je anonimni korisnik u %s" -#: templates/web/base/contact/index.html:23 -#: templates/web/fixmystreet/contact/index.html:38 +#: templates/web/base/contact/index.html:30 msgid "Update below added by %s at %s" msgstr "Ažuriranje u nastavku dodao %s u %s" @@ -3458,7 +3306,7 @@ msgstr "Ažuriranje u nastavku dodao %s u %s" msgid "Update body" msgstr "" -#: templates/web/base/admin/index.html:55 +#: templates/web/base/admin/index.html:48 msgid "Update breakdown by state" msgstr "" @@ -3483,20 +3331,16 @@ msgstr "Ažuriranjem je problem ponovno otvoren" msgid "Update statuses" msgstr "Status ažuriranja" -#: templates/web/base/report/update-form.html:22 -msgid "Update:" -msgstr "Ažuriranje:" - #: templates/web/zurich/admin/index-dm.html:23 #: templates/web/zurich/admin/index-sdm.html:21 #: templates/web/zurich/admin/reports.html:13 msgid "Updated" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1045 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1103 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1147 -#: perllib/FixMyStreet/App/Controller/Admin.pm:822 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1048 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1108 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1156 +#: perllib/FixMyStreet/App/Controller/Admin.pm:821 #: perllib/FixMyStreet/Cobrand/Zurich.pm:771 #: perllib/FixMyStreet/Cobrand/Zurich.pm:796 #: perllib/FixMyStreet/Cobrand/Zurich.pm:866 @@ -3504,13 +3348,12 @@ msgid "Updated!" msgstr "Ažurirano!" #: templates/web/base/admin/list_updates.html:2 -#: templates/web/base/report/update.html:3 -#: templates/web/fixmystreet/report/update.html:5 +#: templates/web/base/report/update.html:5 #: templates/web/zurich/report/updates.html:2 msgid "Updates" msgstr "Ažuriranja" -#: perllib/FixMyStreet/DB/Result/Comment.pm:132 +#: perllib/FixMyStreet/DB/Result/Comment.pm:131 msgid "Updates are limited to %s characters in length. Please shorten your update" msgstr "" @@ -3520,12 +3363,9 @@ msgstr "Ažuriranja za {{naslov}}" #. ("%s is the site name") #: templates/web/base/report/display.html:0 -#: templates/web/base/report/display.html:5 -#: templates/web/fixmystreet/report/display.html:0 -#: templates/web/fixmystreet/report/display.html:9 -#, fuzzy +#: templates/web/base/report/display.html:9 msgid "Updates to this problem, %s" -msgstr "Ažuriranja za ovaj problem,Popravi.to" +msgstr "" #: templates/web/base/admin/body.html:182 msgid "Use the <strong>note</strong> to record details that are only displayed in the admin. Notes are not shown publicly, and are not sent to the body." @@ -3533,15 +3373,14 @@ msgstr "" #: templates/web/zurich/admin/report_edit-sdm.html:48 #: templates/web/zurich/admin/report_edit.html:67 -#, fuzzy msgid "Used map" -msgstr "koriÅ¡tena karta" +msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1452 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1461 msgid "User flag removed" msgstr "KorisniÄka oznaka uklonjena" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1424 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1433 msgid "User flagged" msgstr "Korisnik oznaÄen" @@ -3549,7 +3388,7 @@ msgstr "Korisnik oznaÄen" msgid "User search finds matches in users' names and email addresses." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1280 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1289 #: perllib/FixMyStreet/Cobrand/Zurich.pm:399 #: templates/web/base/admin/flagged.html:29 #: templates/web/zurich/header.html:69 @@ -3580,7 +3419,6 @@ msgid "Viewing a location" msgstr "Prikaz lokacije" #: templates/web/base/report/display.html:0 -#: templates/web/fixmystreet/report/display.html:0 msgid "Viewing a problem" msgstr "Prikaz problema" @@ -3593,25 +3431,24 @@ msgstr "Općine ove županije" 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 "PronaÄ‘eno je viÅ¡e rezultata za tnavedenulokaciju. Prikazano je do deset rezlutata. Ukoliko nije naveden traženi problem, molimo pokuÅ¡ajte s drugom pretragom." -#: templates/web/zurich/auth/token.html:7 -msgid "We have not been able to confirm your account - sorry." -msgstr "" - -#: templates/web/zurich/auth/token.html:17 -msgid "We have sent you an email containing a link to confirm your account." -msgstr "Poslali smo Vam e-mail s linkom za potvrdu korisniÄkog raÄuna." +#: templates/web/base/auth/general.html:6 +#: templates/web/base/report/display.html:27 +#: templates/web/base/report/new/oauth_email_form.html:5 +#, fuzzy +msgid "We need your email address, please give it below." +msgstr "Nikada ne prikazujemo vaÅ¡u e-mail adresu ili telefonski broj." -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:2 -#: templates/web/fixmystreet/report/update-form.html:77 +#: templates/web/base/report/new/form_user_loggedout_email.html:2 +#: templates/web/base/report/update/form_user_loggedout_email.html:2 msgid "We never show your email" msgstr "Nikada ne prikazujemo vaÅ¡u e-mail adresu" -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:31 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:65 +#: templates/web/base/report/new/form_user_loggedin.html:31 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:28 msgid "We never show your email address or phone number." msgstr "Nikada ne prikazujemo vaÅ¡u e-mail adresu ili telefonski broj." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:422 +#: perllib/FixMyStreet/Script/Reports.pm:200 msgid "We realise this problem might be the responsibility of %s; however, we don't currently have any contact details for them. If you know of an appropriate contact address, please do get in touch." msgstr "Shvaćamo da bi za ovaj problem moglo biti odgovorno% s, meÄ‘utim, trenutno nemamo nikakve pojedinosti o njihovom kontaktu. Ako znate odgovarajuću kontakt adresu, molimo Vas da nam se javite." @@ -3628,10 +3465,6 @@ msgstr "VaÅ¡e privatne podatke koristimo u skladu s naÅ¡im <a href=\"/privacy\"> msgid "We’re sorry to hear the problem’s not fixed. Why not try writing to your local representatives?" msgstr "" -#: templates/web/base/contact/blurb.html:8 -msgid "We'd love to hear what you think about this site. Just fill in the form, or send an email to <a href='mailto:%s'>%s</a>:" -msgstr "Rado bismo Äuli VaÅ¡e miÅ¡ljenje o ovoj stranici. Da biste to uÄinili, dovoljno je ispuniti obrazac ili poslati e-mail na <a href='mailto:%s'>%s</a>:" - #: templates/web/base/contact/submit.html:7 msgid "We’ll get back to you as soon as we can." msgstr "" @@ -3640,7 +3473,7 @@ msgstr "" msgid "What was your experience of getting the problem fixed?" msgstr "" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:49 +#: templates/web/base/report/new/form_report.html:19 msgid "What’s the issue, and where is it?" msgstr "" @@ -3653,7 +3486,11 @@ msgstr "Prilikom ažuriranja" msgid "When sent" msgstr "Prilikom slanja" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:640 +#: templates/web/base/js/translation_strings.html:50 +msgid "Whoa there Testino! Three photos are enough." +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Report/New.pm:635 msgid "Whole block of empty flats" msgstr "Cijeli blok praznih stanova" @@ -3668,7 +3505,7 @@ msgstr "" msgid "Wish" msgstr "" -#: templates/web/base/open311/index.html:92 +#: templates/web/base/open311/index.html:84 msgid "With request searches, it is also possible to search for agency_responsible to limit the requests to those sent to a single administration. The search term is the administration ID provided by <a href=\"%s\">MaPit</a>." msgstr "Osim pretraživanja prijava, moguće je pretražiti i odgovorne_agencije kako biste ograniÄili prijave na one poslane odreÄ‘enom uredu. Pojam za pretraživanje je IB pojedinog ureda kojeg možete saznati pomoću <a href=\"%s\">MaPit</a>." @@ -3676,7 +3513,7 @@ msgstr "Osim pretraživanja prijava, moguće je pretražiti i odgovorne_agenc msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"http://fixmystreet.org\">available at fixmystreet.org</a>." msgstr "" -#: templates/web/base/questionnaire/index.html:87 +#: templates/web/base/questionnaire/index.html:96 msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?" msgstr "Želite li za 4 tjedna primiti joÅ¡ jedan upitnik koji bi Vas podsjetio da provjerite status?" @@ -3685,7 +3522,6 @@ msgid "Writing your message entirely in block capitals makes it hard to read, as msgstr "Pisanje velikim tiskanim slovima i bez interpunkcijskih znakova Äini poruku teÅ¡ko Äitljivom." #: templates/web/base/report/new/fill_in_details_form.html:4 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:5 msgid "Wrong location? Just click again on the map." msgstr "" @@ -3708,27 +3544,24 @@ msgstr "Godina" #: templates/web/base/admin/users.html:31 #: templates/web/base/questionnaire/creator_fixed.html:14 #: templates/web/base/questionnaire/index.html:51 -#: templates/web/base/questionnaire/index.html:90 +#: templates/web/base/questionnaire/index.html:99 msgid "Yes" msgstr "Da" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:17 -#: templates/web/fixmystreet/report/update-form.html:91 +#: templates/web/base/report/new/form_user_loggedout_password.html:5 +#: templates/web/base/report/update/form_user_loggedout_password.html:4 msgid "Yes I have a password" msgstr "Da, imam lozinku" -#: templates/web/base/contact/index.html:39 -#: templates/web/fixmystreet/contact/index.html:54 +#: templates/web/base/contact/index.html:46 msgid "You are complaining that this problem report was unnecessarily moderated:" msgstr "" -#: templates/web/base/contact/index.html:41 -#: templates/web/fixmystreet/contact/index.html:56 +#: templates/web/base/contact/index.html:48 msgid "You are reporting the following problem report for being abusive, containing personal information, or similar:" msgstr "Sljedeće izvješće o problemu prijavljujete jer je uvredljivo, sadrži osobne podatke ili sliÄno:" -#: templates/web/base/contact/index.html:15 -#: templates/web/fixmystreet/contact/index.html:30 +#: templates/web/base/contact/index.html:22 msgid "You are reporting the following update for being abusive, containing personal information, or similar:" msgstr "Sljedeće ažuriranje prijavljujete jer je uvredljivo, sadrži osobne podatke ili sliÄno:" @@ -3741,7 +3574,7 @@ msgstr "" msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create." msgstr "" -#: templates/web/fixmystreet/contact/index.html:121 +#: templates/web/base/contact/index.html:113 msgid "You can contact technical support on <a href='mailto:%s'>%s</a>" msgstr "" @@ -3752,8 +3585,8 @@ msgid "" " reports in the past." msgstr "" -#: templates/web/base/report/new/councils_text_none.html:10 -#: templates/web/base/report/new/councils_text_none.html:2 +#: templates/web/base/report/new/councils_text_none.html:12 +#: templates/web/base/report/new/councils_text_none.html:14 #: templates/web/base/report/new/councils_text_some.html:19 #: templates/web/base/report/new/councils_text_some.html:21 msgid "You can help us by finding a contact email address for local problems for %s and emailing it to us at <a href='mailto:%s'>%s</a>." @@ -3771,21 +3604,16 @@ msgstr "" msgid "You have already answered this questionnaire. If you have a question, please <a href='%s'>get in touch</a>, or <a href='%s'>view your problem</a>.\n" msgstr "Već ste ogovorili na upitnik. Ako imate nekih pitanja, molimo da nam<a href='%s'>se javite</a>, ili<a href='%s'>pregledate problem koji vas zanima</a>.\n" -#: templates/web/base/questionnaire/index.html:77 -#: templates/web/base/report/new/fill_in_details_form.html:75 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:73 -msgid "You have already attached a photo to this report, attaching another one will replace it." -msgstr "Već ste priložiti fotografiju ovoj prijavi, ako dodate novu, zamijenit će prethodno postojeću." - -#: templates/web/base/report/update-form.html:59 -#: templates/web/fixmystreet/report/update-form.html:56 -msgid "You have already attached a photo to this update, attaching another one will replace it." -msgstr "Već ste priložiti fotografiju ovom ažuriranju, ako dodate novu, zamijenit će prethodno postojeću." - -#: templates/web/zurich/report/new/fill_in_details_form.html:61 +#: templates/web/base/report/new/form_report.html:32 +#: templates/web/zurich/report/new/fill_in_details_form.html:55 msgid "You have already attached photos to this report. Note that you can attach a maximum of 3 to this report (if you try to upload more, the oldest will be removed)." msgstr "" +#: templates/web/base/questionnaire/index.html:83 +#: templates/web/base/report/update/form_update.html:14 +msgid "You have already attached photos to this update. Note that you can attach a maximum of 3 to this update (if you try to upload more, the oldest will be removed)." +msgstr "" + #: templates/web/base/auth/sign_out.html:4 #: templates/web/zurich/auth/sign_out.html:3 msgid "You have been signed out" @@ -3800,9 +3628,8 @@ msgstr "Locirali ste problem na mjestu oznaÄenom zelenom iglom na karti. Ako to msgid "You have successfully confirmed your email address." msgstr "" -#: templates/web/base/report/display.html:20 -#: templates/web/base/report/new/fill_in_details.html:37 -#: templates/web/fixmystreet/report/display.html:17 +#: templates/web/base/report/display.html:17 +#: templates/web/base/report/new/login_success_form.html:3 msgid "You have successfully signed in; please check and confirm your details are accurate:" msgstr "UapjeÅ¡no ste se prijavili; molimo provjerite i potvrdite toÄnost VaÅ¡ih podataka:" @@ -3831,53 +3658,42 @@ msgid "Your Reports" msgstr "VaÅ¡e prijave" #: templates/web/base/alert/_list.html:89 +#: templates/web/base/contact/index.html:83 +#: templates/web/base/report/display_tools.html:38 +#: templates/web/base/report/display_tools.html:40 +#: templates/web/base/report/new/form_user_loggedin.html:3 +#: templates/web/base/report/new/form_user_loggedout_email.html:1 +#: templates/web/base/report/update/form_user_loggedout_email.html:1 #: templates/web/fixmystreet/alert/updates.html:19 #: templates/web/fixmystreet/alert/updates.html:22 -#: templates/web/fixmystreet/contact/index.html:91 -#: templates/web/fixmystreet/report/display.html:62 -#: templates/web/fixmystreet/report/display.html:64 -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:3 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:1 -#: templates/web/fixmystreet/report/update-form.html:76 #: templates/web/zurich/report/new/fill_in_details_form.html:76 msgid "Your email" msgstr "VaÅ¡ e-mail" -#: templates/web/base/auth/general.html:28 -#: templates/web/fixmystreet/report/update-form.html:82 +#: templates/web/base/auth/general.html:45 +#: templates/web/base/report/update/form_user_loggedout_email.html:7 #: templates/web/zurich/auth/general.html:30 #: templates/web/zurich/auth/general.html:58 msgid "Your email address" msgstr "VaÅ¡a e-mail adresa" -#: templates/web/base/report/new/fill_in_details_form.html:106 -#: templates/web/base/report/update-form.html:81 -msgid "Your email:" -msgstr "VaÅ¡ e-mail:" - -#: templates/web/fixmystreet/report/updates-sidebar-notes.html:7 +#: templates/web/base/report/updates-sidebar-notes.html:3 msgid "Your information will only be used in accordance with our <a href=\"/privacy\">privacy policy</a>" msgstr "VaÅ¡e informacije će se koristiti iskljuÄivo u skladu s naÅ¡im<a href=\"/privacy\">pravilima o privatnosti</a>" -#: templates/web/base/auth/general.html:51 -#: templates/web/fixmystreet/contact/index.html:84 -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:18 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:54 -#: templates/web/fixmystreet/report/update-form.html:142 +#: templates/web/base/auth/general.html:90 +#: templates/web/base/contact/index.html:76 +#: templates/web/base/report/new/form_user_loggedin.html:18 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:17 +#: templates/web/base/report/update/form_name.html:11 #: templates/web/zurich/auth/general.html:61 #: templates/web/zurich/report/new/fill_in_details_form.html:86 msgid "Your name" msgstr "Ime" -#: templates/web/base/contact/index.html:73 -#: templates/web/base/report/new/fill_in_details_form.html:186 -#: templates/web/base/report/update-form.html:152 -msgid "Your name:" -msgstr "Ime:" - -#: templates/web/base/auth/general.html:39 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:22 -#: templates/web/fixmystreet/report/update-form.html:96 +#: templates/web/base/auth/general.html:75 +#: templates/web/base/report/new/form_user_loggedout_password.html:10 +#: templates/web/base/report/update/form_user_loggedout_password.html:9 #: templates/web/zurich/auth/general.html:34 msgid "Your password" msgstr "Lozinka" @@ -3886,15 +3702,16 @@ msgstr "Lozinka" msgid "Your password has been changed" msgstr "VaÅ¡a lozinka je promijenjena" -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:27 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:63 +#: templates/web/base/report/new/form_user_loggedin.html:27 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:26 #: templates/web/zurich/report/new/fill_in_details_form.html:92 msgid "Your phone number" msgstr "VaÅ¡ broj telefona" #: templates/web/base/questionnaire/index.html:14 +#, fuzzy msgid "Your report" -msgstr "VaÅ¡a prijava" +msgstr "VaÅ¡e prijave" #: templates/web/base/footer.html:9 templates/web/fixmystreet/footer.html:29 msgid "Your reports" @@ -3904,23 +3721,17 @@ msgstr "VaÅ¡e prijave" msgid "Your updates" msgstr "VaÅ¡a ažuriranja" -#: templates/web/base/contact/index.html:81 -msgid "Your email:" -msgstr "VaÅ¡ e-mail:" - #: templates/web/base/reports/_list-filters.html:3 -#, fuzzy msgid "all reports" -msgstr "Sve prijave" +msgstr "" #: templates/web/base/admin/timeline.html:4 msgid "by %s" msgstr "od %s" #: templates/web/base/reports/_list-filters.html:5 -#, fuzzy msgid "closed reports" -msgstr "Zatvorene prijave" +msgstr "" #: templates/web/base/reports/body.html:6 #: templates/web/base/reports/body.html:7 @@ -3942,17 +3753,16 @@ msgid "edit user" msgstr "" #: templates/web/base/reports/_list-filters.html:6 -#, fuzzy msgid "fixed reports" -msgstr "Popravljene prijave" +msgstr "" -#: templates/web/base/admin/index.html:33 +#: templates/web/base/status/stats.html:20 #: templates/web/zurich/admin/index.html:5 msgid "from %s different users" -msgstr "od %d razliÄitih korisnika" +msgstr "od %s razliÄitih korisnika" -#: templates/web/base/report/_item.html:17 -#: templates/web/zurich/report/_item.html:16 +#: templates/web/base/report/_item.html:15 +#: templates/web/zurich/report/_item.html:14 msgid "last updated %s" msgstr "" @@ -4044,10 +3854,8 @@ msgstr "ponovno otvoreno" msgid "sign out" msgstr "odjavi se" -#: templates/web/base/report/new/fill_in_details_form.html:12 -#: templates/web/base/report/new/fill_in_details_form.html:15 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:10 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:12 +#: templates/web/base/report/new/fill_in_details_form.html:11 +#: templates/web/base/report/new/fill_in_details_form.html:9 msgid "the local council" msgstr "lokalno odgovorno tijelo" @@ -4056,7 +3864,7 @@ msgstr "lokalno odgovorno tijelo" msgid "there is no pin shown as the user did not use the map" msgstr "nema oznake jer korisnik nije oznaÄio problem na karti" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:398 +#: perllib/FixMyStreet/Script/Reports.pm:176 msgid "this type of local problem" msgstr "ovaj tip " @@ -4065,9 +3873,8 @@ msgid "today" msgstr "danas" #: templates/web/base/reports/_list-filters.html:4 -#, fuzzy msgid "unfixed reports" -msgstr "Popravljene prijave" +msgstr "" #: templates/web/base/admin/report_edit.html:32 msgid "used map" @@ -4086,7 +3893,7 @@ msgstr "korisnik je vlasnik problema" msgid "ward" msgstr "" -#: templates/web/base/front/stats.html:17 +#: templates/web/base/front/stats.html:13 #, perl-format msgid "<big>%s</big> report recently" msgid_plural "<big>%s</big> reports recently" @@ -4118,7 +3925,7 @@ msgstr[0] "%d minuta" msgstr[1] "%d minute" msgstr[2] "%d minute" -#: templates/web/base/front/stats.html:29 +#: templates/web/base/front/stats.html:25 #, perl-format msgid "<big>%s</big> update on reports" msgid_plural "<big>%s</big> updates on reports" @@ -4142,7 +3949,7 @@ msgstr[0] "%d tjedan" msgstr[1] "%d tjedni" msgstr[2] "%d tjedni" -#: templates/web/base/front/stats.html:12 +#: templates/web/base/front/stats.html:8 #, perl-format msgid "<big>%s</big> report in past week" msgid_plural "<big>%s</big> reports in past week" @@ -4150,7 +3957,7 @@ msgstr[0] "<big>%s</big> prijava u proÅ¡lom tjednu" msgstr[1] "<big>%s</big> prijave u proÅ¡lom tjednu" msgstr[2] "<big>%s</big> prijave u proÅ¡lom tjednu" -#: templates/web/base/front/stats.html:23 +#: templates/web/base/front/stats.html:19 #, perl-format msgid "<big>%s</big> fixed in past month" msgid_plural "<big>%s</big> fixed in past month" @@ -4174,110 +3981,80 @@ msgstr[0] "JoÅ¡ <strong>nemamo</strong> podatke za drugo odgovorno tijelo koje j msgstr[1] "JoÅ¡ <strong>nemamo</strong> podatke za ostala odgovorna tijela koja su odgovorna za ovu lokaciju." msgstr[2] "JoÅ¡ <strong>nemamo</strong> podatke za ostala odgovorna tijela koja su odgovorna za ovu lokaciju." -#~ msgid "<small>If you cannot see the map, <a href='%s' rel='nofollow'>skip this step</a>.</small>" -#~ msgstr "<small>Ukoliko ne vidite kartu, <a href='%s' rel='nofollow'>preskoÄite ovaj korak</a>.</small>" - -#~ msgid "<strong>No</strong>, I do not, let me sign in by email:" -#~ msgstr "<strong>No</strong>, Nemam, prijavi me e-mailom:" - -#~ msgid "Are you a <strong>developer</strong>? Would you like to contribute to FixMyStreet?" -#~ msgstr "Jeste li <strong>developer</strong>? Biste li htjeli doprinijeti ideji popravi.to?" - -#~ msgid "Closest nearby problems <small>(within %skm)</small>" -#~ msgstr "Najbliži problemi <small>(within %skm)</small>" - -#~ msgid "Contact FixMyStreet" -#~ msgstr "Kontaktiraj potvrdi.to" - -#~ msgid "Do you have a FixMyBarangay password?" -#~ msgstr "ImaÅ¡ li popravi.to lozinku?" - -#~ msgid "FixMyStreet admin:" -#~ msgstr "Popravi.to admin:" - -#~ msgid "New local reports on reportemptyhomes.com" -#~ msgstr "Nove lokalne prijave na kućoprazna.joj" - -#~ msgid "New reports for {{COUNCIL}} within {{WARD}} ward on reportemptyhomes.com" -#~ msgstr "Nove prijave za {{COUNCIL}} unutar{{WARD}} na kucoprazna.joj" - -#~ msgid "New reports on reportemptyhomes.com" -#~ msgstr "Nove prijave na praznakuco.joj" - -#~ msgid "New reports on reportemptyhomes.com near {{POSTCODE}}" -#~ msgstr "Nove prijave na praznakuco.joj blizu{{POÅ TANSKI BROJ}}" +#~ msgid "(we never show your email address or phone number)" +#~ msgstr "(vaÅ¡u email adresu i broj telefona držimo u tajnosti)" -#~ msgid "New reports to {{COUNCIL}} on reportemptyhomes.com" -#~ msgstr "Nove prijave {{ODGOVORNOM TIJELU}} na praznakuco.joj" +#~ msgid "(we never show your email)" +#~ msgstr "(vaÅ¡ email držimo u tajnosti)" -#~ msgid "New reports within {{NAME}}'s boundary on reportemptyhomes.com" -#~ msgstr "Nove prijave u djelokrugu {{IME}} na praznakuco.joj" +#~ msgid "<strong>No</strong>, let me confirm my report by email:" +#~ msgstr "<strong>No</strong>, potvrdi moju prijavu e-mailom:" -#~ msgid "No problems found." -#~ msgstr "Nisu pronaÄ‘eni problemi." +#~ msgid "<strong>No</strong>, let me confirm my update by email:" +#~ msgstr "<strong>No</strong>, potvrdi moje ažuriranje e-mailom:" -#~ msgid "No problems have been reported yet." -#~ msgstr "JoÅ¡ uvijek nisu prijavljeni nikakvi problemi." +#~ msgid "Email me updates" +#~ msgstr "PoÅ¡alji mi e-mail o ažuriranjima" -#~ msgid "Now to submit your report… do you have a FixMyStreet password?" -#~ msgstr "Podnesite svoju prijavu… imate li Popravi.to lozinku?" +#~ msgid "Enter a new password:" +#~ msgstr "Unesi novu lozinku:" -#~ msgid "Now to submit your update… do you have a FixMyStreet password?" -#~ msgstr "PoÅ¡aljite svoje ažuriranje… imate li Popravi.to lozinku?" +#~ 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 "Nažalost, ne možemo provjeriti token. Ako ste kopirali URL iz e-maila, molimo provjeriti da ste ga toÄno kopirali. \n" -#~ msgid "Our code is open source and <a href=\"http://github.com/mysociety/fixmystreet\">available on GitHub</a>." -#~ msgstr "NaÅ¡ kod je open source i <a href=\"http://github.com/mysociety/fixmystreet\">dostupan na GitHub</a>." +#~ 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 "Ako koristite e-mail na Webu ili 'junk mail' filtere, provjerite svoje bulk / spam mail mape: ponekad su naÅ¡e poruke oznaÄene na taj naÄin." -#~ msgid "Please <a class=\"tab_link\" href=\"#report\">take a look</a> at the updates that have been left." -#~ msgstr "Molimo<a class=\"tab_link\" href=\"#report\">pregledajte</a> poslana ažuriranja." +#~ msgid "Message:" +#~ msgstr "Poruka:" -#~ msgid "Please take a look at the updates that have been left." -#~ msgstr "Pregledajte ažuriranja" +#~ msgid "More problems nearby" +#~ msgstr "ViÅ¡e problema u blizini" -#~ msgid "Problems within %s, FixMyStreet" -#~ msgstr "Problemi unutar%s, Popravi.to" +#~ msgid "Nearly Done! Now check your email..." +#~ msgstr "Skoro uÄinjeno! Sada provjeri svoj e-mail..." -#~ msgid "Properties recently reported as put back to use on reportemptyhomes.com" -#~ msgstr "Objekti nedavno prijavljeni za ponovno koriÅ¡tenje na praznakuco.joj" +#~ msgid "Offensive? Unsuitable? Tell us" +#~ msgstr "Uvredljivo? Neprikladno? Recite nam" -#~ msgid "Reported %s, to %s" -#~ msgstr "Prijavljeno %s, za %s" +#~ msgid "Photo:" +#~ msgstr "Slika:" -#~ msgid "Reports on and around the map" -#~ msgstr "Prijave na i oko mape" +#~ msgid "Please check your email" +#~ msgstr "Provjeri svoj e-mail" -#~ msgid "Sign in by email" -#~ msgstr "Prijavi se putem e-maila" +#~ msgid "Please note that updates are not sent to the council. If you leave your name it will be public. Your information will only be used in accordance with our <a href=\"/faq#privacy\">privacy policy</a>" +#~ msgstr "Napominjemo da se ažuriranja ne Å¡alju odgovornom tijelu. Ako navedete svoje ime, bit će vidljivo. VaÅ¡e informacije će biti koriÅ¡tene u skladu s naÅ¡im <a href=\"/faq#privacy\">pravilima o privatnosti</a>" -#~ msgid "Signed in as %s" -#~ msgstr "Prijavljen kao %s" +#~ msgid "This problem has been closed" +#~ msgstr "Problem je zatvoren" -#~ msgid "The confirmation email <strong>may</strong> take a few minutes to arrive — <em>please</em> be patient." -#~ msgstr "Molimo<strong> priÄekajte </strong> — <em>email</em> potvrde." +#~ msgid "This problem is in progress" +#~ msgstr "Problem je i dalje aktualan" -#~ msgid "The details of your problem are available from the other tab above." -#~ msgstr "Pojedinosti problema dostupne su u gornjem dijelu stranice" +#~ msgid "This problem is old and of unknown status." +#~ msgstr "Odabrani problem je star i nismo upoznati s trenutnim stanjem." -#~ msgid "The details of your problem are available on the right hand side of this page." -#~ msgstr "Pojedinosti problema dostupne su u desnom dijelu stranice" +#~ msgid "Update:" +#~ msgstr "Ažuriranje:" -#~ msgid "The latest local reports reported by users" -#~ msgstr "Posljednji lokalni izvjeÅ¡taji " +#~ msgid "We have sent you an email containing a link to confirm your account." +#~ msgstr "Poslali smo Vam e-mail s linkom za potvrdu korisniÄkog raÄuna." -#~ msgid "The latest properties reported back to use by users" -#~ msgstr "Posljednji prijavljeni napuÅ¡teni objekti" +#~ msgid "We'd love to hear what you think about this site. Just fill in the form, or send an email to <a href='mailto:%s'>%s</a>:" +#~ msgstr "Rado bismo Äuli VaÅ¡e miÅ¡ljenje o ovoj stranici. Da biste to uÄinili, dovoljno je ispuniti obrazac ili poslati e-mail na <a href='mailto:%s'>%s</a>:" -#~ msgid "The latest reports for {{COUNCIL}} reported by users" -#~ msgstr "Zadnje prijave za {{COUNCIL}} dostavljene od strane korisnika" +#~ msgid "You have already attached a photo to this report, attaching another one will replace it." +#~ msgstr "Već ste priložiti fotografiju ovoj prijavi, ako dodate novu, zamijenit će prethodno postojeću." -#~ msgid "The latest reports for {{COUNCIL}} within {{WARD}} ward reported by users" -#~ msgstr "Zadnje prijave za {{COUNCIL}} unutar {{WARD}} dostavljene od strane korisnika" +#~ msgid "You have already attached a photo to this update, attaching another one will replace it." +#~ msgstr "Već ste priložiti fotografiju ovom ažuriranju, ako dodate novu, zamijenit će prethodno postojeću." -#~ msgid "The latest reports within {{NAME}}'s boundary reported by users" -#~ msgstr "Zadnje prijave unutar granice {{NAME}} dostavljene od strane korisnika" +#~ msgid "Your email:" +#~ msgstr "VaÅ¡ e-mail:" -#~ msgid "To <strong>report a problem</strong>, click on the map at the correct location." -#~ msgstr "Kako<strong>biste prijavili problem</strong>, na karti oznaÄite toÄnu lokaciju." +#~ msgid "Your name:" +#~ msgstr "Ime:" -#~ msgid "Your email address:" -#~ msgstr "VaÅ¡a e-mail adresa:" +#~ msgid "Your email:" +#~ msgstr "VaÅ¡ e-mail:" diff --git a/locale/it.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/it.UTF-8/LC_MESSAGES/FixMyStreet.po index 1c48611b0..10b78add4 100644 --- a/locale/it.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/it.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: fixmystreet\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2015-10-23 16:51+0100\n" -"PO-Revision-Date: 2015-07-31 16:31+0000\n" +"POT-Creation-Date: 2016-03-02 13:09+0000\n" +"PO-Revision-Date: 2015-10-23 16:36+0000\n" "Last-Translator: mySociety <transifex@mysociety.org>\n" "Language-Team: Italian (http://www.transifex.com/mysociety/fixmystreet/language/it/)\n" "Language: it\n" @@ -21,45 +21,24 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:628 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:411 +#: perllib/FixMyStreet/DB/Result/Problem.pm:616 +#: perllib/FixMyStreet/Script/Reports.pm:189 msgid " and " msgstr "e" #: templates/web/base/report/new/councils_text_all.html:2 -#: templates/web/base/report/new/councils_text_none.html:11 -#: templates/web/base/report/new/councils_text_none.html:2 +#: templates/web/base/report/new/councils_text_none.html:12 +#: templates/web/base/report/new/councils_text_none.html:15 #: templates/web/base/report/new/councils_text_some.html:19 #: templates/web/base/report/new/councils_text_some.html:22 #: templates/web/base/report/new/councils_text_some.html:5 msgid " or " msgstr "o" -#: templates/web/base/admin/index.html:35 -#: templates/web/base/status/index.html:13 -msgid "%s confirmed alerts, %s unconfirmed" -msgstr "%d segnalazioni confermate, %d non confermate" - -#: templates/web/base/admin/index.html:37 -#: templates/web/base/status/index.html:16 -#: templates/web/zurich/admin/index.html:6 -msgid "%s council contacts – %s confirmed, %s unconfirmed" -msgstr "%d contatti del Comune – %d confermati, %d non confermati" - #: templates/web/base/admin/edit-league.html:12 msgid "%d edits by %s" msgstr "%d modificato da %s" -#: templates/web/base/admin/index.html:34 -#: templates/web/base/status/index.html:12 -msgid "%s live updates" -msgstr "%d aggiornamenti in tempo reale" - -#: templates/web/base/admin/index.html:36 -#: templates/web/base/status/index.html:14 -msgid "%s questionnaires sent – %s answered (%s%%)" -msgstr "%d questionari inviati – %d compilati (%s%%)" - #: templates/web/base/pagination.html:10 msgid "%d to %d of %d" msgstr "%d a %d di %d" @@ -74,31 +53,45 @@ msgstr "%s - Riassunto sulle segnalazioni" msgid "%s admin:" msgstr "" +#: templates/web/base/status/stats.html:26 +#, fuzzy +msgid "%s bodies" +msgstr "Corpi" + +#: templates/web/base/status/stats.html:24 +msgid "%s confirmed alerts, %s unconfirmed" +msgstr "%s segnalazioni confermate, %s non confermate" + +#: templates/web/base/status/stats.html:27 +#: templates/web/zurich/admin/index.html:6 +msgid "%s council contacts – %s confirmed, %s unconfirmed" +msgstr "%s contatti del Comune – %s confermati, %s non confermati" + #. ("%s is the site name") #: templates/web/base/alert/index.html:7 -#, fuzzy msgid "" "%s has a variety of RSS feeds and email alerts for local\n" "problems, including alerts for all problems within a particular ward, or all\n" "problems within a certain distance of a particular location." msgstr "" -"FixMyStreet offre un servizio di RSS feed e di avvertimenti via email sui problemi locali, inclusiâŽ\n" -"gli avvertimenti per problemi in un particolare quartiere o comune, o tutti i problemiâŽ\n" -"da una certa distanza da una specifica zona." #. ("%s is the site name") #: templates/web/base/alert/index.html:11 -#, fuzzy msgid "" "%s has a variety of RSS feeds and email alerts for local problems, including\n" "alerts for all problems within a particular ward or council, or all problems\n" "within a certain distance of a particular location." msgstr "" -"FixMyStreet offre un servizio di RSS feed e di avvertimenti via email sui problemi locali, inclusiâŽ\n" -"gli avvertimenti per problemi in un particolare quartiere o comune, o tutti i problemiâŽ\n" -"da una certa distanza da una specifica zona." -#: perllib/FixMyStreet/DB/Result/Problem.pm:695 +#: templates/web/base/status/stats.html:23 +msgid "%s live updates" +msgstr "%s aggiornamenti in tempo reale" + +#: templates/web/base/status/stats.html:25 +msgid "%s questionnaires sent – %s answered (%s%%)" +msgstr "%s questionari inviati – %s compilati (%s%%)" + +#: perllib/FixMyStreet/DB/Result/Problem.pm:683 msgid "%s ref: %s" msgstr "%s ref: %s" @@ -113,15 +106,15 @@ msgid "" "for the county council." msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:255 perllib/FixMyStreet/Cobrand/UK.pm:267 +#: perllib/FixMyStreet/Cobrand/UK.pm:256 perllib/FixMyStreet/Cobrand/UK.pm:268 msgid "%s ward, %s" msgstr "%s quartiere, %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:564 +#: perllib/FixMyStreet/DB/Result/Problem.pm:552 msgid "%s, reported at %s" msgstr "%s, segnalati al %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:282 perllib/FixMyStreet/Cobrand/UK.pm:294 +#: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295 msgid "%s, within %s ward" msgstr "%s dentro al quartiere %s" @@ -129,7 +122,7 @@ msgstr "%s dentro al quartiere %s" msgid "© <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors" msgstr "" -#: templates/web/zurich/report/new/fill_in_details_form.html:53 +#: templates/web/zurich/report/new/fill_in_details_form.html:46 msgid "(Defect & location of defect)" msgstr "" @@ -140,15 +133,13 @@ msgstr "(Email nella tabella degli abusi)" #: templates/web/zurich/admin/report_edit-sdm.html:60 #: templates/web/zurich/admin/report_edit.html:88 -#, fuzzy msgid "(No name)" -msgstr "Il tuo nome" +msgstr "" #: templates/web/zurich/admin/report_edit-sdm.html:67 #: templates/web/zurich/admin/report_edit.html:95 -#, fuzzy msgid "(No phone number)" -msgstr "Il tuo numero di telefono" +msgstr "" #: templates/web/base/alert/_list.html:24 msgid "(a default distance which covers roughly 200,000 people)" @@ -156,17 +147,16 @@ msgstr "(una distanza predefinita che copre approssimativamente 200,000 persone) #. ("%s is a list of distance links, e.g. [2km] / [5km] / [10km] / [20km]") #: templates/web/base/alert/_list.html:29 -#, fuzzy msgid "(alternatively the RSS feed can be customised, within %s)" -msgstr "(alternativamente gli RSS feed possono essere personalizzati, dentro " +msgstr "" -#: templates/web/base/report/_item.html:27 -#: templates/web/zurich/report/_item.html:21 +#: templates/web/base/report/_item.html:25 +#: templates/web/zurich/report/_item.html:19 msgid "(closed)" msgstr "(chiuso)" -#: templates/web/base/report/_item.html:25 -#: templates/web/zurich/report/_item.html:19 +#: templates/web/base/report/_item.html:23 +#: templates/web/zurich/report/_item.html:17 msgid "(fixed)" msgstr "(risolto)" @@ -174,37 +164,28 @@ msgstr "(risolto)" msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)" msgstr "(come gli atti vandalici, le discariche abusive, la pavimentazione e l'illuminazione stradale rotta)" -#: templates/web/base/report/_item.html:21 +#: templates/web/base/report/_item.html:19 msgid "(not sent to council)" msgstr "(non inviato al Comune)" -#: templates/web/base/report/new/fill_in_details_form.html:200 #: templates/web/zurich/report/new/fill_in_details_form.html:82 msgid "(optional)" msgstr "(opzionale)" -#: templates/web/fixmystreet/report/public_label.html:1 +#: templates/web/base/report/public_label.html:1 msgid "(public)" msgstr "(pubblico)" -#: templates/web/base/report/_item.html:20 +#: templates/web/base/report/_item.html:18 msgid "(sent to both)" msgstr "(inviato ad entrambi)" -#: templates/web/base/report/new/fill_in_details_form.html:194 -msgid "(we never show your email address or phone number)" -msgstr "(non mostreremo mai la tua email o il tuo numero di telefono)" - -#: templates/web/base/report/update-form.html:159 -msgid "(we never show your email)" -msgstr "(non mostreremo mai la tua email)" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:673 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 #: perllib/FixMyStreet/DB/Result/Problem.pm:410 msgid "-- Pick a category --" msgstr "-- Scegli una categoria --" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:637 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:632 #: perllib/FixMyStreet/DB/Result/Problem.pm:416 msgid "-- Pick a property type --" msgstr "-- Scegli un tipo di proprietà --" @@ -223,52 +204,39 @@ msgstr "" msgid "<label>Show %s</label> <label>about %s</label>" msgstr "" -#: templates/web/base/admin/index.html:32 -#: templates/web/base/status/index.html:11 +#: templates/web/base/status/stats.html:18 #: templates/web/zurich/admin/index.html:4 msgid "<strong>%s</strong> live problems" -msgstr "<strong>%d</strong> problemi in tempo reale" +msgstr "<strong>%s</strong> problemi in tempo reale" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:39 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:2 msgid "<strong>No</strong> Let me confirm my report by email" msgstr "<strong>No</strong> Lasciami confermare la mia segnalazione via email" -#: templates/web/fixmystreet/report/update-form.html:112 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:2 msgid "<strong>No</strong> Let me confirm my update by email" msgstr "<strong>No</strong> Lasciami confermare il mio aggiornamento via email" -#: templates/web/base/auth/general.html:48 +#: templates/web/base/auth/general.html:87 #: templates/web/zurich/auth/general.html:51 msgid "<strong>No</strong> let me sign in by email" msgstr "<strong>No</strong> lasciami entrare con l'email" -#: templates/web/base/report/new/fill_in_details_form.html:145 -msgid "<strong>No</strong>, let me confirm my report by email:" -msgstr "<strong>No</strong>, lasciami confermare la mia segnalazione via email:" - -#: templates/web/base/report/update-form.html:118 -msgid "<strong>No</strong>, let me confirm my update by email:" -msgstr "<strong>No</strong>, lasciami confermare il mio aggiornamento via email:" - -#: templates/web/base/auth/general.html:34 -#: templates/web/base/report/new/fill_in_details_form.html:123 -#: templates/web/base/report/update-form.html:96 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:15 -#: templates/web/fixmystreet/report/update-form.html:89 +#: templates/web/base/auth/general.html:70 +#: templates/web/base/report/new/form_user_loggedout_password.html:3 +#: templates/web/base/report/update/form_user_loggedout_password.html:2 msgid "<strong>Yes</strong> I have a password" msgstr "<strong>Si</strong> Ho già la password" -#: templates/web/base/static/about-en-gb.html:1 -#: templates/web/base/static/about-en-gb.html:3 +#: templates/web/base/about/about-en-gb.html:1 +#: templates/web/base/about/about-en-gb.html:3 msgid "About us" msgstr "Chi siamo" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:8 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:31 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:29 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:35 msgid "Action Scheduled" msgstr "" @@ -299,7 +267,7 @@ msgstr "Aggiungi una nuova categoria" msgid "Add user" msgstr "Aggiungi un'utente" -#: templates/web/base/my/my.html:52 +#: templates/web/base/my/my.html:56 msgid "Added %s" msgstr "Aggiunti %s" @@ -319,8 +287,7 @@ msgstr "Segnalazione %d creata per %s tipo %s, parametri %s / %s" msgid "Alert %d disabled (created %s)" msgstr "Segnalazione %d disabilitata (creata %s)" -#: templates/web/base/report/update-form.html:164 -#: templates/web/fixmystreet/report/update-form.html:150 +#: templates/web/base/report/update/form_name.html:20 msgid "Alert me to future updates" msgstr "Avvisami su futuri aggiornamenti" @@ -330,9 +297,8 @@ msgid "All Reports" msgstr "Tutte le segnalazioni" #: templates/web/zurich/admin/stats.html:5 -#, fuzzy msgid "All Reports as CSV" -msgstr "Tutte le segnalazioni" +msgstr "" #: templates/web/base/footer.html:11 templates/web/fixmystreet/footer.html:32 #: templates/web/zurich/admin/index-dm.html:12 @@ -353,10 +319,8 @@ msgstr "Tutte le informazioni che aggiungi qui, saranno inviate all'ufficio comp #: templates/web/base/report/new/councils_text_all.html:2 #: templates/web/base/report/new/councils_text_all.html:4 -#: templates/web/base/report/new/fill_in_details_form.html:12 -#: templates/web/base/report/new/fill_in_details_form.html:14 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:10 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:11 +#: templates/web/base/report/new/fill_in_details_form.html:10 +#: templates/web/base/report/new/fill_in_details_form.html:9 msgid "All the information you provide here will be sent to <strong>%s</strong>." msgstr "Tutte le informazioni che aggiungi qui saranno inviate al <strong>%s</strong>." @@ -378,6 +342,10 @@ msgstr "Anonimo:" msgid "Are you a developer?" msgstr "Sei uno sviluppatore?" +#: templates/web/base/js/translation_strings.html:52 +msgid "Are you sure you want to cancel this upload?" +msgstr "" + #: templates/web/base/admin/body-form.html:69 #: templates/web/base/admin/body.html:16 #: templates/web/zurich/admin/body-form.html:24 @@ -390,9 +358,8 @@ msgid "As this is a staging site and %s is false, reports made on this site will msgstr "" #: templates/web/zurich/admin/report_edit.html:213 -#, fuzzy msgid "Assign to competent body:" -msgstr "Assegna ad un corpo esterno:" +msgstr "" #: templates/web/zurich/admin/report_edit.html:173 #: templates/web/zurich/admin/stats.html:36 @@ -411,16 +378,16 @@ msgstr "Assegna ad una subdivisione:" msgid "Assigned to %s" msgstr "Assegnato a %s" -#: templates/web/base/open311/index.html:84 +#: templates/web/base/open311/index.html:76 msgid "At most %d requests are returned in each query. The returned requests are ordered by requested_datetime, so to get all requests, do several searches with rolling start_date and end_date." msgstr "" -#: templates/web/base/open311/index.html:76 +#: templates/web/base/open311/index.html:68 msgid "At the moment only searching for and looking at reports work." msgstr "Al momento funziona solo la ricerca e la visualizzazione delle segnalazioni." #: perllib/FixMyStreet/DB/Result/Problem.pm:373 -#: templates/web/zurich/report/_item.html:11 +#: templates/web/zurich/report/_item.html:9 msgid "Awaiting moderation" msgstr "" @@ -432,7 +399,7 @@ msgstr "Indietro" msgid "Ban email address" msgstr "Vietare l'indirizzo email" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1276 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1285 #: perllib/FixMyStreet/Cobrand/Zurich.pm:392 #: templates/web/base/admin/bodies.html:1 templates/web/zurich/header.html:64 msgid "Bodies" @@ -462,7 +429,7 @@ msgid "Can't see the map? <em>Skip this step</em>" msgstr "Non puoi vedere la mappa? <em>Salta questo passaggio</em>" #: templates/web/base/admin/body.html:68 -#: templates/web/base/admin/index.html:61 +#: templates/web/base/admin/index.html:54 #: templates/web/base/report/new/category.html:10 #: templates/web/base/report/new/category_wrapper.html:3 #: templates/web/zurich/admin/body.html:14 @@ -473,8 +440,8 @@ msgstr "Non puoi vedere la mappa? <em>Salta questo passaggio</em>" msgid "Category" msgstr "Categoria" -#: templates/web/base/admin/index.html:59 -#: templates/web/base/admin/index.html:67 +#: templates/web/base/admin/index.html:52 +#: templates/web/base/admin/index.html:60 msgid "Category fix rate for problems > 4 weeks old" msgstr "" @@ -487,7 +454,7 @@ msgstr "" msgid "Category:" msgstr "Categoria:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:402 +#: perllib/FixMyStreet/Script/Reports.pm:180 msgid "Category: %s" msgstr "Categoria: %s" @@ -537,7 +504,7 @@ msgid "Click here or enter as dd/mm/yyyy" msgstr "" #: templates/web/base/around/_report_banner.html:2 -#: templates/web/base/js/translation_strings.html:50 +#: templates/web/base/js/translation_strings.html:55 msgid "Click map to report a problem" msgstr "Clicca sulla mappa per riportare un problema" @@ -564,7 +531,7 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:25 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:144 -#: templates/web/fixmystreet/report/banner.html:15 +#: templates/web/base/report/banner.html:15 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:10 #: templates/web/zurich/admin/header.html:16 @@ -572,7 +539,7 @@ msgstr "" msgid "Closed" msgstr "Chiuso" -#: perllib/FixMyStreet/DB/Result/Problem.pm:794 +#: perllib/FixMyStreet/DB/Result/Problem.pm:779 msgid "Closed by council" msgstr "Chiuso dal comune" @@ -598,7 +565,7 @@ msgstr "Dati del Cobrand:" msgid "Cobrand:" msgstr "Cobrand:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1283 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1292 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "Configurazione" @@ -611,13 +578,14 @@ msgstr "Configura il punto finale" msgid "Confirm" msgstr "Conferma" -#: templates/web/base/auth/token.html:1 templates/web/zurich/auth/token.html:1 +#: templates/web/base/auth/token.html:1 msgid "Confirm account" msgstr "Conferma l'account" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:33 -#: templates/web/fixmystreet/report/update-form.html:107 -msgid "Confirm by email below, providing a new password at that point. When you confirm, your password will be updated." +#: templates/web/base/report/new/form_user_loggedout_password.html:21 +#: templates/web/base/report/update/form_user_loggedout_password.html:20 +#, fuzzy +msgid "Confirm by email instead, providing a new password at that point. When you confirm, your password will be updated." msgstr "Conferma tramite l'email qui sotto ed una nuova password ti verrà fornita. Dopo aver confermato l'email che riceverai, la tua password verrà aggiornata." #: templates/web/base/questionnaire/creator_fixed.html:1 @@ -647,35 +615,27 @@ msgid "Confirmed:" msgstr "Confermato:" #. ("%s is the site name") -#: templates/web/base/faq/faq-en-gb.html:8 templates/web/base/footer.html:24 -#: templates/web/base/open311/index.html:8 -#: templates/web/base/static/privacy.html:10 -#: templates/web/fixmystreet/contact/index.html:12 -#, fuzzy +#: templates/web/base/about/_sidebar.html:6 templates/web/base/footer.html:24 msgid "Contact %s" -msgstr "Contattaci" +msgstr "" #: templates/web/base/contact/index.html:1 #: templates/web/base/contact/index.html:2 #: templates/web/base/contact/submit.html:1 -#: templates/web/fixmystreet/contact/index.html:1 -#: templates/web/fixmystreet/contact/index.html:2 msgid "Contact Us" msgstr "Contattaci" -#: templates/web/base/contact/index.html:6 -#: templates/web/fixmystreet/contact/index.html:20 +#: templates/web/base/contact/index.html:12 msgid "Contact the team" msgstr "Contatta il team" #: templates/web/zurich/admin/report_edit-sdm.html:40 #: templates/web/zurich/admin/report_edit.html:59 -#, fuzzy msgid "Coordinates:" -msgstr "Coordinate:" +msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1420 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1448 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1429 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1457 msgid "Could not find user" msgstr "Non posso trovare l'utente" @@ -693,7 +653,7 @@ msgstr "Comune" msgid "Council contacts for %s" msgstr "I contatti del comune per %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:693 +#: perllib/FixMyStreet/DB/Result/Problem.pm:681 msgid "Council ref: %s" msgstr "" @@ -708,7 +668,7 @@ msgstr "Comune:" msgid "Count" msgstr "Contare" -#: templates/web/base/email_sent.html:1 templates/web/zurich/email_sent.html:1 +#: templates/web/base/email_sent.html:1 msgid "Create a report" msgstr "Crea una segnalazione" @@ -718,9 +678,8 @@ msgid "Create category" msgstr "Crea una categoria" #: templates/web/zurich/admin/template_edit.html:29 -#, fuzzy msgid "Create template" -msgstr "Crea una segnalazione" +msgstr "" #: templates/web/base/admin/problem_row.html:34 #: templates/web/zurich/admin/templates.html:10 @@ -757,7 +716,7 @@ msgstr "Pannello di controllo" msgid "Dealt with by subdivision within 5 working days" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:878 +#: perllib/FixMyStreet/App/Controller/Admin.pm:877 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "" @@ -770,7 +729,7 @@ msgstr "" msgid "Deleted" msgstr "Eliminato" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:51 +#: templates/web/base/report/new/form_report.html:45 #: templates/web/zurich/admin/index-dm.html:22 #: templates/web/zurich/admin/index-sdm.html:20 #: templates/web/zurich/admin/reports.html:12 @@ -778,12 +737,11 @@ msgid "Description" msgstr "Descrizione" #: templates/web/base/js/translation_strings.html:34 -#: templates/web/zurich/report/new/fill_in_details_form.html:42 +#: templates/web/zurich/report/new/fill_in_details_form.html:68 msgid "Details" msgstr "Dettagli" #: templates/web/base/admin/report_edit.html:20 -#: templates/web/base/report/new/fill_in_details_form.html:62 #: templates/web/zurich/admin/report_edit-sdm.html:27 #: templates/web/zurich/admin/report_edit.html:29 #: templates/web/zurich/admin/report_edit.html:43 @@ -796,38 +754,38 @@ msgstr "Devoluto:" #: templates/web/zurich/admin/report_edit-sdm.html:50 #: templates/web/zurich/admin/report_edit.html:69 -#, fuzzy msgid "Didn't use map" -msgstr "mappa non usata" +msgstr "" #: templates/web/base/admin/edit-league.html:8 msgid "Diligency prize league table" msgstr "" #. ("%s is the site name") -#: templates/web/base/auth/general.html:31 -#: templates/web/base/report/new/fill_in_details_form.html:114 -#: templates/web/base/report/update-form.html:87 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:11 -#: templates/web/fixmystreet/report/update-form.html:86 -#, fuzzy +#: templates/web/base/auth/general.html:48 +#: templates/web/base/report/new/form_user_loggedout.html:18 +#: templates/web/base/report/new/oauth_email_form.html:18 +#: templates/web/base/report/update-form.html:29 +#: templates/web/base/report/update/form_user_loggedout.html:17 msgid "Do you have a %s password?" -msgstr "Hai già la password per FixMyStreet?" +msgstr "" #: templates/web/base/questionnaire/index.html:55 msgid "Don’t know" msgstr "Non lo so" -#: templates/web/fixmystreet/contact/index.html:118 +#: templates/web/base/contact/index.html:110 msgid "Don't like forms?" msgstr "" +#: templates/web/base/js/translation_strings.html:51 +msgid "Drag and drop photos here or <u>click to upload</u>" +msgstr "" + #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:14 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:32 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:30 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:36 msgid "Duplicate" msgstr "Duplica" @@ -877,7 +835,7 @@ msgstr "Editor" #: templates/web/base/admin/category_edit.html:91 #: templates/web/base/admin/flagged.html:38 #: templates/web/base/admin/users.html:16 -#: templates/web/base/auth/general.html:22 +#: templates/web/base/auth/general.html:39 #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:24 @@ -885,7 +843,7 @@ msgstr "Editor" msgid "Email" msgstr "Email" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1396 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1405 msgid "Email added to abuse list" msgstr "Email aggiunta alla lista abusi" @@ -901,7 +859,7 @@ msgstr "" msgid "Email alert deleted" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1393 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1402 msgid "Email already in abuse list" msgstr "Email già presente nella lista abusi" @@ -909,41 +867,36 @@ msgstr "Email già presente nella lista abusi" msgid "Email me new local problems" msgstr "Inviami via email i nuovi problemi locali" -#: templates/web/base/report/display.html:38 -msgid "Email me updates" -msgstr "Inviami via email gli aggiornamenti" - #: templates/web/base/admin/category_edit.html:31 #: templates/web/base/admin/report_edit.html:62 #: templates/web/base/admin/update_edit.html:33 #: templates/web/base/admin/user-form.html:20 #: templates/web/base/alert/updates.html:13 -#: templates/web/base/report/display.html:42 #: templates/web/zurich/admin/body.html:47 msgid "Email:" msgstr "Email:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:329 +#: perllib/FixMyStreet/Script/Reports.pm:108 msgid "Email: %s" msgstr "Email: %s" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:639 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:634 msgid "Empty flat or maisonette" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:638 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:633 msgid "Empty house or bungalow" msgstr "Case o bungalow vuoti" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:641 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:636 msgid "Empty office or other commercial" msgstr "Uffici o altri locali commerciali vuoti" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:642 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:637 msgid "Empty pub or bar" msgstr "Pub o bar vuoti" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:643 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:638 msgid "Empty public building - school, hospital, etc." msgstr "Edifici pubblici - scuole, ospedali, ecc vuoti" @@ -976,7 +929,7 @@ msgstr "Punto finale" msgid "Enter a Zürich street name" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:13 +#: perllib/FixMyStreet/Cobrand/UK.pm:14 msgid "Enter a nearby UK postcode, or street name and area" msgstr "Inserisci il piu vicino codice postale UK, o il nome di una strada e una città " @@ -994,14 +947,9 @@ msgstr "Inserisci il nome di una strada nelle vicinanze e una città o solo in n msgid "Enter a nearby street name and area, postal code or district in Delhi" msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:152 -#: templates/web/base/report/update-form.html:125 -msgid "Enter a new password:" -msgstr "Inserisci una nuova password:" - -#: templates/web/base/auth/general.html:60 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:75 -#: templates/web/fixmystreet/report/update-form.html:123 +#: templates/web/base/auth/general.html:99 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:38 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:13 #: templates/web/zurich/auth/general.html:65 msgid "Enter a password" msgstr "Inserisci una password" @@ -1011,11 +959,11 @@ msgid "Enter details of the problem" msgstr "Inserisci i dettagli del problema" #: templates/web/base/errors/generic.html:1 -#: templates/web/base/errors/generic.html:3 +#: templates/web/base/errors/generic.html:4 #: templates/web/base/tokens/abuse.html:1 #: templates/web/base/tokens/abuse.html:3 #: templates/web/base/tokens/error.html:1 -#: templates/web/base/tokens/error.html:3 +#: templates/web/base/tokens/error.html:5 msgid "Error" msgstr "Errore" @@ -1028,11 +976,11 @@ msgstr "" msgid "Example postcode %s" msgstr "Esempio codice postale %s" -#: templates/web/base/open311/index.html:94 +#: templates/web/base/open311/index.html:86 msgid "Examples:" msgstr "Esempi:" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:55 +#: templates/web/base/report/new/form_report.html:49 msgid "Explain what’s wrong, exactly where it is, and how long it’s been there…" msgstr "" @@ -1073,17 +1021,15 @@ msgstr "" msgid "FixMyStreet" msgstr "FixMyStreet" -#: templates/web/base/admin/index.html:61 +#: templates/web/base/admin/index.html:54 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:24 #: templates/web/base/admin/report_blocks.html:9 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:144 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:34 -#: templates/web/fixmystreet/report/banner.html:12 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:32 +#: templates/web/base/report/banner.html:12 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:38 msgid "Fixed" msgstr "Risolto" @@ -1110,7 +1056,7 @@ msgstr "" msgid "Flag user" msgstr "Utente segnalato" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1281 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1290 #: templates/web/base/admin/users.html:19 msgid "Flagged" msgstr "Segnalato" @@ -1141,36 +1087,31 @@ msgstr "" msgid "For more information, see <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>." msgstr "" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:32 -#: templates/web/fixmystreet/report/update-form.html:106 +#: templates/web/base/report/new/form_user_loggedout_password.html:20 +#: templates/web/base/report/update/form_user_loggedout_password.html:19 msgid "Forgotten your password?" msgstr "Hai dimenticato la tua password?" #: perllib/FixMyStreet/Cobrand/Zurich.pm:752 -#, fuzzy msgid "Forwarded to external body" -msgstr "Assegna ad un corpo esterno:" +msgstr "" #: perllib/FixMyStreet/Cobrand/Zurich.pm:753 -#, fuzzy msgid "Forwarded wish to external body" -msgstr "Assegna ad un corpo esterno:" +msgstr "" -#: templates/web/base/faq/faq-en-gb.html:1 -#: templates/web/base/faq/faq-en-gb.html:13 -#: templates/web/base/faq/faq-en-gb.html:6 -#: templates/web/base/open311/index.html:6 -#: templates/web/base/static/privacy.html:8 -#: templates/web/fixmystreet/contact/index.html:10 +#: templates/web/base/about/_sidebar.html:4 +#: templates/web/base/about/faq-en-gb.html:1 +#: templates/web/base/about/faq-en-gb.html:5 msgid "Frequently Asked Questions" msgstr "Domande Frequenti" -#: templates/web/base/open311/index.html:136 +#: templates/web/base/open311/index.html:128 msgid "GeoRSS on Google Maps" msgstr "GeoRSS su Google Maps" +#: templates/web/base/report/display_tools.html:11 #: templates/web/fixmystreet/around/_updates.html:3 -#: templates/web/fixmystreet/report/display.html:35 msgid "Get updates" msgstr "Ottieni aggiornamenti " @@ -1203,7 +1144,7 @@ msgstr "Vai" msgid "Going to send questionnaire?" msgstr "" -#: templates/web/base/admin/index.html:42 +#: templates/web/base/admin/index.html:35 msgid "Graph of problem creation by status over time" msgstr "" @@ -1220,7 +1161,7 @@ msgid "Have you ever reported a problem to a council before, or is this your fir msgstr "Avevi mai segnalato un problema ad un comune precedentemente, o questa è la tua prima volta?" #: templates/web/base/footer.html:15 templates/web/fixmystreet/footer.html:38 -#: templates/web/zurich/faq/faq-de-ch.html:1 +#: templates/web/zurich/about/faq-de-ch.html:1 #: templates/web/zurich/footer.html:22 #: templates/web/zurich/nav_over_content.html:8 msgid "Help" @@ -1271,7 +1212,7 @@ msgstr "Come segnalare un problema" msgid "How to send successful reports" msgstr "Come inviare segnalazioni di successo" -#: perllib/FixMyStreet/App/Controller/Admin.pm:754 +#: perllib/FixMyStreet/App/Controller/Admin.pm:752 msgid "I am afraid you cannot confirm unconfirmed reports." msgstr "Mi spiace non puoi confermare le segnalazioni non confermate." @@ -1289,10 +1230,6 @@ msgstr "" msgid "I'm afraid we couldn't locate your problem in the database.\n" msgstr "Mi spiace non possiamo localizzare il tuo problema nel database.\n" -#: perllib/FixMyStreet/App/Controller/Tokens.pm:327 -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 "Mi spiace non possiamo validare questo token. Se hai copiato l'URL dall'email, controlla se l'hai copiato correttamente.\n" - #: templates/web/base/admin/flagged.html:14 #: templates/web/base/admin/list_updates.html:6 #: templates/web/base/admin/reports.html:11 @@ -1321,25 +1258,16 @@ msgstr "" msgid "If you get some more information about the status of your problem, please come back to the site and leave an update." msgstr "" -#: templates/web/base/report/new/councils_text_none.html:2 -#: templates/web/base/report/new/councils_text_none.html:8 +#: templates/web/base/report/new/councils_text_none.html:10 +#: templates/web/base/report/new/councils_text_none.html:9 msgid "If you submit a problem here the subject and details of the problem will be public, but the problem will <strong>not</strong> be reported to the council." msgstr "Se invii un problema qui, il soggetto e i dettagli del problema saranno pubblici ma il problema <strong>non</strong> verrà segnalato al comune." -#: templates/web/zurich/auth/token.html:19 -#: templates/web/zurich/email_sent.html:7 -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 "Se usi un' email su un sito web o hai un filtro per la posta indesiderata, dovresti controllare anche la cartella dello spam o posta indesiderata: qualche volta i nostri messaggi finiscono li." - #: templates/web/base/questionnaire/index.html:68 -#, fuzzy msgid "" "If you wish to leave a public update on the problem, please enter it here\n" "(please note it will not be sent to the council)." msgstr "" -"Se desideri lasciare un'aggiornamento pubblico sullo stato del problema, per favore inseriscilo quiâŽ\n" -"(tieni presente che non verrà inviato al comune). Per esempio, com'è stata laâŽ\n" -"tua esperienza nell'ottenere il problema risolto?" #: templates/web/base/admin/body.html:149 msgid "If you're using <strong>a send method that is not email</strong>, enter the service ID (Open311) or equivalent identifier here." @@ -1378,10 +1306,8 @@ msgstr "Selezione feed illegale" #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:144 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:32 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:30 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:36 msgid "In Progress" msgstr "In progresso" @@ -1389,7 +1315,7 @@ msgstr "In progresso" msgid "In abuse table?" msgstr "" -#: templates/web/base/open311/index.html:88 +#: templates/web/base/open311/index.html:80 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 "" @@ -1397,7 +1323,7 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/Zurich.pm:963 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:7 -#: templates/web/fixmystreet/report/banner.html:19 +#: templates/web/base/report/banner.html:19 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:8 msgid "In progress" @@ -1432,7 +1358,7 @@ msgstr "" msgid "Invalid agency_responsible value %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1201 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1210 msgid "Invalid end date" msgstr "" @@ -1440,7 +1366,7 @@ msgstr "" msgid "Invalid format %s specified." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1206 msgid "Invalid start date" msgstr "" @@ -1448,14 +1374,12 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:5 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:143 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:31 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:29 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:35 msgid "Investigating" msgstr "Investigando" -#: templates/web/fixmystreet/contact/blurb.html:8 +#: templates/web/base/contact/blurb.html:8 msgid "It's often quickest to <a href=\"%s\">check our FAQs</a> and see if the answer is there." msgstr "" @@ -1473,11 +1397,9 @@ msgstr "" msgid "Jurisdiction unknown" msgstr "" -#: templates/web/base/auth/general.html:44 -#: templates/web/base/report/new/fill_in_details_form.html:132 -#: templates/web/base/report/update-form.html:105 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:28 -#: templates/web/fixmystreet/report/update-form.html:102 +#: templates/web/base/auth/general.html:80 +#: templates/web/base/report/new/form_user_loggedout_password.html:16 +#: templates/web/base/report/update/form_user_loggedout_password.html:15 #: templates/web/zurich/auth/general.html:40 msgid "Keep me signed in on this computer" msgstr "Lasciami loggato su questo computer" @@ -1535,6 +1457,7 @@ msgid "MAP" msgstr "MAPPA" #: templates/web/base/js/translation_strings.html:45 +#: templates/web/base/maps/google-ol.html:13 msgid "Map" msgstr "Mappa" @@ -1554,23 +1477,17 @@ msgstr "" msgid "Marked fixed/closed more than eight weeks ago" msgstr "" -#: templates/web/fixmystreet/contact/index.html:106 +#: templates/web/base/contact/index.html:98 msgid "Message" msgstr "Messaggio" #: templates/web/zurich/admin/report_edit.html:284 -#, fuzzy msgid "Message to competent body:" -msgstr "Assegna ad un corpo esterno:" +msgstr "" #: templates/web/zurich/admin/report_edit.html:282 -#, fuzzy msgid "Message to external body:" -msgstr "Assegna ad un corpo esterno:" - -#: templates/web/base/contact/index.html:97 -msgid "Message:" -msgstr "Messaggio:" +msgstr "" #: perllib/FixMyStreet/App/Controller/Open311.pm:445 msgid "Missing jurisdiction_id" @@ -1584,10 +1501,6 @@ msgstr "" msgid "Month" msgstr "Mese" -#: templates/web/base/report/display.html:34 -msgid "More problems nearby" -msgstr "Più problemi vicini" - #: templates/web/base/admin/bodies.html:21 #: templates/web/base/admin/body-form.html:18 #: templates/web/base/admin/flagged.html:16 @@ -1595,11 +1508,11 @@ msgstr "Più problemi vicini" #: templates/web/base/admin/list_updates.html:7 #: templates/web/base/admin/reports.html:13 #: templates/web/base/admin/users.html:15 -#: templates/web/base/auth/general.html:50 +#: templates/web/base/auth/general.html:89 +#: templates/web/base/report/new/form_user_loggedin.html:9 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:7 +#: templates/web/base/report/update/form_name.html:4 #: templates/web/base/reports/index.html:20 -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:9 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:44 -#: templates/web/fixmystreet/report/update-form.html:138 #: templates/web/zurich/admin/body-form.html:4 #: templates/web/zurich/auth/general.html:60 #: templates/web/zurich/report/new/fill_in_details_form.html:82 @@ -1613,7 +1526,7 @@ msgstr "Nome" msgid "Name:" msgstr "Nome:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:328 +#: perllib/FixMyStreet/Script/Reports.pm:107 msgid "Name: %s" msgstr "Nome: %s" @@ -1622,29 +1535,24 @@ msgstr "Nome: %s" msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s" msgstr "Il più vicino nome della strada al segno posizionato sulla mappa (automaticamente generato usando OpenStreetMap): %s%s" -#: perllib/FixMyStreet/Cobrand/UK.pm:127 +#: perllib/FixMyStreet/Cobrand/UK.pm:128 msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:434 -#: perllib/FixMyStreet/Cobrand/Default.pm:474 +#: perllib/FixMyStreet/Cobrand/Default.pm:455 +#: perllib/FixMyStreet/Cobrand/Default.pm:495 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:267 +#: perllib/FixMyStreet/Script/Alerts.pm:290 msgid "" "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n" "\n" msgstr "" -#: templates/web/zurich/email_sent.html:5 -msgid "Nearly Done! Now check your email..." -msgstr "Quasi fatto! Ora controlla la tua email..." - #: templates/web/base/auth/token.html:17 templates/web/base/email_sent.html:5 -#, fuzzy msgid "Nearly done! Now check your email…" -msgstr "Quasi fatto! Ora controlla la tua email..." +msgstr "" #: templates/web/base/reports/index.html:21 msgid "New <br>problems" @@ -1701,9 +1609,8 @@ msgstr "Nuovo stato" #: templates/web/zurich/admin/template_edit.html:9 #: templates/web/zurich/admin/templates.html:26 -#, fuzzy msgid "New template" -msgstr "Nuovo stato" +msgstr "" #: templates/web/base/pagination.html:13 msgid "Next" @@ -1720,8 +1627,8 @@ msgstr "Prossimo" #: templates/web/base/admin/report_edit.html:75 #: templates/web/base/admin/update_edit.html:25 #: templates/web/base/questionnaire/creator_fixed.html:16 +#: templates/web/base/questionnaire/index.html:101 #: templates/web/base/questionnaire/index.html:53 -#: templates/web/base/questionnaire/index.html:92 msgid "No" msgstr "No" @@ -1785,10 +1692,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:13 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:33 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:31 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:37 msgid "Not Responsible" msgstr "Non responsabile" @@ -1796,9 +1701,8 @@ msgstr "Non responsabile" #: perllib/FixMyStreet/Cobrand/Zurich.pm:937 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:13 -#, fuzzy msgid "Not contactable" -msgstr "Non responsabile" +msgstr "" #: templates/web/zurich/admin/report_edit-sdm.html:108 msgid "Not for my subdivision" @@ -1828,7 +1732,7 @@ msgstr "Tieni presente che per includere delle segnalazioni non confermate, usia msgid "Note:" msgstr "Nota:" -#: templates/web/base/open311/index.html:73 +#: templates/web/base/open311/index.html:65 msgid "Note: <strong>%s</strong>" msgstr "Nota: <strong>%s</strong>" @@ -1836,13 +1740,15 @@ msgstr "Nota: <strong>%s</strong>" msgid "Notes from SDM to DM" msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:113 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:10 +#: templates/web/base/report/new/form_user_loggedout.html:14 +#: templates/web/base/report/new/form_user_loggedout.html:2 +#: templates/web/base/report/new/oauth_email_form.html:17 msgid "Now to submit your report…" msgstr "Ora per inserire la tua segnalazione…" -#: templates/web/base/report/update-form.html:86 -#: templates/web/fixmystreet/report/update-form.html:85 +#: templates/web/base/report/update-form.html:28 +#: templates/web/base/report/update/form_user_loggedout.html:13 +#: templates/web/base/report/update/form_user_loggedout.html:2 msgid "Now to submit your update…" msgstr "Ora per inserire il tuo aggiornamento…" @@ -1850,11 +1756,6 @@ msgstr "Ora per inserire il tuo aggiornamento…" msgid "OK" msgstr "OK" -#: templates/web/base/report/display.html:28 -#: templates/web/base/report/update.html:17 -msgid "Offensive? Unsuitable? Tell us" -msgstr "Offensivo? Non adatto? Contattaci" - #: templates/web/base/reports/index.html:23 msgid "Old / unknown <br>problems" msgstr "Vecchi / sconosciuti <br>problemi" @@ -1871,7 +1772,7 @@ msgstr "Più vecchi <br> risolti" msgid "Older <br>problems" msgstr "Vecchi <br>problemi" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:45 +#: templates/web/base/report/new/form_report.html:15 msgid "One-line summary" msgstr "" @@ -1882,8 +1783,7 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:4 #: templates/web/base/admin/update_edit.html:28 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/report/update-form.html:30 -#: templates/web/fixmystreet/report/update-form.html:28 +#: templates/web/base/report/update/form_update.html:34 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:7 #: templates/web/zurich/admin/update_edit.html:18 @@ -1898,15 +1798,15 @@ msgstr "" msgid "Open, but not had any update in eight weeks" msgstr "" -#: templates/web/base/open311/index.html:70 +#: templates/web/base/open311/index.html:62 msgid "Open311 API for the mySociety FixMyStreet server" msgstr "" -#: templates/web/base/open311/index.html:80 +#: templates/web/base/open311/index.html:72 msgid "Open311 initiative web page" msgstr "" -#: templates/web/base/open311/index.html:81 +#: templates/web/base/open311/index.html:73 msgid "Open311 specification" msgstr "" @@ -1918,15 +1818,15 @@ msgstr "" msgid "Or you can subscribe to an alert based upon what ward or council you’re in:" msgstr "O puoi iscriverti agli avvisi basati sul tuo quartiere o comune di appartenenza:" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1084 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:673 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:674 -#: perllib/FixMyStreet/DB/Result/Problem.pm:570 -#: perllib/FixMyStreet/DB/Result/Problem.pm:580 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1055 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:669 +#: perllib/FixMyStreet/DB/Result/Problem.pm:558 +#: perllib/FixMyStreet/DB/Result/Problem.pm:568 +#: perllib/FixMyStreet/DB/Result/Problem.pm:578 #: perllib/FixMyStreet/DB/Result/Problem.pm:590 -#: perllib/FixMyStreet/DB/Result/Problem.pm:602 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:397 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:412 +#: perllib/FixMyStreet/Script/Reports.pm:175 +#: perllib/FixMyStreet/Script/Reports.pm:190 msgid "Other" msgstr "Altro" @@ -1935,7 +1835,7 @@ msgid "Owner" msgstr "Proprietario" #: templates/web/base/errors/page_error_404_not_found.html:1 -#: templates/web/base/errors/page_error_404_not_found.html:3 +#: templates/web/base/errors/page_error_404_not_found.html:4 msgid "Page Not Found" msgstr "Pagina non trovata" @@ -1949,16 +1849,16 @@ msgstr "Parente" msgid "Partial" msgstr "Parziale" -#: templates/web/base/auth/general.html:53 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:68 -#: templates/web/fixmystreet/report/update-form.html:116 +#: templates/web/base/auth/general.html:92 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:31 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:6 #: templates/web/zurich/auth/general.html:32 #: templates/web/zurich/auth/general.html:63 msgid "Password (optional)" msgstr "Password (opzionale)" #: templates/web/base/auth/change_password.html:25 -#: templates/web/base/auth/general.html:36 +#: templates/web/base/auth/general.html:72 msgid "Password:" msgstr "Password:" @@ -1970,45 +1870,37 @@ msgstr "" msgid "Phone number" msgstr "Numero di telefono" -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:26 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:62 +#: templates/web/base/report/new/form_user_loggedin.html:26 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:25 msgid "Phone number (optional)" msgstr "Numero di telefono (opzionale)" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:306 +#: perllib/FixMyStreet/Script/Reports.pm:83 #: templates/web/base/admin/report_edit.html:63 -#: templates/web/base/report/new/fill_in_details_form.html:198 #: templates/web/zurich/admin/stats.html:39 msgid "Phone:" msgstr "Telefono:" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:66 -#: templates/web/fixmystreet/report/update-form.html:59 +#: templates/web/base/questionnaire/index.html:75 +#: templates/web/base/report/new/form_report.html:23 +#: templates/web/base/report/update/form_update.html:6 #: templates/web/zurich/admin/index-dm.html:29 #: templates/web/zurich/admin/index-sdm.html:24 #: templates/web/zurich/admin/reports.html:16 #: templates/web/zurich/admin/stats.html:37 -#: templates/web/zurich/report/new/fill_in_details_form.html:52 +#: templates/web/zurich/report/new/fill_in_details_form.html:45 msgid "Photo" msgstr "Foto" -#: perllib/FixMyStreet/App/Controller/Photo.pm:221 -#, fuzzy +#: perllib/FixMyStreet/App/Controller/Photo.pm:187 msgid "Photo is required." -msgstr "Questa informazione è richiesta" +msgstr "" #: templates/web/base/admin/category_edit.html:48 -#, fuzzy msgid "Photo required" -msgstr "Questa informazione è richiesta" - -#: templates/web/base/questionnaire/index.html:80 -#: templates/web/base/report/new/fill_in_details_form.html:84 -#: templates/web/base/report/update-form.html:62 -msgid "Photo:" -msgstr "Foto:" +msgstr "" -#: templates/web/base/alert/list.html:26 +#: templates/web/base/alert/list.html:23 msgid "Photos of recent nearby reports" msgstr "Foto delle piu vicine e recenti segnalazioni" @@ -2037,20 +1929,16 @@ msgstr "Per favore cerca di essere educato, conciso e dritto al punto." msgid "Please check the passwords and try again" msgstr "Per favore controlla la password e prova ancora" -#: templates/web/zurich/auth/token.html:16 -msgid "Please check your email" -msgstr "Per favore controlla la tua email" - -#: templates/web/base/auth/general.html:10 -#: templates/web/base/auth/general.html:16 +#: templates/web/base/auth/general.html:27 +#: templates/web/base/auth/general.html:33 #: templates/web/zurich/auth/general.html:3 #: templates/web/zurich/auth/general.html:9 msgid "Please check your email address is correct" msgstr "Per favore controlla che il tuo indirizzo email è corretto" #: perllib/FixMyStreet/App/Controller/Admin.pm:343 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:883 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:948 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:878 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:943 #: perllib/FixMyStreet/DB/Result/Problem.pm:412 #: templates/web/base/js/translation_strings.html:9 msgid "Please choose a category" @@ -2064,28 +1952,29 @@ msgstr "Per favore scegli un tipo di proprietà " msgid "Please correct the errors below" msgstr "" -#: templates/web/base/contact/blurb.html:2 -#: templates/web/fixmystreet/contact/blurb.html:12 -#, fuzzy +#: templates/web/base/contact/blurb.html:12 msgid "" "Please do <strong>not</strong> report problems through this form; messages go to\n" "the team behind this site, not a council. To report a problem,\n" "please <a href=\"/\">go to the front page</a> and follow the instructions." msgstr "" -"Per favore <strong>non</strong> segnalare i problemi attraverso questo form; i messaggi inseriti qui arrivanoâŽ\n" -"al team che gestisce FixMyStreet, non ai comuni. Per riportare un problema,âŽ\n" -"per favore <a href=\"/\">vai nella pagina principale</a> e segui le istruzioni." #: templates/web/base/report/new/notes.html:6 msgid "Please do not be abusive — abusing your council devalues the service for all users." msgstr "Per favore non abusarne — abusandone il comune svaluterà il servizio per tutti gli utenti." #: perllib/FixMyStreet/App/Controller/Admin.pm:346 -#: perllib/FixMyStreet/DB/Result/Comment.pm:126 +#: perllib/FixMyStreet/DB/Result/Comment.pm:125 #: templates/web/base/js/translation_strings.html:2 msgid "Please enter a message" msgstr "Per favore inserisci un messaggio" +#: perllib/FixMyStreet/App/Controller/Admin.pm:1091 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1146 +#, fuzzy +msgid "Please enter a name" +msgstr "Per favore inserisci il tuo nome" + #: templates/web/base/auth/change_password.html:12 #: templates/web/base/auth/change_password.html:15 #: templates/web/base/js/translation_strings.html:19 @@ -2098,10 +1987,10 @@ msgstr "Per favore inserisci la password" msgid "Please enter a subject" msgstr "Per favore inserisci il soggetto" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1084 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1137 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1087 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1142 #: perllib/FixMyStreet/App/Controller/Admin.pm:345 -#: perllib/FixMyStreet/DB/Result/User.pm:127 +#: perllib/FixMyStreet/DB/Result/User.pm:133 #: templates/web/base/js/translation_strings.html:12 #: templates/web/base/js/translation_strings.html:16 msgid "Please enter a valid email" @@ -2118,9 +2007,9 @@ msgid "Please enter some details" msgstr "Per favore inserire qualche dettaglio " #: perllib/FixMyStreet/App/Controller/Contact.pm:113 -#: perllib/FixMyStreet/DB/Result/User.pm:124 -#: templates/web/base/auth/general.html:10 -#: templates/web/base/auth/general.html:15 +#: perllib/FixMyStreet/DB/Result/User.pm:130 +#: templates/web/base/auth/general.html:27 +#: templates/web/base/auth/general.html:32 #: templates/web/base/js/translation_strings.html:11 #: templates/web/base/js/translation_strings.html:15 #: templates/web/zurich/auth/general.html:3 @@ -2128,7 +2017,7 @@ msgstr "Per favore inserire qualche dettaglio " msgid "Please enter your email" msgstr "Per favore inserisci la tua email" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:7 +#: templates/web/base/report/new/form_user_loggedout_email.html:7 #: templates/web/zurich/report/new/fill_in_details_form.html:80 msgid "Please enter your email address" msgstr "Per favore inserisci il tuo indirizzo email" @@ -2137,15 +2026,15 @@ msgstr "Per favore inserisci il tuo indirizzo email" msgid "Please enter your first name" msgstr "Per favore inserisci il tuo nome" -#: perllib/FixMyStreet/Cobrand/UK.pm:318 +#: perllib/FixMyStreet/Cobrand/UK.pm:319 #: templates/web/base/js/translation_strings.html:7 msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below" msgstr "Per favore inserisci il tuo nome completo, i comuni hanno bisogno di questa informazione - Se non vuoi che il tuo nome venga mostrato sul sito, deseleziona il box qui sotto" #: perllib/FixMyStreet/App/Controller/Contact.pm:112 -#: perllib/FixMyStreet/DB/Result/Comment.pm:123 +#: perllib/FixMyStreet/DB/Result/Comment.pm:122 #: perllib/FixMyStreet/DB/Result/Problem.pm:406 -#: perllib/FixMyStreet/DB/Result/User.pm:120 +#: perllib/FixMyStreet/DB/Result/User.pm:126 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter your name" msgstr "Per favore inserisci il tuo nome" @@ -2172,12 +2061,11 @@ msgstr "Per favore <a href=\"%s\">entra di nuovo</a>, o torna indietro nella <a msgid "Please fill in details of the problem below." msgstr "Si prega di compilare i dettagli del problema qui di seguito." -#: templates/web/zurich/report/new/fill_in_details_form.html:46 +#: templates/web/zurich/report/new/fill_in_details_form.html:72 msgid "Please fill in details of the problem." msgstr "SI prega di inserire i dettagli del problema" -#: templates/web/base/report/new/fill_in_details_form.html:28 -#: templates/web/fixmystreet/report/new/sidebar.html:7 +#: templates/web/base/report/new/sidebar.html:7 #: templates/web/zurich/report/new/fill_in_details_form.html:20 msgid "Please fill in the form below with details of the problem, and describe the location as precisely as possible in the details box." msgstr "Si prega di compilare il modulo sottostante con i dettagli del problema, e descrivere la posizione nel modo più preciso possibile, nella casella dettagli." @@ -2186,20 +2074,24 @@ msgstr "Si prega di compilare il modulo sottostante con i dettagli del problema, msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "Per favore indicare se si vuole ricevere un altro questionario" -#: templates/web/fixmystreet/report/updates-sidebar-notes.html:4 +#: templates/web/base/report/updates-sidebar-notes.html:2 msgid "Please note that updates are not sent to the council." msgstr "Gli aggiornamenti non verranno inviati al comune." -#: templates/web/base/report/update-form.html:7 -msgid "Please note that updates are not sent to the council. If you leave your name it will be public. Your information will only be used in accordance with our <a href=\"/faq#privacy\">privacy policy</a>" -msgstr "Gli aggiornamenti non vengono inviati al comune. Se lasci il tuo nome questo sarà pubblico. Le tue informazioni non verranno usate in accordo con la nostra <a href=\"/faq#privacy\">politica sulla privacy</a>" +#: templates/web/base/report/new/oauth_email_form.html:4 +#, fuzzy +msgid "Please note your report has <strong>not yet been sent</strong>." +msgstr "La tua segnalazione <strong>non è stata inviata</strong>. Scegli una categoria e aggiungi ulteriori informazioni qui di seguito e infine inviala." -#: templates/web/base/report/new/fill_in_details_form.html:8 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:21 +#: templates/web/base/report/new/fill_in_details_form.html:20 #: templates/web/zurich/report/new/fill_in_details_form.html:11 msgid "Please note your report has <strong>not yet been sent</strong>. Choose a category and add further information below, then submit." msgstr "La tua segnalazione <strong>non è stata inviata</strong>. Scegli una categoria e aggiungi ulteriori informazioni qui di seguito e infine inviala." +#: templates/web/base/report/display.html:26 +msgid "Please note your update has <strong>not yet been posted</strong>." +msgstr "" + #: templates/web/base/report/new/notes.html:1 #: templates/web/zurich/report/new/notes.html:1 msgid "Please note:" @@ -2219,9 +2111,8 @@ msgid "Please say whether you've ever reported a problem to your council before" msgstr "Per favore dicci se hai mai precedentemente riportato un problema al tuo comune " #: templates/web/zurich/admin/report_edit.html:208 -#, fuzzy msgid "Please select a body." -msgstr "Si prega di selezionare il feed che si vuole" +msgstr "" #: perllib/FixMyStreet/App/Controller/Alert.pm:80 msgid "Please select the feed you want" @@ -2238,6 +2129,7 @@ msgstr "Si prega di indicare se il problema è stato risolto" #: perllib/FixMyStreet/App/Model/PhotoSet.pm:117 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:145 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:147 +#: templates/web/base/js/translation_strings.html:53 msgid "Please upload a JPEG image only" msgstr "Per favore utilizza soltanto il formato JPG" @@ -2245,18 +2137,14 @@ msgstr "Per favore utilizza soltanto il formato JPG" msgid "Please write a message" msgstr "Per favore scrivi un messaggio" -#: templates/web/fixmystreet/report/update-form.html:23 +#: templates/web/base/report/update/form_update.html:29 msgid "Please write your update here" msgstr "Per favore scrivi il tuo aggiornamento qui" -#: templates/web/base/contact/index.html:100 -#: templates/web/base/report/update-form.html:110 -#: templates/web/base/report/update-form.html:132 -#: templates/web/base/report/update-form.html:72 -#: templates/web/fixmystreet/contact/index.html:113 -#: templates/web/fixmystreet/report/update-form.html:124 -#: templates/web/fixmystreet/report/update-form.html:71 -#: templates/web/fixmystreet/report/update-form.html:97 +#: templates/web/base/contact/index.html:105 +#: templates/web/base/report/update-form.html:24 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:14 +#: templates/web/base/report/update/form_user_loggedout_password.html:10 msgid "Post" msgstr "Posta" @@ -2284,12 +2172,9 @@ msgstr "Precedente" msgid "Privacy" msgstr "Privacy" -#: templates/web/base/faq/faq-en-gb.html:7 -#: templates/web/base/open311/index.html:7 -#: templates/web/base/static/privacy.html:1 -#: templates/web/base/static/privacy.html:2 -#: templates/web/base/static/privacy.html:9 -#: templates/web/fixmystreet/contact/index.html:11 +#: templates/web/base/about/_sidebar.html:5 +#: templates/web/base/about/privacy.html:1 +#: templates/web/base/about/privacy.html:2 msgid "Privacy and cookies" msgstr "" @@ -2317,12 +2202,12 @@ msgstr "Problema %s confermato" msgid "Problem %s sent to council %s" msgstr "Problema %s inviato al comune %s" -#: templates/web/base/admin/index.html:46 +#: templates/web/base/admin/index.html:39 #: templates/web/zurich/admin/index.html:9 msgid "Problem breakdown by state" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1055 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1058 msgid "Problem marked as open." msgstr "Problema marcato come aperto." @@ -2338,11 +2223,11 @@ msgstr "Problemi" msgid "Problems in this area" msgstr "Problemi in questa area" -#: templates/web/fixmystreet/report/display.html:43 +#: templates/web/base/report/display_tools.html:19 msgid "Problems nearby" msgstr "Problemi vicino" -#: templates/web/fixmystreet/report/display.html:41 +#: templates/web/base/report/display_tools.html:17 msgid "Problems on the map" msgstr "Problemi sulla mappa" @@ -2354,24 +2239,23 @@ msgstr "Problemi recentemente segnalati e risolti su FIxMyStreet" msgid "Problems within %.1fkm of this location" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:642 +#: perllib/FixMyStreet/Cobrand/Default.pm:663 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:120 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:139 -#: perllib/FixMyStreet/Cobrand/UK.pm:207 +#: perllib/FixMyStreet/Cobrand/UK.pm:208 msgid "Problems within %s" msgstr "Problemi dentro %s" #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:128 -#: perllib/FixMyStreet/Cobrand/UK.pm:221 +#: perllib/FixMyStreet/Cobrand/UK.pm:222 msgid "Problems within %s ward" msgstr "Problemi dentro %s quartiere" #. ("First %s is the body name, second %s the site name") #: templates/web/base/reports/body.html:0 #: templates/web/base/reports/body.html:24 -#, fuzzy msgid "Problems within %s, %s" -msgstr "Problemi dentro %s" +msgstr "" #: templates/web/base/alert/_list.html:42 msgid "Problems within the boundary of:" @@ -2385,19 +2269,16 @@ msgstr "L'indirizzo della proprietà :" msgid "Property type:" msgstr "Tipo di proprietà :" -#: templates/web/base/report/update-form.html:3 -#: templates/web/fixmystreet/report/update-form.html:4 +#: templates/web/base/report/update-form.html:6 msgid "Provide an update" msgstr "Fornisci un'aggiornamento" -#: templates/web/base/auth/general.html:56 +#: templates/web/base/auth/general.html:95 msgid "Providing a name and password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:156 -#: templates/web/base/report/update-form.html:129 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:71 -#: templates/web/fixmystreet/report/update-form.html:119 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:34 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:9 msgid "Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." msgstr "Scegliere una password è opzionale, ma farlo ti acconsentirà di riportare più facilmente le future segnalazioni, di aggiungere degli aggiornamenti e gestire le tue segnalazioni." @@ -2433,18 +2314,17 @@ msgstr "" #: templates/web/base/alert/_list.html:22 #: templates/web/base/around/display_location.html:1 #: templates/web/base/around/display_location.html:3 -#: templates/web/base/report/display.html:50 +#: templates/web/base/report/display_tools.html:34 #: templates/web/base/reports/_rss.html:1 #: templates/web/fixmystreet/alert/updates.html:9 -#: templates/web/fixmystreet/report/display.html:58 msgid "RSS feed" msgstr "RSS feed" -#: perllib/FixMyStreet/Cobrand/UK.pm:250 perllib/FixMyStreet/Cobrand/UK.pm:262 +#: perllib/FixMyStreet/Cobrand/UK.pm:251 perllib/FixMyStreet/Cobrand/UK.pm:263 msgid "RSS feed for %s" msgstr "RSS feed per %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:256 perllib/FixMyStreet/Cobrand/UK.pm:268 +#: perllib/FixMyStreet/Cobrand/UK.pm:257 perllib/FixMyStreet/Cobrand/UK.pm:269 msgid "RSS feed for %s ward, %s" msgstr "" @@ -2452,11 +2332,11 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:163 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:173 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:181 -#: perllib/FixMyStreet/Cobrand/UK.pm:276 perllib/FixMyStreet/Cobrand/UK.pm:288 +#: perllib/FixMyStreet/Cobrand/UK.pm:277 perllib/FixMyStreet/Cobrand/UK.pm:289 msgid "RSS feed of %s" msgstr "RSS feed di %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:281 perllib/FixMyStreet/Cobrand/UK.pm:293 +#: perllib/FixMyStreet/Cobrand/UK.pm:282 perllib/FixMyStreet/Cobrand/UK.pm:294 msgid "RSS feed of %s, within %s ward" msgstr "RSS feed di %s, dentro al quartiere %s " @@ -2468,15 +2348,15 @@ msgstr "RSS feed dei problemi vicino" msgid "RSS feed of problems in this %s" msgstr "RSS feed per i problemi in questo %s" -#: perllib/FixMyStreet/Cobrand/Default.pm:643 +#: perllib/FixMyStreet/Cobrand/Default.pm:664 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:121 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:138 -#: perllib/FixMyStreet/Cobrand/UK.pm:214 +#: perllib/FixMyStreet/Cobrand/UK.pm:215 msgid "RSS feed of problems within %s" msgstr "RSS feed dei problemi dentro %s" #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:127 -#: perllib/FixMyStreet/Cobrand/UK.pm:220 +#: perllib/FixMyStreet/Cobrand/UK.pm:221 msgid "RSS feed of problems within %s ward" msgstr "RSS feed di problemi dentro al quartiere %s " @@ -2485,25 +2365,22 @@ msgstr "RSS feed di problemi dentro al quartiere %s " msgid "RSS feed of recent local problems" msgstr "RSS feed dei recenti problemi locali" -#: templates/web/base/report/display.html:50 +#: templates/web/base/report/display_tools.html:34 #: templates/web/fixmystreet/alert/updates.html:9 -#: templates/web/fixmystreet/report/display.html:58 msgid "RSS feed of updates to this problem" msgstr "RSS feed degli aggiornamenti su questa segnalazione" #: templates/web/base/alert/updates.html:9 -#: templates/web/base/report/display.html:41 +#: templates/web/base/report/display_tools.html:36 #: templates/web/fixmystreet/alert/updates.html:14 -#: templates/web/fixmystreet/report/display.html:60 msgid "Receive email when updates are left on this problem." msgstr "Ricevi un'email quando gli aggiornamenti sono aggiunti su questa segnalazione." #. ("%s is the site name") #: templates/web/base/around/display_location.html:0 #: templates/web/base/around/display_location.html:33 -#, fuzzy msgid "Recent local problems, %s" -msgstr "Recenti problemi locali, FIxMyStreet" +msgstr "" #: templates/web/base/reports/index.html:24 msgid "Recently <br>fixed" @@ -2521,16 +2398,15 @@ msgstr "Ricorda che FIxMyStreet serve per segnalare problemi materiali che posso msgid "Remove flag" msgstr "" -#: templates/web/base/admin/report_edit.html:92 -#: templates/web/base/admin/update_edit.html:62 +#: templates/web/base/admin/report_edit.html:93 +#: templates/web/base/admin/update_edit.html:67 #: templates/web/zurich/admin/update_edit.html:35 msgid "Remove photo (can't be undone!)" msgstr "" #: templates/web/zurich/admin/report_edit.html:243 -#, fuzzy msgid "Reply to user:" -msgstr "Modifica utente" +msgstr "" #: templates/web/fixmystreet/header_logo.html:2 msgid "Report" @@ -2543,7 +2419,7 @@ msgstr "" msgid "Report a problem" msgstr "Segnala un problema" -#: templates/web/fixmystreet/report/display.html:32 +#: templates/web/base/report/display_tools.html:8 msgid "Report abuse" msgstr "Segnala un abuso" @@ -2552,7 +2428,8 @@ msgid "Report on %s" msgstr "" #: templates/web/base/report/new/fill_in_details_form.html:1 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:2 +#: templates/web/base/report/new/login_success_form.html:1 +#: templates/web/base/report/new/oauth_email_form.html:1 msgid "Report your problem" msgstr "" @@ -2561,9 +2438,8 @@ msgstr "" msgid "Report, view, or discuss local problems" msgstr "Segnala, conosci e discuti sui problemi della tua città " -#: perllib/FixMyStreet/DB/Result/Problem.pm:585 -#: templates/web/base/contact/index.html:50 -#: templates/web/fixmystreet/contact/index.html:65 +#: perllib/FixMyStreet/DB/Result/Problem.pm:573 +#: templates/web/base/contact/index.html:57 msgid "Reported anonymously at %s" msgstr "Riportati anonimamente al %s" @@ -2572,43 +2448,41 @@ msgstr "Riportati anonimamente al %s" msgid "Reported before" msgstr "Segnalati prima" -#: perllib/FixMyStreet/DB/Result/Problem.pm:608 -#: templates/web/base/contact/index.html:52 -#: templates/web/fixmystreet/contact/index.html:67 +#: perllib/FixMyStreet/DB/Result/Problem.pm:596 +#: templates/web/base/contact/index.html:59 msgid "Reported by %s at %s" msgstr "Segnalato da %s al %s" #: templates/web/zurich/admin/report_edit-sdm.html:58 #: templates/web/zurich/admin/report_edit.html:86 -#, fuzzy msgid "Reported by:" -msgstr "Riportati %s" +msgstr "" #: templates/web/zurich/report/_main.html:2 msgid "Reported in the %s category" msgstr "Riportato nella categoria %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:581 +#: perllib/FixMyStreet/DB/Result/Problem.pm:569 msgid "Reported in the %s category anonymously at %s" msgstr "Riportato nella categoria %s anonimamente alle %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:603 +#: perllib/FixMyStreet/DB/Result/Problem.pm:591 msgid "Reported in the %s category by %s at %s" msgstr "Riportato nella categoria %s da %s alle %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:577 +#: perllib/FixMyStreet/DB/Result/Problem.pm:565 msgid "Reported via %s anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:599 +#: perllib/FixMyStreet/DB/Result/Problem.pm:587 msgid "Reported via %s by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:573 +#: perllib/FixMyStreet/DB/Result/Problem.pm:561 msgid "Reported via %s in the %s category anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:593 +#: perllib/FixMyStreet/DB/Result/Problem.pm:581 msgid "Reported via %s in the %s category by %s at %s" msgstr "" @@ -2618,9 +2492,8 @@ msgstr "" #: templates/web/zurich/admin/report_edit-sdm.html:36 #: templates/web/zurich/admin/report_edit.html:55 -#, fuzzy msgid "Reported:" -msgstr "Riportati %s" +msgstr "" #: templates/web/base/around/index.html:2 #: templates/web/base/js/translation_strings.html:41 @@ -2630,13 +2503,13 @@ msgstr "Riportati %s" msgid "Reporting a problem" msgstr "Stai segnalando un problema" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1277 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1286 #: perllib/FixMyStreet/Cobrand/Zurich.pm:384 #: templates/web/zurich/header.html:60 msgid "Reports" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:327 perllib/FixMyStreet/Cobrand/UK.pm:331 +#: perllib/FixMyStreet/Cobrand/UK.pm:328 perllib/FixMyStreet/Cobrand/UK.pm:332 msgid "Reports are limited to %s characters in length. Please shorten your report" msgstr "" @@ -2673,15 +2546,17 @@ msgstr "" msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1495 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1500 -#: templates/web/base/admin/report_edit.html:88 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1508 +#: templates/web/base/admin/report_edit.html:90 +#: templates/web/base/admin/update_edit.html:64 #: templates/web/zurich/admin/report_edit.html:116 msgid "Rotate Left" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1495 -#: templates/web/base/admin/report_edit.html:89 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 +#: templates/web/base/admin/report_edit.html:91 +#: templates/web/base/admin/update_edit.html:65 #: templates/web/zurich/admin/report_edit.html:117 msgid "Rotate Right" msgstr "" @@ -2691,7 +2566,6 @@ msgid "Rotating this photo will discard unsaved changes to the report." msgstr "" #: templates/web/base/js/translation_strings.html:46 -#: templates/web/base/maps/google-ol.html:13 msgid "Satellite" msgstr "" @@ -2744,16 +2618,14 @@ msgid "Select an area" msgstr "Seleziona un'area" #: templates/web/base/alert/_list.html:10 -#, fuzzy msgid "Select which type of alert you’d like and click the button for an RSS feed, or enter your email address to subscribe to an email alert." -msgstr "Seleziona quale tipo di avvertimento vorresti e clicca sul bottone per gli RSS feed oppure inserisci il tuo indirizzo email per iscriverti agli avvertimenti via email." +msgstr "" #: perllib/FixMyStreet/Cobrand/Zurich.pm:835 -#, fuzzy msgid "Sent report back" -msgstr "Segnalazione aperta" +msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:708 +#: perllib/FixMyStreet/DB/Result/Problem.pm:696 msgid "Sent to %s %s later" msgstr "" @@ -2766,15 +2638,13 @@ msgstr "Inviato:" msgid "Service:" msgstr "" -#: templates/web/fixmystreet/report/display.html:38 +#: templates/web/base/report/display_tools.html:14 msgid "Share" msgstr "Condividi" -#: templates/web/base/report/new/fill_in_details_form.html:193 -#: templates/web/base/report/update-form.html:158 -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:23 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:59 -#: templates/web/fixmystreet/report/update-form.html:146 +#: templates/web/base/report/new/form_user_loggedin.html:23 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:22 +#: templates/web/base/report/update/form_name.html:15 msgid "Show my name publicly" msgstr "Mostra il mio nome pubblicamente" @@ -2786,9 +2656,9 @@ msgstr "" msgid "Show pins" msgstr "" +#: templates/web/base/auth/general.html:100 #: templates/web/base/auth/general.html:3 -#: templates/web/base/auth/general.html:40 -#: templates/web/base/auth/general.html:61 +#: templates/web/base/auth/general.html:76 #: templates/web/zurich/auth/general.html:18 #: templates/web/zurich/auth/general.html:35 msgid "Sign in" @@ -2815,7 +2685,7 @@ msgid "" " sent from your FixMyStreet installation." msgstr "" -#: templates/web/base/alert/index.html:42 +#: templates/web/base/alert/index.html:40 msgid "Some photos of recent reports" msgstr "Qualche foto di segnalazioni recenti" @@ -2825,7 +2695,7 @@ msgstr "Qualche foto di segnalazioni recenti" msgid "Some text to localize" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:78 +#: perllib/FixMyStreet/Cobrand/UK.pm:79 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover." msgstr "" @@ -2837,23 +2707,34 @@ msgstr "" msgid "Sorry, there has been an error confirming your problem." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:221 -#: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:37 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:216 +#: perllib/FixMyStreet/Geocode.pm:38 perllib/FixMyStreet/Geocode/Bing.pm:38 #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:56 #: perllib/FixMyStreet/Geocode/OSM.pm:48 msgid "Sorry, we could not find that location." msgstr "Ci scusiamo, non possiamo trovare questa zona." -#: perllib/FixMyStreet/Geocode/Bing.pm:34 +#: templates/web/base/auth/general.html:9 +#: templates/web/base/report/display.html:21 +#: templates/web/base/report/new/fill_in_details_form.html:23 +#, fuzzy +msgid "Sorry, we could not log you in. Please fill in the form below." +msgstr "Ci scusiamo, non possiamo analizzare questa zona. Per favore prova ancora." + +#: perllib/FixMyStreet/Geocode/Bing.pm:35 #: perllib/FixMyStreet/Geocode/Google.pm:45 #: perllib/FixMyStreet/Geocode/Zurich.pm:88 msgid "Sorry, we could not parse that location. Please try again." msgstr "Ci scusiamo, non possiamo analizzare questa zona. Per favore prova ancora." #: perllib/FixMyStreet/App/Model/PhotoSet.pm:134 -#, fuzzy msgid "Sorry, we couldn't save your image(s), please try again." -msgstr "Ci scusiamo, non possiamo analizzare questa zona. Per favore prova ancora." +msgstr "" + +#: perllib/FixMyStreet/App/Controller/AuthSS.pm:301 +#, fuzzy +msgid "Sorry, you can not log in with Facebook. Please try again later." +msgstr "E' accaduto un problema visualizzando questa pagine. Per favore riprova ancora più tardi" #: templates/web/base/admin/stats.html:64 msgid "Start Date:" @@ -2863,13 +2744,12 @@ msgstr "Data di inizio:" #: templates/web/base/admin/flagged.html:18 #: templates/web/base/admin/list_updates.html:11 #: templates/web/base/admin/reports.html:15 -#: templates/web/fixmystreet/report/update-form.html:26 +#: templates/web/base/report/update/form_update.html:32 msgid "State" msgstr "Stato" #: templates/web/base/admin/report_edit.html:47 #: templates/web/base/admin/update_edit.html:27 -#: templates/web/base/report/update-form.html:28 #: templates/web/zurich/admin/report_edit-sdm.html:73 #: templates/web/zurich/admin/report_edit.html:101 #: templates/web/zurich/admin/report_edit.html:155 @@ -2877,7 +2757,7 @@ msgstr "Stato" msgid "State:" msgstr "Stato:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1282 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1291 #: perllib/FixMyStreet/Cobrand/Zurich.pm:387 #: templates/web/base/admin/stats.html:1 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:73 @@ -2899,7 +2779,7 @@ msgstr "Ancora aperto, attraverso il questionario %s" msgid "Street View" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:406 +#: perllib/FixMyStreet/Script/Reports.pm:184 msgid "Subcategory: %s" msgstr "Sottocategoria: %s" @@ -2907,30 +2787,25 @@ msgstr "Sottocategoria: %s" msgid "Subdivision/Body" msgstr "Sottodivisione/Corpo" -#: templates/web/fixmystreet/contact/index.html:98 +#: templates/web/base/contact/index.html:90 msgid "Subject" msgstr "Soggetto" #: templates/web/base/admin/report_edit.html:19 -#: templates/web/base/contact/index.html:88 -#: templates/web/base/report/new/fill_in_details_form.html:53 #: templates/web/zurich/admin/report_edit.html:39 msgid "Subject:" msgstr "Soggetto:" #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/fill_in_details_form.html:137 -#: templates/web/base/report/new/fill_in_details_form.html:159 -#: templates/web/base/report/new/fill_in_details_form.html:96 -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:36 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:23 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:76 +#: templates/web/base/report/new/form_user_loggedin.html:36 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:39 +#: templates/web/base/report/new/form_user_loggedout_password.html:11 #: templates/web/zurich/report/new/fill_in_details_form.html:96 msgid "Submit" msgstr "Invia" -#: templates/web/base/admin/report_edit.html:95 -#: templates/web/base/admin/update_edit.html:65 +#: templates/web/base/admin/report_edit.html:101 +#: templates/web/base/admin/update_edit.html:75 #: templates/web/base/admin/user-form.html:56 #: templates/web/zurich/admin/report_edit-sdm.html:137 #: templates/web/zurich/admin/report_edit.html:268 @@ -2938,7 +2813,7 @@ msgstr "Invia" msgid "Submit changes" msgstr "Invia modifiche" -#: templates/web/base/questionnaire/index.html:97 +#: templates/web/base/questionnaire/index.html:106 msgid "Submit questionnaire" msgstr "Invia questionario" @@ -2954,9 +2829,8 @@ msgid "Submitted" msgstr "Inviato" #: templates/web/base/alert/updates.html:17 -#: templates/web/base/report/display.html:46 +#: templates/web/base/report/display_tools.html:41 #: templates/web/fixmystreet/alert/updates.html:23 -#: templates/web/fixmystreet/report/display.html:65 msgid "Subscribe" msgstr "Sottoscrivi" @@ -2964,7 +2838,7 @@ msgstr "Sottoscrivi" msgid "Subscribe me to an email alert" msgstr "Iscrivimi alle email di avviso" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1275 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1284 #: perllib/FixMyStreet/Cobrand/Zurich.pm:383 #: templates/web/base/admin/bodies.html:25 #: templates/web/base/admin/index.html:1 @@ -2983,7 +2857,7 @@ msgstr "Sommario" msgid "Summary reports" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1279 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1288 msgid "Survey" msgstr "Sondaggio" @@ -2997,9 +2871,8 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/Zurich.pm:394 #: templates/web/zurich/header.html:77 -#, fuzzy msgid "Templates" -msgstr "Aggiornamenti" +msgstr "" #: templates/web/base/admin/list_updates.html:12 #: templates/web/zurich/admin/templates.html:9 @@ -3020,7 +2893,7 @@ msgstr "Testo:" msgid "Thank you for reporting this issue!" msgstr "" -#: templates/web/base/tokens/error.html:7 +#: templates/web/base/tokens/error.html:6 msgid "Thank you for trying to confirm your update or problem. We seem to have an error ourselves though, so <a href=\"%s\">please let us know what went on</a> and we'll look into it." msgstr "" @@ -3055,23 +2928,23 @@ msgstr "Questa posizione non sembra essere nel Regno Unito, si prega di riprovar #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:47 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:63 -#: perllib/FixMyStreet/Cobrand/UK.pm:71 +#: perllib/FixMyStreet/Cobrand/UK.pm:72 msgid "That postcode was not recognised, sorry." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:726 +#: perllib/FixMyStreet/App/Controller/Admin.pm:724 msgid "That problem has been marked as sent." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:718 +#: perllib/FixMyStreet/App/Controller/Admin.pm:716 msgid "That problem will now be resent." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:125 +#: perllib/FixMyStreet/App/Controller/Report.pm:127 msgid "That report cannot be viewed on %s." msgstr "La segnalazione non può essere vista su %s." -#: perllib/FixMyStreet/App/Controller/Report.pm:119 +#: perllib/FixMyStreet/App/Controller/Report.pm:121 msgid "That report has been removed from FixMyStreet." msgstr "Quella segnalazione è stata rimossa da FixMyStreet" @@ -3102,7 +2975,7 @@ msgid "" " If you leave this blank, <strong>send method defaults to email</strong>." msgstr "" -#: templates/web/base/open311/index.html:90 +#: templates/web/base/open311/index.html:82 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 "" @@ -3123,12 +2996,12 @@ msgstr "Il comune non sarà in grado di fare qualcosa finchè non lascerai più msgid "The diligency prize league table shows editors' activity (who's been editing the most records)." msgstr "" -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:60 -#: perllib/FixMyStreet/App/Controller/Reports.pm:79 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:61 +#: perllib/FixMyStreet/App/Controller/Reports.pm:80 msgid "The error was: %s" msgstr "L'errore era: %s" -#: templates/web/base/open311/index.html:86 +#: templates/web/base/open311/index.html:78 msgid "The following Open311 v2 attributes are returned for each request: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code and service_name." msgstr "" @@ -3175,8 +3048,7 @@ msgstr "" msgid "The passwords do not match" msgstr "Le passwords non corrispondono" -#: templates/web/base/errors/page_error_404_not_found.html:10 -#: templates/web/base/errors/page_error_404_not_found.html:12 +#: templates/web/base/errors/page_error_404_not_found.html:9 msgid "The requested URL '%s' was not found on this server" msgstr "L'URL richiesta '%s' non è stata trovata su questo serverjavascript:;" @@ -3186,12 +3058,11 @@ msgstr "" #: templates/web/base/report/new/councils_extra_text.html:1 #: templates/web/base/report/new/councils_text_some.html:10 -#: templates/web/base/report/new/fill_in_details_form.html:18 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:14 +#: templates/web/base/report/new/fill_in_details_form.html:13 msgid "The summary and description will also be made public (see our <a href=\"/privacy\">privacy policy</a>)." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:315 +#: perllib/FixMyStreet/Script/Reports.pm:92 msgid "The user could not locate the problem on a map, but to see the area around the location they entered" msgstr "" @@ -3208,18 +3079,18 @@ msgstr "" msgid "There are no reports to show." msgstr "" -#: perllib/FixMyStreet/App/Controller/Reports.pm:76 +#: perllib/FixMyStreet/App/Controller/Reports.pm:77 msgid "There was a problem showing the All Reports page. Please try again later." msgstr "" #: perllib/FixMyStreet/App/Controller/Contact.pm:137 -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:59 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:60 msgid "There was a problem showing this page. Please try again later." msgstr "E' accaduto un problema visualizzando questa pagine. Per favore riprova ancora più tardi" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:769 -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:134 -#: templates/web/base/auth/general.html:26 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:764 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:138 +#: templates/web/base/auth/general.html:43 #: templates/web/zurich/auth/general.html:28 msgid "There was a problem with your email/password combination. If you cannot remember your password, or do not have one, please fill in the ‘sign in by email’ section of the form." msgstr "E' accaduto un problema con la tua combinazione email/password. Se non ti ricordi la password, o non né hai ancora una, per favore riempi qui gli ‘ ed entra con l'email&rsquo, nella sezione del form" @@ -3228,7 +3099,7 @@ msgstr "E' accaduto un problema con la tua combinazione email/password. Se non t msgid "There was a problem with your email/password combination. Please try again." msgstr "E' accaduto un problema con la tua combinazione email/password. Per favore prova ancora." -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:272 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:336 msgid "There was a problem with your update. Please try again." msgstr "C'è stato un problema con il tuo aggiornamento. Per favore prova ancora." @@ -3236,7 +3107,7 @@ msgstr "C'è stato un problema con il tuo aggiornamento. Per favore prova ancora msgid "There were problems with your report. Please see below." msgstr "Ci sono stati dei problemi con la tua segnalazione. Per favore guarda qui sotto." -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:300 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:371 msgid "There were problems with your update. Please see below." msgstr "" @@ -3250,7 +3121,7 @@ msgid "" " " msgstr "" -#: templates/web/base/open311/index.html:77 +#: templates/web/base/open311/index.html:69 msgid "This API implementation is work in progress and not yet stabilized. It will change without warnings in the future." msgstr "" @@ -3272,18 +3143,18 @@ msgid "" " A body will not receive any reports unless it covers at least one area." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:413 +#: perllib/FixMyStreet/Script/Reports.pm:191 msgid "This email has been sent to both councils covering the location of the problem, as the user did not categorise it; please ignore it if you're not the correct council to deal with the issue, or let us know what category of problem this is so we can add it to our system." msgstr "Questa email è stata inviata ad entrambi i comuni che coprono la zona del problema, visto che l'utente non ha aggiunto una categoria; per favore ignorate l'email se non siete il comune corretto che deve gestire il problema, o fateci sapere qual'e la categoria di questo problema così da poterla aggiungere nel nostro sistema." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:416 +#: perllib/FixMyStreet/Script/Reports.pm:194 msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:925 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:995 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:920 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:990 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:142 -#: perllib/FixMyStreet/Cobrand/UK.pm:43 +#: perllib/FixMyStreet/Cobrand/UK.pm:44 msgid "This information is required" msgstr "Questa informazione è richiesta" @@ -3295,56 +3166,37 @@ msgstr "" msgid "This is a summary of all reports on this site." msgstr "" -#: templates/web/zurich/auth/token.html:8 -msgid "This may be because the link is too old or already used, or the address was not copied correctly." -msgstr "" - -#: templates/web/base/report/banner.html:15 -msgid "This problem has been closed" -msgstr "Questo problema è stato chiuso" - -#: templates/web/base/report/banner.html:12 -#: templates/web/base/report/update-form.html:48 -#: templates/web/fixmystreet/report/update-form.html:46 +#: templates/web/base/report/update/form_update.html:52 msgid "This problem has been fixed" msgstr "Questo problema è stato risolto" -#: templates/web/base/report/update-form.html:43 -#: templates/web/fixmystreet/report/update-form.html:40 +#: templates/web/base/report/update/form_update.html:46 msgid "This problem has not been fixed" msgstr "Questo problema non è stato risolto" -#: templates/web/base/report/banner.html:19 -msgid "This problem is in progress" -msgstr "" - -#: templates/web/base/report/banner.html:9 -msgid "This problem is old and of unknown status." -msgstr "" - #: perllib/FixMyStreet/Cobrand/Zurich.pm:168 #: perllib/FixMyStreet/Cobrand/Zurich.pm:169 #: templates/web/zurich/report/_main.html:14 msgid "This report is awaiting moderation." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:86 +#: perllib/FixMyStreet/Script/Alerts.pm:94 msgid "This report is currently marked as closed." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:84 +#: perllib/FixMyStreet/Script/Alerts.pm:92 msgid "This report is currently marked as fixed." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:88 +#: perllib/FixMyStreet/Script/Alerts.pm:96 msgid "This report is currently marked as open." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:326 +#: perllib/FixMyStreet/Script/Reports.pm:105 msgid "This report was submitted anonymously" msgstr "Questo report è stato sottomesso in maniera anonima" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:308 +#: perllib/FixMyStreet/Script/Reports.pm:85 msgid "This web page also contains a photo of the problem, provided by the user." msgstr "" @@ -3355,7 +3207,7 @@ msgstr "" msgid "Time spent (in minutes):" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1278 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1287 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "" @@ -3367,24 +3219,22 @@ msgid "Title" msgstr "Titolo" #: templates/web/zurich/admin/template_edit.html:20 -#, fuzzy msgid "Title:" -msgstr "Titolo" +msgstr "" #: templates/web/base/alert/index.html:25 -#, fuzzy msgid "To find out what local alerts we have for you, please enter your %s postcode or street name and area:" -msgstr "Per sapere quali segnalazioni locali abbiamo per te, inserisci per favore il tuo codice postale o il nome della via e della zona" +msgstr "" #: templates/web/base/alert/index.html:27 msgid "To find out what local alerts we have for you, please enter your postcode or street name and area" msgstr "Per sapere quali segnalazioni locali abbiamo per te, inserisci per favore il tuo codice postale o il nome della via e della zona" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:314 +#: perllib/FixMyStreet/Script/Reports.pm:91 msgid "To view a map of the precise location of this issue" msgstr "" -#: templates/web/base/admin/index.html:61 +#: templates/web/base/admin/index.html:54 #: templates/web/base/admin/questionnaire.html:24 #: templates/web/base/admin/stats.html:24 #: templates/web/base/admin/stats.html:43 @@ -3402,10 +3252,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:12 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:33 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:31 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:37 msgid "Unable to fix" msgstr "" @@ -3418,7 +3266,7 @@ msgstr "" msgid "Unconfirmed" msgstr "Non confermato" -#: templates/web/fixmystreet/report/banner.html:9 +#: templates/web/base/report/banner.html:9 msgid "Unknown" msgstr "Sconosciuto" @@ -3426,17 +3274,18 @@ msgstr "Sconosciuto" msgid "Unknown alert type" msgstr "" +#: perllib/FixMyStreet/App/Controller/Photo.pm:110 #: templates/web/base/js/translation_strings.html:39 msgid "Unknown error" msgstr "Errore sconosciuto" -#: perllib/FixMyStreet/App/Controller/Report.pm:103 -#: perllib/FixMyStreet/App/Controller/Report.pm:109 -#: perllib/FixMyStreet/App/Controller/Report.pm:112 +#: perllib/FixMyStreet/App/Controller/Report.pm:105 +#: perllib/FixMyStreet/App/Controller/Report.pm:111 +#: perllib/FixMyStreet/App/Controller/Report.pm:114 msgid "Unknown problem ID" msgstr "" -#: templates/web/fixmystreet/report/update-form.html:19 +#: templates/web/base/report/update/form_update.html:25 msgid "Update" msgstr "" @@ -3444,13 +3293,11 @@ msgstr "" msgid "Update %s created for problem %d; by %s" msgstr "" -#: templates/web/base/contact/index.html:21 -#: templates/web/fixmystreet/contact/index.html:36 +#: templates/web/base/contact/index.html:28 msgid "Update below added anonymously at %s" msgstr "" -#: templates/web/base/contact/index.html:23 -#: templates/web/fixmystreet/contact/index.html:38 +#: templates/web/base/contact/index.html:30 msgid "Update below added by %s at %s" msgstr "" @@ -3459,7 +3306,7 @@ msgstr "" msgid "Update body" msgstr "" -#: templates/web/base/admin/index.html:55 +#: templates/web/base/admin/index.html:48 msgid "Update breakdown by state" msgstr "" @@ -3484,20 +3331,16 @@ msgstr "" msgid "Update statuses" msgstr "" -#: templates/web/base/report/update-form.html:22 -msgid "Update:" -msgstr "Aggiornamento:" - #: templates/web/zurich/admin/index-dm.html:23 #: templates/web/zurich/admin/index-sdm.html:21 #: templates/web/zurich/admin/reports.html:13 msgid "Updated" msgstr "Aggiornato" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1045 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1103 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1147 -#: perllib/FixMyStreet/App/Controller/Admin.pm:822 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1048 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1108 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1156 +#: perllib/FixMyStreet/App/Controller/Admin.pm:821 #: perllib/FixMyStreet/Cobrand/Zurich.pm:771 #: perllib/FixMyStreet/Cobrand/Zurich.pm:796 #: perllib/FixMyStreet/Cobrand/Zurich.pm:866 @@ -3505,13 +3348,12 @@ msgid "Updated!" msgstr "Aggiornato!" #: templates/web/base/admin/list_updates.html:2 -#: templates/web/base/report/update.html:3 -#: templates/web/fixmystreet/report/update.html:5 +#: templates/web/base/report/update.html:5 #: templates/web/zurich/report/updates.html:2 msgid "Updates" msgstr "Aggiornamenti" -#: perllib/FixMyStreet/DB/Result/Comment.pm:132 +#: perllib/FixMyStreet/DB/Result/Comment.pm:131 msgid "Updates are limited to %s characters in length. Please shorten your update" msgstr "" @@ -3521,12 +3363,9 @@ msgstr "" #. ("%s is the site name") #: templates/web/base/report/display.html:0 -#: templates/web/base/report/display.html:5 -#: templates/web/fixmystreet/report/display.html:0 -#: templates/web/fixmystreet/report/display.html:9 -#, fuzzy +#: templates/web/base/report/display.html:9 msgid "Updates to this problem, %s" -msgstr "Ottieni gli aggiornamenti di %s problemi" +msgstr "" #: templates/web/base/admin/body.html:182 msgid "Use the <strong>note</strong> to record details that are only displayed in the admin. Notes are not shown publicly, and are not sent to the body." @@ -3534,15 +3373,14 @@ msgstr "" #: templates/web/zurich/admin/report_edit-sdm.html:48 #: templates/web/zurich/admin/report_edit.html:67 -#, fuzzy msgid "Used map" -msgstr "mappa usata" +msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1452 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1461 msgid "User flag removed" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1424 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1433 msgid "User flagged" msgstr "" @@ -3550,7 +3388,7 @@ msgstr "" msgid "User search finds matches in users' names and email addresses." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1280 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1289 #: perllib/FixMyStreet/Cobrand/Zurich.pm:399 #: templates/web/base/admin/flagged.html:29 #: templates/web/zurich/header.html:69 @@ -3581,7 +3419,6 @@ msgid "Viewing a location" msgstr "" #: templates/web/base/report/display.html:0 -#: templates/web/fixmystreet/report/display.html:0 msgid "Viewing a problem" msgstr "" @@ -3594,25 +3431,24 @@ 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 "Abbiamo trovato più di una corrispondenza per questa posizione. Mostriamo fino a dieci risultati, per favore prova una ricerca differente se quello che cercavi non è qui." -#: templates/web/zurich/auth/token.html:7 -msgid "We have not been able to confirm your account - sorry." -msgstr "" - -#: templates/web/zurich/auth/token.html:17 -msgid "We have sent you an email containing a link to confirm your account." -msgstr "" +#: templates/web/base/auth/general.html:6 +#: templates/web/base/report/display.html:27 +#: templates/web/base/report/new/oauth_email_form.html:5 +#, fuzzy +msgid "We need your email address, please give it below." +msgstr "Non mostriamo mai il tuo indirizzo email e numero di telefono." -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:2 -#: templates/web/fixmystreet/report/update-form.html:77 +#: templates/web/base/report/new/form_user_loggedout_email.html:2 +#: templates/web/base/report/update/form_user_loggedout_email.html:2 msgid "We never show your email" msgstr "" -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:31 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:65 +#: templates/web/base/report/new/form_user_loggedin.html:31 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:28 msgid "We never show your email address or phone number." msgstr "Non mostriamo mai il tuo indirizzo email e numero di telefono." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:422 +#: perllib/FixMyStreet/Script/Reports.pm:200 msgid "We realise this problem might be the responsibility of %s; however, we don't currently have any contact details for them. If you know of an appropriate contact address, please do get in touch." msgstr "" @@ -3629,10 +3465,6 @@ msgstr "Useremo le tue informazioni personali solo in accordo con la nostra <a msgid "We’re sorry to hear the problem’s not fixed. Why not try writing to your local representatives?" msgstr "" -#: templates/web/base/contact/blurb.html:8 -msgid "We'd love to hear what you think about this site. Just fill in the form, or send an email to <a href='mailto:%s'>%s</a>:" -msgstr "" - #: templates/web/base/contact/submit.html:7 msgid "We’ll get back to you as soon as we can." msgstr "" @@ -3641,7 +3473,7 @@ msgstr "" msgid "What was your experience of getting the problem fixed?" msgstr "" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:49 +#: templates/web/base/report/new/form_report.html:19 msgid "What’s the issue, and where is it?" msgstr "" @@ -3654,7 +3486,11 @@ msgstr "" msgid "When sent" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:640 +#: templates/web/base/js/translation_strings.html:50 +msgid "Whoa there Testino! Three photos are enough." +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Report/New.pm:635 msgid "Whole block of empty flats" msgstr "" @@ -3669,7 +3505,7 @@ msgstr "" msgid "Wish" msgstr "" -#: templates/web/base/open311/index.html:92 +#: templates/web/base/open311/index.html:84 msgid "With request searches, it is also possible to search for agency_responsible to limit the requests to those sent to a single administration. The search term is the administration ID provided by <a href=\"%s\">MaPit</a>." msgstr "" @@ -3677,7 +3513,7 @@ msgstr "" msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"http://fixmystreet.org\">available at fixmystreet.org</a>." msgstr "" -#: templates/web/base/questionnaire/index.html:87 +#: templates/web/base/questionnaire/index.html:96 msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?" msgstr "" @@ -3686,7 +3522,6 @@ msgid "Writing your message entirely in block capitals makes it hard to read, as msgstr "Scrivere il tuo messaggio interamente con lettere maiuscole diventa di difficile lettura, come anche una mancanza di punteggiatura." #: templates/web/base/report/new/fill_in_details_form.html:4 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:5 msgid "Wrong location? Just click again on the map." msgstr "" @@ -3709,27 +3544,24 @@ msgstr "Anno" #: templates/web/base/admin/users.html:31 #: templates/web/base/questionnaire/creator_fixed.html:14 #: templates/web/base/questionnaire/index.html:51 -#: templates/web/base/questionnaire/index.html:90 +#: templates/web/base/questionnaire/index.html:99 msgid "Yes" msgstr "Si" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:17 -#: templates/web/fixmystreet/report/update-form.html:91 +#: templates/web/base/report/new/form_user_loggedout_password.html:5 +#: templates/web/base/report/update/form_user_loggedout_password.html:4 msgid "Yes I have a password" msgstr "Si ho già la password" -#: templates/web/base/contact/index.html:39 -#: templates/web/fixmystreet/contact/index.html:54 +#: templates/web/base/contact/index.html:46 msgid "You are complaining that this problem report was unnecessarily moderated:" msgstr "" -#: templates/web/base/contact/index.html:41 -#: templates/web/fixmystreet/contact/index.html:56 +#: templates/web/base/contact/index.html:48 msgid "You are reporting the following problem report for being abusive, containing personal information, or similar:" msgstr "" -#: templates/web/base/contact/index.html:15 -#: templates/web/fixmystreet/contact/index.html:30 +#: templates/web/base/contact/index.html:22 msgid "You are reporting the following update for being abusive, containing personal information, or similar:" msgstr "" @@ -3742,7 +3574,7 @@ msgstr "" msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create." msgstr "" -#: templates/web/fixmystreet/contact/index.html:121 +#: templates/web/base/contact/index.html:113 msgid "You can contact technical support on <a href='mailto:%s'>%s</a>" msgstr "" @@ -3753,8 +3585,8 @@ msgid "" " reports in the past." msgstr "" -#: templates/web/base/report/new/councils_text_none.html:10 -#: templates/web/base/report/new/councils_text_none.html:2 +#: templates/web/base/report/new/councils_text_none.html:12 +#: templates/web/base/report/new/councils_text_none.html:14 #: templates/web/base/report/new/councils_text_some.html:19 #: templates/web/base/report/new/councils_text_some.html:21 msgid "You can help us by finding a contact email address for local problems for %s and emailing it to us at <a href='mailto:%s'>%s</a>." @@ -3772,19 +3604,14 @@ msgstr "Hai rifiutato; Per favore riempi il box qui sopra " msgid "You have already answered this questionnaire. If you have a question, please <a href='%s'>get in touch</a>, or <a href='%s'>view your problem</a>.\n" msgstr "" -#: templates/web/base/questionnaire/index.html:77 -#: templates/web/base/report/new/fill_in_details_form.html:75 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:73 -msgid "You have already attached a photo to this report, attaching another one will replace it." -msgstr "" - -#: templates/web/base/report/update-form.html:59 -#: templates/web/fixmystreet/report/update-form.html:56 -msgid "You have already attached a photo to this update, attaching another one will replace it." +#: templates/web/base/report/new/form_report.html:32 +#: templates/web/zurich/report/new/fill_in_details_form.html:55 +msgid "You have already attached photos to this report. Note that you can attach a maximum of 3 to this report (if you try to upload more, the oldest will be removed)." msgstr "" -#: templates/web/zurich/report/new/fill_in_details_form.html:61 -msgid "You have already attached photos to this report. Note that you can attach a maximum of 3 to this report (if you try to upload more, the oldest will be removed)." +#: templates/web/base/questionnaire/index.html:83 +#: templates/web/base/report/update/form_update.html:14 +msgid "You have already attached photos to this update. Note that you can attach a maximum of 3 to this update (if you try to upload more, the oldest will be removed)." msgstr "" #: templates/web/base/auth/sign_out.html:4 @@ -3801,9 +3628,8 @@ msgstr "Hai localizzato il problema nel punto segnato sulla mappa dal segnetto v msgid "You have successfully confirmed your email address." msgstr "Il tuo indirizzo email è stato confermato con successo." -#: templates/web/base/report/display.html:20 -#: templates/web/base/report/new/fill_in_details.html:37 -#: templates/web/fixmystreet/report/display.html:17 +#: templates/web/base/report/display.html:17 +#: templates/web/base/report/new/login_success_form.html:3 msgid "You have successfully signed in; please check and confirm your details are accurate:" msgstr "Ti sei correttamente iscritto; per favore controlla e conferma i tuoi dettagli:" @@ -3832,53 +3658,42 @@ msgid "Your Reports" msgstr "Tue segnalazioni" #: templates/web/base/alert/_list.html:89 +#: templates/web/base/contact/index.html:83 +#: templates/web/base/report/display_tools.html:38 +#: templates/web/base/report/display_tools.html:40 +#: templates/web/base/report/new/form_user_loggedin.html:3 +#: templates/web/base/report/new/form_user_loggedout_email.html:1 +#: templates/web/base/report/update/form_user_loggedout_email.html:1 #: templates/web/fixmystreet/alert/updates.html:19 #: templates/web/fixmystreet/alert/updates.html:22 -#: templates/web/fixmystreet/contact/index.html:91 -#: templates/web/fixmystreet/report/display.html:62 -#: templates/web/fixmystreet/report/display.html:64 -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:3 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:1 -#: templates/web/fixmystreet/report/update-form.html:76 #: templates/web/zurich/report/new/fill_in_details_form.html:76 msgid "Your email" msgstr "La tua email" -#: templates/web/base/auth/general.html:28 -#: templates/web/fixmystreet/report/update-form.html:82 +#: templates/web/base/auth/general.html:45 +#: templates/web/base/report/update/form_user_loggedout_email.html:7 #: templates/web/zurich/auth/general.html:30 #: templates/web/zurich/auth/general.html:58 msgid "Your email address" msgstr "Tuo indirizzo email" -#: templates/web/base/report/new/fill_in_details_form.html:106 -#: templates/web/base/report/update-form.html:81 -msgid "Your email:" -msgstr "La tua email:" - -#: templates/web/fixmystreet/report/updates-sidebar-notes.html:7 +#: templates/web/base/report/updates-sidebar-notes.html:3 msgid "Your information will only be used in accordance with our <a href=\"/privacy\">privacy policy</a>" msgstr "" -#: templates/web/base/auth/general.html:51 -#: templates/web/fixmystreet/contact/index.html:84 -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:18 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:54 -#: templates/web/fixmystreet/report/update-form.html:142 +#: templates/web/base/auth/general.html:90 +#: templates/web/base/contact/index.html:76 +#: templates/web/base/report/new/form_user_loggedin.html:18 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:17 +#: templates/web/base/report/update/form_name.html:11 #: templates/web/zurich/auth/general.html:61 #: templates/web/zurich/report/new/fill_in_details_form.html:86 msgid "Your name" msgstr "Il tuo nome" -#: templates/web/base/contact/index.html:73 -#: templates/web/base/report/new/fill_in_details_form.html:186 -#: templates/web/base/report/update-form.html:152 -msgid "Your name:" -msgstr "Il tuo nome:" - -#: templates/web/base/auth/general.html:39 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:22 -#: templates/web/fixmystreet/report/update-form.html:96 +#: templates/web/base/auth/general.html:75 +#: templates/web/base/report/new/form_user_loggedout_password.html:10 +#: templates/web/base/report/update/form_user_loggedout_password.html:9 #: templates/web/zurich/auth/general.html:34 msgid "Your password" msgstr "Tua password" @@ -3887,15 +3702,16 @@ msgstr "Tua password" msgid "Your password has been changed" msgstr "La tua password è stata cambiata" -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:27 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:63 +#: templates/web/base/report/new/form_user_loggedin.html:27 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:26 #: templates/web/zurich/report/new/fill_in_details_form.html:92 msgid "Your phone number" msgstr "Il tuo numero di telefono" #: templates/web/base/questionnaire/index.html:14 +#, fuzzy msgid "Your report" -msgstr "La tua segnalazione" +msgstr "Tue segnalazioni" #: templates/web/base/footer.html:9 templates/web/fixmystreet/footer.html:29 msgid "Your reports" @@ -3905,23 +3721,17 @@ msgstr "Tue segnalazioni" msgid "Your updates" msgstr "" -#: templates/web/base/contact/index.html:81 -msgid "Your email:" -msgstr "La tua email:" - #: templates/web/base/reports/_list-filters.html:3 -#, fuzzy msgid "all reports" -msgstr "Tutte le segnalazioni" +msgstr "" #: templates/web/base/admin/timeline.html:4 msgid "by %s" msgstr "da %s" #: templates/web/base/reports/_list-filters.html:5 -#, fuzzy msgid "closed reports" -msgstr "Segnalazione chiusa" +msgstr "" #: templates/web/base/reports/body.html:6 #: templates/web/base/reports/body.html:7 @@ -3943,17 +3753,16 @@ msgid "edit user" msgstr "Modifica utente" #: templates/web/base/reports/_list-filters.html:6 -#, fuzzy msgid "fixed reports" -msgstr "Problemi risolti" +msgstr "" -#: templates/web/base/admin/index.html:33 +#: templates/web/base/status/stats.html:20 #: templates/web/zurich/admin/index.html:5 msgid "from %s different users" -msgstr "da %d utenti differenti" +msgstr "da %s utenti differenti" -#: templates/web/base/report/_item.html:17 -#: templates/web/zurich/report/_item.html:16 +#: templates/web/base/report/_item.html:15 +#: templates/web/zurich/report/_item.html:14 msgid "last updated %s" msgstr "ultimo aggiornamento %s" @@ -4045,10 +3854,8 @@ msgstr "riaperto" msgid "sign out" msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:12 -#: templates/web/base/report/new/fill_in_details_form.html:15 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:10 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:12 +#: templates/web/base/report/new/fill_in_details_form.html:11 +#: templates/web/base/report/new/fill_in_details_form.html:9 msgid "the local council" msgstr "" @@ -4057,7 +3864,7 @@ msgstr "" msgid "there is no pin shown as the user did not use the map" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:398 +#: perllib/FixMyStreet/Script/Reports.pm:176 msgid "this type of local problem" msgstr "" @@ -4066,9 +3873,8 @@ msgid "today" msgstr "oggi" #: templates/web/base/reports/_list-filters.html:4 -#, fuzzy msgid "unfixed reports" -msgstr "Problemi risolti" +msgstr "" #: templates/web/base/admin/report_edit.html:32 msgid "used map" @@ -4087,7 +3893,7 @@ msgstr "" msgid "ward" msgstr "" -#: templates/web/base/front/stats.html:17 +#: templates/web/base/front/stats.html:13 #, perl-format msgid "<big>%s</big> report recently" msgid_plural "<big>%s</big> reports recently" @@ -4115,7 +3921,7 @@ msgid_plural "%d minutes" msgstr[0] "%d minuto" msgstr[1] "%d minuti" -#: templates/web/base/front/stats.html:29 +#: templates/web/base/front/stats.html:25 #, perl-format msgid "<big>%s</big> update on reports" msgid_plural "<big>%s</big> updates on reports" @@ -4136,14 +3942,14 @@ msgid_plural "%d weeks" msgstr[0] "%d settimana" msgstr[1] "%d settimane" -#: templates/web/base/front/stats.html:12 +#: templates/web/base/front/stats.html:8 #, perl-format msgid "<big>%s</big> report in past week" msgid_plural "<big>%s</big> reports in past week" msgstr[0] "<big>%s</big> Segnalazione nell'ultima settimana" msgstr[1] "<big>%s</big> Segnalazioni nelle ultime settimane" -#: templates/web/base/front/stats.html:23 +#: templates/web/base/front/stats.html:19 #, perl-format msgid "<big>%s</big> fixed in past month" msgid_plural "<big>%s</big> fixed in past month" @@ -4164,107 +3970,62 @@ msgid_plural "We do <strong>not</strong> yet have details for the other councils msgstr[0] "<strong>Non</strong>abbiamo ancora dettagli per un'altro comune che copre questa zona." msgstr[1] "<strong>Non</strong>abbiamo ancora dettagli sugli altri comuni che coprono questa zona." -#~ msgid "(Don't worry — we'll hang on to your alert while you're checking your email.)" -#~ msgstr "(Non ti preoccupare — ci penseremo noi alla tua segnalazione mentre controlli l'email.)" - -#~ msgid "(Don't worry — we'll hang on to your problem report while you're checking your email.)" -#~ msgstr "(Non ti preoccupare — ci penseremo noi al tuo problema segnalato mentre controlli l'email.)" - -#~ msgid "(Don't worry — we'll hang on to your update while you're checking your email.)" -#~ msgstr "(Non ti preoccupare — ci penseremo noi al tuo aggiornamento mentre controlli l'email.)" - -#~ msgid "<small>If you cannot see the map, <a href='%s' rel='nofollow'>skip this step</a>.</small>" -#~ msgstr "<small>Se non puoi vedere la mappa, <a href='%s' rel='nofollow'>salta questo passaggio</a>.</small>" - -#~ msgid "<strong>No</strong>, I do not, let me sign in by email:" -#~ msgstr "<strong>No</strong>, Non c'e l'ho, lasciami entrare con la mia email:" - -#~ msgid "Are you a <strong>developer</strong>? Would you like to contribute to FixMyStreet?" -#~ msgstr "Sei uno <strong>sviluppatore</strong>? Vorresti contribuire a FixMyStreet?" - -#~ msgid "Closest nearby problems <small>(within %skm)</small>" -#~ msgstr "Problemi più vicini <small>(within %skm)</small>" - -#~ msgid "Contact FixMyStreet" -#~ msgstr "Contatto FixMyStreet" - -#~ msgid "Do you have a FixMyBarangay password?" -#~ msgstr "Hai già la password per FixMyBrarangay?" - -#~ msgid "FixMyStreet admin:" -#~ msgstr "FixMyStreet amministrazione:" - -#~ msgid "If you do not, your alert will not be activated." -#~ msgstr "Se non lo fai, il tuo avviso non sarà attivato." - -#~ msgid "If you do not, your problem will not be posted." -#~ msgstr "Se non lo fai, il tuo problema non sarà postato." - -#~ msgid "If you do not, your update will not be posted." -#~ msgstr "Se non lo fai, il tuo aggiornamento non sarà postato." - -#~ msgid "New reports for {{COUNCIL}} within {{WARD}} ward on reportemptyhomes.com" -#~ msgstr "Nuova segnalazione per {{COUNCIL}} dentro il quartiere {{WARD}} su reportemptyhomes.com" - -#~ msgid "New reports within {{NAME}}'s boundary on reportemptyhomes.com" -#~ msgstr "Nuove segnalazioni dentro i confini di {{NAME}} su reportemptyhomes.com" - -#~ msgid "New update:" -#~ msgstr "Nuovo aggiornamento:" +#~ msgid "(we never show your email address or phone number)" +#~ msgstr "(non mostreremo mai la tua email o il tuo numero di telefono)" -#~ msgid "No problems found." -#~ msgstr "Nessun problema trovato." +#~ msgid "(we never show your email)" +#~ msgstr "(non mostreremo mai la tua email)" -#~ msgid "No problems have been reported yet." -#~ msgstr "Nessun problema è stato ancora segnalato." +#~ msgid "<strong>No</strong>, let me confirm my report by email:" +#~ msgstr "<strong>No</strong>, lasciami confermare la mia segnalazione via email:" -#~ msgid "Now to submit your report… do you have a FixMyStreet password?" -#~ msgstr "Ora per inserire la tua segnalazione… Hai già la password per FixMyStreet?" +#~ msgid "<strong>No</strong>, let me confirm my update by email:" +#~ msgstr "<strong>No</strong>, lasciami confermare il mio aggiornamento via email:" -#~ msgid "Now to submit your update… do you have a FixMyStreet password?" -#~ msgstr "Ora per inserire il tuo aggiornamento… Hai già la password per FixMyStreet?" +#~ msgid "Email me updates" +#~ msgstr "Inviami via email gli aggiornamenti" -#~ msgid "Our code is open source and <a href=\"http://github.com/mysociety/fixmystreet\">available on GitHub</a>." -#~ msgstr "Il nostro codice è open source e <a href=\"http://github.com/mysociety/fixmystreet\">disponibile su GitHub</a>" +#~ msgid "Enter a new password:" +#~ msgstr "Inserisci una nuova password:" -#~ msgid "Please <a class=\"tab_link\" href=\"#report\">take a look</a> at the updates that have been left." -#~ msgstr "Per favore <a class=\"tab_link\" href=\"#report\">dai un'occhiata</a> agli aggiornamenti che sono stati lasciati." +#~ 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 "Mi spiace non possiamo validare questo token. Se hai copiato l'URL dall'email, controlla se l'hai copiato correttamente.\n" -#~ msgid "Please take a look at the updates that have been left." -#~ msgstr "Per favore dai un'occhiata agli aggiornamenti che sono stati aggiunti" +#~ 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 "Se usi un' email su un sito web o hai un filtro per la posta indesiderata, dovresti controllare anche la cartella dello spam o posta indesiderata: qualche volta i nostri messaggi finiscono li." -#~ msgid "Problems within %s, FixMyStreet" -#~ msgstr "Problemi dentro %s, FIxMyStreet" +#~ msgid "Message:" +#~ msgstr "Messaggio:" -#~ msgid "Publish the response" -#~ msgstr "Pubblica la risposta" +#~ msgid "More problems nearby" +#~ msgstr "Più problemi vicini" -#~ msgid "Reported %s, to %s" -#~ msgstr "Riportati %s, a %s" +#~ msgid "Nearly Done! Now check your email..." +#~ msgstr "Quasi fatto! Ora controlla la tua email..." -#~ msgid "Reports on and around the map" -#~ msgstr "Segnalazioni sulla e intorno alla mappa" +#~ msgid "Offensive? Unsuitable? Tell us" +#~ msgstr "Offensivo? Non adatto? Contattaci" -#~ msgid "Sign in by email" -#~ msgstr "Entra inserendo l'email" +#~ msgid "Photo:" +#~ msgstr "Foto:" -#~ msgid "Signed in as %s" -#~ msgstr "Entra come %s" +#~ msgid "Please check your email" +#~ msgstr "Per favore controlla la tua email" -#~ msgid "The latest reports for {{COUNCIL}} reported by users" -#~ msgstr "Le ultime segnalazioni per {{COUNCIL}} riportate dagli utenti" +#~ msgid "Please note that updates are not sent to the council. If you leave your name it will be public. Your information will only be used in accordance with our <a href=\"/faq#privacy\">privacy policy</a>" +#~ msgstr "Gli aggiornamenti non vengono inviati al comune. Se lasci il tuo nome questo sarà pubblico. Le tue informazioni non verranno usate in accordo con la nostra <a href=\"/faq#privacy\">politica sulla privacy</a>" -#~ msgid "The latest reports for {{COUNCIL}} within {{WARD}} ward reported by users" -#~ msgstr "Le ultime segnalazioni per {{COUNCIL}} dentro i confini del quartiere {{WARD}} riportate dagli utenti" +#~ msgid "This problem has been closed" +#~ msgstr "Questo problema è stato chiuso" -#~ msgid "The latest reports within {{NAME}}'s boundary reported by users" -#~ msgstr "Le ultime segnalazioni dentro i confini di {{NAME}} riportate dagli utenti" +#~ msgid "Update:" +#~ msgstr "Aggiornamento:" -#~ msgid "To <strong>report a problem</strong>, click on the map at the correct location." -#~ msgstr "Per <strong>segnalare un problema</strong>, clicca sulla mappa nella corretta zona." +#~ msgid "Your email:" +#~ msgstr "La tua email:" -#~ msgid "User" -#~ msgstr "Utente" +#~ msgid "Your name:" +#~ msgstr "Il tuo nome:" -#~ msgid "Your email address:" -#~ msgstr "Tuo indirizzo email:" +#~ msgid "Your email:" +#~ msgstr "La tua email:" diff --git a/locale/lt_LT.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/lt_LT.UTF-8/LC_MESSAGES/FixMyStreet.po index 356ee1329..808791113 100644 --- a/locale/lt_LT.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/lt_LT.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: fixmystreet\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2015-10-23 16:51+0100\n" -"PO-Revision-Date: 2015-07-31 16:31+0000\n" +"POT-Creation-Date: 2016-03-02 13:09+0000\n" +"PO-Revision-Date: 2015-10-23 16:38+0000\n" "Last-Translator: mySociety <transifex@mysociety.org>\n" "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/mysociety/fixmystreet/language/lt_LT/)\n" "Language: lt_LT\n" @@ -19,45 +19,24 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:628 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:411 +#: perllib/FixMyStreet/DB/Result/Problem.pm:616 +#: perllib/FixMyStreet/Script/Reports.pm:189 msgid " and " msgstr "ir" #: templates/web/base/report/new/councils_text_all.html:2 -#: templates/web/base/report/new/councils_text_none.html:11 -#: templates/web/base/report/new/councils_text_none.html:2 +#: templates/web/base/report/new/councils_text_none.html:12 +#: templates/web/base/report/new/councils_text_none.html:15 #: templates/web/base/report/new/councils_text_some.html:19 #: templates/web/base/report/new/councils_text_some.html:22 #: templates/web/base/report/new/councils_text_some.html:5 msgid " or " msgstr "arba" -#: templates/web/base/admin/index.html:35 -#: templates/web/base/status/index.html:13 -msgid "%s confirmed alerts, %s unconfirmed" -msgstr "%d patvirtinti praneÅ¡imai, %d nepatvirtinti" - -#: templates/web/base/admin/index.html:37 -#: templates/web/base/status/index.html:16 -#: templates/web/zurich/admin/index.html:6 -msgid "%s council contacts – %s confirmed, %s unconfirmed" -msgstr "%d tarybos kontaktai – %d patvirtinti, %d nepatvirtinti" - #: templates/web/base/admin/edit-league.html:12 msgid "%d edits by %s" msgstr "%d pakeitimai pagal %s" -#: templates/web/base/admin/index.html:34 -#: templates/web/base/status/index.html:12 -msgid "%s live updates" -msgstr "%d tiesioginiai atnaujinimai" - -#: templates/web/base/admin/index.html:36 -#: templates/web/base/status/index.html:14 -msgid "%s questionnaires sent – %s answered (%s%%)" -msgstr "%d klausimynai iÅ¡siųsti – %d atsakyti (%s%%)" - #: templates/web/base/pagination.html:10 msgid "%d to %d of %d" msgstr "%d į %d iÅ¡ %d" @@ -72,37 +51,50 @@ msgstr "%s - SuvestinÄ—s ataskaitos" msgid "%s admin:" msgstr "" +#: templates/web/base/status/stats.html:26 +#, fuzzy +msgid "%s bodies" +msgstr "Institucijos" + +#: templates/web/base/status/stats.html:24 +msgid "%s confirmed alerts, %s unconfirmed" +msgstr "%s patvirtinti praneÅ¡imai, %s nepatvirtinti" + +#: templates/web/base/status/stats.html:27 +#: templates/web/zurich/admin/index.html:6 +msgid "%s council contacts – %s confirmed, %s unconfirmed" +msgstr "%s tarybos kontaktai – %s patvirtinti, %s nepatvirtinti" + #. ("%s is the site name") #: templates/web/base/alert/index.html:7 -#, fuzzy msgid "" "%s has a variety of RSS feeds and email alerts for local\n" "problems, including alerts for all problems within a particular ward, or all\n" "problems within a certain distance of a particular location." msgstr "" -"FixMyStreet has a variety of RSS feeds and email alerts for local problems, including\n" -"alerts for all problems within a particular ward or council, or all problems\n" -"within a certain distance of a particular location." #. ("%s is the site name") #: templates/web/base/alert/index.html:11 -#, fuzzy msgid "" "%s has a variety of RSS feeds and email alerts for local problems, including\n" "alerts for all problems within a particular ward or council, or all problems\n" "within a certain distance of a particular location." msgstr "" -"FixMyStreet has a variety of RSS feeds and email alerts for local problems, including\n" -"alerts for all problems within a particular ward or council, or all problems\n" -"within a certain distance of a particular location." -#: perllib/FixMyStreet/DB/Result/Problem.pm:695 +#: templates/web/base/status/stats.html:23 +msgid "%s live updates" +msgstr "%s tiesioginiai atnaujinimai" + +#: templates/web/base/status/stats.html:25 +msgid "%s questionnaires sent – %s answered (%s%%)" +msgstr "%s klausimynai iÅ¡siųsti – %s atsakyti (%s%%)" + +#: perllib/FixMyStreet/DB/Result/Problem.pm:683 msgid "%s ref: %s" msgstr "%s ref: %s" #. ("%s is the site name") #: templates/web/base/alert/_list.html:73 -#, fuzzy msgid "" "%s sends different categories of problem\n" "to the appropriate council, so problems within the boundary of a particular council\n" @@ -111,22 +103,16 @@ msgid "" "council’s alerts, but will only appear in the \"Within the boundary\" alert\n" "for the county council." msgstr "" -"FixMyStreet sends different categories of problem\n" -"to the appropriate council, so problems within the boundary of a particular council\n" -"might not match the problems sent to that council. For example, a graffiti report\n" -"will be sent to the district council, so will appear in both of the district\n" -"council’s alerts, but will only appear in the \"Within the boundary\" alert\n" -"for the county council." -#: perllib/FixMyStreet/Cobrand/UK.pm:255 perllib/FixMyStreet/Cobrand/UK.pm:267 +#: perllib/FixMyStreet/Cobrand/UK.pm:256 perllib/FixMyStreet/Cobrand/UK.pm:268 msgid "%s ward, %s" msgstr "%s rajonas, %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:564 +#: perllib/FixMyStreet/DB/Result/Problem.pm:552 msgid "%s, reported at %s" msgstr "%s, praneÅ¡ta %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:282 perllib/FixMyStreet/Cobrand/UK.pm:294 +#: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295 msgid "%s, within %s ward" msgstr "%s, viduje %s rajonas" @@ -134,7 +120,7 @@ msgstr "%s, viduje %s rajonas" msgid "© <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors" msgstr "" -#: templates/web/zurich/report/new/fill_in_details_form.html:53 +#: templates/web/zurich/report/new/fill_in_details_form.html:46 msgid "(Defect & location of defect)" msgstr "" @@ -150,9 +136,8 @@ msgstr "" #: templates/web/zurich/admin/report_edit-sdm.html:67 #: templates/web/zurich/admin/report_edit.html:95 -#, fuzzy msgid "(No phone number)" -msgstr "Telefono numeris" +msgstr "" #: templates/web/base/alert/_list.html:24 msgid "(a default distance which covers roughly 200,000 people)" @@ -160,17 +145,16 @@ msgstr "(numatytasis atstumas, kuris apima maždaug 200.000 žmonių)" #. ("%s is a list of distance links, e.g. [2km] / [5km] / [10km] / [20km]") #: templates/web/base/alert/_list.html:29 -#, fuzzy msgid "(alternatively the RSS feed can be customised, within %s)" -msgstr "(arba RSS srautas gali bÅ«ti pritaikytas pagal" +msgstr "" -#: templates/web/base/report/_item.html:27 -#: templates/web/zurich/report/_item.html:21 +#: templates/web/base/report/_item.html:25 +#: templates/web/zurich/report/_item.html:19 msgid "(closed)" msgstr "(uždaryta)" -#: templates/web/base/report/_item.html:25 -#: templates/web/zurich/report/_item.html:19 +#: templates/web/base/report/_item.html:23 +#: templates/web/zurich/report/_item.html:17 msgid "(fixed)" msgstr "(atlikta)" @@ -178,37 +162,28 @@ msgstr "(atlikta)" msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)" msgstr "(pavyzdžiui, grafitis, Å¡iukÅ¡lÄ—s, duobÄ— kelyje ar gatvÄ—s apÅ¡vietimas)" -#: templates/web/base/report/_item.html:21 +#: templates/web/base/report/_item.html:19 msgid "(not sent to council)" msgstr "(neiÅ¡siųsta savivaldybei)" -#: templates/web/base/report/new/fill_in_details_form.html:200 #: templates/web/zurich/report/new/fill_in_details_form.html:82 msgid "(optional)" msgstr "(pasirinktinai)" -#: templates/web/fixmystreet/report/public_label.html:1 +#: templates/web/base/report/public_label.html:1 msgid "(public)" msgstr "(vieÅ¡as)" -#: templates/web/base/report/_item.html:20 +#: templates/web/base/report/_item.html:18 msgid "(sent to both)" msgstr "(iÅ¡siųsta į abu)" -#: templates/web/base/report/new/fill_in_details_form.html:194 -msgid "(we never show your email address or phone number)" -msgstr "(mes niekada nerodome jÅ«sų el. paÅ¡to arba telefono numerio)" - -#: templates/web/base/report/update-form.html:159 -msgid "(we never show your email)" -msgstr "(mes niekada nerodome jÅ«sų el. paÅ¡to)" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:673 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 #: perllib/FixMyStreet/DB/Result/Problem.pm:410 msgid "-- Pick a category --" msgstr "-- IÅ¡sirinktite kategorija --" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:637 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:632 #: perllib/FixMyStreet/DB/Result/Problem.pm:416 msgid "-- Pick a property type --" msgstr "-- Pasirinkite nuosavybÄ—s tipÄ… --" @@ -230,52 +205,39 @@ msgstr "" msgid "<label>Show %s</label> <label>about %s</label>" msgstr "" -#: templates/web/base/admin/index.html:32 -#: templates/web/base/status/index.html:11 +#: templates/web/base/status/stats.html:18 #: templates/web/zurich/admin/index.html:4 msgid "<strong>%s</strong> live problems" -msgstr "<strong>%d</strong> Problemos tiesiogiai" +msgstr "<strong>%s</strong> Problemos tiesiogiai" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:39 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:2 msgid "<strong>No</strong> Let me confirm my report by email" msgstr "<strong>Ne</strong> Leisti patvirtinti mano praneÅ¡imÄ… el. paÅ¡tu" -#: templates/web/fixmystreet/report/update-form.html:112 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:2 msgid "<strong>No</strong> Let me confirm my update by email" msgstr "<strong>Ne</strong> Leisti patvirtinti mano atnaujinimÄ… el. paÅ¡tu" -#: templates/web/base/auth/general.html:48 +#: templates/web/base/auth/general.html:87 #: templates/web/zurich/auth/general.html:51 msgid "<strong>No</strong> let me sign in by email" msgstr "<strong>Ne</strong> leisti man prisijungti el. paÅ¡tu" -#: templates/web/base/report/new/fill_in_details_form.html:145 -msgid "<strong>No</strong>, let me confirm my report by email:" -msgstr "<strong>Ne</strong>, leisti man patvirtinti mano praneÅ¡imÄ… el. paÅ¡tu:" - -#: templates/web/base/report/update-form.html:118 -msgid "<strong>No</strong>, let me confirm my update by email:" -msgstr "<strong>Ne</strong>Ä leisti patvirtinti mano atnaujinimÄ… el. paÅ¡tu:" - -#: templates/web/base/auth/general.html:34 -#: templates/web/base/report/new/fill_in_details_form.html:123 -#: templates/web/base/report/update-form.html:96 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:15 -#: templates/web/fixmystreet/report/update-form.html:89 +#: templates/web/base/auth/general.html:70 +#: templates/web/base/report/new/form_user_loggedout_password.html:3 +#: templates/web/base/report/update/form_user_loggedout_password.html:2 msgid "<strong>Yes</strong> I have a password" msgstr "<strong>Taip</strong> AÅ¡ turiu slaptažodį" -#: templates/web/base/static/about-en-gb.html:1 -#: templates/web/base/static/about-en-gb.html:3 +#: templates/web/base/about/about-en-gb.html:1 +#: templates/web/base/about/about-en-gb.html:3 msgid "About us" msgstr "Apie Mus" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:8 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:31 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:29 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:35 msgid "Action Scheduled" msgstr "Veiksmas suplanuotas" @@ -309,14 +271,13 @@ msgstr "PridÄ—ti naujÄ… kategorijÄ…" msgid "Add user" msgstr "PridÄ—ti vartotojÄ…" -#: templates/web/base/my/my.html:52 +#: templates/web/base/my/my.html:56 msgid "Added %s" msgstr "PridÄ—ta %s" #: templates/web/base/report/new/category_extras.html:9 -#, fuzzy msgid "Additional Information" -msgstr "Laukiama " +msgstr "" #: templates/web/base/auth/change_password.html:29 msgid "Again:" @@ -330,8 +291,7 @@ msgstr "" msgid "Alert %d disabled (created %s)" msgstr "" -#: templates/web/base/report/update-form.html:164 -#: templates/web/fixmystreet/report/update-form.html:150 +#: templates/web/base/report/update/form_name.html:20 msgid "Alert me to future updates" msgstr "Ä®spÄ—ti mane apie atnaujinimus" @@ -341,9 +301,8 @@ msgid "All Reports" msgstr "Visi PraneÅ¡imai" #: templates/web/zurich/admin/stats.html:5 -#, fuzzy msgid "All Reports as CSV" -msgstr "Visi PraneÅ¡imai" +msgstr "" #: templates/web/base/footer.html:11 templates/web/fixmystreet/footer.html:32 #: templates/web/zurich/admin/index-dm.html:12 @@ -364,10 +323,8 @@ msgstr "Visa jÅ«sų suteikta informacija bus iÅ¡siųsta" #: templates/web/base/report/new/councils_text_all.html:2 #: templates/web/base/report/new/councils_text_all.html:4 -#: templates/web/base/report/new/fill_in_details_form.html:12 -#: templates/web/base/report/new/fill_in_details_form.html:14 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:10 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:11 +#: templates/web/base/report/new/fill_in_details_form.html:10 +#: templates/web/base/report/new/fill_in_details_form.html:9 msgid "All the information you provide here will be sent to <strong>%s</strong>." msgstr "" "Visa jÅ«sų suteikta informacija bus iÅ¡siųsta į \n" @@ -391,6 +348,10 @@ msgstr "Anoniminis:" msgid "Are you a developer?" msgstr "Ar esi aplikacijų kÅ«rÄ—jas?" +#: templates/web/base/js/translation_strings.html:52 +msgid "Are you sure you want to cancel this upload?" +msgstr "" + #: templates/web/base/admin/body-form.html:69 #: templates/web/base/admin/body.html:16 #: templates/web/zurich/admin/body-form.html:24 @@ -403,9 +364,8 @@ msgid "As this is a staging site and %s is false, reports made on this site will msgstr "Å iuo metu puslapis ir %s yra neveikiantis, sukurti praneÅ¡imai bus iÅ¡siųsti problemos siuntÄ—jui, o ne kontaktui pateiktame praneÅ¡imo kategorijoje." #: templates/web/zurich/admin/report_edit.html:213 -#, fuzzy msgid "Assign to competent body:" -msgstr "Priskirti iÅ¡oriniai institucijai:" +msgstr "" #: templates/web/zurich/admin/report_edit.html:173 #: templates/web/zurich/admin/stats.html:36 @@ -424,16 +384,16 @@ msgstr "Priskirti padaliniui:" msgid "Assigned to %s" msgstr "Priskirta to %s" -#: templates/web/base/open311/index.html:84 +#: templates/web/base/open311/index.html:76 msgid "At most %d requests are returned in each query. The returned requests are ordered by requested_datetime, so to get all requests, do several searches with rolling start_date and end_date." msgstr " %d praÅ¡ymai yra grąžinami kiekvienai užklausai. Grąžinti praÅ¡ymai sudÄ—liojami Å¡ia tvarka requested_datetime, todÄ—l norint gauti visus praneÅ¡imus atlikite kelias paieÅ¡kas start_date ir end_date." -#: templates/web/base/open311/index.html:76 +#: templates/web/base/open311/index.html:68 msgid "At the moment only searching for and looking at reports work." msgstr "Å iuo metu veikia tiktai praneÅ¡imų peržiÅ«ra ir paieÅ¡ka." #: perllib/FixMyStreet/DB/Result/Problem.pm:373 -#: templates/web/zurich/report/_item.html:11 +#: templates/web/zurich/report/_item.html:9 msgid "Awaiting moderation" msgstr "Laukiama " @@ -445,7 +405,7 @@ msgstr "Atgal" msgid "Ban email address" msgstr "Drausti el. paÅ¡tÄ…" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1276 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1285 #: perllib/FixMyStreet/Cobrand/Zurich.pm:392 #: templates/web/base/admin/bodies.html:1 templates/web/zurich/header.html:64 msgid "Bodies" @@ -475,7 +435,7 @@ msgid "Can't see the map? <em>Skip this step</em>" msgstr "Nematote žemÄ—lapio? <em>Praleiskite Å¡itÄ… žingsnį</em>" #: templates/web/base/admin/body.html:68 -#: templates/web/base/admin/index.html:61 +#: templates/web/base/admin/index.html:54 #: templates/web/base/report/new/category.html:10 #: templates/web/base/report/new/category_wrapper.html:3 #: templates/web/zurich/admin/body.html:14 @@ -486,8 +446,8 @@ msgstr "Nematote žemÄ—lapio? <em>Praleiskite Å¡itÄ… žingsnį</em>" msgid "Category" msgstr "Kategorija" -#: templates/web/base/admin/index.html:59 -#: templates/web/base/admin/index.html:67 +#: templates/web/base/admin/index.html:52 +#: templates/web/base/admin/index.html:60 msgid "Category fix rate for problems > 4 weeks old" msgstr "Problemų kategorijoje tvarkymo sparta > 4 savaitÄ—s senumo" @@ -500,7 +460,7 @@ msgstr "Problemų kategorijoje tvarkymo sparta > 4 savaitÄ—s senumo" msgid "Category:" msgstr "Kategorija:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:402 +#: perllib/FixMyStreet/Script/Reports.pm:180 msgid "Category: %s" msgstr "Kategorija: %s" @@ -563,7 +523,7 @@ msgid "Click here or enter as dd/mm/yyyy" msgstr "Paspausti Äia arba įvesti dd/mm/yyyy" #: templates/web/base/around/_report_banner.html:2 -#: templates/web/base/js/translation_strings.html:50 +#: templates/web/base/js/translation_strings.html:55 msgid "Click map to report a problem" msgstr "Paspaukite ant žemÄ—lapio, kad praneÅ¡ti problemÄ…" @@ -590,7 +550,7 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:25 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:144 -#: templates/web/fixmystreet/report/banner.html:15 +#: templates/web/base/report/banner.html:15 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:10 #: templates/web/zurich/admin/header.html:16 @@ -598,7 +558,7 @@ msgstr "" msgid "Closed" msgstr "Uždaryta" -#: perllib/FixMyStreet/DB/Result/Problem.pm:794 +#: perllib/FixMyStreet/DB/Result/Problem.pm:779 msgid "Closed by council" msgstr "Uždaryta " @@ -624,7 +584,7 @@ msgstr "Cobrand informacija:" msgid "Cobrand:" msgstr "Cobrand:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1283 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1292 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "Nustatymai" @@ -637,13 +597,14 @@ msgstr "Nustatyti Pabaigos TaÅ¡kÄ…" msgid "Confirm" msgstr "Patvirtinti" -#: templates/web/base/auth/token.html:1 templates/web/zurich/auth/token.html:1 +#: templates/web/base/auth/token.html:1 msgid "Confirm account" msgstr "Patvirtinti paskyrÄ…" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:33 -#: templates/web/fixmystreet/report/update-form.html:107 -msgid "Confirm by email below, providing a new password at that point. When you confirm, your password will be updated." +#: templates/web/base/report/new/form_user_loggedout_password.html:21 +#: templates/web/base/report/update/form_user_loggedout_password.html:20 +#, fuzzy +msgid "Confirm by email instead, providing a new password at that point. When you confirm, your password will be updated." msgstr "Patvirtinti el. paÅ¡tu, nurodant naujÄ… slaptažodį. Slaptažodis bus atnaujintas jums patvirtinus." #: templates/web/base/questionnaire/creator_fixed.html:1 @@ -673,35 +634,27 @@ msgid "Confirmed:" msgstr "Patvirtinta:" #. ("%s is the site name") -#: templates/web/base/faq/faq-en-gb.html:8 templates/web/base/footer.html:24 -#: templates/web/base/open311/index.html:8 -#: templates/web/base/static/privacy.html:10 -#: templates/web/fixmystreet/contact/index.html:12 -#, fuzzy +#: templates/web/base/about/_sidebar.html:6 templates/web/base/footer.html:24 msgid "Contact %s" -msgstr "Susiekite su Mumis" +msgstr "" #: templates/web/base/contact/index.html:1 #: templates/web/base/contact/index.html:2 #: templates/web/base/contact/submit.html:1 -#: templates/web/fixmystreet/contact/index.html:1 -#: templates/web/fixmystreet/contact/index.html:2 msgid "Contact Us" msgstr "Susiekite su Mumis" -#: templates/web/base/contact/index.html:6 -#: templates/web/fixmystreet/contact/index.html:20 +#: templates/web/base/contact/index.html:12 msgid "Contact the team" msgstr "Susisiekite su komanda" #: templates/web/zurich/admin/report_edit-sdm.html:40 #: templates/web/zurich/admin/report_edit.html:59 -#, fuzzy msgid "Coordinates:" -msgstr "KoordinatÄ—s:" +msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1420 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1448 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1429 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1457 msgid "Could not find user" msgstr "Vartotojas nerastas" @@ -719,7 +672,7 @@ msgstr "SavivaldybÄ—" msgid "Council contacts for %s" msgstr "Tarybos kontaktai skirti %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:693 +#: perllib/FixMyStreet/DB/Result/Problem.pm:681 msgid "Council ref: %s" msgstr "" @@ -734,7 +687,7 @@ msgstr "SavivaldybÄ—:" msgid "Count" msgstr "SkaiÄiavimas" -#: templates/web/base/email_sent.html:1 templates/web/zurich/email_sent.html:1 +#: templates/web/base/email_sent.html:1 msgid "Create a report" msgstr "Sukurti praneÅ¡imÄ…" @@ -744,9 +697,8 @@ msgid "Create category" msgstr "Sukurti kategorijÄ…" #: templates/web/zurich/admin/template_edit.html:29 -#, fuzzy msgid "Create template" -msgstr "Sukurti praneÅ¡imÄ…" +msgstr "" #: templates/web/base/admin/problem_row.html:34 #: templates/web/zurich/admin/templates.html:10 @@ -783,7 +735,7 @@ msgstr "Ä®rankių juosta" msgid "Dealt with by subdivision within 5 working days" msgstr "Padalinys atliko per 5 darbo dienas" -#: perllib/FixMyStreet/App/Controller/Admin.pm:878 +#: perllib/FixMyStreet/App/Controller/Admin.pm:877 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "" @@ -796,7 +748,7 @@ msgstr "" msgid "Deleted" msgstr "IÅ¡trinta" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:51 +#: templates/web/base/report/new/form_report.html:45 #: templates/web/zurich/admin/index-dm.html:22 #: templates/web/zurich/admin/index-sdm.html:20 #: templates/web/zurich/admin/reports.html:12 @@ -804,12 +756,11 @@ msgid "Description" msgstr "ApraÅ¡ymas" #: templates/web/base/js/translation_strings.html:34 -#: templates/web/zurich/report/new/fill_in_details_form.html:42 +#: templates/web/zurich/report/new/fill_in_details_form.html:68 msgid "Details" msgstr "IÅ¡samiau" #: templates/web/base/admin/report_edit.html:20 -#: templates/web/base/report/new/fill_in_details_form.html:62 #: templates/web/zurich/admin/report_edit-sdm.html:27 #: templates/web/zurich/admin/report_edit.html:29 #: templates/web/zurich/admin/report_edit.html:43 @@ -830,29 +781,30 @@ msgid "Diligency prize league table" msgstr "Diligency prize league table" #. ("%s is the site name") -#: templates/web/base/auth/general.html:31 -#: templates/web/base/report/new/fill_in_details_form.html:114 -#: templates/web/base/report/update-form.html:87 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:11 -#: templates/web/fixmystreet/report/update-form.html:86 -#, fuzzy +#: templates/web/base/auth/general.html:48 +#: templates/web/base/report/new/form_user_loggedout.html:18 +#: templates/web/base/report/new/oauth_email_form.html:18 +#: templates/web/base/report/update-form.html:29 +#: templates/web/base/report/update/form_user_loggedout.html:17 msgid "Do you have a %s password?" -msgstr "Ar jÅ«s turite FixMyStreet slaptažodį?" +msgstr "" #: templates/web/base/questionnaire/index.html:55 msgid "Don’t know" msgstr "Don’t nežinau" -#: templates/web/fixmystreet/contact/index.html:118 +#: templates/web/base/contact/index.html:110 msgid "Don't like forms?" msgstr "Nepatinka anketos?" +#: templates/web/base/js/translation_strings.html:51 +msgid "Drag and drop photos here or <u>click to upload</u>" +msgstr "" + #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:14 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:32 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:30 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:36 msgid "Duplicate" msgstr "Kopija" @@ -905,7 +857,7 @@ msgstr "Redaktorius" #: templates/web/base/admin/category_edit.html:91 #: templates/web/base/admin/flagged.html:38 #: templates/web/base/admin/users.html:16 -#: templates/web/base/auth/general.html:22 +#: templates/web/base/auth/general.html:39 #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:24 @@ -913,7 +865,7 @@ msgstr "Redaktorius" msgid "Email" msgstr "El. paÅ¡tas" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1396 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1405 msgid "Email added to abuse list" msgstr "El. paÅ¡tas pridÄ—tas prie piktnaudžiavimo sÄ…raÅ¡o" @@ -929,7 +881,7 @@ msgstr "" msgid "Email alert deleted" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1393 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1402 msgid "Email already in abuse list" msgstr "El. paÅ¡tas jau yra piktnaudžiavimo sÄ…raÅ¡e" @@ -937,41 +889,36 @@ msgstr "El. paÅ¡tas jau yra piktnaudžiavimo sÄ…raÅ¡e" msgid "Email me new local problems" msgstr "Atsiųsti man naujas vietines problemas" -#: templates/web/base/report/display.html:38 -msgid "Email me updates" -msgstr "Atsiųsti man atnaujinimus" - #: templates/web/base/admin/category_edit.html:31 #: templates/web/base/admin/report_edit.html:62 #: templates/web/base/admin/update_edit.html:33 #: templates/web/base/admin/user-form.html:20 #: templates/web/base/alert/updates.html:13 -#: templates/web/base/report/display.html:42 #: templates/web/zurich/admin/body.html:47 msgid "Email:" msgstr "El. paÅ¡tas:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:329 +#: perllib/FixMyStreet/Script/Reports.pm:108 msgid "Email: %s" msgstr "El. paÅ¡tas: %s" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:639 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:634 msgid "Empty flat or maisonette" msgstr "Apleistas butas" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:638 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:633 msgid "Empty house or bungalow" msgstr "Apleistas namas" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:641 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:636 msgid "Empty office or other commercial" msgstr "Apleista įtaiga arba kitas komercinÄ—s paskirties objektas" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:642 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:637 msgid "Empty pub or bar" msgstr "Apleistas baras" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:643 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:638 msgid "Empty public building - school, hospital, etc." msgstr "Apleistas vieÅ¡osios paskirties pastatas - mokyklaÄ ligonine ir t.t" @@ -1011,7 +958,7 @@ msgstr "Pabaigos taÅ¡kas" msgid "Enter a Zürich street name" msgstr "Ä®veskite Zürich gatvÄ—s pavadinimÄ…" -#: perllib/FixMyStreet/Cobrand/UK.pm:13 +#: perllib/FixMyStreet/Cobrand/UK.pm:14 msgid "Enter a nearby UK postcode, or street name and area" msgstr "Ä®veskite artimiausia paÅ¡to kodÄ… arba gatvÄ—s pavadinimÄ… ir rajonÄ…" @@ -1029,14 +976,9 @@ msgstr "Ä®veskite artimiausios gatvÄ—s pavadinimÄ… ir rajonÄ…" msgid "Enter a nearby street name and area, postal code or district in Delhi" msgstr "Ä®veskite artimiausia paÅ¡to kodÄ… arba gatvÄ—s pavadinimÄ… ir rajonÄ…" -#: templates/web/base/report/new/fill_in_details_form.html:152 -#: templates/web/base/report/update-form.html:125 -msgid "Enter a new password:" -msgstr "Ä®veskite nauja slaptažodį:" - -#: templates/web/base/auth/general.html:60 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:75 -#: templates/web/fixmystreet/report/update-form.html:123 +#: templates/web/base/auth/general.html:99 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:38 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:13 #: templates/web/zurich/auth/general.html:65 msgid "Enter a password" msgstr "Ä®veskite slaptažodį" @@ -1046,11 +988,11 @@ msgid "Enter details of the problem" msgstr "įveskite problemos detales" #: templates/web/base/errors/generic.html:1 -#: templates/web/base/errors/generic.html:3 +#: templates/web/base/errors/generic.html:4 #: templates/web/base/tokens/abuse.html:1 #: templates/web/base/tokens/abuse.html:3 #: templates/web/base/tokens/error.html:1 -#: templates/web/base/tokens/error.html:3 +#: templates/web/base/tokens/error.html:5 msgid "Error" msgstr "Klaida" @@ -1063,11 +1005,11 @@ msgstr "" msgid "Example postcode %s" msgstr "PaÅ¡to kodo pavyzdys %s" -#: templates/web/base/open311/index.html:94 +#: templates/web/base/open311/index.html:86 msgid "Examples:" msgstr "Pavyzdžiai:" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:55 +#: templates/web/base/report/new/form_report.html:49 msgid "Explain what’s wrong, exactly where it is, and how long it’s been there…" msgstr "ApibÅ«dinkite kas negerai, tiksliÄ… vietÄ… ir kiek ilgai tai tÄ™siasi..." @@ -1108,17 +1050,15 @@ msgstr "Suvarkyti tai pasirenkant <strong>pažymÄ—ta vietovÄ™</strong> <em>Reda msgid "FixMyStreet" msgstr "FixMyStreet" -#: templates/web/base/admin/index.html:61 +#: templates/web/base/admin/index.html:54 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:24 #: templates/web/base/admin/report_blocks.html:9 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:144 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:34 -#: templates/web/fixmystreet/report/banner.html:12 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:32 +#: templates/web/base/report/banner.html:12 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:38 msgid "Fixed" msgstr "Sutvarkyta" @@ -1145,7 +1085,7 @@ msgstr "Pažymeti kaip iÅ¡trinta" msgid "Flag user" msgstr "PažymÄ—ti vartotojÄ…" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1281 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1290 #: templates/web/base/admin/users.html:19 msgid "Flagged" msgstr "PažymÄ—ta" @@ -1176,36 +1116,31 @@ msgstr "Follow a ward link to view only reports within that ward." msgid "For more information, see <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>." msgstr "Daugiau informacijos rasite <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>." -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:32 -#: templates/web/fixmystreet/report/update-form.html:106 +#: templates/web/base/report/new/form_user_loggedout_password.html:20 +#: templates/web/base/report/update/form_user_loggedout_password.html:19 msgid "Forgotten your password?" msgstr "PamirÅ¡ote slaptažodį?" #: perllib/FixMyStreet/Cobrand/Zurich.pm:752 -#, fuzzy msgid "Forwarded to external body" -msgstr "Priskirti iÅ¡oriniai institucijai:" +msgstr "" #: perllib/FixMyStreet/Cobrand/Zurich.pm:753 -#, fuzzy msgid "Forwarded wish to external body" -msgstr "Priskirti iÅ¡oriniai institucijai:" +msgstr "" -#: templates/web/base/faq/faq-en-gb.html:1 -#: templates/web/base/faq/faq-en-gb.html:13 -#: templates/web/base/faq/faq-en-gb.html:6 -#: templates/web/base/open311/index.html:6 -#: templates/web/base/static/privacy.html:8 -#: templates/web/fixmystreet/contact/index.html:10 +#: templates/web/base/about/_sidebar.html:4 +#: templates/web/base/about/faq-en-gb.html:1 +#: templates/web/base/about/faq-en-gb.html:5 msgid "Frequently Asked Questions" msgstr "Dažniausiai Užduodami Klausimai" -#: templates/web/base/open311/index.html:136 +#: templates/web/base/open311/index.html:128 msgid "GeoRSS on Google Maps" msgstr "" +#: templates/web/base/report/display_tools.html:11 #: templates/web/fixmystreet/around/_updates.html:3 -#: templates/web/fixmystreet/report/display.html:35 msgid "Get updates" msgstr "Gauti atnaujinimus" @@ -1238,7 +1173,7 @@ msgstr "Pirmyn" msgid "Going to send questionnaire?" msgstr "Ar ruoÅ¡iates iÅ¡siųsti klausimynÄ…?" -#: templates/web/base/admin/index.html:42 +#: templates/web/base/admin/index.html:35 msgid "Graph of problem creation by status over time" msgstr "Problemų sukurimo grafikas pagal statusÄ… per laikÄ…" @@ -1255,7 +1190,7 @@ msgid "Have you ever reported a problem to a council before, or is this your fir msgstr "Ar esate praneÅ¡Ä™s apie problema anksÄiau, o gal tai pirmas kartas?" #: templates/web/base/footer.html:15 templates/web/fixmystreet/footer.html:38 -#: templates/web/zurich/faq/faq-de-ch.html:1 +#: templates/web/zurich/about/faq-de-ch.html:1 #: templates/web/zurich/footer.html:22 #: templates/web/zurich/nav_over_content.html:8 msgid "Help" @@ -1306,7 +1241,7 @@ msgstr "Kaip praneÅ¡ti apie problema" msgid "How to send successful reports" msgstr "Kaip iÅ¡siųsti sÄ—kminga praneÅ¡imÄ…" -#: perllib/FixMyStreet/App/Controller/Admin.pm:754 +#: perllib/FixMyStreet/App/Controller/Admin.pm:752 msgid "I am afraid you cannot confirm unconfirmed reports." msgstr "ApgailestaujameÄ bet jÅ«s negalite patvirtinti nepatvirtintų praneÅ¡imų." @@ -1324,10 +1259,6 @@ msgstr "" msgid "I'm afraid we couldn't locate your problem in the database.\n" msgstr "Apgailestaujame, bet jÅ«sų problema nebuvo rasta duomenų bazÄ—je.\n" -#: perllib/FixMyStreet/App/Controller/Tokens.pm:327 -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 "Apgailestaujame, bet žymÄ— nebuvo patvirtinta. PraÅ¡ome patikrinti ar jÅ«s teisingai nukopijavote adresÄ… iÅ¡ savo el. paÅ¡to.\n" - #: templates/web/base/admin/flagged.html:14 #: templates/web/base/admin/list_updates.html:6 #: templates/web/base/admin/reports.html:11 @@ -1360,24 +1291,16 @@ msgstr "" msgid "If you get some more information about the status of your problem, please come back to the site and leave an update." msgstr "" -#: templates/web/base/report/new/councils_text_none.html:2 -#: templates/web/base/report/new/councils_text_none.html:8 +#: templates/web/base/report/new/councils_text_none.html:10 +#: templates/web/base/report/new/councils_text_none.html:9 msgid "If you submit a problem here the subject and details of the problem will be public, but the problem will <strong>not</strong> be reported to the council." msgstr "Jeigu jÅ«s patalpinsite problema Äia, tada problemos tema ir informacija taps vieÅ¡ai prieinama, taÄiau <strong>nebus</strong> iÅ¡siųsta į savivaldybÄ™." -#: templates/web/zurich/auth/token.html:19 -#: templates/web/zurich/email_sent.html:7 -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 "Patikrinkite savo el. paÅ¡to \"Junk mail\" arba \"Spam\" skyrius, nes kartais musų žinutÄ—s bÅ«na nusiųstos ten." - #: templates/web/base/questionnaire/index.html:68 -#, fuzzy msgid "" "If you wish to leave a public update on the problem, please enter it here\n" "(please note it will not be sent to the council)." msgstr "" -"Jeigu norite palikti vieÅ¡Ä… problemos atnaujinimÄ… praÅ¡ome įvesti jį Äia\n" -"(tai nebus nusiųsta į savivaldybÄ™). Pvz, kÄ… manote apie problemos sprendimo eigÄ…?" #: templates/web/base/admin/body.html:149 msgid "If you're using <strong>a send method that is not email</strong>, enter the service ID (Open311) or equivalent identifier here." @@ -1424,10 +1347,8 @@ msgstr "NeteisÄ—tas srauto pasirinkimas" #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:144 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:32 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:30 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:36 msgid "In Progress" msgstr "Apdorojama" @@ -1435,7 +1356,7 @@ msgstr "Apdorojama" msgid "In abuse table?" msgstr "į piknaudžiavimo lentelÄ™?" -#: templates/web/base/open311/index.html:88 +#: templates/web/base/open311/index.html:80 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 "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)." @@ -1443,7 +1364,7 @@ msgstr "In addition, the following attributes that are not part of the Open311 v #: perllib/FixMyStreet/Cobrand/Zurich.pm:963 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:7 -#: templates/web/fixmystreet/report/banner.html:19 +#: templates/web/base/report/banner.html:19 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:8 msgid "In progress" @@ -1478,7 +1399,7 @@ msgstr "Internal referral" msgid "Invalid agency_responsible value %s" msgstr "Invalid agency_responsible value %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1201 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1210 msgid "Invalid end date" msgstr "Klaidina pabaigos data" @@ -1486,7 +1407,7 @@ msgstr "Klaidina pabaigos data" msgid "Invalid format %s specified." msgstr "Pasirinktas klaidingas formatas %s." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1206 msgid "Invalid start date" msgstr "Klaidinga pradžios data" @@ -1494,14 +1415,12 @@ msgstr "Klaidinga pradžios data" #: templates/web/base/admin/report_blocks.html:5 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:143 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:31 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:29 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:35 msgid "Investigating" msgstr "Tyriama" -#: templates/web/fixmystreet/contact/blurb.html:8 +#: templates/web/base/contact/blurb.html:8 msgid "It's often quickest to <a href=\"%s\">check our FAQs</a> and see if the answer is there." msgstr "Patikrinkite <a href=\"%s\">mÅ«sų D.U.K</a> gal atsakymas yra ten." @@ -1519,11 +1438,9 @@ msgstr "" msgid "Jurisdiction unknown" msgstr "" -#: templates/web/base/auth/general.html:44 -#: templates/web/base/report/new/fill_in_details_form.html:132 -#: templates/web/base/report/update-form.html:105 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:28 -#: templates/web/fixmystreet/report/update-form.html:102 +#: templates/web/base/auth/general.html:80 +#: templates/web/base/report/new/form_user_loggedout_password.html:16 +#: templates/web/base/report/update/form_user_loggedout_password.html:15 #: templates/web/zurich/auth/general.html:40 msgid "Keep me signed in on this computer" msgstr "Palikti mane prisijungusi su Å¡iuo komputeriu" @@ -1581,6 +1498,7 @@ msgid "MAP" msgstr "MAP" #: templates/web/base/js/translation_strings.html:45 +#: templates/web/base/maps/google-ol.html:13 msgid "Map" msgstr "ŽemÄ—lapis" @@ -1600,23 +1518,17 @@ msgstr "" msgid "Marked fixed/closed more than eight weeks ago" msgstr "" -#: templates/web/fixmystreet/contact/index.html:106 +#: templates/web/base/contact/index.html:98 msgid "Message" msgstr "ŽinutÄ—" #: templates/web/zurich/admin/report_edit.html:284 -#, fuzzy msgid "Message to competent body:" -msgstr "Priskirti iÅ¡oriniai institucijai:" +msgstr "" #: templates/web/zurich/admin/report_edit.html:282 -#, fuzzy msgid "Message to external body:" -msgstr "Priskirti iÅ¡oriniai institucijai:" - -#: templates/web/base/contact/index.html:97 -msgid "Message:" -msgstr "ŽinutÄ—:" +msgstr "" #: perllib/FixMyStreet/App/Controller/Open311.pm:445 msgid "Missing jurisdiction_id" @@ -1630,10 +1542,6 @@ msgstr "Moderated by division within one working day" msgid "Month" msgstr "MÄ—nuo" -#: templates/web/base/report/display.html:34 -msgid "More problems nearby" -msgstr "Daugiau Å¡alia esanÄių problemų" - #: templates/web/base/admin/bodies.html:21 #: templates/web/base/admin/body-form.html:18 #: templates/web/base/admin/flagged.html:16 @@ -1641,11 +1549,11 @@ msgstr "Daugiau Å¡alia esanÄių problemų" #: templates/web/base/admin/list_updates.html:7 #: templates/web/base/admin/reports.html:13 #: templates/web/base/admin/users.html:15 -#: templates/web/base/auth/general.html:50 +#: templates/web/base/auth/general.html:89 +#: templates/web/base/report/new/form_user_loggedin.html:9 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:7 +#: templates/web/base/report/update/form_name.html:4 #: templates/web/base/reports/index.html:20 -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:9 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:44 -#: templates/web/fixmystreet/report/update-form.html:138 #: templates/web/zurich/admin/body-form.html:4 #: templates/web/zurich/auth/general.html:60 #: templates/web/zurich/report/new/fill_in_details_form.html:82 @@ -1659,7 +1567,7 @@ msgstr "Vardas" msgid "Name:" msgstr "Vardas:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:328 +#: perllib/FixMyStreet/Script/Reports.pm:107 msgid "Name: %s" msgstr "Vardas: %s" @@ -1668,16 +1576,16 @@ msgstr "Vardas: %s" msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s" msgstr "Artimiausia gatvÄ— esanti Å¡alia smeigtuko (automatiÅ¡kai sugeneruota naudojant OpenStreetMap): %s%s" -#: perllib/FixMyStreet/Cobrand/UK.pm:127 +#: perllib/FixMyStreet/Cobrand/UK.pm:128 msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" msgstr "Artimiausias paÅ¡to kodas esantis Å¡alia smeigtuko žemÄ—lapyje (sugeneruota automatiÅ¡kai): %s (%sm toliau)" -#: perllib/FixMyStreet/Cobrand/Default.pm:434 -#: perllib/FixMyStreet/Cobrand/Default.pm:474 +#: perllib/FixMyStreet/Cobrand/Default.pm:455 +#: perllib/FixMyStreet/Cobrand/Default.pm:495 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "Artimiausia gavtÄ— esanti Å¡alia smeigtuko žemÄ—lapyje (sugeneruota automatiÅ¡kai naudojant Bing Maps): %s " -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:267 +#: perllib/FixMyStreet/Script/Alerts.pm:290 msgid "" "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n" "\n" @@ -1685,14 +1593,9 @@ msgstr "" "Artimiausia gavtÄ— esanti Å¡alia smeigtuko žemÄ—lapyje (sugeneruota automatiÅ¡kai naudojant Bing Maps): %s \n" "\n" -#: templates/web/zurich/email_sent.html:5 -msgid "Nearly Done! Now check your email..." -msgstr "Beveik baigta! Dabar patikrinkite savo el. paÅ¡tÄ…..." - #: templates/web/base/auth/token.html:17 templates/web/base/email_sent.html:5 -#, fuzzy msgid "Nearly done! Now check your email…" -msgstr "Beveik baigta! Dabar patikrinkite savo el. paÅ¡tÄ…..." +msgstr "" #: templates/web/base/reports/index.html:21 msgid "New <br>problems" @@ -1716,9 +1619,8 @@ msgid "New local problems on FixMyStreet" msgstr "Naujos vietinÄ—s problemos FixMyStreet" #: templates/web/zurich/admin/report_edit-sdm.html:117 -#, fuzzy msgid "New note to DM:" -msgstr "New internal note:" +msgstr "" #: db/alert_types.pl:38 msgid "New problems for {{COUNCIL}} within {{WARD}} ward on FixMyStreet" @@ -1750,9 +1652,8 @@ msgstr "New state" #: templates/web/zurich/admin/template_edit.html:9 #: templates/web/zurich/admin/templates.html:26 -#, fuzzy msgid "New template" -msgstr "New state" +msgstr "" #: templates/web/base/pagination.html:13 msgid "Next" @@ -1769,8 +1670,8 @@ msgstr "Kitas" #: templates/web/base/admin/report_edit.html:75 #: templates/web/base/admin/update_edit.html:25 #: templates/web/base/questionnaire/creator_fixed.html:16 +#: templates/web/base/questionnaire/index.html:101 #: templates/web/base/questionnaire/index.html:53 -#: templates/web/base/questionnaire/index.html:92 msgid "No" msgstr "Ne" @@ -1840,10 +1741,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:13 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:33 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:31 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:37 msgid "Not Responsible" msgstr "Neatsakingas" @@ -1851,9 +1750,8 @@ msgstr "Neatsakingas" #: perllib/FixMyStreet/Cobrand/Zurich.pm:937 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:13 -#, fuzzy msgid "Not contactable" -msgstr "Neatsakingas" +msgstr "" #: templates/web/zurich/admin/report_edit-sdm.html:108 msgid "Not for my subdivision" @@ -1883,7 +1781,7 @@ msgstr "Note that when including unconfirmed reports we use the date the report msgid "Note:" msgstr "Pastaba:" -#: templates/web/base/open311/index.html:73 +#: templates/web/base/open311/index.html:65 msgid "Note: <strong>%s</strong>" msgstr "Pastaba: <strong>%s</strong>" @@ -1891,13 +1789,15 @@ msgstr "Pastaba: <strong>%s</strong>" msgid "Notes from SDM to DM" msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:113 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:10 +#: templates/web/base/report/new/form_user_loggedout.html:14 +#: templates/web/base/report/new/form_user_loggedout.html:2 +#: templates/web/base/report/new/oauth_email_form.html:17 msgid "Now to submit your report…" msgstr "Dabar patvirtinti jÅ«sų report…" -#: templates/web/base/report/update-form.html:86 -#: templates/web/fixmystreet/report/update-form.html:85 +#: templates/web/base/report/update-form.html:28 +#: templates/web/base/report/update/form_user_loggedout.html:13 +#: templates/web/base/report/update/form_user_loggedout.html:2 msgid "Now to submit your update…" msgstr "Dabar patvirtinti jÅ«sų update…" @@ -1905,11 +1805,6 @@ msgstr "Dabar patvirtinti jÅ«sų update…" msgid "OK" msgstr "Gerai" -#: templates/web/base/report/display.html:28 -#: templates/web/base/report/update.html:17 -msgid "Offensive? Unsuitable? Tell us" -msgstr "Įžeidžiantis? Netinkamas? PraneÅ¡k mums" - #: templates/web/base/reports/index.html:23 msgid "Old / unknown <br>problems" msgstr "Senos/ nežinomos <br>problemos" @@ -1926,7 +1821,7 @@ msgstr "Senesnis <br>sutvarkyta" msgid "Older <br>problems" msgstr "SenesnÄ—s <br>problemos" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:45 +#: templates/web/base/report/new/form_report.html:15 msgid "One-line summary" msgstr "Vieno eilutÄ—s santrauka" @@ -1937,8 +1832,7 @@ msgstr "Vieno eilutÄ—s santrauka" #: templates/web/base/admin/report_blocks.html:4 #: templates/web/base/admin/update_edit.html:28 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/report/update-form.html:30 -#: templates/web/fixmystreet/report/update-form.html:28 +#: templates/web/base/report/update/form_update.html:34 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:7 #: templates/web/zurich/admin/update_edit.html:18 @@ -1953,15 +1847,15 @@ msgstr "" msgid "Open, but not had any update in eight weeks" msgstr "" -#: templates/web/base/open311/index.html:70 +#: templates/web/base/open311/index.html:62 msgid "Open311 API for the mySociety FixMyStreet server" msgstr "Open311 API for the mySociety FixMyStreet server" -#: templates/web/base/open311/index.html:80 +#: templates/web/base/open311/index.html:72 msgid "Open311 initiative web page" msgstr "Open311 initiative web page" -#: templates/web/base/open311/index.html:81 +#: templates/web/base/open311/index.html:73 msgid "Open311 specification" msgstr "Open311 specification" @@ -1973,15 +1867,15 @@ msgstr "Arba problemos praneÅ¡tos:" msgid "Or you can subscribe to an alert based upon what ward or council you’re in:" msgstr "Arba jÅ«s galite prenumeruoti įspÄ—jimÄ… atsižvelgiant į jÅ«sų rajonÄ… arba savivaldybÄ™:" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1084 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:673 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:674 -#: perllib/FixMyStreet/DB/Result/Problem.pm:570 -#: perllib/FixMyStreet/DB/Result/Problem.pm:580 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1055 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:669 +#: perllib/FixMyStreet/DB/Result/Problem.pm:558 +#: perllib/FixMyStreet/DB/Result/Problem.pm:568 +#: perllib/FixMyStreet/DB/Result/Problem.pm:578 #: perllib/FixMyStreet/DB/Result/Problem.pm:590 -#: perllib/FixMyStreet/DB/Result/Problem.pm:602 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:397 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:412 +#: perllib/FixMyStreet/Script/Reports.pm:175 +#: perllib/FixMyStreet/Script/Reports.pm:190 msgid "Other" msgstr "Kita" @@ -1990,7 +1884,7 @@ msgid "Owner" msgstr "Savininkas" #: templates/web/base/errors/page_error_404_not_found.html:1 -#: templates/web/base/errors/page_error_404_not_found.html:3 +#: templates/web/base/errors/page_error_404_not_found.html:4 msgid "Page Not Found" msgstr "Puslapis nerastas" @@ -2004,16 +1898,16 @@ msgstr "Parent" msgid "Partial" msgstr "Dalinis" -#: templates/web/base/auth/general.html:53 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:68 -#: templates/web/fixmystreet/report/update-form.html:116 +#: templates/web/base/auth/general.html:92 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:31 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:6 #: templates/web/zurich/auth/general.html:32 #: templates/web/zurich/auth/general.html:63 msgid "Password (optional)" msgstr "Slaptažodis (nebÅ«tina)" #: templates/web/base/auth/change_password.html:25 -#: templates/web/base/auth/general.html:36 +#: templates/web/base/auth/general.html:72 msgid "Password:" msgstr "Slaptažodis:" @@ -2025,29 +1919,29 @@ msgstr "Permalink" msgid "Phone number" msgstr "Telefono numeris" -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:26 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:62 +#: templates/web/base/report/new/form_user_loggedin.html:26 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:25 msgid "Phone number (optional)" msgstr "Telefono numeris (nebÅ«tina)" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:306 +#: perllib/FixMyStreet/Script/Reports.pm:83 #: templates/web/base/admin/report_edit.html:63 -#: templates/web/base/report/new/fill_in_details_form.html:198 #: templates/web/zurich/admin/stats.html:39 msgid "Phone:" msgstr "Telefonas:" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:66 -#: templates/web/fixmystreet/report/update-form.html:59 +#: templates/web/base/questionnaire/index.html:75 +#: templates/web/base/report/new/form_report.html:23 +#: templates/web/base/report/update/form_update.html:6 #: templates/web/zurich/admin/index-dm.html:29 #: templates/web/zurich/admin/index-sdm.html:24 #: templates/web/zurich/admin/reports.html:16 #: templates/web/zurich/admin/stats.html:37 -#: templates/web/zurich/report/new/fill_in_details_form.html:52 +#: templates/web/zurich/report/new/fill_in_details_form.html:45 msgid "Photo" msgstr "Nuotrauka" -#: perllib/FixMyStreet/App/Controller/Photo.pm:221 +#: perllib/FixMyStreet/App/Controller/Photo.pm:187 msgid "Photo is required." msgstr "" @@ -2055,13 +1949,7 @@ msgstr "" msgid "Photo required" msgstr "" -#: templates/web/base/questionnaire/index.html:80 -#: templates/web/base/report/new/fill_in_details_form.html:84 -#: templates/web/base/report/update-form.html:62 -msgid "Photo:" -msgstr "Nuotrauka:" - -#: templates/web/base/alert/list.html:26 +#: templates/web/base/alert/list.html:23 msgid "Photos of recent nearby reports" msgstr "Naujausios gretimų praneÅ¡imų nuotraukos" @@ -2090,20 +1978,16 @@ msgstr "PraÅ¡ome bÅ«ti mandagÅ«s, raÅ¡yti glaustai ir tiksliai." msgid "Please check the passwords and try again" msgstr "PraÅ¡ome patikrinti slaptažodžius ir pabandykite dar kartÄ…" -#: templates/web/zurich/auth/token.html:16 -msgid "Please check your email" -msgstr "PraÅ¡ome patikrinti savo el. paÅ¡tÄ…" - -#: templates/web/base/auth/general.html:10 -#: templates/web/base/auth/general.html:16 +#: templates/web/base/auth/general.html:27 +#: templates/web/base/auth/general.html:33 #: templates/web/zurich/auth/general.html:3 #: templates/web/zurich/auth/general.html:9 msgid "Please check your email address is correct" msgstr "PraÅ¡ome patikrinti ar jÅ«sų el. paÅ¡to adresas teisingas " #: perllib/FixMyStreet/App/Controller/Admin.pm:343 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:883 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:948 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:878 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:943 #: perllib/FixMyStreet/DB/Result/Problem.pm:412 #: templates/web/base/js/translation_strings.html:9 msgid "Please choose a category" @@ -2117,28 +2001,29 @@ msgstr "PraÅ¡ome pasirinkti nuosavybÄ—s tipÄ…" msgid "Please correct the errors below" msgstr "PraÅ¡ome iÅ¡taisyti klaidas " -#: templates/web/base/contact/blurb.html:2 -#: templates/web/fixmystreet/contact/blurb.html:12 -#, fuzzy +#: templates/web/base/contact/blurb.html:12 msgid "" "Please do <strong>not</strong> report problems through this form; messages go to\n" "the team behind this site, not a council. To report a problem,\n" "please <a href=\"/\">go to the front page</a> and follow the instructions." msgstr "" -"PraÅ¡ome <strong>nepraneÅ¡ti</strong> problemų naudojant Å¡iÄ… anketÄ…; žinutÄ—s iÅ¡siunÄiamos\n" -"FixMyStreet komandai, ne į savivaldybÄ™. NorÄ—dami praneÅ¡ti problemÄ… praÅ¡ome\n" -"<a href=\"/\">eiti į pagrindinį puslapį</a> ir sekti pateiktas instrukcijas." #: templates/web/base/report/new/notes.html:6 msgid "Please do not be abusive — abusing your council devalues the service for all users." msgstr "PraÅ¡ome neįžeidinÄ—ti — įžeidinÄ—jimai nuvertina paslaugÄ… visiems vartotojams." #: perllib/FixMyStreet/App/Controller/Admin.pm:346 -#: perllib/FixMyStreet/DB/Result/Comment.pm:126 +#: perllib/FixMyStreet/DB/Result/Comment.pm:125 #: templates/web/base/js/translation_strings.html:2 msgid "Please enter a message" msgstr "PraÅ¡ome įvesti žinutÄ™" +#: perllib/FixMyStreet/App/Controller/Admin.pm:1091 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1146 +#, fuzzy +msgid "Please enter a name" +msgstr "PraÅ¡ome įvesti savo vardÄ…" + #: templates/web/base/auth/change_password.html:12 #: templates/web/base/auth/change_password.html:15 #: templates/web/base/js/translation_strings.html:19 @@ -2151,10 +2036,10 @@ msgstr "PraÅ¡ome įvesti slaptažodį" msgid "Please enter a subject" msgstr "PraÅ¡ome įvesti temÄ…" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1084 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1137 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1087 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1142 #: perllib/FixMyStreet/App/Controller/Admin.pm:345 -#: perllib/FixMyStreet/DB/Result/User.pm:127 +#: perllib/FixMyStreet/DB/Result/User.pm:133 #: templates/web/base/js/translation_strings.html:12 #: templates/web/base/js/translation_strings.html:16 msgid "Please enter a valid email" @@ -2171,9 +2056,9 @@ msgid "Please enter some details" msgstr "PraÅ¡ome įvesti daugiau informacijos" #: perllib/FixMyStreet/App/Controller/Contact.pm:113 -#: perllib/FixMyStreet/DB/Result/User.pm:124 -#: templates/web/base/auth/general.html:10 -#: templates/web/base/auth/general.html:15 +#: perllib/FixMyStreet/DB/Result/User.pm:130 +#: templates/web/base/auth/general.html:27 +#: templates/web/base/auth/general.html:32 #: templates/web/base/js/translation_strings.html:11 #: templates/web/base/js/translation_strings.html:15 #: templates/web/zurich/auth/general.html:3 @@ -2181,7 +2066,7 @@ msgstr "PraÅ¡ome įvesti daugiau informacijos" msgid "Please enter your email" msgstr "PraÅ¡ome įvesti savo el. paÅ¡tÄ…" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:7 +#: templates/web/base/report/new/form_user_loggedout_email.html:7 #: templates/web/zurich/report/new/fill_in_details_form.html:80 msgid "Please enter your email address" msgstr "PraÅ¡ome įvesti savo el. paÅ¡to adresÄ…" @@ -2190,15 +2075,15 @@ msgstr "PraÅ¡ome įvesti savo el. paÅ¡to adresÄ…" msgid "Please enter your first name" msgstr "PraÅ¡ome įvesti savo vardÄ…" -#: perllib/FixMyStreet/Cobrand/UK.pm:318 +#: perllib/FixMyStreet/Cobrand/UK.pm:319 #: templates/web/base/js/translation_strings.html:7 msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below" msgstr "PraÅ¡ome įvesti savo vardÄ… ir pavardÄ™, savivalldybei reikalinga jÅ«sų informacija - jeigu pageidaujate, kad jÅ«sų vardas nebÅ«tu pateiktas puslapyje nužymÄ—kite langelį apaÄioje" #: perllib/FixMyStreet/App/Controller/Contact.pm:112 -#: perllib/FixMyStreet/DB/Result/Comment.pm:123 +#: perllib/FixMyStreet/DB/Result/Comment.pm:122 #: perllib/FixMyStreet/DB/Result/Problem.pm:406 -#: perllib/FixMyStreet/DB/Result/User.pm:120 +#: perllib/FixMyStreet/DB/Result/User.pm:126 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter your name" msgstr "PraÅ¡ome įvesti savo vardÄ…" @@ -2225,12 +2110,11 @@ msgstr "Galite <a href=\"%s\">prisijungti iÅ¡ naujo</a>, arba grįžti atgal į msgid "Please fill in details of the problem below." msgstr "PraÅ¡ome žemiau užpildyti problemos detales." -#: templates/web/zurich/report/new/fill_in_details_form.html:46 +#: templates/web/zurich/report/new/fill_in_details_form.html:72 msgid "Please fill in details of the problem." msgstr "PraÅ¡ome užpildyti problemos detales." -#: templates/web/base/report/new/fill_in_details_form.html:28 -#: templates/web/fixmystreet/report/new/sidebar.html:7 +#: templates/web/base/report/new/sidebar.html:7 #: templates/web/zurich/report/new/fill_in_details_form.html:20 msgid "Please fill in the form below with details of the problem, and describe the location as precisely as possible in the details box." msgstr "PraÅ¡ome pateikti problemos detales žemiau esanÄioje anketoje ir kuo tiksliau apibÅ«dinkite vietÄ…." @@ -2239,20 +2123,24 @@ msgstr "PraÅ¡ome pateikti problemos detales žemiau esanÄioje anketoje ir kuo t msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "PraÅ¡ome nurodyti, ar norite gauti kitÄ… klausimynÄ…." -#: templates/web/fixmystreet/report/updates-sidebar-notes.html:4 +#: templates/web/base/report/updates-sidebar-notes.html:2 msgid "Please note that updates are not sent to the council." msgstr "Atkreipkite dÄ—mesį, kad naujinimai nÄ—ra siunÄiama savivaldybei." -#: templates/web/base/report/update-form.html:7 -msgid "Please note that updates are not sent to the council. If you leave your name it will be public. Your information will only be used in accordance with our <a href=\"/faq#privacy\">privacy policy</a>" -msgstr "Atkreipkite dÄ—mesį, kad naujinimai nÄ—ra siunÄiama savivaldybei. Jeigu jÅ«s pateiksite savo vardÄ… jis bus vieÅ¡ai prieinamas. JÅ«sų asmeninÄ— informacija bus naudojama tiktai pagal mÅ«sų <a href=\"/faq#privacy\">privatumo politika</a>" +#: templates/web/base/report/new/oauth_email_form.html:4 +#, fuzzy +msgid "Please note your report has <strong>not yet been sent</strong>." +msgstr "Atkreipkite dÄ—mesį, kad jÅ«sų praneÅ¡imas dar <strong>nÄ—ra iÅ¡siųstas</strong>. Pasirinkite kategorija ir pridÄ—kite iÅ¡samesnÄ™ informacija, tada patvirtinkite." -#: templates/web/base/report/new/fill_in_details_form.html:8 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:21 +#: templates/web/base/report/new/fill_in_details_form.html:20 #: templates/web/zurich/report/new/fill_in_details_form.html:11 msgid "Please note your report has <strong>not yet been sent</strong>. Choose a category and add further information below, then submit." msgstr "Atkreipkite dÄ—mesį, kad jÅ«sų praneÅ¡imas dar <strong>nÄ—ra iÅ¡siųstas</strong>. Pasirinkite kategorija ir pridÄ—kite iÅ¡samesnÄ™ informacija, tada patvirtinkite." +#: templates/web/base/report/display.html:26 +msgid "Please note your update has <strong>not yet been posted</strong>." +msgstr "" + #: templates/web/base/report/new/notes.html:1 #: templates/web/zurich/report/new/notes.html:1 msgid "Please note:" @@ -2272,9 +2160,8 @@ msgid "Please say whether you've ever reported a problem to your council before" msgstr "PraÅ¡ome pasakyti ar esate praneÅ¡Ä™s apie problemÄ… savo savivaldybei anksÄiau" #: templates/web/zurich/admin/report_edit.html:208 -#, fuzzy msgid "Please select a body." -msgstr "PraÅ¡ome pasirinkti jÅ«sų pageidaujama srautÄ…" +msgstr "" #: perllib/FixMyStreet/App/Controller/Alert.pm:80 msgid "Please select the feed you want" @@ -2291,6 +2178,7 @@ msgstr "PraÅ¡ome nurodyti, ar problema buvo sutvarkyta" #: perllib/FixMyStreet/App/Model/PhotoSet.pm:117 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:145 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:147 +#: templates/web/base/js/translation_strings.html:53 msgid "Please upload a JPEG image only" msgstr "PraÅ¡ome įkelti tik JPEG formato nuotraukÄ…" @@ -2298,18 +2186,14 @@ msgstr "PraÅ¡ome įkelti tik JPEG formato nuotraukÄ…" msgid "Please write a message" msgstr "PraÅ¡ome įvesti žinutÄ™" -#: templates/web/fixmystreet/report/update-form.html:23 +#: templates/web/base/report/update/form_update.html:29 msgid "Please write your update here" msgstr "PraÅ¡ome raÅ¡tyti savo naujinimÄ… Äia" -#: templates/web/base/contact/index.html:100 -#: templates/web/base/report/update-form.html:110 -#: templates/web/base/report/update-form.html:132 -#: templates/web/base/report/update-form.html:72 -#: templates/web/fixmystreet/contact/index.html:113 -#: templates/web/fixmystreet/report/update-form.html:124 -#: templates/web/fixmystreet/report/update-form.html:71 -#: templates/web/fixmystreet/report/update-form.html:97 +#: templates/web/base/contact/index.html:105 +#: templates/web/base/report/update-form.html:24 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:14 +#: templates/web/base/report/update/form_user_loggedout_password.html:10 msgid "Post" msgstr "Ä®kelti" @@ -2337,12 +2221,9 @@ msgstr "Ankstesnis" msgid "Privacy" msgstr "Privatumas" -#: templates/web/base/faq/faq-en-gb.html:7 -#: templates/web/base/open311/index.html:7 -#: templates/web/base/static/privacy.html:1 -#: templates/web/base/static/privacy.html:2 -#: templates/web/base/static/privacy.html:9 -#: templates/web/fixmystreet/contact/index.html:11 +#: templates/web/base/about/_sidebar.html:5 +#: templates/web/base/about/privacy.html:1 +#: templates/web/base/about/privacy.html:2 msgid "Privacy and cookies" msgstr "" @@ -2370,12 +2251,12 @@ msgstr "" msgid "Problem %s sent to council %s" msgstr "Problema %s iÅ¡siųsta savivaldybei %s" -#: templates/web/base/admin/index.html:46 +#: templates/web/base/admin/index.html:39 #: templates/web/zurich/admin/index.html:9 msgid "Problem breakdown by state" msgstr "Problemos pasiskirstymas pagal valstybÄ—s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1055 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1058 msgid "Problem marked as open." msgstr "Problema pažymÄ—ta kaip atidaryta" @@ -2391,11 +2272,11 @@ msgstr "Problemos" msgid "Problems in this area" msgstr "Problemos Å¡ioje srityje" -#: templates/web/fixmystreet/report/display.html:43 +#: templates/web/base/report/display_tools.html:19 msgid "Problems nearby" msgstr "Å alia esanÄios problemos" -#: templates/web/fixmystreet/report/display.html:41 +#: templates/web/base/report/display_tools.html:17 msgid "Problems on the map" msgstr "Problemos žemÄ—lapyje" @@ -2407,24 +2288,23 @@ msgstr "Neseniai praneÅ¡tos problemos FixMyStreet" msgid "Problems within %.1fkm of this location" msgstr "Problemos %.1fkm atstumu aplink Å¡iÄ… vietovÄ™" -#: perllib/FixMyStreet/Cobrand/Default.pm:642 +#: perllib/FixMyStreet/Cobrand/Default.pm:663 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:120 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:139 -#: perllib/FixMyStreet/Cobrand/UK.pm:207 +#: perllib/FixMyStreet/Cobrand/UK.pm:208 msgid "Problems within %s" msgstr "Problemos viduje %s" #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:128 -#: perllib/FixMyStreet/Cobrand/UK.pm:221 +#: perllib/FixMyStreet/Cobrand/UK.pm:222 msgid "Problems within %s ward" msgstr "Problemos %s rajone" #. ("First %s is the body name, second %s the site name") #: templates/web/base/reports/body.html:0 #: templates/web/base/reports/body.html:24 -#, fuzzy msgid "Problems within %s, %s" -msgstr "Problemos viduje %s" +msgstr "" #: templates/web/base/alert/_list.html:42 msgid "Problems within the boundary of:" @@ -2438,19 +2318,16 @@ msgstr "NuosavybÄ—s adresas:" msgid "Property type:" msgstr "NuosavybÄ—s tipas:" -#: templates/web/base/report/update-form.html:3 -#: templates/web/fixmystreet/report/update-form.html:4 +#: templates/web/base/report/update-form.html:6 msgid "Provide an update" msgstr "Pateikti naujinimÄ…" -#: templates/web/base/auth/general.html:56 +#: templates/web/base/auth/general.html:95 msgid "Providing a name and password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." msgstr "Pateikti vardÄ… ir slaptažodį yra nebÅ«tina, taÄiau pateiktus bus jums papraÅ¡Äiau praneÅ¡ti problemas, pateikti naujinimus ir tvarkyti savo praneÅ¡imus." -#: templates/web/base/report/new/fill_in_details_form.html:156 -#: templates/web/base/report/update-form.html:129 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:71 -#: templates/web/fixmystreet/report/update-form.html:119 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:34 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:9 msgid "Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." msgstr "Pateikti slaptažodį yra nebÅ«tina, taÄiau pateiktus bus jums papraÅ¡Äiau praneÅ¡ti problemas, pateikti naujinimus ir tvarkyti savo praneÅ¡imus." @@ -2486,18 +2363,17 @@ msgstr "Questionnaire filled in by problem reporter" #: templates/web/base/alert/_list.html:22 #: templates/web/base/around/display_location.html:1 #: templates/web/base/around/display_location.html:3 -#: templates/web/base/report/display.html:50 +#: templates/web/base/report/display_tools.html:34 #: templates/web/base/reports/_rss.html:1 #: templates/web/fixmystreet/alert/updates.html:9 -#: templates/web/fixmystreet/report/display.html:58 msgid "RSS feed" msgstr "RSS srautas" -#: perllib/FixMyStreet/Cobrand/UK.pm:250 perllib/FixMyStreet/Cobrand/UK.pm:262 +#: perllib/FixMyStreet/Cobrand/UK.pm:251 perllib/FixMyStreet/Cobrand/UK.pm:263 msgid "RSS feed for %s" msgstr "RSS srautas skirtas %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:256 perllib/FixMyStreet/Cobrand/UK.pm:268 +#: perllib/FixMyStreet/Cobrand/UK.pm:257 perllib/FixMyStreet/Cobrand/UK.pm:269 msgid "RSS feed for %s ward, %s" msgstr "RSS srautas skirtas %s rajonui, %s" @@ -2505,11 +2381,11 @@ msgstr "RSS srautas skirtas %s rajonui, %s" #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:163 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:173 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:181 -#: perllib/FixMyStreet/Cobrand/UK.pm:276 perllib/FixMyStreet/Cobrand/UK.pm:288 +#: perllib/FixMyStreet/Cobrand/UK.pm:277 perllib/FixMyStreet/Cobrand/UK.pm:289 msgid "RSS feed of %s" msgstr "RSS srautas %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:281 perllib/FixMyStreet/Cobrand/UK.pm:293 +#: perllib/FixMyStreet/Cobrand/UK.pm:282 perllib/FixMyStreet/Cobrand/UK.pm:294 msgid "RSS feed of %s, within %s ward" msgstr "RSS srautas %s, viduje %s rajono" @@ -2521,15 +2397,15 @@ msgstr "Å alia esanÄių problemų RSS srautas" msgid "RSS feed of problems in this %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:643 +#: perllib/FixMyStreet/Cobrand/Default.pm:664 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:121 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:138 -#: perllib/FixMyStreet/Cobrand/UK.pm:214 +#: perllib/FixMyStreet/Cobrand/UK.pm:215 msgid "RSS feed of problems within %s" msgstr "" #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:127 -#: perllib/FixMyStreet/Cobrand/UK.pm:220 +#: perllib/FixMyStreet/Cobrand/UK.pm:221 msgid "RSS feed of problems within %s ward" msgstr "" @@ -2538,25 +2414,22 @@ msgstr "" msgid "RSS feed of recent local problems" msgstr "" -#: templates/web/base/report/display.html:50 +#: templates/web/base/report/display_tools.html:34 #: templates/web/fixmystreet/alert/updates.html:9 -#: templates/web/fixmystreet/report/display.html:58 msgid "RSS feed of updates to this problem" msgstr "" #: templates/web/base/alert/updates.html:9 -#: templates/web/base/report/display.html:41 +#: templates/web/base/report/display_tools.html:36 #: templates/web/fixmystreet/alert/updates.html:14 -#: templates/web/fixmystreet/report/display.html:60 msgid "Receive email when updates are left on this problem." msgstr "" #. ("%s is the site name") #: templates/web/base/around/display_location.html:0 #: templates/web/base/around/display_location.html:33 -#, fuzzy msgid "Recent local problems, %s" -msgstr "Atsiųsti man naujas vietines problemas" +msgstr "" #: templates/web/base/reports/index.html:24 msgid "Recently <br>fixed" @@ -2574,8 +2447,8 @@ msgstr "" msgid "Remove flag" msgstr "" -#: templates/web/base/admin/report_edit.html:92 -#: templates/web/base/admin/update_edit.html:62 +#: templates/web/base/admin/report_edit.html:93 +#: templates/web/base/admin/update_edit.html:67 #: templates/web/zurich/admin/update_edit.html:35 msgid "Remove photo (can't be undone!)" msgstr "" @@ -2595,7 +2468,7 @@ msgstr "" msgid "Report a problem" msgstr "" -#: templates/web/fixmystreet/report/display.html:32 +#: templates/web/base/report/display_tools.html:8 msgid "Report abuse" msgstr "" @@ -2604,7 +2477,8 @@ msgid "Report on %s" msgstr "" #: templates/web/base/report/new/fill_in_details_form.html:1 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:2 +#: templates/web/base/report/new/login_success_form.html:1 +#: templates/web/base/report/new/oauth_email_form.html:1 msgid "Report your problem" msgstr "" @@ -2613,9 +2487,8 @@ msgstr "" msgid "Report, view, or discuss local problems" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:585 -#: templates/web/base/contact/index.html:50 -#: templates/web/fixmystreet/contact/index.html:65 +#: perllib/FixMyStreet/DB/Result/Problem.pm:573 +#: templates/web/base/contact/index.html:57 msgid "Reported anonymously at %s" msgstr "" @@ -2624,9 +2497,8 @@ msgstr "" msgid "Reported before" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:608 -#: templates/web/base/contact/index.html:52 -#: templates/web/fixmystreet/contact/index.html:67 +#: perllib/FixMyStreet/DB/Result/Problem.pm:596 +#: templates/web/base/contact/index.html:59 msgid "Reported by %s at %s" msgstr "" @@ -2639,27 +2511,27 @@ msgstr "" msgid "Reported in the %s category" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:581 +#: perllib/FixMyStreet/DB/Result/Problem.pm:569 msgid "Reported in the %s category anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:603 +#: perllib/FixMyStreet/DB/Result/Problem.pm:591 msgid "Reported in the %s category by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:577 +#: perllib/FixMyStreet/DB/Result/Problem.pm:565 msgid "Reported via %s anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:599 +#: perllib/FixMyStreet/DB/Result/Problem.pm:587 msgid "Reported via %s by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:573 +#: perllib/FixMyStreet/DB/Result/Problem.pm:561 msgid "Reported via %s in the %s category anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:593 +#: perllib/FixMyStreet/DB/Result/Problem.pm:581 msgid "Reported via %s in the %s category by %s at %s" msgstr "" @@ -2669,9 +2541,8 @@ msgstr "" #: templates/web/zurich/admin/report_edit-sdm.html:36 #: templates/web/zurich/admin/report_edit.html:55 -#, fuzzy msgid "Reported:" -msgstr "Visi PraneÅ¡imai" +msgstr "" #: templates/web/base/around/index.html:2 #: templates/web/base/js/translation_strings.html:41 @@ -2681,13 +2552,13 @@ msgstr "Visi PraneÅ¡imai" msgid "Reporting a problem" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1277 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1286 #: perllib/FixMyStreet/Cobrand/Zurich.pm:384 #: templates/web/zurich/header.html:60 msgid "Reports" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:327 perllib/FixMyStreet/Cobrand/UK.pm:331 +#: perllib/FixMyStreet/Cobrand/UK.pm:328 perllib/FixMyStreet/Cobrand/UK.pm:332 msgid "Reports are limited to %s characters in length. Please shorten your report" msgstr "" @@ -2724,15 +2595,17 @@ msgstr "" msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1495 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1500 -#: templates/web/base/admin/report_edit.html:88 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1508 +#: templates/web/base/admin/report_edit.html:90 +#: templates/web/base/admin/update_edit.html:64 #: templates/web/zurich/admin/report_edit.html:116 msgid "Rotate Left" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1495 -#: templates/web/base/admin/report_edit.html:89 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 +#: templates/web/base/admin/report_edit.html:91 +#: templates/web/base/admin/update_edit.html:65 #: templates/web/zurich/admin/report_edit.html:117 msgid "Rotate Right" msgstr "" @@ -2742,7 +2615,6 @@ msgid "Rotating this photo will discard unsaved changes to the report." msgstr "" #: templates/web/base/js/translation_strings.html:46 -#: templates/web/base/maps/google-ol.html:13 msgid "Satellite" msgstr "" @@ -2799,11 +2671,10 @@ msgid "Select which type of alert you’d like and click the button for an RSS f msgstr "" #: perllib/FixMyStreet/Cobrand/Zurich.pm:835 -#, fuzzy msgid "Sent report back" -msgstr "Atidaryti praneÅ¡imai" +msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:708 +#: perllib/FixMyStreet/DB/Result/Problem.pm:696 msgid "Sent to %s %s later" msgstr "" @@ -2816,15 +2687,13 @@ msgstr "" msgid "Service:" msgstr "" -#: templates/web/fixmystreet/report/display.html:38 +#: templates/web/base/report/display_tools.html:14 msgid "Share" msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:193 -#: templates/web/base/report/update-form.html:158 -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:23 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:59 -#: templates/web/fixmystreet/report/update-form.html:146 +#: templates/web/base/report/new/form_user_loggedin.html:23 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:22 +#: templates/web/base/report/update/form_name.html:15 msgid "Show my name publicly" msgstr "" @@ -2836,9 +2705,9 @@ msgstr "" msgid "Show pins" msgstr "" +#: templates/web/base/auth/general.html:100 #: templates/web/base/auth/general.html:3 -#: templates/web/base/auth/general.html:40 -#: templates/web/base/auth/general.html:61 +#: templates/web/base/auth/general.html:76 #: templates/web/zurich/auth/general.html:18 #: templates/web/zurich/auth/general.html:35 msgid "Sign in" @@ -2865,7 +2734,7 @@ msgid "" " sent from your FixMyStreet installation." msgstr "" -#: templates/web/base/alert/index.html:42 +#: templates/web/base/alert/index.html:40 msgid "Some photos of recent reports" msgstr "" @@ -2875,7 +2744,7 @@ msgstr "" msgid "Some text to localize" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:78 +#: perllib/FixMyStreet/Cobrand/UK.pm:79 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover." msgstr "" @@ -2887,14 +2756,20 @@ msgstr "" msgid "Sorry, there has been an error confirming your problem." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:221 -#: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:37 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:216 +#: perllib/FixMyStreet/Geocode.pm:38 perllib/FixMyStreet/Geocode/Bing.pm:38 #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:56 #: perllib/FixMyStreet/Geocode/OSM.pm:48 msgid "Sorry, we could not find that location." msgstr "" -#: perllib/FixMyStreet/Geocode/Bing.pm:34 +#: templates/web/base/auth/general.html:9 +#: templates/web/base/report/display.html:21 +#: templates/web/base/report/new/fill_in_details_form.html:23 +msgid "Sorry, we could not log you in. Please fill in the form below." +msgstr "" + +#: perllib/FixMyStreet/Geocode/Bing.pm:35 #: perllib/FixMyStreet/Geocode/Google.pm:45 #: perllib/FixMyStreet/Geocode/Zurich.pm:88 msgid "Sorry, we could not parse that location. Please try again." @@ -2904,6 +2779,10 @@ msgstr "" msgid "Sorry, we couldn't save your image(s), please try again." msgstr "" +#: perllib/FixMyStreet/App/Controller/AuthSS.pm:301 +msgid "Sorry, you can not log in with Facebook. Please try again later." +msgstr "" + #: templates/web/base/admin/stats.html:64 msgid "Start Date:" msgstr "" @@ -2912,13 +2791,12 @@ msgstr "" #: templates/web/base/admin/flagged.html:18 #: templates/web/base/admin/list_updates.html:11 #: templates/web/base/admin/reports.html:15 -#: templates/web/fixmystreet/report/update-form.html:26 +#: templates/web/base/report/update/form_update.html:32 msgid "State" msgstr "" #: templates/web/base/admin/report_edit.html:47 #: templates/web/base/admin/update_edit.html:27 -#: templates/web/base/report/update-form.html:28 #: templates/web/zurich/admin/report_edit-sdm.html:73 #: templates/web/zurich/admin/report_edit.html:101 #: templates/web/zurich/admin/report_edit.html:155 @@ -2926,7 +2804,7 @@ msgstr "" msgid "State:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1282 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1291 #: perllib/FixMyStreet/Cobrand/Zurich.pm:387 #: templates/web/base/admin/stats.html:1 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:73 @@ -2948,7 +2826,7 @@ msgstr "" msgid "Street View" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:406 +#: perllib/FixMyStreet/Script/Reports.pm:184 msgid "Subcategory: %s" msgstr "" @@ -2956,30 +2834,25 @@ msgstr "" msgid "Subdivision/Body" msgstr "" -#: templates/web/fixmystreet/contact/index.html:98 +#: templates/web/base/contact/index.html:90 msgid "Subject" msgstr "" #: templates/web/base/admin/report_edit.html:19 -#: templates/web/base/contact/index.html:88 -#: templates/web/base/report/new/fill_in_details_form.html:53 #: templates/web/zurich/admin/report_edit.html:39 msgid "Subject:" msgstr "" #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/fill_in_details_form.html:137 -#: templates/web/base/report/new/fill_in_details_form.html:159 -#: templates/web/base/report/new/fill_in_details_form.html:96 -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:36 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:23 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:76 +#: templates/web/base/report/new/form_user_loggedin.html:36 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:39 +#: templates/web/base/report/new/form_user_loggedout_password.html:11 #: templates/web/zurich/report/new/fill_in_details_form.html:96 msgid "Submit" msgstr "" -#: templates/web/base/admin/report_edit.html:95 -#: templates/web/base/admin/update_edit.html:65 +#: templates/web/base/admin/report_edit.html:101 +#: templates/web/base/admin/update_edit.html:75 #: templates/web/base/admin/user-form.html:56 #: templates/web/zurich/admin/report_edit-sdm.html:137 #: templates/web/zurich/admin/report_edit.html:268 @@ -2987,7 +2860,7 @@ msgstr "" msgid "Submit changes" msgstr "" -#: templates/web/base/questionnaire/index.html:97 +#: templates/web/base/questionnaire/index.html:106 msgid "Submit questionnaire" msgstr "" @@ -3003,9 +2876,8 @@ msgid "Submitted" msgstr "" #: templates/web/base/alert/updates.html:17 -#: templates/web/base/report/display.html:46 +#: templates/web/base/report/display_tools.html:41 #: templates/web/fixmystreet/alert/updates.html:23 -#: templates/web/fixmystreet/report/display.html:65 msgid "Subscribe" msgstr "" @@ -3013,7 +2885,7 @@ msgstr "" msgid "Subscribe me to an email alert" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1275 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1284 #: perllib/FixMyStreet/Cobrand/Zurich.pm:383 #: templates/web/base/admin/bodies.html:25 #: templates/web/base/admin/index.html:1 @@ -3032,7 +2904,7 @@ msgstr "" msgid "Summary reports" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1279 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1288 msgid "Survey" msgstr "" @@ -3046,9 +2918,8 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/Zurich.pm:394 #: templates/web/zurich/header.html:77 -#, fuzzy msgid "Templates" -msgstr "Gauti atnaujinimus" +msgstr "" #: templates/web/base/admin/list_updates.html:12 #: templates/web/zurich/admin/templates.html:9 @@ -3069,7 +2940,7 @@ msgstr "" msgid "Thank you for reporting this issue!" msgstr "" -#: templates/web/base/tokens/error.html:7 +#: templates/web/base/tokens/error.html:6 msgid "Thank you for trying to confirm your update or problem. We seem to have an error ourselves though, so <a href=\"%s\">please let us know what went on</a> and we'll look into it." msgstr "" @@ -3104,23 +2975,23 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:47 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:63 -#: perllib/FixMyStreet/Cobrand/UK.pm:71 +#: perllib/FixMyStreet/Cobrand/UK.pm:72 msgid "That postcode was not recognised, sorry." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:726 +#: perllib/FixMyStreet/App/Controller/Admin.pm:724 msgid "That problem has been marked as sent." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:718 +#: perllib/FixMyStreet/App/Controller/Admin.pm:716 msgid "That problem will now be resent." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:125 +#: perllib/FixMyStreet/App/Controller/Report.pm:127 msgid "That report cannot be viewed on %s." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:119 +#: perllib/FixMyStreet/App/Controller/Report.pm:121 msgid "That report has been removed from FixMyStreet." msgstr "" @@ -3151,7 +3022,7 @@ msgid "" " If you leave this blank, <strong>send method defaults to email</strong>." msgstr "" -#: templates/web/base/open311/index.html:90 +#: templates/web/base/open311/index.html:82 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 "" @@ -3172,12 +3043,12 @@ msgstr "" msgid "The diligency prize league table shows editors' activity (who's been editing the most records)." msgstr "" -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:60 -#: perllib/FixMyStreet/App/Controller/Reports.pm:79 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:61 +#: perllib/FixMyStreet/App/Controller/Reports.pm:80 msgid "The error was: %s" msgstr "" -#: templates/web/base/open311/index.html:86 +#: templates/web/base/open311/index.html:78 msgid "The following Open311 v2 attributes are returned for each request: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code and service_name." msgstr "" @@ -3224,8 +3095,7 @@ msgstr "" msgid "The passwords do not match" msgstr "" -#: templates/web/base/errors/page_error_404_not_found.html:10 -#: templates/web/base/errors/page_error_404_not_found.html:12 +#: templates/web/base/errors/page_error_404_not_found.html:9 msgid "The requested URL '%s' was not found on this server" msgstr "" @@ -3235,12 +3105,11 @@ msgstr "" #: templates/web/base/report/new/councils_extra_text.html:1 #: templates/web/base/report/new/councils_text_some.html:10 -#: templates/web/base/report/new/fill_in_details_form.html:18 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:14 +#: templates/web/base/report/new/fill_in_details_form.html:13 msgid "The summary and description will also be made public (see our <a href=\"/privacy\">privacy policy</a>)." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:315 +#: perllib/FixMyStreet/Script/Reports.pm:92 msgid "The user could not locate the problem on a map, but to see the area around the location they entered" msgstr "" @@ -3257,18 +3126,18 @@ msgstr "" msgid "There are no reports to show." msgstr "" -#: perllib/FixMyStreet/App/Controller/Reports.pm:76 +#: perllib/FixMyStreet/App/Controller/Reports.pm:77 msgid "There was a problem showing the All Reports page. Please try again later." msgstr "" #: perllib/FixMyStreet/App/Controller/Contact.pm:137 -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:59 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:60 msgid "There was a problem showing this page. Please try again later." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:769 -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:134 -#: templates/web/base/auth/general.html:26 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:764 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:138 +#: templates/web/base/auth/general.html:43 #: templates/web/zurich/auth/general.html:28 msgid "There was a problem with your email/password combination. If you cannot remember your password, or do not have one, please fill in the ‘sign in by email’ section of the form." msgstr "" @@ -3277,7 +3146,7 @@ msgstr "" msgid "There was a problem with your email/password combination. Please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:272 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:336 msgid "There was a problem with your update. Please try again." msgstr "" @@ -3285,7 +3154,7 @@ msgstr "" msgid "There were problems with your report. Please see below." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:300 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:371 msgid "There were problems with your update. Please see below." msgstr "" @@ -3299,7 +3168,7 @@ msgid "" " " msgstr "" -#: templates/web/base/open311/index.html:77 +#: templates/web/base/open311/index.html:69 msgid "This API implementation is work in progress and not yet stabilized. It will change without warnings in the future." msgstr "" @@ -3321,18 +3190,18 @@ msgid "" " A body will not receive any reports unless it covers at least one area." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:413 +#: perllib/FixMyStreet/Script/Reports.pm:191 msgid "This email has been sent to both councils covering the location of the problem, as the user did not categorise it; please ignore it if you're not the correct council to deal with the issue, or let us know what category of problem this is so we can add it to our system." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:416 +#: perllib/FixMyStreet/Script/Reports.pm:194 msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:925 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:995 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:920 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:990 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:142 -#: perllib/FixMyStreet/Cobrand/UK.pm:43 +#: perllib/FixMyStreet/Cobrand/UK.pm:44 msgid "This information is required" msgstr "" @@ -3344,56 +3213,37 @@ msgstr "" msgid "This is a summary of all reports on this site." msgstr "" -#: templates/web/zurich/auth/token.html:8 -msgid "This may be because the link is too old or already used, or the address was not copied correctly." -msgstr "" - -#: templates/web/base/report/banner.html:15 -msgid "This problem has been closed" -msgstr "" - -#: templates/web/base/report/banner.html:12 -#: templates/web/base/report/update-form.html:48 -#: templates/web/fixmystreet/report/update-form.html:46 +#: templates/web/base/report/update/form_update.html:52 msgid "This problem has been fixed" msgstr "" -#: templates/web/base/report/update-form.html:43 -#: templates/web/fixmystreet/report/update-form.html:40 +#: templates/web/base/report/update/form_update.html:46 msgid "This problem has not been fixed" msgstr "" -#: templates/web/base/report/banner.html:19 -msgid "This problem is in progress" -msgstr "" - -#: templates/web/base/report/banner.html:9 -msgid "This problem is old and of unknown status." -msgstr "" - #: perllib/FixMyStreet/Cobrand/Zurich.pm:168 #: perllib/FixMyStreet/Cobrand/Zurich.pm:169 #: templates/web/zurich/report/_main.html:14 msgid "This report is awaiting moderation." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:86 +#: perllib/FixMyStreet/Script/Alerts.pm:94 msgid "This report is currently marked as closed." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:84 +#: perllib/FixMyStreet/Script/Alerts.pm:92 msgid "This report is currently marked as fixed." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:88 +#: perllib/FixMyStreet/Script/Alerts.pm:96 msgid "This report is currently marked as open." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:326 +#: perllib/FixMyStreet/Script/Reports.pm:105 msgid "This report was submitted anonymously" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:308 +#: perllib/FixMyStreet/Script/Reports.pm:85 msgid "This web page also contains a photo of the problem, provided by the user." msgstr "" @@ -3404,7 +3254,7 @@ msgstr "" msgid "Time spent (in minutes):" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1278 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1287 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "" @@ -3427,11 +3277,11 @@ msgstr "" msgid "To find out what local alerts we have for you, please enter your postcode or street name and area" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:314 +#: perllib/FixMyStreet/Script/Reports.pm:91 msgid "To view a map of the precise location of this issue" msgstr "" -#: templates/web/base/admin/index.html:61 +#: templates/web/base/admin/index.html:54 #: templates/web/base/admin/questionnaire.html:24 #: templates/web/base/admin/stats.html:24 #: templates/web/base/admin/stats.html:43 @@ -3449,10 +3299,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:12 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:33 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:31 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:37 msgid "Unable to fix" msgstr "" @@ -3465,7 +3313,7 @@ msgstr "" msgid "Unconfirmed" msgstr "" -#: templates/web/fixmystreet/report/banner.html:9 +#: templates/web/base/report/banner.html:9 msgid "Unknown" msgstr "" @@ -3473,17 +3321,18 @@ msgstr "" msgid "Unknown alert type" msgstr "" +#: perllib/FixMyStreet/App/Controller/Photo.pm:110 #: templates/web/base/js/translation_strings.html:39 msgid "Unknown error" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:103 -#: perllib/FixMyStreet/App/Controller/Report.pm:109 -#: perllib/FixMyStreet/App/Controller/Report.pm:112 +#: perllib/FixMyStreet/App/Controller/Report.pm:105 +#: perllib/FixMyStreet/App/Controller/Report.pm:111 +#: perllib/FixMyStreet/App/Controller/Report.pm:114 msgid "Unknown problem ID" msgstr "" -#: templates/web/fixmystreet/report/update-form.html:19 +#: templates/web/base/report/update/form_update.html:25 msgid "Update" msgstr "" @@ -3491,13 +3340,11 @@ msgstr "" msgid "Update %s created for problem %d; by %s" msgstr "" -#: templates/web/base/contact/index.html:21 -#: templates/web/fixmystreet/contact/index.html:36 +#: templates/web/base/contact/index.html:28 msgid "Update below added anonymously at %s" msgstr "" -#: templates/web/base/contact/index.html:23 -#: templates/web/fixmystreet/contact/index.html:38 +#: templates/web/base/contact/index.html:30 msgid "Update below added by %s at %s" msgstr "" @@ -3506,7 +3353,7 @@ msgstr "" msgid "Update body" msgstr "" -#: templates/web/base/admin/index.html:55 +#: templates/web/base/admin/index.html:48 msgid "Update breakdown by state" msgstr "" @@ -3531,20 +3378,16 @@ msgstr "" msgid "Update statuses" msgstr "" -#: templates/web/base/report/update-form.html:22 -msgid "Update:" -msgstr "" - #: templates/web/zurich/admin/index-dm.html:23 #: templates/web/zurich/admin/index-sdm.html:21 #: templates/web/zurich/admin/reports.html:13 msgid "Updated" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1045 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1103 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1147 -#: perllib/FixMyStreet/App/Controller/Admin.pm:822 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1048 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1108 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1156 +#: perllib/FixMyStreet/App/Controller/Admin.pm:821 #: perllib/FixMyStreet/Cobrand/Zurich.pm:771 #: perllib/FixMyStreet/Cobrand/Zurich.pm:796 #: perllib/FixMyStreet/Cobrand/Zurich.pm:866 @@ -3552,13 +3395,12 @@ msgid "Updated!" msgstr "" #: templates/web/base/admin/list_updates.html:2 -#: templates/web/base/report/update.html:3 -#: templates/web/fixmystreet/report/update.html:5 +#: templates/web/base/report/update.html:5 #: templates/web/zurich/report/updates.html:2 msgid "Updates" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:132 +#: perllib/FixMyStreet/DB/Result/Comment.pm:131 msgid "Updates are limited to %s characters in length. Please shorten your update" msgstr "" @@ -3568,12 +3410,9 @@ msgstr "" #. ("%s is the site name") #: templates/web/base/report/display.html:0 -#: templates/web/base/report/display.html:5 -#: templates/web/fixmystreet/report/display.html:0 -#: templates/web/fixmystreet/report/display.html:9 -#, fuzzy +#: templates/web/base/report/display.html:9 msgid "Updates to this problem, %s" -msgstr "Gauti Å¡ių problemų %s atnaujinimus" +msgstr "" #: templates/web/base/admin/body.html:182 msgid "Use the <strong>note</strong> to record details that are only displayed in the admin. Notes are not shown publicly, and are not sent to the body." @@ -3584,11 +3423,11 @@ msgstr "" msgid "Used map" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1452 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1461 msgid "User flag removed" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1424 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1433 msgid "User flagged" msgstr "" @@ -3596,7 +3435,7 @@ msgstr "" msgid "User search finds matches in users' names and email addresses." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1280 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1289 #: perllib/FixMyStreet/Cobrand/Zurich.pm:399 #: templates/web/base/admin/flagged.html:29 #: templates/web/zurich/header.html:69 @@ -3627,7 +3466,6 @@ msgid "Viewing a location" msgstr "" #: templates/web/base/report/display.html:0 -#: templates/web/fixmystreet/report/display.html:0 msgid "Viewing a problem" msgstr "" @@ -3640,25 +3478,24 @@ 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/zurich/auth/token.html:7 -msgid "We have not been able to confirm your account - sorry." -msgstr "" - -#: templates/web/zurich/auth/token.html:17 -msgid "We have sent you an email containing a link to confirm your account." -msgstr "" +#: templates/web/base/auth/general.html:6 +#: templates/web/base/report/display.html:27 +#: templates/web/base/report/new/oauth_email_form.html:5 +#, fuzzy +msgid "We need your email address, please give it below." +msgstr "(mes niekada nerodome jÅ«sų el. paÅ¡to arba telefono numerio)" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:2 -#: templates/web/fixmystreet/report/update-form.html:77 +#: templates/web/base/report/new/form_user_loggedout_email.html:2 +#: templates/web/base/report/update/form_user_loggedout_email.html:2 msgid "We never show your email" msgstr "" -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:31 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:65 +#: templates/web/base/report/new/form_user_loggedin.html:31 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:28 msgid "We never show your email address or phone number." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:422 +#: perllib/FixMyStreet/Script/Reports.pm:200 msgid "We realise this problem might be the responsibility of %s; however, we don't currently have any contact details for them. If you know of an appropriate contact address, please do get in touch." msgstr "" @@ -3675,10 +3512,6 @@ msgstr "" msgid "We’re sorry to hear the problem’s not fixed. Why not try writing to your local representatives?" msgstr "" -#: templates/web/base/contact/blurb.html:8 -msgid "We'd love to hear what you think about this site. Just fill in the form, or send an email to <a href='mailto:%s'>%s</a>:" -msgstr "" - #: templates/web/base/contact/submit.html:7 msgid "We’ll get back to you as soon as we can." msgstr "" @@ -3687,7 +3520,7 @@ msgstr "" msgid "What was your experience of getting the problem fixed?" msgstr "" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:49 +#: templates/web/base/report/new/form_report.html:19 msgid "What’s the issue, and where is it?" msgstr "" @@ -3700,7 +3533,11 @@ msgstr "" msgid "When sent" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:640 +#: templates/web/base/js/translation_strings.html:50 +msgid "Whoa there Testino! Three photos are enough." +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Report/New.pm:635 msgid "Whole block of empty flats" msgstr "" @@ -3715,7 +3552,7 @@ msgstr "" msgid "Wish" msgstr "" -#: templates/web/base/open311/index.html:92 +#: templates/web/base/open311/index.html:84 msgid "With request searches, it is also possible to search for agency_responsible to limit the requests to those sent to a single administration. The search term is the administration ID provided by <a href=\"%s\">MaPit</a>." msgstr "" @@ -3723,7 +3560,7 @@ msgstr "" msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"http://fixmystreet.org\">available at fixmystreet.org</a>." msgstr "" -#: templates/web/base/questionnaire/index.html:87 +#: templates/web/base/questionnaire/index.html:96 msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?" msgstr "" @@ -3732,7 +3569,6 @@ msgid "Writing your message entirely in block capitals makes it hard to read, as msgstr "" #: templates/web/base/report/new/fill_in_details_form.html:4 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:5 msgid "Wrong location? Just click again on the map." msgstr "" @@ -3755,27 +3591,24 @@ msgstr "" #: templates/web/base/admin/users.html:31 #: templates/web/base/questionnaire/creator_fixed.html:14 #: templates/web/base/questionnaire/index.html:51 -#: templates/web/base/questionnaire/index.html:90 +#: templates/web/base/questionnaire/index.html:99 msgid "Yes" msgstr "" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:17 -#: templates/web/fixmystreet/report/update-form.html:91 +#: templates/web/base/report/new/form_user_loggedout_password.html:5 +#: templates/web/base/report/update/form_user_loggedout_password.html:4 msgid "Yes I have a password" msgstr "" -#: templates/web/base/contact/index.html:39 -#: templates/web/fixmystreet/contact/index.html:54 +#: templates/web/base/contact/index.html:46 msgid "You are complaining that this problem report was unnecessarily moderated:" msgstr "" -#: templates/web/base/contact/index.html:41 -#: templates/web/fixmystreet/contact/index.html:56 +#: templates/web/base/contact/index.html:48 msgid "You are reporting the following problem report for being abusive, containing personal information, or similar:" msgstr "" -#: templates/web/base/contact/index.html:15 -#: templates/web/fixmystreet/contact/index.html:30 +#: templates/web/base/contact/index.html:22 msgid "You are reporting the following update for being abusive, containing personal information, or similar:" msgstr "" @@ -3788,7 +3621,7 @@ msgstr "" msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create." msgstr "" -#: templates/web/fixmystreet/contact/index.html:121 +#: templates/web/base/contact/index.html:113 msgid "You can contact technical support on <a href='mailto:%s'>%s</a>" msgstr "" @@ -3799,8 +3632,8 @@ msgid "" " reports in the past." msgstr "" -#: templates/web/base/report/new/councils_text_none.html:10 -#: templates/web/base/report/new/councils_text_none.html:2 +#: templates/web/base/report/new/councils_text_none.html:12 +#: templates/web/base/report/new/councils_text_none.html:14 #: templates/web/base/report/new/councils_text_some.html:19 #: templates/web/base/report/new/councils_text_some.html:21 msgid "You can help us by finding a contact email address for local problems for %s and emailing it to us at <a href='mailto:%s'>%s</a>." @@ -3818,19 +3651,14 @@ msgstr "" msgid "You have already answered this questionnaire. If you have a question, please <a href='%s'>get in touch</a>, or <a href='%s'>view your problem</a>.\n" msgstr "" -#: templates/web/base/questionnaire/index.html:77 -#: templates/web/base/report/new/fill_in_details_form.html:75 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:73 -msgid "You have already attached a photo to this report, attaching another one will replace it." -msgstr "" - -#: templates/web/base/report/update-form.html:59 -#: templates/web/fixmystreet/report/update-form.html:56 -msgid "You have already attached a photo to this update, attaching another one will replace it." +#: templates/web/base/report/new/form_report.html:32 +#: templates/web/zurich/report/new/fill_in_details_form.html:55 +msgid "You have already attached photos to this report. Note that you can attach a maximum of 3 to this report (if you try to upload more, the oldest will be removed)." msgstr "" -#: templates/web/zurich/report/new/fill_in_details_form.html:61 -msgid "You have already attached photos to this report. Note that you can attach a maximum of 3 to this report (if you try to upload more, the oldest will be removed)." +#: templates/web/base/questionnaire/index.html:83 +#: templates/web/base/report/update/form_update.html:14 +msgid "You have already attached photos to this update. Note that you can attach a maximum of 3 to this update (if you try to upload more, the oldest will be removed)." msgstr "" #: templates/web/base/auth/sign_out.html:4 @@ -3847,9 +3675,8 @@ msgstr "" msgid "You have successfully confirmed your email address." msgstr "" -#: templates/web/base/report/display.html:20 -#: templates/web/base/report/new/fill_in_details.html:37 -#: templates/web/fixmystreet/report/display.html:17 +#: templates/web/base/report/display.html:17 +#: templates/web/base/report/new/login_success_form.html:3 msgid "You have successfully signed in; please check and confirm your details are accurate:" msgstr "" @@ -3878,53 +3705,42 @@ msgid "Your Reports" msgstr "" #: templates/web/base/alert/_list.html:89 +#: templates/web/base/contact/index.html:83 +#: templates/web/base/report/display_tools.html:38 +#: templates/web/base/report/display_tools.html:40 +#: templates/web/base/report/new/form_user_loggedin.html:3 +#: templates/web/base/report/new/form_user_loggedout_email.html:1 +#: templates/web/base/report/update/form_user_loggedout_email.html:1 #: templates/web/fixmystreet/alert/updates.html:19 #: templates/web/fixmystreet/alert/updates.html:22 -#: templates/web/fixmystreet/contact/index.html:91 -#: templates/web/fixmystreet/report/display.html:62 -#: templates/web/fixmystreet/report/display.html:64 -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:3 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:1 -#: templates/web/fixmystreet/report/update-form.html:76 #: templates/web/zurich/report/new/fill_in_details_form.html:76 msgid "Your email" msgstr "" -#: templates/web/base/auth/general.html:28 -#: templates/web/fixmystreet/report/update-form.html:82 +#: templates/web/base/auth/general.html:45 +#: templates/web/base/report/update/form_user_loggedout_email.html:7 #: templates/web/zurich/auth/general.html:30 #: templates/web/zurich/auth/general.html:58 msgid "Your email address" msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:106 -#: templates/web/base/report/update-form.html:81 -msgid "Your email:" -msgstr "" - -#: templates/web/fixmystreet/report/updates-sidebar-notes.html:7 +#: templates/web/base/report/updates-sidebar-notes.html:3 msgid "Your information will only be used in accordance with our <a href=\"/privacy\">privacy policy</a>" msgstr "" -#: templates/web/base/auth/general.html:51 -#: templates/web/fixmystreet/contact/index.html:84 -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:18 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:54 -#: templates/web/fixmystreet/report/update-form.html:142 +#: templates/web/base/auth/general.html:90 +#: templates/web/base/contact/index.html:76 +#: templates/web/base/report/new/form_user_loggedin.html:18 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:17 +#: templates/web/base/report/update/form_name.html:11 #: templates/web/zurich/auth/general.html:61 #: templates/web/zurich/report/new/fill_in_details_form.html:86 msgid "Your name" msgstr "" -#: templates/web/base/contact/index.html:73 -#: templates/web/base/report/new/fill_in_details_form.html:186 -#: templates/web/base/report/update-form.html:152 -msgid "Your name:" -msgstr "" - -#: templates/web/base/auth/general.html:39 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:22 -#: templates/web/fixmystreet/report/update-form.html:96 +#: templates/web/base/auth/general.html:75 +#: templates/web/base/report/new/form_user_loggedout_password.html:10 +#: templates/web/base/report/update/form_user_loggedout_password.html:9 #: templates/web/zurich/auth/general.html:34 msgid "Your password" msgstr "" @@ -3933,15 +3749,16 @@ msgstr "" msgid "Your password has been changed" msgstr "" -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:27 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:63 +#: templates/web/base/report/new/form_user_loggedin.html:27 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:26 #: templates/web/zurich/report/new/fill_in_details_form.html:92 msgid "Your phone number" msgstr "" #: templates/web/base/questionnaire/index.html:14 +#, fuzzy msgid "Your report" -msgstr "" +msgstr "Visi praneÅ¡imai" #: templates/web/base/footer.html:9 templates/web/fixmystreet/footer.html:29 msgid "Your reports" @@ -3951,23 +3768,17 @@ msgstr "" msgid "Your updates" msgstr "" -#: templates/web/base/contact/index.html:81 -msgid "Your email:" -msgstr "" - #: templates/web/base/reports/_list-filters.html:3 -#, fuzzy msgid "all reports" -msgstr "Visi praneÅ¡imai" +msgstr "" #: templates/web/base/admin/timeline.html:4 msgid "by %s" msgstr "" #: templates/web/base/reports/_list-filters.html:5 -#, fuzzy msgid "closed reports" -msgstr "Uždaryti praneÅ¡imai" +msgstr "" #: templates/web/base/reports/body.html:6 #: templates/web/base/reports/body.html:7 @@ -3989,17 +3800,16 @@ msgid "edit user" msgstr "" #: templates/web/base/reports/_list-filters.html:6 -#, fuzzy msgid "fixed reports" -msgstr "Sutvarkyti praneÅ¡imai" +msgstr "" -#: templates/web/base/admin/index.html:33 +#: templates/web/base/status/stats.html:20 #: templates/web/zurich/admin/index.html:5 msgid "from %s different users" msgstr "" -#: templates/web/base/report/_item.html:17 -#: templates/web/zurich/report/_item.html:16 +#: templates/web/base/report/_item.html:15 +#: templates/web/zurich/report/_item.html:14 msgid "last updated %s" msgstr "" @@ -4091,10 +3901,8 @@ msgstr "" msgid "sign out" msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:12 -#: templates/web/base/report/new/fill_in_details_form.html:15 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:10 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:12 +#: templates/web/base/report/new/fill_in_details_form.html:11 +#: templates/web/base/report/new/fill_in_details_form.html:9 msgid "the local council" msgstr "" @@ -4103,7 +3911,7 @@ msgstr "" msgid "there is no pin shown as the user did not use the map" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:398 +#: perllib/FixMyStreet/Script/Reports.pm:176 msgid "this type of local problem" msgstr "" @@ -4112,9 +3920,8 @@ msgid "today" msgstr "" #: templates/web/base/reports/_list-filters.html:4 -#, fuzzy msgid "unfixed reports" -msgstr "Sutvarkyti praneÅ¡imai" +msgstr "" #: templates/web/base/admin/report_edit.html:32 msgid "used map" @@ -4133,7 +3940,7 @@ msgstr "" msgid "ward" msgstr "" -#: templates/web/base/front/stats.html:17 +#: templates/web/base/front/stats.html:13 #, perl-format msgid "<big>%s</big> report recently" msgid_plural "<big>%s</big> reports recently" @@ -4165,7 +3972,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: templates/web/base/front/stats.html:29 +#: templates/web/base/front/stats.html:25 #, perl-format msgid "<big>%s</big> update on reports" msgid_plural "<big>%s</big> updates on reports" @@ -4189,7 +3996,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: templates/web/base/front/stats.html:12 +#: templates/web/base/front/stats.html:8 #, perl-format msgid "<big>%s</big> report in past week" msgid_plural "<big>%s</big> reports in past week" @@ -4197,7 +4004,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: templates/web/base/front/stats.html:23 +#: templates/web/base/front/stats.html:19 #, perl-format msgid "<big>%s</big> fixed in past month" msgid_plural "<big>%s</big> fixed in past month" @@ -4221,92 +4028,44 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#~ msgid "(Don't worry — we'll hang on to your alert while you're checking your email.)" -#~ msgstr "(Nesijaudinkite — jÅ«sų praneÅ¡imas nedings, kol tikrinsite savo elektroninį paÅ¡tÄ….)" - -#~ msgid "(Don't worry — we'll hang on to your problem report while you're checking your email.)" -#~ msgstr "(Nesijaudinkite — jÅ«sų problema nedings, kol tikrinsite savo elektroninį paÅ¡tÄ….)" - -#~ msgid "(Don't worry — we'll hang on to your update while you're checking your email.)" -#~ msgstr "(Nesijaudinkite — jÅ«sų atnaujinimas nedings, kol tikrinsite savo elektroninį paÅ¡tÄ….)" - -#~ msgid "<small>If you cannot see the map, <a href='%s' rel='nofollow'>skip this step</a>.</small>" -#~ msgstr "<small>Jeigu jÅ«s nematote žemÄ—lapio, <a href='%s' rel='nofollow'>tada praleiskite Å¡itÄ… žingsnį </a>.</small>" - -#~ msgid "<strong>No</strong>, I do not, let me sign in by email:" -#~ msgstr "<strong>Ne</strong>, AÅ¡ nesu, leisti man prisijungti el. paÅ¡tu:" - -#~ msgid "Are you a <strong>developer</strong>? Would you like to contribute to FixMyStreet?" -#~ msgstr "Esi <strong>aplikacijų kÅ«rÄ—jas</strong>? NorÄ—tum prisidÄ—ti prie projekto FixMyStreet?" - -#~ msgid "Closest nearby problems <small>(within %skm)</small>" -#~ msgstr "Netoliese esanÄios problemos <small>(within %skm)</small>" - -#~ msgid "Contact FixMyStreet" -#~ msgstr "Susiekti su FixMyStreet" - -#~ msgid "Do you have a FixMyBarangay password?" -#~ msgstr "Ar jÅ«s turite FixMyBarangay slaptažodį?" - -#~ msgid "FixMyStreet admin:" -#~ msgstr "FixMyStreet admin:" - -#~ msgid "If you do not, your alert will not be activated." -#~ msgstr "PrieÅ¡ingu atveju jÅ«sų praneÅ¡imas nebus aktyvuotas." - -#~ msgid "If you do not, your problem will not be posted." -#~ msgstr "PrieÅ¡ingu atveju jÅ«sų praneÅ¡imas nebus patalpintas." - -#~ msgid "If you do not, your update will not be posted." -#~ msgstr "PrieÅ¡ingu atveju jÅ«sų atnaujinimas nebus patalpintas." - -#~ msgid "New local reports on reportemptyhomes.com" -#~ msgstr "New local reports on reportemptyhomes.com" - -#~ msgid "New reports for {{COUNCIL}} within {{WARD}} ward on reportemptyhomes.com" -#~ msgstr "New reports for {{COUNCIL}} within {{WARD}} ward on reportemptyhomes.com" - -#~ msgid "New reports on reportemptyhomes.com" -#~ msgstr "New reports on reportemptyhomes.com" - -#~ msgid "New reports on reportemptyhomes.com near {{POSTCODE}}" -#~ msgstr "New reports on reportemptyhomes.com near {{POSTCODE}}" +#~ msgid "(we never show your email)" +#~ msgstr "(mes niekada nerodome jÅ«sų el. paÅ¡to)" -#~ msgid "New reports to {{COUNCIL}} on reportemptyhomes.com" -#~ msgstr "New reports to {{COUNCIL}} on reportemptyhomes.com" +#~ msgid "<strong>No</strong>, let me confirm my report by email:" +#~ msgstr "<strong>Ne</strong>, leisti man patvirtinti mano praneÅ¡imÄ… el. paÅ¡tu:" -#~ msgid "New reports within {{NAME}}'s boundary on reportemptyhomes.com" -#~ msgstr "New reports within {{NAME}}'s boundary on reportemptyhomes.com" +#~ msgid "<strong>No</strong>, let me confirm my update by email:" +#~ msgstr "<strong>Ne</strong>Ä leisti patvirtinti mano atnaujinimÄ… el. paÅ¡tu:" -#~ msgid "New update:" -#~ msgstr "Naujas atnaujinimas:" +#~ msgid "Email me updates" +#~ msgstr "Atsiųsti man atnaujinimus" -#~ msgid "No problems found." -#~ msgstr "Jokių problemų nerasta." +#~ msgid "Enter a new password:" +#~ msgstr "Ä®veskite nauja slaptažodį:" -#~ msgid "No problems have been reported yet." -#~ msgstr "Jokių problemų dar nepraneÅ¡ta." +#~ 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 "Apgailestaujame, bet žymÄ— nebuvo patvirtinta. PraÅ¡ome patikrinti ar jÅ«s teisingai nukopijavote adresÄ… iÅ¡ savo el. paÅ¡to.\n" -#~ msgid "Now to submit your report… do you have a FixMyStreet password?" -#~ msgstr "Dabar patvirtinti jÅ«sų report… ar jÅ«s turite FixMyStreet slaptažodį?" +#~ 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 "Patikrinkite savo el. paÅ¡to \"Junk mail\" arba \"Spam\" skyrius, nes kartais musų žinutÄ—s bÅ«na nusiųstos ten." -#~ msgid "Now to submit your update… do you have a FixMyStreet password?" -#~ msgstr "Dabar patvirtinti jÅ«sų update… ar jÅ«s turite FixMyStreet slaptažodį?" +#~ msgid "Message:" +#~ msgstr "ŽinutÄ—:" -#~ msgid "Our code is open source and <a href=\"http://github.com/mysociety/fixmystreet\">available on GitHub</a>." -#~ msgstr "Our code is open source and <a href=\"http://github.com/mysociety/fixmystreet\">available on GitHub</a>." +#~ msgid "More problems nearby" +#~ msgstr "Daugiau Å¡alia esanÄių problemų" -#~ msgid "Please <a class=\"tab_link\" href=\"#report\">take a look</a> at the updates that have been left." -#~ msgstr "PraÅ¡ome <a class=\"tab_link\" href=\"#report\">peržvelgti</a> pateiktus atnaujinimus." +#~ msgid "Nearly Done! Now check your email..." +#~ msgstr "Beveik baigta! Dabar patikrinkite savo el. paÅ¡tÄ…..." -#~ msgid "Please take a look at the updates that have been left." -#~ msgstr "PraÅ¡ome peržvelgti atnaujinimus, kurie buvo palikti." +#~ msgid "Offensive? Unsuitable? Tell us" +#~ msgstr "Įžeidžiantis? Netinkamas? PraneÅ¡k mums" -#~ msgid "Problems within %s, FixMyStreet" -#~ msgstr "Problemos %s, FixMyStreet" +#~ msgid "Photo:" +#~ msgstr "Nuotrauka:" -#~ msgid "Properties recently reported as put back to use on reportemptyhomes.com" -#~ msgstr "Properties recently reported as put back to use on reportemptyhomes.com" +#~ msgid "Please check your email" +#~ msgstr "PraÅ¡ome patikrinti savo el. paÅ¡tÄ…" -#~ msgid "Publish the response" -#~ msgstr "Paskelbti atsakymÄ…" +#~ msgid "Please note that updates are not sent to the council. If you leave your name it will be public. Your information will only be used in accordance with our <a href=\"/faq#privacy\">privacy policy</a>" +#~ msgstr "Atkreipkite dÄ—mesį, kad naujinimai nÄ—ra siunÄiama savivaldybei. Jeigu jÅ«s pateiksite savo vardÄ… jis bus vieÅ¡ai prieinamas. JÅ«sų asmeninÄ— informacija bus naudojama tiktai pagal mÅ«sų <a href=\"/faq#privacy\">privatumo politika</a>" diff --git a/locale/ms.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/ms.UTF-8/LC_MESSAGES/FixMyStreet.po index 765a43220..471a81f2d 100644 --- a/locale/ms.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/ms.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: fixmystreet\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2015-10-23 16:51+0100\n" -"PO-Revision-Date: 2015-07-31 16:31+0000\n" +"POT-Creation-Date: 2016-03-02 13:09+0000\n" +"PO-Revision-Date: 2015-10-23 16:38+0000\n" "Last-Translator: mySociety <transifex@mysociety.org>\n" "Language-Team: Malay (http://www.transifex.com/mysociety/fixmystreet/language/ms/)\n" "Language: ms\n" @@ -19,45 +19,24 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:628 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:411 +#: perllib/FixMyStreet/DB/Result/Problem.pm:616 +#: perllib/FixMyStreet/Script/Reports.pm:189 msgid " and " msgstr " dan " #: templates/web/base/report/new/councils_text_all.html:2 -#: templates/web/base/report/new/councils_text_none.html:11 -#: templates/web/base/report/new/councils_text_none.html:2 +#: templates/web/base/report/new/councils_text_none.html:12 +#: templates/web/base/report/new/councils_text_none.html:15 #: templates/web/base/report/new/councils_text_some.html:19 #: templates/web/base/report/new/councils_text_some.html:22 #: templates/web/base/report/new/councils_text_some.html:5 msgid " or " msgstr " atau " -#: templates/web/base/admin/index.html:35 -#: templates/web/base/status/index.html:13 -msgid "%s confirmed alerts, %s unconfirmed" -msgstr "%d alert disahkan, %d belum disah" - -#: templates/web/base/admin/index.html:37 -#: templates/web/base/status/index.html:16 -#: templates/web/zurich/admin/index.html:6 -msgid "%s council contacts – %s confirmed, %s unconfirmed" -msgstr "%d cara hubungan majlis – %d disahkan, %d belum disah" - #: templates/web/base/admin/edit-league.html:12 msgid "%d edits by %s" msgstr "%d suntingan daripada %s" -#: templates/web/base/admin/index.html:34 -#: templates/web/base/status/index.html:12 -msgid "%s live updates" -msgstr "%d update secara langsung" - -#: templates/web/base/admin/index.html:36 -#: templates/web/base/status/index.html:14 -msgid "%s questionnaires sent – %s answered (%s%%)" -msgstr "%d soalan selidik dihantar – %d dijawabi (%s%%)" - #: templates/web/base/pagination.html:10 msgid "%d to %d of %d" msgstr "%d kepada %d daripada %d" @@ -72,6 +51,20 @@ msgstr "%s - Laporan Ringkasan" msgid "%s admin:" msgstr "" +#: templates/web/base/status/stats.html:26 +#, fuzzy +msgid "%s bodies" +msgstr "Badan" + +#: templates/web/base/status/stats.html:24 +msgid "%s confirmed alerts, %s unconfirmed" +msgstr "%s alert disahkan, %s belum disah" + +#: templates/web/base/status/stats.html:27 +#: templates/web/zurich/admin/index.html:6 +msgid "%s council contacts – %s confirmed, %s unconfirmed" +msgstr "%s cara hubungan majlis – %s disahkan, %s belum disah" + #. ("%s is the site name") #: templates/web/base/alert/index.html:7 msgid "" @@ -88,7 +81,15 @@ msgid "" "within a certain distance of a particular location." msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:695 +#: templates/web/base/status/stats.html:23 +msgid "%s live updates" +msgstr "%s update secara langsung" + +#: templates/web/base/status/stats.html:25 +msgid "%s questionnaires sent – %s answered (%s%%)" +msgstr "%s soalan selidik dihantar – %s dijawabi (%s%%)" + +#: perllib/FixMyStreet/DB/Result/Problem.pm:683 msgid "%s ref: %s" msgstr "%s ruj; %s" @@ -103,15 +104,15 @@ msgid "" "for the county council." msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:255 perllib/FixMyStreet/Cobrand/UK.pm:267 +#: perllib/FixMyStreet/Cobrand/UK.pm:256 perllib/FixMyStreet/Cobrand/UK.pm:268 msgid "%s ward, %s" msgstr "%s kawasan pentadbiran, %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:564 +#: perllib/FixMyStreet/DB/Result/Problem.pm:552 msgid "%s, reported at %s" msgstr "%s, dilaporkan pada %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:282 perllib/FixMyStreet/Cobrand/UK.pm:294 +#: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295 msgid "%s, within %s ward" msgstr "%s, dalam kawasan pentadbiran %s" @@ -119,7 +120,7 @@ msgstr "%s, dalam kawasan pentadbiran %s" msgid "© <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors" msgstr "" -#: templates/web/zurich/report/new/fill_in_details_form.html:53 +#: templates/web/zurich/report/new/fill_in_details_form.html:46 msgid "(Defect & location of defect)" msgstr "" @@ -130,15 +131,13 @@ msgstr "(Emel dalam jadual penyalahguna)" #: templates/web/zurich/admin/report_edit-sdm.html:60 #: templates/web/zurich/admin/report_edit.html:88 -#, fuzzy msgid "(No name)" -msgstr "Nama anda" +msgstr "" #: templates/web/zurich/admin/report_edit-sdm.html:67 #: templates/web/zurich/admin/report_edit.html:95 -#, fuzzy msgid "(No phone number)" -msgstr "Nombor telefon anda" +msgstr "" #: templates/web/base/alert/_list.html:24 msgid "(a default distance which covers roughly 200,000 people)" @@ -146,17 +145,16 @@ msgstr "(jarak lalai mengandunging 200,000 orang secara kasar)" #. ("%s is a list of distance links, e.g. [2km] / [5km] / [10km] / [20km]") #: templates/web/base/alert/_list.html:29 -#, fuzzy msgid "(alternatively the RSS feed can be customised, within %s)" -msgstr "(manakala RSS feed disesuaikan, dalam" +msgstr "" -#: templates/web/base/report/_item.html:27 -#: templates/web/zurich/report/_item.html:21 +#: templates/web/base/report/_item.html:25 +#: templates/web/zurich/report/_item.html:19 msgid "(closed)" msgstr "(ditutup)" -#: templates/web/base/report/_item.html:25 -#: templates/web/zurich/report/_item.html:19 +#: templates/web/base/report/_item.html:23 +#: templates/web/zurich/report/_item.html:17 msgid "(fixed)" msgstr "(tetap)" @@ -164,37 +162,28 @@ msgstr "(tetap)" msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)" msgstr "(seperti graffiti, fly tipping, paving slabs rosak, atau lampu jalan)" -#: templates/web/base/report/_item.html:21 +#: templates/web/base/report/_item.html:19 msgid "(not sent to council)" msgstr "(tidak dihantar kepada majlis)" -#: templates/web/base/report/new/fill_in_details_form.html:200 #: templates/web/zurich/report/new/fill_in_details_form.html:82 msgid "(optional)" msgstr "(tidak diwajibkan)" -#: templates/web/fixmystreet/report/public_label.html:1 +#: templates/web/base/report/public_label.html:1 msgid "(public)" msgstr "" -#: templates/web/base/report/_item.html:20 +#: templates/web/base/report/_item.html:18 msgid "(sent to both)" msgstr "(hantar kepada kedua-dua)" -#: templates/web/base/report/new/fill_in_details_form.html:194 -msgid "(we never show your email address or phone number)" -msgstr "(kita tidak akan menunjukkan alamat emel atau nombor telefon anda)" - -#: templates/web/base/report/update-form.html:159 -msgid "(we never show your email)" -msgstr "(kita tidak akan menunjukkan alamat emel anda)" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:673 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 #: perllib/FixMyStreet/DB/Result/Problem.pm:410 msgid "-- Pick a category --" msgstr "-- Pilih kategori --" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:637 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:632 #: perllib/FixMyStreet/DB/Result/Problem.pm:416 msgid "-- Pick a property type --" msgstr "-- Pilih jenis harta --" @@ -216,52 +205,39 @@ msgstr "" msgid "<label>Show %s</label> <label>about %s</label>" msgstr "" -#: templates/web/base/admin/index.html:32 -#: templates/web/base/status/index.html:11 +#: templates/web/base/status/stats.html:18 #: templates/web/zurich/admin/index.html:4 msgid "<strong>%s</strong> live problems" -msgstr "<strong>%d</strong> masalah" +msgstr "<strong>%s</strong> masalah" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:39 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:2 msgid "<strong>No</strong> Let me confirm my report by email" msgstr "<strong>Tidak</strong> Benarkan aku mengesahkan laporanku dengan emel" -#: templates/web/fixmystreet/report/update-form.html:112 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:2 msgid "<strong>No</strong> Let me confirm my update by email" msgstr "<strong>Tidak</strong> Benarkan aku mengesahkan kemas kiniku dengan emel" -#: templates/web/base/auth/general.html:48 +#: templates/web/base/auth/general.html:87 #: templates/web/zurich/auth/general.html:51 msgid "<strong>No</strong> let me sign in by email" msgstr "<strong>Tidak</strong> benarkan aku log masuk dengan emel" -#: templates/web/base/report/new/fill_in_details_form.html:145 -msgid "<strong>No</strong>, let me confirm my report by email:" -msgstr "<strong>Tidak</strong>, benarkan aku mengesahkan laporanku dengan emel:" - -#: templates/web/base/report/update-form.html:118 -msgid "<strong>No</strong>, let me confirm my update by email:" -msgstr "<strong>Tidak</strong> Benarkan aku mengesahkan kemas kiniku dengan emel" - -#: templates/web/base/auth/general.html:34 -#: templates/web/base/report/new/fill_in_details_form.html:123 -#: templates/web/base/report/update-form.html:96 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:15 -#: templates/web/fixmystreet/report/update-form.html:89 +#: templates/web/base/auth/general.html:70 +#: templates/web/base/report/new/form_user_loggedout_password.html:3 +#: templates/web/base/report/update/form_user_loggedout_password.html:2 msgid "<strong>Yes</strong> I have a password" msgstr "<strong>Ya</strong> Aku ada kata laluan" -#: templates/web/base/static/about-en-gb.html:1 -#: templates/web/base/static/about-en-gb.html:3 +#: templates/web/base/about/about-en-gb.html:1 +#: templates/web/base/about/about-en-gb.html:3 msgid "About us" msgstr "Tentang kita" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:8 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:31 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:29 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:35 msgid "Action Scheduled" msgstr "Jadual tindakan" @@ -292,14 +268,13 @@ msgstr "Tambah kategori baru" msgid "Add user" msgstr "Tambah pengguna" -#: templates/web/base/my/my.html:52 +#: templates/web/base/my/my.html:56 msgid "Added %s" msgstr "%s telah ditambahi" #: templates/web/base/report/new/category_extras.html:9 -#, fuzzy msgid "Additional Information" -msgstr "Mengunggu penyederhanaan" +msgstr "" #: templates/web/base/auth/change_password.html:29 msgid "Again:" @@ -313,8 +288,7 @@ msgstr "Alert %d diciptakan untuk %s, jenis %s, parameter %s/%s" msgid "Alert %d disabled (created %s)" msgstr "Pemberitahuan %d dihenti (dibuat pada %s)" -#: templates/web/base/report/update-form.html:164 -#: templates/web/fixmystreet/report/update-form.html:150 +#: templates/web/base/report/update/form_name.html:20 msgid "Alert me to future updates" msgstr "Maklumkan aku sebarang kemas kini masa depan" @@ -324,9 +298,8 @@ msgid "All Reports" msgstr "Semua Laporan" #: templates/web/zurich/admin/stats.html:5 -#, fuzzy msgid "All Reports as CSV" -msgstr "Semua Laporan" +msgstr "" #: templates/web/base/footer.html:11 templates/web/fixmystreet/footer.html:32 #: templates/web/zurich/admin/index-dm.html:12 @@ -347,10 +320,8 @@ msgstr "Semua maklumat yang disediakan anda akan dihantar kepada" #: templates/web/base/report/new/councils_text_all.html:2 #: templates/web/base/report/new/councils_text_all.html:4 -#: templates/web/base/report/new/fill_in_details_form.html:12 -#: templates/web/base/report/new/fill_in_details_form.html:14 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:10 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:11 +#: templates/web/base/report/new/fill_in_details_form.html:10 +#: templates/web/base/report/new/fill_in_details_form.html:9 msgid "All the information you provide here will be sent to <strong>%s</strong>." msgstr "" @@ -372,6 +343,10 @@ msgstr "Tanpa Nama:" msgid "Are you a developer?" msgstr "Adakan anda developer?" +#: templates/web/base/js/translation_strings.html:52 +msgid "Are you sure you want to cancel this upload?" +msgstr "" + #: templates/web/base/admin/body-form.html:69 #: templates/web/base/admin/body.html:16 #: templates/web/zurich/admin/body-form.html:24 @@ -384,9 +359,8 @@ msgid "As this is a staging site and %s is false, reports made on this site will msgstr "" #: templates/web/zurich/admin/report_edit.html:213 -#, fuzzy msgid "Assign to competent body:" -msgstr "Ditugaskan kepada badan luaran:" +msgstr "" #: templates/web/zurich/admin/report_edit.html:173 #: templates/web/zurich/admin/stats.html:36 @@ -405,16 +379,16 @@ msgstr "Ditugaskan kepada bahagian bawah:" msgid "Assigned to %s" msgstr "Ditugaskan kepada %s" -#: templates/web/base/open311/index.html:84 +#: templates/web/base/open311/index.html:76 msgid "At most %d requests are returned in each query. The returned requests are ordered by requested_datetime, so to get all requests, do several searches with rolling start_date and end_date." msgstr "" -#: templates/web/base/open311/index.html:76 +#: templates/web/base/open311/index.html:68 msgid "At the moment only searching for and looking at reports work." msgstr "" #: perllib/FixMyStreet/DB/Result/Problem.pm:373 -#: templates/web/zurich/report/_item.html:11 +#: templates/web/zurich/report/_item.html:9 msgid "Awaiting moderation" msgstr "Mengunggu penyederhanaan" @@ -426,7 +400,7 @@ msgstr "Balik" msgid "Ban email address" msgstr "Melarang alamat emel" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1276 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1285 #: perllib/FixMyStreet/Cobrand/Zurich.pm:392 #: templates/web/base/admin/bodies.html:1 templates/web/zurich/header.html:64 msgid "Bodies" @@ -456,7 +430,7 @@ msgid "Can't see the map? <em>Skip this step</em>" msgstr "" #: templates/web/base/admin/body.html:68 -#: templates/web/base/admin/index.html:61 +#: templates/web/base/admin/index.html:54 #: templates/web/base/report/new/category.html:10 #: templates/web/base/report/new/category_wrapper.html:3 #: templates/web/zurich/admin/body.html:14 @@ -467,8 +441,8 @@ msgstr "" msgid "Category" msgstr "Kategori" -#: templates/web/base/admin/index.html:59 -#: templates/web/base/admin/index.html:67 +#: templates/web/base/admin/index.html:52 +#: templates/web/base/admin/index.html:60 msgid "Category fix rate for problems > 4 weeks old" msgstr "Kategori rata masalah diselesai > 4 minggu" @@ -481,7 +455,7 @@ msgstr "Kategori rata masalah diselesai > 4 minggu" msgid "Category:" msgstr "Kategori:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:402 +#: perllib/FixMyStreet/Script/Reports.pm:180 msgid "Category: %s" msgstr "Kategori: %s" @@ -531,7 +505,7 @@ msgid "Click here or enter as dd/mm/yyyy" msgstr "Klik sini atau masukkan sebagai dd/mm/yyyy" #: templates/web/base/around/_report_banner.html:2 -#: templates/web/base/js/translation_strings.html:50 +#: templates/web/base/js/translation_strings.html:55 msgid "Click map to report a problem" msgstr "Klik peta untuk melaporkan masalah" @@ -558,7 +532,7 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:25 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:144 -#: templates/web/fixmystreet/report/banner.html:15 +#: templates/web/base/report/banner.html:15 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:10 #: templates/web/zurich/admin/header.html:16 @@ -566,7 +540,7 @@ msgstr "" msgid "Closed" msgstr "Ditutup" -#: perllib/FixMyStreet/DB/Result/Problem.pm:794 +#: perllib/FixMyStreet/DB/Result/Problem.pm:779 msgid "Closed by council" msgstr "Ditutup oleh majlis" @@ -592,7 +566,7 @@ msgstr "Data Cobrand" msgid "Cobrand:" msgstr "Cobrand:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1283 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1292 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "Konfigurasi" @@ -605,13 +579,13 @@ msgstr "Mengkonfigurasi Endpoint" msgid "Confirm" msgstr "Sah" -#: templates/web/base/auth/token.html:1 templates/web/zurich/auth/token.html:1 +#: templates/web/base/auth/token.html:1 msgid "Confirm account" msgstr "Mengesahkan Akaun" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:33 -#: templates/web/fixmystreet/report/update-form.html:107 -msgid "Confirm by email below, providing a new password at that point. When you confirm, your password will be updated." +#: templates/web/base/report/new/form_user_loggedout_password.html:21 +#: templates/web/base/report/update/form_user_loggedout_password.html:20 +msgid "Confirm by email instead, providing a new password at that point. When you confirm, your password will be updated." msgstr "" #: templates/web/base/questionnaire/creator_fixed.html:1 @@ -641,35 +615,27 @@ msgid "Confirmed:" msgstr "Disahkan:" #. ("%s is the site name") -#: templates/web/base/faq/faq-en-gb.html:8 templates/web/base/footer.html:24 -#: templates/web/base/open311/index.html:8 -#: templates/web/base/static/privacy.html:10 -#: templates/web/fixmystreet/contact/index.html:12 -#, fuzzy +#: templates/web/base/about/_sidebar.html:6 templates/web/base/footer.html:24 msgid "Contact %s" -msgstr "Menghubungi Kita" +msgstr "" #: templates/web/base/contact/index.html:1 #: templates/web/base/contact/index.html:2 #: templates/web/base/contact/submit.html:1 -#: templates/web/fixmystreet/contact/index.html:1 -#: templates/web/fixmystreet/contact/index.html:2 msgid "Contact Us" msgstr "Menghubungi Kita" -#: templates/web/base/contact/index.html:6 -#: templates/web/fixmystreet/contact/index.html:20 +#: templates/web/base/contact/index.html:12 msgid "Contact the team" msgstr "Menghubungi pasukan" #: templates/web/zurich/admin/report_edit-sdm.html:40 #: templates/web/zurich/admin/report_edit.html:59 -#, fuzzy msgid "Coordinates:" -msgstr "Kordinat:" +msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1420 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1448 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1429 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1457 msgid "Could not find user" msgstr "Tidak dapat mencari pengguna" @@ -687,7 +653,7 @@ msgstr "Majlis" msgid "Council contacts for %s" msgstr "Hubungan Majlis untuk %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:693 +#: perllib/FixMyStreet/DB/Result/Problem.pm:681 msgid "Council ref: %s" msgstr "Rujukan majlis: %s" @@ -702,7 +668,7 @@ msgstr "Majlis:" msgid "Count" msgstr "Kiraan" -#: templates/web/base/email_sent.html:1 templates/web/zurich/email_sent.html:1 +#: templates/web/base/email_sent.html:1 msgid "Create a report" msgstr "Laporan baru" @@ -712,9 +678,8 @@ msgid "Create category" msgstr "Kategori baru" #: templates/web/zurich/admin/template_edit.html:29 -#, fuzzy msgid "Create template" -msgstr "Laporan baru" +msgstr "" #: templates/web/base/admin/problem_row.html:34 #: templates/web/zurich/admin/templates.html:10 @@ -751,7 +716,7 @@ msgstr "Papan pemuka" msgid "Dealt with by subdivision within 5 working days" msgstr "Diuruskan oleh bahagian bawah dalam 5 hari bekerja" -#: perllib/FixMyStreet/App/Controller/Admin.pm:878 +#: perllib/FixMyStreet/App/Controller/Admin.pm:877 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "" @@ -764,7 +729,7 @@ msgstr "" msgid "Deleted" msgstr "Dipadam" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:51 +#: templates/web/base/report/new/form_report.html:45 #: templates/web/zurich/admin/index-dm.html:22 #: templates/web/zurich/admin/index-sdm.html:20 #: templates/web/zurich/admin/reports.html:12 @@ -772,12 +737,11 @@ msgid "Description" msgstr "Huraian" #: templates/web/base/js/translation_strings.html:34 -#: templates/web/zurich/report/new/fill_in_details_form.html:42 +#: templates/web/zurich/report/new/fill_in_details_form.html:68 msgid "Details" msgstr "Perincian" #: templates/web/base/admin/report_edit.html:20 -#: templates/web/base/report/new/fill_in_details_form.html:62 #: templates/web/zurich/admin/report_edit-sdm.html:27 #: templates/web/zurich/admin/report_edit.html:29 #: templates/web/zurich/admin/report_edit.html:43 @@ -790,38 +754,38 @@ msgstr "Didelegasikan" #: templates/web/zurich/admin/report_edit-sdm.html:50 #: templates/web/zurich/admin/report_edit.html:69 -#, fuzzy msgid "Didn't use map" -msgstr "tidak mengguna peta" +msgstr "" #: templates/web/base/admin/edit-league.html:8 msgid "Diligency prize league table" msgstr "Jadual liga hadiah ketekunan" #. ("%s is the site name") -#: templates/web/base/auth/general.html:31 -#: templates/web/base/report/new/fill_in_details_form.html:114 -#: templates/web/base/report/update-form.html:87 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:11 -#: templates/web/fixmystreet/report/update-form.html:86 -#, fuzzy +#: templates/web/base/auth/general.html:48 +#: templates/web/base/report/new/form_user_loggedout.html:18 +#: templates/web/base/report/new/oauth_email_form.html:18 +#: templates/web/base/report/update-form.html:29 +#: templates/web/base/report/update/form_user_loggedout.html:17 msgid "Do you have a %s password?" -msgstr "Adakan anda mempunyai kata laluan FixMyStreet?" +msgstr "" #: templates/web/base/questionnaire/index.html:55 msgid "Don’t know" msgstr "Tidak tahu" -#: templates/web/fixmystreet/contact/index.html:118 +#: templates/web/base/contact/index.html:110 msgid "Don't like forms?" msgstr "" +#: templates/web/base/js/translation_strings.html:51 +msgid "Drag and drop photos here or <u>click to upload</u>" +msgstr "" + #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:14 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:32 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:30 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:36 msgid "Duplicate" msgstr "Salinan" @@ -871,7 +835,7 @@ msgstr "Editor" #: templates/web/base/admin/category_edit.html:91 #: templates/web/base/admin/flagged.html:38 #: templates/web/base/admin/users.html:16 -#: templates/web/base/auth/general.html:22 +#: templates/web/base/auth/general.html:39 #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:24 @@ -879,7 +843,7 @@ msgstr "Editor" msgid "Email" msgstr "Emel" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1396 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1405 msgid "Email added to abuse list" msgstr "Emel ditambahkan kepada senarai penyalahguna" @@ -895,7 +859,7 @@ msgstr "" msgid "Email alert deleted" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1393 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1402 msgid "Email already in abuse list" msgstr "Emel telah dalam senarai penyalahguna" @@ -903,41 +867,36 @@ msgstr "Emel telah dalam senarai penyalahguna" msgid "Email me new local problems" msgstr "Emel aku masalah tempatan baru" -#: templates/web/base/report/display.html:38 -msgid "Email me updates" -msgstr "Emel aku kemas kini" - #: templates/web/base/admin/category_edit.html:31 #: templates/web/base/admin/report_edit.html:62 #: templates/web/base/admin/update_edit.html:33 #: templates/web/base/admin/user-form.html:20 #: templates/web/base/alert/updates.html:13 -#: templates/web/base/report/display.html:42 #: templates/web/zurich/admin/body.html:47 msgid "Email:" msgstr "Emel:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:329 +#: perllib/FixMyStreet/Script/Reports.pm:108 msgid "Email: %s" msgstr "Emel: %s" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:639 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:634 msgid "Empty flat or maisonette" msgstr "Flat atau apartmen lama" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:638 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:633 msgid "Empty house or bungalow" msgstr "Rumah kosong atau banglo" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:641 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:636 msgid "Empty office or other commercial" msgstr "Pejabat kosing atau komersial lain" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:642 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:637 msgid "Empty pub or bar" msgstr "Pub kosong atau bar" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:643 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:638 msgid "Empty public building - school, hospital, etc." msgstr "Bangunan awam kosong - sekolah, hospital, lain-lain" @@ -970,7 +929,7 @@ msgstr "Endpoint" msgid "Enter a Zürich street name" msgstr "Masukkan nama jalan Zürich" -#: perllib/FixMyStreet/Cobrand/UK.pm:13 +#: perllib/FixMyStreet/Cobrand/UK.pm:14 msgid "Enter a nearby UK postcode, or street name and area" msgstr "Masukkan poskod UK terdekat, atau nama jalan dan kawasan" @@ -988,14 +947,9 @@ msgstr "Masukkan nama jalan dan kawasan terdekat" msgid "Enter a nearby street name and area, postal code or district in Delhi" msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:152 -#: templates/web/base/report/update-form.html:125 -msgid "Enter a new password:" -msgstr "Masukkan kata laluan baru" - -#: templates/web/base/auth/general.html:60 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:75 -#: templates/web/fixmystreet/report/update-form.html:123 +#: templates/web/base/auth/general.html:99 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:38 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:13 #: templates/web/zurich/auth/general.html:65 msgid "Enter a password" msgstr "Masukkan kata laluan" @@ -1005,11 +959,11 @@ msgid "Enter details of the problem" msgstr "Masukkan perincian masalah tersebut" #: templates/web/base/errors/generic.html:1 -#: templates/web/base/errors/generic.html:3 +#: templates/web/base/errors/generic.html:4 #: templates/web/base/tokens/abuse.html:1 #: templates/web/base/tokens/abuse.html:3 #: templates/web/base/tokens/error.html:1 -#: templates/web/base/tokens/error.html:3 +#: templates/web/base/tokens/error.html:5 msgid "Error" msgstr "Ralat" @@ -1022,11 +976,11 @@ msgstr "" msgid "Example postcode %s" msgstr "Contoh poskod %s" -#: templates/web/base/open311/index.html:94 +#: templates/web/base/open311/index.html:86 msgid "Examples:" msgstr "Contoh:" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:55 +#: templates/web/base/report/new/form_report.html:49 msgid "Explain what’s wrong, exactly where it is, and how long it’s been there…" msgstr "" @@ -1067,17 +1021,15 @@ msgstr "" msgid "FixMyStreet" msgstr "FixMyStreet" -#: templates/web/base/admin/index.html:61 +#: templates/web/base/admin/index.html:54 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:24 #: templates/web/base/admin/report_blocks.html:9 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:144 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:34 -#: templates/web/fixmystreet/report/banner.html:12 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:32 +#: templates/web/base/report/banner.html:12 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:38 msgid "Fixed" msgstr "Diselesai" @@ -1104,7 +1056,7 @@ msgstr "Tanda sebagai dipadam" msgid "Flag user" msgstr "Tanda pengguna" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1281 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1290 #: templates/web/base/admin/users.html:19 msgid "Flagged" msgstr "Ditanda" @@ -1135,36 +1087,31 @@ msgstr "Ikuti link kawasan pentadbiran untuk melihat laporan dalam kawasan terse msgid "For more information, see <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>." msgstr "Untuk maklumat lanjut, lihat <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>Bagaimana FixMyStreet mengguna Mapit</a>." -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:32 -#: templates/web/fixmystreet/report/update-form.html:106 +#: templates/web/base/report/new/form_user_loggedout_password.html:20 +#: templates/web/base/report/update/form_user_loggedout_password.html:19 msgid "Forgotten your password?" msgstr "Terlupai kata laluan anda?" #: perllib/FixMyStreet/Cobrand/Zurich.pm:752 -#, fuzzy msgid "Forwarded to external body" -msgstr "Ditugaskan kepada badan luaran:" +msgstr "" #: perllib/FixMyStreet/Cobrand/Zurich.pm:753 -#, fuzzy msgid "Forwarded wish to external body" -msgstr "Ditugaskan kepada badan luaran:" +msgstr "" -#: templates/web/base/faq/faq-en-gb.html:1 -#: templates/web/base/faq/faq-en-gb.html:13 -#: templates/web/base/faq/faq-en-gb.html:6 -#: templates/web/base/open311/index.html:6 -#: templates/web/base/static/privacy.html:8 -#: templates/web/fixmystreet/contact/index.html:10 +#: templates/web/base/about/_sidebar.html:4 +#: templates/web/base/about/faq-en-gb.html:1 +#: templates/web/base/about/faq-en-gb.html:5 msgid "Frequently Asked Questions" msgstr "Soalan lazim" -#: templates/web/base/open311/index.html:136 +#: templates/web/base/open311/index.html:128 msgid "GeoRSS on Google Maps" msgstr "GeoRSS atas Google Maps" +#: templates/web/base/report/display_tools.html:11 #: templates/web/fixmystreet/around/_updates.html:3 -#: templates/web/fixmystreet/report/display.html:35 msgid "Get updates" msgstr "Dapatkan kemas kini" @@ -1197,7 +1144,7 @@ msgstr "Pergi" msgid "Going to send questionnaire?" msgstr "Teruskan dengan menghantar soalan selidik?" -#: templates/web/base/admin/index.html:42 +#: templates/web/base/admin/index.html:35 msgid "Graph of problem creation by status over time" msgstr "Graf masalah dibuat dengan status dari masa ke masa" @@ -1214,7 +1161,7 @@ msgid "Have you ever reported a problem to a council before, or is this your fir msgstr "Adakan anda pernah melaporkan masalah kepada majlis, atau inikah pertama kali anda?" #: templates/web/base/footer.html:15 templates/web/fixmystreet/footer.html:38 -#: templates/web/zurich/faq/faq-de-ch.html:1 +#: templates/web/zurich/about/faq-de-ch.html:1 #: templates/web/zurich/footer.html:22 #: templates/web/zurich/nav_over_content.html:8 msgid "Help" @@ -1265,7 +1212,7 @@ msgstr "Bagaimana melaporkan masalah" msgid "How to send successful reports" msgstr "Bagaimana untuk menghantar laporan berjaya" -#: perllib/FixMyStreet/App/Controller/Admin.pm:754 +#: perllib/FixMyStreet/App/Controller/Admin.pm:752 msgid "I am afraid you cannot confirm unconfirmed reports." msgstr "Anda tidak boleh mengesahkan laporan yang belum disahkan." @@ -1283,10 +1230,6 @@ msgstr "" msgid "I'm afraid we couldn't locate your problem in the database.\n" msgstr "Masalah anda tidak dapat dijumpai dalam database.\n" -#: perllib/FixMyStreet/App/Controller/Tokens.pm:327 -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 "" - #: templates/web/base/admin/flagged.html:14 #: templates/web/base/admin/list_updates.html:6 #: templates/web/base/admin/reports.html:11 @@ -1315,16 +1258,11 @@ msgstr "" msgid "If you get some more information about the status of your problem, please come back to the site and leave an update." msgstr "" -#: templates/web/base/report/new/councils_text_none.html:2 -#: templates/web/base/report/new/councils_text_none.html:8 +#: templates/web/base/report/new/councils_text_none.html:10 +#: templates/web/base/report/new/councils_text_none.html:9 msgid "If you submit a problem here the subject and details of the problem will be public, but the problem will <strong>not</strong> be reported to the council." msgstr "" -#: templates/web/zurich/auth/token.html:19 -#: templates/web/zurich/email_sent.html:7 -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 "" - #: templates/web/base/questionnaire/index.html:68 msgid "" "If you wish to leave a public update on the problem, please enter it here\n" @@ -1368,10 +1306,8 @@ msgstr "Pilihan feed yang tak sah" #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:144 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:32 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:30 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:36 msgid "In Progress" msgstr "Dijalani" @@ -1379,7 +1315,7 @@ msgstr "Dijalani" msgid "In abuse table?" msgstr "Dalam table penyalahguna?" -#: templates/web/base/open311/index.html:88 +#: templates/web/base/open311/index.html:80 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 "" @@ -1387,7 +1323,7 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/Zurich.pm:963 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:7 -#: templates/web/fixmystreet/report/banner.html:19 +#: templates/web/base/report/banner.html:19 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:8 msgid "In progress" @@ -1422,7 +1358,7 @@ msgstr "Rujukan dalaman" msgid "Invalid agency_responsible value %s" msgstr "Nilai agency_responsible %s salah" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1201 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1210 msgid "Invalid end date" msgstr "Tarikh berakhir yang tak sah" @@ -1430,7 +1366,7 @@ msgstr "Tarikh berakhir yang tak sah" msgid "Invalid format %s specified." msgstr "Format dinyatakan %s salah" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1206 msgid "Invalid start date" msgstr "Tarikh mula yang tak sah" @@ -1438,14 +1374,12 @@ msgstr "Tarikh mula yang tak sah" #: templates/web/base/admin/report_blocks.html:5 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:143 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:31 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:29 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:35 msgid "Investigating" msgstr "Dalam siasatan" -#: templates/web/fixmystreet/contact/blurb.html:8 +#: templates/web/base/contact/blurb.html:8 msgid "It's often quickest to <a href=\"%s\">check our FAQs</a> and see if the answer is there." msgstr "" @@ -1463,11 +1397,9 @@ msgstr "" msgid "Jurisdiction unknown" msgstr "" -#: templates/web/base/auth/general.html:44 -#: templates/web/base/report/new/fill_in_details_form.html:132 -#: templates/web/base/report/update-form.html:105 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:28 -#: templates/web/fixmystreet/report/update-form.html:102 +#: templates/web/base/auth/general.html:80 +#: templates/web/base/report/new/form_user_loggedout_password.html:16 +#: templates/web/base/report/update/form_user_loggedout_password.html:15 #: templates/web/zurich/auth/general.html:40 msgid "Keep me signed in on this computer" msgstr "Teruskan log masuk aku dalam komputer ini" @@ -1525,6 +1457,7 @@ msgid "MAP" msgstr "PETA" #: templates/web/base/js/translation_strings.html:45 +#: templates/web/base/maps/google-ol.html:13 msgid "Map" msgstr "" @@ -1544,23 +1477,17 @@ msgstr "" msgid "Marked fixed/closed more than eight weeks ago" msgstr "" -#: templates/web/fixmystreet/contact/index.html:106 +#: templates/web/base/contact/index.html:98 msgid "Message" msgstr "Pesanan" #: templates/web/zurich/admin/report_edit.html:284 -#, fuzzy msgid "Message to competent body:" -msgstr "Ditugaskan kepada badan luaran:" +msgstr "" #: templates/web/zurich/admin/report_edit.html:282 -#, fuzzy msgid "Message to external body:" -msgstr "Ditugaskan kepada badan luaran:" - -#: templates/web/base/contact/index.html:97 -msgid "Message:" -msgstr "Pesanan:" +msgstr "" #: perllib/FixMyStreet/App/Controller/Open311.pm:445 msgid "Missing jurisdiction_id" @@ -1574,10 +1501,6 @@ msgstr "" msgid "Month" msgstr "Bulan" -#: templates/web/base/report/display.html:34 -msgid "More problems nearby" -msgstr "Lebih masalah terdekat" - #: templates/web/base/admin/bodies.html:21 #: templates/web/base/admin/body-form.html:18 #: templates/web/base/admin/flagged.html:16 @@ -1585,11 +1508,11 @@ msgstr "Lebih masalah terdekat" #: templates/web/base/admin/list_updates.html:7 #: templates/web/base/admin/reports.html:13 #: templates/web/base/admin/users.html:15 -#: templates/web/base/auth/general.html:50 +#: templates/web/base/auth/general.html:89 +#: templates/web/base/report/new/form_user_loggedin.html:9 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:7 +#: templates/web/base/report/update/form_name.html:4 #: templates/web/base/reports/index.html:20 -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:9 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:44 -#: templates/web/fixmystreet/report/update-form.html:138 #: templates/web/zurich/admin/body-form.html:4 #: templates/web/zurich/auth/general.html:60 #: templates/web/zurich/report/new/fill_in_details_form.html:82 @@ -1603,7 +1526,7 @@ msgstr "Nama" msgid "Name:" msgstr "Nama:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:328 +#: perllib/FixMyStreet/Script/Reports.pm:107 msgid "Name: %s" msgstr "Nama: %s" @@ -1612,29 +1535,24 @@ msgstr "Nama: %s" msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:127 +#: perllib/FixMyStreet/Cobrand/UK.pm:128 msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:434 -#: perllib/FixMyStreet/Cobrand/Default.pm:474 +#: perllib/FixMyStreet/Cobrand/Default.pm:455 +#: perllib/FixMyStreet/Cobrand/Default.pm:495 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:267 +#: perllib/FixMyStreet/Script/Alerts.pm:290 msgid "" "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n" "\n" msgstr "" -#: templates/web/zurich/email_sent.html:5 -msgid "Nearly Done! Now check your email..." -msgstr "Hampir Dilakukan! Sila periksa emel anda sekarang..." - #: templates/web/base/auth/token.html:17 templates/web/base/email_sent.html:5 -#, fuzzy msgid "Nearly done! Now check your email…" -msgstr "Hampir Dilakukan! Sila periksa emel anda sekarang..." +msgstr "" #: templates/web/base/reports/index.html:21 msgid "New <br>problems" @@ -1658,9 +1576,8 @@ msgid "New local problems on FixMyStreet" msgstr "Masalah tempatan baru dalam FixMyStreet" #: templates/web/zurich/admin/report_edit-sdm.html:117 -#, fuzzy msgid "New note to DM:" -msgstr "Nota dalaman baru:" +msgstr "" #: db/alert_types.pl:38 msgid "New problems for {{COUNCIL}} within {{WARD}} ward on FixMyStreet" @@ -1692,9 +1609,8 @@ msgstr "Negeri baru" #: templates/web/zurich/admin/template_edit.html:9 #: templates/web/zurich/admin/templates.html:26 -#, fuzzy msgid "New template" -msgstr "Negeri baru" +msgstr "" #: templates/web/base/pagination.html:13 msgid "Next" @@ -1711,8 +1627,8 @@ msgstr "Seterusnya" #: templates/web/base/admin/report_edit.html:75 #: templates/web/base/admin/update_edit.html:25 #: templates/web/base/questionnaire/creator_fixed.html:16 +#: templates/web/base/questionnaire/index.html:101 #: templates/web/base/questionnaire/index.html:53 -#: templates/web/base/questionnaire/index.html:92 msgid "No" msgstr "Tidak" @@ -1776,10 +1692,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:13 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:33 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:31 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:37 msgid "Not Responsible" msgstr "Tidak Bertanggungjawab" @@ -1787,9 +1701,8 @@ msgstr "Tidak Bertanggungjawab" #: perllib/FixMyStreet/Cobrand/Zurich.pm:937 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:13 -#, fuzzy msgid "Not contactable" -msgstr "Tidak Bertanggungjawab" +msgstr "" #: templates/web/zurich/admin/report_edit-sdm.html:108 msgid "Not for my subdivision" @@ -1819,7 +1732,7 @@ msgstr "" msgid "Note:" msgstr "ta:" -#: templates/web/base/open311/index.html:73 +#: templates/web/base/open311/index.html:65 msgid "Note: <strong>%s</strong>" msgstr "Nota: <strong>%s</strong>" @@ -1827,13 +1740,15 @@ msgstr "Nota: <strong>%s</strong>" msgid "Notes from SDM to DM" msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:113 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:10 +#: templates/web/base/report/new/form_user_loggedout.html:14 +#: templates/web/base/report/new/form_user_loggedout.html:2 +#: templates/web/base/report/new/oauth_email_form.html:17 msgid "Now to submit your report…" msgstr "" -#: templates/web/base/report/update-form.html:86 -#: templates/web/fixmystreet/report/update-form.html:85 +#: templates/web/base/report/update-form.html:28 +#: templates/web/base/report/update/form_user_loggedout.html:13 +#: templates/web/base/report/update/form_user_loggedout.html:2 msgid "Now to submit your update…" msgstr "Hantarkan kemas kini anda sekarang…" @@ -1841,11 +1756,6 @@ msgstr "Hantarkan kemas kini anda sekarang…" msgid "OK" msgstr "OK" -#: templates/web/base/report/display.html:28 -#: templates/web/base/report/update.html:17 -msgid "Offensive? Unsuitable? Tell us" -msgstr "Serangan? Tidak sesuai? Beritahu kami" - #: templates/web/base/reports/index.html:23 msgid "Old / unknown <br>problems" msgstr "" @@ -1864,7 +1774,7 @@ msgstr "Lebih tua<br>diselesai" msgid "Older <br>problems" msgstr "Lebih tua <br>masalah" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:45 +#: templates/web/base/report/new/form_report.html:15 msgid "One-line summary" msgstr "" @@ -1875,8 +1785,7 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:4 #: templates/web/base/admin/update_edit.html:28 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/report/update-form.html:30 -#: templates/web/fixmystreet/report/update-form.html:28 +#: templates/web/base/report/update/form_update.html:34 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:7 #: templates/web/zurich/admin/update_edit.html:18 @@ -1891,15 +1800,15 @@ msgstr "" msgid "Open, but not had any update in eight weeks" msgstr "" -#: templates/web/base/open311/index.html:70 +#: templates/web/base/open311/index.html:62 msgid "Open311 API for the mySociety FixMyStreet server" msgstr "API Open311 untuk pelayan FixMyStreet mySociety" -#: templates/web/base/open311/index.html:80 +#: templates/web/base/open311/index.html:72 msgid "Open311 initiative web page" msgstr "Laman web inisiatif Open311" -#: templates/web/base/open311/index.html:81 +#: templates/web/base/open311/index.html:73 msgid "Open311 specification" msgstr "Spesifikasi Open311" @@ -1911,15 +1820,15 @@ msgstr "Atau masalah dilaporkan kepada:" msgid "Or you can subscribe to an alert based upon what ward or council you’re in:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1084 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:673 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:674 -#: perllib/FixMyStreet/DB/Result/Problem.pm:570 -#: perllib/FixMyStreet/DB/Result/Problem.pm:580 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1055 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:669 +#: perllib/FixMyStreet/DB/Result/Problem.pm:558 +#: perllib/FixMyStreet/DB/Result/Problem.pm:568 +#: perllib/FixMyStreet/DB/Result/Problem.pm:578 #: perllib/FixMyStreet/DB/Result/Problem.pm:590 -#: perllib/FixMyStreet/DB/Result/Problem.pm:602 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:397 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:412 +#: perllib/FixMyStreet/Script/Reports.pm:175 +#: perllib/FixMyStreet/Script/Reports.pm:190 msgid "Other" msgstr "Lain-lain" @@ -1928,7 +1837,7 @@ msgid "Owner" msgstr "Pemilik" #: templates/web/base/errors/page_error_404_not_found.html:1 -#: templates/web/base/errors/page_error_404_not_found.html:3 +#: templates/web/base/errors/page_error_404_not_found.html:4 msgid "Page Not Found" msgstr "Laman Tidak Dijumpai" @@ -1942,16 +1851,16 @@ msgstr "Induk" msgid "Partial" msgstr "Separa" -#: templates/web/base/auth/general.html:53 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:68 -#: templates/web/fixmystreet/report/update-form.html:116 +#: templates/web/base/auth/general.html:92 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:31 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:6 #: templates/web/zurich/auth/general.html:32 #: templates/web/zurich/auth/general.html:63 msgid "Password (optional)" msgstr "Kata Laluan (tidah diwajibkan)" #: templates/web/base/auth/change_password.html:25 -#: templates/web/base/auth/general.html:36 +#: templates/web/base/auth/general.html:72 msgid "Password:" msgstr "Kata Laluan:" @@ -1963,29 +1872,29 @@ msgstr "Permalink" msgid "Phone number" msgstr "Nombor telefon" -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:26 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:62 +#: templates/web/base/report/new/form_user_loggedin.html:26 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:25 msgid "Phone number (optional)" msgstr "Nombor telefon (tidak diwajibkan)" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:306 +#: perllib/FixMyStreet/Script/Reports.pm:83 #: templates/web/base/admin/report_edit.html:63 -#: templates/web/base/report/new/fill_in_details_form.html:198 #: templates/web/zurich/admin/stats.html:39 msgid "Phone:" msgstr "Telefon:" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:66 -#: templates/web/fixmystreet/report/update-form.html:59 +#: templates/web/base/questionnaire/index.html:75 +#: templates/web/base/report/new/form_report.html:23 +#: templates/web/base/report/update/form_update.html:6 #: templates/web/zurich/admin/index-dm.html:29 #: templates/web/zurich/admin/index-sdm.html:24 #: templates/web/zurich/admin/reports.html:16 #: templates/web/zurich/admin/stats.html:37 -#: templates/web/zurich/report/new/fill_in_details_form.html:52 +#: templates/web/zurich/report/new/fill_in_details_form.html:45 msgid "Photo" msgstr "Foto" -#: perllib/FixMyStreet/App/Controller/Photo.pm:221 +#: perllib/FixMyStreet/App/Controller/Photo.pm:187 msgid "Photo is required." msgstr "" @@ -1993,13 +1902,7 @@ msgstr "" msgid "Photo required" msgstr "" -#: templates/web/base/questionnaire/index.html:80 -#: templates/web/base/report/new/fill_in_details_form.html:84 -#: templates/web/base/report/update-form.html:62 -msgid "Photo:" -msgstr "Foto:" - -#: templates/web/base/alert/list.html:26 +#: templates/web/base/alert/list.html:23 msgid "Photos of recent nearby reports" msgstr "Foto laporan terdekat baru-baru ini " @@ -2028,20 +1931,16 @@ msgstr "Sila bersopan, ringkas dan tepat." msgid "Please check the passwords and try again" msgstr "Sila periksa kata laluan dan cuba lagi" -#: templates/web/zurich/auth/token.html:16 -msgid "Please check your email" -msgstr "Sila periksa emel anda" - -#: templates/web/base/auth/general.html:10 -#: templates/web/base/auth/general.html:16 +#: templates/web/base/auth/general.html:27 +#: templates/web/base/auth/general.html:33 #: templates/web/zurich/auth/general.html:3 #: templates/web/zurich/auth/general.html:9 msgid "Please check your email address is correct" msgstr "Sila periksa sama ada alamat emel anda adalah betul" #: perllib/FixMyStreet/App/Controller/Admin.pm:343 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:883 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:948 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:878 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:943 #: perllib/FixMyStreet/DB/Result/Problem.pm:412 #: templates/web/base/js/translation_strings.html:9 msgid "Please choose a category" @@ -2055,8 +1954,7 @@ msgstr "Sila pilihkan jenis bangunan" msgid "Please correct the errors below" msgstr "" -#: templates/web/base/contact/blurb.html:2 -#: templates/web/fixmystreet/contact/blurb.html:12 +#: templates/web/base/contact/blurb.html:12 msgid "" "Please do <strong>not</strong> report problems through this form; messages go to\n" "the team behind this site, not a council. To report a problem,\n" @@ -2068,11 +1966,17 @@ msgid "Please do not be abusive — abusing your council devalues the s msgstr "" #: perllib/FixMyStreet/App/Controller/Admin.pm:346 -#: perllib/FixMyStreet/DB/Result/Comment.pm:126 +#: perllib/FixMyStreet/DB/Result/Comment.pm:125 #: templates/web/base/js/translation_strings.html:2 msgid "Please enter a message" msgstr "Sila masukkan pesanan" +#: perllib/FixMyStreet/App/Controller/Admin.pm:1091 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1146 +#, fuzzy +msgid "Please enter a name" +msgstr "Sila masukkan nama anda" + #: templates/web/base/auth/change_password.html:12 #: templates/web/base/auth/change_password.html:15 #: templates/web/base/js/translation_strings.html:19 @@ -2085,10 +1989,10 @@ msgstr "Sila masukkan kata laluan" msgid "Please enter a subject" msgstr "Sila masukkan tajuk" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1084 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1137 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1087 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1142 #: perllib/FixMyStreet/App/Controller/Admin.pm:345 -#: perllib/FixMyStreet/DB/Result/User.pm:127 +#: perllib/FixMyStreet/DB/Result/User.pm:133 #: templates/web/base/js/translation_strings.html:12 #: templates/web/base/js/translation_strings.html:16 msgid "Please enter a valid email" @@ -2105,9 +2009,9 @@ msgid "Please enter some details" msgstr "Sila masukkan perincian" #: perllib/FixMyStreet/App/Controller/Contact.pm:113 -#: perllib/FixMyStreet/DB/Result/User.pm:124 -#: templates/web/base/auth/general.html:10 -#: templates/web/base/auth/general.html:15 +#: perllib/FixMyStreet/DB/Result/User.pm:130 +#: templates/web/base/auth/general.html:27 +#: templates/web/base/auth/general.html:32 #: templates/web/base/js/translation_strings.html:11 #: templates/web/base/js/translation_strings.html:15 #: templates/web/zurich/auth/general.html:3 @@ -2115,7 +2019,7 @@ msgstr "Sila masukkan perincian" msgid "Please enter your email" msgstr "Sila masukkan emel anda" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:7 +#: templates/web/base/report/new/form_user_loggedout_email.html:7 #: templates/web/zurich/report/new/fill_in_details_form.html:80 msgid "Please enter your email address" msgstr "Sila masukkan alamat emel anda" @@ -2124,15 +2028,15 @@ msgstr "Sila masukkan alamat emel anda" msgid "Please enter your first name" msgstr "Sila masukkan nama pertama anda" -#: perllib/FixMyStreet/Cobrand/UK.pm:318 +#: perllib/FixMyStreet/Cobrand/UK.pm:319 #: templates/web/base/js/translation_strings.html:7 msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below" msgstr "Sila masukkan nama penuh anda, majlis memerlukan maklumat ini - Jika anda tidak ingin nama anda dikemukakan dalam laman, untik kota dibawah" #: perllib/FixMyStreet/App/Controller/Contact.pm:112 -#: perllib/FixMyStreet/DB/Result/Comment.pm:123 +#: perllib/FixMyStreet/DB/Result/Comment.pm:122 #: perllib/FixMyStreet/DB/Result/Problem.pm:406 -#: perllib/FixMyStreet/DB/Result/User.pm:120 +#: perllib/FixMyStreet/DB/Result/User.pm:126 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter your name" msgstr "Sila masukkan nama anda" @@ -2159,12 +2063,11 @@ msgstr "Sila <a href=\"%s\">log masuk lagi</a>, atau balik ke <a href=\"/\">hala msgid "Please fill in details of the problem below." msgstr "" -#: templates/web/zurich/report/new/fill_in_details_form.html:46 +#: templates/web/zurich/report/new/fill_in_details_form.html:72 msgid "Please fill in details of the problem." msgstr "Sila isikan perincian untuk masalah tersebut" -#: templates/web/base/report/new/fill_in_details_form.html:28 -#: templates/web/fixmystreet/report/new/sidebar.html:7 +#: templates/web/base/report/new/sidebar.html:7 #: templates/web/zurich/report/new/fill_in_details_form.html:20 msgid "Please fill in the form below with details of the problem, and describe the location as precisely as possible in the details box." msgstr "" @@ -2173,20 +2076,23 @@ msgstr "" msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "" -#: templates/web/fixmystreet/report/updates-sidebar-notes.html:4 +#: templates/web/base/report/updates-sidebar-notes.html:2 msgid "Please note that updates are not sent to the council." msgstr "" -#: templates/web/base/report/update-form.html:7 -msgid "Please note that updates are not sent to the council. If you leave your name it will be public. Your information will only be used in accordance with our <a href=\"/faq#privacy\">privacy policy</a>" +#: templates/web/base/report/new/oauth_email_form.html:4 +msgid "Please note your report has <strong>not yet been sent</strong>." msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:8 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:21 +#: templates/web/base/report/new/fill_in_details_form.html:20 #: templates/web/zurich/report/new/fill_in_details_form.html:11 msgid "Please note your report has <strong>not yet been sent</strong>. Choose a category and add further information below, then submit." msgstr "" +#: templates/web/base/report/display.html:26 +msgid "Please note your update has <strong>not yet been posted</strong>." +msgstr "" + #: templates/web/base/report/new/notes.html:1 #: templates/web/zurich/report/new/notes.html:1 msgid "Please note:" @@ -2206,9 +2112,8 @@ msgid "Please say whether you've ever reported a problem to your council before" msgstr "" #: templates/web/zurich/admin/report_edit.html:208 -#, fuzzy msgid "Please select a body." -msgstr "Pilihkan badan" +msgstr "" #: perllib/FixMyStreet/App/Controller/Alert.pm:80 msgid "Please select the feed you want" @@ -2225,6 +2130,7 @@ msgstr "" #: perllib/FixMyStreet/App/Model/PhotoSet.pm:117 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:145 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:147 +#: templates/web/base/js/translation_strings.html:53 msgid "Please upload a JPEG image only" msgstr "Sila memuat naik imej JPEG sahaja" @@ -2232,18 +2138,14 @@ msgstr "Sila memuat naik imej JPEG sahaja" msgid "Please write a message" msgstr "Sila tuliskan pesanan" -#: templates/web/fixmystreet/report/update-form.html:23 +#: templates/web/base/report/update/form_update.html:29 msgid "Please write your update here" msgstr "Sila tuliskan kemas kini anda di sini" -#: templates/web/base/contact/index.html:100 -#: templates/web/base/report/update-form.html:110 -#: templates/web/base/report/update-form.html:132 -#: templates/web/base/report/update-form.html:72 -#: templates/web/fixmystreet/contact/index.html:113 -#: templates/web/fixmystreet/report/update-form.html:124 -#: templates/web/fixmystreet/report/update-form.html:71 -#: templates/web/fixmystreet/report/update-form.html:97 +#: templates/web/base/contact/index.html:105 +#: templates/web/base/report/update-form.html:24 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:14 +#: templates/web/base/report/update/form_user_loggedout_password.html:10 msgid "Post" msgstr "Post" @@ -2271,12 +2173,9 @@ msgstr "Sebelumnya" msgid "Privacy" msgstr "" -#: templates/web/base/faq/faq-en-gb.html:7 -#: templates/web/base/open311/index.html:7 -#: templates/web/base/static/privacy.html:1 -#: templates/web/base/static/privacy.html:2 -#: templates/web/base/static/privacy.html:9 -#: templates/web/fixmystreet/contact/index.html:11 +#: templates/web/base/about/_sidebar.html:5 +#: templates/web/base/about/privacy.html:1 +#: templates/web/base/about/privacy.html:2 msgid "Privacy and cookies" msgstr "" @@ -2304,12 +2203,12 @@ msgstr "Masalah %s dipastikan" msgid "Problem %s sent to council %s" msgstr "Masalah %s dihantar kepada majlis %s" -#: templates/web/base/admin/index.html:46 +#: templates/web/base/admin/index.html:39 #: templates/web/zurich/admin/index.html:9 msgid "Problem breakdown by state" msgstr "Pecahan masalah bagi negeri" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1055 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1058 msgid "Problem marked as open." msgstr "Masalah ditanda sebagai terbukan" @@ -2325,11 +2224,11 @@ msgstr "Masalah-masalah" msgid "Problems in this area" msgstr "Masalah dalam kawasan ini" -#: templates/web/fixmystreet/report/display.html:43 +#: templates/web/base/report/display_tools.html:19 msgid "Problems nearby" msgstr "Masalah terdekat" -#: templates/web/fixmystreet/report/display.html:41 +#: templates/web/base/report/display_tools.html:17 msgid "Problems on the map" msgstr "Masalah atas peta" @@ -2341,24 +2240,23 @@ msgstr "Masalah yang dilaporkan diselesai pada FixMyStreet baru-baru ini" msgid "Problems within %.1fkm of this location" msgstr "Masalah dalam %.1fkm dalam lokasi ini" -#: perllib/FixMyStreet/Cobrand/Default.pm:642 +#: perllib/FixMyStreet/Cobrand/Default.pm:663 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:120 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:139 -#: perllib/FixMyStreet/Cobrand/UK.pm:207 +#: perllib/FixMyStreet/Cobrand/UK.pm:208 msgid "Problems within %s" msgstr "Masalah dalam %s" #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:128 -#: perllib/FixMyStreet/Cobrand/UK.pm:221 +#: perllib/FixMyStreet/Cobrand/UK.pm:222 msgid "Problems within %s ward" msgstr "Masalah dalam kawasan pentadbiran %s" #. ("First %s is the body name, second %s the site name") #: templates/web/base/reports/body.html:0 #: templates/web/base/reports/body.html:24 -#, fuzzy msgid "Problems within %s, %s" -msgstr "Masalah dalam %s" +msgstr "" #: templates/web/base/alert/_list.html:42 msgid "Problems within the boundary of:" @@ -2372,19 +2270,16 @@ msgstr "Alamat bangunan" msgid "Property type:" msgstr "Jenis bangunan:" -#: templates/web/base/report/update-form.html:3 -#: templates/web/fixmystreet/report/update-form.html:4 +#: templates/web/base/report/update-form.html:6 msgid "Provide an update" msgstr "Sediakan kemas kini" -#: templates/web/base/auth/general.html:56 +#: templates/web/base/auth/general.html:95 msgid "Providing a name and password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:156 -#: templates/web/base/report/update-form.html:129 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:71 -#: templates/web/fixmystreet/report/update-form.html:119 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:34 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:9 msgid "Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." msgstr "" @@ -2420,18 +2315,17 @@ msgstr "Soalan selidik diisikan oleh pelapor masalah" #: templates/web/base/alert/_list.html:22 #: templates/web/base/around/display_location.html:1 #: templates/web/base/around/display_location.html:3 -#: templates/web/base/report/display.html:50 +#: templates/web/base/report/display_tools.html:34 #: templates/web/base/reports/_rss.html:1 #: templates/web/fixmystreet/alert/updates.html:9 -#: templates/web/fixmystreet/report/display.html:58 msgid "RSS feed" msgstr "Feed RSS" -#: perllib/FixMyStreet/Cobrand/UK.pm:250 perllib/FixMyStreet/Cobrand/UK.pm:262 +#: perllib/FixMyStreet/Cobrand/UK.pm:251 perllib/FixMyStreet/Cobrand/UK.pm:263 msgid "RSS feed for %s" msgstr "Feed RSS untuk %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:256 perllib/FixMyStreet/Cobrand/UK.pm:268 +#: perllib/FixMyStreet/Cobrand/UK.pm:257 perllib/FixMyStreet/Cobrand/UK.pm:269 msgid "RSS feed for %s ward, %s" msgstr "Feed RSS untuk kawasan pentadbiran %s, %s" @@ -2439,11 +2333,11 @@ msgstr "Feed RSS untuk kawasan pentadbiran %s, %s" #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:163 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:173 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:181 -#: perllib/FixMyStreet/Cobrand/UK.pm:276 perllib/FixMyStreet/Cobrand/UK.pm:288 +#: perllib/FixMyStreet/Cobrand/UK.pm:277 perllib/FixMyStreet/Cobrand/UK.pm:289 msgid "RSS feed of %s" msgstr "Feed RSS untuk %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:281 perllib/FixMyStreet/Cobrand/UK.pm:293 +#: perllib/FixMyStreet/Cobrand/UK.pm:282 perllib/FixMyStreet/Cobrand/UK.pm:294 msgid "RSS feed of %s, within %s ward" msgstr "Feed RSS untuk %s, dalam kawasan pentadbiran %s" @@ -2455,15 +2349,15 @@ msgstr "Feed RSS untuk masalah berdekatan" msgid "RSS feed of problems in this %s" msgstr "Feed RSS untuk masalah dalam %s ini" -#: perllib/FixMyStreet/Cobrand/Default.pm:643 +#: perllib/FixMyStreet/Cobrand/Default.pm:664 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:121 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:138 -#: perllib/FixMyStreet/Cobrand/UK.pm:214 +#: perllib/FixMyStreet/Cobrand/UK.pm:215 msgid "RSS feed of problems within %s" msgstr "Feed RSS untuk masalah dalam %s" #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:127 -#: perllib/FixMyStreet/Cobrand/UK.pm:220 +#: perllib/FixMyStreet/Cobrand/UK.pm:221 msgid "RSS feed of problems within %s ward" msgstr "Feed RSS untuk masalah dalam kawasan pentadbiran %s" @@ -2472,25 +2366,22 @@ msgstr "Feed RSS untuk masalah dalam kawasan pentadbiran %s" msgid "RSS feed of recent local problems" msgstr "Feed RSS untuk masalah tempatan baru-baru ini" -#: templates/web/base/report/display.html:50 +#: templates/web/base/report/display_tools.html:34 #: templates/web/fixmystreet/alert/updates.html:9 -#: templates/web/fixmystreet/report/display.html:58 msgid "RSS feed of updates to this problem" msgstr "Feed RSS untuk kemas kini bagi masalah ini" #: templates/web/base/alert/updates.html:9 -#: templates/web/base/report/display.html:41 +#: templates/web/base/report/display_tools.html:36 #: templates/web/fixmystreet/alert/updates.html:14 -#: templates/web/fixmystreet/report/display.html:60 msgid "Receive email when updates are left on this problem." msgstr "Terima emel semasa kemas kini ditinggalkan bagi masalah ini" #. ("%s is the site name") #: templates/web/base/around/display_location.html:0 #: templates/web/base/around/display_location.html:33 -#, fuzzy msgid "Recent local problems, %s" -msgstr "Masalah tempatan baru-baru ini, FixMyStreet" +msgstr "" #: templates/web/base/reports/index.html:24 msgid "Recently <br>fixed" @@ -2508,16 +2399,15 @@ msgstr "" msgid "Remove flag" msgstr "" -#: templates/web/base/admin/report_edit.html:92 -#: templates/web/base/admin/update_edit.html:62 +#: templates/web/base/admin/report_edit.html:93 +#: templates/web/base/admin/update_edit.html:67 #: templates/web/zurich/admin/update_edit.html:35 msgid "Remove photo (can't be undone!)" msgstr "" #: templates/web/zurich/admin/report_edit.html:243 -#, fuzzy msgid "Reply to user:" -msgstr "edit pengguna" +msgstr "" #: templates/web/fixmystreet/header_logo.html:2 msgid "Report" @@ -2530,7 +2420,7 @@ msgstr "" msgid "Report a problem" msgstr "" -#: templates/web/fixmystreet/report/display.html:32 +#: templates/web/base/report/display_tools.html:8 msgid "Report abuse" msgstr "" @@ -2539,7 +2429,8 @@ msgid "Report on %s" msgstr "" #: templates/web/base/report/new/fill_in_details_form.html:1 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:2 +#: templates/web/base/report/new/login_success_form.html:1 +#: templates/web/base/report/new/oauth_email_form.html:1 msgid "Report your problem" msgstr "" @@ -2548,9 +2439,8 @@ msgstr "" msgid "Report, view, or discuss local problems" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:585 -#: templates/web/base/contact/index.html:50 -#: templates/web/fixmystreet/contact/index.html:65 +#: perllib/FixMyStreet/DB/Result/Problem.pm:573 +#: templates/web/base/contact/index.html:57 msgid "Reported anonymously at %s" msgstr "" @@ -2559,9 +2449,8 @@ msgstr "" msgid "Reported before" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:608 -#: templates/web/base/contact/index.html:52 -#: templates/web/fixmystreet/contact/index.html:67 +#: perllib/FixMyStreet/DB/Result/Problem.pm:596 +#: templates/web/base/contact/index.html:59 msgid "Reported by %s at %s" msgstr "" @@ -2574,27 +2463,27 @@ msgstr "" msgid "Reported in the %s category" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:581 +#: perllib/FixMyStreet/DB/Result/Problem.pm:569 msgid "Reported in the %s category anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:603 +#: perllib/FixMyStreet/DB/Result/Problem.pm:591 msgid "Reported in the %s category by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:577 +#: perllib/FixMyStreet/DB/Result/Problem.pm:565 msgid "Reported via %s anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:599 +#: perllib/FixMyStreet/DB/Result/Problem.pm:587 msgid "Reported via %s by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:573 +#: perllib/FixMyStreet/DB/Result/Problem.pm:561 msgid "Reported via %s in the %s category anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:593 +#: perllib/FixMyStreet/DB/Result/Problem.pm:581 msgid "Reported via %s in the %s category by %s at %s" msgstr "" @@ -2604,9 +2493,8 @@ msgstr "" #: templates/web/zurich/admin/report_edit-sdm.html:36 #: templates/web/zurich/admin/report_edit.html:55 -#, fuzzy msgid "Reported:" -msgstr "Semua Laporan" +msgstr "" #: templates/web/base/around/index.html:2 #: templates/web/base/js/translation_strings.html:41 @@ -2616,13 +2504,13 @@ msgstr "Semua Laporan" msgid "Reporting a problem" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1277 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1286 #: perllib/FixMyStreet/Cobrand/Zurich.pm:384 #: templates/web/zurich/header.html:60 msgid "Reports" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:327 perllib/FixMyStreet/Cobrand/UK.pm:331 +#: perllib/FixMyStreet/Cobrand/UK.pm:328 perllib/FixMyStreet/Cobrand/UK.pm:332 msgid "Reports are limited to %s characters in length. Please shorten your report" msgstr "" @@ -2659,15 +2547,17 @@ msgstr "" msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1495 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1500 -#: templates/web/base/admin/report_edit.html:88 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1508 +#: templates/web/base/admin/report_edit.html:90 +#: templates/web/base/admin/update_edit.html:64 #: templates/web/zurich/admin/report_edit.html:116 msgid "Rotate Left" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1495 -#: templates/web/base/admin/report_edit.html:89 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 +#: templates/web/base/admin/report_edit.html:91 +#: templates/web/base/admin/update_edit.html:65 #: templates/web/zurich/admin/report_edit.html:117 msgid "Rotate Right" msgstr "" @@ -2677,7 +2567,6 @@ msgid "Rotating this photo will discard unsaved changes to the report." msgstr "" #: templates/web/base/js/translation_strings.html:46 -#: templates/web/base/maps/google-ol.html:13 msgid "Satellite" msgstr "" @@ -2734,11 +2623,10 @@ msgid "Select which type of alert you’d like and click the button for an RSS f msgstr "" #: perllib/FixMyStreet/Cobrand/Zurich.pm:835 -#, fuzzy msgid "Sent report back" -msgstr "Laporan terbuka" +msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:708 +#: perllib/FixMyStreet/DB/Result/Problem.pm:696 msgid "Sent to %s %s later" msgstr "Dihantar kepada %s %s kemudian" @@ -2751,15 +2639,13 @@ msgstr "Dihantar:" msgid "Service:" msgstr "Servis:" -#: templates/web/fixmystreet/report/display.html:38 +#: templates/web/base/report/display_tools.html:14 msgid "Share" msgstr "Kongsi" -#: templates/web/base/report/new/fill_in_details_form.html:193 -#: templates/web/base/report/update-form.html:158 -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:23 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:59 -#: templates/web/fixmystreet/report/update-form.html:146 +#: templates/web/base/report/new/form_user_loggedin.html:23 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:22 +#: templates/web/base/report/update/form_name.html:15 msgid "Show my name publicly" msgstr "Tunjukkan nama aku secara umum" @@ -2771,9 +2657,9 @@ msgstr "Tunjukkan lama" msgid "Show pins" msgstr "Tunjukkan pin" +#: templates/web/base/auth/general.html:100 #: templates/web/base/auth/general.html:3 -#: templates/web/base/auth/general.html:40 -#: templates/web/base/auth/general.html:61 +#: templates/web/base/auth/general.html:76 #: templates/web/zurich/auth/general.html:18 #: templates/web/zurich/auth/general.html:35 msgid "Sign in" @@ -2800,7 +2686,7 @@ msgid "" " sent from your FixMyStreet installation." msgstr "" -#: templates/web/base/alert/index.html:42 +#: templates/web/base/alert/index.html:40 msgid "Some photos of recent reports" msgstr "" @@ -2810,7 +2696,7 @@ msgstr "" msgid "Some text to localize" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:78 +#: perllib/FixMyStreet/Cobrand/UK.pm:79 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover." msgstr "" @@ -2822,14 +2708,20 @@ msgstr "" msgid "Sorry, there has been an error confirming your problem." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:221 -#: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:37 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:216 +#: perllib/FixMyStreet/Geocode.pm:38 perllib/FixMyStreet/Geocode/Bing.pm:38 #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:56 #: perllib/FixMyStreet/Geocode/OSM.pm:48 msgid "Sorry, we could not find that location." msgstr "" -#: perllib/FixMyStreet/Geocode/Bing.pm:34 +#: templates/web/base/auth/general.html:9 +#: templates/web/base/report/display.html:21 +#: templates/web/base/report/new/fill_in_details_form.html:23 +msgid "Sorry, we could not log you in. Please fill in the form below." +msgstr "" + +#: perllib/FixMyStreet/Geocode/Bing.pm:35 #: perllib/FixMyStreet/Geocode/Google.pm:45 #: perllib/FixMyStreet/Geocode/Zurich.pm:88 msgid "Sorry, we could not parse that location. Please try again." @@ -2839,6 +2731,10 @@ msgstr "" msgid "Sorry, we couldn't save your image(s), please try again." msgstr "" +#: perllib/FixMyStreet/App/Controller/AuthSS.pm:301 +msgid "Sorry, you can not log in with Facebook. Please try again later." +msgstr "" + #: templates/web/base/admin/stats.html:64 msgid "Start Date:" msgstr "Tarikh bermula:" @@ -2847,13 +2743,12 @@ msgstr "Tarikh bermula:" #: templates/web/base/admin/flagged.html:18 #: templates/web/base/admin/list_updates.html:11 #: templates/web/base/admin/reports.html:15 -#: templates/web/fixmystreet/report/update-form.html:26 +#: templates/web/base/report/update/form_update.html:32 msgid "State" msgstr "Negeri" #: templates/web/base/admin/report_edit.html:47 #: templates/web/base/admin/update_edit.html:27 -#: templates/web/base/report/update-form.html:28 #: templates/web/zurich/admin/report_edit-sdm.html:73 #: templates/web/zurich/admin/report_edit.html:101 #: templates/web/zurich/admin/report_edit.html:155 @@ -2861,7 +2756,7 @@ msgstr "Negeri" msgid "State:" msgstr "Negeri:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1282 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1291 #: perllib/FixMyStreet/Cobrand/Zurich.pm:387 #: templates/web/base/admin/stats.html:1 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:73 @@ -2883,7 +2778,7 @@ msgstr "Masuk dibuka, melalui soalan selidik, %s" msgid "Street View" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:406 +#: perllib/FixMyStreet/Script/Reports.pm:184 msgid "Subcategory: %s" msgstr "Subkategori: %s" @@ -2891,30 +2786,25 @@ msgstr "Subkategori: %s" msgid "Subdivision/Body" msgstr "Bahagian bawah/Badan" -#: templates/web/fixmystreet/contact/index.html:98 +#: templates/web/base/contact/index.html:90 msgid "Subject" msgstr "Tajuk" #: templates/web/base/admin/report_edit.html:19 -#: templates/web/base/contact/index.html:88 -#: templates/web/base/report/new/fill_in_details_form.html:53 #: templates/web/zurich/admin/report_edit.html:39 msgid "Subject:" msgstr "Tajuk:" #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/fill_in_details_form.html:137 -#: templates/web/base/report/new/fill_in_details_form.html:159 -#: templates/web/base/report/new/fill_in_details_form.html:96 -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:36 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:23 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:76 +#: templates/web/base/report/new/form_user_loggedin.html:36 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:39 +#: templates/web/base/report/new/form_user_loggedout_password.html:11 #: templates/web/zurich/report/new/fill_in_details_form.html:96 msgid "Submit" msgstr "Hantar" -#: templates/web/base/admin/report_edit.html:95 -#: templates/web/base/admin/update_edit.html:65 +#: templates/web/base/admin/report_edit.html:101 +#: templates/web/base/admin/update_edit.html:75 #: templates/web/base/admin/user-form.html:56 #: templates/web/zurich/admin/report_edit-sdm.html:137 #: templates/web/zurich/admin/report_edit.html:268 @@ -2922,7 +2812,7 @@ msgstr "Hantar" msgid "Submit changes" msgstr "Hantar perubahan" -#: templates/web/base/questionnaire/index.html:97 +#: templates/web/base/questionnaire/index.html:106 msgid "Submit questionnaire" msgstr "Hantar soalan selidik" @@ -2938,9 +2828,8 @@ msgid "Submitted" msgstr "Dihantarkan" #: templates/web/base/alert/updates.html:17 -#: templates/web/base/report/display.html:46 +#: templates/web/base/report/display_tools.html:41 #: templates/web/fixmystreet/alert/updates.html:23 -#: templates/web/fixmystreet/report/display.html:65 msgid "Subscribe" msgstr "Melanggan" @@ -2948,7 +2837,7 @@ msgstr "Melanggan" msgid "Subscribe me to an email alert" msgstr "Langgankan pemberitahuan emel" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1275 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1284 #: perllib/FixMyStreet/Cobrand/Zurich.pm:383 #: templates/web/base/admin/bodies.html:25 #: templates/web/base/admin/index.html:1 @@ -2967,7 +2856,7 @@ msgstr "Ringkasan" msgid "Summary reports" msgstr "Laporan ringkasan" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1279 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1288 msgid "Survey" msgstr "Kajian" @@ -2981,9 +2870,8 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/Zurich.pm:394 #: templates/web/zurich/header.html:77 -#, fuzzy msgid "Templates" -msgstr "Kemas kini" +msgstr "" #: templates/web/base/admin/list_updates.html:12 #: templates/web/zurich/admin/templates.html:9 @@ -3004,7 +2892,7 @@ msgstr "Teks:" msgid "Thank you for reporting this issue!" msgstr "" -#: templates/web/base/tokens/error.html:7 +#: templates/web/base/tokens/error.html:6 msgid "Thank you for trying to confirm your update or problem. We seem to have an error ourselves though, so <a href=\"%s\">please let us know what went on</a> and we'll look into it." msgstr "" @@ -3039,23 +2927,23 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:47 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:63 -#: perllib/FixMyStreet/Cobrand/UK.pm:71 +#: perllib/FixMyStreet/Cobrand/UK.pm:72 msgid "That postcode was not recognised, sorry." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:726 +#: perllib/FixMyStreet/App/Controller/Admin.pm:724 msgid "That problem has been marked as sent." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:718 +#: perllib/FixMyStreet/App/Controller/Admin.pm:716 msgid "That problem will now be resent." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:125 +#: perllib/FixMyStreet/App/Controller/Report.pm:127 msgid "That report cannot be viewed on %s." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:119 +#: perllib/FixMyStreet/App/Controller/Report.pm:121 msgid "That report has been removed from FixMyStreet." msgstr "" @@ -3086,7 +2974,7 @@ msgid "" " If you leave this blank, <strong>send method defaults to email</strong>." msgstr "" -#: templates/web/base/open311/index.html:90 +#: templates/web/base/open311/index.html:82 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 "" @@ -3107,12 +2995,12 @@ msgstr "" msgid "The diligency prize league table shows editors' activity (who's been editing the most records)." msgstr "" -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:60 -#: perllib/FixMyStreet/App/Controller/Reports.pm:79 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:61 +#: perllib/FixMyStreet/App/Controller/Reports.pm:80 msgid "The error was: %s" msgstr "" -#: templates/web/base/open311/index.html:86 +#: templates/web/base/open311/index.html:78 msgid "The following Open311 v2 attributes are returned for each request: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code and service_name." msgstr "" @@ -3159,8 +3047,7 @@ msgstr "" msgid "The passwords do not match" msgstr "" -#: templates/web/base/errors/page_error_404_not_found.html:10 -#: templates/web/base/errors/page_error_404_not_found.html:12 +#: templates/web/base/errors/page_error_404_not_found.html:9 msgid "The requested URL '%s' was not found on this server" msgstr "" @@ -3170,12 +3057,11 @@ msgstr "Pemberitahuan yang paling mudah adalah jenis geografi kita:" #: templates/web/base/report/new/councils_extra_text.html:1 #: templates/web/base/report/new/councils_text_some.html:10 -#: templates/web/base/report/new/fill_in_details_form.html:18 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:14 +#: templates/web/base/report/new/fill_in_details_form.html:13 msgid "The summary and description will also be made public (see our <a href=\"/privacy\">privacy policy</a>)." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:315 +#: perllib/FixMyStreet/Script/Reports.pm:92 msgid "The user could not locate the problem on a map, but to see the area around the location they entered" msgstr "" @@ -3192,18 +3078,18 @@ msgstr "" msgid "There are no reports to show." msgstr "" -#: perllib/FixMyStreet/App/Controller/Reports.pm:76 +#: perllib/FixMyStreet/App/Controller/Reports.pm:77 msgid "There was a problem showing the All Reports page. Please try again later." msgstr "" #: perllib/FixMyStreet/App/Controller/Contact.pm:137 -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:59 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:60 msgid "There was a problem showing this page. Please try again later." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:769 -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:134 -#: templates/web/base/auth/general.html:26 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:764 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:138 +#: templates/web/base/auth/general.html:43 #: templates/web/zurich/auth/general.html:28 msgid "There was a problem with your email/password combination. If you cannot remember your password, or do not have one, please fill in the ‘sign in by email’ section of the form." msgstr "" @@ -3212,7 +3098,7 @@ msgstr "" msgid "There was a problem with your email/password combination. Please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:272 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:336 msgid "There was a problem with your update. Please try again." msgstr "" @@ -3220,7 +3106,7 @@ msgstr "" msgid "There were problems with your report. Please see below." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:300 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:371 msgid "There were problems with your update. Please see below." msgstr "" @@ -3234,7 +3120,7 @@ msgid "" " " msgstr "" -#: templates/web/base/open311/index.html:77 +#: templates/web/base/open311/index.html:69 msgid "This API implementation is work in progress and not yet stabilized. It will change without warnings in the future." msgstr "" @@ -3256,18 +3142,18 @@ msgid "" " A body will not receive any reports unless it covers at least one area." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:413 +#: perllib/FixMyStreet/Script/Reports.pm:191 msgid "This email has been sent to both councils covering the location of the problem, as the user did not categorise it; please ignore it if you're not the correct council to deal with the issue, or let us know what category of problem this is so we can add it to our system." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:416 +#: perllib/FixMyStreet/Script/Reports.pm:194 msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:925 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:995 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:920 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:990 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:142 -#: perllib/FixMyStreet/Cobrand/UK.pm:43 +#: perllib/FixMyStreet/Cobrand/UK.pm:44 msgid "This information is required" msgstr "" @@ -3279,56 +3165,37 @@ msgstr "" msgid "This is a summary of all reports on this site." msgstr "" -#: templates/web/zurich/auth/token.html:8 -msgid "This may be because the link is too old or already used, or the address was not copied correctly." -msgstr "" - -#: templates/web/base/report/banner.html:15 -msgid "This problem has been closed" -msgstr "Masalah ini telah ditutup" - -#: templates/web/base/report/banner.html:12 -#: templates/web/base/report/update-form.html:48 -#: templates/web/fixmystreet/report/update-form.html:46 +#: templates/web/base/report/update/form_update.html:52 msgid "This problem has been fixed" msgstr "Masalah ini telah diselesai" -#: templates/web/base/report/update-form.html:43 -#: templates/web/fixmystreet/report/update-form.html:40 +#: templates/web/base/report/update/form_update.html:46 msgid "This problem has not been fixed" msgstr "Masalah ini belum diselesai" -#: templates/web/base/report/banner.html:19 -msgid "This problem is in progress" -msgstr "Masalah ini dalam kemajuan" - -#: templates/web/base/report/banner.html:9 -msgid "This problem is old and of unknown status." -msgstr "Masalah ini lama dan dalam keadaan tidak diketahui." - #: perllib/FixMyStreet/Cobrand/Zurich.pm:168 #: perllib/FixMyStreet/Cobrand/Zurich.pm:169 #: templates/web/zurich/report/_main.html:14 msgid "This report is awaiting moderation." msgstr "Laporan ini menunggui sederhana." -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:86 +#: perllib/FixMyStreet/Script/Alerts.pm:94 msgid "This report is currently marked as closed." msgstr "Laporan ini ditanda sebagai ditutupi sekarang." -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:84 +#: perllib/FixMyStreet/Script/Alerts.pm:92 msgid "This report is currently marked as fixed." msgstr "Laporan ini ditanda sebagai diselesai sekarang." -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:88 +#: perllib/FixMyStreet/Script/Alerts.pm:96 msgid "This report is currently marked as open." msgstr "Laporan ini ditanda sebagai terbuka sekarang." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:326 +#: perllib/FixMyStreet/Script/Reports.pm:105 msgid "This report was submitted anonymously" msgstr "Laporan ini dikemukakan tanpa nama" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:308 +#: perllib/FixMyStreet/Script/Reports.pm:85 msgid "This web page also contains a photo of the problem, provided by the user." msgstr "Laman web tersebut juga mengandungi foto masalah, dibekalkan oleh pengguna." @@ -3339,7 +3206,7 @@ msgstr "Laman web tersebut juga mengandungi foto masalah, dibekalkan oleh penggu msgid "Time spent (in minutes):" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1278 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1287 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "Garis masa" @@ -3351,9 +3218,8 @@ msgid "Title" msgstr "Tajuk" #: templates/web/zurich/admin/template_edit.html:20 -#, fuzzy msgid "Title:" -msgstr "Tajuk" +msgstr "" #: templates/web/base/alert/index.html:25 msgid "To find out what local alerts we have for you, please enter your %s postcode or street name and area:" @@ -3363,11 +3229,11 @@ msgstr "" msgid "To find out what local alerts we have for you, please enter your postcode or street name and area" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:314 +#: perllib/FixMyStreet/Script/Reports.pm:91 msgid "To view a map of the precise location of this issue" msgstr "Melihat lokasi tepat atas peta bagi isu ini" -#: templates/web/base/admin/index.html:61 +#: templates/web/base/admin/index.html:54 #: templates/web/base/admin/questionnaire.html:24 #: templates/web/base/admin/stats.html:24 #: templates/web/base/admin/stats.html:43 @@ -3385,10 +3251,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:12 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:33 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:31 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:37 msgid "Unable to fix" msgstr "Tidak dapat diselesai" @@ -3401,7 +3265,7 @@ msgstr "Tidak dapat diselesai" msgid "Unconfirmed" msgstr "Belum dipastikan" -#: templates/web/fixmystreet/report/banner.html:9 +#: templates/web/base/report/banner.html:9 msgid "Unknown" msgstr "Tidak diketahui" @@ -3409,17 +3273,18 @@ msgstr "Tidak diketahui" msgid "Unknown alert type" msgstr "Jenis pemberitahuan tak diketahui" +#: perllib/FixMyStreet/App/Controller/Photo.pm:110 #: templates/web/base/js/translation_strings.html:39 msgid "Unknown error" msgstr "Ralat tidak diketahui" -#: perllib/FixMyStreet/App/Controller/Report.pm:103 -#: perllib/FixMyStreet/App/Controller/Report.pm:109 -#: perllib/FixMyStreet/App/Controller/Report.pm:112 +#: perllib/FixMyStreet/App/Controller/Report.pm:105 +#: perllib/FixMyStreet/App/Controller/Report.pm:111 +#: perllib/FixMyStreet/App/Controller/Report.pm:114 msgid "Unknown problem ID" msgstr "ID masalah tidak diketahui" -#: templates/web/fixmystreet/report/update-form.html:19 +#: templates/web/base/report/update/form_update.html:25 msgid "Update" msgstr "Kemas kini" @@ -3427,13 +3292,11 @@ msgstr "Kemas kini" msgid "Update %s created for problem %d; by %s" msgstr "Kemaskini %s dibuat untuk masalah %d; oleh %s" -#: templates/web/base/contact/index.html:21 -#: templates/web/fixmystreet/contact/index.html:36 +#: templates/web/base/contact/index.html:28 msgid "Update below added anonymously at %s" msgstr "Kemaskini di bawah ditambahkan tanpa nama pada %s" -#: templates/web/base/contact/index.html:23 -#: templates/web/fixmystreet/contact/index.html:38 +#: templates/web/base/contact/index.html:30 msgid "Update below added by %s at %s" msgstr "Kemaskini di bawah ditambah oleh %s pada %s" @@ -3442,7 +3305,7 @@ msgstr "Kemaskini di bawah ditambah oleh %s pada %s" msgid "Update body" msgstr "Kemas kini badan" -#: templates/web/base/admin/index.html:55 +#: templates/web/base/admin/index.html:48 msgid "Update breakdown by state" msgstr "Pecahan kemaskini mengikuti negeri" @@ -3467,20 +3330,16 @@ msgstr "Kemas kini masalah dibuka semula" msgid "Update statuses" msgstr "Status kemas kini" -#: templates/web/base/report/update-form.html:22 -msgid "Update:" -msgstr "Kemas kini:" - #: templates/web/zurich/admin/index-dm.html:23 #: templates/web/zurich/admin/index-sdm.html:21 #: templates/web/zurich/admin/reports.html:13 msgid "Updated" msgstr "Dikemas kinikan" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1045 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1103 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1147 -#: perllib/FixMyStreet/App/Controller/Admin.pm:822 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1048 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1108 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1156 +#: perllib/FixMyStreet/App/Controller/Admin.pm:821 #: perllib/FixMyStreet/Cobrand/Zurich.pm:771 #: perllib/FixMyStreet/Cobrand/Zurich.pm:796 #: perllib/FixMyStreet/Cobrand/Zurich.pm:866 @@ -3488,13 +3347,12 @@ msgid "Updated!" msgstr "Dikemas kinikan!" #: templates/web/base/admin/list_updates.html:2 -#: templates/web/base/report/update.html:3 -#: templates/web/fixmystreet/report/update.html:5 +#: templates/web/base/report/update.html:5 #: templates/web/zurich/report/updates.html:2 msgid "Updates" msgstr "Kemas kini" -#: perllib/FixMyStreet/DB/Result/Comment.pm:132 +#: perllib/FixMyStreet/DB/Result/Comment.pm:131 msgid "Updates are limited to %s characters in length. Please shorten your update" msgstr "" @@ -3504,12 +3362,9 @@ msgstr "Kemas kini atas {{title}}" #. ("%s is the site name") #: templates/web/base/report/display.html:0 -#: templates/web/base/report/display.html:5 -#: templates/web/fixmystreet/report/display.html:0 -#: templates/web/fixmystreet/report/display.html:9 -#, fuzzy +#: templates/web/base/report/display.html:9 msgid "Updates to this problem, %s" -msgstr "Kemas kini masalah ini, FixMyStreet" +msgstr "" #: templates/web/base/admin/body.html:182 msgid "Use the <strong>note</strong> to record details that are only displayed in the admin. Notes are not shown publicly, and are not sent to the body." @@ -3517,15 +3372,14 @@ msgstr "Gunakan <strong>nota</strong> untuk melaporkan maklumat yang hanya dipap #: templates/web/zurich/admin/report_edit-sdm.html:48 #: templates/web/zurich/admin/report_edit.html:67 -#, fuzzy msgid "Used map" -msgstr "peta diguna" +msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1452 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1461 msgid "User flag removed" msgstr "Tanda pengguna dipadam" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1424 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1433 msgid "User flagged" msgstr "Pengguna ditanda" @@ -3533,7 +3387,7 @@ msgstr "Pengguna ditanda" msgid "User search finds matches in users' names and email addresses." msgstr "Carian pengguna mencari padanan dalam nama dan alamat emel pengguna." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1280 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1289 #: perllib/FixMyStreet/Cobrand/Zurich.pm:399 #: templates/web/base/admin/flagged.html:29 #: templates/web/zurich/header.html:69 @@ -3564,7 +3418,6 @@ msgid "Viewing a location" msgstr "Melihat lokasi" #: templates/web/base/report/display.html:0 -#: templates/web/fixmystreet/report/display.html:0 msgid "Viewing a problem" msgstr "Melihat masalah" @@ -3577,25 +3430,24 @@ msgstr "Kawasan pentadbiran majlis ini" 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 "Kita mendapati lebih daripada satu bersesuaian bagi lokasi tersebut. Kita menunjukkan sehingga sepuluh bersesuaian, sila cuba dengan carian lain jika carian anda tidak didapati di sini. " -#: templates/web/zurich/auth/token.html:7 -msgid "We have not been able to confirm your account - sorry." -msgstr "Kita belum dapat mengesahkan akaun anda - maaf." - -#: templates/web/zurich/auth/token.html:17 -msgid "We have sent you an email containing a link to confirm your account." -msgstr "Kita telah menghantarkan anda emel yang mengandungi link untuk mengesahkan akaun anda." +#: templates/web/base/auth/general.html:6 +#: templates/web/base/report/display.html:27 +#: templates/web/base/report/new/oauth_email_form.html:5 +#, fuzzy +msgid "We need your email address, please give it below." +msgstr "Kita tidak akan mempaparkan alamat emel atau nombor telefon anda." -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:2 -#: templates/web/fixmystreet/report/update-form.html:77 +#: templates/web/base/report/new/form_user_loggedout_email.html:2 +#: templates/web/base/report/update/form_user_loggedout_email.html:2 msgid "We never show your email" msgstr "Kita tidak akan mempaprkan emel anda" -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:31 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:65 +#: templates/web/base/report/new/form_user_loggedin.html:31 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:28 msgid "We never show your email address or phone number." msgstr "Kita tidak akan mempaparkan alamat emel atau nombor telefon anda." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:422 +#: perllib/FixMyStreet/Script/Reports.pm:200 msgid "We realise this problem might be the responsibility of %s; however, we don't currently have any contact details for them. If you know of an appropriate contact address, please do get in touch." msgstr "Kita sedar bahawa masalah ini mungkin tanggungjawab %s; tetapi, pada masa kini kita tiada maklumat hubungan mereka. Jika anda tahu hubungan sewajanya, sila menghubungi mereka" @@ -3612,10 +3464,6 @@ msgstr "" msgid "We’re sorry to hear the problem’s not fixed. Why not try writing to your local representatives?" msgstr "" -#: templates/web/base/contact/blurb.html:8 -msgid "We'd love to hear what you think about this site. Just fill in the form, or send an email to <a href='mailto:%s'>%s</a>:" -msgstr "" - #: templates/web/base/contact/submit.html:7 msgid "We’ll get back to you as soon as we can." msgstr "" @@ -3624,7 +3472,7 @@ msgstr "" msgid "What was your experience of getting the problem fixed?" msgstr "" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:49 +#: templates/web/base/report/new/form_report.html:19 msgid "What’s the issue, and where is it?" msgstr "" @@ -3637,7 +3485,11 @@ msgstr "Bila diedit" msgid "When sent" msgstr "Bila dihantar" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:640 +#: templates/web/base/js/translation_strings.html:50 +msgid "Whoa there Testino! Three photos are enough." +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Report/New.pm:635 msgid "Whole block of empty flats" msgstr "Seluruh blok flat kosong" @@ -3652,7 +3504,7 @@ msgstr "" msgid "Wish" msgstr "" -#: templates/web/base/open311/index.html:92 +#: templates/web/base/open311/index.html:84 msgid "With request searches, it is also possible to search for agency_responsible to limit the requests to those sent to a single administration. The search term is the administration ID provided by <a href=\"%s\">MaPit</a>." msgstr "" @@ -3660,7 +3512,7 @@ msgstr "" msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"http://fixmystreet.org\">available at fixmystreet.org</a>." msgstr "" -#: templates/web/base/questionnaire/index.html:87 +#: templates/web/base/questionnaire/index.html:96 msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?" msgstr "" @@ -3669,7 +3521,6 @@ msgid "Writing your message entirely in block capitals makes it hard to read, as msgstr "" #: templates/web/base/report/new/fill_in_details_form.html:4 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:5 msgid "Wrong location? Just click again on the map." msgstr "" @@ -3692,27 +3543,24 @@ msgstr "Tahun" #: templates/web/base/admin/users.html:31 #: templates/web/base/questionnaire/creator_fixed.html:14 #: templates/web/base/questionnaire/index.html:51 -#: templates/web/base/questionnaire/index.html:90 +#: templates/web/base/questionnaire/index.html:99 msgid "Yes" msgstr "Ya" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:17 -#: templates/web/fixmystreet/report/update-form.html:91 +#: templates/web/base/report/new/form_user_loggedout_password.html:5 +#: templates/web/base/report/update/form_user_loggedout_password.html:4 msgid "Yes I have a password" msgstr "Ya aku ada kata laluan" -#: templates/web/base/contact/index.html:39 -#: templates/web/fixmystreet/contact/index.html:54 +#: templates/web/base/contact/index.html:46 msgid "You are complaining that this problem report was unnecessarily moderated:" msgstr "" -#: templates/web/base/contact/index.html:41 -#: templates/web/fixmystreet/contact/index.html:56 +#: templates/web/base/contact/index.html:48 msgid "You are reporting the following problem report for being abusive, containing personal information, or similar:" msgstr "" -#: templates/web/base/contact/index.html:15 -#: templates/web/fixmystreet/contact/index.html:30 +#: templates/web/base/contact/index.html:22 msgid "You are reporting the following update for being abusive, containing personal information, or similar:" msgstr "" @@ -3725,7 +3573,7 @@ msgstr "" msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create." msgstr "" -#: templates/web/fixmystreet/contact/index.html:121 +#: templates/web/base/contact/index.html:113 msgid "You can contact technical support on <a href='mailto:%s'>%s</a>" msgstr "" @@ -3736,8 +3584,8 @@ msgid "" " reports in the past." msgstr "" -#: templates/web/base/report/new/councils_text_none.html:10 -#: templates/web/base/report/new/councils_text_none.html:2 +#: templates/web/base/report/new/councils_text_none.html:12 +#: templates/web/base/report/new/councils_text_none.html:14 #: templates/web/base/report/new/councils_text_some.html:19 #: templates/web/base/report/new/councils_text_some.html:21 msgid "You can help us by finding a contact email address for local problems for %s and emailing it to us at <a href='mailto:%s'>%s</a>." @@ -3755,21 +3603,16 @@ msgstr "Anda menolak; sila isikan kotak di atas" msgid "You have already answered this questionnaire. If you have a question, please <a href='%s'>get in touch</a>, or <a href='%s'>view your problem</a>.\n" msgstr "" -#: templates/web/base/questionnaire/index.html:77 -#: templates/web/base/report/new/fill_in_details_form.html:75 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:73 -msgid "You have already attached a photo to this report, attaching another one will replace it." -msgstr "Anda telah melampirkan foto untuk laporan ini, lampiran yang lain akan menggantikannya." - -#: templates/web/base/report/update-form.html:59 -#: templates/web/fixmystreet/report/update-form.html:56 -msgid "You have already attached a photo to this update, attaching another one will replace it." -msgstr "Anda telah melampirkan foto untuk kemas kini ini, lampiran yang lain akan menggantikannya." - -#: templates/web/zurich/report/new/fill_in_details_form.html:61 +#: templates/web/base/report/new/form_report.html:32 +#: templates/web/zurich/report/new/fill_in_details_form.html:55 msgid "You have already attached photos to this report. Note that you can attach a maximum of 3 to this report (if you try to upload more, the oldest will be removed)." msgstr "" +#: templates/web/base/questionnaire/index.html:83 +#: templates/web/base/report/update/form_update.html:14 +msgid "You have already attached photos to this update. Note that you can attach a maximum of 3 to this update (if you try to upload more, the oldest will be removed)." +msgstr "" + #: templates/web/base/auth/sign_out.html:4 #: templates/web/zurich/auth/sign_out.html:3 msgid "You have been signed out" @@ -3784,9 +3627,8 @@ msgstr "Anda telah menunjukkan masalah pada titik atas peta yang ditanda pin hij msgid "You have successfully confirmed your email address." msgstr "Anda telah berjaya memastikan alamat emel anda." -#: templates/web/base/report/display.html:20 -#: templates/web/base/report/new/fill_in_details.html:37 -#: templates/web/fixmystreet/report/display.html:17 +#: templates/web/base/report/display.html:17 +#: templates/web/base/report/new/login_success_form.html:3 msgid "You have successfully signed in; please check and confirm your details are accurate:" msgstr "Anda telah berjaya log masuk; sila semak dan pastikan maklumat anda adalah tepat: " @@ -3818,53 +3660,42 @@ msgid "Your Reports" msgstr "Laporan Anda" #: templates/web/base/alert/_list.html:89 +#: templates/web/base/contact/index.html:83 +#: templates/web/base/report/display_tools.html:38 +#: templates/web/base/report/display_tools.html:40 +#: templates/web/base/report/new/form_user_loggedin.html:3 +#: templates/web/base/report/new/form_user_loggedout_email.html:1 +#: templates/web/base/report/update/form_user_loggedout_email.html:1 #: templates/web/fixmystreet/alert/updates.html:19 #: templates/web/fixmystreet/alert/updates.html:22 -#: templates/web/fixmystreet/contact/index.html:91 -#: templates/web/fixmystreet/report/display.html:62 -#: templates/web/fixmystreet/report/display.html:64 -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:3 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:1 -#: templates/web/fixmystreet/report/update-form.html:76 #: templates/web/zurich/report/new/fill_in_details_form.html:76 msgid "Your email" msgstr "Emel Anda" -#: templates/web/base/auth/general.html:28 -#: templates/web/fixmystreet/report/update-form.html:82 +#: templates/web/base/auth/general.html:45 +#: templates/web/base/report/update/form_user_loggedout_email.html:7 #: templates/web/zurich/auth/general.html:30 #: templates/web/zurich/auth/general.html:58 msgid "Your email address" msgstr "Alamat emel anda" -#: templates/web/base/report/new/fill_in_details_form.html:106 -#: templates/web/base/report/update-form.html:81 -msgid "Your email:" -msgstr "Emel anda:" - -#: templates/web/fixmystreet/report/updates-sidebar-notes.html:7 +#: templates/web/base/report/updates-sidebar-notes.html:3 msgid "Your information will only be used in accordance with our <a href=\"/privacy\">privacy policy</a>" msgstr "Maklumat anda akan digunakan mengikuti <a href=\"/privacy\">dasar privasi</a> kita" -#: templates/web/base/auth/general.html:51 -#: templates/web/fixmystreet/contact/index.html:84 -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:18 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:54 -#: templates/web/fixmystreet/report/update-form.html:142 +#: templates/web/base/auth/general.html:90 +#: templates/web/base/contact/index.html:76 +#: templates/web/base/report/new/form_user_loggedin.html:18 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:17 +#: templates/web/base/report/update/form_name.html:11 #: templates/web/zurich/auth/general.html:61 #: templates/web/zurich/report/new/fill_in_details_form.html:86 msgid "Your name" msgstr "Nama anda" -#: templates/web/base/contact/index.html:73 -#: templates/web/base/report/new/fill_in_details_form.html:186 -#: templates/web/base/report/update-form.html:152 -msgid "Your name:" -msgstr "Nama anda:" - -#: templates/web/base/auth/general.html:39 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:22 -#: templates/web/fixmystreet/report/update-form.html:96 +#: templates/web/base/auth/general.html:75 +#: templates/web/base/report/new/form_user_loggedout_password.html:10 +#: templates/web/base/report/update/form_user_loggedout_password.html:9 #: templates/web/zurich/auth/general.html:34 msgid "Your password" msgstr "Kata laluan anda" @@ -3873,13 +3704,14 @@ msgstr "Kata laluan anda" msgid "Your password has been changed" msgstr "Kata laluan anda telah diubahi" -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:27 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:63 +#: templates/web/base/report/new/form_user_loggedin.html:27 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:26 #: templates/web/zurich/report/new/fill_in_details_form.html:92 msgid "Your phone number" msgstr "Nombor telefon anda" #: templates/web/base/questionnaire/index.html:14 +#, fuzzy msgid "Your report" msgstr "Laporan anda" @@ -3891,23 +3723,17 @@ msgstr "Laporan anda" msgid "Your updates" msgstr "Kemas kini anda" -#: templates/web/base/contact/index.html:81 -msgid "Your email:" -msgstr "Emel anda:" - #: templates/web/base/reports/_list-filters.html:3 -#, fuzzy msgid "all reports" -msgstr "Semua laporan" +msgstr "" #: templates/web/base/admin/timeline.html:4 msgid "by %s" msgstr "dari %s" #: templates/web/base/reports/_list-filters.html:5 -#, fuzzy msgid "closed reports" -msgstr "Laporan ditutup" +msgstr "" #: templates/web/base/reports/body.html:6 #: templates/web/base/reports/body.html:7 @@ -3929,17 +3755,16 @@ msgid "edit user" msgstr "edit pengguna" #: templates/web/base/reports/_list-filters.html:6 -#, fuzzy msgid "fixed reports" -msgstr "Laporan selesai" +msgstr "" -#: templates/web/base/admin/index.html:33 +#: templates/web/base/status/stats.html:20 #: templates/web/zurich/admin/index.html:5 msgid "from %s different users" -msgstr "dari %d pengguna lain" +msgstr "dari %s pengguna lain" -#: templates/web/base/report/_item.html:17 -#: templates/web/zurich/report/_item.html:16 +#: templates/web/base/report/_item.html:15 +#: templates/web/zurich/report/_item.html:14 msgid "last updated %s" msgstr "kemaskini yang lepas %s" @@ -4031,10 +3856,8 @@ msgstr "dibuka semula" msgid "sign out" msgstr "log keluar" -#: templates/web/base/report/new/fill_in_details_form.html:12 -#: templates/web/base/report/new/fill_in_details_form.html:15 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:10 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:12 +#: templates/web/base/report/new/fill_in_details_form.html:11 +#: templates/web/base/report/new/fill_in_details_form.html:9 msgid "the local council" msgstr "majlis tempatan" @@ -4043,7 +3866,7 @@ msgstr "majlis tempatan" msgid "there is no pin shown as the user did not use the map" msgstr "pin tidak ditunjukkan sebab pengguna tidak menggunakan peta" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:398 +#: perllib/FixMyStreet/Script/Reports.pm:176 msgid "this type of local problem" msgstr "jenis masalah tempatan ini" @@ -4052,9 +3875,8 @@ msgid "today" msgstr "hari ini" #: templates/web/base/reports/_list-filters.html:4 -#, fuzzy msgid "unfixed reports" -msgstr "Laporan selesai" +msgstr "" #: templates/web/base/admin/report_edit.html:32 msgid "used map" @@ -4073,7 +3895,7 @@ msgstr "pengguna adalah pemilik masalah" msgid "ward" msgstr "kawasan pentadbiran" -#: templates/web/base/front/stats.html:17 +#: templates/web/base/front/stats.html:13 #, perl-format msgid "<big>%s</big> report recently" msgid_plural "<big>%s</big> reports recently" @@ -4097,7 +3919,7 @@ msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d minit" -#: templates/web/base/front/stats.html:29 +#: templates/web/base/front/stats.html:25 #, perl-format msgid "<big>%s</big> update on reports" msgid_plural "<big>%s</big> updates on reports" @@ -4115,13 +3937,13 @@ msgid "%d week" msgid_plural "%d weeks" msgstr[0] "%d minggu" -#: templates/web/base/front/stats.html:12 +#: templates/web/base/front/stats.html:8 #, perl-format msgid "<big>%s</big> report in past week" msgid_plural "<big>%s</big> reports in past week" msgstr[0] "<big>%s</big> laporan di minggu lepas" -#: templates/web/base/front/stats.html:23 +#: templates/web/base/front/stats.html:19 #, perl-format msgid "<big>%s</big> fixed in past month" msgid_plural "<big>%s</big> fixed in past month" @@ -4139,92 +3961,71 @@ msgid "We do <strong>not</strong> yet have details for the other council that co msgid_plural "We do <strong>not</strong> yet have details for the other councils that cover this location." msgstr[0] "Kita <strong>belum</strong> ada maklumat tentang majlis lain yang menutupi lokasi ini." -#~ msgid "(Don't worry — we'll hang on to your alert while you're checking your email.)" -#~ msgstr "(Jangan bimbang — kita akan mengantungkan alert akan sambil anda menyemak emel anda.)" - -#~ msgid "(Don't worry — we'll hang on to your problem report while you're checking your email.)" -#~ msgstr "(Jangan bimbang — kita akan mengantungkan laporan masalah anda sambil anda menyemak emel anda.)" - -#~ msgid "(Don't worry — we'll hang on to your update while you're checking your email.)" -#~ msgstr "(Jangan bimbang — kita akan mengantungkan update akan sambil anda menyemak emel anda.)" - -#~ msgid "<strong>No</strong>, I do not, let me sign in by email:" -#~ msgstr "<strong>Tidak</strong>, Aku tidak, benarkan aku log masuk dengan emel:" - -#~ msgid "Contact FixMyStreet" -#~ msgstr "Menghubungi FixMyStreet" - -#~ msgid "Do you have a FixMyBarangay password?" -#~ msgstr "Adakan anda mempunyai kata laluan FixMyBarangay?" - -#~ msgid "FixMyStreet admin:" -#~ msgstr "Admin FixMyStreet:" - -#~ msgid "If you do not, your alert will not be activated." -#~ msgstr "Jika anda tidak, pemberitahuan anda tidak akan diaktifkan." +#~ msgid "(we never show your email address or phone number)" +#~ msgstr "(kita tidak akan menunjukkan alamat emel atau nombor telefon anda)" -#~ msgid "If you do not, your problem will not be posted." -#~ msgstr "Jika anda tidak, masalah anda tidak akan dipaparkan." +#~ msgid "(we never show your email)" +#~ msgstr "(kita tidak akan menunjukkan alamat emel anda)" -#~ msgid "If you do not, your update will not be posted." -#~ msgstr "Jika anda tidak, kemas kini anda tidak akan dipaparkan." +#~ msgid "<strong>No</strong>, let me confirm my report by email:" +#~ msgstr "<strong>Tidak</strong>, benarkan aku mengesahkan laporanku dengan emel:" -#~ msgid "New local reports on reportemptyhomes.com" -#~ msgstr "Laporan tempatan baru dalam reportemptyhomes.com" +#~ msgid "<strong>No</strong>, let me confirm my update by email:" +#~ msgstr "<strong>Tidak</strong> Benarkan aku mengesahkan kemas kiniku dengan emel" -#~ msgid "New reports for {{COUNCIL}} within {{WARD}} ward on reportemptyhomes.com" -#~ msgstr "Laporan baru untuk {{COUNCIL}} dalam {{WARD}} kawasan pentadbiran dalam reportemptyhomes.com" +#~ msgid "Email me updates" +#~ msgstr "Emel aku kemas kini" -#~ msgid "New reports on reportemptyhomes.com" -#~ msgstr "Laporan baru dalam reportemptyhomes.com" +#~ msgid "Enter a new password:" +#~ msgstr "Masukkan kata laluan baru" -#~ msgid "New reports on reportemptyhomes.com near {{POSTCODE}}" -#~ msgstr "Laporan baru dekat {{POSTCODE}} dalam reportemptyhomes.com" +#~ msgid "Message:" +#~ msgstr "Pesanan:" -#~ msgid "New reports to {{COUNCIL}} on reportemptyhomes.com" -#~ msgstr "Laporan baru untuk {{COUNCIL}} dalam reportemptyhomes.com" +#~ msgid "More problems nearby" +#~ msgstr "Lebih masalah terdekat" -#~ msgid "New reports within {{NAME}}'s boundary on reportemptyhomes.com" -#~ msgstr "Laporan baru dalam sempadan {{NAME}} dalam reportemptyhomes.com" +#~ msgid "Nearly Done! Now check your email..." +#~ msgstr "Hampir Dilakukan! Sila periksa emel anda sekarang..." -#~ msgid "New update:" -#~ msgstr "Kemas kini baru:" +#~ msgid "Offensive? Unsuitable? Tell us" +#~ msgstr "Serangan? Tidak sesuai? Beritahu kami" -#~ msgid "No problems found." -#~ msgstr "Tiada masalah." +#~ msgid "Photo:" +#~ msgstr "Foto:" -#~ msgid "No problems have been reported yet." -#~ msgstr "Belum ada masalah yang dilaporkan." +#~ msgid "Please check your email" +#~ msgstr "Sila periksa emel anda" -#~ msgid "Now to submit your update… do you have a FixMyStreet password?" -#~ msgstr "Hantarkan kemas kini anda sekarang… adakan anda mempunyai kata laluan FixMyStreet?" +#~ msgid "This problem has been closed" +#~ msgstr "Masalah ini telah ditutup" -#~ msgid "Our code is open source and <a href=\"http://github.com/mysociety/fixmystreet\">available on GitHub</a>." -#~ msgstr "Sumber kode kita adalah terbuka dan <a href=\"http://github.com/mysociety/fixmystreet\">terdapat dalam GitHub</a>." +#~ msgid "This problem is in progress" +#~ msgstr "Masalah ini dalam kemajuan" -#~ msgid "Problems within %s, FixMyStreet" -#~ msgstr "Masalah dalam %s, FixMyStreet" +#~ msgid "This problem is old and of unknown status." +#~ msgstr "Masalah ini lama dan dalam keadaan tidak diketahui." -#~ msgid "Properties recently reported as put back to use on reportemptyhomes.com" -#~ msgstr "Bangunan yang dilaporkan diguna semula dalam reportemptyhomes.com baru-baru ini" +#~ msgid "Update:" +#~ msgstr "Kemas kini:" -#~ msgid "Publish the response" -#~ msgstr "Terbitkan tindak balas" +#~ msgid "We have not been able to confirm your account - sorry." +#~ msgstr "Kita belum dapat mengesahkan akaun anda - maaf." -#~ msgid "Sign in by email" -#~ msgstr "Log masuk dengan emel" +#~ msgid "We have sent you an email containing a link to confirm your account." +#~ msgstr "Kita telah menghantarkan anda emel yang mengandungi link untuk mengesahkan akaun anda." -#~ msgid "Signed in as %s" -#~ msgstr "Log masuk sebagai %s" +#~ msgid "You have already attached a photo to this report, attaching another one will replace it." +#~ msgstr "Anda telah melampirkan foto untuk laporan ini, lampiran yang lain akan menggantikannya." -#~ msgid "To <strong>report a problem</strong>, click on the map at the correct location." -#~ msgstr "Untuk <strong>melaporkan masalah</strong>, klik lokasi yang betul atas peta." +#~ msgid "You have already attached a photo to this update, attaching another one will replace it." +#~ msgstr "Anda telah melampirkan foto untuk kemas kini ini, lampiran yang lain akan menggantikannya." -#~ msgid "User" -#~ msgstr "Pengguna" +#~ msgid "Your email:" +#~ msgstr "Emel anda:" -#~ msgid "You must now click the link in the email we've just sent you." -#~ msgstr "Anda mesti mengklikkan link dalam emel yang dihantar kepada anda." +#~ msgid "Your name:" +#~ msgstr "Nama anda:" -#~ msgid "Your email address:" -#~ msgstr "Alamat emel anda:" +#~ msgid "Your email:" +#~ msgstr "Emel anda:" diff --git a/locale/my_MM.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/my_MM.UTF-8/LC_MESSAGES/FixMyStreet.po index b9480f1c3..d179c78d1 100644 --- a/locale/my_MM.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/my_MM.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -14,8 +14,8 @@ msgid "" msgstr "" "Project-Id-Version: fixmystreet\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2015-10-23 16:51+0100\n" -"PO-Revision-Date: 2015-07-31 16:31+0000\n" +"POT-Creation-Date: 2016-03-02 13:09+0000\n" +"PO-Revision-Date: 2015-10-23 16:38+0000\n" "Last-Translator: mySociety <transifex@mysociety.org>\n" "Language-Team: Burmese (Myanmar) (http://www.transifex.com/mysociety/fixmystreet/language/my_MM/)\n" "Language: my_MM\n" @@ -24,45 +24,24 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:628 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:411 +#: perllib/FixMyStreet/DB/Result/Problem.pm:616 +#: perllib/FixMyStreet/Script/Reports.pm:189 msgid " and " msgstr "á‚ွင့္" #: templates/web/base/report/new/councils_text_all.html:2 -#: templates/web/base/report/new/councils_text_none.html:11 -#: templates/web/base/report/new/councils_text_none.html:2 +#: templates/web/base/report/new/councils_text_none.html:12 +#: templates/web/base/report/new/councils_text_none.html:15 #: templates/web/base/report/new/councils_text_some.html:19 #: templates/web/base/report/new/councils_text_some.html:22 #: templates/web/base/report/new/councils_text_some.html:5 msgid " or " msgstr "သá€á€¯á‚”မဟုá€á€¹" -#: templates/web/base/admin/index.html:35 -#: templates/web/base/status/index.html:13 -msgid "%s confirmed alerts, %s unconfirmed" -msgstr "%d အá€á€Šá€¹á€»á€•á€³á€»á€á€„္းသá€á€á€±á€•á€¸á€á€ºá€€á€¹ %dအá€á€Šá€¹á€™á€»á€•á€³á€›á€±á€žá€¸" - -#: templates/web/base/admin/index.html:37 -#: templates/web/base/status/index.html:16 -#: templates/web/zurich/admin/index.html:6 -msgid "%s council contacts – %s confirmed, %s unconfirmed" -msgstr "%ေကာင္စီအဆက္အသြယ္ – %d အá€á€Šá€¹á€»á€•á€³á€»á€•á€®á€¸á€»á€•á€® %dအá€á€Šá€¹á€™á€»á€•á€³á€›á€±á€žá€¸" - #: templates/web/base/admin/edit-league.html:12 msgid "%d edits by %s" msgstr "%s မွ %d ကá€á€¯á€»á€•á€„္ဆင္á€á€²á€·á€žá€Šá€¹" -#: templates/web/base/admin/index.html:34 -#: templates/web/base/status/index.html:12 -msgid "%s live updates" -msgstr "%d á€á€á€¯á€€á€¹á€›á€á€¯á€€á€¹á€¡á€žá€…္ရယူျá€á€„္:" - -#: templates/web/base/admin/index.html:36 -#: templates/web/base/status/index.html:14 -msgid "%s questionnaires sent – %s answered (%s%%)" -msgstr "%d စစ်á€á€™á€ºá€¸á€™á€±á€¸á€á€½á€”်းလွှာပá€á€¯á€·á€•á€¼á€®á€¸ – %d အဖြေ (%s%%)" - #: templates/web/base/pagination.html:10 msgid "%d to %d of %d" msgstr "%d မွ %d á %d သá€á€¯á‚”" @@ -77,25 +56,45 @@ msgstr "အက်ဥ္းá€á€ºá€³á€•á€¹ အစီရင္á€á€¶á€…ာမ်ဠmsgid "%s admin:" msgstr "" +#: templates/web/base/status/stats.html:26 +#, fuzzy +msgid "%s bodies" +msgstr "စာကá€á€¯á€šá€¹á€™á€ºá€¬á€¸" + +#: templates/web/base/status/stats.html:24 +msgid "%s confirmed alerts, %s unconfirmed" +msgstr "%s အá€á€Šá€¹á€»á€•á€³á€»á€á€„္းသá€á€á€±á€•á€¸á€á€ºá€€á€¹ %sအá€á€Šá€¹á€™á€»á€•á€³á€›á€±á€žá€¸" + +#: templates/web/base/status/stats.html:27 +#: templates/web/zurich/admin/index.html:6 +msgid "%s council contacts – %s confirmed, %s unconfirmed" +msgstr "%ေကာင္စီအဆက္အသြယ္ – %s အá€á€Šá€¹á€»á€•á€³á€»á€•á€®á€¸á€»á€•á€® %sအá€á€Šá€¹á€™á€»á€•á€³á€›á€±á€žá€¸" + #. ("%s is the site name") #: templates/web/base/alert/index.html:7 -#, fuzzy msgid "" "%s has a variety of RSS feeds and email alerts for local\n" "problems, including alerts for all problems within a particular ward, or all\n" "problems within a certain distance of a particular location." -msgstr "FixMyStreet á€á€¼á€„္ သီးျá€á€¬á€¸ အုပ္á€á€ºá€³á€•á€¹á€±á€›á€¸á€Œá€¬á€” သá€á€¯á‚”မဟုá€á€¹ ေကာင္စီá€á€…္á€á€¯á€¡á€á€¼á€„္းရá€á€½ ျပႆနာမ်ားအá€á€¼á€€á€¹ သá€á€á€±á€•á€¸á€á€ºá€€á€¹á€™á€ºá€¬á€¸á‚ွင့္ á€á€…္ဦးá€á€ºá€„္းစီá á€á€á€€á€ºá€±á€žá€á€ºá€¬á€žá€Šá€¹á€· á€á€Šá€¹á€±á€”ရာ အကြာအေá€á€¸ အá€á€¼á€„္းရá€á€½ ျပႆနာအားလံုးá€á€á€¯á‚” အပါအá€á€„္ ျပည္á€á€¼á€„္း ျပႆနာမ်ား အá€á€¼á€€á€¹ ကြဲျပားျá€á€¬á€¸á€”ားေသာ RSS feed မ်ားá‚ွင့္ အီးေမးလ္ သá€á€á€±á€•á€¸á€á€ºá€€á€¹á€™á€ºá€¬á€¸ ရá€á€½á€žá€Šá€¹á‹" +msgstr "" #. ("%s is the site name") #: templates/web/base/alert/index.html:11 -#, fuzzy msgid "" "%s has a variety of RSS feeds and email alerts for local problems, including\n" "alerts for all problems within a particular ward or council, or all problems\n" "within a certain distance of a particular location." -msgstr "FixMyStreet á€á€¼á€„္ သီးျá€á€¬á€¸ အုပ္á€á€ºá€³á€•á€¹á€±á€›á€¸á€Œá€¬á€” သá€á€¯á‚”မဟုá€á€¹ ေကာင္စီá€á€…္á€á€¯á€¡á€á€¼á€„္းရá€á€½ ျပႆနာမ်ားအá€á€¼á€€á€¹ သá€á€á€±á€•á€¸á€á€ºá€€á€¹á€™á€ºá€¬á€¸á‚ွင့္ á€á€…္ဦးá€á€ºá€„္းစီá á€á€á€€á€ºá€±á€žá€á€ºá€¬á€žá€Šá€¹á€· á€á€Šá€¹á€±á€”ရာ အကြာအေá€á€¸ အá€á€¼á€„္းရá€á€½ ျပႆနာအားလံုးá€á€á€¯á‚” အပါအá€á€„္ ျပည္á€á€¼á€„္း ျပႆနာမ်ား အá€á€¼á€€á€¹ ကြဲျပားျá€á€¬á€¸á€”ားေသာ RSS feed မ်ားá‚ွင့္ အီးေမးလ္ သá€á€á€±á€•á€¸á€á€ºá€€á€¹á€™á€ºá€¬á€¸ ရá€á€½á€žá€Šá€¹á‹" +msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:695 +#: templates/web/base/status/stats.html:23 +msgid "%s live updates" +msgstr "%s á€á€á€¯á€€á€¹á€›á€á€¯á€€á€¹á€¡á€žá€…္ရယူျá€á€„္:" + +#: templates/web/base/status/stats.html:25 +msgid "%s questionnaires sent – %s answered (%s%%)" +msgstr "%s စစ်á€á€™á€ºá€¸á€™á€±á€¸á€á€½á€”်းလွှာပá€á€¯á€·á€•á€¼á€®á€¸ – %s အဖြေ (%s%%)" + +#: perllib/FixMyStreet/DB/Result/Problem.pm:683 msgid "%s ref: %s" msgstr "" @@ -110,15 +109,15 @@ msgid "" "for the county council." msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:255 perllib/FixMyStreet/Cobrand/UK.pm:267 +#: perllib/FixMyStreet/Cobrand/UK.pm:256 perllib/FixMyStreet/Cobrand/UK.pm:268 msgid "%s ward, %s" msgstr "%sရပ္ကြက္አ%s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:564 +#: perllib/FixMyStreet/DB/Result/Problem.pm:552 msgid "%s, reported at %s" msgstr "%s သá€á€„္းပá€á€¯á‚”သည္မွာ %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:282 perllib/FixMyStreet/Cobrand/UK.pm:294 +#: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295 msgid "%s, within %s ward" msgstr "%sአ%s ရပ္ကြက္အá€á€¼á€„္း" @@ -126,7 +125,7 @@ msgstr "%sአ%s ရပ္ကြက္အá€á€¼á€„္း" msgid "© <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors" msgstr "" -#: templates/web/zurich/report/new/fill_in_details_form.html:53 +#: templates/web/zurich/report/new/fill_in_details_form.html:46 msgid "(Defect & location of defect)" msgstr "" @@ -137,15 +136,13 @@ msgstr "(ရá€á€¯á€„္းစá€á€¯á€„္းစြာေျပာသည့္ဠ#: templates/web/zurich/admin/report_edit-sdm.html:60 #: templates/web/zurich/admin/report_edit.html:88 -#, fuzzy msgid "(No name)" -msgstr "သင့္အမည္" +msgstr "" #: templates/web/zurich/admin/report_edit-sdm.html:67 #: templates/web/zurich/admin/report_edit.html:95 -#, fuzzy msgid "(No phone number)" -msgstr "သင္á ဖုန္းနံပါá€á€¹" +msgstr "" #: templates/web/base/alert/_list.html:24 msgid "(a default distance which covers roughly 200,000 people)" @@ -153,17 +150,16 @@ msgstr "(လူအေယာက္ á‚á€á€ á€á€á€ ကá€á€¯á€¡á¾á€€á€™á€¹á€ #. ("%s is a list of distance links, e.g. [2km] / [5km] / [10km] / [20km]") #: templates/web/base/alert/_list.html:29 -#, fuzzy msgid "(alternatively the RSS feed can be customised, within %s)" -msgstr "(ေျပာင္းျပန္အားျဖင့္ RSS Feed ကá€á€¯á€»á€•á€³á€»á€•á€„္á‚á€á€¯á€„္ျပီးአအေá€á€¬á€¡á€á€¼á€„္း" +msgstr "" -#: templates/web/base/report/_item.html:27 -#: templates/web/zurich/report/_item.html:21 +#: templates/web/base/report/_item.html:25 +#: templates/web/zurich/report/_item.html:19 msgid "(closed)" msgstr "(ပá€á€á€¹á€‘ားသည္)" -#: templates/web/base/report/_item.html:25 -#: templates/web/zurich/report/_item.html:19 +#: templates/web/base/report/_item.html:23 +#: templates/web/zurich/report/_item.html:17 msgid "(fixed)" msgstr "(ျပင္ျပီးျပီ)" @@ -171,37 +167,28 @@ msgstr "(ျပင္ျပီးျပီ)" msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)" msgstr "(ဂရပ္ဖီá€á€®áŠ စည္းကမ္းမဲ့ အမá€á‚ˆá€¹á€€á€¹á€…ြန္႔ပစ္ျá€á€„္းአလမ္းေဘးပလက္ေဖာင္းအုá€á€¹á€á€²á€™á€ºá€¬á€¸á€€á€ºá€á€³á€¸á€•á€²á€·á€™á‚ˆ သá€á€¯á‚”မဟုá€á€¹ လမ္းမီးမလာျá€á€„္းကဲ့သá€á€¯á‚”)" -#: templates/web/base/report/_item.html:21 +#: templates/web/base/report/_item.html:19 msgid "(not sent to council)" msgstr "(ေကာင္စီသá€á€¯á‚”မပá€á€¯á‚”ပါ)" -#: templates/web/base/report/new/fill_in_details_form.html:200 #: templates/web/zurich/report/new/fill_in_details_form.html:82 msgid "(optional)" msgstr "(ေရြးá€á€ºá€šá€¹á‚á€á€¯á€„္á€á€¼á€„့္)" -#: templates/web/fixmystreet/report/public_label.html:1 +#: templates/web/base/report/public_label.html:1 msgid "(public)" msgstr "" -#: templates/web/base/report/_item.html:20 +#: templates/web/base/report/_item.html:18 msgid "(sent to both)" msgstr "(á‚ွစ္á€á€¯á€œá€¶á€¯á€¸á€žá€á€¯á‚”ပá€á€¯á‚”မည္)" -#: templates/web/base/report/new/fill_in_details_form.html:194 -msgid "(we never show your email address or phone number)" -msgstr "(သင္áအီးေမလ္လá€á€•á€¹á€…ာ သá€á€¯á‚”မဟုá€á€¹ ဖုန္းနံပါá€á€¹á€€á€á€¯á€€á½á€¼á‚္ုပ္á€á€á€¯á‚”မွ ဘယ္ေá€á€¬á€·á€™á€½á€™á€±á€–ာ္ျပပါ)" - -#: templates/web/base/report/update-form.html:159 -msgid "(we never show your email)" -msgstr "(သင္áအီးေမးလ္ကá€á€¯á€€á½á€¼á‚္ုပ္á€á€á€¯á‚”မွဘယ္ေá€á€¬á€·á€™á€½á€™á€±á€–ာ္ျပပါ)" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:673 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 #: perllib/FixMyStreet/DB/Result/Problem.pm:410 msgid "-- Pick a category --" msgstr "-- ေá€á€«á€„္းစဥ္á€á€…္á€á€¯á€±á€›á€¼á€¸á€•á€« --" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:637 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:632 #: perllib/FixMyStreet/DB/Result/Problem.pm:416 msgid "-- Pick a property type --" msgstr "-- ပစá¥á€Šá€¹á€¸á€¡á€™á€ºá€á€³á€¸á€¡á€…ားကá€á€¯á€±á€›á€¼á€¸á€•á€« --" @@ -220,52 +207,39 @@ msgstr "" msgid "<label>Show %s</label> <label>about %s</label>" msgstr "" -#: templates/web/base/admin/index.html:32 -#: templates/web/base/status/index.html:11 +#: templates/web/base/status/stats.html:18 #: templates/web/zurich/admin/index.html:4 msgid "<strong>%s</strong> live problems" -msgstr "<strong> %d </strong>ဘá€á€»á€•á‚†á€”ာမ်ား" +msgstr "<strong> %s </strong>ဘá€á€»á€•á‚†á€”ာမ်ား" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:39 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:2 msgid "<strong>No</strong> Let me confirm my report by email" msgstr "<strong>မဟုá€á€¹á€•á€«</strong> ကá½á€¼á‚္ုပ္áအစီရင္á€á€¶á€…ာကá€á€¯á€¡á€®á€¸á€±á€™á€¸á€œá€¹á€»á€–င့္အá€á€Šá€¹á€»á€•á€³á€™á€Šá€¹" -#: templates/web/fixmystreet/report/update-form.html:112 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:2 msgid "<strong>No</strong> Let me confirm my update by email" msgstr "<strong>မဟုá€á€¹á€•á€«</strong> ကá½á€¼á‚္ုပ္áအသစ္မြမ္းမံျá€á€„္းကá€á€¯á€¡á€®á€¸á€±á€™á€¸á€œá€¹á€»á€–င့္အá€á€Šá€¹á€»á€•á€³á€™á€Šá€¹" -#: templates/web/base/auth/general.html:48 +#: templates/web/base/auth/general.html:87 #: templates/web/zurich/auth/general.html:51 msgid "<strong>No</strong> let me sign in by email" msgstr "<strong>မဟုá€á€¹á€•á€«</strong> အီးေမးလ္ျဖင့္á€á€„္မည္" -#: templates/web/base/report/new/fill_in_details_form.html:145 -msgid "<strong>No</strong>, let me confirm my report by email:" -msgstr "<strong>မဟုá€á€¹á€•á€«</strong>ကá½á€¼á‚္ုပ္áအစီရင္á€á€¶á€…ာကá€á€¯á€¡á€®á€¸á€±á€™á€¸á€œá€¹á€»á€–င့္အá€á€Šá€¹á€»á€•á€³á€™á€Šá€¹ -" - -#: templates/web/base/report/update-form.html:118 -msgid "<strong>No</strong>, let me confirm my update by email:" -msgstr "<strong>မဟုá€á€¹á€•á€«</strong>ကá½á€¼á‚္ုပ္áအသစ္မြမ္းမံျá€á€„္းကá€á€¯á€¡á€®á€¸á€±á€™á€œá€¹á€»á€–င့္အá€á€Šá€¹á€»á€•á€³á€™á€Šá€¹ -" - -#: templates/web/base/auth/general.html:34 -#: templates/web/base/report/new/fill_in_details_form.html:123 -#: templates/web/base/report/update-form.html:96 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:15 -#: templates/web/fixmystreet/report/update-form.html:89 +#: templates/web/base/auth/general.html:70 +#: templates/web/base/report/new/form_user_loggedout_password.html:3 +#: templates/web/base/report/update/form_user_loggedout_password.html:2 msgid "<strong>Yes</strong> I have a password" msgstr "<strong>ဟုá€á€¹á€€á€²á€·</strong> ကá½á€¼á‚္ုပ္á€á€¼á€„္စကားá€á€½á€€á€¹á€á€…္á€á€¯á€›á€½á€á€žá€Šá€¹" -#: templates/web/base/static/about-en-gb.html:1 -#: templates/web/base/static/about-en-gb.html:3 +#: templates/web/base/about/about-en-gb.html:1 +#: templates/web/base/about/about-en-gb.html:3 msgid "About us" msgstr "ကá½á€¼á‚္ုပ္á€á€á€¯á‚”အေá¾á€€á€¬á€„္း" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:8 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:31 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:29 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:35 msgid "Action Scheduled" msgstr "လုပ္ေဆာင္မႈကá€á€¯á€¡á€á€ºá€á€”္ဇယားျဖင့္ျပဳလုပ္ျပီး" @@ -296,14 +270,13 @@ msgstr "ေá€á€«á€„္းစဥ္အသစ္ထည့္မည္" msgid "Add user" msgstr "အသံုးျပဳသူထည့္မည္" -#: templates/web/base/my/my.html:52 +#: templates/web/base/my/my.html:56 msgid "Added %s" msgstr "%sကá€á€¯á€‘ည့္ျပီးျပီ" #: templates/web/base/report/new/category_extras.html:9 -#, fuzzy msgid "Additional Information" -msgstr "စá€á€…စ္ျá€á€„္းကá€á€¯á€±á€…ာင့္ဆá€á€¯á€„္းေနá€á€¯á€”္း" +msgstr "" #: templates/web/base/auth/change_password.html:29 msgid "Again:" @@ -317,8 +290,7 @@ msgstr "Parameters %s/%s አအမ်á€á€³á€¸á€¡á€…ား %s አ%s အá€á€¼á msgid "Alert %d disabled (created %s)" msgstr "အသá€á€±á€•á€¸á€á€ºá€€á€¹%dကá€á€¯á€•á€á€á€¹á€‘ားသည္(%sကá€á€¯á€–န္á€á€®á€¸á€»á€•á€®á€¸)" -#: templates/web/base/report/update-form.html:164 -#: templates/web/fixmystreet/report/update-form.html:150 +#: templates/web/base/report/update/form_name.html:20 msgid "Alert me to future updates" msgstr "ေနာက္ထပ္အသစ္မ်ားအá€á€¼á€€á€¹á€œá€Šá€¹á€¸á€€á½á€¼á‚္ုပ္ကá€á€¯á€¡á€žá€á€±á€•á€¸á€™á€Šá€¹" @@ -328,9 +300,8 @@ msgid "All Reports" msgstr "အစီရင္á€á€¶á€…ာအားလံုး" #: templates/web/zurich/admin/stats.html:5 -#, fuzzy msgid "All Reports as CSV" -msgstr "အစီရင္á€á€¶á€…ာအားလံုး" +msgstr "" #: templates/web/base/footer.html:11 templates/web/fixmystreet/footer.html:32 #: templates/web/zurich/admin/index-dm.html:12 @@ -351,10 +322,8 @@ msgstr "သင္ေထာက္ပံ့ေသာအá€á€ºá€€á€¹á€¡á€œá€€á€¹á€™ #: templates/web/base/report/new/councils_text_all.html:2 #: templates/web/base/report/new/councils_text_all.html:4 -#: templates/web/base/report/new/fill_in_details_form.html:12 -#: templates/web/base/report/new/fill_in_details_form.html:14 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:10 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:11 +#: templates/web/base/report/new/fill_in_details_form.html:10 +#: templates/web/base/report/new/fill_in_details_form.html:9 msgid "All the information you provide here will be sent to <strong>%s</strong>." msgstr "သင္ေထာက္ပံ့ေသာအá€á€ºá€€á€¹á€¡á€œá€€á€¹á€™á€ºá€¬á€¸á€¡á€¬á€¸á€œá€¶á€¯á€¸á€€á€á€¯á€•á€á€¯á‚”မည့္ေနရာမွာ <strong>%s</strong>သá€á€¯á‚”ပá€á€¯á‚”မည္" @@ -376,6 +345,10 @@ msgstr "အမည္မသá€-" msgid "Are you a developer?" msgstr "Developer လား" +#: templates/web/base/js/translation_strings.html:52 +msgid "Are you sure you want to cancel this upload?" +msgstr "" + #: templates/web/base/admin/body-form.html:69 #: templates/web/base/admin/body.html:16 #: templates/web/zurich/admin/body-form.html:24 @@ -388,9 +361,8 @@ msgid "As this is a staging site and %s is false, reports made on this site will msgstr "" #: templates/web/zurich/admin/report_edit.html:213 -#, fuzzy msgid "Assign to competent body:" -msgstr "အပá€á€¯á€…ာကá€á€¯á€šá€¹á€€á€á€¯á€žá€á€¹á€™á€½á€á€¹á€™á€Šá€¹ -" +msgstr "" #: templates/web/zurich/admin/report_edit.html:173 #: templates/web/zurich/admin/stats.html:36 @@ -409,16 +381,16 @@ msgstr "အေသးစá€á€á€¹á€”ယ္နမá€á€á€¹á€žá€á€¯á‚”သá€á€¹á€™ msgid "Assigned to %s" msgstr "%s သá€á€¯á‚” လြဲအပ္မည္" -#: templates/web/base/open311/index.html:84 +#: templates/web/base/open311/index.html:76 msgid "At most %d requests are returned in each query. The returned requests are ordered by requested_datetime, so to get all requests, do several searches with rolling start_date and end_date." msgstr "" -#: templates/web/base/open311/index.html:76 +#: templates/web/base/open311/index.html:68 msgid "At the moment only searching for and looking at reports work." msgstr "အá€á€¯á€±á€œá€¬á€±á€œá€¬á€†á€šá€¹ အစီရင္á€á€¶á€…ာမ်ားကá€á€¯ ရွာေဖြျá€á€„္းáŠá¾á€€á€Šá€¹á€·á€›á‚ˆá€»á€á€„္းသာျပဳလုပ္á‚á€á€¯á€„္ေသးသည္" #: perllib/FixMyStreet/DB/Result/Problem.pm:373 -#: templates/web/zurich/report/_item.html:11 +#: templates/web/zurich/report/_item.html:9 msgid "Awaiting moderation" msgstr "စá€á€…စ္ျá€á€„္းကá€á€¯á€±á€…ာင့္ဆá€á€¯á€„္းေနá€á€¯á€”္း" @@ -430,7 +402,7 @@ msgstr "ေနာက္သá€á€¯á‚”" msgid "Ban email address" msgstr "အီးေမးလ္လá€á€•á€¹á€…ာကá€á€¯á€•á€á€¹á€á€¹á€•á€„္မည္" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1276 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1285 #: perllib/FixMyStreet/Cobrand/Zurich.pm:392 #: templates/web/base/admin/bodies.html:1 templates/web/zurich/header.html:64 msgid "Bodies" @@ -460,7 +432,7 @@ msgid "Can't see the map? <em>Skip this step</em>" msgstr "ေျမပံုကá€á€¯á€™á€»á€™á€„္ဘူးလားዠ<em>ဒီအဆင့္ကá€á€¯á€±á€€á€ºá€¬á€¹á€™á€Šá€¹</em> " #: templates/web/base/admin/body.html:68 -#: templates/web/base/admin/index.html:61 +#: templates/web/base/admin/index.html:54 #: templates/web/base/report/new/category.html:10 #: templates/web/base/report/new/category_wrapper.html:3 #: templates/web/zurich/admin/body.html:14 @@ -471,8 +443,8 @@ msgstr "ေျမပံုကá€á€¯á€™á€»á€™á€„္ဘူးလားዠ<em>ဒá msgid "Category" msgstr "အမ်á€á€³á€¸á€¡á€…ား" -#: templates/web/base/admin/index.html:59 -#: templates/web/base/admin/index.html:67 +#: templates/web/base/admin/index.html:52 +#: templates/web/base/admin/index.html:60 msgid "Category fix rate for problems > 4 weeks old" msgstr "" @@ -485,7 +457,7 @@ msgstr "" msgid "Category:" msgstr "အမ်á€á€³á€¸á€¡á€…ား -" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:402 +#: perllib/FixMyStreet/Script/Reports.pm:180 msgid "Category: %s" msgstr "အမ်á€á€³á€¸á€¡á€…ား - %s" @@ -535,7 +507,7 @@ msgid "Click here or enter as dd/mm/yyyy" msgstr "ဒီေနရာကá€á€¯á‚ွá€á€•á€¹á€•á€« သá€á€¯á‚” dd/mm/yyyy ကဲ့သá€á€¯á‚”ရá€á€¯á€€á€¹á€‘ည့္ပါ" #: templates/web/base/around/_report_banner.html:2 -#: templates/web/base/js/translation_strings.html:50 +#: templates/web/base/js/translation_strings.html:55 msgid "Click map to report a problem" msgstr "ျပႆနာá€á€…္á€á€¯á€€á€á€¯á€¡á€…ီရင္á€á€¶á€…ာá€á€„္ရင္ေျမပံုကá€á€¯á‚ွá€á€•á€¹á€•á€«" @@ -562,7 +534,7 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:25 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:144 -#: templates/web/fixmystreet/report/banner.html:15 +#: templates/web/base/report/banner.html:15 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:10 #: templates/web/zurich/admin/header.html:16 @@ -570,7 +542,7 @@ msgstr "" msgid "Closed" msgstr "ပá€á€á€¹á€™á€Šá€¹" -#: perllib/FixMyStreet/DB/Result/Problem.pm:794 +#: perllib/FixMyStreet/DB/Result/Problem.pm:779 msgid "Closed by council" msgstr "ေကာင္စီမွပá€á€á€¹á€‘ားသည္" @@ -596,7 +568,7 @@ msgstr "" msgid "Cobrand:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1283 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1292 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "အစီအစဥ္သá€á€¹á€™á€½á€á€¹á€»á€á€„္း" @@ -609,13 +581,13 @@ msgstr "" msgid "Confirm" msgstr "အá€á€Šá€¹á€»á€•á€³á€™á€Šá€¹" -#: templates/web/base/auth/token.html:1 templates/web/zurich/auth/token.html:1 +#: templates/web/base/auth/token.html:1 msgid "Confirm account" msgstr "အေကာင့္ကá€á€¯á€¡á€á€Šá€¹á€»á€•á€³á€™á€Šá€¹" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:33 -#: templates/web/fixmystreet/report/update-form.html:107 -msgid "Confirm by email below, providing a new password at that point. When you confirm, your password will be updated." +#: templates/web/base/report/new/form_user_loggedout_password.html:21 +#: templates/web/base/report/update/form_user_loggedout_password.html:20 +msgid "Confirm by email instead, providing a new password at that point. When you confirm, your password will be updated." msgstr "" #: templates/web/base/questionnaire/creator_fixed.html:1 @@ -645,24 +617,17 @@ msgid "Confirmed:" msgstr "အá€á€Šá€¹á€»á€•á€³á€á€²á€·á€á€ºá€á€”္-" #. ("%s is the site name") -#: templates/web/base/faq/faq-en-gb.html:8 templates/web/base/footer.html:24 -#: templates/web/base/open311/index.html:8 -#: templates/web/base/static/privacy.html:10 -#: templates/web/fixmystreet/contact/index.html:12 -#, fuzzy +#: templates/web/base/about/_sidebar.html:6 templates/web/base/footer.html:24 msgid "Contact %s" -msgstr "ကá½á€¼á‚္ုပ္á€á€á€¯á‚”á‚ွင့္ဆက္သြယ္ပါ" +msgstr "" #: templates/web/base/contact/index.html:1 #: templates/web/base/contact/index.html:2 #: templates/web/base/contact/submit.html:1 -#: templates/web/fixmystreet/contact/index.html:1 -#: templates/web/fixmystreet/contact/index.html:2 msgid "Contact Us" msgstr "ကá½á€¼á‚္ုပ္á€á€á€¯á‚”á‚ွင့္ဆက္သြယ္ပါ" -#: templates/web/base/contact/index.html:6 -#: templates/web/fixmystreet/contact/index.html:20 +#: templates/web/base/contact/index.html:12 msgid "Contact the team" msgstr "အဖြဲ႕á‚ွင့္ဆက္သြယ္ပါ" @@ -671,8 +636,8 @@ msgstr "အဖြဲ႕á‚ွင့္ဆက္သြယ္ပါ" msgid "Coordinates:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1420 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1448 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1429 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1457 msgid "Could not find user" msgstr "အသံုးျပဳသူရွာမေá€á€¼á‚•á€•á€«" @@ -690,7 +655,7 @@ msgstr "ေကာင္စီ" msgid "Council contacts for %s" msgstr "%sအá€á€¼á€€á€¹á€±á€€á€¬á€„္စီအဆက္အသြယ္" -#: perllib/FixMyStreet/DB/Result/Problem.pm:693 +#: perllib/FixMyStreet/DB/Result/Problem.pm:681 msgid "Council ref: %s" msgstr "ေကာင္စီ ရည္ညႊန္းá€á€ºá€€á€¹" @@ -705,7 +670,7 @@ msgstr "ေကာင္စီ-" msgid "Count" msgstr "အေရအá€á€¼á€€á€¹" -#: templates/web/base/email_sent.html:1 templates/web/zurich/email_sent.html:1 +#: templates/web/base/email_sent.html:1 msgid "Create a report" msgstr "အစီရင္á€á€¶á€…ာá€á€…္á€á€¯á€€á€á€¯á€–န္á€á€®á€¸á€™á€Šá€¹" @@ -715,9 +680,8 @@ msgid "Create category" msgstr "အမ်á€á€³á€¸á€¡á€…ားဖန္á€á€®á€¸á€™á€Šá€¹" #: templates/web/zurich/admin/template_edit.html:29 -#, fuzzy msgid "Create template" -msgstr "အစီရင္á€á€¶á€…ာá€á€…္á€á€¯á€€á€á€¯á€–န္á€á€®á€¸á€™á€Šá€¹" +msgstr "" #: templates/web/base/admin/problem_row.html:34 #: templates/web/zurich/admin/templates.html:10 @@ -754,7 +718,7 @@ msgstr "" msgid "Dealt with by subdivision within 5 working days" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:878 +#: perllib/FixMyStreet/App/Controller/Admin.pm:877 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "" @@ -767,7 +731,7 @@ msgstr "" msgid "Deleted" msgstr "ဖ်က္ျပီးျပီ" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:51 +#: templates/web/base/report/new/form_report.html:45 #: templates/web/zurich/admin/index-dm.html:22 #: templates/web/zurich/admin/index-sdm.html:20 #: templates/web/zurich/admin/reports.html:12 @@ -775,12 +739,11 @@ msgid "Description" msgstr "ေဖာ္ျပá€á€ºá€€á€¹" #: templates/web/base/js/translation_strings.html:34 -#: templates/web/zurich/report/new/fill_in_details_form.html:42 +#: templates/web/zurich/report/new/fill_in_details_form.html:68 msgid "Details" msgstr "အေသးစá€á€á€¹á€¡á€á€ºá€€á€¹á€¡á€œá€€á€¹" #: templates/web/base/admin/report_edit.html:20 -#: templates/web/base/report/new/fill_in_details_form.html:62 #: templates/web/zurich/admin/report_edit-sdm.html:27 #: templates/web/zurich/admin/report_edit.html:29 #: templates/web/zurich/admin/report_edit.html:43 @@ -793,38 +756,38 @@ msgstr "á€á€…္ေယာက္မွá€á€…္ေယာက္လက္လြဲ #: templates/web/zurich/admin/report_edit-sdm.html:50 #: templates/web/zurich/admin/report_edit.html:69 -#, fuzzy msgid "Didn't use map" -msgstr "ေျမပံု မသံုးá€á€²á€·á€•á€«" +msgstr "" #: templates/web/base/admin/edit-league.html:8 msgid "Diligency prize league table" msgstr "" #. ("%s is the site name") -#: templates/web/base/auth/general.html:31 -#: templates/web/base/report/new/fill_in_details_form.html:114 -#: templates/web/base/report/update-form.html:87 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:11 -#: templates/web/fixmystreet/report/update-form.html:86 -#, fuzzy +#: templates/web/base/auth/general.html:48 +#: templates/web/base/report/new/form_user_loggedout.html:18 +#: templates/web/base/report/new/oauth_email_form.html:18 +#: templates/web/base/report/update-form.html:29 +#: templates/web/base/report/update/form_user_loggedout.html:17 msgid "Do you have a %s password?" -msgstr "FixMyStreet áစကားá€á€½á€€á€¹á€›á€½á€á€•á€«á€žá€œá€¬á€¸á‹" +msgstr "" #: templates/web/base/questionnaire/index.html:55 msgid "Don’t know" msgstr "" -#: templates/web/fixmystreet/contact/index.html:118 +#: templates/web/base/contact/index.html:110 msgid "Don't like forms?" msgstr "" +#: templates/web/base/js/translation_strings.html:51 +msgid "Drag and drop photos here or <u>click to upload</u>" +msgstr "" + #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:14 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:32 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:30 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:36 msgid "Duplicate" msgstr "á‚ွစ္á€á€¯á€»á€•á€³á€œá€¯á€•á€¹á€™á€Šá€¹" @@ -874,7 +837,7 @@ msgstr "အယ္ဒီá€á€¬" #: templates/web/base/admin/category_edit.html:91 #: templates/web/base/admin/flagged.html:38 #: templates/web/base/admin/users.html:16 -#: templates/web/base/auth/general.html:22 +#: templates/web/base/auth/general.html:39 #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:24 @@ -882,7 +845,7 @@ msgstr "အယ္ဒီá€á€¬" msgid "Email" msgstr "အီးေမးလ္" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1396 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1405 msgid "Email added to abuse list" msgstr "အလြဲသံုးသည့္စာရင္းထဲá€á€¼á€„္အီးေမးလ္ထည့္ျပီး" @@ -898,7 +861,7 @@ msgstr "" msgid "Email alert deleted" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1393 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1402 msgid "Email already in abuse list" msgstr "အလြဲသံုးသည့္စာရင္းထဲá€á€¼á€„္အီးေမးလ္ရွá€á€»á€•á€®á€¸" @@ -906,41 +869,36 @@ msgstr "အလြဲသံုးသည့္စာရင္းထဲá€á€¼á€„္ msgid "Email me new local problems" msgstr "ေဒသအá€á€¼á€„္းျပႆနာအသစ္မ်ားကá€á€¯á€€á½á€¼á‚္ုပ္ထံသá€á€¯á‚”အီးေမးလ္ပá€á€¯á‚”မည္" -#: templates/web/base/report/display.html:38 -msgid "Email me updates" -msgstr "အသစ္မြမ္းမံမႈမ်ားကá€á€¯á€€á½á€¼á‚္ုပ္ထံသá€á€¯á‚•á€¡á€®á€¸á€±á€™á€¸á€œá€¹á€•á€á€¯á‚”မည္" - #: templates/web/base/admin/category_edit.html:31 #: templates/web/base/admin/report_edit.html:62 #: templates/web/base/admin/update_edit.html:33 #: templates/web/base/admin/user-form.html:20 #: templates/web/base/alert/updates.html:13 -#: templates/web/base/report/display.html:42 #: templates/web/zurich/admin/body.html:47 msgid "Email:" msgstr "အီးေမးလ္-" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:329 +#: perllib/FixMyStreet/Script/Reports.pm:108 msgid "Email: %s" msgstr "အီးေမးလ္ -%s" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:639 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:634 msgid "Empty flat or maisonette" msgstr "á€á€á€¯á€€á€¹á€á€”္းအလြá€á€¹á€žá€á€¯á‚”မဟုá€á€¹ maisonette" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:638 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:633 msgid "Empty house or bungalow" msgstr "အá€á€™á€¹á€¡á€œá€¼á€á€¹á€žá€á€¯á‚”မဟုá€á€¹á€˜á€”္ဂလá€á€¯á€¡á€œá€¼á€á€¹" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:641 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:636 msgid "Empty office or other commercial" msgstr "ရံုးအလြá€á€¹á€žá€á€¯á‚”မဟုá€á€¹á€á€»á€á€¬á€¸á€…ီးပြားေရးအလြá€á€¹" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:642 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:637 msgid "Empty pub or bar" msgstr "အလြá€á€¹á€¡á€›á€€á€¹á€†á€á€¯á€„္သá€á€¯á‚”မဟုá€á€¹á€˜á€¬á€¸" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:643 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:638 msgid "Empty public building - school, hospital, etc." msgstr "အမ်ားျပည္သူá‚ွင့္ဆá€á€¯á€„္ေသာá€á€á€¯á€€á€¹á€¡á€œá€¼á€á€¹-ေက်ာင္းáŠá€±á€†á€¸á€›á€¶á€¯á€…သည္ျဖင့္.." @@ -973,7 +931,7 @@ msgstr "ျပီးဆံုးမွá€á€¹-" msgid "Enter a Zürich street name" msgstr "လမ္းနာမည္ ျဖည့္စြက္ပါ" -#: perllib/FixMyStreet/Cobrand/UK.pm:13 +#: perllib/FixMyStreet/Cobrand/UK.pm:14 msgid "Enter a nearby UK postcode, or street name and area" msgstr "ယူေကအနီးနားရွဠစာá€á€á€¯á€€á€¹á€”ံပါá€á€¹áŠá€žá€á€¯á‚”မဟုá€á€¹á€œá€™á€¹á€¸á€¡á€™á€Šá€¹á‚ွင့္ဧရá€á€šá€¬á€›á€á€¯á€€á€¹á€‘ည့္ပါ" @@ -991,14 +949,9 @@ msgstr "အနီးနားရွá€á€œá€™á€¹á€¸á€¡á€™á€Šá€¹á‚ွင့္ဧ msgid "Enter a nearby street name and area, postal code or district in Delhi" msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:152 -#: templates/web/base/report/update-form.html:125 -msgid "Enter a new password:" -msgstr "စကားá€á€½á€€á€¹á€¡á€žá€…္á€á€…္á€á€¯á€›á€á€¯á€€á€¹á€‘ည့္ပါ-" - -#: templates/web/base/auth/general.html:60 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:75 -#: templates/web/fixmystreet/report/update-form.html:123 +#: templates/web/base/auth/general.html:99 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:38 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:13 #: templates/web/zurich/auth/general.html:65 msgid "Enter a password" msgstr "စကားá€á€½á€€á€¹á€›á€á€¯á€€á€¹á€‘ည့္ပါ" @@ -1008,11 +961,11 @@ msgid "Enter details of the problem" msgstr "ျပႆနာáအေသးစá€á€á€¹á€¡á€á€ºá€€á€¹á€¡á€œá€€á€¹á€™á€ºá€¬á€¸á€€á€á€¯á€›á€á€¯á€€á€¹á€‘ည့္ပါ" #: templates/web/base/errors/generic.html:1 -#: templates/web/base/errors/generic.html:3 +#: templates/web/base/errors/generic.html:4 #: templates/web/base/tokens/abuse.html:1 #: templates/web/base/tokens/abuse.html:3 #: templates/web/base/tokens/error.html:1 -#: templates/web/base/tokens/error.html:3 +#: templates/web/base/tokens/error.html:5 msgid "Error" msgstr "အမွားအယြင္း" @@ -1025,11 +978,11 @@ msgstr "" msgid "Example postcode %s" msgstr "နမူနာစာá€á€á€¯á€€á€¹á€±á€žá€á±á€¬á€”ံပါá€á€¹ %s" -#: templates/web/base/open311/index.html:94 +#: templates/web/base/open311/index.html:86 msgid "Examples:" msgstr "နမူနာမ်ား -" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:55 +#: templates/web/base/report/new/form_report.html:49 msgid "Explain what’s wrong, exactly where it is, and how long it’s been there…" msgstr "" @@ -1070,17 +1023,15 @@ msgstr "" msgid "FixMyStreet" msgstr "ကá½á€¼á‚ု္ပ္လမ္းကá€á€¯á€»á€•á€„္ေပးပါ" -#: templates/web/base/admin/index.html:61 +#: templates/web/base/admin/index.html:54 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:24 #: templates/web/base/admin/report_blocks.html:9 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:144 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:34 -#: templates/web/fixmystreet/report/banner.html:12 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:32 +#: templates/web/base/report/banner.html:12 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:38 msgid "Fixed" msgstr "ျပင္ျပီးျပီ" @@ -1107,7 +1058,7 @@ msgstr "ဖ်က္ျပီးျပီဟုသá€á€¹á€™á€½á€á€¹á€™á€Šá€¹" msgid "Flag user" msgstr "သá€á€¹á€™á€½á€á€¹á€žá€Šá€¹á€·á€¡á€žá€¶á€¯á€¸á€»á€•á€³á€žá€°" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1281 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1290 #: templates/web/base/admin/users.html:19 msgid "Flagged" msgstr "" @@ -1138,36 +1089,31 @@ msgstr "ရပ္ကြက္ထဲမွအစီရင္á€á€¶á€…ာမ်ာ msgid "For more information, see <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>." msgstr "" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:32 -#: templates/web/fixmystreet/report/update-form.html:106 +#: templates/web/base/report/new/form_user_loggedout_password.html:20 +#: templates/web/base/report/update/form_user_loggedout_password.html:19 msgid "Forgotten your password?" msgstr "သင္áစကားá€á€½á€€á€¹á€±á€™á€·á€žá€¼á€¬á€¸á€»á€•á€®á€œá€¬á€¸á‹" #: perllib/FixMyStreet/Cobrand/Zurich.pm:752 -#, fuzzy msgid "Forwarded to external body" -msgstr "အပá€á€¯á€…ာကá€á€¯á€šá€¹á€€á€á€¯á€žá€á€¹á€™á€½á€á€¹á€™á€Šá€¹ -" +msgstr "" #: perllib/FixMyStreet/Cobrand/Zurich.pm:753 -#, fuzzy msgid "Forwarded wish to external body" -msgstr "အပá€á€¯á€…ာကá€á€¯á€šá€¹á€€á€á€¯á€žá€á€¹á€™á€½á€á€¹á€™á€Šá€¹ -" +msgstr "" -#: templates/web/base/faq/faq-en-gb.html:1 -#: templates/web/base/faq/faq-en-gb.html:13 -#: templates/web/base/faq/faq-en-gb.html:6 -#: templates/web/base/open311/index.html:6 -#: templates/web/base/static/privacy.html:8 -#: templates/web/fixmystreet/contact/index.html:10 +#: templates/web/base/about/_sidebar.html:4 +#: templates/web/base/about/faq-en-gb.html:1 +#: templates/web/base/about/faq-en-gb.html:5 msgid "Frequently Asked Questions" msgstr "မá¾á€€á€¬á€á€á€±á€™á€¸á€±á€žá€¬á€±á€™á€¸á€á€¼á€”္းမ်ား" -#: templates/web/base/open311/index.html:136 +#: templates/web/base/open311/index.html:128 msgid "GeoRSS on Google Maps" msgstr "Google Maps ေပášá€€ GeoRSS" +#: templates/web/base/report/display_tools.html:11 #: templates/web/fixmystreet/around/_updates.html:3 -#: templates/web/fixmystreet/report/display.html:35 msgid "Get updates" msgstr "မြမ္းမံထားေသာအသစ္မ်ားရယူရန္" @@ -1200,7 +1146,7 @@ msgstr "သြားမည္" msgid "Going to send questionnaire?" msgstr "စစ္á€á€™á€¹á€¸á€€á€á€¯á€•á€á€¯á‚”ေá€á€¬á€·á€™á€½á€¬á€œá€¬á€¸á‹" -#: templates/web/base/admin/index.html:42 +#: templates/web/base/admin/index.html:35 msgid "Graph of problem creation by status over time" msgstr "" @@ -1217,7 +1163,7 @@ msgid "Have you ever reported a problem to a council before, or is this your fir msgstr "ယá€á€„္က ေကာင္စီထံ ျပႆနာမ်ား အစီရင္á€á€¶á€–ူးသလားዠသá€á€¯á‚”မဟုá€á€¹ ဒါက ပထမဦးဆံုး အႀကá€á€™á€¹á€œá€¬á€¸?" #: templates/web/base/footer.html:15 templates/web/fixmystreet/footer.html:38 -#: templates/web/zurich/faq/faq-de-ch.html:1 +#: templates/web/zurich/about/faq-de-ch.html:1 #: templates/web/zurich/footer.html:22 #: templates/web/zurich/nav_over_content.html:8 msgid "Help" @@ -1268,7 +1214,7 @@ msgstr "ျပႆနာကá€á€¯á€˜á€šá€¹á€œá€á€¯á€¡á€…ီရင္á€á€¶á€…ာ msgid "How to send successful reports" msgstr "ေကာင္းမြန္ေသာအစီရင္á€á€¶á€…ာကá€á€¯á€˜á€šá€¹á€œá€á€¯á€•á€á€¯á‚”မလဲ" -#: perllib/FixMyStreet/App/Controller/Admin.pm:754 +#: perllib/FixMyStreet/App/Controller/Admin.pm:752 msgid "I am afraid you cannot confirm unconfirmed reports." msgstr "အá€á€Šá€¹á€™á€»á€•á€³á€›á€±á€žá€¸á€±á€žá€¬á€¡á€…ီရင္á€á€¶á€…ာကá€á€¯á€žá€„္အá€á€Šá€¹á€™á€»á€•á€³á€›á€±á€žá€¸á€•á€«" @@ -1286,10 +1232,6 @@ msgstr "" msgid "I'm afraid we couldn't locate your problem in the database.\n" msgstr "" -#: perllib/FixMyStreet/App/Controller/Tokens.pm:327 -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 "" - #: templates/web/base/admin/flagged.html:14 #: templates/web/base/admin/list_updates.html:6 #: templates/web/base/admin/reports.html:11 @@ -1318,16 +1260,11 @@ msgstr "" msgid "If you get some more information about the status of your problem, please come back to the site and leave an update." msgstr "" -#: templates/web/base/report/new/councils_text_none.html:2 -#: templates/web/base/report/new/councils_text_none.html:8 +#: templates/web/base/report/new/councils_text_none.html:10 +#: templates/web/base/report/new/councils_text_none.html:9 msgid "If you submit a problem here the subject and details of the problem will be public, but the problem will <strong>not</strong> be reported to the council." msgstr "ျပႆနာ á€á€…္á€á€¯á€€á€á€¯ ဤေနရာá€á€¼á€„္ á€á€„္သြင္းပါက ျပႆနာá အေသးစá€á€á€¹ အá€á€ºá€€á€¹á€¡á€œá€€á€¹á€€á€á€¯ အမ်ားျပည္သူ ျမင္ေá€á€¼á‚•á‚á€á€¯á€„္သည္ዠသá€á€¯á‚”ေသာ္ ျပႆနာကá€á€¯ ေကာင္စီထံ အစီရင္á€á€¶á€™á€Šá€¹ မဟုá€á€¹á€•á€«á‹" -#: templates/web/zurich/auth/token.html:19 -#: templates/web/zurich/email_sent.html:7 -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 "" - #: templates/web/base/questionnaire/index.html:68 msgid "" "If you wish to leave a public update on the problem, please enter it here\n" @@ -1371,10 +1308,8 @@ msgstr "á€á€›á€¬á€¸á€™á€á€„္ေသာအá€á€¯á€„္ဒီ" #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:144 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:32 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:30 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:36 msgid "In Progress" msgstr "လုပ္ေဆာင္ေနဆဲ" @@ -1382,7 +1317,7 @@ msgstr "လုပ္ေဆာင္ေနဆဲ" msgid "In abuse table?" msgstr "" -#: templates/web/base/open311/index.html:88 +#: templates/web/base/open311/index.html:80 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 "" @@ -1390,7 +1325,7 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/Zurich.pm:963 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:7 -#: templates/web/fixmystreet/report/banner.html:19 +#: templates/web/base/report/banner.html:19 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:8 msgid "In progress" @@ -1425,7 +1360,7 @@ msgstr "" msgid "Invalid agency_responsible value %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1201 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1210 msgid "Invalid end date" msgstr "ေနာက္ဆံုးေန႔မမွန္ကန္ပါ" @@ -1433,7 +1368,7 @@ msgstr "ေနာက္ဆံုးေန႔မမွန္ကန္ပါ" msgid "Invalid format %s specified." msgstr "ပံုစံ %s သည္မမွန္ကန္ပါ" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1206 msgid "Invalid start date" msgstr "စမည့္ရက္မမွန္ကန္ပါ" @@ -1441,14 +1376,12 @@ msgstr "စမည့္ရက္မမွန္ကန္ပါ" #: templates/web/base/admin/report_blocks.html:5 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:143 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:31 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:29 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:35 msgid "Investigating" msgstr "စံုစမ္းစစ္ေဆးေနဆဲ" -#: templates/web/fixmystreet/contact/blurb.html:8 +#: templates/web/base/contact/blurb.html:8 msgid "It's often quickest to <a href=\"%s\">check our FAQs</a> and see if the answer is there." msgstr "" @@ -1466,11 +1399,9 @@ msgstr "" msgid "Jurisdiction unknown" msgstr "" -#: templates/web/base/auth/general.html:44 -#: templates/web/base/report/new/fill_in_details_form.html:132 -#: templates/web/base/report/update-form.html:105 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:28 -#: templates/web/fixmystreet/report/update-form.html:102 +#: templates/web/base/auth/general.html:80 +#: templates/web/base/report/new/form_user_loggedout_password.html:16 +#: templates/web/base/report/update/form_user_loggedout_password.html:15 #: templates/web/zurich/auth/general.html:40 msgid "Keep me signed in on this computer" msgstr "ဒီကြန္ျပဴá€á€¬á€™á€½á€¬á€á€„္ေနေအာင္ျပဳလုပ္မည္" @@ -1528,6 +1459,7 @@ msgid "MAP" msgstr "ေျမပံု" #: templates/web/base/js/translation_strings.html:45 +#: templates/web/base/maps/google-ol.html:13 msgid "Map" msgstr "" @@ -1547,23 +1479,17 @@ msgstr "" msgid "Marked fixed/closed more than eight weeks ago" msgstr "" -#: templates/web/fixmystreet/contact/index.html:106 +#: templates/web/base/contact/index.html:98 msgid "Message" msgstr "စာ" #: templates/web/zurich/admin/report_edit.html:284 -#, fuzzy msgid "Message to competent body:" -msgstr "အပá€á€¯á€…ာကá€á€¯á€šá€¹á€€á€á€¯á€žá€á€¹á€™á€½á€á€¹á€™á€Šá€¹ -" +msgstr "" #: templates/web/zurich/admin/report_edit.html:282 -#, fuzzy msgid "Message to external body:" -msgstr "အပá€á€¯á€…ာကá€á€¯á€šá€¹á€€á€á€¯á€žá€á€¹á€™á€½á€á€¹á€™á€Šá€¹ -" - -#: templates/web/base/contact/index.html:97 -msgid "Message:" -msgstr "စာ-" +msgstr "" #: perllib/FixMyStreet/App/Controller/Open311.pm:445 msgid "Missing jurisdiction_id" @@ -1577,10 +1503,6 @@ msgstr "" msgid "Month" msgstr "လ" -#: templates/web/base/report/display.html:34 -msgid "More problems nearby" -msgstr "အနီးနားရွá€á€»á€•á‚†á€”ာမ်ားစြာ" - #: templates/web/base/admin/bodies.html:21 #: templates/web/base/admin/body-form.html:18 #: templates/web/base/admin/flagged.html:16 @@ -1588,11 +1510,11 @@ msgstr "အနီးနားရွá€á€»á€•á‚†á€”ာမ်ားစြာ" #: templates/web/base/admin/list_updates.html:7 #: templates/web/base/admin/reports.html:13 #: templates/web/base/admin/users.html:15 -#: templates/web/base/auth/general.html:50 +#: templates/web/base/auth/general.html:89 +#: templates/web/base/report/new/form_user_loggedin.html:9 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:7 +#: templates/web/base/report/update/form_name.html:4 #: templates/web/base/reports/index.html:20 -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:9 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:44 -#: templates/web/fixmystreet/report/update-form.html:138 #: templates/web/zurich/admin/body-form.html:4 #: templates/web/zurich/auth/general.html:60 #: templates/web/zurich/report/new/fill_in_details_form.html:82 @@ -1606,7 +1528,7 @@ msgstr "အမည္" msgid "Name:" msgstr "အမည္-" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:328 +#: perllib/FixMyStreet/Script/Reports.pm:107 msgid "Name: %s" msgstr "အမည္ - %s" @@ -1615,29 +1537,24 @@ msgstr "အမည္ - %s" msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:127 +#: perllib/FixMyStreet/Cobrand/UK.pm:128 msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:434 -#: perllib/FixMyStreet/Cobrand/Default.pm:474 +#: perllib/FixMyStreet/Cobrand/Default.pm:455 +#: perllib/FixMyStreet/Cobrand/Default.pm:495 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:267 +#: perllib/FixMyStreet/Script/Alerts.pm:290 msgid "" "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n" "\n" msgstr "" -#: templates/web/zurich/email_sent.html:5 -msgid "Nearly Done! Now check your email..." -msgstr "လုပ္ေဆာင္မႈနီးပါးျပီးပါျပီአသင္áအီးေမးလ္ကá€á€¯á€…စ္ေဆးပါ" - #: templates/web/base/auth/token.html:17 templates/web/base/email_sent.html:5 -#, fuzzy msgid "Nearly done! Now check your email…" -msgstr "လုပ္ေဆာင္မႈနီးပါးျပီးပါျပီአသင္áအီးေမးလ္ကá€á€¯á€…စ္ေဆးပါ" +msgstr "" #: templates/web/base/reports/index.html:21 msgid "New <br>problems" @@ -1661,9 +1578,8 @@ msgid "New local problems on FixMyStreet" msgstr "ကá½á€¼á‚္ုပ္လမ္းကá€á€¯á€»á€•á€„္ေပးပါá€á€¼á€„္ေဒသá€á€¼á€„္းျပႆနာအသစ္မ်ား" #: templates/web/zurich/admin/report_edit-sdm.html:117 -#, fuzzy msgid "New note to DM:" -msgstr "အá€á€¼á€„္းမွá€á€¹á€…ုအသစ္-" +msgstr "" #: db/alert_types.pl:38 msgid "New problems for {{COUNCIL}} within {{WARD}} ward on FixMyStreet" @@ -1695,9 +1611,8 @@ msgstr "ျမá€á€³á‚•á€¡á€žá€…္" #: templates/web/zurich/admin/template_edit.html:9 #: templates/web/zurich/admin/templates.html:26 -#, fuzzy msgid "New template" -msgstr "ျမá€á€³á‚•á€¡á€žá€…္" +msgstr "" #: templates/web/base/pagination.html:13 msgid "Next" @@ -1714,8 +1629,8 @@ msgstr "ေနာက္သá€á€¯á‚”" #: templates/web/base/admin/report_edit.html:75 #: templates/web/base/admin/update_edit.html:25 #: templates/web/base/questionnaire/creator_fixed.html:16 +#: templates/web/base/questionnaire/index.html:101 #: templates/web/base/questionnaire/index.html:53 -#: templates/web/base/questionnaire/index.html:92 msgid "No" msgstr "မရွá€á€•á€«" @@ -1779,10 +1694,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:13 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:33 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:31 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:37 msgid "Not Responsible" msgstr "á€á€¬á€á€”္ယူမႈမရွá€á€»á€á€„္း" @@ -1790,9 +1703,8 @@ msgstr "á€á€¬á€á€”္ယူမႈမရွá€á€»á€á€„္း" #: perllib/FixMyStreet/Cobrand/Zurich.pm:937 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:13 -#, fuzzy msgid "Not contactable" -msgstr "á€á€¬á€á€”္ယူမႈမရွá€á€»á€á€„္း" +msgstr "" #: templates/web/zurich/admin/report_edit-sdm.html:108 msgid "Not for my subdivision" @@ -1822,7 +1734,7 @@ msgstr "" msgid "Note:" msgstr "မွá€á€¹á€…ု -" -#: templates/web/base/open311/index.html:73 +#: templates/web/base/open311/index.html:65 msgid "Note: <strong>%s</strong>" msgstr "မွá€á€¹á€…ု <strong> %s </strong>" @@ -1830,13 +1742,15 @@ msgstr "မွá€á€¹á€…ု <strong> %s </strong>" msgid "Notes from SDM to DM" msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:113 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:10 +#: templates/web/base/report/new/form_user_loggedout.html:14 +#: templates/web/base/report/new/form_user_loggedout.html:2 +#: templates/web/base/report/new/oauth_email_form.html:17 msgid "Now to submit your report…" msgstr "ယá€á€¯á€žá€„္áအစီရင္á€á€¶á€…ာကá€á€¯á€žá€¼á€„္းá‚á€á€¯á€„္ပါျပီ …" -#: templates/web/base/report/update-form.html:86 -#: templates/web/fixmystreet/report/update-form.html:85 +#: templates/web/base/report/update-form.html:28 +#: templates/web/base/report/update/form_user_loggedout.html:13 +#: templates/web/base/report/update/form_user_loggedout.html:2 msgid "Now to submit your update…" msgstr "" @@ -1844,11 +1758,6 @@ msgstr "" msgid "OK" msgstr "အá€á€¯á€±á€€" -#: templates/web/base/report/display.html:28 -#: templates/web/base/report/update.html:17 -msgid "Offensive? Unsuitable? Tell us" -msgstr "ထá€á€á€á€¯á€€á€¹á€±á€…á‚á€á€¯á€„္ေသာáŠá€™á€žá€„့္ေá€á€¬á€¹á€˜á€°á€¸á€œá€¬á€¸áŠ ကá½á€¼á‚္ုပ္á€á€á€¯á‚”ကá€á€¯á€±á€»á€•á€¬á€•á€«" - #: templates/web/base/reports/index.html:23 msgid "Old / unknown <br>problems" msgstr "အေဟာင္းáŠá€¡á€™á€Šá€¹á€™á€žá€ <br>ျပႆနာမ်ား" @@ -1865,7 +1774,7 @@ msgstr "ပá€á€¯áေဟာင္းေသာ <br> ျပင္ျပီးျ msgid "Older <br>problems" msgstr "ပá€á€¯áေဟာင္းေသာ<br>ျပႆနာမ်ား" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:45 +#: templates/web/base/report/new/form_report.html:15 msgid "One-line summary" msgstr "" @@ -1876,8 +1785,7 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:4 #: templates/web/base/admin/update_edit.html:28 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/report/update-form.html:30 -#: templates/web/fixmystreet/report/update-form.html:28 +#: templates/web/base/report/update/form_update.html:34 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:7 #: templates/web/zurich/admin/update_edit.html:18 @@ -1892,15 +1800,15 @@ msgstr "" msgid "Open, but not had any update in eight weeks" msgstr "" -#: templates/web/base/open311/index.html:70 +#: templates/web/base/open311/index.html:62 msgid "Open311 API for the mySociety FixMyStreet server" msgstr "mySociety FixMyStreet ဆာဗာအá€á€¼á€€á€¹ áƒáá API ကá€á€¯á€–ြင့္မည္" -#: templates/web/base/open311/index.html:80 +#: templates/web/base/open311/index.html:72 msgid "Open311 initiative web page" msgstr "" -#: templates/web/base/open311/index.html:81 +#: templates/web/base/open311/index.html:73 msgid "Open311 specification" msgstr "" @@ -1912,15 +1820,15 @@ msgstr "သá€á€¯á‚”မဟုá€á€¹ ျပႆနာမ်ားကá€á€¯á€á€„ဠmsgid "Or you can subscribe to an alert based upon what ward or council you’re in:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1084 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:673 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:674 -#: perllib/FixMyStreet/DB/Result/Problem.pm:570 -#: perllib/FixMyStreet/DB/Result/Problem.pm:580 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1055 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:669 +#: perllib/FixMyStreet/DB/Result/Problem.pm:558 +#: perllib/FixMyStreet/DB/Result/Problem.pm:568 +#: perllib/FixMyStreet/DB/Result/Problem.pm:578 #: perllib/FixMyStreet/DB/Result/Problem.pm:590 -#: perllib/FixMyStreet/DB/Result/Problem.pm:602 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:397 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:412 +#: perllib/FixMyStreet/Script/Reports.pm:175 +#: perllib/FixMyStreet/Script/Reports.pm:190 msgid "Other" msgstr "á€á€»á€á€¬á€¸" @@ -1929,7 +1837,7 @@ msgid "Owner" msgstr "ပá€á€¯á€„္ရွင္" #: templates/web/base/errors/page_error_404_not_found.html:1 -#: templates/web/base/errors/page_error_404_not_found.html:3 +#: templates/web/base/errors/page_error_404_not_found.html:4 msgid "Page Not Found" msgstr "စာမ်က္á‚ွာရွာမေá€á€¼á‚•á€•á€«" @@ -1943,16 +1851,16 @@ msgstr "ပင္မ" msgid "Partial" msgstr "á€á€…္á€á€€á€¹" -#: templates/web/base/auth/general.html:53 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:68 -#: templates/web/fixmystreet/report/update-form.html:116 +#: templates/web/base/auth/general.html:92 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:31 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:6 #: templates/web/zurich/auth/general.html:32 #: templates/web/zurich/auth/general.html:63 msgid "Password (optional)" msgstr "စကားá€á€½á€€á€¹(ထည့္á€á€ºá€„္မွထည့္ပါ)" #: templates/web/base/auth/change_password.html:25 -#: templates/web/base/auth/general.html:36 +#: templates/web/base/auth/general.html:72 msgid "Password:" msgstr "စကားá€á€½á€€á€¹-" @@ -1964,45 +1872,37 @@ msgstr "အျမဲá€á€™á€¹á€¸á€œá€„့္á€á€¹" msgid "Phone number" msgstr "ဖုန္းနံပါá€á€¹" -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:26 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:62 +#: templates/web/base/report/new/form_user_loggedin.html:26 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:25 msgid "Phone number (optional)" msgstr "ဖုန္းနံပါá€á€¹(ထည့္á€á€ºá€„္မွထည့္ပါ)" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:306 +#: perllib/FixMyStreet/Script/Reports.pm:83 #: templates/web/base/admin/report_edit.html:63 -#: templates/web/base/report/new/fill_in_details_form.html:198 #: templates/web/zurich/admin/stats.html:39 msgid "Phone:" msgstr "ဖုန္း-" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:66 -#: templates/web/fixmystreet/report/update-form.html:59 +#: templates/web/base/questionnaire/index.html:75 +#: templates/web/base/report/new/form_report.html:23 +#: templates/web/base/report/update/form_update.html:6 #: templates/web/zurich/admin/index-dm.html:29 #: templates/web/zurich/admin/index-sdm.html:24 #: templates/web/zurich/admin/reports.html:16 #: templates/web/zurich/admin/stats.html:37 -#: templates/web/zurich/report/new/fill_in_details_form.html:52 +#: templates/web/zurich/report/new/fill_in_details_form.html:45 msgid "Photo" msgstr "ဓာá€á€¹á€•á€¶á€¯" -#: perllib/FixMyStreet/App/Controller/Photo.pm:221 -#, fuzzy +#: perllib/FixMyStreet/App/Controller/Photo.pm:187 msgid "Photo is required." -msgstr "ဒီအá€á€ºá€€á€¹á€¡á€œá€€á€¹ ျဖည့္စြက္ရန္ လá€á€¯á€¡á€•á€¹á€žá€Šá€¹" +msgstr "" #: templates/web/base/admin/category_edit.html:48 -#, fuzzy msgid "Photo required" -msgstr "ဒီအá€á€ºá€€á€¹á€¡á€œá€€á€¹ ျဖည့္စြက္ရန္ လá€á€¯á€¡á€•á€¹á€žá€Šá€¹" - -#: templates/web/base/questionnaire/index.html:80 -#: templates/web/base/report/new/fill_in_details_form.html:84 -#: templates/web/base/report/update-form.html:62 -msgid "Photo:" -msgstr "ဓာá€á€¹á€•á€¶á€¯-" +msgstr "" -#: templates/web/base/alert/list.html:26 +#: templates/web/base/alert/list.html:23 msgid "Photos of recent nearby reports" msgstr "မá¾á€€á€¬á€±á€žá€¸á€á€„္ကအနီးအနားက အစီရင္á€á€¶á€…ာမ်ားáဓာá€á€¹á€•á€¶á€¯" @@ -2031,20 +1931,16 @@ msgstr "" msgid "Please check the passwords and try again" msgstr "စကားá€á€½á€€á€¹á€€á€á€¯á€»á€•á€”္စစ္ေဆးျပီးျပန္á¾á€€á€á€³á€¸á€…ားပါ" -#: templates/web/zurich/auth/token.html:16 -msgid "Please check your email" -msgstr "သင္áအီးေမးလ္ကá€á€¯á€…စ္ပါ" - -#: templates/web/base/auth/general.html:10 -#: templates/web/base/auth/general.html:16 +#: templates/web/base/auth/general.html:27 +#: templates/web/base/auth/general.html:33 #: templates/web/zurich/auth/general.html:3 #: templates/web/zurich/auth/general.html:9 msgid "Please check your email address is correct" msgstr "သင္áအီးေမးလ္လá€á€•á€¹á€…ာမွန္áŠá€™á€™á€½á€”္ကá€á€¯á€…စ္ေဆးပါ" #: perllib/FixMyStreet/App/Controller/Admin.pm:343 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:883 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:948 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:878 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:943 #: perllib/FixMyStreet/DB/Result/Problem.pm:412 #: templates/web/base/js/translation_strings.html:9 msgid "Please choose a category" @@ -2058,8 +1954,7 @@ msgstr "ပစá¥á€Šá€¹á€¸á€¡á€™á€ºá€á€³á€¸á€¡á€…ားá€á€…္á€á€¯á€€á€á€¯ msgid "Please correct the errors below" msgstr "" -#: templates/web/base/contact/blurb.html:2 -#: templates/web/fixmystreet/contact/blurb.html:12 +#: templates/web/base/contact/blurb.html:12 msgid "" "Please do <strong>not</strong> report problems through this form; messages go to\n" "the team behind this site, not a council. To report a problem,\n" @@ -2071,11 +1966,17 @@ msgid "Please do not be abusive — abusing your council devalues the s msgstr "" #: perllib/FixMyStreet/App/Controller/Admin.pm:346 -#: perllib/FixMyStreet/DB/Result/Comment.pm:126 +#: perllib/FixMyStreet/DB/Result/Comment.pm:125 #: templates/web/base/js/translation_strings.html:2 msgid "Please enter a message" msgstr "စာá€á€…္á€á€¯á€›á€á€¯á€€á€¹á€‘ည့္ပါ" +#: perllib/FixMyStreet/App/Controller/Admin.pm:1091 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1146 +#, fuzzy +msgid "Please enter a name" +msgstr "သင္áအမည္ကá€á€¯á€›á€á€¯á€€á€¹á€‘ည့္ပါ" + #: templates/web/base/auth/change_password.html:12 #: templates/web/base/auth/change_password.html:15 #: templates/web/base/js/translation_strings.html:19 @@ -2088,10 +1989,10 @@ msgstr "စကားá€á€½á€€á€¹á€á€…္á€á€¯á€›á€á€¯á€€á€¹á€‘ည့္ပါ msgid "Please enter a subject" msgstr "ေá€á€«á€„္းစီးá€á€…္á€á€¯á€›á€á€¯á€€á€¹á€‘ည့္ပါ" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1084 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1137 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1087 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1142 #: perllib/FixMyStreet/App/Controller/Admin.pm:345 -#: perllib/FixMyStreet/DB/Result/User.pm:127 +#: perllib/FixMyStreet/DB/Result/User.pm:133 #: templates/web/base/js/translation_strings.html:12 #: templates/web/base/js/translation_strings.html:16 msgid "Please enter a valid email" @@ -2108,9 +2009,9 @@ msgid "Please enter some details" msgstr "á€á€…္á€á€ºá€á€³á‚•á€¡á€á€ºá€€á€¹á€¡á€œá€€á€¹á€™á€ºá€¬á€¸á€€á€á€¯á€›á€á€¯á€€á€¹á€‘ည့္ပါ" #: perllib/FixMyStreet/App/Controller/Contact.pm:113 -#: perllib/FixMyStreet/DB/Result/User.pm:124 -#: templates/web/base/auth/general.html:10 -#: templates/web/base/auth/general.html:15 +#: perllib/FixMyStreet/DB/Result/User.pm:130 +#: templates/web/base/auth/general.html:27 +#: templates/web/base/auth/general.html:32 #: templates/web/base/js/translation_strings.html:11 #: templates/web/base/js/translation_strings.html:15 #: templates/web/zurich/auth/general.html:3 @@ -2118,7 +2019,7 @@ msgstr "á€á€…္á€á€ºá€á€³á‚•á€¡á€á€ºá€€á€¹á€¡á€œá€€á€¹á€™á€ºá€¬á€¸á€€á€á€¯ msgid "Please enter your email" msgstr "သင္áအီးေမးလ္ကá€á€¯á€›á€á€¯á€€á€¹á€‘ည့္ပါ" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:7 +#: templates/web/base/report/new/form_user_loggedout_email.html:7 #: templates/web/zurich/report/new/fill_in_details_form.html:80 msgid "Please enter your email address" msgstr "သင္áအီးေမးလ္လá€á€•á€¹á€…ာကá€á€¯á€›á€á€¯á€€á€¹á€‘ည့္ပါ" @@ -2127,15 +2028,15 @@ msgstr "သင္áအီးေမးလ္လá€á€•á€¹á€…ာကá€á€¯á€›á€á€¯ msgid "Please enter your first name" msgstr "သင္áပထမအမည္ကá€á€¯á€›á€á€¯á€€á€¹á€‘ည့္ပါ" -#: perllib/FixMyStreet/Cobrand/UK.pm:318 +#: perllib/FixMyStreet/Cobrand/UK.pm:319 #: templates/web/base/js/translation_strings.html:7 msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below" msgstr "" #: perllib/FixMyStreet/App/Controller/Contact.pm:112 -#: perllib/FixMyStreet/DB/Result/Comment.pm:123 +#: perllib/FixMyStreet/DB/Result/Comment.pm:122 #: perllib/FixMyStreet/DB/Result/Problem.pm:406 -#: perllib/FixMyStreet/DB/Result/User.pm:120 +#: perllib/FixMyStreet/DB/Result/User.pm:126 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter your name" msgstr "သင္áအမည္ကá€á€¯á€›á€á€¯á€€á€¹á€‘ည့္ပါ" @@ -2162,12 +2063,11 @@ msgstr "ျပန္လည္ á€á€„္ေရာက္ပါ သá€á€¯á‚”မဟá msgid "Please fill in details of the problem below." msgstr "" -#: templates/web/zurich/report/new/fill_in_details_form.html:46 +#: templates/web/zurich/report/new/fill_in_details_form.html:72 msgid "Please fill in details of the problem." msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:28 -#: templates/web/fixmystreet/report/new/sidebar.html:7 +#: templates/web/base/report/new/sidebar.html:7 #: templates/web/zurich/report/new/fill_in_details_form.html:20 msgid "Please fill in the form below with details of the problem, and describe the location as precisely as possible in the details box." msgstr "" @@ -2176,20 +2076,23 @@ msgstr "" msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "" -#: templates/web/fixmystreet/report/updates-sidebar-notes.html:4 +#: templates/web/base/report/updates-sidebar-notes.html:2 msgid "Please note that updates are not sent to the council." msgstr "အသစ္မြမ္းမံမႈမ်ားသည္ေကာင္စီသá€á€¯á‚”မပá€á€¯á‚”ရေသးဘူးဆá€á€¯á€á€¬á€™á€½á€á€¹á€žá€¬á€¸á€±á€…လá€á€¯á€•á€«á€žá€Šá€¹" -#: templates/web/base/report/update-form.html:7 -msgid "Please note that updates are not sent to the council. If you leave your name it will be public. Your information will only be used in accordance with our <a href=\"/faq#privacy\">privacy policy</a>" +#: templates/web/base/report/new/oauth_email_form.html:4 +msgid "Please note your report has <strong>not yet been sent</strong>." msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:8 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:21 +#: templates/web/base/report/new/fill_in_details_form.html:20 #: templates/web/zurich/report/new/fill_in_details_form.html:11 msgid "Please note your report has <strong>not yet been sent</strong>. Choose a category and add further information below, then submit." msgstr "" +#: templates/web/base/report/display.html:26 +msgid "Please note your update has <strong>not yet been posted</strong>." +msgstr "" + #: templates/web/base/report/new/notes.html:1 #: templates/web/zurich/report/new/notes.html:1 msgid "Please note:" @@ -2209,9 +2112,8 @@ msgid "Please say whether you've ever reported a problem to your council before" msgstr "သင္áေကာင္စီသá€á€¯á‚”သင္ယá€á€„္ကသá€á€„္းပá€á€¯á‚”ဖူးေá¾á€€á€¬á€„္းေျပာျပေပးပါ" #: templates/web/zurich/admin/report_edit.html:208 -#, fuzzy msgid "Please select a body." -msgstr "စာကá€á€¯á€šá€¹á€á€…္á€á€¯á€€á€á€¯ ေရြးပါá‹" +msgstr "" #: perllib/FixMyStreet/App/Controller/Alert.pm:80 msgid "Please select the feed you want" @@ -2228,6 +2130,7 @@ msgstr "ျပႆနာေျဖရွင္းျပီးျပီáŠá€™á€›á€½ #: perllib/FixMyStreet/App/Model/PhotoSet.pm:117 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:145 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:147 +#: templates/web/base/js/translation_strings.html:53 msgid "Please upload a JPEG image only" msgstr "JPEG ပံုá€á€…္ပံုသာá€á€„္ရန္" @@ -2235,18 +2138,14 @@ msgstr "JPEG ပံုá€á€…္ပံုသာá€á€„္ရန္" msgid "Please write a message" msgstr "စာá€á€…္ေá¾á€€á€¬á€„္းေရးပါ" -#: templates/web/fixmystreet/report/update-form.html:23 +#: templates/web/base/report/update/form_update.html:29 msgid "Please write your update here" msgstr "သင္áအသစ္မြမ္းမံမႈကá€á€¯á€’ီေနရာမွာေရးပါ" -#: templates/web/base/contact/index.html:100 -#: templates/web/base/report/update-form.html:110 -#: templates/web/base/report/update-form.html:132 -#: templates/web/base/report/update-form.html:72 -#: templates/web/fixmystreet/contact/index.html:113 -#: templates/web/fixmystreet/report/update-form.html:124 -#: templates/web/fixmystreet/report/update-form.html:71 -#: templates/web/fixmystreet/report/update-form.html:97 +#: templates/web/base/contact/index.html:105 +#: templates/web/base/report/update-form.html:24 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:14 +#: templates/web/base/report/update/form_user_loggedout_password.html:10 msgid "Post" msgstr "á€á€„္မည္" @@ -2274,12 +2173,9 @@ msgstr "ယá€á€„္က" msgid "Privacy" msgstr "" -#: templates/web/base/faq/faq-en-gb.html:7 -#: templates/web/base/open311/index.html:7 -#: templates/web/base/static/privacy.html:1 -#: templates/web/base/static/privacy.html:2 -#: templates/web/base/static/privacy.html:9 -#: templates/web/fixmystreet/contact/index.html:11 +#: templates/web/base/about/_sidebar.html:5 +#: templates/web/base/about/privacy.html:1 +#: templates/web/base/about/privacy.html:2 msgid "Privacy and cookies" msgstr "" @@ -2307,12 +2203,12 @@ msgstr "ျပႆနာ %s သည္အá€á€Šá€¹á€»á€–စ္á€á€²á€·á€žá€Šá€¹" msgid "Problem %s sent to council %s" msgstr "ေကာင္စီ %s သá€á€¯á‚” ျပႆနာ %s ကá€á€¯á€•á€á€¯á‚”လá€á€¯á€€á€¹á€•á€«á€»á€•á€®" -#: templates/web/base/admin/index.html:46 +#: templates/web/base/admin/index.html:39 #: templates/web/zurich/admin/index.html:9 msgid "Problem breakdown by state" msgstr "ျပည္နယ္မွ ျပႆနာကá€á€¯á€‘ပ္မံá€á€¼á€²á€…á€á€á€¹á€œá€á€¯á€€á€¹á€žá€Šá€¹" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1055 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1058 msgid "Problem marked as open." msgstr "ျပႆနာကá€á€¯ ဖြင့္ထားသည္" @@ -2328,11 +2224,11 @@ msgstr "ျပႆနာမ်ား" msgid "Problems in this area" msgstr "ဒီဧရá€á€šá€¬á€¡á€á€¼á€„္းရွá€á€»á€•á‚†á€”ာမ်ား" -#: templates/web/fixmystreet/report/display.html:43 +#: templates/web/base/report/display_tools.html:19 msgid "Problems nearby" msgstr "အနီးနားရွá€á€»á€•á‚†á€”ာမ်ား" -#: templates/web/fixmystreet/report/display.html:41 +#: templates/web/base/report/display_tools.html:17 msgid "Problems on the map" msgstr "ေျမပံုေပášá€€ ျပႆနာမ်ား" @@ -2344,24 +2240,23 @@ msgstr "FixMyStreet ေပášá€á€¼á€„္ လá€á€¹á€á€±á€œá€¬ á€á€„္ျပá msgid "Problems within %.1fkm of this location" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:642 +#: perllib/FixMyStreet/Cobrand/Default.pm:663 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:120 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:139 -#: perllib/FixMyStreet/Cobrand/UK.pm:207 +#: perllib/FixMyStreet/Cobrand/UK.pm:208 msgid "Problems within %s" msgstr "" #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:128 -#: perllib/FixMyStreet/Cobrand/UK.pm:221 +#: perllib/FixMyStreet/Cobrand/UK.pm:222 msgid "Problems within %s ward" msgstr "" #. ("First %s is the body name, second %s the site name") #: templates/web/base/reports/body.html:0 #: templates/web/base/reports/body.html:24 -#, fuzzy msgid "Problems within %s, %s" -msgstr "ဒီဧရá€á€šá€¬á€¡á€á€¼á€„္းရွá€á€»á€•á‚†á€”ာမ်ား" +msgstr "" #: templates/web/base/alert/_list.html:42 msgid "Problems within the boundary of:" @@ -2375,19 +2270,16 @@ msgstr "" msgid "Property type:" msgstr "" -#: templates/web/base/report/update-form.html:3 -#: templates/web/fixmystreet/report/update-form.html:4 +#: templates/web/base/report/update-form.html:6 msgid "Provide an update" msgstr "" -#: templates/web/base/auth/general.html:56 +#: templates/web/base/auth/general.html:95 msgid "Providing a name and password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." msgstr "နာမည္á‚ွင့္ စကားá€á€½á€€á€¹á€€á€á€¯ မထည့္သြင္းá€á€ºá€„္လွ်င္ ရသည္ዠနံပါá€á€¹á‚ွင့္ စကားá€á€½á€€á€¹ ထည့္သြင္းပါက ျပႆနာမ်ားကá€á€¯ á€á€„္ျပျá€á€„္းአupdate မ်ား ျပဳလုပ္ျá€á€„္းá‚ွင့္ အစီရင္á€á€¶á€…ာမ်ား စီမံá€á€”္႔á€á€¼á€²á€»á€á€„္းá€á€á€¯á‚”ကá€á€¯ ပá€á€¯á€™á€á€¯á€œá€¼á€šá€¹á€€á€°á€…ြာ ျပဳလုပ္á‚á€á€¯á€„္မည္á‹" -#: templates/web/base/report/new/fill_in_details_form.html:156 -#: templates/web/base/report/update-form.html:129 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:71 -#: templates/web/fixmystreet/report/update-form.html:119 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:34 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:9 msgid "Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." msgstr "စကားá€á€½á€€á€¹á€€á€á€¯ မထည့္သြင္းá€á€ºá€„္လွ်င္ ရသည္ዠစကားá€á€½á€€á€¹ ထည့္သြင္းပါက ျပႆနာမ်ားကá€á€¯ á€á€„္ျပျá€á€„္းአupdate မ်ား ျပဳလုပ္ျá€á€„္းá‚ွင့္ အစီရင္á€á€¶á€…ာမ်ား စီမံá€á€”္႔á€á€¼á€²á€»á€á€„္းá€á€á€¯á‚”ကá€á€¯ ပá€á€¯á€™á€á€¯á€œá€¼á€šá€¹á€€á€°á€…ြာ ျပဳလုပ္á‚á€á€¯á€„္မည္á‹" @@ -2423,18 +2315,17 @@ msgstr "ျပႆနာ အစီရင္á€á€¶á€žá€° ျဖည့္စြကá #: templates/web/base/alert/_list.html:22 #: templates/web/base/around/display_location.html:1 #: templates/web/base/around/display_location.html:3 -#: templates/web/base/report/display.html:50 +#: templates/web/base/report/display_tools.html:34 #: templates/web/base/reports/_rss.html:1 #: templates/web/fixmystreet/alert/updates.html:9 -#: templates/web/fixmystreet/report/display.html:58 msgid "RSS feed" msgstr "RSS feed" -#: perllib/FixMyStreet/Cobrand/UK.pm:250 perllib/FixMyStreet/Cobrand/UK.pm:262 +#: perllib/FixMyStreet/Cobrand/UK.pm:251 perllib/FixMyStreet/Cobrand/UK.pm:263 msgid "RSS feed for %s" msgstr "%s အá€á€¼á€€á€¹ RSS feed" -#: perllib/FixMyStreet/Cobrand/UK.pm:256 perllib/FixMyStreet/Cobrand/UK.pm:268 +#: perllib/FixMyStreet/Cobrand/UK.pm:257 perllib/FixMyStreet/Cobrand/UK.pm:269 msgid "RSS feed for %s ward, %s" msgstr "%s အုပ္á€á€ºá€³á€³á€•á€¹á€±á€›á€¸á€Œá€¬á€” %s အá€á€¼á€€á€¹ RSS feed" @@ -2442,11 +2333,11 @@ msgstr "%s အုပ္á€á€ºá€³á€³á€•á€¹á€±á€›á€¸á€Œá€¬á€” %s အá€á€¼á€€á€¹ R #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:163 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:173 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:181 -#: perllib/FixMyStreet/Cobrand/UK.pm:276 perllib/FixMyStreet/Cobrand/UK.pm:288 +#: perllib/FixMyStreet/Cobrand/UK.pm:277 perllib/FixMyStreet/Cobrand/UK.pm:289 msgid "RSS feed of %s" msgstr "%s á RSS feed" -#: perllib/FixMyStreet/Cobrand/UK.pm:281 perllib/FixMyStreet/Cobrand/UK.pm:293 +#: perllib/FixMyStreet/Cobrand/UK.pm:282 perllib/FixMyStreet/Cobrand/UK.pm:294 msgid "RSS feed of %s, within %s ward" msgstr "%s အုပ္á€á€ºá€³á€•á€¹á€±á€›á€¸á€Œá€¬á€” အá€á€¼á€„္းရá€á€½ %s á RSS feed" @@ -2458,15 +2349,15 @@ msgstr "အနီးအနားရá€á€½ ျပႆနာမ်ားá RSS fee msgid "RSS feed of problems in this %s" msgstr "ဒီ %s ရá€á€½ ျပႆနာမ်ားá RSS feed" -#: perllib/FixMyStreet/Cobrand/Default.pm:643 +#: perllib/FixMyStreet/Cobrand/Default.pm:664 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:121 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:138 -#: perllib/FixMyStreet/Cobrand/UK.pm:214 +#: perllib/FixMyStreet/Cobrand/UK.pm:215 msgid "RSS feed of problems within %s" msgstr "%s အá€á€¼á€„္းရá€á€½ ျပႆနာမ်ားá RSS feed" #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:127 -#: perllib/FixMyStreet/Cobrand/UK.pm:220 +#: perllib/FixMyStreet/Cobrand/UK.pm:221 msgid "RSS feed of problems within %s ward" msgstr "%s အုပ္á€á€ºá€³á€•á€¹á€±á€›á€¸á€Œá€¬á€” အá€á€¼á€„္းရá€á€½ ျပႆနာမ်ားá RSS feed" @@ -2475,25 +2366,22 @@ msgstr "%s အုပ္á€á€ºá€³á€•á€¹á€±á€›á€¸á€Œá€¬á€” အá€á€¼á€„္းရဠmsgid "RSS feed of recent local problems" msgstr "လá€á€¹á€á€±á€œá€¬ ျပည္á€á€¼á€„္း ျပႆနာမ်ား အá€á€¼á€€á€¹ RSS feed" -#: templates/web/base/report/display.html:50 +#: templates/web/base/report/display_tools.html:34 #: templates/web/fixmystreet/alert/updates.html:9 -#: templates/web/fixmystreet/report/display.html:58 msgid "RSS feed of updates to this problem" msgstr "လက္ရá€á€½ ျပႆနာကá€á€¯ update ျပဳလုပ္ထားသည့္ RSS feed" #: templates/web/base/alert/updates.html:9 -#: templates/web/base/report/display.html:41 +#: templates/web/base/report/display_tools.html:36 #: templates/web/fixmystreet/alert/updates.html:14 -#: templates/web/fixmystreet/report/display.html:60 msgid "Receive email when updates are left on this problem." msgstr "" #. ("%s is the site name") #: templates/web/base/around/display_location.html:0 #: templates/web/base/around/display_location.html:33 -#, fuzzy msgid "Recent local problems, %s" -msgstr "လá€á€¹á€á€±á€œá€¬ ျပည္á€á€¼á€„္း ျပႆနာမာ်ား" +msgstr "" #: templates/web/base/reports/index.html:24 msgid "Recently <br>fixed" @@ -2511,16 +2399,15 @@ msgstr "" msgid "Remove flag" msgstr "" -#: templates/web/base/admin/report_edit.html:92 -#: templates/web/base/admin/update_edit.html:62 +#: templates/web/base/admin/report_edit.html:93 +#: templates/web/base/admin/update_edit.html:67 #: templates/web/zurich/admin/update_edit.html:35 msgid "Remove photo (can't be undone!)" msgstr "ဓာá€á€¹á€•á€¶á€¯ ဖယ္ရွားရန္ (မá¿á€•á€®á€¸á€±á€»á€™á€¬á€€á€¹á‚á€á€¯á€„္ပါ)" #: templates/web/zurich/admin/report_edit.html:243 -#, fuzzy msgid "Reply to user:" -msgstr "သုံးစြဲသူအား ျပင္ဆင္ျá€á€„္း" +msgstr "" #: templates/web/fixmystreet/header_logo.html:2 msgid "Report" @@ -2533,7 +2420,7 @@ msgstr "" msgid "Report a problem" msgstr "ျပႆနာကá€á€¯ အစီရင္á€á€¶ á€á€„္ျပရန္" -#: templates/web/fixmystreet/report/display.html:32 +#: templates/web/base/report/display_tools.html:8 msgid "Report abuse" msgstr "" @@ -2542,7 +2429,8 @@ msgid "Report on %s" msgstr "" #: templates/web/base/report/new/fill_in_details_form.html:1 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:2 +#: templates/web/base/report/new/login_success_form.html:1 +#: templates/web/base/report/new/oauth_email_form.html:1 msgid "Report your problem" msgstr "" @@ -2551,9 +2439,8 @@ msgstr "" msgid "Report, view, or discuss local problems" msgstr "ေဒသá€á€¼á€„္း ျပႆနာမ်ားကá€á€¯ အစီရင္á€á€¶á€»á€á€„္းአá¾á€€á€Šá€¹á€·á‚ႈျá€á€„္းá‚ွင့္ ေဆြးေá‚ြးျá€á€„္း" -#: perllib/FixMyStreet/DB/Result/Problem.pm:585 -#: templates/web/base/contact/index.html:50 -#: templates/web/fixmystreet/contact/index.html:65 +#: perllib/FixMyStreet/DB/Result/Problem.pm:573 +#: templates/web/base/contact/index.html:57 msgid "Reported anonymously at %s" msgstr "" @@ -2562,9 +2449,8 @@ msgstr "" msgid "Reported before" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:608 -#: templates/web/base/contact/index.html:52 -#: templates/web/fixmystreet/contact/index.html:67 +#: perllib/FixMyStreet/DB/Result/Problem.pm:596 +#: templates/web/base/contact/index.html:59 msgid "Reported by %s at %s" msgstr "" @@ -2577,27 +2463,27 @@ msgstr "" msgid "Reported in the %s category" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:581 +#: perllib/FixMyStreet/DB/Result/Problem.pm:569 msgid "Reported in the %s category anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:603 +#: perllib/FixMyStreet/DB/Result/Problem.pm:591 msgid "Reported in the %s category by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:577 +#: perllib/FixMyStreet/DB/Result/Problem.pm:565 msgid "Reported via %s anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:599 +#: perllib/FixMyStreet/DB/Result/Problem.pm:587 msgid "Reported via %s by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:573 +#: perllib/FixMyStreet/DB/Result/Problem.pm:561 msgid "Reported via %s in the %s category anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:593 +#: perllib/FixMyStreet/DB/Result/Problem.pm:581 msgid "Reported via %s in the %s category by %s at %s" msgstr "" @@ -2607,9 +2493,8 @@ msgstr "" #: templates/web/zurich/admin/report_edit-sdm.html:36 #: templates/web/zurich/admin/report_edit.html:55 -#, fuzzy msgid "Reported:" -msgstr "အစီရင္á€á€¶á€…ာအားလံုး" +msgstr "" #: templates/web/base/around/index.html:2 #: templates/web/base/js/translation_strings.html:41 @@ -2619,13 +2504,13 @@ msgstr "အစီရင္á€á€¶á€…ာအားလံုး" msgid "Reporting a problem" msgstr "ျပႆနာကá€á€¯ အစီရင္á€á€¶ á€á€„္ျပျá€á€„္း" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1277 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1286 #: perllib/FixMyStreet/Cobrand/Zurich.pm:384 #: templates/web/zurich/header.html:60 msgid "Reports" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:327 perllib/FixMyStreet/Cobrand/UK.pm:331 +#: perllib/FixMyStreet/Cobrand/UK.pm:328 perllib/FixMyStreet/Cobrand/UK.pm:332 msgid "Reports are limited to %s characters in length. Please shorten your report" msgstr "" @@ -2662,15 +2547,17 @@ msgstr "" msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1495 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1500 -#: templates/web/base/admin/report_edit.html:88 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1508 +#: templates/web/base/admin/report_edit.html:90 +#: templates/web/base/admin/update_edit.html:64 #: templates/web/zurich/admin/report_edit.html:116 msgid "Rotate Left" msgstr "ဘယ္ဘက္ကá€á€¯ လွည့္ပါ" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1495 -#: templates/web/base/admin/report_edit.html:89 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 +#: templates/web/base/admin/report_edit.html:91 +#: templates/web/base/admin/update_edit.html:65 #: templates/web/zurich/admin/report_edit.html:117 msgid "Rotate Right" msgstr "ညာဘက္ကá€á€¯ လွည့္ပါ" @@ -2680,7 +2567,6 @@ msgid "Rotating this photo will discard unsaved changes to the report." msgstr "" #: templates/web/base/js/translation_strings.html:46 -#: templates/web/base/maps/google-ol.html:13 msgid "Satellite" msgstr "" @@ -2737,11 +2623,10 @@ msgid "Select which type of alert you’d like and click the button for an RSS f msgstr "" #: perllib/FixMyStreet/Cobrand/Zurich.pm:835 -#, fuzzy msgid "Sent report back" -msgstr "အစီရင္á€á€¶á€…ာကá€á€¯á€–ြင့္မည္" +msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:708 +#: perllib/FixMyStreet/DB/Result/Problem.pm:696 msgid "Sent to %s %s later" msgstr "" @@ -2754,15 +2639,13 @@ msgstr "" msgid "Service:" msgstr "" -#: templates/web/fixmystreet/report/display.html:38 +#: templates/web/base/report/display_tools.html:14 msgid "Share" msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:193 -#: templates/web/base/report/update-form.html:158 -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:23 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:59 -#: templates/web/fixmystreet/report/update-form.html:146 +#: templates/web/base/report/new/form_user_loggedin.html:23 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:22 +#: templates/web/base/report/update/form_name.html:15 msgid "Show my name publicly" msgstr "" @@ -2774,9 +2657,9 @@ msgstr "" msgid "Show pins" msgstr "" +#: templates/web/base/auth/general.html:100 #: templates/web/base/auth/general.html:3 -#: templates/web/base/auth/general.html:40 -#: templates/web/base/auth/general.html:61 +#: templates/web/base/auth/general.html:76 #: templates/web/zurich/auth/general.html:18 #: templates/web/zurich/auth/general.html:35 msgid "Sign in" @@ -2803,7 +2686,7 @@ msgid "" " sent from your FixMyStreet installation." msgstr "" -#: templates/web/base/alert/index.html:42 +#: templates/web/base/alert/index.html:40 msgid "Some photos of recent reports" msgstr "" @@ -2813,7 +2696,7 @@ msgstr "" msgid "Some text to localize" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:78 +#: perllib/FixMyStreet/Cobrand/UK.pm:79 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover." msgstr "" @@ -2825,14 +2708,20 @@ msgstr "" msgid "Sorry, there has been an error confirming your problem." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:221 -#: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:37 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:216 +#: perllib/FixMyStreet/Geocode.pm:38 perllib/FixMyStreet/Geocode/Bing.pm:38 #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:56 #: perllib/FixMyStreet/Geocode/OSM.pm:48 msgid "Sorry, we could not find that location." msgstr "" -#: perllib/FixMyStreet/Geocode/Bing.pm:34 +#: templates/web/base/auth/general.html:9 +#: templates/web/base/report/display.html:21 +#: templates/web/base/report/new/fill_in_details_form.html:23 +msgid "Sorry, we could not log you in. Please fill in the form below." +msgstr "" + +#: perllib/FixMyStreet/Geocode/Bing.pm:35 #: perllib/FixMyStreet/Geocode/Google.pm:45 #: perllib/FixMyStreet/Geocode/Zurich.pm:88 msgid "Sorry, we could not parse that location. Please try again." @@ -2842,6 +2731,10 @@ msgstr "" msgid "Sorry, we couldn't save your image(s), please try again." msgstr "" +#: perllib/FixMyStreet/App/Controller/AuthSS.pm:301 +msgid "Sorry, you can not log in with Facebook. Please try again later." +msgstr "" + #: templates/web/base/admin/stats.html:64 msgid "Start Date:" msgstr "" @@ -2850,13 +2743,12 @@ msgstr "" #: templates/web/base/admin/flagged.html:18 #: templates/web/base/admin/list_updates.html:11 #: templates/web/base/admin/reports.html:15 -#: templates/web/fixmystreet/report/update-form.html:26 +#: templates/web/base/report/update/form_update.html:32 msgid "State" msgstr "" #: templates/web/base/admin/report_edit.html:47 #: templates/web/base/admin/update_edit.html:27 -#: templates/web/base/report/update-form.html:28 #: templates/web/zurich/admin/report_edit-sdm.html:73 #: templates/web/zurich/admin/report_edit.html:101 #: templates/web/zurich/admin/report_edit.html:155 @@ -2864,7 +2756,7 @@ msgstr "" msgid "State:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1282 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1291 #: perllib/FixMyStreet/Cobrand/Zurich.pm:387 #: templates/web/base/admin/stats.html:1 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:73 @@ -2886,7 +2778,7 @@ msgstr "" msgid "Street View" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:406 +#: perllib/FixMyStreet/Script/Reports.pm:184 msgid "Subcategory: %s" msgstr "" @@ -2894,30 +2786,25 @@ msgstr "" msgid "Subdivision/Body" msgstr "" -#: templates/web/fixmystreet/contact/index.html:98 +#: templates/web/base/contact/index.html:90 msgid "Subject" msgstr "" #: templates/web/base/admin/report_edit.html:19 -#: templates/web/base/contact/index.html:88 -#: templates/web/base/report/new/fill_in_details_form.html:53 #: templates/web/zurich/admin/report_edit.html:39 msgid "Subject:" msgstr "" #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/fill_in_details_form.html:137 -#: templates/web/base/report/new/fill_in_details_form.html:159 -#: templates/web/base/report/new/fill_in_details_form.html:96 -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:36 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:23 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:76 +#: templates/web/base/report/new/form_user_loggedin.html:36 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:39 +#: templates/web/base/report/new/form_user_loggedout_password.html:11 #: templates/web/zurich/report/new/fill_in_details_form.html:96 msgid "Submit" msgstr "" -#: templates/web/base/admin/report_edit.html:95 -#: templates/web/base/admin/update_edit.html:65 +#: templates/web/base/admin/report_edit.html:101 +#: templates/web/base/admin/update_edit.html:75 #: templates/web/base/admin/user-form.html:56 #: templates/web/zurich/admin/report_edit-sdm.html:137 #: templates/web/zurich/admin/report_edit.html:268 @@ -2925,7 +2812,7 @@ msgstr "" msgid "Submit changes" msgstr "" -#: templates/web/base/questionnaire/index.html:97 +#: templates/web/base/questionnaire/index.html:106 msgid "Submit questionnaire" msgstr "" @@ -2941,9 +2828,8 @@ msgid "Submitted" msgstr "" #: templates/web/base/alert/updates.html:17 -#: templates/web/base/report/display.html:46 +#: templates/web/base/report/display_tools.html:41 #: templates/web/fixmystreet/alert/updates.html:23 -#: templates/web/fixmystreet/report/display.html:65 msgid "Subscribe" msgstr "" @@ -2951,7 +2837,7 @@ msgstr "" msgid "Subscribe me to an email alert" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1275 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1284 #: perllib/FixMyStreet/Cobrand/Zurich.pm:383 #: templates/web/base/admin/bodies.html:25 #: templates/web/base/admin/index.html:1 @@ -2970,7 +2856,7 @@ msgstr "အက်ဥ္းá€á€ºá€³á€•á€¹" msgid "Summary reports" msgstr "အစီရင္á€á€¶á€…ာအက်ဥ္းá€á€ºá€³á€•á€¹" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1279 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1288 msgid "Survey" msgstr "စစ္á€á€™á€¹á€¸" @@ -2984,9 +2870,8 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/Zurich.pm:394 #: templates/web/zurich/header.html:77 -#, fuzzy msgid "Templates" -msgstr "မြမ္းမံထားေသာအသစ္မ်ားရယူရန္" +msgstr "" #: templates/web/base/admin/list_updates.html:12 #: templates/web/zurich/admin/templates.html:9 @@ -3007,7 +2892,7 @@ msgstr "စာ-" msgid "Thank you for reporting this issue!" msgstr "" -#: templates/web/base/tokens/error.html:7 +#: templates/web/base/tokens/error.html:6 msgid "Thank you for trying to confirm your update or problem. We seem to have an error ourselves though, so <a href=\"%s\">please let us know what went on</a> and we'll look into it." msgstr "" @@ -3042,23 +2927,23 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:47 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:63 -#: perllib/FixMyStreet/Cobrand/UK.pm:71 +#: perllib/FixMyStreet/Cobrand/UK.pm:72 msgid "That postcode was not recognised, sorry." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:726 +#: perllib/FixMyStreet/App/Controller/Admin.pm:724 msgid "That problem has been marked as sent." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:718 +#: perllib/FixMyStreet/App/Controller/Admin.pm:716 msgid "That problem will now be resent." msgstr "ထá€á€¯á€»á€•á‚†á€”ာကá€á€¯á€šá€á€¯á€•á€„္ျပန္ပá€á€¯á‚”ပါမည္" -#: perllib/FixMyStreet/App/Controller/Report.pm:125 +#: perllib/FixMyStreet/App/Controller/Report.pm:127 msgid "That report cannot be viewed on %s." msgstr "ဒီအစီရင္á€á€¶á€…ာကá€á€¯ %s ေပášá€á€¼á€„္မá¾á€€á€Šá€¹á€·á‚á€á€¯á€„္ပါ" -#: perllib/FixMyStreet/App/Controller/Report.pm:119 +#: perllib/FixMyStreet/App/Controller/Report.pm:121 msgid "That report has been removed from FixMyStreet." msgstr "ကá½á€¼á‚္ုပ္လမ္းကá€á€¯á€»á€•á€„္ေပးပါ မွဒီအစီရင္á€á€¶á€…ာကá€á€¯á€–ယ္ျပီးပါျပီ" @@ -3089,7 +2974,7 @@ msgid "" " If you leave this blank, <strong>send method defaults to email</strong>." msgstr "" -#: templates/web/base/open311/index.html:90 +#: templates/web/base/open311/index.html:82 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 "" @@ -3110,12 +2995,12 @@ msgstr "" msgid "The diligency prize league table shows editors' activity (who's been editing the most records)." msgstr "" -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:60 -#: perllib/FixMyStreet/App/Controller/Reports.pm:79 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:61 +#: perllib/FixMyStreet/App/Controller/Reports.pm:80 msgid "The error was: %s" msgstr "á€á€ºá€á€³á‚•á€šá€¼á€„္းမႈမွာ - %s" -#: templates/web/base/open311/index.html:86 +#: templates/web/base/open311/index.html:78 msgid "The following Open311 v2 attributes are returned for each request: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code and service_name." msgstr "" @@ -3162,8 +3047,7 @@ msgstr "" msgid "The passwords do not match" msgstr "စကားá€á€½á€€á€¹á€™á€ºá€¬á€¸á€žá€Šá€¹á€™á€á€°á€Šá€®á€•á€«" -#: templates/web/base/errors/page_error_404_not_found.html:10 -#: templates/web/base/errors/page_error_404_not_found.html:12 +#: templates/web/base/errors/page_error_404_not_found.html:9 msgid "The requested URL '%s' was not found on this server" msgstr "သင္ေá€á€¬á€„္းဆá€á€¯á€±á€žá€¬ URL %s ကá€á€¯á€’ီဆာဗာမွာရွာမေá€á€¼á‚•á€•á€«" @@ -3173,12 +3057,11 @@ msgstr "" #: templates/web/base/report/new/councils_extra_text.html:1 #: templates/web/base/report/new/councils_text_some.html:10 -#: templates/web/base/report/new/fill_in_details_form.html:18 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:14 +#: templates/web/base/report/new/fill_in_details_form.html:13 msgid "The summary and description will also be made public (see our <a href=\"/privacy\">privacy policy</a>)." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:315 +#: perllib/FixMyStreet/Script/Reports.pm:92 msgid "The user could not locate the problem on a map, but to see the area around the location they entered" msgstr "" @@ -3195,18 +3078,18 @@ msgstr "" msgid "There are no reports to show." msgstr "" -#: perllib/FixMyStreet/App/Controller/Reports.pm:76 +#: perllib/FixMyStreet/App/Controller/Reports.pm:77 msgid "There was a problem showing the All Reports page. Please try again later." msgstr "" #: perllib/FixMyStreet/App/Controller/Contact.pm:137 -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:59 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:60 msgid "There was a problem showing this page. Please try again later." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:769 -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:134 -#: templates/web/base/auth/general.html:26 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:764 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:138 +#: templates/web/base/auth/general.html:43 #: templates/web/zurich/auth/general.html:28 msgid "There was a problem with your email/password combination. If you cannot remember your password, or do not have one, please fill in the ‘sign in by email’ section of the form." msgstr "အီးေမးလ္á‚ွင့္ လ်ွá€á€³á‚•á€á€½á€€á€¹á€”ံပါá€á€¹á€á€¼á€„္ ျပႆနာ ျဖစ္ေပášá€á€²á€·á€•á€«á€žá€Šá€¹á‹ သင္á လွ်á€á€³á‚•á€á€½á€€á€¹á€”ံပါá€á€¹á€€á€á€¯ မမွá€á€¹á€™á€á€•á€«á€€ သá€á€¯á‚”မဟုá€á€¹ မရá€á€½á€±á€žá€¸á€•á€«á€€ ေလွ်က္လႊာá \"အီးေမးလ္ျဖင့္ á€á€„္ရန္\" ေနရာá€á€¼á€„္ ျဖည့္ပါá‹" @@ -3215,7 +3098,7 @@ msgstr "အီးေမးလ္á‚ွင့္ လ်ွá€á€³á‚•á€á€½á€€á€¹á€ msgid "There was a problem with your email/password combination. Please try again." msgstr "အီးေမးလ္ သá€á€¯á‚”မဟုá€á€¹ စကားá€á€½á€€á€¹á€á€¼á€„္ ျပႆနာ ျဖစ္ေပášá€á€²á€·á€•á€«á€žá€Šá€¹á‹ ျပန္လည္ ႀကá€á€³á€¸á€…ားပါá‹" -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:272 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:336 msgid "There was a problem with your update. Please try again." msgstr "" @@ -3223,7 +3106,7 @@ msgstr "" msgid "There were problems with your report. Please see below." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:300 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:371 msgid "There were problems with your update. Please see below." msgstr "" @@ -3237,7 +3120,7 @@ msgid "" " " msgstr "" -#: templates/web/base/open311/index.html:77 +#: templates/web/base/open311/index.html:69 msgid "This API implementation is work in progress and not yet stabilized. It will change without warnings in the future." msgstr "" @@ -3259,18 +3142,18 @@ msgid "" " A body will not receive any reports unless it covers at least one area." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:413 +#: perllib/FixMyStreet/Script/Reports.pm:191 msgid "This email has been sent to both councils covering the location of the problem, as the user did not categorise it; please ignore it if you're not the correct council to deal with the issue, or let us know what category of problem this is so we can add it to our system." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:416 +#: perllib/FixMyStreet/Script/Reports.pm:194 msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:925 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:995 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:920 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:990 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:142 -#: perllib/FixMyStreet/Cobrand/UK.pm:43 +#: perllib/FixMyStreet/Cobrand/UK.pm:44 msgid "This information is required" msgstr "ဒီအá€á€ºá€€á€¹á€¡á€œá€€á€¹ ျဖည့္စြက္ရန္ လá€á€¯á€¡á€•á€¹á€žá€Šá€¹" @@ -3282,56 +3165,37 @@ msgstr "" msgid "This is a summary of all reports on this site." msgstr "" -#: templates/web/zurich/auth/token.html:8 -msgid "This may be because the link is too old or already used, or the address was not copied correctly." -msgstr "" - -#: templates/web/base/report/banner.html:15 -msgid "This problem has been closed" -msgstr "ဒီျပႆနာကá€á€¯á€•á€á€á€¹á€‘ားျပီးျဖစ္သည္á‹" - -#: templates/web/base/report/banner.html:12 -#: templates/web/base/report/update-form.html:48 -#: templates/web/fixmystreet/report/update-form.html:46 +#: templates/web/base/report/update/form_update.html:52 msgid "This problem has been fixed" msgstr "ဒီျပႆနာကá€á€¯á€±á€»á€–ရွင္းျပီးပါျပီ" -#: templates/web/base/report/update-form.html:43 -#: templates/web/fixmystreet/report/update-form.html:40 +#: templates/web/base/report/update/form_update.html:46 msgid "This problem has not been fixed" msgstr "ဒီျပႆနာကá€á€¯á€™á€±á€»á€–ရွင္းရေသးပါ" -#: templates/web/base/report/banner.html:19 -msgid "This problem is in progress" -msgstr "ဒီျပႆနာကá€á€¯á€±á€»á€–ရွင္းေနဆဲျဖစ္သည္" - -#: templates/web/base/report/banner.html:9 -msgid "This problem is old and of unknown status." -msgstr "ဒီျပႆနာသည္အရမ္းá¾á€€á€¬á€»á€•á€®á€»á€–စ္ျပီး အေျá€á€¡á€±á€”ကá€á€¯á€™á€žá€á€›á€•á€«" - #: perllib/FixMyStreet/Cobrand/Zurich.pm:168 #: perllib/FixMyStreet/Cobrand/Zurich.pm:169 #: templates/web/zurich/report/_main.html:14 msgid "This report is awaiting moderation." msgstr "ဒီအစီရင္á€á€¶á€…ာသည္အá€á€Šá€¹á€»á€•á€³á€»á€á€„္းကá€á€¯á€±á€…ာင့္ဆá€á€¯á€„္းေနဆဲျဖစ္သည္" -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:86 +#: perllib/FixMyStreet/Script/Alerts.pm:94 msgid "This report is currently marked as closed." msgstr "ဒီျပႆနာကá€á€¯ ပá€á€á€¹á€‘ားသည္ဟုေလာေလာဆယ္သá€á€¹á€™á€½á€á€¹á€‘ားသည္" -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:84 +#: perllib/FixMyStreet/Script/Alerts.pm:92 msgid "This report is currently marked as fixed." msgstr "ဒီျပႆနာကá€á€¯á€±á€œá€¬á€±á€œá€¬á€†á€šá€¹á€±á€»á€–ရွင္းျပီးျပီဟုသá€á€¹á€™á€½á€á€¹á€‘ားသည္" -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:88 +#: perllib/FixMyStreet/Script/Alerts.pm:96 msgid "This report is currently marked as open." msgstr "ဒီအစီရင္á€á€¶á€…ာကá€á€¯á€šá€á€¯á€±á€œá€¬á€±á€œá€¬á€†á€šá€¹á€–ြင့္ထားသည္" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:326 +#: perllib/FixMyStreet/Script/Reports.pm:105 msgid "This report was submitted anonymously" msgstr "ဒီအစီရင္á€á€¶á€…ာကá€á€¯á€¡á€™á€Šá€¹á€™á€žá€á€žá€°á€™á€½á€á€„္သြင္းá€á€²á€·á€žá€Šá€¹" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:308 +#: perllib/FixMyStreet/Script/Reports.pm:85 msgid "This web page also contains a photo of the problem, provided by the user." msgstr "ဒီ web စာမ်က္á‚ွာသည္ အသံုးျပဳသူမွရá€á€¯á€€á€¹á€‘ားေသာ ျပႆနာáဓာá€á€¹á€•á€¶á€¯á€á€…္ပံုပါá€á€„္သည္" @@ -3342,7 +3206,7 @@ msgstr "ဒီ web စာမ်က္á‚ွာသည္ အသံုးျပဳ msgid "Time spent (in minutes):" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1278 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1287 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "" @@ -3358,19 +3222,18 @@ msgid "Title:" msgstr "" #: templates/web/base/alert/index.html:25 -#, fuzzy msgid "To find out what local alerts we have for you, please enter your %s postcode or street name and area:" -msgstr "ျပည္á€á€¼á€„္း သá€á€á€±á€•á€¸á€á€ºá€€á€¹á€™á€ºá€¬á€¸ ေဖာ္ျပရန္အá€á€¼á€€á€¹ သင္á စာá€á€á€¯á€€á€¹á€±á€žá€á²á€¬á€¡á€™á€½á€á€¹ သá€á€¯á‚”မဟုá€á€¹ လမ္းနာမည္á‚ွင့္ ဧရá€á€šá€¬á€€á€á€¯ ထည့္သြင္းပါá‹" +msgstr "" #: templates/web/base/alert/index.html:27 msgid "To find out what local alerts we have for you, please enter your postcode or street name and area" msgstr "ျပည္á€á€¼á€„္း သá€á€á€±á€•á€¸á€á€ºá€€á€¹á€™á€ºá€¬á€¸ ေဖာ္ျပရန္အá€á€¼á€€á€¹ သင္á စာá€á€á€¯á€€á€¹á€±á€žá€á²á€¬á€¡á€™á€½á€á€¹ သá€á€¯á‚”မဟုá€á€¹ လမ္းနာမည္á‚ွင့္ ဧရá€á€šá€¬á€€á€á€¯ ထည့္သြင္းပါá‹" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:314 +#: perllib/FixMyStreet/Script/Reports.pm:91 msgid "To view a map of the precise location of this issue" msgstr "" -#: templates/web/base/admin/index.html:61 +#: templates/web/base/admin/index.html:54 #: templates/web/base/admin/questionnaire.html:24 #: templates/web/base/admin/stats.html:24 #: templates/web/base/admin/stats.html:43 @@ -3388,10 +3251,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:12 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:33 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:31 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:37 msgid "Unable to fix" msgstr "" @@ -3404,7 +3265,7 @@ msgstr "" msgid "Unconfirmed" msgstr "" -#: templates/web/fixmystreet/report/banner.html:9 +#: templates/web/base/report/banner.html:9 msgid "Unknown" msgstr "" @@ -3412,17 +3273,18 @@ msgstr "" msgid "Unknown alert type" msgstr "" +#: perllib/FixMyStreet/App/Controller/Photo.pm:110 #: templates/web/base/js/translation_strings.html:39 msgid "Unknown error" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:103 -#: perllib/FixMyStreet/App/Controller/Report.pm:109 -#: perllib/FixMyStreet/App/Controller/Report.pm:112 +#: perllib/FixMyStreet/App/Controller/Report.pm:105 +#: perllib/FixMyStreet/App/Controller/Report.pm:111 +#: perllib/FixMyStreet/App/Controller/Report.pm:114 msgid "Unknown problem ID" msgstr "" -#: templates/web/fixmystreet/report/update-form.html:19 +#: templates/web/base/report/update/form_update.html:25 msgid "Update" msgstr "" @@ -3430,13 +3292,11 @@ msgstr "" msgid "Update %s created for problem %d; by %s" msgstr "" -#: templates/web/base/contact/index.html:21 -#: templates/web/fixmystreet/contact/index.html:36 +#: templates/web/base/contact/index.html:28 msgid "Update below added anonymously at %s" msgstr "" -#: templates/web/base/contact/index.html:23 -#: templates/web/fixmystreet/contact/index.html:38 +#: templates/web/base/contact/index.html:30 msgid "Update below added by %s at %s" msgstr "" @@ -3445,7 +3305,7 @@ msgstr "" msgid "Update body" msgstr "" -#: templates/web/base/admin/index.html:55 +#: templates/web/base/admin/index.html:48 msgid "Update breakdown by state" msgstr "" @@ -3470,20 +3330,16 @@ msgstr "" msgid "Update statuses" msgstr "" -#: templates/web/base/report/update-form.html:22 -msgid "Update:" -msgstr "" - #: templates/web/zurich/admin/index-dm.html:23 #: templates/web/zurich/admin/index-sdm.html:21 #: templates/web/zurich/admin/reports.html:13 msgid "Updated" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1045 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1103 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1147 -#: perllib/FixMyStreet/App/Controller/Admin.pm:822 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1048 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1108 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1156 +#: perllib/FixMyStreet/App/Controller/Admin.pm:821 #: perllib/FixMyStreet/Cobrand/Zurich.pm:771 #: perllib/FixMyStreet/Cobrand/Zurich.pm:796 #: perllib/FixMyStreet/Cobrand/Zurich.pm:866 @@ -3491,13 +3347,12 @@ msgid "Updated!" msgstr "" #: templates/web/base/admin/list_updates.html:2 -#: templates/web/base/report/update.html:3 -#: templates/web/fixmystreet/report/update.html:5 +#: templates/web/base/report/update.html:5 #: templates/web/zurich/report/updates.html:2 msgid "Updates" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:132 +#: perllib/FixMyStreet/DB/Result/Comment.pm:131 msgid "Updates are limited to %s characters in length. Please shorten your update" msgstr "" @@ -3507,12 +3362,9 @@ msgstr "" #. ("%s is the site name") #: templates/web/base/report/display.html:0 -#: templates/web/base/report/display.html:5 -#: templates/web/fixmystreet/report/display.html:0 -#: templates/web/fixmystreet/report/display.html:9 -#, fuzzy +#: templates/web/base/report/display.html:9 msgid "Updates to this problem, %s" -msgstr "ဒီျပႆနာမ်ားကá€á€¯ FixMyStreet သá€á€¯á‚”á€á€„္ျပပါá‹" +msgstr "" #: templates/web/base/admin/body.html:182 msgid "Use the <strong>note</strong> to record details that are only displayed in the admin. Notes are not shown publicly, and are not sent to the body." @@ -3520,15 +3372,14 @@ msgstr "စီမံသူá€á€¼á€„္သာ ေဖာ္ျပေပးသညဠ#: templates/web/zurich/admin/report_edit-sdm.html:48 #: templates/web/zurich/admin/report_edit.html:67 -#, fuzzy msgid "Used map" -msgstr "ေျမပံု အသံုးျပဳထားá¿á€•á€®á€¸" +msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1452 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1461 msgid "User flag removed" msgstr "သုံးစြဲသူ အမွá€á€¹á€¡á€žá€¬á€¸ ျပဳလုပ္ျá€á€„္းကá€á€¯ ဖယ္ရွားလá€á€¯á€€á€¹á€žá€Šá€¹á‹" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1424 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1433 msgid "User flagged" msgstr "သုုံးစြဲသူက အမွá€á€¹á€¡á€žá€¬á€¸ ျပဳလုပ္ျá€á€„္း" @@ -3536,7 +3387,7 @@ msgstr "သုုံးစြဲသူက အမွá€á€¹á€¡á€žá€¬á€¸ ျပဳá msgid "User search finds matches in users' names and email addresses." msgstr "သုံးစြဲသူရွာေဖြမႈသည္ áŽá€á€á€¯á‚”á အီးေမးလá€á€•á€¹á€…ာá‚ွင့္ နာမည္မ်ားရွဠá€á€°á€Šá€®á€™á‚ˆá€™á€ºá€¬á€¸á€€á€á€¯ ေá€á€¼á‚”ရွá€á‚á€á€¯á€„္သည္ዠ" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1280 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1289 #: perllib/FixMyStreet/Cobrand/Zurich.pm:399 #: templates/web/base/admin/flagged.html:29 #: templates/web/zurich/header.html:69 @@ -3567,7 +3418,6 @@ msgid "Viewing a location" msgstr "á€á€Šá€¹á€±á€”ရာကá€á€¯ စá€á€…စ္ျá€á€„္း" #: templates/web/base/report/display.html:0 -#: templates/web/fixmystreet/report/display.html:0 msgid "Viewing a problem" msgstr "ျပႆနာကá€á€¯ စá€á€…စ္ျá€á€„္း" @@ -3580,25 +3430,24 @@ 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/zurich/auth/token.html:7 -msgid "We have not been able to confirm your account - sorry." -msgstr "သင့္ account ကá€á€¯á€¡á€á€Šá€¹ မျပဳá‚á€á€¯á€„္ေသးပါ- á€á€™á€¹á€¸á€”ည္းပါá€á€šá€¹á‹" - -#: templates/web/zurich/auth/token.html:17 -msgid "We have sent you an email containing a link to confirm your account." -msgstr "မá€á€™á€á€á€á€¯á‚”သည္ သင့္ account ကá€á€¯á€¡á€á€Šá€¹á€»á€•á€³á€±á€•á€¸á€™á€Šá€¹á€· လင့္á€á€¹á€•á€«á€á€„္ေသာ အီးေမးကá€á€¯ ေပးပá€á€¯á‚”ထားပါသည္á‹" +#: templates/web/base/auth/general.html:6 +#: templates/web/base/report/display.html:27 +#: templates/web/base/report/new/oauth_email_form.html:5 +#, fuzzy +msgid "We need your email address, please give it below." +msgstr "မá€á€™á€á€á€á€¯á‚”သည္ သင့္ဖုန္းနံပါá€á€¹ သá€á€¯á‚”မဟုá€á€¹ အီးေမးလá€á€•á€¹á€…ာကá€á€¯ ျပသသြားမည္ မဟုá€á€¹á€•á€«" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:2 -#: templates/web/fixmystreet/report/update-form.html:77 +#: templates/web/base/report/new/form_user_loggedout_email.html:2 +#: templates/web/base/report/update/form_user_loggedout_email.html:2 msgid "We never show your email" msgstr "သင့္အီးေမးလá€á€•á€¹á€…ာကá€á€¯ ျပသ သြားမည္မဟုá€á€¹á€•á€«á‹" -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:31 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:65 +#: templates/web/base/report/new/form_user_loggedin.html:31 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:28 msgid "We never show your email address or phone number." msgstr "မá€á€™á€á€á€á€¯á‚”သည္ သင့္ဖုန္းနံပါá€á€¹ သá€á€¯á‚”မဟုá€á€¹ အီးေမးလá€á€•á€¹á€…ာကá€á€¯ ျပသသြားမည္ မဟုá€á€¹á€•á€«" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:422 +#: perllib/FixMyStreet/Script/Reports.pm:200 msgid "We realise this problem might be the responsibility of %s; however, we don't currently have any contact details for them. If you know of an appropriate contact address, please do get in touch." msgstr "မá€á€™á€á€á€á€¯á‚”သည္ %s; áá€á€¬á€á€”္ျဖစ္ေá¾á€€á€¬á€„္း သá€á€á€»á€•á€³á€™á€á€±á€žá€¬á€¹á€œá€Šá€¹á€¸ မá€á€™á€á€á€á€¯á‚”á€á€¼á€„္ áŽá€á€á€¯á‚”ကá€á€¯ ဆက္သြယ္ရန္ အေသးစá€á€á€¹ မရွá€á€±á€žá€¸á€•á€«á‹ အကယ္á သင့္ေá€á€¬á€¹á€žá€Šá€¹á€· လá€á€•á€¹á€…ာရွá€á€•á€«á€€ ေက်းဇူးျပဳá¿á€•á€®á€¸ ဆက္သြယ္ေပးပါá‹" @@ -3615,10 +3464,6 @@ msgstr "မá€á€™á€á€á€á€¯á‚”á privacy ေပášá€œá€…ီá‚ွင့္အ msgid "We’re sorry to hear the problem’s not fixed. Why not try writing to your local representatives?" msgstr "" -#: templates/web/base/contact/blurb.html:8 -msgid "We'd love to hear what you think about this site. Just fill in the form, or send an email to <a href='mailto:%s'>%s</a>:" -msgstr "မá€á€™á€á€á€á€¯á‚”အေနနဲ႔ ယá€á€¯á€†á€á€¯á€€á€¹á€”ဲ႔ ပá€á€¹á€žá€€á€¹á€žá€Šá€¹á€· အႀကံဥာá€á€¹á€™á€ºá€¬á€¸ သá€á€œá€á€¯á€•á€«á€žá€Šá€¹á‹ ပုံစံá€á€¼á€„္ျဖည့္ျá€á€„္း သá€á€¯á‚”မဟုá€á€¹ <a href='mailto:%s'>%s</a>: သá€á€¯á‚” အီးေမး ေပးပá€á€¯á‚”á‚á€á€¯á€„္ပါသည္á‹" - #: templates/web/base/contact/submit.html:7 msgid "We’ll get back to you as soon as we can." msgstr "" @@ -3627,7 +3472,7 @@ msgstr "" msgid "What was your experience of getting the problem fixed?" msgstr "" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:49 +#: templates/web/base/report/new/form_report.html:19 msgid "What’s the issue, and where is it?" msgstr "" @@ -3640,7 +3485,11 @@ msgstr "ျပင္ဆင္á€á€²á€·á€žá€Šá€¹á€· အá€á€ºá€á€”္" msgid "When sent" msgstr "ေပးပá€á€¯á‚”á€á€²á€·á€žá€Šá€¹á€· အá€á€ºá€á€”္" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:640 +#: templates/web/base/js/translation_strings.html:50 +msgid "Whoa there Testino! Three photos are enough." +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Report/New.pm:635 msgid "Whole block of empty flats" msgstr "á€á€á€¯á€€á€¹á€á€”္းလြá€á€¹á€™á€ºá€¬á€¸ ရွá€á€›á€¬ ဘေလာက္" @@ -3655,7 +3504,7 @@ msgstr "" msgid "Wish" msgstr "" -#: templates/web/base/open311/index.html:92 +#: templates/web/base/open311/index.html:84 msgid "With request searches, it is also possible to search for agency_responsible to limit the requests to those sent to a single administration. The search term is the administration ID provided by <a href=\"%s\">MaPit</a>." msgstr "" "ေá€á€¬á€„္းဆá€á€¯ ရွာေဖြမႈမ်ားá‚ွင့္ အá€á€° အုပ္á€á€ºá€³á€•á€¹á€±á€›á€¸á€á€…္á€á€¯á€…ီကá€á€¯ ေပးပá€á€¯á‚”သည့္ ေá€á€¬á€„္းဆá€á€¯á€á€ºá€€á€¹á€™á€ºá€¬á€¸á€€á€á€¯ ကန္႔သá€á€¹á€›á€”္ ေအဂ်င္စီá€á€¬á€á€”္ အá€á€¼á€€á€¹á€›á€½á€¬á€±á€–ြမႈမ်ားလည္း ျဖစ္\n" @@ -3665,7 +3514,7 @@ msgstr "" msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"http://fixmystreet.org\">available at fixmystreet.org</a>." msgstr "" -#: templates/web/base/questionnaire/index.html:87 +#: templates/web/base/questionnaire/index.html:96 msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?" msgstr "သင့္အေနျဖင့္ ေလးပá€á€¹á€¡á€á€¼á€„္း အျá€á€¬á€¸á€±á€™á€¸á€á€¼á€”္းမ်ား ရရွá€á€œá€á€¯á¿á€•á€®á€¸ အေျá€á€¡á€±á€”ကá€á€¯ သá€á€á€›á€±á€…ရန္ သá€á€á€±á€•á€¸á€œá€á€¯á€•á€«á€žá€œá€¬á€¸á‹" @@ -3674,7 +3523,6 @@ msgid "Writing your message entirely in block capitals makes it hard to read, as msgstr "မက္ေဆ့á€á€ºá€¹ á€á€…္á€á€¯á€œá€¯á€¶á€¸á€€á€á€¯ စာလုံးအႀကီးမ်ား ျဖင့္ ေရးျá€á€„္းသည္ ဖá€á€¹á€›á€á€€á€¹á€á€²á¿á€•á€®á€¸ ပုဒ္ျဖá€á€¹á€•á€¯á€’္ရပ္ ကá€á€¯á€œá€Šá€¹á€¸ ေပ်ာက္ေစသည္á‹" #: templates/web/base/report/new/fill_in_details_form.html:4 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:5 msgid "Wrong location? Just click again on the map." msgstr "" @@ -3697,27 +3545,24 @@ msgstr "á€á€¯á‚ွစ္" #: templates/web/base/admin/users.html:31 #: templates/web/base/questionnaire/creator_fixed.html:14 #: templates/web/base/questionnaire/index.html:51 -#: templates/web/base/questionnaire/index.html:90 +#: templates/web/base/questionnaire/index.html:99 msgid "Yes" msgstr "ဟုá€á€¹á€žá€Šá€¹á‹" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:17 -#: templates/web/fixmystreet/report/update-form.html:91 +#: templates/web/base/report/new/form_user_loggedout_password.html:5 +#: templates/web/base/report/update/form_user_loggedout_password.html:4 msgid "Yes I have a password" msgstr "ကá½á€¼á‚ု္ပ္á€á€¼á€„္ စကားá€á€½á€€á€¹á€á€…္á€á€¯ ရá€á€½á€žá€Šá€¹" -#: templates/web/base/contact/index.html:39 -#: templates/web/fixmystreet/contact/index.html:54 +#: templates/web/base/contact/index.html:46 msgid "You are complaining that this problem report was unnecessarily moderated:" msgstr "" -#: templates/web/base/contact/index.html:41 -#: templates/web/fixmystreet/contact/index.html:56 +#: templates/web/base/contact/index.html:48 msgid "You are reporting the following problem report for being abusive, containing personal information, or similar:" msgstr "á€á€…္ကá€á€¯á€šá€¹á€›á€Šá€¹ အá€á€ºá€€á€¹á€¡á€œá€€á€¹á€™á€ºá€¬á€¸ သá€á€¯á‚”မဟုá€á€¹ á€á€°á€Šá€®á€žá€Šá€¹á€·á€¡á€›á€¬á€™á€ºá€¬á€¸ ေစာ္ကားá€á€¶á€›á€¡á€á€¼á€€á€¹ ေဖာ္ျပျပႆနာ အစီရင္á€á€¶á€…ာကá€á€¯ ရသည္á‹" -#: templates/web/base/contact/index.html:15 -#: templates/web/fixmystreet/contact/index.html:30 +#: templates/web/base/contact/index.html:22 msgid "You are reporting the following update for being abusive, containing personal information, or similar:" msgstr "သင့္အေနျဖင့္ ေစာ္ကားá€á€¶á€±á€”ရေá¾á€€á€¬á€„္း ျပန္လည္မြမ္းမံထားသည္ á€á€á€¯á‚”ကေဖာ္ျပေနá¿á€•á€®á€¸ ထá€á€¯á€‘ဲá€á€¼á€„္ á€á€…္ကုá€á€šá€¹á€›á€Šá€¹ အá€á€ºá€€á€¹á€¡á€œá€€á€¹ သá€á€¯á‚”မဟုá€á€¹ á€á€°á€Šá€®á€žá€Šá€¹á€· အá€á€ºá€€á€¹á€¡á€œá€€á€¹á€™á€ºá€¬á€¸ ပါá€á€„္သည္á‹" @@ -3730,7 +3575,7 @@ msgstr "သင့္အေနျဖင့္ ယá€á€¯á€†á€á€¯á€€á€¹á€á€¼á€„ဠmsgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create." msgstr "သင့္အေနျဖင့္ ယဥ္ေက်းမႈမရွá€á€±á€žá€¬ သုံးစြဲသူá အီးေမးလ္ကá€á€¯ áŽá€á€á€¯á‚”ဖန္á€á€®á€¸á€‘ားေသာ အလá€á€¯á€¡á€±á€œá€ºá€¬á€€á€¹ ဖုံးထားေသာ(မေပးပá€á€¯á‚”ေသာ) အစီရင္á€á€¶á€…ာမ်ား ျဖစ္သည့္ ယဥ္ေက်းမႈမရွá€á€±á€žá€¬ စာရင္းá€á€¼á€„္ ထည့္သြင္းထားá‚á€á€¯á€„္သည္á‹" -#: templates/web/fixmystreet/contact/index.html:121 +#: templates/web/base/contact/index.html:113 msgid "You can contact technical support on <a href='mailto:%s'>%s</a>" msgstr "" @@ -3741,8 +3586,8 @@ msgid "" " reports in the past." msgstr "သင့္အေနျဖင့္မည္သည့္ report ကá€á€¯á€™á€†á€¯á€ သá€á€¯á‚”မဟုá€á€¹ သုံးစြဲသူကá€á€¯ ျပင္ဆင္လá€á€¯á€•á€«á€€ အမွá€á€¹á€¡á€žá€¬á€¸ ျပဳလုပ္á‚á€á€¯á€„္á¿á€•á€®á€¸ áŽá€á€á€¯á‚”သည္ စာမ်က္á‚ွာေပášá€á€¼á€„္ ေဖာ္ျပá€á€¶á€›á€™á€Šá€¹ ျဖစ္သည္ዠဥပမာ အá€á€á€á€¹á€á€¼á€„္ မသင့္ေလွ်ာ္သည့္ အစီရင္á€á€¶á€…ာမ်ား á€á€„္သူမ်ားကá€á€¯ ေစာင့္á¾á€€á€Šá€¹á€·á€œá€á€¯á€•á€«á€€ အသုံးá€á€„္လာမည္ ျဖစ္သည္á‹" -#: templates/web/base/report/new/councils_text_none.html:10 -#: templates/web/base/report/new/councils_text_none.html:2 +#: templates/web/base/report/new/councils_text_none.html:12 +#: templates/web/base/report/new/councils_text_none.html:14 #: templates/web/base/report/new/councils_text_some.html:19 #: templates/web/base/report/new/councils_text_some.html:21 msgid "You can help us by finding a contact email address for local problems for %s and emailing it to us at <a href='mailto:%s'>%s</a>." @@ -3763,21 +3608,16 @@ msgstr "" "မွာ သင့္ျပႆနာကá€á€¯ သြားေရာက္ á¾á€€á€Šá€¹á€·á€›á€°á‚á€á€¯á€„္ပါသည္ዠ\n" "\n" -#: templates/web/base/questionnaire/index.html:77 -#: templates/web/base/report/new/fill_in_details_form.html:75 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:73 -msgid "You have already attached a photo to this report, attaching another one will replace it." -msgstr "ဒီအစီရင္á€á€¶á€…ာá€á€¼á€„္ ဓာá€á€¹á€•á€¯á€¶á€á€¼á€²á€á€„္ထားá¿á€•á€® ျဖစ္á¿á€•á€®á€¸ အျá€á€¬á€¸á€á€…္á€á€¯ á€á€¼á€²á€á€„္ျá€á€„္းသည္ အရင္ေနရာá€á€¼á€„္ အစားထá€á€¯á€¸á€žá€¼á€¬á€¸á€•á€«á€™á€Šá€¹á‹" - -#: templates/web/base/report/update-form.html:59 -#: templates/web/fixmystreet/report/update-form.html:56 -msgid "You have already attached a photo to this update, attaching another one will replace it." -msgstr "ယá€á€¯ ျပင္ဆင္မြမ္းမံမႈကá€á€¯ ဓာá€á€¹á€•á€¯á€¶á€»á€–င့္ á€á€¼á€²á€á€„္ထားá¿á€•á€®á€¸ ျဖစ္á¿á€•á€®á€¸ အျá€á€¬á€¸á€á€…္á€á€¯á€á€¼á€²á€á€„္လွ်င္ အရင္ေနရာá€á€¼á€„္ အစားထá€á€¯á€¸á€±á€•á€¸á€žá€¼á€¬á€¸á€™á€Šá€¹ ျဖစ္သည္á‹" - -#: templates/web/zurich/report/new/fill_in_details_form.html:61 +#: templates/web/base/report/new/form_report.html:32 +#: templates/web/zurich/report/new/fill_in_details_form.html:55 msgid "You have already attached photos to this report. Note that you can attach a maximum of 3 to this report (if you try to upload more, the oldest will be removed)." msgstr "" +#: templates/web/base/questionnaire/index.html:83 +#: templates/web/base/report/update/form_update.html:14 +msgid "You have already attached photos to this update. Note that you can attach a maximum of 3 to this update (if you try to upload more, the oldest will be removed)." +msgstr "" + #: templates/web/base/auth/sign_out.html:4 #: templates/web/zurich/auth/sign_out.html:3 msgid "You have been signed out" @@ -3794,9 +3634,8 @@ msgstr "" msgid "You have successfully confirmed your email address." msgstr "သင္á အီးေမးလ္လá€á€•á€¹á€…ာကá€á€¯ ေအာင္ျမင္စြာ အá€á€Šá€¹á€»á€•á€³á¿á€•á€®á€¸ ျဖစ္သည္" -#: templates/web/base/report/display.html:20 -#: templates/web/base/report/new/fill_in_details.html:37 -#: templates/web/fixmystreet/report/display.html:17 +#: templates/web/base/report/display.html:17 +#: templates/web/base/report/new/login_success_form.html:3 msgid "You have successfully signed in; please check and confirm your details are accurate:" msgstr "သင္ ေအာင္ျမင္စြာ á€á€„္ေရာက္á‚á€á€¯á€„္á€á€²á€·á€•á€«á¿á€•á€®á‹ သင္á အေသးစá€á€á€¹ အá€á€ºá€€á€¹á€¡á€œá€€á€¹ မွန္ကန္မႈ ရá€á€½ မရá€á€½ စစ္ေဆးá¿á€•á€®á€¸ အá€á€Šá€¹á€»á€•á€³á€•á€«á‹" @@ -3825,53 +3664,42 @@ msgid "Your Reports" msgstr "သင္á အစီရင္á€á€¶á€…ာမ်ား" #: templates/web/base/alert/_list.html:89 +#: templates/web/base/contact/index.html:83 +#: templates/web/base/report/display_tools.html:38 +#: templates/web/base/report/display_tools.html:40 +#: templates/web/base/report/new/form_user_loggedin.html:3 +#: templates/web/base/report/new/form_user_loggedout_email.html:1 +#: templates/web/base/report/update/form_user_loggedout_email.html:1 #: templates/web/fixmystreet/alert/updates.html:19 #: templates/web/fixmystreet/alert/updates.html:22 -#: templates/web/fixmystreet/contact/index.html:91 -#: templates/web/fixmystreet/report/display.html:62 -#: templates/web/fixmystreet/report/display.html:64 -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:3 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:1 -#: templates/web/fixmystreet/report/update-form.html:76 #: templates/web/zurich/report/new/fill_in_details_form.html:76 msgid "Your email" msgstr "သင္á အီးေမးလ္" -#: templates/web/base/auth/general.html:28 -#: templates/web/fixmystreet/report/update-form.html:82 +#: templates/web/base/auth/general.html:45 +#: templates/web/base/report/update/form_user_loggedout_email.html:7 #: templates/web/zurich/auth/general.html:30 #: templates/web/zurich/auth/general.html:58 msgid "Your email address" msgstr "သင္á အီးေမးလ္လá€á€•á€¹á€…ာ" -#: templates/web/base/report/new/fill_in_details_form.html:106 -#: templates/web/base/report/update-form.html:81 -msgid "Your email:" -msgstr "သင္á အီးေမးလ္" - -#: templates/web/fixmystreet/report/updates-sidebar-notes.html:7 +#: templates/web/base/report/updates-sidebar-notes.html:3 msgid "Your information will only be used in accordance with our <a href=\"/privacy\">privacy policy</a>" msgstr "သင့္áအá€á€ºá€€á€¹á€¡á€œá€€á€¹á€™á€ºá€¬á€¸á€€á€á€¯ ကá½á€¼á‚ု္ပ္á€á€á€¯á‚”á သီးသန္႔á€á€Šá€¹á€›á€½á€á€™á‚ˆ ေပášá€œá€…ီ á‚ွင့္အညီ အသုံးျပဳသြားမည္ ျဖစ္သည္á‹" -#: templates/web/base/auth/general.html:51 -#: templates/web/fixmystreet/contact/index.html:84 -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:18 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:54 -#: templates/web/fixmystreet/report/update-form.html:142 +#: templates/web/base/auth/general.html:90 +#: templates/web/base/contact/index.html:76 +#: templates/web/base/report/new/form_user_loggedin.html:18 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:17 +#: templates/web/base/report/update/form_name.html:11 #: templates/web/zurich/auth/general.html:61 #: templates/web/zurich/report/new/fill_in_details_form.html:86 msgid "Your name" msgstr "သင့္အမည္" -#: templates/web/base/contact/index.html:73 -#: templates/web/base/report/new/fill_in_details_form.html:186 -#: templates/web/base/report/update-form.html:152 -msgid "Your name:" -msgstr "သင့္အမည္" - -#: templates/web/base/auth/general.html:39 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:22 -#: templates/web/fixmystreet/report/update-form.html:96 +#: templates/web/base/auth/general.html:75 +#: templates/web/base/report/new/form_user_loggedout_password.html:10 +#: templates/web/base/report/update/form_user_loggedout_password.html:9 #: templates/web/zurich/auth/general.html:34 msgid "Your password" msgstr "သင္á စကားá€á€½á€€á€¹" @@ -3880,15 +3708,16 @@ msgstr "သင္á စကားá€á€½á€€á€¹" msgid "Your password has been changed" msgstr "သင္á စကားá€á€½á€€á€¹á€€á€á€¯ ေျပာင္းလဲá¿á€•á€®á€¸á€»á€–စ္သည္" -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:27 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:63 +#: templates/web/base/report/new/form_user_loggedin.html:27 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:26 #: templates/web/zurich/report/new/fill_in_details_form.html:92 msgid "Your phone number" msgstr "သင္á ဖုန္းနံပါá€á€¹" #: templates/web/base/questionnaire/index.html:14 +#, fuzzy msgid "Your report" -msgstr "သင္á အစီရင္á€á€¶á€…ာ" +msgstr "သင္á အစီရင္á€á€¶á€…ာမ်ား" #: templates/web/base/footer.html:9 templates/web/fixmystreet/footer.html:29 msgid "Your reports" @@ -3898,23 +3727,17 @@ msgstr "သင္á အစီရင္á€á€¶á€…ာမ်ား" msgid "Your updates" msgstr "သင္á မြမ္းမံျပင္ဆင္ထားမႈမ်ား" -#: templates/web/base/contact/index.html:81 -msgid "Your email:" -msgstr "သင္á အီးေမးလ္" - #: templates/web/base/reports/_list-filters.html:3 -#, fuzzy msgid "all reports" -msgstr "အစီရင္á€á€¶á€…ာအားလံုး" +msgstr "" #: templates/web/base/admin/timeline.html:4 msgid "by %s" msgstr "%s မွ" #: templates/web/base/reports/_list-filters.html:5 -#, fuzzy msgid "closed reports" -msgstr "အစီရင္á€á€¶á€…ာကá€á€¯á€•á€á€á€¹á€™á€Šá€¹" +msgstr "" #: templates/web/base/reports/body.html:6 #: templates/web/base/reports/body.html:7 @@ -3936,17 +3759,16 @@ msgid "edit user" msgstr "သုံးစြဲသူအား ျပင္ဆင္ျá€á€„္း" #: templates/web/base/reports/_list-filters.html:6 -#, fuzzy msgid "fixed reports" -msgstr "ျပင္ျပီးေá¾á€€á€¬á€„္းအစီရင္á€á€¶á€…ာ" +msgstr "" -#: templates/web/base/admin/index.html:33 +#: templates/web/base/status/stats.html:20 #: templates/web/zurich/admin/index.html:5 msgid "from %s different users" -msgstr "%d မွ မá€á€°á€Šá€®á€±á€žá€¬ သုံးစြဲသူမ်ား" +msgstr "%s မွ မá€á€°á€Šá€®á€±á€žá€¬ သုံးစြဲသူမ်ား" -#: templates/web/base/report/_item.html:17 -#: templates/web/zurich/report/_item.html:16 +#: templates/web/base/report/_item.html:15 +#: templates/web/zurich/report/_item.html:14 msgid "last updated %s" msgstr "ေနာက္ဆုံး ျပဳျပင္မြမ္းမံမႈမ်ား" @@ -4038,10 +3860,8 @@ msgstr "ျပန္ဖြင့္ပါ" msgid "sign out" msgstr "ထြက္ရန္" -#: templates/web/base/report/new/fill_in_details_form.html:12 -#: templates/web/base/report/new/fill_in_details_form.html:15 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:10 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:12 +#: templates/web/base/report/new/fill_in_details_form.html:11 +#: templates/web/base/report/new/fill_in_details_form.html:9 msgid "the local council" msgstr "ျပည္á€á€¼á€„္းေကာင္စီ" @@ -4050,7 +3870,7 @@ msgstr "ျပည္á€á€¼á€„္းေကာင္စီ" msgid "there is no pin shown as the user did not use the map" msgstr "အသုံးျပဳသူ မသုံးသည့္ ေျမပုံကá€á€¯ ပင္အပ္ျဖင့္ မေဖာ္ျပထားပါ" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:398 +#: perllib/FixMyStreet/Script/Reports.pm:176 msgid "this type of local problem" msgstr "ေဒသá€á€¼á€„္း ျပႆနာသာျဖစ္သည္á‹" @@ -4059,9 +3879,8 @@ msgid "today" msgstr "ယေန႔" #: templates/web/base/reports/_list-filters.html:4 -#, fuzzy msgid "unfixed reports" -msgstr "ျပင္ျပီးေá¾á€€á€¬á€„္းအစီရင္á€á€¶á€…ာ" +msgstr "" #: templates/web/base/admin/report_edit.html:32 msgid "used map" @@ -4080,7 +3899,7 @@ msgstr "အသုံးျပဳသူပ ျပႆနာပá€á€¯á€„္ရွဠmsgid "ward" msgstr "အုပ္á€á€ºá€³á€•á€¹á€±á€›á€¸á€Œá€¬á€”" -#: templates/web/base/front/stats.html:17 +#: templates/web/base/front/stats.html:13 #, perl-format msgid "<big>%s</big> report recently" msgid_plural "<big>%s</big> reports recently" @@ -4104,7 +3923,7 @@ msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d မá€á€”စ္မ်ား" -#: templates/web/base/front/stats.html:29 +#: templates/web/base/front/stats.html:25 #, perl-format msgid "<big>%s</big> update on reports" msgid_plural "<big>%s</big> updates on reports" @@ -4122,13 +3941,13 @@ msgid "%d week" msgid_plural "%d weeks" msgstr[0] "%d ရက္သá€á±á€•á€á€¹á€™á€ºá€¬á€¸" -#: templates/web/base/front/stats.html:12 +#: templates/web/base/front/stats.html:8 #, perl-format msgid "<big>%s</big> report in past week" msgid_plural "<big>%s</big> reports in past week" msgstr[0] "<big>%s</big> á¿á€•á€®á€¸á€á€²á€·á€žá€Šá€¹á€· ရက္သá€á±á€•á€á€¹á€€ အစီရင္á€á€¶á€…ာမ်ား" -#: templates/web/base/front/stats.html:23 +#: templates/web/base/front/stats.html:19 #, perl-format msgid "<big>%s</big> fixed in past month" msgid_plural "<big>%s</big> fixed in past month" @@ -4146,68 +3965,71 @@ msgid "We do <strong>not</strong> yet have details for the other council that co msgid_plural "We do <strong>not</strong> yet have details for the other councils that cover this location." msgstr[0] "ကá½á€¼á‚ု္ပ္á€á€á€¯á‚”á€á€¼á€„္ ဒီá€á€Šá€¹á€±á€”ရာá‚ွင့္ ပá€á€¹á€žá€€á€¹á€žá€Šá€¹á€· အျá€á€¬á€¸á€±á€€á€¬á€„္အá€á€¼á€€á€¹ အေသးစá€á€á€¹á€™á€›á€½á€á€±á€žá€¸á€•á€«á‹" -#~ msgid "(Don't worry — we'll hang on to your alert while you're checking your email.)" -#~ msgstr "(စá€á€á€¹á€™á€•á€°á€•á€«á‚ွင့္ዠသင္ အီးေမးလ္ စစ္ေဆးေနá€á€ºá€á€”္á€á€¼á€„္ ကá½á€¼á‚ု္ပ္á€á€á€¯á‚”က သင္á သá€á€á€±á€•á€¸á€á€ºá€€á€¹á€€á€á€¯ ထá€á€”္းသá€á€™á€¹á€¸á€‘ားပါမည္á‹)" +#~ msgid "(we never show your email address or phone number)" +#~ msgstr "(သင္áအီးေမလ္လá€á€•á€¹á€…ာ သá€á€¯á‚”မဟုá€á€¹ ဖုန္းနံပါá€á€¹á€€á€á€¯á€€á½á€¼á‚္ုပ္á€á€á€¯á‚”မွ ဘယ္ေá€á€¬á€·á€™á€½á€™á€±á€–ာ္ျပပါ)" + +#~ msgid "(we never show your email)" +#~ msgstr "(သင္áအီးေမးလ္ကá€á€¯á€€á½á€¼á‚္ုပ္á€á€á€¯á‚”မွဘယ္ေá€á€¬á€·á€™á€½á€™á€±á€–ာ္ျပပါ)" -#~ msgid "(Don't worry — we'll hang on to your problem report while you're checking your email.)" -#~ msgstr "(စá€á€á€¹á€™á€•á€°á€•á€«á‚ွင့္ዠသင္ အီးေမးလ္ စစ္ေဆးေနá€á€ºá€á€”္á€á€¼á€„္ ကá½á€¼á‚ု္ပ္á€á€á€¯á‚”က သင္á ျပႆနာ အစီရင္á€á€¶á€…ာကá€á€¯ ထá€á€”္းသá€á€™á€¹á€¸á€‘ားပါမည္á‹)" +#~ msgid "<strong>No</strong>, let me confirm my report by email:" +#~ msgstr "<strong>မဟုá€á€¹á€•á€«</strong>ကá½á€¼á‚္ုပ္áအစီရင္á€á€¶á€…ာကá€á€¯á€¡á€®á€¸á€±á€™á€¸á€œá€¹á€»á€–င့္အá€á€Šá€¹á€»á€•á€³á€™á€Šá€¹ -" -#~ msgid "(Don't worry — we'll hang on to your update while you're checking your email.)" -#~ msgstr "(စá€á€á€¹á€™á€•á€°á€•á€«á‚ွင့္ዠသင္ အီးေမးလ္ စစ္ေဆးေနá€á€ºá€á€”္á€á€¼á€„္ ကá½á€¼á‚ု္ပ္á€á€á€¯á‚”က သင္á ေနာက္ဆံုး ျပဳျပင္ထားသည့္ အá€á€ºá€€á€¹á€¡á€œá€€á€¹á€€á€á€¯ ထá€á€”္းသá€á€™á€¹á€¸á€‘ားပါမည္á‹)" +#~ msgid "<strong>No</strong>, let me confirm my update by email:" +#~ msgstr "<strong>မဟုá€á€¹á€•á€«</strong>ကá½á€¼á‚္ုပ္áအသစ္မြမ္းမံျá€á€„္းကá€á€¯á€¡á€®á€¸á€±á€™á€œá€¹á€»á€–င့္အá€á€Šá€¹á€»á€•á€³á€™á€Šá€¹ -" -#~ msgid "<small>If you cannot see the map, <a href='%s' rel='nofollow'>skip this step</a>.</small>" -#~ msgstr "<small>သင္ေျမပံုကá€á€¯á€™á€»á€™á€„္ရပါက <a href = '%s'rel = 'nofollow'> ဒီအဆင့္ကá€á€¯á€±á€€á€ºá€¬á€¹á€œá€á€¯á€€á€¹á€•á€«</a>.</small>" +#~ msgid "Email me updates" +#~ msgstr "အသစ္မြမ္းမံမႈမ်ားကá€á€¯á€€á½á€¼á‚္ုပ္ထံသá€á€¯á‚•á€¡á€®á€¸á€±á€™á€¸á€œá€¹á€•á€á€¯á‚”မည္" -#~ msgid "<strong>No</strong>, I do not, let me sign in by email:" -#~ msgstr "<strong>မဟုá€á€¹á€•á€«</strong>မလုပ္ပါáŠá€¡á€®á€¸á€±á€™á€¸á€œá€¹á€»á€–င့္á€á€„္မည္-" +#~ msgid "Enter a new password:" +#~ msgstr "စကားá€á€½á€€á€¹á€¡á€žá€…္á€á€…္á€á€¯á€›á€á€¯á€€á€¹á€‘ည့္ပါ-" -#~ msgid "Are you a <strong>developer</strong>? Would you like to contribute to FixMyStreet?" -#~ msgstr "သင္သည္ <strong>developer</strong> á€á€…္ေယာက္လားዠFixMyStreet ကá€á€¯ ကူညီလá€á€¯á€•á€«á€žá€œá€¬á€¸á‹" +#~ msgid "Message:" +#~ msgstr "စာ-" -#~ msgid "Contact FixMyStreet" -#~ msgstr "FixMyStreet ကá€á€¯á€†á€€á€¹á€žá€¼á€šá€¹á€™á€Šá€¹" +#~ msgid "More problems nearby" +#~ msgstr "အနီးနားရွá€á€»á€•á‚†á€”ာမ်ားစြာ" -#~ msgid "Do you have a FixMyBarangay password?" -#~ msgstr "FixMyBarangay áစကားá€á€½á€€á€¹á€›á€½á€á€•á€«á€žá€œá€¬á€¸á‹" +#~ msgid "Nearly Done! Now check your email..." +#~ msgstr "လုပ္ေဆာင္မႈနီးပါးျပီးပါျပီአသင္áအီးေမးလ္ကá€á€¯á€…စ္ေဆးပါ" -#~ msgid "FixMyStreet admin:" -#~ msgstr "FixMyStreet á အုပ္á€á€ºá€³á€•á€¹á€žá€°" +#~ msgid "Offensive? Unsuitable? Tell us" +#~ msgstr "ထá€á€á€á€¯á€€á€¹á€±á€…á‚á€á€¯á€„္ေသာáŠá€™á€žá€„့္ေá€á€¬á€¹á€˜á€°á€¸á€œá€¬á€¸áŠ ကá½á€¼á‚္ုပ္á€á€á€¯á‚”ကá€á€¯á€±á€»á€•á€¬á€•á€«" -#~ msgid "If you do not, your alert will not be activated." -#~ msgstr "သင္မျပဳလုပ္ပါကသင္áအသá€á€±á€•á€¸á€»á€á€„္းကá€á€¯á€¡á€á€Šá€¹á€™á€»á€•á€³á€±á€•á€¸á‚á€á€¯á€„္ပါ" +#~ msgid "Photo:" +#~ msgstr "ဓာá€á€¹á€•á€¶á€¯-" -#~ msgid "If you do not, your problem will not be posted." -#~ msgstr "သင္မျပဳလုပ္ပါကသင္áျပႆနာကá€á€¯á€™á€á€„္á‚á€á€¯á€„္ပါ" +#~ msgid "Please check your email" +#~ msgstr "သင္áအီးေမးလ္ကá€á€¯á€…စ္ပါ" -#~ msgid "If you do not, your update will not be posted." -#~ msgstr "သင္မျပဳလုပ္ပါကသင္áမြမ္းမံမႈကá€á€¯á€™á€á€„္á‚á€á€¯á€„္ပါ" +#~ msgid "This problem has been closed" +#~ msgstr "ဒီျပႆနာကá€á€¯á€•á€á€á€¹á€‘ားျပီးျဖစ္သည္á‹" -#~ msgid "New local reports on reportemptyhomes.com" -#~ msgstr "reportemptyhomes.com မွ ျပည္á€á€¼á€„္း အစီရင္á€á€¶á€…ာသစ္မ်ား" +#~ msgid "This problem is in progress" +#~ msgstr "ဒီျပႆနာကá€á€¯á€±á€»á€–ရွင္းေနဆဲျဖစ္သည္" -#~ msgid "New update:" -#~ msgstr "အသစ္မြမ္းမံမႈ - " +#~ msgid "This problem is old and of unknown status." +#~ msgstr "ဒီျပႆနာသည္အရမ္းá¾á€€á€¬á€»á€•á€®á€»á€–စ္ျပီး အေျá€á€¡á€±á€”ကá€á€¯á€™á€žá€á€›á€•á€«" -#~ msgid "No problems found." -#~ msgstr "ျပႆနာမ်ားမေá€á€¼á‚•á€•á€«" +#~ msgid "We have not been able to confirm your account - sorry." +#~ msgstr "သင့္ account ကá€á€¯á€¡á€á€Šá€¹ မျပဳá‚á€á€¯á€„္ေသးပါ- á€á€™á€¹á€¸á€”ည္းပါá€á€šá€¹á‹" -#~ msgid "No problems have been reported yet." -#~ msgstr "မည္သည့္ျပႆနာမွအစီရင္မá€á€¶á€›á€±á€žá€¸á€•á€«" +#~ msgid "We have sent you an email containing a link to confirm your account." +#~ msgstr "မá€á€™á€á€á€á€¯á‚”သည္ သင့္ account ကá€á€¯á€¡á€á€Šá€¹á€»á€•á€³á€±á€•á€¸á€™á€Šá€¹á€· လင့္á€á€¹á€•á€«á€á€„္ေသာ အီးေမးကá€á€¯ ေပးပá€á€¯á‚”ထားပါသည္á‹" -#~ msgid "Sign in by email" -#~ msgstr "အီးေမးလ္ျဖင့္ á€á€„္ရန္" +#~ msgid "We'd love to hear what you think about this site. Just fill in the form, or send an email to <a href='mailto:%s'>%s</a>:" +#~ msgstr "မá€á€™á€á€á€á€¯á‚”အေနနဲ႔ ယá€á€¯á€†á€á€¯á€€á€¹á€”ဲ႔ ပá€á€¹á€žá€€á€¹á€žá€Šá€¹á€· အႀကံဥာá€á€¹á€™á€ºá€¬á€¸ သá€á€œá€á€¯á€•á€«á€žá€Šá€¹á‹ ပုံစံá€á€¼á€„္ျဖည့္ျá€á€„္း သá€á€¯á‚”မဟုá€á€¹ <a href='mailto:%s'>%s</a>: သá€á€¯á‚” အီးေမး ေပးပá€á€¯á‚”á‚á€á€¯á€„္ပါသည္á‹" -#~ msgid "Signed in as %s" -#~ msgstr "%s အေနျဖင့္ á€á€„္ထားသည္" +#~ msgid "You have already attached a photo to this report, attaching another one will replace it." +#~ msgstr "ဒီအစီရင္á€á€¶á€…ာá€á€¼á€„္ ဓာá€á€¹á€•á€¯á€¶á€á€¼á€²á€á€„္ထားá¿á€•á€® ျဖစ္á¿á€•á€®á€¸ အျá€á€¬á€¸á€á€…္á€á€¯ á€á€¼á€²á€á€„္ျá€á€„္းသည္ အရင္ေနရာá€á€¼á€„္ အစားထá€á€¯á€¸á€žá€¼á€¬á€¸á€•á€«á€™á€Šá€¹á‹" -#~ msgid "The latest local reports reported by users" -#~ msgstr "အသံုးျပဳသူမ်ားမွေပးပá€á€¯á‚”လာေသာေဒသá€á€¼á€„္းအစီရင္á€á€¶á€…ာအသစ္မ်ား" +#~ msgid "You have already attached a photo to this update, attaching another one will replace it." +#~ msgstr "ယá€á€¯ ျပင္ဆင္မြမ္းမံမႈကá€á€¯ ဓာá€á€¹á€•á€¯á€¶á€»á€–င့္ á€á€¼á€²á€á€„္ထားá¿á€•á€®á€¸ ျဖစ္á¿á€•á€®á€¸ အျá€á€¬á€¸á€á€…္á€á€¯á€á€¼á€²á€á€„္လွ်င္ အရင္ေနရာá€á€¼á€„္ အစားထá€á€¯á€¸á€±á€•á€¸á€žá€¼á€¬á€¸á€™á€Šá€¹ ျဖစ္သည္á‹" -#~ msgid "User" -#~ msgstr "အသံုးျပဳသူ" +#~ msgid "Your email:" +#~ msgstr "သင္á အီးေမးလ္" -#~ msgid "You must now click the link in the email we've just sent you." -#~ msgstr "ယá€á€¯ ကá½á€¼á‚ု္ပ္á€á€á€¯á‚” ေပးပá€á€¯á‚”လá€á€¯á€€á€¹á€žá€Šá€¹á€· အီးေမးလ္ရá€á€½ လင့္á€á€¹á€€á€á€¯ á‚ွá€á€•á€¹á€•á€«á‹" +#~ msgid "Your name:" +#~ msgstr "သင့္အမည္" -#~ msgid "Your email address:" -#~ msgstr "သင္á အီးေမးလ္လá€á€•á€¹á€…ာ" +#~ msgid "Your email:" +#~ msgstr "သင္á အီးေမးလ္" diff --git a/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po index e603727b3..d9daeb663 100644 --- a/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -5,7 +5,8 @@ # # Translators: # Guttorm Flatabø <post@guttormflatabo.com>, 2013 -# oeyrvin <oeyrvin@hagan.no>, 2015 +# Jan Høydahl <jh@cominvent.com>, 2016 +# Ole-Erik Yrvin <oeyrvin@gmail.com>, 2015 # Ørjan Vøllestad <orjanv@gmail.com>, 2014 # pere <pere-transifex@hungry.com>, 2012,2015 # pere <pere-transifex@hungry.com>, 2015 @@ -14,9 +15,9 @@ msgid "" msgstr "" "Project-Id-Version: fixmystreet\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2015-10-23 16:51+0100\n" -"PO-Revision-Date: 2015-10-15 09:47+0000\n" -"Last-Translator: pere <pere-transifex@hungry.com>\n" +"POT-Creation-Date: 2016-03-02 13:09+0000\n" +"PO-Revision-Date: 2016-01-06 11:44+0000\n" +"Last-Translator: Jan Høydahl <jh@cominvent.com>\n" "Language-Team: Norwegian BokmÃ¥l (Norway) (http://www.transifex.com/mysociety/fixmystreet/language/nb_NO/)\n" "Language: nb_NO\n" "MIME-Version: 1.0\n" @@ -24,45 +25,24 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:628 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:411 +#: perllib/FixMyStreet/DB/Result/Problem.pm:616 +#: perllib/FixMyStreet/Script/Reports.pm:189 msgid " and " msgstr " og " #: templates/web/base/report/new/councils_text_all.html:2 -#: templates/web/base/report/new/councils_text_none.html:11 -#: templates/web/base/report/new/councils_text_none.html:2 +#: templates/web/base/report/new/councils_text_none.html:12 +#: templates/web/base/report/new/councils_text_none.html:15 #: templates/web/base/report/new/councils_text_some.html:19 #: templates/web/base/report/new/councils_text_some.html:22 #: templates/web/base/report/new/councils_text_some.html:5 msgid " or " msgstr " eller " -#: templates/web/base/admin/index.html:35 -#: templates/web/base/status/index.html:13 -msgid "%s confirmed alerts, %s unconfirmed" -msgstr "%d bekreftede varsler, %d ubekreftede" - -#: templates/web/base/admin/index.html:37 -#: templates/web/base/status/index.html:16 -#: templates/web/zurich/admin/index.html:6 -msgid "%s council contacts – %s confirmed, %s unconfirmed" -msgstr "%d administrasjonskontakter – %d bekreftet, %d ubekreftet" - #: templates/web/base/admin/edit-league.html:12 msgid "%d edits by %s" msgstr "%d redigeringer av %s" -#: templates/web/base/admin/index.html:34 -#: templates/web/base/status/index.html:12 -msgid "%s live updates" -msgstr "%d aktive oppdateringer" - -#: templates/web/base/admin/index.html:36 -#: templates/web/base/status/index.html:14 -msgid "%s questionnaires sent – %s answered (%s%%)" -msgstr "%d spørreskjema sendt – %d besvart (%s%%)" - #: templates/web/base/pagination.html:10 msgid "%d to %d of %d" msgstr "%d til %d av %d" @@ -75,37 +55,56 @@ msgstr "%s - oppsummeringsrapporter" #. ("%s here is the site name") #: templates/web/base/admin/header.html:10 msgid "%s admin:" -msgstr "" +msgstr "%s administrator:" + +#: templates/web/base/status/stats.html:26 +#, fuzzy +msgid "%s bodies" +msgstr "Administrasjoner" + +#: templates/web/base/status/stats.html:24 +msgid "%s confirmed alerts, %s unconfirmed" +msgstr "%s bekreftede varsler, %s ubekreftede" + +#: templates/web/base/status/stats.html:27 +#: templates/web/zurich/admin/index.html:6 +msgid "%s council contacts – %s confirmed, %s unconfirmed" +msgstr "%s administrasjonskontakter – %s bekreftet, %s ubekreftet" #. ("%s is the site name") #: templates/web/base/alert/index.html:7 -#, fuzzy msgid "" "%s has a variety of RSS feeds and email alerts for local\n" "problems, including alerts for all problems within a particular ward, or all\n" "problems within a certain distance of a particular location." msgstr "" -"Fiksgatami har ulike RSS-strømmer og e-postlister om lokale problemer, dette inkluderer problemer meldt innenfor en bestemt bydel eller administrasjon, eller et omrÃ¥de med problemer\n" +"%s har ulike RSS-strømmer og e-post-varsler om lokale problemer, inkludert problemer meldt innenfor en bestemt bydel eller administrasjon, eller et omrÃ¥de med problemer\n" "innen en angitt distanse fra en bestemt posisjon." #. ("%s is the site name") #: templates/web/base/alert/index.html:11 -#, fuzzy msgid "" "%s has a variety of RSS feeds and email alerts for local problems, including\n" "alerts for all problems within a particular ward or council, or all problems\n" "within a certain distance of a particular location." msgstr "" -"Fiksgatami har ulike RSS-strømmer og e-postlister om lokale problemer, dette inkluderer problemer meldt innenfor en bestemt bydel eller administrasjon, eller et omrÃ¥de med problemer\n" +"%s har ulike RSS-strømmer og e-post-varsler om lokale problemer, inkludert problemer meldt innenfor en bestemt bydel eller administrasjon, eller et omrÃ¥de med problemer\n" "innen en angitt distanse fra en bestemt posisjon." -#: perllib/FixMyStreet/DB/Result/Problem.pm:695 +#: templates/web/base/status/stats.html:23 +msgid "%s live updates" +msgstr "%s aktive oppdateringer" + +#: templates/web/base/status/stats.html:25 +msgid "%s questionnaires sent – %s answered (%s%%)" +msgstr "%s spørreskjema sendt – %s besvart (%s%%)" + +#: perllib/FixMyStreet/DB/Result/Problem.pm:683 msgid "%s ref: %s" msgstr "%s ref: %s" #. ("%s is the site name") #: templates/web/base/alert/_list.html:73 -#, fuzzy msgid "" "%s sends different categories of problem\n" "to the appropriate council, so problems within the boundary of a particular council\n" @@ -113,17 +112,17 @@ msgid "" "will be sent to the district council, so will appear in both of the district\n" "council’s alerts, but will only appear in the \"Within the boundary\" alert\n" "for the county council." -msgstr "FiksGataMi sender forskjellige kategorier problemer til forskjellige administrasjoner, problemer som gjelder flere administrasjoner blir sendt til alle de det gjelder." +msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:255 perllib/FixMyStreet/Cobrand/UK.pm:267 +#: perllib/FixMyStreet/Cobrand/UK.pm:256 perllib/FixMyStreet/Cobrand/UK.pm:268 msgid "%s ward, %s" msgstr "%s bydel, %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:564 +#: perllib/FixMyStreet/DB/Result/Problem.pm:552 msgid "%s, reported at %s" msgstr "%s, rapportert %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:282 perllib/FixMyStreet/Cobrand/UK.pm:294 +#: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295 msgid "%s, within %s ward" msgstr "%s, innefor bydel %s" @@ -131,9 +130,9 @@ msgstr "%s, innefor bydel %s" msgid "© <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors" msgstr "© <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> -bidragsytere" -#: templates/web/zurich/report/new/fill_in_details_form.html:53 +#: templates/web/zurich/report/new/fill_in_details_form.html:46 msgid "(Defect & location of defect)" -msgstr "" +msgstr "(Feil & lokasjon for feil)" #: templates/web/base/admin/report_blocks.html:41 #: templates/web/base/admin/users.html:31 @@ -142,15 +141,13 @@ msgstr "(Epost i misbrukstabellen)" #: templates/web/zurich/admin/report_edit-sdm.html:60 #: templates/web/zurich/admin/report_edit.html:88 -#, fuzzy msgid "(No name)" -msgstr "Ditt navn" +msgstr "(Uten navn)" #: templates/web/zurich/admin/report_edit-sdm.html:67 #: templates/web/zurich/admin/report_edit.html:95 -#, fuzzy msgid "(No phone number)" -msgstr "Ditt telefonnummer" +msgstr "(Uten telefonnummer)" #: templates/web/base/alert/_list.html:24 msgid "(a default distance which covers roughly 200,000 people)" @@ -158,17 +155,16 @@ msgstr "(en standardavstand som dekker en befolkning pÃ¥ omtrent 200 000)" #. ("%s is a list of distance links, e.g. [2km] / [5km] / [10km] / [20km]") #: templates/web/base/alert/_list.html:29 -#, fuzzy msgid "(alternatively the RSS feed can be customised, within %s)" -msgstr "(alternativt kan RSS-strømmen tilpasses, innenfor" +msgstr "(alternativt kan RSS-strømmen tilpasses, innenfor %s)" -#: templates/web/base/report/_item.html:27 -#: templates/web/zurich/report/_item.html:21 +#: templates/web/base/report/_item.html:25 +#: templates/web/zurich/report/_item.html:19 msgid "(closed)" msgstr "(lukket)" -#: templates/web/base/report/_item.html:25 -#: templates/web/zurich/report/_item.html:19 +#: templates/web/base/report/_item.html:23 +#: templates/web/zurich/report/_item.html:17 msgid "(fixed)" msgstr "(løst)" @@ -176,37 +172,28 @@ msgstr "(løst)" msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)" msgstr "(som tagging, søppel, hull i veien, eller ødelagte gatelys)" -#: templates/web/base/report/_item.html:21 +#: templates/web/base/report/_item.html:19 msgid "(not sent to council)" msgstr "(ikke rapportert til administrasjonen)" -#: templates/web/base/report/new/fill_in_details_form.html:200 #: templates/web/zurich/report/new/fill_in_details_form.html:82 msgid "(optional)" msgstr "(valgfritt)" -#: templates/web/fixmystreet/report/public_label.html:1 +#: templates/web/base/report/public_label.html:1 msgid "(public)" msgstr "(offentlig)" -#: templates/web/base/report/_item.html:20 +#: templates/web/base/report/_item.html:18 msgid "(sent to both)" msgstr "(sendt til begge)" -#: templates/web/base/report/new/fill_in_details_form.html:194 -msgid "(we never show your email address or phone number)" -msgstr "(vi viser aldri din e-postadresse eller telefonnummer)" - -#: templates/web/base/report/update-form.html:159 -msgid "(we never show your email)" -msgstr "(vi viser aldri din e-postadresse)" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:673 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 #: perllib/FixMyStreet/DB/Result/Problem.pm:410 msgid "-- Pick a category --" msgstr "-- Velg en kategori --" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:637 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:632 #: perllib/FixMyStreet/DB/Result/Problem.pm:416 msgid "-- Pick a property type --" msgstr "-- Velg en eiendomsstype --" @@ -223,54 +210,41 @@ msgstr "<code>MAPIT_URL</code> er satt (<code>%s</code>) men ingen <code>MAPIT_T #. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories") #: templates/web/base/reports/_list-filters.html:27 msgid "<label>Show %s</label> <label>about %s</label>" -msgstr "" +msgstr "<label>Vis %s</label> <label>om %s</label>" -#: templates/web/base/admin/index.html:32 -#: templates/web/base/status/index.html:11 +#: templates/web/base/status/stats.html:18 #: templates/web/zurich/admin/index.html:4 msgid "<strong>%s</strong> live problems" -msgstr "<strong>%d</strong> aktive problemer" +msgstr "<strong>%s</strong> aktive problemer" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:39 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:2 msgid "<strong>No</strong> Let me confirm my report by email" msgstr "<strong>Nei</strong> La meg bekrefte min rapport med e-post" -#: templates/web/fixmystreet/report/update-form.html:112 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:2 msgid "<strong>No</strong> Let me confirm my update by email" msgstr "<strong>Nei</strong> La meg bekrefte min oppdatering med e-post" -#: templates/web/base/auth/general.html:48 +#: templates/web/base/auth/general.html:87 #: templates/web/zurich/auth/general.html:51 msgid "<strong>No</strong> let me sign in by email" msgstr "<strong>Nei</strong>, la meg logge inn med e-post:" -#: templates/web/base/report/new/fill_in_details_form.html:145 -msgid "<strong>No</strong>, let me confirm my report by email:" -msgstr "<strong>Nei</strong>, la meg bekrefte min rapport med e-post:" - -#: templates/web/base/report/update-form.html:118 -msgid "<strong>No</strong>, let me confirm my update by email:" -msgstr "<strong>Nei</strong>, la meg bekrefte min oppdatering med e-post:" - -#: templates/web/base/auth/general.html:34 -#: templates/web/base/report/new/fill_in_details_form.html:123 -#: templates/web/base/report/update-form.html:96 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:15 -#: templates/web/fixmystreet/report/update-form.html:89 +#: templates/web/base/auth/general.html:70 +#: templates/web/base/report/new/form_user_loggedout_password.html:3 +#: templates/web/base/report/update/form_user_loggedout_password.html:2 msgid "<strong>Yes</strong> I have a password" msgstr "<strong>Ja</strong>, jeg har et passord" -#: templates/web/base/static/about-en-gb.html:1 -#: templates/web/base/static/about-en-gb.html:3 +#: templates/web/base/about/about-en-gb.html:1 +#: templates/web/base/about/about-en-gb.html:3 msgid "About us" msgstr "Om oss" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:8 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:31 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:29 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:35 msgid "Action Scheduled" msgstr "Handling planlagt" @@ -301,14 +275,13 @@ msgstr "Legg til ny kategori" msgid "Add user" msgstr "Legg til bruker" -#: templates/web/base/my/my.html:52 +#: templates/web/base/my/my.html:56 msgid "Added %s" msgstr "La til %s" #: templates/web/base/report/new/category_extras.html:9 -#, fuzzy msgid "Additional Information" -msgstr "Avventer moderasjon" +msgstr "Tilleggsinformasjon" #: templates/web/base/auth/change_password.html:29 msgid "Again:" @@ -322,8 +295,7 @@ msgstr "Varsel %d opprettet for %s, type %s, parameter %s / %s" msgid "Alert %d disabled (created %s)" msgstr "Varsel %d koblet ut (opprettet %s)" -#: templates/web/base/report/update-form.html:164 -#: templates/web/fixmystreet/report/update-form.html:150 +#: templates/web/base/report/update/form_name.html:20 msgid "Alert me to future updates" msgstr "Send meg varsel ved fremtidige oppdateringer" @@ -333,9 +305,8 @@ msgid "All Reports" msgstr "Alle rapporter" #: templates/web/zurich/admin/stats.html:5 -#, fuzzy msgid "All Reports as CSV" -msgstr "Alle rapporter" +msgstr "Alle rapporter som CSV" #: templates/web/base/footer.html:11 templates/web/fixmystreet/footer.html:32 #: templates/web/zurich/admin/index-dm.html:12 @@ -356,10 +327,8 @@ msgstr "All informasjonen du har lagt inn her vil bli sendt til" #: templates/web/base/report/new/councils_text_all.html:2 #: templates/web/base/report/new/councils_text_all.html:4 -#: templates/web/base/report/new/fill_in_details_form.html:12 -#: templates/web/base/report/new/fill_in_details_form.html:14 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:10 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:11 +#: templates/web/base/report/new/fill_in_details_form.html:10 +#: templates/web/base/report/new/fill_in_details_form.html:9 msgid "All the information you provide here will be sent to <strong>%s</strong>." msgstr "All informasjonen du har lagt inn her vil bli sendt til <strong>%s</strong>." @@ -381,6 +350,10 @@ msgstr "Anonym:" msgid "Are you a developer?" msgstr "Er du en utvikler?" +#: templates/web/base/js/translation_strings.html:52 +msgid "Are you sure you want to cancel this upload?" +msgstr "" + #: templates/web/base/admin/body-form.html:69 #: templates/web/base/admin/body.html:16 #: templates/web/zurich/admin/body-form.html:24 @@ -393,9 +366,8 @@ msgid "As this is a staging site and %s is false, reports made on this site will msgstr "Da reproduksjonsstedet og %s ikke stemmer, vil meldingen som er laget her, bli sendt til problemrapportøren, og ikke til kontakten som er gitt for meldingformÃ¥let." #: templates/web/zurich/admin/report_edit.html:213 -#, fuzzy msgid "Assign to competent body:" -msgstr "Tildel til ekstern administrasjon:" +msgstr "Tildel til kompetent administrasjon:" #: templates/web/zurich/admin/report_edit.html:173 #: templates/web/zurich/admin/stats.html:36 @@ -414,16 +386,16 @@ msgstr "Tildelt underavdeling:" msgid "Assigned to %s" msgstr "Tildelt %s" -#: templates/web/base/open311/index.html:84 +#: templates/web/base/open311/index.html:76 msgid "At most %d requests are returned in each query. The returned requests are ordered by requested_datetime, so to get all requests, do several searches with rolling start_date and end_date." msgstr "PÃ¥ det meste blir %d forespørsler returnert i hver spørring. De returnerte forespørslene blir sortert pÃ¥ requested_datetime, sÃ¥ en mÃ¥ gjøre flere søk med rullerende start_date og end_date for Ã¥ fÃ¥ tak i alle forespørslene." -#: templates/web/base/open311/index.html:76 +#: templates/web/base/open311/index.html:68 msgid "At the moment only searching for and looking at reports work." msgstr "For øyeblikket er det kun søk etter og Ã¥ se pÃ¥ rapporter som fungerer." #: perllib/FixMyStreet/DB/Result/Problem.pm:373 -#: templates/web/zurich/report/_item.html:11 +#: templates/web/zurich/report/_item.html:9 msgid "Awaiting moderation" msgstr "Avventer moderasjon" @@ -435,7 +407,7 @@ msgstr "Tilbake" msgid "Ban email address" msgstr "Bannlys epostadresse" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1276 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1285 #: perllib/FixMyStreet/Cobrand/Zurich.pm:392 #: templates/web/base/admin/bodies.html:1 templates/web/zurich/header.html:64 msgid "Bodies" @@ -458,14 +430,14 @@ msgstr "PÃ¥ dato" #: templates/web/base/auth/token.html:21 templates/web/base/email_sent.html:18 msgid "Can’t find our email? Check your spam folder – that’s the solution 99% of the time." -msgstr "" +msgstr "Finner du ikke e-posten? Sjekk mappen for uønsket post. Det løser problemet i 99% av tilfellene." #: templates/web/base/around/_report_banner.html:5 msgid "Can't see the map? <em>Skip this step</em>" msgstr "Hvis du ikke kan se kartet, <em>hopp over dette steget</em>." #: templates/web/base/admin/body.html:68 -#: templates/web/base/admin/index.html:61 +#: templates/web/base/admin/index.html:54 #: templates/web/base/report/new/category.html:10 #: templates/web/base/report/new/category_wrapper.html:3 #: templates/web/zurich/admin/body.html:14 @@ -476,8 +448,8 @@ msgstr "Hvis du ikke kan se kartet, <em>hopp over dette steget</em>." msgid "Category" msgstr "Kategori" -#: templates/web/base/admin/index.html:59 -#: templates/web/base/admin/index.html:67 +#: templates/web/base/admin/index.html:52 +#: templates/web/base/admin/index.html:60 msgid "Category fix rate for problems > 4 weeks old" msgstr "Løsningsrate fordelt pÃ¥ kategori for problemer > 4 uker gamle" @@ -490,7 +462,7 @@ msgstr "Løsningsrate fordelt pÃ¥ kategori for problemer > 4 uker gamle" msgid "Category:" msgstr "Kategori:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:402 +#: perllib/FixMyStreet/Script/Reports.pm:180 msgid "Category: %s" msgstr "Kategori: %s" @@ -541,7 +513,7 @@ msgstr "Velg et <strong>kategorinavn</strong> som gir mening for innbyggerne (f. #: templates/web/zurich/admin/response_templates_select.html:6 msgid "Choose a template" -msgstr "" +msgstr "Velg en mal" #: templates/web/base/admin/stats.html:65 #: templates/web/base/admin/stats.html:71 @@ -549,25 +521,25 @@ msgid "Click here or enter as dd/mm/yyyy" msgstr "Klikk her eller tast inn dato pÃ¥ formatet dd/mm/åååå" #: templates/web/base/around/_report_banner.html:2 -#: templates/web/base/js/translation_strings.html:50 +#: templates/web/base/js/translation_strings.html:55 msgid "Click map to report a problem" msgstr "Klikk i kartet for Ã¥ rapportere et problem" #: templates/web/base/email_sent.html:13 msgid "Click the link in our confirmation email to activate your alert." -msgstr "" +msgstr "Klikk lenken i bekreftelses-eposten for Ã¥ aktivere ditt varsel." #: templates/web/base/email_sent.html:9 msgid "Click the link in our confirmation email to publish your problem." -msgstr "" +msgstr "Klikk lenken i bekreftelses-eposten for Ã¥ publisere ditt problem." #: templates/web/base/email_sent.html:11 msgid "Click the link in our confirmation email to publish your update." -msgstr "" +msgstr "Klikk lenken i bekreftelses-eposten for Ã¥ publisere din oppdatering." #: templates/web/base/auth/token.html:18 msgid "Click the link in our confirmation email to sign in." -msgstr "" +msgstr "Klikk lenken i bekreftelses-eposten for Ã¥ logge inn." #: perllib/FixMyStreet/Cobrand/Zurich.pm:196 #: perllib/FixMyStreet/Cobrand/Zurich.pm:969 @@ -576,7 +548,7 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:25 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:144 -#: templates/web/fixmystreet/report/banner.html:15 +#: templates/web/base/report/banner.html:15 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:10 #: templates/web/zurich/admin/header.html:16 @@ -584,7 +556,7 @@ msgstr "" msgid "Closed" msgstr "Lukket" -#: perllib/FixMyStreet/DB/Result/Problem.pm:794 +#: perllib/FixMyStreet/DB/Result/Problem.pm:779 msgid "Closed by council" msgstr "(ikke rapportert til administrasjonen)" @@ -610,7 +582,7 @@ msgstr "Merkevaresamarbeidsdata:" msgid "Cobrand:" msgstr "Merkevaresamarbeid:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1283 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1292 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "Oppsett" @@ -623,13 +595,14 @@ msgstr "Sett opp endepunkt" msgid "Confirm" msgstr "Bekreft" -#: templates/web/base/auth/token.html:1 templates/web/zurich/auth/token.html:1 +#: templates/web/base/auth/token.html:1 msgid "Confirm account" msgstr "Bekreft konto" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:33 -#: templates/web/fixmystreet/report/update-form.html:107 -msgid "Confirm by email below, providing a new password at that point. When you confirm, your password will be updated." +#: templates/web/base/report/new/form_user_loggedout_password.html:21 +#: templates/web/base/report/update/form_user_loggedout_password.html:20 +#, fuzzy +msgid "Confirm by email instead, providing a new password at that point. When you confirm, your password will be updated." msgstr "Bekreft via epost under, og oppgi et nytt passord der. NÃ¥r du har bekreftet vil passordet ditt bli oppdatert." #: templates/web/base/questionnaire/creator_fixed.html:1 @@ -659,35 +632,27 @@ msgid "Confirmed:" msgstr "Bekreftet:" #. ("%s is the site name") -#: templates/web/base/faq/faq-en-gb.html:8 templates/web/base/footer.html:24 -#: templates/web/base/open311/index.html:8 -#: templates/web/base/static/privacy.html:10 -#: templates/web/fixmystreet/contact/index.html:12 -#, fuzzy +#: templates/web/base/about/_sidebar.html:6 templates/web/base/footer.html:24 msgid "Contact %s" -msgstr "Kontakt oss" +msgstr "Kontakt %s" #: templates/web/base/contact/index.html:1 #: templates/web/base/contact/index.html:2 #: templates/web/base/contact/submit.html:1 -#: templates/web/fixmystreet/contact/index.html:1 -#: templates/web/fixmystreet/contact/index.html:2 msgid "Contact Us" msgstr "Kontakt oss" -#: templates/web/base/contact/index.html:6 -#: templates/web/fixmystreet/contact/index.html:20 +#: templates/web/base/contact/index.html:12 msgid "Contact the team" msgstr "Kontakt prosjektgruppen" #: templates/web/zurich/admin/report_edit-sdm.html:40 #: templates/web/zurich/admin/report_edit.html:59 -#, fuzzy msgid "Coordinates:" msgstr "Koordinater:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1420 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1448 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1429 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1457 msgid "Could not find user" msgstr "Kunne ikke finne bruker" @@ -705,7 +670,7 @@ msgstr "Administrasjon" msgid "Council contacts for %s" msgstr "Administrasjonskontakter for %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:693 +#: perllib/FixMyStreet/DB/Result/Problem.pm:681 msgid "Council ref: %s" msgstr "administrasjonsreferanse: %s" @@ -720,7 +685,7 @@ msgstr "Administrasjon:" msgid "Count" msgstr "Antall" -#: templates/web/base/email_sent.html:1 templates/web/zurich/email_sent.html:1 +#: templates/web/base/email_sent.html:1 msgid "Create a report" msgstr "Lag en rapport" @@ -730,9 +695,8 @@ msgid "Create category" msgstr "Lag kategori" #: templates/web/zurich/admin/template_edit.html:29 -#, fuzzy msgid "Create template" -msgstr "Lag en rapport" +msgstr "Lag mal" #: templates/web/base/admin/problem_row.html:34 #: templates/web/zurich/admin/templates.html:10 @@ -758,7 +722,7 @@ msgstr "I øyeblikket er ikke laget noen instanser." #: perllib/FixMyStreet/Cobrand/Zurich.pm:834 #: templates/web/zurich/admin/report_edit-sdm.html:109 msgid "Customer not contactable" -msgstr "" +msgstr "Kunden kan ikke kontaktes" #: templates/web/base/dashboard/index.html:5 #: templates/web/base/dashboard/index.html:7 @@ -769,10 +733,10 @@ msgstr "Oversikt" msgid "Dealt with by subdivision within 5 working days" msgstr "Behandlet av underavdeling innen 5 arbeidsdager" -#: perllib/FixMyStreet/App/Controller/Admin.pm:878 +#: perllib/FixMyStreet/App/Controller/Admin.pm:877 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" -msgstr "" +msgstr "Slett mal" #: templates/web/base/admin/bodies.html:27 #: templates/web/base/admin/body.html:177 @@ -782,7 +746,7 @@ msgstr "" msgid "Deleted" msgstr "Slettet" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:51 +#: templates/web/base/report/new/form_report.html:45 #: templates/web/zurich/admin/index-dm.html:22 #: templates/web/zurich/admin/index-sdm.html:20 #: templates/web/zurich/admin/reports.html:12 @@ -790,12 +754,11 @@ msgid "Description" msgstr "Beskrivelse" #: templates/web/base/js/translation_strings.html:34 -#: templates/web/zurich/report/new/fill_in_details_form.html:42 +#: templates/web/zurich/report/new/fill_in_details_form.html:68 msgid "Details" msgstr "Detaljer" #: templates/web/base/admin/report_edit.html:20 -#: templates/web/base/report/new/fill_in_details_form.html:62 #: templates/web/zurich/admin/report_edit-sdm.html:27 #: templates/web/zurich/admin/report_edit.html:29 #: templates/web/zurich/admin/report_edit.html:43 @@ -808,21 +771,19 @@ msgstr "Delegert" #: templates/web/zurich/admin/report_edit-sdm.html:50 #: templates/web/zurich/admin/report_edit.html:69 -#, fuzzy msgid "Didn't use map" -msgstr "brukte ikke kart" +msgstr "Brukte ikke kart" #: templates/web/base/admin/edit-league.html:8 msgid "Diligency prize league table" msgstr "Arbeidshester" #. ("%s is the site name") -#: templates/web/base/auth/general.html:31 -#: templates/web/base/report/new/fill_in_details_form.html:114 -#: templates/web/base/report/update-form.html:87 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:11 -#: templates/web/fixmystreet/report/update-form.html:86 -#, fuzzy +#: templates/web/base/auth/general.html:48 +#: templates/web/base/report/new/form_user_loggedout.html:18 +#: templates/web/base/report/new/oauth_email_form.html:18 +#: templates/web/base/report/update-form.html:29 +#: templates/web/base/report/update/form_user_loggedout.html:17 msgid "Do you have a %s password?" msgstr "Har du et FiksGataMi-passord?" @@ -830,16 +791,18 @@ msgstr "Har du et FiksGataMi-passord?" msgid "Don’t know" msgstr "Vet ikke" -#: templates/web/fixmystreet/contact/index.html:118 +#: templates/web/base/contact/index.html:110 msgid "Don't like forms?" msgstr "Liker ikke skjemaer?" +#: templates/web/base/js/translation_strings.html:51 +msgid "Drag and drop photos here or <u>click to upload</u>" +msgstr "" + #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:14 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:32 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:30 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:36 msgid "Duplicate" msgstr "Duplikat" @@ -892,7 +855,7 @@ msgstr "Oppdatert av" #: templates/web/base/admin/category_edit.html:91 #: templates/web/base/admin/flagged.html:38 #: templates/web/base/admin/users.html:16 -#: templates/web/base/auth/general.html:22 +#: templates/web/base/auth/general.html:39 #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:24 @@ -900,7 +863,7 @@ msgstr "Oppdatert av" msgid "Email" msgstr "E-post" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1396 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1405 msgid "Email added to abuse list" msgstr "Epost lagt til misbruksliste" @@ -916,7 +879,7 @@ msgstr "Epostvarsel laget" msgid "Email alert deleted" msgstr "Epostvarsel slettet" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1393 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1402 msgid "Email already in abuse list" msgstr "Epost allerede i misbrukslisten" @@ -924,41 +887,36 @@ msgstr "Epost allerede i misbrukslisten" msgid "Email me new local problems" msgstr "Send meg e-post om lokale problemer" -#: templates/web/base/report/display.html:38 -msgid "Email me updates" -msgstr "Send meg oppdateringer" - #: templates/web/base/admin/category_edit.html:31 #: templates/web/base/admin/report_edit.html:62 #: templates/web/base/admin/update_edit.html:33 #: templates/web/base/admin/user-form.html:20 #: templates/web/base/alert/updates.html:13 -#: templates/web/base/report/display.html:42 #: templates/web/zurich/admin/body.html:47 msgid "Email:" msgstr "E-post:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:329 +#: perllib/FixMyStreet/Script/Reports.pm:108 msgid "Email: %s" msgstr "E-post: %s" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:639 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:634 msgid "Empty flat or maisonette" msgstr "Tom leilighet" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:638 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:633 msgid "Empty house or bungalow" msgstr "Tomt hus eller bungalow" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:641 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:636 msgid "Empty office or other commercial" msgstr "Tomt kontor eller forretningsbygg" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:642 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:637 msgid "Empty pub or bar" msgstr "Tom pub eller bar" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:643 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:638 msgid "Empty public building - school, hospital, etc." msgstr "Tom offentlig bygning - skole, sykehus, etc." @@ -997,7 +955,7 @@ msgstr "Endepunkt" msgid "Enter a Zürich street name" msgstr "Skriv inn et veinavn i Zürich" -#: perllib/FixMyStreet/Cobrand/UK.pm:13 +#: perllib/FixMyStreet/Cobrand/UK.pm:14 msgid "Enter a nearby UK postcode, or street name and area" msgstr "Skriv inn et britisk postnummer i nærheten, eller veinavn og sted" @@ -1015,14 +973,9 @@ msgstr "Skriv inn et veinavn og sted" msgid "Enter a nearby street name and area, postal code or district in Delhi" msgstr "Velg et nærliggende gatenavn og omrÃ¥de, postnummer eller distrikt i Delhi" -#: templates/web/base/report/new/fill_in_details_form.html:152 -#: templates/web/base/report/update-form.html:125 -msgid "Enter a new password:" -msgstr "Skriv inn et nytt passord:" - -#: templates/web/base/auth/general.html:60 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:75 -#: templates/web/fixmystreet/report/update-form.html:123 +#: templates/web/base/auth/general.html:99 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:38 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:13 #: templates/web/zurich/auth/general.html:65 msgid "Enter a password" msgstr "Skriv inn et nytt passord" @@ -1032,28 +985,28 @@ msgid "Enter details of the problem" msgstr "Legg inn detaljer om problemet" #: templates/web/base/errors/generic.html:1 -#: templates/web/base/errors/generic.html:3 +#: templates/web/base/errors/generic.html:4 #: templates/web/base/tokens/abuse.html:1 #: templates/web/base/tokens/abuse.html:3 #: templates/web/base/tokens/error.html:1 -#: templates/web/base/tokens/error.html:3 +#: templates/web/base/tokens/error.html:5 msgid "Error" msgstr "Feil" #: templates/web/base/reports/_list-filters.html:12 msgid "Everything" -msgstr "" +msgstr "Alt" #: templates/web/base/admin/body.html:14 #: templates/web/base/admin/category_edit.html:18 msgid "Example postcode %s" msgstr "Eksempel-postnummer %s" -#: templates/web/base/open311/index.html:94 +#: templates/web/base/open311/index.html:86 msgid "Examples:" msgstr "Eksempler:" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:55 +#: templates/web/base/report/new/form_report.html:49 msgid "Explain what’s wrong, exactly where it is, and how long it’s been there…" msgstr "Forklar hva som er galt, nøyaktig hvor det er og hvor lenge det har vært galt..." @@ -1061,9 +1014,8 @@ msgstr "Forklar hva som er galt, nøyaktig hvor det er og hvor lenge det har væ #: perllib/FixMyStreet/Cobrand/Zurich.pm:922 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:12 -#, fuzzy msgid "Extern" -msgstr "Ekstern URL" +msgstr "Ekstern" #: templates/web/base/admin/body-form.html:81 msgid "External URL" @@ -1095,17 +1047,15 @@ msgstr "Fiks dette ved Ã¥ velge en <strong>area covered</strong> i <em> Edit bod msgid "FixMyStreet" msgstr "FiksGataMi" -#: templates/web/base/admin/index.html:61 +#: templates/web/base/admin/index.html:54 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:24 #: templates/web/base/admin/report_blocks.html:9 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:144 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:34 -#: templates/web/fixmystreet/report/banner.html:12 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:32 +#: templates/web/base/report/banner.html:12 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:38 msgid "Fixed" msgstr "Løst" @@ -1132,7 +1082,7 @@ msgstr "Merk som slettet" msgid "Flag user" msgstr "Flag bruker" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1281 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1290 #: templates/web/base/admin/users.html:19 msgid "Flagged" msgstr "Flagget:" @@ -1163,36 +1113,31 @@ msgstr "Følg en bydelslenke for Ã¥ kun se rapporter innenfor den bydelen." msgid "For more information, see <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>." msgstr "For mer informasjon, se <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>Hvordan FixMyStreet bruker Mapit</a>." -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:32 -#: templates/web/fixmystreet/report/update-form.html:106 +#: templates/web/base/report/new/form_user_loggedout_password.html:20 +#: templates/web/base/report/update/form_user_loggedout_password.html:19 msgid "Forgotten your password?" msgstr "Glemt passordet ditt?" #: perllib/FixMyStreet/Cobrand/Zurich.pm:752 -#, fuzzy msgid "Forwarded to external body" -msgstr "Tildel til ekstern administrasjon:" +msgstr "Tildelt til ekstern administrasjon" #: perllib/FixMyStreet/Cobrand/Zurich.pm:753 -#, fuzzy msgid "Forwarded wish to external body" -msgstr "Tildel til ekstern administrasjon:" +msgstr "Ønsket er sendt videre til ekstern administrasjon" -#: templates/web/base/faq/faq-en-gb.html:1 -#: templates/web/base/faq/faq-en-gb.html:13 -#: templates/web/base/faq/faq-en-gb.html:6 -#: templates/web/base/open311/index.html:6 -#: templates/web/base/static/privacy.html:8 -#: templates/web/fixmystreet/contact/index.html:10 +#: templates/web/base/about/_sidebar.html:4 +#: templates/web/base/about/faq-en-gb.html:1 +#: templates/web/base/about/faq-en-gb.html:5 msgid "Frequently Asked Questions" msgstr "Ofte spurte spørsmÃ¥l" -#: templates/web/base/open311/index.html:136 +#: templates/web/base/open311/index.html:128 msgid "GeoRSS on Google Maps" msgstr "GeoRSS pÃ¥ Google Maps" +#: templates/web/base/report/display_tools.html:11 #: templates/web/fixmystreet/around/_updates.html:3 -#: templates/web/fixmystreet/report/display.html:35 msgid "Get updates" msgstr "FÃ¥ oppdateringer" @@ -1225,7 +1170,7 @@ msgstr "Søk" msgid "Going to send questionnaire?" msgstr "Skal det sendes spørreskjema?" -#: templates/web/base/admin/index.html:42 +#: templates/web/base/admin/index.html:35 msgid "Graph of problem creation by status over time" msgstr "Graf over problemoppretting fordelt pÃ¥ status over tid" @@ -1242,7 +1187,7 @@ msgid "Have you ever reported a problem to a council before, or is this your fir msgstr "Har du rapportert et problem til en administrasjon før, eller er dette første gangen?" #: templates/web/base/footer.html:15 templates/web/fixmystreet/footer.html:38 -#: templates/web/zurich/faq/faq-de-ch.html:1 +#: templates/web/zurich/about/faq-de-ch.html:1 #: templates/web/zurich/footer.html:22 #: templates/web/zurich/nav_over_content.html:8 msgid "Help" @@ -1293,7 +1238,7 @@ msgstr "Hvordan rapportere et problem" msgid "How to send successful reports" msgstr "Hvordan sende inn rapporter som løses" -#: perllib/FixMyStreet/App/Controller/Admin.pm:754 +#: perllib/FixMyStreet/App/Controller/Admin.pm:752 msgid "I am afraid you cannot confirm unconfirmed reports." msgstr "Jeg er redd du ikke kan bekrefte ubekreftede rapporter." @@ -1311,10 +1256,6 @@ msgstr "Jeg oppdaterte akkurat et problem pÃ¥ @fiksgatami" msgid "I'm afraid we couldn't locate your problem in the database.\n" msgstr "Jeg er redd vi ikke klarte Ã¥ finne ditt problem i databasen.\n" -#: perllib/FixMyStreet/App/Controller/Tokens.pm:327 -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 "Jeg er redd vi ikke kunne verifisere den referansen. Hvis du kopierte webadressen fra en e-post, sjekk at du har kopiert den korrekt.\n" - #: templates/web/base/admin/flagged.html:14 #: templates/web/base/admin/list_updates.html:6 #: templates/web/base/admin/reports.html:11 @@ -1343,25 +1284,16 @@ msgstr "Hvis to eller flere instanser er lokalisert pÃ¥ samme sted, kombinerer msgid "If you get some more information about the status of your problem, please come back to the site and leave an update." msgstr "Hvis du fÃ¥r mer informasjon om status for problemet ditt, vær sÃ¥ snill Ã¥ kom tilbake til nettstedet og legg igjen en oppdatering." -#: templates/web/base/report/new/councils_text_none.html:2 -#: templates/web/base/report/new/councils_text_none.html:8 +#: templates/web/base/report/new/councils_text_none.html:10 +#: templates/web/base/report/new/councils_text_none.html:9 msgid "If you submit a problem here the subject and details of the problem will be public, but the problem will <strong>not</strong> be reported to the council." msgstr "Hvis du sender inn et problem hit, sÃ¥ vil emne og detaljer for problemet være offentlig, men problemet vil <strong>ikke</strong> bli rapportert til administrasjonen." -#: templates/web/zurich/auth/token.html:19 -#: templates/web/zurich/email_sent.html:7 -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 "Hvis du bruker web-basert e-post eller har filtre for søppel-e-post pÃ¥ din e-postkonto, kan du i noen tilfellet mÃ¥tte se etter vÃ¥re meldinger der." - #: templates/web/base/questionnaire/index.html:68 -#, fuzzy msgid "" "If you wish to leave a public update on the problem, please enter it here\n" "(please note it will not be sent to the council)." -msgstr "" -"Hvis du ønsker Ã¥ legge til en offentlig kommentar pÃ¥ problemet, legg den til her\n" -"(denne blir ikke sendt til administrasjonen). Du kan for eksempel\n" -"dele din erfaring med hvordan ditt problem ble løst." +msgstr "Hvis du ønsker Ã¥ legge til en offentlig kommentar pÃ¥ problemet, legg den til her (denne blir ikke sendt til administrasjonen)." #: templates/web/base/admin/body.html:149 msgid "If you're using <strong>a send method that is not email</strong>, enter the service ID (Open311) or equivalent identifier here." @@ -1407,10 +1339,8 @@ msgstr "Ugyldig valg av feed" #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:144 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:32 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:30 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:36 msgid "In Progress" msgstr "Under arbeid" @@ -1418,7 +1348,7 @@ msgstr "Under arbeid" msgid "In abuse table?" msgstr "I misbrukstabell?" -#: templates/web/base/open311/index.html:88 +#: templates/web/base/open311/index.html:80 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 "I tillegg er følgende attributter som ikke er del av Open311 v2-spesifikasjonen returnert: agency_sent_datetime, title (ogsÃ¥ returnert som del av description), interface_used, comment_count, requestor_name (kun tilstede hvis innsender tillot at navnet kunne vises pÃ¥ dette nettstedet)." @@ -1426,7 +1356,7 @@ msgstr "I tillegg er følgende attributter som ikke er del av Open311 v2-spesifi #: perllib/FixMyStreet/Cobrand/Zurich.pm:963 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:7 -#: templates/web/fixmystreet/report/banner.html:19 +#: templates/web/base/report/banner.html:19 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:8 msgid "In progress" @@ -1461,7 +1391,7 @@ msgstr "Interne referanser" msgid "Invalid agency_responsible value %s" msgstr "Ugyldig agency_responsible-verdi %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1201 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1210 msgid "Invalid end date" msgstr "Ugyldig slutt-dato" @@ -1469,7 +1399,7 @@ msgstr "Ugyldig slutt-dato" msgid "Invalid format %s specified." msgstr "Ugyldig format %s oppgitt." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1206 msgid "Invalid start date" msgstr "Ugyldig startdato" @@ -1477,14 +1407,12 @@ msgstr "Ugyldig startdato" #: templates/web/base/admin/report_blocks.html:5 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:143 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:31 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:29 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:35 msgid "Investigating" msgstr "Undersøkes" -#: templates/web/fixmystreet/contact/blurb.html:8 +#: templates/web/base/contact/blurb.html:8 msgid "It's often quickest to <a href=\"%s\">check our FAQs</a> and see if the answer is there." msgstr "Det er ofte raskest Ã¥ <a href=\"%s\">sjekke FAQ-en vÃ¥r</a> og se om svaret er der." @@ -1494,19 +1422,17 @@ msgstr "Den er pÃ¥ tur mot myndigheten akkurat nÃ¥." #: perllib/FixMyStreet/Cobrand/Zurich.pm:184 msgid "Jurisdiction Unknown" -msgstr "" +msgstr "Ukjent omrÃ¥de" #: perllib/FixMyStreet/Cobrand/Zurich.pm:927 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:15 msgid "Jurisdiction unknown" -msgstr "" +msgstr "Ukjent omrÃ¥de" -#: templates/web/base/auth/general.html:44 -#: templates/web/base/report/new/fill_in_details_form.html:132 -#: templates/web/base/report/update-form.html:105 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:28 -#: templates/web/fixmystreet/report/update-form.html:102 +#: templates/web/base/auth/general.html:80 +#: templates/web/base/report/new/form_user_loggedout_password.html:16 +#: templates/web/base/report/update/form_user_loggedout_password.html:15 #: templates/web/zurich/auth/general.html:40 msgid "Keep me signed in on this computer" msgstr "Husk min innlogging pÃ¥ denne datamaskinen" @@ -1564,6 +1490,7 @@ msgid "MAP" msgstr "KART" #: templates/web/base/js/translation_strings.html:45 +#: templates/web/base/maps/google-ol.html:13 msgid "Map" msgstr "Kart" @@ -1583,23 +1510,17 @@ msgstr "Merket fikset/lukket i løpet av de siste Ã¥tte ukene" msgid "Marked fixed/closed more than eight weeks ago" msgstr "Merket fikset/lukket mer enn Ã¥tte uker siden" -#: templates/web/fixmystreet/contact/index.html:106 +#: templates/web/base/contact/index.html:98 msgid "Message" msgstr "Melding" #: templates/web/zurich/admin/report_edit.html:284 -#, fuzzy msgid "Message to competent body:" -msgstr "Tildel til ekstern administrasjon:" +msgstr "Melding til kompetent administrasjon:" #: templates/web/zurich/admin/report_edit.html:282 -#, fuzzy msgid "Message to external body:" -msgstr "Tildel til ekstern administrasjon:" - -#: templates/web/base/contact/index.html:97 -msgid "Message:" -msgstr "Melding:" +msgstr "Melding til ekstern administrasjon:" #: perllib/FixMyStreet/App/Controller/Open311.pm:445 msgid "Missing jurisdiction_id" @@ -1613,10 +1534,6 @@ msgstr "Moderert av avdeling innen en arbeidsdag" msgid "Month" msgstr "MÃ¥ned" -#: templates/web/base/report/display.html:34 -msgid "More problems nearby" -msgstr "Flere problemer i nærheten" - #: templates/web/base/admin/bodies.html:21 #: templates/web/base/admin/body-form.html:18 #: templates/web/base/admin/flagged.html:16 @@ -1624,11 +1541,11 @@ msgstr "Flere problemer i nærheten" #: templates/web/base/admin/list_updates.html:7 #: templates/web/base/admin/reports.html:13 #: templates/web/base/admin/users.html:15 -#: templates/web/base/auth/general.html:50 +#: templates/web/base/auth/general.html:89 +#: templates/web/base/report/new/form_user_loggedin.html:9 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:7 +#: templates/web/base/report/update/form_name.html:4 #: templates/web/base/reports/index.html:20 -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:9 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:44 -#: templates/web/fixmystreet/report/update-form.html:138 #: templates/web/zurich/admin/body-form.html:4 #: templates/web/zurich/auth/general.html:60 #: templates/web/zurich/report/new/fill_in_details_form.html:82 @@ -1642,7 +1559,7 @@ msgstr "Navn" msgid "Name:" msgstr "Navn:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:328 +#: perllib/FixMyStreet/Script/Reports.pm:107 msgid "Name: %s" msgstr "Navn: %s" @@ -1651,16 +1568,16 @@ msgstr "Navn: %s" msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s" msgstr "Nærmeste navngitte vei til nÃ¥len plassert pÃ¥ kartet (automatisk generert ved hjelp av OpenStreetMap): %s%s" -#: perllib/FixMyStreet/Cobrand/UK.pm:127 +#: perllib/FixMyStreet/Cobrand/UK.pm:128 msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" msgstr "Nærmeste postnummer til nÃ¥len plassert pÃ¥ kartet (automatisk generert): %s (%sm unna)" -#: perllib/FixMyStreet/Cobrand/Default.pm:434 -#: perllib/FixMyStreet/Cobrand/Default.pm:474 +#: perllib/FixMyStreet/Cobrand/Default.pm:455 +#: perllib/FixMyStreet/Cobrand/Default.pm:495 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "Nærmeste vei til nÃ¥len plassert pÃ¥ kartet (automatisk generert ved hjelp av Bing Maps): %s" -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:267 +#: perllib/FixMyStreet/Script/Alerts.pm:290 msgid "" "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n" "\n" @@ -1668,12 +1585,7 @@ msgstr "" "Nærmeste vei til nÃ¥len plassert pÃ¥ kartet (automatisk generert ved hjelp av Bing Maps) er: %s\n" "\n" -#: templates/web/zurich/email_sent.html:5 -msgid "Nearly Done! Now check your email..." -msgstr "Nesten ferdig! NÃ¥ mÃ¥ du sjekke e-posten din..." - #: templates/web/base/auth/token.html:17 templates/web/base/email_sent.html:5 -#, fuzzy msgid "Nearly done! Now check your email…" msgstr "Nesten ferdig! NÃ¥ mÃ¥ du sjekke e-posten din..." @@ -1699,9 +1611,8 @@ msgid "New local problems on FixMyStreet" msgstr "Nye lokale problemer pÃ¥ FiksGataMi" #: templates/web/zurich/admin/report_edit-sdm.html:117 -#, fuzzy msgid "New note to DM:" -msgstr "Nytt internt notat:" +msgstr "" #: db/alert_types.pl:38 msgid "New problems for {{COUNCIL}} within {{WARD}} ward on FixMyStreet" @@ -1733,9 +1644,8 @@ msgstr "Ny tilstand" #: templates/web/zurich/admin/template_edit.html:9 #: templates/web/zurich/admin/templates.html:26 -#, fuzzy msgid "New template" -msgstr "Ny tilstand" +msgstr "Ny mal" #: templates/web/base/pagination.html:13 msgid "Next" @@ -1752,8 +1662,8 @@ msgstr "Neste" #: templates/web/base/admin/report_edit.html:75 #: templates/web/base/admin/update_edit.html:25 #: templates/web/base/questionnaire/creator_fixed.html:16 +#: templates/web/base/questionnaire/index.html:101 #: templates/web/base/questionnaire/index.html:53 -#: templates/web/base/questionnaire/index.html:92 msgid "No" msgstr "Nei" @@ -1824,10 +1734,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:13 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:33 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:31 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:37 msgid "Not Responsible" msgstr "Ikke ansvarlig" @@ -1835,9 +1743,8 @@ msgstr "Ikke ansvarlig" #: perllib/FixMyStreet/Cobrand/Zurich.pm:937 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:13 -#, fuzzy msgid "Not contactable" -msgstr "Ikke ansvarlig" +msgstr "Kan ikke kontaktes" #: templates/web/zurich/admin/report_edit-sdm.html:108 msgid "Not for my subdivision" @@ -1867,7 +1774,7 @@ msgstr "Merk at nÃ¥r vi tar med ubekreftede rapporter sÃ¥ brukes datoen rapporte msgid "Note:" msgstr "Merk:" -#: templates/web/base/open311/index.html:73 +#: templates/web/base/open311/index.html:65 msgid "Note: <strong>%s</strong>" msgstr "Note: <strong>%d</strong>" @@ -1875,13 +1782,15 @@ msgstr "Note: <strong>%d</strong>" msgid "Notes from SDM to DM" msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:113 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:10 +#: templates/web/base/report/new/form_user_loggedout.html:14 +#: templates/web/base/report/new/form_user_loggedout.html:2 +#: templates/web/base/report/new/oauth_email_form.html:17 msgid "Now to submit your report…" msgstr "PÃ¥ tide Ã¥ sende din rapport…" -#: templates/web/base/report/update-form.html:86 -#: templates/web/fixmystreet/report/update-form.html:85 +#: templates/web/base/report/update-form.html:28 +#: templates/web/base/report/update/form_user_loggedout.html:13 +#: templates/web/base/report/update/form_user_loggedout.html:2 msgid "Now to submit your update…" msgstr "PÃ¥ tide Ã¥ registrere din oppdatering…" @@ -1889,11 +1798,6 @@ msgstr "PÃ¥ tide Ã¥ registrere din oppdatering…" msgid "OK" msgstr "OK" -#: templates/web/base/report/display.html:28 -#: templates/web/base/report/update.html:17 -msgid "Offensive? Unsuitable? Tell us" -msgstr "Støtende? Upassende? Gi oss beskjed" - #: templates/web/base/reports/index.html:23 msgid "Old / unknown <br>problems" msgstr "Gamle / ukjente <br>problemer" @@ -1910,7 +1814,7 @@ msgstr "Eldre <br>løste" msgid "Older <br>problems" msgstr "Eldre <br>problemer" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:45 +#: templates/web/base/report/new/form_report.html:15 msgid "One-line summary" msgstr "Enlinjers oppsummering" @@ -1921,8 +1825,7 @@ msgstr "Enlinjers oppsummering" #: templates/web/base/admin/report_blocks.html:4 #: templates/web/base/admin/update_edit.html:28 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/report/update-form.html:30 -#: templates/web/fixmystreet/report/update-form.html:28 +#: templates/web/base/report/update/form_update.html:34 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:7 #: templates/web/zurich/admin/update_edit.html:18 @@ -1937,15 +1840,15 @@ msgstr "Ã…pen i mer enn fire uker, med en oppdatering i løpet av de siste Ã¥tte msgid "Open, but not had any update in eight weeks" msgstr "Ã…pen, men har ikke hatt noen oppdateringer pÃ¥ Ã¥tte uker" -#: templates/web/base/open311/index.html:70 +#: templates/web/base/open311/index.html:62 msgid "Open311 API for the mySociety FixMyStreet server" msgstr "Open311-API for mySocietys FiksGataMi-tjener" -#: templates/web/base/open311/index.html:80 +#: templates/web/base/open311/index.html:72 msgid "Open311 initiative web page" msgstr "Open311-initiativets nettside" -#: templates/web/base/open311/index.html:81 +#: templates/web/base/open311/index.html:73 msgid "Open311 specification" msgstr "Open311-spesifikasjon" @@ -1957,15 +1860,15 @@ msgstr "Eller problemer meldt til:" msgid "Or you can subscribe to an alert based upon what ward or council you’re in:" msgstr "Eller du kan abonnere pÃ¥ varsel basert pÃ¥ bydel eller administrasjon du hører inn under:" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1084 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:673 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:674 -#: perllib/FixMyStreet/DB/Result/Problem.pm:570 -#: perllib/FixMyStreet/DB/Result/Problem.pm:580 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1055 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:669 +#: perllib/FixMyStreet/DB/Result/Problem.pm:558 +#: perllib/FixMyStreet/DB/Result/Problem.pm:568 +#: perllib/FixMyStreet/DB/Result/Problem.pm:578 #: perllib/FixMyStreet/DB/Result/Problem.pm:590 -#: perllib/FixMyStreet/DB/Result/Problem.pm:602 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:397 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:412 +#: perllib/FixMyStreet/Script/Reports.pm:175 +#: perllib/FixMyStreet/Script/Reports.pm:190 msgid "Other" msgstr "Annet" @@ -1974,7 +1877,7 @@ msgid "Owner" msgstr "Eier" #: templates/web/base/errors/page_error_404_not_found.html:1 -#: templates/web/base/errors/page_error_404_not_found.html:3 +#: templates/web/base/errors/page_error_404_not_found.html:4 msgid "Page Not Found" msgstr "Fant ikke siden" @@ -1988,16 +1891,16 @@ msgstr "Forelder" msgid "Partial" msgstr "Delvis" -#: templates/web/base/auth/general.html:53 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:68 -#: templates/web/fixmystreet/report/update-form.html:116 +#: templates/web/base/auth/general.html:92 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:31 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:6 #: templates/web/zurich/auth/general.html:32 #: templates/web/zurich/auth/general.html:63 msgid "Password (optional)" msgstr "Passord (valgfritt)" #: templates/web/base/auth/change_password.html:25 -#: templates/web/base/auth/general.html:36 +#: templates/web/base/auth/general.html:72 msgid "Password:" msgstr "Passord:" @@ -2009,45 +1912,37 @@ msgstr "Permalink" msgid "Phone number" msgstr "Telefonnummer" -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:26 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:62 +#: templates/web/base/report/new/form_user_loggedin.html:26 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:25 msgid "Phone number (optional)" msgstr "Telefonnummer (valgfritt)" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:306 +#: perllib/FixMyStreet/Script/Reports.pm:83 #: templates/web/base/admin/report_edit.html:63 -#: templates/web/base/report/new/fill_in_details_form.html:198 #: templates/web/zurich/admin/stats.html:39 msgid "Phone:" msgstr "Telefon:" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:66 -#: templates/web/fixmystreet/report/update-form.html:59 +#: templates/web/base/questionnaire/index.html:75 +#: templates/web/base/report/new/form_report.html:23 +#: templates/web/base/report/update/form_update.html:6 #: templates/web/zurich/admin/index-dm.html:29 #: templates/web/zurich/admin/index-sdm.html:24 #: templates/web/zurich/admin/reports.html:16 #: templates/web/zurich/admin/stats.html:37 -#: templates/web/zurich/report/new/fill_in_details_form.html:52 +#: templates/web/zurich/report/new/fill_in_details_form.html:45 msgid "Photo" msgstr "Bilde" -#: perllib/FixMyStreet/App/Controller/Photo.pm:221 -#, fuzzy +#: perllib/FixMyStreet/App/Controller/Photo.pm:187 msgid "Photo is required." -msgstr "Denne informasjonen er pÃ¥krevd" +msgstr "Foto er pÃ¥krevd." #: templates/web/base/admin/category_edit.html:48 -#, fuzzy msgid "Photo required" -msgstr "Denne informasjonen er pÃ¥krevd" - -#: templates/web/base/questionnaire/index.html:80 -#: templates/web/base/report/new/fill_in_details_form.html:84 -#: templates/web/base/report/update-form.html:62 -msgid "Photo:" -msgstr "Bilde:" +msgstr "Foto kreves" -#: templates/web/base/alert/list.html:26 +#: templates/web/base/alert/list.html:23 msgid "Photos of recent nearby reports" msgstr "Bilder av nye problemer i nærheten" @@ -2076,20 +1971,16 @@ 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/zurich/auth/token.html:16 -msgid "Please check your email" -msgstr "Vennligst sjekk e-posten du oppgav" - -#: templates/web/base/auth/general.html:10 -#: templates/web/base/auth/general.html:16 +#: templates/web/base/auth/general.html:27 +#: templates/web/base/auth/general.html:33 #: templates/web/zurich/auth/general.html:3 #: templates/web/zurich/auth/general.html:9 msgid "Please check your email address is correct" msgstr "Vennligst sjekk at du har skrevet en gyldig e-postadresse" #: perllib/FixMyStreet/App/Controller/Admin.pm:343 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:883 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:948 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:878 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:943 #: perllib/FixMyStreet/DB/Result/Problem.pm:412 #: templates/web/base/js/translation_strings.html:9 msgid "Please choose a category" @@ -2103,9 +1994,7 @@ msgstr "Velg en type egenskap" msgid "Please correct the errors below" msgstr "Husk Ã¥ rette opp feilene nedenfor." -#: templates/web/base/contact/blurb.html:2 -#: templates/web/fixmystreet/contact/blurb.html:12 -#, fuzzy +#: templates/web/base/contact/blurb.html:12 msgid "" "Please do <strong>not</strong> report problems through this form; messages go to\n" "the team behind this site, not a council. To report a problem,\n" @@ -2120,11 +2009,17 @@ msgid "Please do not be abusive — abusing your council devalues the s msgstr "Ikke vær ufin — Ã¥ kjefte pÃ¥ din administrasjon skader verdien av tjenesten for alle brukerne." #: perllib/FixMyStreet/App/Controller/Admin.pm:346 -#: perllib/FixMyStreet/DB/Result/Comment.pm:126 +#: perllib/FixMyStreet/DB/Result/Comment.pm:125 #: templates/web/base/js/translation_strings.html:2 msgid "Please enter a message" msgstr "Vennligst legg til en melding" +#: perllib/FixMyStreet/App/Controller/Admin.pm:1091 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1146 +#, fuzzy +msgid "Please enter a name" +msgstr "Legg inn ditt navn" + #: templates/web/base/auth/change_password.html:12 #: templates/web/base/auth/change_password.html:15 #: templates/web/base/js/translation_strings.html:19 @@ -2137,10 +2032,10 @@ msgstr "Skriv inn et passord" msgid "Please enter a subject" msgstr "Vennligst legg inn et emne" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1084 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1137 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1087 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1142 #: perllib/FixMyStreet/App/Controller/Admin.pm:345 -#: perllib/FixMyStreet/DB/Result/User.pm:127 +#: perllib/FixMyStreet/DB/Result/User.pm:133 #: templates/web/base/js/translation_strings.html:12 #: templates/web/base/js/translation_strings.html:16 msgid "Please enter a valid email" @@ -2157,9 +2052,9 @@ msgid "Please enter some details" msgstr "Legg inn opplysninger om problemet" #: perllib/FixMyStreet/App/Controller/Contact.pm:113 -#: perllib/FixMyStreet/DB/Result/User.pm:124 -#: templates/web/base/auth/general.html:10 -#: templates/web/base/auth/general.html:15 +#: perllib/FixMyStreet/DB/Result/User.pm:130 +#: templates/web/base/auth/general.html:27 +#: templates/web/base/auth/general.html:32 #: templates/web/base/js/translation_strings.html:11 #: templates/web/base/js/translation_strings.html:15 #: templates/web/zurich/auth/general.html:3 @@ -2167,7 +2062,7 @@ msgstr "Legg inn opplysninger om problemet" msgid "Please enter your email" msgstr "Legg inn din e-post" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:7 +#: templates/web/base/report/new/form_user_loggedout_email.html:7 #: templates/web/zurich/report/new/fill_in_details_form.html:80 msgid "Please enter your email address" msgstr "Vennligst tast inn din e-postadresse" @@ -2176,15 +2071,15 @@ msgstr "Vennligst tast inn din e-postadresse" msgid "Please enter your first name" msgstr "Vennligst tast inn ditt fornavn" -#: perllib/FixMyStreet/Cobrand/UK.pm:318 +#: perllib/FixMyStreet/Cobrand/UK.pm:319 #: templates/web/base/js/translation_strings.html:7 msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below" msgstr "Vennligst legg inn ditt fulle navn, administrasjoner som mottar ditt problem trenger dette - hvis du ikke ønsker at ditt navn skal vises, fjern haken under" #: perllib/FixMyStreet/App/Controller/Contact.pm:112 -#: perllib/FixMyStreet/DB/Result/Comment.pm:123 +#: perllib/FixMyStreet/DB/Result/Comment.pm:122 #: perllib/FixMyStreet/DB/Result/Problem.pm:406 -#: perllib/FixMyStreet/DB/Result/User.pm:120 +#: perllib/FixMyStreet/DB/Result/User.pm:126 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter your name" msgstr "Legg inn ditt navn" @@ -2211,12 +2106,11 @@ msgstr "Du kan ogsÃ¥ <a href=\"%s\">logge inn igjen</a> eller gÃ¥ tilbake til <a msgid "Please fill in details of the problem below." msgstr "Vennligst fyll ut detaljer om problemet under" -#: templates/web/zurich/report/new/fill_in_details_form.html:46 +#: templates/web/zurich/report/new/fill_in_details_form.html:72 msgid "Please fill in details of the problem." msgstr "Vennligst fyll ut detaljer om problemet." -#: templates/web/base/report/new/fill_in_details_form.html:28 -#: templates/web/fixmystreet/report/new/sidebar.html:7 +#: templates/web/base/report/new/sidebar.html:7 #: templates/web/zurich/report/new/fill_in_details_form.html:20 msgid "Please fill in the form below with details of the problem, and describe the location as precisely as possible in the details box." msgstr "" @@ -2227,20 +2121,24 @@ msgstr "" msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "Vennligst indiker om du ønsker Ã¥ motta et nytt spørreskjema" -#: templates/web/fixmystreet/report/updates-sidebar-notes.html:4 +#: templates/web/base/report/updates-sidebar-notes.html:2 msgid "Please note that updates are not sent to the council." msgstr "Vær oppmerksom pÃ¥ at oppdateringer ikke blir videresendt til administrasjonen." -#: templates/web/base/report/update-form.html:7 -msgid "Please note that updates are not sent to the council. If you leave your name it will be public. Your information will only be used in accordance with our <a href=\"/faq#privacy\">privacy policy</a>" -msgstr "Vennligst merk at oppdateringer ikke blir sendt til administrasjonen. Hvis du legger igjen navnet ditt sÃ¥ vil det være offentlig tilgjengelig. Din informasjon vil kun bli brukt i henhold til vÃ¥re <a href=\"/faq#privacy\">personvernpolicy</a>" +#: templates/web/base/report/new/oauth_email_form.html:4 +#, fuzzy +msgid "Please note your report has <strong>not yet been sent</strong>." +msgstr "Merk at din rapport <strong>ennÃ¥ ikke er sendt</strong. Velg en kategori og legg til mer informasjon under før du sender inn." -#: templates/web/base/report/new/fill_in_details_form.html:8 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:21 +#: templates/web/base/report/new/fill_in_details_form.html:20 #: templates/web/zurich/report/new/fill_in_details_form.html:11 msgid "Please note your report has <strong>not yet been sent</strong>. Choose a category and add further information below, then submit." msgstr "Merk at din rapport <strong>ennÃ¥ ikke er sendt</strong. Velg en kategori og legg til mer informasjon under før du sender inn." +#: templates/web/base/report/display.html:26 +msgid "Please note your update has <strong>not yet been posted</strong>." +msgstr "" + #: templates/web/base/report/new/notes.html:1 #: templates/web/zurich/report/new/notes.html:1 msgid "Please note:" @@ -2260,9 +2158,8 @@ msgid "Please say whether you've ever reported a problem to your council before" msgstr "Vennligst opplys om du har rapportert et problem til din administrasjon tidligere" #: templates/web/zurich/admin/report_edit.html:208 -#, fuzzy msgid "Please select a body." -msgstr "Velg en administrasjon" +msgstr "Velg en administrasjon." #: perllib/FixMyStreet/App/Controller/Alert.pm:80 msgid "Please select the feed you want" @@ -2279,6 +2176,7 @@ msgstr "Vennligs oppgi om dette problemet er blitt fikset eller ikke" #: perllib/FixMyStreet/App/Model/PhotoSet.pm:117 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:145 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:147 +#: templates/web/base/js/translation_strings.html:53 msgid "Please upload a JPEG image only" msgstr "Vennligst last opp kun JPEG-bilder" @@ -2286,18 +2184,14 @@ msgstr "Vennligst last opp kun JPEG-bilder" msgid "Please write a message" msgstr "Skriv inn en melding" -#: templates/web/fixmystreet/report/update-form.html:23 +#: templates/web/base/report/update/form_update.html:29 msgid "Please write your update here" msgstr "Vennligst skriv inn din oppdatering her" -#: templates/web/base/contact/index.html:100 -#: templates/web/base/report/update-form.html:110 -#: templates/web/base/report/update-form.html:132 -#: templates/web/base/report/update-form.html:72 -#: templates/web/fixmystreet/contact/index.html:113 -#: templates/web/fixmystreet/report/update-form.html:124 -#: templates/web/fixmystreet/report/update-form.html:71 -#: templates/web/fixmystreet/report/update-form.html:97 +#: templates/web/base/contact/index.html:105 +#: templates/web/base/report/update-form.html:24 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:14 +#: templates/web/base/report/update/form_user_loggedout_password.html:10 msgid "Post" msgstr "Send inn" @@ -2315,7 +2209,7 @@ msgstr "Sendt inn av %s %s" #: templates/web/base/front/footer-marketing.html:12 msgid "Powered by <a class=\"platform-logo\" href=\"http://fixmystreet.org/\">FixMyStreet Platform</a>" -msgstr "" +msgstr "Drevet av <a class=\"platform-logo\" href=\"http://fixmystreet.org/\">FixMyStreet Platform</a>" #: templates/web/base/pagination.html:7 msgid "Previous" @@ -2325,14 +2219,11 @@ msgstr "Forrige" msgid "Privacy" msgstr "Personvern" -#: templates/web/base/faq/faq-en-gb.html:7 -#: templates/web/base/open311/index.html:7 -#: templates/web/base/static/privacy.html:1 -#: templates/web/base/static/privacy.html:2 -#: templates/web/base/static/privacy.html:9 -#: templates/web/fixmystreet/contact/index.html:11 +#: templates/web/base/about/_sidebar.html:5 +#: templates/web/base/about/privacy.html:1 +#: templates/web/base/about/privacy.html:2 msgid "Privacy and cookies" -msgstr "" +msgstr "Personvern og cookies" #: templates/web/base/admin/body.html:202 #: templates/web/base/admin/body.html:85 @@ -2358,12 +2249,12 @@ msgstr "Problem %s bekreftet" msgid "Problem %s sent to council %s" msgstr "Problem %s sendt til administrasjon %s" -#: templates/web/base/admin/index.html:46 +#: templates/web/base/admin/index.html:39 #: templates/web/zurich/admin/index.html:9 msgid "Problem breakdown by state" msgstr "Tilstandsfordeling av problemer" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1055 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1058 msgid "Problem marked as open." msgstr "Problem markert som Ã¥pent." @@ -2379,11 +2270,11 @@ msgstr "Problemer" msgid "Problems in this area" msgstr "Problemer i dette omrÃ¥det" -#: templates/web/fixmystreet/report/display.html:43 +#: templates/web/base/report/display_tools.html:19 msgid "Problems nearby" msgstr "Problemer i nærheten" -#: templates/web/fixmystreet/report/display.html:41 +#: templates/web/base/report/display_tools.html:17 msgid "Problems on the map" msgstr "Problemer pÃ¥ kartet" @@ -2395,24 +2286,23 @@ msgstr "Problemer nylig rapportert fikset pÃ¥ FiksGataMi" msgid "Problems within %.1fkm of this location" msgstr "Problemer innenfor %.1fkm av denne posisjonen" -#: perllib/FixMyStreet/Cobrand/Default.pm:642 +#: perllib/FixMyStreet/Cobrand/Default.pm:663 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:120 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:139 -#: perllib/FixMyStreet/Cobrand/UK.pm:207 +#: perllib/FixMyStreet/Cobrand/UK.pm:208 msgid "Problems within %s" msgstr "Problemer innenfor %s" #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:128 -#: perllib/FixMyStreet/Cobrand/UK.pm:221 +#: perllib/FixMyStreet/Cobrand/UK.pm:222 msgid "Problems within %s ward" msgstr "Problemer innenfor %s bydel" #. ("First %s is the body name, second %s the site name") #: templates/web/base/reports/body.html:0 #: templates/web/base/reports/body.html:24 -#, fuzzy msgid "Problems within %s, %s" -msgstr "Problemer innenfor %s" +msgstr "Problemer innenfor %s, %s" #: templates/web/base/alert/_list.html:42 msgid "Problems within the boundary of:" @@ -2426,19 +2316,16 @@ msgstr "Eiendomsadresse:" msgid "Property type:" msgstr "Type egenskap:" -#: templates/web/base/report/update-form.html:3 -#: templates/web/fixmystreet/report/update-form.html:4 +#: templates/web/base/report/update-form.html:6 msgid "Provide an update" msgstr "Bidra med en oppdatering" -#: templates/web/base/auth/general.html:56 +#: templates/web/base/auth/general.html:95 msgid "Providing a name and password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." msgstr "Det er valgfritt Ã¥ oppgi navn og passord, men hvis du gjør det kan du enklere rapportere problemer, legge igjen oppdateringer og hÃ¥ndtere rapportene dine." -#: templates/web/base/report/new/fill_in_details_form.html:156 -#: templates/web/base/report/update-form.html:129 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:71 -#: templates/web/fixmystreet/report/update-form.html:119 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:34 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:9 msgid "Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." msgstr "Det er valgfritt Ã¥ oppgi et passord, men hvis du gjør det vil det bli enklere for deg Ã¥ rapportere problemer, legge inn oppdateringer og holde oversikt over dine rapporter" @@ -2474,18 +2361,17 @@ msgstr "Spørreskjema fylt inn av feilrapportøren" #: templates/web/base/alert/_list.html:22 #: templates/web/base/around/display_location.html:1 #: templates/web/base/around/display_location.html:3 -#: templates/web/base/report/display.html:50 +#: templates/web/base/report/display_tools.html:34 #: templates/web/base/reports/_rss.html:1 #: templates/web/fixmystreet/alert/updates.html:9 -#: templates/web/fixmystreet/report/display.html:58 msgid "RSS feed" msgstr "RSS-strøm" -#: perllib/FixMyStreet/Cobrand/UK.pm:250 perllib/FixMyStreet/Cobrand/UK.pm:262 +#: perllib/FixMyStreet/Cobrand/UK.pm:251 perllib/FixMyStreet/Cobrand/UK.pm:263 msgid "RSS feed for %s" msgstr "RSS-strøm for %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:256 perllib/FixMyStreet/Cobrand/UK.pm:268 +#: perllib/FixMyStreet/Cobrand/UK.pm:257 perllib/FixMyStreet/Cobrand/UK.pm:269 msgid "RSS feed for %s ward, %s" msgstr "RSS-strøm for %s bydel, %s" @@ -2493,11 +2379,11 @@ msgstr "RSS-strøm for %s bydel, %s" #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:163 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:173 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:181 -#: perllib/FixMyStreet/Cobrand/UK.pm:276 perllib/FixMyStreet/Cobrand/UK.pm:288 +#: perllib/FixMyStreet/Cobrand/UK.pm:277 perllib/FixMyStreet/Cobrand/UK.pm:289 msgid "RSS feed of %s" msgstr "RSS-strøm fra %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:281 perllib/FixMyStreet/Cobrand/UK.pm:293 +#: perllib/FixMyStreet/Cobrand/UK.pm:282 perllib/FixMyStreet/Cobrand/UK.pm:294 msgid "RSS feed of %s, within %s ward" msgstr "RSS-strøm av %s, innenfor %s bydel" @@ -2509,15 +2395,15 @@ msgstr "RSS-strøm med problemer i nærheten" msgid "RSS feed of problems in this %s" msgstr "RSS-strøm for problemer i denne %s" -#: perllib/FixMyStreet/Cobrand/Default.pm:643 +#: perllib/FixMyStreet/Cobrand/Default.pm:664 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:121 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:138 -#: perllib/FixMyStreet/Cobrand/UK.pm:214 +#: perllib/FixMyStreet/Cobrand/UK.pm:215 msgid "RSS feed of problems within %s" msgstr "RSS-strøm for problemer innenfor %s" #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:127 -#: perllib/FixMyStreet/Cobrand/UK.pm:220 +#: perllib/FixMyStreet/Cobrand/UK.pm:221 msgid "RSS feed of problems within %s ward" msgstr "RSS-strøm for problemer innenfor %s bydel" @@ -2526,23 +2412,20 @@ msgstr "RSS-strøm for problemer innenfor %s bydel" msgid "RSS feed of recent local problems" msgstr "RSS-strøm med nylige lokale problemer" -#: templates/web/base/report/display.html:50 +#: templates/web/base/report/display_tools.html:34 #: templates/web/fixmystreet/alert/updates.html:9 -#: templates/web/fixmystreet/report/display.html:58 msgid "RSS feed of updates to this problem" msgstr "RSS-strøm med oppdateringer for dette problemet" #: templates/web/base/alert/updates.html:9 -#: templates/web/base/report/display.html:41 +#: templates/web/base/report/display_tools.html:36 #: templates/web/fixmystreet/alert/updates.html:14 -#: templates/web/fixmystreet/report/display.html:60 msgid "Receive email when updates are left on this problem." msgstr "Motta e-post nÃ¥r det er oppdateringer pÃ¥ dette problemet" #. ("%s is the site name") #: templates/web/base/around/display_location.html:0 #: templates/web/base/around/display_location.html:33 -#, fuzzy msgid "Recent local problems, %s" msgstr "Nylige lokale problemer, FiksGataMi." @@ -2562,16 +2445,15 @@ msgstr "Husk at FiksGataMi primert er laget for Ã¥ rapportere fysiske problemer msgid "Remove flag" msgstr "Fjern flagg" -#: templates/web/base/admin/report_edit.html:92 -#: templates/web/base/admin/update_edit.html:62 +#: templates/web/base/admin/report_edit.html:93 +#: templates/web/base/admin/update_edit.html:67 #: templates/web/zurich/admin/update_edit.html:35 msgid "Remove photo (can't be undone!)" msgstr "Fjern bilde (kan ikke gjøres om!)" #: templates/web/zurich/admin/report_edit.html:243 -#, fuzzy msgid "Reply to user:" -msgstr "rediger bruker" +msgstr "Svar til bruker:" #: templates/web/fixmystreet/header_logo.html:2 msgid "Report" @@ -2584,7 +2466,7 @@ msgstr "Rapport" msgid "Report a problem" msgstr "Rapporter et problem" -#: templates/web/fixmystreet/report/display.html:32 +#: templates/web/base/report/display_tools.html:8 msgid "Report abuse" msgstr "Rapporter misbruk" @@ -2593,7 +2475,8 @@ msgid "Report on %s" msgstr "Rapport pÃ¥ %s" #: templates/web/base/report/new/fill_in_details_form.html:1 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:2 +#: templates/web/base/report/new/login_success_form.html:1 +#: templates/web/base/report/new/oauth_email_form.html:1 msgid "Report your problem" msgstr "Rapporter problemet ditt" @@ -2602,9 +2485,8 @@ msgstr "Rapporter problemet ditt" msgid "Report, view, or discuss local problems" msgstr "Rapporter, finn eller diskuter lokale problemer" -#: perllib/FixMyStreet/DB/Result/Problem.pm:585 -#: templates/web/base/contact/index.html:50 -#: templates/web/fixmystreet/contact/index.html:65 +#: perllib/FixMyStreet/DB/Result/Problem.pm:573 +#: templates/web/base/contact/index.html:57 msgid "Reported anonymously at %s" msgstr "Rapportert anonymt %s" @@ -2613,43 +2495,41 @@ msgstr "Rapportert anonymt %s" msgid "Reported before" msgstr "Rapportert tidligere" -#: perllib/FixMyStreet/DB/Result/Problem.pm:608 -#: templates/web/base/contact/index.html:52 -#: templates/web/fixmystreet/contact/index.html:67 +#: perllib/FixMyStreet/DB/Result/Problem.pm:596 +#: templates/web/base/contact/index.html:59 msgid "Reported by %s at %s" msgstr "Publisert av %s %s" #: templates/web/zurich/admin/report_edit-sdm.html:58 #: templates/web/zurich/admin/report_edit.html:86 -#, fuzzy msgid "Reported by:" -msgstr "Rapportert %s" +msgstr "Rapportert av:" #: templates/web/zurich/report/_main.html:2 msgid "Reported in the %s category" msgstr "Rapportert i kategorien %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:581 +#: perllib/FixMyStreet/DB/Result/Problem.pm:569 msgid "Reported in the %s category anonymously at %s" msgstr "Rapportert i kategorien %s anonymt %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:603 +#: perllib/FixMyStreet/DB/Result/Problem.pm:591 msgid "Reported in the %s category by %s at %s" msgstr "Rapportert i kategorien %s av %s %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:577 +#: perllib/FixMyStreet/DB/Result/Problem.pm:565 msgid "Reported via %s anonymously at %s" msgstr "Publisert av %s anonymt %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:599 +#: perllib/FixMyStreet/DB/Result/Problem.pm:587 msgid "Reported via %s by %s at %s" msgstr "Rapportert av %s av %s %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:573 +#: perllib/FixMyStreet/DB/Result/Problem.pm:561 msgid "Reported via %s in the %s category anonymously at %s" msgstr "Rapportert av %s i kategorien %s anonymt %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:593 +#: perllib/FixMyStreet/DB/Result/Problem.pm:581 msgid "Reported via %s in the %s category by %s at %s" msgstr "Rapportert av %s i kategorien %s av %s %s" @@ -2659,9 +2539,8 @@ msgstr "Rapportert i løpet av de siste fire ukene" #: templates/web/zurich/admin/report_edit-sdm.html:36 #: templates/web/zurich/admin/report_edit.html:55 -#, fuzzy msgid "Reported:" -msgstr "Rapportert %s" +msgstr "Rapportert:" #: templates/web/base/around/index.html:2 #: templates/web/base/js/translation_strings.html:41 @@ -2671,13 +2550,13 @@ msgstr "Rapportert %s" msgid "Reporting a problem" msgstr "Legger til et problem" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1277 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1286 #: perllib/FixMyStreet/Cobrand/Zurich.pm:384 #: templates/web/zurich/header.html:60 msgid "Reports" msgstr "Rapporter" -#: perllib/FixMyStreet/Cobrand/UK.pm:327 perllib/FixMyStreet/Cobrand/UK.pm:331 +#: perllib/FixMyStreet/Cobrand/UK.pm:328 perllib/FixMyStreet/Cobrand/UK.pm:332 msgid "Reports are limited to %s characters in length. Please shorten your report" msgstr "Rapportene begrenses til %s tegn. Rapporten mÃ¥ forkortes." @@ -2698,7 +2577,7 @@ msgstr "Send rapport pÃ¥ nytt" #: templates/web/zurich/admin/templates.html:1 #: templates/web/zurich/admin/templates.html:3 msgid "Response Templates for %s" -msgstr "" +msgstr "Svarmaler for %s" #: templates/web/base/js/translation_strings.html:28 msgid "Right place?" @@ -2714,25 +2593,26 @@ msgstr "Veioperatør for denne navngitte veien (utledet fra veiens referansenumm msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "Veioperatør for denne navngitte veien (fra OpenStreetMap): %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1495 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1500 -#: templates/web/base/admin/report_edit.html:88 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1508 +#: templates/web/base/admin/report_edit.html:90 +#: templates/web/base/admin/update_edit.html:64 #: templates/web/zurich/admin/report_edit.html:116 msgid "Rotate Left" msgstr "Roter til venstre" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1495 -#: templates/web/base/admin/report_edit.html:89 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 +#: templates/web/base/admin/report_edit.html:91 +#: templates/web/base/admin/update_edit.html:65 #: templates/web/zurich/admin/report_edit.html:117 msgid "Rotate Right" msgstr "Roter til høyre" #: templates/web/zurich/admin/report_edit.html:388 msgid "Rotating this photo will discard unsaved changes to the report." -msgstr "" +msgstr "Hvis du roterer dette bildet, mister du ikke lagrede endringer til rapporten." #: templates/web/base/js/translation_strings.html:46 -#: templates/web/base/maps/google-ol.html:13 msgid "Satellite" msgstr "Satelitt" @@ -2785,16 +2665,14 @@ msgid "Select an area" msgstr "Velg et omrÃ¥de" #: templates/web/base/alert/_list.html:10 -#, fuzzy msgid "Select which type of alert you’d like and click the button for an RSS feed, or enter your email address to subscribe to an email alert." -msgstr "Velg hvilken type varsel du ønsker og klikk pÃ¥ knappen for en RSS-kilde, eller skriv inn din e-postadresse for Ã¥ abonnere pÃ¥ et e-postvarsel." +msgstr "" #: perllib/FixMyStreet/Cobrand/Zurich.pm:835 -#, fuzzy msgid "Sent report back" -msgstr "Ã…pne rapporter" +msgstr "Rapport sendt tilbake" -#: perllib/FixMyStreet/DB/Result/Problem.pm:708 +#: perllib/FixMyStreet/DB/Result/Problem.pm:696 msgid "Sent to %s %s later" msgstr "Sendt til %s %s senere" @@ -2807,15 +2685,13 @@ msgstr "Sendt:" msgid "Service:" msgstr "Tjeneste:" -#: templates/web/fixmystreet/report/display.html:38 +#: templates/web/base/report/display_tools.html:14 msgid "Share" msgstr "Dele" -#: templates/web/base/report/new/fill_in_details_form.html:193 -#: templates/web/base/report/update-form.html:158 -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:23 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:59 -#: templates/web/fixmystreet/report/update-form.html:146 +#: templates/web/base/report/new/form_user_loggedin.html:23 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:22 +#: templates/web/base/report/update/form_name.html:15 msgid "Show my name publicly" msgstr "Vis mitt navn offentlig" @@ -2827,9 +2703,9 @@ msgstr "Vis gamle" msgid "Show pins" msgstr "Vis nÃ¥ler" +#: templates/web/base/auth/general.html:100 #: templates/web/base/auth/general.html:3 -#: templates/web/base/auth/general.html:40 -#: templates/web/base/auth/general.html:61 +#: templates/web/base/auth/general.html:76 #: templates/web/zurich/auth/general.html:18 #: templates/web/zurich/auth/general.html:35 msgid "Sign in" @@ -2859,7 +2735,7 @@ msgstr "" "</strong> for Ã¥ indikere at rapportene blir sendt\n" "fra din FiksGataMi installasjon." -#: templates/web/base/alert/index.html:42 +#: templates/web/base/alert/index.html:40 msgid "Some photos of recent reports" msgstr "Noen bilder av nylig meldte problemer" @@ -2869,35 +2745,46 @@ msgstr "Noen bilder av nylig meldte problemer" msgid "Some text to localize" msgstr "Noe tekst Ã¥ oversette" -#: perllib/FixMyStreet/Cobrand/UK.pm:78 +#: perllib/FixMyStreet/Cobrand/UK.pm:79 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover." msgstr "Beklager det ser ut til Ã¥ være et \"Crown dependency\"-postnummer, som vi ikke dekker." #: templates/web/base/auth/token.html:8 msgid "Sorry, that wasn’t a valid link" -msgstr "" +msgstr "Beklager, det var ikke en gyldig lenke" #: templates/web/base/tokens/abuse.html:5 msgid "Sorry, there has been an error confirming your problem." msgstr "Beklager, men det oppsto et problem nÃ¥r vi forsøkte Ã¥ bekrefte problemrapporten din" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:221 -#: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:37 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:216 +#: perllib/FixMyStreet/Geocode.pm:38 perllib/FixMyStreet/Geocode/Bing.pm:38 #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:56 #: perllib/FixMyStreet/Geocode/OSM.pm:48 msgid "Sorry, we could not find that location." msgstr "Beklager, vi kunne ikke finne det stedet." -#: perllib/FixMyStreet/Geocode/Bing.pm:34 +#: templates/web/base/auth/general.html:9 +#: templates/web/base/report/display.html:21 +#: templates/web/base/report/new/fill_in_details_form.html:23 +#, fuzzy +msgid "Sorry, we could not log you in. Please fill in the form below." +msgstr "Beklager, vi kunne ikke tolke den posisjonen. Vennligst prøv pÃ¥ nytt." + +#: perllib/FixMyStreet/Geocode/Bing.pm:35 #: perllib/FixMyStreet/Geocode/Google.pm:45 #: perllib/FixMyStreet/Geocode/Zurich.pm:88 msgid "Sorry, we could not parse that location. Please try again." msgstr "Beklager, vi kunne ikke tolke den posisjonen. Vennligst prøv pÃ¥ nytt." #: perllib/FixMyStreet/App/Model/PhotoSet.pm:134 -#, fuzzy msgid "Sorry, we couldn't save your image(s), please try again." -msgstr "Beklager, vi kunne ikke tolke den posisjonen. Vennligst prøv pÃ¥ nytt." +msgstr "Beklager, vi kunne ikke lagre bildet ditt. Forsøk igjen." + +#: perllib/FixMyStreet/App/Controller/AuthSS.pm:301 +#, fuzzy +msgid "Sorry, you can not log in with Facebook. Please try again later." +msgstr "Det var problemer med Ã¥ vise denne siden. Vennligst prøv igjen senere." #: templates/web/base/admin/stats.html:64 msgid "Start Date:" @@ -2907,13 +2794,12 @@ msgstr "Start-dato:" #: templates/web/base/admin/flagged.html:18 #: templates/web/base/admin/list_updates.html:11 #: templates/web/base/admin/reports.html:15 -#: templates/web/fixmystreet/report/update-form.html:26 +#: templates/web/base/report/update/form_update.html:32 msgid "State" msgstr "Tilstand" #: templates/web/base/admin/report_edit.html:47 #: templates/web/base/admin/update_edit.html:27 -#: templates/web/base/report/update-form.html:28 #: templates/web/zurich/admin/report_edit-sdm.html:73 #: templates/web/zurich/admin/report_edit.html:101 #: templates/web/zurich/admin/report_edit.html:155 @@ -2921,7 +2807,7 @@ msgstr "Tilstand" msgid "State:" msgstr "Tilstand:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1282 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1291 #: perllib/FixMyStreet/Cobrand/Zurich.pm:387 #: templates/web/base/admin/stats.html:1 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:73 @@ -2941,9 +2827,9 @@ msgstr "Fortsatt Ã¥pen via spørreskjema, %s" #: templates/web/zurich/admin/report_edit-sdm.html:25 #: templates/web/zurich/admin/report_edit.html:26 msgid "Street View" -msgstr "" +msgstr "Gatevisning" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:406 +#: perllib/FixMyStreet/Script/Reports.pm:184 msgid "Subcategory: %s" msgstr "Underkategori: %s" @@ -2951,30 +2837,25 @@ msgstr "Underkategori: %s" msgid "Subdivision/Body" msgstr "Underavdeling/administrasjon" -#: templates/web/fixmystreet/contact/index.html:98 +#: templates/web/base/contact/index.html:90 msgid "Subject" msgstr "Emne" #: templates/web/base/admin/report_edit.html:19 -#: templates/web/base/contact/index.html:88 -#: templates/web/base/report/new/fill_in_details_form.html:53 #: templates/web/zurich/admin/report_edit.html:39 msgid "Subject:" msgstr "Emne:" #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/fill_in_details_form.html:137 -#: templates/web/base/report/new/fill_in_details_form.html:159 -#: templates/web/base/report/new/fill_in_details_form.html:96 -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:36 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:23 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:76 +#: templates/web/base/report/new/form_user_loggedin.html:36 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:39 +#: templates/web/base/report/new/form_user_loggedout_password.html:11 #: templates/web/zurich/report/new/fill_in_details_form.html:96 msgid "Submit" msgstr "Send inn" -#: templates/web/base/admin/report_edit.html:95 -#: templates/web/base/admin/update_edit.html:65 +#: templates/web/base/admin/report_edit.html:101 +#: templates/web/base/admin/update_edit.html:75 #: templates/web/base/admin/user-form.html:56 #: templates/web/zurich/admin/report_edit-sdm.html:137 #: templates/web/zurich/admin/report_edit.html:268 @@ -2982,7 +2863,7 @@ msgstr "Send inn" msgid "Submit changes" msgstr "Send inn endringer" -#: templates/web/base/questionnaire/index.html:97 +#: templates/web/base/questionnaire/index.html:106 msgid "Submit questionnaire" msgstr "Send inn spørreskjema" @@ -2998,9 +2879,8 @@ msgid "Submitted" msgstr "Sendt inn" #: templates/web/base/alert/updates.html:17 -#: templates/web/base/report/display.html:46 +#: templates/web/base/report/display_tools.html:41 #: templates/web/fixmystreet/alert/updates.html:23 -#: templates/web/fixmystreet/report/display.html:65 msgid "Subscribe" msgstr "Abonner" @@ -3008,7 +2888,7 @@ msgstr "Abonner" msgid "Subscribe me to an email alert" msgstr "Jeg ønsker Ã¥ abonnere pÃ¥ e-postvarsel" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1275 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1284 #: perllib/FixMyStreet/Cobrand/Zurich.pm:383 #: templates/web/base/admin/bodies.html:25 #: templates/web/base/admin/index.html:1 @@ -3027,7 +2907,7 @@ msgstr "Oppsummering" msgid "Summary reports" msgstr "Oppsummeringsrapporter" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1279 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1288 msgid "Survey" msgstr "Spørreundersøkelse" @@ -3037,13 +2917,12 @@ msgstr "Resultater fra spørreundersøkelsen" #: templates/web/zurich/admin/template_edit.html:7 msgid "Template «%s»" -msgstr "" +msgstr "Mal «%s»" #: perllib/FixMyStreet/Cobrand/Zurich.pm:394 #: templates/web/zurich/header.html:77 -#, fuzzy msgid "Templates" -msgstr "Oppdateringer" +msgstr "Maler" #: templates/web/base/admin/list_updates.html:12 #: templates/web/zurich/admin/templates.html:9 @@ -3064,7 +2943,7 @@ msgstr "Tekst:" msgid "Thank you for reporting this issue!" msgstr "Takk for at du rapporterte dette problemet!" -#: templates/web/base/tokens/error.html:7 +#: templates/web/base/tokens/error.html:6 msgid "Thank you for trying to confirm your update or problem. We seem to have an error ourselves though, so <a href=\"%s\">please let us know what went on</a> and we'll look into it." msgstr "Takk for at du forsøker Ã¥ bekrefte din oppdatering eller ditt problem. Vi ser ut til Ã¥ ha en feil hos oss, sÃ¥ <a href=\"%s\">vær sÃ¥ snill Ã¥ fortelle oss hva som skjedde</a> sÃ¥ skal vi se pÃ¥ saken." @@ -3099,23 +2978,23 @@ msgstr "Det stedet virker ikke Ã¥ være i Storbritannia. Vennligst prøv igjen." #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:47 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:63 -#: perllib/FixMyStreet/Cobrand/UK.pm:71 +#: perllib/FixMyStreet/Cobrand/UK.pm:72 msgid "That postcode was not recognised, sorry." msgstr "Det postnummeret ble ikke gjenkjent, beklager." -#: perllib/FixMyStreet/App/Controller/Admin.pm:726 +#: perllib/FixMyStreet/App/Controller/Admin.pm:724 msgid "That problem has been marked as sent." msgstr "Det problemer har blitt markert som sendt." -#: perllib/FixMyStreet/App/Controller/Admin.pm:718 +#: perllib/FixMyStreet/App/Controller/Admin.pm:716 msgid "That problem will now be resent." msgstr "Det problemet vil nÃ¥ bli sendt pÃ¥ nytt." -#: perllib/FixMyStreet/App/Controller/Report.pm:125 +#: perllib/FixMyStreet/App/Controller/Report.pm:127 msgid "That report cannot be viewed on %s." msgstr "Den rapporten kan ikke ses pÃ¥ %s." -#: perllib/FixMyStreet/App/Controller/Report.pm:119 +#: perllib/FixMyStreet/App/Controller/Report.pm:121 msgid "That report has been removed from FixMyStreet." msgstr "Den rapporten har blitt fjernet fra FiksGataMi." @@ -3154,7 +3033,7 @@ msgstr "" "<Strong>Sendemetoden</strong> bestemmer hvordan problemmeldinger blir sendt til administrasjonen.\n" "Hvis du lar dette stÃ¥ tomt, <strong>er sendemetoden som standard til e-post</strong>." -#: templates/web/base/open311/index.html:90 +#: templates/web/base/open311/index.html:82 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 "Open311 v2-atributten agency_responsible brukes for Ã¥ liste opp administrasjonene som mottok problemrapporten, noe som ikke helt stemmer med hvordan atributten er definert i Open311 v2-spesifikasjonen." @@ -3181,12 +3060,12 @@ msgstr "" msgid "The diligency prize league table shows editors' activity (who's been editing the most records)." msgstr "The diligency prize league tabellen viser redaktørenes aktivitet, (hvem som har redigert flest)." -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:60 -#: perllib/FixMyStreet/App/Controller/Reports.pm:79 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:61 +#: perllib/FixMyStreet/App/Controller/Reports.pm:80 msgid "The error was: %s" msgstr "Feilen var: %s" -#: templates/web/base/open311/index.html:86 +#: templates/web/base/open311/index.html:78 msgid "The following Open311 v2 attributes are returned for each request: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code and service_name." msgstr "De følgende Open311 v2-atributtene blir returnert for hver forespørsel: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code og service_name." @@ -3222,7 +3101,7 @@ msgstr "De siste problemer innenfor grensen til {{NAME}} rapportert av brukere" #: templates/web/base/auth/token.html:9 msgid "The link might have expired, or maybe you didn’t quite copy and paste it correctly." -msgstr "" +msgstr "Denne lenken har kanskje gÃ¥tt ut pÃ¥ tid, eller kanskje du ikke kopierte og limte den inn korrekt." #: templates/web/base/admin/body-form.html:58 msgid "The list of available areas is being provided by the MapIt service at %s." @@ -3233,8 +3112,7 @@ msgstr "Listen over tilgjengelige omrÃ¥der kommer fra MapIt-tjenesten pÃ¥ %s." msgid "The passwords do not match" msgstr "Passordene er ikke like" -#: templates/web/base/errors/page_error_404_not_found.html:10 -#: templates/web/base/errors/page_error_404_not_found.html:12 +#: templates/web/base/errors/page_error_404_not_found.html:9 msgid "The requested URL '%s' was not found on this server" msgstr "Den forespurte URL '%s' ble ikke funnet pÃ¥ denne tjeneren" @@ -3244,12 +3122,11 @@ msgstr "Den enkleste meldingen er vÃ¥r geografiske:" #: templates/web/base/report/new/councils_extra_text.html:1 #: templates/web/base/report/new/councils_text_some.html:10 -#: templates/web/base/report/new/fill_in_details_form.html:18 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:14 +#: templates/web/base/report/new/fill_in_details_form.html:13 msgid "The summary and description will also be made public (see our <a href=\"/privacy\">privacy policy</a>)." msgstr "Oppsummeringen og beskrivelsen vil ogsÃ¥ offentliggjøres (se vÃ¥re <a href=\"/privacy\">personvernregler</a>)." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:315 +#: perllib/FixMyStreet/Script/Reports.pm:92 msgid "The user could not locate the problem on a map, but to see the area around the location they entered" msgstr "Brukeren kunne ikke plassere problemet pÃ¥ et kart, men sjekk omrÃ¥det rundt stedet de skrev inn" @@ -3268,18 +3145,18 @@ msgstr "" msgid "There are no reports to show." msgstr "Det er ingen rapporter Ã¥ vise." -#: perllib/FixMyStreet/App/Controller/Reports.pm:76 +#: perllib/FixMyStreet/App/Controller/Reports.pm:77 msgid "There was a problem showing the All Reports page. Please try again later." msgstr "Det var problemer med Ã¥ vise 'Alle rapporter'-siden. Vennligst prøv igjen senere." #: perllib/FixMyStreet/App/Controller/Contact.pm:137 -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:59 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:60 msgid "There was a problem showing this page. Please try again later." msgstr "Det var problemer med Ã¥ vise denne siden. Vennligst prøv igjen senere." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:769 -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:134 -#: templates/web/base/auth/general.html:26 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:764 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:138 +#: templates/web/base/auth/general.html:43 #: templates/web/zurich/auth/general.html:28 msgid "There was a problem with your email/password combination. If you cannot remember your password, or do not have one, please fill in the ‘sign in by email’ section of the form." msgstr "Det var problemer med din e-post/passord-kombinasjon. Hvis du har glemt ditt passord, eller hvis du ikke har et, vennligst fyll inn «Logg inn via e-post»-delen av skjemaet" @@ -3288,7 +3165,7 @@ msgstr "Det var problemer med din e-post/passord-kombinasjon. Hvis du har glemt msgid "There was a problem with your email/password combination. Please try again." msgstr "Det var problemer med din epost/passord-kombinasjon. Vær sÃ¥ snill Ã¥ forsøke igjen." -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:272 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:336 msgid "There was a problem with your update. Please try again." msgstr "Det var problemer med din oppdatering. Vær sÃ¥ snill Ã¥ forsøke igjen." @@ -3296,7 +3173,7 @@ msgstr "Det var problemer med din oppdatering. Vær sÃ¥ snill Ã¥ forsøke igjen msgid "There were problems with your report. Please see below." msgstr "Det var problemer med din rapport. Vennligst se under." -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:300 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:371 msgid "There were problems with your update. Please see below." msgstr "Det var problemer med din oppdatering. Vennligst se under." @@ -3314,7 +3191,7 @@ msgstr "" "For mer informasjon om Open311, se\n" "<a href='https://www.mysociety.org/2013/01/17/open311-explained/' class='admin-offsite-link'>denne artikkelen</a>." -#: templates/web/base/open311/index.html:77 +#: templates/web/base/open311/index.html:69 msgid "This API implementation is work in progress and not yet stabilized. It will change without warnings in the future." msgstr "Denne API-implementasjonen er under arbeid og ennÃ¥ ikke stabil. Den vil endre seg uten advarsel i fremtiden." @@ -3341,18 +3218,18 @@ msgstr "" "Denne instansen fÃ¥r bare rapporter for problemer som er lokalisert i <strong>area covered</strong>.\n" "En instans vil ikke fÃ¥ noen meldinger om det ikke dekker minst ett omrÃ¥de." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:413 +#: perllib/FixMyStreet/Script/Reports.pm:191 msgid "This email has been sent to both councils covering the location of the problem, as the user did not categorise it; please ignore it if you're not the correct council to deal with the issue, or let us know what category of problem this is so we can add it to our system." msgstr "Denne e-posten har blitt sendt til begge administrasjonene som dekker stedet for problemet, da brukeren ikke kategoriserte det. Vær sÃ¥ snill Ã¥ ignorere den hvis dere ikke er korrekt administrasjon for Ã¥ hÃ¥ndtere denne saken, eller gi oss beskjed om hvilken kategori av problemer dette er sÃ¥ vi kan legge det til i vÃ¥rt system." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:416 +#: perllib/FixMyStreet/Script/Reports.pm:194 msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue." msgstr "Denne e-posten har blitt sendt til flere administrasjoner som dekker stedet for problemet, da den valgte kategorien er tilgjengelig for disse. Vær sÃ¥ snill Ã¥ ignorere e-posten hvis dere ikke er korrekt administrasjon for Ã¥ hÃ¥ndtere denne saken." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:925 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:995 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:920 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:990 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:142 -#: perllib/FixMyStreet/Cobrand/UK.pm:43 +#: perllib/FixMyStreet/Cobrand/UK.pm:44 msgid "This information is required" msgstr "Denne informasjonen er pÃ¥krevd" @@ -3364,56 +3241,37 @@ msgstr "Dette er et utviklernettsted. Ting kan knekke nÃ¥r som helst og database msgid "This is a summary of all reports on this site." msgstr "Dette er en opplisting av alle problemene i denne tjenesten." -#: templates/web/zurich/auth/token.html:8 -msgid "This may be because the link is too old or already used, or the address was not copied correctly." -msgstr "Dette kan være fordi lenken er for gammel eller allerede brukt, eller at lenken ikke ble kopiert riktig." - -#: templates/web/base/report/banner.html:15 -msgid "This problem has been closed" -msgstr "Dette problemet er lukket" - -#: templates/web/base/report/banner.html:12 -#: templates/web/base/report/update-form.html:48 -#: templates/web/fixmystreet/report/update-form.html:46 +#: templates/web/base/report/update/form_update.html:52 msgid "This problem has been fixed" msgstr "Dette problemet er løst" -#: templates/web/base/report/update-form.html:43 -#: templates/web/fixmystreet/report/update-form.html:40 +#: templates/web/base/report/update/form_update.html:46 msgid "This problem has not been fixed" msgstr "Dette problemet har ikke blitt løst" -#: templates/web/base/report/banner.html:19 -msgid "This problem is in progress" -msgstr "Dette problemet er under arbeid" - -#: templates/web/base/report/banner.html:9 -msgid "This problem is old and of unknown status." -msgstr "Dette problemet er gammelt og med ukjent status." - #: perllib/FixMyStreet/Cobrand/Zurich.pm:168 #: perllib/FixMyStreet/Cobrand/Zurich.pm:169 #: templates/web/zurich/report/_main.html:14 msgid "This report is awaiting moderation." msgstr "Denne rapporten avventer moderasjon" -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:86 +#: perllib/FixMyStreet/Script/Alerts.pm:94 msgid "This report is currently marked as closed." msgstr "Denne rapporten er for tiden markert som lukket." -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:84 +#: perllib/FixMyStreet/Script/Alerts.pm:92 msgid "This report is currently marked as fixed." msgstr "Denne rapporten er for tiden markert som fikset." -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:88 +#: perllib/FixMyStreet/Script/Alerts.pm:96 msgid "This report is currently marked as open." msgstr "Denne rapporten er for tiden markert som Ã¥pen." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:326 +#: perllib/FixMyStreet/Script/Reports.pm:105 msgid "This report was submitted anonymously" msgstr "Denne rapporten ble rapportert anonymt" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:308 +#: perllib/FixMyStreet/Script/Reports.pm:85 msgid "This web page also contains a photo of the problem, provided by the user." msgstr "Denne nettsiden inneholder ogsÃ¥ et bilde av problemet, sendt inn av brukeren." @@ -3422,9 +3280,9 @@ msgstr "Denne nettsiden inneholder ogsÃ¥ et bilde av problemet, sendt inn av bru #: templates/web/zurich/admin/report_edit.html:104 #: templates/web/zurich/admin/report_edit.html:148 msgid "Time spent (in minutes):" -msgstr "" +msgstr "Tid brukt (i minutter):" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1278 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1287 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "Tidslinje" @@ -3436,24 +3294,22 @@ msgid "Title" msgstr "Tittel" #: templates/web/zurich/admin/template_edit.html:20 -#, fuzzy msgid "Title:" -msgstr "Tittel" +msgstr "Tittel:" #: templates/web/base/alert/index.html:25 -#, fuzzy msgid "To find out what local alerts we have for you, please enter your %s postcode or street name and area:" -msgstr "Du finner lokale problemer ved Ã¥ søke pÃ¥ ditt postnummer, veinavn eller sted" +msgstr "Du finner lokale problemer ved Ã¥ søke pÃ¥ ditt postnummer eller veinavn og sted" #: templates/web/base/alert/index.html:27 msgid "To find out what local alerts we have for you, please enter your postcode or street name and area" msgstr "Du finner lokale problemer ved Ã¥ søke pÃ¥ ditt postnummer, veinavn eller sted" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:314 +#: perllib/FixMyStreet/Script/Reports.pm:91 msgid "To view a map of the precise location of this issue" msgstr "For Ã¥ se et kart med en mer presis plassering for dette problemet." -#: templates/web/base/admin/index.html:61 +#: templates/web/base/admin/index.html:54 #: templates/web/base/admin/questionnaire.html:24 #: templates/web/base/admin/stats.html:24 #: templates/web/base/admin/stats.html:43 @@ -3471,10 +3327,8 @@ msgstr "Forsøk Ã¥ sende epost direkte til oss:" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:12 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:33 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:31 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:37 msgid "Unable to fix" msgstr "Kan ikke fikses" @@ -3487,7 +3341,7 @@ msgstr "Kan ikke fikses" msgid "Unconfirmed" msgstr "Ubekreftet" -#: templates/web/fixmystreet/report/banner.html:9 +#: templates/web/base/report/banner.html:9 msgid "Unknown" msgstr "Ukjent" @@ -3495,17 +3349,18 @@ msgstr "Ukjent" msgid "Unknown alert type" msgstr "Ukjent varsel-type" +#: perllib/FixMyStreet/App/Controller/Photo.pm:110 #: templates/web/base/js/translation_strings.html:39 msgid "Unknown error" msgstr "Ukjent feil" -#: perllib/FixMyStreet/App/Controller/Report.pm:103 -#: perllib/FixMyStreet/App/Controller/Report.pm:109 -#: perllib/FixMyStreet/App/Controller/Report.pm:112 +#: perllib/FixMyStreet/App/Controller/Report.pm:105 +#: perllib/FixMyStreet/App/Controller/Report.pm:111 +#: perllib/FixMyStreet/App/Controller/Report.pm:114 msgid "Unknown problem ID" msgstr "Ukjent problem-Id" -#: templates/web/fixmystreet/report/update-form.html:19 +#: templates/web/base/report/update/form_update.html:25 msgid "Update" msgstr "Oppdatering" @@ -3513,13 +3368,11 @@ msgstr "Oppdatering" msgid "Update %s created for problem %d; by %s" msgstr "Oppdatering %s opprettet for problem %d, av %s" -#: templates/web/base/contact/index.html:21 -#: templates/web/fixmystreet/contact/index.html:36 +#: templates/web/base/contact/index.html:28 msgid "Update below added anonymously at %s" msgstr "Oppdateringen under lagt inn anonymt %s" -#: templates/web/base/contact/index.html:23 -#: templates/web/fixmystreet/contact/index.html:38 +#: templates/web/base/contact/index.html:30 msgid "Update below added by %s at %s" msgstr "Oppdateringen under lagt til av %s %s" @@ -3528,7 +3381,7 @@ msgstr "Oppdateringen under lagt til av %s %s" msgid "Update body" msgstr "Oppdater administrasjon" -#: templates/web/base/admin/index.html:55 +#: templates/web/base/admin/index.html:48 msgid "Update breakdown by state" msgstr "Tilstandsfordeling for oppdateringer" @@ -3553,20 +3406,16 @@ msgstr "En oppdatering gjennÃ¥pnet problemet" msgid "Update statuses" msgstr "Oppdater tilstanden" -#: templates/web/base/report/update-form.html:22 -msgid "Update:" -msgstr "Oppdatering:" - #: templates/web/zurich/admin/index-dm.html:23 #: templates/web/zurich/admin/index-sdm.html:21 #: templates/web/zurich/admin/reports.html:13 msgid "Updated" msgstr "Oppdatert" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1045 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1103 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1147 -#: perllib/FixMyStreet/App/Controller/Admin.pm:822 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1048 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1108 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1156 +#: perllib/FixMyStreet/App/Controller/Admin.pm:821 #: perllib/FixMyStreet/Cobrand/Zurich.pm:771 #: perllib/FixMyStreet/Cobrand/Zurich.pm:796 #: perllib/FixMyStreet/Cobrand/Zurich.pm:866 @@ -3574,13 +3423,12 @@ msgid "Updated!" msgstr "Oppdatert!" #: templates/web/base/admin/list_updates.html:2 -#: templates/web/base/report/update.html:3 -#: templates/web/fixmystreet/report/update.html:5 +#: templates/web/base/report/update.html:5 #: templates/web/zurich/report/updates.html:2 msgid "Updates" msgstr "Oppdateringer" -#: perllib/FixMyStreet/DB/Result/Comment.pm:132 +#: perllib/FixMyStreet/DB/Result/Comment.pm:131 msgid "Updates are limited to %s characters in length. Please shorten your update" msgstr "Oppdateringer er begrenset til %s tegn i lengde. Vennligst skriv en kortere tekst." @@ -3590,10 +3438,7 @@ msgstr "Oppdateringer av {{title}}" #. ("%s is the site name") #: templates/web/base/report/display.html:0 -#: templates/web/base/report/display.html:5 -#: templates/web/fixmystreet/report/display.html:0 -#: templates/web/fixmystreet/report/display.html:9 -#, fuzzy +#: templates/web/base/report/display.html:9 msgid "Updates to this problem, %s" msgstr "Oppdateringer til dette problemet, FiksGataMi" @@ -3603,15 +3448,14 @@ msgstr "Bruk <strong>notater</strong> for Ã¥ notere detaljer som skal vises frem #: templates/web/zurich/admin/report_edit-sdm.html:48 #: templates/web/zurich/admin/report_edit.html:67 -#, fuzzy msgid "Used map" -msgstr "brukte kart" +msgstr "Brukte kart" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1452 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1461 msgid "User flag removed" msgstr "Brukerflagg fjernet" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1424 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1433 msgid "User flagged" msgstr "Bruker flagget" @@ -3619,7 +3463,7 @@ msgstr "Bruker flagget" msgid "User search finds matches in users' names and email addresses." msgstr "Brukersøk leter etter treff gjennom brukernavn og epostadresser. " -#: perllib/FixMyStreet/App/Controller/Admin.pm:1280 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1289 #: perllib/FixMyStreet/Cobrand/Zurich.pm:399 #: templates/web/base/admin/flagged.html:29 #: templates/web/zurich/header.html:69 @@ -3650,7 +3494,6 @@ msgid "Viewing a location" msgstr "Ser pÃ¥ et sted" #: templates/web/base/report/display.html:0 -#: templates/web/fixmystreet/report/display.html:0 msgid "Viewing a problem" msgstr "Ser pÃ¥ et problem" @@ -3663,25 +3506,24 @@ msgstr "Bydeler innenfor denne administrasjonen" 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 "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/zurich/auth/token.html:7 -msgid "We have not been able to confirm your account - sorry." -msgstr "Vi har ikke klart Ã¥ bekrefte din konto - beklager." - -#: templates/web/zurich/auth/token.html:17 -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." +#: templates/web/base/auth/general.html:6 +#: templates/web/base/report/display.html:27 +#: templates/web/base/report/new/oauth_email_form.html:5 +#, fuzzy +msgid "We need your email address, please give it below." +msgstr "Vi viser aldri din e-postadresse eller ditt telefonnummer" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:2 -#: templates/web/fixmystreet/report/update-form.html:77 +#: templates/web/base/report/new/form_user_loggedout_email.html:2 +#: templates/web/base/report/update/form_user_loggedout_email.html:2 msgid "We never show your email" msgstr "Vi viser aldri din e-postadresse" -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:31 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:65 +#: templates/web/base/report/new/form_user_loggedin.html:31 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:28 msgid "We never show your email address or phone number." msgstr "Vi viser aldri din e-postadresse eller ditt telefonnummer" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:422 +#: perllib/FixMyStreet/Script/Reports.pm:200 msgid "We realise this problem might be the responsibility of %s; however, we don't currently have any contact details for them. If you know of an appropriate contact address, please do get in touch." msgstr "Vi innser at %s kan være ansvarlig for dette problemet, men vi mangler for tiden kontaktinformasjon for dem. Hvis du vet om en egnet kontaktadresse, sÃ¥ ta kontakt med oss." @@ -3698,19 +3540,15 @@ msgstr "Vi vil kun bruke personlige informasjon om deg i henhold til vÃ¥re <a hr msgid "We’re sorry to hear the problem’s not fixed. Why not try writing to your local representatives?" msgstr "Det gjør oss triste Ã¥ høre at problemet ikke er løst. Hva med Ã¥ forsøke Ã¥ skrive til dine lokale representanter?" -#: templates/web/base/contact/blurb.html:8 -msgid "We'd love to hear what you think about this site. Just fill in the form, or send an email to <a href='mailto:%s'>%s</a>:" -msgstr "Vi ønsker Ã¥ fÃ¥ din tilbakemelding om hva du mener om denne tjenesten. Bare fyll ut skjemaet, eller send en e-post <a href='mailto:%s'>%s</a>:" - #: templates/web/base/contact/submit.html:7 msgid "We’ll get back to you as soon as we can." msgstr "Vi tar kontakt med deg sÃ¥ snart vi kan." #: templates/web/base/questionnaire/index.html:71 msgid "What was your experience of getting the problem fixed?" -msgstr "" +msgstr "Hvilken erfaring hadde du med Ã¥ fÃ¥ løst dette problemet?" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:49 +#: templates/web/base/report/new/form_report.html:19 msgid "What’s the issue, and where is it?" msgstr "Hva er problemet og hvor skjer det?" @@ -3723,7 +3561,11 @@ msgstr "NÃ¥r redigert" msgid "When sent" msgstr "NÃ¥r sendt" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:640 +#: templates/web/base/js/translation_strings.html:50 +msgid "Whoa there Testino! Three photos are enough." +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Report/New.pm:635 msgid "Whole block of empty flats" msgstr "Hel blokk med tomme leiligheter" @@ -3736,9 +3578,9 @@ msgstr "Hvorfor stoppe der? <a href=\"/alert\">Sett opp flere varsler</a> grati #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:14 msgid "Wish" -msgstr "" +msgstr "Ønske" -#: templates/web/base/open311/index.html:92 +#: templates/web/base/open311/index.html:84 msgid "With request searches, it is also possible to search for agency_responsible to limit the requests to those sent to a single administration. The search term is the administration ID provided by <a href=\"%s\">MaPit</a>." msgstr "NÃ¥r du søker etter forespørsler, sÃ¥ er det ogsÃ¥ mulig Ã¥ søke etter agency_responsible for Ã¥ begrense det til forespørsler som er sendt til en enkelt adminstrasjon. Søketermen er administrasjons-IDen som oppgitt av <a href=\"%s\">MaPit</a>." @@ -3746,7 +3588,7 @@ msgstr "NÃ¥r du søker etter forespørsler, sÃ¥ er det ogsÃ¥ mulig Ã¥ søke ette msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"http://fixmystreet.org\">available at fixmystreet.org</a>." msgstr "Kunne du tenke deg Ã¥ bidra til FiksGataMi? Kildekoden vÃ¥r er fri programvare og <a href=\"http://fixmystreet.org\">tilgjengelig via fixmystreet.org</a>." -#: templates/web/base/questionnaire/index.html:87 +#: templates/web/base/questionnaire/index.html:96 msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?" msgstr "Kunne du tenke deg Ã¥ motta en ny forespørsel om 4 uker, som minner deg om Ã¥ sjekke status?" @@ -3755,7 +3597,6 @@ msgid "Writing your message entirely in block capitals makes it hard to read, as msgstr "NÃ¥r du skriver meldingen din med kun store bokstaver blir den vanskelig Ã¥ lese. Det samme gjelder manglende tegnsetting." #: templates/web/base/report/new/fill_in_details_form.html:4 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:5 msgid "Wrong location? Just click again on the map." msgstr "Feil sted? Bare klikk pÃ¥ nytt i kartet." @@ -3778,27 +3619,24 @@ msgstr "Ã…r" #: templates/web/base/admin/users.html:31 #: templates/web/base/questionnaire/creator_fixed.html:14 #: templates/web/base/questionnaire/index.html:51 -#: templates/web/base/questionnaire/index.html:90 +#: templates/web/base/questionnaire/index.html:99 msgid "Yes" msgstr "Ja" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:17 -#: templates/web/fixmystreet/report/update-form.html:91 +#: templates/web/base/report/new/form_user_loggedout_password.html:5 +#: templates/web/base/report/update/form_user_loggedout_password.html:4 msgid "Yes I have a password" msgstr "Ja, jeg har et passord" -#: templates/web/base/contact/index.html:39 -#: templates/web/fixmystreet/contact/index.html:54 +#: templates/web/base/contact/index.html:46 msgid "You are complaining that this problem report was unnecessarily moderated:" msgstr "Du klager over at denne problemrapporten ble moderert uten grunn:" -#: templates/web/base/contact/index.html:41 -#: templates/web/fixmystreet/contact/index.html:56 +#: templates/web/base/contact/index.html:48 msgid "You are reporting the following problem report for being abusive, containing personal information, or similar:" msgstr "Du rapporterer at følgende problem er støtende, inneholder personlig informasjon eller lignende:" -#: templates/web/base/contact/index.html:15 -#: templates/web/fixmystreet/contact/index.html:30 +#: templates/web/base/contact/index.html:22 msgid "You are reporting the following update for being abusive, containing personal information, or similar:" msgstr "Du rapporterer at følgende oppdatering er støtende, inneholder personlig informasjon, eller lignende:" @@ -3811,7 +3649,7 @@ msgstr "Du kan <a href=\"%s%s\">lese om problemet pÃ¥ denne siden</a>." msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create." msgstr "Du kan legge en misbrukers epostadresse til misbrukslista, hvilket automatisk skjuler (og aldri sender) rapporter vedkommende oppretter." -#: templates/web/fixmystreet/contact/index.html:121 +#: templates/web/base/contact/index.html:113 msgid "You can contact technical support on <a href='mailto:%s'>%s</a>" msgstr "Du kan kontakte teknisk støtte via <a href='mailto:%s'>%s</a>" @@ -3824,8 +3662,8 @@ msgstr "" "Du kan flagge alle meldinger eller brukere ved Ã¥ redigere dem, og de blir ført opp pÃ¥ denne siden.\n" "For eksempel kan dette være nyttig hvis du ønsker Ã¥ holde et øye med en bruker som tidligere har lagt ut uegnede meldinger. " -#: templates/web/base/report/new/councils_text_none.html:10 -#: templates/web/base/report/new/councils_text_none.html:2 +#: templates/web/base/report/new/councils_text_none.html:12 +#: templates/web/base/report/new/councils_text_none.html:14 #: templates/web/base/report/new/councils_text_some.html:19 #: templates/web/base/report/new/councils_text_some.html:21 msgid "You can help us by finding a contact email address for local problems for %s and emailing it to us at <a href='mailto:%s'>%s</a>." @@ -3843,20 +3681,16 @@ msgstr "Du avviste; vennligst fyll inn boksen ovenfor" msgid "You have already answered this questionnaire. If you have a question, please <a href='%s'>get in touch</a>, or <a href='%s'>view your problem</a>.\n" msgstr "Du har allerede besvart dette spørreskjemaet. Hvis du har spørsmÃ¥l, vennligst <a href='%s'>ta kontakt</a>, eller <a href='%s'>se pÃ¥ ditt problem</a>.\n" -#: templates/web/base/questionnaire/index.html:77 -#: templates/web/base/report/new/fill_in_details_form.html:75 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:73 -msgid "You have already attached a photo to this report, attaching another one will replace it." -msgstr "Du har allerede lagt ved et bilde til dette problemet. Ã… legge ved et annet vil bytte ut dette." - -#: templates/web/base/report/update-form.html:59 -#: templates/web/fixmystreet/report/update-form.html:56 -msgid "You have already attached a photo to this update, attaching another one will replace it." -msgstr "Du har allerede lagt ved et bilde til denne oppdateringen. Ã… legge ved et annet vil bytte ut dette." - -#: templates/web/zurich/report/new/fill_in_details_form.html:61 +#: templates/web/base/report/new/form_report.html:32 +#: templates/web/zurich/report/new/fill_in_details_form.html:55 msgid "You have already attached photos to this report. Note that you can attach a maximum of 3 to this report (if you try to upload more, the oldest will be removed)." -msgstr "" +msgstr "Du har allerede lagt ved bilder til denne rapporten. Merk at du kan maksimalt legge ved 3 til rapporten (hvis du laster opp flere blir det eldste slettet)." + +#: templates/web/base/questionnaire/index.html:83 +#: templates/web/base/report/update/form_update.html:14 +#, fuzzy +msgid "You have already attached photos to this update. Note that you can attach a maximum of 3 to this update (if you try to upload more, the oldest will be removed)." +msgstr "Du har allerede lagt ved bilder til denne rapporten. Merk at du kan maksimalt legge ved 3 til rapporten (hvis du laster opp flere blir det eldste slettet)." #: templates/web/base/auth/sign_out.html:4 #: templates/web/zurich/auth/sign_out.html:3 @@ -3872,9 +3706,8 @@ msgstr "Du har plassert problemet ved punktet i kartet som er markert med en grà msgid "You have successfully confirmed your email address." msgstr "Du har nÃ¥ lykkes med Ã¥ bekrefte din e-postadresse." -#: templates/web/base/report/display.html:20 -#: templates/web/base/report/new/fill_in_details.html:37 -#: templates/web/fixmystreet/report/display.html:17 +#: templates/web/base/report/display.html:17 +#: templates/web/base/report/new/login_success_form.html:3 msgid "You have successfully signed in; please check and confirm your details are accurate:" msgstr "Du har lykkes med Ã¥ logge inn. Vennligst sjekk og bekreft at dine detaljer er korrekte:" @@ -3905,53 +3738,42 @@ msgid "Your Reports" msgstr "Dine rapporter" #: templates/web/base/alert/_list.html:89 +#: templates/web/base/contact/index.html:83 +#: templates/web/base/report/display_tools.html:38 +#: templates/web/base/report/display_tools.html:40 +#: templates/web/base/report/new/form_user_loggedin.html:3 +#: templates/web/base/report/new/form_user_loggedout_email.html:1 +#: templates/web/base/report/update/form_user_loggedout_email.html:1 #: templates/web/fixmystreet/alert/updates.html:19 #: templates/web/fixmystreet/alert/updates.html:22 -#: templates/web/fixmystreet/contact/index.html:91 -#: templates/web/fixmystreet/report/display.html:62 -#: templates/web/fixmystreet/report/display.html:64 -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:3 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:1 -#: templates/web/fixmystreet/report/update-form.html:76 #: templates/web/zurich/report/new/fill_in_details_form.html:76 msgid "Your email" msgstr "Din e-post" -#: templates/web/base/auth/general.html:28 -#: templates/web/fixmystreet/report/update-form.html:82 +#: templates/web/base/auth/general.html:45 +#: templates/web/base/report/update/form_user_loggedout_email.html:7 #: templates/web/zurich/auth/general.html:30 #: templates/web/zurich/auth/general.html:58 msgid "Your email address" msgstr "Din e-postadresse" -#: templates/web/base/report/new/fill_in_details_form.html:106 -#: templates/web/base/report/update-form.html:81 -msgid "Your email:" -msgstr "Din e-post" - -#: templates/web/fixmystreet/report/updates-sidebar-notes.html:7 +#: templates/web/base/report/updates-sidebar-notes.html:3 msgid "Your information will only be used in accordance with our <a href=\"/privacy\">privacy policy</a>" msgstr "Vi vil kun bruke personlig informasjon om deg i henhold til vÃ¥re <a href=\"/faq#privacy\">personvernsregler.</a>" -#: templates/web/base/auth/general.html:51 -#: templates/web/fixmystreet/contact/index.html:84 -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:18 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:54 -#: templates/web/fixmystreet/report/update-form.html:142 +#: templates/web/base/auth/general.html:90 +#: templates/web/base/contact/index.html:76 +#: templates/web/base/report/new/form_user_loggedin.html:18 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:17 +#: templates/web/base/report/update/form_name.html:11 #: templates/web/zurich/auth/general.html:61 #: templates/web/zurich/report/new/fill_in_details_form.html:86 msgid "Your name" msgstr "Ditt navn" -#: templates/web/base/contact/index.html:73 -#: templates/web/base/report/new/fill_in_details_form.html:186 -#: templates/web/base/report/update-form.html:152 -msgid "Your name:" -msgstr "Ditt navn:" - -#: templates/web/base/auth/general.html:39 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:22 -#: templates/web/fixmystreet/report/update-form.html:96 +#: templates/web/base/auth/general.html:75 +#: templates/web/base/report/new/form_user_loggedout_password.html:10 +#: templates/web/base/report/update/form_user_loggedout_password.html:9 #: templates/web/zurich/auth/general.html:34 msgid "Your password" msgstr "Ditt passord" @@ -3960,15 +3782,16 @@ msgstr "Ditt passord" msgid "Your password has been changed" msgstr "Ditt passord har blitt endret" -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:27 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:63 +#: templates/web/base/report/new/form_user_loggedin.html:27 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:26 #: templates/web/zurich/report/new/fill_in_details_form.html:92 msgid "Your phone number" msgstr "Ditt telefonnummer" #: templates/web/base/questionnaire/index.html:14 +#, fuzzy msgid "Your report" -msgstr "Dine rapporter" +msgstr "Dine oppdateringer" #: templates/web/base/footer.html:9 templates/web/fixmystreet/footer.html:29 msgid "Your reports" @@ -3978,23 +3801,17 @@ msgstr "Dine oppdateringer" msgid "Your updates" msgstr "Dine oppdateringer" -#: templates/web/base/contact/index.html:81 -msgid "Your email:" -msgstr "Din e-post:" - #: templates/web/base/reports/_list-filters.html:3 -#, fuzzy msgid "all reports" -msgstr "Alle rapporter" +msgstr "alle rapporter" #: templates/web/base/admin/timeline.html:4 msgid "by %s" msgstr "av %s" #: templates/web/base/reports/_list-filters.html:5 -#, fuzzy msgid "closed reports" -msgstr "Fiksede rapporter" +msgstr "lukkede rapporter" #: templates/web/base/reports/body.html:6 #: templates/web/base/reports/body.html:7 @@ -4016,17 +3833,16 @@ msgid "edit user" msgstr "rediger bruker" #: templates/web/base/reports/_list-filters.html:6 -#, fuzzy msgid "fixed reports" -msgstr "Fiksede rapporter" +msgstr "løste rapporter" -#: templates/web/base/admin/index.html:33 +#: templates/web/base/status/stats.html:20 #: templates/web/zurich/admin/index.html:5 msgid "from %s different users" -msgstr "fra %d forskjellige brukere" +msgstr "fra %s forskjellige brukere" -#: templates/web/base/report/_item.html:17 -#: templates/web/zurich/report/_item.html:16 +#: templates/web/base/report/_item.html:15 +#: templates/web/zurich/report/_item.html:14 msgid "last updated %s" msgstr "sist oppdatert %s" @@ -4118,10 +3934,8 @@ msgstr "Ã¥pnet pÃ¥ nytt" msgid "sign out" msgstr "logg ut" -#: templates/web/base/report/new/fill_in_details_form.html:12 -#: templates/web/base/report/new/fill_in_details_form.html:15 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:10 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:12 +#: templates/web/base/report/new/fill_in_details_form.html:11 +#: templates/web/base/report/new/fill_in_details_form.html:9 msgid "the local council" msgstr "den lokale administrasjonen" @@ -4130,7 +3944,7 @@ msgstr "den lokale administrasjonen" msgid "there is no pin shown as the user did not use the map" msgstr "Det vises ingen nÃ¥l pÃ¥ grunn av at brukeren ikke brukte kartet" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:398 +#: perllib/FixMyStreet/Script/Reports.pm:176 msgid "this type of local problem" msgstr "denne type lokalt problem" @@ -4139,9 +3953,8 @@ msgid "today" msgstr "idag" #: templates/web/base/reports/_list-filters.html:4 -#, fuzzy msgid "unfixed reports" -msgstr "Fiksede rapporter" +msgstr "uløste rapporter" #: templates/web/base/admin/report_edit.html:32 msgid "used map" @@ -4160,7 +3973,7 @@ msgstr "bruker er eier av problemet" msgid "ward" msgstr "bydel" -#: templates/web/base/front/stats.html:17 +#: templates/web/base/front/stats.html:13 #, perl-format msgid "<big>%s</big> report recently" msgid_plural "<big>%s</big> reports recently" @@ -4188,7 +4001,7 @@ msgid_plural "%d minutes" msgstr[0] "%d minutt" msgstr[1] "%d minutter" -#: templates/web/base/front/stats.html:29 +#: templates/web/base/front/stats.html:25 #, perl-format msgid "<big>%s</big> update on reports" msgid_plural "<big>%s</big> updates on reports" @@ -4209,14 +4022,14 @@ msgid_plural "%d weeks" msgstr[0] "%d uke" msgstr[1] "%d uker" -#: templates/web/base/front/stats.html:12 +#: templates/web/base/front/stats.html:8 #, perl-format msgid "<big>%s</big> report in past week" msgid_plural "<big>%s</big> reports in past week" msgstr[0] "<big>%s</big> rapport siste uke" msgstr[1] "<big>%s</big> rapporter siste uke" -#: templates/web/base/front/stats.html:23 +#: templates/web/base/front/stats.html:19 #, perl-format msgid "<big>%s</big> fixed in past month" msgid_plural "<big>%s</big> fixed in past month" @@ -4237,140 +4050,86 @@ msgid_plural "We do <strong>not</strong> yet have details for the other councils msgstr[0] "Vi har ennÃ¥ <strong>ikke</strong> detaljene for den andre administrasjonen som dekker dette stedet." msgstr[1] "Vi har ennÃ¥ <strong>ikke</strong> detaljene for de andre administrasjonene som dekker dette stedet." -#~ msgid "(Don't worry — we'll hang on to your alert while you're checking your email.)" -#~ msgstr "(Ta det med ro; vi tar vare pÃ¥ varselet ditt mens du sjekker e-posten din.)" - -#~ msgid "(Don't worry — we'll hang on to your problem report while you're checking your email.)" -#~ msgstr "(Ta det med ro — vi tar vare pÃ¥ problemrapporten din mens du sjekker e-posten din.)" - -#~ msgid "(Don't worry — we'll hang on to your update while you're checking your email.)" -#~ msgstr "(Ta det med ro — vi tar vare pÃ¥ oppdateringen din mens du sjekker e-posten din.)" - -#~ msgid "<small>If you cannot see the map, <a href='%s' rel='nofollow'>skip this step</a>.</small>" -#~ msgstr "<small>Hvis du ikke kan se kartet, <a href='%s' rel='nofollow'>hopp over dette steget</a>.</small>" - -#~ msgid "<strong>No</strong>, I do not, let me sign in by email:" -#~ msgstr "<strong>Nei</strong>, det gjør jeg ikke. La meg logge inn med e-post:" - -#~ msgid "Are you a <strong>developer</strong>? Would you like to contribute to FixMyStreet?" -#~ msgstr "Er du en <strong>utvikler</strong>? Kunne du tenke deg Ã¥ bidra til FiksGataMi?" - -#~ msgid "Closest nearby problems <small>(within %skm)</small>" -#~ msgstr "De nærmeste problemene <small>(innenfor %skm)</small>" - -#~ msgid "Contact FixMyStreet" -#~ msgstr "Kontakt FiksGataMi" - -#~ msgid "Do you have a FixMyBarangay password?" -#~ msgstr "Har du et FixMyBarangay-passord?" - -#~ msgid "FixMyStreet admin:" -#~ msgstr "FiksGataMi-administrator:" - -#~ msgid "If you do not, your alert will not be activated." -#~ msgstr "Hvis du ikke gjør dette vil ikke ditt varsel bli aktivert" - -#~ msgid "If you do not, your problem will not be posted." -#~ msgstr "Hvis du ikke gjør dette vil ikke din rapport bli publisert" - -#~ msgid "If you do not, your update will not be posted." -#~ msgstr "Hvis du ikke gjør dette vil ikke din oppdatering bli publisert" - -#~ msgid "New local reports on reportemptyhomes.com" -#~ msgstr "Nye lokale rapporter pÃ¥ reportemptyhomes.com" - -#~ msgid "New reports for {{COUNCIL}} within {{WARD}} ward on reportemptyhomes.com" -#~ msgstr "Nye rapporter for {{COUNCIL}} innenfor {{WARD}} bydel pÃ¥ reportemptyhomes.com" - -#~ msgid "New reports on reportemptyhomes.com" -#~ msgstr "Nye rapporter pÃ¥ reportemptyhomes.com" - -#~ msgid "New reports on reportemptyhomes.com near {{POSTCODE}}" -#~ msgstr "Nye rapporter pÃ¥ reportemptyhomes.com nær postnummer {{POSTCODE}}" - -#~ msgid "New reports to {{COUNCIL}} on reportemptyhomes.com" -#~ msgstr "Nye rapporter til {{COUNCIL}} pÃ¥ reportemptyhomes.com" - -#~ msgid "New reports within {{NAME}}'s boundary on reportemptyhomes.com" -#~ msgstr "Nye rapporter innenfor grensen til {{NAME}} pÃ¥ reportemptyhomes.com" +#~ msgid "(we never show your email address or phone number)" +#~ msgstr "(vi viser aldri din e-postadresse eller telefonnummer)" -#~ msgid "New update:" -#~ msgstr "Ny oppdatering:" +#~ msgid "(we never show your email)" +#~ msgstr "(vi viser aldri din e-postadresse)" -#~ msgid "No problems found." -#~ msgstr "Ingen problemer ble funnet." +#~ msgid "<strong>No</strong>, let me confirm my report by email:" +#~ msgstr "<strong>Nei</strong>, la meg bekrefte min rapport med e-post:" -#~ msgid "No problems have been reported yet." -#~ msgstr "Ingen problemer er rapportert" +#~ msgid "<strong>No</strong>, let me confirm my update by email:" +#~ msgstr "<strong>Nei</strong>, la meg bekrefte min oppdatering med e-post:" -#~ msgid "Now to submit your report… do you have a FixMyStreet password?" -#~ msgstr "PÃ¥ tide Ã¥ sende din rapport… har du et FiksGataMi-passord?" +#~ msgid "Email me updates" +#~ msgstr "Send meg oppdateringer" -#~ msgid "Now to submit your update… do you have a FixMyStreet password?" -#~ msgstr "PÃ¥ tide Ã¥ registrere din oppdatering… har du et FiksGataMi-passord?" +#~ msgid "Enter a new password:" +#~ msgstr "Skriv inn et nytt passord:" -#~ msgid "Our code is open source and <a href=\"http://github.com/mysociety/fixmystreet\">available on GitHub</a>." -#~ msgstr "VÃ¥r kildekode er fri programvare og <a href=\"http://github.com/mysociety/fixmystreet\">tilgjengelig pÃ¥ GitHub</a>." +#~ 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 "Jeg er redd vi ikke kunne verifisere den referansen. Hvis du kopierte webadressen fra en e-post, sjekk at du har kopiert den korrekt.\n" -#~ msgid "Please <a class=\"tab_link\" href=\"#report\">take a look</a> at the updates that have been left." -#~ msgstr "Vennligst <a class=\"tab_link\" href=\"#report\">se over</a> oppdateringene som har blitt lagt inn." +#~ 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 "Hvis du bruker web-basert e-post eller har filtre for søppel-e-post pÃ¥ din e-postkonto, kan du i noen tilfellet mÃ¥tte se etter vÃ¥re meldinger der." -#~ msgid "Please take a look at the updates that have been left." -#~ msgstr "Vennligst se over oppdateringene som har blitt lagt inn." +#~ msgid "Message:" +#~ msgstr "Melding:" -#~ msgid "Problems within %s, FixMyStreet" -#~ msgstr "Problemer innenfor %s, Fiksgatami" +#~ msgid "More problems nearby" +#~ msgstr "Flere problemer i nærheten" -#~ msgid "Properties recently reported as put back to use on reportemptyhomes.com" -#~ msgstr "Eiendommer nylig rapportert som gÃ¥tt tilbake i bruk pÃ¥ reportemptyhomes.com" +#~ msgid "Nearly Done! Now check your email..." +#~ msgstr "Nesten ferdig! NÃ¥ mÃ¥ du sjekke e-posten din..." -#~ msgid "Publish the response" -#~ msgstr "Publiser svar" +#~ msgid "Offensive? Unsuitable? Tell us" +#~ msgstr "Støtende? Upassende? Gi oss beskjed" -#~ msgid "Reported %s, to %s" -#~ msgstr "Rapportert %s, til %s" +#~ msgid "Photo:" +#~ msgstr "Bilde:" -#~ msgid "Reports on and around the map" -#~ msgstr "Problemer i og rundt kartet" +#~ msgid "Please check your email" +#~ msgstr "Vennligst sjekk e-posten du oppgav" -#~ msgid "Sign in by email" -#~ msgstr "Logg inn via epost" +#~ msgid "Please note that updates are not sent to the council. If you leave your name it will be public. Your information will only be used in accordance with our <a href=\"/faq#privacy\">privacy policy</a>" +#~ msgstr "Vennligst merk at oppdateringer ikke blir sendt til administrasjonen. Hvis du legger igjen navnet ditt sÃ¥ vil det være offentlig tilgjengelig. Din informasjon vil kun bli brukt i henhold til vÃ¥re <a href=\"/faq#privacy\">personvernpolicy</a>" -#~ msgid "Signed in as %s" -#~ msgstr "Logget inn som %s" +#~ msgid "This may be because the link is too old or already used, or the address was not copied correctly." +#~ msgstr "Dette kan være fordi lenken er for gammel eller allerede brukt, eller at lenken ikke ble kopiert riktig." -#~ msgid "The confirmation email <strong>may</strong> take a few minutes to arrive — <em>please</em> be patient." -#~ msgstr "E-postbekreftelsen <strong>kan</strong> bruke noen minutter før den kommer frem — sÃ¥ vær tÃ¥lmodig." +#~ msgid "This problem has been closed" +#~ msgstr "Dette problemet er lukket" -#~ msgid "The details of your problem are available from the other tab above." -#~ msgstr "Detaljene om ditt problem er tilgjengelig under den andre fanen ovenfor." +#~ msgid "This problem is in progress" +#~ msgstr "Dette problemet er under arbeid" -#~ msgid "The details of your problem are available on the right hand side of this page." -#~ msgstr "Detaljene om ditt problem er tilgjengelig pÃ¥ høyre kant av denne siden." +#~ msgid "This problem is old and of unknown status." +#~ msgstr "Dette problemet er gammelt og med ukjent status." -#~ msgid "The latest local reports reported by users" -#~ msgstr "De siste lokale rapporter rapportert av brukere" +#~ msgid "Update:" +#~ msgstr "Oppdatering:" -#~ msgid "The latest properties reported back to use by users" -#~ msgstr "De siste eiendommer rapportert tilbake i bruk av brukere" +#~ msgid "We have not been able to confirm your account - sorry." +#~ msgstr "Vi har ikke klart Ã¥ bekrefte din konto - beklager." -#~ msgid "The latest reports for {{COUNCIL}} reported by users" -#~ msgstr "De siste rapporter for {{COUNCIL}} rapportert av brukere" +#~ 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." -#~ msgid "The latest reports for {{COUNCIL}} within {{WARD}} ward reported by users" -#~ msgstr "De siste rapporter for {{COUNCIL}} innenfor {{WARD}} bydel rapportert av brukere" +#~ msgid "We'd love to hear what you think about this site. Just fill in the form, or send an email to <a href='mailto:%s'>%s</a>:" +#~ msgstr "Vi ønsker Ã¥ fÃ¥ din tilbakemelding om hva du mener om denne tjenesten. Bare fyll ut skjemaet, eller send en e-post <a href='mailto:%s'>%s</a>:" -#~ msgid "The latest reports within {{NAME}}'s boundary reported by users" -#~ msgstr "De siste rapporter innenfor grensen til {{NAME}} rapportert av brukere" +#~ msgid "You have already attached a photo to this report, attaching another one will replace it." +#~ msgstr "Du har allerede lagt ved et bilde til dette problemet. Ã… legge ved et annet vil bytte ut dette." -#~ msgid "To <strong>report a problem</strong>, click on the map at the correct location." -#~ msgstr "For Ã¥ <strong>rapportere et problem</strong>, klikk pÃ¥ riktig sted pÃ¥ kartet." +#~ msgid "You have already attached a photo to this update, attaching another one will replace it." +#~ msgstr "Du har allerede lagt ved et bilde til denne oppdateringen. Ã… legge ved et annet vil bytte ut dette." -#~ msgid "User" -#~ msgstr "Bruker" +#~ msgid "Your email:" +#~ msgstr "Din e-post" -#~ msgid "You must now click the link in the email we've just sent you." -#~ msgstr "Du mÃ¥ nÃ¥ Ã¥pne lenken i e-posten vi akkurat sendte deg." +#~ msgid "Your name:" +#~ msgstr "Ditt navn:" -#~ msgid "Your email address:" -#~ msgstr "Din e-postadresse:" +#~ msgid "Your email:" +#~ msgstr "Din e-post:" diff --git a/locale/nl_NL.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/nl_NL.UTF-8/LC_MESSAGES/FixMyStreet.po index 80852a82f..83fea7b83 100644 --- a/locale/nl_NL.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/nl_NL.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -5,13 +5,14 @@ # # Translators: # Edwin Bosveld <edwin@inwy.nl>, 2012 +# Milo van der Linden <milo@dogodigi.net>, 2015 msgid "" msgstr "" "Project-Id-Version: fixmystreet\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2015-10-23 16:51+0100\n" -"PO-Revision-Date: 2015-07-31 16:31+0000\n" -"Last-Translator: mySociety <transifex@mysociety.org>\n" +"POT-Creation-Date: 2016-03-02 13:09+0000\n" +"PO-Revision-Date: 2015-12-04 12:53+0000\n" +"Last-Translator: Milo van der Linden <milo@dogodigi.net>\n" "Language-Team: Dutch (Netherlands) (http://www.transifex.com/mysociety/fixmystreet/language/nl_NL/)\n" "Language: nl_NL\n" "MIME-Version: 1.0\n" @@ -19,48 +20,27 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:628 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:411 +#: perllib/FixMyStreet/DB/Result/Problem.pm:616 +#: perllib/FixMyStreet/Script/Reports.pm:189 msgid " and " msgstr "en" #: templates/web/base/report/new/councils_text_all.html:2 -#: templates/web/base/report/new/councils_text_none.html:11 -#: templates/web/base/report/new/councils_text_none.html:2 +#: templates/web/base/report/new/councils_text_none.html:12 +#: templates/web/base/report/new/councils_text_none.html:15 #: templates/web/base/report/new/councils_text_some.html:19 #: templates/web/base/report/new/councils_text_some.html:22 #: templates/web/base/report/new/councils_text_some.html:5 msgid " or " msgstr "of" -#: templates/web/base/admin/index.html:35 -#: templates/web/base/status/index.html:13 -msgid "%s confirmed alerts, %s unconfirmed" -msgstr "%d geverifieerde meldingen, %d ongeverifieerd" - -#: templates/web/base/admin/index.html:37 -#: templates/web/base/status/index.html:16 -#: templates/web/zurich/admin/index.html:6 -msgid "%s council contacts – %s confirmed, %s unconfirmed" -msgstr "%d gemeente contactpersonen – %d geverifieerd, %d ongeverifieerd" - #: templates/web/base/admin/edit-league.html:12 msgid "%d edits by %s" msgstr "%d bewerkingen door %s" -#: templates/web/base/admin/index.html:34 -#: templates/web/base/status/index.html:12 -msgid "%s live updates" -msgstr "%s live updates" - -#: templates/web/base/admin/index.html:36 -#: templates/web/base/status/index.html:14 -msgid "%s questionnaires sent – %s answered (%s%%)" -msgstr "%d vragenlijsten verzonden – %d beantwoord (%s%%)" - #: templates/web/base/pagination.html:10 msgid "%d to %d of %d" -msgstr "" +msgstr "%d aan %d van %d" #: templates/web/base/reports/body.html:0 #: templates/web/base/reports/body.html:23 @@ -70,33 +50,51 @@ msgstr "%s - Overzichtsverslagen" #. ("%s here is the site name") #: templates/web/base/admin/header.html:10 msgid "%s admin:" +msgstr "%s beheerder:" + +#: templates/web/base/status/stats.html:26 +msgid "%s bodies" msgstr "" +#: templates/web/base/status/stats.html:24 +msgid "%s confirmed alerts, %s unconfirmed" +msgstr "%s geverifieerde meldingen, %s ongeverifieerd" + +#: templates/web/base/status/stats.html:27 +#: templates/web/zurich/admin/index.html:6 +msgid "%s council contacts – %s confirmed, %s unconfirmed" +msgstr "%s contactpersonen overheid – %s geverifieerd, %s ongeverifieerd" + #. ("%s is the site name") #: templates/web/base/alert/index.html:7 -#, fuzzy msgid "" "%s has a variety of RSS feeds and email alerts for local\n" "problems, including alerts for all problems within a particular ward, or all\n" "problems within a certain distance of a particular location." -msgstr "FixMyStreet heeft diverse RSS feeds en e-mail meldingen voor lokale problemen zoals meldingen voor problemen in bepaalde wijken of gemeentes, of alle problemen binnen een bepaalde straal." +msgstr "%s heeft diverse RSS feeds en e-mail meldingen voor lokale problemen zoals meldingen voor problemen in bepaalde wijken of gemeentes, of alle problemen binnen een bepaalde straal." #. ("%s is the site name") #: templates/web/base/alert/index.html:11 -#, fuzzy msgid "" "%s has a variety of RSS feeds and email alerts for local problems, including\n" "alerts for all problems within a particular ward or council, or all problems\n" "within a certain distance of a particular location." -msgstr "FixMyStreet heeft diverse RSS feeds en e-mail meldingen voor lokale problemen zoals meldingen voor problemen in bepaalde wijken of gemeentes, of alle problemen binnen een bepaalde straal." +msgstr "%s heeft diverse RSS feeds en e-mail meldingen voor lokale problemen zoals meldingen voor problemen in bepaalde wijken of gemeentes, of alle problemen binnen een bepaalde straal." -#: perllib/FixMyStreet/DB/Result/Problem.pm:695 +#: templates/web/base/status/stats.html:23 +msgid "%s live updates" +msgstr "%s live updates" + +#: templates/web/base/status/stats.html:25 +msgid "%s questionnaires sent – %s answered (%s%%)" +msgstr "%s vragenlijsten verzonden – %s beantwoord (%s%%)" + +#: perllib/FixMyStreet/DB/Result/Problem.pm:683 msgid "%s ref: %s" msgstr "%s ref: %s" #. ("%s is the site name") #: templates/web/base/alert/_list.html:73 -#, fuzzy msgid "" "%s sends different categories of problem\n" "to the appropriate council, so problems within the boundary of a particular council\n" @@ -104,17 +102,17 @@ msgid "" "will be sent to the district council, so will appear in both of the district\n" "council’s alerts, but will only appear in the \"Within the boundary\" alert\n" "for the county council." -msgstr "FixMyStreet heeft diverse categorieën per gemeente voor problemen daarom kan het voorkomen dat problemen binnen de gemeentegrenzen niet getoond worden in een bepaalde gemeente." +msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:255 perllib/FixMyStreet/Cobrand/UK.pm:267 +#: perllib/FixMyStreet/Cobrand/UK.pm:256 perllib/FixMyStreet/Cobrand/UK.pm:268 msgid "%s ward, %s" msgstr "%s district, %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:564 +#: perllib/FixMyStreet/DB/Result/Problem.pm:552 msgid "%s, reported at %s" -msgstr "" +msgstr "%s, gemeld aan %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:282 perllib/FixMyStreet/Cobrand/UK.pm:294 +#: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295 msgid "%s, within %s ward" msgstr "%s, in %s district" @@ -122,9 +120,9 @@ msgstr "%s, in %s district" msgid "© <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors" msgstr "" -#: templates/web/zurich/report/new/fill_in_details_form.html:53 +#: templates/web/zurich/report/new/fill_in_details_form.html:46 msgid "(Defect & location of defect)" -msgstr "" +msgstr "(Defect & en locatie van het defect)" #: templates/web/base/admin/report_blocks.html:41 #: templates/web/base/admin/users.html:31 @@ -133,15 +131,13 @@ msgstr "(Email in misbruiktabel)" #: templates/web/zurich/admin/report_edit-sdm.html:60 #: templates/web/zurich/admin/report_edit.html:88 -#, fuzzy msgid "(No name)" -msgstr "Jouw naam" +msgstr "(Niet opgegeven)" #: templates/web/zurich/admin/report_edit-sdm.html:67 #: templates/web/zurich/admin/report_edit.html:95 -#, fuzzy msgid "(No phone number)" -msgstr "Je telefoonnummer" +msgstr "(Niet opgegeven)" #: templates/web/base/alert/_list.html:24 msgid "(a default distance which covers roughly 200,000 people)" @@ -149,17 +145,16 @@ msgstr "(een stand afstand waarbinnen ongeveer 200.000 mensen leven)" #. ("%s is a list of distance links, e.g. [2km] / [5km] / [10km] / [20km]") #: templates/web/base/alert/_list.html:29 -#, fuzzy msgid "(alternatively the RSS feed can be customised, within %s)" -msgstr "(als alternatief kan je de RSS feed aanpassen binnen" +msgstr "(als alternatief kan de RSS feed worden aangepast binnen %s)" -#: templates/web/base/report/_item.html:27 -#: templates/web/zurich/report/_item.html:21 +#: templates/web/base/report/_item.html:25 +#: templates/web/zurich/report/_item.html:19 msgid "(closed)" msgstr "(gesloten)" -#: templates/web/base/report/_item.html:25 -#: templates/web/zurich/report/_item.html:19 +#: templates/web/base/report/_item.html:23 +#: templates/web/zurich/report/_item.html:17 msgid "(fixed)" msgstr "(opgelost)" @@ -167,37 +162,28 @@ msgstr "(opgelost)" msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)" msgstr "(zoals graffiti, zwerfafval, losliggende tegels of straatverlichting) " -#: templates/web/base/report/_item.html:21 +#: templates/web/base/report/_item.html:19 msgid "(not sent to council)" msgstr "(niet verstuurd naar de gemeente)" -#: templates/web/base/report/new/fill_in_details_form.html:200 #: templates/web/zurich/report/new/fill_in_details_form.html:82 msgid "(optional)" msgstr "(optioneel)" -#: templates/web/fixmystreet/report/public_label.html:1 +#: templates/web/base/report/public_label.html:1 msgid "(public)" -msgstr "" +msgstr "(publiek)" -#: templates/web/base/report/_item.html:20 +#: templates/web/base/report/_item.html:18 msgid "(sent to both)" msgstr "(verstuurd naar beide)" -#: templates/web/base/report/new/fill_in_details_form.html:194 -msgid "(we never show your email address or phone number)" -msgstr "(we zullen je telefoonnummer of e-mailadres niet tonen)" - -#: templates/web/base/report/update-form.html:159 -msgid "(we never show your email)" -msgstr "(we zullen je e-mailadres niet tonen)" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:673 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 #: perllib/FixMyStreet/DB/Result/Problem.pm:410 msgid "-- Pick a category --" msgstr "-- Kies een categorie --" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:637 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:632 #: perllib/FixMyStreet/DB/Result/Problem.pm:416 msgid "-- Pick a property type --" msgstr "-- Kies een woning type --" @@ -216,54 +202,41 @@ msgstr "" msgid "<label>Show %s</label> <label>about %s</label>" msgstr "" -#: templates/web/base/admin/index.html:32 -#: templates/web/base/status/index.html:11 +#: templates/web/base/status/stats.html:18 #: templates/web/zurich/admin/index.html:4 msgid "<strong>%s</strong> live problems" -msgstr "<strong>%d</strong> actieve problemen" +msgstr "<strong>%s</strong> actieve problemen" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:39 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:2 msgid "<strong>No</strong> Let me confirm my report by email" msgstr "<strong>Nee</strong> Laat me mijn melding per e-mail bevestigen" -#: templates/web/fixmystreet/report/update-form.html:112 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:2 msgid "<strong>No</strong> Let me confirm my update by email" msgstr "<strong>Nee</strong> Laat me mijn update per e-mail bevestigen" -#: templates/web/base/auth/general.html:48 +#: templates/web/base/auth/general.html:87 #: templates/web/zurich/auth/general.html:51 msgid "<strong>No</strong> let me sign in by email" msgstr "<strong>Nee</strong> Laat me inloggen per e-mail" -#: templates/web/base/report/new/fill_in_details_form.html:145 -msgid "<strong>No</strong>, let me confirm my report by email:" -msgstr "<strong>Nee</strong> Laat me mijn melding per e-mail bevestigen" - -#: templates/web/base/report/update-form.html:118 -msgid "<strong>No</strong>, let me confirm my update by email:" -msgstr "<strong>Nee</strong> Laat me mijn update per e-mail bevestigen" - -#: templates/web/base/auth/general.html:34 -#: templates/web/base/report/new/fill_in_details_form.html:123 -#: templates/web/base/report/update-form.html:96 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:15 -#: templates/web/fixmystreet/report/update-form.html:89 +#: templates/web/base/auth/general.html:70 +#: templates/web/base/report/new/form_user_loggedout_password.html:3 +#: templates/web/base/report/update/form_user_loggedout_password.html:2 msgid "<strong>Yes</strong> I have a password" msgstr "<strong>Ja</strong, ik heb een wachtwoord" -#: templates/web/base/static/about-en-gb.html:1 -#: templates/web/base/static/about-en-gb.html:3 +#: templates/web/base/about/about-en-gb.html:1 +#: templates/web/base/about/about-en-gb.html:3 msgid "About us" msgstr "Over ons" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:8 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:31 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:29 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:35 msgid "Action Scheduled" -msgstr "" +msgstr "Actie ingepland" #: templates/web/base/admin/body-form.html:3 #: templates/web/base/admin/body-form.html:4 @@ -275,7 +248,7 @@ msgstr "" #: templates/web/base/admin/body.html:56 msgid "Add a contact using the form below." -msgstr "" +msgstr "Voeg een contactpersoon toe" #: templates/web/base/admin/bodies.html:74 #: templates/web/base/admin/body-form.html:240 @@ -290,15 +263,15 @@ msgstr "Voeg een nieuwe categorie toe" #: templates/web/base/admin/users.html:47 msgid "Add user" -msgstr "" +msgstr "Gebruiker toevoegen" -#: templates/web/base/my/my.html:52 +#: templates/web/base/my/my.html:56 msgid "Added %s" msgstr "%s toegevoegd" #: templates/web/base/report/new/category_extras.html:9 msgid "Additional Information" -msgstr "" +msgstr "Aanvullende informatie" #: templates/web/base/auth/change_password.html:29 msgid "Again:" @@ -312,8 +285,7 @@ msgstr "Melding %d gemaakt voor %s, type %s, parameters %s / %s" msgid "Alert %d disabled (created %s)" msgstr "Melding %d inactief gemaakt (gemaakt %s)" -#: templates/web/base/report/update-form.html:164 -#: templates/web/fixmystreet/report/update-form.html:150 +#: templates/web/base/report/update/form_name.html:20 msgid "Alert me to future updates" msgstr "Meld het me als er updates zijn" @@ -323,9 +295,8 @@ msgid "All Reports" msgstr "Alle meldingen" #: templates/web/zurich/admin/stats.html:5 -#, fuzzy msgid "All Reports as CSV" -msgstr "Alle meldingen" +msgstr "Alle rapporten als CSV" #: templates/web/base/footer.html:11 templates/web/fixmystreet/footer.html:32 #: templates/web/zurich/admin/index-dm.html:12 @@ -338,7 +309,7 @@ msgstr "Alle meldingen" #: templates/web/base/admin/stats.html:5 #: templates/web/zurich/admin/stats.html:8 msgid "All reports between %s and %s" -msgstr "" +msgstr "Alle rapporten tussen %s en %s" #: templates/web/base/report/new/councils_text_some.html:2 msgid "All the information you provide here will be sent to" @@ -346,10 +317,8 @@ msgstr "Alle informatie die je ingevuld hebt zal worden verstuurd naar" #: templates/web/base/report/new/councils_text_all.html:2 #: templates/web/base/report/new/councils_text_all.html:4 -#: templates/web/base/report/new/fill_in_details_form.html:12 -#: templates/web/base/report/new/fill_in_details_form.html:14 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:10 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:11 +#: templates/web/base/report/new/fill_in_details_form.html:10 +#: templates/web/base/report/new/fill_in_details_form.html:9 msgid "All the information you provide here will be sent to <strong>%s</strong>." msgstr "Alle informatie die je hier opgeeft zal worden verzonden naar <strong>%s</strong>." @@ -371,6 +340,10 @@ msgstr "Anoniem:" msgid "Are you a developer?" msgstr "Ben je een ontwikkelaar?" +#: templates/web/base/js/translation_strings.html:52 +msgid "Are you sure you want to cancel this upload?" +msgstr "" + #: templates/web/base/admin/body-form.html:69 #: templates/web/base/admin/body.html:16 #: templates/web/zurich/admin/body-form.html:24 @@ -389,42 +362,42 @@ msgstr "" #: templates/web/zurich/admin/report_edit.html:173 #: templates/web/zurich/admin/stats.html:36 msgid "Assign to different category:" -msgstr "" +msgstr "Toewijzen aan categorie:" #: templates/web/zurich/admin/report_edit.html:211 msgid "Assign to external body:" -msgstr "" +msgstr "Toegewezen aan:" #: templates/web/zurich/admin/report_edit.html:190 msgid "Assign to subdivision:" -msgstr "" +msgstr "Toegewezen aan afdeling:" #: perllib/FixMyStreet/Cobrand/Zurich.pm:221 msgid "Assigned to %s" -msgstr "" +msgstr "Toegewezen aan %s" -#: templates/web/base/open311/index.html:84 +#: templates/web/base/open311/index.html:76 msgid "At most %d requests are returned in each query. The returned requests are ordered by requested_datetime, so to get all requests, do several searches with rolling start_date and end_date." msgstr "Ten hoogste %d aanvragen worden per query teruggegeven. The teruggegeven aanvragen zijn gesorteerd op requested_datetime, dus om alle aanvragen binnen te krijgen moet je meerdere zoekopdrachten uitvoeren met verschuivende start_date en end_date." -#: templates/web/base/open311/index.html:76 +#: templates/web/base/open311/index.html:68 msgid "At the moment only searching for and looking at reports work." msgstr "Op dit moment kan je alleen zoeken naar meldingen en deze bekijken." #: perllib/FixMyStreet/DB/Result/Problem.pm:373 -#: templates/web/zurich/report/_item.html:11 +#: templates/web/zurich/report/_item.html:9 msgid "Awaiting moderation" -msgstr "" +msgstr "Wacht op controle" #: templates/web/base/js/translation_strings.html:32 msgid "Back" -msgstr "" +msgstr "Vorige" #: templates/web/base/admin/report_blocks.html:41 msgid "Ban email address" msgstr "Verban e-mailadres" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1276 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1285 #: perllib/FixMyStreet/Cobrand/Zurich.pm:392 #: templates/web/base/admin/bodies.html:1 templates/web/zurich/header.html:64 msgid "Bodies" @@ -454,7 +427,7 @@ msgid "Can't see the map? <em>Skip this step</em>" msgstr "Kan je de kaart niet zien? <em>Sla deze stap over</em>" #: templates/web/base/admin/body.html:68 -#: templates/web/base/admin/index.html:61 +#: templates/web/base/admin/index.html:54 #: templates/web/base/report/new/category.html:10 #: templates/web/base/report/new/category_wrapper.html:3 #: templates/web/zurich/admin/body.html:14 @@ -465,8 +438,8 @@ msgstr "Kan je de kaart niet zien? <em>Sla deze stap over</em>" msgid "Category" msgstr "Categorie" -#: templates/web/base/admin/index.html:59 -#: templates/web/base/admin/index.html:67 +#: templates/web/base/admin/index.html:52 +#: templates/web/base/admin/index.html:60 msgid "Category fix rate for problems > 4 weeks old" msgstr "Doorloopsnelheid voor problemen in categorie >4 weken oud" @@ -479,7 +452,7 @@ msgstr "Doorloopsnelheid voor problemen in categorie >4 weken oud" msgid "Category:" msgstr "Categorie:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:402 +#: perllib/FixMyStreet/Script/Reports.pm:180 msgid "Category: %s" msgstr "Categorie: %s" @@ -529,7 +502,7 @@ msgid "Click here or enter as dd/mm/yyyy" msgstr "" #: templates/web/base/around/_report_banner.html:2 -#: templates/web/base/js/translation_strings.html:50 +#: templates/web/base/js/translation_strings.html:55 msgid "Click map to report a problem" msgstr "Klik op de kaart om een probleem te melden" @@ -556,7 +529,7 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:25 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:144 -#: templates/web/fixmystreet/report/banner.html:15 +#: templates/web/base/report/banner.html:15 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:10 #: templates/web/zurich/admin/header.html:16 @@ -564,7 +537,7 @@ msgstr "" msgid "Closed" msgstr "Gesloten" -#: perllib/FixMyStreet/DB/Result/Problem.pm:794 +#: perllib/FixMyStreet/DB/Result/Problem.pm:779 msgid "Closed by council" msgstr "Gesloten door gemeente" @@ -590,7 +563,7 @@ msgstr "Cobrand data:" msgid "Cobrand:" msgstr "Cobrand:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1283 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1292 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "" @@ -603,13 +576,14 @@ msgstr "Configureer eindpunt" msgid "Confirm" msgstr "Bevestig" -#: templates/web/base/auth/token.html:1 templates/web/zurich/auth/token.html:1 +#: templates/web/base/auth/token.html:1 msgid "Confirm account" msgstr "Bevestig account" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:33 -#: templates/web/fixmystreet/report/update-form.html:107 -msgid "Confirm by email below, providing a new password at that point. When you confirm, your password will be updated." +#: templates/web/base/report/new/form_user_loggedout_password.html:21 +#: templates/web/base/report/update/form_user_loggedout_password.html:20 +#, fuzzy +msgid "Confirm by email instead, providing a new password at that point. When you confirm, your password will be updated." msgstr "Bevestig door e-mail beneden en kies een wachtwoord. Als je bevestigd wordt je wachtwoord bijgewerkt." #: templates/web/base/questionnaire/creator_fixed.html:1 @@ -639,35 +613,27 @@ msgid "Confirmed:" msgstr "Bevestigd:" #. ("%s is the site name") -#: templates/web/base/faq/faq-en-gb.html:8 templates/web/base/footer.html:24 -#: templates/web/base/open311/index.html:8 -#: templates/web/base/static/privacy.html:10 -#: templates/web/fixmystreet/contact/index.html:12 -#, fuzzy +#: templates/web/base/about/_sidebar.html:6 templates/web/base/footer.html:24 msgid "Contact %s" -msgstr "Contacteer ons" +msgstr "" #: templates/web/base/contact/index.html:1 #: templates/web/base/contact/index.html:2 #: templates/web/base/contact/submit.html:1 -#: templates/web/fixmystreet/contact/index.html:1 -#: templates/web/fixmystreet/contact/index.html:2 msgid "Contact Us" msgstr "Contacteer ons" -#: templates/web/base/contact/index.html:6 -#: templates/web/fixmystreet/contact/index.html:20 +#: templates/web/base/contact/index.html:12 msgid "Contact the team" msgstr "Neem contact op met het team" #: templates/web/zurich/admin/report_edit-sdm.html:40 #: templates/web/zurich/admin/report_edit.html:59 -#, fuzzy msgid "Coordinates:" -msgstr "Coördinaten:" +msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1420 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1448 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1429 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1457 msgid "Could not find user" msgstr "Kan de gebruiker niet vinden" @@ -685,7 +651,7 @@ msgstr "Gemeente" msgid "Council contacts for %s" msgstr "Gemeente contactpersongen voor %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:693 +#: perllib/FixMyStreet/DB/Result/Problem.pm:681 msgid "Council ref: %s" msgstr "gemeente ref.: %s" @@ -700,7 +666,7 @@ msgstr "Gemeente:" msgid "Count" msgstr "Aantal" -#: templates/web/base/email_sent.html:1 templates/web/zurich/email_sent.html:1 +#: templates/web/base/email_sent.html:1 msgid "Create a report" msgstr "Maak een melding" @@ -710,9 +676,8 @@ msgid "Create category" msgstr "Maak een categorie" #: templates/web/zurich/admin/template_edit.html:29 -#, fuzzy msgid "Create template" -msgstr "Maak een melding" +msgstr "" #: templates/web/base/admin/problem_row.html:34 #: templates/web/zurich/admin/templates.html:10 @@ -749,7 +714,7 @@ msgstr "Dashboard" msgid "Dealt with by subdivision within 5 working days" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:878 +#: perllib/FixMyStreet/App/Controller/Admin.pm:877 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "" @@ -762,7 +727,7 @@ msgstr "" msgid "Deleted" msgstr "Verwijderd" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:51 +#: templates/web/base/report/new/form_report.html:45 #: templates/web/zurich/admin/index-dm.html:22 #: templates/web/zurich/admin/index-sdm.html:20 #: templates/web/zurich/admin/reports.html:12 @@ -770,12 +735,11 @@ msgid "Description" msgstr "" #: templates/web/base/js/translation_strings.html:34 -#: templates/web/zurich/report/new/fill_in_details_form.html:42 +#: templates/web/zurich/report/new/fill_in_details_form.html:68 msgid "Details" msgstr "Details" #: templates/web/base/admin/report_edit.html:20 -#: templates/web/base/report/new/fill_in_details_form.html:62 #: templates/web/zurich/admin/report_edit-sdm.html:27 #: templates/web/zurich/admin/report_edit.html:29 #: templates/web/zurich/admin/report_edit.html:43 @@ -788,38 +752,38 @@ msgstr "Overgedragen" #: templates/web/zurich/admin/report_edit-sdm.html:50 #: templates/web/zurich/admin/report_edit.html:69 -#, fuzzy msgid "Didn't use map" -msgstr "kaart niet gebruikt" +msgstr "" #: templates/web/base/admin/edit-league.html:8 msgid "Diligency prize league table" msgstr "Toewijdingsranglijst" #. ("%s is the site name") -#: templates/web/base/auth/general.html:31 -#: templates/web/base/report/new/fill_in_details_form.html:114 -#: templates/web/base/report/update-form.html:87 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:11 -#: templates/web/fixmystreet/report/update-form.html:86 -#, fuzzy +#: templates/web/base/auth/general.html:48 +#: templates/web/base/report/new/form_user_loggedout.html:18 +#: templates/web/base/report/new/oauth_email_form.html:18 +#: templates/web/base/report/update-form.html:29 +#: templates/web/base/report/update/form_user_loggedout.html:17 msgid "Do you have a %s password?" -msgstr "Heb je een FixMyStreet wachtwoord?" +msgstr "" #: templates/web/base/questionnaire/index.html:55 msgid "Don’t know" msgstr "Geen idee" -#: templates/web/fixmystreet/contact/index.html:118 +#: templates/web/base/contact/index.html:110 msgid "Don't like forms?" msgstr "" +#: templates/web/base/js/translation_strings.html:51 +msgid "Drag and drop photos here or <u>click to upload</u>" +msgstr "" + #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:14 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:32 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:30 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:36 msgid "Duplicate" msgstr "" @@ -869,7 +833,7 @@ msgstr "Redacteur" #: templates/web/base/admin/category_edit.html:91 #: templates/web/base/admin/flagged.html:38 #: templates/web/base/admin/users.html:16 -#: templates/web/base/auth/general.html:22 +#: templates/web/base/auth/general.html:39 #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:24 @@ -877,7 +841,7 @@ msgstr "Redacteur" msgid "Email" msgstr "Email" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1396 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1405 msgid "Email added to abuse list" msgstr "Email toegevoegd aan zwarte lijst" @@ -893,7 +857,7 @@ msgstr "" msgid "Email alert deleted" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1393 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1402 msgid "Email already in abuse list" msgstr "Email staat al op zwarte lijst" @@ -901,41 +865,36 @@ msgstr "Email staat al op zwarte lijst" msgid "Email me new local problems" msgstr "Email me nieuwe lokale meldingen" -#: templates/web/base/report/display.html:38 -msgid "Email me updates" -msgstr "Email me updates" - #: templates/web/base/admin/category_edit.html:31 #: templates/web/base/admin/report_edit.html:62 #: templates/web/base/admin/update_edit.html:33 #: templates/web/base/admin/user-form.html:20 #: templates/web/base/alert/updates.html:13 -#: templates/web/base/report/display.html:42 #: templates/web/zurich/admin/body.html:47 msgid "Email:" msgstr "Email:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:329 +#: perllib/FixMyStreet/Script/Reports.pm:108 msgid "Email: %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:639 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:634 msgid "Empty flat or maisonette" msgstr "Lege flat of maisonette" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:638 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:633 msgid "Empty house or bungalow" msgstr "Leeg huis of bungalow" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:641 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:636 msgid "Empty office or other commercial" msgstr "Leeg kantoor of ander commercieel" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:642 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:637 msgid "Empty pub or bar" msgstr "Lege kroeg of bar" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:643 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:638 msgid "Empty public building - school, hospital, etc." msgstr "Leeg publiek gebouw - school, ziekenhuis etc." @@ -968,7 +927,7 @@ msgstr "" msgid "Enter a Zürich street name" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:13 +#: perllib/FixMyStreet/Cobrand/UK.pm:14 msgid "Enter a nearby UK postcode, or street name and area" msgstr "Vul een dichtstbijzijnde UK postcode, of straatnaam en plaats in" @@ -986,14 +945,9 @@ msgstr "Geef dichtstbijzijnde straatnaam en plaats" msgid "Enter a nearby street name and area, postal code or district in Delhi" msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:152 -#: templates/web/base/report/update-form.html:125 -msgid "Enter a new password:" -msgstr "Geef nieuw wachtwoord:" - -#: templates/web/base/auth/general.html:60 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:75 -#: templates/web/fixmystreet/report/update-form.html:123 +#: templates/web/base/auth/general.html:99 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:38 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:13 #: templates/web/zurich/auth/general.html:65 msgid "Enter a password" msgstr "Geef wachtwoord " @@ -1003,11 +957,11 @@ msgid "Enter details of the problem" msgstr "Geef details van het probleem" #: templates/web/base/errors/generic.html:1 -#: templates/web/base/errors/generic.html:3 +#: templates/web/base/errors/generic.html:4 #: templates/web/base/tokens/abuse.html:1 #: templates/web/base/tokens/abuse.html:3 #: templates/web/base/tokens/error.html:1 -#: templates/web/base/tokens/error.html:3 +#: templates/web/base/tokens/error.html:5 msgid "Error" msgstr "Foutmelding" @@ -1020,11 +974,11 @@ msgstr "" msgid "Example postcode %s" msgstr "Voorbeeld van postcode %s" -#: templates/web/base/open311/index.html:94 +#: templates/web/base/open311/index.html:86 msgid "Examples:" msgstr "Voorbeelden:" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:55 +#: templates/web/base/report/new/form_report.html:49 msgid "Explain what’s wrong, exactly where it is, and how long it’s been there…" msgstr "" @@ -1065,17 +1019,15 @@ msgstr "" msgid "FixMyStreet" msgstr "FixMyStreet" -#: templates/web/base/admin/index.html:61 +#: templates/web/base/admin/index.html:54 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:24 #: templates/web/base/admin/report_blocks.html:9 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:144 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:34 -#: templates/web/fixmystreet/report/banner.html:12 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:32 +#: templates/web/base/report/banner.html:12 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:38 msgid "Fixed" msgstr "Opgelost" @@ -1102,7 +1054,7 @@ msgstr "" msgid "Flag user" msgstr "Gemarkeerde gebruikr" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1281 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1290 #: templates/web/base/admin/users.html:19 msgid "Flagged" msgstr "Gemarkeerd" @@ -1133,8 +1085,8 @@ msgstr "Klik op de link voor een wijk om alleen problemen in die wijk te bekijke msgid "For more information, see <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>." msgstr "" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:32 -#: templates/web/fixmystreet/report/update-form.html:106 +#: templates/web/base/report/new/form_user_loggedout_password.html:20 +#: templates/web/base/report/update/form_user_loggedout_password.html:19 msgid "Forgotten your password?" msgstr "Wachtwoord vergeten?" @@ -1146,21 +1098,18 @@ msgstr "" msgid "Forwarded wish to external body" msgstr "" -#: templates/web/base/faq/faq-en-gb.html:1 -#: templates/web/base/faq/faq-en-gb.html:13 -#: templates/web/base/faq/faq-en-gb.html:6 -#: templates/web/base/open311/index.html:6 -#: templates/web/base/static/privacy.html:8 -#: templates/web/fixmystreet/contact/index.html:10 +#: templates/web/base/about/_sidebar.html:4 +#: templates/web/base/about/faq-en-gb.html:1 +#: templates/web/base/about/faq-en-gb.html:5 msgid "Frequently Asked Questions" msgstr "Veelgestelde Vragen" -#: templates/web/base/open311/index.html:136 +#: templates/web/base/open311/index.html:128 msgid "GeoRSS on Google Maps" msgstr "GeoRSS op Google Maps" +#: templates/web/base/report/display_tools.html:11 #: templates/web/fixmystreet/around/_updates.html:3 -#: templates/web/fixmystreet/report/display.html:35 msgid "Get updates" msgstr "Updates ontvangen" @@ -1193,7 +1142,7 @@ msgstr "Gaan" msgid "Going to send questionnaire?" msgstr "Vragenlijst versturen?" -#: templates/web/base/admin/index.html:42 +#: templates/web/base/admin/index.html:35 msgid "Graph of problem creation by status over time" msgstr "Grafiek van problemen aangemaakt per status na verloop van tijd" @@ -1210,7 +1159,7 @@ msgid "Have you ever reported a problem to a council before, or is this your fir msgstr "Heb je al eens eerder een probleem aan de gemeente gemeld, of is dit jouw eerste keer?" #: templates/web/base/footer.html:15 templates/web/fixmystreet/footer.html:38 -#: templates/web/zurich/faq/faq-de-ch.html:1 +#: templates/web/zurich/about/faq-de-ch.html:1 #: templates/web/zurich/footer.html:22 #: templates/web/zurich/nav_over_content.html:8 msgid "Help" @@ -1261,7 +1210,7 @@ msgstr "Hoe een melding maken" msgid "How to send successful reports" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:754 +#: perllib/FixMyStreet/App/Controller/Admin.pm:752 msgid "I am afraid you cannot confirm unconfirmed reports." msgstr "Ik ben bang dat je geen ongeverifieerde meldingen kunt bevestigen." @@ -1279,10 +1228,6 @@ msgstr "" msgid "I'm afraid we couldn't locate your problem in the database.\n" msgstr "Ik ben bang dat we je melding niet kunnen vinden in onze database.\n" -#: perllib/FixMyStreet/App/Controller/Tokens.pm:327 -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 "Ik ben bang dat we je token niet kunnen valideren. Als je de URL uit een e-mail hebt gekopieerd kan je controleren of je hem volledig hebt gekopieerd.\n" - #: templates/web/base/admin/flagged.html:14 #: templates/web/base/admin/list_updates.html:6 #: templates/web/base/admin/reports.html:11 @@ -1311,22 +1256,16 @@ msgstr "" msgid "If you get some more information about the status of your problem, please come back to the site and leave an update." msgstr "" -#: templates/web/base/report/new/councils_text_none.html:2 -#: templates/web/base/report/new/councils_text_none.html:8 +#: templates/web/base/report/new/councils_text_none.html:10 +#: templates/web/base/report/new/councils_text_none.html:9 msgid "If you submit a problem here the subject and details of the problem will be public, but the problem will <strong>not</strong> be reported to the council." msgstr "Het onderwerp en details van het probleem worden publiek zichtbaar als je deze instuurt, maar het probleem zal <strong>niet</strong> worden verzonden aan de gemeente." -#: templates/web/zurich/auth/token.html:19 -#: templates/web/zurich/email_sent.html:7 -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 "Als je een gratis e-mailadres of spamfilter hebt kan het voorkomen dat deze de e-mail tegenhoud. " - #: templates/web/base/questionnaire/index.html:68 -#, fuzzy msgid "" "If you wish to leave a public update on the problem, please enter it here\n" "(please note it will not be sent to the council)." -msgstr "Als je een publieke update over dit probleem wil maken vul ht dan hier in. Deze wordt niet neer de gemeente gestuurd. Bijvoorbeeld hoe was jouw ervaring met het oplossen van dit probleem?" +msgstr "" #: templates/web/base/admin/body.html:149 msgid "If you're using <strong>a send method that is not email</strong>, enter the service ID (Open311) or equivalent identifier here." @@ -1365,10 +1304,8 @@ msgstr "Illegale RSS feed selectie" #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:144 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:32 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:30 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:36 msgid "In Progress" msgstr "In Behandeling" @@ -1376,7 +1313,7 @@ msgstr "In Behandeling" msgid "In abuse table?" msgstr "" -#: templates/web/base/open311/index.html:88 +#: templates/web/base/open311/index.html:80 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 "Daarnaast worden de volgende attributen, die niet onderdeel zijn van de Open311 v2 specificatie meegestuurd: agency_sent_datetime, title (ook meegestuurd als onderdeel van de description), interface_used, comment_count, requestor_name (alleen aanwezig als deze getoond mag worden op de site)." @@ -1384,7 +1321,7 @@ msgstr "Daarnaast worden de volgende attributen, die niet onderdeel zijn van de #: perllib/FixMyStreet/Cobrand/Zurich.pm:963 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:7 -#: templates/web/fixmystreet/report/banner.html:19 +#: templates/web/base/report/banner.html:19 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:8 msgid "In progress" @@ -1408,7 +1345,7 @@ msgstr "Ongeldige has_photo waarde \"%s\"" #: templates/web/zurich/admin/list_updates.html:35 msgid "Internal notes" -msgstr "" +msgstr "Interne notities" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:16 @@ -1419,7 +1356,7 @@ msgstr "" msgid "Invalid agency_responsible value %s" msgstr "Ongeldige agency_responsible waarde %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1201 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1210 msgid "Invalid end date" msgstr "Ongeldige einddatum" @@ -1427,7 +1364,7 @@ msgstr "Ongeldige einddatum" msgid "Invalid format %s specified." msgstr "Ongeldig formaat %s gespecifieerd" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1206 msgid "Invalid start date" msgstr "Ongeldige startdatum" @@ -1435,14 +1372,12 @@ msgstr "Ongeldige startdatum" #: templates/web/base/admin/report_blocks.html:5 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:143 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:31 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:29 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:35 msgid "Investigating" msgstr "Onderzoeken" -#: templates/web/fixmystreet/contact/blurb.html:8 +#: templates/web/base/contact/blurb.html:8 msgid "It's often quickest to <a href=\"%s\">check our FAQs</a> and see if the answer is there." msgstr "" @@ -1460,11 +1395,9 @@ msgstr "" msgid "Jurisdiction unknown" msgstr "" -#: templates/web/base/auth/general.html:44 -#: templates/web/base/report/new/fill_in_details_form.html:132 -#: templates/web/base/report/update-form.html:105 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:28 -#: templates/web/fixmystreet/report/update-form.html:102 +#: templates/web/base/auth/general.html:80 +#: templates/web/base/report/new/form_user_loggedout_password.html:16 +#: templates/web/base/report/update/form_user_loggedout_password.html:15 #: templates/web/zurich/auth/general.html:40 msgid "Keep me signed in on this computer" msgstr "Hou me ingelogd op deze computer" @@ -1519,15 +1452,16 @@ msgstr "Vind het probleem op de kaart van de omgeving" #: templates/web/base/js/translation_strings.html:43 msgid "MAP" -msgstr "" +msgstr "Kaart" #: templates/web/base/js/translation_strings.html:45 +#: templates/web/base/maps/google-ol.html:13 msgid "Map" -msgstr "" +msgstr "Kaart" #: templates/web/base/admin/report_edit.html:68 msgid "Mark as sent" -msgstr "" +msgstr "Markeren als verzonden" #: templates/web/base/admin/user-form.html:44 msgid "Mark users whose behaviour you want to keep a check on as <strong>flagged</strong>." @@ -1541,7 +1475,7 @@ msgstr "" msgid "Marked fixed/closed more than eight weeks ago" msgstr "" -#: templates/web/fixmystreet/contact/index.html:106 +#: templates/web/base/contact/index.html:98 msgid "Message" msgstr "Bericht" @@ -1553,10 +1487,6 @@ msgstr "" msgid "Message to external body:" msgstr "" -#: templates/web/base/contact/index.html:97 -msgid "Message:" -msgstr "Bericht:" - #: perllib/FixMyStreet/App/Controller/Open311.pm:445 msgid "Missing jurisdiction_id" msgstr "Vermiste jurisdiction_id" @@ -1569,10 +1499,6 @@ msgstr "" msgid "Month" msgstr "Maand" -#: templates/web/base/report/display.html:34 -msgid "More problems nearby" -msgstr "Meer problemen dichtbij" - #: templates/web/base/admin/bodies.html:21 #: templates/web/base/admin/body-form.html:18 #: templates/web/base/admin/flagged.html:16 @@ -1580,11 +1506,11 @@ msgstr "Meer problemen dichtbij" #: templates/web/base/admin/list_updates.html:7 #: templates/web/base/admin/reports.html:13 #: templates/web/base/admin/users.html:15 -#: templates/web/base/auth/general.html:50 +#: templates/web/base/auth/general.html:89 +#: templates/web/base/report/new/form_user_loggedin.html:9 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:7 +#: templates/web/base/report/update/form_name.html:4 #: templates/web/base/reports/index.html:20 -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:9 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:44 -#: templates/web/fixmystreet/report/update-form.html:138 #: templates/web/zurich/admin/body-form.html:4 #: templates/web/zurich/auth/general.html:60 #: templates/web/zurich/report/new/fill_in_details_form.html:82 @@ -1598,25 +1524,25 @@ msgstr "Naam" msgid "Name:" msgstr "Naam:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:328 +#: perllib/FixMyStreet/Script/Reports.pm:107 msgid "Name: %s" -msgstr "" +msgstr "Naam: %s" #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:160 #: perllib/FixMyStreet/Geocode/OSM.pm:145 msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s" msgstr "Dichtstbijzijnde straat met naam voor lokatie op de kaart (automatisch gegenereerd via OpenStreetMap): %s%s" -#: perllib/FixMyStreet/Cobrand/UK.pm:127 +#: perllib/FixMyStreet/Cobrand/UK.pm:128 msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" msgstr "Dichtstbijzijnde postcode voor lokatie op de kaart (automatisch gegenereerd): %s (%sm afstand)" -#: perllib/FixMyStreet/Cobrand/Default.pm:434 -#: perllib/FixMyStreet/Cobrand/Default.pm:474 +#: perllib/FixMyStreet/Cobrand/Default.pm:455 +#: perllib/FixMyStreet/Cobrand/Default.pm:495 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "Dichtstbijzijnde straat voor lokatie op de kaart (automatisch gegenereerd via Bing Maps): %s" -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:267 +#: perllib/FixMyStreet/Script/Alerts.pm:290 msgid "" "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n" "\n" @@ -1624,14 +1550,9 @@ msgstr "" "Dichtstbijzijnde weg op basis van de gemarkeerde plek op de kaart (automatisch gegenereerd door Bing Maps): %s\n" "\n" -#: templates/web/zurich/email_sent.html:5 -msgid "Nearly Done! Now check your email..." -msgstr "Bijna klaar! Kijk nu in je e-mail..." - #: templates/web/base/auth/token.html:17 templates/web/base/email_sent.html:5 -#, fuzzy msgid "Nearly done! Now check your email…" -msgstr "Bijna klaar! Kijk nu in je e-mail..." +msgstr "" #: templates/web/base/reports/index.html:21 msgid "New <br>problems" @@ -1688,13 +1609,12 @@ msgstr "Nieuwe status" #: templates/web/zurich/admin/template_edit.html:9 #: templates/web/zurich/admin/templates.html:26 -#, fuzzy msgid "New template" -msgstr "Nieuwe status" +msgstr "" #: templates/web/base/pagination.html:13 msgid "Next" -msgstr "" +msgstr "Volgende" #: templates/web/base/admin/body.html:80 templates/web/base/admin/body.html:82 #: templates/web/base/admin/body.html:86 templates/web/base/admin/body.html:88 @@ -1707,8 +1627,8 @@ msgstr "" #: templates/web/base/admin/report_edit.html:75 #: templates/web/base/admin/update_edit.html:25 #: templates/web/base/questionnaire/creator_fixed.html:16 +#: templates/web/base/questionnaire/index.html:101 #: templates/web/base/questionnaire/index.html:53 -#: templates/web/base/questionnaire/index.html:92 msgid "No" msgstr "Nee" @@ -1772,10 +1692,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:13 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:33 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:31 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:37 msgid "Not Responsible" msgstr "" @@ -1814,7 +1732,7 @@ msgstr "Let op dat als je onbevestigde meldingen meeneemt we de datum gebruiken msgid "Note:" msgstr "Opmerking:" -#: templates/web/base/open311/index.html:73 +#: templates/web/base/open311/index.html:65 msgid "Note: <strong>%s</strong>" msgstr "Opmerking: <strong>%s</strong>" @@ -1822,13 +1740,15 @@ msgstr "Opmerking: <strong>%s</strong>" msgid "Notes from SDM to DM" msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:113 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:10 +#: templates/web/base/report/new/form_user_loggedout.html:14 +#: templates/web/base/report/new/form_user_loggedout.html:2 +#: templates/web/base/report/new/oauth_email_form.html:17 msgid "Now to submit your report…" msgstr "Nu om je melding te verzend…" -#: templates/web/base/report/update-form.html:86 -#: templates/web/fixmystreet/report/update-form.html:85 +#: templates/web/base/report/update-form.html:28 +#: templates/web/base/report/update/form_user_loggedout.html:13 +#: templates/web/base/report/update/form_user_loggedout.html:2 msgid "Now to submit your update…" msgstr "Nu om je update te verzend…" @@ -1836,11 +1756,6 @@ msgstr "Nu om je update te verzend…" msgid "OK" msgstr "" -#: templates/web/base/report/display.html:28 -#: templates/web/base/report/update.html:17 -msgid "Offensive? Unsuitable? Tell us" -msgstr "Beledigend? Ongeschikt? Meld het ons" - #: templates/web/base/reports/index.html:23 msgid "Old / unknown <br>problems" msgstr "Oude / onbekende <br>problemen" @@ -1857,7 +1772,7 @@ msgstr "Ouder<br>opgelost" msgid "Older <br>problems" msgstr "Oudere<br>problemen" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:45 +#: templates/web/base/report/new/form_report.html:15 msgid "One-line summary" msgstr "" @@ -1868,8 +1783,7 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:4 #: templates/web/base/admin/update_edit.html:28 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/report/update-form.html:30 -#: templates/web/fixmystreet/report/update-form.html:28 +#: templates/web/base/report/update/form_update.html:34 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:7 #: templates/web/zurich/admin/update_edit.html:18 @@ -1884,15 +1798,15 @@ msgstr "" msgid "Open, but not had any update in eight weeks" msgstr "" -#: templates/web/base/open311/index.html:70 +#: templates/web/base/open311/index.html:62 msgid "Open311 API for the mySociety FixMyStreet server" msgstr "Open311 API voor de mySociety FixMyStreet server" -#: templates/web/base/open311/index.html:80 +#: templates/web/base/open311/index.html:72 msgid "Open311 initiative web page" msgstr "Open311 initiatief website" -#: templates/web/base/open311/index.html:81 +#: templates/web/base/open311/index.html:73 msgid "Open311 specification" msgstr "Open311 specificatie" @@ -1904,15 +1818,15 @@ msgstr "Of problemen gemeld aan:" msgid "Or you can subscribe to an alert based upon what ward or council you’re in:" msgstr "Of je kan je abonneren op een melding gebaseerd op welke gemeente je woont:" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1084 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:673 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:674 -#: perllib/FixMyStreet/DB/Result/Problem.pm:570 -#: perllib/FixMyStreet/DB/Result/Problem.pm:580 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1055 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:669 +#: perllib/FixMyStreet/DB/Result/Problem.pm:558 +#: perllib/FixMyStreet/DB/Result/Problem.pm:568 +#: perllib/FixMyStreet/DB/Result/Problem.pm:578 #: perllib/FixMyStreet/DB/Result/Problem.pm:590 -#: perllib/FixMyStreet/DB/Result/Problem.pm:602 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:397 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:412 +#: perllib/FixMyStreet/Script/Reports.pm:175 +#: perllib/FixMyStreet/Script/Reports.pm:190 msgid "Other" msgstr "Anders" @@ -1921,7 +1835,7 @@ msgid "Owner" msgstr "Eigenaar" #: templates/web/base/errors/page_error_404_not_found.html:1 -#: templates/web/base/errors/page_error_404_not_found.html:3 +#: templates/web/base/errors/page_error_404_not_found.html:4 msgid "Page Not Found" msgstr "Pagina Niet Gevonden" @@ -1935,16 +1849,16 @@ msgstr "" msgid "Partial" msgstr "Gedeeltelijk" -#: templates/web/base/auth/general.html:53 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:68 -#: templates/web/fixmystreet/report/update-form.html:116 +#: templates/web/base/auth/general.html:92 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:31 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:6 #: templates/web/zurich/auth/general.html:32 #: templates/web/zurich/auth/general.html:63 msgid "Password (optional)" msgstr "Wachtwoord (optioneel)" #: templates/web/base/auth/change_password.html:25 -#: templates/web/base/auth/general.html:36 +#: templates/web/base/auth/general.html:72 msgid "Password:" msgstr "Wachtwoord:" @@ -1956,45 +1870,37 @@ msgstr "" msgid "Phone number" msgstr "" -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:26 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:62 +#: templates/web/base/report/new/form_user_loggedin.html:26 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:25 msgid "Phone number (optional)" msgstr "Telefoonnummer (optioneel)" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:306 +#: perllib/FixMyStreet/Script/Reports.pm:83 #: templates/web/base/admin/report_edit.html:63 -#: templates/web/base/report/new/fill_in_details_form.html:198 #: templates/web/zurich/admin/stats.html:39 msgid "Phone:" msgstr "Telefoonnummer:" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:66 -#: templates/web/fixmystreet/report/update-form.html:59 +#: templates/web/base/questionnaire/index.html:75 +#: templates/web/base/report/new/form_report.html:23 +#: templates/web/base/report/update/form_update.html:6 #: templates/web/zurich/admin/index-dm.html:29 #: templates/web/zurich/admin/index-sdm.html:24 #: templates/web/zurich/admin/reports.html:16 #: templates/web/zurich/admin/stats.html:37 -#: templates/web/zurich/report/new/fill_in_details_form.html:52 +#: templates/web/zurich/report/new/fill_in_details_form.html:45 msgid "Photo" msgstr "Foto" -#: perllib/FixMyStreet/App/Controller/Photo.pm:221 -#, fuzzy +#: perllib/FixMyStreet/App/Controller/Photo.pm:187 msgid "Photo is required." -msgstr "Deze informatie is verplicht" +msgstr "" #: templates/web/base/admin/category_edit.html:48 -#, fuzzy msgid "Photo required" -msgstr "Deze informatie is verplicht" - -#: templates/web/base/questionnaire/index.html:80 -#: templates/web/base/report/new/fill_in_details_form.html:84 -#: templates/web/base/report/update-form.html:62 -msgid "Photo:" -msgstr "Foto:" +msgstr "" -#: templates/web/base/alert/list.html:26 +#: templates/web/base/alert/list.html:23 msgid "Photos of recent nearby reports" msgstr "Foto's van recente meldingen dichtbij" @@ -2023,20 +1929,16 @@ msgstr "Wees beleefd, precies en beknopt" msgid "Please check the passwords and try again" msgstr "Controleer de wachtwoorden en probeer opnieuw" -#: templates/web/zurich/auth/token.html:16 -msgid "Please check your email" -msgstr "Controleer je e-mail" - -#: templates/web/base/auth/general.html:10 -#: templates/web/base/auth/general.html:16 +#: templates/web/base/auth/general.html:27 +#: templates/web/base/auth/general.html:33 #: templates/web/zurich/auth/general.html:3 #: templates/web/zurich/auth/general.html:9 msgid "Please check your email address is correct" msgstr "Controleer of je e-mailadres klopt" #: perllib/FixMyStreet/App/Controller/Admin.pm:343 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:883 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:948 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:878 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:943 #: perllib/FixMyStreet/DB/Result/Problem.pm:412 #: templates/web/base/js/translation_strings.html:9 msgid "Please choose a category" @@ -2050,25 +1952,29 @@ msgstr "Kies een pand type" msgid "Please correct the errors below" msgstr "" -#: templates/web/base/contact/blurb.html:2 -#: templates/web/fixmystreet/contact/blurb.html:12 -#, fuzzy +#: templates/web/base/contact/blurb.html:12 msgid "" "Please do <strong>not</strong> report problems through this form; messages go to\n" "the team behind this site, not a council. To report a problem,\n" "please <a href=\"/\">go to the front page</a> and follow the instructions." -msgstr "Maak alsjeblieft <strong>geen</strong> meldingen van problemen via dit formulier; meldingen gaan naar het team van FixMyStreet, en komen niet terecht bij de gemeente. Ga <a href=\"/\">naar de hoofdpagina</a> en volg de instructies." +msgstr "" #: templates/web/base/report/new/notes.html:6 msgid "Please do not be abusive — abusing your council devalues the service for all users." msgstr "" #: perllib/FixMyStreet/App/Controller/Admin.pm:346 -#: perllib/FixMyStreet/DB/Result/Comment.pm:126 +#: perllib/FixMyStreet/DB/Result/Comment.pm:125 #: templates/web/base/js/translation_strings.html:2 msgid "Please enter a message" msgstr "Geef bericht in" +#: perllib/FixMyStreet/App/Controller/Admin.pm:1091 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1146 +#, fuzzy +msgid "Please enter a name" +msgstr "Geef je naam" + #: templates/web/base/auth/change_password.html:12 #: templates/web/base/auth/change_password.html:15 #: templates/web/base/js/translation_strings.html:19 @@ -2081,10 +1987,10 @@ msgstr "Geef wachtwoord" msgid "Please enter a subject" msgstr "Geef onderwerp" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1084 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1137 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1087 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1142 #: perllib/FixMyStreet/App/Controller/Admin.pm:345 -#: perllib/FixMyStreet/DB/Result/User.pm:127 +#: perllib/FixMyStreet/DB/Result/User.pm:133 #: templates/web/base/js/translation_strings.html:12 #: templates/web/base/js/translation_strings.html:16 msgid "Please enter a valid email" @@ -2101,9 +2007,9 @@ msgid "Please enter some details" msgstr "Geef details" #: perllib/FixMyStreet/App/Controller/Contact.pm:113 -#: perllib/FixMyStreet/DB/Result/User.pm:124 -#: templates/web/base/auth/general.html:10 -#: templates/web/base/auth/general.html:15 +#: perllib/FixMyStreet/DB/Result/User.pm:130 +#: templates/web/base/auth/general.html:27 +#: templates/web/base/auth/general.html:32 #: templates/web/base/js/translation_strings.html:11 #: templates/web/base/js/translation_strings.html:15 #: templates/web/zurich/auth/general.html:3 @@ -2111,7 +2017,7 @@ msgstr "Geef details" msgid "Please enter your email" msgstr "Geef een geldig e-mailadres" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:7 +#: templates/web/base/report/new/form_user_loggedout_email.html:7 #: templates/web/zurich/report/new/fill_in_details_form.html:80 msgid "Please enter your email address" msgstr "Geef een geldig e-mailadres" @@ -2120,15 +2026,15 @@ msgstr "Geef een geldig e-mailadres" msgid "Please enter your first name" msgstr "Geef je voornaam" -#: perllib/FixMyStreet/Cobrand/UK.pm:318 +#: perllib/FixMyStreet/Cobrand/UK.pm:319 #: templates/web/base/js/translation_strings.html:7 msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below" msgstr "Geef je volledige naam, gemeentes hebben deze informatie nodig. Mocht je niet willen dat je naam op de site getoond wordt, haal dan de vink beneden weg." #: perllib/FixMyStreet/App/Controller/Contact.pm:112 -#: perllib/FixMyStreet/DB/Result/Comment.pm:123 +#: perllib/FixMyStreet/DB/Result/Comment.pm:122 #: perllib/FixMyStreet/DB/Result/Problem.pm:406 -#: perllib/FixMyStreet/DB/Result/User.pm:120 +#: perllib/FixMyStreet/DB/Result/User.pm:126 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter your name" msgstr "Geef je naam" @@ -2155,12 +2061,11 @@ msgstr "" msgid "Please fill in details of the problem below." msgstr "Vul de details van het probleem beneden in." -#: templates/web/zurich/report/new/fill_in_details_form.html:46 +#: templates/web/zurich/report/new/fill_in_details_form.html:72 msgid "Please fill in details of the problem." msgstr "Vul de details van het probleem in." -#: templates/web/base/report/new/fill_in_details_form.html:28 -#: templates/web/fixmystreet/report/new/sidebar.html:7 +#: templates/web/base/report/new/sidebar.html:7 #: templates/web/zurich/report/new/fill_in_details_form.html:20 msgid "Please fill in the form below with details of the problem, and describe the location as precisely as possible in the details box." msgstr "Vul zoveel mogelijk details in het veld beneden in. Vermeld ook de locatie zo precies mogelijk." @@ -2169,20 +2074,24 @@ msgstr "Vul zoveel mogelijk details in het veld beneden in. Vermeld ook de locat msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "Geef aan of je een vragenlijst wilt ontvangen" -#: templates/web/fixmystreet/report/updates-sidebar-notes.html:4 +#: templates/web/base/report/updates-sidebar-notes.html:2 msgid "Please note that updates are not sent to the council." msgstr "Let op, updates worden niet aan de gemeente verzonden." -#: templates/web/base/report/update-form.html:7 -msgid "Please note that updates are not sent to the council. If you leave your name it will be public. Your information will only be used in accordance with our <a href=\"/faq#privacy\">privacy policy</a>" -msgstr "Let op, updates worden niet aan de gemeente verzonden. Als je je naam achterlaat zal het publiekelijk getoond worden. Jouw gegevens worden alleen gebruikt volgens de vermeldingen van onze <a href=\"/faq#privacy\">privacy policy</a>" +#: templates/web/base/report/new/oauth_email_form.html:4 +#, fuzzy +msgid "Please note your report has <strong>not yet been sent</strong>." +msgstr "Let op dat je melding <strong>nog niet is verzonden</strong>. Kies een categorie en vermeld verdere informatie hierbeneden en klik op insturen." -#: templates/web/base/report/new/fill_in_details_form.html:8 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:21 +#: templates/web/base/report/new/fill_in_details_form.html:20 #: templates/web/zurich/report/new/fill_in_details_form.html:11 msgid "Please note your report has <strong>not yet been sent</strong>. Choose a category and add further information below, then submit." msgstr "Let op dat je melding <strong>nog niet is verzonden</strong>. Kies een categorie en vermeld verdere informatie hierbeneden en klik op insturen." +#: templates/web/base/report/display.html:26 +msgid "Please note your update has <strong>not yet been posted</strong>." +msgstr "" + #: templates/web/base/report/new/notes.html:1 #: templates/web/zurich/report/new/notes.html:1 msgid "Please note:" @@ -2202,9 +2111,8 @@ msgid "Please say whether you've ever reported a problem to your council before" msgstr "Geef aan of je het probleem al eerder hebt doorgegeven aan de gemeente" #: templates/web/zurich/admin/report_edit.html:208 -#, fuzzy msgid "Please select a body." -msgstr "Kies de feed die je wilt" +msgstr "" #: perllib/FixMyStreet/App/Controller/Alert.pm:80 msgid "Please select the feed you want" @@ -2221,6 +2129,7 @@ msgstr "Geef aan of het probleem is verholpen" #: perllib/FixMyStreet/App/Model/PhotoSet.pm:117 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:145 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:147 +#: templates/web/base/js/translation_strings.html:53 msgid "Please upload a JPEG image only" msgstr "Je kan alleen een JPEG foto insturen" @@ -2228,18 +2137,14 @@ msgstr "Je kan alleen een JPEG foto insturen" msgid "Please write a message" msgstr "Schrijf een bericht" -#: templates/web/fixmystreet/report/update-form.html:23 +#: templates/web/base/report/update/form_update.html:29 msgid "Please write your update here" msgstr "Schrijf je update hier" -#: templates/web/base/contact/index.html:100 -#: templates/web/base/report/update-form.html:110 -#: templates/web/base/report/update-form.html:132 -#: templates/web/base/report/update-form.html:72 -#: templates/web/fixmystreet/contact/index.html:113 -#: templates/web/fixmystreet/report/update-form.html:124 -#: templates/web/fixmystreet/report/update-form.html:71 -#: templates/web/fixmystreet/report/update-form.html:97 +#: templates/web/base/contact/index.html:105 +#: templates/web/base/report/update-form.html:24 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:14 +#: templates/web/base/report/update/form_user_loggedout_password.html:10 msgid "Post" msgstr "Bericht" @@ -2261,18 +2166,15 @@ msgstr "" #: templates/web/base/pagination.html:7 msgid "Previous" -msgstr "" +msgstr "Vorige" #: templates/web/fixmystreet/footer.html:41 msgid "Privacy" msgstr "" -#: templates/web/base/faq/faq-en-gb.html:7 -#: templates/web/base/open311/index.html:7 -#: templates/web/base/static/privacy.html:1 -#: templates/web/base/static/privacy.html:2 -#: templates/web/base/static/privacy.html:9 -#: templates/web/fixmystreet/contact/index.html:11 +#: templates/web/base/about/_sidebar.html:5 +#: templates/web/base/about/privacy.html:1 +#: templates/web/base/about/privacy.html:2 msgid "Privacy and cookies" msgstr "" @@ -2300,12 +2202,12 @@ msgstr "Probleem %s bevestigd" msgid "Problem %s sent to council %s" msgstr "Probleem %s verzonden naar gemeente %s" -#: templates/web/base/admin/index.html:46 +#: templates/web/base/admin/index.html:39 #: templates/web/zurich/admin/index.html:9 msgid "Problem breakdown by state" msgstr "Probleem verdeeld per status" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1055 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1058 msgid "Problem marked as open." msgstr "Probleem gemarkeerd als open" @@ -2321,11 +2223,11 @@ msgstr "Problemen" msgid "Problems in this area" msgstr "Problemen in dit gebied" -#: templates/web/fixmystreet/report/display.html:43 +#: templates/web/base/report/display_tools.html:19 msgid "Problems nearby" msgstr "Problemen dichtbij" -#: templates/web/fixmystreet/report/display.html:41 +#: templates/web/base/report/display_tools.html:17 msgid "Problems on the map" msgstr "Problemen op de kaart" @@ -2337,24 +2239,23 @@ msgstr "Recent gemelde problemen op FixMyStreet" msgid "Problems within %.1fkm of this location" msgstr "Problemen binnen een straal van %.1fkm van deze lokatie" -#: perllib/FixMyStreet/Cobrand/Default.pm:642 +#: perllib/FixMyStreet/Cobrand/Default.pm:663 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:120 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:139 -#: perllib/FixMyStreet/Cobrand/UK.pm:207 +#: perllib/FixMyStreet/Cobrand/UK.pm:208 msgid "Problems within %s" msgstr "Problemen binnen %s" #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:128 -#: perllib/FixMyStreet/Cobrand/UK.pm:221 +#: perllib/FixMyStreet/Cobrand/UK.pm:222 msgid "Problems within %s ward" msgstr "Problemen binnen wijk %s" #. ("First %s is the body name, second %s the site name") #: templates/web/base/reports/body.html:0 #: templates/web/base/reports/body.html:24 -#, fuzzy msgid "Problems within %s, %s" -msgstr "Problemen binnen %s" +msgstr "" #: templates/web/base/alert/_list.html:42 msgid "Problems within the boundary of:" @@ -2368,19 +2269,16 @@ msgstr "" msgid "Property type:" msgstr "Pand soort:" -#: templates/web/base/report/update-form.html:3 -#: templates/web/fixmystreet/report/update-form.html:4 +#: templates/web/base/report/update-form.html:6 msgid "Provide an update" msgstr "Geef een update" -#: templates/web/base/auth/general.html:56 +#: templates/web/base/auth/general.html:95 msgid "Providing a name and password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:156 -#: templates/web/base/report/update-form.html:129 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:71 -#: templates/web/fixmystreet/report/update-form.html:119 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:34 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:9 msgid "Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." msgstr "Het is optioneel om een wachtwoord op de geven, maar hiermee is het makkelijker om in de toekomst problemen te melden, updates te plaatsen en je meldingen te beheren." @@ -2392,7 +2290,7 @@ msgstr "" #: templates/web/zurich/admin/report_edit.html:121 #: templates/web/zurich/admin/stats.html:38 msgid "Publish photo" -msgstr "" +msgstr "Foto publiceren" #: templates/web/base/questionnaire/completed.html:1 #: templates/web/base/questionnaire/index.html:0 @@ -2416,18 +2314,17 @@ msgstr "Vragenlijst ingevuld door melder" #: templates/web/base/alert/_list.html:22 #: templates/web/base/around/display_location.html:1 #: templates/web/base/around/display_location.html:3 -#: templates/web/base/report/display.html:50 +#: templates/web/base/report/display_tools.html:34 #: templates/web/base/reports/_rss.html:1 #: templates/web/fixmystreet/alert/updates.html:9 -#: templates/web/fixmystreet/report/display.html:58 msgid "RSS feed" msgstr "RSS feed" -#: perllib/FixMyStreet/Cobrand/UK.pm:250 perllib/FixMyStreet/Cobrand/UK.pm:262 +#: perllib/FixMyStreet/Cobrand/UK.pm:251 perllib/FixMyStreet/Cobrand/UK.pm:263 msgid "RSS feed for %s" msgstr "RSS feed voor %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:256 perllib/FixMyStreet/Cobrand/UK.pm:268 +#: perllib/FixMyStreet/Cobrand/UK.pm:257 perllib/FixMyStreet/Cobrand/UK.pm:269 msgid "RSS feed for %s ward, %s" msgstr "RSS feed voor wijk %s, %s" @@ -2435,11 +2332,11 @@ msgstr "RSS feed voor wijk %s, %s" #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:163 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:173 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:181 -#: perllib/FixMyStreet/Cobrand/UK.pm:276 perllib/FixMyStreet/Cobrand/UK.pm:288 +#: perllib/FixMyStreet/Cobrand/UK.pm:277 perllib/FixMyStreet/Cobrand/UK.pm:289 msgid "RSS feed of %s" msgstr "RSS feed van %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:281 perllib/FixMyStreet/Cobrand/UK.pm:293 +#: perllib/FixMyStreet/Cobrand/UK.pm:282 perllib/FixMyStreet/Cobrand/UK.pm:294 msgid "RSS feed of %s, within %s ward" msgstr "RSS feed van %s, binnen wijk %s" @@ -2451,15 +2348,15 @@ msgstr "RSS feed van nabije problemen" msgid "RSS feed of problems in this %s" msgstr "RSS feed van problemen in dit %s" -#: perllib/FixMyStreet/Cobrand/Default.pm:643 +#: perllib/FixMyStreet/Cobrand/Default.pm:664 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:121 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:138 -#: perllib/FixMyStreet/Cobrand/UK.pm:214 +#: perllib/FixMyStreet/Cobrand/UK.pm:215 msgid "RSS feed of problems within %s" msgstr "RSS feed van problemen binnen %s" #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:127 -#: perllib/FixMyStreet/Cobrand/UK.pm:220 +#: perllib/FixMyStreet/Cobrand/UK.pm:221 msgid "RSS feed of problems within %s ward" msgstr "RSS feed van problemen in wijk %s" @@ -2468,25 +2365,22 @@ msgstr "RSS feed van problemen in wijk %s" msgid "RSS feed of recent local problems" msgstr "RSS feed van recente lokale problemen" -#: templates/web/base/report/display.html:50 +#: templates/web/base/report/display_tools.html:34 #: templates/web/fixmystreet/alert/updates.html:9 -#: templates/web/fixmystreet/report/display.html:58 msgid "RSS feed of updates to this problem" msgstr "RSS feed van updates voor dit probleem" #: templates/web/base/alert/updates.html:9 -#: templates/web/base/report/display.html:41 +#: templates/web/base/report/display_tools.html:36 #: templates/web/fixmystreet/alert/updates.html:14 -#: templates/web/fixmystreet/report/display.html:60 msgid "Receive email when updates are left on this problem." msgstr "Ontvang een e-mail als updates worden achtergelaten bij dit probleem." #. ("%s is the site name") #: templates/web/base/around/display_location.html:0 #: templates/web/base/around/display_location.html:33 -#, fuzzy msgid "Recent local problems, %s" -msgstr "Recente lokale problemen, FixMystreet" +msgstr "" #: templates/web/base/reports/index.html:24 msgid "Recently <br>fixed" @@ -2504,19 +2398,19 @@ msgstr "Onthoud dat FixMyStreet zich richt op het melden van fysieke problemen d msgid "Remove flag" msgstr "Verwijder markering" -#: templates/web/base/admin/report_edit.html:92 -#: templates/web/base/admin/update_edit.html:62 +#: templates/web/base/admin/report_edit.html:93 +#: templates/web/base/admin/update_edit.html:67 #: templates/web/zurich/admin/update_edit.html:35 msgid "Remove photo (can't be undone!)" msgstr "Verwijder foto (kan niet ongedaan worden!)" #: templates/web/zurich/admin/report_edit.html:243 msgid "Reply to user:" -msgstr "" +msgstr "Beantwoord" #: templates/web/fixmystreet/header_logo.html:2 msgid "Report" -msgstr "" +msgstr "Melding" #: templates/web/base/footer.html:7 templates/web/fixmystreet/footer.html:26 #: templates/web/fixmystreet/header_logo.html:2 @@ -2525,7 +2419,7 @@ msgstr "" msgid "Report a problem" msgstr "Meld een probleem" -#: templates/web/fixmystreet/report/display.html:32 +#: templates/web/base/report/display_tools.html:8 msgid "Report abuse" msgstr "Meld misbruik" @@ -2534,18 +2428,18 @@ msgid "Report on %s" msgstr "Meld op %s" #: templates/web/base/report/new/fill_in_details_form.html:1 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:2 +#: templates/web/base/report/new/login_success_form.html:1 +#: templates/web/base/report/new/oauth_email_form.html:1 msgid "Report your problem" -msgstr "" +msgstr "Probleem melden" #: templates/web/base/around/intro.html:1 #: templates/web/zurich/around/intro.html:1 msgid "Report, view, or discuss local problems" msgstr "Meld, bekijk of discussier over lokale problemen" -#: perllib/FixMyStreet/DB/Result/Problem.pm:585 -#: templates/web/base/contact/index.html:50 -#: templates/web/fixmystreet/contact/index.html:65 +#: perllib/FixMyStreet/DB/Result/Problem.pm:573 +#: templates/web/base/contact/index.html:57 msgid "Reported anonymously at %s" msgstr "Anoniem gemeld bij %s" @@ -2554,55 +2448,52 @@ msgstr "Anoniem gemeld bij %s" msgid "Reported before" msgstr "Eerder gemeld" -#: perllib/FixMyStreet/DB/Result/Problem.pm:608 -#: templates/web/base/contact/index.html:52 -#: templates/web/fixmystreet/contact/index.html:67 +#: perllib/FixMyStreet/DB/Result/Problem.pm:596 +#: templates/web/base/contact/index.html:59 msgid "Reported by %s at %s" msgstr "Gemeld door %s bij %s" #: templates/web/zurich/admin/report_edit-sdm.html:58 #: templates/web/zurich/admin/report_edit.html:86 -#, fuzzy msgid "Reported by:" -msgstr "Gemeld %s" +msgstr "Gemeld door:" #: templates/web/zurich/report/_main.html:2 msgid "Reported in the %s category" -msgstr "" +msgstr "Toegewezen aan categorie %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:581 +#: perllib/FixMyStreet/DB/Result/Problem.pm:569 msgid "Reported in the %s category anonymously at %s" msgstr "Anoniem gemeld in de categorie %s bij %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:603 +#: perllib/FixMyStreet/DB/Result/Problem.pm:591 msgid "Reported in the %s category by %s at %s" msgstr "Gemeld in de categorie %s door %s bij %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:577 +#: perllib/FixMyStreet/DB/Result/Problem.pm:565 msgid "Reported via %s anonymously at %s" msgstr "Anoniem door %s gemeld bij %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:599 +#: perllib/FixMyStreet/DB/Result/Problem.pm:587 msgid "Reported via %s by %s at %s" msgstr "Gemeld door %s door %s bij %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:573 +#: perllib/FixMyStreet/DB/Result/Problem.pm:561 msgid "Reported via %s in the %s category anonymously at %s" msgstr "Anoniem gemeld bij %s in de categorie %s door %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:593 +#: perllib/FixMyStreet/DB/Result/Problem.pm:581 msgid "Reported via %s in the %s category by %s at %s" msgstr "Gemeld door %s in de categorie %s door %s bij %s" #: templates/web/base/reports/index.html:21 msgid "Reported within the last four weeks" -msgstr "" +msgstr "Gemeld in de afgelopen vier weken" #: templates/web/zurich/admin/report_edit-sdm.html:36 #: templates/web/zurich/admin/report_edit.html:55 -#, fuzzy msgid "Reported:" -msgstr "Gemeld %s" +msgstr "Gemeld:" #: templates/web/base/around/index.html:2 #: templates/web/base/js/translation_strings.html:41 @@ -2612,13 +2503,13 @@ msgstr "Gemeld %s" msgid "Reporting a problem" msgstr "Meld een probleem" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1277 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1286 #: perllib/FixMyStreet/Cobrand/Zurich.pm:384 #: templates/web/zurich/header.html:60 msgid "Reports" -msgstr "" +msgstr "Meldingen" -#: perllib/FixMyStreet/Cobrand/UK.pm:327 perllib/FixMyStreet/Cobrand/UK.pm:331 +#: perllib/FixMyStreet/Cobrand/UK.pm:328 perllib/FixMyStreet/Cobrand/UK.pm:332 msgid "Reports are limited to %s characters in length. Please shorten your report" msgstr "" @@ -2655,25 +2546,26 @@ msgstr "Wegbeheerder voor deze straat (afgeleid van wegnummer en type): %s" msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "Wegbeheerder voor deze straat (uit OpenStreetMap): %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1495 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1500 -#: templates/web/base/admin/report_edit.html:88 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1508 +#: templates/web/base/admin/report_edit.html:90 +#: templates/web/base/admin/update_edit.html:64 #: templates/web/zurich/admin/report_edit.html:116 msgid "Rotate Left" -msgstr "" +msgstr "Linksom roteren" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1495 -#: templates/web/base/admin/report_edit.html:89 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 +#: templates/web/base/admin/report_edit.html:91 +#: templates/web/base/admin/update_edit.html:65 #: templates/web/zurich/admin/report_edit.html:117 msgid "Rotate Right" -msgstr "" +msgstr "Rechtsom roteren" #: templates/web/zurich/admin/report_edit.html:388 msgid "Rotating this photo will discard unsaved changes to the report." msgstr "" #: templates/web/base/js/translation_strings.html:46 -#: templates/web/base/maps/google-ol.html:13 msgid "Satellite" msgstr "" @@ -2695,7 +2587,7 @@ msgstr "Zoek Gebruikers" #: templates/web/zurich/header.html:82 msgid "Search reports" -msgstr "" +msgstr "Meldingen zoeken" #: templates/web/base/admin/reports.html:5 #: templates/web/base/admin/users.html:8 @@ -2705,11 +2597,11 @@ msgstr "Zoek:" #: templates/web/base/admin/reports.html:26 msgid "Searching found no reports." -msgstr "" +msgstr "Geen meldingen gevonden." #: templates/web/base/admin/users.html:41 msgid "Searching found no users." -msgstr "" +msgstr "Geen gebruikers gevonden." #: templates/web/base/admin/body-form.html:33 #: templates/web/zurich/admin/body-form.html:16 @@ -2723,19 +2615,17 @@ msgstr "Selecteer een gemeente om te zien welke rapporten hierheen zijn gestuurd #: templates/web/base/admin/body-form.html:71 #: templates/web/zurich/admin/body-form.html:26 msgid "Select an area" -msgstr "" +msgstr "Selecteer een gebied" #: templates/web/base/alert/_list.html:10 -#, fuzzy msgid "Select which type of alert you’d like and click the button for an RSS feed, or enter your email address to subscribe to an email alert." -msgstr "Selecteer op welke melding je wilt hebben en klik op de knop om een RSS feed te maken, of vul je e-mailadres in om je abonneren op een e-mailmelding." +msgstr "" #: perllib/FixMyStreet/Cobrand/Zurich.pm:835 -#, fuzzy msgid "Sent report back" -msgstr "Open meldingen" +msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:708 +#: perllib/FixMyStreet/DB/Result/Problem.pm:696 msgid "Sent to %s %s later" msgstr "Verzonden aan %s %s later" @@ -2748,15 +2638,13 @@ msgstr "Verzonden:" msgid "Service:" msgstr "Service:" -#: templates/web/fixmystreet/report/display.html:38 +#: templates/web/base/report/display_tools.html:14 msgid "Share" msgstr "Deel" -#: templates/web/base/report/new/fill_in_details_form.html:193 -#: templates/web/base/report/update-form.html:158 -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:23 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:59 -#: templates/web/fixmystreet/report/update-form.html:146 +#: templates/web/base/report/new/form_user_loggedin.html:23 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:22 +#: templates/web/base/report/update/form_name.html:15 msgid "Show my name publicly" msgstr "Toon mijn naam publiekelijk" @@ -2768,9 +2656,9 @@ msgstr "Toon oud" msgid "Show pins" msgstr "Toon spelden" +#: templates/web/base/auth/general.html:100 #: templates/web/base/auth/general.html:3 -#: templates/web/base/auth/general.html:40 -#: templates/web/base/auth/general.html:61 +#: templates/web/base/auth/general.html:76 #: templates/web/zurich/auth/general.html:18 #: templates/web/zurich/auth/general.html:35 msgid "Sign in" @@ -2797,7 +2685,7 @@ msgid "" " sent from your FixMyStreet installation." msgstr "" -#: templates/web/base/alert/index.html:42 +#: templates/web/base/alert/index.html:40 msgid "Some photos of recent reports" msgstr "" @@ -2807,7 +2695,7 @@ msgstr "" msgid "Some text to localize" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:78 +#: perllib/FixMyStreet/Cobrand/UK.pm:79 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover." msgstr "" @@ -2819,14 +2707,20 @@ msgstr "" msgid "Sorry, there has been an error confirming your problem." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:221 -#: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:37 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:216 +#: perllib/FixMyStreet/Geocode.pm:38 perllib/FixMyStreet/Geocode/Bing.pm:38 #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:56 #: perllib/FixMyStreet/Geocode/OSM.pm:48 msgid "Sorry, we could not find that location." msgstr "" -#: perllib/FixMyStreet/Geocode/Bing.pm:34 +#: templates/web/base/auth/general.html:9 +#: templates/web/base/report/display.html:21 +#: templates/web/base/report/new/fill_in_details_form.html:23 +msgid "Sorry, we could not log you in. Please fill in the form below." +msgstr "" + +#: perllib/FixMyStreet/Geocode/Bing.pm:35 #: perllib/FixMyStreet/Geocode/Google.pm:45 #: perllib/FixMyStreet/Geocode/Zurich.pm:88 msgid "Sorry, we could not parse that location. Please try again." @@ -2836,40 +2730,44 @@ msgstr "" msgid "Sorry, we couldn't save your image(s), please try again." msgstr "" +#: perllib/FixMyStreet/App/Controller/AuthSS.pm:301 +#, fuzzy +msgid "Sorry, you can not log in with Facebook. Please try again later." +msgstr "Er was een probleem bij het tonen van deze pagina. Probeer het later nog eens." + #: templates/web/base/admin/stats.html:64 msgid "Start Date:" -msgstr "" +msgstr "Startdatum:" #: templates/web/base/admin/body.html:69 #: templates/web/base/admin/flagged.html:18 #: templates/web/base/admin/list_updates.html:11 #: templates/web/base/admin/reports.html:15 -#: templates/web/fixmystreet/report/update-form.html:26 +#: templates/web/base/report/update/form_update.html:32 msgid "State" -msgstr "" +msgstr "Staat" #: templates/web/base/admin/report_edit.html:47 #: templates/web/base/admin/update_edit.html:27 -#: templates/web/base/report/update-form.html:28 #: templates/web/zurich/admin/report_edit-sdm.html:73 #: templates/web/zurich/admin/report_edit.html:101 #: templates/web/zurich/admin/report_edit.html:155 #: templates/web/zurich/admin/update_edit.html:17 msgid "State:" -msgstr "" +msgstr "Staat:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1282 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1291 #: perllib/FixMyStreet/Cobrand/Zurich.pm:387 #: templates/web/base/admin/stats.html:1 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:73 msgid "Stats" -msgstr "" +msgstr "Statistieken" #: templates/web/zurich/admin/index-dm.html:23 #: templates/web/zurich/admin/index-sdm.html:21 #: templates/web/zurich/admin/reports.html:13 msgid "Status" -msgstr "" +msgstr "Status" #: templates/web/base/report/updates.html:10 msgid "Still open, via questionnaire, %s" @@ -2880,48 +2778,43 @@ msgstr "" msgid "Street View" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:406 +#: perllib/FixMyStreet/Script/Reports.pm:184 msgid "Subcategory: %s" -msgstr "" +msgstr "Subcategorie: %s" #: templates/web/zurich/admin/index-dm.html:27 msgid "Subdivision/Body" msgstr "" -#: templates/web/fixmystreet/contact/index.html:98 +#: templates/web/base/contact/index.html:90 msgid "Subject" -msgstr "" +msgstr "Onderwerp" #: templates/web/base/admin/report_edit.html:19 -#: templates/web/base/contact/index.html:88 -#: templates/web/base/report/new/fill_in_details_form.html:53 #: templates/web/zurich/admin/report_edit.html:39 msgid "Subject:" -msgstr "" +msgstr "Onderwerp:" #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/fill_in_details_form.html:137 -#: templates/web/base/report/new/fill_in_details_form.html:159 -#: templates/web/base/report/new/fill_in_details_form.html:96 -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:36 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:23 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:76 +#: templates/web/base/report/new/form_user_loggedin.html:36 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:39 +#: templates/web/base/report/new/form_user_loggedout_password.html:11 #: templates/web/zurich/report/new/fill_in_details_form.html:96 msgid "Submit" -msgstr "" +msgstr "Opslaan" -#: templates/web/base/admin/report_edit.html:95 -#: templates/web/base/admin/update_edit.html:65 +#: templates/web/base/admin/report_edit.html:101 +#: templates/web/base/admin/update_edit.html:75 #: templates/web/base/admin/user-form.html:56 #: templates/web/zurich/admin/report_edit-sdm.html:137 #: templates/web/zurich/admin/report_edit.html:268 #: templates/web/zurich/admin/update_edit.html:38 msgid "Submit changes" -msgstr "" +msgstr "Wijzigingen opslaan" -#: templates/web/base/questionnaire/index.html:97 +#: templates/web/base/questionnaire/index.html:106 msgid "Submit questionnaire" -msgstr "" +msgstr "Vragenlijst opslaan" #: perllib/FixMyStreet/Cobrand/Zurich.pm:171 #: perllib/FixMyStreet/Cobrand/Zurich.pm:902 @@ -2932,12 +2825,11 @@ msgstr "" #: templates/web/zurich/admin/index-sdm.html:21 #: templates/web/zurich/admin/reports.html:13 msgid "Submitted" -msgstr "" +msgstr "Opgeslagen" #: templates/web/base/alert/updates.html:17 -#: templates/web/base/report/display.html:46 +#: templates/web/base/report/display_tools.html:41 #: templates/web/fixmystreet/alert/updates.html:23 -#: templates/web/fixmystreet/report/display.html:65 msgid "Subscribe" msgstr "" @@ -2945,7 +2837,7 @@ msgstr "" msgid "Subscribe me to an email alert" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1275 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1284 #: perllib/FixMyStreet/Cobrand/Zurich.pm:383 #: templates/web/base/admin/bodies.html:25 #: templates/web/base/admin/index.html:1 @@ -2956,7 +2848,7 @@ msgstr "" #: templates/web/zurich/admin/index.html:1 templates/web/zurich/footer.html:13 #: templates/web/zurich/header.html:57 msgid "Summary" -msgstr "" +msgstr "Samenvatting" #: templates/web/base/reports/index.html:1 #: templates/web/zurich/reports/index.html:0 @@ -2964,7 +2856,7 @@ msgstr "" msgid "Summary reports" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1279 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1288 msgid "Survey" msgstr "" @@ -2978,9 +2870,8 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/Zurich.pm:394 #: templates/web/zurich/header.html:77 -#, fuzzy msgid "Templates" -msgstr "Updates ontvangen" +msgstr "" #: templates/web/base/admin/list_updates.html:12 #: templates/web/zurich/admin/templates.html:9 @@ -3001,7 +2892,7 @@ msgstr "" msgid "Thank you for reporting this issue!" msgstr "" -#: templates/web/base/tokens/error.html:7 +#: templates/web/base/tokens/error.html:6 msgid "Thank you for trying to confirm your update or problem. We seem to have an error ourselves though, so <a href=\"%s\">please let us know what went on</a> and we'll look into it." msgstr "" @@ -3036,23 +2927,23 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:47 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:63 -#: perllib/FixMyStreet/Cobrand/UK.pm:71 +#: perllib/FixMyStreet/Cobrand/UK.pm:72 msgid "That postcode was not recognised, sorry." -msgstr "" +msgstr "De postcode is niet geldig." -#: perllib/FixMyStreet/App/Controller/Admin.pm:726 +#: perllib/FixMyStreet/App/Controller/Admin.pm:724 msgid "That problem has been marked as sent." -msgstr "" +msgstr "Het probleem is gemarkeerd als verzonden." -#: perllib/FixMyStreet/App/Controller/Admin.pm:718 +#: perllib/FixMyStreet/App/Controller/Admin.pm:716 msgid "That problem will now be resent." -msgstr "" +msgstr "Het probleem wordt opnieuw verzonden." -#: perllib/FixMyStreet/App/Controller/Report.pm:125 +#: perllib/FixMyStreet/App/Controller/Report.pm:127 msgid "That report cannot be viewed on %s." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:119 +#: perllib/FixMyStreet/App/Controller/Report.pm:121 msgid "That report has been removed from FixMyStreet." msgstr "" @@ -3083,7 +2974,7 @@ msgid "" " If you leave this blank, <strong>send method defaults to email</strong>." msgstr "" -#: templates/web/base/open311/index.html:90 +#: templates/web/base/open311/index.html:82 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 "" @@ -3104,12 +2995,12 @@ msgstr "" msgid "The diligency prize league table shows editors' activity (who's been editing the most records)." msgstr "" -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:60 -#: perllib/FixMyStreet/App/Controller/Reports.pm:79 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:61 +#: perllib/FixMyStreet/App/Controller/Reports.pm:80 msgid "The error was: %s" msgstr "De foutmelding was: %s" -#: templates/web/base/open311/index.html:86 +#: templates/web/base/open311/index.html:78 msgid "The following Open311 v2 attributes are returned for each request: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code and service_name." msgstr "De volgende Open311 v2 attributen worden teruggegeven voor elke aanvraag: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code en service_name." @@ -3156,8 +3047,7 @@ msgstr "" msgid "The passwords do not match" msgstr "Wachtwoorden komen niet overeen" -#: templates/web/base/errors/page_error_404_not_found.html:10 -#: templates/web/base/errors/page_error_404_not_found.html:12 +#: templates/web/base/errors/page_error_404_not_found.html:9 msgid "The requested URL '%s' was not found on this server" msgstr "De opgevraagde URL '%s' is niet gevonden op de server" @@ -3167,12 +3057,11 @@ msgstr "De simpelste melding is onze geografische:" #: templates/web/base/report/new/councils_extra_text.html:1 #: templates/web/base/report/new/councils_text_some.html:10 -#: templates/web/base/report/new/fill_in_details_form.html:18 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:14 +#: templates/web/base/report/new/fill_in_details_form.html:13 msgid "The summary and description will also be made public (see our <a href=\"/privacy\">privacy policy</a>)." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:315 +#: perllib/FixMyStreet/Script/Reports.pm:92 msgid "The user could not locate the problem on a map, but to see the area around the location they entered" msgstr "The gebruiker kon het probleem niet vinden op de kaart, maar het gebied rond de lokatie wordt op de kaart getoond" @@ -3189,18 +3078,18 @@ msgstr "" msgid "There are no reports to show." msgstr "" -#: perllib/FixMyStreet/App/Controller/Reports.pm:76 +#: perllib/FixMyStreet/App/Controller/Reports.pm:77 msgid "There was a problem showing the All Reports page. Please try again later." msgstr "Er was een probleem bij het tonen van de Alle Meldingen pagina. Probeer het later nog eens." #: perllib/FixMyStreet/App/Controller/Contact.pm:137 -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:59 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:60 msgid "There was a problem showing this page. Please try again later." msgstr "Er was een probleem bij het tonen van deze pagina. Probeer het later nog eens." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:769 -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:134 -#: templates/web/base/auth/general.html:26 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:764 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:138 +#: templates/web/base/auth/general.html:43 #: templates/web/zurich/auth/general.html:28 msgid "There was a problem with your email/password combination. If you cannot remember your password, or do not have one, please fill in the ‘sign in by email’ section of the form." msgstr "Er was een probleem met je e-mailadres/wachtwoord combinatie. Als je het wachtwoord niet kunt herinneren, of je hebt er geen een, vul dan het formulier ‘inloggen via email’ in." @@ -3209,7 +3098,7 @@ msgstr "Er was een probleem met je e-mailadres/wachtwoord combinatie. Als je het msgid "There was a problem with your email/password combination. Please try again." msgstr "Er was een probleem met je e-mailadres/wachtwoord combinatie. Probeer het later nog eens." -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:272 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:336 msgid "There was a problem with your update. Please try again." msgstr "Er was een probleem met je update. Probeer het later nog eens." @@ -3217,7 +3106,7 @@ msgstr "Er was een probleem met je update. Probeer het later nog eens." msgid "There were problems with your report. Please see below." msgstr "Er was een probleem met je melding. Zie beneden." -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:300 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:371 msgid "There were problems with your update. Please see below." msgstr "Er was een probleem met je update. Zie beneden." @@ -3231,7 +3120,7 @@ msgid "" " " msgstr "" -#: templates/web/base/open311/index.html:77 +#: templates/web/base/open311/index.html:69 msgid "This API implementation is work in progress and not yet stabilized. It will change without warnings in the future." msgstr "Deze API implementatie is een werk in uitvoering en nog niet stabiel. Het kan zonder waarschuwing wijzigen in de toekomst." @@ -3253,18 +3142,18 @@ msgid "" " A body will not receive any reports unless it covers at least one area." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:413 +#: perllib/FixMyStreet/Script/Reports.pm:191 msgid "This email has been sent to both councils covering the location of the problem, as the user did not categorise it; please ignore it if you're not the correct council to deal with the issue, or let us know what category of problem this is so we can add it to our system." msgstr "Deze e-mail is naar meerdere contactpersonen gestuurd die mogelijk geïnteresseerd zijn in deze lokatie omdat de gebruiker geen categorie heeft aangegeven. Negeer deze melding als je niet de juiste contactpersoon bent, of laat ons weten in welke categorie dit probleem valt zodat we dit kunnen toevoegen aan ons systeem." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:416 +#: perllib/FixMyStreet/Script/Reports.pm:194 msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue." msgstr "Deze e-mail is naar meerdere contactpersonen gestuurd die mogelijk geïnteresseerd zijn in deze lokatie. Negeer deze melding als je niet de juiste contactpersoon bent." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:925 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:995 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:920 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:990 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:142 -#: perllib/FixMyStreet/Cobrand/UK.pm:43 +#: perllib/FixMyStreet/Cobrand/UK.pm:44 msgid "This information is required" msgstr "Deze informatie is verplicht" @@ -3276,56 +3165,37 @@ msgstr "Dit is een ontwikkelingssite; er kunnen mogelijk problemen optreden, en msgid "This is a summary of all reports on this site." msgstr "Dit is een samenvatting van alle meldingen op deze site." -#: templates/web/zurich/auth/token.html:8 -msgid "This may be because the link is too old or already used, or the address was not copied correctly." -msgstr "" - -#: templates/web/base/report/banner.html:15 -msgid "This problem has been closed" -msgstr "Dit probleem is gesloten" - -#: templates/web/base/report/banner.html:12 -#: templates/web/base/report/update-form.html:48 -#: templates/web/fixmystreet/report/update-form.html:46 +#: templates/web/base/report/update/form_update.html:52 msgid "This problem has been fixed" msgstr "Dit probleem is opgelost" -#: templates/web/base/report/update-form.html:43 -#: templates/web/fixmystreet/report/update-form.html:40 +#: templates/web/base/report/update/form_update.html:46 msgid "This problem has not been fixed" msgstr "Dit probleem is niet opgelost" -#: templates/web/base/report/banner.html:19 -msgid "This problem is in progress" -msgstr "Aan dit probleem wordt gewerkt" - -#: templates/web/base/report/banner.html:9 -msgid "This problem is old and of unknown status." -msgstr "Dit probleem is oud, en de status is onbekend." - #: perllib/FixMyStreet/Cobrand/Zurich.pm:168 #: perllib/FixMyStreet/Cobrand/Zurich.pm:169 #: templates/web/zurich/report/_main.html:14 msgid "This report is awaiting moderation." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:86 +#: perllib/FixMyStreet/Script/Alerts.pm:94 msgid "This report is currently marked as closed." msgstr "Deze melding is momenteel gemarkeerd als gesloten." -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:84 +#: perllib/FixMyStreet/Script/Alerts.pm:92 msgid "This report is currently marked as fixed." msgstr "Deze melding is momenteel gemarkeerd als opgelost." -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:88 +#: perllib/FixMyStreet/Script/Alerts.pm:96 msgid "This report is currently marked as open." msgstr "Deze melding is momenteel gemarkeerd als openstaand." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:326 +#: perllib/FixMyStreet/Script/Reports.pm:105 msgid "This report was submitted anonymously" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:308 +#: perllib/FixMyStreet/Script/Reports.pm:85 msgid "This web page also contains a photo of the problem, provided by the user." msgstr "Deze pagina bevat een door de gebruiker aangeleverde foto van het probleem." @@ -3334,9 +3204,9 @@ msgstr "Deze pagina bevat een door de gebruiker aangeleverde foto van het proble #: templates/web/zurich/admin/report_edit.html:104 #: templates/web/zurich/admin/report_edit.html:148 msgid "Time spent (in minutes):" -msgstr "" +msgstr "Gespendeerde tijd (in minuten):" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1278 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1287 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "Tijdslijn" @@ -3348,34 +3218,32 @@ msgid "Title" msgstr "Titel" #: templates/web/zurich/admin/template_edit.html:20 -#, fuzzy msgid "Title:" -msgstr "Titel" +msgstr "Titel:" #: templates/web/base/alert/index.html:25 -#, fuzzy msgid "To find out what local alerts we have for you, please enter your %s postcode or street name and area:" -msgstr "Vul je postcode of straatnaam en plaats in om te kijken welke lokale meldingen we voor je hebben." +msgstr "" #: templates/web/base/alert/index.html:27 msgid "To find out what local alerts we have for you, please enter your postcode or street name and area" msgstr "Vul je postcode of straatnaam en plaats in om te kijken welke lokale meldingen we voor je hebben." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:314 +#: perllib/FixMyStreet/Script/Reports.pm:91 msgid "To view a map of the precise location of this issue" msgstr "" -#: templates/web/base/admin/index.html:61 +#: templates/web/base/admin/index.html:54 #: templates/web/base/admin/questionnaire.html:24 #: templates/web/base/admin/stats.html:24 #: templates/web/base/admin/stats.html:43 #: templates/web/zurich/admin/stats.html:30 msgid "Total" -msgstr "" +msgstr "Totaal" #: templates/web/base/js/translation_strings.html:29 msgid "Try again" -msgstr "" +msgstr "Opnieuw proberen" #: templates/web/base/contact/submit.html:14 msgid "Try emailing us directly:" @@ -3383,10 +3251,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:12 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:33 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:31 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:37 msgid "Unable to fix" msgstr "" @@ -3399,7 +3265,7 @@ msgstr "" msgid "Unconfirmed" msgstr "" -#: templates/web/fixmystreet/report/banner.html:9 +#: templates/web/base/report/banner.html:9 msgid "Unknown" msgstr "" @@ -3407,17 +3273,18 @@ msgstr "" msgid "Unknown alert type" msgstr "" +#: perllib/FixMyStreet/App/Controller/Photo.pm:110 #: templates/web/base/js/translation_strings.html:39 msgid "Unknown error" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:103 -#: perllib/FixMyStreet/App/Controller/Report.pm:109 -#: perllib/FixMyStreet/App/Controller/Report.pm:112 +#: perllib/FixMyStreet/App/Controller/Report.pm:105 +#: perllib/FixMyStreet/App/Controller/Report.pm:111 +#: perllib/FixMyStreet/App/Controller/Report.pm:114 msgid "Unknown problem ID" msgstr "" -#: templates/web/fixmystreet/report/update-form.html:19 +#: templates/web/base/report/update/form_update.html:25 msgid "Update" msgstr "" @@ -3425,13 +3292,11 @@ msgstr "" msgid "Update %s created for problem %d; by %s" msgstr "" -#: templates/web/base/contact/index.html:21 -#: templates/web/fixmystreet/contact/index.html:36 +#: templates/web/base/contact/index.html:28 msgid "Update below added anonymously at %s" msgstr "" -#: templates/web/base/contact/index.html:23 -#: templates/web/fixmystreet/contact/index.html:38 +#: templates/web/base/contact/index.html:30 msgid "Update below added by %s at %s" msgstr "" @@ -3440,7 +3305,7 @@ msgstr "" msgid "Update body" msgstr "" -#: templates/web/base/admin/index.html:55 +#: templates/web/base/admin/index.html:48 msgid "Update breakdown by state" msgstr "" @@ -3465,20 +3330,16 @@ msgstr "" msgid "Update statuses" msgstr "" -#: templates/web/base/report/update-form.html:22 -msgid "Update:" -msgstr "" - #: templates/web/zurich/admin/index-dm.html:23 #: templates/web/zurich/admin/index-sdm.html:21 #: templates/web/zurich/admin/reports.html:13 msgid "Updated" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1045 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1103 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1147 -#: perllib/FixMyStreet/App/Controller/Admin.pm:822 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1048 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1108 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1156 +#: perllib/FixMyStreet/App/Controller/Admin.pm:821 #: perllib/FixMyStreet/Cobrand/Zurich.pm:771 #: perllib/FixMyStreet/Cobrand/Zurich.pm:796 #: perllib/FixMyStreet/Cobrand/Zurich.pm:866 @@ -3486,13 +3347,12 @@ msgid "Updated!" msgstr "" #: templates/web/base/admin/list_updates.html:2 -#: templates/web/base/report/update.html:3 -#: templates/web/fixmystreet/report/update.html:5 +#: templates/web/base/report/update.html:5 #: templates/web/zurich/report/updates.html:2 msgid "Updates" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:132 +#: perllib/FixMyStreet/DB/Result/Comment.pm:131 msgid "Updates are limited to %s characters in length. Please shorten your update" msgstr "" @@ -3502,12 +3362,9 @@ msgstr "" #. ("%s is the site name") #: templates/web/base/report/display.html:0 -#: templates/web/base/report/display.html:5 -#: templates/web/fixmystreet/report/display.html:0 -#: templates/web/fixmystreet/report/display.html:9 -#, fuzzy +#: templates/web/base/report/display.html:9 msgid "Updates to this problem, %s" -msgstr "Updates over %s problemen ontvangen" +msgstr "" #: templates/web/base/admin/body.html:182 msgid "Use the <strong>note</strong> to record details that are only displayed in the admin. Notes are not shown publicly, and are not sent to the body." @@ -3516,13 +3373,13 @@ msgstr "" #: templates/web/zurich/admin/report_edit-sdm.html:48 #: templates/web/zurich/admin/report_edit.html:67 msgid "Used map" -msgstr "" +msgstr "Gebruikte kaart" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1452 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1461 msgid "User flag removed" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1424 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1433 msgid "User flagged" msgstr "" @@ -3530,12 +3387,12 @@ msgstr "" msgid "User search finds matches in users' names and email addresses." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1280 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1289 #: perllib/FixMyStreet/Cobrand/Zurich.pm:399 #: templates/web/base/admin/flagged.html:29 #: templates/web/zurich/header.html:69 msgid "Users" -msgstr "" +msgstr "Gebruikers" #: perllib/FixMyStreet/App/Controller/Admin.pm:382 #: perllib/FixMyStreet/App/Controller/Admin.pm:412 @@ -3561,7 +3418,6 @@ msgid "Viewing a location" msgstr "" #: templates/web/base/report/display.html:0 -#: templates/web/fixmystreet/report/display.html:0 msgid "Viewing a problem" msgstr "" @@ -3574,25 +3430,24 @@ 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/zurich/auth/token.html:7 -msgid "We have not been able to confirm your account - sorry." -msgstr "" - -#: templates/web/zurich/auth/token.html:17 -msgid "We have sent you an email containing a link to confirm your account." -msgstr "" +#: templates/web/base/auth/general.html:6 +#: templates/web/base/report/display.html:27 +#: templates/web/base/report/new/oauth_email_form.html:5 +#, fuzzy +msgid "We need your email address, please give it below." +msgstr "(we zullen je telefoonnummer of e-mailadres niet tonen)" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:2 -#: templates/web/fixmystreet/report/update-form.html:77 +#: templates/web/base/report/new/form_user_loggedout_email.html:2 +#: templates/web/base/report/update/form_user_loggedout_email.html:2 msgid "We never show your email" msgstr "" -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:31 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:65 +#: templates/web/base/report/new/form_user_loggedin.html:31 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:28 msgid "We never show your email address or phone number." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:422 +#: perllib/FixMyStreet/Script/Reports.pm:200 msgid "We realise this problem might be the responsibility of %s; however, we don't currently have any contact details for them. If you know of an appropriate contact address, please do get in touch." msgstr "" @@ -3609,10 +3464,6 @@ msgstr "" msgid "We’re sorry to hear the problem’s not fixed. Why not try writing to your local representatives?" msgstr "" -#: templates/web/base/contact/blurb.html:8 -msgid "We'd love to hear what you think about this site. Just fill in the form, or send an email to <a href='mailto:%s'>%s</a>:" -msgstr "" - #: templates/web/base/contact/submit.html:7 msgid "We’ll get back to you as soon as we can." msgstr "" @@ -3621,7 +3472,7 @@ msgstr "" msgid "What was your experience of getting the problem fixed?" msgstr "" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:49 +#: templates/web/base/report/new/form_report.html:19 msgid "What’s the issue, and where is it?" msgstr "" @@ -3634,7 +3485,11 @@ msgstr "" msgid "When sent" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:640 +#: templates/web/base/js/translation_strings.html:50 +msgid "Whoa there Testino! Three photos are enough." +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Report/New.pm:635 msgid "Whole block of empty flats" msgstr "" @@ -3649,7 +3504,7 @@ msgstr "" msgid "Wish" msgstr "" -#: templates/web/base/open311/index.html:92 +#: templates/web/base/open311/index.html:84 msgid "With request searches, it is also possible to search for agency_responsible to limit the requests to those sent to a single administration. The search term is the administration ID provided by <a href=\"%s\">MaPit</a>." msgstr "" @@ -3657,7 +3512,7 @@ msgstr "" msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"http://fixmystreet.org\">available at fixmystreet.org</a>." msgstr "" -#: templates/web/base/questionnaire/index.html:87 +#: templates/web/base/questionnaire/index.html:96 msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?" msgstr "" @@ -3666,7 +3521,6 @@ msgid "Writing your message entirely in block capitals makes it hard to read, as msgstr "Je bericht is moeilijk leesbaar als deze alleen uit hoofdletters bestaat of geen interpunctie heeft." #: templates/web/base/report/new/fill_in_details_form.html:4 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:5 msgid "Wrong location? Just click again on the map." msgstr "" @@ -3689,27 +3543,24 @@ msgstr "Jaar" #: templates/web/base/admin/users.html:31 #: templates/web/base/questionnaire/creator_fixed.html:14 #: templates/web/base/questionnaire/index.html:51 -#: templates/web/base/questionnaire/index.html:90 +#: templates/web/base/questionnaire/index.html:99 msgid "Yes" msgstr "Ja" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:17 -#: templates/web/fixmystreet/report/update-form.html:91 +#: templates/web/base/report/new/form_user_loggedout_password.html:5 +#: templates/web/base/report/update/form_user_loggedout_password.html:4 msgid "Yes I have a password" msgstr "Ja, ik heb een wachtwoord" -#: templates/web/base/contact/index.html:39 -#: templates/web/fixmystreet/contact/index.html:54 +#: templates/web/base/contact/index.html:46 msgid "You are complaining that this problem report was unnecessarily moderated:" msgstr "" -#: templates/web/base/contact/index.html:41 -#: templates/web/fixmystreet/contact/index.html:56 +#: templates/web/base/contact/index.html:48 msgid "You are reporting the following problem report for being abusive, containing personal information, or similar:" msgstr "Je meld het volgende probleem als beledigend, persoonlijke informatie bevattend of gelijkend aan:" -#: templates/web/base/contact/index.html:15 -#: templates/web/fixmystreet/contact/index.html:30 +#: templates/web/base/contact/index.html:22 msgid "You are reporting the following update for being abusive, containing personal information, or similar:" msgstr "Je meld het volgende update als beledigend, persoonlijke informatie bevattend of gelijkend aan:" @@ -3722,7 +3573,7 @@ msgstr "" msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create." msgstr "" -#: templates/web/fixmystreet/contact/index.html:121 +#: templates/web/base/contact/index.html:113 msgid "You can contact technical support on <a href='mailto:%s'>%s</a>" msgstr "" @@ -3733,8 +3584,8 @@ msgid "" " reports in the past." msgstr "" -#: templates/web/base/report/new/councils_text_none.html:10 -#: templates/web/base/report/new/councils_text_none.html:2 +#: templates/web/base/report/new/councils_text_none.html:12 +#: templates/web/base/report/new/councils_text_none.html:14 #: templates/web/base/report/new/councils_text_some.html:19 #: templates/web/base/report/new/councils_text_some.html:21 msgid "You can help us by finding a contact email address for local problems for %s and emailing it to us at <a href='mailto:%s'>%s</a>." @@ -3752,21 +3603,16 @@ msgstr "" msgid "You have already answered this questionnaire. If you have a question, please <a href='%s'>get in touch</a>, or <a href='%s'>view your problem</a>.\n" msgstr "Je hebt deze vragenlijst al ingevuld. Als je vragen hebt kan je <a href='%s'>contact opnemen</a> of <a href='%s'>je probleem bekijken</a>.\n" -#: templates/web/base/questionnaire/index.html:77 -#: templates/web/base/report/new/fill_in_details_form.html:75 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:73 -msgid "You have already attached a photo to this report, attaching another one will replace it." -msgstr "Je hebt al een foto toegevoegd aan deze melding, als je nog een foto toevoegt overschrijft deze die." - -#: templates/web/base/report/update-form.html:59 -#: templates/web/fixmystreet/report/update-form.html:56 -msgid "You have already attached a photo to this update, attaching another one will replace it." -msgstr "Je hebt al een foto toegevoegd aan deze update, als je nog een foto toevoegt overschrijft deze die." - -#: templates/web/zurich/report/new/fill_in_details_form.html:61 +#: templates/web/base/report/new/form_report.html:32 +#: templates/web/zurich/report/new/fill_in_details_form.html:55 msgid "You have already attached photos to this report. Note that you can attach a maximum of 3 to this report (if you try to upload more, the oldest will be removed)." msgstr "" +#: templates/web/base/questionnaire/index.html:83 +#: templates/web/base/report/update/form_update.html:14 +msgid "You have already attached photos to this update. Note that you can attach a maximum of 3 to this update (if you try to upload more, the oldest will be removed)." +msgstr "" + #: templates/web/base/auth/sign_out.html:4 #: templates/web/zurich/auth/sign_out.html:3 msgid "You have been signed out" @@ -3781,9 +3627,8 @@ msgstr "Je hebt een probleem aangewezen op de plek gemarkeerd met een groene spe msgid "You have successfully confirmed your email address." msgstr "" -#: templates/web/base/report/display.html:20 -#: templates/web/base/report/new/fill_in_details.html:37 -#: templates/web/fixmystreet/report/display.html:17 +#: templates/web/base/report/display.html:17 +#: templates/web/base/report/new/login_success_form.html:3 msgid "You have successfully signed in; please check and confirm your details are accurate:" msgstr "Je bent ingelogd; controleer of je gegevens nog kloppen:" @@ -3812,53 +3657,42 @@ msgid "Your Reports" msgstr "Jouw meldingen" #: templates/web/base/alert/_list.html:89 +#: templates/web/base/contact/index.html:83 +#: templates/web/base/report/display_tools.html:38 +#: templates/web/base/report/display_tools.html:40 +#: templates/web/base/report/new/form_user_loggedin.html:3 +#: templates/web/base/report/new/form_user_loggedout_email.html:1 +#: templates/web/base/report/update/form_user_loggedout_email.html:1 #: templates/web/fixmystreet/alert/updates.html:19 #: templates/web/fixmystreet/alert/updates.html:22 -#: templates/web/fixmystreet/contact/index.html:91 -#: templates/web/fixmystreet/report/display.html:62 -#: templates/web/fixmystreet/report/display.html:64 -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:3 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:1 -#: templates/web/fixmystreet/report/update-form.html:76 #: templates/web/zurich/report/new/fill_in_details_form.html:76 msgid "Your email" msgstr "Jouw e-mail" -#: templates/web/base/auth/general.html:28 -#: templates/web/fixmystreet/report/update-form.html:82 +#: templates/web/base/auth/general.html:45 +#: templates/web/base/report/update/form_user_loggedout_email.html:7 #: templates/web/zurich/auth/general.html:30 #: templates/web/zurich/auth/general.html:58 msgid "Your email address" msgstr "Jouw e-mailadres" -#: templates/web/base/report/new/fill_in_details_form.html:106 -#: templates/web/base/report/update-form.html:81 -msgid "Your email:" -msgstr "Jouw e-mail:" - -#: templates/web/fixmystreet/report/updates-sidebar-notes.html:7 +#: templates/web/base/report/updates-sidebar-notes.html:3 msgid "Your information will only be used in accordance with our <a href=\"/privacy\">privacy policy</a>" msgstr "Je informatie wordt alleen gebruikt zoals vermeld in onze <a href=\"/privacy\">privacy policy</a>" -#: templates/web/base/auth/general.html:51 -#: templates/web/fixmystreet/contact/index.html:84 -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:18 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:54 -#: templates/web/fixmystreet/report/update-form.html:142 +#: templates/web/base/auth/general.html:90 +#: templates/web/base/contact/index.html:76 +#: templates/web/base/report/new/form_user_loggedin.html:18 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:17 +#: templates/web/base/report/update/form_name.html:11 #: templates/web/zurich/auth/general.html:61 #: templates/web/zurich/report/new/fill_in_details_form.html:86 msgid "Your name" msgstr "Jouw naam" -#: templates/web/base/contact/index.html:73 -#: templates/web/base/report/new/fill_in_details_form.html:186 -#: templates/web/base/report/update-form.html:152 -msgid "Your name:" -msgstr "Jouw naam:" - -#: templates/web/base/auth/general.html:39 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:22 -#: templates/web/fixmystreet/report/update-form.html:96 +#: templates/web/base/auth/general.html:75 +#: templates/web/base/report/new/form_user_loggedout_password.html:10 +#: templates/web/base/report/update/form_user_loggedout_password.html:9 #: templates/web/zurich/auth/general.html:34 msgid "Your password" msgstr "Jouw wachtwoord" @@ -3867,15 +3701,16 @@ msgstr "Jouw wachtwoord" msgid "Your password has been changed" msgstr "Je wachtwoord is gewijzigd" -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:27 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:63 +#: templates/web/base/report/new/form_user_loggedin.html:27 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:26 #: templates/web/zurich/report/new/fill_in_details_form.html:92 msgid "Your phone number" msgstr "Je telefoonnummer" #: templates/web/base/questionnaire/index.html:14 +#, fuzzy msgid "Your report" -msgstr "Jouw melding" +msgstr "Jouw meldingen" #: templates/web/base/footer.html:9 templates/web/fixmystreet/footer.html:29 msgid "Your reports" @@ -3885,12 +3720,7 @@ msgstr "Jouw meldingen" msgid "Your updates" msgstr "Jouw updates" -#: templates/web/base/contact/index.html:81 -msgid "Your email:" -msgstr "Jouw e-mail" - #: templates/web/base/reports/_list-filters.html:3 -#, fuzzy msgid "all reports" msgstr "Alle meldingen" @@ -3899,7 +3729,6 @@ msgid "by %s" msgstr "door %s" #: templates/web/base/reports/_list-filters.html:5 -#, fuzzy msgid "closed reports" msgstr "Gesloten meldingen" @@ -3923,17 +3752,16 @@ msgid "edit user" msgstr "" #: templates/web/base/reports/_list-filters.html:6 -#, fuzzy msgid "fixed reports" -msgstr "Opgeloste meldingen" +msgstr "" -#: templates/web/base/admin/index.html:33 +#: templates/web/base/status/stats.html:20 #: templates/web/zurich/admin/index.html:5 msgid "from %s different users" -msgstr "door %d verschillende gebruikers" +msgstr "door %s verschillende gebruikers" -#: templates/web/base/report/_item.html:17 -#: templates/web/zurich/report/_item.html:16 +#: templates/web/base/report/_item.html:15 +#: templates/web/zurich/report/_item.html:14 msgid "last updated %s" msgstr "" @@ -3955,7 +3783,7 @@ msgstr "" #: templates/web/base/report/updates.html:49 msgid "marked as closed" -msgstr "" +msgstr "gemarkeerd als gesloten" #: templates/web/base/report/updates.html:28 #: templates/web/base/report/updates.html:51 @@ -3964,11 +3792,11 @@ msgstr "gemarkeerd als opgelost" #: templates/web/base/report/updates.html:45 msgid "marked as in progress" -msgstr "" +msgstr "gemarkeerd als in behandeling" #: templates/web/base/report/updates.html:41 msgid "marked as investigating" -msgstr "" +msgstr "gemarkeerd als in onderzoek" #: templates/web/base/report/updates.html:55 msgid "marked as not the council's responsibility" @@ -3976,7 +3804,7 @@ msgstr "" #: templates/web/base/report/updates.html:43 msgid "marked as planned" -msgstr "" +msgstr "gemarkeerd als gepland" #: templates/web/base/report/updates.html:53 msgid "marked as unable to fix" @@ -4025,10 +3853,8 @@ msgstr "" msgid "sign out" msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:12 -#: templates/web/base/report/new/fill_in_details_form.html:15 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:10 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:12 +#: templates/web/base/report/new/fill_in_details_form.html:11 +#: templates/web/base/report/new/fill_in_details_form.html:9 msgid "the local council" msgstr "" @@ -4037,18 +3863,17 @@ msgstr "" msgid "there is no pin shown as the user did not use the map" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:398 +#: perllib/FixMyStreet/Script/Reports.pm:176 msgid "this type of local problem" msgstr "" #: perllib/Utils.pm:176 msgid "today" -msgstr "" +msgstr "vandaag" #: templates/web/base/reports/_list-filters.html:4 -#, fuzzy msgid "unfixed reports" -msgstr "Opgeloste meldingen" +msgstr "Onopgeloste meldingen" #: templates/web/base/admin/report_edit.html:32 msgid "used map" @@ -4067,7 +3892,7 @@ msgstr "" msgid "ward" msgstr "" -#: templates/web/base/front/stats.html:17 +#: templates/web/base/front/stats.html:13 #, perl-format msgid "<big>%s</big> report recently" msgid_plural "<big>%s</big> reports recently" @@ -4078,24 +3903,24 @@ msgstr[1] "" #, perl-format msgid "%d hour" msgid_plural "%d hours" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%d uur" +msgstr[1] "%d uur" #: templates/web/base/report/_support.html:6 #, perl-format msgid "%d supporter" msgid_plural "%d supporters" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%d voorstander" +msgstr[1] "%d voorstanders" #: perllib/Utils.pm:225 #, perl-format msgid "%d minute" msgid_plural "%d minutes" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%d minuut" +msgstr[1] "%d minuten" -#: templates/web/base/front/stats.html:29 +#: templates/web/base/front/stats.html:25 #, perl-format msgid "<big>%s</big> update on reports" msgid_plural "<big>%s</big> updates on reports" @@ -4113,17 +3938,17 @@ msgstr[1] "" #, perl-format msgid "%d week" msgid_plural "%d weeks" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%d week" +msgstr[1] "%d weken" -#: templates/web/base/front/stats.html:12 +#: templates/web/base/front/stats.html:8 #, perl-format msgid "<big>%s</big> report in past week" msgid_plural "<big>%s</big> reports in past week" msgstr[0] "" msgstr[1] "" -#: templates/web/base/front/stats.html:23 +#: templates/web/base/front/stats.html:19 #, perl-format msgid "<big>%s</big> fixed in past month" msgid_plural "<big>%s</big> fixed in past month" @@ -4134,8 +3959,8 @@ msgstr[1] "" #, perl-format msgid "%d day" msgid_plural "%d days" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%d dag" +msgstr[1] "%d dagen" #: templates/web/base/report/new/councils_text_some.html:13 #, perl-format @@ -4144,107 +3969,68 @@ msgid_plural "We do <strong>not</strong> yet have details for the other councils msgstr[0] "" msgstr[1] "" -#~ msgid "<small>If you cannot see the map, <a href='%s' rel='nofollow'>skip this step</a>.</small>" -#~ msgstr "<small>Als je geen kaart ziet, <a href='%s' rel='nofollow'>sla dan deze stap over</a>.</small>" - -#~ msgid "<strong>No</strong>, I do not, let me sign in by email:" -#~ msgstr "<strong>Nee</strong>, die heb ik niet, laat me inloggen per e-mail:" - -#~ msgid "Are you a <strong>developer</strong>? Would you like to contribute to FixMyStreet?" -#~ msgstr "Ben je een <strong>ontwikkelaar</strong>? Wil je bijdragen aan FixMyStreet?" - -#~ msgid "Closest nearby problems <small>(within %skm)</small>" -#~ msgstr "Dichtstbijzijnde problemen <small>(binnen %skm)</small>" - -#~ msgid "Contact FixMyStreet" -#~ msgstr "Neem contact op met FixMyStreet" - -#~ msgid "Do you have a FixMyBarangay password?" -#~ msgstr "Heb je een FixMyBarangay wachtwoord?" - -#~ msgid "FixMyStreet admin:" -#~ msgstr "FixMyStreet admin:" - -#~ msgid "New local reports on reportemptyhomes.com" -#~ msgstr "Nieuwe lokale meldingen op reportemptyhomes.com" - -#~ msgid "New reports for {{COUNCIL}} within {{WARD}} ward on reportemptyhomes.com" -#~ msgstr "Nieuwe melding voor {{COUNCIL}} binnen {{WARD}} district op reportemptyhomes.com" - -#~ msgid "New reports on reportemptyhomes.com" -#~ msgstr "Nieuwe meldingen op reportemptyhomes.com" - -#~ msgid "New reports on reportemptyhomes.com near {{POSTCODE}}" -#~ msgstr "Nieuwe meldingen op reportemptyhomes.com dichtbij {{POSTCODE}}" - -#~ msgid "New reports to {{COUNCIL}} on reportemptyhomes.com" -#~ msgstr "Nieuwe melding voor {{COUNCIL}} op reportemptyhomes.com" - -#~ msgid "New reports within {{NAME}}'s boundary on reportemptyhomes.com" -#~ msgstr "Nieuwe melding binnen de grenzen van {{NAME}} op reportemptyhomes.com" - -#~ msgid "No problems found." -#~ msgstr "Geen problemen gevonden." +#~ msgid "(we never show your email)" +#~ msgstr "(we zullen je e-mailadres niet tonen)" -#~ msgid "No problems have been reported yet." -#~ msgstr "Er zijn nog geen problemen gemeld." +#~ msgid "<strong>No</strong>, let me confirm my report by email:" +#~ msgstr "<strong>Nee</strong> Laat me mijn melding per e-mail bevestigen" -#~ msgid "Now to submit your report… do you have a FixMyStreet password?" -#~ msgstr "Nu om je melding te verzend… heb je een FixMyStreet wachtwoord?" +#~ msgid "<strong>No</strong>, let me confirm my update by email:" +#~ msgstr "<strong>Nee</strong> Laat me mijn update per e-mail bevestigen" -#~ msgid "Now to submit your update… do you have a FixMyStreet password?" -#~ msgstr "Nu om je update te verzend… heb je een FixMyStreet wachtwoord?" +#~ msgid "Email me updates" +#~ msgstr "Email me updates" -#~ msgid "Our code is open source and <a href=\"http://github.com/mysociety/fixmystreet\">available on GitHub</a>." -#~ msgstr "Onze code is open source en <a href=\"http://github.com/mysociety/fixmystreet\">te vinden op GitHub</a>." +#~ msgid "Enter a new password:" +#~ msgstr "Geef nieuw wachtwoord:" -#~ msgid "Please <a class=\"tab_link\" href=\"#report\">take a look</a> at the updates that have been left." -#~ msgstr "<a class=\"tab_link\" href=\"#report\">Neem een kijkje</a> bij de updates die zijn achtergelaten." +#~ 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 "Ik ben bang dat we je token niet kunnen valideren. Als je de URL uit een e-mail hebt gekopieerd kan je controleren of je hem volledig hebt gekopieerd.\n" -#~ msgid "Please take a look at the updates that have been left." -#~ msgstr "Kijk eens naar de updates die zijn achter gelaten." +#~ 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 "Als je een gratis e-mailadres of spamfilter hebt kan het voorkomen dat deze de e-mail tegenhoud. " -#~ msgid "Problems within %s, FixMyStreet" -#~ msgstr "Problemen binnen %s, FixMyStreet" +#~ msgid "Message:" +#~ msgstr "Bericht:" -#~ msgid "Properties recently reported as put back to use on reportemptyhomes.com" -#~ msgstr "Recent gemelde hergebruikte panden op reportemptyhomes.com" +#~ msgid "More problems nearby" +#~ msgstr "Meer problemen dichtbij" -#~ msgid "Reported %s, to %s" -#~ msgstr "Gemeld %s aan %s" +#~ msgid "Nearly Done! Now check your email..." +#~ msgstr "Bijna klaar! Kijk nu in je e-mail..." -#~ msgid "Reports on and around the map" -#~ msgstr "Melding op en nabij de kaart" +#~ msgid "Offensive? Unsuitable? Tell us" +#~ msgstr "Beledigend? Ongeschikt? Meld het ons" -#~ msgid "Sign in by email" -#~ msgstr "Inloggen via e-mail" +#~ msgid "Photo:" +#~ msgstr "Foto:" -#~ msgid "Signed in as %s" -#~ msgstr "Ingelogd als %s" +#~ msgid "Please check your email" +#~ msgstr "Controleer je e-mail" -#~ msgid "The details of your problem are available from the other tab above." -#~ msgstr "De details van je probleem zijn beschikbaar in het andere tabblad." +#~ msgid "Please note that updates are not sent to the council. If you leave your name it will be public. Your information will only be used in accordance with our <a href=\"/faq#privacy\">privacy policy</a>" +#~ msgstr "Let op, updates worden niet aan de gemeente verzonden. Als je je naam achterlaat zal het publiekelijk getoond worden. Jouw gegevens worden alleen gebruikt volgens de vermeldingen van onze <a href=\"/faq#privacy\">privacy policy</a>" -#~ msgid "The details of your problem are available on the right hand side of this page." -#~ msgstr "De details van je probleem zijn beschikbaar aan de rechter kant van de pagina." +#~ msgid "This problem has been closed" +#~ msgstr "Dit probleem is gesloten" -#~ msgid "The latest local reports reported by users" -#~ msgstr "Laatste lokale meldingen gemaakt door gebruikers" +#~ msgid "This problem is in progress" +#~ msgstr "Aan dit probleem wordt gewerkt" -#~ msgid "The latest properties reported back to use by users" -#~ msgstr "Laatste panden die teruggemeld zijn door gebruikers" +#~ msgid "This problem is old and of unknown status." +#~ msgstr "Dit probleem is oud, en de status is onbekend." -#~ msgid "The latest reports for {{COUNCIL}} reported by users" -#~ msgstr "Laatste meldingen voor {{COUNCIL}} gemeld door gebruikers" +#~ msgid "You have already attached a photo to this report, attaching another one will replace it." +#~ msgstr "Je hebt al een foto toegevoegd aan deze melding, als je nog een foto toevoegt overschrijft deze die." -#~ msgid "The latest reports for {{COUNCIL}} within {{WARD}} ward reported by users" -#~ msgstr "Laatste meldingen voor {{COUNCIL}} binnen de wijk {{WARD}} gemeld door gebruikers" +#~ msgid "You have already attached a photo to this update, attaching another one will replace it." +#~ msgstr "Je hebt al een foto toegevoegd aan deze update, als je nog een foto toevoegt overschrijft deze die." -#~ msgid "The latest reports within {{NAME}}'s boundary reported by users" -#~ msgstr "Laatste meldingen binnen de grenzen van {{NAME}} gemeld door gebruikers" +#~ msgid "Your email:" +#~ msgstr "Jouw e-mail:" -#~ msgid "To <strong>report a problem</strong>, click on the map at the correct location." -#~ msgstr "Klik op de kaart op de juiste lokatie om <strong>een probleem te melden</strong>." +#~ msgid "Your name:" +#~ msgstr "Jouw naam:" -#~ msgid "Your email address:" -#~ msgstr "Jouw e-mailadres:" +#~ msgid "Your email:" +#~ msgstr "Jouw e-mail" diff --git a/locale/nn_NO.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/nn_NO.UTF-8/LC_MESSAGES/FixMyStreet.po index e6e0ccebe..af7a6fe98 100644 --- a/locale/nn_NO.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/nn_NO.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: fixmystreet\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2015-10-23 16:51+0100\n" -"PO-Revision-Date: 2015-07-31 16:31+0000\n" +"POT-Creation-Date: 2016-03-02 13:09+0000\n" +"PO-Revision-Date: 2015-10-23 16:36+0000\n" "Last-Translator: mySociety <transifex@mysociety.org>\n" "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/mysociety/fixmystreet/language/nn_NO/)\n" "Language: nn_NO\n" @@ -21,45 +21,24 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:628 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:411 +#: perllib/FixMyStreet/DB/Result/Problem.pm:616 +#: perllib/FixMyStreet/Script/Reports.pm:189 msgid " and " msgstr " og " #: templates/web/base/report/new/councils_text_all.html:2 -#: templates/web/base/report/new/councils_text_none.html:11 -#: templates/web/base/report/new/councils_text_none.html:2 +#: templates/web/base/report/new/councils_text_none.html:12 +#: templates/web/base/report/new/councils_text_none.html:15 #: templates/web/base/report/new/councils_text_some.html:19 #: templates/web/base/report/new/councils_text_some.html:22 #: templates/web/base/report/new/councils_text_some.html:5 msgid " or " msgstr " eller " -#: templates/web/base/admin/index.html:35 -#: templates/web/base/status/index.html:13 -msgid "%s confirmed alerts, %s unconfirmed" -msgstr "%d stadfesta varsel, %d ikkje stadfesta" - -#: templates/web/base/admin/index.html:37 -#: templates/web/base/status/index.html:16 -#: templates/web/zurich/admin/index.html:6 -msgid "%s council contacts – %s confirmed, %s unconfirmed" -msgstr "%d administrasjonskontaktar – %d stadfesta, %d ikkje stadfesta" - #: templates/web/base/admin/edit-league.html:12 msgid "%d edits by %s" msgstr "%d redigeringar av %s" -#: templates/web/base/admin/index.html:34 -#: templates/web/base/status/index.html:12 -msgid "%s live updates" -msgstr "%d aktive oppdateringar" - -#: templates/web/base/admin/index.html:36 -#: templates/web/base/status/index.html:14 -msgid "%s questionnaires sent – %s answered (%s%%)" -msgstr "%d spørjeskjema sendt – %d svart (%s%%)" - #: templates/web/base/pagination.html:10 msgid "%d to %d of %d" msgstr "" @@ -74,35 +53,49 @@ msgstr "%s – oppsummeringsrapportar" msgid "%s admin:" msgstr "" +#: templates/web/base/status/stats.html:26 +msgid "%s bodies" +msgstr "" + +#: templates/web/base/status/stats.html:24 +msgid "%s confirmed alerts, %s unconfirmed" +msgstr "%s stadfesta varsel, %s ikkje stadfesta" + +#: templates/web/base/status/stats.html:27 +#: templates/web/zurich/admin/index.html:6 +msgid "%s council contacts – %s confirmed, %s unconfirmed" +msgstr "%s administrasjonskontaktar – %s stadfesta, %s ikkje stadfesta" + #. ("%s is the site name") #: templates/web/base/alert/index.html:7 -#, fuzzy msgid "" "%s has a variety of RSS feeds and email alerts for local\n" "problems, including alerts for all problems within a particular ward, or all\n" "problems within a certain distance of a particular location." msgstr "" -"Fiksgatami har ulike RSS-straumar og e-postlister om lokale problem, dette inkluderer problem meldt innanfor ein viss bydel eller administrasjon, eller eit omrÃ¥de med problem\n" -"innan ein gitt distanse frÃ¥ ein viss posisjon." #. ("%s is the site name") #: templates/web/base/alert/index.html:11 -#, fuzzy msgid "" "%s has a variety of RSS feeds and email alerts for local problems, including\n" "alerts for all problems within a particular ward or council, or all problems\n" "within a certain distance of a particular location." msgstr "" -"Fiksgatami har ulike RSS-straumar og e-postlister om lokale problem, dette inkluderer problem meldt innanfor ein viss bydel eller administrasjon, eller eit omrÃ¥de med problem\n" -"innan ein gitt distanse frÃ¥ ein viss posisjon." -#: perllib/FixMyStreet/DB/Result/Problem.pm:695 +#: templates/web/base/status/stats.html:23 +msgid "%s live updates" +msgstr "%s aktive oppdateringar" + +#: templates/web/base/status/stats.html:25 +msgid "%s questionnaires sent – %s answered (%s%%)" +msgstr "%s spørjeskjema sendt – %s svart (%s%%)" + +#: perllib/FixMyStreet/DB/Result/Problem.pm:683 msgid "%s ref: %s" msgstr "%s ref: %s" #. ("%s is the site name") #: templates/web/base/alert/_list.html:73 -#, fuzzy msgid "" "%s sends different categories of problem\n" "to the appropriate council, so problems within the boundary of a particular council\n" @@ -110,17 +103,17 @@ msgid "" "will be sent to the district council, so will appear in both of the district\n" "council’s alerts, but will only appear in the \"Within the boundary\" alert\n" "for the county council." -msgstr "FiksGataMi sender ulike kategoriar problem til ulike administrasjonar, problem som gjeld fleire administrasjonar vert send til alle dei det gjeld." +msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:255 perllib/FixMyStreet/Cobrand/UK.pm:267 +#: perllib/FixMyStreet/Cobrand/UK.pm:256 perllib/FixMyStreet/Cobrand/UK.pm:268 msgid "%s ward, %s" msgstr "%s bydel, %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:564 +#: perllib/FixMyStreet/DB/Result/Problem.pm:552 msgid "%s, reported at %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:282 perllib/FixMyStreet/Cobrand/UK.pm:294 +#: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295 msgid "%s, within %s ward" msgstr "%s, innanfor bydelen %s" @@ -128,7 +121,7 @@ msgstr "%s, innanfor bydelen %s" msgid "© <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors" msgstr "" -#: templates/web/zurich/report/new/fill_in_details_form.html:53 +#: templates/web/zurich/report/new/fill_in_details_form.html:46 msgid "(Defect & location of defect)" msgstr "" @@ -139,9 +132,8 @@ msgstr "(Epost i misbruktabellen)" #: templates/web/zurich/admin/report_edit-sdm.html:60 #: templates/web/zurich/admin/report_edit.html:88 -#, fuzzy msgid "(No name)" -msgstr "Namnet ditt:" +msgstr "" #: templates/web/zurich/admin/report_edit-sdm.html:67 #: templates/web/zurich/admin/report_edit.html:95 @@ -154,17 +146,16 @@ msgstr "(ein standardavstand som dekkjer ein folkesetnad pÃ¥ omtrent 200 000)" #. ("%s is a list of distance links, e.g. [2km] / [5km] / [10km] / [20km]") #: templates/web/base/alert/_list.html:29 -#, fuzzy msgid "(alternatively the RSS feed can be customised, within %s)" -msgstr "(alternativt kan RSS-straumen tilpassast, innanfor" +msgstr "" -#: templates/web/base/report/_item.html:27 -#: templates/web/zurich/report/_item.html:21 +#: templates/web/base/report/_item.html:25 +#: templates/web/zurich/report/_item.html:19 msgid "(closed)" msgstr "(lukka)" -#: templates/web/base/report/_item.html:25 -#: templates/web/zurich/report/_item.html:19 +#: templates/web/base/report/_item.html:23 +#: templates/web/zurich/report/_item.html:17 msgid "(fixed)" msgstr "(løyst)" @@ -172,37 +163,28 @@ msgstr "(løyst)" msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)" msgstr "(som tagging, søppel, hol i vegen, eller øydelagte gatelys)" -#: templates/web/base/report/_item.html:21 +#: templates/web/base/report/_item.html:19 msgid "(not sent to council)" msgstr "(ikkje rapportert til administrasjonen)" -#: templates/web/base/report/new/fill_in_details_form.html:200 #: templates/web/zurich/report/new/fill_in_details_form.html:82 msgid "(optional)" msgstr "(valfritt)" -#: templates/web/fixmystreet/report/public_label.html:1 +#: templates/web/base/report/public_label.html:1 msgid "(public)" msgstr "" -#: templates/web/base/report/_item.html:20 +#: templates/web/base/report/_item.html:18 msgid "(sent to both)" msgstr "(sendt til begge)" -#: templates/web/base/report/new/fill_in_details_form.html:194 -msgid "(we never show your email address or phone number)" -msgstr "(vi viser aldri e-postadressa di eller telefonnummeret ditt)" - -#: templates/web/base/report/update-form.html:159 -msgid "(we never show your email)" -msgstr "(vi viser aldri e-postadressa di)" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:673 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 #: perllib/FixMyStreet/DB/Result/Problem.pm:410 msgid "-- Pick a category --" msgstr "-- Vel ein kategori --" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:637 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:632 #: perllib/FixMyStreet/DB/Result/Problem.pm:416 msgid "-- Pick a property type --" msgstr "-- Vel ein eigedomstype --" @@ -221,52 +203,39 @@ msgstr "" msgid "<label>Show %s</label> <label>about %s</label>" msgstr "" -#: templates/web/base/admin/index.html:32 -#: templates/web/base/status/index.html:11 +#: templates/web/base/status/stats.html:18 #: templates/web/zurich/admin/index.html:4 msgid "<strong>%s</strong> live problems" -msgstr "<strong>%d</strong> aktive problem" +msgstr "<strong>%s</strong> aktive problem" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:39 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:2 msgid "<strong>No</strong> Let me confirm my report by email" msgstr "" -#: templates/web/fixmystreet/report/update-form.html:112 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:2 msgid "<strong>No</strong> Let me confirm my update by email" msgstr "" -#: templates/web/base/auth/general.html:48 +#: templates/web/base/auth/general.html:87 #: templates/web/zurich/auth/general.html:51 msgid "<strong>No</strong> let me sign in by email" msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:145 -msgid "<strong>No</strong>, let me confirm my report by email:" -msgstr "<strong>Nei</strong>, la meg stadfesta rapporten min med e-post:" - -#: templates/web/base/report/update-form.html:118 -msgid "<strong>No</strong>, let me confirm my update by email:" -msgstr "<strong>Nei</strong>, la meg stadfesta oppdateringa mi med e-post:" - -#: templates/web/base/auth/general.html:34 -#: templates/web/base/report/new/fill_in_details_form.html:123 -#: templates/web/base/report/update-form.html:96 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:15 -#: templates/web/fixmystreet/report/update-form.html:89 +#: templates/web/base/auth/general.html:70 +#: templates/web/base/report/new/form_user_loggedout_password.html:3 +#: templates/web/base/report/update/form_user_loggedout_password.html:2 msgid "<strong>Yes</strong> I have a password" msgstr "<strong>Ja</strong>, eg har eit passord" -#: templates/web/base/static/about-en-gb.html:1 -#: templates/web/base/static/about-en-gb.html:3 +#: templates/web/base/about/about-en-gb.html:1 +#: templates/web/base/about/about-en-gb.html:3 msgid "About us" msgstr "Om oss" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:8 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:31 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:29 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:35 msgid "Action Scheduled" msgstr "" @@ -297,7 +266,7 @@ msgstr "Legg til ny kategori" msgid "Add user" msgstr "" -#: templates/web/base/my/my.html:52 +#: templates/web/base/my/my.html:56 msgid "Added %s" msgstr "La til %s" @@ -317,8 +286,7 @@ msgstr "Varsel %d oppretta for %s, type %s, parameter %s / %s" msgid "Alert %d disabled (created %s)" msgstr "Varsel %d kobla ut (oppretta %s)" -#: templates/web/base/report/update-form.html:164 -#: templates/web/fixmystreet/report/update-form.html:150 +#: templates/web/base/report/update/form_name.html:20 msgid "Alert me to future updates" msgstr "Send meg varsel ved framtidige oppdateringar" @@ -328,9 +296,8 @@ msgid "All Reports" msgstr "" #: templates/web/zurich/admin/stats.html:5 -#, fuzzy msgid "All Reports as CSV" -msgstr "Alle rapportar" +msgstr "" #: templates/web/base/footer.html:11 templates/web/fixmystreet/footer.html:32 #: templates/web/zurich/admin/index-dm.html:12 @@ -351,10 +318,8 @@ msgstr "All informasjonen du har lagt inn her vil sendast til" #: templates/web/base/report/new/councils_text_all.html:2 #: templates/web/base/report/new/councils_text_all.html:4 -#: templates/web/base/report/new/fill_in_details_form.html:12 -#: templates/web/base/report/new/fill_in_details_form.html:14 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:10 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:11 +#: templates/web/base/report/new/fill_in_details_form.html:10 +#: templates/web/base/report/new/fill_in_details_form.html:9 msgid "All the information you provide here will be sent to <strong>%s</strong>." msgstr "All informasjonen du har lagt inn her vil sendast til <strong>%s</strong>." @@ -376,6 +341,10 @@ msgstr "Anonym:" msgid "Are you a developer?" msgstr "" +#: templates/web/base/js/translation_strings.html:52 +msgid "Are you sure you want to cancel this upload?" +msgstr "" + #: templates/web/base/admin/body-form.html:69 #: templates/web/base/admin/body.html:16 #: templates/web/zurich/admin/body-form.html:24 @@ -408,16 +377,16 @@ msgstr "" msgid "Assigned to %s" msgstr "" -#: templates/web/base/open311/index.html:84 +#: templates/web/base/open311/index.html:76 msgid "At most %d requests are returned in each query. The returned requests are ordered by requested_datetime, so to get all requests, do several searches with rolling start_date and end_date." msgstr "PÃ¥ det meste vert %d førespurnader returnert i kvar spørring. Dei returnerte førespurnadene vert sorterte pÃ¥ requested_datetime, sÃ¥ ein mÃ¥ gjera fleire søk med rullerande start_date og end_date for Ã¥ fÃ¥ tak i alle førespurnadene." -#: templates/web/base/open311/index.html:76 +#: templates/web/base/open311/index.html:68 msgid "At the moment only searching for and looking at reports work." msgstr "For augneblunken gÃ¥r det berre an Ã¥ søkja etter og Ã¥ sjÃ¥ pÃ¥ rapportar." #: perllib/FixMyStreet/DB/Result/Problem.pm:373 -#: templates/web/zurich/report/_item.html:11 +#: templates/web/zurich/report/_item.html:9 msgid "Awaiting moderation" msgstr "" @@ -429,7 +398,7 @@ msgstr "" msgid "Ban email address" msgstr "Bannlys e-postadresse" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1276 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1285 #: perllib/FixMyStreet/Cobrand/Zurich.pm:392 #: templates/web/base/admin/bodies.html:1 templates/web/zurich/header.html:64 msgid "Bodies" @@ -459,7 +428,7 @@ msgid "Can't see the map? <em>Skip this step</em>" msgstr "" #: templates/web/base/admin/body.html:68 -#: templates/web/base/admin/index.html:61 +#: templates/web/base/admin/index.html:54 #: templates/web/base/report/new/category.html:10 #: templates/web/base/report/new/category_wrapper.html:3 #: templates/web/zurich/admin/body.html:14 @@ -470,8 +439,8 @@ msgstr "" msgid "Category" msgstr "Kategori" -#: templates/web/base/admin/index.html:59 -#: templates/web/base/admin/index.html:67 +#: templates/web/base/admin/index.html:52 +#: templates/web/base/admin/index.html:60 msgid "Category fix rate for problems > 4 weeks old" msgstr "Løysingsrate fordelt pÃ¥ kategori for problem > 4 veker gamle" @@ -484,7 +453,7 @@ msgstr "Løysingsrate fordelt pÃ¥ kategori for problem > 4 veker gamle" msgid "Category:" msgstr "Kategori:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:402 +#: perllib/FixMyStreet/Script/Reports.pm:180 msgid "Category: %s" msgstr "Kategori: %s" @@ -534,7 +503,7 @@ msgid "Click here or enter as dd/mm/yyyy" msgstr "" #: templates/web/base/around/_report_banner.html:2 -#: templates/web/base/js/translation_strings.html:50 +#: templates/web/base/js/translation_strings.html:55 msgid "Click map to report a problem" msgstr "" @@ -561,7 +530,7 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:25 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:144 -#: templates/web/fixmystreet/report/banner.html:15 +#: templates/web/base/report/banner.html:15 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:10 #: templates/web/zurich/admin/header.html:16 @@ -569,7 +538,7 @@ msgstr "" msgid "Closed" msgstr "Lukka" -#: perllib/FixMyStreet/DB/Result/Problem.pm:794 +#: perllib/FixMyStreet/DB/Result/Problem.pm:779 msgid "Closed by council" msgstr "(ikkje rapportert til administrasjonen)" @@ -595,7 +564,7 @@ msgstr "Data om merkevaresamarbeid:" msgid "Cobrand:" msgstr "Merkevaresamarbeid:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1283 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1292 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "" @@ -608,13 +577,13 @@ msgstr "" msgid "Confirm" msgstr "Stadfest" -#: templates/web/base/auth/token.html:1 templates/web/zurich/auth/token.html:1 +#: templates/web/base/auth/token.html:1 msgid "Confirm account" msgstr "Stadfest konto" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:33 -#: templates/web/fixmystreet/report/update-form.html:107 -msgid "Confirm by email below, providing a new password at that point. When you confirm, your password will be updated." +#: templates/web/base/report/new/form_user_loggedout_password.html:21 +#: templates/web/base/report/update/form_user_loggedout_password.html:20 +msgid "Confirm by email instead, providing a new password at that point. When you confirm, your password will be updated." msgstr "" #: templates/web/base/questionnaire/creator_fixed.html:1 @@ -644,35 +613,27 @@ msgid "Confirmed:" msgstr "Stadfesta:" #. ("%s is the site name") -#: templates/web/base/faq/faq-en-gb.html:8 templates/web/base/footer.html:24 -#: templates/web/base/open311/index.html:8 -#: templates/web/base/static/privacy.html:10 -#: templates/web/fixmystreet/contact/index.html:12 -#, fuzzy +#: templates/web/base/about/_sidebar.html:6 templates/web/base/footer.html:24 msgid "Contact %s" -msgstr "Kontakt oss" +msgstr "" #: templates/web/base/contact/index.html:1 #: templates/web/base/contact/index.html:2 #: templates/web/base/contact/submit.html:1 -#: templates/web/fixmystreet/contact/index.html:1 -#: templates/web/fixmystreet/contact/index.html:2 msgid "Contact Us" msgstr "Kontakt oss" -#: templates/web/base/contact/index.html:6 -#: templates/web/fixmystreet/contact/index.html:20 +#: templates/web/base/contact/index.html:12 msgid "Contact the team" msgstr "Kontakt prosjektgruppa" #: templates/web/zurich/admin/report_edit-sdm.html:40 #: templates/web/zurich/admin/report_edit.html:59 -#, fuzzy msgid "Coordinates:" -msgstr "Koordinatar:" +msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1420 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1448 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1429 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1457 msgid "Could not find user" msgstr "Kunne ikkje finna brukaren" @@ -690,7 +651,7 @@ msgstr "Administrasjon" msgid "Council contacts for %s" msgstr "Administrasjonskontaktar for %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:693 +#: perllib/FixMyStreet/DB/Result/Problem.pm:681 msgid "Council ref: %s" msgstr "" @@ -705,7 +666,7 @@ msgstr "Administrasjon:" msgid "Count" msgstr "Mengd" -#: templates/web/base/email_sent.html:1 templates/web/zurich/email_sent.html:1 +#: templates/web/base/email_sent.html:1 msgid "Create a report" msgstr "Lag ein rapport" @@ -715,9 +676,8 @@ msgid "Create category" msgstr "Lag kategori" #: templates/web/zurich/admin/template_edit.html:29 -#, fuzzy msgid "Create template" -msgstr "Lag ein rapport" +msgstr "" #: templates/web/base/admin/problem_row.html:34 #: templates/web/zurich/admin/templates.html:10 @@ -754,7 +714,7 @@ msgstr "" msgid "Dealt with by subdivision within 5 working days" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:878 +#: perllib/FixMyStreet/App/Controller/Admin.pm:877 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "" @@ -767,7 +727,7 @@ msgstr "" msgid "Deleted" msgstr "Sletta" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:51 +#: templates/web/base/report/new/form_report.html:45 #: templates/web/zurich/admin/index-dm.html:22 #: templates/web/zurich/admin/index-sdm.html:20 #: templates/web/zurich/admin/reports.html:12 @@ -775,12 +735,11 @@ msgid "Description" msgstr "" #: templates/web/base/js/translation_strings.html:34 -#: templates/web/zurich/report/new/fill_in_details_form.html:42 +#: templates/web/zurich/report/new/fill_in_details_form.html:68 msgid "Details" msgstr "" #: templates/web/base/admin/report_edit.html:20 -#: templates/web/base/report/new/fill_in_details_form.html:62 #: templates/web/zurich/admin/report_edit-sdm.html:27 #: templates/web/zurich/admin/report_edit.html:29 #: templates/web/zurich/admin/report_edit.html:43 @@ -793,38 +752,38 @@ msgstr "" #: templates/web/zurich/admin/report_edit-sdm.html:50 #: templates/web/zurich/admin/report_edit.html:69 -#, fuzzy msgid "Didn't use map" -msgstr "brukte ikkje kart" +msgstr "" #: templates/web/base/admin/edit-league.html:8 msgid "Diligency prize league table" msgstr "Arbeidshestar" #. ("%s is the site name") -#: templates/web/base/auth/general.html:31 -#: templates/web/base/report/new/fill_in_details_form.html:114 -#: templates/web/base/report/update-form.html:87 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:11 -#: templates/web/fixmystreet/report/update-form.html:86 -#, fuzzy +#: templates/web/base/auth/general.html:48 +#: templates/web/base/report/new/form_user_loggedout.html:18 +#: templates/web/base/report/new/oauth_email_form.html:18 +#: templates/web/base/report/update-form.html:29 +#: templates/web/base/report/update/form_user_loggedout.html:17 msgid "Do you have a %s password?" -msgstr "Har du eit FiksGataMi-passord?" +msgstr "" #: templates/web/base/questionnaire/index.html:55 msgid "Don’t know" msgstr "Veit ikkje" -#: templates/web/fixmystreet/contact/index.html:118 +#: templates/web/base/contact/index.html:110 msgid "Don't like forms?" msgstr "" +#: templates/web/base/js/translation_strings.html:51 +msgid "Drag and drop photos here or <u>click to upload</u>" +msgstr "" + #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:14 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:32 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:30 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:36 msgid "Duplicate" msgstr "" @@ -874,7 +833,7 @@ msgstr "Oppdatert av" #: templates/web/base/admin/category_edit.html:91 #: templates/web/base/admin/flagged.html:38 #: templates/web/base/admin/users.html:16 -#: templates/web/base/auth/general.html:22 +#: templates/web/base/auth/general.html:39 #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:24 @@ -882,7 +841,7 @@ msgstr "Oppdatert av" msgid "Email" msgstr "E-post" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1396 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1405 msgid "Email added to abuse list" msgstr "E-post lagd til misbrukliste" @@ -898,7 +857,7 @@ msgstr "" msgid "Email alert deleted" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1393 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1402 msgid "Email already in abuse list" msgstr "E-post allereie i misbruklista" @@ -906,41 +865,36 @@ msgstr "E-post allereie i misbruklista" msgid "Email me new local problems" msgstr "Send meg e-post om lokale problem" -#: templates/web/base/report/display.html:38 -msgid "Email me updates" -msgstr "Send meg oppdateringar" - #: templates/web/base/admin/category_edit.html:31 #: templates/web/base/admin/report_edit.html:62 #: templates/web/base/admin/update_edit.html:33 #: templates/web/base/admin/user-form.html:20 #: templates/web/base/alert/updates.html:13 -#: templates/web/base/report/display.html:42 #: templates/web/zurich/admin/body.html:47 msgid "Email:" msgstr "E-post:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:329 +#: perllib/FixMyStreet/Script/Reports.pm:108 msgid "Email: %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:639 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:634 msgid "Empty flat or maisonette" msgstr "Tom leilegheit" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:638 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:633 msgid "Empty house or bungalow" msgstr "Tomt hus eller bungalow" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:641 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:636 msgid "Empty office or other commercial" msgstr "Tomt kontor eller forretningsbygg" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:642 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:637 msgid "Empty pub or bar" msgstr "Tom pub eller bar" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:643 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:638 msgid "Empty public building - school, hospital, etc." msgstr "Tom offentleg bygning – skule, sjukehus, osb." @@ -973,7 +927,7 @@ msgstr "" msgid "Enter a Zürich street name" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:13 +#: perllib/FixMyStreet/Cobrand/UK.pm:14 msgid "Enter a nearby UK postcode, or street name and area" msgstr "" @@ -991,14 +945,9 @@ msgstr "" msgid "Enter a nearby street name and area, postal code or district in Delhi" msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:152 -#: templates/web/base/report/update-form.html:125 -msgid "Enter a new password:" -msgstr "Skriv inn eit nytt passord:" - -#: templates/web/base/auth/general.html:60 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:75 -#: templates/web/fixmystreet/report/update-form.html:123 +#: templates/web/base/auth/general.html:99 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:38 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:13 #: templates/web/zurich/auth/general.html:65 msgid "Enter a password" msgstr "Enter a password" @@ -1008,11 +957,11 @@ msgid "Enter details of the problem" msgstr "Legg inn detaljar om problemet" #: templates/web/base/errors/generic.html:1 -#: templates/web/base/errors/generic.html:3 +#: templates/web/base/errors/generic.html:4 #: templates/web/base/tokens/abuse.html:1 #: templates/web/base/tokens/abuse.html:3 #: templates/web/base/tokens/error.html:1 -#: templates/web/base/tokens/error.html:3 +#: templates/web/base/tokens/error.html:5 msgid "Error" msgstr "Feil" @@ -1025,11 +974,11 @@ msgstr "" msgid "Example postcode %s" msgstr "Postnummerdøme %s" -#: templates/web/base/open311/index.html:94 +#: templates/web/base/open311/index.html:86 msgid "Examples:" msgstr "Døme:" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:55 +#: templates/web/base/report/new/form_report.html:49 msgid "Explain what’s wrong, exactly where it is, and how long it’s been there…" msgstr "" @@ -1070,17 +1019,15 @@ msgstr "" msgid "FixMyStreet" msgstr "" -#: templates/web/base/admin/index.html:61 +#: templates/web/base/admin/index.html:54 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:24 #: templates/web/base/admin/report_blocks.html:9 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:144 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:34 -#: templates/web/fixmystreet/report/banner.html:12 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:32 +#: templates/web/base/report/banner.html:12 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:38 msgid "Fixed" msgstr "Løyst" @@ -1107,7 +1054,7 @@ msgstr "" msgid "Flag user" msgstr "Flagg brukar" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1281 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1290 #: templates/web/base/admin/users.html:19 msgid "Flagged" msgstr "Flagga:" @@ -1138,8 +1085,8 @@ msgstr "Følg ei bydellenkje for Ã¥ berre sjÃ¥ rapportar innanfor den bydelen." msgid "For more information, see <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>." msgstr "" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:32 -#: templates/web/fixmystreet/report/update-form.html:106 +#: templates/web/base/report/new/form_user_loggedout_password.html:20 +#: templates/web/base/report/update/form_user_loggedout_password.html:19 msgid "Forgotten your password?" msgstr "" @@ -1151,21 +1098,18 @@ msgstr "" msgid "Forwarded wish to external body" msgstr "" -#: templates/web/base/faq/faq-en-gb.html:1 -#: templates/web/base/faq/faq-en-gb.html:13 -#: templates/web/base/faq/faq-en-gb.html:6 -#: templates/web/base/open311/index.html:6 -#: templates/web/base/static/privacy.html:8 -#: templates/web/fixmystreet/contact/index.html:10 +#: templates/web/base/about/_sidebar.html:4 +#: templates/web/base/about/faq-en-gb.html:1 +#: templates/web/base/about/faq-en-gb.html:5 msgid "Frequently Asked Questions" msgstr "Ofte spurde spurnader" -#: templates/web/base/open311/index.html:136 +#: templates/web/base/open311/index.html:128 msgid "GeoRSS on Google Maps" msgstr "GeoRSS pÃ¥ Google Maps" +#: templates/web/base/report/display_tools.html:11 #: templates/web/fixmystreet/around/_updates.html:3 -#: templates/web/fixmystreet/report/display.html:35 msgid "Get updates" msgstr "" @@ -1198,7 +1142,7 @@ msgstr "Hald fram" msgid "Going to send questionnaire?" msgstr "Skal spørjeskjemaet sendast?" -#: templates/web/base/admin/index.html:42 +#: templates/web/base/admin/index.html:35 msgid "Graph of problem creation by status over time" msgstr "Graf over problemoppretting fordelt pÃ¥ status over tid" @@ -1215,7 +1159,7 @@ msgid "Have you ever reported a problem to a council before, or is this your fir msgstr "Har du rapportert eit problem til ein administrasjon før, eller er dette første gongen?" #: templates/web/base/footer.html:15 templates/web/fixmystreet/footer.html:38 -#: templates/web/zurich/faq/faq-de-ch.html:1 +#: templates/web/zurich/about/faq-de-ch.html:1 #: templates/web/zurich/footer.html:22 #: templates/web/zurich/nav_over_content.html:8 msgid "Help" @@ -1266,7 +1210,7 @@ msgstr "Korleis rapportera eit problem" msgid "How to send successful reports" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:754 +#: perllib/FixMyStreet/App/Controller/Admin.pm:752 msgid "I am afraid you cannot confirm unconfirmed reports." msgstr "Eg er redd du ikkje kan stadfesta ustadfesta rapportar." @@ -1284,10 +1228,6 @@ msgstr "" msgid "I'm afraid we couldn't locate your problem in the database.\n" msgstr "Eg er redd vi ikkje klarte Ã¥ finna problemet ditt i databasen.\n" -#: perllib/FixMyStreet/App/Controller/Tokens.pm:327 -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 "Eg er redd vi ikkje kunne verifisera den referansen. Viss du kopierte nettadressa frÃ¥ ein e-post, sjekk at du har kopiert ho korrekt.\n" - #: templates/web/base/admin/flagged.html:14 #: templates/web/base/admin/list_updates.html:6 #: templates/web/base/admin/reports.html:11 @@ -1316,25 +1256,16 @@ msgstr "" msgid "If you get some more information about the status of your problem, please come back to the site and leave an update." msgstr "" -#: templates/web/base/report/new/councils_text_none.html:2 -#: templates/web/base/report/new/councils_text_none.html:8 +#: templates/web/base/report/new/councils_text_none.html:10 +#: templates/web/base/report/new/councils_text_none.html:9 msgid "If you submit a problem here the subject and details of the problem will be public, but the problem will <strong>not</strong> be reported to the council." msgstr "Viss du sender inn eit problem hit, sÃ¥ vil emnet og detaljar for problemet vera offentlege, men problemet vil <strong>ikkje</strong> rapporterast til administrasjonen." -#: templates/web/zurich/auth/token.html:19 -#: templates/web/zurich/email_sent.html:7 -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 "Viss du brukar vevbasert e-post eller har filter for søppel-e-post pÃ¥ e-postkontoen din, kan du i visse tilfelle mÃ¥tta sjÃ¥ etter meldingane vÃ¥re der." - #: templates/web/base/questionnaire/index.html:68 -#, fuzzy msgid "" "If you wish to leave a public update on the problem, please enter it here\n" "(please note it will not be sent to the council)." msgstr "" -"Viss du ynskjer Ã¥ leggja til ein offentleg kommentar pÃ¥ problemet, legg han til her\n" -"(denne vert ikkje send til administrasjonen). Du kan til dømes\n" -"dela røynsla di med korleis problemet ditt vart løyst." #: templates/web/base/admin/body.html:149 msgid "If you're using <strong>a send method that is not email</strong>, enter the service ID (Open311) or equivalent identifier here." @@ -1373,10 +1304,8 @@ msgstr "Ugyldig val av straum" #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:144 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:32 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:30 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:36 msgid "In Progress" msgstr "Under arbeid" @@ -1384,7 +1313,7 @@ msgstr "Under arbeid" msgid "In abuse table?" msgstr "" -#: templates/web/base/open311/index.html:88 +#: templates/web/base/open311/index.html:80 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 "I tillegg er følgjande attributt som ikkje er del av Open311 v2-spesifikasjonen returnert: agency_sent_datetime, title (òg returnert som del av description), interface_used, comment_count, requestor_name (berre tilstades viss innsendar tillét at namnet kunne visast pÃ¥ denne nettstaden)." @@ -1392,7 +1321,7 @@ msgstr "I tillegg er følgjande attributt som ikkje er del av Open311 v2-spesifi #: perllib/FixMyStreet/Cobrand/Zurich.pm:963 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:7 -#: templates/web/fixmystreet/report/banner.html:19 +#: templates/web/base/report/banner.html:19 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:8 msgid "In progress" @@ -1427,7 +1356,7 @@ msgstr "" msgid "Invalid agency_responsible value %s" msgstr "Ugyldig agency_responsible-verdi %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1201 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1210 msgid "Invalid end date" msgstr "Ugyldig slutt-dato" @@ -1435,7 +1364,7 @@ msgstr "Ugyldig slutt-dato" msgid "Invalid format %s specified." msgstr "Ugyldig format %s oppgjeve." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1206 msgid "Invalid start date" msgstr "Ugyldig startdato" @@ -1443,14 +1372,12 @@ msgstr "Ugyldig startdato" #: templates/web/base/admin/report_blocks.html:5 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:143 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:31 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:29 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:35 msgid "Investigating" msgstr "Undersøkjer" -#: templates/web/fixmystreet/contact/blurb.html:8 +#: templates/web/base/contact/blurb.html:8 msgid "It's often quickest to <a href=\"%s\">check our FAQs</a> and see if the answer is there." msgstr "" @@ -1468,11 +1395,9 @@ msgstr "" msgid "Jurisdiction unknown" msgstr "" -#: templates/web/base/auth/general.html:44 -#: templates/web/base/report/new/fill_in_details_form.html:132 -#: templates/web/base/report/update-form.html:105 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:28 -#: templates/web/fixmystreet/report/update-form.html:102 +#: templates/web/base/auth/general.html:80 +#: templates/web/base/report/new/form_user_loggedout_password.html:16 +#: templates/web/base/report/update/form_user_loggedout_password.html:15 #: templates/web/zurich/auth/general.html:40 msgid "Keep me signed in on this computer" msgstr "Hugs mi innlogging pÃ¥ denne datamaskina" @@ -1530,6 +1455,7 @@ msgid "MAP" msgstr "" #: templates/web/base/js/translation_strings.html:45 +#: templates/web/base/maps/google-ol.html:13 msgid "Map" msgstr "" @@ -1549,7 +1475,7 @@ msgstr "" msgid "Marked fixed/closed more than eight weeks ago" msgstr "" -#: templates/web/fixmystreet/contact/index.html:106 +#: templates/web/base/contact/index.html:98 msgid "Message" msgstr "" @@ -1561,10 +1487,6 @@ msgstr "" msgid "Message to external body:" msgstr "" -#: templates/web/base/contact/index.html:97 -msgid "Message:" -msgstr "Melding:" - #: perllib/FixMyStreet/App/Controller/Open311.pm:445 msgid "Missing jurisdiction_id" msgstr "Manglar jurisdiction_id" @@ -1577,10 +1499,6 @@ msgstr "" msgid "Month" msgstr "MÃ¥nad" -#: templates/web/base/report/display.html:34 -msgid "More problems nearby" -msgstr "Fleire problem i nærleiken" - #: templates/web/base/admin/bodies.html:21 #: templates/web/base/admin/body-form.html:18 #: templates/web/base/admin/flagged.html:16 @@ -1588,11 +1506,11 @@ msgstr "Fleire problem i nærleiken" #: templates/web/base/admin/list_updates.html:7 #: templates/web/base/admin/reports.html:13 #: templates/web/base/admin/users.html:15 -#: templates/web/base/auth/general.html:50 +#: templates/web/base/auth/general.html:89 +#: templates/web/base/report/new/form_user_loggedin.html:9 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:7 +#: templates/web/base/report/update/form_name.html:4 #: templates/web/base/reports/index.html:20 -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:9 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:44 -#: templates/web/fixmystreet/report/update-form.html:138 #: templates/web/zurich/admin/body-form.html:4 #: templates/web/zurich/auth/general.html:60 #: templates/web/zurich/report/new/fill_in_details_form.html:82 @@ -1606,7 +1524,7 @@ msgstr "Namn" msgid "Name:" msgstr "Namn:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:328 +#: perllib/FixMyStreet/Script/Reports.pm:107 msgid "Name: %s" msgstr "" @@ -1615,29 +1533,24 @@ msgstr "" msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s" msgstr "Næraste namngjevne veg til nÃ¥len plassert pÃ¥ kartet (automatisk generert ved hjelp av OpenStreetMap): %s%s" -#: perllib/FixMyStreet/Cobrand/UK.pm:127 +#: perllib/FixMyStreet/Cobrand/UK.pm:128 msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" msgstr "Næraste postnummer til nÃ¥len plassert pÃ¥ kartet (automatisk generert): %s (%sm unna)" -#: perllib/FixMyStreet/Cobrand/Default.pm:434 -#: perllib/FixMyStreet/Cobrand/Default.pm:474 +#: perllib/FixMyStreet/Cobrand/Default.pm:455 +#: perllib/FixMyStreet/Cobrand/Default.pm:495 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "Næraste veg til nÃ¥len plassert pÃ¥ karta (automatisk generert ved hjelp av Bing Maps): %s" -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:267 +#: perllib/FixMyStreet/Script/Alerts.pm:290 msgid "" "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n" "\n" msgstr "" -#: templates/web/zurich/email_sent.html:5 -msgid "Nearly Done! Now check your email..." -msgstr "Nesten ferdig! No mÃ¥ du sjekka e-posten din …" - #: templates/web/base/auth/token.html:17 templates/web/base/email_sent.html:5 -#, fuzzy msgid "Nearly done! Now check your email…" -msgstr "Nesten ferdig! No mÃ¥ du sjekka e-posten din …" +msgstr "" #: templates/web/base/reports/index.html:21 msgid "New <br>problems" @@ -1694,9 +1607,8 @@ msgstr "Ny tilstand" #: templates/web/zurich/admin/template_edit.html:9 #: templates/web/zurich/admin/templates.html:26 -#, fuzzy msgid "New template" -msgstr "Ny tilstand" +msgstr "" #: templates/web/base/pagination.html:13 msgid "Next" @@ -1713,8 +1625,8 @@ msgstr "" #: templates/web/base/admin/report_edit.html:75 #: templates/web/base/admin/update_edit.html:25 #: templates/web/base/questionnaire/creator_fixed.html:16 +#: templates/web/base/questionnaire/index.html:101 #: templates/web/base/questionnaire/index.html:53 -#: templates/web/base/questionnaire/index.html:92 msgid "No" msgstr "Nei" @@ -1778,10 +1690,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:13 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:33 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:31 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:37 msgid "Not Responsible" msgstr "" @@ -1820,7 +1730,7 @@ msgstr "Merk at nÃ¥r vi tek med ustadfesta rapportar, sÃ¥ brukar vi datoen rappo msgid "Note:" msgstr "Merk:" -#: templates/web/base/open311/index.html:73 +#: templates/web/base/open311/index.html:65 msgid "Note: <strong>%s</strong>" msgstr "Merk: <strong>%s</strong>" @@ -1828,13 +1738,15 @@ msgstr "Merk: <strong>%s</strong>" msgid "Notes from SDM to DM" msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:113 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:10 +#: templates/web/base/report/new/form_user_loggedout.html:14 +#: templates/web/base/report/new/form_user_loggedout.html:2 +#: templates/web/base/report/new/oauth_email_form.html:17 msgid "Now to submit your report…" msgstr "" -#: templates/web/base/report/update-form.html:86 -#: templates/web/fixmystreet/report/update-form.html:85 +#: templates/web/base/report/update-form.html:28 +#: templates/web/base/report/update/form_user_loggedout.html:13 +#: templates/web/base/report/update/form_user_loggedout.html:2 msgid "Now to submit your update…" msgstr "" @@ -1842,11 +1754,6 @@ msgstr "" msgid "OK" msgstr "" -#: templates/web/base/report/display.html:28 -#: templates/web/base/report/update.html:17 -msgid "Offensive? Unsuitable? Tell us" -msgstr "Støytande? Upassende? Sei frÃ¥" - #: templates/web/base/reports/index.html:23 msgid "Old / unknown <br>problems" msgstr "" @@ -1863,7 +1770,7 @@ msgstr "" msgid "Older <br>problems" msgstr "" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:45 +#: templates/web/base/report/new/form_report.html:15 msgid "One-line summary" msgstr "" @@ -1874,8 +1781,7 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:4 #: templates/web/base/admin/update_edit.html:28 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/report/update-form.html:30 -#: templates/web/fixmystreet/report/update-form.html:28 +#: templates/web/base/report/update/form_update.html:34 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:7 #: templates/web/zurich/admin/update_edit.html:18 @@ -1890,15 +1796,15 @@ msgstr "" msgid "Open, but not had any update in eight weeks" msgstr "" -#: templates/web/base/open311/index.html:70 +#: templates/web/base/open311/index.html:62 msgid "Open311 API for the mySociety FixMyStreet server" msgstr "Open311-API for mySocietys FiksGataMi-tenar" -#: templates/web/base/open311/index.html:80 +#: templates/web/base/open311/index.html:72 msgid "Open311 initiative web page" msgstr "Nettsida til Open311-initiativet" -#: templates/web/base/open311/index.html:81 +#: templates/web/base/open311/index.html:73 msgid "Open311 specification" msgstr "Open311-spesifikasjon" @@ -1910,15 +1816,15 @@ msgstr "Eller problem meldt til:" msgid "Or you can subscribe to an alert based upon what ward or council you’re in:" msgstr "Eller du kan abonnera pÃ¥ varsel basert pÃ¥ bydel eller administrasjon du høyrer til under:" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1084 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:673 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:674 -#: perllib/FixMyStreet/DB/Result/Problem.pm:570 -#: perllib/FixMyStreet/DB/Result/Problem.pm:580 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1055 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:669 +#: perllib/FixMyStreet/DB/Result/Problem.pm:558 +#: perllib/FixMyStreet/DB/Result/Problem.pm:568 +#: perllib/FixMyStreet/DB/Result/Problem.pm:578 #: perllib/FixMyStreet/DB/Result/Problem.pm:590 -#: perllib/FixMyStreet/DB/Result/Problem.pm:602 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:397 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:412 +#: perllib/FixMyStreet/Script/Reports.pm:175 +#: perllib/FixMyStreet/Script/Reports.pm:190 msgid "Other" msgstr "Anna" @@ -1927,7 +1833,7 @@ msgid "Owner" msgstr "Eigar" #: templates/web/base/errors/page_error_404_not_found.html:1 -#: templates/web/base/errors/page_error_404_not_found.html:3 +#: templates/web/base/errors/page_error_404_not_found.html:4 msgid "Page Not Found" msgstr "Fann ikkje sida" @@ -1941,16 +1847,16 @@ msgstr "" msgid "Partial" msgstr "Delvis" -#: templates/web/base/auth/general.html:53 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:68 -#: templates/web/fixmystreet/report/update-form.html:116 +#: templates/web/base/auth/general.html:92 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:31 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:6 #: templates/web/zurich/auth/general.html:32 #: templates/web/zurich/auth/general.html:63 msgid "Password (optional)" msgstr "" #: templates/web/base/auth/change_password.html:25 -#: templates/web/base/auth/general.html:36 +#: templates/web/base/auth/general.html:72 msgid "Password:" msgstr "Passord:" @@ -1962,45 +1868,37 @@ msgstr "" msgid "Phone number" msgstr "" -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:26 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:62 +#: templates/web/base/report/new/form_user_loggedin.html:26 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:25 msgid "Phone number (optional)" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:306 +#: perllib/FixMyStreet/Script/Reports.pm:83 #: templates/web/base/admin/report_edit.html:63 -#: templates/web/base/report/new/fill_in_details_form.html:198 #: templates/web/zurich/admin/stats.html:39 msgid "Phone:" msgstr "Telefon:" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:66 -#: templates/web/fixmystreet/report/update-form.html:59 +#: templates/web/base/questionnaire/index.html:75 +#: templates/web/base/report/new/form_report.html:23 +#: templates/web/base/report/update/form_update.html:6 #: templates/web/zurich/admin/index-dm.html:29 #: templates/web/zurich/admin/index-sdm.html:24 #: templates/web/zurich/admin/reports.html:16 #: templates/web/zurich/admin/stats.html:37 -#: templates/web/zurich/report/new/fill_in_details_form.html:52 +#: templates/web/zurich/report/new/fill_in_details_form.html:45 msgid "Photo" msgstr "" -#: perllib/FixMyStreet/App/Controller/Photo.pm:221 -#, fuzzy +#: perllib/FixMyStreet/App/Controller/Photo.pm:187 msgid "Photo is required." -msgstr "Denne informasjonen er pÃ¥kravd" +msgstr "" #: templates/web/base/admin/category_edit.html:48 -#, fuzzy msgid "Photo required" -msgstr "Denne informasjonen er pÃ¥kravd" - -#: templates/web/base/questionnaire/index.html:80 -#: templates/web/base/report/new/fill_in_details_form.html:84 -#: templates/web/base/report/update-form.html:62 -msgid "Photo:" -msgstr "Bilete:" +msgstr "" -#: templates/web/base/alert/list.html:26 +#: templates/web/base/alert/list.html:23 msgid "Photos of recent nearby reports" msgstr "Bilete av nye problem i nærleiken" @@ -2029,20 +1927,16 @@ 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/zurich/auth/token.html:16 -msgid "Please check your email" -msgstr "Ver venleg og sjekk e-posten du oppgav" - -#: templates/web/base/auth/general.html:10 -#: templates/web/base/auth/general.html:16 +#: templates/web/base/auth/general.html:27 +#: templates/web/base/auth/general.html:33 #: templates/web/zurich/auth/general.html:3 #: templates/web/zurich/auth/general.html:9 msgid "Please check your email address is correct" msgstr "Ver venleg og sjekk at du har skrive ei gyldig e-postadresse" #: perllib/FixMyStreet/App/Controller/Admin.pm:343 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:883 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:948 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:878 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:943 #: perllib/FixMyStreet/DB/Result/Problem.pm:412 #: templates/web/base/js/translation_strings.html:9 msgid "Please choose a category" @@ -2056,25 +1950,29 @@ msgstr "Vel ein type eigenskap" msgid "Please correct the errors below" msgstr "" -#: templates/web/base/contact/blurb.html:2 -#: templates/web/fixmystreet/contact/blurb.html:12 -#, fuzzy +#: templates/web/base/contact/blurb.html:12 msgid "" "Please do <strong>not</strong> report problems through this form; messages go to\n" "the team behind this site, not a council. To report a problem,\n" "please <a href=\"/\">go to the front page</a> and follow the instructions." -msgstr "Ver venleg og <strong>ikkje</strong> rapporter feil gjennom denne sida; meldingane gÃ¥r til gruppa som stÃ¥r bak FiksGataMi, og ikkje til ein administrasjon. For Ã¥ rapportera eit problem, ver venleg og <a href=\"/\">gÃ¥ til forsida</a> og følg instruksjonane." +msgstr "" #: templates/web/base/report/new/notes.html:6 msgid "Please do not be abusive — abusing your council devalues the service for all users." msgstr "" #: perllib/FixMyStreet/App/Controller/Admin.pm:346 -#: perllib/FixMyStreet/DB/Result/Comment.pm:126 +#: perllib/FixMyStreet/DB/Result/Comment.pm:125 #: templates/web/base/js/translation_strings.html:2 msgid "Please enter a message" msgstr "Ver venleg og skriv ei melding" +#: perllib/FixMyStreet/App/Controller/Admin.pm:1091 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1146 +#, fuzzy +msgid "Please enter a name" +msgstr "Ver venleg og legg inn namnet ditt" + #: templates/web/base/auth/change_password.html:12 #: templates/web/base/auth/change_password.html:15 #: templates/web/base/js/translation_strings.html:19 @@ -2087,10 +1985,10 @@ msgstr "Skriv inn eit passord" msgid "Please enter a subject" msgstr "Ver venleg og legg inn eit emne" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1084 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1137 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1087 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1142 #: perllib/FixMyStreet/App/Controller/Admin.pm:345 -#: perllib/FixMyStreet/DB/Result/User.pm:127 +#: perllib/FixMyStreet/DB/Result/User.pm:133 #: templates/web/base/js/translation_strings.html:12 #: templates/web/base/js/translation_strings.html:16 msgid "Please enter a valid email" @@ -2107,9 +2005,9 @@ msgid "Please enter some details" msgstr "Ver venleg og legg inn opplysningar om problemet" #: perllib/FixMyStreet/App/Controller/Contact.pm:113 -#: perllib/FixMyStreet/DB/Result/User.pm:124 -#: templates/web/base/auth/general.html:10 -#: templates/web/base/auth/general.html:15 +#: perllib/FixMyStreet/DB/Result/User.pm:130 +#: templates/web/base/auth/general.html:27 +#: templates/web/base/auth/general.html:32 #: templates/web/base/js/translation_strings.html:11 #: templates/web/base/js/translation_strings.html:15 #: templates/web/zurich/auth/general.html:3 @@ -2117,7 +2015,7 @@ msgstr "Ver venleg og legg inn opplysningar om problemet" msgid "Please enter your email" msgstr "Ver venleg og legg inn e-posten din" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:7 +#: templates/web/base/report/new/form_user_loggedout_email.html:7 #: templates/web/zurich/report/new/fill_in_details_form.html:80 msgid "Please enter your email address" msgstr "" @@ -2126,15 +2024,15 @@ msgstr "" msgid "Please enter your first name" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:318 +#: perllib/FixMyStreet/Cobrand/UK.pm:319 #: templates/web/base/js/translation_strings.html:7 msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below" msgstr "" #: perllib/FixMyStreet/App/Controller/Contact.pm:112 -#: perllib/FixMyStreet/DB/Result/Comment.pm:123 +#: perllib/FixMyStreet/DB/Result/Comment.pm:122 #: perllib/FixMyStreet/DB/Result/Problem.pm:406 -#: perllib/FixMyStreet/DB/Result/User.pm:120 +#: perllib/FixMyStreet/DB/Result/User.pm:126 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter your name" msgstr "Ver venleg og legg inn namnet ditt" @@ -2161,12 +2059,11 @@ msgstr "" msgid "Please fill in details of the problem below." msgstr "Ver venleg og fyll ut detaljar om problemet under." -#: templates/web/zurich/report/new/fill_in_details_form.html:46 +#: templates/web/zurich/report/new/fill_in_details_form.html:72 msgid "Please fill in details of the problem." msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:28 -#: templates/web/fixmystreet/report/new/sidebar.html:7 +#: templates/web/base/report/new/sidebar.html:7 #: templates/web/zurich/report/new/fill_in_details_form.html:20 msgid "Please fill in the form below with details of the problem, and describe the location as precisely as possible in the details box." msgstr "" @@ -2177,23 +2074,24 @@ msgstr "" msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "Ver venleg og indiker om du ynskjer Ã¥ motta eit nytt spørjeskjema" -#: templates/web/fixmystreet/report/updates-sidebar-notes.html:4 +#: templates/web/base/report/updates-sidebar-notes.html:2 msgid "Please note that updates are not sent to the council." msgstr "" -#: templates/web/base/report/update-form.html:7 -msgid "Please note that updates are not sent to the council. If you leave your name it will be public. Your information will only be used in accordance with our <a href=\"/faq#privacy\">privacy policy</a>" -msgstr "" -"Merk at oppdateringar ikkje vert sende til administrasjonen. Viss du\n" -"legg igjen namnet ditt sÃ¥ vil det vera offentleg tilgjengeleg.\n" -"Informasjonen din vil berre brukast i samsvar med <a href=\"/faq#privacy\">personvernpolicyen vÃ¥r</a>" +#: templates/web/base/report/new/oauth_email_form.html:4 +#, fuzzy +msgid "Please note your report has <strong>not yet been sent</strong>." +msgstr "Merk at rapporten din <strong>enno ikkje er send</strong. Vel ein kategori og legg til meir informasjon under før du sender inn." -#: templates/web/base/report/new/fill_in_details_form.html:8 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:21 +#: templates/web/base/report/new/fill_in_details_form.html:20 #: templates/web/zurich/report/new/fill_in_details_form.html:11 msgid "Please note your report has <strong>not yet been sent</strong>. Choose a category and add further information below, then submit." msgstr "Merk at rapporten din <strong>enno ikkje er send</strong. Vel ein kategori og legg til meir informasjon under før du sender inn." +#: templates/web/base/report/display.html:26 +msgid "Please note your update has <strong>not yet been posted</strong>." +msgstr "" + #: templates/web/base/report/new/notes.html:1 #: templates/web/zurich/report/new/notes.html:1 msgid "Please note:" @@ -2213,9 +2111,8 @@ msgid "Please say whether you've ever reported a problem to your council before" msgstr "Ver venleg og opplys om du har rapportert eit problem til administrasjonen din tidlegare" #: templates/web/zurich/admin/report_edit.html:208 -#, fuzzy msgid "Please select a body." -msgstr "Vel den kjelda du ynskjer" +msgstr "" #: perllib/FixMyStreet/App/Controller/Alert.pm:80 msgid "Please select the feed you want" @@ -2232,6 +2129,7 @@ msgstr "Ver venleg og oppgje om dette problemet har vorte fiksa eller ikkje" #: perllib/FixMyStreet/App/Model/PhotoSet.pm:117 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:145 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:147 +#: templates/web/base/js/translation_strings.html:53 msgid "Please upload a JPEG image only" msgstr "Ver venleg og berre last opp JPEG-bilete" @@ -2239,18 +2137,14 @@ msgstr "Ver venleg og berre last opp JPEG-bilete" msgid "Please write a message" msgstr "Skriv inn ei melding" -#: templates/web/fixmystreet/report/update-form.html:23 +#: templates/web/base/report/update/form_update.html:29 msgid "Please write your update here" msgstr "" -#: templates/web/base/contact/index.html:100 -#: templates/web/base/report/update-form.html:110 -#: templates/web/base/report/update-form.html:132 -#: templates/web/base/report/update-form.html:72 -#: templates/web/fixmystreet/contact/index.html:113 -#: templates/web/fixmystreet/report/update-form.html:124 -#: templates/web/fixmystreet/report/update-form.html:71 -#: templates/web/fixmystreet/report/update-form.html:97 +#: templates/web/base/contact/index.html:105 +#: templates/web/base/report/update-form.html:24 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:14 +#: templates/web/base/report/update/form_user_loggedout_password.html:10 msgid "Post" msgstr "Send inn" @@ -2278,12 +2172,9 @@ msgstr "" msgid "Privacy" msgstr "" -#: templates/web/base/faq/faq-en-gb.html:7 -#: templates/web/base/open311/index.html:7 -#: templates/web/base/static/privacy.html:1 -#: templates/web/base/static/privacy.html:2 -#: templates/web/base/static/privacy.html:9 -#: templates/web/fixmystreet/contact/index.html:11 +#: templates/web/base/about/_sidebar.html:5 +#: templates/web/base/about/privacy.html:1 +#: templates/web/base/about/privacy.html:2 msgid "Privacy and cookies" msgstr "" @@ -2311,12 +2202,12 @@ msgstr "Problem %s stadfesta" msgid "Problem %s sent to council %s" msgstr "Problem %s sendt til administrasjon %s" -#: templates/web/base/admin/index.html:46 +#: templates/web/base/admin/index.html:39 #: templates/web/zurich/admin/index.html:9 msgid "Problem breakdown by state" msgstr "Tilstandsfordeling av problem" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1055 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1058 msgid "Problem marked as open." msgstr "Problem markert som ope." @@ -2332,11 +2223,11 @@ msgstr "Problem" msgid "Problems in this area" msgstr "Problem i dette omrÃ¥det" -#: templates/web/fixmystreet/report/display.html:43 +#: templates/web/base/report/display_tools.html:19 msgid "Problems nearby" msgstr "" -#: templates/web/fixmystreet/report/display.html:41 +#: templates/web/base/report/display_tools.html:17 msgid "Problems on the map" msgstr "" @@ -2348,24 +2239,23 @@ msgstr "Problem nyleg rapportert fiksa pÃ¥ FiksGataMi" msgid "Problems within %.1fkm of this location" msgstr "Problem innanfor %.1fkm av denne posisjonen" -#: perllib/FixMyStreet/Cobrand/Default.pm:642 +#: perllib/FixMyStreet/Cobrand/Default.pm:663 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:120 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:139 -#: perllib/FixMyStreet/Cobrand/UK.pm:207 +#: perllib/FixMyStreet/Cobrand/UK.pm:208 msgid "Problems within %s" msgstr "Problem innanfor %s" #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:128 -#: perllib/FixMyStreet/Cobrand/UK.pm:221 +#: perllib/FixMyStreet/Cobrand/UK.pm:222 msgid "Problems within %s ward" msgstr "Problem innanfor %s bydel" #. ("First %s is the body name, second %s the site name") #: templates/web/base/reports/body.html:0 #: templates/web/base/reports/body.html:24 -#, fuzzy msgid "Problems within %s, %s" -msgstr "Problem innanfor %s" +msgstr "" #: templates/web/base/alert/_list.html:42 msgid "Problems within the boundary of:" @@ -2379,19 +2269,16 @@ msgstr "" msgid "Property type:" msgstr "Type eigenskap:" -#: templates/web/base/report/update-form.html:3 -#: templates/web/fixmystreet/report/update-form.html:4 +#: templates/web/base/report/update-form.html:6 msgid "Provide an update" msgstr "Bidra med ei oppdatering" -#: templates/web/base/auth/general.html:56 +#: templates/web/base/auth/general.html:95 msgid "Providing a name and password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:156 -#: templates/web/base/report/update-form.html:129 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:71 -#: templates/web/fixmystreet/report/update-form.html:119 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:34 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:9 msgid "Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." msgstr "Det er valfritt Ã¥ oppgje eit passord, men om du gjer det vil det verta enklare for deg Ã¥ rapportera problem, leggja inn oppdateringar og halda oversyn over rapportane dine" @@ -2427,18 +2314,17 @@ msgstr "Spørjeskjema fylt inn av feilrapportøren" #: templates/web/base/alert/_list.html:22 #: templates/web/base/around/display_location.html:1 #: templates/web/base/around/display_location.html:3 -#: templates/web/base/report/display.html:50 +#: templates/web/base/report/display_tools.html:34 #: templates/web/base/reports/_rss.html:1 #: templates/web/fixmystreet/alert/updates.html:9 -#: templates/web/fixmystreet/report/display.html:58 msgid "RSS feed" msgstr "RSS-straum" -#: perllib/FixMyStreet/Cobrand/UK.pm:250 perllib/FixMyStreet/Cobrand/UK.pm:262 +#: perllib/FixMyStreet/Cobrand/UK.pm:251 perllib/FixMyStreet/Cobrand/UK.pm:263 msgid "RSS feed for %s" msgstr "RSS-straum for %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:256 perllib/FixMyStreet/Cobrand/UK.pm:268 +#: perllib/FixMyStreet/Cobrand/UK.pm:257 perllib/FixMyStreet/Cobrand/UK.pm:269 msgid "RSS feed for %s ward, %s" msgstr "RSS-straum for %s bydel, %s" @@ -2446,11 +2332,11 @@ msgstr "RSS-straum for %s bydel, %s" #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:163 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:173 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:181 -#: perllib/FixMyStreet/Cobrand/UK.pm:276 perllib/FixMyStreet/Cobrand/UK.pm:288 +#: perllib/FixMyStreet/Cobrand/UK.pm:277 perllib/FixMyStreet/Cobrand/UK.pm:289 msgid "RSS feed of %s" msgstr "RSS-straum frÃ¥ %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:281 perllib/FixMyStreet/Cobrand/UK.pm:293 +#: perllib/FixMyStreet/Cobrand/UK.pm:282 perllib/FixMyStreet/Cobrand/UK.pm:294 msgid "RSS feed of %s, within %s ward" msgstr "RSS-straum av %s, innanfor %s bydel" @@ -2462,15 +2348,15 @@ msgstr "RSS-straum med problem i nærleiken" msgid "RSS feed of problems in this %s" msgstr "RSS-straum for problem i denne %s-en" -#: perllib/FixMyStreet/Cobrand/Default.pm:643 +#: perllib/FixMyStreet/Cobrand/Default.pm:664 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:121 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:138 -#: perllib/FixMyStreet/Cobrand/UK.pm:214 +#: perllib/FixMyStreet/Cobrand/UK.pm:215 msgid "RSS feed of problems within %s" msgstr "RSS-straum for problem innanfor %s" #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:127 -#: perllib/FixMyStreet/Cobrand/UK.pm:220 +#: perllib/FixMyStreet/Cobrand/UK.pm:221 msgid "RSS feed of problems within %s ward" msgstr "RSS-straum for problem innanfor %s bydel" @@ -2479,25 +2365,22 @@ msgstr "RSS-straum for problem innanfor %s bydel" msgid "RSS feed of recent local problems" msgstr "RSS-straum med nye lokale problem" -#: templates/web/base/report/display.html:50 +#: templates/web/base/report/display_tools.html:34 #: templates/web/fixmystreet/alert/updates.html:9 -#: templates/web/fixmystreet/report/display.html:58 msgid "RSS feed of updates to this problem" msgstr "RSS-straum med oppdateringar for dette problemet" #: templates/web/base/alert/updates.html:9 -#: templates/web/base/report/display.html:41 +#: templates/web/base/report/display_tools.html:36 #: templates/web/fixmystreet/alert/updates.html:14 -#: templates/web/fixmystreet/report/display.html:60 msgid "Receive email when updates are left on this problem." msgstr "Motta e-post nÃ¥r det er oppdateringar pÃ¥ dette problemet" #. ("%s is the site name") #: templates/web/base/around/display_location.html:0 #: templates/web/base/around/display_location.html:33 -#, fuzzy msgid "Recent local problems, %s" -msgstr "Nye lokale problem, FiksGataMi." +msgstr "" #: templates/web/base/reports/index.html:24 msgid "Recently <br>fixed" @@ -2515,8 +2398,8 @@ msgstr "Hugs at FiksGataMi primert er laga for Ã¥ rapportera fysiske problem som msgid "Remove flag" msgstr "Fjern flagg" -#: templates/web/base/admin/report_edit.html:92 -#: templates/web/base/admin/update_edit.html:62 +#: templates/web/base/admin/report_edit.html:93 +#: templates/web/base/admin/update_edit.html:67 #: templates/web/zurich/admin/update_edit.html:35 msgid "Remove photo (can't be undone!)" msgstr "Fjern bilete (kan ikkje gjerast om!)" @@ -2536,7 +2419,7 @@ msgstr "" msgid "Report a problem" msgstr "Rapporter eit problem" -#: templates/web/fixmystreet/report/display.html:32 +#: templates/web/base/report/display_tools.html:8 msgid "Report abuse" msgstr "" @@ -2545,7 +2428,8 @@ msgid "Report on %s" msgstr "Rapport pÃ¥ %s" #: templates/web/base/report/new/fill_in_details_form.html:1 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:2 +#: templates/web/base/report/new/login_success_form.html:1 +#: templates/web/base/report/new/oauth_email_form.html:1 msgid "Report your problem" msgstr "" @@ -2554,9 +2438,8 @@ msgstr "" msgid "Report, view, or discuss local problems" msgstr "Rapporter, finn eller diskuter lokale problem" -#: perllib/FixMyStreet/DB/Result/Problem.pm:585 -#: templates/web/base/contact/index.html:50 -#: templates/web/fixmystreet/contact/index.html:65 +#: perllib/FixMyStreet/DB/Result/Problem.pm:573 +#: templates/web/base/contact/index.html:57 msgid "Reported anonymously at %s" msgstr "Rapportert anonymt %s" @@ -2565,43 +2448,41 @@ msgstr "Rapportert anonymt %s" msgid "Reported before" msgstr "Rapportert tidlegare" -#: perllib/FixMyStreet/DB/Result/Problem.pm:608 -#: templates/web/base/contact/index.html:52 -#: templates/web/fixmystreet/contact/index.html:67 +#: perllib/FixMyStreet/DB/Result/Problem.pm:596 +#: templates/web/base/contact/index.html:59 msgid "Reported by %s at %s" msgstr "Publisert av %s %s" #: templates/web/zurich/admin/report_edit-sdm.html:58 #: templates/web/zurich/admin/report_edit.html:86 -#, fuzzy msgid "Reported by:" -msgstr "Rapportert %s" +msgstr "" #: templates/web/zurich/report/_main.html:2 msgid "Reported in the %s category" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:581 +#: perllib/FixMyStreet/DB/Result/Problem.pm:569 msgid "Reported in the %s category anonymously at %s" msgstr "Rapportert i kategorien %s anonymt %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:603 +#: perllib/FixMyStreet/DB/Result/Problem.pm:591 msgid "Reported in the %s category by %s at %s" msgstr "Rapportert i kategorien %s av %s %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:577 +#: perllib/FixMyStreet/DB/Result/Problem.pm:565 msgid "Reported via %s anonymously at %s" msgstr "Publisert av %s anonymt %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:599 +#: perllib/FixMyStreet/DB/Result/Problem.pm:587 msgid "Reported via %s by %s at %s" msgstr "Rapportert av %s av %s %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:573 +#: perllib/FixMyStreet/DB/Result/Problem.pm:561 msgid "Reported via %s in the %s category anonymously at %s" msgstr "Rapportert av %s i kategorien %s anonymt %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:593 +#: perllib/FixMyStreet/DB/Result/Problem.pm:581 msgid "Reported via %s in the %s category by %s at %s" msgstr "Rapportert av %s i kategorien %s av %s %s" @@ -2611,9 +2492,8 @@ msgstr "" #: templates/web/zurich/admin/report_edit-sdm.html:36 #: templates/web/zurich/admin/report_edit.html:55 -#, fuzzy msgid "Reported:" -msgstr "Rapportert %s" +msgstr "" #: templates/web/base/around/index.html:2 #: templates/web/base/js/translation_strings.html:41 @@ -2623,13 +2503,13 @@ msgstr "Rapportert %s" msgid "Reporting a problem" msgstr "Legger til eit problem" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1277 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1286 #: perllib/FixMyStreet/Cobrand/Zurich.pm:384 #: templates/web/zurich/header.html:60 msgid "Reports" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:327 perllib/FixMyStreet/Cobrand/UK.pm:331 +#: perllib/FixMyStreet/Cobrand/UK.pm:328 perllib/FixMyStreet/Cobrand/UK.pm:332 msgid "Reports are limited to %s characters in length. Please shorten your report" msgstr "" @@ -2666,15 +2546,17 @@ msgstr "Vegoperatør for denne namngjevne vegen (utleia frÃ¥ vegreferansenummer msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "Vegoperatør for denne namngjevne vegen (frÃ¥ OpenStreetMap): %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1495 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1500 -#: templates/web/base/admin/report_edit.html:88 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1508 +#: templates/web/base/admin/report_edit.html:90 +#: templates/web/base/admin/update_edit.html:64 #: templates/web/zurich/admin/report_edit.html:116 msgid "Rotate Left" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1495 -#: templates/web/base/admin/report_edit.html:89 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 +#: templates/web/base/admin/report_edit.html:91 +#: templates/web/base/admin/update_edit.html:65 #: templates/web/zurich/admin/report_edit.html:117 msgid "Rotate Right" msgstr "" @@ -2684,7 +2566,6 @@ msgid "Rotating this photo will discard unsaved changes to the report." msgstr "" #: templates/web/base/js/translation_strings.html:46 -#: templates/web/base/maps/google-ol.html:13 msgid "Satellite" msgstr "" @@ -2737,16 +2618,14 @@ msgid "Select an area" msgstr "" #: templates/web/base/alert/_list.html:10 -#, fuzzy msgid "Select which type of alert you’d like and click the button for an RSS feed, or enter your email address to subscribe to an email alert." -msgstr "Vel kva for ein type varsel du ynskjer og klikk pÃ¥ knappen for ei RSS-kjelde, eller skriv inn e-postadressa di for Ã¥ abonnera pÃ¥ eit e-postvarsel." +msgstr "" #: perllib/FixMyStreet/Cobrand/Zurich.pm:835 -#, fuzzy msgid "Sent report back" -msgstr "Opne rapportar" +msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:708 +#: perllib/FixMyStreet/DB/Result/Problem.pm:696 msgid "Sent to %s %s later" msgstr "Sendt til %s %s seinare" @@ -2759,15 +2638,13 @@ msgstr "Sendt:" msgid "Service:" msgstr "Teneste:" -#: templates/web/fixmystreet/report/display.html:38 +#: templates/web/base/report/display_tools.html:14 msgid "Share" msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:193 -#: templates/web/base/report/update-form.html:158 -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:23 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:59 -#: templates/web/fixmystreet/report/update-form.html:146 +#: templates/web/base/report/new/form_user_loggedin.html:23 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:22 +#: templates/web/base/report/update/form_name.html:15 msgid "Show my name publicly" msgstr "Vis namnet mitt offentleg" @@ -2779,9 +2656,9 @@ msgstr "" msgid "Show pins" msgstr "Vis nÃ¥ler" +#: templates/web/base/auth/general.html:100 #: templates/web/base/auth/general.html:3 -#: templates/web/base/auth/general.html:40 -#: templates/web/base/auth/general.html:61 +#: templates/web/base/auth/general.html:76 #: templates/web/zurich/auth/general.html:18 #: templates/web/zurich/auth/general.html:35 msgid "Sign in" @@ -2808,7 +2685,7 @@ msgid "" " sent from your FixMyStreet installation." msgstr "" -#: templates/web/base/alert/index.html:42 +#: templates/web/base/alert/index.html:40 msgid "Some photos of recent reports" msgstr "Nokre bilete av nyleg melde problem" @@ -2818,7 +2695,7 @@ msgstr "Nokre bilete av nyleg melde problem" msgid "Some text to localize" msgstr "Noko tekst Ã¥ omsetja" -#: perllib/FixMyStreet/Cobrand/UK.pm:78 +#: perllib/FixMyStreet/Cobrand/UK.pm:79 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover." msgstr "Orsak, det ser ut til Ã¥ vera eit «Crown dependency»-postnummer, som vi ikkje dekkjer." @@ -2830,22 +2707,33 @@ msgstr "" msgid "Sorry, there has been an error confirming your problem." msgstr "Orsak, men det oppstod eit problem nÃ¥r vi freista Ã¥ stadfesta problemrapporten din" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:221 -#: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:37 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:216 +#: perllib/FixMyStreet/Geocode.pm:38 perllib/FixMyStreet/Geocode/Bing.pm:38 #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:56 #: perllib/FixMyStreet/Geocode/OSM.pm:48 msgid "Sorry, we could not find that location." msgstr "Orsak, vi kunne ikkje finna den staden." -#: perllib/FixMyStreet/Geocode/Bing.pm:34 +#: templates/web/base/auth/general.html:9 +#: templates/web/base/report/display.html:21 +#: templates/web/base/report/new/fill_in_details_form.html:23 +#, fuzzy +msgid "Sorry, we could not log you in. Please fill in the form below." +msgstr "Orsak, vi kunne ikkje tolka den posisjonen. Ver venleg og prøv pÃ¥ nytt." + +#: perllib/FixMyStreet/Geocode/Bing.pm:35 #: perllib/FixMyStreet/Geocode/Google.pm:45 #: perllib/FixMyStreet/Geocode/Zurich.pm:88 msgid "Sorry, we could not parse that location. Please try again." msgstr "Orsak, vi kunne ikkje tolka den posisjonen. Ver venleg og prøv pÃ¥ nytt." #: perllib/FixMyStreet/App/Model/PhotoSet.pm:134 -#, fuzzy msgid "Sorry, we couldn't save your image(s), please try again." +msgstr "" + +#: perllib/FixMyStreet/App/Controller/AuthSS.pm:301 +#, fuzzy +msgid "Sorry, you can not log in with Facebook. Please try again later." msgstr "Orsak, vi kunne ikkje tolka den posisjonen. Ver venleg og prøv pÃ¥ nytt." #: templates/web/base/admin/stats.html:64 @@ -2856,13 +2744,12 @@ msgstr "" #: templates/web/base/admin/flagged.html:18 #: templates/web/base/admin/list_updates.html:11 #: templates/web/base/admin/reports.html:15 -#: templates/web/fixmystreet/report/update-form.html:26 +#: templates/web/base/report/update/form_update.html:32 msgid "State" msgstr "Tilstand" #: templates/web/base/admin/report_edit.html:47 #: templates/web/base/admin/update_edit.html:27 -#: templates/web/base/report/update-form.html:28 #: templates/web/zurich/admin/report_edit-sdm.html:73 #: templates/web/zurich/admin/report_edit.html:101 #: templates/web/zurich/admin/report_edit.html:155 @@ -2870,7 +2757,7 @@ msgstr "Tilstand" msgid "State:" msgstr "Tilstand:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1282 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1291 #: perllib/FixMyStreet/Cobrand/Zurich.pm:387 #: templates/web/base/admin/stats.html:1 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:73 @@ -2892,7 +2779,7 @@ msgstr "" msgid "Street View" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:406 +#: perllib/FixMyStreet/Script/Reports.pm:184 msgid "Subcategory: %s" msgstr "" @@ -2900,30 +2787,25 @@ msgstr "" msgid "Subdivision/Body" msgstr "" -#: templates/web/fixmystreet/contact/index.html:98 +#: templates/web/base/contact/index.html:90 msgid "Subject" msgstr "" #: templates/web/base/admin/report_edit.html:19 -#: templates/web/base/contact/index.html:88 -#: templates/web/base/report/new/fill_in_details_form.html:53 #: templates/web/zurich/admin/report_edit.html:39 msgid "Subject:" msgstr "Emne:" #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/fill_in_details_form.html:137 -#: templates/web/base/report/new/fill_in_details_form.html:159 -#: templates/web/base/report/new/fill_in_details_form.html:96 -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:36 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:23 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:76 +#: templates/web/base/report/new/form_user_loggedin.html:36 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:39 +#: templates/web/base/report/new/form_user_loggedout_password.html:11 #: templates/web/zurich/report/new/fill_in_details_form.html:96 msgid "Submit" msgstr "Send inn" -#: templates/web/base/admin/report_edit.html:95 -#: templates/web/base/admin/update_edit.html:65 +#: templates/web/base/admin/report_edit.html:101 +#: templates/web/base/admin/update_edit.html:75 #: templates/web/base/admin/user-form.html:56 #: templates/web/zurich/admin/report_edit-sdm.html:137 #: templates/web/zurich/admin/report_edit.html:268 @@ -2931,7 +2813,7 @@ msgstr "Send inn" msgid "Submit changes" msgstr "Send inn endringar" -#: templates/web/base/questionnaire/index.html:97 +#: templates/web/base/questionnaire/index.html:106 msgid "Submit questionnaire" msgstr "Send inn spørjeskjema" @@ -2947,9 +2829,8 @@ msgid "Submitted" msgstr "" #: templates/web/base/alert/updates.html:17 -#: templates/web/base/report/display.html:46 +#: templates/web/base/report/display_tools.html:41 #: templates/web/fixmystreet/alert/updates.html:23 -#: templates/web/fixmystreet/report/display.html:65 msgid "Subscribe" msgstr "Abonner" @@ -2957,7 +2838,7 @@ msgstr "Abonner" msgid "Subscribe me to an email alert" msgstr "Eg ynskjer Ã¥ abonnera pÃ¥ e-postvarsel" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1275 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1284 #: perllib/FixMyStreet/Cobrand/Zurich.pm:383 #: templates/web/base/admin/bodies.html:25 #: templates/web/base/admin/index.html:1 @@ -2976,7 +2857,7 @@ msgstr "Oppsummering" msgid "Summary reports" msgstr "Oppsummeringsrapportar" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1279 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1288 msgid "Survey" msgstr "" @@ -2990,9 +2871,8 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/Zurich.pm:394 #: templates/web/zurich/header.html:77 -#, fuzzy msgid "Templates" -msgstr "Oppdateringar" +msgstr "" #: templates/web/base/admin/list_updates.html:12 #: templates/web/zurich/admin/templates.html:9 @@ -3013,7 +2893,7 @@ msgstr "Tekst:" msgid "Thank you for reporting this issue!" msgstr "" -#: templates/web/base/tokens/error.html:7 +#: templates/web/base/tokens/error.html:6 msgid "Thank you for trying to confirm your update or problem. We seem to have an error ourselves though, so <a href=\"%s\">please let us know what went on</a> and we'll look into it." msgstr "" "Takk for at du freistar Ã¥ stadfesta oppdateringa di eller problemet\n" @@ -3051,23 +2931,23 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:47 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:63 -#: perllib/FixMyStreet/Cobrand/UK.pm:71 +#: perllib/FixMyStreet/Cobrand/UK.pm:72 msgid "That postcode was not recognised, sorry." msgstr "Det postnummeret vart ikkje gjenkjent, orsak." -#: perllib/FixMyStreet/App/Controller/Admin.pm:726 +#: perllib/FixMyStreet/App/Controller/Admin.pm:724 msgid "That problem has been marked as sent." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:718 +#: perllib/FixMyStreet/App/Controller/Admin.pm:716 msgid "That problem will now be resent." msgstr "Det problemet vil no sendast pÃ¥ nytt." -#: perllib/FixMyStreet/App/Controller/Report.pm:125 +#: perllib/FixMyStreet/App/Controller/Report.pm:127 msgid "That report cannot be viewed on %s." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:119 +#: perllib/FixMyStreet/App/Controller/Report.pm:121 msgid "That report has been removed from FixMyStreet." msgstr "Den rapporten har vorte fjerna frÃ¥ FiksGataMi." @@ -3098,7 +2978,7 @@ msgid "" " If you leave this blank, <strong>send method defaults to email</strong>." msgstr "" -#: templates/web/base/open311/index.html:90 +#: templates/web/base/open311/index.html:82 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 "Open311 v2-attributten agency_responsible vert brukt for Ã¥ lista opp administrasjonane som mottok problemrapporten, noko som ikkje heilt passar med korleis attributten er definert i Open311 v2-spesifikasjonen." @@ -3119,12 +2999,12 @@ msgstr "" msgid "The diligency prize league table shows editors' activity (who's been editing the most records)." msgstr "" -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:60 -#: perllib/FixMyStreet/App/Controller/Reports.pm:79 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:61 +#: perllib/FixMyStreet/App/Controller/Reports.pm:80 msgid "The error was: %s" msgstr "Feilen var: %s" -#: templates/web/base/open311/index.html:86 +#: templates/web/base/open311/index.html:78 msgid "The following Open311 v2 attributes are returned for each request: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code and service_name." msgstr "Dei følgjande Open311 v2-attributtene vert returnerte for kvar førespurnad: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code og service_name." @@ -3171,8 +3051,7 @@ msgstr "" msgid "The passwords do not match" msgstr "Passorda er ikkje like" -#: templates/web/base/errors/page_error_404_not_found.html:10 -#: templates/web/base/errors/page_error_404_not_found.html:12 +#: templates/web/base/errors/page_error_404_not_found.html:9 msgid "The requested URL '%s' was not found on this server" msgstr "Fann ikkje URL-en «%s» pÃ¥ denne tenaren" @@ -3182,12 +3061,11 @@ msgstr "Den enklaste meldinga er den geografiske:" #: templates/web/base/report/new/councils_extra_text.html:1 #: templates/web/base/report/new/councils_text_some.html:10 -#: templates/web/base/report/new/fill_in_details_form.html:18 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:14 +#: templates/web/base/report/new/fill_in_details_form.html:13 msgid "The summary and description will also be made public (see our <a href=\"/privacy\">privacy policy</a>)." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:315 +#: perllib/FixMyStreet/Script/Reports.pm:92 msgid "The user could not locate the problem on a map, but to see the area around the location they entered" msgstr "Brukaren kunne ikkje plassera problemet pÃ¥ eit kart, men sjekk omrÃ¥dde rundt staden dei skreiv inn" @@ -3204,18 +3082,18 @@ msgstr "" msgid "There are no reports to show." msgstr "" -#: perllib/FixMyStreet/App/Controller/Reports.pm:76 +#: perllib/FixMyStreet/App/Controller/Reports.pm:77 msgid "There was a problem showing the All Reports page. Please try again later." msgstr "Det oppstod problem med Ã¥ visa «Alle rapportar»-sida. Ver venleg og prøv igjen seinare." #: perllib/FixMyStreet/App/Controller/Contact.pm:137 -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:59 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:60 msgid "There was a problem showing this page. Please try again later." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:769 -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:134 -#: templates/web/base/auth/general.html:26 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:764 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:138 +#: templates/web/base/auth/general.html:43 #: templates/web/zurich/auth/general.html:28 msgid "There was a problem with your email/password combination. If you cannot remember your password, or do not have one, please fill in the ‘sign in by email’ section of the form." msgstr "" @@ -3224,7 +3102,7 @@ msgstr "" msgid "There was a problem with your email/password combination. Please try again." msgstr "Det var problem med e-post/passord-kombinasjonen din. Ver venleg og prøv igjen." -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:272 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:336 msgid "There was a problem with your update. Please try again." msgstr "Det var problem med oppdateringa di. Ver venleg og prøv igjen." @@ -3232,7 +3110,7 @@ msgstr "Det var problem med oppdateringa di. Ver venleg og prøv igjen." msgid "There were problems with your report. Please see below." msgstr "Det var problem med rapporten din. Ver venleg og sjÃ¥ under." -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:300 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:371 msgid "There were problems with your update. Please see below." msgstr "Det var problem med oppdateringa di. Ver venleg og sjÃ¥ under." @@ -3246,7 +3124,7 @@ msgid "" " " msgstr "" -#: templates/web/base/open311/index.html:77 +#: templates/web/base/open311/index.html:69 msgid "This API implementation is work in progress and not yet stabilized. It will change without warnings in the future." msgstr "Denne API-implementasjonen er under arbeid og ikkje enno stabil. Han vil endra seg utan Ã¥tvaring i framtida." @@ -3268,18 +3146,18 @@ msgid "" " A body will not receive any reports unless it covers at least one area." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:413 +#: perllib/FixMyStreet/Script/Reports.pm:191 msgid "This email has been sent to both councils covering the location of the problem, as the user did not categorise it; please ignore it if you're not the correct council to deal with the issue, or let us know what category of problem this is so we can add it to our system." msgstr "Denne e-posten er sendt til begge administrasjonane som dekkjer staden for problemet, sidan brukaren ikkje kategoriserte det. Ver venleg og ignorer e-posten viss de ikkje er korrekt administrasjon for Ã¥ handtera denne saka, eller gjev oss melding om kva for ein kategori av problem dette er sÃ¥ vi kan leggja det til i systemet vÃ¥rt." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:416 +#: perllib/FixMyStreet/Script/Reports.pm:194 msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue." msgstr "Denne e-posten er sendt til fleire administrasjonar som dekkjer staden for problemet, sidan den valde kategorien er tilgjengeleg for desse. Ver venleg og ignorer e-posten viss de ikkje er korrekt administrasjon for Ã¥ handtera denne saka." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:925 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:995 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:920 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:990 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:142 -#: perllib/FixMyStreet/Cobrand/UK.pm:43 +#: perllib/FixMyStreet/Cobrand/UK.pm:44 msgid "This information is required" msgstr "Denne informasjonen er pÃ¥kravd" @@ -3291,56 +3169,37 @@ msgstr "Dette er ein utviklarnettstad. Ting kan knekka nÃ¥r som helst og databas msgid "This is a summary of all reports on this site." msgstr "" -#: templates/web/zurich/auth/token.html:8 -msgid "This may be because the link is too old or already used, or the address was not copied correctly." -msgstr "" - -#: templates/web/base/report/banner.html:15 -msgid "This problem has been closed" -msgstr "Dette problemet er lukka" - -#: templates/web/base/report/banner.html:12 -#: templates/web/base/report/update-form.html:48 -#: templates/web/fixmystreet/report/update-form.html:46 +#: templates/web/base/report/update/form_update.html:52 msgid "This problem has been fixed" msgstr "Dette problemet er løyst" -#: templates/web/base/report/update-form.html:43 -#: templates/web/fixmystreet/report/update-form.html:40 +#: templates/web/base/report/update/form_update.html:46 msgid "This problem has not been fixed" msgstr "Dette problemet har ikkje vorte løyst" -#: templates/web/base/report/banner.html:19 -msgid "This problem is in progress" -msgstr "Dette problemet er under arbeid" - -#: templates/web/base/report/banner.html:9 -msgid "This problem is old and of unknown status." -msgstr "Dette problemet er gammalt og med ukjend status." - #: perllib/FixMyStreet/Cobrand/Zurich.pm:168 #: perllib/FixMyStreet/Cobrand/Zurich.pm:169 #: templates/web/zurich/report/_main.html:14 msgid "This report is awaiting moderation." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:86 +#: perllib/FixMyStreet/Script/Alerts.pm:94 msgid "This report is currently marked as closed." msgstr "Denne rapporten er for tida markert som lukka." -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:84 +#: perllib/FixMyStreet/Script/Alerts.pm:92 msgid "This report is currently marked as fixed." msgstr "Denne rapporten er for tida markert som fiksa." -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:88 +#: perllib/FixMyStreet/Script/Alerts.pm:96 msgid "This report is currently marked as open." msgstr "Denne rapporten er for tida markert som open." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:326 +#: perllib/FixMyStreet/Script/Reports.pm:105 msgid "This report was submitted anonymously" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:308 +#: perllib/FixMyStreet/Script/Reports.pm:85 msgid "This web page also contains a photo of the problem, provided by the user." msgstr "Denne nettsida inneheld òg eit bilete av problemet, sendt inn av brukaren." @@ -3351,7 +3210,7 @@ msgstr "Denne nettsida inneheld òg eit bilete av problemet, sendt inn av brukar msgid "Time spent (in minutes):" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1278 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1287 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "Tidslinje" @@ -3363,9 +3222,8 @@ msgid "Title" msgstr "Tittel" #: templates/web/zurich/admin/template_edit.html:20 -#, fuzzy msgid "Title:" -msgstr "Tittel" +msgstr "" #: templates/web/base/alert/index.html:25 msgid "To find out what local alerts we have for you, please enter your %s postcode or street name and area:" @@ -3375,11 +3233,11 @@ msgstr "" msgid "To find out what local alerts we have for you, please enter your postcode or street name and area" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:314 +#: perllib/FixMyStreet/Script/Reports.pm:91 msgid "To view a map of the precise location of this issue" msgstr "For Ã¥ sjÃ¥ eit kart med ei meir presis plassering for dette problemet" -#: templates/web/base/admin/index.html:61 +#: templates/web/base/admin/index.html:54 #: templates/web/base/admin/questionnaire.html:24 #: templates/web/base/admin/stats.html:24 #: templates/web/base/admin/stats.html:43 @@ -3397,10 +3255,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:12 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:33 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:31 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:37 msgid "Unable to fix" msgstr "" @@ -3413,7 +3269,7 @@ msgstr "" msgid "Unconfirmed" msgstr "Ikkje stadfesta" -#: templates/web/fixmystreet/report/banner.html:9 +#: templates/web/base/report/banner.html:9 msgid "Unknown" msgstr "" @@ -3421,17 +3277,18 @@ msgstr "" msgid "Unknown alert type" msgstr "Ukjend varsel-type" +#: perllib/FixMyStreet/App/Controller/Photo.pm:110 #: templates/web/base/js/translation_strings.html:39 msgid "Unknown error" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:103 -#: perllib/FixMyStreet/App/Controller/Report.pm:109 -#: perllib/FixMyStreet/App/Controller/Report.pm:112 +#: perllib/FixMyStreet/App/Controller/Report.pm:105 +#: perllib/FixMyStreet/App/Controller/Report.pm:111 +#: perllib/FixMyStreet/App/Controller/Report.pm:114 msgid "Unknown problem ID" msgstr "Ukjend problem-ID" -#: templates/web/fixmystreet/report/update-form.html:19 +#: templates/web/base/report/update/form_update.html:25 msgid "Update" msgstr "" @@ -3439,13 +3296,11 @@ msgstr "" msgid "Update %s created for problem %d; by %s" msgstr "Oppdatering %s oppretta for problem %d, av %s" -#: templates/web/base/contact/index.html:21 -#: templates/web/fixmystreet/contact/index.html:36 +#: templates/web/base/contact/index.html:28 msgid "Update below added anonymously at %s" msgstr "Oppdateringa under vart lagt inn anonymt %s" -#: templates/web/base/contact/index.html:23 -#: templates/web/fixmystreet/contact/index.html:38 +#: templates/web/base/contact/index.html:30 msgid "Update below added by %s at %s" msgstr "Oppdateringa under vart lagt til av %s %s" @@ -3454,7 +3309,7 @@ msgstr "Oppdateringa under vart lagt til av %s %s" msgid "Update body" msgstr "" -#: templates/web/base/admin/index.html:55 +#: templates/web/base/admin/index.html:48 msgid "Update breakdown by state" msgstr "Tilstandsfordeling for oppdateringar" @@ -3479,20 +3334,16 @@ msgstr "Ei oppdatering gjenopna problemet" msgid "Update statuses" msgstr "Oppdater tilstanden" -#: templates/web/base/report/update-form.html:22 -msgid "Update:" -msgstr "Oppdatering:" - #: templates/web/zurich/admin/index-dm.html:23 #: templates/web/zurich/admin/index-sdm.html:21 #: templates/web/zurich/admin/reports.html:13 msgid "Updated" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1045 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1103 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1147 -#: perllib/FixMyStreet/App/Controller/Admin.pm:822 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1048 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1108 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1156 +#: perllib/FixMyStreet/App/Controller/Admin.pm:821 #: perllib/FixMyStreet/Cobrand/Zurich.pm:771 #: perllib/FixMyStreet/Cobrand/Zurich.pm:796 #: perllib/FixMyStreet/Cobrand/Zurich.pm:866 @@ -3500,13 +3351,12 @@ msgid "Updated!" msgstr "Oppdatert!" #: templates/web/base/admin/list_updates.html:2 -#: templates/web/base/report/update.html:3 -#: templates/web/fixmystreet/report/update.html:5 +#: templates/web/base/report/update.html:5 #: templates/web/zurich/report/updates.html:2 msgid "Updates" msgstr "Oppdateringar" -#: perllib/FixMyStreet/DB/Result/Comment.pm:132 +#: perllib/FixMyStreet/DB/Result/Comment.pm:131 msgid "Updates are limited to %s characters in length. Please shorten your update" msgstr "" @@ -3516,12 +3366,9 @@ msgstr "Oppdateringar av {{title}}" #. ("%s is the site name") #: templates/web/base/report/display.html:0 -#: templates/web/base/report/display.html:5 -#: templates/web/fixmystreet/report/display.html:0 -#: templates/web/fixmystreet/report/display.html:9 -#, fuzzy +#: templates/web/base/report/display.html:9 msgid "Updates to this problem, %s" -msgstr "Oppdateringar til dette problemet, FiksGataMi" +msgstr "" #: templates/web/base/admin/body.html:182 msgid "Use the <strong>note</strong> to record details that are only displayed in the admin. Notes are not shown publicly, and are not sent to the body." @@ -3529,15 +3376,14 @@ msgstr "" #: templates/web/zurich/admin/report_edit-sdm.html:48 #: templates/web/zurich/admin/report_edit.html:67 -#, fuzzy msgid "Used map" -msgstr "brukte kart" +msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1452 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1461 msgid "User flag removed" msgstr "Brukarflagg fjerna" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1424 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1433 msgid "User flagged" msgstr "Brukar flagga" @@ -3545,7 +3391,7 @@ msgstr "Brukar flagga" msgid "User search finds matches in users' names and email addresses." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1280 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1289 #: perllib/FixMyStreet/Cobrand/Zurich.pm:399 #: templates/web/base/admin/flagged.html:29 #: templates/web/zurich/header.html:69 @@ -3576,7 +3422,6 @@ msgid "Viewing a location" msgstr "Ser pÃ¥ ein stad" #: templates/web/base/report/display.html:0 -#: templates/web/fixmystreet/report/display.html:0 msgid "Viewing a problem" msgstr "Ser pÃ¥ eit problem" @@ -3589,25 +3434,24 @@ msgstr "Bydelar innanfor denne administrasjonen" 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 "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/zurich/auth/token.html:7 -msgid "We have not been able to confirm your account - sorry." -msgstr "" - -#: templates/web/zurich/auth/token.html:17 -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 din." +#: templates/web/base/auth/general.html:6 +#: templates/web/base/report/display.html:27 +#: templates/web/base/report/new/oauth_email_form.html:5 +#, fuzzy +msgid "We need your email address, please give it below." +msgstr "(vi viser aldri e-postadressa di eller telefonnummeret ditt)" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:2 -#: templates/web/fixmystreet/report/update-form.html:77 +#: templates/web/base/report/new/form_user_loggedout_email.html:2 +#: templates/web/base/report/update/form_user_loggedout_email.html:2 msgid "We never show your email" msgstr "" -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:31 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:65 +#: templates/web/base/report/new/form_user_loggedin.html:31 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:28 msgid "We never show your email address or phone number." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:422 +#: perllib/FixMyStreet/Script/Reports.pm:200 msgid "We realise this problem might be the responsibility of %s; however, we don't currently have any contact details for them. If you know of an appropriate contact address, please do get in touch." msgstr "Vi innser at %s kan vera ansvarleg for dette problemet, men vi manglar for tida kontaktinformasjon for dei. Viss du veit om ei eigna kontaktadresse, ta kontakt med oss." @@ -3624,10 +3468,6 @@ msgstr "" msgid "We’re sorry to hear the problem’s not fixed. Why not try writing to your local representatives?" msgstr "" -#: templates/web/base/contact/blurb.html:8 -msgid "We'd love to hear what you think about this site. Just fill in the form, or send an email to <a href='mailto:%s'>%s</a>:" -msgstr "Vi ynskjer Ã¥ fÃ¥ tilbakemelding frÃ¥ deg om kva du meiner om denne tenesta. Berre fyll ut skjemaet, eller send ein e-post <a href='mailto:%s'>%s</a>:" - #: templates/web/base/contact/submit.html:7 msgid "We’ll get back to you as soon as we can." msgstr "" @@ -3636,7 +3476,7 @@ msgstr "" msgid "What was your experience of getting the problem fixed?" msgstr "" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:49 +#: templates/web/base/report/new/form_report.html:19 msgid "What’s the issue, and where is it?" msgstr "" @@ -3649,7 +3489,11 @@ msgstr "NÃ¥r redigert" msgid "When sent" msgstr "NÃ¥r sendt" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:640 +#: templates/web/base/js/translation_strings.html:50 +msgid "Whoa there Testino! Three photos are enough." +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Report/New.pm:635 msgid "Whole block of empty flats" msgstr "Heil blokk med tomme leilegheiter" @@ -3664,7 +3508,7 @@ msgstr "" msgid "Wish" msgstr "" -#: templates/web/base/open311/index.html:92 +#: templates/web/base/open311/index.html:84 msgid "With request searches, it is also possible to search for agency_responsible to limit the requests to those sent to a single administration. The search term is the administration ID provided by <a href=\"%s\">MaPit</a>." msgstr "NÃ¥r du søkjer etter førespurnader, sÃ¥ er det òg mogleg Ã¥ søkja etter agency_responsible for Ã¥ avgrensa det til førespurnader som er sendt til ein einskild adminstrasjon. Søkjetermen er administrasjonssida som du fÃ¥r frÃ¥ <a href=\"%s\">MaPit</a>." @@ -3672,7 +3516,7 @@ msgstr "NÃ¥r du søkjer etter førespurnader, sÃ¥ er det òg mogleg Ã¥ søkja et msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"http://fixmystreet.org\">available at fixmystreet.org</a>." msgstr "" -#: templates/web/base/questionnaire/index.html:87 +#: templates/web/base/questionnaire/index.html:96 msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?" msgstr "Kunne du tenkja deg Ã¥ motta ein ny førespurnad om 4 veker, som minner deg om Ã¥ sjekka status?" @@ -3681,7 +3525,6 @@ msgid "Writing your message entirely in block capitals makes it hard to read, as msgstr "NÃ¥r du skriv meldinga di med berre store bokstavar vert ho vanskeleg Ã¥ lesa. Det same gjeld manglande tegnsetting." #: templates/web/base/report/new/fill_in_details_form.html:4 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:5 msgid "Wrong location? Just click again on the map." msgstr "" @@ -3704,27 +3547,24 @@ msgstr "Ã…r" #: templates/web/base/admin/users.html:31 #: templates/web/base/questionnaire/creator_fixed.html:14 #: templates/web/base/questionnaire/index.html:51 -#: templates/web/base/questionnaire/index.html:90 +#: templates/web/base/questionnaire/index.html:99 msgid "Yes" msgstr "Ja" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:17 -#: templates/web/fixmystreet/report/update-form.html:91 +#: templates/web/base/report/new/form_user_loggedout_password.html:5 +#: templates/web/base/report/update/form_user_loggedout_password.html:4 msgid "Yes I have a password" msgstr "" -#: templates/web/base/contact/index.html:39 -#: templates/web/fixmystreet/contact/index.html:54 +#: templates/web/base/contact/index.html:46 msgid "You are complaining that this problem report was unnecessarily moderated:" msgstr "" -#: templates/web/base/contact/index.html:41 -#: templates/web/fixmystreet/contact/index.html:56 +#: templates/web/base/contact/index.html:48 msgid "You are reporting the following problem report for being abusive, containing personal information, or similar:" msgstr "Du rapporterer at følgjande problem er støytande, inneheld personleg informasjon eller liknande:" -#: templates/web/base/contact/index.html:15 -#: templates/web/fixmystreet/contact/index.html:30 +#: templates/web/base/contact/index.html:22 msgid "You are reporting the following update for being abusive, containing personal information, or similar:" msgstr "Du rapporterer at følgjande oppdatering er støytande, inneheld personleg informasjon, eller liknande:" @@ -3737,7 +3577,7 @@ msgstr "" msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create." msgstr "" -#: templates/web/fixmystreet/contact/index.html:121 +#: templates/web/base/contact/index.html:113 msgid "You can contact technical support on <a href='mailto:%s'>%s</a>" msgstr "" @@ -3748,8 +3588,8 @@ msgid "" " reports in the past." msgstr "" -#: templates/web/base/report/new/councils_text_none.html:10 -#: templates/web/base/report/new/councils_text_none.html:2 +#: templates/web/base/report/new/councils_text_none.html:12 +#: templates/web/base/report/new/councils_text_none.html:14 #: templates/web/base/report/new/councils_text_some.html:19 #: templates/web/base/report/new/councils_text_some.html:21 msgid "You can help us by finding a contact email address for local problems for %s and emailing it to us at <a href='mailto:%s'>%s</a>." @@ -3767,21 +3607,16 @@ msgstr "" msgid "You have already answered this questionnaire. If you have a question, please <a href='%s'>get in touch</a>, or <a href='%s'>view your problem</a>.\n" msgstr "Du har allereie svart pÃ¥ dette spørjeskjemaet. Viss du har spurnader, ver venleg og <a href='%s'>ta kontakt</a>, eller <a href='%s'>sjÃ¥ pÃ¥ problemet ditt</a>.\n" -#: templates/web/base/questionnaire/index.html:77 -#: templates/web/base/report/new/fill_in_details_form.html:75 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:73 -msgid "You have already attached a photo to this report, attaching another one will replace it." -msgstr "Du har allereie lagt ved eit bilete til dette problemet. Ã… leggja ved eit anna vil byta ut dette." - -#: templates/web/base/report/update-form.html:59 -#: templates/web/fixmystreet/report/update-form.html:56 -msgid "You have already attached a photo to this update, attaching another one will replace it." -msgstr "Du har allereie lagt ved eit bilete til denne oppdateringa. Ã… leggja ved eit anna vil byta ut dette." - -#: templates/web/zurich/report/new/fill_in_details_form.html:61 +#: templates/web/base/report/new/form_report.html:32 +#: templates/web/zurich/report/new/fill_in_details_form.html:55 msgid "You have already attached photos to this report. Note that you can attach a maximum of 3 to this report (if you try to upload more, the oldest will be removed)." msgstr "" +#: templates/web/base/questionnaire/index.html:83 +#: templates/web/base/report/update/form_update.html:14 +msgid "You have already attached photos to this update. Note that you can attach a maximum of 3 to this update (if you try to upload more, the oldest will be removed)." +msgstr "" + #: templates/web/base/auth/sign_out.html:4 #: templates/web/zurich/auth/sign_out.html:3 msgid "You have been signed out" @@ -3796,9 +3631,8 @@ msgstr "" msgid "You have successfully confirmed your email address." msgstr "" -#: templates/web/base/report/display.html:20 -#: templates/web/base/report/new/fill_in_details.html:37 -#: templates/web/fixmystreet/report/display.html:17 +#: templates/web/base/report/display.html:17 +#: templates/web/base/report/new/login_success_form.html:3 msgid "You have successfully signed in; please check and confirm your details are accurate:" msgstr "Du har no logga inn. Ver venleg og sjekk og stadfest at detaljane dine er korrekte:" @@ -3827,53 +3661,42 @@ msgid "Your Reports" msgstr "Rapportane dine" #: templates/web/base/alert/_list.html:89 +#: templates/web/base/contact/index.html:83 +#: templates/web/base/report/display_tools.html:38 +#: templates/web/base/report/display_tools.html:40 +#: templates/web/base/report/new/form_user_loggedin.html:3 +#: templates/web/base/report/new/form_user_loggedout_email.html:1 +#: templates/web/base/report/update/form_user_loggedout_email.html:1 #: templates/web/fixmystreet/alert/updates.html:19 #: templates/web/fixmystreet/alert/updates.html:22 -#: templates/web/fixmystreet/contact/index.html:91 -#: templates/web/fixmystreet/report/display.html:62 -#: templates/web/fixmystreet/report/display.html:64 -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:3 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:1 -#: templates/web/fixmystreet/report/update-form.html:76 #: templates/web/zurich/report/new/fill_in_details_form.html:76 msgid "Your email" msgstr "" -#: templates/web/base/auth/general.html:28 -#: templates/web/fixmystreet/report/update-form.html:82 +#: templates/web/base/auth/general.html:45 +#: templates/web/base/report/update/form_user_loggedout_email.html:7 #: templates/web/zurich/auth/general.html:30 #: templates/web/zurich/auth/general.html:58 msgid "Your email address" msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:106 -#: templates/web/base/report/update-form.html:81 -msgid "Your email:" -msgstr "E-posten din" - -#: templates/web/fixmystreet/report/updates-sidebar-notes.html:7 +#: templates/web/base/report/updates-sidebar-notes.html:3 msgid "Your information will only be used in accordance with our <a href=\"/privacy\">privacy policy</a>" msgstr "" -#: templates/web/base/auth/general.html:51 -#: templates/web/fixmystreet/contact/index.html:84 -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:18 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:54 -#: templates/web/fixmystreet/report/update-form.html:142 +#: templates/web/base/auth/general.html:90 +#: templates/web/base/contact/index.html:76 +#: templates/web/base/report/new/form_user_loggedin.html:18 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:17 +#: templates/web/base/report/update/form_name.html:11 #: templates/web/zurich/auth/general.html:61 #: templates/web/zurich/report/new/fill_in_details_form.html:86 msgid "Your name" msgstr "" -#: templates/web/base/contact/index.html:73 -#: templates/web/base/report/new/fill_in_details_form.html:186 -#: templates/web/base/report/update-form.html:152 -msgid "Your name:" -msgstr "Namnet ditt:" - -#: templates/web/base/auth/general.html:39 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:22 -#: templates/web/fixmystreet/report/update-form.html:96 +#: templates/web/base/auth/general.html:75 +#: templates/web/base/report/new/form_user_loggedout_password.html:10 +#: templates/web/base/report/update/form_user_loggedout_password.html:9 #: templates/web/zurich/auth/general.html:34 msgid "Your password" msgstr "" @@ -3882,15 +3705,16 @@ msgstr "" msgid "Your password has been changed" msgstr "Passordet ditt har vorte endra" -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:27 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:63 +#: templates/web/base/report/new/form_user_loggedin.html:27 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:26 #: templates/web/zurich/report/new/fill_in_details_form.html:92 msgid "Your phone number" msgstr "" #: templates/web/base/questionnaire/index.html:14 +#, fuzzy msgid "Your report" -msgstr "" +msgstr "Oppdateringane dine" #: templates/web/base/footer.html:9 templates/web/fixmystreet/footer.html:29 msgid "Your reports" @@ -3900,23 +3724,17 @@ msgstr "Oppdateringane dine" msgid "Your updates" msgstr "Oppdateringane dine" -#: templates/web/base/contact/index.html:81 -msgid "Your email:" -msgstr "E-posten din:" - #: templates/web/base/reports/_list-filters.html:3 -#, fuzzy msgid "all reports" -msgstr "Alle rapportar" +msgstr "" #: templates/web/base/admin/timeline.html:4 msgid "by %s" msgstr "av %s" #: templates/web/base/reports/_list-filters.html:5 -#, fuzzy msgid "closed reports" -msgstr "Lukka rapportar" +msgstr "" #: templates/web/base/reports/body.html:6 #: templates/web/base/reports/body.html:7 @@ -3938,17 +3756,16 @@ msgid "edit user" msgstr "" #: templates/web/base/reports/_list-filters.html:6 -#, fuzzy msgid "fixed reports" -msgstr "Løyste rapportar" +msgstr "" -#: templates/web/base/admin/index.html:33 +#: templates/web/base/status/stats.html:20 #: templates/web/zurich/admin/index.html:5 msgid "from %s different users" -msgstr "frÃ¥ %d ulike brukarar" +msgstr "frÃ¥ %s ulike brukarar" -#: templates/web/base/report/_item.html:17 -#: templates/web/zurich/report/_item.html:16 +#: templates/web/base/report/_item.html:15 +#: templates/web/zurich/report/_item.html:14 msgid "last updated %s" msgstr "" @@ -4040,10 +3857,8 @@ msgstr "opna pÃ¥ nytt" msgid "sign out" msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:12 -#: templates/web/base/report/new/fill_in_details_form.html:15 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:10 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:12 +#: templates/web/base/report/new/fill_in_details_form.html:11 +#: templates/web/base/report/new/fill_in_details_form.html:9 msgid "the local council" msgstr "den lokale administrasjonen" @@ -4052,7 +3867,7 @@ msgstr "den lokale administrasjonen" msgid "there is no pin shown as the user did not use the map" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:398 +#: perllib/FixMyStreet/Script/Reports.pm:176 msgid "this type of local problem" msgstr "denne typen lokalt problem" @@ -4061,9 +3876,8 @@ msgid "today" msgstr "i dag" #: templates/web/base/reports/_list-filters.html:4 -#, fuzzy msgid "unfixed reports" -msgstr "Løyste rapportar" +msgstr "" #: templates/web/base/admin/report_edit.html:32 msgid "used map" @@ -4082,7 +3896,7 @@ msgstr "brukaren er eigaren av problemet" msgid "ward" msgstr "bydel" -#: templates/web/base/front/stats.html:17 +#: templates/web/base/front/stats.html:13 #, perl-format msgid "<big>%s</big> report recently" msgid_plural "<big>%s</big> reports recently" @@ -4110,7 +3924,7 @@ msgid_plural "%d minutes" msgstr[0] "" msgstr[1] "" -#: templates/web/base/front/stats.html:29 +#: templates/web/base/front/stats.html:25 #, perl-format msgid "<big>%s</big> update on reports" msgid_plural "<big>%s</big> updates on reports" @@ -4131,14 +3945,14 @@ msgid_plural "%d weeks" msgstr[0] "" msgstr[1] "" -#: templates/web/base/front/stats.html:12 +#: templates/web/base/front/stats.html:8 #, perl-format msgid "<big>%s</big> report in past week" msgid_plural "<big>%s</big> reports in past week" msgstr[0] "<big>%s</big> rapport siste veke" msgstr[1] "<big>%s</big> rapportar siste veke" -#: templates/web/base/front/stats.html:23 +#: templates/web/base/front/stats.html:19 #, perl-format msgid "<big>%s</big> fixed in past month" msgid_plural "<big>%s</big> fixed in past month" @@ -4159,95 +3973,80 @@ msgid_plural "We do <strong>not</strong> yet have details for the other councils msgstr[0] "Vi har enno <strong>ikkje</strong> detaljane for den andre administrasjonen som dekkjer denne staden." msgstr[1] "Vi har enno <strong>ikkje</strong> detaljane for dei andre administrasjonane som dekkjer denne staden." -#~ msgid "<small>If you cannot see the map, <a href='%s' rel='nofollow'>skip this step</a>.</small>" -#~ msgstr "<small>Viss du ikkje kan sjÃ¥ kartet, <a href='%s' rel='nofollow'>hopp over dette steget</a>.</small>" - -#~ msgid "<strong>No</strong>, I do not, let me sign in by email:" -#~ msgstr "<strong>Nei</strong>, det gjer eg ikkje. La meg logga inn med e-post:" - -#~ msgid "Closest nearby problems <small>(within %skm)</small>" -#~ msgstr "Dei næraste problema <small>(innanfor %skm)</small>" - -#~ msgid "Contact FixMyStreet" -#~ msgstr "Kontakt FiksGataMi" - -#~ msgid "FixMyStreet admin:" -#~ msgstr "FiksGataMi-administrator:" - -#~ msgid "New local reports on reportemptyhomes.com" -#~ msgstr "Nye lokale rapportar pÃ¥ reportemptyhomes.com" - -#~ msgid "New reports for {{COUNCIL}} within {{WARD}} ward on reportemptyhomes.com" -#~ msgstr "Nye rapportar for {{COUNCIL}} innanfor {{WARD}} bydel pÃ¥ reportemptyhomes.com" +#~ msgid "(we never show your email)" +#~ msgstr "(vi viser aldri e-postadressa di)" -#~ msgid "New reports on reportemptyhomes.com" -#~ msgstr "Nye rapportar pÃ¥ reportemptyhomes.com" +#~ msgid "<strong>No</strong>, let me confirm my report by email:" +#~ msgstr "<strong>Nei</strong>, la meg stadfesta rapporten min med e-post:" -#~ msgid "New reports on reportemptyhomes.com near {{POSTCODE}}" -#~ msgstr "Nye rapportar pÃ¥ reportemptyhomes.com nær postnummer {{POSTCODE}}" +#~ msgid "<strong>No</strong>, let me confirm my update by email:" +#~ msgstr "<strong>Nei</strong>, la meg stadfesta oppdateringa mi med e-post:" -#~ msgid "New reports to {{COUNCIL}} on reportemptyhomes.com" -#~ msgstr "Nye rapportar til {{COUNCIL}} pÃ¥ reportemptyhomes.com" +#~ msgid "Email me updates" +#~ msgstr "Send meg oppdateringar" -#~ msgid "New reports within {{NAME}}'s boundary on reportemptyhomes.com" -#~ msgstr "Nye rapportar innanfor grensa til {{NAME}} pÃ¥ reportemptyhomes.com" +#~ msgid "Enter a new password:" +#~ msgstr "Skriv inn eit nytt passord:" -#~ msgid "No problems found." -#~ msgstr "Fann ingen problem." +#~ 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 "Eg er redd vi ikkje kunne verifisera den referansen. Viss du kopierte nettadressa frÃ¥ ein e-post, sjekk at du har kopiert ho korrekt.\n" -#~ msgid "No problems have been reported yet." -#~ msgstr "Ingen problem er rapporterte" +#~ 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 "Viss du brukar vevbasert e-post eller har filter for søppel-e-post pÃ¥ e-postkontoen din, kan du i visse tilfelle mÃ¥tta sjÃ¥ etter meldingane vÃ¥re der." -#~ msgid "Now to submit your report… do you have a FixMyStreet password?" -#~ msgstr "PÃ¥ tide Ã¥ senda rapporten din, har du eit FiksGataMi-passord?" +#~ msgid "Message:" +#~ msgstr "Melding:" -#~ msgid "Now to submit your update… do you have a FixMyStreet password?" -#~ msgstr "PÃ¥ tide Ã¥ registrera oppdateringa di, har du eit FiksGataMi-passord?" +#~ msgid "More problems nearby" +#~ msgstr "Fleire problem i nærleiken" -#~ msgid "Our code is open source and <a href=\"http://github.com/mysociety/fixmystreet\">available on GitHub</a>." -#~ msgstr "Kjeldekoda vÃ¥r er fri programvare og <a href=\"http://github.com/mysociety/fixmystreet\">tilgjengeleg pÃ¥ GitHub</a>." +#~ msgid "Nearly Done! Now check your email..." +#~ msgstr "Nesten ferdig! No mÃ¥ du sjekka e-posten din …" -#~ msgid "Please take a look at the updates that have been left." -#~ msgstr "Ver venleg og sjÃ¥ over oppdateringane som er lagt inn." +#~ msgid "Offensive? Unsuitable? Tell us" +#~ msgstr "Støytande? Upassende? Sei frÃ¥" -#~ msgid "Problems within %s, FixMyStreet" -#~ msgstr "Problem innanfor %s, FiksGataMi" +#~ msgid "Photo:" +#~ msgstr "Bilete:" -#~ msgid "Properties recently reported as put back to use on reportemptyhomes.com" -#~ msgstr "Eigedomar nyleg rapportert som tilbake i bruk pÃ¥ reportemptyhomes.com" +#~ msgid "Please check your email" +#~ msgstr "Ver venleg og sjekk e-posten du oppgav" -#~ msgid "Reported %s, to %s" -#~ msgstr "Rapportert %s, til %s" +#~ msgid "Please note that updates are not sent to the council. If you leave your name it will be public. Your information will only be used in accordance with our <a href=\"/faq#privacy\">privacy policy</a>" +#~ msgstr "" +#~ "Merk at oppdateringar ikkje vert sende til administrasjonen. Viss du\n" +#~ "legg igjen namnet ditt sÃ¥ vil det vera offentleg tilgjengeleg.\n" +#~ "Informasjonen din vil berre brukast i samsvar med <a href=\"/faq#privacy\">personvernpolicyen vÃ¥r</a>" -#~ msgid "Reports on and around the map" -#~ msgstr "Problem i og rundt kartet" +#~ msgid "This problem has been closed" +#~ msgstr "Dette problemet er lukka" -#~ msgid "Sign in by email" -#~ msgstr "Logg inn via epost" +#~ msgid "This problem is in progress" +#~ msgstr "Dette problemet er under arbeid" -#~ msgid "Signed in as %s" -#~ msgstr "Logga inn som %s" +#~ msgid "This problem is old and of unknown status." +#~ msgstr "Dette problemet er gammalt og med ukjend status." -#~ msgid "The confirmation email <strong>may</strong> take a few minutes to arrive — <em>please</em> be patient." -#~ msgstr "Stadfestingse-posten <strong>kan</strong> bruka nokre minutt før han kjem fram — sÃ¥ ver tÃ¥lmodig." +#~ msgid "Update:" +#~ msgstr "Oppdatering:" -#~ msgid "The details of your problem are available on the right hand side of this page." -#~ msgstr "Detaljane om problemet ditt er tilgjengelege pÃ¥ høgre kant av denne sida." +#~ 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 din." -#~ msgid "The latest local reports reported by users" -#~ msgstr "Dei siste lokale rapportane rapportert av brukarar" +#~ msgid "We'd love to hear what you think about this site. Just fill in the form, or send an email to <a href='mailto:%s'>%s</a>:" +#~ msgstr "Vi ynskjer Ã¥ fÃ¥ tilbakemelding frÃ¥ deg om kva du meiner om denne tenesta. Berre fyll ut skjemaet, eller send ein e-post <a href='mailto:%s'>%s</a>:" -#~ msgid "The latest properties reported back to use by users" -#~ msgstr "Dei siste eigedomane rapportert tilbake i bruk av brukarar" +#~ msgid "You have already attached a photo to this report, attaching another one will replace it." +#~ msgstr "Du har allereie lagt ved eit bilete til dette problemet. Ã… leggja ved eit anna vil byta ut dette." -#~ msgid "The latest reports for {{COUNCIL}} reported by users" -#~ msgstr "Dei siste rapportane for {{COUNCIL}} rapportert av brukarar" +#~ msgid "You have already attached a photo to this update, attaching another one will replace it." +#~ msgstr "Du har allereie lagt ved eit bilete til denne oppdateringa. Ã… leggja ved eit anna vil byta ut dette." -#~ msgid "The latest reports for {{COUNCIL}} within {{WARD}} ward reported by users" -#~ msgstr "Dei siste rapportane for {{COUNCIL}} innanfor {{WARD}} bydel rapportert av brukarar" +#~ msgid "Your email:" +#~ msgstr "E-posten din" -#~ msgid "The latest reports within {{NAME}}'s boundary reported by users" -#~ msgstr "Dei siste rapportane innanfor grensa til {{NAME}} rapportert av brukarar" +#~ msgid "Your name:" +#~ msgstr "Namnet ditt:" -#~ msgid "Your email address:" -#~ msgstr "e-postadressa di:" +#~ msgid "Your email:" +#~ msgstr "E-posten din:" diff --git a/locale/pt_CV.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/pt.UTF-8/LC_MESSAGES/FixMyStreet.po index 6e44a8685..f4bac2de7 100644 --- a/locale/pt_CV.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/pt.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -6,59 +6,40 @@ # Translators: # francisco oliveira martins <francisco.martins@recortes.cv>, 2013 # mySociety <transifex@mysociety.org>, 2013 +# daey <netrapida@live.com.pt>, 2016 +# simaor <simaor@hotmail.com>, 2016 msgid "" msgstr "" "Project-Id-Version: fixmystreet\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2015-10-23 16:51+0100\n" -"PO-Revision-Date: 2015-07-31 16:31+0000\n" -"Last-Translator: mySociety <transifex@mysociety.org>\n" +"POT-Creation-Date: 2016-03-02 13:09+0000\n" +"PO-Revision-Date: 2016-02-15 16:12+0000\n" +"Last-Translator: daey <netrapida@live.com.pt>\n" "Language-Team: Portuguese (http://www.transifex.com/mysociety/fixmystreet/language/pt/)\n" -"Language: pt_CV\n" +"Language: pt\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:628 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:411 +#: perllib/FixMyStreet/DB/Result/Problem.pm:616 +#: perllib/FixMyStreet/Script/Reports.pm:189 msgid " and " msgstr "e" #: templates/web/base/report/new/councils_text_all.html:2 -#: templates/web/base/report/new/councils_text_none.html:11 -#: templates/web/base/report/new/councils_text_none.html:2 +#: templates/web/base/report/new/councils_text_none.html:12 +#: templates/web/base/report/new/councils_text_none.html:15 #: templates/web/base/report/new/councils_text_some.html:19 #: templates/web/base/report/new/councils_text_some.html:22 #: templates/web/base/report/new/councils_text_some.html:5 msgid " or " msgstr "ou" -#: templates/web/base/admin/index.html:35 -#: templates/web/base/status/index.html:13 -msgid "%s confirmed alerts, %s unconfirmed" -msgstr "%d alertas confirmados,%d não confirmados" - -#: templates/web/base/admin/index.html:37 -#: templates/web/base/status/index.html:16 -#: templates/web/zurich/admin/index.html:6 -msgid "%s council contacts – %s confirmed, %s unconfirmed" -msgstr "%d contatos do Conselho; %d confirmada,%d não confirmados" - #: templates/web/base/admin/edit-league.html:12 msgid "%d edits by %s" msgstr "%d edições por %s" -#: templates/web/base/admin/index.html:34 -#: templates/web/base/status/index.html:12 -msgid "%s live updates" -msgstr "%d atualizações directas" - -#: templates/web/base/admin/index.html:36 -#: templates/web/base/status/index.html:14 -msgid "%s questionnaires sent – %s answered (%s%%)" -msgstr "%d questionários enviados - %d respondeu (%s%%)" - #: templates/web/base/pagination.html:10 msgid "%d to %d of %d" msgstr "%d de %d de %d" @@ -66,44 +47,57 @@ msgstr "%d de %d de %d" #: templates/web/base/reports/body.html:0 #: templates/web/base/reports/body.html:23 msgid "%s - Summary reports" -msgstr "%s - relat￳rios resumidos" +msgstr "%s - relatórios resumidos" #. ("%s here is the site name") #: templates/web/base/admin/header.html:10 msgid "%s admin:" msgstr "" +#: templates/web/base/status/stats.html:26 +#, fuzzy +msgid "%s bodies" +msgstr "Corpos" + +#: templates/web/base/status/stats.html:24 +msgid "%s confirmed alerts, %s unconfirmed" +msgstr "%s alertas confirmados,%s não confirmados" + +#: templates/web/base/status/stats.html:27 +#: templates/web/zurich/admin/index.html:6 +msgid "%s council contacts – %s confirmed, %s unconfirmed" +msgstr "%s contatos da Zona; %s confirmada,%s não confirmados" + #. ("%s is the site name") #: templates/web/base/alert/index.html:7 -#, fuzzy msgid "" "%s has a variety of RSS feeds and email alerts for local\n" "problems, including alerts for all problems within a particular ward, or all\n" "problems within a certain distance of a particular location." msgstr "" -"FixMyStreetMindelo tem uma variedade de feeds RSS e alertas para problemas locais, incluindo \n" -"alertas para todos os problemas dentro de uma determinada zona especial ou conselho, ou todos os problemas \n" -"dentro de uma certa distância de um local em particular." #. ("%s is the site name") #: templates/web/base/alert/index.html:11 -#, fuzzy msgid "" "%s has a variety of RSS feeds and email alerts for local problems, including\n" "alerts for all problems within a particular ward or council, or all problems\n" "within a certain distance of a particular location." msgstr "" -"FixMyStreetMindelo tem uma variedade de feeds RSS e alertas para problemas locais, incluindo \n" -"alertas para todos os problemas dentro de uma determinada zona especial ou conselho, ou todos os problemas \n" -"dentro de uma certa distância de um local em particular." -#: perllib/FixMyStreet/DB/Result/Problem.pm:695 +#: templates/web/base/status/stats.html:23 +msgid "%s live updates" +msgstr "%s atualizações directas" + +#: templates/web/base/status/stats.html:25 +msgid "%s questionnaires sent – %s answered (%s%%)" +msgstr "%s questionários enviados - %s respondeu (%s%%)" + +#: perllib/FixMyStreet/DB/Result/Problem.pm:683 msgid "%s ref: %s" msgstr "%s ref: %s" #. ("%s is the site name") #: templates/web/base/alert/_list.html:73 -#, fuzzy msgid "" "%s sends different categories of problem\n" "to the appropriate council, so problems within the boundary of a particular council\n" @@ -112,22 +106,16 @@ msgid "" "council’s alerts, but will only appear in the \"Within the boundary\" alert\n" "for the county council." msgstr "" -"FixMyStreetMindelo envia diferentes categorias de problema âŽ\n" -"para o conselho apropriado, assim que os problemas dentro do limite de um conselho especial âŽ\n" -"pode não coincidir com os problemas enviados para que o conselho. Por exemplo, um relatório de graffiti âŽ\n" -"será enviado ao conselho distrital, então vai aparecer em ambos do distrito âŽ\n" -"alertas do Conselho, mas só vai aparecer o \"No limite\" alerta âŽ\n" -"para o conselho do condado." -#: perllib/FixMyStreet/Cobrand/UK.pm:255 perllib/FixMyStreet/Cobrand/UK.pm:267 +#: perllib/FixMyStreet/Cobrand/UK.pm:256 perllib/FixMyStreet/Cobrand/UK.pm:268 msgid "%s ward, %s" msgstr "%s ala, %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:564 +#: perllib/FixMyStreet/DB/Result/Problem.pm:552 msgid "%s, reported at %s" msgstr "%s, reportou em %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:282 perllib/FixMyStreet/Cobrand/UK.pm:294 +#: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295 msgid "%s, within %s ward" msgstr "%s, %s dentro da ala" @@ -135,7 +123,7 @@ msgstr "%s, %s dentro da ala" msgid "© <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors" msgstr "" -#: templates/web/zurich/report/new/fill_in_details_form.html:53 +#: templates/web/zurich/report/new/fill_in_details_form.html:46 msgid "(Defect & location of defect)" msgstr "" @@ -146,15 +134,13 @@ msgstr "(E-mail na tabela de abuso)" #: templates/web/zurich/admin/report_edit-sdm.html:60 #: templates/web/zurich/admin/report_edit.html:88 -#, fuzzy msgid "(No name)" -msgstr "Nome" +msgstr "(Sem nome)" #: templates/web/zurich/admin/report_edit-sdm.html:67 #: templates/web/zurich/admin/report_edit.html:95 -#, fuzzy msgid "(No phone number)" -msgstr "Telefone " +msgstr "(Sem número de telefone)" #: templates/web/base/alert/_list.html:24 msgid "(a default distance which covers roughly 200,000 people)" @@ -162,17 +148,16 @@ msgstr "(A distância padrão, que abrange cerca de 50 mil pessoas)" #. ("%s is a list of distance links, e.g. [2km] / [5km] / [10km] / [20km]") #: templates/web/base/alert/_list.html:29 -#, fuzzy msgid "(alternatively the RSS feed can be customised, within %s)" -msgstr "(Alternativamente o feed RSS pode ser personalizado, dentro de" +msgstr "(alternativamente, o feed RSS pode ser personalizado, dentro de %s)" -#: templates/web/base/report/_item.html:27 -#: templates/web/zurich/report/_item.html:21 +#: templates/web/base/report/_item.html:25 +#: templates/web/zurich/report/_item.html:19 msgid "(closed)" msgstr "(fechado)" -#: templates/web/base/report/_item.html:25 -#: templates/web/zurich/report/_item.html:19 +#: templates/web/base/report/_item.html:23 +#: templates/web/zurich/report/_item.html:17 msgid "(fixed)" msgstr "(Fixo)" @@ -180,37 +165,28 @@ msgstr "(Fixo)" msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)" msgstr "(Como ruas e pavimentos esburacados, grafits, arvores caidas, lajes partidas, entulhos, lixo, pardeiros, vandalismo, postes quebrados, vazamentos de agua e esgotos, ou iluminação pública)" -#: templates/web/base/report/_item.html:21 +#: templates/web/base/report/_item.html:19 msgid "(not sent to council)" msgstr "(Não reportar ao conselho)" -#: templates/web/base/report/new/fill_in_details_form.html:200 #: templates/web/zurich/report/new/fill_in_details_form.html:82 msgid "(optional)" msgstr "(opcional)" -#: templates/web/fixmystreet/report/public_label.html:1 +#: templates/web/base/report/public_label.html:1 msgid "(public)" -msgstr "" +msgstr "(público)" -#: templates/web/base/report/_item.html:20 +#: templates/web/base/report/_item.html:18 msgid "(sent to both)" msgstr "(remeter para ambos)" -#: templates/web/base/report/new/fill_in_details_form.html:194 -msgid "(we never show your email address or phone number)" -msgstr "(é confidencial seu email e seu numero de telefone)" - -#: templates/web/base/report/update-form.html:159 -msgid "(we never show your email)" -msgstr "(seu email não será divulgado)" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:673 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 #: perllib/FixMyStreet/DB/Result/Problem.pm:410 msgid "-- Pick a category --" msgstr "-- Escolha uma categoria --" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:637 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:632 #: perllib/FixMyStreet/DB/Result/Problem.pm:416 msgid "-- Pick a property type --" msgstr "-- Escolha um tipo de categoria --" @@ -229,52 +205,39 @@ msgstr "" msgid "<label>Show %s</label> <label>about %s</label>" msgstr "" -#: templates/web/base/admin/index.html:32 -#: templates/web/base/status/index.html:11 +#: templates/web/base/status/stats.html:18 #: templates/web/zurich/admin/index.html:4 msgid "<strong>%s</strong> live problems" -msgstr "<strong>%d</strong> problemas ao vivo" +msgstr "<strong>%s</strong> problemas ao vivo" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:39 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:2 msgid "<strong>No</strong> Let me confirm my report by email" msgstr "<strong> Não </strong> Deixe-me confirmar o meu relatório por e-mail" -#: templates/web/fixmystreet/report/update-form.html:112 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:2 msgid "<strong>No</strong> Let me confirm my update by email" msgstr "<strong> Não </strong> Deixe-me confirmar a minha atualização por e-mail" -#: templates/web/base/auth/general.html:48 +#: templates/web/base/auth/general.html:87 #: templates/web/zurich/auth/general.html:51 msgid "<strong>No</strong> let me sign in by email" msgstr "<strong> Não </strong>, deixe-me entrar por e-mail" -#: templates/web/base/report/new/fill_in_details_form.html:145 -msgid "<strong>No</strong>, let me confirm my report by email:" -msgstr "<strong>No</strong>, let me confirm my report by email:" - -#: templates/web/base/report/update-form.html:118 -msgid "<strong>No</strong>, let me confirm my update by email:" -msgstr "<strong> Não </strong>, deixe-me confirmar a minha atualização por e-mail:" - -#: templates/web/base/auth/general.html:34 -#: templates/web/base/report/new/fill_in_details_form.html:123 -#: templates/web/base/report/update-form.html:96 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:15 -#: templates/web/fixmystreet/report/update-form.html:89 +#: templates/web/base/auth/general.html:70 +#: templates/web/base/report/new/form_user_loggedout_password.html:3 +#: templates/web/base/report/update/form_user_loggedout_password.html:2 msgid "<strong>Yes</strong> I have a password" msgstr "<strong> Sim </strong> Eu tenho password" -#: templates/web/base/static/about-en-gb.html:1 -#: templates/web/base/static/about-en-gb.html:3 +#: templates/web/base/about/about-en-gb.html:1 +#: templates/web/base/about/about-en-gb.html:3 msgid "About us" msgstr "Acerca de nós" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:8 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:31 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:29 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:35 msgid "Action Scheduled" msgstr "Ação Programada" @@ -305,14 +268,13 @@ msgstr "Adicionar nova categoria" msgid "Add user" msgstr "Adicionar user" -#: templates/web/base/my/my.html:52 +#: templates/web/base/my/my.html:56 msgid "Added %s" msgstr "Adicionado %s" #: templates/web/base/report/new/category_extras.html:9 -#, fuzzy msgid "Additional Information" -msgstr "Aguardando moderação" +msgstr "" #: templates/web/base/auth/change_password.html:29 msgid "Again:" @@ -326,8 +288,7 @@ msgstr "Alerta %d criado por %s, tipo %s, os parâmetros %s / %s" msgid "Alert %d disabled (created %s)" msgstr "Alerta %d desativada (criado %s)" -#: templates/web/base/report/update-form.html:164 -#: templates/web/fixmystreet/report/update-form.html:150 +#: templates/web/base/report/update/form_name.html:20 msgid "Alert me to future updates" msgstr "Avise-me de atualizações futuras" @@ -337,9 +298,8 @@ msgid "All Reports" msgstr "Todos os Relatórios" #: templates/web/zurich/admin/stats.html:5 -#, fuzzy msgid "All Reports as CSV" -msgstr "Todos os Relatórios" +msgstr "" #: templates/web/base/footer.html:11 templates/web/fixmystreet/footer.html:32 #: templates/web/zurich/admin/index-dm.html:12 @@ -360,10 +320,8 @@ msgstr "Todas as informações que você fornecer aqui serão enviados para fixm #: templates/web/base/report/new/councils_text_all.html:2 #: templates/web/base/report/new/councils_text_all.html:4 -#: templates/web/base/report/new/fill_in_details_form.html:12 -#: templates/web/base/report/new/fill_in_details_form.html:14 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:10 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:11 +#: templates/web/base/report/new/fill_in_details_form.html:10 +#: templates/web/base/report/new/fill_in_details_form.html:9 msgid "All the information you provide here will be sent to <strong>%s</strong>." msgstr "Todas as informações que você fornecer aqui serão enviados para <strong>%s</strong>" @@ -385,6 +343,10 @@ msgstr "Anonimo:" msgid "Are you a developer?" msgstr "Você é um desenvolvedor?" +#: templates/web/base/js/translation_strings.html:52 +msgid "Are you sure you want to cancel this upload?" +msgstr "" + #: templates/web/base/admin/body-form.html:69 #: templates/web/base/admin/body.html:16 #: templates/web/zurich/admin/body-form.html:24 @@ -397,9 +359,8 @@ msgid "As this is a staging site and %s is false, reports made on this site will msgstr "" #: templates/web/zurich/admin/report_edit.html:213 -#, fuzzy msgid "Assign to competent body:" -msgstr "Atribuir ao órgão externo:" +msgstr "" #: templates/web/zurich/admin/report_edit.html:173 #: templates/web/zurich/admin/stats.html:36 @@ -418,16 +379,16 @@ msgstr "Atribuir a subdivisão:" msgid "Assigned to %s" msgstr "Designado para %s" -#: templates/web/base/open311/index.html:84 +#: templates/web/base/open311/index.html:76 msgid "At most %d requests are returned in each query. The returned requests are ordered by requested_datetime, so to get all requests, do several searches with rolling start_date and end_date." msgstr "No máximo %d pedidos são retornados em cada consulta. Os pedidos retornados são ordenados por requested_datetime, de modo a obter todos os pedidos, fazer várias pesquisas com start_date rolando e end_date." -#: templates/web/base/open311/index.html:76 +#: templates/web/base/open311/index.html:68 msgid "At the moment only searching for and looking at reports work." msgstr "Neste momento, apenas procurando e olhando para os relatórios de trabalho." #: perllib/FixMyStreet/DB/Result/Problem.pm:373 -#: templates/web/zurich/report/_item.html:11 +#: templates/web/zurich/report/_item.html:9 msgid "Awaiting moderation" msgstr "Aguardando moderação" @@ -439,7 +400,7 @@ msgstr "Voltar" msgid "Ban email address" msgstr "Ban endereço de e-mail" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1276 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1285 #: perllib/FixMyStreet/Cobrand/Zurich.pm:392 #: templates/web/base/admin/bodies.html:1 templates/web/zurich/header.html:64 msgid "Bodies" @@ -469,7 +430,7 @@ msgid "Can't see the map? <em>Skip this step</em>" msgstr "Não pode ver a localizaçao no mapa <em> Salte esta etapa </em>" #: templates/web/base/admin/body.html:68 -#: templates/web/base/admin/index.html:61 +#: templates/web/base/admin/index.html:54 #: templates/web/base/report/new/category.html:10 #: templates/web/base/report/new/category_wrapper.html:3 #: templates/web/zurich/admin/body.html:14 @@ -480,8 +441,8 @@ msgstr "Não pode ver a localizaçao no mapa <em> Salte esta etapa </em>" msgid "Category" msgstr "Categoria" -#: templates/web/base/admin/index.html:59 -#: templates/web/base/admin/index.html:67 +#: templates/web/base/admin/index.html:52 +#: templates/web/base/admin/index.html:60 msgid "Category fix rate for problems > 4 weeks old" msgstr "Categoria para cada correção taxa para problemas> 4 semanas, um mes" @@ -494,7 +455,7 @@ msgstr "Categoria para cada correção taxa para problemas> 4 semanas, um mes" msgid "Category:" msgstr "Categoria:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:402 +#: perllib/FixMyStreet/Script/Reports.pm:180 msgid "Category: %s" msgstr "Categoria: %s" @@ -544,7 +505,7 @@ msgid "Click here or enter as dd/mm/yyyy" msgstr "" #: templates/web/base/around/_report_banner.html:2 -#: templates/web/base/js/translation_strings.html:50 +#: templates/web/base/js/translation_strings.html:55 msgid "Click map to report a problem" msgstr "Click no mapa para reportar um porblema " @@ -571,7 +532,7 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:25 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:144 -#: templates/web/fixmystreet/report/banner.html:15 +#: templates/web/base/report/banner.html:15 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:10 #: templates/web/zurich/admin/header.html:16 @@ -579,7 +540,7 @@ msgstr "" msgid "Closed" msgstr "Fechado" -#: perllib/FixMyStreet/DB/Result/Problem.pm:794 +#: perllib/FixMyStreet/DB/Result/Problem.pm:779 msgid "Closed by council" msgstr "Fechado pelo Conselho" @@ -605,7 +566,7 @@ msgstr "Cobrand data:" msgid "Cobrand:" msgstr "Cobrand:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1283 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1292 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "" @@ -618,13 +579,14 @@ msgstr "Configurar Endpoint" msgid "Confirm" msgstr "Confirmar" -#: templates/web/base/auth/token.html:1 templates/web/zurich/auth/token.html:1 +#: templates/web/base/auth/token.html:1 msgid "Confirm account" msgstr "Confirmar conta" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:33 -#: templates/web/fixmystreet/report/update-form.html:107 -msgid "Confirm by email below, providing a new password at that point. When you confirm, your password will be updated." +#: templates/web/base/report/new/form_user_loggedout_password.html:21 +#: templates/web/base/report/update/form_user_loggedout_password.html:20 +#, fuzzy +msgid "Confirm by email instead, providing a new password at that point. When you confirm, your password will be updated." msgstr "Confirme por e-mail abaixo, proporcionando uma nova senha nesse ponto. Quando você confirmar, sua senha será atualizada." #: templates/web/base/questionnaire/creator_fixed.html:1 @@ -654,35 +616,27 @@ msgid "Confirmed:" msgstr "Confirmado:" #. ("%s is the site name") -#: templates/web/base/faq/faq-en-gb.html:8 templates/web/base/footer.html:24 -#: templates/web/base/open311/index.html:8 -#: templates/web/base/static/privacy.html:10 -#: templates/web/fixmystreet/contact/index.html:12 -#, fuzzy +#: templates/web/base/about/_sidebar.html:6 templates/web/base/footer.html:24 msgid "Contact %s" -msgstr "Fale connosco" +msgstr "" #: templates/web/base/contact/index.html:1 #: templates/web/base/contact/index.html:2 #: templates/web/base/contact/submit.html:1 -#: templates/web/fixmystreet/contact/index.html:1 -#: templates/web/fixmystreet/contact/index.html:2 msgid "Contact Us" msgstr "Fale connosco" -#: templates/web/base/contact/index.html:6 -#: templates/web/fixmystreet/contact/index.html:20 +#: templates/web/base/contact/index.html:12 msgid "Contact the team" msgstr "Fale com a equipe" #: templates/web/zurich/admin/report_edit-sdm.html:40 #: templates/web/zurich/admin/report_edit.html:59 -#, fuzzy msgid "Coordinates:" -msgstr "Co-ordenadas:" +msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1420 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1448 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1429 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1457 msgid "Could not find user" msgstr "Não foi possÃvel encontrar usuário" @@ -700,7 +654,7 @@ msgstr "Conselho" msgid "Council contacts for %s" msgstr "Contatos do Conselho para %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:693 +#: perllib/FixMyStreet/DB/Result/Problem.pm:681 msgid "Council ref: %s" msgstr "" @@ -715,7 +669,7 @@ msgstr "Conselho:" msgid "Count" msgstr "Conta" -#: templates/web/base/email_sent.html:1 templates/web/zurich/email_sent.html:1 +#: templates/web/base/email_sent.html:1 msgid "Create a report" msgstr "Criar um report" @@ -725,9 +679,8 @@ msgid "Create category" msgstr "Criar uma categoria" #: templates/web/zurich/admin/template_edit.html:29 -#, fuzzy msgid "Create template" -msgstr "Criar um report" +msgstr "" #: templates/web/base/admin/problem_row.html:34 #: templates/web/zurich/admin/templates.html:10 @@ -764,7 +717,7 @@ msgstr "Painel de instrumentos" msgid "Dealt with by subdivision within 5 working days" msgstr "Tratadas pelas subdivisões dentro de 5 dias úteis" -#: perllib/FixMyStreet/App/Controller/Admin.pm:878 +#: perllib/FixMyStreet/App/Controller/Admin.pm:877 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "" @@ -777,7 +730,7 @@ msgstr "" msgid "Deleted" msgstr "Excluidos" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:51 +#: templates/web/base/report/new/form_report.html:45 #: templates/web/zurich/admin/index-dm.html:22 #: templates/web/zurich/admin/index-sdm.html:20 #: templates/web/zurich/admin/reports.html:12 @@ -785,12 +738,11 @@ msgid "Description" msgstr "Descripçaoi" #: templates/web/base/js/translation_strings.html:34 -#: templates/web/zurich/report/new/fill_in_details_form.html:42 +#: templates/web/zurich/report/new/fill_in_details_form.html:68 msgid "Details" msgstr "DEtalhes" #: templates/web/base/admin/report_edit.html:20 -#: templates/web/base/report/new/fill_in_details_form.html:62 #: templates/web/zurich/admin/report_edit-sdm.html:27 #: templates/web/zurich/admin/report_edit.html:29 #: templates/web/zurich/admin/report_edit.html:43 @@ -803,38 +755,38 @@ msgstr "Delegada" #: templates/web/zurich/admin/report_edit-sdm.html:50 #: templates/web/zurich/admin/report_edit.html:69 -#, fuzzy msgid "Didn't use map" -msgstr "não usar o mapa" +msgstr "" #: templates/web/base/admin/edit-league.html:8 msgid "Diligency prize league table" msgstr "Diligency prêmio tabela classificativa" #. ("%s is the site name") -#: templates/web/base/auth/general.html:31 -#: templates/web/base/report/new/fill_in_details_form.html:114 -#: templates/web/base/report/update-form.html:87 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:11 -#: templates/web/fixmystreet/report/update-form.html:86 -#, fuzzy +#: templates/web/base/auth/general.html:48 +#: templates/web/base/report/new/form_user_loggedout.html:18 +#: templates/web/base/report/new/oauth_email_form.html:18 +#: templates/web/base/report/update-form.html:29 +#: templates/web/base/report/update/form_user_loggedout.html:17 msgid "Do you have a %s password?" -msgstr "Você tem uma senha FixMyStreetMindelo?" +msgstr "" #: templates/web/base/questionnaire/index.html:55 msgid "Don’t know" msgstr "Não sei" -#: templates/web/fixmystreet/contact/index.html:118 +#: templates/web/base/contact/index.html:110 msgid "Don't like forms?" msgstr "" +#: templates/web/base/js/translation_strings.html:51 +msgid "Drag and drop photos here or <u>click to upload</u>" +msgstr "" + #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:14 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:32 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:30 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:36 msgid "Duplicate" msgstr "Duplicar" @@ -884,7 +836,7 @@ msgstr "Editar" #: templates/web/base/admin/category_edit.html:91 #: templates/web/base/admin/flagged.html:38 #: templates/web/base/admin/users.html:16 -#: templates/web/base/auth/general.html:22 +#: templates/web/base/auth/general.html:39 #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:24 @@ -892,7 +844,7 @@ msgstr "Editar" msgid "Email" msgstr "Email" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1396 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1405 msgid "Email added to abuse list" msgstr "Email adicionado a lista de abusos" @@ -908,7 +860,7 @@ msgstr "" msgid "Email alert deleted" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1393 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1402 msgid "Email already in abuse list" msgstr "E-mail já está na lista abusos" @@ -916,41 +868,36 @@ msgstr "E-mail já está na lista abusos" msgid "Email me new local problems" msgstr "Enviar novos problemas locais" -#: templates/web/base/report/display.html:38 -msgid "Email me updates" -msgstr "Envie-me atualizações" - #: templates/web/base/admin/category_edit.html:31 #: templates/web/base/admin/report_edit.html:62 #: templates/web/base/admin/update_edit.html:33 #: templates/web/base/admin/user-form.html:20 #: templates/web/base/alert/updates.html:13 -#: templates/web/base/report/display.html:42 #: templates/web/zurich/admin/body.html:47 msgid "Email:" msgstr "Email:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:329 +#: perllib/FixMyStreet/Script/Reports.pm:108 msgid "Email: %s" msgstr "Email: %s" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:639 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:634 msgid "Empty flat or maisonette" msgstr "Apartamento vazio ou duplex" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:638 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:633 msgid "Empty house or bungalow" msgstr "Casa vazia ou bungalow" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:641 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:636 msgid "Empty office or other commercial" msgstr "Escritório vazio ou outro comercial" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:642 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:637 msgid "Empty pub or bar" msgstr "Pub ou bar vazio" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:643 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:638 msgid "Empty public building - school, hospital, etc." msgstr "EdifÃcio público vazio - escola, hospital, etc" @@ -983,7 +930,7 @@ msgstr "Endpoint" msgid "Enter a Zürich street name" msgstr "Digite um nome de uma rua de Mindelo" -#: perllib/FixMyStreet/Cobrand/UK.pm:13 +#: perllib/FixMyStreet/Cobrand/UK.pm:14 msgid "Enter a nearby UK postcode, or street name and area" msgstr "Inserir um código postal de Mindelo nas proximidades da area, zona, rua ou local" @@ -1001,14 +948,9 @@ msgstr "Digite um nome de rua nas proximidades e área" msgid "Enter a nearby street name and area, postal code or district in Delhi" msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:152 -#: templates/web/base/report/update-form.html:125 -msgid "Enter a new password:" -msgstr "Digite uma nova senha:" - -#: templates/web/base/auth/general.html:60 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:75 -#: templates/web/fixmystreet/report/update-form.html:123 +#: templates/web/base/auth/general.html:99 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:38 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:13 #: templates/web/zurich/auth/general.html:65 msgid "Enter a password" msgstr "Digite uma nova password" @@ -1018,11 +960,11 @@ msgid "Enter details of the problem" msgstr "Digite os detalhes do problema" #: templates/web/base/errors/generic.html:1 -#: templates/web/base/errors/generic.html:3 +#: templates/web/base/errors/generic.html:4 #: templates/web/base/tokens/abuse.html:1 #: templates/web/base/tokens/abuse.html:3 #: templates/web/base/tokens/error.html:1 -#: templates/web/base/tokens/error.html:3 +#: templates/web/base/tokens/error.html:5 msgid "Error" msgstr "Erro" @@ -1035,11 +977,11 @@ msgstr "" msgid "Example postcode %s" msgstr "Exemplo PostCode %s" -#: templates/web/base/open311/index.html:94 +#: templates/web/base/open311/index.html:86 msgid "Examples:" msgstr "Exemplos:" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:55 +#: templates/web/base/report/new/form_report.html:49 msgid "Explain what’s wrong, exactly where it is, and how long it’s been there…" msgstr "" @@ -1080,17 +1022,15 @@ msgstr "" msgid "FixMyStreet" msgstr "FixMyStreetMindelo" -#: templates/web/base/admin/index.html:61 +#: templates/web/base/admin/index.html:54 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:24 #: templates/web/base/admin/report_blocks.html:9 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:144 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:34 -#: templates/web/fixmystreet/report/banner.html:12 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:32 +#: templates/web/base/report/banner.html:12 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:38 msgid "Fixed" msgstr "Corrigido" @@ -1117,7 +1057,7 @@ msgstr "" msgid "Flag user" msgstr "Bandeira - Usuario" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1281 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1290 #: templates/web/base/admin/users.html:19 msgid "Flagged" msgstr "Marcado" @@ -1148,36 +1088,31 @@ msgstr "Siga um link ala para ver apenas os relatórios dentro do ala." msgid "For more information, see <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>." msgstr "" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:32 -#: templates/web/fixmystreet/report/update-form.html:106 +#: templates/web/base/report/new/form_user_loggedout_password.html:20 +#: templates/web/base/report/update/form_user_loggedout_password.html:19 msgid "Forgotten your password?" msgstr "Esqueceu sua senha?" #: perllib/FixMyStreet/Cobrand/Zurich.pm:752 -#, fuzzy msgid "Forwarded to external body" -msgstr "Atribuir ao órgão externo:" +msgstr "" #: perllib/FixMyStreet/Cobrand/Zurich.pm:753 -#, fuzzy msgid "Forwarded wish to external body" -msgstr "Atribuir ao órgão externo:" +msgstr "" -#: templates/web/base/faq/faq-en-gb.html:1 -#: templates/web/base/faq/faq-en-gb.html:13 -#: templates/web/base/faq/faq-en-gb.html:6 -#: templates/web/base/open311/index.html:6 -#: templates/web/base/static/privacy.html:8 -#: templates/web/fixmystreet/contact/index.html:10 +#: templates/web/base/about/_sidebar.html:4 +#: templates/web/base/about/faq-en-gb.html:1 +#: templates/web/base/about/faq-en-gb.html:5 msgid "Frequently Asked Questions" msgstr "Perguntas mais frequentes" -#: templates/web/base/open311/index.html:136 +#: templates/web/base/open311/index.html:128 msgid "GeoRSS on Google Maps" msgstr "GeoRSS no Google Maps" +#: templates/web/base/report/display_tools.html:11 #: templates/web/fixmystreet/around/_updates.html:3 -#: templates/web/fixmystreet/report/display.html:35 msgid "Get updates" msgstr "Receba as atualizações" @@ -1210,7 +1145,7 @@ msgstr " Ir" msgid "Going to send questionnaire?" msgstr "Vai enviar questionário?" -#: templates/web/base/admin/index.html:42 +#: templates/web/base/admin/index.html:35 msgid "Graph of problem creation by status over time" msgstr "Status da tabela grafica ao longo do tempo" @@ -1227,7 +1162,7 @@ msgid "Have you ever reported a problem to a council before, or is this your fir msgstr "Alguma vez voce ja relatou algum problema ao Conselho, ou é a sua primeira vez?" #: templates/web/base/footer.html:15 templates/web/fixmystreet/footer.html:38 -#: templates/web/zurich/faq/faq-de-ch.html:1 +#: templates/web/zurich/about/faq-de-ch.html:1 #: templates/web/zurich/footer.html:22 #: templates/web/zurich/nav_over_content.html:8 msgid "Help" @@ -1278,7 +1213,7 @@ msgstr "Como reportar um problema" msgid "How to send successful reports" msgstr "Como enviar relatorios com sucesso" -#: perllib/FixMyStreet/App/Controller/Admin.pm:754 +#: perllib/FixMyStreet/App/Controller/Admin.pm:752 msgid "I am afraid you cannot confirm unconfirmed reports." msgstr "Tenho receio de nao puder confirmar os seus relatorios" @@ -1296,10 +1231,6 @@ msgstr "" msgid "I'm afraid we couldn't locate your problem in the database.\n" msgstr "Receio que não foi possÃvel localizar o seu problema no banco de dados.\n" -#: perllib/FixMyStreet/App/Controller/Tokens.pm:327 -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 "Receio que não poderia confirmar se token. Se você copiou o URL de um e-mail, verifique se você copiou exatamente.\n" - #: templates/web/base/admin/flagged.html:14 #: templates/web/base/admin/list_updates.html:6 #: templates/web/base/admin/reports.html:11 @@ -1328,31 +1259,19 @@ msgstr "" msgid "If you get some more information about the status of your problem, please come back to the site and leave an update." msgstr "" -#: templates/web/base/report/new/councils_text_none.html:2 -#: templates/web/base/report/new/councils_text_none.html:8 +#: templates/web/base/report/new/councils_text_none.html:10 +#: templates/web/base/report/new/councils_text_none.html:9 msgid "If you submit a problem here the subject and details of the problem will be public, but the problem will <strong>not</strong> be reported to the council." msgstr "" "Se você enviar um problema sobre qualquer assunto e detalhes, será\"\n" "\"Público, mas o problema nao <strong> vai </strong> ser comunicados ao\"\n" "\"Conselho\"." -#: templates/web/zurich/auth/token.html:19 -#: templates/web/zurich/email_sent.html:7 -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 "" -"Se você usar o e-mail baseado na web ou filtros têm\" junk mail \", você pode querer\"\n" -"\"Verifique suas pastas de correio em massa / spam: à s vezes, nossas mensagens são marcadas que\"\n" -"\"Caminho\"" - #: templates/web/base/questionnaire/index.html:68 -#, fuzzy msgid "" "If you wish to leave a public update on the problem, please enter it here\n" "(please note it will not be sent to the council)." msgstr "" -"Se você quiser deixar uma atualização pública sobre o problema, por favor insira-o aqui \\ n\"\n" -"(Note que não será enviado para o conselho). Por exemplo, o que era \\ n\"\n" -"A sua experiência de ter o problema resolvido" #: templates/web/base/admin/body.html:149 msgid "If you're using <strong>a send method that is not email</strong>, enter the service ID (Open311) or equivalent identifier here." @@ -1391,10 +1310,8 @@ msgstr "Seleção de feed ilegal" #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:144 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:32 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:30 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:36 msgid "In Progress" msgstr "Em andamento" @@ -1402,7 +1319,7 @@ msgstr "Em andamento" msgid "In abuse table?" msgstr "" -#: templates/web/base/open311/index.html:88 +#: templates/web/base/open311/index.html:80 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 "Além disso, os seguintes atributos que não fazem parte da especificação v2 Open311 são retornados: agency_sent_datetime, tÃtulo (também retornou como parte da descrição), interface_used, comment_count, requestor_name (presente apenas se solicitante permitido o nome a ser mostrado neste site) ." @@ -1410,7 +1327,7 @@ msgstr "Além disso, os seguintes atributos que não fazem parte da especificaç #: perllib/FixMyStreet/Cobrand/Zurich.pm:963 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:7 -#: templates/web/fixmystreet/report/banner.html:19 +#: templates/web/base/report/banner.html:19 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:8 msgid "In progress" @@ -1445,7 +1362,7 @@ msgstr "" msgid "Invalid agency_responsible value %s" msgstr "Agencia_responsavel valor %s inválido" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1201 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1210 msgid "Invalid end date" msgstr "Invalido data final" @@ -1453,7 +1370,7 @@ msgstr "Invalido data final" msgid "Invalid format %s specified." msgstr "Formato inválido%s especificado." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1206 msgid "Invalid start date" msgstr "Data de inicio invalida" @@ -1461,14 +1378,12 @@ msgstr "Data de inicio invalida" #: templates/web/base/admin/report_blocks.html:5 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:143 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:31 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:29 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:35 msgid "Investigating" msgstr "Investigando" -#: templates/web/fixmystreet/contact/blurb.html:8 +#: templates/web/base/contact/blurb.html:8 msgid "It's often quickest to <a href=\"%s\">check our FAQs</a> and see if the answer is there." msgstr "" @@ -1486,11 +1401,9 @@ msgstr "" msgid "Jurisdiction unknown" msgstr "" -#: templates/web/base/auth/general.html:44 -#: templates/web/base/report/new/fill_in_details_form.html:132 -#: templates/web/base/report/update-form.html:105 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:28 -#: templates/web/fixmystreet/report/update-form.html:102 +#: templates/web/base/auth/general.html:80 +#: templates/web/base/report/new/form_user_loggedout_password.html:16 +#: templates/web/base/report/update/form_user_loggedout_password.html:15 #: templates/web/zurich/auth/general.html:40 msgid "Keep me signed in on this computer" msgstr "Manter-me logado neste computador" @@ -1548,6 +1461,7 @@ msgid "MAP" msgstr "Mapa" #: templates/web/base/js/translation_strings.html:45 +#: templates/web/base/maps/google-ol.html:13 msgid "Map" msgstr "" @@ -1567,23 +1481,17 @@ msgstr "" msgid "Marked fixed/closed more than eight weeks ago" msgstr "" -#: templates/web/fixmystreet/contact/index.html:106 +#: templates/web/base/contact/index.html:98 msgid "Message" msgstr "Menssagem" #: templates/web/zurich/admin/report_edit.html:284 -#, fuzzy msgid "Message to competent body:" -msgstr "Atribuir ao órgão externo:" +msgstr "" #: templates/web/zurich/admin/report_edit.html:282 -#, fuzzy msgid "Message to external body:" -msgstr "Atribuir ao órgão externo:" - -#: templates/web/base/contact/index.html:97 -msgid "Message:" -msgstr "Menssagem" +msgstr "" #: perllib/FixMyStreet/App/Controller/Open311.pm:445 msgid "Missing jurisdiction_id" @@ -1597,10 +1505,6 @@ msgstr "Moderado por divisão dentro de um dia de trabalho" msgid "Month" msgstr "Mês" -#: templates/web/base/report/display.html:34 -msgid "More problems nearby" -msgstr "Mais problemas próximos" - #: templates/web/base/admin/bodies.html:21 #: templates/web/base/admin/body-form.html:18 #: templates/web/base/admin/flagged.html:16 @@ -1608,11 +1512,11 @@ msgstr "Mais problemas próximos" #: templates/web/base/admin/list_updates.html:7 #: templates/web/base/admin/reports.html:13 #: templates/web/base/admin/users.html:15 -#: templates/web/base/auth/general.html:50 +#: templates/web/base/auth/general.html:89 +#: templates/web/base/report/new/form_user_loggedin.html:9 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:7 +#: templates/web/base/report/update/form_name.html:4 #: templates/web/base/reports/index.html:20 -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:9 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:44 -#: templates/web/fixmystreet/report/update-form.html:138 #: templates/web/zurich/admin/body-form.html:4 #: templates/web/zurich/auth/general.html:60 #: templates/web/zurich/report/new/fill_in_details_form.html:82 @@ -1626,7 +1530,7 @@ msgstr "Nome" msgid "Name:" msgstr "Nome:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:328 +#: perllib/FixMyStreet/Script/Reports.pm:107 msgid "Name: %s" msgstr "Nome: %s" @@ -1635,16 +1539,16 @@ msgstr "Nome: %s" msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s" msgstr "Nomeado rodoviário mais próximo ao pino colocado no mapa (gerado automaticamente usando OpenStreetMap): %s%s" -#: perllib/FixMyStreet/Cobrand/UK.pm:127 +#: perllib/FixMyStreet/Cobrand/UK.pm:128 msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" msgstr "Código postal mais próximo do pino colocado no mapa (gerado automaticamente): %s (%sm distância)" -#: perllib/FixMyStreet/Cobrand/Default.pm:434 -#: perllib/FixMyStreet/Cobrand/Default.pm:474 +#: perllib/FixMyStreet/Cobrand/Default.pm:455 +#: perllib/FixMyStreet/Cobrand/Default.pm:495 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "Estrada mais próxima para o pino colocado no mapa (gerado automaticamente por Bing Maps): %s" -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:267 +#: perllib/FixMyStreet/Script/Alerts.pm:290 msgid "" "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n" "\n" @@ -1653,14 +1557,9 @@ msgstr "" "\n" "\n" -#: templates/web/zurich/email_sent.html:5 -msgid "Nearly Done! Now check your email..." -msgstr "Quase pronto! Agora, verifique seu e-mail ..." - #: templates/web/base/auth/token.html:17 templates/web/base/email_sent.html:5 -#, fuzzy msgid "Nearly done! Now check your email…" -msgstr "Quase pronto! Agora, verifique seu e-mail ..." +msgstr "" #: templates/web/base/reports/index.html:21 msgid "New <br>problems" @@ -1717,9 +1616,8 @@ msgstr "Novo estado" #: templates/web/zurich/admin/template_edit.html:9 #: templates/web/zurich/admin/templates.html:26 -#, fuzzy msgid "New template" -msgstr "Novo estado" +msgstr "" #: templates/web/base/pagination.html:13 msgid "Next" @@ -1736,8 +1634,8 @@ msgstr "Proximo" #: templates/web/base/admin/report_edit.html:75 #: templates/web/base/admin/update_edit.html:25 #: templates/web/base/questionnaire/creator_fixed.html:16 +#: templates/web/base/questionnaire/index.html:101 #: templates/web/base/questionnaire/index.html:53 -#: templates/web/base/questionnaire/index.html:92 msgid "No" msgstr "Nao" @@ -1801,10 +1699,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:13 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:33 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:31 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:37 msgid "Not Responsible" msgstr "Nao responsavel" @@ -1812,9 +1708,8 @@ msgstr "Nao responsavel" #: perllib/FixMyStreet/Cobrand/Zurich.pm:937 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:13 -#, fuzzy msgid "Not contactable" -msgstr "Nao responsavel" +msgstr "" #: templates/web/zurich/admin/report_edit-sdm.html:108 msgid "Not for my subdivision" @@ -1844,7 +1739,7 @@ msgstr "Note que quando incluimos relatos não confirmados usamos a data em que msgid "Note:" msgstr "Nota" -#: templates/web/base/open311/index.html:73 +#: templates/web/base/open311/index.html:65 msgid "Note: <strong>%s</strong>" msgstr "Nota: <strong>%s</strong>" @@ -1852,13 +1747,15 @@ msgstr "Nota: <strong>%s</strong>" msgid "Notes from SDM to DM" msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:113 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:10 +#: templates/web/base/report/new/form_user_loggedout.html:14 +#: templates/web/base/report/new/form_user_loggedout.html:2 +#: templates/web/base/report/new/oauth_email_form.html:17 msgid "Now to submit your report…" msgstr "Agora, para apresentar o seu relatório ..." -#: templates/web/base/report/update-form.html:86 -#: templates/web/fixmystreet/report/update-form.html:85 +#: templates/web/base/report/update-form.html:28 +#: templates/web/base/report/update/form_user_loggedout.html:13 +#: templates/web/base/report/update/form_user_loggedout.html:2 msgid "Now to submit your update…" msgstr "Agora, para apresentar a sua atualização ..." @@ -1866,11 +1763,6 @@ msgstr "Agora, para apresentar a sua atualização ..." msgid "OK" msgstr "OK" -#: templates/web/base/report/display.html:28 -#: templates/web/base/report/update.html:17 -msgid "Offensive? Unsuitable? Tell us" -msgstr "Ofensivo? Inadequado? Informem-nos" - #: templates/web/base/reports/index.html:23 msgid "Old / unknown <br>problems" msgstr " Velho / desconhecido <br>problems" @@ -1887,7 +1779,7 @@ msgstr "Mais antigo <br>fixado" msgid "Older <br>problems" msgstr "Mais antigo <br>problemas" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:45 +#: templates/web/base/report/new/form_report.html:15 msgid "One-line summary" msgstr "" @@ -1898,8 +1790,7 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:4 #: templates/web/base/admin/update_edit.html:28 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/report/update-form.html:30 -#: templates/web/fixmystreet/report/update-form.html:28 +#: templates/web/base/report/update/form_update.html:34 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:7 #: templates/web/zurich/admin/update_edit.html:18 @@ -1914,15 +1805,15 @@ msgstr "" msgid "Open, but not had any update in eight weeks" msgstr "" -#: templates/web/base/open311/index.html:70 +#: templates/web/base/open311/index.html:62 msgid "Open311 API for the mySociety FixMyStreet server" msgstr "Open311 API para o servidor FixMyStreet mySociety" -#: templates/web/base/open311/index.html:80 +#: templates/web/base/open311/index.html:72 msgid "Open311 initiative web page" msgstr "Open311 página web iniciativa" -#: templates/web/base/open311/index.html:81 +#: templates/web/base/open311/index.html:73 msgid "Open311 specification" msgstr "Especificação Open311" @@ -1934,15 +1825,15 @@ msgstr "Ou os problemas relatados para:" msgid "Or you can subscribe to an alert based upon what ward or council you’re in:" msgstr "Ou você pode se inscrever em um alerta baseado no que ala, zona ou conselho você está inserido" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1084 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:673 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:674 -#: perllib/FixMyStreet/DB/Result/Problem.pm:570 -#: perllib/FixMyStreet/DB/Result/Problem.pm:580 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1055 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:669 +#: perllib/FixMyStreet/DB/Result/Problem.pm:558 +#: perllib/FixMyStreet/DB/Result/Problem.pm:568 +#: perllib/FixMyStreet/DB/Result/Problem.pm:578 #: perllib/FixMyStreet/DB/Result/Problem.pm:590 -#: perllib/FixMyStreet/DB/Result/Problem.pm:602 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:397 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:412 +#: perllib/FixMyStreet/Script/Reports.pm:175 +#: perllib/FixMyStreet/Script/Reports.pm:190 msgid "Other" msgstr "Outro" @@ -1951,7 +1842,7 @@ msgid "Owner" msgstr "Proprietário" #: templates/web/base/errors/page_error_404_not_found.html:1 -#: templates/web/base/errors/page_error_404_not_found.html:3 +#: templates/web/base/errors/page_error_404_not_found.html:4 msgid "Page Not Found" msgstr "Pagina nao encontrada" @@ -1965,16 +1856,16 @@ msgstr "Parente" msgid "Partial" msgstr "Parcial" -#: templates/web/base/auth/general.html:53 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:68 -#: templates/web/fixmystreet/report/update-form.html:116 +#: templates/web/base/auth/general.html:92 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:31 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:6 #: templates/web/zurich/auth/general.html:32 #: templates/web/zurich/auth/general.html:63 msgid "Password (optional)" msgstr "Password (opcional)" #: templates/web/base/auth/change_password.html:25 -#: templates/web/base/auth/general.html:36 +#: templates/web/base/auth/general.html:72 msgid "Password:" msgstr "Password:" @@ -1986,45 +1877,37 @@ msgstr "" msgid "Phone number" msgstr "" -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:26 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:62 +#: templates/web/base/report/new/form_user_loggedin.html:26 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:25 msgid "Phone number (optional)" msgstr "Telefone (opcional)" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:306 +#: perllib/FixMyStreet/Script/Reports.pm:83 #: templates/web/base/admin/report_edit.html:63 -#: templates/web/base/report/new/fill_in_details_form.html:198 #: templates/web/zurich/admin/stats.html:39 msgid "Phone:" msgstr "Telefone:" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:66 -#: templates/web/fixmystreet/report/update-form.html:59 +#: templates/web/base/questionnaire/index.html:75 +#: templates/web/base/report/new/form_report.html:23 +#: templates/web/base/report/update/form_update.html:6 #: templates/web/zurich/admin/index-dm.html:29 #: templates/web/zurich/admin/index-sdm.html:24 #: templates/web/zurich/admin/reports.html:16 #: templates/web/zurich/admin/stats.html:37 -#: templates/web/zurich/report/new/fill_in_details_form.html:52 +#: templates/web/zurich/report/new/fill_in_details_form.html:45 msgid "Photo" msgstr "Foto" -#: perllib/FixMyStreet/App/Controller/Photo.pm:221 -#, fuzzy +#: perllib/FixMyStreet/App/Controller/Photo.pm:187 msgid "Photo is required." -msgstr "Esta informação é necessária" +msgstr "" #: templates/web/base/admin/category_edit.html:48 -#, fuzzy msgid "Photo required" -msgstr "Esta informação é necessária" - -#: templates/web/base/questionnaire/index.html:80 -#: templates/web/base/report/new/fill_in_details_form.html:84 -#: templates/web/base/report/update-form.html:62 -msgid "Photo:" -msgstr "Foto" +msgstr "" -#: templates/web/base/alert/list.html:26 +#: templates/web/base/alert/list.html:23 msgid "Photos of recent nearby reports" msgstr "Fotos de relatórios recentes mais proximos" @@ -2053,20 +1936,16 @@ msgstr "Por favor, seja educado, objectivo, conciso e direto ao ponto." msgid "Please check the passwords and try again" msgstr "Por favor verifique as senhas e tente novamente" -#: templates/web/zurich/auth/token.html:16 -msgid "Please check your email" -msgstr "Favor verificar seu email" - -#: templates/web/base/auth/general.html:10 -#: templates/web/base/auth/general.html:16 +#: templates/web/base/auth/general.html:27 +#: templates/web/base/auth/general.html:33 #: templates/web/zurich/auth/general.html:3 #: templates/web/zurich/auth/general.html:9 msgid "Please check your email address is correct" msgstr "Favor verificar se seu email esta correcto" #: perllib/FixMyStreet/App/Controller/Admin.pm:343 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:883 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:948 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:878 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:943 #: perllib/FixMyStreet/DB/Result/Problem.pm:412 #: templates/web/base/js/translation_strings.html:9 msgid "Please choose a category" @@ -2080,17 +1959,12 @@ msgstr "Por favor, escolha um tipo de imóvel" msgid "Please correct the errors below" msgstr "" -#: templates/web/base/contact/blurb.html:2 -#: templates/web/fixmystreet/contact/blurb.html:12 -#, fuzzy +#: templates/web/base/contact/blurb.html:12 msgid "" "Please do <strong>not</strong> report problems through this form; messages go to\n" "the team behind this site, not a council. To report a problem,\n" "please <a href=\"/\">go to the front page</a> and follow the instructions." msgstr "" -"Por favor, faça <strong> não </strong> relatar problemas através deste formulário; mensagens de ir para âŽ\n" -"a equipe por trás FixMyStreet, não um conselho. Para relatar um problema, âŽ\n" -"<a href=\"/\"> ir para a página inicial </a> e siga as instruções." #: templates/web/base/report/new/notes.html:6 msgid "Please do not be abusive — abusing your council devalues the service for all users." @@ -2100,11 +1974,17 @@ msgstr "" "<a href=\"/\"> ir par a Página Inicial </a> e como SIGA INSTRUÇÕES." #: perllib/FixMyStreet/App/Controller/Admin.pm:346 -#: perllib/FixMyStreet/DB/Result/Comment.pm:126 +#: perllib/FixMyStreet/DB/Result/Comment.pm:125 #: templates/web/base/js/translation_strings.html:2 msgid "Please enter a message" msgstr "Por favor insira uma mensagem" +#: perllib/FixMyStreet/App/Controller/Admin.pm:1091 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1146 +#, fuzzy +msgid "Please enter a name" +msgstr "Digite seu nome" + #: templates/web/base/auth/change_password.html:12 #: templates/web/base/auth/change_password.html:15 #: templates/web/base/js/translation_strings.html:19 @@ -2117,10 +1997,10 @@ msgstr "Por favor insira uma password" msgid "Please enter a subject" msgstr "Por favor insira um assunto" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1084 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1137 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1087 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1142 #: perllib/FixMyStreet/App/Controller/Admin.pm:345 -#: perllib/FixMyStreet/DB/Result/User.pm:127 +#: perllib/FixMyStreet/DB/Result/User.pm:133 #: templates/web/base/js/translation_strings.html:12 #: templates/web/base/js/translation_strings.html:16 msgid "Please enter a valid email" @@ -2137,9 +2017,9 @@ msgid "Please enter some details" msgstr "Por favor, insira alguns detalhes" #: perllib/FixMyStreet/App/Controller/Contact.pm:113 -#: perllib/FixMyStreet/DB/Result/User.pm:124 -#: templates/web/base/auth/general.html:10 -#: templates/web/base/auth/general.html:15 +#: perllib/FixMyStreet/DB/Result/User.pm:130 +#: templates/web/base/auth/general.html:27 +#: templates/web/base/auth/general.html:32 #: templates/web/base/js/translation_strings.html:11 #: templates/web/base/js/translation_strings.html:15 #: templates/web/zurich/auth/general.html:3 @@ -2147,7 +2027,7 @@ msgstr "Por favor, insira alguns detalhes" msgid "Please enter your email" msgstr "Digite seu e-mail" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:7 +#: templates/web/base/report/new/form_user_loggedout_email.html:7 #: templates/web/zurich/report/new/fill_in_details_form.html:80 msgid "Please enter your email address" msgstr "Por favor, insira o seu endereço de email" @@ -2156,15 +2036,15 @@ msgstr "Por favor, insira o seu endereço de email" msgid "Please enter your first name" msgstr "Digite seu primeiro nome" -#: perllib/FixMyStreet/Cobrand/UK.pm:318 +#: perllib/FixMyStreet/Cobrand/UK.pm:319 #: templates/web/base/js/translation_strings.html:7 msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below" msgstr "Por favor, insira o seu nome completo, os conselhos precisam desta informação - se você não quiser que seu nome seja mostrado no site, desmarque a caixa abaixo" #: perllib/FixMyStreet/App/Controller/Contact.pm:112 -#: perllib/FixMyStreet/DB/Result/Comment.pm:123 +#: perllib/FixMyStreet/DB/Result/Comment.pm:122 #: perllib/FixMyStreet/DB/Result/Problem.pm:406 -#: perllib/FixMyStreet/DB/Result/User.pm:120 +#: perllib/FixMyStreet/DB/Result/User.pm:126 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter your name" msgstr "Digite seu nome" @@ -2191,12 +2071,11 @@ msgstr "Por favor, sinta-se livre para <a href=\\\"%s\\\"> se inscrever de novo msgid "Please fill in details of the problem below." msgstr "Por favor, preencha os detalhes do problema abaixo." -#: templates/web/zurich/report/new/fill_in_details_form.html:46 +#: templates/web/zurich/report/new/fill_in_details_form.html:72 msgid "Please fill in details of the problem." msgstr "Por favor, preencha os detalhes do problema." -#: templates/web/base/report/new/fill_in_details_form.html:28 -#: templates/web/fixmystreet/report/new/sidebar.html:7 +#: templates/web/base/report/new/sidebar.html:7 #: templates/web/zurich/report/new/fill_in_details_form.html:20 msgid "Please fill in the form below with details of the problem, and describe the location as precisely as possible in the details box." msgstr "Por favor, preencha o formulário abaixo com detalhes do problema e descrever a localização mais precisa possÃvel na caixa de detalhes." @@ -2205,20 +2084,24 @@ msgstr "Por favor, preencha o formulário abaixo com detalhes do problema e desc msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "Por favor, indique se você gostaria de receber um outro questionário" -#: templates/web/fixmystreet/report/updates-sidebar-notes.html:4 +#: templates/web/base/report/updates-sidebar-notes.html:2 msgid "Please note that updates are not sent to the council." msgstr "Por favor, note que as atualizações não são enviadas para o conselho." -#: templates/web/base/report/update-form.html:7 -msgid "Please note that updates are not sent to the council. If you leave your name it will be public. Your information will only be used in accordance with our <a href=\"/faq#privacy\">privacy policy</a>" -msgstr "Por favor, note que as atualizações Localidade: Não São enviadas par o Conselho. Se Você. deixar Seu Nome Será, Público. SUAS Informations Só Serao utilizadas according to Nossa <a href=\"/faq#privacy\"> Politica de Privacidade </a>" +#: templates/web/base/report/new/oauth_email_form.html:4 +#, fuzzy +msgid "Please note your report has <strong>not yet been sent</strong>." +msgstr "Por favor, note o relatório ainda não foi enviado <strong> </strong>. Escolha uma categoria e acrescentar mais informações abaixo, em seguida, enviar." -#: templates/web/base/report/new/fill_in_details_form.html:8 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:21 +#: templates/web/base/report/new/fill_in_details_form.html:20 #: templates/web/zurich/report/new/fill_in_details_form.html:11 msgid "Please note your report has <strong>not yet been sent</strong>. Choose a category and add further information below, then submit." msgstr "Por favor, note o relatório ainda não foi enviado <strong> </strong>. Escolha uma categoria e acrescentar mais informações abaixo, em seguida, enviar." +#: templates/web/base/report/display.html:26 +msgid "Please note your update has <strong>not yet been posted</strong>." +msgstr "" + #: templates/web/base/report/new/notes.html:1 #: templates/web/zurich/report/new/notes.html:1 msgid "Please note:" @@ -2238,9 +2121,8 @@ msgid "Please say whether you've ever reported a problem to your council before" msgstr "Por favor, diga se você já relatou um problema para o seu conselho antes" #: templates/web/zurich/admin/report_edit.html:208 -#, fuzzy msgid "Please select a body." -msgstr "Selecione um corpo" +msgstr "" #: perllib/FixMyStreet/App/Controller/Alert.pm:80 msgid "Please select the feed you want" @@ -2257,6 +2139,7 @@ msgstr "Por favor, indique se o problema foi corrigido" #: perllib/FixMyStreet/App/Model/PhotoSet.pm:117 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:145 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:147 +#: templates/web/base/js/translation_strings.html:53 msgid "Please upload a JPEG image only" msgstr "Faça upload somente de uma imagem em JPEG " @@ -2264,18 +2147,14 @@ msgstr "Faça upload somente de uma imagem em JPEG " msgid "Please write a message" msgstr "Por favor, escreva uma mensagem" -#: templates/web/fixmystreet/report/update-form.html:23 +#: templates/web/base/report/update/form_update.html:29 msgid "Please write your update here" msgstr "Por favor, escreva a sua atualização aqui" -#: templates/web/base/contact/index.html:100 -#: templates/web/base/report/update-form.html:110 -#: templates/web/base/report/update-form.html:132 -#: templates/web/base/report/update-form.html:72 -#: templates/web/fixmystreet/contact/index.html:113 -#: templates/web/fixmystreet/report/update-form.html:124 -#: templates/web/fixmystreet/report/update-form.html:71 -#: templates/web/fixmystreet/report/update-form.html:97 +#: templates/web/base/contact/index.html:105 +#: templates/web/base/report/update-form.html:24 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:14 +#: templates/web/base/report/update/form_user_loggedout_password.html:10 msgid "Post" msgstr "Postar" @@ -2303,12 +2182,9 @@ msgstr "Anterior" msgid "Privacy" msgstr "" -#: templates/web/base/faq/faq-en-gb.html:7 -#: templates/web/base/open311/index.html:7 -#: templates/web/base/static/privacy.html:1 -#: templates/web/base/static/privacy.html:2 -#: templates/web/base/static/privacy.html:9 -#: templates/web/fixmystreet/contact/index.html:11 +#: templates/web/base/about/_sidebar.html:5 +#: templates/web/base/about/privacy.html:1 +#: templates/web/base/about/privacy.html:2 msgid "Privacy and cookies" msgstr "" @@ -2336,12 +2212,12 @@ msgstr "Problema %s confirmado" msgid "Problem %s sent to council %s" msgstr "Problema %s enviado ao conselho %s" -#: templates/web/base/admin/index.html:46 +#: templates/web/base/admin/index.html:39 #: templates/web/zurich/admin/index.html:9 msgid "Problem breakdown by state" msgstr "Colapso problema por estado" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1055 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1058 msgid "Problem marked as open." msgstr "Problema marcado como aberto." @@ -2357,11 +2233,11 @@ msgstr "Problemas" msgid "Problems in this area" msgstr "Problemas nesta área" -#: templates/web/fixmystreet/report/display.html:43 +#: templates/web/base/report/display_tools.html:19 msgid "Problems nearby" msgstr "Problemas nas proximidades" -#: templates/web/fixmystreet/report/display.html:41 +#: templates/web/base/report/display_tools.html:17 msgid "Problems on the map" msgstr "Problemas no mapa" @@ -2373,24 +2249,23 @@ msgstr "Problemas relatados recentemente fixados em FixMyStreetMindelo" msgid "Problems within %.1fkm of this location" msgstr "Problemas dentro de %.1fkm deste local" -#: perllib/FixMyStreet/Cobrand/Default.pm:642 +#: perllib/FixMyStreet/Cobrand/Default.pm:663 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:120 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:139 -#: perllib/FixMyStreet/Cobrand/UK.pm:207 +#: perllib/FixMyStreet/Cobrand/UK.pm:208 msgid "Problems within %s" msgstr "Problemas dentro de %s" #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:128 -#: perllib/FixMyStreet/Cobrand/UK.pm:221 +#: perllib/FixMyStreet/Cobrand/UK.pm:222 msgid "Problems within %s ward" msgstr "Problemas dentro de %s ala" #. ("First %s is the body name, second %s the site name") #: templates/web/base/reports/body.html:0 #: templates/web/base/reports/body.html:24 -#, fuzzy msgid "Problems within %s, %s" -msgstr "Problemas dentro de %s" +msgstr "" #: templates/web/base/alert/_list.html:42 msgid "Problems within the boundary of:" @@ -2404,19 +2279,16 @@ msgstr "Endereço do imóvel:" msgid "Property type:" msgstr "Tipo de propriedade:" -#: templates/web/base/report/update-form.html:3 -#: templates/web/fixmystreet/report/update-form.html:4 +#: templates/web/base/report/update-form.html:6 msgid "Provide an update" msgstr "Fornecer uma atualização" -#: templates/web/base/auth/general.html:56 +#: templates/web/base/auth/general.html:95 msgid "Providing a name and password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:156 -#: templates/web/base/report/update-form.html:129 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:71 -#: templates/web/fixmystreet/report/update-form.html:119 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:34 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:9 msgid "Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." msgstr "Fornecer uma senha é opcional, mas isso vai permitir que você mais facilmente relate seus problemas, deixe as atualizações e gerencie seus relatórios." @@ -2452,18 +2324,17 @@ msgstr "Questionário preenchido por problema repórter" #: templates/web/base/alert/_list.html:22 #: templates/web/base/around/display_location.html:1 #: templates/web/base/around/display_location.html:3 -#: templates/web/base/report/display.html:50 +#: templates/web/base/report/display_tools.html:34 #: templates/web/base/reports/_rss.html:1 #: templates/web/fixmystreet/alert/updates.html:9 -#: templates/web/fixmystreet/report/display.html:58 msgid "RSS feed" msgstr "RSS feed" -#: perllib/FixMyStreet/Cobrand/UK.pm:250 perllib/FixMyStreet/Cobrand/UK.pm:262 +#: perllib/FixMyStreet/Cobrand/UK.pm:251 perllib/FixMyStreet/Cobrand/UK.pm:263 msgid "RSS feed for %s" msgstr "RSS feed para %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:256 perllib/FixMyStreet/Cobrand/UK.pm:268 +#: perllib/FixMyStreet/Cobrand/UK.pm:257 perllib/FixMyStreet/Cobrand/UK.pm:269 msgid "RSS feed for %s ward, %s" msgstr "RSS feed for %s ala,%s" @@ -2471,11 +2342,11 @@ msgstr "RSS feed for %s ala,%s" #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:163 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:173 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:181 -#: perllib/FixMyStreet/Cobrand/UK.pm:276 perllib/FixMyStreet/Cobrand/UK.pm:288 +#: perllib/FixMyStreet/Cobrand/UK.pm:277 perllib/FixMyStreet/Cobrand/UK.pm:289 msgid "RSS feed of %s" msgstr "RSS feed de %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:281 perllib/FixMyStreet/Cobrand/UK.pm:293 +#: perllib/FixMyStreet/Cobrand/UK.pm:282 perllib/FixMyStreet/Cobrand/UK.pm:294 msgid "RSS feed of %s, within %s ward" msgstr "RSS feed de %s, %s problemas pendentes" @@ -2487,15 +2358,15 @@ msgstr "RSS feed dos problemas próximos" msgid "RSS feed of problems in this %s" msgstr "RSS feed dos problemas nesta %s" -#: perllib/FixMyStreet/Cobrand/Default.pm:643 +#: perllib/FixMyStreet/Cobrand/Default.pm:664 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:121 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:138 -#: perllib/FixMyStreet/Cobrand/UK.pm:214 +#: perllib/FixMyStreet/Cobrand/UK.pm:215 msgid "RSS feed of problems within %s" msgstr "RSS feed dos Problemas Nesta %s" #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:127 -#: perllib/FixMyStreet/Cobrand/UK.pm:220 +#: perllib/FixMyStreet/Cobrand/UK.pm:221 msgid "RSS feed of problems within %s ward" msgstr "RSS feed dos problemas dentro de %s ala" @@ -2504,25 +2375,22 @@ msgstr "RSS feed dos problemas dentro de %s ala" msgid "RSS feed of recent local problems" msgstr "RSS feed dos problemas locais recentes" -#: templates/web/base/report/display.html:50 +#: templates/web/base/report/display_tools.html:34 #: templates/web/fixmystreet/alert/updates.html:9 -#: templates/web/fixmystreet/report/display.html:58 msgid "RSS feed of updates to this problem" msgstr "RSS feed de atualizações para este problema" #: templates/web/base/alert/updates.html:9 -#: templates/web/base/report/display.html:41 +#: templates/web/base/report/display_tools.html:36 #: templates/web/fixmystreet/alert/updates.html:14 -#: templates/web/fixmystreet/report/display.html:60 msgid "Receive email when updates are left on this problem." msgstr "RSS feed dos problemas locais recentes" #. ("%s is the site name") #: templates/web/base/around/display_location.html:0 #: templates/web/base/around/display_location.html:33 -#, fuzzy msgid "Recent local problems, %s" -msgstr "Recentes problemas locais, FixMyStreetMindelo" +msgstr "" #: templates/web/base/reports/index.html:24 msgid "Recently <br>fixed" @@ -2540,8 +2408,8 @@ msgstr "Lembre-se que FixMyStreetMIndelo é principalmente para relatar problema msgid "Remove flag" msgstr "Remover bandeira" -#: templates/web/base/admin/report_edit.html:92 -#: templates/web/base/admin/update_edit.html:62 +#: templates/web/base/admin/report_edit.html:93 +#: templates/web/base/admin/update_edit.html:67 #: templates/web/zurich/admin/update_edit.html:35 msgid "Remove photo (can't be undone!)" msgstr "Remover foto (não pode ser desfeita!)" @@ -2561,7 +2429,7 @@ msgstr "" msgid "Report a problem" msgstr "Comunicar um problema" -#: templates/web/fixmystreet/report/display.html:32 +#: templates/web/base/report/display_tools.html:8 msgid "Report abuse" msgstr "Denunciar um abuso" @@ -2570,7 +2438,8 @@ msgid "Report on %s" msgstr "Relatório sobre %s" #: templates/web/base/report/new/fill_in_details_form.html:1 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:2 +#: templates/web/base/report/new/login_success_form.html:1 +#: templates/web/base/report/new/oauth_email_form.html:1 msgid "Report your problem" msgstr "" @@ -2579,9 +2448,8 @@ msgstr "" msgid "Report, view, or discuss local problems" msgstr "Relatório, vista, ou discutir os problemas locais" -#: perllib/FixMyStreet/DB/Result/Problem.pm:585 -#: templates/web/base/contact/index.html:50 -#: templates/web/fixmystreet/contact/index.html:65 +#: perllib/FixMyStreet/DB/Result/Problem.pm:573 +#: templates/web/base/contact/index.html:57 msgid "Reported anonymously at %s" msgstr "Relatado anonimamente em %s" @@ -2590,43 +2458,41 @@ msgstr "Relatado anonimamente em %s" msgid "Reported before" msgstr "Relatado antes" -#: perllib/FixMyStreet/DB/Result/Problem.pm:608 -#: templates/web/base/contact/index.html:52 -#: templates/web/fixmystreet/contact/index.html:67 +#: perllib/FixMyStreet/DB/Result/Problem.pm:596 +#: templates/web/base/contact/index.html:59 msgid "Reported by %s at %s" msgstr "Relatado por %s em %s" #: templates/web/zurich/admin/report_edit-sdm.html:58 #: templates/web/zurich/admin/report_edit.html:86 -#, fuzzy msgid "Reported by:" -msgstr "Relatado %s" +msgstr "" #: templates/web/zurich/report/_main.html:2 msgid "Reported in the %s category" msgstr "Relatado na categoria %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:581 +#: perllib/FixMyStreet/DB/Result/Problem.pm:569 msgid "Reported in the %s category anonymously at %s" msgstr "Relatado na categoria %s anonimamente em %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:603 +#: perllib/FixMyStreet/DB/Result/Problem.pm:591 msgid "Reported in the %s category by %s at %s" msgstr "Relatado na categoria %s por %s em %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:577 +#: perllib/FixMyStreet/DB/Result/Problem.pm:565 msgid "Reported via %s anonymously at %s" msgstr "Relatado por %s anonimamente em %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:599 +#: perllib/FixMyStreet/DB/Result/Problem.pm:587 msgid "Reported via %s by %s at %s" msgstr "Relatado por %s por%s em %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:573 +#: perllib/FixMyStreet/DB/Result/Problem.pm:561 msgid "Reported via %s in the %s category anonymously at %s" msgstr "Relatado por %s na categoria %s anonimamente em %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:593 +#: perllib/FixMyStreet/DB/Result/Problem.pm:581 msgid "Reported via %s in the %s category by %s at %s" msgstr "Relatado por %s na categoria %s por %s em %s" @@ -2636,9 +2502,8 @@ msgstr "" #: templates/web/zurich/admin/report_edit-sdm.html:36 #: templates/web/zurich/admin/report_edit.html:55 -#, fuzzy msgid "Reported:" -msgstr "Relatado %s" +msgstr "" #: templates/web/base/around/index.html:2 #: templates/web/base/js/translation_strings.html:41 @@ -2648,13 +2513,13 @@ msgstr "Relatado %s" msgid "Reporting a problem" msgstr "Relatando um problema" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1277 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1286 #: perllib/FixMyStreet/Cobrand/Zurich.pm:384 #: templates/web/zurich/header.html:60 msgid "Reports" msgstr "Relatórios" -#: perllib/FixMyStreet/Cobrand/UK.pm:327 perllib/FixMyStreet/Cobrand/UK.pm:331 +#: perllib/FixMyStreet/Cobrand/UK.pm:328 perllib/FixMyStreet/Cobrand/UK.pm:332 msgid "Reports are limited to %s characters in length. Please shorten your report" msgstr "" @@ -2691,15 +2556,17 @@ msgstr "Operador de estrada por esta estrada chamada (derivado do número de ref msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "Operador de estrada por esta estrada chamada (a partir de OpenStreetMap): %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1495 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1500 -#: templates/web/base/admin/report_edit.html:88 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1508 +#: templates/web/base/admin/report_edit.html:90 +#: templates/web/base/admin/update_edit.html:64 #: templates/web/zurich/admin/report_edit.html:116 msgid "Rotate Left" msgstr "Girar para a esquerda" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1495 -#: templates/web/base/admin/report_edit.html:89 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 +#: templates/web/base/admin/report_edit.html:91 +#: templates/web/base/admin/update_edit.html:65 #: templates/web/zurich/admin/report_edit.html:117 msgid "Rotate Right" msgstr "Girar para a direita" @@ -2709,7 +2576,6 @@ msgid "Rotating this photo will discard unsaved changes to the report." msgstr "" #: templates/web/base/js/translation_strings.html:46 -#: templates/web/base/maps/google-ol.html:13 msgid "Satellite" msgstr "" @@ -2762,16 +2628,14 @@ msgid "Select an area" msgstr "Selecione uma área" #: templates/web/base/alert/_list.html:10 -#, fuzzy msgid "Select which type of alert you’d like and click the button for an RSS feed, or enter your email address to subscribe to an email alert." -msgstr "Selecione o tipo de alerta fixstreet que você gostaria de receber e clique no botão para um feed RSS ou introduza o seu endereço de email para assinar um alerta de e-mail." +msgstr "" #: perllib/FixMyStreet/Cobrand/Zurich.pm:835 -#, fuzzy msgid "Sent report back" -msgstr "Relatorios abertos" +msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:708 +#: perllib/FixMyStreet/DB/Result/Problem.pm:696 msgid "Sent to %s %s later" msgstr "Enviado para %s %s mais tarde" @@ -2784,15 +2648,13 @@ msgstr "Enviar:" msgid "Service:" msgstr "Srerviço:" -#: templates/web/fixmystreet/report/display.html:38 +#: templates/web/base/report/display_tools.html:14 msgid "Share" msgstr "Acçao" -#: templates/web/base/report/new/fill_in_details_form.html:193 -#: templates/web/base/report/update-form.html:158 -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:23 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:59 -#: templates/web/fixmystreet/report/update-form.html:146 +#: templates/web/base/report/new/form_user_loggedin.html:23 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:22 +#: templates/web/base/report/update/form_name.html:15 msgid "Show my name publicly" msgstr "Mostrar meu nome publicamente" @@ -2804,9 +2666,9 @@ msgstr "Mostrar antigo" msgid "Show pins" msgstr "Mostrar pins" +#: templates/web/base/auth/general.html:100 #: templates/web/base/auth/general.html:3 -#: templates/web/base/auth/general.html:40 -#: templates/web/base/auth/general.html:61 +#: templates/web/base/auth/general.html:76 #: templates/web/zurich/auth/general.html:18 #: templates/web/zurich/auth/general.html:35 msgid "Sign in" @@ -2833,7 +2695,7 @@ msgid "" " sent from your FixMyStreet installation." msgstr "" -#: templates/web/base/alert/index.html:42 +#: templates/web/base/alert/index.html:40 msgid "Some photos of recent reports" msgstr "Fotos de reports recentes" @@ -2843,7 +2705,7 @@ msgstr "Fotos de reports recentes" msgid "Some text to localize" msgstr "Algum informaçao para localizar" -#: perllib/FixMyStreet/Cobrand/UK.pm:78 +#: perllib/FixMyStreet/Cobrand/UK.pm:79 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover." msgstr "Desculpe, codigo postal nao coincide. Area nao comprrendida." @@ -2855,23 +2717,34 @@ msgstr "" msgid "Sorry, there has been an error confirming your problem." msgstr "Desculpe, houve um erro ao confirmar o seu problema." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:221 -#: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:37 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:216 +#: perllib/FixMyStreet/Geocode.pm:38 perllib/FixMyStreet/Geocode/Bing.pm:38 #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:56 #: perllib/FixMyStreet/Geocode/OSM.pm:48 msgid "Sorry, we could not find that location." msgstr "Desculpe, não conseguimos encontrar esse local." -#: perllib/FixMyStreet/Geocode/Bing.pm:34 +#: templates/web/base/auth/general.html:9 +#: templates/web/base/report/display.html:21 +#: templates/web/base/report/new/fill_in_details_form.html:23 +#, fuzzy +msgid "Sorry, we could not log you in. Please fill in the form below." +msgstr "Desculpe, mas não foi possÃvel analisar esse local. Por favor, tente novamente." + +#: perllib/FixMyStreet/Geocode/Bing.pm:35 #: perllib/FixMyStreet/Geocode/Google.pm:45 #: perllib/FixMyStreet/Geocode/Zurich.pm:88 msgid "Sorry, we could not parse that location. Please try again." msgstr "Desculpe, mas não foi possÃvel analisar esse local. Por favor, tente novamente." #: perllib/FixMyStreet/App/Model/PhotoSet.pm:134 -#, fuzzy msgid "Sorry, we couldn't save your image(s), please try again." -msgstr "Desculpe, mas não foi possÃvel analisar esse local. Por favor, tente novamente." +msgstr "" + +#: perllib/FixMyStreet/App/Controller/AuthSS.pm:301 +#, fuzzy +msgid "Sorry, you can not log in with Facebook. Please try again later." +msgstr "Houve um problema mostrada nesta página. Por favor, tente novamente mais tarde." #: templates/web/base/admin/stats.html:64 msgid "Start Date:" @@ -2881,13 +2754,12 @@ msgstr "" #: templates/web/base/admin/flagged.html:18 #: templates/web/base/admin/list_updates.html:11 #: templates/web/base/admin/reports.html:15 -#: templates/web/fixmystreet/report/update-form.html:26 +#: templates/web/base/report/update/form_update.html:32 msgid "State" msgstr "Estado" #: templates/web/base/admin/report_edit.html:47 #: templates/web/base/admin/update_edit.html:27 -#: templates/web/base/report/update-form.html:28 #: templates/web/zurich/admin/report_edit-sdm.html:73 #: templates/web/zurich/admin/report_edit.html:101 #: templates/web/zurich/admin/report_edit.html:155 @@ -2895,7 +2767,7 @@ msgstr "Estado" msgid "State:" msgstr "Estado" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1282 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1291 #: perllib/FixMyStreet/Cobrand/Zurich.pm:387 #: templates/web/base/admin/stats.html:1 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:73 @@ -2917,7 +2789,7 @@ msgstr "Ainda em aberto, via questionário, %s" msgid "Street View" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:406 +#: perllib/FixMyStreet/Script/Reports.pm:184 msgid "Subcategory: %s" msgstr "Subcategoria: %s" @@ -2925,30 +2797,25 @@ msgstr "Subcategoria: %s" msgid "Subdivision/Body" msgstr "Zona / Bairro" -#: templates/web/fixmystreet/contact/index.html:98 +#: templates/web/base/contact/index.html:90 msgid "Subject" msgstr "Assunto:" #: templates/web/base/admin/report_edit.html:19 -#: templates/web/base/contact/index.html:88 -#: templates/web/base/report/new/fill_in_details_form.html:53 #: templates/web/zurich/admin/report_edit.html:39 msgid "Subject:" msgstr "Assunto:" #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/fill_in_details_form.html:137 -#: templates/web/base/report/new/fill_in_details_form.html:159 -#: templates/web/base/report/new/fill_in_details_form.html:96 -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:36 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:23 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:76 +#: templates/web/base/report/new/form_user_loggedin.html:36 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:39 +#: templates/web/base/report/new/form_user_loggedout_password.html:11 #: templates/web/zurich/report/new/fill_in_details_form.html:96 msgid "Submit" msgstr "Submeter" -#: templates/web/base/admin/report_edit.html:95 -#: templates/web/base/admin/update_edit.html:65 +#: templates/web/base/admin/report_edit.html:101 +#: templates/web/base/admin/update_edit.html:75 #: templates/web/base/admin/user-form.html:56 #: templates/web/zurich/admin/report_edit-sdm.html:137 #: templates/web/zurich/admin/report_edit.html:268 @@ -2956,7 +2823,7 @@ msgstr "Submeter" msgid "Submit changes" msgstr "Submeter alteraçoes" -#: templates/web/base/questionnaire/index.html:97 +#: templates/web/base/questionnaire/index.html:106 msgid "Submit questionnaire" msgstr "Submeter questionario" @@ -2972,9 +2839,8 @@ msgid "Submitted" msgstr "Submitido" #: templates/web/base/alert/updates.html:17 -#: templates/web/base/report/display.html:46 +#: templates/web/base/report/display_tools.html:41 #: templates/web/fixmystreet/alert/updates.html:23 -#: templates/web/fixmystreet/report/display.html:65 msgid "Subscribe" msgstr "Subscrever" @@ -2982,7 +2848,7 @@ msgstr "Subscrever" msgid "Subscribe me to an email alert" msgstr "Subcrever um alerta de e-mail" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1275 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1284 #: perllib/FixMyStreet/Cobrand/Zurich.pm:383 #: templates/web/base/admin/bodies.html:25 #: templates/web/base/admin/index.html:1 @@ -3001,7 +2867,7 @@ msgstr "Resumo" msgid "Summary reports" msgstr "Resumo reports" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1279 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1288 msgid "Survey" msgstr "Teste" @@ -3015,9 +2881,8 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/Zurich.pm:394 #: templates/web/zurich/header.html:77 -#, fuzzy msgid "Templates" -msgstr "Actualizaçoes" +msgstr "" #: templates/web/base/admin/list_updates.html:12 #: templates/web/zurich/admin/templates.html:9 @@ -3038,7 +2903,7 @@ msgstr "Texto:" msgid "Thank you for reporting this issue!" msgstr "" -#: templates/web/base/tokens/error.html:7 +#: templates/web/base/tokens/error.html:6 msgid "Thank you for trying to confirm your update or problem. We seem to have an error ourselves though, so <a href=\"%s\">please let us know what went on</a> and we'll look into it." msgstr "Obrigado por tentar confirmar a sua atualização ou problema. Parece que temos um erro a nós mesmos, porém, assim <a href=\"%s\"> por favor deixe-nos saber o que aconteceu </a> e vamos olhar para ele." @@ -3073,23 +2938,23 @@ msgstr "Esse local não parece estar em Mindelo, por favor tente novamente." #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:47 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:63 -#: perllib/FixMyStreet/Cobrand/UK.pm:71 +#: perllib/FixMyStreet/Cobrand/UK.pm:72 msgid "That postcode was not recognised, sorry." msgstr "Esse código postal não foi reconhecido, me desculpe.Tente novamente." -#: perllib/FixMyStreet/App/Controller/Admin.pm:726 +#: perllib/FixMyStreet/App/Controller/Admin.pm:724 msgid "That problem has been marked as sent." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:718 +#: perllib/FixMyStreet/App/Controller/Admin.pm:716 msgid "That problem will now be resent." msgstr "Esse problema agora será reenviado e reportado ao conselho." -#: perllib/FixMyStreet/App/Controller/Report.pm:125 +#: perllib/FixMyStreet/App/Controller/Report.pm:127 msgid "That report cannot be viewed on %s." msgstr "Esse relatório não pode ser visualizado em %s." -#: perllib/FixMyStreet/App/Controller/Report.pm:119 +#: perllib/FixMyStreet/App/Controller/Report.pm:121 msgid "That report has been removed from FixMyStreet." msgstr "Esse relatório foi removido FixMyStreetMIndelo" @@ -3120,7 +2985,7 @@ msgid "" " If you leave this blank, <strong>send method defaults to email</strong>." msgstr "" -#: templates/web/base/open311/index.html:90 +#: templates/web/base/open311/index.html:82 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 "O Open311 v2 atributo agency_responsible é usada para listar as administrações que receberam o relatório de problemas, o que não é muito a forma como o atributo é definido na especificação v2 Open311." @@ -3141,12 +3006,12 @@ msgstr "O conselho não vai ser capaz de ajudar a menos que você deixe o máxim msgid "The diligency prize league table shows editors' activity (who's been editing the most records)." msgstr "" -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:60 -#: perllib/FixMyStreet/App/Controller/Reports.pm:79 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:61 +#: perllib/FixMyStreet/App/Controller/Reports.pm:80 msgid "The error was: %s" msgstr "O erro foi: %s" -#: templates/web/base/open311/index.html:86 +#: templates/web/base/open311/index.html:78 msgid "The following Open311 v2 attributes are returned for each request: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code and service_name." msgstr "Os seguintes atributos Open311 v2 são devolvidos para cada solicitação: service_request_id, descrição, lat, long, MEDIA_URL, status, requested_datetime, updated_datetime, service_code e service_name." @@ -3193,8 +3058,7 @@ msgstr "" msgid "The passwords do not match" msgstr "As senhas não são iguais" -#: templates/web/base/errors/page_error_404_not_found.html:10 -#: templates/web/base/errors/page_error_404_not_found.html:12 +#: templates/web/base/errors/page_error_404_not_found.html:9 msgid "The requested URL '%s' was not found on this server" msgstr " A URL solicitada '%s' não foi encontrada neste servidor" @@ -3204,12 +3068,11 @@ msgstr "O alerta mais simples é o nosso único ponto localizaçao geográfica:" #: templates/web/base/report/new/councils_extra_text.html:1 #: templates/web/base/report/new/councils_text_some.html:10 -#: templates/web/base/report/new/fill_in_details_form.html:18 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:14 +#: templates/web/base/report/new/fill_in_details_form.html:13 msgid "The summary and description will also be made public (see our <a href=\"/privacy\">privacy policy</a>)." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:315 +#: perllib/FixMyStreet/Script/Reports.pm:92 msgid "The user could not locate the problem on a map, but to see the area around the location they entered" msgstr "O usuário não conseguiu localizar o problema em um mapa, localizar a area mais proxima do local" @@ -3226,18 +3089,18 @@ msgstr "" msgid "There are no reports to show." msgstr "" -#: perllib/FixMyStreet/App/Controller/Reports.pm:76 +#: perllib/FixMyStreet/App/Controller/Reports.pm:77 msgid "There was a problem showing the All Reports page. Please try again later." msgstr "Houve um problema ao mostrar a página de todos os relatórios. Por favor, tente novamente mais tarde." #: perllib/FixMyStreet/App/Controller/Contact.pm:137 -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:59 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:60 msgid "There was a problem showing this page. Please try again later." msgstr "Houve um problema mostrada nesta página. Por favor, tente novamente mais tarde." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:769 -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:134 -#: templates/web/base/auth/general.html:26 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:764 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:138 +#: templates/web/base/auth/general.html:43 #: templates/web/zurich/auth/general.html:28 msgid "There was a problem with your email/password combination. If you cannot remember your password, or do not have one, please fill in the ‘sign in by email’ section of the form." msgstr "Houve um problema com o email / combinação de senha. Se você não lembra da sua senha, ou não tiver um, por favor preencha o \"sinal de colocar e-mail 'seção do formulário." @@ -3246,7 +3109,7 @@ msgstr "Houve um problema com o email / combinação de senha. Se você não lem msgid "There was a problem with your email/password combination. Please try again." msgstr "Houve um problema com o email / combinação de senha. Por favor, tente novamente." -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:272 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:336 msgid "There was a problem with your update. Please try again." msgstr "Houve um problema com a sua atualização. Por favor, tente novamente." @@ -3254,7 +3117,7 @@ msgstr "Houve um problema com a sua atualização. Por favor, tente novamente." msgid "There were problems with your report. Please see below." msgstr "Houve problemas com o seu relatório. Por favor, veja abaixo." -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:300 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:371 msgid "There were problems with your update. Please see below." msgstr "Houve problemas com a sua atualização. Por favor, veja abaixo." @@ -3268,7 +3131,7 @@ msgid "" " " msgstr "" -#: templates/web/base/open311/index.html:77 +#: templates/web/base/open311/index.html:69 msgid "This API implementation is work in progress and not yet stabilized. It will change without warnings in the future." msgstr "Esta implementação API é um trabalho em andamento e ainda não estabilizou. Ela vai mudar sem avisos no futuro." @@ -3290,18 +3153,18 @@ msgid "" " A body will not receive any reports unless it covers at least one area." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:413 +#: perllib/FixMyStreet/Script/Reports.pm:191 msgid "This email has been sent to both councils covering the location of the problem, as the user did not categorise it; please ignore it if you're not the correct council to deal with the issue, or let us know what category of problem this is so we can add it to our system." msgstr "Este e-mail foi enviado para ambos os conselhos que cobrem o local do problema, como o usuário não categorizá-lo, por favor, ignorar se você não é o conselho correto para lidar com o problema, ou deixe-nos saber que categoria de problema é para que possamos adicioná-lo ao nosso sistema." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:416 +#: perllib/FixMyStreet/Script/Reports.pm:194 msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue." msgstr "Este e-mail foi enviado para vários conselhos que cobrem o local do problema, como a categoria selecionada é fornecida para todos eles, por favor, ignorar se você não é o conselho correto para lidar com o problema." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:925 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:995 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:920 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:990 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:142 -#: perllib/FixMyStreet/Cobrand/UK.pm:43 +#: perllib/FixMyStreet/Cobrand/UK.pm:44 msgid "This information is required" msgstr "Esta informação é necessária" @@ -3313,56 +3176,37 @@ msgstr "Este é um site do desenvolvedor, as coisas podem quebrar a qualquer mom msgid "This is a summary of all reports on this site." msgstr "" -#: templates/web/zurich/auth/token.html:8 -msgid "This may be because the link is too old or already used, or the address was not copied correctly." -msgstr "Isso pode ser porque o link é velho demais ou já foi utilizado, ou o endereço não foi copiado corretamente." - -#: templates/web/base/report/banner.html:15 -msgid "This problem has been closed" -msgstr "Este problema esta solucionado." - -#: templates/web/base/report/banner.html:12 -#: templates/web/base/report/update-form.html:48 -#: templates/web/fixmystreet/report/update-form.html:46 +#: templates/web/base/report/update/form_update.html:52 msgid "This problem has been fixed" msgstr "Este problema foi resolvido" -#: templates/web/base/report/update-form.html:43 -#: templates/web/fixmystreet/report/update-form.html:40 +#: templates/web/base/report/update/form_update.html:46 msgid "This problem has not been fixed" msgstr "Este problema não foi corrigido" -#: templates/web/base/report/banner.html:19 -msgid "This problem is in progress" -msgstr "Este problema está em progresso" - -#: templates/web/base/report/banner.html:9 -msgid "This problem is old and of unknown status." -msgstr "Este problema é antigo e de status desconhecido." - #: perllib/FixMyStreet/Cobrand/Zurich.pm:168 #: perllib/FixMyStreet/Cobrand/Zurich.pm:169 #: templates/web/zurich/report/_main.html:14 msgid "This report is awaiting moderation." msgstr "Este relatório está aguardando moderação." -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:86 +#: perllib/FixMyStreet/Script/Alerts.pm:94 msgid "This report is currently marked as closed." msgstr "Este relatório está marcado como fechado." -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:84 +#: perllib/FixMyStreet/Script/Alerts.pm:92 msgid "This report is currently marked as fixed." msgstr "Este relatório está marcado como fixo." -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:88 +#: perllib/FixMyStreet/Script/Alerts.pm:96 msgid "This report is currently marked as open." msgstr "Este relatório está marcado como aberto." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:326 +#: perllib/FixMyStreet/Script/Reports.pm:105 msgid "This report was submitted anonymously" msgstr "Este relatório foi enviado anonimamente" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:308 +#: perllib/FixMyStreet/Script/Reports.pm:85 msgid "This web page also contains a photo of the problem, provided by the user." msgstr "Esta página também contém uma foto do problema, fornecido pelo usuário." @@ -3373,7 +3217,7 @@ msgstr "Esta página também contém uma foto do problema, fornecido pelo usuár msgid "Time spent (in minutes):" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1278 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1287 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "Timeline" @@ -3385,24 +3229,22 @@ msgid "Title" msgstr "Titulo" #: templates/web/zurich/admin/template_edit.html:20 -#, fuzzy msgid "Title:" -msgstr "Titulo" +msgstr "" #: templates/web/base/alert/index.html:25 -#, fuzzy msgid "To find out what local alerts we have for you, please enter your %s postcode or street name and area:" -msgstr "Para descobrir quais os alertas locais que temos para si, deve inserir o seu código postal ou nome de rua e área ou zona" +msgstr "" #: templates/web/base/alert/index.html:27 msgid "To find out what local alerts we have for you, please enter your postcode or street name and area" msgstr "Para descobrir quais os alertas locais que temos para si, deve inserir o seu código postal ou nome de rua e área ou zona" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:314 +#: perllib/FixMyStreet/Script/Reports.pm:91 msgid "To view a map of the precise location of this issue" msgstr "Para ver no mapa a localização exata desse problema" -#: templates/web/base/admin/index.html:61 +#: templates/web/base/admin/index.html:54 #: templates/web/base/admin/questionnaire.html:24 #: templates/web/base/admin/stats.html:24 #: templates/web/base/admin/stats.html:43 @@ -3420,10 +3262,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:12 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:33 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:31 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:37 msgid "Unable to fix" msgstr "Incapaz de ser resolvido" @@ -3436,7 +3276,7 @@ msgstr "Incapaz de ser resolvido" msgid "Unconfirmed" msgstr "Não confirmado" -#: templates/web/fixmystreet/report/banner.html:9 +#: templates/web/base/report/banner.html:9 msgid "Unknown" msgstr "Desconhecido" @@ -3444,17 +3284,18 @@ msgstr "Desconhecido" msgid "Unknown alert type" msgstr "Tipo de alerta desconhecido" +#: perllib/FixMyStreet/App/Controller/Photo.pm:110 #: templates/web/base/js/translation_strings.html:39 msgid "Unknown error" msgstr "Erro desconhecido" -#: perllib/FixMyStreet/App/Controller/Report.pm:103 -#: perllib/FixMyStreet/App/Controller/Report.pm:109 -#: perllib/FixMyStreet/App/Controller/Report.pm:112 +#: perllib/FixMyStreet/App/Controller/Report.pm:105 +#: perllib/FixMyStreet/App/Controller/Report.pm:111 +#: perllib/FixMyStreet/App/Controller/Report.pm:114 msgid "Unknown problem ID" msgstr "Desconhecido problema com ID" -#: templates/web/fixmystreet/report/update-form.html:19 +#: templates/web/base/report/update/form_update.html:25 msgid "Update" msgstr "Actualizar" @@ -3462,13 +3303,11 @@ msgstr "Actualizar" msgid "Update %s created for problem %d; by %s" msgstr "Atualize %s criado para o problema de %d; por %s" -#: templates/web/base/contact/index.html:21 -#: templates/web/fixmystreet/contact/index.html:36 +#: templates/web/base/contact/index.html:28 msgid "Update below added anonymously at %s" msgstr "Atualize abaixo colocado de forma anónima em %s" -#: templates/web/base/contact/index.html:23 -#: templates/web/fixmystreet/contact/index.html:38 +#: templates/web/base/contact/index.html:30 msgid "Update below added by %s at %s" msgstr "Actualizar abaixo adicionado por %s em %s" @@ -3477,7 +3316,7 @@ msgstr "Actualizar abaixo adicionado por %s em %s" msgid "Update body" msgstr "Atualize corpo" -#: templates/web/base/admin/index.html:55 +#: templates/web/base/admin/index.html:48 msgid "Update breakdown by state" msgstr "Atualize repartição por Estado" @@ -3502,20 +3341,16 @@ msgstr "Reaberto a actualizaçao do problema" msgid "Update statuses" msgstr "Atualizar status" -#: templates/web/base/report/update-form.html:22 -msgid "Update:" -msgstr "Actualizar:" - #: templates/web/zurich/admin/index-dm.html:23 #: templates/web/zurich/admin/index-sdm.html:21 #: templates/web/zurich/admin/reports.html:13 msgid "Updated" msgstr "Atualizado" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1045 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1103 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1147 -#: perllib/FixMyStreet/App/Controller/Admin.pm:822 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1048 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1108 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1156 +#: perllib/FixMyStreet/App/Controller/Admin.pm:821 #: perllib/FixMyStreet/Cobrand/Zurich.pm:771 #: perllib/FixMyStreet/Cobrand/Zurich.pm:796 #: perllib/FixMyStreet/Cobrand/Zurich.pm:866 @@ -3523,13 +3358,12 @@ msgid "Updated!" msgstr "Actualizado!" #: templates/web/base/admin/list_updates.html:2 -#: templates/web/base/report/update.html:3 -#: templates/web/fixmystreet/report/update.html:5 +#: templates/web/base/report/update.html:5 #: templates/web/zurich/report/updates.html:2 msgid "Updates" msgstr "Actualizaçoes" -#: perllib/FixMyStreet/DB/Result/Comment.pm:132 +#: perllib/FixMyStreet/DB/Result/Comment.pm:131 msgid "Updates are limited to %s characters in length. Please shorten your update" msgstr "" @@ -3539,12 +3373,9 @@ msgstr "Atualizações sobre {{tÃtulo}}" #. ("%s is the site name") #: templates/web/base/report/display.html:0 -#: templates/web/base/report/display.html:5 -#: templates/web/fixmystreet/report/display.html:0 -#: templates/web/fixmystreet/report/display.html:9 -#, fuzzy +#: templates/web/base/report/display.html:9 msgid "Updates to this problem, %s" -msgstr "Atualizações para este problema, FixMyStreetMindelo" +msgstr "" #: templates/web/base/admin/body.html:182 msgid "Use the <strong>note</strong> to record details that are only displayed in the admin. Notes are not shown publicly, and are not sent to the body." @@ -3552,15 +3383,14 @@ msgstr "" #: templates/web/zurich/admin/report_edit-sdm.html:48 #: templates/web/zurich/admin/report_edit.html:67 -#, fuzzy msgid "Used map" -msgstr "mapa usado" +msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1452 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1461 msgid "User flag removed" msgstr "Bandeira usuário removida" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1424 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1433 msgid "User flagged" msgstr "Usuário sinalizado" @@ -3568,7 +3398,7 @@ msgstr "Usuário sinalizado" msgid "User search finds matches in users' names and email addresses." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1280 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1289 #: perllib/FixMyStreet/Cobrand/Zurich.pm:399 #: templates/web/base/admin/flagged.html:29 #: templates/web/zurich/header.html:69 @@ -3599,7 +3429,6 @@ msgid "Viewing a location" msgstr "Visualizando um local" #: templates/web/base/report/display.html:0 -#: templates/web/fixmystreet/report/display.html:0 msgid "Viewing a problem" msgstr "Visualizando um problema" @@ -3612,25 +3441,24 @@ msgstr "Wards deste conselho" 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 "Encontramos mais de uma correspondência para essa localização. Mostramos até dez partidas, por favor tente uma pesquisa diferente se não estiver aqui." -#: templates/web/zurich/auth/token.html:7 -msgid "We have not been able to confirm your account - sorry." -msgstr "Nós não temos sido capazes de confirmar a sua conta - desculpe." - -#: templates/web/zurich/auth/token.html:17 -msgid "We have sent you an email containing a link to confirm your account." -msgstr "Nós enviamos um e-mail contendo um link para confirmar sua conta." +#: templates/web/base/auth/general.html:6 +#: templates/web/base/report/display.html:27 +#: templates/web/base/report/new/oauth_email_form.html:5 +#, fuzzy +msgid "We need your email address, please give it below." +msgstr "Nós nunca divulgaremos o seu endereço de e-mail ou número de telefone." -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:2 -#: templates/web/fixmystreet/report/update-form.html:77 +#: templates/web/base/report/new/form_user_loggedout_email.html:2 +#: templates/web/base/report/update/form_user_loggedout_email.html:2 msgid "We never show your email" msgstr "Nós nunca divulgaremos o seu e-mail" -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:31 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:65 +#: templates/web/base/report/new/form_user_loggedin.html:31 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:28 msgid "We never show your email address or phone number." msgstr "Nós nunca divulgaremos o seu endereço de e-mail ou número de telefone." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:422 +#: perllib/FixMyStreet/Script/Reports.pm:200 msgid "We realise this problem might be the responsibility of %s; however, we don't currently have any contact details for them. If you know of an appropriate contact address, please do get in touch." msgstr "Percebemos este problema pode ser da responsabilidade do %s, no entanto, nós não possuÃmos nenhuma informação de contato deles. Se você souber de um endereço de contato apropriado, favor fornecer esse contacto. Obrigado." @@ -3647,10 +3475,6 @@ msgstr "Nós só usamos as suas informações pessoais de acordo com a nossa <a msgid "We’re sorry to hear the problem’s not fixed. Why not try writing to your local representatives?" msgstr "" -#: templates/web/base/contact/blurb.html:8 -msgid "We'd love to hear what you think about this site. Just fill in the form, or send an email to <a href='mailto:%s'>%s</a>:" -msgstr "AdorarÃamos ouvir o que você pensa sobre este site. Basta preencher o formulário, ou envie um e-mail para <a href='mailto:%s'>%s</a>:" - #: templates/web/base/contact/submit.html:7 msgid "We’ll get back to you as soon as we can." msgstr "" @@ -3659,7 +3483,7 @@ msgstr "" msgid "What was your experience of getting the problem fixed?" msgstr "" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:49 +#: templates/web/base/report/new/form_report.html:19 msgid "What’s the issue, and where is it?" msgstr "" @@ -3672,7 +3496,11 @@ msgstr "Quando editar" msgid "When sent" msgstr "Quando enviar" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:640 +#: templates/web/base/js/translation_strings.html:50 +msgid "Whoa there Testino! Three photos are enough." +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Report/New.pm:635 msgid "Whole block of empty flats" msgstr "Bloco inteiro de apartamentos vazios" @@ -3687,7 +3515,7 @@ msgstr "" msgid "Wish" msgstr "" -#: templates/web/base/open311/index.html:92 +#: templates/web/base/open311/index.html:84 msgid "With request searches, it is also possible to search for agency_responsible to limit the requests to those sent to a single administration. The search term is the administration ID provided by <a href=\"%s\">MaPit</a>." msgstr "Com o pedido de pesquisa, também é possÃvel pesquisar agency_responsavel para limitar as solicitações à s enviados para uma única administração. O termo de pesquisa é a identificação de administração fornecidos pela <a href=\"%s\"> MapIt </a>." @@ -3695,7 +3523,7 @@ msgstr "Com o pedido de pesquisa, também é possÃvel pesquisar agency_responsa msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"http://fixmystreet.org\">available at fixmystreet.org</a>." msgstr "" -#: templates/web/base/questionnaire/index.html:87 +#: templates/web/base/questionnaire/index.html:96 msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?" msgstr "Gostaria de receber um questionário em 4 semanas, lembrando que você verifique o status?" @@ -3704,7 +3532,6 @@ msgid "Writing your message entirely in block capitals makes it hard to read, as msgstr "Escrever a mensagem inteiramente em letras maiúsculas torna difÃcil de ler, assim como a falta de pontuação." #: templates/web/base/report/new/fill_in_details_form.html:4 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:5 msgid "Wrong location? Just click again on the map." msgstr "" @@ -3727,27 +3554,24 @@ msgstr "Ano" #: templates/web/base/admin/users.html:31 #: templates/web/base/questionnaire/creator_fixed.html:14 #: templates/web/base/questionnaire/index.html:51 -#: templates/web/base/questionnaire/index.html:90 +#: templates/web/base/questionnaire/index.html:99 msgid "Yes" msgstr "Sim" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:17 -#: templates/web/fixmystreet/report/update-form.html:91 +#: templates/web/base/report/new/form_user_loggedout_password.html:5 +#: templates/web/base/report/update/form_user_loggedout_password.html:4 msgid "Yes I have a password" msgstr "Sim, tenho uma password" -#: templates/web/base/contact/index.html:39 -#: templates/web/fixmystreet/contact/index.html:54 +#: templates/web/base/contact/index.html:46 msgid "You are complaining that this problem report was unnecessarily moderated:" msgstr "" -#: templates/web/base/contact/index.html:41 -#: templates/web/fixmystreet/contact/index.html:56 +#: templates/web/base/contact/index.html:48 msgid "You are reporting the following problem report for being abusive, containing personal information, or similar:" msgstr "Você está reportando o seguinte relatório de problema por ser abusiva, contendo informações pessoais, ou similar:" -#: templates/web/base/contact/index.html:15 -#: templates/web/fixmystreet/contact/index.html:30 +#: templates/web/base/contact/index.html:22 msgid "You are reporting the following update for being abusive, containing personal information, or similar:" msgstr "Você está reportando a seguinte atualização por ser abusiva, contendo informações pessoais, ou similar:" @@ -3760,7 +3584,7 @@ msgstr "Você pode <a href=\"%s%s\"> ver o problema neste site </a>." msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create." msgstr "" -#: templates/web/fixmystreet/contact/index.html:121 +#: templates/web/base/contact/index.html:113 msgid "You can contact technical support on <a href='mailto:%s'>%s</a>" msgstr "" @@ -3771,8 +3595,8 @@ msgid "" " reports in the past." msgstr "" -#: templates/web/base/report/new/councils_text_none.html:10 -#: templates/web/base/report/new/councils_text_none.html:2 +#: templates/web/base/report/new/councils_text_none.html:12 +#: templates/web/base/report/new/councils_text_none.html:14 #: templates/web/base/report/new/councils_text_some.html:19 #: templates/web/base/report/new/councils_text_some.html:21 msgid "You can help us by finding a contact email address for local problems for %s and emailing it to us at <a href='mailto:%s'>%s</a>." @@ -3790,21 +3614,16 @@ msgstr "Você recusou, por favor preencha o quadro de cima" msgid "You have already answered this questionnaire. If you have a question, please <a href='%s'>get in touch</a>, or <a href='%s'>view your problem</a>.\n" msgstr "Você já respondeu a este questionário. Se você tem uma pergunta, por favor <a href='%s'> entrar em contato </a>, ou <a href='%s'> ver o seu problema </a>. \n" -#: templates/web/base/questionnaire/index.html:77 -#: templates/web/base/report/new/fill_in_details_form.html:75 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:73 -msgid "You have already attached a photo to this report, attaching another one will replace it." -msgstr "Você já anexou uma foto com este relatório, anexando outro irá substituÃ-lo." - -#: templates/web/base/report/update-form.html:59 -#: templates/web/fixmystreet/report/update-form.html:56 -msgid "You have already attached a photo to this update, attaching another one will replace it." -msgstr "Você já anexou uma foto a esta atualização, anexando outra irá substituÃ-la." - -#: templates/web/zurich/report/new/fill_in_details_form.html:61 +#: templates/web/base/report/new/form_report.html:32 +#: templates/web/zurich/report/new/fill_in_details_form.html:55 msgid "You have already attached photos to this report. Note that you can attach a maximum of 3 to this report (if you try to upload more, the oldest will be removed)." msgstr "" +#: templates/web/base/questionnaire/index.html:83 +#: templates/web/base/report/update/form_update.html:14 +msgid "You have already attached photos to this update. Note that you can attach a maximum of 3 to this update (if you try to upload more, the oldest will be removed)." +msgstr "" + #: templates/web/base/auth/sign_out.html:4 #: templates/web/zurich/auth/sign_out.html:3 msgid "You have been signed out" @@ -3819,9 +3638,8 @@ msgstr "Você localizou o problema no ponto marcado com um pino verde no mapa. S msgid "You have successfully confirmed your email address." msgstr "Você confirmou com sucesso o seu endereço de e-mail." -#: templates/web/base/report/display.html:20 -#: templates/web/base/report/new/fill_in_details.html:37 -#: templates/web/fixmystreet/report/display.html:17 +#: templates/web/base/report/display.html:17 +#: templates/web/base/report/new/login_success_form.html:3 msgid "You have successfully signed in; please check and confirm your details are accurate:" msgstr "Você se inscreveu com sucesso nos, por favor, verificar e confirmar os seus dados estão correctos:" @@ -3850,53 +3668,42 @@ msgid "Your Reports" msgstr "Seus relatorios" #: templates/web/base/alert/_list.html:89 +#: templates/web/base/contact/index.html:83 +#: templates/web/base/report/display_tools.html:38 +#: templates/web/base/report/display_tools.html:40 +#: templates/web/base/report/new/form_user_loggedin.html:3 +#: templates/web/base/report/new/form_user_loggedout_email.html:1 +#: templates/web/base/report/update/form_user_loggedout_email.html:1 #: templates/web/fixmystreet/alert/updates.html:19 #: templates/web/fixmystreet/alert/updates.html:22 -#: templates/web/fixmystreet/contact/index.html:91 -#: templates/web/fixmystreet/report/display.html:62 -#: templates/web/fixmystreet/report/display.html:64 -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:3 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:1 -#: templates/web/fixmystreet/report/update-form.html:76 #: templates/web/zurich/report/new/fill_in_details_form.html:76 msgid "Your email" msgstr "Seu e-mail" -#: templates/web/base/auth/general.html:28 -#: templates/web/fixmystreet/report/update-form.html:82 +#: templates/web/base/auth/general.html:45 +#: templates/web/base/report/update/form_user_loggedout_email.html:7 #: templates/web/zurich/auth/general.html:30 #: templates/web/zurich/auth/general.html:58 msgid "Your email address" msgstr "O seu endereço de email" -#: templates/web/base/report/new/fill_in_details_form.html:106 -#: templates/web/base/report/update-form.html:81 -msgid "Your email:" -msgstr "Seu e-mail:" - -#: templates/web/fixmystreet/report/updates-sidebar-notes.html:7 +#: templates/web/base/report/updates-sidebar-notes.html:3 msgid "Your information will only be used in accordance with our <a href=\"/privacy\">privacy policy</a>" msgstr "Suas informações só serão utilizadas de acordo com nossa <a href=\"/privacy\"> polÃtica de privacidade </a>" -#: templates/web/base/auth/general.html:51 -#: templates/web/fixmystreet/contact/index.html:84 -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:18 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:54 -#: templates/web/fixmystreet/report/update-form.html:142 +#: templates/web/base/auth/general.html:90 +#: templates/web/base/contact/index.html:76 +#: templates/web/base/report/new/form_user_loggedin.html:18 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:17 +#: templates/web/base/report/update/form_name.html:11 #: templates/web/zurich/auth/general.html:61 #: templates/web/zurich/report/new/fill_in_details_form.html:86 msgid "Your name" msgstr "Nome" -#: templates/web/base/contact/index.html:73 -#: templates/web/base/report/new/fill_in_details_form.html:186 -#: templates/web/base/report/update-form.html:152 -msgid "Your name:" -msgstr "Nome" - -#: templates/web/base/auth/general.html:39 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:22 -#: templates/web/fixmystreet/report/update-form.html:96 +#: templates/web/base/auth/general.html:75 +#: templates/web/base/report/new/form_user_loggedout_password.html:10 +#: templates/web/base/report/update/form_user_loggedout_password.html:9 #: templates/web/zurich/auth/general.html:34 msgid "Your password" msgstr "Password" @@ -3905,15 +3712,16 @@ msgstr "Password" msgid "Your password has been changed" msgstr "Sua password foi alterada" -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:27 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:63 +#: templates/web/base/report/new/form_user_loggedin.html:27 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:26 #: templates/web/zurich/report/new/fill_in_details_form.html:92 msgid "Your phone number" msgstr "Telefone " #: templates/web/base/questionnaire/index.html:14 +#, fuzzy msgid "Your report" -msgstr "Seu relatório" +msgstr "Seus relatórios" #: templates/web/base/footer.html:9 templates/web/fixmystreet/footer.html:29 msgid "Your reports" @@ -3923,23 +3731,17 @@ msgstr "Seus relatórios" msgid "Your updates" msgstr "Suas atualizações" -#: templates/web/base/contact/index.html:81 -msgid "Your email:" -msgstr "Seu e-mail:" - #: templates/web/base/reports/_list-filters.html:3 -#, fuzzy msgid "all reports" -msgstr "Todos os relatórios" +msgstr "" #: templates/web/base/admin/timeline.html:4 msgid "by %s" msgstr "por %s" #: templates/web/base/reports/_list-filters.html:5 -#, fuzzy msgid "closed reports" -msgstr "Reports Fechados" +msgstr "" #: templates/web/base/reports/body.html:6 #: templates/web/base/reports/body.html:7 @@ -3961,17 +3763,16 @@ msgid "edit user" msgstr "" #: templates/web/base/reports/_list-filters.html:6 -#, fuzzy msgid "fixed reports" -msgstr "Reports Corrigidos" +msgstr "" -#: templates/web/base/admin/index.html:33 +#: templates/web/base/status/stats.html:20 #: templates/web/zurich/admin/index.html:5 msgid "from %s different users" -msgstr "e %d usuários diferentes" +msgstr "e %s usuários diferentes" -#: templates/web/base/report/_item.html:17 -#: templates/web/zurich/report/_item.html:16 +#: templates/web/base/report/_item.html:15 +#: templates/web/zurich/report/_item.html:14 msgid "last updated %s" msgstr "Última atualizada %s" @@ -4063,10 +3864,8 @@ msgstr "reaberto" msgid "sign out" msgstr "sair" -#: templates/web/base/report/new/fill_in_details_form.html:12 -#: templates/web/base/report/new/fill_in_details_form.html:15 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:10 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:12 +#: templates/web/base/report/new/fill_in_details_form.html:11 +#: templates/web/base/report/new/fill_in_details_form.html:9 msgid "the local council" msgstr "o conselho local" @@ -4075,7 +3874,7 @@ msgstr "o conselho local" msgid "there is no pin shown as the user did not use the map" msgstr "não há nenhum fix pin para o usuario usar no mapa" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:398 +#: perllib/FixMyStreet/Script/Reports.pm:176 msgid "this type of local problem" msgstr "este tipo de problema local" @@ -4084,9 +3883,8 @@ msgid "today" msgstr "hoje" #: templates/web/base/reports/_list-filters.html:4 -#, fuzzy msgid "unfixed reports" -msgstr "Reports Corrigidos" +msgstr "" #: templates/web/base/admin/report_edit.html:32 msgid "used map" @@ -4105,7 +3903,7 @@ msgstr "usuário é proprietário problema" msgid "ward" msgstr "pendente" -#: templates/web/base/front/stats.html:17 +#: templates/web/base/front/stats.html:13 #, perl-format msgid "<big>%s</big> report recently" msgid_plural "<big>%s</big> reports recently" @@ -4133,7 +3931,7 @@ msgid_plural "%d minutes" msgstr[0] "%d minuto" msgstr[1] "%d minutos" -#: templates/web/base/front/stats.html:29 +#: templates/web/base/front/stats.html:25 #, perl-format msgid "<big>%s</big> update on reports" msgid_plural "<big>%s</big> updates on reports" @@ -4145,7 +3943,7 @@ msgstr[1] "<big>%s</big> atualização los Relatorios" msgid "We do not yet have details for the council that covers this location." msgid_plural "We do not yet have details for the councils that cover this location." msgstr[0] "Nós ainda não temos detalhes para o conselho, que abrange este local." -msgstr[1] "Nós ainda não temos detalhes para o conselho, que abrange este local." +msgstr[1] "Nós ainda não temos detalhes sobre o concelho, que abrange este local." #: perllib/Utils.pm:219 #, perl-format @@ -4154,14 +3952,14 @@ msgid_plural "%d weeks" msgstr[0] "%d semana" msgstr[1] "%d semanas" -#: templates/web/base/front/stats.html:12 +#: templates/web/base/front/stats.html:8 #, perl-format msgid "<big>%s</big> report in past week" msgid_plural "<big>%s</big> reports in past week" msgstr[0] "<big>%s</big> Relatório de semana passada" msgstr[1] "<big>%s</big> Relatórios de semana passado" -#: templates/web/base/front/stats.html:23 +#: templates/web/base/front/stats.html:19 #, perl-format msgid "<big>%s</big> fixed in past month" msgid_plural "<big>%s</big> fixed in past month" @@ -4182,141 +3980,89 @@ msgid_plural "We do <strong>not</strong> yet have details for the other councils msgstr[0] "Fazemos <strong> não </strong> ainda tem detalhes para os outros conselhos que cobrem este local." msgstr[1] "Fazemos <strong> não </strong> ainda tem detalhes para os outros conselhos que cobrem este local." -#~ msgid "(Don't worry — we'll hang on to your alert while you're checking your email.)" -#~ msgstr "" -#~ "(Não se preocupe - nós vamos ficar com o alerta, enquanto você está verificando o seu\"\n" -#~ "\"E-mail.)" - -#~ msgid "(Don't worry — we'll hang on to your problem report while you're checking your email.)" -#~ msgstr "(Não se preocupe - nós vamos fixa o seu relatório de problema, enquanto você está verificando seu email)" - -#~ msgid "(Don't worry — we'll hang on to your update while you're checking your email.)" -#~ msgstr "" -#~ "(Não se preocupe - nós vamos ficar com a sua atualização enquanto você está verificando o seu\"\n" -#~ "\"E-mail.) " - -#~ msgid "<small>If you cannot see the map, <a href='%s' rel='nofollow'>skip this step</a>.</small>" -#~ msgstr "<small> Se você não pode localizar no mapa, <a href='%s' rel='nofollow'> saltar esta etapa </a>. </small>" - -#~ msgid "<strong>No</strong>, I do not, let me sign in by email:" -#~ msgstr "<strong> Não </strong>, eu não, deixe-me entrar por e-mail:" - -#~ msgid "Are you a <strong>developer</strong>? Would you like to contribute to FixMyStreet?" -#~ msgstr "Você é um desenvolvedor <strong> </strong> Gostaria de contribuir para FixMyStreet?" - -#~ msgid "Closest nearby problems <small>(within %skm)</small>" -#~ msgstr "Problemas mais proximos <small> (within %skm) </small>" - -#~ msgid "Contact FixMyStreet" -#~ msgstr "Contact FixMyStreetMindelo" - -#~ msgid "Do you have a FixMyBarangay password?" -#~ msgstr "Você tem uma senha FixMyStreetMindelo?" - -#~ msgid "FixMyStreet admin:" -#~ msgstr "FixMyStreet admin:" - -#~ msgid "If you do not, your alert will not be activated." -#~ msgstr "Se não o fizer, o seu alerta não será ativado" +#~ msgid "(we never show your email address or phone number)" +#~ msgstr "(é confidencial seu email e seu numero de telefone)" -#~ msgid "If you do not, your problem will not be posted." -#~ msgstr "Se você não fizer isso, o problema não será publicado" +#~ msgid "(we never show your email)" +#~ msgstr "(seu email não será divulgado)" -#~ msgid "If you do not, your update will not be posted." -#~ msgstr "se você não fizer isso, a sua atualização não será publicada" +#~ msgid "<strong>No</strong>, let me confirm my report by email:" +#~ msgstr "<strong>No</strong>, let me confirm my report by email:" -#~ msgid "New local reports on reportemptyhomes.com" -#~ msgstr "Novos relatórios locais reportemptyhomes.com" +#~ msgid "<strong>No</strong>, let me confirm my update by email:" +#~ msgstr "<strong> Não </strong>, deixe-me confirmar a minha atualização por e-mail:" -#~ msgid "New reports for {{COUNCIL}} within {{WARD}} ward on reportemptyhomes.com" -#~ msgstr "Novos relatórios para {{CONSELHO}} {{dentro WARD}} em reportemptyhomes.com" +#~ msgid "Email me updates" +#~ msgstr "Envie-me atualizações" -#~ msgid "New reports on reportemptyhomes.com" -#~ msgstr "Novos relatórios sobre reportemptyhomes.com" +#~ msgid "Enter a new password:" +#~ msgstr "Digite uma nova senha:" -#~ msgid "New reports on reportemptyhomes.com near {{POSTCODE}}" -#~ msgstr "Novos relatórios sobre reportemptyhomes.com perto CÓDIGO POSTAL {{}}" +#~ 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 "Receio que não poderia confirmar se token. Se você copiou o URL de um e-mail, verifique se você copiou exatamente.\n" -#~ msgid "New reports to {{COUNCIL}} on reportemptyhomes.com" -#~ msgstr "Novos Relatorios sobre reportemptyhomes.com Perto CÓDIGO POSTAL {{}}" - -#~ msgid "New reports within {{NAME}}'s boundary on reportemptyhomes.com" -#~ msgstr "Novos relatórios dentro de {{NAME}} 's fronteira em reportemptyhomes.com" - -#~ msgid "New update:" -#~ msgstr "Nova actualizaçao" - -#~ msgid "No problems found." -#~ msgstr "Nenhum problema encontrado" - -#~ msgid "No problems have been reported yet." -#~ msgstr "Nenhuns problemas foram ianda reportados" - -#~ msgid "Now to submit your report… do you have a FixMyStreet password?" -#~ msgstr "Agora, para apresentar o seu relatório ... você tem de ter uma senha FixMyStreetMindelo?" - -#~ msgid "Now to submit your update… do you have a FixMyStreet password?" -#~ msgstr "Agora, para apresentar a sua atualização ... você tem de ter uma senha FixMyStreetMindelo?" - -#~ msgid "Our code is open source and <a href=\"http://github.com/mysociety/fixmystreet\">available on GitHub</a>." -#~ msgstr "Nosso código é open source e <a href=\"http://github.com/mysociety/fixmystreet\"> disponÃvel no GitHub </a>." +#~ 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 "" +#~ "Se você usar o e-mail baseado na web ou filtros têm\" junk mail \", você pode querer\"\n" +#~ "\"Verifique suas pastas de correio em massa / spam: à s vezes, nossas mensagens são marcadas que\"\n" +#~ "\"Caminho\"" -#~ msgid "Please <a class=\"tab_link\" href=\"#report\">take a look</a> at the updates that have been left." -#~ msgstr "<a Class=\"tab_link\" href=\"#report\"> dar uma olhada </a> nas atualizações que foram deixadas." +#~ msgid "Message:" +#~ msgstr "Menssagem" -#~ msgid "Please take a look at the updates that have been left." -#~ msgstr "Por favor, dê uma olhada nas atualizações que foram deixadas." +#~ msgid "More problems nearby" +#~ msgstr "Mais problemas próximos" -#~ msgid "Problems within %s, FixMyStreet" -#~ msgstr "Problemas dentro de %s, FixMyStreetMindelo" +#~ msgid "Nearly Done! Now check your email..." +#~ msgstr "Quase pronto! Agora, verifique seu e-mail ..." -#~ msgid "Properties recently reported as put back to use on reportemptyhomes.com" -#~ msgstr "Propriedades informou recentemente como colocar de volta para uso em reportemptyhomes.com" +#~ msgid "Offensive? Unsuitable? Tell us" +#~ msgstr "Ofensivo? Inadequado? Informem-nos" -#~ msgid "Publish the response" -#~ msgstr "Publicar a resposta" +#~ msgid "Photo:" +#~ msgstr "Foto" -#~ msgid "Reported %s, to %s" -#~ msgstr "Reportados %s, para %s" +#~ msgid "Please check your email" +#~ msgstr "Favor verificar seu email" -#~ msgid "Reports on and around the map" -#~ msgstr "Relatórios sobre e ao redor do mapa" +#~ msgid "Please note that updates are not sent to the council. If you leave your name it will be public. Your information will only be used in accordance with our <a href=\"/faq#privacy\">privacy policy</a>" +#~ msgstr "Por favor, note que as atualizações Localidade: Não São enviadas par o Conselho. Se Você. deixar Seu Nome Será, Público. SUAS Informations Só Serao utilizadas according to Nossa <a href=\"/faq#privacy\"> Politica de Privacidade </a>" -#~ msgid "Sign in by email" -#~ msgstr "Entrar por email" +#~ msgid "This may be because the link is too old or already used, or the address was not copied correctly." +#~ msgstr "Isso pode ser porque o link é velho demais ou já foi utilizado, ou o endereço não foi copiado corretamente." -#~ msgid "Signed in as %s" -#~ msgstr "Entrou como %s" +#~ msgid "This problem has been closed" +#~ msgstr "Este problema esta solucionado." -#~ msgid "The confirmation email <strong>may</strong> take a few minutes to arrive — <em>please</em> be patient." -#~ msgstr "O e-mail de confirmação <strong> Maio </strong> levar alguns minutos para chegar - <em> por favor </em>, seja paciente." +#~ msgid "This problem is in progress" +#~ msgstr "Este problema está em progresso" -#~ msgid "The details of your problem are available from the other tab above." -#~ msgstr "Os detalhes do seu problema estão disponÃveis na outra aba acima." +#~ msgid "This problem is old and of unknown status." +#~ msgstr "Este problema é antigo e de status desconhecido." -#~ msgid "The details of your problem are available on the right hand side of this page." -#~ msgstr "Os detalhes do seu problema estão disponÃveis no lado direito desta página." +#~ msgid "Update:" +#~ msgstr "Actualizar:" -#~ msgid "The latest local reports reported by users" -#~ msgstr "Os últimos relatórios locais relatados por usuários" +#~ msgid "We have not been able to confirm your account - sorry." +#~ msgstr "Nós não temos sido capazes de confirmar a sua conta - desculpe." -#~ msgid "The latest properties reported back to use by users" -#~ msgstr "As propriedades mais relatadas de usar por usuários" +#~ msgid "We have sent you an email containing a link to confirm your account." +#~ msgstr "Nós enviamos um e-mail contendo um link para confirmar sua conta." -#~ msgid "The latest reports for {{COUNCIL}} reported by users" -#~ msgstr "Os últimos relatórios para {{}} CONSELHO relatados por usuários" +#~ msgid "We'd love to hear what you think about this site. Just fill in the form, or send an email to <a href='mailto:%s'>%s</a>:" +#~ msgstr "AdorarÃamos ouvir o que você pensa sobre este site. Basta preencher o formulário, ou envie um e-mail para <a href='mailto:%s'>%s</a>:" -#~ msgid "The latest reports for {{COUNCIL}} within {{WARD}} ward reported by users" -#~ msgstr "Os últimos relatórios para {{CONSELHO}} {{dentro WARD}} ala relatados por usuários" +#~ msgid "You have already attached a photo to this report, attaching another one will replace it." +#~ msgstr "Você já anexou uma foto com este relatório, anexando outro irá substituÃ-lo." -#~ msgid "The latest reports within {{NAME}}'s boundary reported by users" -#~ msgstr "Os últimos relatórios dentro de {{NAME}} 's fronteira relatados por usuários" +#~ msgid "You have already attached a photo to this update, attaching another one will replace it." +#~ msgstr "Você já anexou uma foto a esta atualização, anexando outra irá substituÃ-la." -#~ msgid "To <strong>report a problem</strong>, click on the map at the correct location." -#~ msgstr "Para <strong> relatar um problema </strong>, clique no mapa no local correto." +#~ msgid "Your email:" +#~ msgstr "Seu e-mail:" -#~ msgid "You must now click the link in the email we've just sent you." -#~ msgstr "Agora você deve clicar no link do e-mail que acabamos de lhe enviar." +#~ msgid "Your name:" +#~ msgstr "Nome" -#~ msgid "Your email address:" -#~ msgstr "O seu endereço de email:" +#~ msgid "Your email:" +#~ msgstr "Seu e-mail:" diff --git a/locale/pt_CV.UTF-8 b/locale/pt_CV.UTF-8 new file mode 120000 index 000000000..4858492e8 --- /dev/null +++ b/locale/pt_CV.UTF-8 @@ -0,0 +1 @@ +pt.UTF-8
\ No newline at end of file diff --git a/locale/ro_RO.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/ro_RO.UTF-8/LC_MESSAGES/FixMyStreet.po index 1124609f0..3af22b4c1 100644 --- a/locale/ro_RO.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/ro_RO.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -7,15 +7,14 @@ # daniel andriev <andriev_daniel@yahoo.com>, 2015 # fldrog <florin.botis@gmail.com>, 2014 # raduplamadeala <radu@plamadeala.eu>, 2015 -# raduplamadeala <radu@plamadeala.eu>, 2015 # Radu <radu.bilei@gmail.com>, 2014 # test test <nistorbog@gmail.com>, 2014 msgid "" msgstr "" "Project-Id-Version: fixmystreet\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2015-10-23 16:51+0100\n" -"PO-Revision-Date: 2015-07-31 16:31+0000\n" +"POT-Creation-Date: 2016-03-02 13:09+0000\n" +"PO-Revision-Date: 2015-10-23 16:33+0000\n" "Last-Translator: mySociety <transifex@mysociety.org>\n" "Language-Team: Romanian (Romania) (http://www.transifex.com/mysociety/fixmystreet/language/ro_RO/)\n" "Language: ro_RO\n" @@ -24,45 +23,24 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:628 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:411 +#: perllib/FixMyStreet/DB/Result/Problem.pm:616 +#: perllib/FixMyStreet/Script/Reports.pm:189 msgid " and " msgstr "ÅŸi" #: templates/web/base/report/new/councils_text_all.html:2 -#: templates/web/base/report/new/councils_text_none.html:11 -#: templates/web/base/report/new/councils_text_none.html:2 +#: templates/web/base/report/new/councils_text_none.html:12 +#: templates/web/base/report/new/councils_text_none.html:15 #: templates/web/base/report/new/councils_text_some.html:19 #: templates/web/base/report/new/councils_text_some.html:22 #: templates/web/base/report/new/councils_text_some.html:5 msgid " or " msgstr "sau" -#: templates/web/base/admin/index.html:35 -#: templates/web/base/status/index.html:13 -msgid "%s confirmed alerts, %s unconfirmed" -msgstr "%d alerte confirmate, %d neconfirmate" - -#: templates/web/base/admin/index.html:37 -#: templates/web/base/status/index.html:16 -#: templates/web/zurich/admin/index.html:6 -msgid "%s council contacts – %s confirmed, %s unconfirmed" -msgstr "%d contacte – %d confirmate, %d neconfirmate" - #: templates/web/base/admin/edit-league.html:12 msgid "%d edits by %s" msgstr "%d modificări de %s" -#: templates/web/base/admin/index.html:34 -#: templates/web/base/status/index.html:12 -msgid "%s live updates" -msgstr "%d actualizări" - -#: templates/web/base/admin/index.html:36 -#: templates/web/base/status/index.html:14 -msgid "%s questionnaires sent – %s answered (%s%%)" -msgstr "%d chestionare trimise – %d completate (%s%%)" - #: templates/web/base/pagination.html:10 msgid "%d to %d of %d" msgstr "%d - %d din %d" @@ -77,6 +55,19 @@ msgstr "%s - rapoarte de sinteză" msgid "%s admin:" msgstr "" +#: templates/web/base/status/stats.html:26 +msgid "%s bodies" +msgstr "" + +#: templates/web/base/status/stats.html:24 +msgid "%s confirmed alerts, %s unconfirmed" +msgstr "%s alerte confirmate, %s neconfirmate" + +#: templates/web/base/status/stats.html:27 +#: templates/web/zurich/admin/index.html:6 +msgid "%s council contacts – %s confirmed, %s unconfirmed" +msgstr "%s contacte – %s confirmate, %s neconfirmate" + #. ("%s is the site name") #: templates/web/base/alert/index.html:7 msgid "" @@ -93,7 +84,15 @@ msgid "" "within a certain distance of a particular location." msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:695 +#: templates/web/base/status/stats.html:23 +msgid "%s live updates" +msgstr "%s actualizări" + +#: templates/web/base/status/stats.html:25 +msgid "%s questionnaires sent – %s answered (%s%%)" +msgstr "%s chestionare trimise – %s completate (%s%%)" + +#: perllib/FixMyStreet/DB/Result/Problem.pm:683 msgid "%s ref: %s" msgstr "%s ref: %s" @@ -108,15 +107,15 @@ msgid "" "for the county council." msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:255 perllib/FixMyStreet/Cobrand/UK.pm:267 +#: perllib/FixMyStreet/Cobrand/UK.pm:256 perllib/FixMyStreet/Cobrand/UK.pm:268 msgid "%s ward, %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:564 +#: perllib/FixMyStreet/DB/Result/Problem.pm:552 msgid "%s, reported at %s" msgstr "%s, raportat la %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:282 perllib/FixMyStreet/Cobrand/UK.pm:294 +#: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295 msgid "%s, within %s ward" msgstr "" @@ -124,7 +123,7 @@ msgstr "" msgid "© <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors" msgstr "" -#: templates/web/zurich/report/new/fill_in_details_form.html:53 +#: templates/web/zurich/report/new/fill_in_details_form.html:46 msgid "(Defect & location of defect)" msgstr "" @@ -152,13 +151,13 @@ msgstr "(o distanță implicită ce acoperă în jur de 200 000 de locuitori)" msgid "(alternatively the RSS feed can be customised, within %s)" msgstr "" -#: templates/web/base/report/_item.html:27 -#: templates/web/zurich/report/_item.html:21 +#: templates/web/base/report/_item.html:25 +#: templates/web/zurich/report/_item.html:19 msgid "(closed)" msgstr "(închis)" -#: templates/web/base/report/_item.html:25 -#: templates/web/zurich/report/_item.html:19 +#: templates/web/base/report/_item.html:23 +#: templates/web/zurich/report/_item.html:17 msgid "(fixed)" msgstr "(rezolvat)" @@ -166,37 +165,28 @@ msgstr "(rezolvat)" msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)" msgstr "(cum ar fi graffiti, gunoaie depozitate ilegal, pavaj spart sau iluminat stradal)" -#: templates/web/base/report/_item.html:21 +#: templates/web/base/report/_item.html:19 msgid "(not sent to council)" msgstr "(netrimis)" -#: templates/web/base/report/new/fill_in_details_form.html:200 #: templates/web/zurich/report/new/fill_in_details_form.html:82 msgid "(optional)" msgstr "(opÈ›ional)" -#: templates/web/fixmystreet/report/public_label.html:1 +#: templates/web/base/report/public_label.html:1 msgid "(public)" msgstr "(public)" -#: templates/web/base/report/_item.html:20 +#: templates/web/base/report/_item.html:18 msgid "(sent to both)" msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:194 -msgid "(we never show your email address or phone number)" -msgstr "(nu afișăm niciodată adresa ta de email sau numărul de telefon)" - -#: templates/web/base/report/update-form.html:159 -msgid "(we never show your email)" -msgstr "(nu afișăm niciodată adresa ta de email)" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:673 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 #: perllib/FixMyStreet/DB/Result/Problem.pm:410 msgid "-- Pick a category --" msgstr "-- Alege o categorie --" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:637 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:632 #: perllib/FixMyStreet/DB/Result/Problem.pm:416 msgid "-- Pick a property type --" msgstr "-- Alege un tip de proprietate --" @@ -215,52 +205,39 @@ msgstr "" msgid "<label>Show %s</label> <label>about %s</label>" msgstr "" -#: templates/web/base/admin/index.html:32 -#: templates/web/base/status/index.html:11 +#: templates/web/base/status/stats.html:18 #: templates/web/zurich/admin/index.html:4 msgid "<strong>%s</strong> live problems" msgstr "" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:39 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:2 msgid "<strong>No</strong> Let me confirm my report by email" msgstr "" -#: templates/web/fixmystreet/report/update-form.html:112 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:2 msgid "<strong>No</strong> Let me confirm my update by email" msgstr "" -#: templates/web/base/auth/general.html:48 +#: templates/web/base/auth/general.html:87 #: templates/web/zurich/auth/general.html:51 msgid "<strong>No</strong> let me sign in by email" msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:145 -msgid "<strong>No</strong>, let me confirm my report by email:" -msgstr "" - -#: templates/web/base/report/update-form.html:118 -msgid "<strong>No</strong>, let me confirm my update by email:" -msgstr "" - -#: templates/web/base/auth/general.html:34 -#: templates/web/base/report/new/fill_in_details_form.html:123 -#: templates/web/base/report/update-form.html:96 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:15 -#: templates/web/fixmystreet/report/update-form.html:89 +#: templates/web/base/auth/general.html:70 +#: templates/web/base/report/new/form_user_loggedout_password.html:3 +#: templates/web/base/report/update/form_user_loggedout_password.html:2 msgid "<strong>Yes</strong> I have a password" msgstr "" -#: templates/web/base/static/about-en-gb.html:1 -#: templates/web/base/static/about-en-gb.html:3 +#: templates/web/base/about/about-en-gb.html:1 +#: templates/web/base/about/about-en-gb.html:3 msgid "About us" msgstr "Despre noi" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:8 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:31 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:29 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:35 msgid "Action Scheduled" msgstr "" @@ -291,7 +268,7 @@ msgstr "Adaugă o categorie nouă" msgid "Add user" msgstr "Adaugă utilizator" -#: templates/web/base/my/my.html:52 +#: templates/web/base/my/my.html:56 msgid "Added %s" msgstr "" @@ -311,8 +288,7 @@ msgstr "" msgid "Alert %d disabled (created %s)" msgstr "" -#: templates/web/base/report/update-form.html:164 -#: templates/web/fixmystreet/report/update-form.html:150 +#: templates/web/base/report/update/form_name.html:20 msgid "Alert me to future updates" msgstr "" @@ -344,10 +320,8 @@ msgstr "" #: templates/web/base/report/new/councils_text_all.html:2 #: templates/web/base/report/new/councils_text_all.html:4 -#: templates/web/base/report/new/fill_in_details_form.html:12 -#: templates/web/base/report/new/fill_in_details_form.html:14 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:10 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:11 +#: templates/web/base/report/new/fill_in_details_form.html:10 +#: templates/web/base/report/new/fill_in_details_form.html:9 msgid "All the information you provide here will be sent to <strong>%s</strong>." msgstr "" @@ -369,6 +343,10 @@ msgstr "" msgid "Are you a developer?" msgstr "" +#: templates/web/base/js/translation_strings.html:52 +msgid "Are you sure you want to cancel this upload?" +msgstr "" + #: templates/web/base/admin/body-form.html:69 #: templates/web/base/admin/body.html:16 #: templates/web/zurich/admin/body-form.html:24 @@ -401,16 +379,16 @@ msgstr "" msgid "Assigned to %s" msgstr "" -#: templates/web/base/open311/index.html:84 +#: templates/web/base/open311/index.html:76 msgid "At most %d requests are returned in each query. The returned requests are ordered by requested_datetime, so to get all requests, do several searches with rolling start_date and end_date." msgstr "" -#: templates/web/base/open311/index.html:76 +#: templates/web/base/open311/index.html:68 msgid "At the moment only searching for and looking at reports work." msgstr "" #: perllib/FixMyStreet/DB/Result/Problem.pm:373 -#: templates/web/zurich/report/_item.html:11 +#: templates/web/zurich/report/_item.html:9 msgid "Awaiting moderation" msgstr "" @@ -422,7 +400,7 @@ msgstr "" msgid "Ban email address" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1276 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1285 #: perllib/FixMyStreet/Cobrand/Zurich.pm:392 #: templates/web/base/admin/bodies.html:1 templates/web/zurich/header.html:64 msgid "Bodies" @@ -452,7 +430,7 @@ msgid "Can't see the map? <em>Skip this step</em>" msgstr "" #: templates/web/base/admin/body.html:68 -#: templates/web/base/admin/index.html:61 +#: templates/web/base/admin/index.html:54 #: templates/web/base/report/new/category.html:10 #: templates/web/base/report/new/category_wrapper.html:3 #: templates/web/zurich/admin/body.html:14 @@ -463,8 +441,8 @@ msgstr "" msgid "Category" msgstr "" -#: templates/web/base/admin/index.html:59 -#: templates/web/base/admin/index.html:67 +#: templates/web/base/admin/index.html:52 +#: templates/web/base/admin/index.html:60 msgid "Category fix rate for problems > 4 weeks old" msgstr "" @@ -477,7 +455,7 @@ msgstr "" msgid "Category:" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:402 +#: perllib/FixMyStreet/Script/Reports.pm:180 msgid "Category: %s" msgstr "" @@ -527,7 +505,7 @@ msgid "Click here or enter as dd/mm/yyyy" msgstr "" #: templates/web/base/around/_report_banner.html:2 -#: templates/web/base/js/translation_strings.html:50 +#: templates/web/base/js/translation_strings.html:55 msgid "Click map to report a problem" msgstr "" @@ -554,7 +532,7 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:25 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:144 -#: templates/web/fixmystreet/report/banner.html:15 +#: templates/web/base/report/banner.html:15 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:10 #: templates/web/zurich/admin/header.html:16 @@ -562,7 +540,7 @@ msgstr "" msgid "Closed" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:794 +#: perllib/FixMyStreet/DB/Result/Problem.pm:779 msgid "Closed by council" msgstr "" @@ -588,7 +566,7 @@ msgstr "" msgid "Cobrand:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1283 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1292 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "" @@ -601,13 +579,13 @@ msgstr "" msgid "Confirm" msgstr "" -#: templates/web/base/auth/token.html:1 templates/web/zurich/auth/token.html:1 +#: templates/web/base/auth/token.html:1 msgid "Confirm account" msgstr "" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:33 -#: templates/web/fixmystreet/report/update-form.html:107 -msgid "Confirm by email below, providing a new password at that point. When you confirm, your password will be updated." +#: templates/web/base/report/new/form_user_loggedout_password.html:21 +#: templates/web/base/report/update/form_user_loggedout_password.html:20 +msgid "Confirm by email instead, providing a new password at that point. When you confirm, your password will be updated." msgstr "" #: templates/web/base/questionnaire/creator_fixed.html:1 @@ -637,23 +615,17 @@ msgid "Confirmed:" msgstr "" #. ("%s is the site name") -#: templates/web/base/faq/faq-en-gb.html:8 templates/web/base/footer.html:24 -#: templates/web/base/open311/index.html:8 -#: templates/web/base/static/privacy.html:10 -#: templates/web/fixmystreet/contact/index.html:12 +#: templates/web/base/about/_sidebar.html:6 templates/web/base/footer.html:24 msgid "Contact %s" msgstr "" #: templates/web/base/contact/index.html:1 #: templates/web/base/contact/index.html:2 #: templates/web/base/contact/submit.html:1 -#: templates/web/fixmystreet/contact/index.html:1 -#: templates/web/fixmystreet/contact/index.html:2 msgid "Contact Us" msgstr "" -#: templates/web/base/contact/index.html:6 -#: templates/web/fixmystreet/contact/index.html:20 +#: templates/web/base/contact/index.html:12 msgid "Contact the team" msgstr "" @@ -662,8 +634,8 @@ msgstr "" msgid "Coordinates:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1420 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1448 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1429 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1457 msgid "Could not find user" msgstr "" @@ -681,7 +653,7 @@ msgstr "" msgid "Council contacts for %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:693 +#: perllib/FixMyStreet/DB/Result/Problem.pm:681 msgid "Council ref: %s" msgstr "" @@ -696,7 +668,7 @@ msgstr "" msgid "Count" msgstr "" -#: templates/web/base/email_sent.html:1 templates/web/zurich/email_sent.html:1 +#: templates/web/base/email_sent.html:1 msgid "Create a report" msgstr "" @@ -744,7 +716,7 @@ msgstr "" msgid "Dealt with by subdivision within 5 working days" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:878 +#: perllib/FixMyStreet/App/Controller/Admin.pm:877 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "" @@ -757,7 +729,7 @@ msgstr "" msgid "Deleted" msgstr "" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:51 +#: templates/web/base/report/new/form_report.html:45 #: templates/web/zurich/admin/index-dm.html:22 #: templates/web/zurich/admin/index-sdm.html:20 #: templates/web/zurich/admin/reports.html:12 @@ -765,12 +737,11 @@ msgid "Description" msgstr "" #: templates/web/base/js/translation_strings.html:34 -#: templates/web/zurich/report/new/fill_in_details_form.html:42 +#: templates/web/zurich/report/new/fill_in_details_form.html:68 msgid "Details" msgstr "" #: templates/web/base/admin/report_edit.html:20 -#: templates/web/base/report/new/fill_in_details_form.html:62 #: templates/web/zurich/admin/report_edit-sdm.html:27 #: templates/web/zurich/admin/report_edit.html:29 #: templates/web/zurich/admin/report_edit.html:43 @@ -791,11 +762,11 @@ msgid "Diligency prize league table" msgstr "" #. ("%s is the site name") -#: templates/web/base/auth/general.html:31 -#: templates/web/base/report/new/fill_in_details_form.html:114 -#: templates/web/base/report/update-form.html:87 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:11 -#: templates/web/fixmystreet/report/update-form.html:86 +#: templates/web/base/auth/general.html:48 +#: templates/web/base/report/new/form_user_loggedout.html:18 +#: templates/web/base/report/new/oauth_email_form.html:18 +#: templates/web/base/report/update-form.html:29 +#: templates/web/base/report/update/form_user_loggedout.html:17 msgid "Do you have a %s password?" msgstr "" @@ -803,16 +774,18 @@ msgstr "" msgid "Don’t know" msgstr "" -#: templates/web/fixmystreet/contact/index.html:118 +#: templates/web/base/contact/index.html:110 msgid "Don't like forms?" msgstr "" +#: templates/web/base/js/translation_strings.html:51 +msgid "Drag and drop photos here or <u>click to upload</u>" +msgstr "" + #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:14 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:32 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:30 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:36 msgid "Duplicate" msgstr "" @@ -862,7 +835,7 @@ msgstr "" #: templates/web/base/admin/category_edit.html:91 #: templates/web/base/admin/flagged.html:38 #: templates/web/base/admin/users.html:16 -#: templates/web/base/auth/general.html:22 +#: templates/web/base/auth/general.html:39 #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:24 @@ -870,7 +843,7 @@ msgstr "" msgid "Email" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1396 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1405 msgid "Email added to abuse list" msgstr "" @@ -886,7 +859,7 @@ msgstr "" msgid "Email alert deleted" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1393 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1402 msgid "Email already in abuse list" msgstr "" @@ -894,41 +867,36 @@ msgstr "" msgid "Email me new local problems" msgstr "" -#: templates/web/base/report/display.html:38 -msgid "Email me updates" -msgstr "" - #: templates/web/base/admin/category_edit.html:31 #: templates/web/base/admin/report_edit.html:62 #: templates/web/base/admin/update_edit.html:33 #: templates/web/base/admin/user-form.html:20 #: templates/web/base/alert/updates.html:13 -#: templates/web/base/report/display.html:42 #: templates/web/zurich/admin/body.html:47 msgid "Email:" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:329 +#: perllib/FixMyStreet/Script/Reports.pm:108 msgid "Email: %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:639 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:634 msgid "Empty flat or maisonette" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:638 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:633 msgid "Empty house or bungalow" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:641 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:636 msgid "Empty office or other commercial" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:642 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:637 msgid "Empty pub or bar" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:643 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:638 msgid "Empty public building - school, hospital, etc." msgstr "" @@ -961,7 +929,7 @@ msgstr "" msgid "Enter a Zürich street name" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:13 +#: perllib/FixMyStreet/Cobrand/UK.pm:14 msgid "Enter a nearby UK postcode, or street name and area" msgstr "" @@ -979,14 +947,9 @@ msgstr "" msgid "Enter a nearby street name and area, postal code or district in Delhi" msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:152 -#: templates/web/base/report/update-form.html:125 -msgid "Enter a new password:" -msgstr "" - -#: templates/web/base/auth/general.html:60 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:75 -#: templates/web/fixmystreet/report/update-form.html:123 +#: templates/web/base/auth/general.html:99 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:38 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:13 #: templates/web/zurich/auth/general.html:65 msgid "Enter a password" msgstr "" @@ -996,11 +959,11 @@ msgid "Enter details of the problem" msgstr "" #: templates/web/base/errors/generic.html:1 -#: templates/web/base/errors/generic.html:3 +#: templates/web/base/errors/generic.html:4 #: templates/web/base/tokens/abuse.html:1 #: templates/web/base/tokens/abuse.html:3 #: templates/web/base/tokens/error.html:1 -#: templates/web/base/tokens/error.html:3 +#: templates/web/base/tokens/error.html:5 msgid "Error" msgstr "" @@ -1013,11 +976,11 @@ msgstr "" msgid "Example postcode %s" msgstr "" -#: templates/web/base/open311/index.html:94 +#: templates/web/base/open311/index.html:86 msgid "Examples:" msgstr "" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:55 +#: templates/web/base/report/new/form_report.html:49 msgid "Explain what’s wrong, exactly where it is, and how long it’s been there…" msgstr "" @@ -1058,17 +1021,15 @@ msgstr "" msgid "FixMyStreet" msgstr "" -#: templates/web/base/admin/index.html:61 +#: templates/web/base/admin/index.html:54 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:24 #: templates/web/base/admin/report_blocks.html:9 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:144 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:34 -#: templates/web/fixmystreet/report/banner.html:12 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:32 +#: templates/web/base/report/banner.html:12 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:38 msgid "Fixed" msgstr "" @@ -1095,7 +1056,7 @@ msgstr "" msgid "Flag user" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1281 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1290 #: templates/web/base/admin/users.html:19 msgid "Flagged" msgstr "" @@ -1126,8 +1087,8 @@ msgstr "" msgid "For more information, see <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>." msgstr "" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:32 -#: templates/web/fixmystreet/report/update-form.html:106 +#: templates/web/base/report/new/form_user_loggedout_password.html:20 +#: templates/web/base/report/update/form_user_loggedout_password.html:19 msgid "Forgotten your password?" msgstr "" @@ -1139,21 +1100,18 @@ msgstr "" msgid "Forwarded wish to external body" msgstr "" -#: templates/web/base/faq/faq-en-gb.html:1 -#: templates/web/base/faq/faq-en-gb.html:13 -#: templates/web/base/faq/faq-en-gb.html:6 -#: templates/web/base/open311/index.html:6 -#: templates/web/base/static/privacy.html:8 -#: templates/web/fixmystreet/contact/index.html:10 +#: templates/web/base/about/_sidebar.html:4 +#: templates/web/base/about/faq-en-gb.html:1 +#: templates/web/base/about/faq-en-gb.html:5 msgid "Frequently Asked Questions" msgstr "" -#: templates/web/base/open311/index.html:136 +#: templates/web/base/open311/index.html:128 msgid "GeoRSS on Google Maps" msgstr "" +#: templates/web/base/report/display_tools.html:11 #: templates/web/fixmystreet/around/_updates.html:3 -#: templates/web/fixmystreet/report/display.html:35 msgid "Get updates" msgstr "" @@ -1186,7 +1144,7 @@ msgstr "" msgid "Going to send questionnaire?" msgstr "" -#: templates/web/base/admin/index.html:42 +#: templates/web/base/admin/index.html:35 msgid "Graph of problem creation by status over time" msgstr "" @@ -1203,7 +1161,7 @@ msgid "Have you ever reported a problem to a council before, or is this your fir msgstr "" #: templates/web/base/footer.html:15 templates/web/fixmystreet/footer.html:38 -#: templates/web/zurich/faq/faq-de-ch.html:1 +#: templates/web/zurich/about/faq-de-ch.html:1 #: templates/web/zurich/footer.html:22 #: templates/web/zurich/nav_over_content.html:8 msgid "Help" @@ -1254,7 +1212,7 @@ msgstr "" msgid "How to send successful reports" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:754 +#: perllib/FixMyStreet/App/Controller/Admin.pm:752 msgid "I am afraid you cannot confirm unconfirmed reports." msgstr "" @@ -1272,10 +1230,6 @@ msgstr "" msgid "I'm afraid we couldn't locate your problem in the database.\n" msgstr "" -#: perllib/FixMyStreet/App/Controller/Tokens.pm:327 -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 "" - #: templates/web/base/admin/flagged.html:14 #: templates/web/base/admin/list_updates.html:6 #: templates/web/base/admin/reports.html:11 @@ -1304,16 +1258,11 @@ msgstr "" msgid "If you get some more information about the status of your problem, please come back to the site and leave an update." msgstr "" -#: templates/web/base/report/new/councils_text_none.html:2 -#: templates/web/base/report/new/councils_text_none.html:8 +#: templates/web/base/report/new/councils_text_none.html:10 +#: templates/web/base/report/new/councils_text_none.html:9 msgid "If you submit a problem here the subject and details of the problem will be public, but the problem will <strong>not</strong> be reported to the council." msgstr "" -#: templates/web/zurich/auth/token.html:19 -#: templates/web/zurich/email_sent.html:7 -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 "" - #: templates/web/base/questionnaire/index.html:68 msgid "" "If you wish to leave a public update on the problem, please enter it here\n" @@ -1357,10 +1306,8 @@ msgstr "" #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:144 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:32 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:30 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:36 msgid "In Progress" msgstr "" @@ -1368,7 +1315,7 @@ msgstr "" msgid "In abuse table?" msgstr "" -#: templates/web/base/open311/index.html:88 +#: templates/web/base/open311/index.html:80 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 "" @@ -1376,7 +1323,7 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/Zurich.pm:963 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:7 -#: templates/web/fixmystreet/report/banner.html:19 +#: templates/web/base/report/banner.html:19 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:8 msgid "In progress" @@ -1411,7 +1358,7 @@ msgstr "" msgid "Invalid agency_responsible value %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1201 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1210 msgid "Invalid end date" msgstr "" @@ -1419,7 +1366,7 @@ msgstr "" msgid "Invalid format %s specified." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1206 msgid "Invalid start date" msgstr "" @@ -1427,14 +1374,12 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:5 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:143 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:31 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:29 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:35 msgid "Investigating" msgstr "" -#: templates/web/fixmystreet/contact/blurb.html:8 +#: templates/web/base/contact/blurb.html:8 msgid "It's often quickest to <a href=\"%s\">check our FAQs</a> and see if the answer is there." msgstr "" @@ -1452,11 +1397,9 @@ msgstr "" msgid "Jurisdiction unknown" msgstr "" -#: templates/web/base/auth/general.html:44 -#: templates/web/base/report/new/fill_in_details_form.html:132 -#: templates/web/base/report/update-form.html:105 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:28 -#: templates/web/fixmystreet/report/update-form.html:102 +#: templates/web/base/auth/general.html:80 +#: templates/web/base/report/new/form_user_loggedout_password.html:16 +#: templates/web/base/report/update/form_user_loggedout_password.html:15 #: templates/web/zurich/auth/general.html:40 msgid "Keep me signed in on this computer" msgstr "" @@ -1514,6 +1457,7 @@ msgid "MAP" msgstr "" #: templates/web/base/js/translation_strings.html:45 +#: templates/web/base/maps/google-ol.html:13 msgid "Map" msgstr "" @@ -1533,7 +1477,7 @@ msgstr "" msgid "Marked fixed/closed more than eight weeks ago" msgstr "" -#: templates/web/fixmystreet/contact/index.html:106 +#: templates/web/base/contact/index.html:98 msgid "Message" msgstr "" @@ -1545,10 +1489,6 @@ msgstr "" msgid "Message to external body:" msgstr "" -#: templates/web/base/contact/index.html:97 -msgid "Message:" -msgstr "" - #: perllib/FixMyStreet/App/Controller/Open311.pm:445 msgid "Missing jurisdiction_id" msgstr "" @@ -1561,10 +1501,6 @@ msgstr "" msgid "Month" msgstr "" -#: templates/web/base/report/display.html:34 -msgid "More problems nearby" -msgstr "" - #: templates/web/base/admin/bodies.html:21 #: templates/web/base/admin/body-form.html:18 #: templates/web/base/admin/flagged.html:16 @@ -1572,11 +1508,11 @@ msgstr "" #: templates/web/base/admin/list_updates.html:7 #: templates/web/base/admin/reports.html:13 #: templates/web/base/admin/users.html:15 -#: templates/web/base/auth/general.html:50 +#: templates/web/base/auth/general.html:89 +#: templates/web/base/report/new/form_user_loggedin.html:9 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:7 +#: templates/web/base/report/update/form_name.html:4 #: templates/web/base/reports/index.html:20 -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:9 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:44 -#: templates/web/fixmystreet/report/update-form.html:138 #: templates/web/zurich/admin/body-form.html:4 #: templates/web/zurich/auth/general.html:60 #: templates/web/zurich/report/new/fill_in_details_form.html:82 @@ -1590,7 +1526,7 @@ msgstr "" msgid "Name:" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:328 +#: perllib/FixMyStreet/Script/Reports.pm:107 msgid "Name: %s" msgstr "" @@ -1599,25 +1535,21 @@ msgstr "" msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:127 +#: perllib/FixMyStreet/Cobrand/UK.pm:128 msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:434 -#: perllib/FixMyStreet/Cobrand/Default.pm:474 +#: perllib/FixMyStreet/Cobrand/Default.pm:455 +#: perllib/FixMyStreet/Cobrand/Default.pm:495 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:267 +#: perllib/FixMyStreet/Script/Alerts.pm:290 msgid "" "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n" "\n" msgstr "" -#: templates/web/zurich/email_sent.html:5 -msgid "Nearly Done! Now check your email..." -msgstr "" - #: templates/web/base/auth/token.html:17 templates/web/base/email_sent.html:5 msgid "Nearly done! Now check your email…" msgstr "" @@ -1695,8 +1627,8 @@ msgstr "" #: templates/web/base/admin/report_edit.html:75 #: templates/web/base/admin/update_edit.html:25 #: templates/web/base/questionnaire/creator_fixed.html:16 +#: templates/web/base/questionnaire/index.html:101 #: templates/web/base/questionnaire/index.html:53 -#: templates/web/base/questionnaire/index.html:92 msgid "No" msgstr "" @@ -1760,10 +1692,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:13 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:33 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:31 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:37 msgid "Not Responsible" msgstr "" @@ -1802,7 +1732,7 @@ msgstr "" msgid "Note:" msgstr "" -#: templates/web/base/open311/index.html:73 +#: templates/web/base/open311/index.html:65 msgid "Note: <strong>%s</strong>" msgstr "" @@ -1810,13 +1740,15 @@ msgstr "" msgid "Notes from SDM to DM" msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:113 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:10 +#: templates/web/base/report/new/form_user_loggedout.html:14 +#: templates/web/base/report/new/form_user_loggedout.html:2 +#: templates/web/base/report/new/oauth_email_form.html:17 msgid "Now to submit your report…" msgstr "" -#: templates/web/base/report/update-form.html:86 -#: templates/web/fixmystreet/report/update-form.html:85 +#: templates/web/base/report/update-form.html:28 +#: templates/web/base/report/update/form_user_loggedout.html:13 +#: templates/web/base/report/update/form_user_loggedout.html:2 msgid "Now to submit your update…" msgstr "" @@ -1824,11 +1756,6 @@ msgstr "" msgid "OK" msgstr "" -#: templates/web/base/report/display.html:28 -#: templates/web/base/report/update.html:17 -msgid "Offensive? Unsuitable? Tell us" -msgstr "" - #: templates/web/base/reports/index.html:23 msgid "Old / unknown <br>problems" msgstr "" @@ -1845,7 +1772,7 @@ msgstr "" msgid "Older <br>problems" msgstr "" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:45 +#: templates/web/base/report/new/form_report.html:15 msgid "One-line summary" msgstr "" @@ -1856,8 +1783,7 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:4 #: templates/web/base/admin/update_edit.html:28 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/report/update-form.html:30 -#: templates/web/fixmystreet/report/update-form.html:28 +#: templates/web/base/report/update/form_update.html:34 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:7 #: templates/web/zurich/admin/update_edit.html:18 @@ -1872,15 +1798,15 @@ msgstr "" msgid "Open, but not had any update in eight weeks" msgstr "" -#: templates/web/base/open311/index.html:70 +#: templates/web/base/open311/index.html:62 msgid "Open311 API for the mySociety FixMyStreet server" msgstr "" -#: templates/web/base/open311/index.html:80 +#: templates/web/base/open311/index.html:72 msgid "Open311 initiative web page" msgstr "" -#: templates/web/base/open311/index.html:81 +#: templates/web/base/open311/index.html:73 msgid "Open311 specification" msgstr "" @@ -1892,15 +1818,15 @@ msgstr "" msgid "Or you can subscribe to an alert based upon what ward or council you’re in:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1084 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:673 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:674 -#: perllib/FixMyStreet/DB/Result/Problem.pm:570 -#: perllib/FixMyStreet/DB/Result/Problem.pm:580 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1055 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:669 +#: perllib/FixMyStreet/DB/Result/Problem.pm:558 +#: perllib/FixMyStreet/DB/Result/Problem.pm:568 +#: perllib/FixMyStreet/DB/Result/Problem.pm:578 #: perllib/FixMyStreet/DB/Result/Problem.pm:590 -#: perllib/FixMyStreet/DB/Result/Problem.pm:602 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:397 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:412 +#: perllib/FixMyStreet/Script/Reports.pm:175 +#: perllib/FixMyStreet/Script/Reports.pm:190 msgid "Other" msgstr "" @@ -1909,7 +1835,7 @@ msgid "Owner" msgstr "" #: templates/web/base/errors/page_error_404_not_found.html:1 -#: templates/web/base/errors/page_error_404_not_found.html:3 +#: templates/web/base/errors/page_error_404_not_found.html:4 msgid "Page Not Found" msgstr "" @@ -1923,16 +1849,16 @@ msgstr "" msgid "Partial" msgstr "" -#: templates/web/base/auth/general.html:53 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:68 -#: templates/web/fixmystreet/report/update-form.html:116 +#: templates/web/base/auth/general.html:92 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:31 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:6 #: templates/web/zurich/auth/general.html:32 #: templates/web/zurich/auth/general.html:63 msgid "Password (optional)" msgstr "" #: templates/web/base/auth/change_password.html:25 -#: templates/web/base/auth/general.html:36 +#: templates/web/base/auth/general.html:72 msgid "Password:" msgstr "" @@ -1944,29 +1870,29 @@ msgstr "" msgid "Phone number" msgstr "" -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:26 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:62 +#: templates/web/base/report/new/form_user_loggedin.html:26 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:25 msgid "Phone number (optional)" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:306 +#: perllib/FixMyStreet/Script/Reports.pm:83 #: templates/web/base/admin/report_edit.html:63 -#: templates/web/base/report/new/fill_in_details_form.html:198 #: templates/web/zurich/admin/stats.html:39 msgid "Phone:" msgstr "" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:66 -#: templates/web/fixmystreet/report/update-form.html:59 +#: templates/web/base/questionnaire/index.html:75 +#: templates/web/base/report/new/form_report.html:23 +#: templates/web/base/report/update/form_update.html:6 #: templates/web/zurich/admin/index-dm.html:29 #: templates/web/zurich/admin/index-sdm.html:24 #: templates/web/zurich/admin/reports.html:16 #: templates/web/zurich/admin/stats.html:37 -#: templates/web/zurich/report/new/fill_in_details_form.html:52 +#: templates/web/zurich/report/new/fill_in_details_form.html:45 msgid "Photo" msgstr "" -#: perllib/FixMyStreet/App/Controller/Photo.pm:221 +#: perllib/FixMyStreet/App/Controller/Photo.pm:187 msgid "Photo is required." msgstr "" @@ -1974,13 +1900,7 @@ msgstr "" msgid "Photo required" msgstr "" -#: templates/web/base/questionnaire/index.html:80 -#: templates/web/base/report/new/fill_in_details_form.html:84 -#: templates/web/base/report/update-form.html:62 -msgid "Photo:" -msgstr "" - -#: templates/web/base/alert/list.html:26 +#: templates/web/base/alert/list.html:23 msgid "Photos of recent nearby reports" msgstr "" @@ -2009,20 +1929,16 @@ msgstr "" msgid "Please check the passwords and try again" msgstr "" -#: templates/web/zurich/auth/token.html:16 -msgid "Please check your email" -msgstr "" - -#: templates/web/base/auth/general.html:10 -#: templates/web/base/auth/general.html:16 +#: templates/web/base/auth/general.html:27 +#: templates/web/base/auth/general.html:33 #: templates/web/zurich/auth/general.html:3 #: templates/web/zurich/auth/general.html:9 msgid "Please check your email address is correct" msgstr "" #: perllib/FixMyStreet/App/Controller/Admin.pm:343 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:883 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:948 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:878 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:943 #: perllib/FixMyStreet/DB/Result/Problem.pm:412 #: templates/web/base/js/translation_strings.html:9 msgid "Please choose a category" @@ -2036,8 +1952,7 @@ msgstr "" msgid "Please correct the errors below" msgstr "" -#: templates/web/base/contact/blurb.html:2 -#: templates/web/fixmystreet/contact/blurb.html:12 +#: templates/web/base/contact/blurb.html:12 msgid "" "Please do <strong>not</strong> report problems through this form; messages go to\n" "the team behind this site, not a council. To report a problem,\n" @@ -2049,11 +1964,16 @@ msgid "Please do not be abusive — abusing your council devalues the s msgstr "" #: perllib/FixMyStreet/App/Controller/Admin.pm:346 -#: perllib/FixMyStreet/DB/Result/Comment.pm:126 +#: perllib/FixMyStreet/DB/Result/Comment.pm:125 #: templates/web/base/js/translation_strings.html:2 msgid "Please enter a message" msgstr "" +#: perllib/FixMyStreet/App/Controller/Admin.pm:1091 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1146 +msgid "Please enter a name" +msgstr "" + #: templates/web/base/auth/change_password.html:12 #: templates/web/base/auth/change_password.html:15 #: templates/web/base/js/translation_strings.html:19 @@ -2066,10 +1986,10 @@ msgstr "" msgid "Please enter a subject" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1084 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1137 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1087 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1142 #: perllib/FixMyStreet/App/Controller/Admin.pm:345 -#: perllib/FixMyStreet/DB/Result/User.pm:127 +#: perllib/FixMyStreet/DB/Result/User.pm:133 #: templates/web/base/js/translation_strings.html:12 #: templates/web/base/js/translation_strings.html:16 msgid "Please enter a valid email" @@ -2086,9 +2006,9 @@ msgid "Please enter some details" msgstr "" #: perllib/FixMyStreet/App/Controller/Contact.pm:113 -#: perllib/FixMyStreet/DB/Result/User.pm:124 -#: templates/web/base/auth/general.html:10 -#: templates/web/base/auth/general.html:15 +#: perllib/FixMyStreet/DB/Result/User.pm:130 +#: templates/web/base/auth/general.html:27 +#: templates/web/base/auth/general.html:32 #: templates/web/base/js/translation_strings.html:11 #: templates/web/base/js/translation_strings.html:15 #: templates/web/zurich/auth/general.html:3 @@ -2096,7 +2016,7 @@ msgstr "" msgid "Please enter your email" msgstr "" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:7 +#: templates/web/base/report/new/form_user_loggedout_email.html:7 #: templates/web/zurich/report/new/fill_in_details_form.html:80 msgid "Please enter your email address" msgstr "" @@ -2105,15 +2025,15 @@ msgstr "" msgid "Please enter your first name" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:318 +#: perllib/FixMyStreet/Cobrand/UK.pm:319 #: templates/web/base/js/translation_strings.html:7 msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below" msgstr "" #: perllib/FixMyStreet/App/Controller/Contact.pm:112 -#: perllib/FixMyStreet/DB/Result/Comment.pm:123 +#: perllib/FixMyStreet/DB/Result/Comment.pm:122 #: perllib/FixMyStreet/DB/Result/Problem.pm:406 -#: perllib/FixMyStreet/DB/Result/User.pm:120 +#: perllib/FixMyStreet/DB/Result/User.pm:126 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter your name" msgstr "" @@ -2140,12 +2060,11 @@ msgstr "" msgid "Please fill in details of the problem below." msgstr "" -#: templates/web/zurich/report/new/fill_in_details_form.html:46 +#: templates/web/zurich/report/new/fill_in_details_form.html:72 msgid "Please fill in details of the problem." msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:28 -#: templates/web/fixmystreet/report/new/sidebar.html:7 +#: templates/web/base/report/new/sidebar.html:7 #: templates/web/zurich/report/new/fill_in_details_form.html:20 msgid "Please fill in the form below with details of the problem, and describe the location as precisely as possible in the details box." msgstr "" @@ -2154,20 +2073,23 @@ msgstr "" msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "" -#: templates/web/fixmystreet/report/updates-sidebar-notes.html:4 +#: templates/web/base/report/updates-sidebar-notes.html:2 msgid "Please note that updates are not sent to the council." msgstr "" -#: templates/web/base/report/update-form.html:7 -msgid "Please note that updates are not sent to the council. If you leave your name it will be public. Your information will only be used in accordance with our <a href=\"/faq#privacy\">privacy policy</a>" +#: templates/web/base/report/new/oauth_email_form.html:4 +msgid "Please note your report has <strong>not yet been sent</strong>." msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:8 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:21 +#: templates/web/base/report/new/fill_in_details_form.html:20 #: templates/web/zurich/report/new/fill_in_details_form.html:11 msgid "Please note your report has <strong>not yet been sent</strong>. Choose a category and add further information below, then submit." msgstr "" +#: templates/web/base/report/display.html:26 +msgid "Please note your update has <strong>not yet been posted</strong>." +msgstr "" + #: templates/web/base/report/new/notes.html:1 #: templates/web/zurich/report/new/notes.html:1 msgid "Please note:" @@ -2205,6 +2127,7 @@ msgstr "" #: perllib/FixMyStreet/App/Model/PhotoSet.pm:117 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:145 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:147 +#: templates/web/base/js/translation_strings.html:53 msgid "Please upload a JPEG image only" msgstr "" @@ -2212,18 +2135,14 @@ msgstr "" msgid "Please write a message" msgstr "" -#: templates/web/fixmystreet/report/update-form.html:23 +#: templates/web/base/report/update/form_update.html:29 msgid "Please write your update here" msgstr "" -#: templates/web/base/contact/index.html:100 -#: templates/web/base/report/update-form.html:110 -#: templates/web/base/report/update-form.html:132 -#: templates/web/base/report/update-form.html:72 -#: templates/web/fixmystreet/contact/index.html:113 -#: templates/web/fixmystreet/report/update-form.html:124 -#: templates/web/fixmystreet/report/update-form.html:71 -#: templates/web/fixmystreet/report/update-form.html:97 +#: templates/web/base/contact/index.html:105 +#: templates/web/base/report/update-form.html:24 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:14 +#: templates/web/base/report/update/form_user_loggedout_password.html:10 msgid "Post" msgstr "" @@ -2251,12 +2170,9 @@ msgstr "" msgid "Privacy" msgstr "" -#: templates/web/base/faq/faq-en-gb.html:7 -#: templates/web/base/open311/index.html:7 -#: templates/web/base/static/privacy.html:1 -#: templates/web/base/static/privacy.html:2 -#: templates/web/base/static/privacy.html:9 -#: templates/web/fixmystreet/contact/index.html:11 +#: templates/web/base/about/_sidebar.html:5 +#: templates/web/base/about/privacy.html:1 +#: templates/web/base/about/privacy.html:2 msgid "Privacy and cookies" msgstr "" @@ -2284,12 +2200,12 @@ msgstr "" msgid "Problem %s sent to council %s" msgstr "" -#: templates/web/base/admin/index.html:46 +#: templates/web/base/admin/index.html:39 #: templates/web/zurich/admin/index.html:9 msgid "Problem breakdown by state" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1055 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1058 msgid "Problem marked as open." msgstr "" @@ -2305,11 +2221,11 @@ msgstr "" msgid "Problems in this area" msgstr "" -#: templates/web/fixmystreet/report/display.html:43 +#: templates/web/base/report/display_tools.html:19 msgid "Problems nearby" msgstr "" -#: templates/web/fixmystreet/report/display.html:41 +#: templates/web/base/report/display_tools.html:17 msgid "Problems on the map" msgstr "" @@ -2321,15 +2237,15 @@ msgstr "" msgid "Problems within %.1fkm of this location" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:642 +#: perllib/FixMyStreet/Cobrand/Default.pm:663 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:120 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:139 -#: perllib/FixMyStreet/Cobrand/UK.pm:207 +#: perllib/FixMyStreet/Cobrand/UK.pm:208 msgid "Problems within %s" msgstr "" #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:128 -#: perllib/FixMyStreet/Cobrand/UK.pm:221 +#: perllib/FixMyStreet/Cobrand/UK.pm:222 msgid "Problems within %s ward" msgstr "" @@ -2351,19 +2267,16 @@ msgstr "" msgid "Property type:" msgstr "" -#: templates/web/base/report/update-form.html:3 -#: templates/web/fixmystreet/report/update-form.html:4 +#: templates/web/base/report/update-form.html:6 msgid "Provide an update" msgstr "" -#: templates/web/base/auth/general.html:56 +#: templates/web/base/auth/general.html:95 msgid "Providing a name and password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:156 -#: templates/web/base/report/update-form.html:129 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:71 -#: templates/web/fixmystreet/report/update-form.html:119 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:34 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:9 msgid "Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." msgstr "" @@ -2399,18 +2312,17 @@ msgstr "" #: templates/web/base/alert/_list.html:22 #: templates/web/base/around/display_location.html:1 #: templates/web/base/around/display_location.html:3 -#: templates/web/base/report/display.html:50 +#: templates/web/base/report/display_tools.html:34 #: templates/web/base/reports/_rss.html:1 #: templates/web/fixmystreet/alert/updates.html:9 -#: templates/web/fixmystreet/report/display.html:58 msgid "RSS feed" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:250 perllib/FixMyStreet/Cobrand/UK.pm:262 +#: perllib/FixMyStreet/Cobrand/UK.pm:251 perllib/FixMyStreet/Cobrand/UK.pm:263 msgid "RSS feed for %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:256 perllib/FixMyStreet/Cobrand/UK.pm:268 +#: perllib/FixMyStreet/Cobrand/UK.pm:257 perllib/FixMyStreet/Cobrand/UK.pm:269 msgid "RSS feed for %s ward, %s" msgstr "" @@ -2418,11 +2330,11 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:163 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:173 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:181 -#: perllib/FixMyStreet/Cobrand/UK.pm:276 perllib/FixMyStreet/Cobrand/UK.pm:288 +#: perllib/FixMyStreet/Cobrand/UK.pm:277 perllib/FixMyStreet/Cobrand/UK.pm:289 msgid "RSS feed of %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:281 perllib/FixMyStreet/Cobrand/UK.pm:293 +#: perllib/FixMyStreet/Cobrand/UK.pm:282 perllib/FixMyStreet/Cobrand/UK.pm:294 msgid "RSS feed of %s, within %s ward" msgstr "" @@ -2434,15 +2346,15 @@ msgstr "" msgid "RSS feed of problems in this %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:643 +#: perllib/FixMyStreet/Cobrand/Default.pm:664 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:121 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:138 -#: perllib/FixMyStreet/Cobrand/UK.pm:214 +#: perllib/FixMyStreet/Cobrand/UK.pm:215 msgid "RSS feed of problems within %s" msgstr "" #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:127 -#: perllib/FixMyStreet/Cobrand/UK.pm:220 +#: perllib/FixMyStreet/Cobrand/UK.pm:221 msgid "RSS feed of problems within %s ward" msgstr "" @@ -2451,16 +2363,14 @@ msgstr "" msgid "RSS feed of recent local problems" msgstr "" -#: templates/web/base/report/display.html:50 +#: templates/web/base/report/display_tools.html:34 #: templates/web/fixmystreet/alert/updates.html:9 -#: templates/web/fixmystreet/report/display.html:58 msgid "RSS feed of updates to this problem" msgstr "" #: templates/web/base/alert/updates.html:9 -#: templates/web/base/report/display.html:41 +#: templates/web/base/report/display_tools.html:36 #: templates/web/fixmystreet/alert/updates.html:14 -#: templates/web/fixmystreet/report/display.html:60 msgid "Receive email when updates are left on this problem." msgstr "" @@ -2486,8 +2396,8 @@ msgstr "" msgid "Remove flag" msgstr "" -#: templates/web/base/admin/report_edit.html:92 -#: templates/web/base/admin/update_edit.html:62 +#: templates/web/base/admin/report_edit.html:93 +#: templates/web/base/admin/update_edit.html:67 #: templates/web/zurich/admin/update_edit.html:35 msgid "Remove photo (can't be undone!)" msgstr "" @@ -2507,7 +2417,7 @@ msgstr "" msgid "Report a problem" msgstr "" -#: templates/web/fixmystreet/report/display.html:32 +#: templates/web/base/report/display_tools.html:8 msgid "Report abuse" msgstr "" @@ -2516,7 +2426,8 @@ msgid "Report on %s" msgstr "" #: templates/web/base/report/new/fill_in_details_form.html:1 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:2 +#: templates/web/base/report/new/login_success_form.html:1 +#: templates/web/base/report/new/oauth_email_form.html:1 msgid "Report your problem" msgstr "" @@ -2525,9 +2436,8 @@ msgstr "" msgid "Report, view, or discuss local problems" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:585 -#: templates/web/base/contact/index.html:50 -#: templates/web/fixmystreet/contact/index.html:65 +#: perllib/FixMyStreet/DB/Result/Problem.pm:573 +#: templates/web/base/contact/index.html:57 msgid "Reported anonymously at %s" msgstr "" @@ -2536,9 +2446,8 @@ msgstr "" msgid "Reported before" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:608 -#: templates/web/base/contact/index.html:52 -#: templates/web/fixmystreet/contact/index.html:67 +#: perllib/FixMyStreet/DB/Result/Problem.pm:596 +#: templates/web/base/contact/index.html:59 msgid "Reported by %s at %s" msgstr "" @@ -2551,27 +2460,27 @@ msgstr "" msgid "Reported in the %s category" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:581 +#: perllib/FixMyStreet/DB/Result/Problem.pm:569 msgid "Reported in the %s category anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:603 +#: perllib/FixMyStreet/DB/Result/Problem.pm:591 msgid "Reported in the %s category by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:577 +#: perllib/FixMyStreet/DB/Result/Problem.pm:565 msgid "Reported via %s anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:599 +#: perllib/FixMyStreet/DB/Result/Problem.pm:587 msgid "Reported via %s by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:573 +#: perllib/FixMyStreet/DB/Result/Problem.pm:561 msgid "Reported via %s in the %s category anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:593 +#: perllib/FixMyStreet/DB/Result/Problem.pm:581 msgid "Reported via %s in the %s category by %s at %s" msgstr "" @@ -2592,13 +2501,13 @@ msgstr "" msgid "Reporting a problem" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1277 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1286 #: perllib/FixMyStreet/Cobrand/Zurich.pm:384 #: templates/web/zurich/header.html:60 msgid "Reports" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:327 perllib/FixMyStreet/Cobrand/UK.pm:331 +#: perllib/FixMyStreet/Cobrand/UK.pm:328 perllib/FixMyStreet/Cobrand/UK.pm:332 msgid "Reports are limited to %s characters in length. Please shorten your report" msgstr "" @@ -2635,15 +2544,17 @@ msgstr "" msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1495 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1500 -#: templates/web/base/admin/report_edit.html:88 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1508 +#: templates/web/base/admin/report_edit.html:90 +#: templates/web/base/admin/update_edit.html:64 #: templates/web/zurich/admin/report_edit.html:116 msgid "Rotate Left" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1495 -#: templates/web/base/admin/report_edit.html:89 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 +#: templates/web/base/admin/report_edit.html:91 +#: templates/web/base/admin/update_edit.html:65 #: templates/web/zurich/admin/report_edit.html:117 msgid "Rotate Right" msgstr "" @@ -2653,7 +2564,6 @@ msgid "Rotating this photo will discard unsaved changes to the report." msgstr "" #: templates/web/base/js/translation_strings.html:46 -#: templates/web/base/maps/google-ol.html:13 msgid "Satellite" msgstr "" @@ -2713,7 +2623,7 @@ msgstr "" msgid "Sent report back" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:708 +#: perllib/FixMyStreet/DB/Result/Problem.pm:696 msgid "Sent to %s %s later" msgstr "" @@ -2726,15 +2636,13 @@ msgstr "" msgid "Service:" msgstr "" -#: templates/web/fixmystreet/report/display.html:38 +#: templates/web/base/report/display_tools.html:14 msgid "Share" msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:193 -#: templates/web/base/report/update-form.html:158 -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:23 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:59 -#: templates/web/fixmystreet/report/update-form.html:146 +#: templates/web/base/report/new/form_user_loggedin.html:23 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:22 +#: templates/web/base/report/update/form_name.html:15 msgid "Show my name publicly" msgstr "" @@ -2746,9 +2654,9 @@ msgstr "" msgid "Show pins" msgstr "" +#: templates/web/base/auth/general.html:100 #: templates/web/base/auth/general.html:3 -#: templates/web/base/auth/general.html:40 -#: templates/web/base/auth/general.html:61 +#: templates/web/base/auth/general.html:76 #: templates/web/zurich/auth/general.html:18 #: templates/web/zurich/auth/general.html:35 msgid "Sign in" @@ -2775,7 +2683,7 @@ msgid "" " sent from your FixMyStreet installation." msgstr "" -#: templates/web/base/alert/index.html:42 +#: templates/web/base/alert/index.html:40 msgid "Some photos of recent reports" msgstr "" @@ -2785,7 +2693,7 @@ msgstr "" msgid "Some text to localize" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:78 +#: perllib/FixMyStreet/Cobrand/UK.pm:79 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover." msgstr "" @@ -2797,14 +2705,20 @@ msgstr "" msgid "Sorry, there has been an error confirming your problem." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:221 -#: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:37 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:216 +#: perllib/FixMyStreet/Geocode.pm:38 perllib/FixMyStreet/Geocode/Bing.pm:38 #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:56 #: perllib/FixMyStreet/Geocode/OSM.pm:48 msgid "Sorry, we could not find that location." msgstr "" -#: perllib/FixMyStreet/Geocode/Bing.pm:34 +#: templates/web/base/auth/general.html:9 +#: templates/web/base/report/display.html:21 +#: templates/web/base/report/new/fill_in_details_form.html:23 +msgid "Sorry, we could not log you in. Please fill in the form below." +msgstr "" + +#: perllib/FixMyStreet/Geocode/Bing.pm:35 #: perllib/FixMyStreet/Geocode/Google.pm:45 #: perllib/FixMyStreet/Geocode/Zurich.pm:88 msgid "Sorry, we could not parse that location. Please try again." @@ -2814,6 +2728,10 @@ msgstr "" msgid "Sorry, we couldn't save your image(s), please try again." msgstr "" +#: perllib/FixMyStreet/App/Controller/AuthSS.pm:301 +msgid "Sorry, you can not log in with Facebook. Please try again later." +msgstr "" + #: templates/web/base/admin/stats.html:64 msgid "Start Date:" msgstr "" @@ -2822,13 +2740,12 @@ msgstr "" #: templates/web/base/admin/flagged.html:18 #: templates/web/base/admin/list_updates.html:11 #: templates/web/base/admin/reports.html:15 -#: templates/web/fixmystreet/report/update-form.html:26 +#: templates/web/base/report/update/form_update.html:32 msgid "State" msgstr "" #: templates/web/base/admin/report_edit.html:47 #: templates/web/base/admin/update_edit.html:27 -#: templates/web/base/report/update-form.html:28 #: templates/web/zurich/admin/report_edit-sdm.html:73 #: templates/web/zurich/admin/report_edit.html:101 #: templates/web/zurich/admin/report_edit.html:155 @@ -2836,7 +2753,7 @@ msgstr "" msgid "State:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1282 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1291 #: perllib/FixMyStreet/Cobrand/Zurich.pm:387 #: templates/web/base/admin/stats.html:1 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:73 @@ -2858,7 +2775,7 @@ msgstr "" msgid "Street View" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:406 +#: perllib/FixMyStreet/Script/Reports.pm:184 msgid "Subcategory: %s" msgstr "" @@ -2866,30 +2783,25 @@ msgstr "" msgid "Subdivision/Body" msgstr "" -#: templates/web/fixmystreet/contact/index.html:98 +#: templates/web/base/contact/index.html:90 msgid "Subject" msgstr "" #: templates/web/base/admin/report_edit.html:19 -#: templates/web/base/contact/index.html:88 -#: templates/web/base/report/new/fill_in_details_form.html:53 #: templates/web/zurich/admin/report_edit.html:39 msgid "Subject:" msgstr "" #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/fill_in_details_form.html:137 -#: templates/web/base/report/new/fill_in_details_form.html:159 -#: templates/web/base/report/new/fill_in_details_form.html:96 -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:36 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:23 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:76 +#: templates/web/base/report/new/form_user_loggedin.html:36 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:39 +#: templates/web/base/report/new/form_user_loggedout_password.html:11 #: templates/web/zurich/report/new/fill_in_details_form.html:96 msgid "Submit" msgstr "" -#: templates/web/base/admin/report_edit.html:95 -#: templates/web/base/admin/update_edit.html:65 +#: templates/web/base/admin/report_edit.html:101 +#: templates/web/base/admin/update_edit.html:75 #: templates/web/base/admin/user-form.html:56 #: templates/web/zurich/admin/report_edit-sdm.html:137 #: templates/web/zurich/admin/report_edit.html:268 @@ -2897,7 +2809,7 @@ msgstr "" msgid "Submit changes" msgstr "" -#: templates/web/base/questionnaire/index.html:97 +#: templates/web/base/questionnaire/index.html:106 msgid "Submit questionnaire" msgstr "" @@ -2913,9 +2825,8 @@ msgid "Submitted" msgstr "" #: templates/web/base/alert/updates.html:17 -#: templates/web/base/report/display.html:46 +#: templates/web/base/report/display_tools.html:41 #: templates/web/fixmystreet/alert/updates.html:23 -#: templates/web/fixmystreet/report/display.html:65 msgid "Subscribe" msgstr "" @@ -2923,7 +2834,7 @@ msgstr "" msgid "Subscribe me to an email alert" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1275 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1284 #: perllib/FixMyStreet/Cobrand/Zurich.pm:383 #: templates/web/base/admin/bodies.html:25 #: templates/web/base/admin/index.html:1 @@ -2942,7 +2853,7 @@ msgstr "" msgid "Summary reports" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1279 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1288 msgid "Survey" msgstr "" @@ -2978,7 +2889,7 @@ msgstr "" msgid "Thank you for reporting this issue!" msgstr "" -#: templates/web/base/tokens/error.html:7 +#: templates/web/base/tokens/error.html:6 msgid "Thank you for trying to confirm your update or problem. We seem to have an error ourselves though, so <a href=\"%s\">please let us know what went on</a> and we'll look into it." msgstr "" @@ -3013,23 +2924,23 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:47 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:63 -#: perllib/FixMyStreet/Cobrand/UK.pm:71 +#: perllib/FixMyStreet/Cobrand/UK.pm:72 msgid "That postcode was not recognised, sorry." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:726 +#: perllib/FixMyStreet/App/Controller/Admin.pm:724 msgid "That problem has been marked as sent." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:718 +#: perllib/FixMyStreet/App/Controller/Admin.pm:716 msgid "That problem will now be resent." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:125 +#: perllib/FixMyStreet/App/Controller/Report.pm:127 msgid "That report cannot be viewed on %s." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:119 +#: perllib/FixMyStreet/App/Controller/Report.pm:121 msgid "That report has been removed from FixMyStreet." msgstr "" @@ -3060,7 +2971,7 @@ msgid "" " If you leave this blank, <strong>send method defaults to email</strong>." msgstr "" -#: templates/web/base/open311/index.html:90 +#: templates/web/base/open311/index.html:82 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 "" @@ -3081,12 +2992,12 @@ msgstr "" msgid "The diligency prize league table shows editors' activity (who's been editing the most records)." msgstr "" -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:60 -#: perllib/FixMyStreet/App/Controller/Reports.pm:79 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:61 +#: perllib/FixMyStreet/App/Controller/Reports.pm:80 msgid "The error was: %s" msgstr "" -#: templates/web/base/open311/index.html:86 +#: templates/web/base/open311/index.html:78 msgid "The following Open311 v2 attributes are returned for each request: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code and service_name." msgstr "" @@ -3133,8 +3044,7 @@ msgstr "" msgid "The passwords do not match" msgstr "" -#: templates/web/base/errors/page_error_404_not_found.html:10 -#: templates/web/base/errors/page_error_404_not_found.html:12 +#: templates/web/base/errors/page_error_404_not_found.html:9 msgid "The requested URL '%s' was not found on this server" msgstr "" @@ -3144,12 +3054,11 @@ msgstr "" #: templates/web/base/report/new/councils_extra_text.html:1 #: templates/web/base/report/new/councils_text_some.html:10 -#: templates/web/base/report/new/fill_in_details_form.html:18 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:14 +#: templates/web/base/report/new/fill_in_details_form.html:13 msgid "The summary and description will also be made public (see our <a href=\"/privacy\">privacy policy</a>)." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:315 +#: perllib/FixMyStreet/Script/Reports.pm:92 msgid "The user could not locate the problem on a map, but to see the area around the location they entered" msgstr "" @@ -3166,18 +3075,18 @@ msgstr "" msgid "There are no reports to show." msgstr "" -#: perllib/FixMyStreet/App/Controller/Reports.pm:76 +#: perllib/FixMyStreet/App/Controller/Reports.pm:77 msgid "There was a problem showing the All Reports page. Please try again later." msgstr "" #: perllib/FixMyStreet/App/Controller/Contact.pm:137 -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:59 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:60 msgid "There was a problem showing this page. Please try again later." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:769 -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:134 -#: templates/web/base/auth/general.html:26 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:764 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:138 +#: templates/web/base/auth/general.html:43 #: templates/web/zurich/auth/general.html:28 msgid "There was a problem with your email/password combination. If you cannot remember your password, or do not have one, please fill in the ‘sign in by email’ section of the form." msgstr "" @@ -3186,7 +3095,7 @@ msgstr "" msgid "There was a problem with your email/password combination. Please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:272 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:336 msgid "There was a problem with your update. Please try again." msgstr "" @@ -3194,7 +3103,7 @@ msgstr "" msgid "There were problems with your report. Please see below." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:300 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:371 msgid "There were problems with your update. Please see below." msgstr "" @@ -3208,7 +3117,7 @@ msgid "" " " msgstr "" -#: templates/web/base/open311/index.html:77 +#: templates/web/base/open311/index.html:69 msgid "This API implementation is work in progress and not yet stabilized. It will change without warnings in the future." msgstr "" @@ -3230,18 +3139,18 @@ msgid "" " A body will not receive any reports unless it covers at least one area." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:413 +#: perllib/FixMyStreet/Script/Reports.pm:191 msgid "This email has been sent to both councils covering the location of the problem, as the user did not categorise it; please ignore it if you're not the correct council to deal with the issue, or let us know what category of problem this is so we can add it to our system." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:416 +#: perllib/FixMyStreet/Script/Reports.pm:194 msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:925 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:995 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:920 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:990 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:142 -#: perllib/FixMyStreet/Cobrand/UK.pm:43 +#: perllib/FixMyStreet/Cobrand/UK.pm:44 msgid "This information is required" msgstr "" @@ -3253,56 +3162,37 @@ msgstr "" msgid "This is a summary of all reports on this site." msgstr "" -#: templates/web/zurich/auth/token.html:8 -msgid "This may be because the link is too old or already used, or the address was not copied correctly." -msgstr "" - -#: templates/web/base/report/banner.html:15 -msgid "This problem has been closed" -msgstr "" - -#: templates/web/base/report/banner.html:12 -#: templates/web/base/report/update-form.html:48 -#: templates/web/fixmystreet/report/update-form.html:46 +#: templates/web/base/report/update/form_update.html:52 msgid "This problem has been fixed" msgstr "" -#: templates/web/base/report/update-form.html:43 -#: templates/web/fixmystreet/report/update-form.html:40 +#: templates/web/base/report/update/form_update.html:46 msgid "This problem has not been fixed" msgstr "" -#: templates/web/base/report/banner.html:19 -msgid "This problem is in progress" -msgstr "" - -#: templates/web/base/report/banner.html:9 -msgid "This problem is old and of unknown status." -msgstr "" - #: perllib/FixMyStreet/Cobrand/Zurich.pm:168 #: perllib/FixMyStreet/Cobrand/Zurich.pm:169 #: templates/web/zurich/report/_main.html:14 msgid "This report is awaiting moderation." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:86 +#: perllib/FixMyStreet/Script/Alerts.pm:94 msgid "This report is currently marked as closed." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:84 +#: perllib/FixMyStreet/Script/Alerts.pm:92 msgid "This report is currently marked as fixed." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:88 +#: perllib/FixMyStreet/Script/Alerts.pm:96 msgid "This report is currently marked as open." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:326 +#: perllib/FixMyStreet/Script/Reports.pm:105 msgid "This report was submitted anonymously" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:308 +#: perllib/FixMyStreet/Script/Reports.pm:85 msgid "This web page also contains a photo of the problem, provided by the user." msgstr "" @@ -3313,7 +3203,7 @@ msgstr "" msgid "Time spent (in minutes):" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1278 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1287 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "" @@ -3336,11 +3226,11 @@ msgstr "" msgid "To find out what local alerts we have for you, please enter your postcode or street name and area" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:314 +#: perllib/FixMyStreet/Script/Reports.pm:91 msgid "To view a map of the precise location of this issue" msgstr "" -#: templates/web/base/admin/index.html:61 +#: templates/web/base/admin/index.html:54 #: templates/web/base/admin/questionnaire.html:24 #: templates/web/base/admin/stats.html:24 #: templates/web/base/admin/stats.html:43 @@ -3358,10 +3248,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:12 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:33 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:31 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:37 msgid "Unable to fix" msgstr "" @@ -3374,7 +3262,7 @@ msgstr "" msgid "Unconfirmed" msgstr "" -#: templates/web/fixmystreet/report/banner.html:9 +#: templates/web/base/report/banner.html:9 msgid "Unknown" msgstr "" @@ -3382,17 +3270,18 @@ msgstr "" msgid "Unknown alert type" msgstr "" +#: perllib/FixMyStreet/App/Controller/Photo.pm:110 #: templates/web/base/js/translation_strings.html:39 msgid "Unknown error" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:103 -#: perllib/FixMyStreet/App/Controller/Report.pm:109 -#: perllib/FixMyStreet/App/Controller/Report.pm:112 +#: perllib/FixMyStreet/App/Controller/Report.pm:105 +#: perllib/FixMyStreet/App/Controller/Report.pm:111 +#: perllib/FixMyStreet/App/Controller/Report.pm:114 msgid "Unknown problem ID" msgstr "" -#: templates/web/fixmystreet/report/update-form.html:19 +#: templates/web/base/report/update/form_update.html:25 msgid "Update" msgstr "" @@ -3400,13 +3289,11 @@ msgstr "" msgid "Update %s created for problem %d; by %s" msgstr "" -#: templates/web/base/contact/index.html:21 -#: templates/web/fixmystreet/contact/index.html:36 +#: templates/web/base/contact/index.html:28 msgid "Update below added anonymously at %s" msgstr "" -#: templates/web/base/contact/index.html:23 -#: templates/web/fixmystreet/contact/index.html:38 +#: templates/web/base/contact/index.html:30 msgid "Update below added by %s at %s" msgstr "" @@ -3415,7 +3302,7 @@ msgstr "" msgid "Update body" msgstr "" -#: templates/web/base/admin/index.html:55 +#: templates/web/base/admin/index.html:48 msgid "Update breakdown by state" msgstr "" @@ -3440,20 +3327,16 @@ msgstr "" msgid "Update statuses" msgstr "" -#: templates/web/base/report/update-form.html:22 -msgid "Update:" -msgstr "" - #: templates/web/zurich/admin/index-dm.html:23 #: templates/web/zurich/admin/index-sdm.html:21 #: templates/web/zurich/admin/reports.html:13 msgid "Updated" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1045 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1103 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1147 -#: perllib/FixMyStreet/App/Controller/Admin.pm:822 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1048 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1108 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1156 +#: perllib/FixMyStreet/App/Controller/Admin.pm:821 #: perllib/FixMyStreet/Cobrand/Zurich.pm:771 #: perllib/FixMyStreet/Cobrand/Zurich.pm:796 #: perllib/FixMyStreet/Cobrand/Zurich.pm:866 @@ -3461,13 +3344,12 @@ msgid "Updated!" msgstr "" #: templates/web/base/admin/list_updates.html:2 -#: templates/web/base/report/update.html:3 -#: templates/web/fixmystreet/report/update.html:5 +#: templates/web/base/report/update.html:5 #: templates/web/zurich/report/updates.html:2 msgid "Updates" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:132 +#: perllib/FixMyStreet/DB/Result/Comment.pm:131 msgid "Updates are limited to %s characters in length. Please shorten your update" msgstr "" @@ -3477,9 +3359,7 @@ msgstr "" #. ("%s is the site name") #: templates/web/base/report/display.html:0 -#: templates/web/base/report/display.html:5 -#: templates/web/fixmystreet/report/display.html:0 -#: templates/web/fixmystreet/report/display.html:9 +#: templates/web/base/report/display.html:9 msgid "Updates to this problem, %s" msgstr "" @@ -3492,11 +3372,11 @@ msgstr "" msgid "Used map" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1452 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1461 msgid "User flag removed" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1424 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1433 msgid "User flagged" msgstr "" @@ -3504,7 +3384,7 @@ msgstr "" msgid "User search finds matches in users' names and email addresses." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1280 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1289 #: perllib/FixMyStreet/Cobrand/Zurich.pm:399 #: templates/web/base/admin/flagged.html:29 #: templates/web/zurich/header.html:69 @@ -3535,7 +3415,6 @@ msgid "Viewing a location" msgstr "" #: templates/web/base/report/display.html:0 -#: templates/web/fixmystreet/report/display.html:0 msgid "Viewing a problem" msgstr "" @@ -3548,25 +3427,24 @@ 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/zurich/auth/token.html:7 -msgid "We have not been able to confirm your account - sorry." -msgstr "" - -#: templates/web/zurich/auth/token.html:17 -msgid "We have sent you an email containing a link to confirm your account." -msgstr "" +#: templates/web/base/auth/general.html:6 +#: templates/web/base/report/display.html:27 +#: templates/web/base/report/new/oauth_email_form.html:5 +#, fuzzy +msgid "We need your email address, please give it below." +msgstr "(nu afișăm niciodată adresa ta de email sau numărul de telefon)" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:2 -#: templates/web/fixmystreet/report/update-form.html:77 +#: templates/web/base/report/new/form_user_loggedout_email.html:2 +#: templates/web/base/report/update/form_user_loggedout_email.html:2 msgid "We never show your email" msgstr "" -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:31 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:65 +#: templates/web/base/report/new/form_user_loggedin.html:31 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:28 msgid "We never show your email address or phone number." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:422 +#: perllib/FixMyStreet/Script/Reports.pm:200 msgid "We realise this problem might be the responsibility of %s; however, we don't currently have any contact details for them. If you know of an appropriate contact address, please do get in touch." msgstr "" @@ -3583,10 +3461,6 @@ msgstr "" msgid "We’re sorry to hear the problem’s not fixed. Why not try writing to your local representatives?" msgstr "" -#: templates/web/base/contact/blurb.html:8 -msgid "We'd love to hear what you think about this site. Just fill in the form, or send an email to <a href='mailto:%s'>%s</a>:" -msgstr "" - #: templates/web/base/contact/submit.html:7 msgid "We’ll get back to you as soon as we can." msgstr "" @@ -3595,7 +3469,7 @@ msgstr "" msgid "What was your experience of getting the problem fixed?" msgstr "" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:49 +#: templates/web/base/report/new/form_report.html:19 msgid "What’s the issue, and where is it?" msgstr "" @@ -3608,7 +3482,11 @@ msgstr "" msgid "When sent" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:640 +#: templates/web/base/js/translation_strings.html:50 +msgid "Whoa there Testino! Three photos are enough." +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Report/New.pm:635 msgid "Whole block of empty flats" msgstr "" @@ -3623,7 +3501,7 @@ msgstr "" msgid "Wish" msgstr "" -#: templates/web/base/open311/index.html:92 +#: templates/web/base/open311/index.html:84 msgid "With request searches, it is also possible to search for agency_responsible to limit the requests to those sent to a single administration. The search term is the administration ID provided by <a href=\"%s\">MaPit</a>." msgstr "" @@ -3631,7 +3509,7 @@ msgstr "" msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"http://fixmystreet.org\">available at fixmystreet.org</a>." msgstr "" -#: templates/web/base/questionnaire/index.html:87 +#: templates/web/base/questionnaire/index.html:96 msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?" msgstr "" @@ -3640,7 +3518,6 @@ msgid "Writing your message entirely in block capitals makes it hard to read, as msgstr "" #: templates/web/base/report/new/fill_in_details_form.html:4 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:5 msgid "Wrong location? Just click again on the map." msgstr "" @@ -3663,27 +3540,24 @@ msgstr "" #: templates/web/base/admin/users.html:31 #: templates/web/base/questionnaire/creator_fixed.html:14 #: templates/web/base/questionnaire/index.html:51 -#: templates/web/base/questionnaire/index.html:90 +#: templates/web/base/questionnaire/index.html:99 msgid "Yes" msgstr "" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:17 -#: templates/web/fixmystreet/report/update-form.html:91 +#: templates/web/base/report/new/form_user_loggedout_password.html:5 +#: templates/web/base/report/update/form_user_loggedout_password.html:4 msgid "Yes I have a password" msgstr "" -#: templates/web/base/contact/index.html:39 -#: templates/web/fixmystreet/contact/index.html:54 +#: templates/web/base/contact/index.html:46 msgid "You are complaining that this problem report was unnecessarily moderated:" msgstr "" -#: templates/web/base/contact/index.html:41 -#: templates/web/fixmystreet/contact/index.html:56 +#: templates/web/base/contact/index.html:48 msgid "You are reporting the following problem report for being abusive, containing personal information, or similar:" msgstr "" -#: templates/web/base/contact/index.html:15 -#: templates/web/fixmystreet/contact/index.html:30 +#: templates/web/base/contact/index.html:22 msgid "You are reporting the following update for being abusive, containing personal information, or similar:" msgstr "" @@ -3696,7 +3570,7 @@ msgstr "" msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create." msgstr "" -#: templates/web/fixmystreet/contact/index.html:121 +#: templates/web/base/contact/index.html:113 msgid "You can contact technical support on <a href='mailto:%s'>%s</a>" msgstr "" @@ -3707,8 +3581,8 @@ msgid "" " reports in the past." msgstr "" -#: templates/web/base/report/new/councils_text_none.html:10 -#: templates/web/base/report/new/councils_text_none.html:2 +#: templates/web/base/report/new/councils_text_none.html:12 +#: templates/web/base/report/new/councils_text_none.html:14 #: templates/web/base/report/new/councils_text_some.html:19 #: templates/web/base/report/new/councils_text_some.html:21 msgid "You can help us by finding a contact email address for local problems for %s and emailing it to us at <a href='mailto:%s'>%s</a>." @@ -3726,19 +3600,14 @@ msgstr "" msgid "You have already answered this questionnaire. If you have a question, please <a href='%s'>get in touch</a>, or <a href='%s'>view your problem</a>.\n" msgstr "" -#: templates/web/base/questionnaire/index.html:77 -#: templates/web/base/report/new/fill_in_details_form.html:75 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:73 -msgid "You have already attached a photo to this report, attaching another one will replace it." +#: templates/web/base/report/new/form_report.html:32 +#: templates/web/zurich/report/new/fill_in_details_form.html:55 +msgid "You have already attached photos to this report. Note that you can attach a maximum of 3 to this report (if you try to upload more, the oldest will be removed)." msgstr "" -#: templates/web/base/report/update-form.html:59 -#: templates/web/fixmystreet/report/update-form.html:56 -msgid "You have already attached a photo to this update, attaching another one will replace it." -msgstr "" - -#: templates/web/zurich/report/new/fill_in_details_form.html:61 -msgid "You have already attached photos to this report. Note that you can attach a maximum of 3 to this report (if you try to upload more, the oldest will be removed)." +#: templates/web/base/questionnaire/index.html:83 +#: templates/web/base/report/update/form_update.html:14 +msgid "You have already attached photos to this update. Note that you can attach a maximum of 3 to this update (if you try to upload more, the oldest will be removed)." msgstr "" #: templates/web/base/auth/sign_out.html:4 @@ -3755,9 +3624,8 @@ msgstr "" msgid "You have successfully confirmed your email address." msgstr "" -#: templates/web/base/report/display.html:20 -#: templates/web/base/report/new/fill_in_details.html:37 -#: templates/web/fixmystreet/report/display.html:17 +#: templates/web/base/report/display.html:17 +#: templates/web/base/report/new/login_success_form.html:3 msgid "You have successfully signed in; please check and confirm your details are accurate:" msgstr "" @@ -3786,53 +3654,42 @@ msgid "Your Reports" msgstr "Rapoartele dvs." #: templates/web/base/alert/_list.html:89 +#: templates/web/base/contact/index.html:83 +#: templates/web/base/report/display_tools.html:38 +#: templates/web/base/report/display_tools.html:40 +#: templates/web/base/report/new/form_user_loggedin.html:3 +#: templates/web/base/report/new/form_user_loggedout_email.html:1 +#: templates/web/base/report/update/form_user_loggedout_email.html:1 #: templates/web/fixmystreet/alert/updates.html:19 #: templates/web/fixmystreet/alert/updates.html:22 -#: templates/web/fixmystreet/contact/index.html:91 -#: templates/web/fixmystreet/report/display.html:62 -#: templates/web/fixmystreet/report/display.html:64 -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:3 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:1 -#: templates/web/fixmystreet/report/update-form.html:76 #: templates/web/zurich/report/new/fill_in_details_form.html:76 msgid "Your email" msgstr "" -#: templates/web/base/auth/general.html:28 -#: templates/web/fixmystreet/report/update-form.html:82 +#: templates/web/base/auth/general.html:45 +#: templates/web/base/report/update/form_user_loggedout_email.html:7 #: templates/web/zurich/auth/general.html:30 #: templates/web/zurich/auth/general.html:58 msgid "Your email address" msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:106 -#: templates/web/base/report/update-form.html:81 -msgid "Your email:" -msgstr "" - -#: templates/web/fixmystreet/report/updates-sidebar-notes.html:7 +#: templates/web/base/report/updates-sidebar-notes.html:3 msgid "Your information will only be used in accordance with our <a href=\"/privacy\">privacy policy</a>" msgstr "" -#: templates/web/base/auth/general.html:51 -#: templates/web/fixmystreet/contact/index.html:84 -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:18 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:54 -#: templates/web/fixmystreet/report/update-form.html:142 +#: templates/web/base/auth/general.html:90 +#: templates/web/base/contact/index.html:76 +#: templates/web/base/report/new/form_user_loggedin.html:18 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:17 +#: templates/web/base/report/update/form_name.html:11 #: templates/web/zurich/auth/general.html:61 #: templates/web/zurich/report/new/fill_in_details_form.html:86 msgid "Your name" msgstr "" -#: templates/web/base/contact/index.html:73 -#: templates/web/base/report/new/fill_in_details_form.html:186 -#: templates/web/base/report/update-form.html:152 -msgid "Your name:" -msgstr "" - -#: templates/web/base/auth/general.html:39 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:22 -#: templates/web/fixmystreet/report/update-form.html:96 +#: templates/web/base/auth/general.html:75 +#: templates/web/base/report/new/form_user_loggedout_password.html:10 +#: templates/web/base/report/update/form_user_loggedout_password.html:9 #: templates/web/zurich/auth/general.html:34 msgid "Your password" msgstr "" @@ -3841,15 +3698,16 @@ msgstr "" msgid "Your password has been changed" msgstr "" -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:27 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:63 +#: templates/web/base/report/new/form_user_loggedin.html:27 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:26 #: templates/web/zurich/report/new/fill_in_details_form.html:92 msgid "Your phone number" msgstr "" #: templates/web/base/questionnaire/index.html:14 +#, fuzzy msgid "Your report" -msgstr "" +msgstr "Rapoartele dvs." #: templates/web/base/footer.html:9 templates/web/fixmystreet/footer.html:29 msgid "Your reports" @@ -3859,23 +3717,17 @@ msgstr "" msgid "Your updates" msgstr "" -#: templates/web/base/contact/index.html:81 -msgid "Your email:" -msgstr "" - #: templates/web/base/reports/_list-filters.html:3 -#, fuzzy msgid "all reports" -msgstr "Rapoartele dvs." +msgstr "" #: templates/web/base/admin/timeline.html:4 msgid "by %s" msgstr "" #: templates/web/base/reports/_list-filters.html:5 -#, fuzzy msgid "closed reports" -msgstr "Rapoartele dvs." +msgstr "" #: templates/web/base/reports/body.html:6 #: templates/web/base/reports/body.html:7 @@ -3900,13 +3752,13 @@ msgstr "" msgid "fixed reports" msgstr "" -#: templates/web/base/admin/index.html:33 +#: templates/web/base/status/stats.html:20 #: templates/web/zurich/admin/index.html:5 msgid "from %s different users" msgstr "" -#: templates/web/base/report/_item.html:17 -#: templates/web/zurich/report/_item.html:16 +#: templates/web/base/report/_item.html:15 +#: templates/web/zurich/report/_item.html:14 msgid "last updated %s" msgstr "" @@ -3998,10 +3850,8 @@ msgstr "" msgid "sign out" msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:12 -#: templates/web/base/report/new/fill_in_details_form.html:15 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:10 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:12 +#: templates/web/base/report/new/fill_in_details_form.html:11 +#: templates/web/base/report/new/fill_in_details_form.html:9 msgid "the local council" msgstr "" @@ -4010,7 +3860,7 @@ msgstr "" msgid "there is no pin shown as the user did not use the map" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:398 +#: perllib/FixMyStreet/Script/Reports.pm:176 msgid "this type of local problem" msgstr "" @@ -4039,7 +3889,7 @@ msgstr "" msgid "ward" msgstr "" -#: templates/web/base/front/stats.html:17 +#: templates/web/base/front/stats.html:13 #, perl-format msgid "<big>%s</big> report recently" msgid_plural "<big>%s</big> reports recently" @@ -4071,7 +3921,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: templates/web/base/front/stats.html:29 +#: templates/web/base/front/stats.html:25 #, perl-format msgid "<big>%s</big> update on reports" msgid_plural "<big>%s</big> updates on reports" @@ -4095,7 +3945,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: templates/web/base/front/stats.html:12 +#: templates/web/base/front/stats.html:8 #, perl-format msgid "<big>%s</big> report in past week" msgid_plural "<big>%s</big> reports in past week" @@ -4103,7 +3953,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: templates/web/base/front/stats.html:23 +#: templates/web/base/front/stats.html:19 #, perl-format msgid "<big>%s</big> fixed in past month" msgid_plural "<big>%s</big> fixed in past month" @@ -4127,11 +3977,5 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#~ msgid "(Don't worry — we'll hang on to your alert while you're checking your email.)" -#~ msgstr "(Nu-È›i fă griji — îți vom păstra alerta până îți verifici email-ul.)" - -#~ msgid "(Don't worry — we'll hang on to your problem report while you're checking your email.)" -#~ msgstr "(Nu-È›i fă griji — îți vom păstra raportarea până îți verifici email-ul.)" - -#~ msgid "(Don't worry — we'll hang on to your update while you're checking your email.)" -#~ msgstr "(Nu-È›i fă griji — îți vom păstra actualizarea până îți verifici email-ul.)" +#~ msgid "(we never show your email)" +#~ msgstr "(nu afișăm niciodată adresa ta de email)" diff --git a/locale/ru.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/ru.UTF-8/LC_MESSAGES/FixMyStreet.po index b484625a0..9c4844f21 100644 --- a/locale/ru.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/ru.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -5,14 +5,15 @@ # # Translators: # Bakai <naubktl@gmail.com>, 2015 +# RU C2 <e2f54y54hgf@outlook.com>, 2015 # Ð˜Ð»ÑŒÑ Ð’Ð»Ð°Ð´Ð¸Ð¼Ð¸Ñ€Ð¾Ð²Ð¸Ñ‡ Кучаев <kuchaev.iv@gmail.com>, 2015 msgid "" msgstr "" "Project-Id-Version: fixmystreet\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2015-10-23 16:51+0100\n" -"PO-Revision-Date: 2015-08-08 17:11+0000\n" -"Last-Translator: Bakai <naubktl@gmail.com>\n" +"POT-Creation-Date: 2016-03-02 13:09+0000\n" +"PO-Revision-Date: 2015-11-25 13:39+0000\n" +"Last-Translator: RU C2 <e2f54y54hgf@outlook.com>\n" "Language-Team: Russian (http://www.transifex.com/mysociety/fixmystreet/language/ru/)\n" "Language: ru\n" "MIME-Version: 1.0\n" @@ -20,45 +21,24 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:628 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:411 +#: perllib/FixMyStreet/DB/Result/Problem.pm:616 +#: perllib/FixMyStreet/Script/Reports.pm:189 msgid " and " msgstr "и" #: templates/web/base/report/new/councils_text_all.html:2 -#: templates/web/base/report/new/councils_text_none.html:11 -#: templates/web/base/report/new/councils_text_none.html:2 +#: templates/web/base/report/new/councils_text_none.html:12 +#: templates/web/base/report/new/councils_text_none.html:15 #: templates/web/base/report/new/councils_text_some.html:19 #: templates/web/base/report/new/councils_text_some.html:22 #: templates/web/base/report/new/councils_text_some.html:5 msgid " or " msgstr "или" -#: templates/web/base/admin/index.html:35 -#: templates/web/base/status/index.html:13 -msgid "%s confirmed alerts, %s unconfirmed" -msgstr "%d подтвержденных уведомлений, %d неподтвержденных" - -#: templates/web/base/admin/index.html:37 -#: templates/web/base/status/index.html:16 -#: templates/web/zurich/admin/index.html:6 -msgid "%s council contacts – %s confirmed, %s unconfirmed" -msgstr "" - #: templates/web/base/admin/edit-league.html:12 msgid "%d edits by %s" msgstr "%d правок от %s" -#: templates/web/base/admin/index.html:34 -#: templates/web/base/status/index.html:12 -msgid "%s live updates" -msgstr "%d обновлений" - -#: templates/web/base/admin/index.html:36 -#: templates/web/base/status/index.html:14 -msgid "%s questionnaires sent – %s answered (%s%%)" -msgstr "" - #: templates/web/base/pagination.html:10 msgid "%d to %d of %d" msgstr "%d по %d из %d" @@ -71,7 +51,21 @@ msgstr "%s - Итоговые отчеты" #. ("%s here is the site name") #: templates/web/base/admin/header.html:10 msgid "%s admin:" -msgstr "" +msgstr "ÐдминиÑтратор Ñайта %s:" + +#: templates/web/base/status/stats.html:26 +#, fuzzy +msgid "%s bodies" +msgstr "УчреждениÑ" + +#: templates/web/base/status/stats.html:24 +msgid "%s confirmed alerts, %s unconfirmed" +msgstr "%s подтвержденных уведомлений, %s неподтвержденных" + +#: templates/web/base/status/stats.html:27 +#: templates/web/zurich/admin/index.html:6 +msgid "%s council contacts – %s confirmed, %s unconfirmed" +msgstr "%s конт. органов меÑтного ÑÐ°Ð¼Ð¾ÑƒÐ¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ñ – %s подтвержд., %s неподтвержд." #. ("%s is the site name") #: templates/web/base/alert/index.html:7 @@ -80,6 +74,9 @@ msgid "" "problems, including alerts for all problems within a particular ward, or all\n" "problems within a certain distance of a particular location." msgstr "" +"Ðа Ñайте %s можно подпиÑатьÑÑ Ð½Ð° RSS-фиды,\n" +"а также на ÑƒÐ²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ñ Ð¿Ð¾ Ñлектронной почте. Ð˜Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð² уведомлениÑÑ…\n" +"может каÑатьÑÑ ÐºÐ°Ðº неиÑправноÑтей в вашем районе, так и неполадок, которые были зафикÑированы в пределах определенного раÑÑтоÑÐ½Ð¸Ñ Ð¾Ñ‚ заданной точки." #. ("%s is the site name") #: templates/web/base/alert/index.html:11 @@ -88,8 +85,19 @@ msgid "" "alerts for all problems within a particular ward or council, or all problems\n" "within a certain distance of a particular location." msgstr "" +"Ðа Ñайте %s можно подпиÑатьÑÑ Ð½Ð° RSS-фид,\n" +"а также на ÑƒÐ²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ñ Ð¿Ð¾ Ñлектронной почте. Ð˜Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð² уведомлениÑÑ…\n" +"может каÑатьÑÑ ÐºÐ°Ðº неиÑправноÑтей в вашем районе или округе, так и неполадок, которые были зафикÑированыв пределах определенного раÑÑтоÑÐ½Ð¸Ñ Ð¾Ñ‚ заданной точки." + +#: templates/web/base/status/stats.html:23 +msgid "%s live updates" +msgstr "%s обновлений" + +#: templates/web/base/status/stats.html:25 +msgid "%s questionnaires sent – %s answered (%s%%)" +msgstr "Отправлено опроÑов: %s – получено ответов: %s (%s%%)" -#: perllib/FixMyStreet/DB/Result/Problem.pm:695 +#: perllib/FixMyStreet/DB/Result/Problem.pm:683 msgid "%s ref: %s" msgstr "%s ref: %s" @@ -103,99 +111,96 @@ msgid "" "council’s alerts, but will only appear in the \"Within the boundary\" alert\n" "for the county council." msgstr "" +"Сайт %s работает так: ÑиÑтема отÑылает ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ \n" +"о проблеме в ÑоответÑтвующий орган меÑтного ÑÐ°Ð¼Ð¾ÑƒÐ¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ð¿Ð¾ категориÑм, \n" +"поÑтому проблемы, обнаруженные внутри границ округа, могут не Ñовпадать Ñ Ð·Ð°Ð¿Ñ€Ð¾Ñами, которые отправлÑÑŽÑ‚ÑÑ Ð² правление.\n" +"Ðапример, обращение о новом граффити \n" +"будет отправлено в орган ÑÐ°Ð¼Ð¾ÑƒÐ¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ñ€Ð°Ð¹Ð¾Ð½Ð° и поÑвитÑÑ Ð² обоих уведомлениÑÑ… Ñтого ÑамоуправлениÑ. Ðо Ð´Ð»Ñ Ð¾Ñ€Ð³Ð°Ð½Ð° ÑÐ°Ð¼Ð¾ÑƒÐ¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ð¾Ð±Ð»Ð°Ñти оно поÑвитÑÑ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ в \n" +"разделе «Внутри границ облаÑти»." -#: perllib/FixMyStreet/Cobrand/UK.pm:255 perllib/FixMyStreet/Cobrand/UK.pm:267 +#: perllib/FixMyStreet/Cobrand/UK.pm:256 perllib/FixMyStreet/Cobrand/UK.pm:268 msgid "%s ward, %s" msgstr "%s район, %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:564 +#: perllib/FixMyStreet/DB/Result/Problem.pm:552 msgid "%s, reported at %s" msgstr "%s, отправлен в %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:282 perllib/FixMyStreet/Cobrand/UK.pm:294 +#: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295 msgid "%s, within %s ward" -msgstr "" +msgstr "%s, в пределах района: %s" #: perllib/FixMyStreet/Map/OSM.pm:42 msgid "© <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors" -msgstr "" +msgstr "© учаÑтники проекта <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a>" -#: templates/web/zurich/report/new/fill_in_details_form.html:53 +#: templates/web/zurich/report/new/fill_in_details_form.html:46 msgid "(Defect & location of defect)" -msgstr "" +msgstr "(Повреждение и меÑтоположение повреждениÑ)" #: templates/web/base/admin/report_blocks.html:41 #: templates/web/base/admin/users.html:31 msgid "(Email in abuse table)" -msgstr "" +msgstr "(Ð°Ð´Ñ€ÐµÑ Ñл. почты в таблице пользователей, которые пиÑали оÑкорбительные комментарии)" #: templates/web/zurich/admin/report_edit-sdm.html:60 #: templates/web/zurich/admin/report_edit.html:88 msgid "(No name)" -msgstr "" +msgstr "(Ð¸Ð¼Ñ Ð¾Ñ‚ÑутÑтвует)" #: templates/web/zurich/admin/report_edit-sdm.html:67 #: templates/web/zurich/admin/report_edit.html:95 msgid "(No phone number)" -msgstr "" +msgstr "(номер телефона отÑутÑтвует)" #: templates/web/base/alert/_list.html:24 msgid "(a default distance which covers roughly 200,000 people)" -msgstr "" +msgstr "(ТерриториÑ, Ð·Ð°Ð´Ð°Ð½Ð½Ð°Ñ Ð¿Ð¾ умолчанию, на которой проживают примерно 200 000 человек)" #. ("%s is a list of distance links, e.g. [2km] / [5km] / [10km] / [20km]") #: templates/web/base/alert/_list.html:29 msgid "(alternatively the RSS feed can be customised, within %s)" -msgstr "" - -#: templates/web/base/report/_item.html:27 -#: templates/web/zurich/report/_item.html:21 -msgid "(closed)" -msgstr "" +msgstr "(RSS-фид можно наÑтроить по параметру удаленноÑти: %s)" #: templates/web/base/report/_item.html:25 #: templates/web/zurich/report/_item.html:19 +msgid "(closed)" +msgstr "(закрыто)" + +#: templates/web/base/report/_item.html:23 +#: templates/web/zurich/report/_item.html:17 msgid "(fixed)" -msgstr "" +msgstr "(иÑправлено)" #: templates/web/base/around/intro.html:2 msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)" -msgstr "" +msgstr "(например: граффити, муÑор в неположенных меÑтах, Ð¿Ð¾Ð²Ñ€ÐµÐ¶Ð´ÐµÐ½Ð½Ð°Ñ Ñ‚Ñ€Ð¾Ñ‚ÑƒÐ°Ñ€Ð½Ð°Ñ Ð¿Ð»Ð¸Ñ‚ÐºÐ°, разбитые уличные фонари)" -#: templates/web/base/report/_item.html:21 +#: templates/web/base/report/_item.html:19 msgid "(not sent to council)" -msgstr "" +msgstr "(не отправлено в органы ÑамоуправлениÑ)" -#: templates/web/base/report/new/fill_in_details_form.html:200 #: templates/web/zurich/report/new/fill_in_details_form.html:82 msgid "(optional)" -msgstr "" +msgstr "(необÑзательно)" -#: templates/web/fixmystreet/report/public_label.html:1 +#: templates/web/base/report/public_label.html:1 msgid "(public)" -msgstr "" +msgstr "(общедоÑтупно)" -#: templates/web/base/report/_item.html:20 +#: templates/web/base/report/_item.html:18 msgid "(sent to both)" -msgstr "" - -#: templates/web/base/report/new/fill_in_details_form.html:194 -msgid "(we never show your email address or phone number)" -msgstr "" - -#: templates/web/base/report/update-form.html:159 -msgid "(we never show your email)" -msgstr "" +msgstr "(отправлено в обе инÑтанции)" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:673 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 #: perllib/FixMyStreet/DB/Result/Problem.pm:410 msgid "-- Pick a category --" -msgstr "" +msgstr "-- Выберите категорию --" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:637 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:632 #: perllib/FixMyStreet/DB/Result/Problem.pm:416 msgid "-- Pick a property type --" -msgstr "" +msgstr "-- Выберите тип имущеÑтва --" #: templates/web/base/admin/body-form.html:42 #: templates/web/base/admin/body-form.html:43 @@ -204,61 +209,51 @@ msgid "" " This is probably why \"area covered\" is empty (below).<br>\n" " Maybe add some <code>MAPIT_TYPES</code> to your config file?" msgstr "" +"Ð’Ñ‹ задали параметр <code>MAPIT_URL</code> (<code>%s</code>), но не задали <code>MAPIT_TYPES</code>.<br>\n" +"Возможно, поÑтому поле «зона покрытиÑ» не заполнено (Ñм. ниже).<br>\n" +"Хотите добавить неÑколько <code>MAPIT_TYPES</code> в ваш файл конфигурации?" #. ('The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories') #. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories") #: templates/web/base/reports/_list-filters.html:27 msgid "<label>Show %s</label> <label>about %s</label>" -msgstr "" +msgstr "<label>Показать отчеты: %s</label> <label>в категории: %s</label>" -#: templates/web/base/admin/index.html:32 -#: templates/web/base/status/index.html:11 +#: templates/web/base/status/stats.html:18 #: templates/web/zurich/admin/index.html:4 msgid "<strong>%s</strong> live problems" -msgstr "" +msgstr "Ðктуальных неполадок: <strong>%s</strong>" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:39 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:2 msgid "<strong>No</strong> Let me confirm my report by email" -msgstr "" +msgstr "<strong>Ðет</strong> Я хочу подтвердить Ñвое обращение Ñлектронным пиÑьмом" -#: templates/web/fixmystreet/report/update-form.html:112 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:2 msgid "<strong>No</strong> Let me confirm my update by email" -msgstr "" +msgstr "<strong>Ðет</strong> Я хочу подтвердить обновление Ñлектронным пиÑьмом" -#: templates/web/base/auth/general.html:48 +#: templates/web/base/auth/general.html:87 #: templates/web/zurich/auth/general.html:51 msgid "<strong>No</strong> let me sign in by email" -msgstr "" - -#: templates/web/base/report/new/fill_in_details_form.html:145 -msgid "<strong>No</strong>, let me confirm my report by email:" -msgstr "" - -#: templates/web/base/report/update-form.html:118 -msgid "<strong>No</strong>, let me confirm my update by email:" -msgstr "" +msgstr "<strong>Ðет</strong>, Ñ Ñ…Ð¾Ñ‡Ñƒ войти на Ñайт Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ адреÑа Ñл. почты" -#: templates/web/base/auth/general.html:34 -#: templates/web/base/report/new/fill_in_details_form.html:123 -#: templates/web/base/report/update-form.html:96 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:15 -#: templates/web/fixmystreet/report/update-form.html:89 +#: templates/web/base/auth/general.html:70 +#: templates/web/base/report/new/form_user_loggedout_password.html:3 +#: templates/web/base/report/update/form_user_loggedout_password.html:2 msgid "<strong>Yes</strong> I have a password" -msgstr "" +msgstr "<strong>Да</strong> У Ð¼ÐµÐ½Ñ ÐµÑÑ‚ÑŒ пароль" -#: templates/web/base/static/about-en-gb.html:1 -#: templates/web/base/static/about-en-gb.html:3 +#: templates/web/base/about/about-en-gb.html:1 +#: templates/web/base/about/about-en-gb.html:3 msgid "About us" msgstr "О наÑ" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:8 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:31 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:29 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:35 msgid "Action Scheduled" -msgstr "" +msgstr "ДейÑтвие запланировано" #: templates/web/base/admin/body-form.html:3 #: templates/web/base/admin/body-form.html:4 @@ -267,6 +262,9 @@ msgid "" " to which problem reports can be sent. You can add one or more contacts (for different\n" " categories of problem) to each body." msgstr "" +"Добавьте <strong>учреждение</strong> Ð´Ð»Ñ ÐºÐ°Ð¶Ð´Ð¾Ð¹ админиÑтративной единицы (например: орган ÑамоуправлениÑ, отдел),\n" +" в ведении которой находитÑÑ Ñ€ÐµÑˆÐµÐ½Ð¸Ðµ подобных вопроÑов. Ð’ информацию о каждом учреждении можно добавить\n" +" один или неÑколько контактов (в завиÑимоÑти от вида неполадки)." #: templates/web/base/admin/body.html:56 msgid "Add a contact using the form below." @@ -276,7 +274,7 @@ msgstr "Добавить контакт Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ формы." #: templates/web/base/admin/body-form.html:240 #: templates/web/zurich/admin/body-form.html:52 msgid "Add body" -msgstr "" +msgstr "Добавить учреждение" #: templates/web/base/admin/body.html:116 #: templates/web/zurich/admin/body.html:31 @@ -287,13 +285,13 @@ msgstr "Добавить категорию" msgid "Add user" msgstr "Добавить пользователÑ" -#: templates/web/base/my/my.html:52 +#: templates/web/base/my/my.html:56 msgid "Added %s" -msgstr "" +msgstr "Добавлено: %s" #: templates/web/base/report/new/category_extras.html:9 msgid "Additional Information" -msgstr "" +msgstr "Ð”Ð¾Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð°Ñ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ" #: templates/web/base/auth/change_password.html:29 msgid "Again:" @@ -301,16 +299,15 @@ msgstr "Снова:" #: templates/web/base/admin/timeline.html:35 msgid "Alert %d created for %s, type %s, parameters %s / %s" -msgstr "" +msgstr "Создано уведомление «%d» длÑ: %s. Тип: %s, параметры: %s / %s" #: templates/web/base/admin/timeline.html:37 msgid "Alert %d disabled (created %s)" -msgstr "" +msgstr "Уведомление «%d» отключено (Ñоздано: %s)" -#: templates/web/base/report/update-form.html:164 -#: templates/web/fixmystreet/report/update-form.html:150 +#: templates/web/base/report/update/form_name.html:20 msgid "Alert me to future updates" -msgstr "" +msgstr "Оповещать Ð¼ÐµÐ½Ñ Ð¾Ð± обновлениÑÑ… в будущем" #: templates/web/base/reports/index.html:3 #: templates/web/zurich/reports/index.html:12 @@ -318,9 +315,8 @@ msgid "All Reports" msgstr "Ð’Ñе Отчеты" #: templates/web/zurich/admin/stats.html:5 -#, fuzzy msgid "All Reports as CSV" -msgstr "Ð’Ñе Отчеты" +msgstr "Ð’Ñе Ð¾Ð±Ñ€Ð°Ñ‰ÐµÐ½Ð¸Ñ Ð² виде CSV-файлов" #: templates/web/base/footer.html:11 templates/web/fixmystreet/footer.html:32 #: templates/web/zurich/admin/index-dm.html:12 @@ -337,119 +333,121 @@ msgstr "Ð’Ñе отчеты Ñ %s по %s" #: templates/web/base/report/new/councils_text_some.html:2 msgid "All the information you provide here will be sent to" -msgstr "" +msgstr "ИнформациÑ, которую вы предоÑтавлÑете, будет отправлена Ñюда:" #: templates/web/base/report/new/councils_text_all.html:2 #: templates/web/base/report/new/councils_text_all.html:4 -#: templates/web/base/report/new/fill_in_details_form.html:12 -#: templates/web/base/report/new/fill_in_details_form.html:14 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:10 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:11 +#: templates/web/base/report/new/fill_in_details_form.html:10 +#: templates/web/base/report/new/fill_in_details_form.html:9 msgid "All the information you provide here will be sent to <strong>%s</strong>." -msgstr "" +msgstr "ИнформациÑ, которую вы предоÑтавлÑете, будет отправлена Ñюда: <strong>%s</strong>." #: templates/web/base/questionnaire/index.html:45 msgid "An update marked this problem as fixed." -msgstr "" +msgstr "Ð’ обновлении Ñта неполадка помечена как иÑправленнаÑ." #: templates/web/base/admin/list_updates.html:32 #: templates/web/base/admin/problem_row.html:20 msgid "Anonymous" -msgstr "" +msgstr "Ðнонимно" #: templates/web/base/admin/report_edit.html:57 #: templates/web/base/admin/update_edit.html:23 msgid "Anonymous:" -msgstr "" +msgstr "Ðнонимно:" #: templates/web/base/front/footer-marketing.html:16 msgid "Are you a developer?" +msgstr "Ð’Ñ‹ разработчик?" + +#: templates/web/base/js/translation_strings.html:52 +msgid "Are you sure you want to cancel this upload?" msgstr "" #: templates/web/base/admin/body-form.html:69 #: templates/web/base/admin/body.html:16 #: templates/web/zurich/admin/body-form.html:24 msgid "Area covered" -msgstr "" +msgstr "Зона покрытиÑ" #: templates/web/base/admin/bodies.html:15 #: templates/web/base/admin/body.html:60 msgid "As this is a staging site and %s is false, reports made on this site will be sent to the problem reporter, not the contact given for the report’s category." -msgstr "" +msgstr "ПоÑкольку Ñто отладочный Ñайт и в параметре %s значение False, вÑе обращениÑ, оÑтавленные на Ñайте, будут отправлены их авторам, а не в учреждениÑ, обозначенные в категориÑÑ…." #: templates/web/zurich/admin/report_edit.html:213 msgid "Assign to competent body:" -msgstr "" +msgstr "Ðаправить в учреждение, которое ÑпециализируетÑÑ Ð½Ð° решении подобных вопроÑов:" #: templates/web/zurich/admin/report_edit.html:173 #: templates/web/zurich/admin/stats.html:36 msgid "Assign to different category:" -msgstr "" +msgstr "Ðазначить другую категорию:" #: templates/web/zurich/admin/report_edit.html:211 msgid "Assign to external body:" -msgstr "" +msgstr "Ðаправить во внешнее учреждение:" #: templates/web/zurich/admin/report_edit.html:190 msgid "Assign to subdivision:" -msgstr "" +msgstr "Ðаправить в подразделение:" #: perllib/FixMyStreet/Cobrand/Zurich.pm:221 msgid "Assigned to %s" -msgstr "" +msgstr "Ðаправлено Ñюда: %s" -#: templates/web/base/open311/index.html:84 +#: templates/web/base/open311/index.html:76 msgid "At most %d requests are returned in each query. The returned requests are ordered by requested_datetime, so to get all requests, do several searches with rolling start_date and end_date." -msgstr "" +msgstr "Как правило, количеÑтво результатов, которые возвращаютÑÑ Ð¿Ð¾ каждому запроÑу, ÑоÑтавлÑет %d. СиÑтема находит их в ÑоответÑтвии Ñ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ð¾Ð¼ requested_datetime. Чтобы проÑмотреть вÑе результаты, выполните неÑколько поиÑков, изменÑÑ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ñ‹ start_date и end_date." -#: templates/web/base/open311/index.html:76 +#: templates/web/base/open311/index.html:68 msgid "At the moment only searching for and looking at reports work." -msgstr "" +msgstr "Ð¡ÐµÐ¹Ñ‡Ð°Ñ Ð¼Ð¾Ð¶Ð½Ð¾ только иÑкать и проÑматривать обращениÑ" #: perllib/FixMyStreet/DB/Result/Problem.pm:373 -#: templates/web/zurich/report/_item.html:11 +#: templates/web/zurich/report/_item.html:9 msgid "Awaiting moderation" -msgstr "" +msgstr "Ожидает модерации" #: templates/web/base/js/translation_strings.html:32 msgid "Back" -msgstr "" +msgstr "Ðазад" #: templates/web/base/admin/report_blocks.html:41 msgid "Ban email address" -msgstr "" +msgstr "Добавить Ð°Ð´Ñ€ÐµÑ Ñл. почты в черный ÑпиÑок" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1276 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1285 #: perllib/FixMyStreet/Cobrand/Zurich.pm:392 #: templates/web/base/admin/bodies.html:1 templates/web/zurich/header.html:64 msgid "Bodies" -msgstr "" +msgstr "УчреждениÑ" #: templates/web/base/admin/flagged.html:17 #: templates/web/base/admin/reports.html:14 #: templates/web/base/admin/users.html:17 msgid "Body" -msgstr "" +msgstr "Учреждение" #: templates/web/base/admin/report_edit.html:34 #: templates/web/base/admin/user-form.html:32 msgid "Body:" -msgstr "" +msgstr "Учреждение:" #: templates/web/base/admin/stats.html:80 msgid "By Date" -msgstr "" +msgstr "По дате" #: templates/web/base/auth/token.html:21 templates/web/base/email_sent.html:18 msgid "Can’t find our email? Check your spam folder – that’s the solution 99% of the time." -msgstr "" +msgstr "ПиÑьмо не пришло? Оно могло попаÑÑ‚ÑŒ в папку «Спам»." #: templates/web/base/around/_report_banner.html:5 msgid "Can't see the map? <em>Skip this step</em>" -msgstr "" +msgstr "Карта не отображаетÑÑ? <em>ПропуÑтите Ñтот шаг</em>" #: templates/web/base/admin/body.html:68 -#: templates/web/base/admin/index.html:61 +#: templates/web/base/admin/index.html:54 #: templates/web/base/report/new/category.html:10 #: templates/web/base/report/new/category_wrapper.html:3 #: templates/web/zurich/admin/body.html:14 @@ -458,12 +456,12 @@ msgstr "" #: templates/web/zurich/admin/reports.html:13 #: templates/web/zurich/admin/stats.html:50 msgid "Category" -msgstr "" +msgstr "КатегориÑ" -#: templates/web/base/admin/index.html:59 -#: templates/web/base/admin/index.html:67 +#: templates/web/base/admin/index.html:52 +#: templates/web/base/admin/index.html:60 msgid "Category fix rate for problems > 4 weeks old" -msgstr "" +msgstr "Процент уÑÑ‚Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ Ð½ÐµÐ¿Ð¾Ð»Ð°Ð´Ð¾Ðº в Ñтой категории, которым больше 4 недель" #: templates/web/base/admin/body.html:138 #: templates/web/base/admin/category_edit.html:23 @@ -472,30 +470,34 @@ msgstr "" #: templates/web/zurich/admin/report_edit-sdm.html:70 #: templates/web/zurich/admin/report_edit.html:98 msgid "Category:" -msgstr "" +msgstr "КатегориÑ:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:402 +#: perllib/FixMyStreet/Script/Reports.pm:180 msgid "Category: %s" -msgstr "" +msgstr "КатегориÑ: %s" #: templates/web/base/auth/change_password.html:1 #: templates/web/base/auth/change_password.html:3 #: templates/web/base/auth/change_password.html:33 #: templates/web/base/my/my.html:17 msgid "Change password" -msgstr "" +msgstr "Сменить пароль" #: templates/web/base/admin/body.html:160 msgid "" "Check <strong>confirmed</strong> to indicate that this contact has been confirmed as correct.\n" " If you are not sure of the origin or validity of the contact, leave this unchecked." msgstr "" +"Чтобы подтвердить доÑтоверноÑÑ‚ÑŒ контактных данных, поÑтавьте галочку в поле <strong>подтверждено</strong>.\n" +" ЕÑли у Ð²Ð°Ñ ÐµÑÑ‚ÑŒ ÑÐ¾Ð¼Ð½ÐµÐ½Ð¸Ñ Ð² доÑтоверноÑти Ñведений о контакте, оÑтавьте поле пуÑтым." #: templates/web/base/admin/body.html:171 msgid "" "Check <strong>deleted</strong> to remove the category from use. \n" " It will not appear as an available category in the drop-down menu on the report-a-problem page." msgstr "" +"Чтобы удалить Ñту категорию, поÑтавьте галочку в поле<strong>удалено</strong> . \n" +" ÐšÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ð¸Ñ Ð±Ð¾Ð»ÑŒÑˆÐµ не будет отображатьÑÑ ÐºÐ°Ðº доÑÑ‚ÑƒÐ¿Ð½Ð°Ñ Ð² раÑкрывающемÑÑ Ð¼ÐµÐ½ÑŽ на Ñтранице подачи обращений." #: templates/web/base/admin/body.html:191 msgid "" @@ -507,42 +509,51 @@ msgid "" " interest in displaying the report. In the UK, we've used this for services like requesting an extra rubbish bin\n" " at a specific address." msgstr "" +"Отметьте галочкой поле <strong>приватные</strong>, еÑли Ð¾Ð±Ñ€Ð°Ñ‰ÐµÐ½Ð¸Ñ Ð¸Ð· Ñтой категории <strong>никогда не должны отображатьÑÑ Ð½Ð° Ñайте</strong>.\n" +" <br>\n" +" По умолчанию категории общедоÑтупны.\n" +" <br>\n" +" Ограничение доÑтупа к категориÑм может быть полезно в тех ÑлучаÑÑ…, когда у пользователей должна быть возможноÑÑ‚ÑŒ подать обращение в учреждение, но Ñами Ð¾Ð±Ñ€Ð°Ñ‰ÐµÐ½Ð¸Ñ Ð² Ñтой категории не \n" +" имеют публичной ценноÑти. Ðапример: проÑьба обеÑпечить жителей определенного дома \n" +" дополнительным муÑорным баком." #: templates/web/base/admin/body.html:130 msgid "" "Choose a <strong>category</strong> name that makes sense to the public (e.g., \"Pothole\", \"Street lighting\") but is helpful\n" " to the body too. These will appear in the drop-down menu on the report-a-problem page." msgstr "" +"Выберите название <strong>категории</strong> которое будет понÑтно не только другим пользователÑм (например, «Выбоина» или «Уличное оÑвещение»), но и \n" +" Ñотрудникам учреждениÑ. Варианты названий отобразÑÑ‚ÑÑ Ð² раÑкрывающемÑÑ Ð¼ÐµÐ½ÑŽ на Ñтранице подачи обращений." #: templates/web/zurich/admin/response_templates_select.html:6 msgid "Choose a template" -msgstr "" +msgstr "Выберите шаблон" #: templates/web/base/admin/stats.html:65 #: templates/web/base/admin/stats.html:71 msgid "Click here or enter as dd/mm/yyyy" -msgstr "" +msgstr "Ðажмите здеÑÑŒ или введите дату в формате дд/мм/гггг" #: templates/web/base/around/_report_banner.html:2 -#: templates/web/base/js/translation_strings.html:50 +#: templates/web/base/js/translation_strings.html:55 msgid "Click map to report a problem" -msgstr "" +msgstr "Ðажмите на карту, чтобы Ñообщить о проблеме" #: templates/web/base/email_sent.html:13 msgid "Click the link in our confirmation email to activate your alert." -msgstr "" +msgstr "Чтобы активизировать ваше уведомление, пройдите по ÑÑылке, указанной в пиÑьме." #: templates/web/base/email_sent.html:9 msgid "Click the link in our confirmation email to publish your problem." -msgstr "" +msgstr "Чтобы опубликовать ваш запроÑ, пройдите по ÑÑылке, указанной в пиÑьме." #: templates/web/base/email_sent.html:11 msgid "Click the link in our confirmation email to publish your update." -msgstr "" +msgstr "Чтобы опубликовать ваше обновление, пройдите по ÑÑылке, указанной в пиÑьме." #: templates/web/base/auth/token.html:18 msgid "Click the link in our confirmation email to sign in." -msgstr "" +msgstr "Чтобы войти, пройдите по ÑÑылке, указанной в пиÑьме." #: perllib/FixMyStreet/Cobrand/Zurich.pm:196 #: perllib/FixMyStreet/Cobrand/Zurich.pm:969 @@ -551,61 +562,62 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:25 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:144 -#: templates/web/fixmystreet/report/banner.html:15 +#: templates/web/base/report/banner.html:15 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:10 #: templates/web/zurich/admin/header.html:16 #: templates/web/zurich/admin/stats.html:31 msgid "Closed" -msgstr "" +msgstr "Закрыто" -#: perllib/FixMyStreet/DB/Result/Problem.pm:794 +#: perllib/FixMyStreet/DB/Result/Problem.pm:779 msgid "Closed by council" -msgstr "" +msgstr "Закрыто органом ÑамоуправлениÑ" #: templates/web/base/admin/problem_row.html:38 msgid "Closed:" -msgstr "" +msgstr "Закрыто:" #: templates/web/base/admin/report_edit.html:23 msgid "Co-ordinates:" -msgstr "" +msgstr "Координаторы:" #: templates/web/base/admin/list_updates.html:10 msgid "Cobrand" -msgstr "" +msgstr "Кобренд" #: templates/web/base/admin/report_edit.html:73 #: templates/web/base/admin/update_edit.html:50 msgid "Cobrand data:" -msgstr "" +msgstr "Данные о кобренде:" #: templates/web/base/admin/report_edit.html:72 #: templates/web/base/admin/update_edit.html:49 msgid "Cobrand:" -msgstr "" +msgstr "Кобренд:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1283 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1292 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" -msgstr "" +msgstr "КонфигурациÑ" #: templates/web/base/admin/category_edit.html:55 msgid "Configure Endpoint" -msgstr "" +msgstr "ÐаÑтроить конечную точку" #: templates/web/base/admin/body.html:72 msgid "Confirm" -msgstr "" +msgstr "Подтвердить" -#: templates/web/base/auth/token.html:1 templates/web/zurich/auth/token.html:1 +#: templates/web/base/auth/token.html:1 msgid "Confirm account" -msgstr "" +msgstr "Подтвердить аккаунт" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:33 -#: templates/web/fixmystreet/report/update-form.html:107 -msgid "Confirm by email below, providing a new password at that point. When you confirm, your password will be updated." -msgstr "" +#: templates/web/base/report/new/form_user_loggedout_password.html:21 +#: templates/web/base/report/update/form_user_loggedout_password.html:20 +#, fuzzy +msgid "Confirm by email instead, providing a new password at that point. When you confirm, your password will be updated." +msgstr "Подтвердите дейÑтвие, Ð²Ð²ÐµÐ´Ñ Ð°Ð´Ñ€ÐµÑ Ñвоей Ñлектронной почты ниже. ЗдеÑÑŒ же вам необходимо будет выбрать новый пароль. Он вÑтупит в Ñилу Ñразу поÑле подтверждениÑ." #: templates/web/base/questionnaire/creator_fixed.html:1 #: templates/web/base/tokens/confirm_problem.html:1 @@ -613,7 +625,7 @@ msgstr "" #: templates/web/zurich/tokens/confirm_problem.html:1 #: templates/web/zurich/tokens/confirm_problem.html:3 msgid "Confirmation" -msgstr "" +msgstr "Подтверждение" #: templates/web/base/admin/body.html:166 #: templates/web/base/admin/body.html:79 @@ -621,130 +633,124 @@ msgstr "" #: templates/web/base/admin/category_edit.html:92 #: templates/web/zurich/admin/stats.html:40 msgid "Confirmed" -msgstr "" +msgstr "Подтверждено" #: templates/web/base/admin/stats.html:5 msgid "Confirmed reports between %s and %s" -msgstr "" +msgstr "Подтвержденные Ð¾Ð±Ñ€Ð°Ñ‰ÐµÐ½Ð¸Ñ Ñ %s по %s" #: templates/web/base/admin/list_updates.html:39 #: templates/web/base/admin/problem_row.html:36 #: templates/web/base/admin/report_edit.html:65 msgid "Confirmed:" -msgstr "" +msgstr "Подтверждено:" #. ("%s is the site name") -#: templates/web/base/faq/faq-en-gb.html:8 templates/web/base/footer.html:24 -#: templates/web/base/open311/index.html:8 -#: templates/web/base/static/privacy.html:10 -#: templates/web/fixmystreet/contact/index.html:12 +#: templates/web/base/about/_sidebar.html:6 templates/web/base/footer.html:24 msgid "Contact %s" -msgstr "" +msgstr "СвÑжитеÑÑŒ Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð¾Ð¹ Ñайта %s" #: templates/web/base/contact/index.html:1 #: templates/web/base/contact/index.html:2 #: templates/web/base/contact/submit.html:1 -#: templates/web/fixmystreet/contact/index.html:1 -#: templates/web/fixmystreet/contact/index.html:2 msgid "Contact Us" -msgstr "" +msgstr "СвÑжитеÑÑŒ Ñ Ð½Ð°Ð¼Ð¸" -#: templates/web/base/contact/index.html:6 -#: templates/web/fixmystreet/contact/index.html:20 +#: templates/web/base/contact/index.html:12 msgid "Contact the team" -msgstr "" +msgstr "СвÑжитеÑÑŒ Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð¾Ð¹" #: templates/web/zurich/admin/report_edit-sdm.html:40 #: templates/web/zurich/admin/report_edit.html:59 msgid "Coordinates:" -msgstr "" +msgstr "Координаты:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1420 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1448 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1429 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1457 msgid "Could not find user" -msgstr "" +msgstr "Ðе удалоÑÑŒ найти пользователÑ" #: templates/web/base/js/translation_strings.html:37 msgid "Could not look up location" -msgstr "" +msgstr "Ðе удалоÑÑŒ найти меÑтоположение" #: templates/web/base/admin/list_updates.html:9 msgid "Council" -msgstr "" +msgstr "Орган ÑамоуправлениÑ" #: templates/web/base/admin/body.html:1 #: templates/web/base/admin/category_edit.html:1 #: templates/web/zurich/admin/body.html:1 msgid "Council contacts for %s" -msgstr "" +msgstr "Контакты органа ÑÐ°Ð¼Ð¾ÑƒÐ¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ð´Ð»Ñ %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:693 +#: perllib/FixMyStreet/DB/Result/Problem.pm:681 msgid "Council ref: %s" -msgstr "" +msgstr "СÑылка на орган ÑамоуправлениÑ: %s" #: templates/web/base/admin/stats.html:84 msgid "Council:" -msgstr "" +msgstr "Орган ÑамоуправлениÑ:" #: templates/web/base/admin/stats.html:12 #: templates/web/base/admin/stats.html:32 #: templates/web/zurich/admin/stats.html:45 #: templates/web/zurich/admin/stats.html:50 msgid "Count" -msgstr "" +msgstr "ПодÑчет" -#: templates/web/base/email_sent.html:1 templates/web/zurich/email_sent.html:1 +#: templates/web/base/email_sent.html:1 msgid "Create a report" -msgstr "" +msgstr "Создать обращение" #: templates/web/base/admin/body.html:208 #: templates/web/zurich/admin/body.html:59 msgid "Create category" -msgstr "" +msgstr "Создать категорию" #: templates/web/zurich/admin/template_edit.html:29 msgid "Create template" -msgstr "" +msgstr "Создать шаблон" #: templates/web/base/admin/problem_row.html:34 #: templates/web/zurich/admin/templates.html:10 msgid "Created" -msgstr "" +msgstr "Создано" #: templates/web/base/admin/list_updates.html:38 #: templates/web/base/admin/report_edit.html:64 #: templates/web/base/admin/update_edit.html:51 #: templates/web/zurich/admin/update_edit.html:29 msgid "Created:" -msgstr "" +msgstr "Создано:" #: templates/web/base/admin/stats.html:31 msgid "Current state" -msgstr "" +msgstr "СтатуÑ" #: templates/web/base/admin/bodies.html:5 #: templates/web/base/admin/index.html:17 msgid "Currently no bodies have been created." -msgstr "" +msgstr "Ð’ данный момент на Ñайте не зарегиÑтрировано ни одного учреждениÑ." #: perllib/FixMyStreet/Cobrand/Zurich.pm:834 #: templates/web/zurich/admin/report_edit-sdm.html:109 msgid "Customer not contactable" -msgstr "" +msgstr "Ðевозможно ÑвÑзатьÑÑ Ñ Ð¿Ð¾ÐºÑƒÐ¿Ð°Ñ‚ÐµÐ»ÐµÐ¼" #: templates/web/base/dashboard/index.html:5 #: templates/web/base/dashboard/index.html:7 msgid "Dashboard" -msgstr "" +msgstr "Панель управлениÑ" #: templates/web/zurich/admin/stats.html:35 msgid "Dealt with by subdivision within 5 working days" -msgstr "" +msgstr "Ð’Ð¾Ð¿Ñ€Ð¾Ñ Ñ€ÐµÑˆÐµÐ½ подразделением в течение 5 рабочих дней" -#: perllib/FixMyStreet/App/Controller/Admin.pm:878 +#: perllib/FixMyStreet/App/Controller/Admin.pm:877 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" -msgstr "" +msgstr "Удалить шаблон" #: templates/web/base/admin/bodies.html:27 #: templates/web/base/admin/body.html:177 @@ -752,66 +758,67 @@ msgstr "" #: templates/web/base/admin/category_edit.html:42 #: templates/web/base/admin/category_edit.html:93 msgid "Deleted" -msgstr "" +msgstr "Удалено" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:51 +#: templates/web/base/report/new/form_report.html:45 #: templates/web/zurich/admin/index-dm.html:22 #: templates/web/zurich/admin/index-sdm.html:20 #: templates/web/zurich/admin/reports.html:12 msgid "Description" -msgstr "" +msgstr "ОпиÑание" #: templates/web/base/js/translation_strings.html:34 -#: templates/web/zurich/report/new/fill_in_details_form.html:42 +#: templates/web/zurich/report/new/fill_in_details_form.html:68 msgid "Details" -msgstr "" +msgstr "Ð”Ð¾Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð°Ñ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ" #: templates/web/base/admin/report_edit.html:20 -#: templates/web/base/report/new/fill_in_details_form.html:62 #: templates/web/zurich/admin/report_edit-sdm.html:27 #: templates/web/zurich/admin/report_edit.html:29 #: templates/web/zurich/admin/report_edit.html:43 msgid "Details:" -msgstr "" +msgstr "Ð”Ð¾Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð°Ñ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ:" #: templates/web/base/admin/body.html:87 msgid "Devolved" -msgstr "" +msgstr "Передано" #: templates/web/zurich/admin/report_edit-sdm.html:50 #: templates/web/zurich/admin/report_edit.html:69 msgid "Didn't use map" -msgstr "" +msgstr "Карта не иÑпользовалаÑÑŒ" #: templates/web/base/admin/edit-league.html:8 msgid "Diligency prize league table" -msgstr "" +msgstr "Таблица Ñамых активных пользователей" #. ("%s is the site name") -#: templates/web/base/auth/general.html:31 -#: templates/web/base/report/new/fill_in_details_form.html:114 -#: templates/web/base/report/update-form.html:87 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:11 -#: templates/web/fixmystreet/report/update-form.html:86 +#: templates/web/base/auth/general.html:48 +#: templates/web/base/report/new/form_user_loggedout.html:18 +#: templates/web/base/report/new/oauth_email_form.html:18 +#: templates/web/base/report/update-form.html:29 +#: templates/web/base/report/update/form_user_loggedout.html:17 msgid "Do you have a %s password?" -msgstr "" +msgstr "У Ð²Ð°Ñ ÐµÑÑ‚ÑŒ пароль на Ñайте %s?" #: templates/web/base/questionnaire/index.html:55 msgid "Don’t know" -msgstr "" +msgstr "Ðе знаю" -#: templates/web/fixmystreet/contact/index.html:118 +#: templates/web/base/contact/index.html:110 msgid "Don't like forms?" +msgstr "Ðе любите заполнÑÑ‚ÑŒ формы?" + +#: templates/web/base/js/translation_strings.html:51 +msgid "Drag and drop photos here or <u>click to upload</u>" msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:14 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:32 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:30 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:36 msgid "Duplicate" -msgstr "" +msgstr "Создать копию" #: templates/web/base/admin/body.html:106 msgid "" @@ -820,6 +827,10 @@ msgid "" " This means you can add many categories even if you only have one contact for the body.\n" " " msgstr "" +"Любые контактные данные ÑƒÑ‡Ñ€ÐµÐ¶Ð´ÐµÐ½Ð¸Ñ Ð¾Ð¿Ñ€ÐµÐ´ÐµÐ»ÑÑŽÑ‚ÑÑ Ð² ту или иную категорию, ÐºÐ¾Ñ‚Ð¾Ñ€Ð°Ñ Ð½Ð°Ñ…Ð¾Ð´Ð¸Ñ‚ÑÑ Ð² общем доÑтупе. \n" +" При Ñтом <strong>некоторые данные</strong> могут отноÑитьÑÑ Ðº неÑкольким категориÑм (напр., Ð°Ð´Ñ€ÐµÑ Ñл. почты).\n" +" Следовательно, вы можете добавлÑÑ‚ÑŒ много категорий Ð´Ð»Ñ Ð¾Ð´Ð½Ð¾Ð³Ð¾ контакта учреждениÑ.\n" +" " #: templates/web/base/admin/list_updates.html:42 #: templates/web/base/admin/problem_row.html:41 @@ -827,12 +838,12 @@ msgstr "" #: templates/web/zurich/admin/problem_row.html:48 #: templates/web/zurich/admin/templates.html:20 msgid "Edit" -msgstr "" +msgstr "Редактировать" #: templates/web/base/admin/body.html:220 #: templates/web/zurich/admin/body.html:71 msgid "Edit body details" -msgstr "" +msgstr "Редактировать информацию об учреждении" #: templates/web/base/admin/report_edit.html:1 #: templates/web/zurich/admin/report_edit-sdm.html:1 @@ -840,94 +851,89 @@ msgstr "" #: templates/web/zurich/admin/report_edit.html:1 #: templates/web/zurich/admin/report_edit.html:5 msgid "Editing problem %d" -msgstr "" +msgstr "Редактирование данных о неполадке: %d" #: templates/web/base/admin/update_edit.html:1 #: templates/web/zurich/admin/update_edit.html:1 msgid "Editing update %d" -msgstr "" +msgstr "Редактирование обновлениÑ: %d" #: templates/web/base/admin/user_edit.html:1 msgid "Editing user %d" -msgstr "" +msgstr "Редактирование данных о пользователе: %d" #: templates/web/base/admin/category_edit.html:94 msgid "Editor" -msgstr "" +msgstr "Редактор" #: templates/web/base/admin/bodies.html:23 #: templates/web/base/admin/category_edit.html:91 #: templates/web/base/admin/flagged.html:38 #: templates/web/base/admin/users.html:16 -#: templates/web/base/auth/general.html:22 +#: templates/web/base/auth/general.html:39 #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:24 #: templates/web/zurich/auth/general.html:54 msgid "Email" -msgstr "" +msgstr "ÐÐ´Ñ€ÐµÑ Ñл. почты" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1396 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1405 msgid "Email added to abuse list" -msgstr "" +msgstr "ÐÐ´Ñ€ÐµÑ Ñл. почты добавлен в черный ÑпиÑок" #: templates/web/base/admin/body.html:155 msgid "Email address:" -msgstr "" +msgstr "ÐÐ´Ñ€ÐµÑ Ñл. почты:" #: templates/web/base/tokens/confirm_alert.html:6 msgid "Email alert created" -msgstr "" +msgstr "Создано уведомление по Ñл. почте" #: templates/web/base/tokens/confirm_alert.html:10 msgid "Email alert deleted" -msgstr "" +msgstr "Уведомление по Ñл. почте удалено" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1393 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1402 msgid "Email already in abuse list" -msgstr "" +msgstr "Ðтот Ð°Ð´Ñ€ÐµÑ Ñл. почты уже находитÑÑ Ð² черном ÑпиÑке" #: templates/web/base/around/_updates.html:5 msgid "Email me new local problems" -msgstr "" - -#: templates/web/base/report/display.html:38 -msgid "Email me updates" -msgstr "" +msgstr "ПриÑылайте мне Ñлектронные пиÑьма Ñ Ð¾Ð¿Ð¸Ñанием неполадок поблизоÑти" #: templates/web/base/admin/category_edit.html:31 #: templates/web/base/admin/report_edit.html:62 #: templates/web/base/admin/update_edit.html:33 #: templates/web/base/admin/user-form.html:20 #: templates/web/base/alert/updates.html:13 -#: templates/web/base/report/display.html:42 #: templates/web/zurich/admin/body.html:47 msgid "Email:" -msgstr "" +msgstr "ÐÐ´Ñ€ÐµÑ Ñл. почты:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:329 +#: perllib/FixMyStreet/Script/Reports.pm:108 msgid "Email: %s" -msgstr "" +msgstr "ÐÐ´Ñ€ÐµÑ Ñл. почты: %s" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:639 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:634 msgid "Empty flat or maisonette" -msgstr "" +msgstr "ПуÑÑ‚Ð°Ñ ÐºÐ²Ð°Ñ€Ñ‚Ð¸Ñ€Ð° или коттедж" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:638 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:633 msgid "Empty house or bungalow" -msgstr "" +msgstr "ПуÑтой дом или бунгало" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:641 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:636 msgid "Empty office or other commercial" -msgstr "" +msgstr "ПуÑтой Ð¾Ñ„Ð¸Ñ Ð¸Ð»Ð¸ коммерчеÑкое помещение" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:642 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:637 msgid "Empty pub or bar" -msgstr "" +msgstr "ПуÑтой паб или бар" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:643 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:638 msgid "Empty public building - school, hospital, etc." -msgstr "" +msgstr "ПуÑтое муниципальное здание: школа, больница и др." #: templates/web/base/admin/body-form.html:162 #: templates/web/base/admin/body-form.html:163 @@ -937,6 +943,10 @@ msgid "" " For more information, see \n" " <a href='https://www.mysociety.org/2013/02/20/open311-extended/' class='admin-offsite-link'>this article</a>." msgstr "" +"Включите функцию <strong>отправки обновлений на ÑервиÑе Open311</strong>, еÑли ÐºÐ¾Ð½ÐµÑ‡Ð½Ð°Ñ Ñ‚Ð¾Ñ‡ÐºÐ° будет отправлÑÑ‚ÑŒ и получать\n" +" Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð¿Ð¾ текущим обращениÑм. ЕÑли вы не уверены в Ñтом, оÑтавьте поле пуÑтым.\n" +" Подробнее читайте в \n" +" <a href='https://www.mysociety.org/2013/02/20/open311-extended/' class='admin-offsite-link'>Ñтой Ñтатье</a>." #: templates/web/base/admin/body-form.html:222 #: templates/web/base/admin/body-form.html:223 @@ -945,275 +955,268 @@ msgid "" " different endpoint (and send method) from the body's. For example, if reports for some categories of\n" " problem must be emailed, while others can be sent over Open311." msgstr "" +"Включите наÑтройку <strong>может быть изменено</strong>, еÑли у одного или более контактов еÑÑ‚ÑŒ \n" +" разные конечные точки (и метод отправки), отличающиеÑÑ Ð¾Ñ‚ тех, которые ÑоответÑтвуют учреждению. Ðапример: Ð´Ð»Ñ Ð½ÐµÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ñ… категорий проблем Ð¾Ð±Ñ€Ð°Ñ‰ÐµÐ½Ð¸Ñ Ð´Ð¾Ð»Ð¶Ð½Ñ‹\n" +" отправлÑÑ‚ÑŒÑÑ Ð¿Ð¾ Ñл. почте, а Ð´Ð»Ñ Ð´Ñ€ÑƒÐ³Ð¸Ñ… – Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ ÑервиÑа Open311." #: templates/web/base/admin/stats.html:70 msgid "End Date:" -msgstr "" +msgstr "Дата окончаниÑ:" #: templates/web/base/admin/body-form.html:130 msgid "Endpoint" -msgstr "" +msgstr "ÐšÐ¾Ð½ÐµÑ‡Ð½Ð°Ñ Ñ‚Ð¾Ñ‡ÐºÐ°" #: perllib/FixMyStreet/Cobrand/Zurich.pm:76 msgid "Enter a Zürich street name" -msgstr "" +msgstr "Введите название улицы в Цюрихе" -#: perllib/FixMyStreet/Cobrand/UK.pm:13 +#: perllib/FixMyStreet/Cobrand/UK.pm:14 msgid "Enter a nearby UK postcode, or street name and area" -msgstr "" +msgstr "Введите почтовый Ð¸Ð½Ð´ÐµÐºÑ Ð±Ð»Ð¸Ð¶Ð°Ð¹ÑˆÐµÐ³Ð¾ Ð¾Ñ‚Ð´ÐµÐ»ÐµÐ½Ð¸Ñ ÑвÑзи в Великобритании или название улицы и регион" #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:20 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:21 msgid "Enter a nearby postcode, or street name and area" -msgstr "" +msgstr "Введите Ð¸Ð½Ð´ÐµÐºÑ Ð±Ð»Ð¸Ð¶Ð°Ð¹ÑˆÐµÐ³Ð¾ Ð¾Ñ‚Ð´ÐµÐ»ÐµÐ½Ð¸Ñ ÑвÑзи, название улицы или регион" #: templates/web/base/around/postcode_form.html:5 #: templates/web/base/around/postcode_form.html:6 msgid "Enter a nearby street name and area" -msgstr "" +msgstr "Введите название ближайшей улицы и регион" #: perllib/FixMyStreet/Cobrand/ZeroTB.pm:7 msgid "Enter a nearby street name and area, postal code or district in Delhi" -msgstr "" - -#: templates/web/base/report/new/fill_in_details_form.html:152 -#: templates/web/base/report/update-form.html:125 -msgid "Enter a new password:" -msgstr "" +msgstr "Введите название ближайшей улицы и регион, почтовый Ð¸Ð½Ð´ÐµÐºÑ Ð¸Ð»Ð¸ район в Дели" -#: templates/web/base/auth/general.html:60 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:75 -#: templates/web/fixmystreet/report/update-form.html:123 +#: templates/web/base/auth/general.html:99 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:38 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:13 #: templates/web/zurich/auth/general.html:65 msgid "Enter a password" -msgstr "" +msgstr "Введите пароль" #: templates/web/base/index-steps.html:26 msgid "Enter details of the problem" -msgstr "" +msgstr "Подробно опишите проблему" #: templates/web/base/errors/generic.html:1 -#: templates/web/base/errors/generic.html:3 +#: templates/web/base/errors/generic.html:4 #: templates/web/base/tokens/abuse.html:1 #: templates/web/base/tokens/abuse.html:3 #: templates/web/base/tokens/error.html:1 -#: templates/web/base/tokens/error.html:3 +#: templates/web/base/tokens/error.html:5 msgid "Error" -msgstr "" +msgstr "Ошибка" #: templates/web/base/reports/_list-filters.html:12 msgid "Everything" -msgstr "" +msgstr "Ð’ÑÑ‘" #: templates/web/base/admin/body.html:14 #: templates/web/base/admin/category_edit.html:18 msgid "Example postcode %s" -msgstr "" +msgstr "Пример почтового индекÑа: %s" -#: templates/web/base/open311/index.html:94 +#: templates/web/base/open311/index.html:86 msgid "Examples:" -msgstr "" +msgstr "Примеры:" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:55 +#: templates/web/base/report/new/form_report.html:49 msgid "Explain what’s wrong, exactly where it is, and how long it’s been there…" -msgstr "" +msgstr "Опишите, что пошло не так, где Ñто произошло и как давно..." #: perllib/FixMyStreet/Cobrand/Zurich.pm:181 #: perllib/FixMyStreet/Cobrand/Zurich.pm:922 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:12 msgid "Extern" -msgstr "" +msgstr "Внешн." #: templates/web/base/admin/body-form.html:81 msgid "External URL" -msgstr "" +msgstr "Внешний URL" #: templates/web/base/admin/category_edit.html:27 #: templates/web/base/admin/report_edit.html:74 msgid "Extra data:" -msgstr "" +msgstr "Ð”Ð¾Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð°Ñ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ:" #: templates/web/base/contact/submit.html:13 msgid "Failed to send message" -msgstr "" +msgstr "Ðе удалоÑÑŒ отправить Ñообщение" #: templates/web/zurich/admin/index-dm.html:33 #: templates/web/zurich/admin/index-sdm.html:30 msgid "Filter report list" -msgstr "" +msgstr "Сортировать ÑпиÑок обращений" #: templates/web/base/questionnaire/index.html:64 msgid "First time" -msgstr "" +msgstr "Впервые" #: templates/web/base/admin/body.html:48 msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit body details</em> form below." -msgstr "" +msgstr "ИÑправьте Ñто, выбрав <strong>зону покрытиÑ</strong> в форме <em>Редактирование информации об учреждении</em>, раÑположенной ниже." #: templates/web/base/header.html:26 msgid "FixMyStreet" -msgstr "" +msgstr "FixMyStreet" -#: templates/web/base/admin/index.html:61 +#: templates/web/base/admin/index.html:54 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:24 #: templates/web/base/admin/report_blocks.html:9 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:144 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:34 -#: templates/web/fixmystreet/report/banner.html:12 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:32 +#: templates/web/base/report/banner.html:12 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:38 msgid "Fixed" -msgstr "" +msgstr "ИÑправлено" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:11 msgid "Fixed - Council" -msgstr "" +msgstr "ИÑправлено (орган ÑамоуправлениÑ)" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:10 msgid "Fixed - User" -msgstr "" +msgstr "ИÑправлено (пользователь)" #: templates/web/base/admin/problem_row.html:37 msgid "Fixed:" -msgstr "" +msgstr "ИÑправлено:" #: templates/web/base/admin/body-form.html:89 #: templates/web/zurich/admin/body-form.html:36 msgid "Flag as deleted" -msgstr "" +msgstr "Пометить как удаленное" #: templates/web/base/admin/report_blocks.html:46 msgid "Flag user" -msgstr "" +msgstr "Пометить пользователÑ" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1281 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1290 #: templates/web/base/admin/users.html:19 msgid "Flagged" -msgstr "" +msgstr "Помечено" #: templates/web/base/admin/flagged.html:1 msgid "Flagged reports and users" -msgstr "" +msgstr "Помеченные Ð¾Ð±Ñ€Ð°Ñ‰ÐµÐ½Ð¸Ñ Ð¸ профили пользователей" #: templates/web/base/admin/user-form.html:46 msgid "Flagged users are listed on the <a href='%s'>flagged</a> page." -msgstr "" +msgstr "СпиÑок помеченных профилей пользователей находитÑÑ Ð½Ð° Ñтранице <a href='%s'>Помеченное</a>." #: templates/web/base/admin/flagged.html:31 msgid "Flagged users are not restricted in any way. This is just a list of users that have been marked for attention." -msgstr "" +msgstr "Ðа помеченные аккаунты пользователей не накладываютÑÑ Ð¾Ð³Ñ€Ð°Ð½Ð¸Ñ‡ÐµÐ½Ð¸Ñ. Ðто проÑто аккаунты, к которым проÑвлÑетÑÑ Ð¿Ð¾Ð²Ñ‹ÑˆÐµÐ½Ð½Ð¾Ðµ внимание." #: templates/web/base/admin/report_edit.html:76 #: templates/web/base/admin/user-form.html:52 msgid "Flagged:" -msgstr "" +msgstr "Помечено:" #: templates/web/base/reports/_ward-list.html:3 #: templates/web/fixmystreet/reports/_ward-list.html:4 msgid "Follow a ward link to view only reports within that ward." -msgstr "" +msgstr "Чтобы поÑмотреть только обращениÑ, отноÑÑщиеÑÑ Ðº определенному району, перейдите по ÑÑылке на Ñтот район." #: templates/web/base/admin/body-form.html:65 msgid "For more information, see <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>." -msgstr "" +msgstr "Подробнее читайте в разделе <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>Как в FixMyStreet иÑпользуетÑÑ Ð¸Ð½Ñтрумент Mapit</a>." -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:32 -#: templates/web/fixmystreet/report/update-form.html:106 +#: templates/web/base/report/new/form_user_loggedout_password.html:20 +#: templates/web/base/report/update/form_user_loggedout_password.html:19 msgid "Forgotten your password?" -msgstr "" +msgstr "Забыли пароль?" #: perllib/FixMyStreet/Cobrand/Zurich.pm:752 msgid "Forwarded to external body" -msgstr "" +msgstr "Перенаправлено во внешнее учреждение" #: perllib/FixMyStreet/Cobrand/Zurich.pm:753 msgid "Forwarded wish to external body" -msgstr "" +msgstr "Пожелание перенаправлено во внешнее учреждение" -#: templates/web/base/faq/faq-en-gb.html:1 -#: templates/web/base/faq/faq-en-gb.html:13 -#: templates/web/base/faq/faq-en-gb.html:6 -#: templates/web/base/open311/index.html:6 -#: templates/web/base/static/privacy.html:8 -#: templates/web/fixmystreet/contact/index.html:10 +#: templates/web/base/about/_sidebar.html:4 +#: templates/web/base/about/faq-en-gb.html:1 +#: templates/web/base/about/faq-en-gb.html:5 msgid "Frequently Asked Questions" -msgstr "" +msgstr "ЧаÑто задаваемые вопроÑÑ‹" -#: templates/web/base/open311/index.html:136 +#: templates/web/base/open311/index.html:128 msgid "GeoRSS on Google Maps" -msgstr "" +msgstr "GeoRSS в Google Картах" +#: templates/web/base/report/display_tools.html:11 #: templates/web/fixmystreet/around/_updates.html:3 -#: templates/web/fixmystreet/report/display.html:35 msgid "Get updates" -msgstr "" +msgstr "Получать обновлениÑ" #: templates/web/fixmystreet/reports/_rss.html:3 #: templates/web/fixmystreet/reports/_rss.html:9 msgid "Get updates of %s problems" -msgstr "" +msgstr "Получать новоÑти о ходе работы над неполадками в: %s" #: templates/web/fixmystreet/reports/_rss.html:11 #: templates/web/fixmystreet/reports/_rss.html:3 msgid "Get updates of problems in this %s" -msgstr "" +msgstr "Получать новоÑти о неполадках в:" #: templates/web/base/alert/_list.html:82 msgid "Give me an RSS feed" -msgstr "" +msgstr "Подпишите Ð¼ÐµÐ½Ñ Ð½Ð° RSS-фид" #: templates/web/base/questionnaire/completed.html:14 msgid "Glad to hear it’s been fixed!" -msgstr "" +msgstr "Здорово, что проблема решена!" #: templates/web/base/alert/index.html:34 #: templates/web/base/around/postcode_form.html:16 #: templates/web/base/reports/_list-filters.html:28 #: templates/web/zurich/admin/stats.html:26 msgid "Go" -msgstr "" +msgstr "Поехали!" #: templates/web/base/admin/report_edit.html:75 msgid "Going to send questionnaire?" -msgstr "" +msgstr "СобираетеÑÑŒ отправить опроÑ?" -#: templates/web/base/admin/index.html:42 +#: templates/web/base/admin/index.html:35 msgid "Graph of problem creation by status over time" -msgstr "" +msgstr "График уÑÑ‚Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ Ð½ÐµÐ¿Ð¾Ð»Ð°Ð´ÐºÐ¸: ÑтатуÑ/времÑ" #: templates/web/base/reports/index.html:12 msgid "Greyed-out lines are councils that no longer exist." -msgstr "" +msgstr "Графы, выделенные Ñерым цветом, обозначают органы ÑамоуправлениÑ, которые больше не функционируют." #: templates/web/base/questionnaire/index.html:46 msgid "Has this problem been fixed?" -msgstr "" +msgstr "Ðта проблема решена?" #: templates/web/base/questionnaire/index.html:59 msgid "Have you ever reported a problem to a council before, or is this your first time?" -msgstr "" +msgstr "Ð’Ñ‹ впервые отправлÑете обращение в орган ÑамоуправлениÑ?" #: templates/web/base/footer.html:15 templates/web/fixmystreet/footer.html:38 -#: templates/web/zurich/faq/faq-de-ch.html:1 +#: templates/web/zurich/about/faq-de-ch.html:1 #: templates/web/zurich/footer.html:22 #: templates/web/zurich/nav_over_content.html:8 msgid "Help" -msgstr "" +msgstr "Помощь" #: templates/web/base/alert/_list.html:8 msgid "Here are the types of local problem alerts for ‘%s’." -msgstr "" +msgstr "ЗдеÑÑŒ предÑтавлены типы уведомлений о неполадках поблизоÑти. Они указаны длÑ: ‘%s’." #: templates/web/base/header.html:32 templates/web/fixmystreet/header.html:63 #: templates/web/zurich/footer.html:12 msgid "Hi %s" -msgstr "" +msgstr "Привет, %s!" #: perllib/FixMyStreet/Cobrand/Zurich.pm:915 #: templates/web/base/admin/report_blocks.html:1 @@ -1225,53 +1228,49 @@ msgstr "" #: templates/web/zurich/admin/stats.html:32 #: templates/web/zurich/admin/update_edit.html:18 msgid "Hidden" -msgstr "" +msgstr "Скрыто" #: templates/web/base/around/display_location.html:65 msgid "Hide old" -msgstr "" +msgstr "Скрыть Ñтарые" #: templates/web/base/around/display_location.html:60 msgid "Hide pins" -msgstr "" +msgstr "Скрыть метки" #: templates/web/base/admin/category_edit.html:87 msgid "History" -msgstr "" +msgstr "ИÑториÑ" #: templates/web/base/js/translation_strings.html:31 msgid "Home" -msgstr "" +msgstr "Ðа главную Ñтраницу" #: templates/web/base/index-steps.html:1 msgid "How to report a problem" -msgstr "" +msgstr "Как Ñообщить о проблеме" #: templates/web/base/js/translation_strings.html:33 msgid "How to send successful reports" -msgstr "" +msgstr "Как уÑпешно Ñоздавать и отправлÑÑ‚ÑŒ обращениÑ" -#: perllib/FixMyStreet/App/Controller/Admin.pm:754 +#: perllib/FixMyStreet/App/Controller/Admin.pm:752 msgid "I am afraid you cannot confirm unconfirmed reports." -msgstr "" +msgstr "К Ñожалению, вы не можете подтверждать неподтвержденные обращениÑ." #: templates/web/base/tokens/confirm_problem.html:23 #: templates/web/base/tokens/confirm_problem.html:27 msgid "I just reported a problem on @fixmystreet" -msgstr "" +msgstr "Я Ñообщаю о проблеме на @fixmystreet" #: templates/web/base/tokens/confirm_update.html:19 #: templates/web/base/tokens/confirm_update.html:23 msgid "I just updated a problem on @fixmystreet" -msgstr "" +msgstr "Я обновлÑÑŽ информацию о проблеме на @fixmystreet" #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:96 msgid "I'm afraid we couldn't locate your problem in the database.\n" -msgstr "" - -#: perllib/FixMyStreet/App/Controller/Tokens.pm:327 -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 "" +msgstr "Ðам не удалоÑÑŒ найти ваше обращение в базе данных.\n" #: templates/web/base/admin/flagged.html:14 #: templates/web/base/admin/list_updates.html:6 @@ -1282,7 +1281,7 @@ msgstr "" #: templates/web/zurich/admin/list_updates.html:38 #: templates/web/zurich/admin/reports.html:11 msgid "ID" -msgstr "" +msgstr "Идентификатор" #: templates/web/base/admin/body-form.html:24 #: templates/web/base/admin/body-form.html:25 @@ -1290,36 +1289,37 @@ msgid "" "Identify a <strong>parent</strong> if this body is itself part of another body.\n" " For basic installations, you don't need to join bodies in this way." msgstr "" +"Введите название <strong>ответÑтвенной организации</strong> еÑли Ñто учреждение работает под началом другой организации.\n" +" Ð’ Ñлучае Ñ Ð±Ð°Ð·Ð¾Ð²Ñ‹Ð¼Ð¸ уÑтановками вам не нужно объединÑÑ‚ÑŒ учреждениÑ." #: templates/web/base/admin/body.html:133 msgid "" "If two or more bodies serve the same location, FixMyStreet combines identical categories into a single entry in\n" " the menu. Make sure you use the same category name in the bodies if you want this to happen." msgstr "" +"ЕÑли одно меÑтоположение обÑлуживают два и более учреждений, ÑиÑтема Ñайта FixMyStreet объединÑет похожие категории в единую запиÑÑŒ,\n" +" ÐºÐ¾Ñ‚Ð¾Ñ€Ð°Ñ Ñ€Ð°ÑполагаетÑÑ Ð² меню. ЕÑли вы хотите, чтобы Ñто произошло, убедитеÑÑŒ, что вы иÑпользуете одно и то же название категории Ð´Ð»Ñ Ð²Ñ‹Ð±Ñ€Ð°Ð½Ð½Ñ‹Ñ… учреждений." #: templates/web/base/questionnaire/completed.html:8 msgid "If you get some more information about the status of your problem, please come back to the site and leave an update." -msgstr "" +msgstr "ЕÑли вы узнаете больше о ÑтатуÑе вашего обращениÑ, обновите данные на нашем Ñайте." -#: templates/web/base/report/new/councils_text_none.html:2 -#: templates/web/base/report/new/councils_text_none.html:8 +#: templates/web/base/report/new/councils_text_none.html:10 +#: templates/web/base/report/new/councils_text_none.html:9 msgid "If you submit a problem here the subject and details of the problem will be public, but the problem will <strong>not</strong> be reported to the council." -msgstr "" - -#: templates/web/zurich/auth/token.html:19 -#: templates/web/zurich/email_sent.html:7 -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 "" +msgstr "ЕÑли вы Ñообщите о проблеме Ñюда, то тема вашего обращениÑ, а также Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð² нем будут находитьÑÑ Ð² общем доÑтупе. Однако о проблеме <strong>не будет</strong> проинформирован орган ÑамоуправлениÑ." #: templates/web/base/questionnaire/index.html:68 msgid "" "If you wish to leave a public update on the problem, please enter it here\n" "(please note it will not be sent to the council)." msgstr "" +"ЕÑли вы хотите внеÑти новую публичную информацию о неполадке,\n" +"введите ее здеÑÑŒ (важно: новые данные не будут отправлены в орган ÑамоуправлениÑ)." #: templates/web/base/admin/body.html:149 msgid "If you're using <strong>a send method that is not email</strong>, enter the service ID (Open311) or equivalent identifier here." -msgstr "" +msgstr "ЕÑли вы <strong>не пользуетеÑÑŒ Ñлектронной почтой</strong>, а предпочитаете другой ÑпоÑоб ÑвÑзи, введите ÑервиÑный идентификатор (Open311) или его Ñквивалент." #: templates/web/base/admin/body-form.html:207 #: templates/web/base/admin/body-form.html:208 @@ -1328,6 +1328,9 @@ msgid "" " its updates. Enable <strong>extended Open311 stauses</strong> if you want to allow extra states to be passed.\n" " Check that your cobrand supports this feature before switching it on." msgstr "" +"ЕÑли выше вы включили функцию отправки обновлений через Open311, ÑиÑтема Open311 обычно раÑпознает только Ñледующие ÑтатуÑÑ‹: ОТКРЫТО и ЗÐКРЫТО. \n" +" ЕÑли вы хотите, чтобы раÑпознавалиÑÑŒ и другие варианты, включите функцию <strong>раÑширенные ÑтатуÑÑ‹ Open311</strong>.\n" +" Перед Ñтим рекомендуем вам убедитьÑÑ Ð² том, что ваш кобренд поддерживает Ñту функцию." #: templates/web/base/admin/body-form.html:194 #: templates/web/base/admin/body-form.html:195 @@ -1335,6 +1338,8 @@ msgid "" "If you've enabled Open311 update-sending above, enable <strong>suppression of alerts</strong> \n" " if you do <strong>not</strong> want that user to be notified whenever these updates are created." msgstr "" +"ЕÑли вы включили функцию отправки обновлений через Open311, но <strong>не</strong> хотите, чтобы выбранный пользователь получал ÑƒÐ²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ñ Ð¾Ð± обновлениÑÑ…, \n" +" включите также <strong>подавление уведомлений</strong>." #: templates/web/base/admin/body-form.html:177 #: templates/web/base/admin/body-form.html:178 @@ -1343,145 +1348,142 @@ msgid "" " FixMyStreet <strong>user</strong> will be attributed as the creator of those updates\n" " when they are shown on the site. Enter the ID (number) of that user." msgstr "" +"ЕÑли вы включили функцию отправки Ñообщений через Open311, вам необходимо определить, кто из\n" +" <strong>пользователей</strong> Ñайта FixMyStreet будет назначен Ñоздателем Ñтих обновлений,\n" +" когда они поÑвÑÑ‚ÑÑ Ð½Ð° Ñайте. Введите идентификатор (номер) Ñтого пользователÑ." #: perllib/FixMyStreet/App/Controller/Contact.pm:133 msgid "Illegal ID" -msgstr "" +msgstr "Ðеверный идентификатор" #: perllib/FixMyStreet/App/Controller/Alert.pm:100 msgid "Illegal feed selection" -msgstr "" +msgstr "Ðеверно выбран фид" #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:144 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:32 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:30 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:36 msgid "In Progress" -msgstr "" +msgstr "Ð’ процеÑÑе" #: templates/web/base/admin/flagged.html:39 msgid "In abuse table?" -msgstr "" +msgstr "Ð’Ñ‹ в черном ÑпиÑке?" -#: templates/web/base/open311/index.html:88 +#: templates/web/base/open311/index.html:80 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 "" +msgstr "Кроме того, возвращаютÑÑ Ñледующие параметры, которые не ÑвлÑÑŽÑ‚ÑÑ Ñ‡Ð°Ñтью ÑервиÑа Open311 верÑии 2: agency_sent_datetime, title (также возвращаетÑÑ ÐºÐ°Ðº чаÑÑ‚ÑŒ опиÑаниÑ), interface_used, comment_count, requestor_name (приÑутÑтвует только еÑли инициатор запроÑа разрешил отображение имени на Ñайте)." #: perllib/FixMyStreet/Cobrand/Zurich.pm:199 #: perllib/FixMyStreet/Cobrand/Zurich.pm:963 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:7 -#: templates/web/fixmystreet/report/banner.html:19 +#: templates/web/base/report/banner.html:19 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:8 msgid "In progress" -msgstr "" +msgstr "Ð’ процеÑÑе" #: templates/web/base/tokens/confirm_alert.html:11 msgid "Inbox zero, here we come!" -msgstr "" +msgstr "Ура, новых пиÑем нет!" #: templates/web/zurich/admin/report_edit.html:227 msgid "Include reporter personal details" -msgstr "" +msgstr "Включить перÑональные данные заÑвителÑ" #: templates/web/base/admin/stats.html:76 msgid "Include unconfirmed reports" -msgstr "" +msgstr "Включить неподтвержденные обращениÑ" #: perllib/FixMyStreet/App/Controller/Open311.pm:359 msgid "Incorrect has_photo value \"%s\"" -msgstr "" +msgstr "Ðверно задано значение has_photo \"%s\"" #: templates/web/zurich/admin/list_updates.html:35 msgid "Internal notes" -msgstr "" +msgstr "Внутренние заметки" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:16 msgid "Internal referral" -msgstr "" +msgstr "Внутренний реферал" #: perllib/FixMyStreet/App/Controller/Open311.pm:344 msgid "Invalid agency_responsible value %s" -msgstr "" +msgstr "Ðеверно задано значение agency_responsible %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1201 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1210 msgid "Invalid end date" -msgstr "" +msgstr "Ðеверно указана дата окончаниÑ" #: perllib/FixMyStreet/App/Controller/Open311.pm:437 msgid "Invalid format %s specified." -msgstr "" +msgstr "Ðеверно задан формат: %s." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1206 msgid "Invalid start date" -msgstr "" +msgstr "Ðеверно указана дата начала" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:5 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:143 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:31 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:29 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:35 msgid "Investigating" -msgstr "" +msgstr "РаÑÑледование" -#: templates/web/fixmystreet/contact/blurb.html:8 +#: templates/web/base/contact/blurb.html:8 msgid "It's often quickest to <a href=\"%s\">check our FAQs</a> and see if the answer is there." -msgstr "" +msgstr "ЗаглÑните в раздел <a href=\"%s\">ЧаÑто задаваемые вопроÑÑ‹</a>: возможно, вы найдете там нужную информацию." #: templates/web/base/tokens/confirm_problem.html:14 msgid "It’s on its way to the council right now." -msgstr "" +msgstr "Отправлено в орган ÑамоуправлениÑ." #: perllib/FixMyStreet/Cobrand/Zurich.pm:184 msgid "Jurisdiction Unknown" -msgstr "" +msgstr "ЮриÑÐ´Ð¸ÐºÑ†Ð¸Ñ Ð½ÐµÐ¸Ð·Ð²ÐµÑтна" #: perllib/FixMyStreet/Cobrand/Zurich.pm:927 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:15 msgid "Jurisdiction unknown" -msgstr "" +msgstr "ЮриÑÐ´Ð¸ÐºÑ†Ð¸Ñ Ð½ÐµÐ¸Ð·Ð²ÐµÑтна" -#: templates/web/base/auth/general.html:44 -#: templates/web/base/report/new/fill_in_details_form.html:132 -#: templates/web/base/report/update-form.html:105 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:28 -#: templates/web/fixmystreet/report/update-form.html:102 +#: templates/web/base/auth/general.html:80 +#: templates/web/base/report/new/form_user_loggedout_password.html:16 +#: templates/web/base/report/update/form_user_loggedout_password.html:15 #: templates/web/zurich/auth/general.html:40 msgid "Keep me signed in on this computer" -msgstr "" +msgstr "Запомнить мой логин и пароль на Ñтом компьютере" #: templates/web/base/admin/body.html:70 #: templates/web/zurich/admin/body.html:16 msgid "Last editor" -msgstr "" +msgstr "ПоÑледний редактор" #: templates/web/base/admin/report_edit.html:70 msgid "Last update:" -msgstr "" +msgstr "ПоÑледнее обновление:" #: templates/web/base/admin/problem_row.html:39 msgid "Last update:" -msgstr "" +msgstr "ПоÑледнее обновление:" #: templates/web/base/admin/body-form.html:229 msgid "Leave this blank if all reports to this body should be sent using the same send method (e.g., \"%s\")." -msgstr "" +msgstr "ОÑтавьте поле пуÑтым, еÑли вÑе Ð¾Ð±Ñ€Ð°Ñ‰ÐµÐ½Ð¸Ñ Ð² Ñто учреждение должны быть отправлены единым ÑпоÑобом (например: «%s»)." #: templates/web/base/admin/body.html:27 msgid "List all reported problems" -msgstr "" +msgstr "Ð’Ñе ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ð¾ неполадках в виде ÑпиÑка" #: templates/web/base/report/new/category_wrapper.html:4 msgid "Loading..." -msgstr "" +msgstr "Загрузка..." #: templates/web/base/alert/choose.html:1 #: templates/web/base/alert/choose.html:3 @@ -1491,76 +1493,69 @@ msgstr "" #: templates/web/base/tokens/confirm_alert.html:1 #: templates/web/fixmystreet/alert/updates.html:1 msgid "Local RSS feeds and email alerts" -msgstr "" +msgstr "МеÑтные RSS-фиды и ÑƒÐ²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ñ Ð¿Ð¾ Ñл. почте" #: templates/web/base/alert/list.html:1 templates/web/base/alert/list.html:12 #: templates/web/base/alert/list.html:14 templates/web/base/alert/list.html:3 msgid "Local RSS feeds and email alerts for ‘%s’" -msgstr "" +msgstr "МеÑтные RSS-фиды и ÑƒÐ²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ñ Ð¿Ð¾ Ñл. почте (‘%s’)" #: templates/web/base/footer.html:13 templates/web/fixmystreet/footer.html:35 msgid "Local alerts" -msgstr "" +msgstr "МеÑтные уведомлениÑ" #: templates/web/base/index-steps.html:25 msgid "Locate the problem on a map of the area" -msgstr "" +msgstr "Укажите на карте меÑтоположение проблемы" #: templates/web/base/js/translation_strings.html:43 msgid "MAP" -msgstr "" +msgstr "КÐРТÐ" #: templates/web/base/js/translation_strings.html:45 +#: templates/web/base/maps/google-ol.html:13 msgid "Map" -msgstr "" +msgstr "Карта" #: templates/web/base/admin/report_edit.html:68 msgid "Mark as sent" -msgstr "" +msgstr "Пометить как отправленное" #: templates/web/base/admin/user-form.html:44 msgid "Mark users whose behaviour you want to keep a check on as <strong>flagged</strong>." -msgstr "" +msgstr "<strong>Помечайте</strong> тех пользователей, за дейÑтвиÑми которых вы хотите Ñледить." #: templates/web/base/reports/index.html:24 msgid "Marked fixed/closed in the past eight weeks" -msgstr "" +msgstr "Помечено как решенный/закрытый Ð²Ð¾Ð¿Ñ€Ð¾Ñ Ð·Ð° поÑледние воÑемь недель" #: templates/web/base/reports/index.html:25 msgid "Marked fixed/closed more than eight weeks ago" -msgstr "" +msgstr "Помечено как решенный/закрытый Ð²Ð¾Ð¿Ñ€Ð¾Ñ Ð±Ð¾Ð»ÐµÐµ воÑьми недель назад" -#: templates/web/fixmystreet/contact/index.html:106 +#: templates/web/base/contact/index.html:98 msgid "Message" -msgstr "" +msgstr "Сообщение" #: templates/web/zurich/admin/report_edit.html:284 msgid "Message to competent body:" -msgstr "" +msgstr "Сообщение компетентному учреждению:" #: templates/web/zurich/admin/report_edit.html:282 msgid "Message to external body:" -msgstr "" - -#: templates/web/base/contact/index.html:97 -msgid "Message:" -msgstr "" +msgstr "Сообщение внешнему учреждению:" #: perllib/FixMyStreet/App/Controller/Open311.pm:445 msgid "Missing jurisdiction_id" -msgstr "" +msgstr "Ðе найден параметр jurisdiction_id" #: templates/web/zurich/admin/stats.html:34 msgid "Moderated by division within one working day" -msgstr "" +msgstr "Прошло модерацию в течение одного рабочего днÑ" #: templates/web/base/admin/stats.html:11 msgid "Month" -msgstr "" - -#: templates/web/base/report/display.html:34 -msgid "More problems nearby" -msgstr "" +msgstr "МеÑÑц" #: templates/web/base/admin/bodies.html:21 #: templates/web/base/admin/body-form.html:18 @@ -1569,117 +1564,115 @@ msgstr "" #: templates/web/base/admin/list_updates.html:7 #: templates/web/base/admin/reports.html:13 #: templates/web/base/admin/users.html:15 -#: templates/web/base/auth/general.html:50 +#: templates/web/base/auth/general.html:89 +#: templates/web/base/report/new/form_user_loggedin.html:9 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:7 +#: templates/web/base/report/update/form_name.html:4 #: templates/web/base/reports/index.html:20 -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:9 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:44 -#: templates/web/fixmystreet/report/update-form.html:138 #: templates/web/zurich/admin/body-form.html:4 #: templates/web/zurich/auth/general.html:60 #: templates/web/zurich/report/new/fill_in_details_form.html:82 msgid "Name" -msgstr "" +msgstr "ИмÑ" #: templates/web/base/admin/report_edit.html:61 #: templates/web/base/admin/update_edit.html:32 #: templates/web/base/admin/user-form.html:18 #: templates/web/zurich/admin/stats.html:41 msgid "Name:" -msgstr "" +msgstr "ИмÑ:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:328 +#: perllib/FixMyStreet/Script/Reports.pm:107 msgid "Name: %s" -msgstr "" +msgstr "ИмÑ: %s" #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:160 #: perllib/FixMyStreet/Geocode/OSM.pm:145 msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s" -msgstr "" +msgstr "Ð‘Ð»Ð¸Ð¶Ð°Ð¹ÑˆÐ°Ñ Ðº метке дорога (генерируетÑÑ Ð°Ð²Ñ‚Ð¾Ð¼Ð°Ñ‚Ð¸Ñ‡ÐµÑки Ñ Ð¸Ñпользованием ÑервиÑа OpenStreetMap): %s%s" -#: perllib/FixMyStreet/Cobrand/UK.pm:127 +#: perllib/FixMyStreet/Cobrand/UK.pm:128 msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" -msgstr "" +msgstr "Ближайший к метке почтовый Ð¸Ð½Ð´ÐµÐºÑ (генерируетÑÑ Ð°Ð²Ñ‚Ð¾Ð¼Ð°Ñ‚Ð¸Ñ‡ÐµÑки): %s (%sm мил.)" -#: perllib/FixMyStreet/Cobrand/Default.pm:434 -#: perllib/FixMyStreet/Cobrand/Default.pm:474 +#: perllib/FixMyStreet/Cobrand/Default.pm:455 +#: perllib/FixMyStreet/Cobrand/Default.pm:495 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" -msgstr "" +msgstr "Ð‘Ð»Ð¸Ð¶Ð°Ð¹ÑˆÐ°Ñ Ðº метке дорога (генерируетÑÑ Ð°Ð²Ñ‚Ð¾Ð¼Ð°Ñ‚Ð¸Ñ‡ÐµÑки Ñ Ð¸Ñпользованием ÑервиÑа Bing Maps): %s" -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:267 +#: perllib/FixMyStreet/Script/Alerts.pm:290 msgid "" "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n" "\n" msgstr "" - -#: templates/web/zurich/email_sent.html:5 -msgid "Nearly Done! Now check your email..." -msgstr "" +"Ð‘Ð»Ð¸Ð¶Ð°Ð¹ÑˆÐ°Ñ Ðº метке дорога (генерируетÑÑ Ð°Ð²Ñ‚Ð¾Ð¼Ð°Ñ‚Ð¸Ñ‡ÐµÑки Ñ Ð¸Ñпользованием Bing Maps): %s\n" +"\n" #: templates/web/base/auth/token.html:17 templates/web/base/email_sent.html:5 msgid "Nearly done! Now check your email…" -msgstr "" +msgstr "Почти готово! Проверьте почту…" #: templates/web/base/reports/index.html:21 msgid "New <br>problems" -msgstr "" +msgstr "Ðовые <br>неполадки" #: perllib/FixMyStreet/App/Controller/Admin.pm:261 msgid "New body added" -msgstr "" +msgstr "Добавлено новое учреждение" #: perllib/FixMyStreet/App/Controller/Admin.pm:387 msgid "New category contact added" -msgstr "" +msgstr "Добавлен новый контакт в категории" #: templates/web/zurich/admin/report_edit-sdm.html:113 #: templates/web/zurich/admin/report_edit.html:141 msgid "New internal note:" -msgstr "" +msgstr "ÐÐ¾Ð²Ð°Ñ Ð²Ð½ÑƒÑ‚Ñ€ÐµÐ½Ð½ÑÑ Ð·Ð°Ð¼ÐµÑ‚ÐºÐ°:" #: db/alert_types.pl:18 db/alert_types.pl:22 msgid "New local problems on FixMyStreet" -msgstr "" +msgstr "Ðовые неполадки в вашем районе на FixMyStreet" #: templates/web/zurich/admin/report_edit-sdm.html:117 msgid "New note to DM:" -msgstr "" +msgstr "ÐÐ¾Ð²Ð°Ñ Ð·Ð°Ð¼ÐµÑ‚ÐºÐ° Ð´Ð»Ñ DM:" #: db/alert_types.pl:38 msgid "New problems for {{COUNCIL}} within {{WARD}} ward on FixMyStreet" -msgstr "" +msgstr "Ðовые неполадки, адреÑованные в орган ÑамоуправлениÑ: {{COUNCIL}}, находÑщегоÑÑ Ð² районе: {{WARD}} на Ñайте FixMyStreet" #: db/alert_types.pl:26 db/alert_types.pl:30 msgid "New problems near {{POSTCODE}} on FixMyStreet" -msgstr "" +msgstr "Ðовые неполадки в районе Ñ Ð¸Ð½Ð´ÐµÐºÑом {{POSTCODE}} на FixMyStreet" #: db/alert_types.pl:10 msgid "New problems on FixMyStreet" -msgstr "" +msgstr "Ðовые неполадки на FixMyStreet" #: db/alert_types.pl:34 msgid "New problems to {{COUNCIL}} on FixMyStreet" -msgstr "" +msgstr "Ðовые неполадки, адреÑованные в орган ÑамоуправлениÑ: {{COUNCIL}} на FixMyStreet" #: db/alert_types.pl:42 msgid "New problems within {{NAME}}'s boundary on FixMyStreet" -msgstr "" +msgstr "Ðовые неполадки в ведении учреждениÑ: {{NAME}} на FixMyStreet" #: templates/web/zurich/admin/index-sdm.html:4 msgid "New reports" -msgstr "" +msgstr "Ðовые обращениÑ" #: templates/web/base/admin/questionnaire.html:24 msgid "New state" -msgstr "" +msgstr "Ðовый ÑтатуÑ" #: templates/web/zurich/admin/template_edit.html:9 #: templates/web/zurich/admin/templates.html:26 msgid "New template" -msgstr "" +msgstr "Ðовый шаблон" #: templates/web/base/pagination.html:13 msgid "Next" -msgstr "" +msgstr "Далее" #: templates/web/base/admin/body.html:80 templates/web/base/admin/body.html:82 #: templates/web/base/admin/body.html:86 templates/web/base/admin/body.html:88 @@ -1692,43 +1685,43 @@ msgstr "" #: templates/web/base/admin/report_edit.html:75 #: templates/web/base/admin/update_edit.html:25 #: templates/web/base/questionnaire/creator_fixed.html:16 +#: templates/web/base/questionnaire/index.html:101 #: templates/web/base/questionnaire/index.html:53 -#: templates/web/base/questionnaire/index.html:92 msgid "No" -msgstr "" +msgstr "Ðет" #: templates/web/base/admin/user-form.html:33 msgid "No body" -msgstr "" +msgstr "Ðет учреждениÑ" #: templates/web/base/admin/stats.html:85 msgid "No council" -msgstr "" +msgstr "Ðет органа ÑамоуправлениÑ" #: perllib/FixMyStreet/DB/Result/Problem.pm:401 msgid "No council selected" -msgstr "" +msgstr "Орган ÑÐ°Ð¼Ð¾ÑƒÐ¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ð½Ðµ выбран" #: templates/web/base/admin/edit-league.html:17 msgid "No edits have yet been made." -msgstr "" +msgstr "Ðти данные пока не были отредактированы." #: templates/web/base/admin/flagged.html:25 msgid "No flagged problems found." -msgstr "" +msgstr "Ðе найдено помеченных неполадок." #: templates/web/base/admin/flagged.html:58 msgid "No flagged users found." -msgstr "" +msgstr "Ðе найдено помеченных пользователей." #: templates/web/zurich/admin/report_edit-sdm.html:138 #: templates/web/zurich/admin/report_edit.html:263 msgid "No further updates" -msgstr "" +msgstr "Пока нет обновлений" #: templates/web/base/js/translation_strings.html:38 msgid "No result returned" -msgstr "" +msgstr "Результатов нет" #: templates/web/base/admin/body-form.html:60 #: templates/web/base/admin/body-form.html:61 @@ -1736,15 +1729,17 @@ msgid "" "No specific areas are currently available, because the <code>MAPIT_URL</code> in\n" " your config file is not pointing to a live MapIt service." msgstr "" +"Ð’ данный момент конкретные облаÑти недоÑтупны, так как <code>MAPIT_URL</code>в вашем\n" +" файле конфигурации не указывает на ÑÐµÑ€Ð²Ð¸Ñ MapIt в реальном времени." #: templates/web/base/report/_support.html:2 #: templates/web/base/report/_support.html:4 msgid "No supporters" -msgstr "" +msgstr "Ðет группы поддержки" #: templates/web/base/admin/report_edit.html:41 msgid "None" -msgstr "" +msgstr "Ðет" #: templates/web/base/admin/user-form.html:24 #: templates/web/base/admin/user-form.html:25 @@ -1754,97 +1749,96 @@ msgid "" " Depending on the implementation, staff users may have access to the dashboard (summary of\n" " activity across their body), the ability to hide reports or set special report statuses." msgstr "" +"Обычные (публичные) пользователи не должны быть ÑвÑзаны Ñ <strong>учреждением</strong>.<br>\n" +" Пользователи, ÑвлÑющиеÑÑ Ð°Ð²Ñ‚Ð¾Ñ€Ð¸Ð·Ð¾Ð²Ð°Ð½Ð½Ñ‹Ð¼Ð¸ Ñотрудниками, могут быть ÑвÑзаны Ñ ÑƒÑ‡Ñ€ÐµÐ¶Ð´ÐµÐ½Ð¸ÐµÐ¼, которое они предÑтавлÑÑŽÑ‚.<br>\n" +" Ð’ завиÑимоÑти от должноÑти, Ñотрудники могут иметь доÑтуп к панели ÑƒÐ¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ñ (там ÑодержитÑÑ ÐºÑ€Ð°Ñ‚ÐºÐ°Ñ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ\n" +" о дейÑтвиÑÑ… их учреждениÑ), а также возможноÑÑ‚ÑŒ Ñкрывать Ð¾Ð±Ñ€Ð°Ñ‰ÐµÐ½Ð¸Ñ Ð¸Ð»Ð¸ уÑтанавливать ÑпецифичеÑкие ÑтатуÑÑ‹ обращений." #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:13 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:33 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:31 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:37 msgid "Not Responsible" -msgstr "" +msgstr "ОтветÑтвенноÑти не неÑет" #: perllib/FixMyStreet/Cobrand/Zurich.pm:188 #: perllib/FixMyStreet/Cobrand/Zurich.pm:937 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:13 msgid "Not contactable" -msgstr "" +msgstr "Контакты не указаны" #: templates/web/zurich/admin/report_edit-sdm.html:108 msgid "Not for my subdivision" -msgstr "" +msgstr "Ðе Ð´Ð»Ñ Ð¼Ð¾ÐµÐ³Ð¾ подразделениÑ" #: templates/web/base/admin/questionnaire.html:6 msgid "Not reported before" -msgstr "" +msgstr "Первое обращение по Ñтой проблеме" #: templates/web/base/report/_main.html:62 msgid "Not reported to council" -msgstr "" +msgstr "Первое обращение в органы ÑамоуправлениÑ" #: templates/web/base/admin/body.html:71 #: templates/web/base/admin/category_edit.html:95 #: templates/web/zurich/admin/body.html:17 msgid "Note" -msgstr "" +msgstr "Примечание" #: templates/web/base/admin/stats.html:51 msgid "Note that when including unconfirmed reports we use the date the report was created which may not be in the same month the report was confirmed so the numbers may jump about a little" -msgstr "" +msgstr "Учтите, что когда ÑиÑтема включает неподтвержденные обращениÑ, региÑтрируетÑÑ Ð´Ð°Ñ‚Ð° ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ð¾Ð±Ñ€Ð°Ñ‰ÐµÐ½Ð¸Ñ. Она может отличатьÑÑ Ð¾Ñ‚ даты Ð¿Ð¾Ð´Ñ‚Ð²ÐµÑ€Ð¶Ð´ÐµÐ½Ð¸Ñ Ð¾Ð±Ñ€Ð°Ñ‰ÐµÐ½Ð¸Ñ, поÑтому Ñти данные могут быть неточными." #: templates/web/base/admin/body.html:186 #: templates/web/base/admin/category_edit.html:52 #: templates/web/zurich/admin/body.html:53 msgid "Note:" -msgstr "" +msgstr "Примечание:" -#: templates/web/base/open311/index.html:73 +#: templates/web/base/open311/index.html:65 msgid "Note: <strong>%s</strong>" -msgstr "" +msgstr "Примечание: <strong>%s</strong>" #: templates/web/zurich/admin/list_updates.html:21 msgid "Notes from SDM to DM" -msgstr "" +msgstr "Заметки SDM Ð´Ð»Ñ DM" -#: templates/web/base/report/new/fill_in_details_form.html:113 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:10 +#: templates/web/base/report/new/form_user_loggedout.html:14 +#: templates/web/base/report/new/form_user_loggedout.html:2 +#: templates/web/base/report/new/oauth_email_form.html:17 msgid "Now to submit your report…" -msgstr "" +msgstr "Теперь обращение можно отправить…" -#: templates/web/base/report/update-form.html:86 -#: templates/web/fixmystreet/report/update-form.html:85 +#: templates/web/base/report/update-form.html:28 +#: templates/web/base/report/update/form_user_loggedout.html:13 +#: templates/web/base/report/update/form_user_loggedout.html:2 msgid "Now to submit your update…" -msgstr "" +msgstr "Теперь обновление можно отправить…" #: templates/web/base/js/translation_strings.html:42 msgid "OK" -msgstr "" - -#: templates/web/base/report/display.html:28 -#: templates/web/base/report/update.html:17 -msgid "Offensive? Unsuitable? Tell us" -msgstr "" +msgstr "ОК" #: templates/web/base/reports/index.html:23 msgid "Old / unknown <br>problems" -msgstr "" +msgstr "Давние/неизвеÑтные <br>неполадки" #: templates/web/base/admin/questionnaire.html:24 msgid "Old state" -msgstr "" +msgstr "Давний ÑтатуÑ" #: templates/web/base/reports/index.html:25 msgid "Older <br>fixed" -msgstr "" +msgstr "Более давние <br>уÑтраненные" #: templates/web/base/reports/index.html:22 msgid "Older <br>problems" -msgstr "" +msgstr "Давние <br>неполадки" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:45 +#: templates/web/base/report/new/form_report.html:15 msgid "One-line summary" -msgstr "" +msgstr "Краткое резюме" #: perllib/FixMyStreet/Cobrand/Zurich.pm:176 #: perllib/FixMyStreet/Cobrand/Zurich.pm:909 @@ -1853,137 +1847,130 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:4 #: templates/web/base/admin/update_edit.html:28 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/report/update-form.html:30 -#: templates/web/fixmystreet/report/update-form.html:28 +#: templates/web/base/report/update/form_update.html:34 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:7 #: templates/web/zurich/admin/update_edit.html:18 msgid "Open" -msgstr "" +msgstr "Ð’Ð¾Ð¿Ñ€Ð¾Ñ Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚" #: templates/web/base/reports/index.html:22 msgid "Open for more than four weeks, with an update within the past eight weeks" -msgstr "" +msgstr "Ð’Ð¾Ð¿Ñ€Ð¾Ñ Ð±Ñ‹Ð» открыт более четырех недель назад, обновление данных было выполнено в течение поÑледних воÑьми недель" #: templates/web/base/reports/index.html:23 msgid "Open, but not had any update in eight weeks" -msgstr "" +msgstr "Ð’Ð¾Ð¿Ñ€Ð¾Ñ Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚, но за поÑледние воÑемь недель обновлений не было" -#: templates/web/base/open311/index.html:70 +#: templates/web/base/open311/index.html:62 msgid "Open311 API for the mySociety FixMyStreet server" -msgstr "" +msgstr "Open311 API Ð´Ð»Ñ Ñервера mySociety FixMyStreet" -#: templates/web/base/open311/index.html:80 +#: templates/web/base/open311/index.html:72 msgid "Open311 initiative web page" -msgstr "" +msgstr "Веб-Ñтраница ÑервиÑа Open311" -#: templates/web/base/open311/index.html:81 +#: templates/web/base/open311/index.html:73 msgid "Open311 specification" -msgstr "" +msgstr "Ð¡Ð¿ÐµÑ†Ð¸Ñ„Ð¸ÐºÐ°Ñ†Ð¸Ñ Open311" #: templates/web/base/alert/_list.html:60 msgid "Or problems reported to:" -msgstr "" +msgstr "Или данные о неполадках, отправленные Ñюда:" #: templates/web/base/alert/_list.html:36 msgid "Or you can subscribe to an alert based upon what ward or council you’re in:" -msgstr "" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1084 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:673 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:674 -#: perllib/FixMyStreet/DB/Result/Problem.pm:570 -#: perllib/FixMyStreet/DB/Result/Problem.pm:580 +msgstr "Ð’Ñ‹ также можете подпиÑатьÑÑ Ð½Ð° уведомлениÑ, выбрав Ñвой район или орган ÑамоуправлениÑ:" + +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1055 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:669 +#: perllib/FixMyStreet/DB/Result/Problem.pm:558 +#: perllib/FixMyStreet/DB/Result/Problem.pm:568 +#: perllib/FixMyStreet/DB/Result/Problem.pm:578 #: perllib/FixMyStreet/DB/Result/Problem.pm:590 -#: perllib/FixMyStreet/DB/Result/Problem.pm:602 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:397 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:412 +#: perllib/FixMyStreet/Script/Reports.pm:175 +#: perllib/FixMyStreet/Script/Reports.pm:190 msgid "Other" -msgstr "" +msgstr "Другое" #: templates/web/base/admin/list_updates.html:8 msgid "Owner" -msgstr "" +msgstr "Владелец" #: templates/web/base/errors/page_error_404_not_found.html:1 -#: templates/web/base/errors/page_error_404_not_found.html:3 +#: templates/web/base/errors/page_error_404_not_found.html:4 msgid "Page Not Found" -msgstr "" +msgstr "Страница не найдена" #: templates/web/base/admin/body-form.html:31 #: templates/web/zurich/admin/body-form.html:14 msgid "Parent" -msgstr "" +msgstr "РодительÑкаÑ" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:18 msgid "Partial" -msgstr "" +msgstr "ЧаÑтичнаÑ" -#: templates/web/base/auth/general.html:53 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:68 -#: templates/web/fixmystreet/report/update-form.html:116 +#: templates/web/base/auth/general.html:92 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:31 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:6 #: templates/web/zurich/auth/general.html:32 #: templates/web/zurich/auth/general.html:63 msgid "Password (optional)" -msgstr "" +msgstr "Пароль (необÑзательно)" #: templates/web/base/auth/change_password.html:25 -#: templates/web/base/auth/general.html:36 +#: templates/web/base/auth/general.html:72 msgid "Password:" -msgstr "" +msgstr "Пароль:" #: templates/web/base/js/translation_strings.html:48 msgid "Permalink" -msgstr "" +msgstr "ПоÑтоÑÐ½Ð½Ð°Ñ ÑÑылка" #: templates/web/zurich/report/new/fill_in_details_form.html:88 msgid "Phone number" -msgstr "" +msgstr "Ðомер телефона" -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:26 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:62 +#: templates/web/base/report/new/form_user_loggedin.html:26 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:25 msgid "Phone number (optional)" -msgstr "" +msgstr "Ðомер телефона (необÑзательно)" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:306 +#: perllib/FixMyStreet/Script/Reports.pm:83 #: templates/web/base/admin/report_edit.html:63 -#: templates/web/base/report/new/fill_in_details_form.html:198 #: templates/web/zurich/admin/stats.html:39 msgid "Phone:" -msgstr "" +msgstr "Телефон:" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:66 -#: templates/web/fixmystreet/report/update-form.html:59 +#: templates/web/base/questionnaire/index.html:75 +#: templates/web/base/report/new/form_report.html:23 +#: templates/web/base/report/update/form_update.html:6 #: templates/web/zurich/admin/index-dm.html:29 #: templates/web/zurich/admin/index-sdm.html:24 #: templates/web/zurich/admin/reports.html:16 #: templates/web/zurich/admin/stats.html:37 -#: templates/web/zurich/report/new/fill_in_details_form.html:52 +#: templates/web/zurich/report/new/fill_in_details_form.html:45 msgid "Photo" -msgstr "" +msgstr "Фото" -#: perllib/FixMyStreet/App/Controller/Photo.pm:221 +#: perllib/FixMyStreet/App/Controller/Photo.pm:187 msgid "Photo is required." -msgstr "" +msgstr "Ðеобходимо добавить фото." #: templates/web/base/admin/category_edit.html:48 msgid "Photo required" -msgstr "" - -#: templates/web/base/questionnaire/index.html:80 -#: templates/web/base/report/new/fill_in_details_form.html:84 -#: templates/web/base/report/update-form.html:62 -msgid "Photo:" -msgstr "" +msgstr "Ðеобходимо добавить фото" -#: templates/web/base/alert/list.html:26 +#: templates/web/base/alert/list.html:23 msgid "Photos of recent nearby reports" -msgstr "" +msgstr "Фотографии проиÑшеÑтвий поблизоÑти, размещенные в недавних обращениÑÑ…" #: templates/web/base/js/translation_strings.html:30 msgid "Place pin on map" -msgstr "" +msgstr "ПоÑтавить метку на карте" #: perllib/FixMyStreet/Cobrand/Zurich.pm:949 #: perllib/FixMyStreet/Cobrand/Zurich.pm:955 @@ -1995,592 +1982,585 @@ msgstr "" #: templates/web/zurich/admin/header.html:9 #: templates/web/zurich/admin/index-dm.html:9 msgid "Planned" -msgstr "" +msgstr "Запланировано" #: templates/web/base/report/new/notes.html:5 msgid "Please be polite, concise and to the point." -msgstr "" +msgstr "Будьте вежливы, выражайте Ñвои мыÑли кратко и по ÑущеÑтву." #: templates/web/base/auth/change_password.html:12 #: templates/web/base/auth/change_password.html:17 msgid "Please check the passwords and try again" -msgstr "" - -#: templates/web/zurich/auth/token.html:16 -msgid "Please check your email" -msgstr "" +msgstr "Проверьте пароли и попробуйте еще раз" -#: templates/web/base/auth/general.html:10 -#: templates/web/base/auth/general.html:16 +#: templates/web/base/auth/general.html:27 +#: templates/web/base/auth/general.html:33 #: templates/web/zurich/auth/general.html:3 #: templates/web/zurich/auth/general.html:9 msgid "Please check your email address is correct" -msgstr "" +msgstr "Проверьте правильноÑÑ‚ÑŒ напиÑÐ°Ð½Ð¸Ñ Ð°Ð´Ñ€ÐµÑа Ñл. почты" #: perllib/FixMyStreet/App/Controller/Admin.pm:343 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:883 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:948 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:878 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:943 #: perllib/FixMyStreet/DB/Result/Problem.pm:412 #: templates/web/base/js/translation_strings.html:9 msgid "Please choose a category" -msgstr "" +msgstr "Выберите категорию" #: perllib/FixMyStreet/DB/Result/Problem.pm:418 msgid "Please choose a property type" -msgstr "" +msgstr "Выберите тип имущеÑтва" #: perllib/FixMyStreet/App/Controller/Admin.pm:378 msgid "Please correct the errors below" -msgstr "" +msgstr "ИÑправьте ошибки ниже" -#: templates/web/base/contact/blurb.html:2 -#: templates/web/fixmystreet/contact/blurb.html:12 +#: templates/web/base/contact/blurb.html:12 msgid "" "Please do <strong>not</strong> report problems through this form; messages go to\n" "the team behind this site, not a council. To report a problem,\n" "please <a href=\"/\">go to the front page</a> and follow the instructions." msgstr "" +"<strong>Ðе иÑпользуйте</strong> Ñту форму Ð´Ð»Ñ Ð¾Ð±Ñ€Ð°Ñ‰ÐµÐ½Ð¸Ð¹: данные из формы \n" +"адреÑованы команде Ñайта, а не предÑтавителÑм учреждений. Чтобы Ñообщить о проблеме,\n" +"<a href=\"/\">зайдите на главную Ñтраницу</a> и Ñледуйте инÑтрукциÑм." #: templates/web/base/report/new/notes.html:6 msgid "Please do not be abusive — abusing your council devalues the service for all users." -msgstr "" +msgstr "Будьте вежливы! Грубые, некорректные Ð¾Ð±Ñ€Ð°Ñ‰ÐµÐ½Ð¸Ñ Ðº предÑтавителÑм органов ÑÐ°Ð¼Ð¾ÑƒÐ¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ð´Ð¸Ñкредитируют вÑех пользователей ÑервиÑа. " #: perllib/FixMyStreet/App/Controller/Admin.pm:346 -#: perllib/FixMyStreet/DB/Result/Comment.pm:126 +#: perllib/FixMyStreet/DB/Result/Comment.pm:125 #: templates/web/base/js/translation_strings.html:2 msgid "Please enter a message" -msgstr "" +msgstr "Введите текÑÑ‚ ÑообщениÑ" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1091 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1146 +#, fuzzy +msgid "Please enter a name" +msgstr "Введите Ñвое имÑ" #: templates/web/base/auth/change_password.html:12 #: templates/web/base/auth/change_password.html:15 #: templates/web/base/js/translation_strings.html:19 msgid "Please enter a password" -msgstr "" +msgstr "Введите пароль" #: perllib/FixMyStreet/App/Controller/Contact.pm:114 #: perllib/FixMyStreet/DB/Result/Problem.pm:395 #: templates/web/base/js/translation_strings.html:3 msgid "Please enter a subject" -msgstr "" +msgstr "Введите тему" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1084 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1137 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1087 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1142 #: perllib/FixMyStreet/App/Controller/Admin.pm:345 -#: perllib/FixMyStreet/DB/Result/User.pm:127 +#: perllib/FixMyStreet/DB/Result/User.pm:133 #: templates/web/base/js/translation_strings.html:12 #: templates/web/base/js/translation_strings.html:16 msgid "Please enter a valid email" -msgstr "" +msgstr "Введите дейÑтвующий Ð°Ð´Ñ€ÐµÑ Ñл. почты" #: perllib/FixMyStreet/App/Controller/Alert.pm:346 #: perllib/FixMyStreet/App/Controller/Contact.pm:124 msgid "Please enter a valid email address" -msgstr "" +msgstr "Введите дейÑтвующий Ð°Ð´Ñ€ÐµÑ Ñл. почты" #: perllib/FixMyStreet/DB/Result/Problem.pm:398 #: templates/web/base/js/translation_strings.html:4 msgid "Please enter some details" -msgstr "" +msgstr "Введите дополнительную информацию" #: perllib/FixMyStreet/App/Controller/Contact.pm:113 -#: perllib/FixMyStreet/DB/Result/User.pm:124 -#: templates/web/base/auth/general.html:10 -#: templates/web/base/auth/general.html:15 +#: perllib/FixMyStreet/DB/Result/User.pm:130 +#: templates/web/base/auth/general.html:27 +#: templates/web/base/auth/general.html:32 #: templates/web/base/js/translation_strings.html:11 #: templates/web/base/js/translation_strings.html:15 #: templates/web/zurich/auth/general.html:3 #: templates/web/zurich/auth/general.html:8 msgid "Please enter your email" -msgstr "" +msgstr "Введите Ñвой Ñл. адреÑ" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:7 +#: templates/web/base/report/new/form_user_loggedout_email.html:7 #: templates/web/zurich/report/new/fill_in_details_form.html:80 msgid "Please enter your email address" -msgstr "" +msgstr "Введите Ð°Ð´Ñ€ÐµÑ Ñвоей Ñл. почты" #: templates/web/base/js/translation_strings.html:25 msgid "Please enter your first name" -msgstr "" +msgstr "Введите Ñвое имÑ" -#: perllib/FixMyStreet/Cobrand/UK.pm:318 +#: perllib/FixMyStreet/Cobrand/UK.pm:319 #: templates/web/base/js/translation_strings.html:7 msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below" -msgstr "" +msgstr "Введите Ñвое полное имÑ. Ðта Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð½ÐµÐ¾Ð±Ñ…Ð¾Ð´Ð¸Ð¼Ð° предÑтавителÑм органов ÑамоуправлениÑ. ЕÑли вы не хотите, чтобы ваше полное Ð¸Ð¼Ñ Ð¾Ñ‚Ð¾Ð±Ñ€Ð°Ð¶Ð°Ð»Ð¾ÑÑŒ на Ñайте, Ñнимите галочку ниже." #: perllib/FixMyStreet/App/Controller/Contact.pm:112 -#: perllib/FixMyStreet/DB/Result/Comment.pm:123 +#: perllib/FixMyStreet/DB/Result/Comment.pm:122 #: perllib/FixMyStreet/DB/Result/Problem.pm:406 -#: perllib/FixMyStreet/DB/Result/User.pm:120 +#: perllib/FixMyStreet/DB/Result/User.pm:126 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter your name" -msgstr "" +msgstr "Введите Ñвое имÑ" #: templates/web/base/js/translation_strings.html:22 msgid "Please enter your phone number" -msgstr "" +msgstr "Введите номер Ñвоего телефона" #: templates/web/base/js/translation_strings.html:26 msgid "Please enter your second name" -msgstr "" +msgstr "Введите Ñвою фамилию" #: templates/web/base/js/translation_strings.html:24 msgid "Please enter your title" -msgstr "" +msgstr "Ðапишите, как к вам обращатьÑÑ" #: templates/web/base/auth/sign_out.html:5 #: templates/web/zurich/auth/sign_out.html:5 msgid "Please feel free to <a href=\"%s\">sign in again</a>, or go back to the <a href=\"/\">front page</a>." -msgstr "" +msgstr "Ð’Ñ‹ можете еще раз <a href=\"%s\">войти на Ñайт</a> или вернутьÑÑ Ð½Ð° <a href=\"/\">главную Ñтраницу</a>." #: templates/web/base/report/new/fill_in_details_text.html:1 #: templates/web/base/report/new/fill_in_details_text.html:8 msgid "Please fill in details of the problem below." -msgstr "" +msgstr "Подробно раÑÑкажите о неполадке в поле ниже." -#: templates/web/zurich/report/new/fill_in_details_form.html:46 +#: templates/web/zurich/report/new/fill_in_details_form.html:72 msgid "Please fill in details of the problem." -msgstr "" +msgstr "Подробно опишите проблему." -#: templates/web/base/report/new/fill_in_details_form.html:28 -#: templates/web/fixmystreet/report/new/sidebar.html:7 +#: templates/web/base/report/new/sidebar.html:7 #: templates/web/zurich/report/new/fill_in_details_form.html:20 msgid "Please fill in the form below with details of the problem, and describe the location as precisely as possible in the details box." -msgstr "" +msgstr "Заполните форму ниже: раÑÑкажите о неполадке, уточните меÑтоположение. ПоÑтарайтеÑÑŒ предоÑтавить как можно более подробную информацию." #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:253 msgid "Please indicate whether you'd like to receive another questionnaire" -msgstr "" +msgstr "Укажите, хотите ли вы еще один опроÑник" -#: templates/web/fixmystreet/report/updates-sidebar-notes.html:4 +#: templates/web/base/report/updates-sidebar-notes.html:2 msgid "Please note that updates are not sent to the council." -msgstr "" +msgstr "Важно: новые данные не отÑылаютÑÑ Ð² органы ÑамоуправлениÑ." -#: templates/web/base/report/update-form.html:7 -msgid "Please note that updates are not sent to the council. If you leave your name it will be public. Your information will only be used in accordance with our <a href=\"/faq#privacy\">privacy policy</a>" -msgstr "" +#: templates/web/base/report/new/oauth_email_form.html:4 +#, fuzzy +msgid "Please note your report has <strong>not yet been sent</strong>." +msgstr "Внимание! Ваше обращение <strong>не было отправлено</strong>. Чтобы завершить процеÑÑ Ð¾Ñ‚Ð¿Ñ€Ð°Ð²ÐºÐ¸, выберите нужную категорию и добавьте информацию ниже." -#: templates/web/base/report/new/fill_in_details_form.html:8 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:21 +#: templates/web/base/report/new/fill_in_details_form.html:20 #: templates/web/zurich/report/new/fill_in_details_form.html:11 msgid "Please note your report has <strong>not yet been sent</strong>. Choose a category and add further information below, then submit." +msgstr "Внимание! Ваше обращение <strong>не было отправлено</strong>. Чтобы завершить процеÑÑ Ð¾Ñ‚Ð¿Ñ€Ð°Ð²ÐºÐ¸, выберите нужную категорию и добавьте информацию ниже." + +#: templates/web/base/report/display.html:26 +msgid "Please note your update has <strong>not yet been posted</strong>." msgstr "" #: templates/web/base/report/new/notes.html:1 #: templates/web/zurich/report/new/notes.html:1 msgid "Please note:" -msgstr "" +msgstr "Внимание:" #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:256 msgid "Please provide some explanation as to why you're reopening this report" -msgstr "" +msgstr "ПоÑÑните, почему вы решили заново отправить Ñто обращение" #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:263 msgid "Please provide some text as well as a photo" -msgstr "" +msgstr "ПредоÑтавьте не только фото, но и пиÑьменный комментарий" #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:124 #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249 msgid "Please say whether you've ever reported a problem to your council before" -msgstr "" +msgstr "Ð’Ñ‹ впервые отправлÑете обращение в ваш орган ÑамоуправлениÑ?" #: templates/web/zurich/admin/report_edit.html:208 msgid "Please select a body." -msgstr "" +msgstr "Выберите учреждение." #: perllib/FixMyStreet/App/Controller/Alert.pm:80 msgid "Please select the feed you want" -msgstr "" +msgstr "Выберите раÑÑылку" #: perllib/FixMyStreet/App/Controller/Alert.pm:118 msgid "Please select the type of alert you want" -msgstr "" +msgstr "Выберите тип уведомлениÑ" #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:245 msgid "Please state whether or not the problem has been fixed" -msgstr "" +msgstr "Сообщите о ÑтатуÑе неполадки: проблема была решена?" #: perllib/FixMyStreet/App/Model/PhotoSet.pm:117 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:145 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:147 +#: templates/web/base/js/translation_strings.html:53 msgid "Please upload a JPEG image only" -msgstr "" +msgstr "Ð’Ñ‹ можете загружать только Ð¸Ð·Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð¸Ñ Ð² формате JPEG" #: perllib/FixMyStreet/App/Controller/Contact.pm:115 msgid "Please write a message" -msgstr "" +msgstr "Ðапишите Ñообщение" -#: templates/web/fixmystreet/report/update-form.html:23 +#: templates/web/base/report/update/form_update.html:29 msgid "Please write your update here" -msgstr "" +msgstr "Введите новые данные здеÑÑŒ" -#: templates/web/base/contact/index.html:100 -#: templates/web/base/report/update-form.html:110 -#: templates/web/base/report/update-form.html:132 -#: templates/web/base/report/update-form.html:72 -#: templates/web/fixmystreet/contact/index.html:113 -#: templates/web/fixmystreet/report/update-form.html:124 -#: templates/web/fixmystreet/report/update-form.html:71 -#: templates/web/fixmystreet/report/update-form.html:97 +#: templates/web/base/contact/index.html:105 +#: templates/web/base/report/update-form.html:24 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:14 +#: templates/web/base/report/update/form_user_loggedout_password.html:10 msgid "Post" -msgstr "" +msgstr "Опубликовать" #: templates/web/base/report/updates.html:15 msgid "Posted anonymously at %s" -msgstr "" +msgstr "Опубликовано анонимно (%s)" #: templates/web/base/report/updates.html:22 msgid "Posted by %s (<strong>%s</strong>) at %s" -msgstr "" +msgstr "Ðвтор публикации: %s (<strong>%s</strong>), Ð²Ñ€ÐµÐ¼Ñ Ð¿ÑƒÐ±Ð»Ð¸ÐºÐ°Ñ†Ð¸Ð¸: %s" #: templates/web/base/report/updates.html:24 msgid "Posted by %s at %s" -msgstr "" +msgstr "Ðвтор публикации: %s, Ð²Ñ€ÐµÐ¼Ñ Ð¿ÑƒÐ±Ð»Ð¸ÐºÐ°Ñ†Ð¸Ð¸: %s" #: templates/web/base/front/footer-marketing.html:12 msgid "Powered by <a class=\"platform-logo\" href=\"http://fixmystreet.org/\">FixMyStreet Platform</a>" -msgstr "" +msgstr "Ðа базе платформы <a class=\"platform-logo\" href=\"http://fixmystreet.org/\">FixMyStreet</a>" #: templates/web/base/pagination.html:7 msgid "Previous" -msgstr "" +msgstr "ПредыдущаÑ" #: templates/web/fixmystreet/footer.html:41 msgid "Privacy" -msgstr "" +msgstr "КонфиденциальноÑÑ‚ÑŒ" -#: templates/web/base/faq/faq-en-gb.html:7 -#: templates/web/base/open311/index.html:7 -#: templates/web/base/static/privacy.html:1 -#: templates/web/base/static/privacy.html:2 -#: templates/web/base/static/privacy.html:9 -#: templates/web/fixmystreet/contact/index.html:11 +#: templates/web/base/about/_sidebar.html:5 +#: templates/web/base/about/privacy.html:1 +#: templates/web/base/about/privacy.html:2 msgid "Privacy and cookies" -msgstr "" +msgstr "КонфиденциальноÑÑ‚ÑŒ и файлы cookie" #: templates/web/base/admin/body.html:202 #: templates/web/base/admin/body.html:85 #: templates/web/base/admin/category_edit.html:45 #: templates/web/base/admin/report_edit.html:77 msgid "Private" -msgstr "" +msgstr "ДоÑтуп ограничен" #: templates/web/base/maps/noscript_map.html:59 #: templates/web/zurich/maps/noscript_map.html:57 msgid "Problem" -msgstr "" +msgstr "Проблема" #: templates/web/base/admin/timeline.html:22 msgid "Problem %d created" -msgstr "" +msgstr "Сообщено о проблеме: %d" #: templates/web/base/admin/timeline.html:24 msgid "Problem %s confirmed" -msgstr "" +msgstr "Проблема подтверждена: %s" #: templates/web/base/admin/timeline.html:26 msgid "Problem %s sent to council %s" -msgstr "" +msgstr "Проблема (%s) отправлена в орган ÑамоуправлениÑ: %s" -#: templates/web/base/admin/index.html:46 +#: templates/web/base/admin/index.html:39 #: templates/web/zurich/admin/index.html:9 msgid "Problem breakdown by state" -msgstr "" +msgstr "Сортировка проблем по ÑтатуÑу" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1055 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1058 msgid "Problem marked as open." -msgstr "" +msgstr "Проблема помечена как открытаÑ." #: templates/web/base/admin/questionnaire.html:21 msgid "Problem state change based on survey results" -msgstr "" +msgstr "Смена ÑтатуÑа проблемы на оÑновании результатов опроÑа" #: templates/web/base/admin/flagged.html:10 msgid "Problems" -msgstr "" +msgstr "Проблемы" #: templates/web/base/around/_updates.html:1 msgid "Problems in this area" -msgstr "" +msgstr "Проблемы в Ñтой меÑтноÑти" -#: templates/web/fixmystreet/report/display.html:43 +#: templates/web/base/report/display_tools.html:19 msgid "Problems nearby" -msgstr "" +msgstr "Проблемы поблизоÑти" -#: templates/web/fixmystreet/report/display.html:41 +#: templates/web/base/report/display_tools.html:17 msgid "Problems on the map" -msgstr "" +msgstr "Проблемы на карте" #: db/alert_types.pl:14 msgid "Problems recently reported fixed on FixMyStreet" -msgstr "" +msgstr "Ðедавно решенные проблемы на Ñайте FixMyStreet" #: templates/web/base/alert/_list.html:21 msgid "Problems within %.1fkm of this location" -msgstr "" +msgstr "Проблемы в пределах %.1fkm от Ñтого меÑта" -#: perllib/FixMyStreet/Cobrand/Default.pm:642 +#: perllib/FixMyStreet/Cobrand/Default.pm:663 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:120 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:139 -#: perllib/FixMyStreet/Cobrand/UK.pm:207 +#: perllib/FixMyStreet/Cobrand/UK.pm:208 msgid "Problems within %s" -msgstr "" +msgstr "Проблемы в пределах Ñтого меÑта: %s" #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:128 -#: perllib/FixMyStreet/Cobrand/UK.pm:221 +#: perllib/FixMyStreet/Cobrand/UK.pm:222 msgid "Problems within %s ward" -msgstr "" +msgstr "Проблемы в пределах Ñтого района: %s" #. ("First %s is the body name, second %s the site name") #: templates/web/base/reports/body.html:0 #: templates/web/base/reports/body.html:24 msgid "Problems within %s, %s" -msgstr "" +msgstr "Проблемы в пределах Ñтого меÑта: %s, %s" #: templates/web/base/alert/_list.html:42 msgid "Problems within the boundary of:" -msgstr "" +msgstr "Проблемы в пределах Ñтого меÑта:" #: templates/web/base/admin/report_edit.html:45 msgid "Property address:" -msgstr "" +msgstr "ÐÐ´Ñ€ÐµÑ Ð¸Ð¼ÑƒÑ‰ÐµÑтва:" #: templates/web/base/report/new/category.html:8 msgid "Property type:" -msgstr "" +msgstr "Тип имущеÑтва:" -#: templates/web/base/report/update-form.html:3 -#: templates/web/fixmystreet/report/update-form.html:4 +#: templates/web/base/report/update-form.html:6 msgid "Provide an update" -msgstr "" +msgstr "ПредоÑтавить новые данные" -#: templates/web/base/auth/general.html:56 +#: templates/web/base/auth/general.html:95 msgid "Providing a name and password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." -msgstr "" +msgstr "Ð˜Ð¼Ñ Ð¸ пароль необÑзательны. Ðо когда вы предоÑтавите Ñти данные, вы Ñможете быÑтрее Ñообщать о проблемах, вводить новые данные о них и редактировать Ñвои обращениÑ." -#: templates/web/base/report/new/fill_in_details_form.html:156 -#: templates/web/base/report/update-form.html:129 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:71 -#: templates/web/fixmystreet/report/update-form.html:119 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:34 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:9 msgid "Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." -msgstr "" +msgstr "Пароль необÑзателен. Ðо когда вы предоÑтавите Ñти данные, вы Ñможете быÑтрее Ñообщать о проблемах, вводить новые данные о них и редактировать Ñвои обращениÑ." #: templates/web/zurich/admin/report_edit.html:245 #: templates/web/zurich/admin/report_edit.html:272 msgid "Public response:" -msgstr "" +msgstr "Публичный ответ:" #: templates/web/zurich/admin/report_edit.html:121 #: templates/web/zurich/admin/stats.html:38 msgid "Publish photo" -msgstr "" +msgstr "Опубликовать фото" #: templates/web/base/questionnaire/completed.html:1 #: templates/web/base/questionnaire/index.html:0 #: templates/web/base/questionnaire/index.html:12 #: templates/web/base/questionnaire/index.html:5 msgid "Questionnaire" -msgstr "" +msgstr "ОпроÑ" #: templates/web/base/admin/timeline.html:30 msgid "Questionnaire %d answered for problem %d, %s to %s" -msgstr "" +msgstr "ÐžÐ¿Ñ€Ð¾Ñ (%d) заполнен Ð´Ð»Ñ Ð¿Ñ€Ð¾Ð±Ð»ÐµÐ¼Ñ‹ «%d» (%s — %s)" #: templates/web/base/admin/timeline.html:28 msgid "Questionnaire %d sent for problem %d" -msgstr "" +msgstr "ÐžÐ¿Ñ€Ð¾Ñ (%d) отправлен Ð´Ð»Ñ Ð¿Ñ€Ð¾Ð±Ð»ÐµÐ¼Ñ‹ «%d»" #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:200 msgid "Questionnaire filled in by problem reporter" -msgstr "" +msgstr "ÐžÐ¿Ñ€Ð¾Ñ Ð·Ð°Ð¿Ð¾Ð»Ð½ÐµÐ½ автором обращениÑ" #: templates/web/base/alert/_list.html:22 #: templates/web/base/around/display_location.html:1 #: templates/web/base/around/display_location.html:3 -#: templates/web/base/report/display.html:50 +#: templates/web/base/report/display_tools.html:34 #: templates/web/base/reports/_rss.html:1 #: templates/web/fixmystreet/alert/updates.html:9 -#: templates/web/fixmystreet/report/display.html:58 msgid "RSS feed" -msgstr "" +msgstr "RSS-фид" -#: perllib/FixMyStreet/Cobrand/UK.pm:250 perllib/FixMyStreet/Cobrand/UK.pm:262 +#: perllib/FixMyStreet/Cobrand/UK.pm:251 perllib/FixMyStreet/Cobrand/UK.pm:263 msgid "RSS feed for %s" -msgstr "" +msgstr "RSS-фид длÑ: %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:256 perllib/FixMyStreet/Cobrand/UK.pm:268 +#: perllib/FixMyStreet/Cobrand/UK.pm:257 perllib/FixMyStreet/Cobrand/UK.pm:269 msgid "RSS feed for %s ward, %s" -msgstr "" +msgstr "RSS-фид Ð´Ð»Ñ Ñ€Ð°Ð¹Ð¾Ð½Ð°: %s, %s" #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:155 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:163 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:173 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:181 -#: perllib/FixMyStreet/Cobrand/UK.pm:276 perllib/FixMyStreet/Cobrand/UK.pm:288 +#: perllib/FixMyStreet/Cobrand/UK.pm:277 perllib/FixMyStreet/Cobrand/UK.pm:289 msgid "RSS feed of %s" -msgstr "" +msgstr "%s: RSS-фид" -#: perllib/FixMyStreet/Cobrand/UK.pm:281 perllib/FixMyStreet/Cobrand/UK.pm:293 +#: perllib/FixMyStreet/Cobrand/UK.pm:282 perllib/FixMyStreet/Cobrand/UK.pm:294 msgid "RSS feed of %s, within %s ward" -msgstr "" +msgstr "%s: RSS-фид, в пределах района: %s" #: templates/web/base/alert/_list.html:22 msgid "RSS feed of nearby problems" -msgstr "" +msgstr "RSS-фид о проблемах поблизоÑти" #: templates/web/base/reports/_rss.html:1 msgid "RSS feed of problems in this %s" -msgstr "" +msgstr "RSS-фид о проблемах здеÑÑŒ: %s" -#: perllib/FixMyStreet/Cobrand/Default.pm:643 +#: perllib/FixMyStreet/Cobrand/Default.pm:664 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:121 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:138 -#: perllib/FixMyStreet/Cobrand/UK.pm:214 +#: perllib/FixMyStreet/Cobrand/UK.pm:215 msgid "RSS feed of problems within %s" -msgstr "" +msgstr "RSS-фид о проблемах в пределах: %s" #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:127 -#: perllib/FixMyStreet/Cobrand/UK.pm:220 +#: perllib/FixMyStreet/Cobrand/UK.pm:221 msgid "RSS feed of problems within %s ward" -msgstr "" +msgstr "RSS-фид о проблемах в пределах района: %s" #: templates/web/base/around/display_location.html:1 #: templates/web/base/around/display_location.html:4 msgid "RSS feed of recent local problems" -msgstr "" +msgstr "RSS-фид о недавних проблемах поблизоÑти" -#: templates/web/base/report/display.html:50 +#: templates/web/base/report/display_tools.html:34 #: templates/web/fixmystreet/alert/updates.html:9 -#: templates/web/fixmystreet/report/display.html:58 msgid "RSS feed of updates to this problem" -msgstr "" +msgstr "RSS-фид об обновлениÑÑ… по Ñтой проблеме" #: templates/web/base/alert/updates.html:9 -#: templates/web/base/report/display.html:41 +#: templates/web/base/report/display_tools.html:36 #: templates/web/fixmystreet/alert/updates.html:14 -#: templates/web/fixmystreet/report/display.html:60 msgid "Receive email when updates are left on this problem." -msgstr "" +msgstr "Получать Ñл. пиÑьма об обновлениÑÑ… по Ñтой проблеме." #. ("%s is the site name") #: templates/web/base/around/display_location.html:0 #: templates/web/base/around/display_location.html:33 msgid "Recent local problems, %s" -msgstr "" +msgstr "Ðедавние проблемы поблизоÑти, %s" #: templates/web/base/reports/index.html:24 msgid "Recently <br>fixed" -msgstr "" +msgstr "Ðедавно <br>уÑтранены" #: templates/web/base/front/recent.html:11 msgid "Recently reported problems" -msgstr "" +msgstr "Ðедавние Ð¾Ð±Ñ€Ð°Ñ‰ÐµÐ½Ð¸Ñ Ð¾ проблемах" #: templates/web/zurich/report/new/notes.html:5 msgid "Remember that FixMyStreet is primarily for reporting physical problems that can be fixed. If your problem is not appropriate for submission via this site remember that you can contact your council directly using their own website." -msgstr "" +msgstr "Важно: Ñайт FixMyStreet предназначен Ð´Ð»Ñ Ñ€ÐµÐ³Ð¸Ñтрации материальных проблем, которые возможно уÑтранить, и работы Ñ Ð½Ð¸Ð¼Ð¸. ЕÑли проблема, о которой вы хотите Ñообщить, не ÑоответÑтвует тематике Ñайта, обратитеÑÑŒ в меÑтный орган ÑÐ°Ð¼Ð¾ÑƒÐ¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ñ‡ÐµÑ€ÐµÐ· ÑоответÑтвующий Ñайт." #: templates/web/base/admin/report_blocks.html:46 msgid "Remove flag" -msgstr "" +msgstr "Удалить пометку" -#: templates/web/base/admin/report_edit.html:92 -#: templates/web/base/admin/update_edit.html:62 +#: templates/web/base/admin/report_edit.html:93 +#: templates/web/base/admin/update_edit.html:67 #: templates/web/zurich/admin/update_edit.html:35 msgid "Remove photo (can't be undone!)" -msgstr "" +msgstr "Удалить фото (дейÑтвие отменить невозможно)" #: templates/web/zurich/admin/report_edit.html:243 msgid "Reply to user:" -msgstr "" +msgstr "Ответить пользователю:" #: templates/web/fixmystreet/header_logo.html:2 msgid "Report" -msgstr "" +msgstr "Сообщить" #: templates/web/base/footer.html:7 templates/web/fixmystreet/footer.html:26 #: templates/web/fixmystreet/header_logo.html:2 #: templates/web/zurich/footer.html:18 #: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" -msgstr "" +msgstr "Сообщить о проблеме" -#: templates/web/fixmystreet/report/display.html:32 +#: templates/web/base/report/display_tools.html:8 msgid "Report abuse" -msgstr "" +msgstr "Сообщить об оÑкорбительном поведении" #: perllib/FixMyStreet/App/Controller/Rss.pm:291 msgid "Report on %s" -msgstr "" +msgstr "Сообщить о пользователе: %s" #: templates/web/base/report/new/fill_in_details_form.html:1 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:2 +#: templates/web/base/report/new/login_success_form.html:1 +#: templates/web/base/report/new/oauth_email_form.html:1 msgid "Report your problem" -msgstr "" +msgstr "Сообщить о Ñвоей проблеме" #: templates/web/base/around/intro.html:1 #: templates/web/zurich/around/intro.html:1 msgid "Report, view, or discuss local problems" msgstr "ГородÑкие проблемы. Сообщайте, проÑматривайте, обÑуждайте." -#: perllib/FixMyStreet/DB/Result/Problem.pm:585 -#: templates/web/base/contact/index.html:50 -#: templates/web/fixmystreet/contact/index.html:65 +#: perllib/FixMyStreet/DB/Result/Problem.pm:573 +#: templates/web/base/contact/index.html:57 msgid "Reported anonymously at %s" -msgstr "" +msgstr "Сообщено анонимно в: %s" #: templates/web/base/admin/questionnaire.html:5 #: templates/web/base/questionnaire/index.html:62 msgid "Reported before" -msgstr "" +msgstr "Сообщено ранее" -#: perllib/FixMyStreet/DB/Result/Problem.pm:608 -#: templates/web/base/contact/index.html:52 -#: templates/web/fixmystreet/contact/index.html:67 +#: perllib/FixMyStreet/DB/Result/Problem.pm:596 +#: templates/web/base/contact/index.html:59 msgid "Reported by %s at %s" -msgstr "" +msgstr "Ðвтор обращениÑ: %s, Ð²Ñ€ÐµÐ¼Ñ Ð¾Ñ‚Ð¿Ñ€Ð°Ð²ÐºÐ¸: %s" #: templates/web/zurich/admin/report_edit-sdm.html:58 #: templates/web/zurich/admin/report_edit.html:86 msgid "Reported by:" -msgstr "" +msgstr "Ðвтор обращениÑ:" #: templates/web/zurich/report/_main.html:2 msgid "Reported in the %s category" -msgstr "" +msgstr "Обращение отнеÑено к категории: %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:581 +#: perllib/FixMyStreet/DB/Result/Problem.pm:569 msgid "Reported in the %s category anonymously at %s" -msgstr "" +msgstr "Обращение (категориÑ: %s) отправлено анонимно в: %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:603 +#: perllib/FixMyStreet/DB/Result/Problem.pm:591 msgid "Reported in the %s category by %s at %s" -msgstr "" +msgstr "Обращение (категориÑ: %s), автор: %s, отправлено в: %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:577 +#: perllib/FixMyStreet/DB/Result/Problem.pm:565 msgid "Reported via %s anonymously at %s" -msgstr "" +msgstr "Ðнонимно отправлено через: %s, Ð²Ñ€ÐµÐ¼Ñ Ð¾Ñ‚Ð¿Ñ€Ð°Ð²ÐºÐ¸: %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:599 +#: perllib/FixMyStreet/DB/Result/Problem.pm:587 msgid "Reported via %s by %s at %s" -msgstr "" +msgstr "Отправлено через: %s, автор: %s, Ð²Ñ€ÐµÐ¼Ñ Ð¾Ñ‚Ð¿Ñ€Ð°Ð²ÐºÐ¸: %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:573 +#: perllib/FixMyStreet/DB/Result/Problem.pm:561 msgid "Reported via %s in the %s category anonymously at %s" -msgstr "" +msgstr "Ðнонимно отправлено через: %s, категориÑ: %s, Ð²Ñ€ÐµÐ¼Ñ Ð¾Ñ‚Ð¿Ñ€Ð°Ð²ÐºÐ¸: %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:593 +#: perllib/FixMyStreet/DB/Result/Problem.pm:581 msgid "Reported via %s in the %s category by %s at %s" -msgstr "" +msgstr "Отправлено через: %s, категориÑ: %s, автор обращениÑ: %s, Ð²Ñ€ÐµÐ¼Ñ Ð¾Ñ‚Ð¿Ñ€Ð°Ð²ÐºÐ¸: %s" #: templates/web/base/reports/index.html:21 msgid "Reported within the last four weeks" -msgstr "" +msgstr "Обращение отправлено не позднее четырех недель назад" #: templates/web/zurich/admin/report_edit-sdm.html:36 #: templates/web/zurich/admin/report_edit.html:55 -#, fuzzy msgid "Reported:" -msgstr "Ð’Ñе Отчеты" +msgstr "Обращение отправлено:" #: templates/web/base/around/index.html:2 #: templates/web/base/js/translation_strings.html:41 @@ -2588,183 +2568,182 @@ msgstr "Ð’Ñе Отчеты" #: templates/web/base/report/new/fill_in_details.html:5 #: templates/web/zurich/report/new/fill_in_details_form.html:2 msgid "Reporting a problem" -msgstr "" +msgstr "Сообщение о проблеме" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1277 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1286 #: perllib/FixMyStreet/Cobrand/Zurich.pm:384 #: templates/web/zurich/header.html:60 msgid "Reports" -msgstr "" +msgstr "ОбращениÑ" -#: perllib/FixMyStreet/Cobrand/UK.pm:327 perllib/FixMyStreet/Cobrand/UK.pm:331 +#: perllib/FixMyStreet/Cobrand/UK.pm:328 perllib/FixMyStreet/Cobrand/UK.pm:332 msgid "Reports are limited to %s characters in length. Please shorten your report" -msgstr "" +msgstr "КоличеÑтво Ñимволов в текÑте Ð¾Ð±Ñ€Ð°Ñ‰ÐµÐ½Ð¸Ñ Ð½Ðµ должно превышать %s. Ðапишите более короткое обращение." #: templates/web/zurich/admin/index-sdm.html:7 msgid "Reports awaiting approval" -msgstr "" +msgstr "ОбращениÑ, ожидающие проверки" #: templates/web/zurich/admin/index-sdm.html:10 msgid "Reports published" -msgstr "" +msgstr "Опубликованные обращениÑ" #: templates/web/base/admin/report_edit.html:67 msgid "Resend report" -msgstr "" +msgstr "Отправить обращение еще раз" #: templates/web/zurich/admin/template_edit.html:1 #: templates/web/zurich/admin/template_edit.html:4 #: templates/web/zurich/admin/templates.html:1 #: templates/web/zurich/admin/templates.html:3 msgid "Response Templates for %s" -msgstr "" +msgstr "Шаблоны ответов длÑ: %s" #: templates/web/base/js/translation_strings.html:28 msgid "Right place?" -msgstr "" +msgstr "МеÑто указано верно?" #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:167 #: perllib/FixMyStreet/Geocode/OSM.pm:152 msgid "Road operator for this named road (derived from road reference number and type): %s" -msgstr "" +msgstr "Дорога находитÑÑ Ð² ведении: %s" #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:164 #: perllib/FixMyStreet/Geocode/OSM.pm:149 msgid "Road operator for this named road (from OpenStreetMap): %s" -msgstr "" +msgstr "Дорога находитÑÑ Ð² ведении (Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¸Ð· реÑурÑа OpenStreetMap): %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1495 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1500 -#: templates/web/base/admin/report_edit.html:88 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1508 +#: templates/web/base/admin/report_edit.html:90 +#: templates/web/base/admin/update_edit.html:64 #: templates/web/zurich/admin/report_edit.html:116 msgid "Rotate Left" -msgstr "" +msgstr "Повернуть влево" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1495 -#: templates/web/base/admin/report_edit.html:89 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 +#: templates/web/base/admin/report_edit.html:91 +#: templates/web/base/admin/update_edit.html:65 #: templates/web/zurich/admin/report_edit.html:117 msgid "Rotate Right" -msgstr "" +msgstr "Повернуть вправо" #: templates/web/zurich/admin/report_edit.html:388 msgid "Rotating this photo will discard unsaved changes to the report." -msgstr "" +msgstr "Перед поворотом фото необходимо Ñохранить вÑе необходимые Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð² обращении" #: templates/web/base/js/translation_strings.html:46 -#: templates/web/base/maps/google-ol.html:13 msgid "Satellite" -msgstr "" +msgstr "Спутник" #: templates/web/base/admin/body.html:208 #: templates/web/base/admin/category_edit.html:84 #: templates/web/zurich/admin/body.html:59 #: templates/web/zurich/admin/template_edit.html:29 msgid "Save changes" -msgstr "" +msgstr "Сохранить изменениÑ" #: templates/web/base/admin/reports.html:1 #: templates/web/zurich/admin/reports.html:1 msgid "Search Reports" -msgstr "" +msgstr "ИÑкать обращениÑ" #: templates/web/base/admin/users.html:1 msgid "Search Users" -msgstr "" +msgstr "ИÑкать пользователей" #: templates/web/zurich/header.html:82 msgid "Search reports" -msgstr "" +msgstr "ИÑкать обращениÑ" #: templates/web/base/admin/reports.html:5 #: templates/web/base/admin/users.html:8 #: templates/web/zurich/admin/reports.html:5 msgid "Search:" -msgstr "" +msgstr "ПоиÑк:" #: templates/web/base/admin/reports.html:26 msgid "Searching found no reports." -msgstr "" +msgstr "Обращений не найдено." #: templates/web/base/admin/users.html:41 msgid "Searching found no users." -msgstr "" +msgstr "Пользователи не найдены." #: templates/web/base/admin/body-form.html:33 #: templates/web/zurich/admin/body-form.html:16 msgid "Select a body" -msgstr "" +msgstr "Выберите учреждение" #: templates/web/base/reports/index.html:9 msgid "Select a particular council to see the reports sent there." -msgstr "" +msgstr "Выберите нужный орган ÑамоуправлениÑ, чтобы проÑмотреть обращениÑ, направленные его предÑтавителÑм" #: templates/web/base/admin/body-form.html:71 #: templates/web/zurich/admin/body-form.html:26 msgid "Select an area" -msgstr "" +msgstr "Выберите меÑтноÑÑ‚ÑŒ" #: templates/web/base/alert/_list.html:10 msgid "Select which type of alert you’d like and click the button for an RSS feed, or enter your email address to subscribe to an email alert." -msgstr "" +msgstr "Выберите тип уведомлениÑ, а затем либо нажмите кнопку RSS-фида, либо введите Ñвой Ð°Ð´Ñ€ÐµÑ Ñл. почты, чтобы подпиÑатьÑÑ Ð½Ð° раÑÑылку уведомлений." #: perllib/FixMyStreet/Cobrand/Zurich.pm:835 msgid "Sent report back" -msgstr "" +msgstr "Обращение возвращено" -#: perllib/FixMyStreet/DB/Result/Problem.pm:708 +#: perllib/FixMyStreet/DB/Result/Problem.pm:696 msgid "Sent to %s %s later" -msgstr "" +msgstr "Отправлено позже: %s %s" #: templates/web/base/admin/report_edit.html:66 msgid "Sent:" -msgstr "" +msgstr "Отправлено:" #: templates/web/base/admin/report_edit.html:71 #: templates/web/zurich/admin/stats.html:45 msgid "Service:" -msgstr "" +msgstr "СервиÑ:" -#: templates/web/fixmystreet/report/display.html:38 +#: templates/web/base/report/display_tools.html:14 msgid "Share" -msgstr "" +msgstr "ПоделитьÑÑ" -#: templates/web/base/report/new/fill_in_details_form.html:193 -#: templates/web/base/report/update-form.html:158 -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:23 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:59 -#: templates/web/fixmystreet/report/update-form.html:146 +#: templates/web/base/report/new/form_user_loggedin.html:23 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:22 +#: templates/web/base/report/update/form_name.html:15 msgid "Show my name publicly" -msgstr "" +msgstr "Показывать мое Ð¸Ð¼Ñ Ð½Ð° Ñайте" #: templates/web/base/around/display_location.html:67 msgid "Show old" -msgstr "" +msgstr "Показать давние" #: templates/web/base/around/display_location.html:58 msgid "Show pins" -msgstr "" +msgstr "Показать метки" +#: templates/web/base/auth/general.html:100 #: templates/web/base/auth/general.html:3 -#: templates/web/base/auth/general.html:40 -#: templates/web/base/auth/general.html:61 +#: templates/web/base/auth/general.html:76 #: templates/web/zurich/auth/general.html:18 #: templates/web/zurich/auth/general.html:35 msgid "Sign in" -msgstr "" +msgstr "Вход" #: templates/web/base/auth/general.html:1 #: templates/web/zurich/auth/general.html:1 msgid "Sign in or create an account" -msgstr "" +msgstr "Войдите или Ñоздайте аккаунт" #: templates/web/base/auth/sign_out.html:1 #: templates/web/zurich/auth/sign_out.html:1 msgid "Sign out" -msgstr "" +msgstr "Выход" #: templates/web/base/report/new/fill_in_details_text.html:1 msgid "Some categories may require additional information." -msgstr "" +msgstr "Ð”Ð»Ñ Ð½ÐµÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ñ… категорий может потребоватьÑÑ Ð´Ð¾Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð°Ñ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ." #: templates/web/base/admin/body-form.html:149 #: templates/web/base/admin/body-form.html:150 @@ -2772,132 +2751,140 @@ msgid "" "Some endpoints require an <strong>API key</strong> to indicate that the reports are being\n" " sent from your FixMyStreet installation." msgstr "" +"Ð”Ð»Ñ Ð½ÐµÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ñ… конечных точек требуетÑÑ <strong>ключ API</strong>. С его помощью ÑиÑтема помечает, что Ð¾Ð±Ñ€Ð°Ñ‰ÐµÐ½Ð¸Ñ Ð±Ñ‹Ð»Ð¸ отправлены\n" +" из уÑтановленного вами реурÑа FixMyStreet." -#: templates/web/base/alert/index.html:42 +#: templates/web/base/alert/index.html:40 msgid "Some photos of recent reports" -msgstr "" +msgstr "Ðекоторые фото недавних обращений" #. ('Optional comment for translator') #: perllib/FixMyStreet/App/View/Email.pm:32 #: perllib/FixMyStreet/App/View/Web.pm:52 msgid "Some text to localize" -msgstr "" +msgstr "Ðекоторое количеÑтво текÑта Ð´Ð»Ñ Ð»Ð¾ÐºÐ°Ð»Ð¸Ð·Ð°Ñ†Ð¸Ð¸" -#: perllib/FixMyStreet/Cobrand/UK.pm:78 +#: perllib/FixMyStreet/Cobrand/UK.pm:79 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover." -msgstr "" +msgstr "К Ñожалению, адреÑа по данному индекÑу отноÑÑÑ‚ÑÑ Ðº коронным землÑм. Зона Ð¿Ð¾ÐºÑ€Ñ‹Ñ‚Ð¸Ñ Ð½Ð°ÑˆÐµÐ³Ð¾ реÑурÑа на них не раÑпроÑтранÑетÑÑ." #: templates/web/base/auth/token.html:8 msgid "Sorry, that wasn’t a valid link" -msgstr "" +msgstr "Указана Ð½ÐµÐ²ÐµÑ€Ð½Ð°Ñ ÑÑылка" #: templates/web/base/tokens/abuse.html:5 msgid "Sorry, there has been an error confirming your problem." -msgstr "" +msgstr "При подтверждении вашего Ð¾Ð±Ñ€Ð°Ñ‰ÐµÐ½Ð¸Ñ Ð¿Ñ€Ð¾Ð¸Ð·Ð¾ÑˆÐ»Ð° ошибка." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:221 -#: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:37 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:216 +#: perllib/FixMyStreet/Geocode.pm:38 perllib/FixMyStreet/Geocode/Bing.pm:38 #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:56 #: perllib/FixMyStreet/Geocode/OSM.pm:48 msgid "Sorry, we could not find that location." -msgstr "" +msgstr "Ðе удалоÑÑŒ найти Ñто меÑтоположение." -#: perllib/FixMyStreet/Geocode/Bing.pm:34 +#: templates/web/base/auth/general.html:9 +#: templates/web/base/report/display.html:21 +#: templates/web/base/report/new/fill_in_details_form.html:23 +#, fuzzy +msgid "Sorry, we could not log you in. Please fill in the form below." +msgstr "Ðе удалоÑÑŒ проанализировать Ñто меÑтоположение. Повторите попытку." + +#: perllib/FixMyStreet/Geocode/Bing.pm:35 #: perllib/FixMyStreet/Geocode/Google.pm:45 #: perllib/FixMyStreet/Geocode/Zurich.pm:88 msgid "Sorry, we could not parse that location. Please try again." -msgstr "" +msgstr "Ðе удалоÑÑŒ проанализировать Ñто меÑтоположение. Повторите попытку." #: perllib/FixMyStreet/App/Model/PhotoSet.pm:134 msgid "Sorry, we couldn't save your image(s), please try again." -msgstr "" +msgstr "Ðе удалоÑÑŒ Ñохранить фото. Повторите попытку." + +#: perllib/FixMyStreet/App/Controller/AuthSS.pm:301 +#, fuzzy +msgid "Sorry, you can not log in with Facebook. Please try again later." +msgstr "При загрузке Ñтраницы произошла ошибка. Повторите попытку позже." #: templates/web/base/admin/stats.html:64 msgid "Start Date:" -msgstr "" +msgstr "Дата начала:" #: templates/web/base/admin/body.html:69 #: templates/web/base/admin/flagged.html:18 #: templates/web/base/admin/list_updates.html:11 #: templates/web/base/admin/reports.html:15 -#: templates/web/fixmystreet/report/update-form.html:26 +#: templates/web/base/report/update/form_update.html:32 msgid "State" -msgstr "" +msgstr "СтатуÑ" #: templates/web/base/admin/report_edit.html:47 #: templates/web/base/admin/update_edit.html:27 -#: templates/web/base/report/update-form.html:28 #: templates/web/zurich/admin/report_edit-sdm.html:73 #: templates/web/zurich/admin/report_edit.html:101 #: templates/web/zurich/admin/report_edit.html:155 #: templates/web/zurich/admin/update_edit.html:17 msgid "State:" -msgstr "" +msgstr "СтатуÑ:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1282 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1291 #: perllib/FixMyStreet/Cobrand/Zurich.pm:387 #: templates/web/base/admin/stats.html:1 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:73 msgid "Stats" -msgstr "" +msgstr "СтатиÑтика" #: templates/web/zurich/admin/index-dm.html:23 #: templates/web/zurich/admin/index-sdm.html:21 #: templates/web/zurich/admin/reports.html:13 msgid "Status" -msgstr "" +msgstr "СтатуÑ" #: templates/web/base/report/updates.html:10 msgid "Still open, via questionnaire, %s" -msgstr "" +msgstr "Открыто (через опроÑ): %s" #: templates/web/zurich/admin/report_edit-sdm.html:25 #: templates/web/zurich/admin/report_edit.html:26 msgid "Street View" -msgstr "" +msgstr "ПроÑмотр улиц" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:406 +#: perllib/FixMyStreet/Script/Reports.pm:184 msgid "Subcategory: %s" -msgstr "" +msgstr "СубкатегориÑ: %s" #: templates/web/zurich/admin/index-dm.html:27 msgid "Subdivision/Body" -msgstr "" +msgstr "Подразделение/учреждение" -#: templates/web/fixmystreet/contact/index.html:98 +#: templates/web/base/contact/index.html:90 msgid "Subject" -msgstr "" +msgstr "Тема" #: templates/web/base/admin/report_edit.html:19 -#: templates/web/base/contact/index.html:88 -#: templates/web/base/report/new/fill_in_details_form.html:53 #: templates/web/zurich/admin/report_edit.html:39 msgid "Subject:" -msgstr "" +msgstr "Тема:" #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/fill_in_details_form.html:137 -#: templates/web/base/report/new/fill_in_details_form.html:159 -#: templates/web/base/report/new/fill_in_details_form.html:96 -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:36 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:23 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:76 +#: templates/web/base/report/new/form_user_loggedin.html:36 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:39 +#: templates/web/base/report/new/form_user_loggedout_password.html:11 #: templates/web/zurich/report/new/fill_in_details_form.html:96 msgid "Submit" -msgstr "" +msgstr "Отправить" -#: templates/web/base/admin/report_edit.html:95 -#: templates/web/base/admin/update_edit.html:65 +#: templates/web/base/admin/report_edit.html:101 +#: templates/web/base/admin/update_edit.html:75 #: templates/web/base/admin/user-form.html:56 #: templates/web/zurich/admin/report_edit-sdm.html:137 #: templates/web/zurich/admin/report_edit.html:268 #: templates/web/zurich/admin/update_edit.html:38 msgid "Submit changes" -msgstr "" +msgstr "Отправить изменениÑ" -#: templates/web/base/questionnaire/index.html:97 +#: templates/web/base/questionnaire/index.html:106 msgid "Submit questionnaire" -msgstr "" +msgstr "Отправить опроÑ" #: perllib/FixMyStreet/Cobrand/Zurich.pm:171 #: perllib/FixMyStreet/Cobrand/Zurich.pm:902 @@ -2908,20 +2895,19 @@ msgstr "" #: templates/web/zurich/admin/index-sdm.html:21 #: templates/web/zurich/admin/reports.html:13 msgid "Submitted" -msgstr "" +msgstr "Отправлено" #: templates/web/base/alert/updates.html:17 -#: templates/web/base/report/display.html:46 +#: templates/web/base/report/display_tools.html:41 #: templates/web/fixmystreet/alert/updates.html:23 -#: templates/web/fixmystreet/report/display.html:65 msgid "Subscribe" -msgstr "" +msgstr "ПодпиÑатьÑÑ" #: templates/web/base/alert/_list.html:92 msgid "Subscribe me to an email alert" -msgstr "" +msgstr "ПриÑылать мне ÑƒÐ²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ñ Ð¿Ð¾ Ñл. почте" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1275 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1284 #: perllib/FixMyStreet/Cobrand/Zurich.pm:383 #: templates/web/base/admin/bodies.html:25 #: templates/web/base/admin/index.html:1 @@ -2932,110 +2918,112 @@ msgstr "" #: templates/web/zurich/admin/index.html:1 templates/web/zurich/footer.html:13 #: templates/web/zurich/header.html:57 msgid "Summary" -msgstr "" +msgstr "Итог" #: templates/web/base/reports/index.html:1 #: templates/web/zurich/reports/index.html:0 #: templates/web/zurich/reports/index.html:4 msgid "Summary reports" -msgstr "" +msgstr "Отчеты об итогах" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1279 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1288 msgid "Survey" -msgstr "" +msgstr "ОпроÑ" #: templates/web/base/admin/questionnaire.html:1 msgid "Survey Results" -msgstr "" +msgstr "Результаты опроÑа" #: templates/web/zurich/admin/template_edit.html:7 msgid "Template «%s»" -msgstr "" +msgstr "Шаблон «%s»" #: perllib/FixMyStreet/Cobrand/Zurich.pm:394 #: templates/web/zurich/header.html:77 msgid "Templates" -msgstr "" +msgstr "Шаблоны" #: templates/web/base/admin/list_updates.html:12 #: templates/web/zurich/admin/templates.html:9 msgid "Text" -msgstr "" +msgstr "ТекÑÑ‚" #: templates/web/base/admin/body.html:28 msgid "Text only version" -msgstr "" +msgstr "Только текÑÑ‚Ð¾Ð²Ð°Ñ Ð²ÐµÑ€ÑиÑ" #: templates/web/base/admin/update_edit.html:20 #: templates/web/zurich/admin/template_edit.html:24 #: templates/web/zurich/admin/update_edit.html:12 msgid "Text:" -msgstr "" +msgstr "ТекÑÑ‚:" #: templates/web/base/tokens/confirm_problem.html:12 msgid "Thank you for reporting this issue!" -msgstr "" +msgstr "СпаÑибо за ваше обращение!" -#: templates/web/base/tokens/error.html:7 +#: templates/web/base/tokens/error.html:6 msgid "Thank you for trying to confirm your update or problem. We seem to have an error ourselves though, so <a href=\"%s\">please let us know what went on</a> and we'll look into it." -msgstr "" +msgstr "СпаÑибо, что вы обратилиÑÑŒ на наш реÑурÑ, чтобы подтвердить/обновить информацию о проблеме. Похоже, у Ð½Ð°Ñ Ð½Ð° Ñайте возникли неполадки. <a href=\"%s\">Сообщите том, что пошло не так</a>, и мы поÑтараемÑÑ Ð²ÑÑ‘ починить." #: templates/web/base/tokens/confirm_update.html:15 msgid "Thank you for updating this issue!" -msgstr "" +msgstr "СпаÑибо за обновление данных по проблеме!" #: templates/web/base/contact/submit.html:6 #: templates/web/base/questionnaire/completed.html:5 msgid "Thank you for your feedback" -msgstr "" +msgstr "Благодарим Ð²Ð°Ñ Ð·Ð° отзыв" #: templates/web/base/around/_error_multiple.html:17 msgid "Thanks for uploading your photo. We now need to locate your problem, so please enter a nearby street name or postcode in the box above :" -msgstr "" +msgstr "СпаÑибо за предоÑтавленное фото. Теперь нам нужно определить, где именно раÑполагаетÑÑ Ð½ÐµÐ¿Ð¾Ð»Ð°Ð´ÐºÐ°. Ð’ поле выше введите название ближайшей улицы или индекÑ:" #: templates/web/base/questionnaire/creator_fixed.html:9 msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever reported a problem to a council before?" -msgstr "" +msgstr "Мы рады узнать, что проблема решена! Ðто было ваше первое обращение в орган ÑамоуправлениÑ?" #: perllib/FixMyStreet/App/Model/PhotoSet.pm:152 msgid "That image doesn't appear to have uploaded correctly (%s), please try again." -msgstr "" +msgstr "КажетÑÑ, возникли трудноÑти Ñ Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ¾Ð¹ фото (%s).Повторите попытку." #: perllib/FixMyStreet/App/Controller/Council.pm:97 msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again." -msgstr "" +msgstr "КажетÑÑ, Ñто меÑтоположение не находитÑÑ Ð² ведении органа ÑамоуправлениÑ. Возможно, им заведует другое учреждение или же вы указали меÑто в другой Ñтране. Попробуйте еще раз." #: perllib/FixMyStreet/App/Controller/Location.pm:126 msgid "That location does not appear to be in the UK; please try again." -msgstr "" +msgstr "Ðто меÑтоположение находитÑÑ Ð·Ð° пределами Великобритании. Повторите попытку." #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:47 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:63 -#: perllib/FixMyStreet/Cobrand/UK.pm:71 +#: perllib/FixMyStreet/Cobrand/UK.pm:72 msgid "That postcode was not recognised, sorry." -msgstr "" +msgstr "Ðе удалоÑÑŒ раÑпознать индекÑ." -#: perllib/FixMyStreet/App/Controller/Admin.pm:726 +#: perllib/FixMyStreet/App/Controller/Admin.pm:724 msgid "That problem has been marked as sent." -msgstr "" +msgstr "Проблема помечена как отправленнаÑ." -#: perllib/FixMyStreet/App/Controller/Admin.pm:718 +#: perllib/FixMyStreet/App/Controller/Admin.pm:716 msgid "That problem will now be resent." -msgstr "" +msgstr "Ð¡ÐµÐ¹Ñ‡Ð°Ñ Ð¼Ñ‹ еще раз отправим Ñто обращение." -#: perllib/FixMyStreet/App/Controller/Report.pm:125 +#: perllib/FixMyStreet/App/Controller/Report.pm:127 msgid "That report cannot be viewed on %s." -msgstr "" +msgstr "ПроÑмотр Ð¾Ð±Ñ€Ð°Ñ‰ÐµÐ½Ð¸Ñ Ð½ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶ÐµÐ½ на Ñтом уÑтройÑтве (%s)." -#: perllib/FixMyStreet/App/Controller/Report.pm:119 +#: perllib/FixMyStreet/App/Controller/Report.pm:121 msgid "That report has been removed from FixMyStreet." -msgstr "" +msgstr "Ðто обращение было удалено Ñ Ñайта FixMyStreet." #: templates/web/base/admin/body.html:144 msgid "" "The <strong>email address</strong> is the destination to which reports about this category will be sent. \n" " Other categories for this body may have the same email address." msgstr "" +"Ðа <strong>Ñлектронный адреÑ</strong> будут приходить Ð¾Ð±Ñ€Ð°Ñ‰ÐµÐ½Ð¸Ñ Ð¸Ð· Ñтой категории. \n" +" Сюда же могут приходить и Ð¾Ð±Ñ€Ð°Ñ‰ÐµÐ½Ð¸Ñ Ð¸Ð· других категорий, адреÑованные одному и тому же учреждению." #: templates/web/base/admin/body-form.html:123 #: templates/web/base/admin/body-form.html:124 @@ -3043,6 +3031,8 @@ msgid "" "The <strong>endpoint</strong> is the URL of the service that FixMyStreet will connect to \n" " when sending reports to this body." msgstr "" +"<strong>ÐšÐ¾Ð½ÐµÑ‡Ð½Ð°Ñ Ñ‚Ð¾Ñ‡ÐºÐ°</strong> – Ñто URL ÑервиÑа, Ñ ÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ð¼ будет ÑвÑзыватьÑÑ ÑиÑтема FixMyStreet \n" +" при отправке обращений в данное учреждение." #: templates/web/base/admin/body-form.html:136 #: templates/web/base/admin/body-form.html:137 @@ -3050,6 +3040,8 @@ msgid "" "The <strong>jurisdiction</strong> is only needed if the endpoint is serving more\n" " than one. If the body is running its own endpoint, you can usually leave this blank." msgstr "" +"Данные о <strong>юриÑдикции</strong> необходимы только, еÑли ÐºÐ¾Ð½ÐµÑ‡Ð½Ð°Ñ Ñ‚Ð¾Ñ‡ÐºÐ° иÑпользуетÑÑ Ð´Ð»Ñ Ð½ÐµÑкольких\n" +" учреждений. ЕÑли учреждение привÑзано к отдельной конечной точке, оÑтавьте Ñто поле пуÑтым." #: templates/web/base/admin/body-form.html:94 #: templates/web/base/admin/body-form.html:95 @@ -3057,10 +3049,12 @@ msgid "" "The <strong>send method</strong> determines how problem reports will be sent to the body.\n" " If you leave this blank, <strong>send method defaults to email</strong>." msgstr "" +"<strong>Метод отправки</strong> – Ñто ÑпоÑоб, которым будут отправлены Ð¾Ð±Ñ€Ð°Ñ‰ÐµÐ½Ð¸Ñ Ð² учреждение.\n" +" ЕÑли оÑтавить Ñто поле пуÑтым, <strong>по умолчанию Ð¾Ð±Ñ€Ð°Ñ‰ÐµÐ½Ð¸Ñ Ð±ÑƒÐ´ÑƒÑ‚ доÑтавлены по Ñл. почте</strong>." -#: templates/web/base/open311/index.html:90 +#: templates/web/base/open311/index.html:82 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 "" +msgstr "Параметр agency_responsible в Open311 верÑии 2 иÑпользуетÑÑ Ð´Ð»Ñ ÑоÑÑ‚Ð°Ð²Ð»ÐµÐ½Ð¸Ñ ÑпиÑка админиÑтраций, которые получили обращение. Ðто не ÑовÑем Ñтандартный ÑпоÑоб иÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ Ñтого атрибута в Ñпецификации Open311 верÑии 2." #: templates/web/base/admin/body-form.html:11 #: templates/web/base/admin/body-form.html:12 @@ -3068,88 +3062,88 @@ msgid "" "The body's <strong>name</strong> identifies the body (for example, <em>Borsetshire District Council</em>)\n" " and may be displayed publically." msgstr "" +"<strong>Ðазвание</strong> ÑƒÑ‡Ñ€ÐµÐ¶Ð´ÐµÐ½Ð¸Ñ ÑвлÑетÑÑ ÐµÐ³Ð¾ идентификатором (например, <em>Районный орган ÑÐ°Ð¼Ð¾ÑƒÐ¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ð³Ñ€Ð°Ñ„Ñтва БорÑетшир</em>).\n" +" Ðазвание ÑƒÑ‡Ñ€ÐµÐ¶Ð´ÐµÐ½Ð¸Ñ Ð¼Ð¾Ð¶ÐµÑ‚ быть видно вÑем пользователÑм Ñайта." #: templates/web/base/report/new/fill_in_details_text.html:1 #: templates/web/base/report/new/fill_in_details_text.html:3 msgid "The council won’t be able to help unless you leave as much detail as you can. Please describe the exact location of the problem (e.g. on a wall), what it is, how long it has been there, a description (and a photo of the problem if you have one), etc." -msgstr "" +msgstr "Вам необходимо предоÑтавить макÑимум информации, чтобы Ñотрудники органа ÑÐ°Ð¼Ð¾ÑƒÐ¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ð¼Ð¾Ð³Ð»Ð¸ помочь в решении проблемы. Укажите точное меÑтонахождение неполадки (напр., «на Ñтене»), опишите, что Ñто и как давно вы впервые заметили неиÑправноÑÑ‚ÑŒ (также можно приложить фото неполадки) и Ñ‚. д." #: templates/web/base/admin/edit-league.html:3 #: templates/web/base/admin/edit-league.html:4 msgid "The diligency prize league table shows editors' activity (who's been editing the most records)." -msgstr "" +msgstr "Ð’ таблице Ñамых активных пользователей показана деÑтельноÑÑ‚ÑŒ тех редакторов, которые отредактировали наибольшее количеÑтво запиÑей." -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:60 -#: perllib/FixMyStreet/App/Controller/Reports.pm:79 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:61 +#: perllib/FixMyStreet/App/Controller/Reports.pm:80 msgid "The error was: %s" -msgstr "" +msgstr "Ошибка: %s" -#: templates/web/base/open311/index.html:86 +#: templates/web/base/open311/index.html:78 msgid "The following Open311 v2 attributes are returned for each request: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code and service_name." -msgstr "" +msgstr "Следующие параметры Open311 верÑии 2 возвращаютÑÑ Ð´Ð»Ñ ÐºÐ°Ð¶Ð´Ð¾Ð³Ð¾ запроÑа: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code и service_name." #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:159 #: perllib/FixMyStreet/Geocode/OSM.pm:144 msgid "The following information about the nearest road might be inaccurate or irrelevant, if the problem is close to several roads or close to a road without a name registered in OpenStreetMap." -msgstr "" +msgstr "Ð˜Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¾ ближайшей дороге может быть неверной или неточной, еÑли проблема находитÑÑ Ñ€Ñдом Ñ Ð½ÐµÑколькими дорогами или поблизоÑти от безымÑнной дороги, зарегиÑтрированной на OpenStreetMap." #: db/alert_types.pl:19 db/alert_types.pl:23 db/alert_types.pl:27 #: db/alert_types.pl:31 msgid "The latest local problems reported by users" -msgstr "" +msgstr "Ðедавние проблемы поблизоÑти, Ð¾Ð±Ñ€Ð°Ñ‰ÐµÐ½Ð¸Ñ Ð¾ которых подали пользователи" #: db/alert_types.pl:35 msgid "The latest problems for {{COUNCIL}} reported by users" -msgstr "" +msgstr "Ðедавние Ð¾Ð±Ñ€Ð°Ñ‰ÐµÐ½Ð¸Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÐµÐ¹, адреÑованные в орган ÑамоуправлениÑ: {{COUNCIL}}" #: db/alert_types.pl:39 msgid "The latest problems for {{COUNCIL}} within {{WARD}} ward reported by users" -msgstr "" +msgstr "Ðедавние Ð¾Ð±Ñ€Ð°Ñ‰ÐµÐ½Ð¸Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÐµÐ¹, адреÑованные в орган ÑамоуправлениÑ: {{COUNCIL}} в пределах района: {{WARD}}" #: db/alert_types.pl:11 msgid "The latest problems reported by users" -msgstr "" +msgstr "Ðедавние Ð¾Ð±Ñ€Ð°Ñ‰ÐµÐ½Ð¸Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÐµÐ¹" #: db/alert_types.pl:15 msgid "The latest problems reported fixed by users" -msgstr "" +msgstr "Ðедавние проблемы, помеченные пользователÑми как решенные" #: db/alert_types.pl:43 msgid "The latest problems within {{NAME}}'s boundary reported by users" -msgstr "" +msgstr "Ðедавние Ð¾Ð±Ñ€Ð°Ñ‰ÐµÐ½Ð¸Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÐµÐ¹ о проблемах в пределах меÑтноÑти: {{NAME}}" #: templates/web/base/auth/token.html:9 msgid "The link might have expired, or maybe you didn’t quite copy and paste it correctly." -msgstr "" +msgstr "Возможно, ÑÑылка уÑтарела или вы не полноÑтью ее Ñкопировали." #: templates/web/base/admin/body-form.html:58 msgid "The list of available areas is being provided by the MapIt service at %s." -msgstr "" +msgstr "СпиÑок доÑтупных меÑтоположений предоÑтавлен ÑервиÑом MapIt на Ñайте: %s." #: templates/web/base/auth/change_password.html:12 #: templates/web/base/auth/change_password.html:16 msgid "The passwords do not match" -msgstr "" +msgstr "Пароли не Ñовпадают" -#: templates/web/base/errors/page_error_404_not_found.html:10 -#: templates/web/base/errors/page_error_404_not_found.html:12 +#: templates/web/base/errors/page_error_404_not_found.html:9 msgid "The requested URL '%s' was not found on this server" -msgstr "" +msgstr "Запрошенный URL '%s' не был найден на Ñтом Ñервере" #: templates/web/base/alert/_list.html:16 msgid "The simplest alert is our geographic one:" -msgstr "" +msgstr "Самое проÑтое уведомление – географичеÑкое:" #: templates/web/base/report/new/councils_extra_text.html:1 #: templates/web/base/report/new/councils_text_some.html:10 -#: templates/web/base/report/new/fill_in_details_form.html:18 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:14 +#: templates/web/base/report/new/fill_in_details_form.html:13 msgid "The summary and description will also be made public (see our <a href=\"/privacy\">privacy policy</a>)." -msgstr "" +msgstr "Итоги и опиÑание Ñмогут видеть вÑе пользователи (Ñм. нашу <a href=\"/privacy\">политику конфиденциальноÑти</a>)." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:315 +#: perllib/FixMyStreet/Script/Reports.pm:92 msgid "The user could not locate the problem on a map, but to see the area around the location they entered" -msgstr "" +msgstr "Пользователь не Ñмог определить меÑтоположение неполадки на карте. ВмеÑто Ñтого он ввел данные о меÑтноÑти поблизоÑти от неполадки." #: templates/web/base/admin/user-form.html:12 #: templates/web/base/admin/user-form.html:13 @@ -3157,44 +3151,46 @@ msgid "" "The user's <strong>name</strong> is displayed publicly on reports that have not been marked <em>anonymous</em>.\n" " Names are not necessarily unique." msgstr "" +"<strong>ИмÑ</strong> Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð¾Ñ‚Ð¾Ð±Ñ€Ð°Ð¶Ð°ÐµÑ‚ÑÑ Ð² обращениÑÑ…, которые не были помечены как <em>анонимные</em>.\n" +" Ð˜Ð¼Ñ Ð¼Ð¾Ð¶ÐµÑ‚ быть неуникальным." #: templates/web/base/around/on_map_list_items.html:12 #: templates/web/base/my/_problem-list.html:8 #: templates/web/base/reports/_problem-list.html:15 msgid "There are no reports to show." -msgstr "" +msgstr "Ðет обращений." -#: perllib/FixMyStreet/App/Controller/Reports.pm:76 +#: perllib/FixMyStreet/App/Controller/Reports.pm:77 msgid "There was a problem showing the All Reports page. Please try again later." -msgstr "" +msgstr "При загрузке Ñтраницы «ВÑе обращениÑ» произошла ошибка. Повторите попытку позже." #: perllib/FixMyStreet/App/Controller/Contact.pm:137 -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:59 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:60 msgid "There was a problem showing this page. Please try again later." -msgstr "" +msgstr "При загрузке Ñтраницы произошла ошибка. Повторите попытку позже." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:769 -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:134 -#: templates/web/base/auth/general.html:26 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:764 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:138 +#: templates/web/base/auth/general.html:43 #: templates/web/zurich/auth/general.html:28 msgid "There was a problem with your email/password combination. If you cannot remember your password, or do not have one, please fill in the ‘sign in by email’ section of the form." -msgstr "" +msgstr "Ð˜Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð¸Ð»Ð¸ пароль указаны неверно. ЕÑли вы не помните Ñвой пароль или у Ð²Ð°Ñ ÐµÐ³Ð¾ нет, заполните форму «Вход Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ адреÑа Ñл. почты»." #: perllib/FixMyStreet/App/Controller/Alert.pm:355 msgid "There was a problem with your email/password combination. Please try again." -msgstr "" +msgstr "Ð˜Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð¸Ð»Ð¸ пароль указаны неверно. Повторите попытку." -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:272 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:336 msgid "There was a problem with your update. Please try again." -msgstr "" +msgstr "Ðе удалоÑÑŒ загрузить новые данные. Повторите попытку." #: perllib/FixMyStreet/App/Controller/Contact.pm:141 msgid "There were problems with your report. Please see below." -msgstr "" +msgstr "Ðе удалоÑÑŒ загрузить обращение. Прочтите информациию ниже." -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:300 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:371 msgid "There were problems with your update. Please see below." -msgstr "" +msgstr "Ðе удалоÑÑŒ загрузить новые данные. Прочтите информациию ниже." #: templates/web/base/admin/body-form.html:112 #: templates/web/base/admin/body-form.html:113 @@ -3205,10 +3201,15 @@ msgid "" " <a href='https://www.mysociety.org/2013/01/17/open311-explained/' class='admin-offsite-link'>this article</a>.\n" " " msgstr "" +"Ðти наÑтройки нужны Ð´Ð»Ñ ÑƒÑ‡Ñ€ÐµÐ¶Ð´ÐµÐ½Ð¸Ð¹, которые иÑпользуют ÑÐµÑ€Ð²Ð¸Ñ Open311 (или подобный реÑÑƒÑ€Ñ Ð±Ñкенд-интеграции) Ð´Ð»Ñ Ð¿Ð¾Ð»ÑƒÑ‡ÐµÐ½Ð¸Ñ Ð¾Ð±Ñ€Ð°Ñ‰ÐµÐ½Ð¸Ð¹.<br>\n" +" <strong>Вам не нужно уÑтанавливать такие наÑтройки, еÑли Ð´Ð»Ñ ÑвÑзи Ñ ÑƒÑ‡Ñ€ÐµÐ¶Ð´ÐµÐ½Ð¸Ñми вы иÑпользуете Ñл. почту.</strong>.\n" +" Подробнее о ÑервиÑе Open311 читайте в\n" +" <a href='https://www.mysociety.org/2013/01/17/open311-explained/' class='admin-offsite-link'>Ñтой Ñтатье</a>.\n" +" " -#: templates/web/base/open311/index.html:77 +#: templates/web/base/open311/index.html:69 msgid "This API implementation is work in progress and not yet stabilized. It will change without warnings in the future." -msgstr "" +msgstr "Ð ÐµÐ°Ð»Ð¸Ð·Ð°Ñ†Ð¸Ñ API пока работает в теÑтовом режиме, поÑтому в процеÑÑе работы могут возникать неполадки. Они будут иÑправлены через некоторое времÑ." #: templates/web/base/admin/body.html:44 msgid "" @@ -3216,10 +3217,13 @@ msgid "" " Consequently, none of its categories will appear in the drop-down category menu when users report problems.\n" " Currently, users <strong>cannot report problems to this body</strong>." msgstr "" +"Ðто учреждение не имеет в ведении территорий. Его предÑтавители не обладают юриÑдикцией в решении проблем, зарегиÑтрированных <em>в любом меÑтоположении</em>.\n" +" Следовательно, ни одна из категорий не будет отображатьÑÑ Ð² раÑкрывающемÑÑ Ð¼ÐµÐ½ÑŽ, когда пользователи будут подавать обращениÑ.\n" +" Ðа данный момент пользователи <strong>не могут отправлÑÑ‚ÑŒ Ð¾Ð±Ñ€Ð°Ñ‰ÐµÐ½Ð¸Ñ Ð² Ñто учрждение</strong>." #: templates/web/base/admin/body.html:54 msgid "This body has no contacts. This means that currently problems reported to this body <strong>will not be sent</strong>." -msgstr "" +msgstr "Ð’ наÑтоÑщее Ð²Ñ€ÐµÐ¼Ñ <strong>невозможно отправить</strong> Ð¾Ð±Ñ€Ð°Ñ‰ÐµÐ½Ð¸Ñ Ð² данное учреждение, поÑкольку Ð´Ð»Ñ Ð½ÐµÐ³Ð¾ не указано контактных данных. " #: templates/web/base/admin/body-form.html:52 #: templates/web/base/admin/body-form.html:53 @@ -3227,141 +3231,122 @@ msgid "" "This body will only be sent reports for problems that are located in the <strong>area covered</strong>.\n" " A body will not receive any reports unless it covers at least one area." msgstr "" +"Ð’ Ñто учреждение будут отправлÑÑ‚ÑŒÑÑ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ те обращениÑ, неполадки в которых находÑÑ‚ÑÑ Ð½Ð° <strong>подведомÑтвенной территории</strong>.\n" +" Чтобы получать обращениÑ, учреждению необходимо иметь в ведении минимум одну облаÑÑ‚ÑŒ." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:413 +#: perllib/FixMyStreet/Script/Reports.pm:191 msgid "This email has been sent to both councils covering the location of the problem, as the user did not categorise it; please ignore it if you're not the correct council to deal with the issue, or let us know what category of problem this is so we can add it to our system." -msgstr "" +msgstr "ПоÑкольку пользователь не обозначил категорию проблемы, обращение было отправлено в оба органа ÑамоуправлениÑ. ЕÑли Ð´Ð°Ð½Ð½Ð°Ñ Ð¿Ñ€Ð¾Ð±Ð»ÐµÐ¼Ð° находитÑÑ Ð²Ð½Ðµ вашей ответÑтвенноÑти, игнорируйте Ñто обращение. Ð’Ñ‹ также можете напиÑать нам, к какой категории отноÑитÑÑ Ð´Ð°Ð½Ð½Ð°Ñ Ð¿Ñ€Ð¾Ð±Ð»ÐµÐ¼Ð°, и мы добавим новую информацию в ÑиÑтему." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:416 +#: perllib/FixMyStreet/Script/Reports.pm:194 msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue." -msgstr "" +msgstr "ПоÑкольку пользователь обозначил категорию проблемы, находÑщейÑÑ Ð² ведении неÑкольких органов ÑамоуправлениÑ, мы отправили Ñто пиÑьмо во вÑе Ñти инÑтанции. ЕÑли Ð´Ð°Ð½Ð½Ð°Ñ Ð¿Ñ€Ð¾Ð±Ð»ÐµÐ¼Ð° находитÑÑ Ð²Ð½Ðµ вашей ответÑтвенноÑти, игнорируйте Ñто обращение." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:925 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:995 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:920 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:990 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:142 -#: perllib/FixMyStreet/Cobrand/UK.pm:43 +#: perllib/FixMyStreet/Cobrand/UK.pm:44 msgid "This information is required" -msgstr "" +msgstr "Ðта Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ ÑвлÑетÑÑ Ð¾Ð±Ñзательной" #: templates/web/base/debug_header.html:3 msgid "This is a developer site; things might break at any time, and the database will be periodically deleted." -msgstr "" +msgstr "Ðто Ñайт разработчиков, поÑтому в его функционировании иногда могут возникать Ñбои. База данных периодичеÑки удалÑетÑÑ." #: templates/web/base/reports/index.html:7 msgid "This is a summary of all reports on this site." -msgstr "" +msgstr "Ðто ÐºÑ€Ð°Ñ‚ÐºÐ°Ñ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¿Ð¾ вÑем обращениÑм на Ñайте." -#: templates/web/zurich/auth/token.html:8 -msgid "This may be because the link is too old or already used, or the address was not copied correctly." -msgstr "" - -#: templates/web/base/report/banner.html:15 -msgid "This problem has been closed" -msgstr "" - -#: templates/web/base/report/banner.html:12 -#: templates/web/base/report/update-form.html:48 -#: templates/web/fixmystreet/report/update-form.html:46 +#: templates/web/base/report/update/form_update.html:52 msgid "This problem has been fixed" -msgstr "" +msgstr "Ðта проблема была решена" -#: templates/web/base/report/update-form.html:43 -#: templates/web/fixmystreet/report/update-form.html:40 +#: templates/web/base/report/update/form_update.html:46 msgid "This problem has not been fixed" -msgstr "" - -#: templates/web/base/report/banner.html:19 -msgid "This problem is in progress" -msgstr "" - -#: templates/web/base/report/banner.html:9 -msgid "This problem is old and of unknown status." -msgstr "" +msgstr "Ðта проблема не была решена" #: perllib/FixMyStreet/Cobrand/Zurich.pm:168 #: perllib/FixMyStreet/Cobrand/Zurich.pm:169 #: templates/web/zurich/report/_main.html:14 msgid "This report is awaiting moderation." -msgstr "" +msgstr "Ðто обращение ожидает модерации." -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:86 +#: perllib/FixMyStreet/Script/Alerts.pm:94 msgid "This report is currently marked as closed." -msgstr "" +msgstr "Ðто обращение на данный момент помечено как закрытое." -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:84 +#: perllib/FixMyStreet/Script/Alerts.pm:92 msgid "This report is currently marked as fixed." -msgstr "" +msgstr "Ðто обращение на данный момент помечено как решенное." -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:88 +#: perllib/FixMyStreet/Script/Alerts.pm:96 msgid "This report is currently marked as open." -msgstr "" +msgstr "Ðто обращение на данный момент помечено как открытое." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:326 +#: perllib/FixMyStreet/Script/Reports.pm:105 msgid "This report was submitted anonymously" -msgstr "" +msgstr "Ðто обращение было оÑтавлено анонимно." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:308 +#: perllib/FixMyStreet/Script/Reports.pm:85 msgid "This web page also contains a photo of the problem, provided by the user." -msgstr "" +msgstr "Ðта веб-Ñтраница также Ñодержит фото неполадки, предоÑтавленное пользователем." #: templates/web/zurich/admin/report_edit-sdm.html:123 #: templates/web/zurich/admin/report_edit-sdm.html:76 #: templates/web/zurich/admin/report_edit.html:104 #: templates/web/zurich/admin/report_edit.html:148 msgid "Time spent (in minutes):" -msgstr "" +msgstr "Времени потрачено (в минутах):" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1278 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1287 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" -msgstr "" +msgstr "Временной отрезок" #: templates/web/base/admin/flagged.html:15 #: templates/web/base/admin/reports.html:12 #: templates/web/zurich/admin/templates.html:8 msgid "Title" -msgstr "" +msgstr "Ðазвание" #: templates/web/zurich/admin/template_edit.html:20 msgid "Title:" -msgstr "" +msgstr "Ðазвание:" #: templates/web/base/alert/index.html:25 msgid "To find out what local alerts we have for you, please enter your %s postcode or street name and area:" -msgstr "" +msgstr "Введите Ð¸Ð½Ð´ÐµÐºÑ (%s) или название улицы и района, чтобы узнать, какие ÑƒÐ²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ñ Ð°ÐºÑ‚ÑƒÐ°Ð»ÑŒÐ½Ñ‹ Ð´Ð»Ñ Ð²Ð°ÑˆÐµÐ³Ð¾ меÑтоположениÑ:" #: templates/web/base/alert/index.html:27 msgid "To find out what local alerts we have for you, please enter your postcode or street name and area" -msgstr "" +msgstr "Введите Ð¸Ð½Ð´ÐµÐºÑ Ð¸Ð»Ð¸ название улицы и района, чтобы узнать, какие ÑƒÐ²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ñ Ð°ÐºÑ‚ÑƒÐ°Ð»ÑŒÐ½Ñ‹ Ð´Ð»Ñ Ð²Ð°ÑˆÐµÐ³Ð¾ меÑтоположениÑ:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:314 +#: perllib/FixMyStreet/Script/Reports.pm:91 msgid "To view a map of the precise location of this issue" -msgstr "" +msgstr "ПроÑмотр точного меÑÑ‚Ð¾Ð¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ Ð´Ð°Ð½Ð½Ð¾Ð¹ проблемы на карте" -#: templates/web/base/admin/index.html:61 +#: templates/web/base/admin/index.html:54 #: templates/web/base/admin/questionnaire.html:24 #: templates/web/base/admin/stats.html:24 #: templates/web/base/admin/stats.html:43 #: templates/web/zurich/admin/stats.html:30 msgid "Total" -msgstr "" +msgstr "Ð’Ñего" #: templates/web/base/js/translation_strings.html:29 msgid "Try again" -msgstr "" +msgstr "Повторите попытку" #: templates/web/base/contact/submit.html:14 msgid "Try emailing us directly:" -msgstr "" +msgstr "Ðапишите нам:" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:12 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:33 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:31 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:37 msgid "Unable to fix" -msgstr "" +msgstr "Ðевозможно уÑтранить" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:19 @@ -3370,150 +3355,142 @@ msgstr "" #: templates/web/zurich/admin/report_edit.html:92 #: templates/web/zurich/admin/update_edit.html:18 msgid "Unconfirmed" -msgstr "" +msgstr "Ðе подтверждено" -#: templates/web/fixmystreet/report/banner.html:9 +#: templates/web/base/report/banner.html:9 msgid "Unknown" -msgstr "" +msgstr "Ðеизв." #: perllib/FixMyStreet/App/Controller/Rss.pm:173 msgid "Unknown alert type" -msgstr "" +msgstr "ÐеизвеÑтный тип уведомлениÑ" +#: perllib/FixMyStreet/App/Controller/Photo.pm:110 #: templates/web/base/js/translation_strings.html:39 msgid "Unknown error" -msgstr "" +msgstr "ÐеизвеÑÑ‚Ð½Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ°" -#: perllib/FixMyStreet/App/Controller/Report.pm:103 -#: perllib/FixMyStreet/App/Controller/Report.pm:109 -#: perllib/FixMyStreet/App/Controller/Report.pm:112 +#: perllib/FixMyStreet/App/Controller/Report.pm:105 +#: perllib/FixMyStreet/App/Controller/Report.pm:111 +#: perllib/FixMyStreet/App/Controller/Report.pm:114 msgid "Unknown problem ID" -msgstr "" +msgstr "ÐеизвеÑтный идентификатор проблемы" -#: templates/web/fixmystreet/report/update-form.html:19 +#: templates/web/base/report/update/form_update.html:25 msgid "Update" -msgstr "" +msgstr "Обновление" #: templates/web/base/admin/timeline.html:33 msgid "Update %s created for problem %d; by %s" -msgstr "" +msgstr "Добавлены новые данные (%s) Ð´Ð»Ñ Ð¿Ñ€Ð¾Ð±Ð»ÐµÐ¼Ñ‹: %d;, автор: %s" -#: templates/web/base/contact/index.html:21 -#: templates/web/fixmystreet/contact/index.html:36 +#: templates/web/base/contact/index.html:28 msgid "Update below added anonymously at %s" -msgstr "" +msgstr "Ðиже предÑтавлены анонимно добавленные новые данные в: %s" -#: templates/web/base/contact/index.html:23 -#: templates/web/fixmystreet/contact/index.html:38 +#: templates/web/base/contact/index.html:30 msgid "Update below added by %s at %s" -msgstr "" +msgstr "Ðиже предÑтавлены новые данные, добавленные пользователем: %s, в: %s" #: templates/web/base/admin/body-form.html:240 #: templates/web/zurich/admin/body-form.html:52 msgid "Update body" -msgstr "" +msgstr "Обновить данные об учреждении" -#: templates/web/base/admin/index.html:55 +#: templates/web/base/admin/index.html:48 msgid "Update breakdown by state" -msgstr "" +msgstr "Сортировка обновлений по ÑтатуÑу" #: db/alert_types.pl:7 msgid "Update by {{name}}" -msgstr "" +msgstr "Обновлено: {{name}}" #: templates/web/base/admin/update_edit.html:42 #: templates/web/zurich/admin/update_edit.html:25 msgid "Update changed problem state to %s" -msgstr "" +msgstr "Ð’ результате Ð´Ð¾Ð±Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ð´Ð°Ð½Ð½Ñ‹Ñ… ÑÑ‚Ð°Ñ‚ÑƒÑ Ð¿Ñ€Ð¾Ð±Ð»ÐµÐ¼Ñ‹ изменен на: %s" #: templates/web/base/admin/update_edit.html:44 msgid "Update marked problem as fixed" -msgstr "" +msgstr "Ð’ результате Ð´Ð¾Ð±Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ð´Ð°Ð½Ð½Ñ‹Ñ… проблема помечена как решеннаÑ" #: templates/web/base/admin/update_edit.html:46 msgid "Update reopened problem" -msgstr "" +msgstr "Ð’ результате Ð´Ð¾Ð±Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ð´Ð°Ð½Ð½Ñ‹Ñ… проблема помечена как заново открытаÑ" #: templates/web/base/admin/body.html:101 msgid "Update statuses" -msgstr "" - -#: templates/web/base/report/update-form.html:22 -msgid "Update:" -msgstr "" +msgstr "Обновление ÑтатуÑов" #: templates/web/zurich/admin/index-dm.html:23 #: templates/web/zurich/admin/index-sdm.html:21 #: templates/web/zurich/admin/reports.html:13 msgid "Updated" -msgstr "" +msgstr "Обновлено" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1045 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1103 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1147 -#: perllib/FixMyStreet/App/Controller/Admin.pm:822 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1048 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1108 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1156 +#: perllib/FixMyStreet/App/Controller/Admin.pm:821 #: perllib/FixMyStreet/Cobrand/Zurich.pm:771 #: perllib/FixMyStreet/Cobrand/Zurich.pm:796 #: perllib/FixMyStreet/Cobrand/Zurich.pm:866 msgid "Updated!" -msgstr "" +msgstr "Обновлено!" #: templates/web/base/admin/list_updates.html:2 -#: templates/web/base/report/update.html:3 -#: templates/web/fixmystreet/report/update.html:5 +#: templates/web/base/report/update.html:5 #: templates/web/zurich/report/updates.html:2 msgid "Updates" -msgstr "" +msgstr "ОбновлениÑ" -#: perllib/FixMyStreet/DB/Result/Comment.pm:132 +#: perllib/FixMyStreet/DB/Result/Comment.pm:131 msgid "Updates are limited to %s characters in length. Please shorten your update" -msgstr "" +msgstr "ТекÑÑ‚ Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð¾Ð³Ñ€Ð°Ð½Ð¸Ñ‡ÐµÐ½ %s Ñимв. Ðапишите более короткое Ñообщение" #: db/alert_types.pl:5 db/alert_types.pl:6 msgid "Updates on {{title}}" -msgstr "" +msgstr "Ðовые данные длÑ: {{title}}" #. ("%s is the site name") #: templates/web/base/report/display.html:0 -#: templates/web/base/report/display.html:5 -#: templates/web/fixmystreet/report/display.html:0 -#: templates/web/fixmystreet/report/display.html:9 +#: templates/web/base/report/display.html:9 msgid "Updates to this problem, %s" -msgstr "" +msgstr "Ðовые данные Ð´Ð»Ñ Ð¿Ñ€Ð¾Ð±Ð»ÐµÐ¼Ñ‹: %s" #: templates/web/base/admin/body.html:182 msgid "Use the <strong>note</strong> to record details that are only displayed in the admin. Notes are not shown publicly, and are not sent to the body." -msgstr "" +msgstr "ИÑпользуйте <strong>заметки</strong>, чтобы предоÑтавить дополнительную информацию Ð´Ð»Ñ Ð°Ð´Ð¼Ð¸Ð½Ð¸Ñтратора. Заметки не видны другим пользователÑм и не отправлÑÑŽÑ‚ÑÑ Ð² органы ÑамоуправлениÑ." #: templates/web/zurich/admin/report_edit-sdm.html:48 #: templates/web/zurich/admin/report_edit.html:67 msgid "Used map" -msgstr "" +msgstr "ИÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½Ð½Ð°Ñ ÐºÐ°Ñ€Ñ‚Ð°" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1452 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1461 msgid "User flag removed" -msgstr "" +msgstr "Пометка удалена" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1424 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1433 msgid "User flagged" -msgstr "" +msgstr "Ðккаунт Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð¿Ð¾Ð¼ÐµÑ‡ÐµÐ½" #: templates/web/base/admin/users.html:5 msgid "User search finds matches in users' names and email addresses." -msgstr "" +msgstr "При поиÑке пользователей на Ñайте ÑиÑтема находит ÑоответÑÑ‚Ð²Ð¸Ñ Ð¼ÐµÐ¶Ð´Ñƒ именами пользователей и адреÑами Ñл. почты." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1280 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1289 #: perllib/FixMyStreet/Cobrand/Zurich.pm:399 #: templates/web/base/admin/flagged.html:29 #: templates/web/zurich/header.html:69 msgid "Users" -msgstr "" +msgstr "Пользователи" #: perllib/FixMyStreet/App/Controller/Admin.pm:382 #: perllib/FixMyStreet/App/Controller/Admin.pm:412 #: perllib/FixMyStreet/App/Controller/Admin.pm:429 msgid "Values updated" -msgstr "" +msgstr "Ð—Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ñ‹" #: templates/web/base/admin/report_edit.html:18 #: templates/web/base/admin/update_edit.html:18 @@ -3521,130 +3498,127 @@ msgstr "" #: templates/web/zurich/admin/report_edit.html:22 #: templates/web/zurich/admin/update_edit.html:10 msgid "View report on site" -msgstr "" +msgstr "ПоÑмотреть обращение на Ñайте" #: templates/web/base/reports/body.html:14 msgid "View reports by ward" -msgstr "" +msgstr "ПоÑмотреть Ð¾Ð±Ñ€Ð°Ñ‰ÐµÐ½Ð¸Ñ Ð¿Ð¾ районам" #: templates/web/base/around/display_location.html:0 #: templates/web/base/around/display_location.html:35 msgid "Viewing a location" -msgstr "" +msgstr "ПроÑмотр меÑтоположениÑ" #: templates/web/base/report/display.html:0 -#: templates/web/fixmystreet/report/display.html:0 msgid "Viewing a problem" -msgstr "" +msgstr "ПроÑмотр проблемы" #: templates/web/base/reports/body.html:16 msgid "Wards of this council" -msgstr "" +msgstr "Районы, которые находÑÑ‚ÑÑ Ð² ведении данного органа ÑамоуправлениÑ" #: templates/web/base/alert/choose.html:6 #: templates/web/base/around/_error_multiple.html:6 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/zurich/auth/token.html:7 -msgid "We have not been able to confirm your account - sorry." -msgstr "" +msgstr "Мы нашли более одного ÑоответÑÑ‚Ð²Ð¸Ñ Ñтому меÑтоположению. Ðа Ñтранице отображаетÑÑ Ð½Ðµ более деÑÑти результатов поиÑка. ЕÑли вы не нашли нужную информацию в результатах, попробуйте поиÑк по другим параметрам." -#: templates/web/zurich/auth/token.html:17 -msgid "We have sent you an email containing a link to confirm your account." -msgstr "" +#: templates/web/base/auth/general.html:6 +#: templates/web/base/report/display.html:27 +#: templates/web/base/report/new/oauth_email_form.html:5 +#, fuzzy +msgid "We need your email address, please give it below." +msgstr "Мы никому не будем показывать ваш Ð°Ð´Ñ€ÐµÑ Ñл. почты или номер телефона" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:2 -#: templates/web/fixmystreet/report/update-form.html:77 +#: templates/web/base/report/new/form_user_loggedout_email.html:2 +#: templates/web/base/report/update/form_user_loggedout_email.html:2 msgid "We never show your email" -msgstr "" +msgstr "Мы никому не будем показывать ваш Ð°Ð´Ñ€ÐµÑ Ñл. почты" -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:31 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:65 +#: templates/web/base/report/new/form_user_loggedin.html:31 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:28 msgid "We never show your email address or phone number." -msgstr "" +msgstr "Мы никому не будем показывать ваш Ð°Ð´Ñ€ÐµÑ Ñл. почты или номер телефона" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:422 +#: perllib/FixMyStreet/Script/Reports.pm:200 msgid "We realise this problem might be the responsibility of %s; however, we don't currently have any contact details for them. If you know of an appropriate contact address, please do get in touch." -msgstr "" +msgstr "Скорее вÑего, Ñта проблема находитÑÑ Ð² ведении Ñтой инÑтанции: %s;. Однако в нашей ÑиÑтеме нет ее контактных данных. ЕÑли вам извеÑтен дейÑтвующий Ð°Ð´Ñ€ÐµÑ Ñтой организации, напишите нам об Ñтом." #: templates/web/base/index-steps.html:31 msgid "We send it to the council on your behalf" -msgstr "" +msgstr "Данные будут отправлены в орган ÑÐ°Ð¼Ð¾ÑƒÐ¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ð¾Ñ‚ вашего имени" #: templates/web/base/report/new/notes.html:4 #: templates/web/zurich/report/new/notes.html:4 msgid "We will only use your personal information in accordance with our <a href=\"/privacy\">privacy policy.</a>" -msgstr "" +msgstr "Мы обÑзуемÑÑ Ð¸Ñпользовать предоÑтавленные вами перÑональные данные в ÑоответÑтвии Ñ Ð½Ð°ÑˆÐµÐ¹ <a href=\"/privacy\">политикой конфиденциальноÑти.</a>" #: templates/web/base/questionnaire/completed-open.html:2 msgid "We’re sorry to hear the problem’s not fixed. Why not try writing to your local representatives?" -msgstr "" - -#: templates/web/base/contact/blurb.html:8 -msgid "We'd love to hear what you think about this site. Just fill in the form, or send an email to <a href='mailto:%s'>%s</a>:" -msgstr "" +msgstr "Ðам жаль, что проблему не удалоÑÑŒ решить. Рекомендуем обратитьÑÑ Ðº предÑтавителÑм муниципальной влаÑти." #: templates/web/base/contact/submit.html:7 msgid "We’ll get back to you as soon as we can." -msgstr "" +msgstr "Мы ÑвÑжемÑÑ Ñ Ð²Ð°Ð¼Ð¸ при первой возможноÑти." #: templates/web/base/questionnaire/index.html:71 msgid "What was your experience of getting the problem fixed?" -msgstr "" +msgstr "РаÑÑкажите о вашем опыте Ñ€ÐµÑˆÐµÐ½Ð¸Ñ Ð¿Ñ€Ð¾Ð±Ð»ÐµÐ¼Ñ‹ на Ñайте." -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:49 +#: templates/web/base/report/new/form_report.html:19 msgid "What’s the issue, and where is it?" -msgstr "" +msgstr "Ð’ чем ÑоÑтоÑла неполадка и где она находилаÑÑŒ?" #: templates/web/base/admin/category_edit.html:90 #: templates/web/zurich/admin/body.html:18 msgid "When edited" -msgstr "" +msgstr "Когда были отредактированы данные" #: templates/web/base/admin/problem_row.html:35 msgid "When sent" +msgstr "Когда были отправлены данные" + +#: templates/web/base/js/translation_strings.html:50 +msgid "Whoa there Testino! Three photos are enough." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:640 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:635 msgid "Whole block of empty flats" -msgstr "" +msgstr "Целый квартал незаÑеленных квартир" #: templates/web/base/tokens/confirm_alert.html:7 msgid "Why stop there? <a href=\"/alert\">Set up more alerts</a> for free." -msgstr "" +msgstr "И Ñто еще не вÑÑ‘! <a href=\"/alert\">ПодпишитеÑÑŒ на другие уведомлениÑ</a> беÑплатно." #: perllib/FixMyStreet/Cobrand/Zurich.pm:192 #: perllib/FixMyStreet/Cobrand/Zurich.pm:932 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:14 msgid "Wish" -msgstr "" +msgstr "Пожелание" -#: templates/web/base/open311/index.html:92 +#: templates/web/base/open311/index.html:84 msgid "With request searches, it is also possible to search for agency_responsible to limit the requests to those sent to a single administration. The search term is the administration ID provided by <a href=\"%s\">MaPit</a>." -msgstr "" +msgstr "С помощью поиÑка по запроÑу можно иÑкать, иÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÑ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€ agency_responsible, чтобы ограничить результаты поиÑка до обращений, которые были отправлены в один админиÑтративный орган. УÑловие поиÑка – идентификатор админиÑтрации, предоÑтавленный ÑервиÑом <a href=\"%s\">MaPit</a>." #: templates/web/base/front/footer-marketing.html:17 msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"http://fixmystreet.org\">available at fixmystreet.org</a>." -msgstr "" +msgstr "Хотите помочь проекту FixMyStreet? Ðаш код находитÑÑ Ð² открытом доÑтупе и <a href=\"http://fixmystreet.org\">доÑтупен на Ñайте fixmystreet.org</a>." -#: templates/web/base/questionnaire/index.html:87 +#: templates/web/base/questionnaire/index.html:96 msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?" -msgstr "" +msgstr "Хотите получить еще один Ð¾Ð¿Ñ€Ð¾Ñ Ñ‡ÐµÑ€ÐµÐ· 4 недели? Ð’ нем мы напомним вам проверить ÑÑ‚Ð°Ñ‚ÑƒÑ Ð¾Ð±Ñ€Ð°Ñ‰ÐµÐ½Ð¸Ñ." #: templates/web/base/report/new/notes.html:7 msgid "Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation." -msgstr "" +msgstr "Избегайте пунктуационных ошибок и не пишите ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ð·Ð°Ð³Ð»Ð°Ð²Ð½Ñ‹Ð¼Ð¸ буквами: вÑÑ‘ Ñто уÑложнÑет прочтение текÑта." #: templates/web/base/report/new/fill_in_details_form.html:4 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:5 msgid "Wrong location? Just click again on the map." -msgstr "" +msgstr "Ðеверно указано меÑтоположение? Ðажмите на карту еще раз." #: templates/web/base/admin/stats.html:10 msgid "Year" -msgstr "" +msgstr "Год" #: templates/web/base/admin/bodies.html:66 #: templates/web/base/admin/body.html:80 templates/web/base/admin/body.html:82 @@ -3661,42 +3635,39 @@ msgstr "" #: templates/web/base/admin/users.html:31 #: templates/web/base/questionnaire/creator_fixed.html:14 #: templates/web/base/questionnaire/index.html:51 -#: templates/web/base/questionnaire/index.html:90 +#: templates/web/base/questionnaire/index.html:99 msgid "Yes" -msgstr "" +msgstr "Да" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:17 -#: templates/web/fixmystreet/report/update-form.html:91 +#: templates/web/base/report/new/form_user_loggedout_password.html:5 +#: templates/web/base/report/update/form_user_loggedout_password.html:4 msgid "Yes I have a password" -msgstr "" +msgstr "Да, у Ð¼ÐµÐ½Ñ ÐµÑÑ‚ÑŒ пароль" -#: templates/web/base/contact/index.html:39 -#: templates/web/fixmystreet/contact/index.html:54 +#: templates/web/base/contact/index.html:46 msgid "You are complaining that this problem report was unnecessarily moderated:" -msgstr "" +msgstr "Ð’Ñ‹ Ñчитаете, что Ñта проблема не нуждалаÑÑŒ в модерации:" -#: templates/web/base/contact/index.html:41 -#: templates/web/fixmystreet/contact/index.html:56 +#: templates/web/base/contact/index.html:48 msgid "You are reporting the following problem report for being abusive, containing personal information, or similar:" -msgstr "" +msgstr "Ð’Ñ‹ ÑобираетеÑÑŒ пожаловатьÑÑ Ð½Ð° Ñто обращение и Ñчитаете, что оно Ñодержит оÑкорблениÑ, конфиденциальную информацию или как-либо еще нарушает правила Ñайта:" -#: templates/web/base/contact/index.html:15 -#: templates/web/fixmystreet/contact/index.html:30 +#: templates/web/base/contact/index.html:22 msgid "You are reporting the following update for being abusive, containing personal information, or similar:" -msgstr "" +msgstr "Ð’Ñ‹ ÑобираетеÑÑŒ пожаловатьÑÑ Ð½Ð° Ñто обновление и Ñчитаете, что оно Ñодержит оÑкорблениÑ, конфиденциальную информацию или как-либо еще нарушает правила Ñайта:" #: templates/web/zurich/tokens/confirm_problem.html:5 #: templates/web/zurich/tokens/confirm_problem.html:8 msgid "You can <a href=\"%s%s\">view the problem on this site</a>." -msgstr "" +msgstr "Ð’Ñ‹ можете <a href=\"%s%s\">ознакомитьÑÑ Ñ Ð¿Ñ€Ð¾Ð±Ð»ÐµÐ¼Ð¾Ð¹ на Ñтом Ñайте</a>." #: templates/web/base/admin/user-form.html:48 msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create." -msgstr "" +msgstr "Ð’Ñ‹ можете добавить Ð°Ð´Ñ€ÐµÑ Ñл. почты пользователÑ, который проÑвлÑет ÑÐµÐ±Ñ Ð½ÐµÐºÐ¾Ñ€Ñ€ÐµÐºÑ‚Ð½Ð¾, в черный ÑпиÑок. Ð’Ñе дальнейшие Ð¾Ð±Ñ€Ð°Ñ‰ÐµÐ½Ð¸Ñ Ñтого Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð½Ðµ будут опубликованы и отправлены." -#: templates/web/fixmystreet/contact/index.html:121 +#: templates/web/base/contact/index.html:113 msgid "You can contact technical support on <a href='mailto:%s'>%s</a>" -msgstr "" +msgstr "Ð’Ñ‹ можете напиÑать в Ñлужбу техничеÑкой поддержки: <a href='mailto:%s'>%s</a>" #: templates/web/base/admin/flagged.html:5 msgid "" @@ -3704,68 +3675,66 @@ msgid "" " For example, this can useful if you want to keep an eye on a user who has posted inappropriate\n" " reports in the past." msgstr "" +"Ð’Ñ‹ можете пометить любое обращение или пользователÑ: Ð´Ð»Ñ Ñтого нужно отредактировать информацию о них. Помеченные аккаунты или Ð¾Ð±Ñ€Ð°Ñ‰ÐµÐ½Ð¸Ñ Ð±ÑƒÐ´ÑƒÑ‚ отображатьÑÑ Ð½Ð° Ñтой Ñтранице.\n" +" Так можно поÑтупать в ÑлучаÑÑ…, когда вы хотите отÑлеживать дейÑÑ‚Ð²Ð¸Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ, который ранее публиковал \n" +" неумеÑтные материалы." -#: templates/web/base/report/new/councils_text_none.html:10 -#: templates/web/base/report/new/councils_text_none.html:2 +#: templates/web/base/report/new/councils_text_none.html:12 +#: templates/web/base/report/new/councils_text_none.html:14 #: templates/web/base/report/new/councils_text_some.html:19 #: templates/web/base/report/new/councils_text_some.html:21 msgid "You can help us by finding a contact email address for local problems for %s and emailing it to us at <a href='mailto:%s'>%s</a>." -msgstr "" +msgstr "Ð’Ñ‹ можете помочь нам: найдите контактные данные учреждениÑ, в ведении которого находÑÑ‚ÑÑ Ð½ÐµÐ¿Ð¾Ð»Ð°Ð´ÐºÐ¸ в районе (%s), и пришлите Ñти данные нам: <a href='mailto:%s'>%s</a>." #: templates/web/base/admin/body-form.html:85 msgid "You can mark a body as deleted if you do not want it to be active on the site." -msgstr "" +msgstr "Ð’Ñ‹ можете отметить учреждение как удаленное, еÑли не хотите, чтобы его предÑтавители оÑущеÑтвлÑли деÑтельноÑÑ‚ÑŒ на Ñтом Ñайте." #: templates/web/base/js/translation_strings.html:36 msgid "You declined; please fill in the box above" -msgstr "" +msgstr "Ð’Ñ‹ отказалиÑÑŒ; заполните форму выше" #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:38 msgid "You have already answered this questionnaire. If you have a question, please <a href='%s'>get in touch</a>, or <a href='%s'>view your problem</a>.\n" -msgstr "" +msgstr "Ð’Ñ‹ уже ответили на Ñтот опроÑ. ЕÑли у Ð²Ð°Ñ ÐµÑÑ‚ÑŒ вопроÑÑ‹, <a href='%s'>пишите нам</a> или <a href='%s'>ознакомьтеÑÑŒ Ñ Ð´Ð°Ð½Ð½Ñ‹Ð¼Ð¸ опубликованной вами проблемы</a>.\n" -#: templates/web/base/questionnaire/index.html:77 -#: templates/web/base/report/new/fill_in_details_form.html:75 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:73 -msgid "You have already attached a photo to this report, attaching another one will replace it." -msgstr "" - -#: templates/web/base/report/update-form.html:59 -#: templates/web/fixmystreet/report/update-form.html:56 -msgid "You have already attached a photo to this update, attaching another one will replace it." -msgstr "" - -#: templates/web/zurich/report/new/fill_in_details_form.html:61 +#: templates/web/base/report/new/form_report.html:32 +#: templates/web/zurich/report/new/fill_in_details_form.html:55 msgid "You have already attached photos to this report. Note that you can attach a maximum of 3 to this report (if you try to upload more, the oldest will be removed)." -msgstr "" +msgstr "Ð’Ñ‹ уже предоÑтавили фото в Ñтом обращении. Важно: можно прикрепить не более 3 фото (еÑли выбрать больше изображений, они заменÑÑ‚ прикрепленные ранее)." + +#: templates/web/base/questionnaire/index.html:83 +#: templates/web/base/report/update/form_update.html:14 +#, fuzzy +msgid "You have already attached photos to this update. Note that you can attach a maximum of 3 to this update (if you try to upload more, the oldest will be removed)." +msgstr "Ð’Ñ‹ уже предоÑтавили фото в Ñтом обращении. Важно: можно прикрепить не более 3 фото (еÑли выбрать больше изображений, они заменÑÑ‚ прикрепленные ранее)." #: templates/web/base/auth/sign_out.html:4 #: templates/web/zurich/auth/sign_out.html:3 msgid "You have been signed out" -msgstr "" +msgstr "Был оÑущеÑтвлен выход из ÑиÑтемы" #: templates/web/zurich/report/new/fill_in_details_form.html:13 msgid "You have located the problem at the point marked with a green pin on the map. If this is not the correct location, simply click on the map again. " -msgstr "" +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 "" +msgstr "Ð’Ñ‹ подтвердили Ñвой Ð°Ð´Ñ€ÐµÑ Ñл. почты." -#: templates/web/base/report/display.html:20 -#: templates/web/base/report/new/fill_in_details.html:37 -#: templates/web/fixmystreet/report/display.html:17 +#: templates/web/base/report/display.html:17 +#: templates/web/base/report/new/login_success_form.html:3 msgid "You have successfully signed in; please check and confirm your details are accurate:" -msgstr "" +msgstr "Ð’Ñ‹ вошли в ÑиÑтему. Проверьте и подтвердите информацию в Ñвоем профиле:" #: templates/web/base/my/my.html:20 msgid "You haven’t created any reports yet. <a href=\"%s\">Report a problem now.</a>" -msgstr "" +msgstr "Ð’Ñ‹ еще не Ñоздали ни одного обращениÑ. <a href=\"%s\">Самое Ð²Ñ€ÐµÐ¼Ñ Ð½Ð°Ñ‡Ð°Ñ‚ÑŒ!</a>" #: templates/web/base/admin/index.html:19 msgid "You need to <a href=\"%s\">add some bodies</a> (such as councils or departments) before any reports can be sent." -msgstr "" +msgstr "Перед отправкой обращений вам необходимо <a href=\"%s\">добавить неÑколько учреждений</a> (например, органы ÑÐ°Ð¼Ð¾ÑƒÐ¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ð¸Ð»Ð¸ отделы)." #: templates/web/base/admin/bodies.html:7 msgid "" @@ -3773,200 +3742,186 @@ msgid "" " the categories of problems they can handle (such as potholes or streetlights) and the\n" " contacts (such as an email address) to which reports are sent." msgstr "" +"Ðеобходимо добавить ÑƒÑ‡Ñ€ÐµÐ¶Ð´ÐµÐ½Ð¸Ñ (например, орган ÑÐ°Ð¼Ð¾ÑƒÐ¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ð¸Ð»Ð¸ отдел), чтобы затем добавить\n" +" категории проблем, которые им подведомÑтвены (например, колдобины или уличное оÑвещение),\n" +" а также контактную информацию (например, Ð°Ð´Ñ€ÐµÑ Ñл. почты) Ð´Ð»Ñ Ð¾Ñ‚Ð¿Ñ€Ð°Ð²ÐºÐ¸ обращений." #: templates/web/base/admin/report_edit.html:67 msgid "You really want to resend?" -msgstr "" +msgstr "Ð’Ñ‹ дейÑтвительно хотите заново отправить обращение?" #: templates/web/base/my/my.html:0 templates/web/base/my/my.html:15 #: templates/web/base/my/my.html:4 msgid "Your Reports" -msgstr "" +msgstr "Ваши обращениÑ" #: templates/web/base/alert/_list.html:89 +#: templates/web/base/contact/index.html:83 +#: templates/web/base/report/display_tools.html:38 +#: templates/web/base/report/display_tools.html:40 +#: templates/web/base/report/new/form_user_loggedin.html:3 +#: templates/web/base/report/new/form_user_loggedout_email.html:1 +#: templates/web/base/report/update/form_user_loggedout_email.html:1 #: templates/web/fixmystreet/alert/updates.html:19 #: templates/web/fixmystreet/alert/updates.html:22 -#: templates/web/fixmystreet/contact/index.html:91 -#: templates/web/fixmystreet/report/display.html:62 -#: templates/web/fixmystreet/report/display.html:64 -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:3 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:1 -#: templates/web/fixmystreet/report/update-form.html:76 #: templates/web/zurich/report/new/fill_in_details_form.html:76 msgid "Your email" -msgstr "" +msgstr "Ваш Ñл. адреÑ" -#: templates/web/base/auth/general.html:28 -#: templates/web/fixmystreet/report/update-form.html:82 +#: templates/web/base/auth/general.html:45 +#: templates/web/base/report/update/form_user_loggedout_email.html:7 #: templates/web/zurich/auth/general.html:30 #: templates/web/zurich/auth/general.html:58 msgid "Your email address" -msgstr "" +msgstr "Ваш Ð°Ð´Ñ€ÐµÑ Ñл. почты" -#: templates/web/base/report/new/fill_in_details_form.html:106 -#: templates/web/base/report/update-form.html:81 -msgid "Your email:" -msgstr "" - -#: templates/web/fixmystreet/report/updates-sidebar-notes.html:7 +#: templates/web/base/report/updates-sidebar-notes.html:3 msgid "Your information will only be used in accordance with our <a href=\"/privacy\">privacy policy</a>" -msgstr "" +msgstr "Мы обÑзуемÑÑ Ð¸Ñпользовать предоÑтавленные вами перÑональные данные в ÑоответÑтвии Ñ Ð½Ð°ÑˆÐµÐ¹ <a href=\"/privacy\">политикой конфиденциальноÑти</a>" -#: templates/web/base/auth/general.html:51 -#: templates/web/fixmystreet/contact/index.html:84 -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:18 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:54 -#: templates/web/fixmystreet/report/update-form.html:142 +#: templates/web/base/auth/general.html:90 +#: templates/web/base/contact/index.html:76 +#: templates/web/base/report/new/form_user_loggedin.html:18 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:17 +#: templates/web/base/report/update/form_name.html:11 #: templates/web/zurich/auth/general.html:61 #: templates/web/zurich/report/new/fill_in_details_form.html:86 msgid "Your name" -msgstr "" +msgstr "Ваше имÑ" -#: templates/web/base/contact/index.html:73 -#: templates/web/base/report/new/fill_in_details_form.html:186 -#: templates/web/base/report/update-form.html:152 -msgid "Your name:" -msgstr "" - -#: templates/web/base/auth/general.html:39 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:22 -#: templates/web/fixmystreet/report/update-form.html:96 +#: templates/web/base/auth/general.html:75 +#: templates/web/base/report/new/form_user_loggedout_password.html:10 +#: templates/web/base/report/update/form_user_loggedout_password.html:9 #: templates/web/zurich/auth/general.html:34 msgid "Your password" -msgstr "" +msgstr "Ваш пароль" #: templates/web/base/auth/change_password.html:6 msgid "Your password has been changed" -msgstr "" +msgstr "Ваш пароль был изменен" -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:27 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:63 +#: templates/web/base/report/new/form_user_loggedin.html:27 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:26 #: templates/web/zurich/report/new/fill_in_details_form.html:92 msgid "Your phone number" -msgstr "" +msgstr "Ваш номер телефона" #: templates/web/base/questionnaire/index.html:14 +#, fuzzy msgid "Your report" -msgstr "" +msgstr "Ваши обращениÑ" #: templates/web/base/footer.html:9 templates/web/fixmystreet/footer.html:29 msgid "Your reports" -msgstr "" +msgstr "Ваши обращениÑ" #: templates/web/base/my/my.html:41 msgid "Your updates" -msgstr "" - -#: templates/web/base/contact/index.html:81 -msgid "Your email:" -msgstr "" +msgstr "Ваши обновлениÑ" #: templates/web/base/reports/_list-filters.html:3 -#, fuzzy msgid "all reports" -msgstr "Ð’Ñе отчеты" +msgstr "вÑе обращениÑ" #: templates/web/base/admin/timeline.html:4 msgid "by %s" -msgstr "" +msgstr "автор: %s" #: templates/web/base/reports/_list-filters.html:5 -#, fuzzy msgid "closed reports" -msgstr "Ð’Ñе отчеты" +msgstr "закрытые обращениÑ" #: templates/web/base/reports/body.html:6 #: templates/web/base/reports/body.html:7 msgid "council" -msgstr "" +msgstr "орган ÑамоуправлениÑ" #: templates/web/base/admin/report_edit.html:32 msgid "didn't use map" -msgstr "" +msgstr "карта не иÑпользовалаÑÑŒ" #: templates/web/base/alert/index.html:33 #: templates/web/base/around/postcode_form.html:15 msgid "e.g. ‘%s’ or ‘%s’" -msgstr "" +msgstr "напр.: ‘%s’ или ‘%s’" #: templates/web/base/admin/body-form.html:188 #: templates/web/base/admin/flagged.html:51 msgid "edit user" -msgstr "" +msgstr "редактировать информацию о пользователе" #: templates/web/base/reports/_list-filters.html:6 -#, fuzzy msgid "fixed reports" -msgstr "Ð’Ñе отчеты" +msgstr "решенные проблемы" -#: templates/web/base/admin/index.html:33 +#: templates/web/base/status/stats.html:20 #: templates/web/zurich/admin/index.html:5 msgid "from %s different users" -msgstr "" +msgstr "от разных пользователей (%s)" -#: templates/web/base/report/_item.html:17 -#: templates/web/zurich/report/_item.html:16 +#: templates/web/base/report/_item.html:15 +#: templates/web/zurich/report/_item.html:14 msgid "last updated %s" -msgstr "" +msgstr "поÑледнее обновление: %s" #: perllib/Utils.pm:204 msgid "less than a minute" -msgstr "" +msgstr "менее минуты" #: templates/web/base/report/updates.html:57 msgid "marked as a duplicate report" -msgstr "" +msgstr "помечено как ÐºÐ¾Ð¿Ð¸Ñ Ð¾Ð±Ñ€Ð°Ñ‰ÐµÐ½Ð¸Ñ" #: templates/web/base/report/updates.html:47 msgid "marked as action scheduled" -msgstr "" +msgstr "помечено как запланированное дейÑтвие" #: templates/web/base/report/updates.html:59 msgid "marked as an internal referral" -msgstr "" +msgstr "помечено как внутренний реферал" #: templates/web/base/report/updates.html:49 msgid "marked as closed" -msgstr "" +msgstr "помечено как закрытое" #: templates/web/base/report/updates.html:28 #: templates/web/base/report/updates.html:51 msgid "marked as fixed" -msgstr "" +msgstr "помечено как решенное" #: templates/web/base/report/updates.html:45 msgid "marked as in progress" -msgstr "" +msgstr "помечено как находÑщееÑÑ Ð² процеÑÑе разрешениÑ" #: templates/web/base/report/updates.html:41 msgid "marked as investigating" -msgstr "" +msgstr "помечено как находÑщееÑÑ Ð² процеÑÑе раÑÑледованиÑ" #: templates/web/base/report/updates.html:55 msgid "marked as not the council's responsibility" -msgstr "" +msgstr "помечено как Ð²Ð¾Ð¿Ñ€Ð¾Ñ Ð²Ð½Ðµ ответÑтвенноÑти органа управлениÑ" #: templates/web/base/report/updates.html:43 msgid "marked as planned" -msgstr "" +msgstr "помечено как запланированное" #: templates/web/base/report/updates.html:53 msgid "marked as unable to fix" -msgstr "" +msgstr "помечено как проблема, которую невозможно уÑтранить" #: perllib/FixMyStreet/App/Controller/Admin.pm:129 #: templates/web/base/admin/questionnaire.html:15 #: templates/web/base/admin/questionnaire.html:16 msgid "n/a" -msgstr "" +msgstr "недоÑтупн." #: templates/web/base/alert/_list.html:85 msgid "or" -msgstr "" +msgstr "или" #: templates/web/base/js/translation_strings.html:27 msgid "or locate me automatically" -msgstr "" +msgstr "или определите мое меÑтоположение автоматичеÑки" #: templates/web/base/admin/report_edit.html:28 #: templates/web/base/admin/report_edit.html:30 @@ -3981,117 +3936,114 @@ msgstr "" #: templates/web/zurich/admin/report_edit.html:72 #: templates/web/zurich/admin/report_edit.html:74 msgid "originally entered: “%s”" -msgstr "" +msgstr "введено: “%s”" #: templates/web/base/admin/report_edit.html:43 msgid "other areas:" -msgstr "" +msgstr "другие облаÑти" #: templates/web/base/report/updates.html:29 #: templates/web/base/report/updates.html:39 msgid "reopened" -msgstr "" +msgstr "заново открыто" #: templates/web/base/header.html:33 templates/web/fixmystreet/header.html:64 #: templates/web/zurich/footer.html:13 msgid "sign out" -msgstr "" +msgstr "выйти" -#: templates/web/base/report/new/fill_in_details_form.html:12 -#: templates/web/base/report/new/fill_in_details_form.html:15 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:10 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:12 +#: templates/web/base/report/new/fill_in_details_form.html:11 +#: templates/web/base/report/new/fill_in_details_form.html:9 msgid "the local council" -msgstr "" +msgstr "меÑтный орган ÑамоуправлениÑ" #: templates/web/base/report/_main.html:57 #: templates/web/zurich/report/_main.html:5 msgid "there is no pin shown as the user did not use the map" -msgstr "" +msgstr "метка не отображаетÑÑ, так как карта не была иÑпользована" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:398 +#: perllib/FixMyStreet/Script/Reports.pm:176 msgid "this type of local problem" -msgstr "" +msgstr "Ñтот тип проблемы поблизоÑти" #: perllib/Utils.pm:176 msgid "today" -msgstr "" +msgstr "ÑегоднÑ" #: templates/web/base/reports/_list-filters.html:4 -#, fuzzy msgid "unfixed reports" -msgstr "Ð’Ñе отчеты" +msgstr "Ð¾Ð±Ñ€Ð°Ñ‰ÐµÐ½Ð¸Ñ Ñ Ð½ÐµÑƒÑтраненными неполадками" #: templates/web/base/admin/report_edit.html:32 msgid "used map" -msgstr "" +msgstr "карта иÑпользована" #: templates/web/base/admin/update_edit.html:35 msgid "user is from same council as problem - %d" -msgstr "" +msgstr "пользователь проживает недалеко от обнаруженной неполадки на территории, подконтрольной органу ÑÐ°Ð¼Ð¾ÑƒÐ¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ñ (%d)" #: templates/web/base/admin/update_edit.html:38 msgid "user is problem owner" -msgstr "" +msgstr "неполадка находитÑÑ Ð² ÑобÑтвенноÑти пользователÑ" #: templates/web/base/reports/body.html:0 #: templates/web/base/reports/body.html:3 msgid "ward" -msgstr "" +msgstr "район" -#: templates/web/base/front/stats.html:17 +#: templates/web/base/front/stats.html:13 #, perl-format msgid "<big>%s</big> report recently" msgid_plural "<big>%s</big> reports recently" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" +msgstr[0] "<big>%s</big> недавнее обращение" +msgstr[1] "<big>%s</big> недавних обращениÑ" +msgstr[2] "<big>%s</big> недавних обращений" +msgstr[3] "<big>%s</big> недавних обращений" #: perllib/Utils.pm:223 #, perl-format msgid "%d hour" msgid_plural "%d hours" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" +msgstr[0] "%d чаÑ" +msgstr[1] "%d чаÑа" +msgstr[2] "%d чаÑов" +msgstr[3] "%d чаÑов" #: templates/web/base/report/_support.html:6 #, perl-format msgid "%d supporter" msgid_plural "%d supporters" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" +msgstr[0] "%d ÑпонÑор" +msgstr[1] "%d ÑпонÑора" +msgstr[2] "%d ÑпонÑоров" +msgstr[3] "%d ÑпонÑоров" #: perllib/Utils.pm:225 #, perl-format msgid "%d minute" msgid_plural "%d minutes" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" +msgstr[0] "%d минута" +msgstr[1] "%d минуты" +msgstr[2] "%d минут" +msgstr[3] "%d минут" -#: templates/web/base/front/stats.html:29 +#: templates/web/base/front/stats.html:25 #, perl-format msgid "<big>%s</big> update on reports" msgid_plural "<big>%s</big> updates on reports" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" +msgstr[0] "<big>%s</big> обновление обращений" +msgstr[1] "<big>%s</big> Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð¾Ð±Ñ€Ð°Ñ‰ÐµÐ½Ð¸Ð¹" +msgstr[2] "<big>%s</big> обновлений обращений" +msgstr[3] "<big>%s</big> обновлений обращений" #: templates/web/emptyhomes/report/new/councils_text_none.html:3 #, perl-format msgid "We do not yet have details for the council that covers this location." msgid_plural "We do not yet have details for the councils that cover this location." -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" +msgstr[0] "У Ð½Ð°Ñ ÐµÑ‰Ðµ нет подробной информации об органе ÑамоуправлениÑ, в ведении которого находитÑÑ Ñто меÑто." +msgstr[1] "У Ð½Ð°Ñ ÐµÑ‰Ðµ нет подробной информации об органах ÑамоуправлениÑ, в ведении которых находитÑÑ Ñто меÑто." +msgstr[2] "У Ð½Ð°Ñ ÐµÑ‰Ðµ нет подробной информации об органах ÑамоуправлениÑ, в ведении которых находитÑÑ Ñто меÑто." +msgstr[3] "У Ð½Ð°Ñ ÐµÑ‰Ðµ нет подробной информации об органах ÑамоуправлениÑ, в ведении которых находитÑÑ Ñто меÑто." #: perllib/Utils.pm:219 #, perl-format @@ -4102,38 +4054,122 @@ msgstr[1] "%d недели" msgstr[2] "%d недель" msgstr[3] "%d недель" -#: templates/web/base/front/stats.html:12 +#: templates/web/base/front/stats.html:8 #, perl-format msgid "<big>%s</big> report in past week" msgid_plural "<big>%s</big> reports in past week" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" +msgstr[0] "<big>%s</big> обращение за прошлую неделю" +msgstr[1] "<big>%s</big> Ð¾Ð±Ñ€Ð°Ñ‰ÐµÐ½Ð¸Ñ Ð·Ð° прошлую неделю" +msgstr[2] "<big>%s</big> обращений за прошлую неделю" +msgstr[3] "<big>%s</big> обращений за прошлую неделю" -#: templates/web/base/front/stats.html:23 +#: templates/web/base/front/stats.html:19 #, perl-format msgid "<big>%s</big> fixed in past month" msgid_plural "<big>%s</big> fixed in past month" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" +msgstr[0] "<big>%s</big> проблема решена за прошлый меÑÑц" +msgstr[1] "<big>%s</big> проблемы решены за прошлый меÑÑц" +msgstr[2] "<big>%s</big> проблем решено за прошлый меÑÑц" +msgstr[3] "<big>%s</big> проблем решено за прошлый меÑÑц" #: perllib/Utils.pm:221 #, perl-format msgid "%d day" msgid_plural "%d days" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" +msgstr[0] "%d день" +msgstr[1] "%d днÑ" +msgstr[2] "%d дней" +msgstr[3] "%d дней" #: templates/web/base/report/new/councils_text_some.html:13 #, perl-format msgid "We do <strong>not</strong> yet have details for the other council that covers this location." msgid_plural "We do <strong>not</strong> yet have details for the other councils that cover this location." -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" +msgstr[0] "У Ð½Ð°Ñ Ð¿Ð¾ÐºÐ° <strong>нет</strong> подробной информации об органе ÑамоуправлениÑ, в ведении которого находитÑÑ Ñто меÑто." +msgstr[1] "У Ð½Ð°Ñ Ð¿Ð¾ÐºÐ° <strong>нет</strong> подробной информации об органах ÑамоуправлениÑ, в ведении которых находитÑÑ Ñто меÑто." +msgstr[2] "У Ð½Ð°Ñ Ð¿Ð¾ÐºÐ° <strong>нет</strong> подробной информации об органах ÑамоуправлениÑ, в ведении которых находитÑÑ Ñто меÑто." +msgstr[3] "У Ð½Ð°Ñ Ð¿Ð¾ÐºÐ° <strong>нет</strong> подробной информации об органах ÑамоуправлениÑ, в ведении которых находитÑÑ Ñто меÑто." + +#~ msgid "(we never show your email address or phone number)" +#~ msgstr "(мы не будем отображать ваш Ð°Ð´Ñ€ÐµÑ Ñл. почты или номер телефона)" + +#~ msgid "(we never show your email)" +#~ msgstr "(мы не будем отображать ваш Ð°Ð´Ñ€ÐµÑ Ñл. почты)" + +#~ msgid "<strong>No</strong>, let me confirm my report by email:" +#~ msgstr "<strong>Ðет</strong>, Ñ Ñ…Ð¾Ñ‡Ñƒ подтвердить Ñвое обращение Ñлектронным пиÑьмом:" + +#~ msgid "<strong>No</strong>, let me confirm my update by email:" +#~ msgstr "<strong>Ðет</strong>, Ñ Ñ…Ð¾Ñ‡Ñƒ подтвердить обновление Ñлектронным пиÑьмом:" + +#~ msgid "Email me updates" +#~ msgstr "ПриÑылайте мне Ñлектронные пиÑьма Ñ Ð½Ð¾Ð²Ñ‹Ð¼Ð¸ данными" + +#~ msgid "Enter a new password:" +#~ msgstr "Введите новый пароль:" + +#~ 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 "Ðам не удалоÑÑŒ подтвердить токен. Проверьте, правильно ли вы Ñкопировали Ð°Ð´Ñ€ÐµÑ URL из пиÑьма.\n" + +#~ 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 "ЕÑли вы пользуетеÑÑŒ почтовым веб-ÑервиÑом или уÑтановили Ñпам-фильтры, проверьте папку «Спам»: иногда ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ð¾Ñ‚ нашей команды автоматичеÑки попадают туда." + +#~ msgid "Message:" +#~ msgstr "Сообщение:" + +#~ msgid "More problems nearby" +#~ msgstr "Больше неполадок поблизоÑти" + +#~ msgid "Nearly Done! Now check your email..." +#~ msgstr "Почти готово! Проверьте почту..." + +#~ msgid "Offensive? Unsuitable? Tell us" +#~ msgstr "ОÑкорбительное поведение? ÐеумеÑтный комментарий? РаÑÑкажите нам об Ñтом." + +#~ msgid "Photo:" +#~ msgstr "Фото:" + +#~ msgid "Please check your email" +#~ msgstr "Проверьте почту" + +#~ msgid "Please note that updates are not sent to the council. If you leave your name it will be public. Your information will only be used in accordance with our <a href=\"/faq#privacy\">privacy policy</a>" +#~ msgstr "Ðовые данные не отÑылаютÑÑ Ð² органы ÑамоуправлениÑ. ЕÑли вы Ñообщите Ñвое имÑ, его будут видеть оÑтальные пользователи. Мы обÑзуемÑÑ Ð¸Ñпользовать предоÑтавленные вами данные в ÑоответÑтвии Ñ Ð½Ð°ÑˆÐµÐ¹ <a href=\"/faq#privacy\">политикой конфиденциальноÑти</a>" + +#~ msgid "This may be because the link is too old or already used, or the address was not copied correctly." +#~ msgstr "Возможно, ÑÑылка уÑтарела или уже была иÑпользована. Кроме того, Ð°Ð´Ñ€ÐµÑ ÑÑылки мог быть Ñкопирован не полноÑтью." + +#~ msgid "This problem has been closed" +#~ msgstr "Ðта проблема была закрыта" + +#~ msgid "This problem is in progress" +#~ msgstr "Ðта проблема находитÑÑ Ð² Ñтадии разрешениÑ" + +#~ msgid "This problem is old and of unknown status." +#~ msgstr "Ðто давнÑÑ Ð¿Ñ€Ð¾Ð±Ð»ÐµÐ¼Ð° Ñ Ð½ÐµÐ¸Ð·Ð²ÐµÑтным ÑтатуÑом." + +#~ msgid "Update:" +#~ msgstr "Обновить:" + +#~ msgid "We have not been able to confirm your account - sorry." +#~ msgstr "К Ñожалению, нам не удалоÑÑŒ подтвердить ваш аккаунт." + +#~ msgid "We have sent you an email containing a link to confirm your account." +#~ msgstr "Мы отправили вам пиÑьмо Ñо ÑÑылкой Ð´Ð»Ñ Ð¿Ð¾Ð´Ñ‚Ð²ÐµÑ€Ð¶Ð´ÐµÐ½Ð¸Ñ Ð°ÐºÐºÐ°ÑƒÐ½Ñ‚Ð°." + +#~ msgid "We'd love to hear what you think about this site. Just fill in the form, or send an email to <a href='mailto:%s'>%s</a>:" +#~ msgstr "Мы будем рады узнать ваше мнение о Ñайте. Чтобы отправить обратную ÑвÑзь, заполните форму или пришлите пиÑьмо на адреÑ: <a href='mailto:%s'>%s</a>:" + +#~ msgid "You have already attached a photo to this report, attaching another one will replace it." +#~ msgstr "Ð’Ñ‹ уже предоÑтавили фото в Ñтом обращении. ЕÑли выбрать еще одно изображение, оно заменит первое." + +#~ msgid "You have already attached a photo to this update, attaching another one will replace it." +#~ msgstr "Ð’Ñ‹ уже предоÑтавили фото в Ñтом обновлении. ЕÑли выбрать еще одно изображение, оно заменит первое." + +#~ msgid "Your email:" +#~ msgstr "Ваш Ñл. адреÑ:" + +#~ msgid "Your name:" +#~ msgstr "Ваше имÑ:" + +#~ msgid "Your email:" +#~ msgstr "Ваш Ñл. адреÑ:" diff --git a/locale/sq.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/sq.UTF-8/LC_MESSAGES/FixMyStreet.po index 603d65cba..12506a05d 100644 --- a/locale/sq.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/sq.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: fixmystreet\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2015-10-23 16:51+0100\n" -"PO-Revision-Date: 2015-07-31 16:31+0000\n" +"POT-Creation-Date: 2016-03-02 13:09+0000\n" +"PO-Revision-Date: 2015-10-23 16:38+0000\n" "Last-Translator: mySociety <transifex@mysociety.org>\n" "Language-Team: Albanian (http://www.transifex.com/mysociety/fixmystreet/language/sq/)\n" "Language: sq\n" @@ -19,45 +19,24 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:628 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:411 +#: perllib/FixMyStreet/DB/Result/Problem.pm:616 +#: perllib/FixMyStreet/Script/Reports.pm:189 msgid " and " msgstr "dhe" #: templates/web/base/report/new/councils_text_all.html:2 -#: templates/web/base/report/new/councils_text_none.html:11 -#: templates/web/base/report/new/councils_text_none.html:2 +#: templates/web/base/report/new/councils_text_none.html:12 +#: templates/web/base/report/new/councils_text_none.html:15 #: templates/web/base/report/new/councils_text_some.html:19 #: templates/web/base/report/new/councils_text_some.html:22 #: templates/web/base/report/new/councils_text_some.html:5 msgid " or " msgstr "ose" -#: templates/web/base/admin/index.html:35 -#: templates/web/base/status/index.html:13 -msgid "%s confirmed alerts, %s unconfirmed" -msgstr "%d sinjale të konfirmuara, %d te pa konfirmuara" - -#: templates/web/base/admin/index.html:37 -#: templates/web/base/status/index.html:16 -#: templates/web/zurich/admin/index.html:6 -msgid "%s council contacts – %s confirmed, %s unconfirmed" -msgstr "" - #: templates/web/base/admin/edit-league.html:12 msgid "%d edits by %s" msgstr "%d perpunuar nga %s" -#: templates/web/base/admin/index.html:34 -#: templates/web/base/status/index.html:12 -msgid "%s live updates" -msgstr "%d përditësime ne kohë reale" - -#: templates/web/base/admin/index.html:36 -#: templates/web/base/status/index.html:14 -msgid "%s questionnaires sent – %s answered (%s%%)" -msgstr "%d pyetesoret jane derguar– %d pergjigjur (%s%%)" - #: templates/web/base/pagination.html:10 msgid "%d to %d of %d" msgstr "%d në%d të%d" @@ -72,6 +51,19 @@ msgstr "%s - Raportet përmbledhëse" msgid "%s admin:" msgstr "" +#: templates/web/base/status/stats.html:26 +msgid "%s bodies" +msgstr "" + +#: templates/web/base/status/stats.html:24 +msgid "%s confirmed alerts, %s unconfirmed" +msgstr "%s sinjale të konfirmuara, %s te pa konfirmuara" + +#: templates/web/base/status/stats.html:27 +#: templates/web/zurich/admin/index.html:6 +msgid "%s council contacts – %s confirmed, %s unconfirmed" +msgstr "" + #. ("%s is the site name") #: templates/web/base/alert/index.html:7 msgid "" @@ -88,7 +80,15 @@ msgid "" "within a certain distance of a particular location." msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:695 +#: templates/web/base/status/stats.html:23 +msgid "%s live updates" +msgstr "%s përditësime ne kohë reale" + +#: templates/web/base/status/stats.html:25 +msgid "%s questionnaires sent – %s answered (%s%%)" +msgstr "%s pyetesoret jane derguar– %s pergjigjur (%s%%)" + +#: perllib/FixMyStreet/DB/Result/Problem.pm:683 msgid "%s ref: %s" msgstr "%s ref: %s" @@ -103,15 +103,15 @@ msgid "" "for the county council." msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:255 perllib/FixMyStreet/Cobrand/UK.pm:267 +#: perllib/FixMyStreet/Cobrand/UK.pm:256 perllib/FixMyStreet/Cobrand/UK.pm:268 msgid "%s ward, %s" msgstr "%s lagje, %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:564 +#: perllib/FixMyStreet/DB/Result/Problem.pm:552 msgid "%s, reported at %s" msgstr "%s, raportuar në %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:282 perllib/FixMyStreet/Cobrand/UK.pm:294 +#: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295 msgid "%s, within %s ward" msgstr "%s, brenda lagjes %s" @@ -119,7 +119,7 @@ msgstr "%s, brenda lagjes %s" msgid "© <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors" msgstr "" -#: templates/web/zurich/report/new/fill_in_details_form.html:53 +#: templates/web/zurich/report/new/fill_in_details_form.html:46 msgid "(Defect & location of defect)" msgstr "" @@ -130,15 +130,13 @@ msgstr "(Email-i në tabelen abuzimi)" #: templates/web/zurich/admin/report_edit-sdm.html:60 #: templates/web/zurich/admin/report_edit.html:88 -#, fuzzy msgid "(No name)" -msgstr "Emri juaj" +msgstr "" #: templates/web/zurich/admin/report_edit-sdm.html:67 #: templates/web/zurich/admin/report_edit.html:95 -#, fuzzy msgid "(No phone number)" -msgstr "Numri juaj i telefonit" +msgstr "" #: templates/web/base/alert/_list.html:24 msgid "(a default distance which covers roughly 200,000 people)" @@ -146,17 +144,16 @@ msgstr "(nje distance e paracaktuar e cila mbulon pothuajse 200,000 persona)" #. ("%s is a list of distance links, e.g. [2km] / [5km] / [10km] / [20km]") #: templates/web/base/alert/_list.html:29 -#, fuzzy msgid "(alternatively the RSS feed can be customised, within %s)" -msgstr "(ne menyre alternative RSS feed mund te pershtatet, brenda" +msgstr "" -#: templates/web/base/report/_item.html:27 -#: templates/web/zurich/report/_item.html:21 +#: templates/web/base/report/_item.html:25 +#: templates/web/zurich/report/_item.html:19 msgid "(closed)" msgstr "(i mbyllur)" -#: templates/web/base/report/_item.html:25 -#: templates/web/zurich/report/_item.html:19 +#: templates/web/base/report/_item.html:23 +#: templates/web/zurich/report/_item.html:17 msgid "(fixed)" msgstr "(i rregulluar)" @@ -164,37 +161,28 @@ msgstr "(i rregulluar)" msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)" msgstr "" -#: templates/web/base/report/_item.html:21 +#: templates/web/base/report/_item.html:19 msgid "(not sent to council)" msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:200 #: templates/web/zurich/report/new/fill_in_details_form.html:82 msgid "(optional)" msgstr "(opsionale)" -#: templates/web/fixmystreet/report/public_label.html:1 +#: templates/web/base/report/public_label.html:1 msgid "(public)" msgstr "" -#: templates/web/base/report/_item.html:20 +#: templates/web/base/report/_item.html:18 msgid "(sent to both)" msgstr "(dërguar te të dy)" -#: templates/web/base/report/new/fill_in_details_form.html:194 -msgid "(we never show your email address or phone number)" -msgstr "(ne asnjëherë nuk do tëshfaqim email adresen ose numrin tuaj të telefonit)" - -#: templates/web/base/report/update-form.html:159 -msgid "(we never show your email)" -msgstr "(ne asnjëherë nuk do të shfaqim email-in tuaj)" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:673 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 #: perllib/FixMyStreet/DB/Result/Problem.pm:410 msgid "-- Pick a category --" msgstr "-- Zgjedh në kategori --" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:637 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:632 #: perllib/FixMyStreet/DB/Result/Problem.pm:416 msgid "-- Pick a property type --" msgstr "-- Zgjedh nje lloj te karakteristikes --" @@ -216,52 +204,39 @@ msgstr "" msgid "<label>Show %s</label> <label>about %s</label>" msgstr "" -#: templates/web/base/admin/index.html:32 -#: templates/web/base/status/index.html:11 +#: templates/web/base/status/stats.html:18 #: templates/web/zurich/admin/index.html:4 msgid "<strong>%s</strong> live problems" -msgstr "<strong>%d</strong> probleme në kohë reale" +msgstr "<strong>%s</strong> probleme në kohë reale" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:39 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:2 msgid "<strong>No</strong> Let me confirm my report by email" msgstr "<strong>Jo</strong> Më lejo të konfirmoj raportin tim me email" -#: templates/web/fixmystreet/report/update-form.html:112 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:2 msgid "<strong>No</strong> Let me confirm my update by email" msgstr "<strong>Jo</strong> Me lejoni te konfirmoj perditesimin me email" -#: templates/web/base/auth/general.html:48 +#: templates/web/base/auth/general.html:87 #: templates/web/zurich/auth/general.html:51 msgid "<strong>No</strong> let me sign in by email" msgstr "<strong>Jo</strong> më lejo të kyqem me email" -#: templates/web/base/report/new/fill_in_details_form.html:145 -msgid "<strong>No</strong>, let me confirm my report by email:" -msgstr "<strong>Jo</strong>, me lejoni te konfirmoj raportin tim me email:" - -#: templates/web/base/report/update-form.html:118 -msgid "<strong>No</strong>, let me confirm my update by email:" -msgstr "<strong>Jo</strong>, me lejo te konfirmoj perditesimin tim me email:" - -#: templates/web/base/auth/general.html:34 -#: templates/web/base/report/new/fill_in_details_form.html:123 -#: templates/web/base/report/update-form.html:96 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:15 -#: templates/web/fixmystreet/report/update-form.html:89 +#: templates/web/base/auth/general.html:70 +#: templates/web/base/report/new/form_user_loggedout_password.html:3 +#: templates/web/base/report/update/form_user_loggedout_password.html:2 msgid "<strong>Yes</strong> I have a password" msgstr "<strong>Po</strong> Unë kam një fjalëkalim" -#: templates/web/base/static/about-en-gb.html:1 -#: templates/web/base/static/about-en-gb.html:3 +#: templates/web/base/about/about-en-gb.html:1 +#: templates/web/base/about/about-en-gb.html:3 msgid "About us" msgstr "Rreth nesh" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:8 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:31 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:29 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:35 msgid "Action Scheduled" msgstr "Veprim i Planifikuar" @@ -292,7 +267,7 @@ msgstr "Shto një kategori të re" msgid "Add user" msgstr "Shto përdorues" -#: templates/web/base/my/my.html:52 +#: templates/web/base/my/my.html:56 msgid "Added %s" msgstr "Shtoi %s" @@ -312,8 +287,7 @@ msgstr "Paralajmerimi %d u krijua per %s, lloji %s, parametrat %s / %s" msgid "Alert %d disabled (created %s)" msgstr "" -#: templates/web/base/report/update-form.html:164 -#: templates/web/fixmystreet/report/update-form.html:150 +#: templates/web/base/report/update/form_name.html:20 msgid "Alert me to future updates" msgstr "Me paralajmero per perditesime ne te ardhmen" @@ -323,9 +297,8 @@ msgid "All Reports" msgstr "Te gjitha Raportimet" #: templates/web/zurich/admin/stats.html:5 -#, fuzzy msgid "All Reports as CSV" -msgstr "Te gjitha Raportimet" +msgstr "" #: templates/web/base/footer.html:11 templates/web/fixmystreet/footer.html:32 #: templates/web/zurich/admin/index-dm.html:12 @@ -346,10 +319,8 @@ msgstr "Te gjitha informacionet e ofruara nga ju do te dergohen te" #: templates/web/base/report/new/councils_text_all.html:2 #: templates/web/base/report/new/councils_text_all.html:4 -#: templates/web/base/report/new/fill_in_details_form.html:12 -#: templates/web/base/report/new/fill_in_details_form.html:14 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:10 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:11 +#: templates/web/base/report/new/fill_in_details_form.html:10 +#: templates/web/base/report/new/fill_in_details_form.html:9 msgid "All the information you provide here will be sent to <strong>%s</strong>." msgstr "Te gjitha informacionet e ofruara ketu do te dergohen te <strong>%s</strong>." @@ -371,6 +342,10 @@ msgstr "Anonim:" msgid "Are you a developer?" msgstr "A jeni nje zhvillues?" +#: templates/web/base/js/translation_strings.html:52 +msgid "Are you sure you want to cancel this upload?" +msgstr "" + #: templates/web/base/admin/body-form.html:69 #: templates/web/base/admin/body.html:16 #: templates/web/zurich/admin/body-form.html:24 @@ -383,9 +358,8 @@ msgid "As this is a staging site and %s is false, reports made on this site will msgstr "" #: templates/web/zurich/admin/report_edit.html:213 -#, fuzzy msgid "Assign to competent body:" -msgstr "Cakto per kategori te ndryshme:" +msgstr "" #: templates/web/zurich/admin/report_edit.html:173 #: templates/web/zurich/admin/stats.html:36 @@ -404,16 +378,16 @@ msgstr "Cakto per nenndarje:" msgid "Assigned to %s" msgstr "Caktuar per %s" -#: templates/web/base/open311/index.html:84 +#: templates/web/base/open311/index.html:76 msgid "At most %d requests are returned in each query. The returned requests are ordered by requested_datetime, so to get all requests, do several searches with rolling start_date and end_date." msgstr "" -#: templates/web/base/open311/index.html:76 +#: templates/web/base/open311/index.html:68 msgid "At the moment only searching for and looking at reports work." msgstr "Per momentin funksionon vetem kerkimi dhe shikimi i raportimeve." #: perllib/FixMyStreet/DB/Result/Problem.pm:373 -#: templates/web/zurich/report/_item.html:11 +#: templates/web/zurich/report/_item.html:9 msgid "Awaiting moderation" msgstr "" @@ -425,7 +399,7 @@ msgstr "Prapa" msgid "Ban email address" msgstr "bllokoemail adresen" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1276 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1285 #: perllib/FixMyStreet/Cobrand/Zurich.pm:392 #: templates/web/base/admin/bodies.html:1 templates/web/zurich/header.html:64 msgid "Bodies" @@ -455,7 +429,7 @@ msgid "Can't see the map? <em>Skip this step</em>" msgstr "Nuk mund te shihni harten? <em>Kaloni kete hap</em>" #: templates/web/base/admin/body.html:68 -#: templates/web/base/admin/index.html:61 +#: templates/web/base/admin/index.html:54 #: templates/web/base/report/new/category.html:10 #: templates/web/base/report/new/category_wrapper.html:3 #: templates/web/zurich/admin/body.html:14 @@ -466,8 +440,8 @@ msgstr "Nuk mund te shihni harten? <em>Kaloni kete hap</em>" msgid "Category" msgstr "Kategoria" -#: templates/web/base/admin/index.html:59 -#: templates/web/base/admin/index.html:67 +#: templates/web/base/admin/index.html:52 +#: templates/web/base/admin/index.html:60 msgid "Category fix rate for problems > 4 weeks old" msgstr "" @@ -480,7 +454,7 @@ msgstr "" msgid "Category:" msgstr "Kategoria:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:402 +#: perllib/FixMyStreet/Script/Reports.pm:180 msgid "Category: %s" msgstr "Kategoria: %s" @@ -530,7 +504,7 @@ msgid "Click here or enter as dd/mm/yyyy" msgstr "Kliko ketu ose shkruaj si dd/mm/yyyy" #: templates/web/base/around/_report_banner.html:2 -#: templates/web/base/js/translation_strings.html:50 +#: templates/web/base/js/translation_strings.html:55 msgid "Click map to report a problem" msgstr "Kliko ne harte per te raportuar nje problem" @@ -557,7 +531,7 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:25 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:144 -#: templates/web/fixmystreet/report/banner.html:15 +#: templates/web/base/report/banner.html:15 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:10 #: templates/web/zurich/admin/header.html:16 @@ -565,7 +539,7 @@ msgstr "" msgid "Closed" msgstr "Mbyllur" -#: perllib/FixMyStreet/DB/Result/Problem.pm:794 +#: perllib/FixMyStreet/DB/Result/Problem.pm:779 msgid "Closed by council" msgstr "" @@ -591,7 +565,7 @@ msgstr "" msgid "Cobrand:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1283 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1292 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "" @@ -604,13 +578,13 @@ msgstr "" msgid "Confirm" msgstr "Konfirmo" -#: templates/web/base/auth/token.html:1 templates/web/zurich/auth/token.html:1 +#: templates/web/base/auth/token.html:1 msgid "Confirm account" msgstr "Konfirmo llogarine" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:33 -#: templates/web/fixmystreet/report/update-form.html:107 -msgid "Confirm by email below, providing a new password at that point. When you confirm, your password will be updated." +#: templates/web/base/report/new/form_user_loggedout_password.html:21 +#: templates/web/base/report/update/form_user_loggedout_password.html:20 +msgid "Confirm by email instead, providing a new password at that point. When you confirm, your password will be updated." msgstr "" #: templates/web/base/questionnaire/creator_fixed.html:1 @@ -640,24 +614,17 @@ msgid "Confirmed:" msgstr "E konfirmuar:" #. ("%s is the site name") -#: templates/web/base/faq/faq-en-gb.html:8 templates/web/base/footer.html:24 -#: templates/web/base/open311/index.html:8 -#: templates/web/base/static/privacy.html:10 -#: templates/web/fixmystreet/contact/index.html:12 -#, fuzzy +#: templates/web/base/about/_sidebar.html:6 templates/web/base/footer.html:24 msgid "Contact %s" -msgstr "Na Kontaktoni" +msgstr "" #: templates/web/base/contact/index.html:1 #: templates/web/base/contact/index.html:2 #: templates/web/base/contact/submit.html:1 -#: templates/web/fixmystreet/contact/index.html:1 -#: templates/web/fixmystreet/contact/index.html:2 msgid "Contact Us" msgstr "Na Kontaktoni" -#: templates/web/base/contact/index.html:6 -#: templates/web/fixmystreet/contact/index.html:20 +#: templates/web/base/contact/index.html:12 msgid "Contact the team" msgstr "Kontakto ekipin" @@ -666,8 +633,8 @@ msgstr "Kontakto ekipin" msgid "Coordinates:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1420 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1448 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1429 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1457 msgid "Could not find user" msgstr "Nuk mund te gjeni perdoruesin" @@ -685,7 +652,7 @@ msgstr "" msgid "Council contacts for %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:693 +#: perllib/FixMyStreet/DB/Result/Problem.pm:681 msgid "Council ref: %s" msgstr "" @@ -700,7 +667,7 @@ msgstr "" msgid "Count" msgstr "" -#: templates/web/base/email_sent.html:1 templates/web/zurich/email_sent.html:1 +#: templates/web/base/email_sent.html:1 msgid "Create a report" msgstr "Krijo nje raport" @@ -710,9 +677,8 @@ msgid "Create category" msgstr "Krijo kategorine" #: templates/web/zurich/admin/template_edit.html:29 -#, fuzzy msgid "Create template" -msgstr "Krijo nje raport" +msgstr "" #: templates/web/base/admin/problem_row.html:34 #: templates/web/zurich/admin/templates.html:10 @@ -749,7 +715,7 @@ msgstr "" msgid "Dealt with by subdivision within 5 working days" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:878 +#: perllib/FixMyStreet/App/Controller/Admin.pm:877 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "" @@ -762,7 +728,7 @@ msgstr "" msgid "Deleted" msgstr "" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:51 +#: templates/web/base/report/new/form_report.html:45 #: templates/web/zurich/admin/index-dm.html:22 #: templates/web/zurich/admin/index-sdm.html:20 #: templates/web/zurich/admin/reports.html:12 @@ -770,12 +736,11 @@ msgid "Description" msgstr "Pershkrim" #: templates/web/base/js/translation_strings.html:34 -#: templates/web/zurich/report/new/fill_in_details_form.html:42 +#: templates/web/zurich/report/new/fill_in_details_form.html:68 msgid "Details" msgstr "Detaje" #: templates/web/base/admin/report_edit.html:20 -#: templates/web/base/report/new/fill_in_details_form.html:62 #: templates/web/zurich/admin/report_edit-sdm.html:27 #: templates/web/zurich/admin/report_edit.html:29 #: templates/web/zurich/admin/report_edit.html:43 @@ -788,38 +753,38 @@ msgstr "Transferuar" #: templates/web/zurich/admin/report_edit-sdm.html:50 #: templates/web/zurich/admin/report_edit.html:69 -#, fuzzy msgid "Didn't use map" -msgstr "nuk e perdorni harten" +msgstr "" #: templates/web/base/admin/edit-league.html:8 msgid "Diligency prize league table" msgstr "" #. ("%s is the site name") -#: templates/web/base/auth/general.html:31 -#: templates/web/base/report/new/fill_in_details_form.html:114 -#: templates/web/base/report/update-form.html:87 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:11 -#: templates/web/fixmystreet/report/update-form.html:86 -#, fuzzy +#: templates/web/base/auth/general.html:48 +#: templates/web/base/report/new/form_user_loggedout.html:18 +#: templates/web/base/report/new/oauth_email_form.html:18 +#: templates/web/base/report/update-form.html:29 +#: templates/web/base/report/update/form_user_loggedout.html:17 msgid "Do you have a %s password?" -msgstr "A keni fjalekalim te FixMyStreet?" +msgstr "" #: templates/web/base/questionnaire/index.html:55 msgid "Don’t know" msgstr "Nuk e di" -#: templates/web/fixmystreet/contact/index.html:118 +#: templates/web/base/contact/index.html:110 msgid "Don't like forms?" msgstr "Nuk i'u pelqen kjo forme?" +#: templates/web/base/js/translation_strings.html:51 +msgid "Drag and drop photos here or <u>click to upload</u>" +msgstr "" + #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:14 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:32 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:30 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:36 msgid "Duplicate" msgstr "Dyfisho" @@ -869,7 +834,7 @@ msgstr "Editor" #: templates/web/base/admin/category_edit.html:91 #: templates/web/base/admin/flagged.html:38 #: templates/web/base/admin/users.html:16 -#: templates/web/base/auth/general.html:22 +#: templates/web/base/auth/general.html:39 #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:24 @@ -877,7 +842,7 @@ msgstr "Editor" msgid "Email" msgstr "Email" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1396 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1405 msgid "Email added to abuse list" msgstr "Emaili u shtua te lista e abuzimeve" @@ -893,7 +858,7 @@ msgstr "" msgid "Email alert deleted" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1393 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1402 msgid "Email already in abuse list" msgstr "" @@ -901,41 +866,36 @@ msgstr "" msgid "Email me new local problems" msgstr "Me dergo email per problemet e reja lokale" -#: templates/web/base/report/display.html:38 -msgid "Email me updates" -msgstr "" - #: templates/web/base/admin/category_edit.html:31 #: templates/web/base/admin/report_edit.html:62 #: templates/web/base/admin/update_edit.html:33 #: templates/web/base/admin/user-form.html:20 #: templates/web/base/alert/updates.html:13 -#: templates/web/base/report/display.html:42 #: templates/web/zurich/admin/body.html:47 msgid "Email:" msgstr "Email:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:329 +#: perllib/FixMyStreet/Script/Reports.pm:108 msgid "Email: %s" msgstr "Email: %s" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:639 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:634 msgid "Empty flat or maisonette" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:638 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:633 msgid "Empty house or bungalow" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:641 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:636 msgid "Empty office or other commercial" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:642 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:637 msgid "Empty pub or bar" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:643 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:638 msgid "Empty public building - school, hospital, etc." msgstr "" @@ -968,7 +928,7 @@ msgstr "" msgid "Enter a Zürich street name" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:13 +#: perllib/FixMyStreet/Cobrand/UK.pm:14 msgid "Enter a nearby UK postcode, or street name and area" msgstr "" @@ -986,14 +946,9 @@ msgstr "" msgid "Enter a nearby street name and area, postal code or district in Delhi" msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:152 -#: templates/web/base/report/update-form.html:125 -msgid "Enter a new password:" -msgstr "Shkruaj fjalekalimin e ri:" - -#: templates/web/base/auth/general.html:60 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:75 -#: templates/web/fixmystreet/report/update-form.html:123 +#: templates/web/base/auth/general.html:99 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:38 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:13 #: templates/web/zurich/auth/general.html:65 msgid "Enter a password" msgstr "Shkruaj fjalekalimin" @@ -1003,11 +958,11 @@ msgid "Enter details of the problem" msgstr "Pershkruaje problemin" #: templates/web/base/errors/generic.html:1 -#: templates/web/base/errors/generic.html:3 +#: templates/web/base/errors/generic.html:4 #: templates/web/base/tokens/abuse.html:1 #: templates/web/base/tokens/abuse.html:3 #: templates/web/base/tokens/error.html:1 -#: templates/web/base/tokens/error.html:3 +#: templates/web/base/tokens/error.html:5 msgid "Error" msgstr "Gabim" @@ -1020,11 +975,11 @@ msgstr "" msgid "Example postcode %s" msgstr "Shembull i kodit postar %s" -#: templates/web/base/open311/index.html:94 +#: templates/web/base/open311/index.html:86 msgid "Examples:" msgstr "Shembuj:" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:55 +#: templates/web/base/report/new/form_report.html:49 msgid "Explain what’s wrong, exactly where it is, and how long it’s been there…" msgstr "" @@ -1065,17 +1020,15 @@ msgstr "" msgid "FixMyStreet" msgstr "FixMyStreet" -#: templates/web/base/admin/index.html:61 +#: templates/web/base/admin/index.html:54 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:24 #: templates/web/base/admin/report_blocks.html:9 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:144 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:34 -#: templates/web/fixmystreet/report/banner.html:12 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:32 +#: templates/web/base/report/banner.html:12 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:38 msgid "Fixed" msgstr "E rregulluar" @@ -1102,7 +1055,7 @@ msgstr "" msgid "Flag user" msgstr "Flamuri i perdoruesit" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1281 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1290 #: templates/web/base/admin/users.html:19 msgid "Flagged" msgstr "" @@ -1133,8 +1086,8 @@ msgstr "" msgid "For more information, see <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>." msgstr "" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:32 -#: templates/web/fixmystreet/report/update-form.html:106 +#: templates/web/base/report/new/form_user_loggedout_password.html:20 +#: templates/web/base/report/update/form_user_loggedout_password.html:19 msgid "Forgotten your password?" msgstr "Keni harruar fjalekalimin tuaj?" @@ -1146,21 +1099,18 @@ msgstr "" msgid "Forwarded wish to external body" msgstr "" -#: templates/web/base/faq/faq-en-gb.html:1 -#: templates/web/base/faq/faq-en-gb.html:13 -#: templates/web/base/faq/faq-en-gb.html:6 -#: templates/web/base/open311/index.html:6 -#: templates/web/base/static/privacy.html:8 -#: templates/web/fixmystreet/contact/index.html:10 +#: templates/web/base/about/_sidebar.html:4 +#: templates/web/base/about/faq-en-gb.html:1 +#: templates/web/base/about/faq-en-gb.html:5 msgid "Frequently Asked Questions" msgstr "Pyetjet me te shpeshta" -#: templates/web/base/open311/index.html:136 +#: templates/web/base/open311/index.html:128 msgid "GeoRSS on Google Maps" msgstr "GeoRSS ne Google Maps" +#: templates/web/base/report/display_tools.html:11 #: templates/web/fixmystreet/around/_updates.html:3 -#: templates/web/fixmystreet/report/display.html:35 msgid "Get updates" msgstr "Merr perditesimet" @@ -1193,7 +1143,7 @@ msgstr "Vazhdo" msgid "Going to send questionnaire?" msgstr "" -#: templates/web/base/admin/index.html:42 +#: templates/web/base/admin/index.html:35 msgid "Graph of problem creation by status over time" msgstr "" @@ -1210,7 +1160,7 @@ msgid "Have you ever reported a problem to a council before, or is this your fir msgstr "" #: templates/web/base/footer.html:15 templates/web/fixmystreet/footer.html:38 -#: templates/web/zurich/faq/faq-de-ch.html:1 +#: templates/web/zurich/about/faq-de-ch.html:1 #: templates/web/zurich/footer.html:22 #: templates/web/zurich/nav_over_content.html:8 msgid "Help" @@ -1261,7 +1211,7 @@ msgstr "Si te raportoj nje problem" msgid "How to send successful reports" msgstr "Si te dergoj nje raport ne menyre te sukseshme" -#: perllib/FixMyStreet/App/Controller/Admin.pm:754 +#: perllib/FixMyStreet/App/Controller/Admin.pm:752 msgid "I am afraid you cannot confirm unconfirmed reports." msgstr "Une kam frike se ju nuk mund te konfirmoni raportet e pakonfirmuara" @@ -1279,10 +1229,6 @@ msgstr "" msgid "I'm afraid we couldn't locate your problem in the database.\n" msgstr "Une jam i frikesuar se ne nuk mund te lokalizojme problemin tuaj e databaze.\n" -#: perllib/FixMyStreet/App/Controller/Tokens.pm:327 -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 "" - #: templates/web/base/admin/flagged.html:14 #: templates/web/base/admin/list_updates.html:6 #: templates/web/base/admin/reports.html:11 @@ -1311,16 +1257,11 @@ msgstr "" msgid "If you get some more information about the status of your problem, please come back to the site and leave an update." msgstr "" -#: templates/web/base/report/new/councils_text_none.html:2 -#: templates/web/base/report/new/councils_text_none.html:8 +#: templates/web/base/report/new/councils_text_none.html:10 +#: templates/web/base/report/new/councils_text_none.html:9 msgid "If you submit a problem here the subject and details of the problem will be public, but the problem will <strong>not</strong> be reported to the council." msgstr "" -#: templates/web/zurich/auth/token.html:19 -#: templates/web/zurich/email_sent.html:7 -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 "" - #: templates/web/base/questionnaire/index.html:68 msgid "" "If you wish to leave a public update on the problem, please enter it here\n" @@ -1364,10 +1305,8 @@ msgstr "zgjedhje e gabuar e feed" #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:144 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:32 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:30 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:36 msgid "In Progress" msgstr "Ne Vazhdim" @@ -1375,7 +1314,7 @@ msgstr "Ne Vazhdim" msgid "In abuse table?" msgstr "Ne tabelen e abuzimeve?" -#: templates/web/base/open311/index.html:88 +#: templates/web/base/open311/index.html:80 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 "" @@ -1383,7 +1322,7 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/Zurich.pm:963 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:7 -#: templates/web/fixmystreet/report/banner.html:19 +#: templates/web/base/report/banner.html:19 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:8 msgid "In progress" @@ -1418,7 +1357,7 @@ msgstr "Rekomandim i brendshem" msgid "Invalid agency_responsible value %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1201 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1210 msgid "Invalid end date" msgstr "Data e fundit jovalide" @@ -1426,7 +1365,7 @@ msgstr "Data e fundit jovalide" msgid "Invalid format %s specified." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1206 msgid "Invalid start date" msgstr "Data e fillimit jovalide" @@ -1434,14 +1373,12 @@ msgstr "Data e fillimit jovalide" #: templates/web/base/admin/report_blocks.html:5 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:143 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:31 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:29 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:35 msgid "Investigating" msgstr "Shqyrtuar" -#: templates/web/fixmystreet/contact/blurb.html:8 +#: templates/web/base/contact/blurb.html:8 msgid "It's often quickest to <a href=\"%s\">check our FAQs</a> and see if the answer is there." msgstr "" @@ -1459,11 +1396,9 @@ msgstr "" msgid "Jurisdiction unknown" msgstr "" -#: templates/web/base/auth/general.html:44 -#: templates/web/base/report/new/fill_in_details_form.html:132 -#: templates/web/base/report/update-form.html:105 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:28 -#: templates/web/fixmystreet/report/update-form.html:102 +#: templates/web/base/auth/general.html:80 +#: templates/web/base/report/new/form_user_loggedout_password.html:16 +#: templates/web/base/report/update/form_user_loggedout_password.html:15 #: templates/web/zurich/auth/general.html:40 msgid "Keep me signed in on this computer" msgstr "Me mbaj te kyqur ne kete kompjuter" @@ -1521,6 +1456,7 @@ msgid "MAP" msgstr "HARTA" #: templates/web/base/js/translation_strings.html:45 +#: templates/web/base/maps/google-ol.html:13 msgid "Map" msgstr "" @@ -1540,7 +1476,7 @@ msgstr "" msgid "Marked fixed/closed more than eight weeks ago" msgstr "" -#: templates/web/fixmystreet/contact/index.html:106 +#: templates/web/base/contact/index.html:98 msgid "Message" msgstr "Mesazh" @@ -1552,10 +1488,6 @@ msgstr "" msgid "Message to external body:" msgstr "" -#: templates/web/base/contact/index.html:97 -msgid "Message:" -msgstr "Mesazh:" - #: perllib/FixMyStreet/App/Controller/Open311.pm:445 msgid "Missing jurisdiction_id" msgstr "" @@ -1568,10 +1500,6 @@ msgstr "" msgid "Month" msgstr "Muaji" -#: templates/web/base/report/display.html:34 -msgid "More problems nearby" -msgstr "Me shume probleme ketu afer" - #: templates/web/base/admin/bodies.html:21 #: templates/web/base/admin/body-form.html:18 #: templates/web/base/admin/flagged.html:16 @@ -1579,11 +1507,11 @@ msgstr "Me shume probleme ketu afer" #: templates/web/base/admin/list_updates.html:7 #: templates/web/base/admin/reports.html:13 #: templates/web/base/admin/users.html:15 -#: templates/web/base/auth/general.html:50 +#: templates/web/base/auth/general.html:89 +#: templates/web/base/report/new/form_user_loggedin.html:9 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:7 +#: templates/web/base/report/update/form_name.html:4 #: templates/web/base/reports/index.html:20 -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:9 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:44 -#: templates/web/fixmystreet/report/update-form.html:138 #: templates/web/zurich/admin/body-form.html:4 #: templates/web/zurich/auth/general.html:60 #: templates/web/zurich/report/new/fill_in_details_form.html:82 @@ -1597,7 +1525,7 @@ msgstr "Emri" msgid "Name:" msgstr "Emri:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:328 +#: perllib/FixMyStreet/Script/Reports.pm:107 msgid "Name: %s" msgstr "Emri: %s" @@ -1606,29 +1534,24 @@ msgstr "Emri: %s" msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:127 +#: perllib/FixMyStreet/Cobrand/UK.pm:128 msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:434 -#: perllib/FixMyStreet/Cobrand/Default.pm:474 +#: perllib/FixMyStreet/Cobrand/Default.pm:455 +#: perllib/FixMyStreet/Cobrand/Default.pm:495 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:267 +#: perllib/FixMyStreet/Script/Alerts.pm:290 msgid "" "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n" "\n" msgstr "" -#: templates/web/zurich/email_sent.html:5 -msgid "Nearly Done! Now check your email..." -msgstr "" - #: templates/web/base/auth/token.html:17 templates/web/base/email_sent.html:5 -#, fuzzy msgid "Nearly done! Now check your email…" -msgstr "Ju lutem kontrolloni email-in tuaj" +msgstr "" #: templates/web/base/reports/index.html:21 msgid "New <br>problems" @@ -1652,9 +1575,8 @@ msgid "New local problems on FixMyStreet" msgstr "Problem i ri lokal ne FixMyStreet" #: templates/web/zurich/admin/report_edit-sdm.html:117 -#, fuzzy msgid "New note to DM:" -msgstr "Shenim i ri i brendshem:" +msgstr "" #: db/alert_types.pl:38 msgid "New problems for {{COUNCIL}} within {{WARD}} ward on FixMyStreet" @@ -1686,9 +1608,8 @@ msgstr "Gjendje e re" #: templates/web/zurich/admin/template_edit.html:9 #: templates/web/zurich/admin/templates.html:26 -#, fuzzy msgid "New template" -msgstr "Gjendje e re" +msgstr "" #: templates/web/base/pagination.html:13 msgid "Next" @@ -1705,8 +1626,8 @@ msgstr "Tjetra" #: templates/web/base/admin/report_edit.html:75 #: templates/web/base/admin/update_edit.html:25 #: templates/web/base/questionnaire/creator_fixed.html:16 +#: templates/web/base/questionnaire/index.html:101 #: templates/web/base/questionnaire/index.html:53 -#: templates/web/base/questionnaire/index.html:92 msgid "No" msgstr "Jo" @@ -1770,10 +1691,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:13 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:33 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:31 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:37 msgid "Not Responsible" msgstr "Jo Pergjegjes" @@ -1781,9 +1700,8 @@ msgstr "Jo Pergjegjes" #: perllib/FixMyStreet/Cobrand/Zurich.pm:937 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:13 -#, fuzzy msgid "Not contactable" -msgstr "Jo Pergjegjes" +msgstr "" #: templates/web/zurich/admin/report_edit-sdm.html:108 msgid "Not for my subdivision" @@ -1813,7 +1731,7 @@ msgstr "" msgid "Note:" msgstr "Shenim:" -#: templates/web/base/open311/index.html:73 +#: templates/web/base/open311/index.html:65 msgid "Note: <strong>%s</strong>" msgstr "Shenim: <strong>%s</strong>" @@ -1821,13 +1739,15 @@ msgstr "Shenim: <strong>%s</strong>" msgid "Notes from SDM to DM" msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:113 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:10 +#: templates/web/base/report/new/form_user_loggedout.html:14 +#: templates/web/base/report/new/form_user_loggedout.html:2 +#: templates/web/base/report/new/oauth_email_form.html:17 msgid "Now to submit your report…" msgstr "" -#: templates/web/base/report/update-form.html:86 -#: templates/web/fixmystreet/report/update-form.html:85 +#: templates/web/base/report/update-form.html:28 +#: templates/web/base/report/update/form_user_loggedout.html:13 +#: templates/web/base/report/update/form_user_loggedout.html:2 msgid "Now to submit your update…" msgstr "Tani ju mund te paraqitni perditesimin…" @@ -1835,11 +1755,6 @@ msgstr "Tani ju mund te paraqitni perditesimin…" msgid "OK" msgstr "Ne rregull" -#: templates/web/base/report/display.html:28 -#: templates/web/base/report/update.html:17 -msgid "Offensive? Unsuitable? Tell us" -msgstr "" - #: templates/web/base/reports/index.html:23 msgid "Old / unknown <br>problems" msgstr "Te vjetra/probleme <br> te panjohura" @@ -1856,7 +1771,7 @@ msgstr "E vjeter <br>e kryer" msgid "Older <br>problems" msgstr "Probleme <br> te vjetra" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:45 +#: templates/web/base/report/new/form_report.html:15 msgid "One-line summary" msgstr "" @@ -1867,8 +1782,7 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:4 #: templates/web/base/admin/update_edit.html:28 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/report/update-form.html:30 -#: templates/web/fixmystreet/report/update-form.html:28 +#: templates/web/base/report/update/form_update.html:34 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:7 #: templates/web/zurich/admin/update_edit.html:18 @@ -1883,15 +1797,15 @@ msgstr "" msgid "Open, but not had any update in eight weeks" msgstr "" -#: templates/web/base/open311/index.html:70 +#: templates/web/base/open311/index.html:62 msgid "Open311 API for the mySociety FixMyStreet server" msgstr "" -#: templates/web/base/open311/index.html:80 +#: templates/web/base/open311/index.html:72 msgid "Open311 initiative web page" msgstr "" -#: templates/web/base/open311/index.html:81 +#: templates/web/base/open311/index.html:73 msgid "Open311 specification" msgstr "" @@ -1903,15 +1817,15 @@ msgstr "Ose raportoni problemet n:" msgid "Or you can subscribe to an alert based upon what ward or council you’re in:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1084 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:673 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:674 -#: perllib/FixMyStreet/DB/Result/Problem.pm:570 -#: perllib/FixMyStreet/DB/Result/Problem.pm:580 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1055 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:669 +#: perllib/FixMyStreet/DB/Result/Problem.pm:558 +#: perllib/FixMyStreet/DB/Result/Problem.pm:568 +#: perllib/FixMyStreet/DB/Result/Problem.pm:578 #: perllib/FixMyStreet/DB/Result/Problem.pm:590 -#: perllib/FixMyStreet/DB/Result/Problem.pm:602 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:397 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:412 +#: perllib/FixMyStreet/Script/Reports.pm:175 +#: perllib/FixMyStreet/Script/Reports.pm:190 msgid "Other" msgstr "Tjera" @@ -1920,7 +1834,7 @@ msgid "Owner" msgstr "Pronar" #: templates/web/base/errors/page_error_404_not_found.html:1 -#: templates/web/base/errors/page_error_404_not_found.html:3 +#: templates/web/base/errors/page_error_404_not_found.html:4 msgid "Page Not Found" msgstr "Faqja nuk u gjet" @@ -1934,16 +1848,16 @@ msgstr "Burim" msgid "Partial" msgstr "I pjesshem" -#: templates/web/base/auth/general.html:53 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:68 -#: templates/web/fixmystreet/report/update-form.html:116 +#: templates/web/base/auth/general.html:92 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:31 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:6 #: templates/web/zurich/auth/general.html:32 #: templates/web/zurich/auth/general.html:63 msgid "Password (optional)" msgstr "Fjalekalimi (opsionale)" #: templates/web/base/auth/change_password.html:25 -#: templates/web/base/auth/general.html:36 +#: templates/web/base/auth/general.html:72 msgid "Password:" msgstr "Fjalekalimi:" @@ -1955,29 +1869,29 @@ msgstr "" msgid "Phone number" msgstr "Numri i telefonit" -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:26 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:62 +#: templates/web/base/report/new/form_user_loggedin.html:26 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:25 msgid "Phone number (optional)" msgstr "Numri i telefonit (opsionale)" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:306 +#: perllib/FixMyStreet/Script/Reports.pm:83 #: templates/web/base/admin/report_edit.html:63 -#: templates/web/base/report/new/fill_in_details_form.html:198 #: templates/web/zurich/admin/stats.html:39 msgid "Phone:" msgstr "Telefoni:" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:66 -#: templates/web/fixmystreet/report/update-form.html:59 +#: templates/web/base/questionnaire/index.html:75 +#: templates/web/base/report/new/form_report.html:23 +#: templates/web/base/report/update/form_update.html:6 #: templates/web/zurich/admin/index-dm.html:29 #: templates/web/zurich/admin/index-sdm.html:24 #: templates/web/zurich/admin/reports.html:16 #: templates/web/zurich/admin/stats.html:37 -#: templates/web/zurich/report/new/fill_in_details_form.html:52 +#: templates/web/zurich/report/new/fill_in_details_form.html:45 msgid "Photo" msgstr "Fotografia" -#: perllib/FixMyStreet/App/Controller/Photo.pm:221 +#: perllib/FixMyStreet/App/Controller/Photo.pm:187 msgid "Photo is required." msgstr "" @@ -1985,13 +1899,7 @@ msgstr "" msgid "Photo required" msgstr "" -#: templates/web/base/questionnaire/index.html:80 -#: templates/web/base/report/new/fill_in_details_form.html:84 -#: templates/web/base/report/update-form.html:62 -msgid "Photo:" -msgstr "Fotografia:" - -#: templates/web/base/alert/list.html:26 +#: templates/web/base/alert/list.html:23 msgid "Photos of recent nearby reports" msgstr "Fotografite e raporteve te fundit" @@ -2020,20 +1928,16 @@ msgstr "Ju lutem te jeni te sjellshem, korrekt dhe te sakte. " msgid "Please check the passwords and try again" msgstr "Ju lutem kontrolloni fjalekalimin dhe provoni perseri" -#: templates/web/zurich/auth/token.html:16 -msgid "Please check your email" -msgstr "Ju lutem kontrolloni email-in tuaj" - -#: templates/web/base/auth/general.html:10 -#: templates/web/base/auth/general.html:16 +#: templates/web/base/auth/general.html:27 +#: templates/web/base/auth/general.html:33 #: templates/web/zurich/auth/general.html:3 #: templates/web/zurich/auth/general.html:9 msgid "Please check your email address is correct" msgstr "Ju lutem kontrolloni email adresen tuaj nese eshte e sakte" #: perllib/FixMyStreet/App/Controller/Admin.pm:343 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:883 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:948 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:878 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:943 #: perllib/FixMyStreet/DB/Result/Problem.pm:412 #: templates/web/base/js/translation_strings.html:9 msgid "Please choose a category" @@ -2047,8 +1951,7 @@ msgstr "" msgid "Please correct the errors below" msgstr "" -#: templates/web/base/contact/blurb.html:2 -#: templates/web/fixmystreet/contact/blurb.html:12 +#: templates/web/base/contact/blurb.html:12 msgid "" "Please do <strong>not</strong> report problems through this form; messages go to\n" "the team behind this site, not a council. To report a problem,\n" @@ -2060,11 +1963,17 @@ msgid "Please do not be abusive — abusing your council devalues the s msgstr "" #: perllib/FixMyStreet/App/Controller/Admin.pm:346 -#: perllib/FixMyStreet/DB/Result/Comment.pm:126 +#: perllib/FixMyStreet/DB/Result/Comment.pm:125 #: templates/web/base/js/translation_strings.html:2 msgid "Please enter a message" msgstr "Ju lutem shkruaj nje mesazh" +#: perllib/FixMyStreet/App/Controller/Admin.pm:1091 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1146 +#, fuzzy +msgid "Please enter a name" +msgstr "Ju lutem shkruani emrin tuaj" + #: templates/web/base/auth/change_password.html:12 #: templates/web/base/auth/change_password.html:15 #: templates/web/base/js/translation_strings.html:19 @@ -2077,10 +1986,10 @@ msgstr "Ju lutem shkruaj fjalekalimin" msgid "Please enter a subject" msgstr "Ju lutem shkruaj subjektin" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1084 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1137 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1087 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1142 #: perllib/FixMyStreet/App/Controller/Admin.pm:345 -#: perllib/FixMyStreet/DB/Result/User.pm:127 +#: perllib/FixMyStreet/DB/Result/User.pm:133 #: templates/web/base/js/translation_strings.html:12 #: templates/web/base/js/translation_strings.html:16 msgid "Please enter a valid email" @@ -2097,9 +2006,9 @@ msgid "Please enter some details" msgstr "Ju lutem shkruaj disa te dhena" #: perllib/FixMyStreet/App/Controller/Contact.pm:113 -#: perllib/FixMyStreet/DB/Result/User.pm:124 -#: templates/web/base/auth/general.html:10 -#: templates/web/base/auth/general.html:15 +#: perllib/FixMyStreet/DB/Result/User.pm:130 +#: templates/web/base/auth/general.html:27 +#: templates/web/base/auth/general.html:32 #: templates/web/base/js/translation_strings.html:11 #: templates/web/base/js/translation_strings.html:15 #: templates/web/zurich/auth/general.html:3 @@ -2107,7 +2016,7 @@ msgstr "Ju lutem shkruaj disa te dhena" msgid "Please enter your email" msgstr "Ju lutem shkruani email-in tuaj" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:7 +#: templates/web/base/report/new/form_user_loggedout_email.html:7 #: templates/web/zurich/report/new/fill_in_details_form.html:80 msgid "Please enter your email address" msgstr "Ju lutem shkruani email adresen tuaj" @@ -2116,15 +2025,15 @@ msgstr "Ju lutem shkruani email adresen tuaj" msgid "Please enter your first name" msgstr "Ju lutem shkruani emrin tuaj" -#: perllib/FixMyStreet/Cobrand/UK.pm:318 +#: perllib/FixMyStreet/Cobrand/UK.pm:319 #: templates/web/base/js/translation_strings.html:7 msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below" msgstr "" #: perllib/FixMyStreet/App/Controller/Contact.pm:112 -#: perllib/FixMyStreet/DB/Result/Comment.pm:123 +#: perllib/FixMyStreet/DB/Result/Comment.pm:122 #: perllib/FixMyStreet/DB/Result/Problem.pm:406 -#: perllib/FixMyStreet/DB/Result/User.pm:120 +#: perllib/FixMyStreet/DB/Result/User.pm:126 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter your name" msgstr "Ju lutem shkruani emrin tuaj" @@ -2151,12 +2060,11 @@ msgstr "Ju lutem ndihuni te lire per tu <a href=\"%s\">kyqur perseri</a>, ose kt msgid "Please fill in details of the problem below." msgstr "Ju lutem pershkruani ne hollesi problemin me poshte." -#: templates/web/zurich/report/new/fill_in_details_form.html:46 +#: templates/web/zurich/report/new/fill_in_details_form.html:72 msgid "Please fill in details of the problem." msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:28 -#: templates/web/fixmystreet/report/new/sidebar.html:7 +#: templates/web/base/report/new/sidebar.html:7 #: templates/web/zurich/report/new/fill_in_details_form.html:20 msgid "Please fill in the form below with details of the problem, and describe the location as precisely as possible in the details box." msgstr "" @@ -2165,20 +2073,23 @@ msgstr "" msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "" -#: templates/web/fixmystreet/report/updates-sidebar-notes.html:4 +#: templates/web/base/report/updates-sidebar-notes.html:2 msgid "Please note that updates are not sent to the council." msgstr "" -#: templates/web/base/report/update-form.html:7 -msgid "Please note that updates are not sent to the council. If you leave your name it will be public. Your information will only be used in accordance with our <a href=\"/faq#privacy\">privacy policy</a>" +#: templates/web/base/report/new/oauth_email_form.html:4 +msgid "Please note your report has <strong>not yet been sent</strong>." msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:8 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:21 +#: templates/web/base/report/new/fill_in_details_form.html:20 #: templates/web/zurich/report/new/fill_in_details_form.html:11 msgid "Please note your report has <strong>not yet been sent</strong>. Choose a category and add further information below, then submit." msgstr "" +#: templates/web/base/report/display.html:26 +msgid "Please note your update has <strong>not yet been posted</strong>." +msgstr "" + #: templates/web/base/report/new/notes.html:1 #: templates/web/zurich/report/new/notes.html:1 msgid "Please note:" @@ -2198,9 +2109,8 @@ msgid "Please say whether you've ever reported a problem to your council before" msgstr "" #: templates/web/zurich/admin/report_edit.html:208 -#, fuzzy msgid "Please select a body." -msgstr "Ju lutem zgjedhni furnizuesin qe deshironi" +msgstr "" #: perllib/FixMyStreet/App/Controller/Alert.pm:80 msgid "Please select the feed you want" @@ -2217,6 +2127,7 @@ msgstr "" #: perllib/FixMyStreet/App/Model/PhotoSet.pm:117 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:145 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:147 +#: templates/web/base/js/translation_strings.html:53 msgid "Please upload a JPEG image only" msgstr "Ju lutem ngarkoni vetem fotografi te formatit JPEG" @@ -2224,18 +2135,14 @@ msgstr "Ju lutem ngarkoni vetem fotografi te formatit JPEG" msgid "Please write a message" msgstr "Ju lutem shkruani nje mesazh" -#: templates/web/fixmystreet/report/update-form.html:23 +#: templates/web/base/report/update/form_update.html:29 msgid "Please write your update here" msgstr "Ju lutem shkruani perditesimin tuaj ketu" -#: templates/web/base/contact/index.html:100 -#: templates/web/base/report/update-form.html:110 -#: templates/web/base/report/update-form.html:132 -#: templates/web/base/report/update-form.html:72 -#: templates/web/fixmystreet/contact/index.html:113 -#: templates/web/fixmystreet/report/update-form.html:124 -#: templates/web/fixmystreet/report/update-form.html:71 -#: templates/web/fixmystreet/report/update-form.html:97 +#: templates/web/base/contact/index.html:105 +#: templates/web/base/report/update-form.html:24 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:14 +#: templates/web/base/report/update/form_user_loggedout_password.html:10 msgid "Post" msgstr "Posto" @@ -2263,12 +2170,9 @@ msgstr "Paraprak" msgid "Privacy" msgstr "" -#: templates/web/base/faq/faq-en-gb.html:7 -#: templates/web/base/open311/index.html:7 -#: templates/web/base/static/privacy.html:1 -#: templates/web/base/static/privacy.html:2 -#: templates/web/base/static/privacy.html:9 -#: templates/web/fixmystreet/contact/index.html:11 +#: templates/web/base/about/_sidebar.html:5 +#: templates/web/base/about/privacy.html:1 +#: templates/web/base/about/privacy.html:2 msgid "Privacy and cookies" msgstr "" @@ -2296,12 +2200,12 @@ msgstr "Problemi %s u konfirmua" msgid "Problem %s sent to council %s" msgstr "" -#: templates/web/base/admin/index.html:46 +#: templates/web/base/admin/index.html:39 #: templates/web/zurich/admin/index.html:9 msgid "Problem breakdown by state" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1055 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1058 msgid "Problem marked as open." msgstr "Problemi eshte shenuar si i hapur." @@ -2317,11 +2221,11 @@ msgstr "Problemet" msgid "Problems in this area" msgstr "Problemet ne kete zone" -#: templates/web/fixmystreet/report/display.html:43 +#: templates/web/base/report/display_tools.html:19 msgid "Problems nearby" msgstr "Problemet ne afersi" -#: templates/web/fixmystreet/report/display.html:41 +#: templates/web/base/report/display_tools.html:17 msgid "Problems on the map" msgstr "Problemet ne harte" @@ -2333,24 +2237,23 @@ msgstr "Problemet e raportuara se fundi ne FixMyStreet" msgid "Problems within %.1fkm of this location" msgstr "Problemet brenda %.1fkm te ketij lokacioni" -#: perllib/FixMyStreet/Cobrand/Default.pm:642 +#: perllib/FixMyStreet/Cobrand/Default.pm:663 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:120 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:139 -#: perllib/FixMyStreet/Cobrand/UK.pm:207 +#: perllib/FixMyStreet/Cobrand/UK.pm:208 msgid "Problems within %s" msgstr "Problemet brenda %s" #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:128 -#: perllib/FixMyStreet/Cobrand/UK.pm:221 +#: perllib/FixMyStreet/Cobrand/UK.pm:222 msgid "Problems within %s ward" msgstr "Problemet brenda lagjes %s" #. ("First %s is the body name, second %s the site name") #: templates/web/base/reports/body.html:0 #: templates/web/base/reports/body.html:24 -#, fuzzy msgid "Problems within %s, %s" -msgstr "Problemet brenda %s" +msgstr "" #: templates/web/base/alert/_list.html:42 msgid "Problems within the boundary of:" @@ -2364,19 +2267,16 @@ msgstr "Adresa e prones:" msgid "Property type:" msgstr "Lloji i prones:" -#: templates/web/base/report/update-form.html:3 -#: templates/web/fixmystreet/report/update-form.html:4 +#: templates/web/base/report/update-form.html:6 msgid "Provide an update" msgstr "Ofro nje perditesim" -#: templates/web/base/auth/general.html:56 +#: templates/web/base/auth/general.html:95 msgid "Providing a name and password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:156 -#: templates/web/base/report/update-form.html:129 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:71 -#: templates/web/fixmystreet/report/update-form.html:119 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:34 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:9 msgid "Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." msgstr "" @@ -2412,18 +2312,17 @@ msgstr "" #: templates/web/base/alert/_list.html:22 #: templates/web/base/around/display_location.html:1 #: templates/web/base/around/display_location.html:3 -#: templates/web/base/report/display.html:50 +#: templates/web/base/report/display_tools.html:34 #: templates/web/base/reports/_rss.html:1 #: templates/web/fixmystreet/alert/updates.html:9 -#: templates/web/fixmystreet/report/display.html:58 msgid "RSS feed" msgstr "RSS feed" -#: perllib/FixMyStreet/Cobrand/UK.pm:250 perllib/FixMyStreet/Cobrand/UK.pm:262 +#: perllib/FixMyStreet/Cobrand/UK.pm:251 perllib/FixMyStreet/Cobrand/UK.pm:263 msgid "RSS feed for %s" msgstr "RSS feed per %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:256 perllib/FixMyStreet/Cobrand/UK.pm:268 +#: perllib/FixMyStreet/Cobrand/UK.pm:257 perllib/FixMyStreet/Cobrand/UK.pm:269 msgid "RSS feed for %s ward, %s" msgstr "RSS feed per lagjen %s , %s" @@ -2431,11 +2330,11 @@ msgstr "RSS feed per lagjen %s , %s" #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:163 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:173 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:181 -#: perllib/FixMyStreet/Cobrand/UK.pm:276 perllib/FixMyStreet/Cobrand/UK.pm:288 +#: perllib/FixMyStreet/Cobrand/UK.pm:277 perllib/FixMyStreet/Cobrand/UK.pm:289 msgid "RSS feed of %s" msgstr "RSS feed i %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:281 perllib/FixMyStreet/Cobrand/UK.pm:293 +#: perllib/FixMyStreet/Cobrand/UK.pm:282 perllib/FixMyStreet/Cobrand/UK.pm:294 msgid "RSS feed of %s, within %s ward" msgstr "RSS feed i %s, brenda lagjes %s" @@ -2447,15 +2346,15 @@ msgstr "RSS feed i problemeve ne afersi" msgid "RSS feed of problems in this %s" msgstr "RSS feed i problemeve ne kete %s" -#: perllib/FixMyStreet/Cobrand/Default.pm:643 +#: perllib/FixMyStreet/Cobrand/Default.pm:664 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:121 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:138 -#: perllib/FixMyStreet/Cobrand/UK.pm:214 +#: perllib/FixMyStreet/Cobrand/UK.pm:215 msgid "RSS feed of problems within %s" msgstr "RSS feed i problemeve brenda %s" #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:127 -#: perllib/FixMyStreet/Cobrand/UK.pm:220 +#: perllib/FixMyStreet/Cobrand/UK.pm:221 msgid "RSS feed of problems within %s ward" msgstr "RSS feed i problemeve brenda lagjes %s " @@ -2464,25 +2363,22 @@ msgstr "RSS feed i problemeve brenda lagjes %s " msgid "RSS feed of recent local problems" msgstr "RSS feed nga problemet e fundit lokale" -#: templates/web/base/report/display.html:50 +#: templates/web/base/report/display_tools.html:34 #: templates/web/fixmystreet/alert/updates.html:9 -#: templates/web/fixmystreet/report/display.html:58 msgid "RSS feed of updates to this problem" msgstr "RSS feed per te rejat rreth ketij problemi" #: templates/web/base/alert/updates.html:9 -#: templates/web/base/report/display.html:41 +#: templates/web/base/report/display_tools.html:36 #: templates/web/fixmystreet/alert/updates.html:14 -#: templates/web/fixmystreet/report/display.html:60 msgid "Receive email when updates are left on this problem." msgstr "Prano email kur ka perditesime te ketij problemi" #. ("%s is the site name") #: templates/web/base/around/display_location.html:0 #: templates/web/base/around/display_location.html:33 -#, fuzzy msgid "Recent local problems, %s" -msgstr "Problemet lokale te fundit, FixMyStreet" +msgstr "" #: templates/web/base/reports/index.html:24 msgid "Recently <br>fixed" @@ -2500,8 +2396,8 @@ msgstr "" msgid "Remove flag" msgstr "Largo flamurin" -#: templates/web/base/admin/report_edit.html:92 -#: templates/web/base/admin/update_edit.html:62 +#: templates/web/base/admin/report_edit.html:93 +#: templates/web/base/admin/update_edit.html:67 #: templates/web/zurich/admin/update_edit.html:35 msgid "Remove photo (can't be undone!)" msgstr "Largo fotografine (nuk mund te kthehet!)" @@ -2521,7 +2417,7 @@ msgstr "" msgid "Report a problem" msgstr "Raporto nje problem" -#: templates/web/fixmystreet/report/display.html:32 +#: templates/web/base/report/display_tools.html:8 msgid "Report abuse" msgstr "Raporto abuzimin" @@ -2530,7 +2426,8 @@ msgid "Report on %s" msgstr "Raporto ne %s" #: templates/web/base/report/new/fill_in_details_form.html:1 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:2 +#: templates/web/base/report/new/login_success_form.html:1 +#: templates/web/base/report/new/oauth_email_form.html:1 msgid "Report your problem" msgstr "" @@ -2539,9 +2436,8 @@ msgstr "" msgid "Report, view, or discuss local problems" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:585 -#: templates/web/base/contact/index.html:50 -#: templates/web/fixmystreet/contact/index.html:65 +#: perllib/FixMyStreet/DB/Result/Problem.pm:573 +#: templates/web/base/contact/index.html:57 msgid "Reported anonymously at %s" msgstr "Raportuar ne menyre anonime te %s" @@ -2550,43 +2446,41 @@ msgstr "Raportuar ne menyre anonime te %s" msgid "Reported before" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:608 -#: templates/web/base/contact/index.html:52 -#: templates/web/fixmystreet/contact/index.html:67 +#: perllib/FixMyStreet/DB/Result/Problem.pm:596 +#: templates/web/base/contact/index.html:59 msgid "Reported by %s at %s" msgstr "Raportuar nga %s ne %s" #: templates/web/zurich/admin/report_edit-sdm.html:58 #: templates/web/zurich/admin/report_edit.html:86 -#, fuzzy msgid "Reported by:" -msgstr "Raportuar %s" +msgstr "" #: templates/web/zurich/report/_main.html:2 msgid "Reported in the %s category" msgstr "Raportuar ne kategorine %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:581 +#: perllib/FixMyStreet/DB/Result/Problem.pm:569 msgid "Reported in the %s category anonymously at %s" msgstr "Raportuar ne kategorine %s ne menyre anonime ne %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:603 +#: perllib/FixMyStreet/DB/Result/Problem.pm:591 msgid "Reported in the %s category by %s at %s" msgstr "Raportuar ne kategorine %s nga %s ne %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:577 +#: perllib/FixMyStreet/DB/Result/Problem.pm:565 msgid "Reported via %s anonymously at %s" msgstr "Raportuar nepermjet %s ne menyre anonime ne %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:599 +#: perllib/FixMyStreet/DB/Result/Problem.pm:587 msgid "Reported via %s by %s at %s" msgstr "Raportuar nepermjet %s nga %s ne %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:573 +#: perllib/FixMyStreet/DB/Result/Problem.pm:561 msgid "Reported via %s in the %s category anonymously at %s" msgstr "Raportuar nepermjet %s ne kategorine %s ne menyre anonime ne %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:593 +#: perllib/FixMyStreet/DB/Result/Problem.pm:581 msgid "Reported via %s in the %s category by %s at %s" msgstr "Raportuar nepermjet %s ne kategorine %s ne %s" @@ -2596,9 +2490,8 @@ msgstr "" #: templates/web/zurich/admin/report_edit-sdm.html:36 #: templates/web/zurich/admin/report_edit.html:55 -#, fuzzy msgid "Reported:" -msgstr "Raportuar %s" +msgstr "" #: templates/web/base/around/index.html:2 #: templates/web/base/js/translation_strings.html:41 @@ -2608,13 +2501,13 @@ msgstr "Raportuar %s" msgid "Reporting a problem" msgstr "Raportimi i nje problemi" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1277 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1286 #: perllib/FixMyStreet/Cobrand/Zurich.pm:384 #: templates/web/zurich/header.html:60 msgid "Reports" msgstr "Raportimet" -#: perllib/FixMyStreet/Cobrand/UK.pm:327 perllib/FixMyStreet/Cobrand/UK.pm:331 +#: perllib/FixMyStreet/Cobrand/UK.pm:328 perllib/FixMyStreet/Cobrand/UK.pm:332 msgid "Reports are limited to %s characters in length. Please shorten your report" msgstr "Raportimet jane te kufizuara ne gjatesine %s karaktere. Ju lutem shkurtoje raportin tuaj" @@ -2651,15 +2544,17 @@ msgstr "" msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1495 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1500 -#: templates/web/base/admin/report_edit.html:88 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1508 +#: templates/web/base/admin/report_edit.html:90 +#: templates/web/base/admin/update_edit.html:64 #: templates/web/zurich/admin/report_edit.html:116 msgid "Rotate Left" msgstr "Rrotullo Majtas" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1495 -#: templates/web/base/admin/report_edit.html:89 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 +#: templates/web/base/admin/report_edit.html:91 +#: templates/web/base/admin/update_edit.html:65 #: templates/web/zurich/admin/report_edit.html:117 msgid "Rotate Right" msgstr "Rrotullo Djathtas" @@ -2669,7 +2564,6 @@ msgid "Rotating this photo will discard unsaved changes to the report." msgstr "" #: templates/web/base/js/translation_strings.html:46 -#: templates/web/base/maps/google-ol.html:13 msgid "Satellite" msgstr "" @@ -2726,11 +2620,10 @@ msgid "Select which type of alert you’d like and click the button for an RSS f msgstr "" #: perllib/FixMyStreet/Cobrand/Zurich.pm:835 -#, fuzzy msgid "Sent report back" -msgstr "Raporte te hapura" +msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:708 +#: perllib/FixMyStreet/DB/Result/Problem.pm:696 msgid "Sent to %s %s later" msgstr "" @@ -2743,15 +2636,13 @@ msgstr "Dergo:" msgid "Service:" msgstr "Sherbim:" -#: templates/web/fixmystreet/report/display.html:38 +#: templates/web/base/report/display_tools.html:14 msgid "Share" msgstr "Shperndaj" -#: templates/web/base/report/new/fill_in_details_form.html:193 -#: templates/web/base/report/update-form.html:158 -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:23 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:59 -#: templates/web/fixmystreet/report/update-form.html:146 +#: templates/web/base/report/new/form_user_loggedin.html:23 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:22 +#: templates/web/base/report/update/form_name.html:15 msgid "Show my name publicly" msgstr "Publiko emrin tim" @@ -2763,9 +2654,9 @@ msgstr "Shfaq te vjetrat" msgid "Show pins" msgstr "Shfaq shenjat" +#: templates/web/base/auth/general.html:100 #: templates/web/base/auth/general.html:3 -#: templates/web/base/auth/general.html:40 -#: templates/web/base/auth/general.html:61 +#: templates/web/base/auth/general.html:76 #: templates/web/zurich/auth/general.html:18 #: templates/web/zurich/auth/general.html:35 msgid "Sign in" @@ -2792,7 +2683,7 @@ msgid "" " sent from your FixMyStreet installation." msgstr "" -#: templates/web/base/alert/index.html:42 +#: templates/web/base/alert/index.html:40 msgid "Some photos of recent reports" msgstr "" @@ -2802,7 +2693,7 @@ msgstr "" msgid "Some text to localize" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:78 +#: perllib/FixMyStreet/Cobrand/UK.pm:79 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover." msgstr "" @@ -2814,22 +2705,33 @@ msgstr "" msgid "Sorry, there has been an error confirming your problem." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:221 -#: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:37 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:216 +#: perllib/FixMyStreet/Geocode.pm:38 perllib/FixMyStreet/Geocode/Bing.pm:38 #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:56 #: perllib/FixMyStreet/Geocode/OSM.pm:48 msgid "Sorry, we could not find that location." msgstr "Na vjen keq, ne nuk mund te gjejme kete lokacion." -#: perllib/FixMyStreet/Geocode/Bing.pm:34 +#: templates/web/base/auth/general.html:9 +#: templates/web/base/report/display.html:21 +#: templates/web/base/report/new/fill_in_details_form.html:23 +#, fuzzy +msgid "Sorry, we could not log you in. Please fill in the form below." +msgstr "Na vjen keq, ne nuk mund te kuptojme kete lokacion. Ju lutem provoni perseri." + +#: perllib/FixMyStreet/Geocode/Bing.pm:35 #: perllib/FixMyStreet/Geocode/Google.pm:45 #: perllib/FixMyStreet/Geocode/Zurich.pm:88 msgid "Sorry, we could not parse that location. Please try again." msgstr "Na vjen keq, ne nuk mund te kuptojme kete lokacion. Ju lutem provoni perseri." #: perllib/FixMyStreet/App/Model/PhotoSet.pm:134 -#, fuzzy msgid "Sorry, we couldn't save your image(s), please try again." +msgstr "" + +#: perllib/FixMyStreet/App/Controller/AuthSS.pm:301 +#, fuzzy +msgid "Sorry, you can not log in with Facebook. Please try again later." msgstr "Na vjen keq, ne nuk mund te kuptojme kete lokacion. Ju lutem provoni perseri." #: templates/web/base/admin/stats.html:64 @@ -2840,13 +2742,12 @@ msgstr "Data e Fillimit:" #: templates/web/base/admin/flagged.html:18 #: templates/web/base/admin/list_updates.html:11 #: templates/web/base/admin/reports.html:15 -#: templates/web/fixmystreet/report/update-form.html:26 +#: templates/web/base/report/update/form_update.html:32 msgid "State" msgstr "Gjendje" #: templates/web/base/admin/report_edit.html:47 #: templates/web/base/admin/update_edit.html:27 -#: templates/web/base/report/update-form.html:28 #: templates/web/zurich/admin/report_edit-sdm.html:73 #: templates/web/zurich/admin/report_edit.html:101 #: templates/web/zurich/admin/report_edit.html:155 @@ -2854,7 +2755,7 @@ msgstr "Gjendje" msgid "State:" msgstr "Gjendje:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1282 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1291 #: perllib/FixMyStreet/Cobrand/Zurich.pm:387 #: templates/web/base/admin/stats.html:1 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:73 @@ -2876,7 +2777,7 @@ msgstr "Akoma hapur, nepermjet pyetesorit, %s" msgid "Street View" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:406 +#: perllib/FixMyStreet/Script/Reports.pm:184 msgid "Subcategory: %s" msgstr "Nenkategoria: %s" @@ -2884,30 +2785,25 @@ msgstr "Nenkategoria: %s" msgid "Subdivision/Body" msgstr "" -#: templates/web/fixmystreet/contact/index.html:98 +#: templates/web/base/contact/index.html:90 msgid "Subject" msgstr "Tema" #: templates/web/base/admin/report_edit.html:19 -#: templates/web/base/contact/index.html:88 -#: templates/web/base/report/new/fill_in_details_form.html:53 #: templates/web/zurich/admin/report_edit.html:39 msgid "Subject:" msgstr "Tema:" #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/fill_in_details_form.html:137 -#: templates/web/base/report/new/fill_in_details_form.html:159 -#: templates/web/base/report/new/fill_in_details_form.html:96 -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:36 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:23 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:76 +#: templates/web/base/report/new/form_user_loggedin.html:36 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:39 +#: templates/web/base/report/new/form_user_loggedout_password.html:11 #: templates/web/zurich/report/new/fill_in_details_form.html:96 msgid "Submit" msgstr "Paraqit" -#: templates/web/base/admin/report_edit.html:95 -#: templates/web/base/admin/update_edit.html:65 +#: templates/web/base/admin/report_edit.html:101 +#: templates/web/base/admin/update_edit.html:75 #: templates/web/base/admin/user-form.html:56 #: templates/web/zurich/admin/report_edit-sdm.html:137 #: templates/web/zurich/admin/report_edit.html:268 @@ -2915,7 +2811,7 @@ msgstr "Paraqit" msgid "Submit changes" msgstr "Paraqit ndryshimet" -#: templates/web/base/questionnaire/index.html:97 +#: templates/web/base/questionnaire/index.html:106 msgid "Submit questionnaire" msgstr "Paraqit pyetesorin" @@ -2931,9 +2827,8 @@ msgid "Submitted" msgstr "Paraqitur" #: templates/web/base/alert/updates.html:17 -#: templates/web/base/report/display.html:46 +#: templates/web/base/report/display_tools.html:41 #: templates/web/fixmystreet/alert/updates.html:23 -#: templates/web/fixmystreet/report/display.html:65 msgid "Subscribe" msgstr "Abonohu" @@ -2941,7 +2836,7 @@ msgstr "Abonohu" msgid "Subscribe me to an email alert" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1275 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1284 #: perllib/FixMyStreet/Cobrand/Zurich.pm:383 #: templates/web/base/admin/bodies.html:25 #: templates/web/base/admin/index.html:1 @@ -2960,7 +2855,7 @@ msgstr "Permbledhje" msgid "Summary reports" msgstr "Raportet përmbledhëse" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1279 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1288 msgid "Survey" msgstr "Studim" @@ -2974,9 +2869,8 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/Zurich.pm:394 #: templates/web/zurich/header.html:77 -#, fuzzy msgid "Templates" -msgstr "Perditesime" +msgstr "" #: templates/web/base/admin/list_updates.html:12 #: templates/web/zurich/admin/templates.html:9 @@ -2997,7 +2891,7 @@ msgstr "Tekst:" msgid "Thank you for reporting this issue!" msgstr "" -#: templates/web/base/tokens/error.html:7 +#: templates/web/base/tokens/error.html:6 msgid "Thank you for trying to confirm your update or problem. We seem to have an error ourselves though, so <a href=\"%s\">please let us know what went on</a> and we'll look into it." msgstr "" @@ -3032,23 +2926,23 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:47 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:63 -#: perllib/FixMyStreet/Cobrand/UK.pm:71 +#: perllib/FixMyStreet/Cobrand/UK.pm:72 msgid "That postcode was not recognised, sorry." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:726 +#: perllib/FixMyStreet/App/Controller/Admin.pm:724 msgid "That problem has been marked as sent." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:718 +#: perllib/FixMyStreet/App/Controller/Admin.pm:716 msgid "That problem will now be resent." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:125 +#: perllib/FixMyStreet/App/Controller/Report.pm:127 msgid "That report cannot be viewed on %s." msgstr "Raporti nuk mund te shihet ne %s." -#: perllib/FixMyStreet/App/Controller/Report.pm:119 +#: perllib/FixMyStreet/App/Controller/Report.pm:121 msgid "That report has been removed from FixMyStreet." msgstr "" @@ -3079,7 +2973,7 @@ msgid "" " If you leave this blank, <strong>send method defaults to email</strong>." msgstr "" -#: templates/web/base/open311/index.html:90 +#: templates/web/base/open311/index.html:82 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 "" @@ -3100,12 +2994,12 @@ msgstr "" msgid "The diligency prize league table shows editors' activity (who's been editing the most records)." msgstr "" -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:60 -#: perllib/FixMyStreet/App/Controller/Reports.pm:79 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:61 +#: perllib/FixMyStreet/App/Controller/Reports.pm:80 msgid "The error was: %s" msgstr "Gabimi ishte: %s" -#: templates/web/base/open311/index.html:86 +#: templates/web/base/open311/index.html:78 msgid "The following Open311 v2 attributes are returned for each request: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code and service_name." msgstr "" @@ -3152,8 +3046,7 @@ msgstr "" msgid "The passwords do not match" msgstr "Fjalekalimet nuk perputhen" -#: templates/web/base/errors/page_error_404_not_found.html:10 -#: templates/web/base/errors/page_error_404_not_found.html:12 +#: templates/web/base/errors/page_error_404_not_found.html:9 msgid "The requested URL '%s' was not found on this server" msgstr "URL e kerkuar '%s' nuk u gjet ne kete server" @@ -3163,12 +3056,11 @@ msgstr "" #: templates/web/base/report/new/councils_extra_text.html:1 #: templates/web/base/report/new/councils_text_some.html:10 -#: templates/web/base/report/new/fill_in_details_form.html:18 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:14 +#: templates/web/base/report/new/fill_in_details_form.html:13 msgid "The summary and description will also be made public (see our <a href=\"/privacy\">privacy policy</a>)." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:315 +#: perllib/FixMyStreet/Script/Reports.pm:92 msgid "The user could not locate the problem on a map, but to see the area around the location they entered" msgstr "" @@ -3185,18 +3077,18 @@ msgstr "" msgid "There are no reports to show." msgstr "" -#: perllib/FixMyStreet/App/Controller/Reports.pm:76 +#: perllib/FixMyStreet/App/Controller/Reports.pm:77 msgid "There was a problem showing the All Reports page. Please try again later." msgstr "" #: perllib/FixMyStreet/App/Controller/Contact.pm:137 -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:59 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:60 msgid "There was a problem showing this page. Please try again later." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:769 -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:134 -#: templates/web/base/auth/general.html:26 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:764 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:138 +#: templates/web/base/auth/general.html:43 #: templates/web/zurich/auth/general.html:28 msgid "There was a problem with your email/password combination. If you cannot remember your password, or do not have one, please fill in the ‘sign in by email’ section of the form." msgstr "" @@ -3205,7 +3097,7 @@ msgstr "" msgid "There was a problem with your email/password combination. Please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:272 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:336 msgid "There was a problem with your update. Please try again." msgstr "" @@ -3213,7 +3105,7 @@ msgstr "" msgid "There were problems with your report. Please see below." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:300 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:371 msgid "There were problems with your update. Please see below." msgstr "" @@ -3227,7 +3119,7 @@ msgid "" " " msgstr "" -#: templates/web/base/open311/index.html:77 +#: templates/web/base/open311/index.html:69 msgid "This API implementation is work in progress and not yet stabilized. It will change without warnings in the future." msgstr "" @@ -3249,18 +3141,18 @@ msgid "" " A body will not receive any reports unless it covers at least one area." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:413 +#: perllib/FixMyStreet/Script/Reports.pm:191 msgid "This email has been sent to both councils covering the location of the problem, as the user did not categorise it; please ignore it if you're not the correct council to deal with the issue, or let us know what category of problem this is so we can add it to our system." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:416 +#: perllib/FixMyStreet/Script/Reports.pm:194 msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:925 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:995 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:920 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:990 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:142 -#: perllib/FixMyStreet/Cobrand/UK.pm:43 +#: perllib/FixMyStreet/Cobrand/UK.pm:44 msgid "This information is required" msgstr "" @@ -3272,56 +3164,37 @@ msgstr "" msgid "This is a summary of all reports on this site." msgstr "" -#: templates/web/zurich/auth/token.html:8 -msgid "This may be because the link is too old or already used, or the address was not copied correctly." -msgstr "" - -#: templates/web/base/report/banner.html:15 -msgid "This problem has been closed" -msgstr "Ky problem ka qene i mbyllur" - -#: templates/web/base/report/banner.html:12 -#: templates/web/base/report/update-form.html:48 -#: templates/web/fixmystreet/report/update-form.html:46 +#: templates/web/base/report/update/form_update.html:52 msgid "This problem has been fixed" msgstr "Ky problem ka qene i rregulluar" -#: templates/web/base/report/update-form.html:43 -#: templates/web/fixmystreet/report/update-form.html:40 +#: templates/web/base/report/update/form_update.html:46 msgid "This problem has not been fixed" msgstr "Ky problem nuk ka qene i rregulluar" -#: templates/web/base/report/banner.html:19 -msgid "This problem is in progress" -msgstr "Ky problem eshte ne progres" - -#: templates/web/base/report/banner.html:9 -msgid "This problem is old and of unknown status." -msgstr "Ky problem eshte i vjeter dhe me status te panjohur." - #: perllib/FixMyStreet/Cobrand/Zurich.pm:168 #: perllib/FixMyStreet/Cobrand/Zurich.pm:169 #: templates/web/zurich/report/_main.html:14 msgid "This report is awaiting moderation." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:86 +#: perllib/FixMyStreet/Script/Alerts.pm:94 msgid "This report is currently marked as closed." msgstr "Ky raport eshte shenuar si i mbyllur." -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:84 +#: perllib/FixMyStreet/Script/Alerts.pm:92 msgid "This report is currently marked as fixed." msgstr "Ky raport eshte shenuar si i rregulluar." -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:88 +#: perllib/FixMyStreet/Script/Alerts.pm:96 msgid "This report is currently marked as open." msgstr "Ky problem eshte i shenuar si i hapur." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:326 +#: perllib/FixMyStreet/Script/Reports.pm:105 msgid "This report was submitted anonymously" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:308 +#: perllib/FixMyStreet/Script/Reports.pm:85 msgid "This web page also contains a photo of the problem, provided by the user." msgstr "" @@ -3332,7 +3205,7 @@ msgstr "" msgid "Time spent (in minutes):" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1278 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1287 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "Kohezgjatja" @@ -3344,9 +3217,8 @@ msgid "Title" msgstr "Titulli" #: templates/web/zurich/admin/template_edit.html:20 -#, fuzzy msgid "Title:" -msgstr "Titulli" +msgstr "" #: templates/web/base/alert/index.html:25 msgid "To find out what local alerts we have for you, please enter your %s postcode or street name and area:" @@ -3356,11 +3228,11 @@ msgstr "" msgid "To find out what local alerts we have for you, please enter your postcode or street name and area" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:314 +#: perllib/FixMyStreet/Script/Reports.pm:91 msgid "To view a map of the precise location of this issue" msgstr "" -#: templates/web/base/admin/index.html:61 +#: templates/web/base/admin/index.html:54 #: templates/web/base/admin/questionnaire.html:24 #: templates/web/base/admin/stats.html:24 #: templates/web/base/admin/stats.html:43 @@ -3378,10 +3250,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:12 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:33 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:31 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:37 msgid "Unable to fix" msgstr "" @@ -3394,7 +3264,7 @@ msgstr "" msgid "Unconfirmed" msgstr "E pakonfirmuar" -#: templates/web/fixmystreet/report/banner.html:9 +#: templates/web/base/report/banner.html:9 msgid "Unknown" msgstr "E panjohur" @@ -3402,17 +3272,18 @@ msgstr "E panjohur" msgid "Unknown alert type" msgstr "" +#: perllib/FixMyStreet/App/Controller/Photo.pm:110 #: templates/web/base/js/translation_strings.html:39 msgid "Unknown error" msgstr "Gabim i panjohur" -#: perllib/FixMyStreet/App/Controller/Report.pm:103 -#: perllib/FixMyStreet/App/Controller/Report.pm:109 -#: perllib/FixMyStreet/App/Controller/Report.pm:112 +#: perllib/FixMyStreet/App/Controller/Report.pm:105 +#: perllib/FixMyStreet/App/Controller/Report.pm:111 +#: perllib/FixMyStreet/App/Controller/Report.pm:114 msgid "Unknown problem ID" msgstr "" -#: templates/web/fixmystreet/report/update-form.html:19 +#: templates/web/base/report/update/form_update.html:25 msgid "Update" msgstr "Perditesim" @@ -3420,13 +3291,11 @@ msgstr "Perditesim" msgid "Update %s created for problem %d; by %s" msgstr "" -#: templates/web/base/contact/index.html:21 -#: templates/web/fixmystreet/contact/index.html:36 +#: templates/web/base/contact/index.html:28 msgid "Update below added anonymously at %s" msgstr "" -#: templates/web/base/contact/index.html:23 -#: templates/web/fixmystreet/contact/index.html:38 +#: templates/web/base/contact/index.html:30 msgid "Update below added by %s at %s" msgstr "" @@ -3435,7 +3304,7 @@ msgstr "" msgid "Update body" msgstr "" -#: templates/web/base/admin/index.html:55 +#: templates/web/base/admin/index.html:48 msgid "Update breakdown by state" msgstr "" @@ -3460,20 +3329,16 @@ msgstr "" msgid "Update statuses" msgstr "" -#: templates/web/base/report/update-form.html:22 -msgid "Update:" -msgstr "Perditesim:" - #: templates/web/zurich/admin/index-dm.html:23 #: templates/web/zurich/admin/index-sdm.html:21 #: templates/web/zurich/admin/reports.html:13 msgid "Updated" msgstr "Perditesuar" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1045 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1103 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1147 -#: perllib/FixMyStreet/App/Controller/Admin.pm:822 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1048 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1108 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1156 +#: perllib/FixMyStreet/App/Controller/Admin.pm:821 #: perllib/FixMyStreet/Cobrand/Zurich.pm:771 #: perllib/FixMyStreet/Cobrand/Zurich.pm:796 #: perllib/FixMyStreet/Cobrand/Zurich.pm:866 @@ -3481,13 +3346,12 @@ msgid "Updated!" msgstr "Perditesuar!" #: templates/web/base/admin/list_updates.html:2 -#: templates/web/base/report/update.html:3 -#: templates/web/fixmystreet/report/update.html:5 +#: templates/web/base/report/update.html:5 #: templates/web/zurich/report/updates.html:2 msgid "Updates" msgstr "Perditesime" -#: perllib/FixMyStreet/DB/Result/Comment.pm:132 +#: perllib/FixMyStreet/DB/Result/Comment.pm:131 msgid "Updates are limited to %s characters in length. Please shorten your update" msgstr "" @@ -3497,12 +3361,9 @@ msgstr "Perditesimet ne {{title}}" #. ("%s is the site name") #: templates/web/base/report/display.html:0 -#: templates/web/base/report/display.html:5 -#: templates/web/fixmystreet/report/display.html:0 -#: templates/web/fixmystreet/report/display.html:9 -#, fuzzy +#: templates/web/base/report/display.html:9 msgid "Updates to this problem, %s" -msgstr "Merr perditesimet per %s problemet" +msgstr "" #: templates/web/base/admin/body.html:182 msgid "Use the <strong>note</strong> to record details that are only displayed in the admin. Notes are not shown publicly, and are not sent to the body." @@ -3510,15 +3371,14 @@ msgstr "" #: templates/web/zurich/admin/report_edit-sdm.html:48 #: templates/web/zurich/admin/report_edit.html:67 -#, fuzzy msgid "Used map" -msgstr "perdor harten" +msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1452 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1461 msgid "User flag removed" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1424 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1433 msgid "User flagged" msgstr "" @@ -3526,7 +3386,7 @@ msgstr "" msgid "User search finds matches in users' names and email addresses." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1280 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1289 #: perllib/FixMyStreet/Cobrand/Zurich.pm:399 #: templates/web/base/admin/flagged.html:29 #: templates/web/zurich/header.html:69 @@ -3557,7 +3417,6 @@ msgid "Viewing a location" msgstr "" #: templates/web/base/report/display.html:0 -#: templates/web/fixmystreet/report/display.html:0 msgid "Viewing a problem" msgstr "" @@ -3570,25 +3429,24 @@ 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/zurich/auth/token.html:7 -msgid "We have not been able to confirm your account - sorry." -msgstr "Ne nuk jemi ne gjendje te konfirmojme llogarine tuaj - na vjen keq." - -#: templates/web/zurich/auth/token.html:17 -msgid "We have sent you an email containing a link to confirm your account." -msgstr "" +#: templates/web/base/auth/general.html:6 +#: templates/web/base/report/display.html:27 +#: templates/web/base/report/new/oauth_email_form.html:5 +#, fuzzy +msgid "We need your email address, please give it below." +msgstr "Ne asnjëherë nuk do tëshfaqim email adresen ose numrin tuaj të telefonit." -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:2 -#: templates/web/fixmystreet/report/update-form.html:77 +#: templates/web/base/report/new/form_user_loggedout_email.html:2 +#: templates/web/base/report/update/form_user_loggedout_email.html:2 msgid "We never show your email" msgstr "ne asnjëherë nuk do të shfaqim email-in tuaj" -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:31 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:65 +#: templates/web/base/report/new/form_user_loggedin.html:31 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:28 msgid "We never show your email address or phone number." msgstr "Ne asnjëherë nuk do tëshfaqim email adresen ose numrin tuaj të telefonit." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:422 +#: perllib/FixMyStreet/Script/Reports.pm:200 msgid "We realise this problem might be the responsibility of %s; however, we don't currently have any contact details for them. If you know of an appropriate contact address, please do get in touch." msgstr "" @@ -3605,10 +3463,6 @@ msgstr "" msgid "We’re sorry to hear the problem’s not fixed. Why not try writing to your local representatives?" msgstr "" -#: templates/web/base/contact/blurb.html:8 -msgid "We'd love to hear what you think about this site. Just fill in the form, or send an email to <a href='mailto:%s'>%s</a>:" -msgstr "" - #: templates/web/base/contact/submit.html:7 msgid "We’ll get back to you as soon as we can." msgstr "" @@ -3617,7 +3471,7 @@ msgstr "" msgid "What was your experience of getting the problem fixed?" msgstr "" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:49 +#: templates/web/base/report/new/form_report.html:19 msgid "What’s the issue, and where is it?" msgstr "" @@ -3630,7 +3484,11 @@ msgstr "Kur redaktohet" msgid "When sent" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:640 +#: templates/web/base/js/translation_strings.html:50 +msgid "Whoa there Testino! Three photos are enough." +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Report/New.pm:635 msgid "Whole block of empty flats" msgstr "" @@ -3645,7 +3503,7 @@ msgstr "" msgid "Wish" msgstr "" -#: templates/web/base/open311/index.html:92 +#: templates/web/base/open311/index.html:84 msgid "With request searches, it is also possible to search for agency_responsible to limit the requests to those sent to a single administration. The search term is the administration ID provided by <a href=\"%s\">MaPit</a>." msgstr "" @@ -3653,7 +3511,7 @@ msgstr "" msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"http://fixmystreet.org\">available at fixmystreet.org</a>." msgstr "" -#: templates/web/base/questionnaire/index.html:87 +#: templates/web/base/questionnaire/index.html:96 msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?" msgstr "" @@ -3662,7 +3520,6 @@ msgid "Writing your message entirely in block capitals makes it hard to read, as msgstr "" #: templates/web/base/report/new/fill_in_details_form.html:4 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:5 msgid "Wrong location? Just click again on the map." msgstr "" @@ -3685,27 +3542,24 @@ msgstr "Viti" #: templates/web/base/admin/users.html:31 #: templates/web/base/questionnaire/creator_fixed.html:14 #: templates/web/base/questionnaire/index.html:51 -#: templates/web/base/questionnaire/index.html:90 +#: templates/web/base/questionnaire/index.html:99 msgid "Yes" msgstr "Po" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:17 -#: templates/web/fixmystreet/report/update-form.html:91 +#: templates/web/base/report/new/form_user_loggedout_password.html:5 +#: templates/web/base/report/update/form_user_loggedout_password.html:4 msgid "Yes I have a password" msgstr "Po une kam nje fjalekalim" -#: templates/web/base/contact/index.html:39 -#: templates/web/fixmystreet/contact/index.html:54 +#: templates/web/base/contact/index.html:46 msgid "You are complaining that this problem report was unnecessarily moderated:" msgstr "" -#: templates/web/base/contact/index.html:41 -#: templates/web/fixmystreet/contact/index.html:56 +#: templates/web/base/contact/index.html:48 msgid "You are reporting the following problem report for being abusive, containing personal information, or similar:" msgstr "" -#: templates/web/base/contact/index.html:15 -#: templates/web/fixmystreet/contact/index.html:30 +#: templates/web/base/contact/index.html:22 msgid "You are reporting the following update for being abusive, containing personal information, or similar:" msgstr "" @@ -3718,7 +3572,7 @@ msgstr "Ju mund <a href=\"%s%s\">te shihni problemin ne kete faqe</a>." msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create." msgstr "" -#: templates/web/fixmystreet/contact/index.html:121 +#: templates/web/base/contact/index.html:113 msgid "You can contact technical support on <a href='mailto:%s'>%s</a>" msgstr "Ju mund te kontaktoni per ndihme teknike ne <a href='mailto:%s'>%s</a>" @@ -3729,8 +3583,8 @@ msgid "" " reports in the past." msgstr "" -#: templates/web/base/report/new/councils_text_none.html:10 -#: templates/web/base/report/new/councils_text_none.html:2 +#: templates/web/base/report/new/councils_text_none.html:12 +#: templates/web/base/report/new/councils_text_none.html:14 #: templates/web/base/report/new/councils_text_some.html:19 #: templates/web/base/report/new/councils_text_some.html:21 msgid "You can help us by finding a contact email address for local problems for %s and emailing it to us at <a href='mailto:%s'>%s</a>." @@ -3748,19 +3602,14 @@ msgstr "" msgid "You have already answered this questionnaire. If you have a question, please <a href='%s'>get in touch</a>, or <a href='%s'>view your problem</a>.\n" msgstr "" -#: templates/web/base/questionnaire/index.html:77 -#: templates/web/base/report/new/fill_in_details_form.html:75 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:73 -msgid "You have already attached a photo to this report, attaching another one will replace it." -msgstr "" - -#: templates/web/base/report/update-form.html:59 -#: templates/web/fixmystreet/report/update-form.html:56 -msgid "You have already attached a photo to this update, attaching another one will replace it." +#: templates/web/base/report/new/form_report.html:32 +#: templates/web/zurich/report/new/fill_in_details_form.html:55 +msgid "You have already attached photos to this report. Note that you can attach a maximum of 3 to this report (if you try to upload more, the oldest will be removed)." msgstr "" -#: templates/web/zurich/report/new/fill_in_details_form.html:61 -msgid "You have already attached photos to this report. Note that you can attach a maximum of 3 to this report (if you try to upload more, the oldest will be removed)." +#: templates/web/base/questionnaire/index.html:83 +#: templates/web/base/report/update/form_update.html:14 +msgid "You have already attached photos to this update. Note that you can attach a maximum of 3 to this update (if you try to upload more, the oldest will be removed)." msgstr "" #: templates/web/base/auth/sign_out.html:4 @@ -3777,9 +3626,8 @@ msgstr "" msgid "You have successfully confirmed your email address." msgstr "" -#: templates/web/base/report/display.html:20 -#: templates/web/base/report/new/fill_in_details.html:37 -#: templates/web/fixmystreet/report/display.html:17 +#: templates/web/base/report/display.html:17 +#: templates/web/base/report/new/login_success_form.html:3 msgid "You have successfully signed in; please check and confirm your details are accurate:" msgstr "" @@ -3808,53 +3656,42 @@ msgid "Your Reports" msgstr "Raportet tuaja" #: templates/web/base/alert/_list.html:89 +#: templates/web/base/contact/index.html:83 +#: templates/web/base/report/display_tools.html:38 +#: templates/web/base/report/display_tools.html:40 +#: templates/web/base/report/new/form_user_loggedin.html:3 +#: templates/web/base/report/new/form_user_loggedout_email.html:1 +#: templates/web/base/report/update/form_user_loggedout_email.html:1 #: templates/web/fixmystreet/alert/updates.html:19 #: templates/web/fixmystreet/alert/updates.html:22 -#: templates/web/fixmystreet/contact/index.html:91 -#: templates/web/fixmystreet/report/display.html:62 -#: templates/web/fixmystreet/report/display.html:64 -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:3 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:1 -#: templates/web/fixmystreet/report/update-form.html:76 #: templates/web/zurich/report/new/fill_in_details_form.html:76 msgid "Your email" msgstr "Email-i juaj" -#: templates/web/base/auth/general.html:28 -#: templates/web/fixmystreet/report/update-form.html:82 +#: templates/web/base/auth/general.html:45 +#: templates/web/base/report/update/form_user_loggedout_email.html:7 #: templates/web/zurich/auth/general.html:30 #: templates/web/zurich/auth/general.html:58 msgid "Your email address" msgstr "Email adresa juaj" -#: templates/web/base/report/new/fill_in_details_form.html:106 -#: templates/web/base/report/update-form.html:81 -msgid "Your email:" -msgstr "Email-i juaj:" - -#: templates/web/fixmystreet/report/updates-sidebar-notes.html:7 +#: templates/web/base/report/updates-sidebar-notes.html:3 msgid "Your information will only be used in accordance with our <a href=\"/privacy\">privacy policy</a>" msgstr "" -#: templates/web/base/auth/general.html:51 -#: templates/web/fixmystreet/contact/index.html:84 -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:18 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:54 -#: templates/web/fixmystreet/report/update-form.html:142 +#: templates/web/base/auth/general.html:90 +#: templates/web/base/contact/index.html:76 +#: templates/web/base/report/new/form_user_loggedin.html:18 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:17 +#: templates/web/base/report/update/form_name.html:11 #: templates/web/zurich/auth/general.html:61 #: templates/web/zurich/report/new/fill_in_details_form.html:86 msgid "Your name" msgstr "Emri juaj" -#: templates/web/base/contact/index.html:73 -#: templates/web/base/report/new/fill_in_details_form.html:186 -#: templates/web/base/report/update-form.html:152 -msgid "Your name:" -msgstr "Emri juaj:" - -#: templates/web/base/auth/general.html:39 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:22 -#: templates/web/fixmystreet/report/update-form.html:96 +#: templates/web/base/auth/general.html:75 +#: templates/web/base/report/new/form_user_loggedout_password.html:10 +#: templates/web/base/report/update/form_user_loggedout_password.html:9 #: templates/web/zurich/auth/general.html:34 msgid "Your password" msgstr "Fjalekalimi juaj" @@ -3863,15 +3700,16 @@ msgstr "Fjalekalimi juaj" msgid "Your password has been changed" msgstr "Fjalekalimi juaj eshte ndryshuar" -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:27 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:63 +#: templates/web/base/report/new/form_user_loggedin.html:27 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:26 #: templates/web/zurich/report/new/fill_in_details_form.html:92 msgid "Your phone number" msgstr "Numri juaj i telefonit" #: templates/web/base/questionnaire/index.html:14 +#, fuzzy msgid "Your report" -msgstr "Raporti juaj" +msgstr "Raportet tuaja" #: templates/web/base/footer.html:9 templates/web/fixmystreet/footer.html:29 msgid "Your reports" @@ -3881,23 +3719,17 @@ msgstr "Raportet tuaja" msgid "Your updates" msgstr "Perditesimet tuaja" -#: templates/web/base/contact/index.html:81 -msgid "Your email:" -msgstr "Email-i juaj;" - #: templates/web/base/reports/_list-filters.html:3 -#, fuzzy msgid "all reports" -msgstr "Te gjitha raportimet" +msgstr "" #: templates/web/base/admin/timeline.html:4 msgid "by %s" msgstr "nga %s" #: templates/web/base/reports/_list-filters.html:5 -#, fuzzy msgid "closed reports" -msgstr "Raportime te mbyllura" +msgstr "" #: templates/web/base/reports/body.html:6 #: templates/web/base/reports/body.html:7 @@ -3919,17 +3751,16 @@ msgid "edit user" msgstr "" #: templates/web/base/reports/_list-filters.html:6 -#, fuzzy msgid "fixed reports" -msgstr "Raportet e perfunduara" +msgstr "" -#: templates/web/base/admin/index.html:33 +#: templates/web/base/status/stats.html:20 #: templates/web/zurich/admin/index.html:5 msgid "from %s different users" -msgstr "nga %d perdorues te ndry" +msgstr "nga %s perdorues te ndry" -#: templates/web/base/report/_item.html:17 -#: templates/web/zurich/report/_item.html:16 +#: templates/web/base/report/_item.html:15 +#: templates/web/zurich/report/_item.html:14 msgid "last updated %s" msgstr "Perditesimi i fundit %s" @@ -4021,10 +3852,8 @@ msgstr "rihapur" msgid "sign out" msgstr "shkyqur" -#: templates/web/base/report/new/fill_in_details_form.html:12 -#: templates/web/base/report/new/fill_in_details_form.html:15 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:10 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:12 +#: templates/web/base/report/new/fill_in_details_form.html:11 +#: templates/web/base/report/new/fill_in_details_form.html:9 msgid "the local council" msgstr "" @@ -4033,7 +3862,7 @@ msgstr "" msgid "there is no pin shown as the user did not use the map" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:398 +#: perllib/FixMyStreet/Script/Reports.pm:176 msgid "this type of local problem" msgstr "ky lloj i problemit lokal" @@ -4042,9 +3871,8 @@ msgid "today" msgstr "sot" #: templates/web/base/reports/_list-filters.html:4 -#, fuzzy msgid "unfixed reports" -msgstr "Raportet e perfunduara" +msgstr "" #: templates/web/base/admin/report_edit.html:32 msgid "used map" @@ -4063,7 +3891,7 @@ msgstr "perdoruesi eshte shkaktar i problemit" msgid "ward" msgstr "lagje" -#: templates/web/base/front/stats.html:17 +#: templates/web/base/front/stats.html:13 #, perl-format msgid "<big>%s</big> report recently" msgid_plural "<big>%s</big> reports recently" @@ -4091,7 +3919,7 @@ msgid_plural "%d minutes" msgstr[0] "%d minutë" msgstr[1] "%d minuta" -#: templates/web/base/front/stats.html:29 +#: templates/web/base/front/stats.html:25 #, perl-format msgid "<big>%s</big> update on reports" msgid_plural "<big>%s</big> updates on reports" @@ -4112,14 +3940,14 @@ msgid_plural "%d weeks" msgstr[0] "%d javë" msgstr[1] "%d javë" -#: templates/web/base/front/stats.html:12 +#: templates/web/base/front/stats.html:8 #, perl-format msgid "<big>%s</big> report in past week" msgid_plural "<big>%s</big> reports in past week" msgstr[0] "<big>%s</big> raport ne javen e fundit" msgstr[1] "<big>%s</big> raporte ne javen e fundit" -#: templates/web/base/front/stats.html:23 +#: templates/web/base/front/stats.html:19 #, perl-format msgid "<big>%s</big> fixed in past month" msgid_plural "<big>%s</big> fixed in past month" @@ -4140,59 +3968,53 @@ msgid_plural "We do <strong>not</strong> yet have details for the other councils msgstr[0] "" msgstr[1] "" -#~ msgid "<small>If you cannot see the map, <a href='%s' rel='nofollow'>skip this step</a>.</small>" -#~ msgstr "<small>Nëse ju nuk mund ta shihni hartën , <a href='%s' rel='nofollow'>kaloni këtë hap</a>.</small>" - -#~ msgid "<strong>No</strong>, I do not, let me sign in by email:" -#~ msgstr "<strong>Jo</strong>, nuk mund ta bej, me lejo te kyqem me email:" - -#~ msgid "Are you a <strong>developer</strong>? Would you like to contribute to FixMyStreet?" -#~ msgstr "A jeni nje <strong>zhvillues</strong>? A deshironi te kontriboni per FixMyStreet?" +#~ msgid "(we never show your email address or phone number)" +#~ msgstr "(ne asnjëherë nuk do tëshfaqim email adresen ose numrin tuaj të telefonit)" -#~ msgid "Contact FixMyStreet" -#~ msgstr "Kontakto FixMyStreet" +#~ msgid "(we never show your email)" +#~ msgstr "(ne asnjëherë nuk do të shfaqim email-in tuaj)" -#~ msgid "FixMyStreet admin:" -#~ msgstr "FixMyStreet admin:" +#~ msgid "<strong>No</strong>, let me confirm my report by email:" +#~ msgstr "<strong>Jo</strong>, me lejoni te konfirmoj raportin tim me email:" -#~ msgid "New update:" -#~ msgstr "Perditesim i ri:" +#~ msgid "<strong>No</strong>, let me confirm my update by email:" +#~ msgstr "<strong>Jo</strong>, me lejo te konfirmoj perditesimin tim me email:" -#~ msgid "No problems found." -#~ msgstr "Asnje problem u u gjet." +#~ msgid "Enter a new password:" +#~ msgstr "Shkruaj fjalekalimin e ri:" -#~ msgid "No problems have been reported yet." -#~ msgstr "Asnje problem nuk eshte raportuar deri me tani." +#~ msgid "Message:" +#~ msgstr "Mesazh:" -#~ msgid "Our code is open source and <a href=\"http://github.com/mysociety/fixmystreet\">available on GitHub</a>." -#~ msgstr "Kodi jone eshte i hapur dhe <a href=\"http://github.com/mysociety/fixmystreet\">ne dispozicion ne GitHub</a>." +#~ msgid "More problems nearby" +#~ msgstr "Me shume probleme ketu afer" -#~ msgid "Problems within %s, FixMyStreet" -#~ msgstr "Problemet brenda %s, FixMyStreet" +#~ msgid "Photo:" +#~ msgstr "Fotografia:" -#~ msgid "Publish the response" -#~ msgstr "Publiko pergjigjen" +#~ msgid "Please check your email" +#~ msgstr "Ju lutem kontrolloni email-in tuaj" -#~ msgid "Reported %s, to %s" -#~ msgstr "Raportuar %s, te %s" +#~ msgid "This problem has been closed" +#~ msgstr "Ky problem ka qene i mbyllur" -#~ msgid "Reports on and around the map" -#~ msgstr "Raportimet ne dhe perrreth hartes" +#~ msgid "This problem is in progress" +#~ msgstr "Ky problem eshte ne progres" -#~ msgid "Sign in by email" -#~ msgstr "Kyqu me email" +#~ msgid "This problem is old and of unknown status." +#~ msgstr "Ky problem eshte i vjeter dhe me status te panjohur." -#~ msgid "Signed in as %s" -#~ msgstr "Kyqur si %s" +#~ msgid "Update:" +#~ msgstr "Perditesim:" -#~ msgid "The latest local reports reported by users" -#~ msgstr "Raportimet lokale te bera se fundi nga perdoruesit" +#~ msgid "We have not been able to confirm your account - sorry." +#~ msgstr "Ne nuk jemi ne gjendje te konfirmojme llogarine tuaj - na vjen keq." -#~ msgid "To <strong>report a problem</strong>, click on the map at the correct location." -#~ msgstr "Per te <strong>raportuar nje problem</strong>, kliko ne harte ne lokacionin e sakte." +#~ msgid "Your email:" +#~ msgstr "Email-i juaj:" -#~ msgid "User" -#~ msgstr "Perdorues" +#~ msgid "Your name:" +#~ msgstr "Emri juaj:" -#~ msgid "Your email address:" -#~ msgstr "Email adresa juaj:" +#~ msgid "Your email:" +#~ msgstr "Email-i juaj;" diff --git a/locale/sv_SE.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/sv_SE.UTF-8/LC_MESSAGES/FixMyStreet.po index 926beac88..5a1fdf08d 100644 --- a/locale/sv_SE.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/sv_SE.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -6,15 +6,14 @@ # Translators: # Joel Hansen <johaswe@gmail.com>, 2012 # Jonas Öberg <jonas@morus.se>, 2012 -# Jon Kristensen <info@jonkri.com>, 2014-2015 -# Rikard Fröberg <rikard@morus.se>, 2014-2015 +# Jon Kristensen <info@jonkri.com>, 2016 msgid "" msgstr "" "Project-Id-Version: fixmystreet\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2015-10-23 16:51+0100\n" -"PO-Revision-Date: 2015-07-31 16:31+0000\n" -"Last-Translator: mySociety <transifex@mysociety.org>\n" +"POT-Creation-Date: 2016-03-02 13:09+0000\n" +"PO-Revision-Date: 2016-01-31 19:36+0000\n" +"Last-Translator: Jon Kristensen <info@jonkri.com>\n" "Language-Team: Swedish (Sweden) (http://www.transifex.com/mysociety/fixmystreet/language/sv_SE/)\n" "Language: sv_SE\n" "MIME-Version: 1.0\n" @@ -22,45 +21,24 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:628 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:411 +#: perllib/FixMyStreet/DB/Result/Problem.pm:616 +#: perllib/FixMyStreet/Script/Reports.pm:189 msgid " and " msgstr "eller" #: templates/web/base/report/new/councils_text_all.html:2 -#: templates/web/base/report/new/councils_text_none.html:11 -#: templates/web/base/report/new/councils_text_none.html:2 +#: templates/web/base/report/new/councils_text_none.html:12 +#: templates/web/base/report/new/councils_text_none.html:15 #: templates/web/base/report/new/councils_text_some.html:19 #: templates/web/base/report/new/councils_text_some.html:22 #: templates/web/base/report/new/councils_text_some.html:5 msgid " or " msgstr "eller" -#: templates/web/base/admin/index.html:35 -#: templates/web/base/status/index.html:13 -msgid "%s confirmed alerts, %s unconfirmed" -msgstr "%d bekräftade bevakningar, %d obekräftade" - -#: templates/web/base/admin/index.html:37 -#: templates/web/base/status/index.html:16 -#: templates/web/zurich/admin/index.html:6 -msgid "%s council contacts – %s confirmed, %s unconfirmed" -msgstr "%d kommuner kontaktade – %d bekräftade, %d obekräftade" - #: templates/web/base/admin/edit-league.html:12 msgid "%d edits by %s" msgstr "%d ändringar av %s" -#: templates/web/base/admin/index.html:34 -#: templates/web/base/status/index.html:12 -msgid "%s live updates" -msgstr "%d uppdateringar" - -#: templates/web/base/admin/index.html:36 -#: templates/web/base/status/index.html:14 -msgid "%s questionnaires sent – %s answered (%s%%)" -msgstr "%d frÃ¥geformulär skickade – %d besvarade (%s%%)" - #: templates/web/base/pagination.html:10 msgid "%d to %d of %d" msgstr "%d till %d av %d" @@ -73,33 +51,52 @@ msgstr "%s - Sammanställningsrapporter" #. ("%s here is the site name") #: templates/web/base/admin/header.html:10 msgid "%s admin:" -msgstr "" +msgstr "%s administratör:" + +#: templates/web/base/status/stats.html:26 +#, fuzzy +msgid "%s bodies" +msgstr "Förvaltningar" + +#: templates/web/base/status/stats.html:24 +msgid "%s confirmed alerts, %s unconfirmed" +msgstr "%s bekräftade bevakningar, %s obekräftade" + +#: templates/web/base/status/stats.html:27 +#: templates/web/zurich/admin/index.html:6 +msgid "%s council contacts – %s confirmed, %s unconfirmed" +msgstr "%s kommuner kontaktade – %s bekräftade, %s obekräftade" #. ("%s is the site name") #: templates/web/base/alert/index.html:7 -#, fuzzy msgid "" "%s has a variety of RSS feeds and email alerts for local\n" "problems, including alerts for all problems within a particular ward, or all\n" "problems within a certain distance of a particular location." -msgstr "FixaMinGata har ett flertal RSS-flöden och epostbevakningar för lokala problem, inklusive bevakning för alla problem inom en kommun eller alla problem inom ett visst avstÃ¥nd frÃ¥n en plats. " +msgstr "%s har ett flertal RSS-flöden och epostbevakningar för lokala problem, inklusive bevakning för alla problem inom en kommun eller alla problem inom ett visst avstÃ¥nd frÃ¥n en plats." #. ("%s is the site name") #: templates/web/base/alert/index.html:11 -#, fuzzy msgid "" "%s has a variety of RSS feeds and email alerts for local problems, including\n" "alerts for all problems within a particular ward or council, or all problems\n" "within a certain distance of a particular location." -msgstr "FixaMinGata har ett flertal RSS-flöden och epostbevakningar för lokala problem, inklusive bevakning för alla problem inom en kommun eller alla problem inom ett visst avstÃ¥nd frÃ¥n en plats. " +msgstr "%s har ett flertal RSS-flöden och epostbevakningar för lokala problem, inklusive bevakning för alla problem inom en kommun eller alla problem inom ett visst avstÃ¥nd frÃ¥n en plats." + +#: templates/web/base/status/stats.html:23 +msgid "%s live updates" +msgstr "%s uppdateringar" + +#: templates/web/base/status/stats.html:25 +msgid "%s questionnaires sent – %s answered (%s%%)" +msgstr "%s frÃ¥geformulär skickade – %s besvarade (%s%%)" -#: perllib/FixMyStreet/DB/Result/Problem.pm:695 +#: perllib/FixMyStreet/DB/Result/Problem.pm:683 msgid "%s ref: %s" msgstr "%s ref: %s" #. ("%s is the site name") #: templates/web/base/alert/_list.html:73 -#, fuzzy msgid "" "%s sends different categories of problem\n" "to the appropriate council, so problems within the boundary of a particular council\n" @@ -107,17 +104,17 @@ msgid "" "will be sent to the district council, so will appear in both of the district\n" "council’s alerts, but will only appear in the \"Within the boundary\" alert\n" "for the county council." -msgstr "FixaMinGata skickar olika kategorier av rapporter till olika enheter inom en kommun eller län. Problem som rapporteras inom en viss kommun dyker därför inte nödvändigtvis upp i listan över rapporter till den kommunen. Exempelvis kan en rapport om en väg skickas till Vägverket snarare än kommunen. Rapporten dyker dÃ¥ inte upp i listan över rapporter till kommunen, men dyker upp om man söker alla rapporter inom ett visst avstÃ¥nd." +msgstr "%s skickar olika kategorier av rapporter till olika enheter inom en kommun eller län. Problem som rapporteras inom en viss kommun dyker därför inte nödvändigtvis upp i listan över rapporter till den kommunen. Exempelvis kan en rapport om en väg skickas till Vägverket snarare än kommunen. Rapporten dyker dÃ¥ inte upp i listan över rapporter till kommunen, men dyker upp om man söker alla rapporter inom ett visst avstÃ¥nd." -#: perllib/FixMyStreet/Cobrand/UK.pm:255 perllib/FixMyStreet/Cobrand/UK.pm:267 +#: perllib/FixMyStreet/Cobrand/UK.pm:256 perllib/FixMyStreet/Cobrand/UK.pm:268 msgid "%s ward, %s" msgstr "Administrativa omrÃ¥det %s, %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:564 +#: perllib/FixMyStreet/DB/Result/Problem.pm:552 msgid "%s, reported at %s" msgstr "%s, rapporterad %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:282 perllib/FixMyStreet/Cobrand/UK.pm:294 +#: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295 msgid "%s, within %s ward" msgstr "%s inom det administrativa omrÃ¥det %s" @@ -125,9 +122,9 @@ msgstr "%s inom det administrativa omrÃ¥det %s" msgid "© <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors" msgstr "© <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors" -#: templates/web/zurich/report/new/fill_in_details_form.html:53 +#: templates/web/zurich/report/new/fill_in_details_form.html:46 msgid "(Defect & location of defect)" -msgstr "" +msgstr "(Defekt & defektens plats)" #: templates/web/base/admin/report_blocks.html:41 #: templates/web/base/admin/users.html:31 @@ -136,15 +133,13 @@ msgstr "(Epost i missbrukstabellen)" #: templates/web/zurich/admin/report_edit-sdm.html:60 #: templates/web/zurich/admin/report_edit.html:88 -#, fuzzy msgid "(No name)" -msgstr "Ditt namn och efternamn" +msgstr "(Inget namn)" #: templates/web/zurich/admin/report_edit-sdm.html:67 #: templates/web/zurich/admin/report_edit.html:95 -#, fuzzy msgid "(No phone number)" -msgstr "Ditt telefonnummer" +msgstr "(Inget telefonnummer)" #: templates/web/base/alert/_list.html:24 msgid "(a default distance which covers roughly 200,000 people)" @@ -152,17 +147,16 @@ msgstr "(ett avstÃ¥nd som täcker ungefär 200,000 invÃ¥nare)" #. ("%s is a list of distance links, e.g. [2km] / [5km] / [10km] / [20km]") #: templates/web/base/alert/_list.html:29 -#, fuzzy msgid "(alternatively the RSS feed can be customised, within %s)" -msgstr "(alternativt kan RSS-flödet konfigureras inom" +msgstr "(alternativt kan RSS-flödet konfigureras inom %s)" -#: templates/web/base/report/_item.html:27 -#: templates/web/zurich/report/_item.html:21 +#: templates/web/base/report/_item.html:25 +#: templates/web/zurich/report/_item.html:19 msgid "(closed)" msgstr "(stängd)" -#: templates/web/base/report/_item.html:25 -#: templates/web/zurich/report/_item.html:19 +#: templates/web/base/report/_item.html:23 +#: templates/web/zurich/report/_item.html:17 msgid "(fixed)" msgstr "(fixad)" @@ -170,37 +164,28 @@ msgstr "(fixad)" msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)" msgstr "(ex.v. graffiti, skräp, trasiga gatustenar eller belysning)" -#: templates/web/base/report/_item.html:21 +#: templates/web/base/report/_item.html:19 msgid "(not sent to council)" msgstr "(ej skickat till kommunen)" -#: templates/web/base/report/new/fill_in_details_form.html:200 #: templates/web/zurich/report/new/fill_in_details_form.html:82 msgid "(optional)" msgstr "(valfritt)" -#: templates/web/fixmystreet/report/public_label.html:1 +#: templates/web/base/report/public_label.html:1 msgid "(public)" msgstr "(offentlig)" -#: templates/web/base/report/_item.html:20 +#: templates/web/base/report/_item.html:18 msgid "(sent to both)" msgstr "(skickat till bÃ¥da)" -#: templates/web/base/report/new/fill_in_details_form.html:194 -msgid "(we never show your email address or phone number)" -msgstr "(vi visar aldrig din epostadress eller telefonnummer)" - -#: templates/web/base/report/update-form.html:159 -msgid "(we never show your email)" -msgstr "(vi visar aldrig din epostadress)" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:673 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 #: perllib/FixMyStreet/DB/Result/Problem.pm:410 msgid "-- Pick a category --" msgstr "-- Välj en katagori --" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:637 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:632 #: perllib/FixMyStreet/DB/Result/Problem.pm:416 msgid "-- Pick a property type --" msgstr "-- Välj en fastighetstyp --" @@ -220,54 +205,41 @@ msgstr "" #. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories") #: templates/web/base/reports/_list-filters.html:27 msgid "<label>Show %s</label> <label>about %s</label>" -msgstr "" +msgstr "<label>Visa %s</label> <label>om %s</label>" -#: templates/web/base/admin/index.html:32 -#: templates/web/base/status/index.html:11 +#: templates/web/base/status/stats.html:18 #: templates/web/zurich/admin/index.html:4 msgid "<strong>%s</strong> live problems" -msgstr "<strong>%d</strong> aktuella problem" +msgstr "<strong>%s</strong> aktuella problem" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:39 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:2 msgid "<strong>No</strong> Let me confirm my report by email" msgstr "<strong>Nej</strong> LÃ¥t mig bekräfta min rapport via epost" -#: templates/web/fixmystreet/report/update-form.html:112 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:2 msgid "<strong>No</strong> Let me confirm my update by email" msgstr "<strong>Nej</strong> LÃ¥t mig bekräfta uppdateringen via epost" -#: templates/web/base/auth/general.html:48 +#: templates/web/base/auth/general.html:87 #: templates/web/zurich/auth/general.html:51 msgid "<strong>No</strong> let me sign in by email" msgstr "<strong>Nej</strong> LÃ¥t mig logga in med min epostadress" -#: templates/web/base/report/new/fill_in_details_form.html:145 -msgid "<strong>No</strong>, let me confirm my report by email:" -msgstr "<strong>Nej<strong>, lÃ¥t mig bekräfta min rapport via epost:" - -#: templates/web/base/report/update-form.html:118 -msgid "<strong>No</strong>, let me confirm my update by email:" -msgstr "<strong>Nej</strong>, lÃ¥t mig bekräfta min uppdatering via epost:" - -#: templates/web/base/auth/general.html:34 -#: templates/web/base/report/new/fill_in_details_form.html:123 -#: templates/web/base/report/update-form.html:96 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:15 -#: templates/web/fixmystreet/report/update-form.html:89 +#: templates/web/base/auth/general.html:70 +#: templates/web/base/report/new/form_user_loggedout_password.html:3 +#: templates/web/base/report/update/form_user_loggedout_password.html:2 msgid "<strong>Yes</strong> I have a password" msgstr "<strong>Ja</strong>, jag har ett lösenord" -#: templates/web/base/static/about-en-gb.html:1 -#: templates/web/base/static/about-en-gb.html:3 +#: templates/web/base/about/about-en-gb.html:1 +#: templates/web/base/about/about-en-gb.html:3 msgid "About us" msgstr "Om oss" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:8 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:31 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:29 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:35 msgid "Action Scheduled" msgstr "Ã…tgärd är schemalagd" @@ -298,14 +270,13 @@ msgstr "Ny kategori" msgid "Add user" msgstr "Lägg till användare" -#: templates/web/base/my/my.html:52 +#: templates/web/base/my/my.html:56 msgid "Added %s" msgstr "Lades till %s" #: templates/web/base/report/new/category_extras.html:9 -#, fuzzy msgid "Additional Information" -msgstr "Väntar pÃ¥ att granskas" +msgstr "Ytterligare Information" #: templates/web/base/auth/change_password.html:29 msgid "Again:" @@ -319,8 +290,7 @@ msgstr "Bevakning %d skapad för %s av typen %s med parametrarna %s/%s" msgid "Alert %d disabled (created %s)" msgstr "Bevakning %d avaktiverad (skapad %s)" -#: templates/web/base/report/update-form.html:164 -#: templates/web/fixmystreet/report/update-form.html:150 +#: templates/web/base/report/update/form_name.html:20 msgid "Alert me to future updates" msgstr "Varsko mig om framtida uppdateringar" @@ -330,9 +300,8 @@ msgid "All Reports" msgstr "Alla rapporter" #: templates/web/zurich/admin/stats.html:5 -#, fuzzy msgid "All Reports as CSV" -msgstr "Alla rapporter" +msgstr "Alla rapporter som CSV" #: templates/web/base/footer.html:11 templates/web/fixmystreet/footer.html:32 #: templates/web/zurich/admin/index-dm.html:12 @@ -353,10 +322,8 @@ msgstr "All information du anger här kommer att skickas till" #: templates/web/base/report/new/councils_text_all.html:2 #: templates/web/base/report/new/councils_text_all.html:4 -#: templates/web/base/report/new/fill_in_details_form.html:12 -#: templates/web/base/report/new/fill_in_details_form.html:14 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:10 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:11 +#: templates/web/base/report/new/fill_in_details_form.html:10 +#: templates/web/base/report/new/fill_in_details_form.html:9 msgid "All the information you provide here will be sent to <strong>%s</strong>." msgstr "All information du anger här kommer att skickas till ansvariga i <strong>%s</strong>." @@ -378,6 +345,10 @@ msgstr "Anonym:" msgid "Are you a developer?" msgstr "Är du en utvecklare?" +#: templates/web/base/js/translation_strings.html:52 +msgid "Are you sure you want to cancel this upload?" +msgstr "" + #: templates/web/base/admin/body-form.html:69 #: templates/web/base/admin/body.html:16 #: templates/web/zurich/admin/body-form.html:24 @@ -390,9 +361,8 @@ msgid "As this is a staging site and %s is false, reports made on this site will msgstr "Eftersom detta är en testsajt och %s är falskt kommer rapporter gjorda här att rapporteras till problemrapportören istället för kontakten angiven i problemkategorin" #: templates/web/zurich/admin/report_edit.html:213 -#, fuzzy msgid "Assign to competent body:" -msgstr "Tilldela extern förvaltning:" +msgstr "Tilldela behörig förvaltning:" #: templates/web/zurich/admin/report_edit.html:173 #: templates/web/zurich/admin/stats.html:36 @@ -411,16 +381,16 @@ msgstr "Tilldela underavdelning:" msgid "Assigned to %s" msgstr "Tilldelad %s" -#: templates/web/base/open311/index.html:84 +#: templates/web/base/open311/index.html:76 msgid "At most %d requests are returned in each query. The returned requests are ordered by requested_datetime, so to get all requests, do several searches with rolling start_date and end_date." msgstr "Som mest returneras %d svar i varje förfrÃ¥gan. De returnerade svaren är sorterade efter requested_datetime. Om du vill fÃ¥ alla svar mÃ¥ste du göra flera sökningar med rullande start_date och end_date." -#: templates/web/base/open311/index.html:76 +#: templates/web/base/open311/index.html:68 msgid "At the moment only searching for and looking at reports work." msgstr "För tillfället fungerar det endast att söka för eller leta efter rapporter." #: perllib/FixMyStreet/DB/Result/Problem.pm:373 -#: templates/web/zurich/report/_item.html:11 +#: templates/web/zurich/report/_item.html:9 msgid "Awaiting moderation" msgstr "Väntar pÃ¥ att granskas" @@ -432,7 +402,7 @@ msgstr "Tillbaka" msgid "Ban email address" msgstr "Förbjud epostadress" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1276 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1285 #: perllib/FixMyStreet/Cobrand/Zurich.pm:392 #: templates/web/base/admin/bodies.html:1 templates/web/zurich/header.html:64 msgid "Bodies" @@ -455,14 +425,14 @@ msgstr "Efter datum" #: templates/web/base/auth/token.html:21 templates/web/base/email_sent.html:18 msgid "Can’t find our email? Check your spam folder – that’s the solution 99% of the time." -msgstr "" +msgstr "Kan du inte hitta vÃ¥rt e-brev? Kolla din skräppostmapp –– det är lösningen 99% av tiden." #: templates/web/base/around/_report_banner.html:5 msgid "Can't see the map? <em>Skip this step</em>" msgstr "Kan du inte se kartan? <em>Hoppa över det här steget</em>" #: templates/web/base/admin/body.html:68 -#: templates/web/base/admin/index.html:61 +#: templates/web/base/admin/index.html:54 #: templates/web/base/report/new/category.html:10 #: templates/web/base/report/new/category_wrapper.html:3 #: templates/web/zurich/admin/body.html:14 @@ -473,8 +443,8 @@ msgstr "Kan du inte se kartan? <em>Hoppa över det här steget</em>" msgid "Category" msgstr "Kategori" -#: templates/web/base/admin/index.html:59 -#: templates/web/base/admin/index.html:67 +#: templates/web/base/admin/index.html:52 +#: templates/web/base/admin/index.html:60 msgid "Category fix rate for problems > 4 weeks old" msgstr "Kategorins lösningsnivÃ¥ för problem över 4 veckor gamla" @@ -487,7 +457,7 @@ msgstr "Kategorins lösningsnivÃ¥ för problem över 4 veckor gamla" msgid "Category:" msgstr "Kategori:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:402 +#: perllib/FixMyStreet/Script/Reports.pm:180 msgid "Category: %s" msgstr "Kategori: %s" @@ -531,7 +501,7 @@ msgstr "Välj ett <strong>kategorinamn</strong> som Ã¥ ena sidan är förstÃ¥eli #: templates/web/zurich/admin/response_templates_select.html:6 msgid "Choose a template" -msgstr "" +msgstr "Välj en mall" #: templates/web/base/admin/stats.html:65 #: templates/web/base/admin/stats.html:71 @@ -539,25 +509,25 @@ msgid "Click here or enter as dd/mm/yyyy" msgstr "Klicka här eller ange som dd/mm/yyyy" #: templates/web/base/around/_report_banner.html:2 -#: templates/web/base/js/translation_strings.html:50 +#: templates/web/base/js/translation_strings.html:55 msgid "Click map to report a problem" msgstr "Klicka pÃ¥ kartan för att rapportera ett problem" #: templates/web/base/email_sent.html:13 msgid "Click the link in our confirmation email to activate your alert." -msgstr "" +msgstr "Klicka pÃ¥ länken i vÃ¥rt bekräftelsemail för att aktivera din bevakning." #: templates/web/base/email_sent.html:9 msgid "Click the link in our confirmation email to publish your problem." -msgstr "" +msgstr "Klicka pÃ¥ länken i vÃ¥rt bekräftelsemail för att publicera din problemrapport." #: templates/web/base/email_sent.html:11 msgid "Click the link in our confirmation email to publish your update." -msgstr "" +msgstr "Klicka pÃ¥ länken i vÃ¥rt bekräftelsemail för att publicera din uppdatering." #: templates/web/base/auth/token.html:18 msgid "Click the link in our confirmation email to sign in." -msgstr "" +msgstr "Klicka pÃ¥ länken i vÃ¥rt bekräftelsemail för att logga in." #: perllib/FixMyStreet/Cobrand/Zurich.pm:196 #: perllib/FixMyStreet/Cobrand/Zurich.pm:969 @@ -566,7 +536,7 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:25 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:144 -#: templates/web/fixmystreet/report/banner.html:15 +#: templates/web/base/report/banner.html:15 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:10 #: templates/web/zurich/admin/header.html:16 @@ -574,7 +544,7 @@ msgstr "" msgid "Closed" msgstr "Stängd" -#: perllib/FixMyStreet/DB/Result/Problem.pm:794 +#: perllib/FixMyStreet/DB/Result/Problem.pm:779 msgid "Closed by council" msgstr "Stängd av kommunen" @@ -600,7 +570,7 @@ msgstr "Cobrand data:" msgid "Cobrand:" msgstr "Cobrand:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1283 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1292 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "Konfiguration" @@ -613,13 +583,14 @@ msgstr "Konfigurera slutpunkt" msgid "Confirm" msgstr "Bekfräfta" -#: templates/web/base/auth/token.html:1 templates/web/zurich/auth/token.html:1 +#: templates/web/base/auth/token.html:1 msgid "Confirm account" msgstr "Bekräfta konto" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:33 -#: templates/web/fixmystreet/report/update-form.html:107 -msgid "Confirm by email below, providing a new password at that point. When you confirm, your password will be updated." +#: templates/web/base/report/new/form_user_loggedout_password.html:21 +#: templates/web/base/report/update/form_user_loggedout_password.html:20 +#, fuzzy +msgid "Confirm by email instead, providing a new password at that point. When you confirm, your password will be updated." msgstr "Bekräfta via epost nedan genom att ange ett nytt lösenord. När du bekräftar kommer ditt lösenord att uppdateras." #: templates/web/base/questionnaire/creator_fixed.html:1 @@ -649,35 +620,27 @@ msgid "Confirmed:" msgstr "Bekräftat:" #. ("%s is the site name") -#: templates/web/base/faq/faq-en-gb.html:8 templates/web/base/footer.html:24 -#: templates/web/base/open311/index.html:8 -#: templates/web/base/static/privacy.html:10 -#: templates/web/fixmystreet/contact/index.html:12 -#, fuzzy +#: templates/web/base/about/_sidebar.html:6 templates/web/base/footer.html:24 msgid "Contact %s" -msgstr "Kontakta oss" +msgstr "Kontakta %s" #: templates/web/base/contact/index.html:1 #: templates/web/base/contact/index.html:2 #: templates/web/base/contact/submit.html:1 -#: templates/web/fixmystreet/contact/index.html:1 -#: templates/web/fixmystreet/contact/index.html:2 msgid "Contact Us" msgstr "Kontakta oss" -#: templates/web/base/contact/index.html:6 -#: templates/web/fixmystreet/contact/index.html:20 +#: templates/web/base/contact/index.html:12 msgid "Contact the team" msgstr "Kontakta teamet" #: templates/web/zurich/admin/report_edit-sdm.html:40 #: templates/web/zurich/admin/report_edit.html:59 -#, fuzzy msgid "Coordinates:" msgstr "Koordinater:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1420 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1448 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1429 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1457 msgid "Could not find user" msgstr "Kan inte hitta användaren" @@ -695,7 +658,7 @@ msgstr "Kommun" msgid "Council contacts for %s" msgstr "Kommunkontakter för %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:693 +#: perllib/FixMyStreet/DB/Result/Problem.pm:681 msgid "Council ref: %s" msgstr "kommunens referens: %s" @@ -710,7 +673,7 @@ msgstr "Kommun:" msgid "Count" msgstr "Antal" -#: templates/web/base/email_sent.html:1 templates/web/zurich/email_sent.html:1 +#: templates/web/base/email_sent.html:1 msgid "Create a report" msgstr "Skapa en rapport" @@ -720,9 +683,8 @@ msgid "Create category" msgstr "Skapa en kategori" #: templates/web/zurich/admin/template_edit.html:29 -#, fuzzy msgid "Create template" -msgstr "Skapa en rapport" +msgstr "Välj mall" #: templates/web/base/admin/problem_row.html:34 #: templates/web/zurich/admin/templates.html:10 @@ -748,7 +710,7 @@ msgstr "Inga förvaltningar har skapats ännu." #: perllib/FixMyStreet/Cobrand/Zurich.pm:834 #: templates/web/zurich/admin/report_edit-sdm.html:109 msgid "Customer not contactable" -msgstr "" +msgstr "Kund ej kontaktbar" #: templates/web/base/dashboard/index.html:5 #: templates/web/base/dashboard/index.html:7 @@ -759,10 +721,10 @@ msgstr "Skrivbord" msgid "Dealt with by subdivision within 5 working days" msgstr "Hanterat av underavdelning inom 5 arbetsdagar" -#: perllib/FixMyStreet/App/Controller/Admin.pm:878 +#: perllib/FixMyStreet/App/Controller/Admin.pm:877 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" -msgstr "" +msgstr "Ta bort mall" #: templates/web/base/admin/bodies.html:27 #: templates/web/base/admin/body.html:177 @@ -772,7 +734,7 @@ msgstr "" msgid "Deleted" msgstr "Borttagen" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:51 +#: templates/web/base/report/new/form_report.html:45 #: templates/web/zurich/admin/index-dm.html:22 #: templates/web/zurich/admin/index-sdm.html:20 #: templates/web/zurich/admin/reports.html:12 @@ -780,12 +742,11 @@ msgid "Description" msgstr "Beskrivning" #: templates/web/base/js/translation_strings.html:34 -#: templates/web/zurich/report/new/fill_in_details_form.html:42 +#: templates/web/zurich/report/new/fill_in_details_form.html:68 msgid "Details" msgstr "Detaljer" #: templates/web/base/admin/report_edit.html:20 -#: templates/web/base/report/new/fill_in_details_form.html:62 #: templates/web/zurich/admin/report_edit-sdm.html:27 #: templates/web/zurich/admin/report_edit.html:29 #: templates/web/zurich/admin/report_edit.html:43 @@ -798,38 +759,38 @@ msgstr "Delegerat" #: templates/web/zurich/admin/report_edit-sdm.html:50 #: templates/web/zurich/admin/report_edit.html:69 -#, fuzzy msgid "Didn't use map" -msgstr "använde inte kartan" +msgstr "Använde inte kartan" #: templates/web/base/admin/edit-league.html:8 msgid "Diligency prize league table" msgstr "Flitighetstopplistan" #. ("%s is the site name") -#: templates/web/base/auth/general.html:31 -#: templates/web/base/report/new/fill_in_details_form.html:114 -#: templates/web/base/report/update-form.html:87 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:11 -#: templates/web/fixmystreet/report/update-form.html:86 -#, fuzzy +#: templates/web/base/auth/general.html:48 +#: templates/web/base/report/new/form_user_loggedout.html:18 +#: templates/web/base/report/new/oauth_email_form.html:18 +#: templates/web/base/report/update-form.html:29 +#: templates/web/base/report/update/form_user_loggedout.html:17 msgid "Do you have a %s password?" -msgstr "Har du ett lösenord för FixaMinGata?" +msgstr "Har du ett lösenord för %s?" #: templates/web/base/questionnaire/index.html:55 msgid "Don’t know" msgstr "Vet ej" -#: templates/web/fixmystreet/contact/index.html:118 +#: templates/web/base/contact/index.html:110 msgid "Don't like forms?" msgstr "Gillar du inte formulär?" +#: templates/web/base/js/translation_strings.html:51 +msgid "Drag and drop photos here or <u>click to upload</u>" +msgstr "" + #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:14 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:32 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:30 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:36 msgid "Duplicate" msgstr "Finns redan" @@ -879,7 +840,7 @@ msgstr "Redaktör" #: templates/web/base/admin/category_edit.html:91 #: templates/web/base/admin/flagged.html:38 #: templates/web/base/admin/users.html:16 -#: templates/web/base/auth/general.html:22 +#: templates/web/base/auth/general.html:39 #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:24 @@ -887,7 +848,7 @@ msgstr "Redaktör" msgid "Email" msgstr "Epost" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1396 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1405 msgid "Email added to abuse list" msgstr "Epostadressen tillagd till missbrukslistan" @@ -903,7 +864,7 @@ msgstr "E-postnotifikation skapad" msgid "Email alert deleted" msgstr "E-postnotifikation borttagen" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1393 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1402 msgid "Email already in abuse list" msgstr "Epostadressen finns redan i missbrukslistan" @@ -911,41 +872,36 @@ msgstr "Epostadressen finns redan i missbrukslistan" msgid "Email me new local problems" msgstr "Eposta mig nya problem lokalt" -#: templates/web/base/report/display.html:38 -msgid "Email me updates" -msgstr "Eposta mig uppdateringar" - #: templates/web/base/admin/category_edit.html:31 #: templates/web/base/admin/report_edit.html:62 #: templates/web/base/admin/update_edit.html:33 #: templates/web/base/admin/user-form.html:20 #: templates/web/base/alert/updates.html:13 -#: templates/web/base/report/display.html:42 #: templates/web/zurich/admin/body.html:47 msgid "Email:" msgstr "Epost:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:329 +#: perllib/FixMyStreet/Script/Reports.pm:108 msgid "Email: %s" msgstr "E-post: %s" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:639 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:634 msgid "Empty flat or maisonette" msgstr "Tom lägenhet" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:638 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:633 msgid "Empty house or bungalow" msgstr "Tomt hus" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:641 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:636 msgid "Empty office or other commercial" msgstr "Tomt kontor eller annan kommersiell lokal" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:642 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:637 msgid "Empty pub or bar" msgstr "Tom pub eller bar" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:643 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:638 msgid "Empty public building - school, hospital, etc." msgstr "Tom publik byggnad - skola, sjukhus, etc." @@ -981,7 +937,7 @@ msgstr "Ändpunkt" msgid "Enter a Zürich street name" msgstr "Skriv in ett Zürich-gatunamn" -#: perllib/FixMyStreet/Cobrand/UK.pm:13 +#: perllib/FixMyStreet/Cobrand/UK.pm:14 msgid "Enter a nearby UK postcode, or street name and area" msgstr "Ange ett postnummer eller gatunamn och ort" @@ -999,14 +955,9 @@ msgstr "Ange ett närligande gatunamn och ort" msgid "Enter a nearby street name and area, postal code or district in Delhi" msgstr "Ange ett närligande gatunamn och ort, postnummer och distrikt i Delhi" -#: templates/web/base/report/new/fill_in_details_form.html:152 -#: templates/web/base/report/update-form.html:125 -msgid "Enter a new password:" -msgstr "Ange ett nytt lösenord:" - -#: templates/web/base/auth/general.html:60 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:75 -#: templates/web/fixmystreet/report/update-form.html:123 +#: templates/web/base/auth/general.html:99 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:38 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:13 #: templates/web/zurich/auth/general.html:65 msgid "Enter a password" msgstr "Ange ett lösenord" @@ -1016,28 +967,28 @@ msgid "Enter details of the problem" msgstr "Skriv in information om problemet" #: templates/web/base/errors/generic.html:1 -#: templates/web/base/errors/generic.html:3 +#: templates/web/base/errors/generic.html:4 #: templates/web/base/tokens/abuse.html:1 #: templates/web/base/tokens/abuse.html:3 #: templates/web/base/tokens/error.html:1 -#: templates/web/base/tokens/error.html:3 +#: templates/web/base/tokens/error.html:5 msgid "Error" msgstr "Fel" #: templates/web/base/reports/_list-filters.html:12 msgid "Everything" -msgstr "" +msgstr "Allt" #: templates/web/base/admin/body.html:14 #: templates/web/base/admin/category_edit.html:18 msgid "Example postcode %s" msgstr "Exempelpostnummer %s" -#: templates/web/base/open311/index.html:94 +#: templates/web/base/open311/index.html:86 msgid "Examples:" msgstr "Exempel:" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:55 +#: templates/web/base/report/new/form_report.html:49 msgid "Explain what’s wrong, exactly where it is, and how long it’s been there…" msgstr "Beskriv vad problemet är, exakt var det är, och hur länge det har varit där..." @@ -1046,11 +997,11 @@ msgstr "Beskriv vad problemet är, exakt var det är, och hur länge det har var #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:12 msgid "Extern" -msgstr "" +msgstr "Extern" #: templates/web/base/admin/body-form.html:81 msgid "External URL" -msgstr "" +msgstr "Extern URL" #: templates/web/base/admin/category_edit.html:27 #: templates/web/base/admin/report_edit.html:74 @@ -1078,17 +1029,15 @@ msgstr "Lös detta genom att välja ett <strong>lämpligt omrÃ¥de</strong> i <em msgid "FixMyStreet" msgstr "FixaMinGata" -#: templates/web/base/admin/index.html:61 +#: templates/web/base/admin/index.html:54 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:24 #: templates/web/base/admin/report_blocks.html:9 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:144 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:34 -#: templates/web/fixmystreet/report/banner.html:12 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:32 +#: templates/web/base/report/banner.html:12 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:38 msgid "Fixed" msgstr "Löst" @@ -1115,7 +1064,7 @@ msgstr "Flagga som borttagen" msgid "Flag user" msgstr "Flagga användare" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1281 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1290 #: templates/web/base/admin/users.html:19 msgid "Flagged" msgstr "Flaggat" @@ -1146,36 +1095,31 @@ msgstr "Följ en länk till ett omrÃ¥de för att se rapporter endast inom det om msgid "For more information, see <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>." msgstr "För mer information, se <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>." -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:32 -#: templates/web/fixmystreet/report/update-form.html:106 +#: templates/web/base/report/new/form_user_loggedout_password.html:20 +#: templates/web/base/report/update/form_user_loggedout_password.html:19 msgid "Forgotten your password?" msgstr "Glömt ditt lösenord?" #: perllib/FixMyStreet/Cobrand/Zurich.pm:752 -#, fuzzy msgid "Forwarded to external body" -msgstr "Tilldela extern förvaltning:" +msgstr "Vidarebefordrad till extern förvaltning" #: perllib/FixMyStreet/Cobrand/Zurich.pm:753 -#, fuzzy msgid "Forwarded wish to external body" -msgstr "Tilldela extern förvaltning:" +msgstr "Vidarebefordrade önskan till extern förvaltning" -#: templates/web/base/faq/faq-en-gb.html:1 -#: templates/web/base/faq/faq-en-gb.html:13 -#: templates/web/base/faq/faq-en-gb.html:6 -#: templates/web/base/open311/index.html:6 -#: templates/web/base/static/privacy.html:8 -#: templates/web/fixmystreet/contact/index.html:10 +#: templates/web/base/about/_sidebar.html:4 +#: templates/web/base/about/faq-en-gb.html:1 +#: templates/web/base/about/faq-en-gb.html:5 msgid "Frequently Asked Questions" msgstr "Vanliga frÃ¥gor" -#: templates/web/base/open311/index.html:136 +#: templates/web/base/open311/index.html:128 msgid "GeoRSS on Google Maps" msgstr "GeoRSS pÃ¥ Google Maps" +#: templates/web/base/report/display_tools.html:11 #: templates/web/fixmystreet/around/_updates.html:3 -#: templates/web/fixmystreet/report/display.html:35 msgid "Get updates" msgstr "FÃ¥ uppdateringar" @@ -1208,7 +1152,7 @@ msgstr "GÃ¥" msgid "Going to send questionnaire?" msgstr "Skicka enkät?" -#: templates/web/base/admin/index.html:42 +#: templates/web/base/admin/index.html:35 msgid "Graph of problem creation by status over time" msgstr "Visualisering av rapporter över tid" @@ -1225,7 +1169,7 @@ msgid "Have you ever reported a problem to a council before, or is this your fir msgstr "Har du nÃ¥gonsin rapporterat ett problem till en kommun tidigare eller är det här första gÃ¥ngen?" #: templates/web/base/footer.html:15 templates/web/fixmystreet/footer.html:38 -#: templates/web/zurich/faq/faq-de-ch.html:1 +#: templates/web/zurich/about/faq-de-ch.html:1 #: templates/web/zurich/footer.html:22 #: templates/web/zurich/nav_over_content.html:8 msgid "Help" @@ -1276,7 +1220,7 @@ msgstr "Hur man rapporterar ett problem" msgid "How to send successful reports" msgstr "Hur bra rapporter skickas" -#: perllib/FixMyStreet/App/Controller/Admin.pm:754 +#: perllib/FixMyStreet/App/Controller/Admin.pm:752 msgid "I am afraid you cannot confirm unconfirmed reports." msgstr "Tyvärr kan du inte bekräfta obekräftade rapporter" @@ -1294,10 +1238,6 @@ msgstr "Jag uppdaterade precis ett problem pÃ¥ @fixamingata" msgid "I'm afraid we couldn't locate your problem in the database.\n" msgstr "Tyvärr kunde vi inte hitta ditt problem i databasen.\n" -#: perllib/FixMyStreet/App/Controller/Tokens.pm:327 -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 "Tyvärr kan vi inte hitta den rapporten. Om du kopierade en länk frÃ¥n ett epost bör du verifiera att du kopierade länken exakt.\n" - #: templates/web/base/admin/flagged.html:14 #: templates/web/base/admin/list_updates.html:6 #: templates/web/base/admin/reports.html:11 @@ -1326,18 +1266,12 @@ msgstr "Om tvÃ¥ eller fler förvaltningar delar pÃ¥ ett geografiskt omrÃ¥de, kom msgid "If you get some more information about the status of your problem, please come back to the site and leave an update." msgstr "Om du fÃ¥r mer information om problemets status fÃ¥r du gärna komma tillbaka hit och lämna en uppdatering." -#: templates/web/base/report/new/councils_text_none.html:2 -#: templates/web/base/report/new/councils_text_none.html:8 +#: templates/web/base/report/new/councils_text_none.html:10 +#: templates/web/base/report/new/councils_text_none.html:9 msgid "If you submit a problem here the subject and details of the problem will be public, but the problem will <strong>not</strong> be reported to the council." msgstr "Om du anmäler ett problem i FixaMinGata kommer ärendet och detaljerna att visas här, men rapporten kommer <strong>inte</strong> att skickas till kommunen." -#: templates/web/zurich/auth/token.html:19 -#: templates/web/zurich/email_sent.html:7 -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 "Om du använder webbmail och har spamfilter bör du kolla din spamfolder eftersom vÃ¥ra brev ibland markeras som skräp." - #: templates/web/base/questionnaire/index.html:68 -#, fuzzy msgid "" "If you wish to leave a public update on the problem, please enter it here\n" "(please note it will not be sent to the council)." @@ -1380,10 +1314,8 @@ msgstr "Ogiltigt RSS-flöde" #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:144 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:32 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:30 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:36 msgid "In Progress" msgstr "PÃ¥gÃ¥ende" @@ -1391,7 +1323,7 @@ msgstr "PÃ¥gÃ¥ende" msgid "In abuse table?" msgstr "I missbrukstabellen?" -#: templates/web/base/open311/index.html:88 +#: templates/web/base/open311/index.html:80 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 "I tillägg, följande attribut som inte är del av Open311 v2-specifikationen returneras: 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)." @@ -1399,7 +1331,7 @@ msgstr "I tillägg, följande attribut som inte är del av Open311 v2-specifikat #: perllib/FixMyStreet/Cobrand/Zurich.pm:963 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:7 -#: templates/web/fixmystreet/report/banner.html:19 +#: templates/web/base/report/banner.html:19 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:8 msgid "In progress" @@ -1434,7 +1366,7 @@ msgstr "Interna refereringar" msgid "Invalid agency_responsible value %s" msgstr "Inkorrekt värde för agency_responsible, \"%s\"" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1201 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1210 msgid "Invalid end date" msgstr "Inkorrekt slutdatum" @@ -1442,7 +1374,7 @@ msgstr "Inkorrekt slutdatum" msgid "Invalid format %s specified." msgstr "Inkorrekt format %s angivet." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1206 msgid "Invalid start date" msgstr "Inkorrekt startdatum" @@ -1450,14 +1382,12 @@ msgstr "Inkorrekt startdatum" #: templates/web/base/admin/report_blocks.html:5 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:143 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:31 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:29 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:35 msgid "Investigating" msgstr "Utredes" -#: templates/web/fixmystreet/contact/blurb.html:8 +#: templates/web/base/contact/blurb.html:8 msgid "It's often quickest to <a href=\"%s\">check our FAQs</a> and see if the answer is there." msgstr "Det gÃ¥r oftast snabbast att <a href=\"%s\">kolla vÃ¥r FAQ</a> och se om svaret finns där." @@ -1467,19 +1397,17 @@ msgstr "Det är nu pÃ¥ väg till kommunen." #: perllib/FixMyStreet/Cobrand/Zurich.pm:184 msgid "Jurisdiction Unknown" -msgstr "" +msgstr "Jurisdiktion Okänd" #: perllib/FixMyStreet/Cobrand/Zurich.pm:927 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:15 msgid "Jurisdiction unknown" -msgstr "" +msgstr "Jurisdiktion okänd" -#: templates/web/base/auth/general.html:44 -#: templates/web/base/report/new/fill_in_details_form.html:132 -#: templates/web/base/report/update-form.html:105 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:28 -#: templates/web/fixmystreet/report/update-form.html:102 +#: templates/web/base/auth/general.html:80 +#: templates/web/base/report/new/form_user_loggedout_password.html:16 +#: templates/web/base/report/update/form_user_loggedout_password.html:15 #: templates/web/zurich/auth/general.html:40 msgid "Keep me signed in on this computer" msgstr "BehÃ¥ll mig inloggad pÃ¥ den här datorn" @@ -1537,12 +1465,13 @@ msgid "MAP" msgstr "KARTA" #: templates/web/base/js/translation_strings.html:45 +#: templates/web/base/maps/google-ol.html:13 msgid "Map" msgstr "Karta" #: templates/web/base/admin/report_edit.html:68 msgid "Mark as sent" -msgstr "" +msgstr "Markera som skickad" #: templates/web/base/admin/user-form.html:44 msgid "Mark users whose behaviour you want to keep a check on as <strong>flagged</strong>." @@ -1550,29 +1479,23 @@ msgstr "Markera användare som du vill hÃ¥lla ett öga pÃ¥ som <strong>flaggade< #: templates/web/base/reports/index.html:24 msgid "Marked fixed/closed in the past eight weeks" -msgstr "" +msgstr "Markerad som löst/stängd under de senaste Ã¥tta veckorna" #: templates/web/base/reports/index.html:25 msgid "Marked fixed/closed more than eight weeks ago" -msgstr "" +msgstr "Markerad som löst/stängd för mer än Ã¥tta veckor sedan" -#: templates/web/fixmystreet/contact/index.html:106 +#: templates/web/base/contact/index.html:98 msgid "Message" msgstr "Meddelande" #: templates/web/zurich/admin/report_edit.html:284 -#, fuzzy msgid "Message to competent body:" -msgstr "Tilldela extern förvaltning:" +msgstr "Meddelande till behörig förvaltning:" #: templates/web/zurich/admin/report_edit.html:282 -#, fuzzy msgid "Message to external body:" -msgstr "Tilldela extern förvaltning:" - -#: templates/web/base/contact/index.html:97 -msgid "Message:" -msgstr "Meddelande:" +msgstr "Meddelande till extern förvaltning:" #: perllib/FixMyStreet/App/Controller/Open311.pm:445 msgid "Missing jurisdiction_id" @@ -1586,10 +1509,6 @@ msgstr "Granskat av underavdelningen inom en arbetsdag" msgid "Month" msgstr "MÃ¥nad" -#: templates/web/base/report/display.html:34 -msgid "More problems nearby" -msgstr "Fler närliggande problem" - #: templates/web/base/admin/bodies.html:21 #: templates/web/base/admin/body-form.html:18 #: templates/web/base/admin/flagged.html:16 @@ -1597,11 +1516,11 @@ msgstr "Fler närliggande problem" #: templates/web/base/admin/list_updates.html:7 #: templates/web/base/admin/reports.html:13 #: templates/web/base/admin/users.html:15 -#: templates/web/base/auth/general.html:50 +#: templates/web/base/auth/general.html:89 +#: templates/web/base/report/new/form_user_loggedin.html:9 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:7 +#: templates/web/base/report/update/form_name.html:4 #: templates/web/base/reports/index.html:20 -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:9 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:44 -#: templates/web/fixmystreet/report/update-form.html:138 #: templates/web/zurich/admin/body-form.html:4 #: templates/web/zurich/auth/general.html:60 #: templates/web/zurich/report/new/fill_in_details_form.html:82 @@ -1615,7 +1534,7 @@ msgstr "Namn" msgid "Name:" msgstr "Namn:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:328 +#: perllib/FixMyStreet/Script/Reports.pm:107 msgid "Name: %s" msgstr "Namn: %s" @@ -1624,16 +1543,16 @@ msgstr "Namn: %s" msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s" msgstr "Närmaste namngivna gata till placeringen pÃ¥ kartan (genereras automatiskt via OpenStreetMap): %s%s" -#: perllib/FixMyStreet/Cobrand/UK.pm:127 +#: perllib/FixMyStreet/Cobrand/UK.pm:128 msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" msgstr "Närmaste postnummer till placeringen pÃ¥ kartan (genereras automatiskt): %s (%s meter bort)" -#: perllib/FixMyStreet/Cobrand/Default.pm:434 -#: perllib/FixMyStreet/Cobrand/Default.pm:474 +#: perllib/FixMyStreet/Cobrand/Default.pm:455 +#: perllib/FixMyStreet/Cobrand/Default.pm:495 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "Närmaste gata till placeringen pÃ¥ kartan (genereras automatiskt av Bing Maps): %s" -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:267 +#: perllib/FixMyStreet/Script/Alerts.pm:290 msgid "" "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n" "\n" @@ -1641,14 +1560,9 @@ msgstr "" "Närmaste gata till placeringen pÃ¥ kartan (genereras automatiskt av Bing Maps): %s\n" "\n" -#: templates/web/zurich/email_sent.html:5 -msgid "Nearly Done! Now check your email..." -msgstr "Nästan klar! Kolla nu din epost." - #: templates/web/base/auth/token.html:17 templates/web/base/email_sent.html:5 -#, fuzzy msgid "Nearly done! Now check your email…" -msgstr "Nästan klar! Kolla nu din epost." +msgstr "Nästan klart! Kolla nu din epost." #: templates/web/base/reports/index.html:21 msgid "New <br>problems" @@ -1672,9 +1586,8 @@ msgid "New local problems on FixMyStreet" msgstr "Nya lokala problem pÃ¥ FixaMinGata" #: templates/web/zurich/admin/report_edit-sdm.html:117 -#, fuzzy msgid "New note to DM:" -msgstr "Ny intern anteckning:" +msgstr "Ny anteckning till DM:" #: db/alert_types.pl:38 msgid "New problems for {{COUNCIL}} within {{WARD}} ward on FixMyStreet" @@ -1706,9 +1619,8 @@ msgstr "Ny status" #: templates/web/zurich/admin/template_edit.html:9 #: templates/web/zurich/admin/templates.html:26 -#, fuzzy msgid "New template" -msgstr "Ny status" +msgstr "Ny mall" #: templates/web/base/pagination.html:13 msgid "Next" @@ -1725,8 +1637,8 @@ msgstr "Nästa" #: templates/web/base/admin/report_edit.html:75 #: templates/web/base/admin/update_edit.html:25 #: templates/web/base/questionnaire/creator_fixed.html:16 +#: templates/web/base/questionnaire/index.html:101 #: templates/web/base/questionnaire/index.html:53 -#: templates/web/base/questionnaire/index.html:92 msgid "No" msgstr "Nej" @@ -1790,10 +1702,8 @@ msgstr "Normala (publika) användare skall inte associeras med nÃ¥gon <strong>fà #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:13 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:33 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:31 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:37 msgid "Not Responsible" msgstr "Ej ansvarig" @@ -1801,9 +1711,8 @@ msgstr "Ej ansvarig" #: perllib/FixMyStreet/Cobrand/Zurich.pm:937 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:13 -#, fuzzy msgid "Not contactable" -msgstr "Ej ansvarig" +msgstr "Ej kontaktbar" #: templates/web/zurich/admin/report_edit-sdm.html:108 msgid "Not for my subdivision" @@ -1833,21 +1742,23 @@ msgstr "Observera att när vi listar obegräftade rapporter använder vi datumet msgid "Note:" msgstr "Observera:" -#: templates/web/base/open311/index.html:73 +#: templates/web/base/open311/index.html:65 msgid "Note: <strong>%s</strong>" msgstr "Observera: <strong>%s</strong>" #: templates/web/zurich/admin/list_updates.html:21 msgid "Notes from SDM to DM" -msgstr "" +msgstr "Anteckningar frÃ¥n SDM till DM" -#: templates/web/base/report/new/fill_in_details_form.html:113 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:10 +#: templates/web/base/report/new/form_user_loggedout.html:14 +#: templates/web/base/report/new/form_user_loggedout.html:2 +#: templates/web/base/report/new/oauth_email_form.html:17 msgid "Now to submit your report…" msgstr "För att skicka din rapport…" -#: templates/web/base/report/update-form.html:86 -#: templates/web/fixmystreet/report/update-form.html:85 +#: templates/web/base/report/update-form.html:28 +#: templates/web/base/report/update/form_user_loggedout.html:13 +#: templates/web/base/report/update/form_user_loggedout.html:2 msgid "Now to submit your update…" msgstr "För att skicka din uppdatering…" @@ -1855,11 +1766,6 @@ msgstr "För att skicka din uppdatering…" msgid "OK" msgstr "OK" -#: templates/web/base/report/display.html:28 -#: templates/web/base/report/update.html:17 -msgid "Offensive? Unsuitable? Tell us" -msgstr "Kränkande eller olämpligt? Kontakta oss" - #: templates/web/base/reports/index.html:23 msgid "Old / unknown <br>problems" msgstr "Äldre/okända <br>problem" @@ -1876,7 +1782,7 @@ msgstr "Äldre <br>fixat" msgid "Older <br>problems" msgstr "Äldre <br>problem" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:45 +#: templates/web/base/report/new/form_report.html:15 msgid "One-line summary" msgstr "Kort sammanfattning" @@ -1887,8 +1793,7 @@ msgstr "Kort sammanfattning" #: templates/web/base/admin/report_blocks.html:4 #: templates/web/base/admin/update_edit.html:28 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/report/update-form.html:30 -#: templates/web/fixmystreet/report/update-form.html:28 +#: templates/web/base/report/update/form_update.html:34 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:7 #: templates/web/zurich/admin/update_edit.html:18 @@ -1897,21 +1802,21 @@ msgstr "Öppen" #: templates/web/base/reports/index.html:22 msgid "Open for more than four weeks, with an update within the past eight weeks" -msgstr "" +msgstr "Öppna i mer än fyra veckor, med en uppdatering under de senaste Ã¥tta veckorna" #: templates/web/base/reports/index.html:23 msgid "Open, but not had any update in eight weeks" -msgstr "" +msgstr "Öppen, men utan uppdateringar under de senaste Ã¥tta veckorna" -#: templates/web/base/open311/index.html:70 +#: templates/web/base/open311/index.html:62 msgid "Open311 API for the mySociety FixMyStreet server" msgstr "Open311 API för FixaMinGata" -#: templates/web/base/open311/index.html:80 +#: templates/web/base/open311/index.html:72 msgid "Open311 initiative web page" msgstr "Open311" -#: templates/web/base/open311/index.html:81 +#: templates/web/base/open311/index.html:73 msgid "Open311 specification" msgstr "Open311 Specifikation" @@ -1923,15 +1828,15 @@ msgstr "Eller problem rapporterade til:" msgid "Or you can subscribe to an alert based upon what ward or council you’re in:" msgstr "Du kan ocksÃ¥ prenumerera pÃ¥ bevakningar baserat pÃ¥ vilken kommun du bor i:" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1084 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:673 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:674 -#: perllib/FixMyStreet/DB/Result/Problem.pm:570 -#: perllib/FixMyStreet/DB/Result/Problem.pm:580 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1055 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:669 +#: perllib/FixMyStreet/DB/Result/Problem.pm:558 +#: perllib/FixMyStreet/DB/Result/Problem.pm:568 +#: perllib/FixMyStreet/DB/Result/Problem.pm:578 #: perllib/FixMyStreet/DB/Result/Problem.pm:590 -#: perllib/FixMyStreet/DB/Result/Problem.pm:602 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:397 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:412 +#: perllib/FixMyStreet/Script/Reports.pm:175 +#: perllib/FixMyStreet/Script/Reports.pm:190 msgid "Other" msgstr "Övrig" @@ -1940,7 +1845,7 @@ msgid "Owner" msgstr "Ägare" #: templates/web/base/errors/page_error_404_not_found.html:1 -#: templates/web/base/errors/page_error_404_not_found.html:3 +#: templates/web/base/errors/page_error_404_not_found.html:4 msgid "Page Not Found" msgstr "Sidan hittas ej" @@ -1954,16 +1859,16 @@ msgstr "Förälder" msgid "Partial" msgstr "Partiell" -#: templates/web/base/auth/general.html:53 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:68 -#: templates/web/fixmystreet/report/update-form.html:116 +#: templates/web/base/auth/general.html:92 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:31 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:6 #: templates/web/zurich/auth/general.html:32 #: templates/web/zurich/auth/general.html:63 msgid "Password (optional)" msgstr "Lösenord (valfritt)" #: templates/web/base/auth/change_password.html:25 -#: templates/web/base/auth/general.html:36 +#: templates/web/base/auth/general.html:72 msgid "Password:" msgstr "Lösenord:" @@ -1975,45 +1880,37 @@ msgstr "Permanent länk" msgid "Phone number" msgstr "Telefonnummer" -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:26 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:62 +#: templates/web/base/report/new/form_user_loggedin.html:26 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:25 msgid "Phone number (optional)" msgstr "Telefonnummer (valfritt)" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:306 +#: perllib/FixMyStreet/Script/Reports.pm:83 #: templates/web/base/admin/report_edit.html:63 -#: templates/web/base/report/new/fill_in_details_form.html:198 #: templates/web/zurich/admin/stats.html:39 msgid "Phone:" msgstr "Telefonnummer:" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:66 -#: templates/web/fixmystreet/report/update-form.html:59 +#: templates/web/base/questionnaire/index.html:75 +#: templates/web/base/report/new/form_report.html:23 +#: templates/web/base/report/update/form_update.html:6 #: templates/web/zurich/admin/index-dm.html:29 #: templates/web/zurich/admin/index-sdm.html:24 #: templates/web/zurich/admin/reports.html:16 #: templates/web/zurich/admin/stats.html:37 -#: templates/web/zurich/report/new/fill_in_details_form.html:52 +#: templates/web/zurich/report/new/fill_in_details_form.html:45 msgid "Photo" msgstr "Foto" -#: perllib/FixMyStreet/App/Controller/Photo.pm:221 -#, fuzzy +#: perllib/FixMyStreet/App/Controller/Photo.pm:187 msgid "Photo is required." -msgstr "Den här informationen krävs" +msgstr "Foto är ett krav." #: templates/web/base/admin/category_edit.html:48 -#, fuzzy msgid "Photo required" -msgstr "Den här informationen krävs" - -#: templates/web/base/questionnaire/index.html:80 -#: templates/web/base/report/new/fill_in_details_form.html:84 -#: templates/web/base/report/update-form.html:62 -msgid "Photo:" -msgstr "Foto:" +msgstr "Foto krävs" -#: templates/web/base/alert/list.html:26 +#: templates/web/base/alert/list.html:23 msgid "Photos of recent nearby reports" msgstr "Foton frÃ¥n närliggande rapporter" @@ -2042,20 +1939,16 @@ msgstr "Var vänlig, kortfattad och rakt pÃ¥ sak." msgid "Please check the passwords and try again" msgstr "Vänligen kontrollera lösenordet och prova igen" -#: templates/web/zurich/auth/token.html:16 -msgid "Please check your email" -msgstr "Vänligen kontrollera din epost" - -#: templates/web/base/auth/general.html:10 -#: templates/web/base/auth/general.html:16 +#: templates/web/base/auth/general.html:27 +#: templates/web/base/auth/general.html:33 #: templates/web/zurich/auth/general.html:3 #: templates/web/zurich/auth/general.html:9 msgid "Please check your email address is correct" msgstr "Vänligen kontrollera att din epostadress är korrekt" #: perllib/FixMyStreet/App/Controller/Admin.pm:343 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:883 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:948 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:878 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:943 #: perllib/FixMyStreet/DB/Result/Problem.pm:412 #: templates/web/base/js/translation_strings.html:9 msgid "Please choose a category" @@ -2069,25 +1962,29 @@ msgstr "Välj en fastighetstyp" msgid "Please correct the errors below" msgstr "Vänligen korrigera felen nedan" -#: templates/web/base/contact/blurb.html:2 -#: templates/web/fixmystreet/contact/blurb.html:12 -#, fuzzy +#: templates/web/base/contact/blurb.html:12 msgid "" "Please do <strong>not</strong> report problems through this form; messages go to\n" "the team behind this site, not a council. To report a problem,\n" "please <a href=\"/\">go to the front page</a> and follow the instructions." -msgstr "Var snäll och rapportera <strong>inga</strong> problem genom det här formuläret. Meddelanden här gÃ¥r till teamet bakom FixaMinGata, inte till din kommun. för att rapportera ett problem, <a href=\"/\">gÃ¥ till framsidan</a> och följ instruktionerna." +msgstr "Var snäll och rapportera <strong>inga</strong> problem genom det här formuläret. Meddelanden här gÃ¥r till teamet bakom FixaMinGata, inte till din kommun. För att rapportera ett problem, <a href=\"/\">gÃ¥ till framsidan</a> och följ instruktionerna." #: templates/web/base/report/new/notes.html:6 msgid "Please do not be abusive — abusing your council devalues the service for all users." msgstr "Var snäll och missbruka inte tjänsten, det förstör för alla." #: perllib/FixMyStreet/App/Controller/Admin.pm:346 -#: perllib/FixMyStreet/DB/Result/Comment.pm:126 +#: perllib/FixMyStreet/DB/Result/Comment.pm:125 #: templates/web/base/js/translation_strings.html:2 msgid "Please enter a message" msgstr "Skriv in ett meddelande" +#: perllib/FixMyStreet/App/Controller/Admin.pm:1091 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1146 +#, fuzzy +msgid "Please enter a name" +msgstr "Skriv in ditt namn och efternamn" + #: templates/web/base/auth/change_password.html:12 #: templates/web/base/auth/change_password.html:15 #: templates/web/base/js/translation_strings.html:19 @@ -2100,10 +1997,10 @@ msgstr "Skriv in ett lösenord" msgid "Please enter a subject" msgstr "Skriv in ett ärende" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1084 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1137 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1087 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1142 #: perllib/FixMyStreet/App/Controller/Admin.pm:345 -#: perllib/FixMyStreet/DB/Result/User.pm:127 +#: perllib/FixMyStreet/DB/Result/User.pm:133 #: templates/web/base/js/translation_strings.html:12 #: templates/web/base/js/translation_strings.html:16 msgid "Please enter a valid email" @@ -2120,9 +2017,9 @@ msgid "Please enter some details" msgstr "Skriv nÃ¥gra detaljer" #: perllib/FixMyStreet/App/Controller/Contact.pm:113 -#: perllib/FixMyStreet/DB/Result/User.pm:124 -#: templates/web/base/auth/general.html:10 -#: templates/web/base/auth/general.html:15 +#: perllib/FixMyStreet/DB/Result/User.pm:130 +#: templates/web/base/auth/general.html:27 +#: templates/web/base/auth/general.html:32 #: templates/web/base/js/translation_strings.html:11 #: templates/web/base/js/translation_strings.html:15 #: templates/web/zurich/auth/general.html:3 @@ -2130,7 +2027,7 @@ msgstr "Skriv nÃ¥gra detaljer" msgid "Please enter your email" msgstr "Skriv in din epostadress" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:7 +#: templates/web/base/report/new/form_user_loggedout_email.html:7 #: templates/web/zurich/report/new/fill_in_details_form.html:80 msgid "Please enter your email address" msgstr "Skriv in din epostadress" @@ -2139,15 +2036,15 @@ msgstr "Skriv in din epostadress" msgid "Please enter your first name" msgstr "Skriv in ditt förnamn" -#: perllib/FixMyStreet/Cobrand/UK.pm:318 +#: perllib/FixMyStreet/Cobrand/UK.pm:319 #: templates/web/base/js/translation_strings.html:7 msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below" msgstr "Skriv in ditt namn och efternamn om kommunen behöver den informationen. Om du inte vill att dit namn visas kan du välja det nedanför" #: perllib/FixMyStreet/App/Controller/Contact.pm:112 -#: perllib/FixMyStreet/DB/Result/Comment.pm:123 +#: perllib/FixMyStreet/DB/Result/Comment.pm:122 #: perllib/FixMyStreet/DB/Result/Problem.pm:406 -#: perllib/FixMyStreet/DB/Result/User.pm:120 +#: perllib/FixMyStreet/DB/Result/User.pm:126 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter your name" msgstr "Skriv in ditt namn och efternamn" @@ -2174,12 +2071,11 @@ msgstr "Välkommen att <a href=\"&s\">logga in igen</a>, eller gÃ¥ tillbaka till msgid "Please fill in details of the problem below." msgstr "Fyll i information om problemet nedan." -#: templates/web/zurich/report/new/fill_in_details_form.html:46 +#: templates/web/zurich/report/new/fill_in_details_form.html:72 msgid "Please fill in details of the problem." msgstr "Fyll i information om problemet nedan." -#: templates/web/base/report/new/fill_in_details_form.html:28 -#: templates/web/fixmystreet/report/new/sidebar.html:7 +#: templates/web/base/report/new/sidebar.html:7 #: templates/web/zurich/report/new/fill_in_details_form.html:20 msgid "Please fill in the form below with details of the problem, and describe the location as precisely as possible in the details box." msgstr "Fyll i information om problemet nedan och beskriv den exakta platsen för problemet sÃ¥ noga du kan." @@ -2188,20 +2084,24 @@ msgstr "Fyll i information om problemet nedan och beskriv den exakta platsen fö msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "Ange ifall du vill ta emot ett annat frÃ¥geformulär" -#: templates/web/fixmystreet/report/updates-sidebar-notes.html:4 +#: templates/web/base/report/updates-sidebar-notes.html:2 msgid "Please note that updates are not sent to the council." msgstr "Observera att uppdateringar inte skickas till kommunen." -#: templates/web/base/report/update-form.html:7 -msgid "Please note that updates are not sent to the council. If you leave your name it will be public. Your information will only be used in accordance with our <a href=\"/faq#privacy\">privacy policy</a>" -msgstr "Observera att uppdateringar inte skickas till kommunen. Om du lämnar ditt namn kommer det att visas publikt. Din information används endast i enlighet med vÃ¥r <a href=\"/faq#privacy\">sekretesspolicy</a>" +#: templates/web/base/report/new/oauth_email_form.html:4 +#, fuzzy +msgid "Please note your report has <strong>not yet been sent</strong>." +msgstr "Observera att din rapport <strong>inte har skickats än</strong>. Välj en kategori och ytterligare information nedan. Tryck sedan pÃ¥ skicka." -#: templates/web/base/report/new/fill_in_details_form.html:8 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:21 +#: templates/web/base/report/new/fill_in_details_form.html:20 #: templates/web/zurich/report/new/fill_in_details_form.html:11 msgid "Please note your report has <strong>not yet been sent</strong>. Choose a category and add further information below, then submit." msgstr "Observera att din rapport <strong>inte har skickats än</strong>. Välj en kategori och ytterligare information nedan. Tryck sedan pÃ¥ skicka." +#: templates/web/base/report/display.html:26 +msgid "Please note your update has <strong>not yet been posted</strong>." +msgstr "" + #: templates/web/base/report/new/notes.html:1 #: templates/web/zurich/report/new/notes.html:1 msgid "Please note:" @@ -2221,9 +2121,8 @@ msgid "Please say whether you've ever reported a problem to your council before" msgstr "Ange om du har anmält ett problem till kommunen tidigare eller ej" #: templates/web/zurich/admin/report_edit.html:208 -#, fuzzy msgid "Please select a body." -msgstr "Välj en förvaltning" +msgstr "Välj en förvaltning." #: perllib/FixMyStreet/App/Controller/Alert.pm:80 msgid "Please select the feed you want" @@ -2240,6 +2139,7 @@ msgstr "Ange om problemet har lösts eller ej" #: perllib/FixMyStreet/App/Model/PhotoSet.pm:117 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:145 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:147 +#: templates/web/base/js/translation_strings.html:53 msgid "Please upload a JPEG image only" msgstr "Ladda upp en JPEG-bild" @@ -2247,18 +2147,14 @@ msgstr "Ladda upp en JPEG-bild" msgid "Please write a message" msgstr "Skriv ett meddelande" -#: templates/web/fixmystreet/report/update-form.html:23 +#: templates/web/base/report/update/form_update.html:29 msgid "Please write your update here" msgstr "Skriv din uppdatering här" -#: templates/web/base/contact/index.html:100 -#: templates/web/base/report/update-form.html:110 -#: templates/web/base/report/update-form.html:132 -#: templates/web/base/report/update-form.html:72 -#: templates/web/fixmystreet/contact/index.html:113 -#: templates/web/fixmystreet/report/update-form.html:124 -#: templates/web/fixmystreet/report/update-form.html:71 -#: templates/web/fixmystreet/report/update-form.html:97 +#: templates/web/base/contact/index.html:105 +#: templates/web/base/report/update-form.html:24 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:14 +#: templates/web/base/report/update/form_user_loggedout_password.html:10 msgid "Post" msgstr "Skicka" @@ -2276,7 +2172,7 @@ msgstr "Postat av %s %s" #: templates/web/base/front/footer-marketing.html:12 msgid "Powered by <a class=\"platform-logo\" href=\"http://fixmystreet.org/\">FixMyStreet Platform</a>" -msgstr "" +msgstr "Byggd pÃ¥ <a class=\"platform-logo\" href=\"http://fixmystreet.org/\">FixMyStreet-plattformen</a>" #: templates/web/base/pagination.html:7 msgid "Previous" @@ -2286,14 +2182,11 @@ msgstr "FöregÃ¥ende" msgid "Privacy" msgstr "Personlig integritet" -#: templates/web/base/faq/faq-en-gb.html:7 -#: templates/web/base/open311/index.html:7 -#: templates/web/base/static/privacy.html:1 -#: templates/web/base/static/privacy.html:2 -#: templates/web/base/static/privacy.html:9 -#: templates/web/fixmystreet/contact/index.html:11 +#: templates/web/base/about/_sidebar.html:5 +#: templates/web/base/about/privacy.html:1 +#: templates/web/base/about/privacy.html:2 msgid "Privacy and cookies" -msgstr "" +msgstr "Integritetsskydd och kakor" #: templates/web/base/admin/body.html:202 #: templates/web/base/admin/body.html:85 @@ -2319,12 +2212,12 @@ msgstr "Rapport %s bekräftad" msgid "Problem %s sent to council %s" msgstr "Rapport %s skickad till %s" -#: templates/web/base/admin/index.html:46 +#: templates/web/base/admin/index.html:39 #: templates/web/zurich/admin/index.html:9 msgid "Problem breakdown by state" msgstr "Rapporter per status" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1055 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1058 msgid "Problem marked as open." msgstr "Problemet markerat som öppet." @@ -2340,11 +2233,11 @@ msgstr "Problem" msgid "Problems in this area" msgstr "Problem i detta omrÃ¥de" -#: templates/web/fixmystreet/report/display.html:43 +#: templates/web/base/report/display_tools.html:19 msgid "Problems nearby" msgstr "Närliggande problem" -#: templates/web/fixmystreet/report/display.html:41 +#: templates/web/base/report/display_tools.html:17 msgid "Problems on the map" msgstr "Problem pÃ¥ kartan" @@ -2356,24 +2249,23 @@ msgstr "Problem nyligen rapporterade som lösta pÃ¥ FixaMinGata" msgid "Problems within %.1fkm of this location" msgstr "Problem inom %.1f km frÃ¥n denna position" -#: perllib/FixMyStreet/Cobrand/Default.pm:642 +#: perllib/FixMyStreet/Cobrand/Default.pm:663 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:120 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:139 -#: perllib/FixMyStreet/Cobrand/UK.pm:207 +#: perllib/FixMyStreet/Cobrand/UK.pm:208 msgid "Problems within %s" msgstr "Problem inom %s" #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:128 -#: perllib/FixMyStreet/Cobrand/UK.pm:221 +#: perllib/FixMyStreet/Cobrand/UK.pm:222 msgid "Problems within %s ward" msgstr "Problem inom omrÃ¥det %s" #. ("First %s is the body name, second %s the site name") #: templates/web/base/reports/body.html:0 #: templates/web/base/reports/body.html:24 -#, fuzzy msgid "Problems within %s, %s" -msgstr "Problem inom %s" +msgstr "Problem inom %s, %s" #: templates/web/base/alert/_list.html:42 msgid "Problems within the boundary of:" @@ -2387,19 +2279,16 @@ msgstr "Fastighetsadress:" msgid "Property type:" msgstr "Fastighetstyp:" -#: templates/web/base/report/update-form.html:3 -#: templates/web/fixmystreet/report/update-form.html:4 +#: templates/web/base/report/update-form.html:6 msgid "Provide an update" msgstr "Ge en uppdatering" -#: templates/web/base/auth/general.html:56 +#: templates/web/base/auth/general.html:95 msgid "Providing a name and password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." msgstr "Du mÃ¥ste inte ange namn och ett lösenord men om du gör det är det lättare att rapportera problem, lämna uppdateringar och hantera dina rapporter." -#: templates/web/base/report/new/fill_in_details_form.html:156 -#: templates/web/base/report/update-form.html:129 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:71 -#: templates/web/fixmystreet/report/update-form.html:119 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:34 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:9 msgid "Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." msgstr "Att ange ett lösenord är valfritt, men om du gör det kommer du lättare att kunna rapportera problem, lämna uppdateringar och hantera dina anmälningar." @@ -2435,18 +2324,17 @@ msgstr "FrÃ¥geformulär ifyllt av rapportören" #: templates/web/base/alert/_list.html:22 #: templates/web/base/around/display_location.html:1 #: templates/web/base/around/display_location.html:3 -#: templates/web/base/report/display.html:50 +#: templates/web/base/report/display_tools.html:34 #: templates/web/base/reports/_rss.html:1 #: templates/web/fixmystreet/alert/updates.html:9 -#: templates/web/fixmystreet/report/display.html:58 msgid "RSS feed" msgstr "RSS-flöde" -#: perllib/FixMyStreet/Cobrand/UK.pm:250 perllib/FixMyStreet/Cobrand/UK.pm:262 +#: perllib/FixMyStreet/Cobrand/UK.pm:251 perllib/FixMyStreet/Cobrand/UK.pm:263 msgid "RSS feed for %s" msgstr "RSS-flöde för %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:256 perllib/FixMyStreet/Cobrand/UK.pm:268 +#: perllib/FixMyStreet/Cobrand/UK.pm:257 perllib/FixMyStreet/Cobrand/UK.pm:269 msgid "RSS feed for %s ward, %s" msgstr "RSS-flöde för omrÃ¥de %s, %s" @@ -2454,11 +2342,11 @@ msgstr "RSS-flöde för omrÃ¥de %s, %s" #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:163 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:173 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:181 -#: perllib/FixMyStreet/Cobrand/UK.pm:276 perllib/FixMyStreet/Cobrand/UK.pm:288 +#: perllib/FixMyStreet/Cobrand/UK.pm:277 perllib/FixMyStreet/Cobrand/UK.pm:289 msgid "RSS feed of %s" msgstr "RSS-flöde för %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:281 perllib/FixMyStreet/Cobrand/UK.pm:293 +#: perllib/FixMyStreet/Cobrand/UK.pm:282 perllib/FixMyStreet/Cobrand/UK.pm:294 msgid "RSS feed of %s, within %s ward" msgstr "RSS-flöde för %s, inom omrÃ¥de %s" @@ -2470,15 +2358,15 @@ msgstr "RSS-flöde av närliggande problem" msgid "RSS feed of problems in this %s" msgstr "RSS-flöde för problem i denna %s" -#: perllib/FixMyStreet/Cobrand/Default.pm:643 +#: perllib/FixMyStreet/Cobrand/Default.pm:664 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:121 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:138 -#: perllib/FixMyStreet/Cobrand/UK.pm:214 +#: perllib/FixMyStreet/Cobrand/UK.pm:215 msgid "RSS feed of problems within %s" msgstr "RSS-flöde för problem inom %s" #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:127 -#: perllib/FixMyStreet/Cobrand/UK.pm:220 +#: perllib/FixMyStreet/Cobrand/UK.pm:221 msgid "RSS feed of problems within %s ward" msgstr "RSS-flöde för problem inom omrÃ¥de %s" @@ -2487,25 +2375,22 @@ msgstr "RSS-flöde för problem inom omrÃ¥de %s" msgid "RSS feed of recent local problems" msgstr "RSS-flöde för senaste lokala problemen" -#: templates/web/base/report/display.html:50 +#: templates/web/base/report/display_tools.html:34 #: templates/web/fixmystreet/alert/updates.html:9 -#: templates/web/fixmystreet/report/display.html:58 msgid "RSS feed of updates to this problem" msgstr "RSS-flöde för uppdateringar till denna rapport" #: templates/web/base/alert/updates.html:9 -#: templates/web/base/report/display.html:41 +#: templates/web/base/report/display_tools.html:36 #: templates/web/fixmystreet/alert/updates.html:14 -#: templates/web/fixmystreet/report/display.html:60 msgid "Receive email when updates are left on this problem." msgstr "ErhÃ¥ll epost när uppdateringar ges till denna rapport" #. ("%s is the site name") #: templates/web/base/around/display_location.html:0 #: templates/web/base/around/display_location.html:33 -#, fuzzy msgid "Recent local problems, %s" -msgstr "Senaste lokala rapporterna, FixaMinGata" +msgstr "Senaste lokala rapporterna, %s" #: templates/web/base/reports/index.html:24 msgid "Recently <br>fixed" @@ -2523,16 +2408,15 @@ msgstr "Kom ihÃ¥g att FixaMinGata primärt är avsett för att rapportera fysisk msgid "Remove flag" msgstr "Ta bort flagga" -#: templates/web/base/admin/report_edit.html:92 -#: templates/web/base/admin/update_edit.html:62 +#: templates/web/base/admin/report_edit.html:93 +#: templates/web/base/admin/update_edit.html:67 #: templates/web/zurich/admin/update_edit.html:35 msgid "Remove photo (can't be undone!)" msgstr "Ta bort foto (kan inte Ã¥ngras!)" #: templates/web/zurich/admin/report_edit.html:243 -#, fuzzy msgid "Reply to user:" -msgstr "ändra användare" +msgstr "Besvara användare:" #: templates/web/fixmystreet/header_logo.html:2 msgid "Report" @@ -2545,7 +2429,7 @@ msgstr "Rapportera" msgid "Report a problem" msgstr "Rapportera ett problem" -#: templates/web/fixmystreet/report/display.html:32 +#: templates/web/base/report/display_tools.html:8 msgid "Report abuse" msgstr "Rapportera missbruk" @@ -2554,7 +2438,8 @@ msgid "Report on %s" msgstr "Rappoort pÃ¥ %s" #: templates/web/base/report/new/fill_in_details_form.html:1 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:2 +#: templates/web/base/report/new/login_success_form.html:1 +#: templates/web/base/report/new/oauth_email_form.html:1 msgid "Report your problem" msgstr "Rapportera ditt problem" @@ -2563,9 +2448,8 @@ msgstr "Rapportera ditt problem" msgid "Report, view, or discuss local problems" msgstr "Rapportera, visa, eller diskutera lokala problem" -#: perllib/FixMyStreet/DB/Result/Problem.pm:585 -#: templates/web/base/contact/index.html:50 -#: templates/web/fixmystreet/contact/index.html:65 +#: perllib/FixMyStreet/DB/Result/Problem.pm:573 +#: templates/web/base/contact/index.html:57 msgid "Reported anonymously at %s" msgstr "Rapporterat anonymt %s" @@ -2574,55 +2458,52 @@ msgstr "Rapporterat anonymt %s" msgid "Reported before" msgstr "Rapporterat tidigare" -#: perllib/FixMyStreet/DB/Result/Problem.pm:608 -#: templates/web/base/contact/index.html:52 -#: templates/web/fixmystreet/contact/index.html:67 +#: perllib/FixMyStreet/DB/Result/Problem.pm:596 +#: templates/web/base/contact/index.html:59 msgid "Reported by %s at %s" msgstr "Rapporterat av %s den %s" #: templates/web/zurich/admin/report_edit-sdm.html:58 #: templates/web/zurich/admin/report_edit.html:86 -#, fuzzy msgid "Reported by:" -msgstr "Rapporterade %s" +msgstr "Rapporterad av:" #: templates/web/zurich/report/_main.html:2 msgid "Reported in the %s category" msgstr "Rapporterat i kategori %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:581 +#: perllib/FixMyStreet/DB/Result/Problem.pm:569 msgid "Reported in the %s category anonymously at %s" msgstr "Anonym rapport i kategori %s, %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:603 +#: perllib/FixMyStreet/DB/Result/Problem.pm:591 msgid "Reported in the %s category by %s at %s" msgstr "Rapporterat i kategori %s av %s den %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:577 +#: perllib/FixMyStreet/DB/Result/Problem.pm:565 msgid "Reported via %s anonymously at %s" msgstr "Rapporterat av %s anonymt %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:599 +#: perllib/FixMyStreet/DB/Result/Problem.pm:587 msgid "Reported via %s by %s at %s" msgstr "Rapporterat av %s av %s den %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:573 +#: perllib/FixMyStreet/DB/Result/Problem.pm:561 msgid "Reported via %s in the %s category anonymously at %s" msgstr "Rapporterat av %s i kategorin %s, anonymt %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:593 +#: perllib/FixMyStreet/DB/Result/Problem.pm:581 msgid "Reported via %s in the %s category by %s at %s" msgstr "Rapporterat av %s i kategorin %s av %s den %s" #: templates/web/base/reports/index.html:21 msgid "Reported within the last four weeks" -msgstr "" +msgstr "Rapporterade under de senaste fyra veckorna" #: templates/web/zurich/admin/report_edit-sdm.html:36 #: templates/web/zurich/admin/report_edit.html:55 -#, fuzzy msgid "Reported:" -msgstr "Rapporterade %s" +msgstr "Rapporterad:" #: templates/web/base/around/index.html:2 #: templates/web/base/js/translation_strings.html:41 @@ -2632,13 +2513,13 @@ msgstr "Rapporterade %s" msgid "Reporting a problem" msgstr "Rapportera ett problem" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1277 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1286 #: perllib/FixMyStreet/Cobrand/Zurich.pm:384 #: templates/web/zurich/header.html:60 msgid "Reports" msgstr "Rapporter" -#: perllib/FixMyStreet/Cobrand/UK.pm:327 perllib/FixMyStreet/Cobrand/UK.pm:331 +#: perllib/FixMyStreet/Cobrand/UK.pm:328 perllib/FixMyStreet/Cobrand/UK.pm:332 msgid "Reports are limited to %s characters in length. Please shorten your report" msgstr "Rapporter kan bara innehÃ¥lla %s tecken. Var vänlig korta ned din rapport" @@ -2659,7 +2540,7 @@ msgstr "Skicka om rapporten" #: templates/web/zurich/admin/templates.html:1 #: templates/web/zurich/admin/templates.html:3 msgid "Response Templates for %s" -msgstr "" +msgstr "Svarsmallar för %s" #: templates/web/base/js/translation_strings.html:28 msgid "Right place?" @@ -2675,25 +2556,26 @@ msgstr "Vägoperatör för den här namngivna vägen (hämtat frÃ¥n vägens numm msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "Vägoperatör för den här namngivna vägen (frÃ¥n OpenStreetMap): %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1495 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1500 -#: templates/web/base/admin/report_edit.html:88 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1508 +#: templates/web/base/admin/report_edit.html:90 +#: templates/web/base/admin/update_edit.html:64 #: templates/web/zurich/admin/report_edit.html:116 msgid "Rotate Left" msgstr "Rotera Ã¥t vänster" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1495 -#: templates/web/base/admin/report_edit.html:89 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 +#: templates/web/base/admin/report_edit.html:91 +#: templates/web/base/admin/update_edit.html:65 #: templates/web/zurich/admin/report_edit.html:117 msgid "Rotate Right" msgstr "Rotera Ã¥t höger" #: templates/web/zurich/admin/report_edit.html:388 msgid "Rotating this photo will discard unsaved changes to the report." -msgstr "" +msgstr "Rotation av detta foto kommer att radera osparade rapportändringar." #: templates/web/base/js/translation_strings.html:46 -#: templates/web/base/maps/google-ol.html:13 msgid "Satellite" msgstr "Satellit" @@ -2746,16 +2628,14 @@ msgid "Select an area" msgstr "Välj ett omrÃ¥de" #: templates/web/base/alert/_list.html:10 -#, fuzzy msgid "Select which type of alert you’d like and click the button for an RSS feed, or enter your email address to subscribe to an email alert." msgstr "Välj vilken kategori av rapporter du vill fÃ¥ och klicka knappen för ett RSS-flöde eller ange din epostadress för att prenumerera via epost." #: perllib/FixMyStreet/Cobrand/Zurich.pm:835 -#, fuzzy msgid "Sent report back" -msgstr "Öppna rapporter" +msgstr "Skicka tillbaka rapport" -#: perllib/FixMyStreet/DB/Result/Problem.pm:708 +#: perllib/FixMyStreet/DB/Result/Problem.pm:696 msgid "Sent to %s %s later" msgstr "Skickades till %s, %s senare" @@ -2768,15 +2648,13 @@ msgstr "Skickades:" msgid "Service:" msgstr "Tjänst:" -#: templates/web/fixmystreet/report/display.html:38 +#: templates/web/base/report/display_tools.html:14 msgid "Share" msgstr "Dela" -#: templates/web/base/report/new/fill_in_details_form.html:193 -#: templates/web/base/report/update-form.html:158 -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:23 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:59 -#: templates/web/fixmystreet/report/update-form.html:146 +#: templates/web/base/report/new/form_user_loggedin.html:23 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:22 +#: templates/web/base/report/update/form_name.html:15 msgid "Show my name publicly" msgstr "Visa mitt namn publikt" @@ -2788,9 +2666,9 @@ msgstr "Visa äldre" msgid "Show pins" msgstr "Visa pinnar" +#: templates/web/base/auth/general.html:100 #: templates/web/base/auth/general.html:3 -#: templates/web/base/auth/general.html:40 -#: templates/web/base/auth/general.html:61 +#: templates/web/base/auth/general.html:76 #: templates/web/zurich/auth/general.html:18 #: templates/web/zurich/auth/general.html:35 msgid "Sign in" @@ -2819,7 +2697,7 @@ msgstr "" "En del ändpunkter kräver en <strong>API-nyckel</strong> för att kunna verifiera att rapporterna\n" "skickats frÃ¥n denna FixMyStreet-installation" -#: templates/web/base/alert/index.html:42 +#: templates/web/base/alert/index.html:40 msgid "Some photos of recent reports" msgstr "Foton frÃ¥n de senaste rapporterna" @@ -2829,35 +2707,46 @@ msgstr "Foton frÃ¥n de senaste rapporterna" msgid "Some text to localize" msgstr "Lite text att lokalisera" -#: perllib/FixMyStreet/Cobrand/UK.pm:78 +#: perllib/FixMyStreet/Cobrand/UK.pm:79 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover." msgstr "Tyvärr, det verkar vara ett postnummer som vi inte täcker." #: templates/web/base/auth/token.html:8 msgid "Sorry, that wasn’t a valid link" -msgstr "" +msgstr "Länken är tyvärr ogiltig" #: templates/web/base/tokens/abuse.html:5 msgid "Sorry, there has been an error confirming your problem." msgstr "Tyvärr har det uppstÃ¥tt ett fel med att bekräfta ditt problem." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:221 -#: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:37 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:216 +#: perllib/FixMyStreet/Geocode.pm:38 perllib/FixMyStreet/Geocode/Bing.pm:38 #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:56 #: perllib/FixMyStreet/Geocode/OSM.pm:48 msgid "Sorry, we could not find that location." msgstr "Tyvärr kan vi inte hitta den adressen." -#: perllib/FixMyStreet/Geocode/Bing.pm:34 +#: templates/web/base/auth/general.html:9 +#: templates/web/base/report/display.html:21 +#: templates/web/base/report/new/fill_in_details_form.html:23 +#, fuzzy +msgid "Sorry, we could not log you in. Please fill in the form below." +msgstr "Tyvärr kan vi inte förstÃ¥ den adressen. Försök gärna igen." + +#: perllib/FixMyStreet/Geocode/Bing.pm:35 #: perllib/FixMyStreet/Geocode/Google.pm:45 #: perllib/FixMyStreet/Geocode/Zurich.pm:88 msgid "Sorry, we could not parse that location. Please try again." msgstr "Tyvärr kan vi inte förstÃ¥ den adressen. Försök gärna igen." #: perllib/FixMyStreet/App/Model/PhotoSet.pm:134 -#, fuzzy msgid "Sorry, we couldn't save your image(s), please try again." -msgstr "Tyvärr kan vi inte förstÃ¥ den adressen. Försök gärna igen." +msgstr "Tyvärr kan vi inte spara bilden eller bilderna. Försök gärna igen." + +#: perllib/FixMyStreet/App/Controller/AuthSS.pm:301 +#, fuzzy +msgid "Sorry, you can not log in with Facebook. Please try again later." +msgstr "Det uppstod ett problem med att visa denna sida. Försök gärna igen senare." #: templates/web/base/admin/stats.html:64 msgid "Start Date:" @@ -2867,13 +2756,12 @@ msgstr "Startdatum:" #: templates/web/base/admin/flagged.html:18 #: templates/web/base/admin/list_updates.html:11 #: templates/web/base/admin/reports.html:15 -#: templates/web/fixmystreet/report/update-form.html:26 +#: templates/web/base/report/update/form_update.html:32 msgid "State" msgstr "Status" #: templates/web/base/admin/report_edit.html:47 #: templates/web/base/admin/update_edit.html:27 -#: templates/web/base/report/update-form.html:28 #: templates/web/zurich/admin/report_edit-sdm.html:73 #: templates/web/zurich/admin/report_edit.html:101 #: templates/web/zurich/admin/report_edit.html:155 @@ -2881,7 +2769,7 @@ msgstr "Status" msgid "State:" msgstr "Status:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1282 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1291 #: perllib/FixMyStreet/Cobrand/Zurich.pm:387 #: templates/web/base/admin/stats.html:1 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:73 @@ -2901,9 +2789,9 @@ msgstr "Fortfarande öppen, via frÃ¥geformulär, %s" #: templates/web/zurich/admin/report_edit-sdm.html:25 #: templates/web/zurich/admin/report_edit.html:26 msgid "Street View" -msgstr "" +msgstr "Street View" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:406 +#: perllib/FixMyStreet/Script/Reports.pm:184 msgid "Subcategory: %s" msgstr "Underkategori: %s" @@ -2911,30 +2799,25 @@ msgstr "Underkategori: %s" msgid "Subdivision/Body" msgstr "Underavdelning/Förvaltning" -#: templates/web/fixmystreet/contact/index.html:98 +#: templates/web/base/contact/index.html:90 msgid "Subject" msgstr "Ärende" #: templates/web/base/admin/report_edit.html:19 -#: templates/web/base/contact/index.html:88 -#: templates/web/base/report/new/fill_in_details_form.html:53 #: templates/web/zurich/admin/report_edit.html:39 msgid "Subject:" msgstr "Ärende:" #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/fill_in_details_form.html:137 -#: templates/web/base/report/new/fill_in_details_form.html:159 -#: templates/web/base/report/new/fill_in_details_form.html:96 -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:36 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:23 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:76 +#: templates/web/base/report/new/form_user_loggedin.html:36 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:39 +#: templates/web/base/report/new/form_user_loggedout_password.html:11 #: templates/web/zurich/report/new/fill_in_details_form.html:96 msgid "Submit" msgstr "Skicka" -#: templates/web/base/admin/report_edit.html:95 -#: templates/web/base/admin/update_edit.html:65 +#: templates/web/base/admin/report_edit.html:101 +#: templates/web/base/admin/update_edit.html:75 #: templates/web/base/admin/user-form.html:56 #: templates/web/zurich/admin/report_edit-sdm.html:137 #: templates/web/zurich/admin/report_edit.html:268 @@ -2942,7 +2825,7 @@ msgstr "Skicka" msgid "Submit changes" msgstr "Skicka förändringar" -#: templates/web/base/questionnaire/index.html:97 +#: templates/web/base/questionnaire/index.html:106 msgid "Submit questionnaire" msgstr "Skicka frÃ¥geformulär" @@ -2958,9 +2841,8 @@ msgid "Submitted" msgstr "Skickad" #: templates/web/base/alert/updates.html:17 -#: templates/web/base/report/display.html:46 +#: templates/web/base/report/display_tools.html:41 #: templates/web/fixmystreet/alert/updates.html:23 -#: templates/web/fixmystreet/report/display.html:65 msgid "Subscribe" msgstr "Prenumerera" @@ -2968,7 +2850,7 @@ msgstr "Prenumerera" msgid "Subscribe me to an email alert" msgstr "Prenumerera med epost" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1275 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1284 #: perllib/FixMyStreet/Cobrand/Zurich.pm:383 #: templates/web/base/admin/bodies.html:25 #: templates/web/base/admin/index.html:1 @@ -2987,7 +2869,7 @@ msgstr "Sammanfattning" msgid "Summary reports" msgstr "Sammanställningsrapporter" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1279 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1288 msgid "Survey" msgstr "Enkät" @@ -2997,13 +2879,12 @@ msgstr "FrÃ¥geresultat" #: templates/web/zurich/admin/template_edit.html:7 msgid "Template «%s»" -msgstr "" +msgstr "Mall «%s»" #: perllib/FixMyStreet/Cobrand/Zurich.pm:394 #: templates/web/zurich/header.html:77 -#, fuzzy msgid "Templates" -msgstr "Uppdateringar" +msgstr "Mallar" #: templates/web/base/admin/list_updates.html:12 #: templates/web/zurich/admin/templates.html:9 @@ -3024,7 +2905,7 @@ msgstr "Text:" msgid "Thank you for reporting this issue!" msgstr "Tack för att du rapporterade detta ärende!" -#: templates/web/base/tokens/error.html:7 +#: templates/web/base/tokens/error.html:6 msgid "Thank you for trying to confirm your update or problem. We seem to have an error ourselves though, so <a href=\"%s\">please let us know what went on</a> and we'll look into it." msgstr "Tack för att du försöker bekräfta din uppdatering eller rapport. Vi har tyvärr stött pÃ¥ ett fel och uppskattar om du kan <a href=\"%s\">rapporterar vad som hände</a> sÃ¥ att vi kan titta pÃ¥ det." @@ -3059,23 +2940,23 @@ msgstr "Den positionen verkar inte vara i Sverige: försök gärna igen." #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:47 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:63 -#: perllib/FixMyStreet/Cobrand/UK.pm:71 +#: perllib/FixMyStreet/Cobrand/UK.pm:72 msgid "That postcode was not recognised, sorry." msgstr "Det postnummret finns tyvärr inte." -#: perllib/FixMyStreet/App/Controller/Admin.pm:726 +#: perllib/FixMyStreet/App/Controller/Admin.pm:724 msgid "That problem has been marked as sent." -msgstr "" +msgstr "Problemet har markerats som skickat." -#: perllib/FixMyStreet/App/Controller/Admin.pm:718 +#: perllib/FixMyStreet/App/Controller/Admin.pm:716 msgid "That problem will now be resent." msgstr "Rapportern kommer nu att skickas om." -#: perllib/FixMyStreet/App/Controller/Report.pm:125 +#: perllib/FixMyStreet/App/Controller/Report.pm:127 msgid "That report cannot be viewed on %s." msgstr "Rapporten kan inte visas pÃ¥ %s." -#: perllib/FixMyStreet/App/Controller/Report.pm:119 +#: perllib/FixMyStreet/App/Controller/Report.pm:121 msgid "That report has been removed from FixMyStreet." msgstr "Rapporten har tagits bort frÃ¥n FixaMinGata." @@ -3106,7 +2987,7 @@ msgid "" " If you leave this blank, <strong>send method defaults to email</strong>." msgstr "Utskicksmetoden avgör hur problemrapporter kommer att skickas till förvaltningen. Lämnar du detta fält blankt sÃ¥ kommer <strong>e-post att användas som utskicksmetod</strong>." -#: templates/web/base/open311/index.html:90 +#: templates/web/base/open311/index.html:82 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 "Open311 v2-attributet agency_responsible används för att lista de administrationer som tagit emot problemrapporten, vilket inte exakt är hur attributet definieras i Open311 v2-specifikationen." @@ -3127,12 +3008,12 @@ msgstr "Fyll i information om problemet nedan. Kommunen kommer inte att kunna hj msgid "The diligency prize league table shows editors' activity (who's been editing the most records)." msgstr "Flitighetstabellen visar redigerares aktiviteter (vem som har ändrat flest handlingar)." -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:60 -#: perllib/FixMyStreet/App/Controller/Reports.pm:79 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:61 +#: perllib/FixMyStreet/App/Controller/Reports.pm:80 msgid "The error was: %s" msgstr "Felet var: %s" -#: templates/web/base/open311/index.html:86 +#: templates/web/base/open311/index.html:78 msgid "The following Open311 v2 attributes are returned for each request: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code and service_name." msgstr "Följande Open311 v2-attribut returneras för varje begäran: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code and service_name." @@ -3168,7 +3049,7 @@ msgstr "De senaste problemen inom {{NAME}}'s gräns rapporterade av användare" #: templates/web/base/auth/token.html:9 msgid "The link might have expired, or maybe you didn’t quite copy and paste it correctly." -msgstr "" +msgstr "Länken kan ha gÃ¥tt ut, eller sÃ¥ kanske du inte kopierade och klistrade in den pÃ¥ rätt sätt." #: templates/web/base/admin/body-form.html:58 msgid "The list of available areas is being provided by the MapIt service at %s." @@ -3179,8 +3060,7 @@ msgstr "Listan av tillgängliga omrÃ¥den förses av MapIt-tjänsten pÃ¥ %s." msgid "The passwords do not match" msgstr "Lösenorden stämmer inte överens" -#: templates/web/base/errors/page_error_404_not_found.html:10 -#: templates/web/base/errors/page_error_404_not_found.html:12 +#: templates/web/base/errors/page_error_404_not_found.html:9 msgid "The requested URL '%s' was not found on this server" msgstr "Den sökta adressen '%s' hittades inte pÃ¥ denna server" @@ -3190,12 +3070,11 @@ msgstr "VÃ¥r enklaste bevakning är för rapporter inom ett geografiskt omrÃ¥de: #: templates/web/base/report/new/councils_extra_text.html:1 #: templates/web/base/report/new/councils_text_some.html:10 -#: templates/web/base/report/new/fill_in_details_form.html:18 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:14 +#: templates/web/base/report/new/fill_in_details_form.html:13 msgid "The summary and description will also be made public (see our <a href=\"/privacy\">privacy policy</a>)." msgstr "Sammanfattningen och beskrivningen kommer ocksÃ¥ att visas offentligt (se vÃ¥r <a href=\"/privacy\">integritetsskyddspolicy</a>)." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:315 +#: perllib/FixMyStreet/Script/Reports.pm:92 msgid "The user could not locate the problem on a map, but to see the area around the location they entered" msgstr "Användaren kunde inte lokalisera problemet pÃ¥ kartan men angav en area inom vilket problemet finns" @@ -3212,18 +3091,18 @@ msgstr "Användarens <strong>namn</strong> visas offentligt i rapporter som inte msgid "There are no reports to show." msgstr "Det finns inga rapporter att visa." -#: perllib/FixMyStreet/App/Controller/Reports.pm:76 +#: perllib/FixMyStreet/App/Controller/Reports.pm:77 msgid "There was a problem showing the All Reports page. Please try again later." msgstr "Det uppstod ett problem med att visa sidan med alla rapporter. Försök gärna igen senare." #: perllib/FixMyStreet/App/Controller/Contact.pm:137 -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:59 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:60 msgid "There was a problem showing this page. Please try again later." msgstr "Det uppstod ett problem med att visa denna sida. Försök gärna igen senare." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:769 -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:134 -#: templates/web/base/auth/general.html:26 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:764 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:138 +#: templates/web/base/auth/general.html:43 #: templates/web/zurich/auth/general.html:28 msgid "There was a problem with your email/password combination. If you cannot remember your password, or do not have one, please fill in the ‘sign in by email’ section of the form." msgstr "Felaktigt lösenord eller epostadress. Om du har glömt bort ditt lösenord, eller om du inte har ett lösenord, kan du fylla i ‘logga in via epost’." @@ -3232,7 +3111,7 @@ msgstr "Felaktigt lösenord eller epostadress. Om du har glömt bort ditt lösen msgid "There was a problem with your email/password combination. Please try again." msgstr "Felaktigt lösenord eller epostadress. Försök igen." -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:272 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:336 msgid "There was a problem with your update. Please try again." msgstr "Det uppstod ett problem med din uppdatering. Försök igen." @@ -3240,7 +3119,7 @@ msgstr "Det uppstod ett problem med din uppdatering. Försök igen." msgid "There were problems with your report. Please see below." msgstr "Det uppstod ett problem med din rapport. Se nedan." -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:300 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:371 msgid "There were problems with your update. Please see below." msgstr "Det uppstod ett problem med din uppdatering. Se nedan." @@ -3254,7 +3133,7 @@ msgid "" " " msgstr "Dessa inställningar är för förvaltningar som använder Open311 (eller nÃ¥gon annan back-end-integrering) för att ta emot problemrapporter.<br><strong>Du behöver inte sätta dem om utskicksmetoden är e-post.</strong>. För mer information om Open311, se <a href='https://www.mysociety.org/2013/01/17/open311-explained/' class='admin-offsite-link'>den här artikeln</a>." -#: templates/web/base/open311/index.html:77 +#: templates/web/base/open311/index.html:69 msgid "This API implementation is work in progress and not yet stabilized. It will change without warnings in the future." msgstr "Den här API-implementationen är ett pÃ¥gÃ¥ende arbete och har inte stabiliserats än. Den kommer att förändras." @@ -3276,18 +3155,18 @@ msgid "" " A body will not receive any reports unless it covers at least one area." msgstr "Den här förvaltningen kommer endast att skickas rapporter för problem inom dess <strong>geografiska omrÃ¥de</strong>. En förvaltning kommer inte att fÃ¥ nÃ¥gra rapporter om den inte täcker Ã¥tminstone ett omrÃ¥de." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:413 +#: perllib/FixMyStreet/Script/Reports.pm:191 msgid "This email has been sent to both councils covering the location of the problem, as the user did not categorise it; please ignore it if you're not the correct council to deal with the issue, or let us know what category of problem this is so we can add it to our system." msgstr "Det här brevet har skickats till flera adresser eftersom rapportören inte angav nÃ¥gon kategori, eller den kategori som angavs hör till flera olika enheter. Du kan ignorera det här brevet om du inte är rätt person att hantera det, men det vore ocksÃ¥ mycket hjälpsamt om du kan ta reda pÃ¥ vem som är rätt person och anmäla detta till oss sÃ¥ att vi kan ändra databasen för framtida brev." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:416 +#: perllib/FixMyStreet/Script/Reports.pm:194 msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue." msgstr "Det här brevet har skickats till flera adresser eftersom rapportören inte angav nÃ¥gon kategori, eller den kategori som angavs hör till flera olika enheter. Du kan ignorera det här brevet om du inte är rätt person att hantera det, men det vore ocksÃ¥ mycket hjälpsamt om du kan ta reda pÃ¥ vem som är rätt person och anmäla detta till oss sÃ¥ att vi kan ändra databasen för framtida brev." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:925 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:995 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:920 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:990 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:142 -#: perllib/FixMyStreet/Cobrand/UK.pm:43 +#: perllib/FixMyStreet/Cobrand/UK.pm:44 msgid "This information is required" msgstr "Den här informationen krävs" @@ -3299,56 +3178,37 @@ msgstr "Det här är en utvecklingsplats: olika saker kan komma att gÃ¥ sönder msgid "This is a summary of all reports on this site." msgstr "Det här är en sammanställning av alla rapporter." -#: templates/web/zurich/auth/token.html:8 -msgid "This may be because the link is too old or already used, or the address was not copied correctly." -msgstr "Detta kan bero pÃ¥ att länken är för gammal, att den redan har använts, eller att adressen inte kopierades korrekt." - -#: templates/web/base/report/banner.html:15 -msgid "This problem has been closed" -msgstr "Den här rapporten har stängts" - -#: templates/web/base/report/banner.html:12 -#: templates/web/base/report/update-form.html:48 -#: templates/web/fixmystreet/report/update-form.html:46 +#: templates/web/base/report/update/form_update.html:52 msgid "This problem has been fixed" msgstr "Det här problemet har lösts" -#: templates/web/base/report/update-form.html:43 -#: templates/web/fixmystreet/report/update-form.html:40 +#: templates/web/base/report/update/form_update.html:46 msgid "This problem has not been fixed" msgstr "Det här problemet har inte lösts" -#: templates/web/base/report/banner.html:19 -msgid "This problem is in progress" -msgstr "Arbete pÃ¥gÃ¥r med att lösa problemet" - -#: templates/web/base/report/banner.html:9 -msgid "This problem is old and of unknown status." -msgstr "Problemet är gammalt och har okänt status" - #: perllib/FixMyStreet/Cobrand/Zurich.pm:168 #: perllib/FixMyStreet/Cobrand/Zurich.pm:169 #: templates/web/zurich/report/_main.html:14 msgid "This report is awaiting moderation." msgstr "Den här rapporten väntar pÃ¥ att granskas." -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:86 +#: perllib/FixMyStreet/Script/Alerts.pm:94 msgid "This report is currently marked as closed." msgstr "Den här rapporten är markerad som stängd" -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:84 +#: perllib/FixMyStreet/Script/Alerts.pm:92 msgid "This report is currently marked as fixed." msgstr "Det här problemet är markerat som löst" -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:88 +#: perllib/FixMyStreet/Script/Alerts.pm:96 msgid "This report is currently marked as open." msgstr "Den här rapportern är öppen" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:326 +#: perllib/FixMyStreet/Script/Reports.pm:105 msgid "This report was submitted anonymously" msgstr "Den här rapporten skickades anonymt." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:308 +#: perllib/FixMyStreet/Script/Reports.pm:85 msgid "This web page also contains a photo of the problem, provided by the user." msgstr "Den här sidan innehÃ¥ller ocksÃ¥ ett foto av problemet" @@ -3357,9 +3217,9 @@ msgstr "Den här sidan innehÃ¥ller ocksÃ¥ ett foto av problemet" #: templates/web/zurich/admin/report_edit.html:104 #: templates/web/zurich/admin/report_edit.html:148 msgid "Time spent (in minutes):" -msgstr "" +msgstr "Nedlagd tid (i minuter):" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1278 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1287 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "Tidslinje" @@ -3371,24 +3231,22 @@ msgid "Title" msgstr "Titel" #: templates/web/zurich/admin/template_edit.html:20 -#, fuzzy msgid "Title:" -msgstr "Titel" +msgstr "Titel:" #: templates/web/base/alert/index.html:25 -#, fuzzy msgid "To find out what local alerts we have for you, please enter your %s postcode or street name and area:" -msgstr "Skriv in postnummer eller gatunamn och ort för att se rapporter kring den platsen." +msgstr "Skriv in postnummer eller gatunamn och ort för %s för att se rapporter kring den platsen." #: templates/web/base/alert/index.html:27 msgid "To find out what local alerts we have for you, please enter your postcode or street name and area" msgstr "Skriv in postnummer eller gatunamn och ort för att se rapporter kring den platsen." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:314 +#: perllib/FixMyStreet/Script/Reports.pm:91 msgid "To view a map of the precise location of this issue" msgstr "För att visa en karta med den exakta positionen för problemet" -#: templates/web/base/admin/index.html:61 +#: templates/web/base/admin/index.html:54 #: templates/web/base/admin/questionnaire.html:24 #: templates/web/base/admin/stats.html:24 #: templates/web/base/admin/stats.html:43 @@ -3406,10 +3264,8 @@ msgstr "Prova att skicka ett e-brev till oss direkt:" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:12 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:33 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:31 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:37 msgid "Unable to fix" msgstr "Kunde inte Ã¥tgärda" @@ -3422,7 +3278,7 @@ msgstr "Kunde inte Ã¥tgärda" msgid "Unconfirmed" msgstr "Obekräftat" -#: templates/web/fixmystreet/report/banner.html:9 +#: templates/web/base/report/banner.html:9 msgid "Unknown" msgstr "Okänt" @@ -3430,17 +3286,18 @@ msgstr "Okänt" msgid "Unknown alert type" msgstr "Okänd feltyp" +#: perllib/FixMyStreet/App/Controller/Photo.pm:110 #: templates/web/base/js/translation_strings.html:39 msgid "Unknown error" msgstr "Okänt fel" -#: perllib/FixMyStreet/App/Controller/Report.pm:103 -#: perllib/FixMyStreet/App/Controller/Report.pm:109 -#: perllib/FixMyStreet/App/Controller/Report.pm:112 +#: perllib/FixMyStreet/App/Controller/Report.pm:105 +#: perllib/FixMyStreet/App/Controller/Report.pm:111 +#: perllib/FixMyStreet/App/Controller/Report.pm:114 msgid "Unknown problem ID" msgstr "Okänt problemnummer" -#: templates/web/fixmystreet/report/update-form.html:19 +#: templates/web/base/report/update/form_update.html:25 msgid "Update" msgstr "Uppdatering" @@ -3448,13 +3305,11 @@ msgstr "Uppdatering" msgid "Update %s created for problem %d; by %s" msgstr "Uppdatering %s skapad för rapporten %d, av %s" -#: templates/web/base/contact/index.html:21 -#: templates/web/fixmystreet/contact/index.html:36 +#: templates/web/base/contact/index.html:28 msgid "Update below added anonymously at %s" msgstr "Uppdateringen nedan tillagd anonymt %s" -#: templates/web/base/contact/index.html:23 -#: templates/web/fixmystreet/contact/index.html:38 +#: templates/web/base/contact/index.html:30 msgid "Update below added by %s at %s" msgstr "Uppdateringen nedan tillagd av %s den %s" @@ -3463,7 +3318,7 @@ msgstr "Uppdateringen nedan tillagd av %s den %s" msgid "Update body" msgstr "Uppdatera förvaltning" -#: templates/web/base/admin/index.html:55 +#: templates/web/base/admin/index.html:48 msgid "Update breakdown by state" msgstr "Uppdatering per status" @@ -3488,20 +3343,16 @@ msgstr "Uppdateringen öppnade rapporten pÃ¥ nytt" msgid "Update statuses" msgstr "Uppdaterad status" -#: templates/web/base/report/update-form.html:22 -msgid "Update:" -msgstr "Uppdatering:" - #: templates/web/zurich/admin/index-dm.html:23 #: templates/web/zurich/admin/index-sdm.html:21 #: templates/web/zurich/admin/reports.html:13 msgid "Updated" msgstr "Uppdaterad" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1045 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1103 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1147 -#: perllib/FixMyStreet/App/Controller/Admin.pm:822 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1048 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1108 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1156 +#: perllib/FixMyStreet/App/Controller/Admin.pm:821 #: perllib/FixMyStreet/Cobrand/Zurich.pm:771 #: perllib/FixMyStreet/Cobrand/Zurich.pm:796 #: perllib/FixMyStreet/Cobrand/Zurich.pm:866 @@ -3509,13 +3360,12 @@ msgid "Updated!" msgstr "Uppdaterad!" #: templates/web/base/admin/list_updates.html:2 -#: templates/web/base/report/update.html:3 -#: templates/web/fixmystreet/report/update.html:5 +#: templates/web/base/report/update.html:5 #: templates/web/zurich/report/updates.html:2 msgid "Updates" msgstr "Uppdateringar" -#: perllib/FixMyStreet/DB/Result/Comment.pm:132 +#: perllib/FixMyStreet/DB/Result/Comment.pm:131 msgid "Updates are limited to %s characters in length. Please shorten your update" msgstr "Uppdateringar kan inte innehÃ¥lla mer än %s tecken. Var vänlig korta ned din uppdatering." @@ -3525,12 +3375,9 @@ msgstr "Uppdateringar för {{title}}" #. ("%s is the site name") #: templates/web/base/report/display.html:0 -#: templates/web/base/report/display.html:5 -#: templates/web/fixmystreet/report/display.html:0 -#: templates/web/fixmystreet/report/display.html:9 -#, fuzzy +#: templates/web/base/report/display.html:9 msgid "Updates to this problem, %s" -msgstr "Uppdateringar för det här problemet, FixaMinGata" +msgstr "Uppdateringar för det här problemet, %s" #: templates/web/base/admin/body.html:182 msgid "Use the <strong>note</strong> to record details that are only displayed in the admin. Notes are not shown publicly, and are not sent to the body." @@ -3538,15 +3385,14 @@ msgstr "Använd <strong>anteckningen</strong> för att dokumentera information s #: templates/web/zurich/admin/report_edit-sdm.html:48 #: templates/web/zurich/admin/report_edit.html:67 -#, fuzzy msgid "Used map" -msgstr "använde kartan" +msgstr "Använde kartan" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1452 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1461 msgid "User flag removed" msgstr "Användarflaggan borttagen" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1424 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1433 msgid "User flagged" msgstr "Användaren flaggad" @@ -3554,7 +3400,7 @@ msgstr "Användaren flaggad" msgid "User search finds matches in users' names and email addresses." msgstr "Användarsökningen matchar mot användares namn och e-postadresser." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1280 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1289 #: perllib/FixMyStreet/Cobrand/Zurich.pm:399 #: templates/web/base/admin/flagged.html:29 #: templates/web/zurich/header.html:69 @@ -3585,7 +3431,6 @@ msgid "Viewing a location" msgstr "Visa en position" #: templates/web/base/report/display.html:0 -#: templates/web/fixmystreet/report/display.html:0 msgid "Viewing a problem" msgstr "Visa ett problem" @@ -3598,25 +3443,24 @@ msgstr "DelomrÃ¥den i denna kommun" 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 "Vi hittade fler än en träff. Vi visar upp till tio träffar nedan. Om ingen av dem överenstämmer med vald adress kan du söka igen. Om du söker efter en gata, lägg till stad efterÃ¥t: \"Vasagatan, Göteborg\" för att förfina sökningen." -#: templates/web/zurich/auth/token.html:7 -msgid "We have not been able to confirm your account - sorry." -msgstr "Vi beklagar att vi inte har kunnat bekräfta ditt konto." - -#: templates/web/zurich/auth/token.html:17 -msgid "We have sent you an email containing a link to confirm your account." -msgstr "Vi har skickat dig epost med en länk för att bekräfta ditt konto." +#: templates/web/base/auth/general.html:6 +#: templates/web/base/report/display.html:27 +#: templates/web/base/report/new/oauth_email_form.html:5 +#, fuzzy +msgid "We need your email address, please give it below." +msgstr "Vi visar aldrig din epostadress eller telefonnummer publikt." -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:2 -#: templates/web/fixmystreet/report/update-form.html:77 +#: templates/web/base/report/new/form_user_loggedout_email.html:2 +#: templates/web/base/report/update/form_user_loggedout_email.html:2 msgid "We never show your email" msgstr "Vi visar aldrig din epostadress publikt" -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:31 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:65 +#: templates/web/base/report/new/form_user_loggedin.html:31 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:28 msgid "We never show your email address or phone number." msgstr "Vi visar aldrig din epostadress eller telefonnummer publikt." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:422 +#: perllib/FixMyStreet/Script/Reports.pm:200 msgid "We realise this problem might be the responsibility of %s; however, we don't currently have any contact details for them. If you know of an appropriate contact address, please do get in touch." msgstr "Det här problemet kan höra till %s. Dessvärre har vi ingen kontaktinformation till dem. Om du vet om en lämplig kontaktadress hör vi gärna frÃ¥n dig." @@ -3633,19 +3477,15 @@ msgstr "Vi kommer endast att använda din information i enlighet med vÃ¥r <a hre msgid "We’re sorry to hear the problem’s not fixed. Why not try writing to your local representatives?" msgstr "TrÃ¥kigt att problemet inte Ã¥tgärdats. Du kan prova att skriva direkt till din kommun för att uppmana dem att Ã¥tgärda problemet." -#: templates/web/base/contact/blurb.html:8 -msgid "We'd love to hear what you think about this site. Just fill in the form, or send an email to <a href='mailto:%s'>%s</a>:" -msgstr "Vi vill gärna höra vad du tycker om FixaMinGata. Fyll i formuläret nedan och skicka in, eller skicka epost till <a href='mailto:%s'>%s</a>:" - #: templates/web/base/contact/submit.html:7 msgid "We’ll get back to you as soon as we can." msgstr "Vi Ã¥terkommer sÃ¥ snart vi kan!" #: templates/web/base/questionnaire/index.html:71 msgid "What was your experience of getting the problem fixed?" -msgstr "" +msgstr "Hur var din upplevelse kring att fÃ¥ problemet löst?" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:49 +#: templates/web/base/report/new/form_report.html:19 msgid "What’s the issue, and where is it?" msgstr "Vad och var är problemet?" @@ -3658,7 +3498,11 @@ msgstr "Vid förändringar" msgid "When sent" msgstr "Vid avsändning" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:640 +#: templates/web/base/js/translation_strings.html:50 +msgid "Whoa there Testino! Three photos are enough." +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Report/New.pm:635 msgid "Whole block of empty flats" msgstr "Hela block med tomma lägenheter" @@ -3671,9 +3515,9 @@ msgstr "Varför sluta där? <a href=\"/alert\">Sätt upp fler notifikationer</a> #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:14 msgid "Wish" -msgstr "" +msgstr "Önskan" -#: templates/web/base/open311/index.html:92 +#: templates/web/base/open311/index.html:84 msgid "With request searches, it is also possible to search for agency_responsible to limit the requests to those sent to a single administration. The search term is the administration ID provided by <a href=\"%s\">MaPit</a>." msgstr "Vid sökningar är det ocksÃ¥ möjligt att söka efter agency_responsible för att begränsa svaren till de som skickats till en enstaka kommun. Söktermen för administrations-IDt erhÃ¥lls av <a href=\"%s\">MapIt</a>." @@ -3681,7 +3525,7 @@ msgstr "Vid sökningar är det ocksÃ¥ möjligt att söka efter agency_responsibl msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"http://fixmystreet.org\">available at fixmystreet.org</a>." msgstr "Vill du bidra till FixaMinGata? VÃ¥r kod är öppen programvara och <a href=\"http://fixmystreet.org\">tillgänglig pÃ¥ fixmystreet.org</a>." -#: templates/web/base/questionnaire/index.html:87 +#: templates/web/base/questionnaire/index.html:96 msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?" msgstr "Vill du bli pÃ¥mind om att kolla statusen med ett annat frÃ¥geformulär om fyra veckor?" @@ -3690,7 +3534,6 @@ msgid "Writing your message entirely in block capitals makes it hard to read, as msgstr "Om du skriver ditt meddelande endast med versaler blir det svÃ¥rare att läsa, precis som om du inte kommaterar korrekt." #: templates/web/base/report/new/fill_in_details_form.html:4 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:5 msgid "Wrong location? Just click again on the map." msgstr "Fel plats? Klicka i sÃ¥ fall pÃ¥ kartan igen." @@ -3713,27 +3556,24 @@ msgstr "Ã…r" #: templates/web/base/admin/users.html:31 #: templates/web/base/questionnaire/creator_fixed.html:14 #: templates/web/base/questionnaire/index.html:51 -#: templates/web/base/questionnaire/index.html:90 +#: templates/web/base/questionnaire/index.html:99 msgid "Yes" msgstr "Ja" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:17 -#: templates/web/fixmystreet/report/update-form.html:91 +#: templates/web/base/report/new/form_user_loggedout_password.html:5 +#: templates/web/base/report/update/form_user_loggedout_password.html:4 msgid "Yes I have a password" msgstr "Ja, jag har ett lösenord" -#: templates/web/base/contact/index.html:39 -#: templates/web/fixmystreet/contact/index.html:54 +#: templates/web/base/contact/index.html:46 msgid "You are complaining that this problem report was unnecessarily moderated:" msgstr "Du anmäler att den här problemrapporten var modererad i onödan:" -#: templates/web/base/contact/index.html:41 -#: templates/web/fixmystreet/contact/index.html:56 +#: templates/web/base/contact/index.html:48 msgid "You are reporting the following problem report for being abusive, containing personal information, or similar:" msgstr "Du vill anmäla missbruk, personlig inforation, eller motsvarande i följande rapport:" -#: templates/web/base/contact/index.html:15 -#: templates/web/fixmystreet/contact/index.html:30 +#: templates/web/base/contact/index.html:22 msgid "You are reporting the following update for being abusive, containing personal information, or similar:" msgstr "Du vill anmäla missbruk, personlig inforation, eller motsvarande i följande uppdatering:" @@ -3746,7 +3586,7 @@ msgstr "Du kan <a href=\"%s%s\">se problemet pÃ¥ den här webbplatsen</a>." msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create." msgstr "Du kan lägga till en elakartade användares e-postadresser i missbrukarlistan, vilket automatiskt döljer (och aldrig skickar) rapporter som användarna skapar." -#: templates/web/fixmystreet/contact/index.html:121 +#: templates/web/base/contact/index.html:113 msgid "You can contact technical support on <a href='mailto:%s'>%s</a>" msgstr "Du kan kontakta teknisk support pÃ¥ <a href='mailto:%s'>%s</a>." @@ -3757,8 +3597,8 @@ msgid "" " reports in the past." msgstr "Du kan flagga rapporter eller användare under dess inställningar, och de kommer dÃ¥ att visas pÃ¥ den här sidan. Detta kan exempelvis vara användbart om du vill hÃ¥lla ett öga pÃ¥ en användare som tidigare har rapporterat olämpliga rapporter." -#: templates/web/base/report/new/councils_text_none.html:10 -#: templates/web/base/report/new/councils_text_none.html:2 +#: templates/web/base/report/new/councils_text_none.html:12 +#: templates/web/base/report/new/councils_text_none.html:14 #: templates/web/base/report/new/councils_text_some.html:19 #: templates/web/base/report/new/councils_text_some.html:21 msgid "You can help us by finding a contact email address for local problems for %s and emailing it to us at <a href='mailto:%s'>%s</a>." @@ -3776,20 +3616,16 @@ msgstr "Du nekade; vänligan fyll i rutan ovan" msgid "You have already answered this questionnaire. If you have a question, please <a href='%s'>get in touch</a>, or <a href='%s'>view your problem</a>.\n" msgstr "Du har redan svarat pÃ¥ det här frÃ¥geformuläret. Om du har en frÃ¥ga, <a href=\"%s\">kontakta oss</a> eller <a href=\"%s\">visa problemet</a>.\n" -#: templates/web/base/questionnaire/index.html:77 -#: templates/web/base/report/new/fill_in_details_form.html:75 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:73 -msgid "You have already attached a photo to this report, attaching another one will replace it." -msgstr "Du har redan bifogat ett foto till rapporten. Om du bifogar ett nytt foto kommer det att ersätta det tidigare." - -#: templates/web/base/report/update-form.html:59 -#: templates/web/fixmystreet/report/update-form.html:56 -msgid "You have already attached a photo to this update, attaching another one will replace it." -msgstr "Du har redan bifogat ett foto till uppdateringen. Om du bifogar ett nytt foto kommer det att ersätta det tidigare." - -#: templates/web/zurich/report/new/fill_in_details_form.html:61 +#: templates/web/base/report/new/form_report.html:32 +#: templates/web/zurich/report/new/fill_in_details_form.html:55 msgid "You have already attached photos to this report. Note that you can attach a maximum of 3 to this report (if you try to upload more, the oldest will be removed)." -msgstr "" +msgstr "Du har redan bifogat bilder till den här rapporten. Notera att du kan bifoga som mest tre bilder (om du försöker ladda upp fler tas de tidigaste bort)." + +#: templates/web/base/questionnaire/index.html:83 +#: templates/web/base/report/update/form_update.html:14 +#, fuzzy +msgid "You have already attached photos to this update. Note that you can attach a maximum of 3 to this update (if you try to upload more, the oldest will be removed)." +msgstr "Du har redan bifogat bilder till den här rapporten. Notera att du kan bifoga som mest tre bilder (om du försöker ladda upp fler tas de tidigaste bort)." #: templates/web/base/auth/sign_out.html:4 #: templates/web/zurich/auth/sign_out.html:3 @@ -3805,9 +3641,8 @@ msgstr "Du har markerat problemet med den gröna nÃ¥lmarkören pÃ¥ kartan. Om de msgid "You have successfully confirmed your email address." msgstr "Du har bekräftat din e-postadress." -#: templates/web/base/report/display.html:20 -#: templates/web/base/report/new/fill_in_details.html:37 -#: templates/web/fixmystreet/report/display.html:17 +#: templates/web/base/report/display.html:17 +#: templates/web/base/report/new/login_success_form.html:3 msgid "You have successfully signed in; please check and confirm your details are accurate:" msgstr "Du har loggats in. Verifiera att dina uppgifter stämmer:" @@ -3836,53 +3671,42 @@ msgid "Your Reports" msgstr "Dina rapporter" #: templates/web/base/alert/_list.html:89 +#: templates/web/base/contact/index.html:83 +#: templates/web/base/report/display_tools.html:38 +#: templates/web/base/report/display_tools.html:40 +#: templates/web/base/report/new/form_user_loggedin.html:3 +#: templates/web/base/report/new/form_user_loggedout_email.html:1 +#: templates/web/base/report/update/form_user_loggedout_email.html:1 #: templates/web/fixmystreet/alert/updates.html:19 #: templates/web/fixmystreet/alert/updates.html:22 -#: templates/web/fixmystreet/contact/index.html:91 -#: templates/web/fixmystreet/report/display.html:62 -#: templates/web/fixmystreet/report/display.html:64 -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:3 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:1 -#: templates/web/fixmystreet/report/update-form.html:76 #: templates/web/zurich/report/new/fill_in_details_form.html:76 msgid "Your email" msgstr "Din epostadress" -#: templates/web/base/auth/general.html:28 -#: templates/web/fixmystreet/report/update-form.html:82 +#: templates/web/base/auth/general.html:45 +#: templates/web/base/report/update/form_user_loggedout_email.html:7 #: templates/web/zurich/auth/general.html:30 #: templates/web/zurich/auth/general.html:58 msgid "Your email address" msgstr "Din epostadress" -#: templates/web/base/report/new/fill_in_details_form.html:106 -#: templates/web/base/report/update-form.html:81 -msgid "Your email:" -msgstr "Din epostadress:" - -#: templates/web/fixmystreet/report/updates-sidebar-notes.html:7 +#: templates/web/base/report/updates-sidebar-notes.html:3 msgid "Your information will only be used in accordance with our <a href=\"/privacy\">privacy policy</a>" msgstr "Din information kommer endast att användas i enlighet med vÃ¥r <a href=\"/privacy\">sekretesspolicy</a>" -#: templates/web/base/auth/general.html:51 -#: templates/web/fixmystreet/contact/index.html:84 -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:18 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:54 -#: templates/web/fixmystreet/report/update-form.html:142 +#: templates/web/base/auth/general.html:90 +#: templates/web/base/contact/index.html:76 +#: templates/web/base/report/new/form_user_loggedin.html:18 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:17 +#: templates/web/base/report/update/form_name.html:11 #: templates/web/zurich/auth/general.html:61 #: templates/web/zurich/report/new/fill_in_details_form.html:86 msgid "Your name" msgstr "Ditt namn och efternamn" -#: templates/web/base/contact/index.html:73 -#: templates/web/base/report/new/fill_in_details_form.html:186 -#: templates/web/base/report/update-form.html:152 -msgid "Your name:" -msgstr "Ditt namn:" - -#: templates/web/base/auth/general.html:39 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:22 -#: templates/web/fixmystreet/report/update-form.html:96 +#: templates/web/base/auth/general.html:75 +#: templates/web/base/report/new/form_user_loggedout_password.html:10 +#: templates/web/base/report/update/form_user_loggedout_password.html:9 #: templates/web/zurich/auth/general.html:34 msgid "Your password" msgstr "Ditt lösenord" @@ -3891,15 +3715,16 @@ msgstr "Ditt lösenord" msgid "Your password has been changed" msgstr "Ditt lösenord har ändrats" -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:27 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:63 +#: templates/web/base/report/new/form_user_loggedin.html:27 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:26 #: templates/web/zurich/report/new/fill_in_details_form.html:92 msgid "Your phone number" msgstr "Ditt telefonnummer" #: templates/web/base/questionnaire/index.html:14 +#, fuzzy msgid "Your report" -msgstr "Din rapport" +msgstr "Dina rapporter" #: templates/web/base/footer.html:9 templates/web/fixmystreet/footer.html:29 msgid "Your reports" @@ -3909,23 +3734,17 @@ msgstr "Dina rapporter" msgid "Your updates" msgstr "Dina uppdateringar" -#: templates/web/base/contact/index.html:81 -msgid "Your email:" -msgstr "Din epostadress:" - #: templates/web/base/reports/_list-filters.html:3 -#, fuzzy msgid "all reports" -msgstr "Alla rapporter" +msgstr "alla rapporter" #: templates/web/base/admin/timeline.html:4 msgid "by %s" msgstr "av %s" #: templates/web/base/reports/_list-filters.html:5 -#, fuzzy msgid "closed reports" -msgstr "Stängda rapporter" +msgstr "stängda rapporter" #: templates/web/base/reports/body.html:6 #: templates/web/base/reports/body.html:7 @@ -3947,17 +3766,16 @@ msgid "edit user" msgstr "ändra användare" #: templates/web/base/reports/_list-filters.html:6 -#, fuzzy msgid "fixed reports" -msgstr "Lösta rapporer" +msgstr "lösta rapporter" -#: templates/web/base/admin/index.html:33 +#: templates/web/base/status/stats.html:20 #: templates/web/zurich/admin/index.html:5 msgid "from %s different users" -msgstr "frÃ¥n %d olika användare" +msgstr "frÃ¥n %s olika användare" -#: templates/web/base/report/_item.html:17 -#: templates/web/zurich/report/_item.html:16 +#: templates/web/base/report/_item.html:15 +#: templates/web/zurich/report/_item.html:14 msgid "last updated %s" msgstr "senast uppdaterad %s" @@ -4049,10 +3867,8 @@ msgstr "öppnat pÃ¥ nytt" msgid "sign out" msgstr "logga ut" -#: templates/web/base/report/new/fill_in_details_form.html:12 -#: templates/web/base/report/new/fill_in_details_form.html:15 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:10 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:12 +#: templates/web/base/report/new/fill_in_details_form.html:11 +#: templates/web/base/report/new/fill_in_details_form.html:9 msgid "the local council" msgstr "kommunen" @@ -4061,7 +3877,7 @@ msgstr "kommunen" msgid "there is no pin shown as the user did not use the map" msgstr "det finns ingen kartmarkering eftersom användaren inte använde kartan" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:398 +#: perllib/FixMyStreet/Script/Reports.pm:176 msgid "this type of local problem" msgstr "den här typen av problem" @@ -4070,9 +3886,8 @@ msgid "today" msgstr "idag" #: templates/web/base/reports/_list-filters.html:4 -#, fuzzy msgid "unfixed reports" -msgstr "Lösta rapporer" +msgstr "ej lösta rapporter" #: templates/web/base/admin/report_edit.html:32 msgid "used map" @@ -4091,7 +3906,7 @@ msgstr "användaren är inte problemägare" msgid "ward" msgstr "omrÃ¥de" -#: templates/web/base/front/stats.html:17 +#: templates/web/base/front/stats.html:13 #, perl-format msgid "<big>%s</big> report recently" msgid_plural "<big>%s</big> reports recently" @@ -4119,7 +3934,7 @@ msgid_plural "%d minutes" msgstr[0] "%d minut" msgstr[1] "%d minuter" -#: templates/web/base/front/stats.html:29 +#: templates/web/base/front/stats.html:25 #, perl-format msgid "<big>%s</big> update on reports" msgid_plural "<big>%s</big> updates on reports" @@ -4140,14 +3955,14 @@ msgid_plural "%d weeks" msgstr[0] "%d vecka" msgstr[1] "%d veckor" -#: templates/web/base/front/stats.html:12 +#: templates/web/base/front/stats.html:8 #, perl-format msgid "<big>%s</big> report in past week" msgid_plural "<big>%s</big> reports in past week" msgstr[0] "<big>%s</big> rapport senaste veckan" msgstr[1] "<big>%s</big> rapporter senaste veckan" -#: templates/web/base/front/stats.html:23 +#: templates/web/base/front/stats.html:19 #, perl-format msgid "<big>%s</big> fixed in past month" msgid_plural "<big>%s</big> fixed in past month" @@ -4168,140 +3983,86 @@ msgid_plural "We do <strong>not</strong> yet have details for the other councils msgstr[0] "Vi har ännu <strong>ingen</strong> information om kommunen pÃ¥ den platsen" msgstr[1] "Kommunen pÃ¥ platsen har valt att inte ta emot rapporter frÃ¥n FixaMinGata." -#~ msgid "(Don't worry — we'll hang on to your alert while you're checking your email.)" -#~ msgstr "(Vi behÃ¥ller din bevakning medan du kontrollerar din e-post)" - -#~ msgid "(Don't worry — we'll hang on to your problem report while you're checking your email.)" -#~ msgstr "(Vi behÃ¥ller din rapport medan du kontrollerar din e-post)" - -#~ msgid "(Don't worry — we'll hang on to your update while you're checking your email.)" -#~ msgstr "(Vi behÃ¥ller din uppdatering medan du kontrollerar din e-post.)" - -#~ msgid "<small>If you cannot see the map, <a href='%s' rel='nofollow'>skip this step</a>.</small>" -#~ msgstr "<small>Om du inte kan se kartan kan du <a herf='%s' rel='nofollow'>hoppa över det här steget</a>.</small>" - -#~ msgid "<strong>No</strong>, I do not, let me sign in by email:" -#~ msgstr "<strong>Nej</strong>, det vill jag inte, lÃ¥t mig logga in med min epostadress:" +#~ msgid "(we never show your email address or phone number)" +#~ msgstr "(vi visar aldrig din epostadress eller telefonnummer)" -#~ msgid "Are you a <strong>developer</strong>? Would you like to contribute to FixMyStreet?" -#~ msgstr "Är du en <strong>utvecklare</strong>? Skulle du vilja bidra till FixaMinGata?" +#~ msgid "(we never show your email)" +#~ msgstr "(vi visar aldrig din epostadress)" -#~ msgid "Closest nearby problems <small>(within %skm)</small>" -#~ msgstr "Närmaste närliggande problem <small>(inom %s km)</small>" +#~ msgid "<strong>No</strong>, let me confirm my report by email:" +#~ msgstr "<strong>Nej<strong>, lÃ¥t mig bekräfta min rapport via epost:" -#~ msgid "Contact FixMyStreet" -#~ msgstr "Kontakta FixaMinGata" +#~ msgid "<strong>No</strong>, let me confirm my update by email:" +#~ msgstr "<strong>Nej</strong>, lÃ¥t mig bekräfta min uppdatering via epost:" -#~ msgid "Do you have a FixMyBarangay password?" -#~ msgstr "Har du ett lösenord till FixMyBrangay?" +#~ msgid "Email me updates" +#~ msgstr "Eposta mig uppdateringar" -#~ msgid "FixMyStreet admin:" -#~ msgstr "FixaMinGata administratör:" +#~ msgid "Enter a new password:" +#~ msgstr "Ange ett nytt lösenord:" -#~ msgid "If you do not, your alert will not be activated." -#~ msgstr "Om du inte gör det kommer ditt alarm inte att bli aktiverat." +#~ 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 "Tyvärr kan vi inte hitta den rapporten. Om du kopierade en länk frÃ¥n ett epost bör du verifiera att du kopierade länken exakt.\n" -#~ msgid "If you do not, your problem will not be posted." -#~ msgstr "Om du inte gör det kommer ditt problem inte att skickas." +#~ 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 "Om du använder webbmail och har spamfilter bör du kolla din spamfolder eftersom vÃ¥ra brev ibland markeras som skräp." -#~ msgid "If you do not, your update will not be posted." -#~ msgstr "Om du inte gör det kommer din uppdatering inte att skickas." +#~ msgid "Message:" +#~ msgstr "Meddelande:" -#~ msgid "New local reports on reportemptyhomes.com" -#~ msgstr "Nya lokala rapporter pÃ¥ reportemptyhomes.com" +#~ msgid "More problems nearby" +#~ msgstr "Fler närliggande problem" -#~ msgid "New reports for {{COUNCIL}} within {{WARD}} ward on reportemptyhomes.com" -#~ msgstr "Nya rapporter för {{COUNCIL}} inom {{WARD}} omrÃ¥de pÃ¥ reportemptyhomes.com" +#~ msgid "Nearly Done! Now check your email..." +#~ msgstr "Nästan klar! Kolla nu din epost." -#~ msgid "New reports on reportemptyhomes.com" -#~ msgstr "Nya rapporter pÃ¥ reportemptyhomes.com" +#~ msgid "Offensive? Unsuitable? Tell us" +#~ msgstr "Kränkande eller olämpligt? Kontakta oss" -#~ msgid "New reports on reportemptyhomes.com near {{POSTCODE}}" -#~ msgstr "Nya rapporter pÃ¥ reportemptyhomes.com nära {{POSTCODE}}" +#~ msgid "Photo:" +#~ msgstr "Foto:" -#~ msgid "New reports to {{COUNCIL}} on reportemptyhomes.com" -#~ msgstr "Nya rapporter till {{COUNCIL}} pÃ¥ reportemptyhomes.com" +#~ msgid "Please check your email" +#~ msgstr "Vänligen kontrollera din epost" -#~ msgid "New reports within {{NAME}}'s boundary on reportemptyhomes.com" -#~ msgstr "Nya rapporter inom {{NAME}}'s administrativa gräns pÃ¥ reportemptyhomes.com" +#~ msgid "Please note that updates are not sent to the council. If you leave your name it will be public. Your information will only be used in accordance with our <a href=\"/faq#privacy\">privacy policy</a>" +#~ msgstr "Observera att uppdateringar inte skickas till kommunen. Om du lämnar ditt namn kommer det att visas publikt. Din information används endast i enlighet med vÃ¥r <a href=\"/faq#privacy\">sekretesspolicy</a>" -#~ msgid "New update:" -#~ msgstr "Ny uppdatering:" +#~ msgid "This may be because the link is too old or already used, or the address was not copied correctly." +#~ msgstr "Detta kan bero pÃ¥ att länken är för gammal, att den redan har använts, eller att adressen inte kopierades korrekt." -#~ msgid "No problems found." -#~ msgstr "Inga poblem hittade." +#~ msgid "This problem has been closed" +#~ msgstr "Den här rapporten har stängts" -#~ msgid "No problems have been reported yet." -#~ msgstr "Inga problem har rapporteras än." +#~ msgid "This problem is in progress" +#~ msgstr "Arbete pÃ¥gÃ¥r med att lösa problemet" -#~ msgid "Now to submit your report… do you have a FixMyStreet password?" -#~ msgstr "För att skicka din rapport… har du ett lösenord för FixaMinGata?" +#~ msgid "This problem is old and of unknown status." +#~ msgstr "Problemet är gammalt och har okänt status" -#~ msgid "Now to submit your update… do you have a FixMyStreet password?" -#~ msgstr "För att skicka din uppdatering… har du ett lösenord för FixaMinGata?" +#~ msgid "Update:" +#~ msgstr "Uppdatering:" -#~ msgid "Our code is open source and <a href=\"http://github.com/mysociety/fixmystreet\">available on GitHub</a>." -#~ msgstr "FixaMinGata är öppen programvara och <a href=\"http://github.com/mysociety/fixmystreet\">tillgänglig pÃ¥ GitHub</a>." +#~ msgid "We have not been able to confirm your account - sorry." +#~ msgstr "Vi beklagar att vi inte har kunnat bekräfta ditt konto." -#~ msgid "Please <a class=\"tab_link\" href=\"#report\">take a look</a> at the updates that have been left." -#~ msgstr "Observera <a class=\"tab_link\" href=\"#report\">uppdateringarna</a> som har lämnats." +#~ msgid "We have sent you an email containing a link to confirm your account." +#~ msgstr "Vi har skickat dig epost med en länk för att bekräfta ditt konto." -#~ msgid "Please take a look at the updates that have been left." -#~ msgstr "Titta pÃ¥ de uppdateringar som har lämnats." +#~ msgid "We'd love to hear what you think about this site. Just fill in the form, or send an email to <a href='mailto:%s'>%s</a>:" +#~ msgstr "Vi vill gärna höra vad du tycker om FixaMinGata. Fyll i formuläret nedan och skicka in, eller skicka epost till <a href='mailto:%s'>%s</a>:" -#~ msgid "Problems within %s, FixMyStreet" -#~ msgstr "Problem inom %s, FixaMinGata" +#~ msgid "You have already attached a photo to this report, attaching another one will replace it." +#~ msgstr "Du har redan bifogat ett foto till rapporten. Om du bifogar ett nytt foto kommer det att ersätta det tidigare." -#~ msgid "Properties recently reported as put back to use on reportemptyhomes.com" -#~ msgstr "Fastigheter nyligen rapporterade som Ã¥tgärdade pÃ¥ reportemptyhomes.com" +#~ msgid "You have already attached a photo to this update, attaching another one will replace it." +#~ msgstr "Du har redan bifogat ett foto till uppdateringen. Om du bifogar ett nytt foto kommer det att ersätta det tidigare." -#~ msgid "Publish the response" -#~ msgstr "Publicera svaret" - -#~ msgid "Reported %s, to %s" -#~ msgstr "Rapporterat %s till %s" - -#~ msgid "Reports on and around the map" -#~ msgstr "Rapporter pÃ¥ och runt kartbilden" - -#~ msgid "Sign in by email" -#~ msgstr "Logga in via epost" - -#~ msgid "Signed in as %s" -#~ msgstr "Inloggad som %s" - -#~ msgid "The confirmation email <strong>may</strong> take a few minutes to arrive — <em>please</em> be patient." -#~ msgstr "Bekräftelsebrevet <strong>kan</strong> ta ett par minuter att komma fram — var tÃ¥lmodig." - -#~ msgid "The details of your problem are available from the other tab above." -#~ msgstr "Information om ditt problem kan du se i fliken \"Din rapport\" ovan." - -#~ msgid "The details of your problem are available on the right hand side of this page." -#~ msgstr "Detaljerna för ditt problem kan nu ses pÃ¥ höger sida av den här sidan." - -#~ msgid "The latest local reports reported by users" -#~ msgstr "De senaste lokala rapporterna frÃ¥n användare" - -#~ msgid "The latest properties reported back to use by users" -#~ msgstr "De senaste fastigheterna rapporterade som Ã¥ter tagna i användning av användare" - -#~ msgid "The latest reports for {{COUNCIL}} reported by users" -#~ msgstr "De senaste rapporterna för {{COUNCIL}} rapporterade frÃ¥n användare" - -#~ msgid "The latest reports for {{COUNCIL}} within {{WARD}} ward reported by users" -#~ msgstr "De senaste rapporterna för {{COUNCIL}} inom {{WARD}} rapporterade frÃ¥n användare" - -#~ msgid "The latest reports within {{NAME}}'s boundary reported by users" -#~ msgstr "De senaste rapporterna inom {{NAME}}'s gräns rapporterade frÃ¥n användare" - -#~ msgid "To <strong>report a problem</strong>, click on the map at the correct location." -#~ msgstr "Klicka pÃ¥ kartan för att <strong>rapportera ett problem</strong>." - -#~ msgid "User" -#~ msgstr "Användare" +#~ msgid "Your email:" +#~ msgstr "Din epostadress:" -#~ msgid "You must now click the link in the email we've just sent you." -#~ msgstr "Du mÃ¥ste nu klicka pÃ¥ länken i det brev vi just skickat till dig." +#~ msgid "Your name:" +#~ msgstr "Ditt namn:" -#~ msgid "Your email address:" -#~ msgstr "Din epostadress:" +#~ msgid "Your email:" +#~ msgstr "Din epostadress:" diff --git a/locale/tr_TR.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/tr_TR.UTF-8/LC_MESSAGES/FixMyStreet.po index 371d0674a..522bf16e3 100644 --- a/locale/tr_TR.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/tr_TR.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -11,9 +11,9 @@ msgid "" msgstr "" "Project-Id-Version: fixmystreet\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2015-10-23 16:51+0100\n" -"PO-Revision-Date: 2015-10-13 09:45+0000\n" -"Last-Translator: Muradiye <Muradiye.ates@gmail.com>\n" +"POT-Creation-Date: 2016-03-02 13:09+0000\n" +"PO-Revision-Date: 2015-12-28 08:30+0000\n" +"Last-Translator: mySociety <transifex@mysociety.org>\n" "Language-Team: Turkish (Turkey) (http://www.transifex.com/mysociety/fixmystreet/language/tr_TR/)\n" "Language: tr_TR\n" "MIME-Version: 1.0\n" @@ -21,45 +21,24 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:628 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:411 +#: perllib/FixMyStreet/DB/Result/Problem.pm:616 +#: perllib/FixMyStreet/Script/Reports.pm:189 msgid " and " msgstr "ve" #: templates/web/base/report/new/councils_text_all.html:2 -#: templates/web/base/report/new/councils_text_none.html:11 -#: templates/web/base/report/new/councils_text_none.html:2 +#: templates/web/base/report/new/councils_text_none.html:12 +#: templates/web/base/report/new/councils_text_none.html:15 #: templates/web/base/report/new/councils_text_some.html:19 #: templates/web/base/report/new/councils_text_some.html:22 #: templates/web/base/report/new/councils_text_some.html:5 msgid " or " msgstr "veya" -#: templates/web/base/admin/index.html:35 -#: templates/web/base/status/index.html:13 -msgid "%s confirmed alerts, %s unconfirmed" -msgstr "%d onaylanmış uyarı, %d onaylanmamış" - -#: templates/web/base/admin/index.html:37 -#: templates/web/base/status/index.html:16 -#: templates/web/zurich/admin/index.html:6 -msgid "%s council contacts – %s confirmed, %s unconfirmed" -msgstr "%d kurul irtibatları – %d onaylanmış, %d onaylanmamış" - #: templates/web/base/admin/edit-league.html:12 msgid "%d edits by %s" msgstr " %s tarafından %d yayına hazırlanır" -#: templates/web/base/admin/index.html:34 -#: templates/web/base/status/index.html:12 -msgid "%s live updates" -msgstr "%d güncellemeler" - -#: templates/web/base/admin/index.html:36 -#: templates/web/base/status/index.html:14 -msgid "%s questionnaires sent – %s answered (%s%%)" -msgstr "%d bildirim – %d cevaplandı (%s%%)" - #: templates/web/base/pagination.html:10 msgid "%d to %d of %d" msgstr "%d'in %d'den %d'ye" @@ -74,6 +53,20 @@ msgstr "%s - Özet raporlar" msgid "%s admin:" msgstr "" +#: templates/web/base/status/stats.html:26 +#, fuzzy +msgid "%s bodies" +msgstr "Bölümler" + +#: templates/web/base/status/stats.html:24 +msgid "%s confirmed alerts, %s unconfirmed" +msgstr "%s onaylanmış uyarı, %s onaylanmamış" + +#: templates/web/base/status/stats.html:27 +#: templates/web/zurich/admin/index.html:6 +msgid "%s council contacts – %s confirmed, %s unconfirmed" +msgstr "%s kurul irtibatları – %s onaylanmış, %s onaylanmamış" + #. ("%s is the site name") #: templates/web/base/alert/index.html:7 msgid "" @@ -90,7 +83,15 @@ msgid "" "within a certain distance of a particular location." msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:695 +#: templates/web/base/status/stats.html:23 +msgid "%s live updates" +msgstr "%s güncellemeler" + +#: templates/web/base/status/stats.html:25 +msgid "%s questionnaires sent – %s answered (%s%%)" +msgstr "%s bildirim – %s cevaplandı (%s%%)" + +#: perllib/FixMyStreet/DB/Result/Problem.pm:683 msgid "%s ref: %s" msgstr "%s ref: %s" @@ -105,15 +106,15 @@ msgid "" "for the county council." msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:255 perllib/FixMyStreet/Cobrand/UK.pm:267 +#: perllib/FixMyStreet/Cobrand/UK.pm:256 perllib/FixMyStreet/Cobrand/UK.pm:268 msgid "%s ward, %s" msgstr "%s bölüm, %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:564 +#: perllib/FixMyStreet/DB/Result/Problem.pm:552 msgid "%s, reported at %s" msgstr "%s, rapor edilmiÅŸ %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:282 perllib/FixMyStreet/Cobrand/UK.pm:294 +#: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295 msgid "%s, within %s ward" msgstr "%s, içinde %s bölüm" @@ -121,7 +122,7 @@ msgstr "%s, içinde %s bölüm" msgid "© <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors" msgstr "© <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a>katkıda bulunanlar" -#: templates/web/zurich/report/new/fill_in_details_form.html:53 +#: templates/web/zurich/report/new/fill_in_details_form.html:46 msgid "(Defect & location of defect)" msgstr "" @@ -132,15 +133,13 @@ msgstr "(E-posta kara listede)" #: templates/web/zurich/admin/report_edit-sdm.html:60 #: templates/web/zurich/admin/report_edit.html:88 -#, fuzzy msgid "(No name)" -msgstr "Adınız" +msgstr "" #: templates/web/zurich/admin/report_edit-sdm.html:67 #: templates/web/zurich/admin/report_edit.html:95 -#, fuzzy msgid "(No phone number)" -msgstr "Telefon numaran" +msgstr "" #: templates/web/base/alert/_list.html:24 msgid "(a default distance which covers roughly 200,000 people)" @@ -148,17 +147,16 @@ msgstr "(yaklaşık 200,000 kiÅŸiyi kapsayan bir mesafe)" #. ("%s is a list of distance links, e.g. [2km] / [5km] / [10km] / [20km]") #: templates/web/base/alert/_list.html:29 -#, fuzzy msgid "(alternatively the RSS feed can be customised, within %s)" -msgstr "(RSS içinde özelleÅŸtirilebilir " +msgstr "" -#: templates/web/base/report/_item.html:27 -#: templates/web/zurich/report/_item.html:21 +#: templates/web/base/report/_item.html:25 +#: templates/web/zurich/report/_item.html:19 msgid "(closed)" msgstr "(kapalı)" -#: templates/web/base/report/_item.html:25 -#: templates/web/zurich/report/_item.html:19 +#: templates/web/base/report/_item.html:23 +#: templates/web/zurich/report/_item.html:17 msgid "(fixed)" msgstr "(onarıldı)" @@ -166,37 +164,28 @@ msgstr "(onarıldı)" msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)" msgstr "(duvar yazısı (grafiti), moloz atma, kırık kaldırım döşeme, ya da sokak aydınlatma gibi)" -#: templates/web/base/report/_item.html:21 +#: templates/web/base/report/_item.html:19 msgid "(not sent to council)" msgstr "(kurula gönderilmemiÅŸ)" -#: templates/web/base/report/new/fill_in_details_form.html:200 #: templates/web/zurich/report/new/fill_in_details_form.html:82 msgid "(optional)" msgstr "(isteÄŸe baÄŸlı)" -#: templates/web/fixmystreet/report/public_label.html:1 +#: templates/web/base/report/public_label.html:1 msgid "(public)" msgstr "(kamu)" -#: templates/web/base/report/_item.html:20 +#: templates/web/base/report/_item.html:18 msgid "(sent to both)" msgstr "(her ikisine de gönderildi)" -#: templates/web/base/report/new/fill_in_details_form.html:194 -msgid "(we never show your email address or phone number)" -msgstr "(e-posta adresiniz veya telefon numaranız gizli tutulacaktır)" - -#: templates/web/base/report/update-form.html:159 -msgid "(we never show your email)" -msgstr "(e-posta adresiniz gizli tutulacaktır)" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:673 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 #: perllib/FixMyStreet/DB/Result/Problem.pm:410 msgid "-- Pick a category --" msgstr "-- Kategori seçiniz--" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:637 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:632 #: perllib/FixMyStreet/DB/Result/Problem.pm:416 msgid "-- Pick a property type --" msgstr "-- Bir özellik seçiniz --" @@ -218,52 +207,39 @@ msgstr "" msgid "<label>Show %s</label> <label>about %s</label>" msgstr "" -#: templates/web/base/admin/index.html:32 -#: templates/web/base/status/index.html:11 +#: templates/web/base/status/stats.html:18 #: templates/web/zurich/admin/index.html:4 msgid "<strong>%s</strong> live problems" -msgstr "<strong>%d</strong> güncel problemler" +msgstr "<strong>%s</strong> güncel problemler" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:39 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:2 msgid "<strong>No</strong> Let me confirm my report by email" msgstr "<strong>Hayır</strong> E mail yoluyla raporumu onaylamama izin ver" -#: templates/web/fixmystreet/report/update-form.html:112 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:2 msgid "<strong>No</strong> Let me confirm my update by email" msgstr "<strong>Hayır</strong> Güncellemelerimi e-posta yoluyla onaylamama izin ver" -#: templates/web/base/auth/general.html:48 +#: templates/web/base/auth/general.html:87 #: templates/web/zurich/auth/general.html:51 msgid "<strong>No</strong> let me sign in by email" msgstr "<strong>Hayır</strong> e-posta yoluyla giriÅŸ yapmama izin ver" -#: templates/web/base/report/new/fill_in_details_form.html:145 -msgid "<strong>No</strong>, let me confirm my report by email:" -msgstr "<strong>Hayır</strong>, bildirimleri e-posta yoluyla onaylamaya izin ver" - -#: templates/web/base/report/update-form.html:118 -msgid "<strong>No</strong>, let me confirm my update by email:" -msgstr "<strong>Hayır</strong>, güncellemelerimi e-posta yoluyla onaylamama izin ver" - -#: templates/web/base/auth/general.html:34 -#: templates/web/base/report/new/fill_in_details_form.html:123 -#: templates/web/base/report/update-form.html:96 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:15 -#: templates/web/fixmystreet/report/update-form.html:89 +#: templates/web/base/auth/general.html:70 +#: templates/web/base/report/new/form_user_loggedout_password.html:3 +#: templates/web/base/report/update/form_user_loggedout_password.html:2 msgid "<strong>Yes</strong> I have a password" msgstr "<strong>Evet</strong> ÅŸifrem var" -#: templates/web/base/static/about-en-gb.html:1 -#: templates/web/base/static/about-en-gb.html:3 +#: templates/web/base/about/about-en-gb.html:1 +#: templates/web/base/about/about-en-gb.html:3 msgid "About us" msgstr "Hakkımızda" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:8 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:31 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:29 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:35 msgid "Action Scheduled" msgstr "Planlı Eylem" @@ -298,14 +274,13 @@ msgstr "Yeni kategori ekle" msgid "Add user" msgstr "Kullanıcı ekle" -#: templates/web/base/my/my.html:52 +#: templates/web/base/my/my.html:56 msgid "Added %s" msgstr "EklenmiÅŸ %s" #: templates/web/base/report/new/category_extras.html:9 -#, fuzzy msgid "Additional Information" -msgstr "Denetleme bekliyor" +msgstr "" #: templates/web/base/auth/change_password.html:29 msgid "Again:" @@ -319,8 +294,7 @@ msgstr "Uyarı %d için oluÅŸturulmuÅŸ %s, tür %s, deÄŸiÅŸkenler %s / %s" msgid "Alert %d disabled (created %s)" msgstr "Uyarı %d engellendi (oluÅŸturuldu %s)" -#: templates/web/base/report/update-form.html:164 -#: templates/web/fixmystreet/report/update-form.html:150 +#: templates/web/base/report/update/form_name.html:20 msgid "Alert me to future updates" msgstr "Güncellemeleri bildir" @@ -330,9 +304,8 @@ msgid "All Reports" msgstr "Tüm Bildirimler" #: templates/web/zurich/admin/stats.html:5 -#, fuzzy msgid "All Reports as CSV" -msgstr "Tüm Bildirimler" +msgstr "" #: templates/web/base/footer.html:11 templates/web/fixmystreet/footer.html:32 #: templates/web/zurich/admin/index-dm.html:12 @@ -353,10 +326,8 @@ msgstr "Buraya bildirdiÄŸiniz tüm bilgiler gönderilecektir" #: templates/web/base/report/new/councils_text_all.html:2 #: templates/web/base/report/new/councils_text_all.html:4 -#: templates/web/base/report/new/fill_in_details_form.html:12 -#: templates/web/base/report/new/fill_in_details_form.html:14 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:10 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:11 +#: templates/web/base/report/new/fill_in_details_form.html:10 +#: templates/web/base/report/new/fill_in_details_form.html:9 msgid "All the information you provide here will be sent to <strong>%s</strong>." msgstr "Buraya bildirdiÄŸiniz tüm bilgiler gönderilecektir" @@ -378,6 +349,10 @@ msgstr "Anonim:" msgid "Are you a developer?" msgstr "GeliÅŸtirici misiniz?" +#: templates/web/base/js/translation_strings.html:52 +msgid "Are you sure you want to cancel this upload?" +msgstr "" + #: templates/web/base/admin/body-form.html:69 #: templates/web/base/admin/body.html:16 #: templates/web/zurich/admin/body-form.html:24 @@ -387,12 +362,11 @@ msgstr "Kapsadığı alan" #: templates/web/base/admin/bodies.html:15 #: templates/web/base/admin/body.html:60 msgid "As this is a staging site and %s is false, reports made on this site will be sent to the problem reporter, not the contact given for the report’s category." -msgstr "" +msgstr "Burası geçiÅŸ sayfası ve %s yanlış olduÄŸu için, bu sayfada yapılan bildirimler, ilgili birimdeki sorumlu kiÅŸi yerine problemi bildiren kiÅŸiye gönderilecektir." #: templates/web/zurich/admin/report_edit.html:213 -#, fuzzy msgid "Assign to competent body:" -msgstr "Dışarıdan bir organ atamak:" +msgstr "" #: templates/web/zurich/admin/report_edit.html:173 #: templates/web/zurich/admin/stats.html:36 @@ -411,16 +385,16 @@ msgstr "Alt bölüm atamak:" msgid "Assigned to %s" msgstr "%s atamak" -#: templates/web/base/open311/index.html:84 +#: templates/web/base/open311/index.html:76 msgid "At most %d requests are returned in each query. The returned requests are ordered by requested_datetime, so to get all requests, do several searches with rolling start_date and end_date." -msgstr "" +msgstr "En çok geri dönen %d talepler sorgulama neticesinde geri dönmüştür. Geri dönen talepler talep_tarihsaat göz önünde bulundurularak sıralanmıştır. Bütün taleplere ulaÅŸmak için baÅŸlangıç ve bitiÅŸ tarihlerini belirterek çeÅŸitli aramalar yapınız." -#: templates/web/base/open311/index.html:76 +#: templates/web/base/open311/index.html:68 msgid "At the moment only searching for and looking at reports work." msgstr "Åžu an sadece arama ve raporlara göz atma kısımları çalışıyor." #: perllib/FixMyStreet/DB/Result/Problem.pm:373 -#: templates/web/zurich/report/_item.html:11 +#: templates/web/zurich/report/_item.html:9 msgid "Awaiting moderation" msgstr "Denetleme bekliyor" @@ -432,7 +406,7 @@ msgstr "Geri" msgid "Ban email address" msgstr "Email adresini engelle" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1276 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1285 #: perllib/FixMyStreet/Cobrand/Zurich.pm:392 #: templates/web/base/admin/bodies.html:1 templates/web/zurich/header.html:64 msgid "Bodies" @@ -462,7 +436,7 @@ msgid "Can't see the map? <em>Skip this step</em>" msgstr "Haritayı göremiyor musunuz? <em>Bu adımı atlayın</em>" #: templates/web/base/admin/body.html:68 -#: templates/web/base/admin/index.html:61 +#: templates/web/base/admin/index.html:54 #: templates/web/base/report/new/category.html:10 #: templates/web/base/report/new/category_wrapper.html:3 #: templates/web/zurich/admin/body.html:14 @@ -473,8 +447,8 @@ msgstr "Haritayı göremiyor musunuz? <em>Bu adımı atlayın</em>" msgid "Category" msgstr "Kategori" -#: templates/web/base/admin/index.html:59 -#: templates/web/base/admin/index.html:67 +#: templates/web/base/admin/index.html:52 +#: templates/web/base/admin/index.html:60 msgid "Category fix rate for problems > 4 weeks old" msgstr "Bu kategori için problemlerin onarılma süresi > 4 hafta" @@ -487,7 +461,7 @@ msgstr "Bu kategori için problemlerin onarılma süresi > 4 hafta" msgid "Category:" msgstr "Kategori:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:402 +#: perllib/FixMyStreet/Script/Reports.pm:180 msgid "Category: %s" msgstr "Kategori: %s" @@ -524,12 +498,20 @@ msgid "" " interest in displaying the report. In the UK, we've used this for services like requesting an extra rubbish bin\n" " at a specific address." msgstr "" +"Kontrol et <strong>kiÅŸisel</strong> bu kategorideki bildirimler internet sayfasında </strong>hiçbir ÅŸekilde gözükmemelidir</strong>.\n" +"<br>\n" +"Normalde kategoriler gizli deÄŸildir.\n" +"<br>\n" +"Bu kullanıcının ilgili birime bildirimde bulunmasına izin vermek istediÄŸiniz konular için uygundur, gizli olanlar hariç. Ä°ngiltere'de, ekstra çöp kutusu talebi gibi hizmetlerde bunu daha önce kullanmıştık\n" +"belirli bir adres için." #: templates/web/base/admin/body.html:130 msgid "" "Choose a <strong>category</strong> name that makes sense to the public (e.g., \"Pothole\", \"Street lighting\") but is helpful\n" " to the body too. These will appear in the drop-down menu on the report-a-problem page." msgstr "" +"Herkes tarafından kolay anlaşılabilecek bir <strong>kategori</strong> ismi seçin (ör: \"çukur\", \"sokak lambası\") aynı zamanda birime de\n" +"yardımcı olacak. Bunlar problem-bildir sayfasındaki açılan menüde görüntülenecektir." #: templates/web/zurich/admin/response_templates_select.html:6 msgid "Choose a template" @@ -541,7 +523,7 @@ msgid "Click here or enter as dd/mm/yyyy" msgstr "dd/mm/yyyy olarak girin ya da buraya tıklayın" #: templates/web/base/around/_report_banner.html:2 -#: templates/web/base/js/translation_strings.html:50 +#: templates/web/base/js/translation_strings.html:55 msgid "Click map to report a problem" msgstr "Haritayı tıklayarak problemi bildirin" @@ -568,7 +550,7 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:25 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:144 -#: templates/web/fixmystreet/report/banner.html:15 +#: templates/web/base/report/banner.html:15 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:10 #: templates/web/zurich/admin/header.html:16 @@ -576,7 +558,7 @@ msgstr "" msgid "Closed" msgstr "Kapalı" -#: perllib/FixMyStreet/DB/Result/Problem.pm:794 +#: perllib/FixMyStreet/DB/Result/Problem.pm:779 msgid "Closed by council" msgstr "Kurul tarafından kapatıldı" @@ -602,7 +584,7 @@ msgstr "Cobrand data:" msgid "Cobrand:" msgstr "Cobrand:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1283 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1292 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "Yapılandırma" @@ -615,13 +597,14 @@ msgstr "Yapılandırma Son Nokta" msgid "Confirm" msgstr "Onayla" -#: templates/web/base/auth/token.html:1 templates/web/zurich/auth/token.html:1 +#: templates/web/base/auth/token.html:1 msgid "Confirm account" msgstr "Hesabı onayla" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:33 -#: templates/web/fixmystreet/report/update-form.html:107 -msgid "Confirm by email below, providing a new password at that point. When you confirm, your password will be updated." +#: templates/web/base/report/new/form_user_loggedout_password.html:21 +#: templates/web/base/report/update/form_user_loggedout_password.html:20 +#, fuzzy +msgid "Confirm by email instead, providing a new password at that point. When you confirm, your password will be updated." msgstr "Bu noktada yeni bir ÅŸifre saÄŸlayarak, aÅŸağıdaki e-posta ile onaylayın. Onayladıktan sonra ÅŸifreniz güncellenecektir." #: templates/web/base/questionnaire/creator_fixed.html:1 @@ -651,35 +634,27 @@ msgid "Confirmed:" msgstr "Onaylanmış:" #. ("%s is the site name") -#: templates/web/base/faq/faq-en-gb.html:8 templates/web/base/footer.html:24 -#: templates/web/base/open311/index.html:8 -#: templates/web/base/static/privacy.html:10 -#: templates/web/fixmystreet/contact/index.html:12 -#, fuzzy +#: templates/web/base/about/_sidebar.html:6 templates/web/base/footer.html:24 msgid "Contact %s" -msgstr "Bize Ulaşın" +msgstr "" #: templates/web/base/contact/index.html:1 #: templates/web/base/contact/index.html:2 #: templates/web/base/contact/submit.html:1 -#: templates/web/fixmystreet/contact/index.html:1 -#: templates/web/fixmystreet/contact/index.html:2 msgid "Contact Us" msgstr "Bize Ulaşın" -#: templates/web/base/contact/index.html:6 -#: templates/web/fixmystreet/contact/index.html:20 +#: templates/web/base/contact/index.html:12 msgid "Contact the team" msgstr "Grupla baÄŸlantı kur" #: templates/web/zurich/admin/report_edit-sdm.html:40 #: templates/web/zurich/admin/report_edit.html:59 -#, fuzzy msgid "Coordinates:" -msgstr "Koordinatlar:" +msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1420 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1448 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1429 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1457 msgid "Could not find user" msgstr "Kullanıcı bulunamadı" @@ -697,7 +672,7 @@ msgstr "Kurul" msgid "Council contacts for %s" msgstr "Kurula ulaÅŸmak için %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:693 +#: perllib/FixMyStreet/DB/Result/Problem.pm:681 msgid "Council ref: %s" msgstr "Kurul ref: %s" @@ -712,7 +687,7 @@ msgstr "Kurul:" msgid "Count" msgstr "Sayma" -#: templates/web/base/email_sent.html:1 templates/web/zurich/email_sent.html:1 +#: templates/web/base/email_sent.html:1 msgid "Create a report" msgstr "Bildiri oluÅŸtur" @@ -722,9 +697,8 @@ msgid "Create category" msgstr "Kategori oluÅŸtur" #: templates/web/zurich/admin/template_edit.html:29 -#, fuzzy msgid "Create template" -msgstr "Bildiri oluÅŸtur" +msgstr "" #: templates/web/base/admin/problem_row.html:34 #: templates/web/zurich/admin/templates.html:10 @@ -761,7 +735,7 @@ msgstr "Kontrol Paneli " msgid "Dealt with by subdivision within 5 working days" msgstr "Alt komisyon tarafından 5 iÅŸ günü içinde üstesinden gelinilecek" -#: perllib/FixMyStreet/App/Controller/Admin.pm:878 +#: perllib/FixMyStreet/App/Controller/Admin.pm:877 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "" @@ -774,7 +748,7 @@ msgstr "" msgid "Deleted" msgstr "Silindi" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:51 +#: templates/web/base/report/new/form_report.html:45 #: templates/web/zurich/admin/index-dm.html:22 #: templates/web/zurich/admin/index-sdm.html:20 #: templates/web/zurich/admin/reports.html:12 @@ -782,12 +756,11 @@ msgid "Description" msgstr "Tanım" #: templates/web/base/js/translation_strings.html:34 -#: templates/web/zurich/report/new/fill_in_details_form.html:42 +#: templates/web/zurich/report/new/fill_in_details_form.html:68 msgid "Details" msgstr "Detaylar" #: templates/web/base/admin/report_edit.html:20 -#: templates/web/base/report/new/fill_in_details_form.html:62 #: templates/web/zurich/admin/report_edit-sdm.html:27 #: templates/web/zurich/admin/report_edit.html:29 #: templates/web/zurich/admin/report_edit.html:43 @@ -800,38 +773,38 @@ msgstr "Devredildi" #: templates/web/zurich/admin/report_edit-sdm.html:50 #: templates/web/zurich/admin/report_edit.html:69 -#, fuzzy msgid "Didn't use map" -msgstr "harita kullanılmamış" +msgstr "" #: templates/web/base/admin/edit-league.html:8 msgid "Diligency prize league table" -msgstr "" +msgstr "Özenle hazırlanmış iÅŸbirliÄŸi tablosu" #. ("%s is the site name") -#: templates/web/base/auth/general.html:31 -#: templates/web/base/report/new/fill_in_details_form.html:114 -#: templates/web/base/report/update-form.html:87 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:11 -#: templates/web/fixmystreet/report/update-form.html:86 -#, fuzzy +#: templates/web/base/auth/general.html:48 +#: templates/web/base/report/new/form_user_loggedout.html:18 +#: templates/web/base/report/new/oauth_email_form.html:18 +#: templates/web/base/report/update-form.html:29 +#: templates/web/base/report/update/form_user_loggedout.html:17 msgid "Do you have a %s password?" -msgstr "FixMyStreet ÅŸifreniz var mıdır?" +msgstr "" #: templates/web/base/questionnaire/index.html:55 msgid "Don’t know" msgstr "Don’t know" -#: templates/web/fixmystreet/contact/index.html:118 +#: templates/web/base/contact/index.html:110 msgid "Don't like forms?" msgstr "Åžekilleri beÄŸenmediniz mi?" +#: templates/web/base/js/translation_strings.html:51 +msgid "Drag and drop photos here or <u>click to upload</u>" +msgstr "" + #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:14 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:32 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:30 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:36 msgid "Duplicate" msgstr "ÇoÄŸaltmak" @@ -881,7 +854,7 @@ msgstr "Editör" #: templates/web/base/admin/category_edit.html:91 #: templates/web/base/admin/flagged.html:38 #: templates/web/base/admin/users.html:16 -#: templates/web/base/auth/general.html:22 +#: templates/web/base/auth/general.html:39 #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:24 @@ -889,7 +862,7 @@ msgstr "Editör" msgid "Email" msgstr "E-posta" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1396 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1405 msgid "Email added to abuse list" msgstr "E-posta kara listeye eklendi" @@ -905,7 +878,7 @@ msgstr "E-posta uyarısı oluÅŸturuldu" msgid "Email alert deleted" msgstr "E-posta uyarısı silindi" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1393 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1402 msgid "Email already in abuse list" msgstr "E-posta kara listede" @@ -913,41 +886,36 @@ msgstr "E-posta kara listede" msgid "Email me new local problems" msgstr "Yeni yerel problemleri e posta olarak gönder" -#: templates/web/base/report/display.html:38 -msgid "Email me updates" -msgstr "Güncellemeleri bana e-posta yolu ile bildir" - #: templates/web/base/admin/category_edit.html:31 #: templates/web/base/admin/report_edit.html:62 #: templates/web/base/admin/update_edit.html:33 #: templates/web/base/admin/user-form.html:20 #: templates/web/base/alert/updates.html:13 -#: templates/web/base/report/display.html:42 #: templates/web/zurich/admin/body.html:47 msgid "Email:" msgstr "E-posta:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:329 +#: perllib/FixMyStreet/Script/Reports.pm:108 msgid "Email: %s" msgstr "E-posta: %s" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:639 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:634 msgid "Empty flat or maisonette" msgstr "BoÅŸ daire veye müstakil ev" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:638 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:633 msgid "Empty house or bungalow" msgstr "BoÅŸ ev veya bungalov" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:641 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:636 msgid "Empty office or other commercial" msgstr "BoÅŸ büro veya diÄŸer ticari yerler" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:642 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:637 msgid "Empty pub or bar" msgstr "BoÅŸ pub veya bar" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:643 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:638 msgid "Empty public building - school, hospital, etc." msgstr "BoÅŸ kamu binası- okul, hastane, vb." @@ -984,7 +952,7 @@ msgstr "Varılan nokta" msgid "Enter a Zürich street name" msgstr "Bir Zürich sokak ismi giriniz" -#: perllib/FixMyStreet/Cobrand/UK.pm:13 +#: perllib/FixMyStreet/Cobrand/UK.pm:14 msgid "Enter a nearby UK postcode, or street name and area" msgstr "Yakınlardaki bir posta kodu, cadde veya bölge ismi giriniz" @@ -1000,16 +968,11 @@ msgstr "Yakınlardaki bir cadde ve bölge ismi giriniz" #: perllib/FixMyStreet/Cobrand/ZeroTB.pm:7 msgid "Enter a nearby street name and area, postal code or district in Delhi" -msgstr "" - -#: templates/web/base/report/new/fill_in_details_form.html:152 -#: templates/web/base/report/update-form.html:125 -msgid "Enter a new password:" -msgstr "Yeni bir ÅŸifre gir:" +msgstr "Yakın çevrede bulunan cadde ismi, bölge ismi, posta kodu veya Delhi de bulunan semti girin" -#: templates/web/base/auth/general.html:60 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:75 -#: templates/web/fixmystreet/report/update-form.html:123 +#: templates/web/base/auth/general.html:99 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:38 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:13 #: templates/web/zurich/auth/general.html:65 msgid "Enter a password" msgstr "Åžifre gir" @@ -1019,11 +982,11 @@ msgid "Enter details of the problem" msgstr "Problem hakkında detaylı bilgi giriniz" #: templates/web/base/errors/generic.html:1 -#: templates/web/base/errors/generic.html:3 +#: templates/web/base/errors/generic.html:4 #: templates/web/base/tokens/abuse.html:1 #: templates/web/base/tokens/abuse.html:3 #: templates/web/base/tokens/error.html:1 -#: templates/web/base/tokens/error.html:3 +#: templates/web/base/tokens/error.html:5 msgid "Error" msgstr "Hata" @@ -1036,11 +999,11 @@ msgstr "" msgid "Example postcode %s" msgstr "Örnek postakodu " -#: templates/web/base/open311/index.html:94 +#: templates/web/base/open311/index.html:86 msgid "Examples:" msgstr "Örnekler:" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:55 +#: templates/web/base/report/new/form_report.html:49 msgid "Explain what’s wrong, exactly where it is, and how long it’s been there…" msgstr "Sorunun ne olduÄŸunu, nerede ve nezamandan beri orada olduÄŸunu açıklayın..." @@ -1048,9 +1011,8 @@ msgstr "Sorunun ne olduÄŸunu, nerede ve nezamandan beri orada olduÄŸunu açıkla #: perllib/FixMyStreet/Cobrand/Zurich.pm:922 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:12 -#, fuzzy msgid "Extern" -msgstr "Harici URL " +msgstr "" #: templates/web/base/admin/body-form.html:81 msgid "External URL" @@ -1082,17 +1044,15 @@ msgstr "" msgid "FixMyStreet" msgstr "FixMyStreet" -#: templates/web/base/admin/index.html:61 +#: templates/web/base/admin/index.html:54 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:24 #: templates/web/base/admin/report_blocks.html:9 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:144 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:34 -#: templates/web/fixmystreet/report/banner.html:12 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:32 +#: templates/web/base/report/banner.html:12 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:38 msgid "Fixed" msgstr "Sorun çözüldü" @@ -1119,7 +1079,7 @@ msgstr "Silindi olarak seçildi" msgid "Flag user" msgstr "Kullanıcıyı seç" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1281 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1290 #: templates/web/base/admin/users.html:19 msgid "Flagged" msgstr "Seçildi" @@ -1150,36 +1110,31 @@ msgstr "Sadece o bölge içinde yer alan raporları görüntülemek için bölge msgid "For more information, see <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>." msgstr "Daha fazla bilgi için, bakınız <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'> FixMyStreet'in Mapit'i nasıl kullandığını</a>." -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:32 -#: templates/web/fixmystreet/report/update-form.html:106 +#: templates/web/base/report/new/form_user_loggedout_password.html:20 +#: templates/web/base/report/update/form_user_loggedout_password.html:19 msgid "Forgotten your password?" msgstr "Åžifrenizi mi unuttunuz?" #: perllib/FixMyStreet/Cobrand/Zurich.pm:752 -#, fuzzy msgid "Forwarded to external body" -msgstr "Dışarıdan bir organ atamak:" +msgstr "" #: perllib/FixMyStreet/Cobrand/Zurich.pm:753 -#, fuzzy msgid "Forwarded wish to external body" -msgstr "Dışarıdan bir organ atamak:" +msgstr "" -#: templates/web/base/faq/faq-en-gb.html:1 -#: templates/web/base/faq/faq-en-gb.html:13 -#: templates/web/base/faq/faq-en-gb.html:6 -#: templates/web/base/open311/index.html:6 -#: templates/web/base/static/privacy.html:8 -#: templates/web/fixmystreet/contact/index.html:10 +#: templates/web/base/about/_sidebar.html:4 +#: templates/web/base/about/faq-en-gb.html:1 +#: templates/web/base/about/faq-en-gb.html:5 msgid "Frequently Asked Questions" msgstr "Sıkça Sorulan Sorular" -#: templates/web/base/open311/index.html:136 +#: templates/web/base/open311/index.html:128 msgid "GeoRSS on Google Maps" msgstr " Google Haritadaki GeoRSS " +#: templates/web/base/report/display_tools.html:11 #: templates/web/fixmystreet/around/_updates.html:3 -#: templates/web/fixmystreet/report/display.html:35 msgid "Get updates" msgstr "Güncellemeleri yap" @@ -1210,26 +1165,26 @@ msgstr "Git" #: templates/web/base/admin/report_edit.html:75 msgid "Going to send questionnaire?" -msgstr "" +msgstr "Anket gönderecek misiniz?" -#: templates/web/base/admin/index.html:42 +#: templates/web/base/admin/index.html:35 msgid "Graph of problem creation by status over time" -msgstr "" +msgstr "Zamanla oluÅŸan problemlerin duruma göre grafikleri" #: templates/web/base/reports/index.html:12 msgid "Greyed-out lines are councils that no longer exist." -msgstr "" +msgstr "Gri çizgiler artık var olmayan kurulları göstermektedir." #: templates/web/base/questionnaire/index.html:46 msgid "Has this problem been fixed?" -msgstr "" +msgstr "Bu sorun giderildi mi? " #: templates/web/base/questionnaire/index.html:59 msgid "Have you ever reported a problem to a council before, or is this your first time?" -msgstr "" +msgstr "Daha önce bir problemi bir kurula bildirdiniz mi, yoksa bu ilk defa mı?" #: templates/web/base/footer.html:15 templates/web/fixmystreet/footer.html:38 -#: templates/web/zurich/faq/faq-de-ch.html:1 +#: templates/web/zurich/about/faq-de-ch.html:1 #: templates/web/zurich/footer.html:22 #: templates/web/zurich/nav_over_content.html:8 msgid "Help" @@ -1237,7 +1192,7 @@ msgstr "Yardım" #: templates/web/base/alert/_list.html:8 msgid "Here are the types of local problem alerts for ‘%s’." -msgstr "" +msgstr "‘%s’ için yerel sorun uyarı çeÅŸitleri buradadır." #: templates/web/base/header.html:32 templates/web/fixmystreet/header.html:63 #: templates/web/zurich/footer.html:12 @@ -1258,11 +1213,11 @@ msgstr "Gizli" #: templates/web/base/around/display_location.html:65 msgid "Hide old" -msgstr "" +msgstr "Eskileri gizle" #: templates/web/base/around/display_location.html:60 msgid "Hide pins" -msgstr "" +msgstr "Ä°ÄŸneler gizle" #: templates/web/base/admin/category_edit.html:87 msgid "History" @@ -1280,7 +1235,7 @@ msgstr "Bir problem nasıl bildirilir" msgid "How to send successful reports" msgstr "BaÅŸarılı bildirim nasıl gönderilir" -#: perllib/FixMyStreet/App/Controller/Admin.pm:754 +#: perllib/FixMyStreet/App/Controller/Admin.pm:752 msgid "I am afraid you cannot confirm unconfirmed reports." msgstr "Maalesef onaylanmamış bildirimleri onaylayamıyorsunuz." @@ -1298,10 +1253,6 @@ msgstr "@fixmystreet'teki problemi yeni güncelledim" msgid "I'm afraid we couldn't locate your problem in the database.\n" msgstr "Maalesef veri tabanında sorunun yerini bulamadık.\n" -#: perllib/FixMyStreet/App/Controller/Tokens.pm:327 -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 "" - #: templates/web/base/admin/flagged.html:14 #: templates/web/base/admin/list_updates.html:6 #: templates/web/base/admin/reports.html:11 @@ -1330,15 +1281,10 @@ msgstr "" msgid "If you get some more information about the status of your problem, please come back to the site and leave an update." msgstr "Sorununuzun durumu ile ilgili daha fazla bilgi almak istiyorsanız, lütfen ana sayfaya geri dönün ve bir güncelleme bırakın." -#: templates/web/base/report/new/councils_text_none.html:2 -#: templates/web/base/report/new/councils_text_none.html:8 +#: templates/web/base/report/new/councils_text_none.html:10 +#: templates/web/base/report/new/councils_text_none.html:9 msgid "If you submit a problem here the subject and details of the problem will be public, but the problem will <strong>not</strong> be reported to the council." -msgstr "" - -#: templates/web/zurich/auth/token.html:19 -#: templates/web/zurich/email_sent.html:7 -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 "" +msgstr "Buraya bildireceÄŸiniz problemin konusu ve detayları tüm herkese açık olacaktır, fakat bahse konu problem ilgili kuruma strong>bildirilmeyecektir.</strong> " #: templates/web/base/questionnaire/index.html:68 msgid "" @@ -1379,22 +1325,20 @@ msgstr "Kanunsuz kimlik " #: perllib/FixMyStreet/App/Controller/Alert.pm:100 msgid "Illegal feed selection" -msgstr "" +msgstr "Yasadışı bildirim seçimi" #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:144 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:32 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:30 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:36 msgid "In Progress" msgstr "Devam Etmekte" #: templates/web/base/admin/flagged.html:39 msgid "In abuse table?" -msgstr "" +msgstr "Gereksiz bölümüne atılsın mı?" -#: templates/web/base/open311/index.html:88 +#: templates/web/base/open311/index.html:80 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 "" @@ -1402,7 +1346,7 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/Zurich.pm:963 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:7 -#: templates/web/fixmystreet/report/banner.html:19 +#: templates/web/base/report/banner.html:19 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:8 msgid "In progress" @@ -1410,42 +1354,42 @@ msgstr "Devam etmekte" #: templates/web/base/tokens/confirm_alert.html:11 msgid "Inbox zero, here we come!" -msgstr "" +msgstr "Gelen kutusu boÅŸ " #: templates/web/zurich/admin/report_edit.html:227 msgid "Include reporter personal details" -msgstr "" +msgstr "Bildiren kiÅŸinin kiÅŸisel bilgilerini dahil et" #: templates/web/base/admin/stats.html:76 msgid "Include unconfirmed reports" -msgstr "" +msgstr "Onaylanmamış bildirimleri dahil et" #: perllib/FixMyStreet/App/Controller/Open311.pm:359 msgid "Incorrect has_photo value \"%s\"" -msgstr "" +msgstr "Hatalı sahip_fotoÄŸraf deÄŸer \"%s\"" #: templates/web/zurich/admin/list_updates.html:35 msgid "Internal notes" -msgstr "" +msgstr "İç notlar" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:16 msgid "Internal referral" -msgstr "" +msgstr "İç yönlendirme" #: perllib/FixMyStreet/App/Controller/Open311.pm:344 msgid "Invalid agency_responsible value %s" -msgstr "" +msgstr "Geçersiz ajans_sorumlu deÄŸer %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1201 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1210 msgid "Invalid end date" msgstr "Geçersiz bitiÅŸ tarihi" #: perllib/FixMyStreet/App/Controller/Open311.pm:437 msgid "Invalid format %s specified." -msgstr "" +msgstr "Geçersiz format %s belirlenmiÅŸ." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1206 msgid "Invalid start date" msgstr "Geçersiz baÅŸlangıç tarihi" @@ -1453,20 +1397,18 @@ msgstr "Geçersiz baÅŸlangıç tarihi" #: templates/web/base/admin/report_blocks.html:5 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:143 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:31 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:29 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:35 msgid "Investigating" msgstr "Ä°ncelenmekte" -#: templates/web/fixmystreet/contact/blurb.html:8 +#: templates/web/base/contact/blurb.html:8 msgid "It's often quickest to <a href=\"%s\">check our FAQs</a> and see if the answer is there." -msgstr "" +msgstr " FAQs'ı kontrol et</a> bu çözüme ulaÅŸmak için <a href=\"%s\">en hızlı yoldur." #: templates/web/base/tokens/confirm_problem.html:14 msgid "It’s on its way to the council right now." -msgstr "" +msgstr "Kurula iletilmek üzere." #: perllib/FixMyStreet/Cobrand/Zurich.pm:184 msgid "Jurisdiction Unknown" @@ -1478,19 +1420,17 @@ msgstr "" msgid "Jurisdiction unknown" msgstr "" -#: templates/web/base/auth/general.html:44 -#: templates/web/base/report/new/fill_in_details_form.html:132 -#: templates/web/base/report/update-form.html:105 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:28 -#: templates/web/fixmystreet/report/update-form.html:102 +#: templates/web/base/auth/general.html:80 +#: templates/web/base/report/new/form_user_loggedout_password.html:16 +#: templates/web/base/report/update/form_user_loggedout_password.html:15 #: templates/web/zurich/auth/general.html:40 msgid "Keep me signed in on this computer" -msgstr "" +msgstr "Bu bilgisayarda oturumu açık tut" #: templates/web/base/admin/body.html:70 #: templates/web/zurich/admin/body.html:16 msgid "Last editor" -msgstr "" +msgstr "Son düzenleyen" #: templates/web/base/admin/report_edit.html:70 msgid "Last update:" @@ -1502,7 +1442,7 @@ msgstr "Son güncelleme:" #: templates/web/base/admin/body-form.html:229 msgid "Leave this blank if all reports to this body should be sent using the same send method (e.g., \"%s\")." -msgstr "" +msgstr "EÄŸerbu birime bürün bildirimler aynı gönderme yöntemi ile yapılacak ise burayı boÅŸ bırakın (ör., \"%s\")." #: templates/web/base/admin/body.html:27 msgid "List all reported problems" @@ -1520,26 +1460,27 @@ msgstr "Yükleniyor..." #: templates/web/base/tokens/confirm_alert.html:1 #: templates/web/fixmystreet/alert/updates.html:1 msgid "Local RSS feeds and email alerts" -msgstr "" +msgstr "Yerel RSS bildirimi ve e-posta uyarısı" #: templates/web/base/alert/list.html:1 templates/web/base/alert/list.html:12 #: templates/web/base/alert/list.html:14 templates/web/base/alert/list.html:3 msgid "Local RSS feeds and email alerts for ‘%s’" -msgstr "" +msgstr "Yerel RSS bildirimi ve‘%s’ için e-posta uyarısı" #: templates/web/base/footer.html:13 templates/web/fixmystreet/footer.html:35 msgid "Local alerts" -msgstr "" +msgstr "Yerel uyarılar" #: templates/web/base/index-steps.html:25 msgid "Locate the problem on a map of the area" -msgstr "" +msgstr "Problemin bulunduÄŸu alandaki haritayı bul ve iÅŸaretle" #: templates/web/base/js/translation_strings.html:43 msgid "MAP" -msgstr "" +msgstr "HARÄ°TA" #: templates/web/base/js/translation_strings.html:45 +#: templates/web/base/maps/google-ol.html:13 msgid "Map" msgstr "Harita" @@ -1553,46 +1494,36 @@ msgstr "" #: templates/web/base/reports/index.html:24 msgid "Marked fixed/closed in the past eight weeks" -msgstr "" +msgstr "8 hafta önce halledilmiÅŸ/kapatılmış olarak iÅŸaretlendi" #: templates/web/base/reports/index.html:25 msgid "Marked fixed/closed more than eight weeks ago" -msgstr "" +msgstr "8 haftadan daha uzun bir süre önce halledilmiÅŸ/kapatılmış olarak iÅŸaretlendi" -#: templates/web/fixmystreet/contact/index.html:106 +#: templates/web/base/contact/index.html:98 msgid "Message" msgstr "Ä°leti" #: templates/web/zurich/admin/report_edit.html:284 -#, fuzzy msgid "Message to competent body:" -msgstr "Dışarıdan bir organ atamak:" +msgstr "" #: templates/web/zurich/admin/report_edit.html:282 -#, fuzzy msgid "Message to external body:" -msgstr "Dışarıdan bir organ atamak:" - -#: templates/web/base/contact/index.html:97 -msgid "Message:" -msgstr "Ä°leti:" +msgstr "" #: perllib/FixMyStreet/App/Controller/Open311.pm:445 msgid "Missing jurisdiction_id" -msgstr "" +msgstr "Eksik yetki_id" #: templates/web/zurich/admin/stats.html:34 msgid "Moderated by division within one working day" -msgstr "" +msgstr "Bir iÅŸ gününe bölünmüş bir ÅŸekilde yönetilmiÅŸtir" #: templates/web/base/admin/stats.html:11 msgid "Month" msgstr "Ay" -#: templates/web/base/report/display.html:34 -msgid "More problems nearby" -msgstr "Yakındaki diÄŸer problemler" - #: templates/web/base/admin/bodies.html:21 #: templates/web/base/admin/body-form.html:18 #: templates/web/base/admin/flagged.html:16 @@ -1600,11 +1531,11 @@ msgstr "Yakındaki diÄŸer problemler" #: templates/web/base/admin/list_updates.html:7 #: templates/web/base/admin/reports.html:13 #: templates/web/base/admin/users.html:15 -#: templates/web/base/auth/general.html:50 +#: templates/web/base/auth/general.html:89 +#: templates/web/base/report/new/form_user_loggedin.html:9 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:7 +#: templates/web/base/report/update/form_name.html:4 #: templates/web/base/reports/index.html:20 -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:9 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:44 -#: templates/web/fixmystreet/report/update-form.html:138 #: templates/web/zurich/admin/body-form.html:4 #: templates/web/zurich/auth/general.html:60 #: templates/web/zurich/report/new/fill_in_details_form.html:82 @@ -1618,7 +1549,7 @@ msgstr "Ä°sim" msgid "Name:" msgstr "Ä°sim:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:328 +#: perllib/FixMyStreet/Script/Reports.pm:107 msgid "Name: %s" msgstr "Ä°sim: %s" @@ -1627,29 +1558,24 @@ msgstr "Ä°sim: %s" msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:127 +#: perllib/FixMyStreet/Cobrand/UK.pm:128 msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:434 -#: perllib/FixMyStreet/Cobrand/Default.pm:474 +#: perllib/FixMyStreet/Cobrand/Default.pm:455 +#: perllib/FixMyStreet/Cobrand/Default.pm:495 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:267 +#: perllib/FixMyStreet/Script/Alerts.pm:290 msgid "" "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n" "\n" msgstr "" -#: templates/web/zurich/email_sent.html:5 -msgid "Nearly Done! Now check your email..." -msgstr "" - #: templates/web/base/auth/token.html:17 templates/web/base/email_sent.html:5 -#, fuzzy msgid "Nearly done! Now check your email…" -msgstr "E-posta adresinizi kontrol ediniz" +msgstr "" #: templates/web/base/reports/index.html:21 msgid "New <br>problems" @@ -1661,16 +1587,16 @@ msgstr "Yeni bölüm eklendi" #: perllib/FixMyStreet/App/Controller/Admin.pm:387 msgid "New category contact added" -msgstr "" +msgstr "Yeni kategori bilgisi eklendi" #: templates/web/zurich/admin/report_edit-sdm.html:113 #: templates/web/zurich/admin/report_edit.html:141 msgid "New internal note:" -msgstr "" +msgstr "Yeni iç bilgi notu: " #: db/alert_types.pl:18 db/alert_types.pl:22 msgid "New local problems on FixMyStreet" -msgstr "" +msgstr "FixMyStreet'taki yeni yerel problemler" #: templates/web/zurich/admin/report_edit-sdm.html:117 msgid "New note to DM:" @@ -1690,11 +1616,11 @@ msgstr "FixMyStreet'teki yeni problemler" #: db/alert_types.pl:34 msgid "New problems to {{COUNCIL}} on FixMyStreet" -msgstr "" +msgstr "FixMyStreet'teki {{COUNCIL}}'a yeni problemler " #: db/alert_types.pl:42 msgid "New problems within {{NAME}}'s boundary on FixMyStreet" -msgstr "" +msgstr "FixMyStreet'teki {{NAME}} sınırları içindeki yeni problemler" #: templates/web/zurich/admin/index-sdm.html:4 msgid "New reports" @@ -1706,9 +1632,8 @@ msgstr "Yeni durum" #: templates/web/zurich/admin/template_edit.html:9 #: templates/web/zurich/admin/templates.html:26 -#, fuzzy msgid "New template" -msgstr "Yeni durum" +msgstr "" #: templates/web/base/pagination.html:13 msgid "Next" @@ -1725,43 +1650,43 @@ msgstr "Sonraki" #: templates/web/base/admin/report_edit.html:75 #: templates/web/base/admin/update_edit.html:25 #: templates/web/base/questionnaire/creator_fixed.html:16 +#: templates/web/base/questionnaire/index.html:101 #: templates/web/base/questionnaire/index.html:53 -#: templates/web/base/questionnaire/index.html:92 msgid "No" msgstr "Hayır" #: templates/web/base/admin/user-form.html:33 msgid "No body" -msgstr "" +msgstr "Birim yok" #: templates/web/base/admin/stats.html:85 msgid "No council" -msgstr "" +msgstr "Kurul yok" #: perllib/FixMyStreet/DB/Result/Problem.pm:401 msgid "No council selected" -msgstr "" +msgstr "SeçilmiÅŸ kurul yok" #: templates/web/base/admin/edit-league.html:17 msgid "No edits have yet been made." -msgstr "" +msgstr "Åžuana kadar herhangi bir ekleme yapılmadı." #: templates/web/base/admin/flagged.html:25 msgid "No flagged problems found." -msgstr "" +msgstr "Ä°ÅŸaretlenen problemler bulunamadı." #: templates/web/base/admin/flagged.html:58 msgid "No flagged users found." -msgstr "" +msgstr "Ä°ÅŸaretlenen kullanıcılar bulunamadı." #: templates/web/zurich/admin/report_edit-sdm.html:138 #: templates/web/zurich/admin/report_edit.html:263 msgid "No further updates" -msgstr "" +msgstr "Güncelleme yok" #: templates/web/base/js/translation_strings.html:38 msgid "No result returned" -msgstr "" +msgstr "Herhangi bir geri dönüş olmamıştır" #: templates/web/base/admin/body-form.html:60 #: templates/web/base/admin/body-form.html:61 @@ -1773,7 +1698,7 @@ msgstr "" #: templates/web/base/report/_support.html:2 #: templates/web/base/report/_support.html:4 msgid "No supporters" -msgstr "" +msgstr "Destek saÄŸlayıcı yok" #: templates/web/base/admin/report_edit.html:41 msgid "None" @@ -1790,10 +1715,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:13 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:33 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:31 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:37 msgid "Not Responsible" msgstr "Sorumlu deÄŸildir" @@ -1801,13 +1724,12 @@ msgstr "Sorumlu deÄŸildir" #: perllib/FixMyStreet/Cobrand/Zurich.pm:937 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:13 -#, fuzzy msgid "Not contactable" -msgstr "Sorumlu deÄŸildir" +msgstr "" #: templates/web/zurich/admin/report_edit-sdm.html:108 msgid "Not for my subdivision" -msgstr "" +msgstr "Benim bölümüm için deÄŸil" #: templates/web/base/admin/questionnaire.html:6 msgid "Not reported before" @@ -1815,7 +1737,7 @@ msgstr "Daha önce bildirilmedi" #: templates/web/base/report/_main.html:62 msgid "Not reported to council" -msgstr "" +msgstr "Kurula bildirilmemiÅŸ" #: templates/web/base/admin/body.html:71 #: templates/web/base/admin/category_edit.html:95 @@ -1833,7 +1755,7 @@ msgstr "" msgid "Note:" msgstr "Not:" -#: templates/web/base/open311/index.html:73 +#: templates/web/base/open311/index.html:65 msgid "Note: <strong>%s</strong>" msgstr "Not:<strong>%s</strong>" @@ -1841,13 +1763,15 @@ msgstr "Not:<strong>%s</strong>" msgid "Notes from SDM to DM" msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:113 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:10 +#: templates/web/base/report/new/form_user_loggedout.html:14 +#: templates/web/base/report/new/form_user_loggedout.html:2 +#: templates/web/base/report/new/oauth_email_form.html:17 msgid "Now to submit your report…" -msgstr "" +msgstr "Åžimdi bildirimini&hellip kaydet;" -#: templates/web/base/report/update-form.html:86 -#: templates/web/fixmystreet/report/update-form.html:85 +#: templates/web/base/report/update-form.html:28 +#: templates/web/base/report/update/form_user_loggedout.html:13 +#: templates/web/base/report/update/form_user_loggedout.html:2 msgid "Now to submit your update…" msgstr "" @@ -1855,11 +1779,6 @@ msgstr "" msgid "OK" msgstr "Tamam" -#: templates/web/base/report/display.html:28 -#: templates/web/base/report/update.html:17 -msgid "Offensive? Unsuitable? Tell us" -msgstr "" - #: templates/web/base/reports/index.html:23 msgid "Old / unknown <br>problems" msgstr "Eski/ bilinmeyen <br>problemler" @@ -1870,15 +1789,15 @@ msgstr "Eski durum" #: templates/web/base/reports/index.html:25 msgid "Older <br>fixed" -msgstr "" +msgstr "GeçmiÅŸte <br>onarılmış" #: templates/web/base/reports/index.html:22 msgid "Older <br>problems" msgstr "Eski <br>sorunlar" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:45 +#: templates/web/base/report/new/form_report.html:15 msgid "One-line summary" -msgstr "" +msgstr "Tek-satırlık özet" #: perllib/FixMyStreet/Cobrand/Zurich.pm:176 #: perllib/FixMyStreet/Cobrand/Zurich.pm:909 @@ -1887,8 +1806,7 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:4 #: templates/web/base/admin/update_edit.html:28 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/report/update-form.html:30 -#: templates/web/fixmystreet/report/update-form.html:28 +#: templates/web/base/report/update/form_update.html:34 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:7 #: templates/web/zurich/admin/update_edit.html:18 @@ -1897,41 +1815,41 @@ msgstr "Aç" #: templates/web/base/reports/index.html:22 msgid "Open for more than four weeks, with an update within the past eight weeks" -msgstr "" +msgstr "GeçmiÅŸte 8 haftanın güncellemesi dahil olmak üzere ek olarak 4 hafta daha ulaşılabilir" #: templates/web/base/reports/index.html:23 msgid "Open, but not had any update in eight weeks" -msgstr "" +msgstr "Açık, fakat son 8 hafta içinde herhangi bir güncelleme yapılmamıştır" -#: templates/web/base/open311/index.html:70 +#: templates/web/base/open311/index.html:62 msgid "Open311 API for the mySociety FixMyStreet server" -msgstr "" +msgstr "mySociety FixMyStreet sunucusu için Open311 API " -#: templates/web/base/open311/index.html:80 +#: templates/web/base/open311/index.html:72 msgid "Open311 initiative web page" -msgstr "" +msgstr "Open311 giriÅŸ sayfası" -#: templates/web/base/open311/index.html:81 +#: templates/web/base/open311/index.html:73 msgid "Open311 specification" -msgstr "" +msgstr "Open311 özellikleri" #: templates/web/base/alert/_list.html:60 msgid "Or problems reported to:" -msgstr "" +msgstr "Veya 'e bildirilen sorunlar:" #: templates/web/base/alert/_list.html:36 msgid "Or you can subscribe to an alert based upon what ward or council you’re in:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1084 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:673 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:674 -#: perllib/FixMyStreet/DB/Result/Problem.pm:570 -#: perllib/FixMyStreet/DB/Result/Problem.pm:580 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1055 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:669 +#: perllib/FixMyStreet/DB/Result/Problem.pm:558 +#: perllib/FixMyStreet/DB/Result/Problem.pm:568 +#: perllib/FixMyStreet/DB/Result/Problem.pm:578 #: perllib/FixMyStreet/DB/Result/Problem.pm:590 -#: perllib/FixMyStreet/DB/Result/Problem.pm:602 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:397 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:412 +#: perllib/FixMyStreet/Script/Reports.pm:175 +#: perllib/FixMyStreet/Script/Reports.pm:190 msgid "Other" msgstr "DiÄŸer" @@ -1940,7 +1858,7 @@ msgid "Owner" msgstr "Sahibi" #: templates/web/base/errors/page_error_404_not_found.html:1 -#: templates/web/base/errors/page_error_404_not_found.html:3 +#: templates/web/base/errors/page_error_404_not_found.html:4 msgid "Page Not Found" msgstr "Sayfa bulunamadı" @@ -1954,50 +1872,50 @@ msgstr "Ebeveyn" msgid "Partial" msgstr "Kısmi" -#: templates/web/base/auth/general.html:53 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:68 -#: templates/web/fixmystreet/report/update-form.html:116 +#: templates/web/base/auth/general.html:92 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:31 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:6 #: templates/web/zurich/auth/general.html:32 #: templates/web/zurich/auth/general.html:63 msgid "Password (optional)" msgstr "Åžifre (isteÄŸe baÄŸlı)" #: templates/web/base/auth/change_password.html:25 -#: templates/web/base/auth/general.html:36 +#: templates/web/base/auth/general.html:72 msgid "Password:" msgstr "Åžifre:" #: templates/web/base/js/translation_strings.html:48 msgid "Permalink" -msgstr "" +msgstr "Permalink" #: templates/web/zurich/report/new/fill_in_details_form.html:88 msgid "Phone number" msgstr "Telefon numarası" -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:26 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:62 +#: templates/web/base/report/new/form_user_loggedin.html:26 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:25 msgid "Phone number (optional)" msgstr "Telefon numarası (isteÄŸe baÄŸlı)" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:306 +#: perllib/FixMyStreet/Script/Reports.pm:83 #: templates/web/base/admin/report_edit.html:63 -#: templates/web/base/report/new/fill_in_details_form.html:198 #: templates/web/zurich/admin/stats.html:39 msgid "Phone:" msgstr "Telefon:" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:66 -#: templates/web/fixmystreet/report/update-form.html:59 +#: templates/web/base/questionnaire/index.html:75 +#: templates/web/base/report/new/form_report.html:23 +#: templates/web/base/report/update/form_update.html:6 #: templates/web/zurich/admin/index-dm.html:29 #: templates/web/zurich/admin/index-sdm.html:24 #: templates/web/zurich/admin/reports.html:16 #: templates/web/zurich/admin/stats.html:37 -#: templates/web/zurich/report/new/fill_in_details_form.html:52 +#: templates/web/zurich/report/new/fill_in_details_form.html:45 msgid "Photo" msgstr "FotoÄŸraf" -#: perllib/FixMyStreet/App/Controller/Photo.pm:221 +#: perllib/FixMyStreet/App/Controller/Photo.pm:187 msgid "Photo is required." msgstr "" @@ -2005,19 +1923,13 @@ msgstr "" msgid "Photo required" msgstr "" -#: templates/web/base/questionnaire/index.html:80 -#: templates/web/base/report/new/fill_in_details_form.html:84 -#: templates/web/base/report/update-form.html:62 -msgid "Photo:" -msgstr "FotoÄŸraf:" - -#: templates/web/base/alert/list.html:26 +#: templates/web/base/alert/list.html:23 msgid "Photos of recent nearby reports" -msgstr "" +msgstr "Son zamanlarda bildirilen çevredeki fotoÄŸraflar " #: templates/web/base/js/translation_strings.html:30 msgid "Place pin on map" -msgstr "" +msgstr "Harita üzerine iÅŸaretleyin" #: perllib/FixMyStreet/Cobrand/Zurich.pm:949 #: perllib/FixMyStreet/Cobrand/Zurich.pm:955 @@ -2033,27 +1945,23 @@ msgstr "Planlanmış" #: templates/web/base/report/new/notes.html:5 msgid "Please be polite, concise and to the point." -msgstr "" +msgstr "Kibar, açık ve hedef odaklı olun." #: templates/web/base/auth/change_password.html:12 #: templates/web/base/auth/change_password.html:17 msgid "Please check the passwords and try again" msgstr "Åžifreyi kontrol ediniz ve tekrar deneyiniz" -#: templates/web/zurich/auth/token.html:16 -msgid "Please check your email" -msgstr "E-posta adresinizi kontrol ediniz" - -#: templates/web/base/auth/general.html:10 -#: templates/web/base/auth/general.html:16 +#: templates/web/base/auth/general.html:27 +#: templates/web/base/auth/general.html:33 #: templates/web/zurich/auth/general.html:3 #: templates/web/zurich/auth/general.html:9 msgid "Please check your email address is correct" msgstr "E-posta adresinizin doÄŸruluÄŸunu kontrol ediniz" #: perllib/FixMyStreet/App/Controller/Admin.pm:343 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:883 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:948 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:878 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:943 #: perllib/FixMyStreet/DB/Result/Problem.pm:412 #: templates/web/base/js/translation_strings.html:9 msgid "Please choose a category" @@ -2061,14 +1969,13 @@ msgstr "Kategori seçiniz" #: perllib/FixMyStreet/DB/Result/Problem.pm:418 msgid "Please choose a property type" -msgstr "" +msgstr "Bir özellik seçin" #: perllib/FixMyStreet/App/Controller/Admin.pm:378 msgid "Please correct the errors below" msgstr "Lütfen aÅŸağıdaki hataları düzeltiniz" -#: templates/web/base/contact/blurb.html:2 -#: templates/web/fixmystreet/contact/blurb.html:12 +#: templates/web/base/contact/blurb.html:12 msgid "" "Please do <strong>not</strong> report problems through this form; messages go to\n" "the team behind this site, not a council. To report a problem,\n" @@ -2080,11 +1987,17 @@ msgid "Please do not be abusive — abusing your council devalues the s msgstr "" #: perllib/FixMyStreet/App/Controller/Admin.pm:346 -#: perllib/FixMyStreet/DB/Result/Comment.pm:126 +#: perllib/FixMyStreet/DB/Result/Comment.pm:125 #: templates/web/base/js/translation_strings.html:2 msgid "Please enter a message" msgstr "Mesaj giriniz" +#: perllib/FixMyStreet/App/Controller/Admin.pm:1091 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1146 +#, fuzzy +msgid "Please enter a name" +msgstr "Lütfen isminizi giriniz" + #: templates/web/base/auth/change_password.html:12 #: templates/web/base/auth/change_password.html:15 #: templates/web/base/js/translation_strings.html:19 @@ -2097,10 +2010,10 @@ msgstr "Åžifre giriniz" msgid "Please enter a subject" msgstr "Konu giriniz" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1084 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1137 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1087 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1142 #: perllib/FixMyStreet/App/Controller/Admin.pm:345 -#: perllib/FixMyStreet/DB/Result/User.pm:127 +#: perllib/FixMyStreet/DB/Result/User.pm:133 #: templates/web/base/js/translation_strings.html:12 #: templates/web/base/js/translation_strings.html:16 msgid "Please enter a valid email" @@ -2117,9 +2030,9 @@ msgid "Please enter some details" msgstr "Lütfen bir kaç ayrıntı giriniz" #: perllib/FixMyStreet/App/Controller/Contact.pm:113 -#: perllib/FixMyStreet/DB/Result/User.pm:124 -#: templates/web/base/auth/general.html:10 -#: templates/web/base/auth/general.html:15 +#: perllib/FixMyStreet/DB/Result/User.pm:130 +#: templates/web/base/auth/general.html:27 +#: templates/web/base/auth/general.html:32 #: templates/web/base/js/translation_strings.html:11 #: templates/web/base/js/translation_strings.html:15 #: templates/web/zurich/auth/general.html:3 @@ -2127,7 +2040,7 @@ msgstr "Lütfen bir kaç ayrıntı giriniz" msgid "Please enter your email" msgstr "E-posta giriniz" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:7 +#: templates/web/base/report/new/form_user_loggedout_email.html:7 #: templates/web/zurich/report/new/fill_in_details_form.html:80 msgid "Please enter your email address" msgstr "Lütfen mail adresinizi giriniz" @@ -2136,15 +2049,15 @@ msgstr "Lütfen mail adresinizi giriniz" msgid "Please enter your first name" msgstr "Ad giriniz" -#: perllib/FixMyStreet/Cobrand/UK.pm:318 +#: perllib/FixMyStreet/Cobrand/UK.pm:319 #: templates/web/base/js/translation_strings.html:7 msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below" -msgstr "" +msgstr "Lütfen adınızı ve soyadınızı giriniz, kurullar için gereklidir – eÄŸer isminizin sitede kullanılmasını istemiyorsanız, aÅŸağıda bulunan kutucuktan tiki kaldırınız." #: perllib/FixMyStreet/App/Controller/Contact.pm:112 -#: perllib/FixMyStreet/DB/Result/Comment.pm:123 +#: perllib/FixMyStreet/DB/Result/Comment.pm:122 #: perllib/FixMyStreet/DB/Result/Problem.pm:406 -#: perllib/FixMyStreet/DB/Result/User.pm:120 +#: perllib/FixMyStreet/DB/Result/User.pm:126 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter your name" msgstr "Lütfen isminizi giriniz" @@ -2164,67 +2077,69 @@ msgstr "Konu baÅŸlığı giriniz" #: templates/web/base/auth/sign_out.html:5 #: templates/web/zurich/auth/sign_out.html:5 msgid "Please feel free to <a href=\"%s\">sign in again</a>, or go back to the <a href=\"/\">front page</a>." -msgstr "" +msgstr "Lütfen rahat bir ÅŸekilde <a href=\"%s\"> tekrar giriÅŸ yapın</a>, veya <a href=\"/\">bir önceki sayfaya dönün</a>." #: templates/web/base/report/new/fill_in_details_text.html:1 #: templates/web/base/report/new/fill_in_details_text.html:8 msgid "Please fill in details of the problem below." msgstr "Lütfen aÅŸağıdaki probleme ait ayrıntıları giriniz." -#: templates/web/zurich/report/new/fill_in_details_form.html:46 +#: templates/web/zurich/report/new/fill_in_details_form.html:72 msgid "Please fill in details of the problem." msgstr "Lütfen probleme ait ayrıntıları giriniz." -#: templates/web/base/report/new/fill_in_details_form.html:28 -#: templates/web/fixmystreet/report/new/sidebar.html:7 +#: templates/web/base/report/new/sidebar.html:7 #: templates/web/zurich/report/new/fill_in_details_form.html:20 msgid "Please fill in the form below with details of the problem, and describe the location as precisely as possible in the details box." -msgstr "" +msgstr "Lütfen aÅŸağıda verilen formu problemin detayları ile ilgili doldurunuz ve konumu detay kutucuÄŸu içerisine mümkün oldukça yakın bir ÅŸekilde tarif ediniz." #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:253 msgid "Please indicate whether you'd like to receive another questionnaire" -msgstr "" +msgstr "BaÅŸka bir anket doldurmak istediÄŸinizi belirtiniz." -#: templates/web/fixmystreet/report/updates-sidebar-notes.html:4 +#: templates/web/base/report/updates-sidebar-notes.html:2 msgid "Please note that updates are not sent to the council." -msgstr "" +msgstr "Güncellemeler kurula gönderilmemiÅŸtir." -#: templates/web/base/report/update-form.html:7 -msgid "Please note that updates are not sent to the council. If you leave your name it will be public. Your information will only be used in accordance with our <a href=\"/faq#privacy\">privacy policy</a>" -msgstr "" +#: templates/web/base/report/new/oauth_email_form.html:4 +#, fuzzy +msgid "Please note your report has <strong>not yet been sent</strong>." +msgstr "Bildiriminiz henüz <strong>gönderilmemiÅŸtir. Bir kategori seçiniz ve ayrıntılı bilgi ekleyiniz, sonra kaydediniz." -#: templates/web/base/report/new/fill_in_details_form.html:8 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:21 +#: templates/web/base/report/new/fill_in_details_form.html:20 #: templates/web/zurich/report/new/fill_in_details_form.html:11 msgid "Please note your report has <strong>not yet been sent</strong>. Choose a category and add further information below, then submit." +msgstr "Bildiriminiz henüz <strong>gönderilmemiÅŸtir. Bir kategori seçiniz ve ayrıntılı bilgi ekleyiniz, sonra kaydediniz." + +#: templates/web/base/report/display.html:26 +msgid "Please note your update has <strong>not yet been posted</strong>." msgstr "" #: templates/web/base/report/new/notes.html:1 #: templates/web/zurich/report/new/notes.html:1 msgid "Please note:" -msgstr "" +msgstr "Lütfen dikkat:" #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:256 msgid "Please provide some explanation as to why you're reopening this report" -msgstr "" +msgstr "Bu bildirimi neden paylaÅŸatığınza dair lütfen bir kaç açıklama yapın" #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:263 msgid "Please provide some text as well as a photo" -msgstr "" +msgstr "Hem metin hem de fotoÄŸraf ekleyiniz" #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:124 #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249 msgid "Please say whether you've ever reported a problem to your council before" -msgstr "" +msgstr "Bir kurula daha önce sorun bildirip bildirmediÄŸinizi belirtin" #: templates/web/zurich/admin/report_edit.html:208 -#, fuzzy msgid "Please select a body." -msgstr "Åžifre giriniz" +msgstr "" #: perllib/FixMyStreet/App/Controller/Alert.pm:80 msgid "Please select the feed you want" -msgstr "" +msgstr "Bilgilendirme seçiniz" #: perllib/FixMyStreet/App/Controller/Alert.pm:118 msgid "Please select the type of alert you want" @@ -2232,11 +2147,12 @@ msgstr "Ä°stediÄŸiniz bir bildiri ÅŸekli secin" #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:245 msgid "Please state whether or not the problem has been fixed" -msgstr "" +msgstr "Problemin giderilmiÅŸ veya giderilmemiÅŸ olması durumunu bildiriniz lütfen" #: perllib/FixMyStreet/App/Model/PhotoSet.pm:117 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:145 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:147 +#: templates/web/base/js/translation_strings.html:53 msgid "Please upload a JPEG image only" msgstr "Sadece JPEG formatı yükleyin" @@ -2244,18 +2160,14 @@ msgstr "Sadece JPEG formatı yükleyin" msgid "Please write a message" msgstr "Mesaj gönderin" -#: templates/web/fixmystreet/report/update-form.html:23 +#: templates/web/base/report/update/form_update.html:29 msgid "Please write your update here" msgstr "Güncellemeleri buraya yazınız" -#: templates/web/base/contact/index.html:100 -#: templates/web/base/report/update-form.html:110 -#: templates/web/base/report/update-form.html:132 -#: templates/web/base/report/update-form.html:72 -#: templates/web/fixmystreet/contact/index.html:113 -#: templates/web/fixmystreet/report/update-form.html:124 -#: templates/web/fixmystreet/report/update-form.html:71 -#: templates/web/fixmystreet/report/update-form.html:97 +#: templates/web/base/contact/index.html:105 +#: templates/web/base/report/update-form.html:24 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:14 +#: templates/web/base/report/update/form_user_loggedout_password.html:10 msgid "Post" msgstr "PaylaÅŸ" @@ -2265,7 +2177,7 @@ msgstr "%s Anonim olarak gönderildi" #: templates/web/base/report/updates.html:22 msgid "Posted by %s (<strong>%s</strong>) at %s" -msgstr "" +msgstr "%s (<strong>%s</strong>) tarafından %s 'te paylaşılmıştır" #: templates/web/base/report/updates.html:24 msgid "Posted by %s at %s" @@ -2283,12 +2195,9 @@ msgstr "Önceki" msgid "Privacy" msgstr "Gizlilik" -#: templates/web/base/faq/faq-en-gb.html:7 -#: templates/web/base/open311/index.html:7 -#: templates/web/base/static/privacy.html:1 -#: templates/web/base/static/privacy.html:2 -#: templates/web/base/static/privacy.html:9 -#: templates/web/fixmystreet/contact/index.html:11 +#: templates/web/base/about/_sidebar.html:5 +#: templates/web/base/about/privacy.html:1 +#: templates/web/base/about/privacy.html:2 msgid "Privacy and cookies" msgstr "" @@ -2306,28 +2215,28 @@ msgstr "Sorun" #: templates/web/base/admin/timeline.html:22 msgid "Problem %d created" -msgstr "" +msgstr "Problem %d oluÅŸturuldu" #: templates/web/base/admin/timeline.html:24 msgid "Problem %s confirmed" -msgstr "" +msgstr "Problem %s onaylandı" #: templates/web/base/admin/timeline.html:26 msgid "Problem %s sent to council %s" -msgstr "" +msgstr "Problem %s kurula gönderildi %s" -#: templates/web/base/admin/index.html:46 +#: templates/web/base/admin/index.html:39 #: templates/web/zurich/admin/index.html:9 msgid "Problem breakdown by state" -msgstr "" +msgstr "Sorun devlet tarafından meydana gelmiÅŸtir" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1055 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1058 msgid "Problem marked as open." -msgstr "" +msgstr "Problem çözülmemiÅŸ olarak iÅŸaretlenmiÅŸtir." #: templates/web/base/admin/questionnaire.html:21 msgid "Problem state change based on survey results" -msgstr "" +msgstr "AraÅŸtırma sonucu göz önünde bulundurularak problemin durumundaki deÄŸiÅŸim" #: templates/web/base/admin/flagged.html:10 msgid "Problems" @@ -2335,75 +2244,71 @@ msgstr "Sorunlar" #: templates/web/base/around/_updates.html:1 msgid "Problems in this area" -msgstr "" +msgstr "Bu bölgedeki problemler" -#: templates/web/fixmystreet/report/display.html:43 +#: templates/web/base/report/display_tools.html:19 msgid "Problems nearby" -msgstr "" +msgstr "Çevredeki problemler" -#: templates/web/fixmystreet/report/display.html:41 +#: templates/web/base/report/display_tools.html:17 msgid "Problems on the map" -msgstr "" +msgstr "Haritadaki problemler" #: db/alert_types.pl:14 msgid "Problems recently reported fixed on FixMyStreet" -msgstr "" +msgstr "FixMyStreet'te kısa bir süre önce onarıldı olarak bildirilen problemler" #: templates/web/base/alert/_list.html:21 msgid "Problems within %.1fkm of this location" -msgstr "" +msgstr "Konumun %.1fkm içerisinde yer alan sorunlar" -#: perllib/FixMyStreet/Cobrand/Default.pm:642 +#: perllib/FixMyStreet/Cobrand/Default.pm:663 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:120 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:139 -#: perllib/FixMyStreet/Cobrand/UK.pm:207 +#: perllib/FixMyStreet/Cobrand/UK.pm:208 msgid "Problems within %s" -msgstr "" +msgstr "%s deki problemler" #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:128 -#: perllib/FixMyStreet/Cobrand/UK.pm:221 +#: perllib/FixMyStreet/Cobrand/UK.pm:222 msgid "Problems within %s ward" -msgstr "" +msgstr "%s semtindeki sorunlar" #. ("First %s is the body name, second %s the site name") #: templates/web/base/reports/body.html:0 #: templates/web/base/reports/body.html:24 -#, fuzzy msgid "Problems within %s, %s" -msgstr "%s içerisindeki problemlerle alakalı RSS besleme" +msgstr "" #: templates/web/base/alert/_list.html:42 msgid "Problems within the boundary of:" -msgstr "" +msgstr "Ä°lgilenilen kısım içinde yer alan sorunlar:" #: templates/web/base/admin/report_edit.html:45 msgid "Property address:" -msgstr "" +msgstr "Emlak adresi:" #: templates/web/base/report/new/category.html:8 msgid "Property type:" -msgstr "" +msgstr "Emlak türü:" -#: templates/web/base/report/update-form.html:3 -#: templates/web/fixmystreet/report/update-form.html:4 +#: templates/web/base/report/update-form.html:6 msgid "Provide an update" -msgstr "" +msgstr "Güncellemeye izin ver" -#: templates/web/base/auth/general.html:56 +#: templates/web/base/auth/general.html:95 msgid "Providing a name and password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." -msgstr "" +msgstr "Ä°sim ve ÅŸifre edinmek isteÄŸe baÄŸlıdır, fakat ÅŸifre almış olmanız durumunda sorunları bildirmek, güncellemeleri yapmak ve bildirimleri yönetmek daha kolay olacaktır." -#: templates/web/base/report/new/fill_in_details_form.html:156 -#: templates/web/base/report/update-form.html:129 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:71 -#: templates/web/fixmystreet/report/update-form.html:119 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:34 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:9 msgid "Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." -msgstr "" +msgstr "Åžifre saÄŸlamak isteÄŸe baÄŸlıdır, fakat ÅŸifre almış olmanız durumunda sorunları bildirmek, güncellemeleri yapmak ve bildirimleri yönetmek daha kolay olacaktır." #: templates/web/zurich/admin/report_edit.html:245 #: templates/web/zurich/admin/report_edit.html:272 msgid "Public response:" -msgstr "" +msgstr "Toplumsal geri bildirim:" #: templates/web/zurich/admin/report_edit.html:121 #: templates/web/zurich/admin/stats.html:38 @@ -2415,35 +2320,34 @@ msgstr "FotoÄŸraf yayınla" #: templates/web/base/questionnaire/index.html:12 #: templates/web/base/questionnaire/index.html:5 msgid "Questionnaire" -msgstr "" +msgstr "Anket" #: templates/web/base/admin/timeline.html:30 msgid "Questionnaire %d answered for problem %d, %s to %s" -msgstr "" +msgstr "%s den %s 'e cevaplanan %d sorunun %d anketi" #: templates/web/base/admin/timeline.html:28 msgid "Questionnaire %d sent for problem %d" -msgstr "" +msgstr "%d sorunu için gönderilen %d anket" #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:200 msgid "Questionnaire filled in by problem reporter" -msgstr "" +msgstr "Anket sorun bildirici tarafından dolduruldu" #: templates/web/base/alert/_list.html:22 #: templates/web/base/around/display_location.html:1 #: templates/web/base/around/display_location.html:3 -#: templates/web/base/report/display.html:50 +#: templates/web/base/report/display_tools.html:34 #: templates/web/base/reports/_rss.html:1 #: templates/web/fixmystreet/alert/updates.html:9 -#: templates/web/fixmystreet/report/display.html:58 msgid "RSS feed" msgstr "RSS besleme" -#: perllib/FixMyStreet/Cobrand/UK.pm:250 perllib/FixMyStreet/Cobrand/UK.pm:262 +#: perllib/FixMyStreet/Cobrand/UK.pm:251 perllib/FixMyStreet/Cobrand/UK.pm:263 msgid "RSS feed for %s" msgstr "%s için RSS Besleme" -#: perllib/FixMyStreet/Cobrand/UK.pm:256 perllib/FixMyStreet/Cobrand/UK.pm:268 +#: perllib/FixMyStreet/Cobrand/UK.pm:257 perllib/FixMyStreet/Cobrand/UK.pm:269 msgid "RSS feed for %s ward, %s" msgstr "%s için %s gözetiminde RSS besleme" @@ -2451,11 +2355,11 @@ msgstr "%s için %s gözetiminde RSS besleme" #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:163 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:173 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:181 -#: perllib/FixMyStreet/Cobrand/UK.pm:276 perllib/FixMyStreet/Cobrand/UK.pm:288 +#: perllib/FixMyStreet/Cobrand/UK.pm:277 perllib/FixMyStreet/Cobrand/UK.pm:289 msgid "RSS feed of %s" msgstr "%s için RSS besleme" -#: perllib/FixMyStreet/Cobrand/UK.pm:281 perllib/FixMyStreet/Cobrand/UK.pm:293 +#: perllib/FixMyStreet/Cobrand/UK.pm:282 perllib/FixMyStreet/Cobrand/UK.pm:294 msgid "RSS feed of %s, within %s ward" msgstr "%s içinde %s gözetimiyle RSS besleme" @@ -2467,15 +2371,15 @@ msgstr "Civardaki problemlerle alakalı RSS besleme" msgid "RSS feed of problems in this %s" msgstr "%s ile ilgili problemeleri RSS besleme" -#: perllib/FixMyStreet/Cobrand/Default.pm:643 +#: perllib/FixMyStreet/Cobrand/Default.pm:664 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:121 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:138 -#: perllib/FixMyStreet/Cobrand/UK.pm:214 +#: perllib/FixMyStreet/Cobrand/UK.pm:215 msgid "RSS feed of problems within %s" msgstr "%s içerisindeki problemlerle alakalı RSS besleme" #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:127 -#: perllib/FixMyStreet/Cobrand/UK.pm:220 +#: perllib/FixMyStreet/Cobrand/UK.pm:221 msgid "RSS feed of problems within %s ward" msgstr "%s bölgesi içerisindeki problemlerle alakalı RSS besleme" @@ -2484,98 +2388,93 @@ msgstr "%s bölgesi içerisindeki problemlerle alakalı RSS besleme" msgid "RSS feed of recent local problems" msgstr "Son günlerdeki yerel problemlerle alakalı RSS besleme" -#: templates/web/base/report/display.html:50 +#: templates/web/base/report/display_tools.html:34 #: templates/web/fixmystreet/alert/updates.html:9 -#: templates/web/fixmystreet/report/display.html:58 msgid "RSS feed of updates to this problem" msgstr "Bu problemin güncellemelerini RSS olarak besle" #: templates/web/base/alert/updates.html:9 -#: templates/web/base/report/display.html:41 +#: templates/web/base/report/display_tools.html:36 #: templates/web/fixmystreet/alert/updates.html:14 -#: templates/web/fixmystreet/report/display.html:60 msgid "Receive email when updates are left on this problem." -msgstr "" +msgstr "Bu sorunda herhangi bir güncelleme olduÄŸunda e-posta ile bildir." #. ("%s is the site name") #: templates/web/base/around/display_location.html:0 #: templates/web/base/around/display_location.html:33 -#, fuzzy msgid "Recent local problems, %s" -msgstr "Son günlerdeki yerel problemlerle alakalı RSS besleme" +msgstr "" #: templates/web/base/reports/index.html:24 msgid "Recently <br>fixed" -msgstr "" +msgstr "Yakın zamanda <br>onarılmış" #: templates/web/base/front/recent.html:11 msgid "Recently reported problems" -msgstr "" +msgstr "Yakın zamanda bildirilen problemler" #: templates/web/zurich/report/new/notes.html:5 msgid "Remember that FixMyStreet is primarily for reporting physical problems that can be fixed. If your problem is not appropriate for submission via this site remember that you can contact your council directly using their own website." -msgstr "" +msgstr "Åžehir Dedektifi uygulamasının temel amacının, kamusal alanlardaki alt ve üst yapıları ile alakalı problemlerin ilgili kurumlara iletilmesini saÄŸlamak olduÄŸunu hatırlatır, bahse konu alanlar dışındaki problem veya ÅŸikayetlerin ilgili kuruma direk olarak iletilmesini tavsiye ederiz." #: templates/web/base/admin/report_blocks.html:46 msgid "Remove flag" -msgstr "" +msgstr "Ä°ÅŸareti kaldır" -#: templates/web/base/admin/report_edit.html:92 -#: templates/web/base/admin/update_edit.html:62 +#: templates/web/base/admin/report_edit.html:93 +#: templates/web/base/admin/update_edit.html:67 #: templates/web/zurich/admin/update_edit.html:35 msgid "Remove photo (can't be undone!)" -msgstr "" +msgstr "FotoÄŸrafı kaldır (mümkün olmayabilir)" #: templates/web/zurich/admin/report_edit.html:243 -#, fuzzy msgid "Reply to user:" -msgstr "kullanıcı düzenle" +msgstr "" #: templates/web/fixmystreet/header_logo.html:2 msgid "Report" -msgstr "" +msgstr "Bildirim" #: templates/web/base/footer.html:7 templates/web/fixmystreet/footer.html:26 #: templates/web/fixmystreet/header_logo.html:2 #: templates/web/zurich/footer.html:18 #: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" -msgstr "" +msgstr "Bir problem bildir" -#: templates/web/fixmystreet/report/display.html:32 +#: templates/web/base/report/display_tools.html:8 msgid "Report abuse" -msgstr "" +msgstr "Kötüye kullanım bildir" #: perllib/FixMyStreet/App/Controller/Rss.pm:291 msgid "Report on %s" -msgstr "" +msgstr "%s 'e bildir" #: templates/web/base/report/new/fill_in_details_form.html:1 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:2 +#: templates/web/base/report/new/login_success_form.html:1 +#: templates/web/base/report/new/oauth_email_form.html:1 msgid "Report your problem" -msgstr "" +msgstr "Probleminizi bildirin" #: templates/web/base/around/intro.html:1 #: templates/web/zurich/around/intro.html:1 msgid "Report, view, or discuss local problems" -msgstr "" +msgstr "Yerel problemleri bildir, göster ve tartış" -#: perllib/FixMyStreet/DB/Result/Problem.pm:585 -#: templates/web/base/contact/index.html:50 -#: templates/web/fixmystreet/contact/index.html:65 +#: perllib/FixMyStreet/DB/Result/Problem.pm:573 +#: templates/web/base/contact/index.html:57 msgid "Reported anonymously at %s" -msgstr "" +msgstr "%s 'e ananim olarak bildirilmiÅŸ" #: templates/web/base/admin/questionnaire.html:5 #: templates/web/base/questionnaire/index.html:62 msgid "Reported before" -msgstr "" +msgstr "Önceden bildirilmiÅŸ" -#: perllib/FixMyStreet/DB/Result/Problem.pm:608 -#: templates/web/base/contact/index.html:52 -#: templates/web/fixmystreet/contact/index.html:67 +#: perllib/FixMyStreet/DB/Result/Problem.pm:596 +#: templates/web/base/contact/index.html:59 msgid "Reported by %s at %s" -msgstr "" +msgstr "%s tarafından %s de bildirilmiÅŸtir" #: templates/web/zurich/admin/report_edit-sdm.html:58 #: templates/web/zurich/admin/report_edit.html:86 @@ -2584,41 +2483,40 @@ msgstr "" #: templates/web/zurich/report/_main.html:2 msgid "Reported in the %s category" -msgstr "" +msgstr "%s kategorisine bildirilmiÅŸtir" -#: perllib/FixMyStreet/DB/Result/Problem.pm:581 +#: perllib/FixMyStreet/DB/Result/Problem.pm:569 msgid "Reported in the %s category anonymously at %s" -msgstr "" +msgstr "%s kategorisine anonim olarak %s de bildirilmiÅŸtir" -#: perllib/FixMyStreet/DB/Result/Problem.pm:603 +#: perllib/FixMyStreet/DB/Result/Problem.pm:591 msgid "Reported in the %s category by %s at %s" -msgstr "" +msgstr " %s tarafından %s kategorisinde %s de bildirilmiÅŸtir" -#: perllib/FixMyStreet/DB/Result/Problem.pm:577 +#: perllib/FixMyStreet/DB/Result/Problem.pm:565 msgid "Reported via %s anonymously at %s" -msgstr "" +msgstr "%s aracılığıyla anonim olarak %s de bildirilmiÅŸtir" -#: perllib/FixMyStreet/DB/Result/Problem.pm:599 +#: perllib/FixMyStreet/DB/Result/Problem.pm:587 msgid "Reported via %s by %s at %s" -msgstr "" +msgstr "%s yoluyla %s tarafından %s da bildirilmiÅŸtir" -#: perllib/FixMyStreet/DB/Result/Problem.pm:573 +#: perllib/FixMyStreet/DB/Result/Problem.pm:561 msgid "Reported via %s in the %s category anonymously at %s" -msgstr "" +msgstr "%s aracılığıyla %s kategorisine anonim olarak %s de bildirilmiÅŸtir" -#: perllib/FixMyStreet/DB/Result/Problem.pm:593 +#: perllib/FixMyStreet/DB/Result/Problem.pm:581 msgid "Reported via %s in the %s category by %s at %s" -msgstr "" +msgstr " %s tarafından %s kategorisinde %s aracılığıyla %s 'e bildirilen raporlar" #: templates/web/base/reports/index.html:21 msgid "Reported within the last four weeks" -msgstr "" +msgstr "Son dört haftada bildirilenler" #: templates/web/zurich/admin/report_edit-sdm.html:36 #: templates/web/zurich/admin/report_edit.html:55 -#, fuzzy msgid "Reported:" -msgstr "Tüm Bildirimler" +msgstr "" #: templates/web/base/around/index.html:2 #: templates/web/base/js/translation_strings.html:41 @@ -2626,29 +2524,29 @@ msgstr "Tüm Bildirimler" #: templates/web/base/report/new/fill_in_details.html:5 #: templates/web/zurich/report/new/fill_in_details_form.html:2 msgid "Reporting a problem" -msgstr "" +msgstr "Bir problemin bildirilmesi" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1277 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1286 #: perllib/FixMyStreet/Cobrand/Zurich.pm:384 #: templates/web/zurich/header.html:60 msgid "Reports" -msgstr "" +msgstr "Bildirimler" -#: perllib/FixMyStreet/Cobrand/UK.pm:327 perllib/FixMyStreet/Cobrand/UK.pm:331 +#: perllib/FixMyStreet/Cobrand/UK.pm:328 perllib/FixMyStreet/Cobrand/UK.pm:332 msgid "Reports are limited to %s characters in length. Please shorten your report" -msgstr "" +msgstr "Bildirimler %s karakter olarak sınırlıdır. Bildiriminizi kısaltınız lütfen" #: templates/web/zurich/admin/index-sdm.html:7 msgid "Reports awaiting approval" -msgstr "" +msgstr "Onay bekleyen bildirimler" #: templates/web/zurich/admin/index-sdm.html:10 msgid "Reports published" -msgstr "" +msgstr "Yayınlanmış bildirimler" #: templates/web/base/admin/report_edit.html:67 msgid "Resend report" -msgstr "" +msgstr "Bildiriyi tekrar gönder" #: templates/web/zurich/admin/template_edit.html:1 #: templates/web/zurich/admin/template_edit.html:4 @@ -2659,39 +2557,40 @@ msgstr "" #: templates/web/base/js/translation_strings.html:28 msgid "Right place?" -msgstr "" +msgstr "DoÄŸru yer mi?" #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:167 #: perllib/FixMyStreet/Geocode/OSM.pm:152 msgid "Road operator for this named road (derived from road reference number and type): %s" -msgstr "" +msgstr "Bu isimli yol için yol operatörü (yol referans numarası ve türünden elde edilmiÅŸ): %s" #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:164 #: perllib/FixMyStreet/Geocode/OSM.pm:149 msgid "Road operator for this named road (from OpenStreetMap): %s" -msgstr "" +msgstr "Bu isimli yol için yol operatörü (OpenStreetMap'ten): %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1495 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1500 -#: templates/web/base/admin/report_edit.html:88 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1508 +#: templates/web/base/admin/report_edit.html:90 +#: templates/web/base/admin/update_edit.html:64 #: templates/web/zurich/admin/report_edit.html:116 msgid "Rotate Left" -msgstr "" +msgstr "Sola YerleÅŸtir" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1495 -#: templates/web/base/admin/report_edit.html:89 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 +#: templates/web/base/admin/report_edit.html:91 +#: templates/web/base/admin/update_edit.html:65 #: templates/web/zurich/admin/report_edit.html:117 msgid "Rotate Right" -msgstr "" +msgstr "SaÄŸa YerleÅŸtir" #: templates/web/zurich/admin/report_edit.html:388 msgid "Rotating this photo will discard unsaved changes to the report." msgstr "" #: templates/web/base/js/translation_strings.html:46 -#: templates/web/base/maps/google-ol.html:13 msgid "Satellite" -msgstr "" +msgstr "Uydu" #: templates/web/base/admin/body.html:208 #: templates/web/base/admin/category_edit.html:84 @@ -2703,7 +2602,7 @@ msgstr "DeÄŸiÅŸiklikleri kaydet" #: templates/web/base/admin/reports.html:1 #: templates/web/zurich/admin/reports.html:1 msgid "Search Reports" -msgstr "" +msgstr "Bildirimleri ara" #: templates/web/base/admin/users.html:1 msgid "Search Users" @@ -2711,7 +2610,7 @@ msgstr "Kullanıcı Ara" #: templates/web/zurich/header.html:82 msgid "Search reports" -msgstr "" +msgstr "Bildirimleri ara" #: templates/web/base/admin/reports.html:5 #: templates/web/base/admin/users.html:8 @@ -2721,7 +2620,7 @@ msgstr "Ara:" #: templates/web/base/admin/reports.html:26 msgid "Searching found no reports." -msgstr "" +msgstr "Aranan sonuç bulunamadı." #: templates/web/base/admin/users.html:41 msgid "Searching found no users." @@ -2730,11 +2629,11 @@ msgstr "Arama sonucu kullanıcı bulunamadı" #: templates/web/base/admin/body-form.html:33 #: templates/web/zurich/admin/body-form.html:16 msgid "Select a body" -msgstr "" +msgstr "Bir bölüm seç" #: templates/web/base/reports/index.html:9 msgid "Select a particular council to see the reports sent there." -msgstr "" +msgstr "Oraya gönderilmiÅŸ bildirimleri görmek için, belirli bir kurul seç " #: templates/web/base/admin/body-form.html:71 #: templates/web/zurich/admin/body-form.html:26 @@ -2746,11 +2645,10 @@ msgid "Select which type of alert you’d like and click the button for an RSS f msgstr "" #: perllib/FixMyStreet/Cobrand/Zurich.pm:835 -#, fuzzy msgid "Sent report back" -msgstr "Bildirileri aç" +msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:708 +#: perllib/FixMyStreet/DB/Result/Problem.pm:696 msgid "Sent to %s %s later" msgstr "%s %s sonra gönder" @@ -2761,17 +2659,15 @@ msgstr "gönderildi:" #: templates/web/base/admin/report_edit.html:71 #: templates/web/zurich/admin/stats.html:45 msgid "Service:" -msgstr "" +msgstr "Hizmet:" -#: templates/web/fixmystreet/report/display.html:38 +#: templates/web/base/report/display_tools.html:14 msgid "Share" msgstr "PaylaÅŸ" -#: templates/web/base/report/new/fill_in_details_form.html:193 -#: templates/web/base/report/update-form.html:158 -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:23 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:59 -#: templates/web/fixmystreet/report/update-form.html:146 +#: templates/web/base/report/new/form_user_loggedin.html:23 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:22 +#: templates/web/base/report/update/form_name.html:15 msgid "Show my name publicly" msgstr "Ä°smimi açıkça göster " @@ -2781,11 +2677,11 @@ msgstr "Eskileri göster" #: templates/web/base/around/display_location.html:58 msgid "Show pins" -msgstr "" +msgstr "Ä°ÅŸaretlemeleri göster" +#: templates/web/base/auth/general.html:100 #: templates/web/base/auth/general.html:3 -#: templates/web/base/auth/general.html:40 -#: templates/web/base/auth/general.html:61 +#: templates/web/base/auth/general.html:76 #: templates/web/zurich/auth/general.html:18 #: templates/web/zurich/auth/general.html:35 msgid "Sign in" @@ -2803,16 +2699,16 @@ msgstr "Çıkış" #: templates/web/base/report/new/fill_in_details_text.html:1 msgid "Some categories may require additional information." -msgstr "" +msgstr "Bazı kategoriler ek bilgiler gerektirebilir." #: templates/web/base/admin/body-form.html:149 #: templates/web/base/admin/body-form.html:150 msgid "" "Some endpoints require an <strong>API key</strong> to indicate that the reports are being\n" " sent from your FixMyStreet installation." -msgstr "" +msgstr "Son aÅŸamaların bazıları <strong>API key</strong> FixMyStreet kurulumundan bildirimlerin geldiÄŸine iÅŸaret etmektedir." -#: templates/web/base/alert/index.html:42 +#: templates/web/base/alert/index.html:40 msgid "Some photos of recent reports" msgstr "Son bildirimlerden bazı fotograflar" @@ -2820,11 +2716,11 @@ msgstr "Son bildirimlerden bazı fotograflar" #: perllib/FixMyStreet/App/View/Email.pm:32 #: perllib/FixMyStreet/App/View/Web.pm:52 msgid "Some text to localize" -msgstr "" +msgstr "Konumun belirlenebilmesi için tarif" -#: perllib/FixMyStreet/Cobrand/UK.pm:78 +#: perllib/FixMyStreet/Cobrand/UK.pm:79 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover." -msgstr "" +msgstr "Ãœzgünüz, bu posta kodu bizim sınırlarımız dışında yer almaktadır." #: templates/web/base/auth/token.html:8 msgid "Sorry, that wasn’t a valid link" @@ -2834,23 +2730,35 @@ msgstr "" msgid "Sorry, there has been an error confirming your problem." msgstr "Ãœzgünüz, sorununuzu onaylarken bir hata oluÅŸtu." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:221 -#: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:37 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:216 +#: perllib/FixMyStreet/Geocode.pm:38 perllib/FixMyStreet/Geocode/Bing.pm:38 #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:56 #: perllib/FixMyStreet/Geocode/OSM.pm:48 msgid "Sorry, we could not find that location." -msgstr "" +msgstr "Ãœzgünüz, konum bulunamadı." -#: perllib/FixMyStreet/Geocode/Bing.pm:34 +#: templates/web/base/auth/general.html:9 +#: templates/web/base/report/display.html:21 +#: templates/web/base/report/new/fill_in_details_form.html:23 +#, fuzzy +msgid "Sorry, we could not log you in. Please fill in the form below." +msgstr "Ãœzgünüz, konum ayrıştırılamadı. Daha sonra tekrar deneyin." + +#: perllib/FixMyStreet/Geocode/Bing.pm:35 #: perllib/FixMyStreet/Geocode/Google.pm:45 #: perllib/FixMyStreet/Geocode/Zurich.pm:88 msgid "Sorry, we could not parse that location. Please try again." -msgstr "" +msgstr "Ãœzgünüz, konum ayrıştırılamadı. Daha sonra tekrar deneyin." #: perllib/FixMyStreet/App/Model/PhotoSet.pm:134 msgid "Sorry, we couldn't save your image(s), please try again." msgstr "" +#: perllib/FixMyStreet/App/Controller/AuthSS.pm:301 +#, fuzzy +msgid "Sorry, you can not log in with Facebook. Please try again later." +msgstr "Bu sayfa görüntülenirken bir sorun oluÅŸtu. Lütfen daha sonra tekrar deneyin." + #: templates/web/base/admin/stats.html:64 msgid "Start Date:" msgstr "BaÅŸlangıç Tarihi:" @@ -2859,13 +2767,12 @@ msgstr "BaÅŸlangıç Tarihi:" #: templates/web/base/admin/flagged.html:18 #: templates/web/base/admin/list_updates.html:11 #: templates/web/base/admin/reports.html:15 -#: templates/web/fixmystreet/report/update-form.html:26 +#: templates/web/base/report/update/form_update.html:32 msgid "State" msgstr "Devlet" #: templates/web/base/admin/report_edit.html:47 #: templates/web/base/admin/update_edit.html:27 -#: templates/web/base/report/update-form.html:28 #: templates/web/zurich/admin/report_edit-sdm.html:73 #: templates/web/zurich/admin/report_edit.html:101 #: templates/web/zurich/admin/report_edit.html:155 @@ -2873,12 +2780,12 @@ msgstr "Devlet" msgid "State:" msgstr "Devlet:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1282 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1291 #: perllib/FixMyStreet/Cobrand/Zurich.pm:387 #: templates/web/base/admin/stats.html:1 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:73 msgid "Stats" -msgstr "" +msgstr "Ä°statistik" #: templates/web/zurich/admin/index-dm.html:23 #: templates/web/zurich/admin/index-sdm.html:21 @@ -2888,55 +2795,50 @@ msgstr "Durum" #: templates/web/base/report/updates.html:10 msgid "Still open, via questionnaire, %s" -msgstr "" +msgstr "Henüz çözülmemiÅŸ, anket aracılığıyla, %s" #: templates/web/zurich/admin/report_edit-sdm.html:25 #: templates/web/zurich/admin/report_edit.html:26 msgid "Street View" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:406 +#: perllib/FixMyStreet/Script/Reports.pm:184 msgid "Subcategory: %s" -msgstr "" +msgstr "Alt kategori: %s" #: templates/web/zurich/admin/index-dm.html:27 msgid "Subdivision/Body" -msgstr "" +msgstr "Alt bölüm/Bölüm" -#: templates/web/fixmystreet/contact/index.html:98 +#: templates/web/base/contact/index.html:90 msgid "Subject" -msgstr "" +msgstr "Konu" #: templates/web/base/admin/report_edit.html:19 -#: templates/web/base/contact/index.html:88 -#: templates/web/base/report/new/fill_in_details_form.html:53 #: templates/web/zurich/admin/report_edit.html:39 msgid "Subject:" -msgstr "" +msgstr "Konu:" #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/fill_in_details_form.html:137 -#: templates/web/base/report/new/fill_in_details_form.html:159 -#: templates/web/base/report/new/fill_in_details_form.html:96 -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:36 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:23 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:76 +#: templates/web/base/report/new/form_user_loggedin.html:36 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:39 +#: templates/web/base/report/new/form_user_loggedout_password.html:11 #: templates/web/zurich/report/new/fill_in_details_form.html:96 msgid "Submit" -msgstr "" +msgstr "Kaydet" -#: templates/web/base/admin/report_edit.html:95 -#: templates/web/base/admin/update_edit.html:65 +#: templates/web/base/admin/report_edit.html:101 +#: templates/web/base/admin/update_edit.html:75 #: templates/web/base/admin/user-form.html:56 #: templates/web/zurich/admin/report_edit-sdm.html:137 #: templates/web/zurich/admin/report_edit.html:268 #: templates/web/zurich/admin/update_edit.html:38 msgid "Submit changes" -msgstr "" +msgstr "DeÄŸiÅŸiklikleri kaydet" -#: templates/web/base/questionnaire/index.html:97 +#: templates/web/base/questionnaire/index.html:106 msgid "Submit questionnaire" -msgstr "" +msgstr "Anketi kaydet" #: perllib/FixMyStreet/Cobrand/Zurich.pm:171 #: perllib/FixMyStreet/Cobrand/Zurich.pm:902 @@ -2947,20 +2849,19 @@ msgstr "" #: templates/web/zurich/admin/index-sdm.html:21 #: templates/web/zurich/admin/reports.html:13 msgid "Submitted" -msgstr "" +msgstr "Kaydedildi" #: templates/web/base/alert/updates.html:17 -#: templates/web/base/report/display.html:46 +#: templates/web/base/report/display_tools.html:41 #: templates/web/fixmystreet/alert/updates.html:23 -#: templates/web/fixmystreet/report/display.html:65 msgid "Subscribe" -msgstr "" +msgstr "Kaydet" #: templates/web/base/alert/_list.html:92 msgid "Subscribe me to an email alert" -msgstr "" +msgstr "E-posta uyarısını benim için onayla" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1275 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1284 #: perllib/FixMyStreet/Cobrand/Zurich.pm:383 #: templates/web/base/admin/bodies.html:25 #: templates/web/base/admin/index.html:1 @@ -2977,15 +2878,15 @@ msgstr "Özet" #: templates/web/zurich/reports/index.html:0 #: templates/web/zurich/reports/index.html:4 msgid "Summary reports" -msgstr "" +msgstr "Özet bildirimler" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1279 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1288 msgid "Survey" -msgstr "" +msgstr "Anket" #: templates/web/base/admin/questionnaire.html:1 msgid "Survey Results" -msgstr "" +msgstr "Anket Sonuçları" #: templates/web/zurich/admin/template_edit.html:7 msgid "Template «%s»" @@ -2993,32 +2894,31 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/Zurich.pm:394 #: templates/web/zurich/header.html:77 -#, fuzzy msgid "Templates" -msgstr "Güncellemeler" +msgstr "" #: templates/web/base/admin/list_updates.html:12 #: templates/web/zurich/admin/templates.html:9 msgid "Text" -msgstr "" +msgstr "Metin" #: templates/web/base/admin/body.html:28 msgid "Text only version" -msgstr "" +msgstr "Salt metin sürümü " #: templates/web/base/admin/update_edit.html:20 #: templates/web/zurich/admin/template_edit.html:24 #: templates/web/zurich/admin/update_edit.html:12 msgid "Text:" -msgstr "" +msgstr "Metin:" #: templates/web/base/tokens/confirm_problem.html:12 msgid "Thank you for reporting this issue!" msgstr "Bu konuyu bildirdiÄŸiniz için teÅŸekkür ederiz!" -#: templates/web/base/tokens/error.html:7 +#: templates/web/base/tokens/error.html:6 msgid "Thank you for trying to confirm your update or problem. We seem to have an error ourselves though, so <a href=\"%s\">please let us know what went on</a> and we'll look into it." -msgstr "" +msgstr "Güncelleme ya da sorunu teyit etmek için çabaladığınız için teÅŸekkürler. bizim kendimizin bir hata yaptığını fark ettiÄŸinizde <a href=\"%s\"> lütfen ne olduÄŸunu bize bildirin</a> ve biz bunu araÅŸtıralım." #: templates/web/base/tokens/confirm_update.html:15 msgid "Thank you for updating this issue!" @@ -3027,62 +2927,62 @@ msgstr "Bu konuyu güncellediÄŸiniz için teÅŸekkür ederiz!" #: templates/web/base/contact/submit.html:6 #: templates/web/base/questionnaire/completed.html:5 msgid "Thank you for your feedback" -msgstr "" +msgstr "Geri bildiriminiz için teÅŸekkür ederiz" #: templates/web/base/around/_error_multiple.html:17 msgid "Thanks for uploading your photo. We now need to locate your problem, so please enter a nearby street name or postcode in the box above :" -msgstr "" +msgstr "Resim yüklediÄŸiniz için teÅŸekkür ederiz. Şİmsi sorunu konumlandırmak için lütfen yakındaki cadde ismini veya e :yukarıdaki kutucuktan postakodunu giriniz." #: templates/web/base/questionnaire/creator_fixed.html:9 msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever reported a problem to a council before?" -msgstr "" +msgstr "TeÅŸekkürler, sorunun hallolduÄŸuna sevindim. Bu sorunu daha önce herhangi bir birime bildirmiÅŸ miydiniz?" #: perllib/FixMyStreet/App/Model/PhotoSet.pm:152 msgid "That image doesn't appear to have uploaded correctly (%s), please try again." -msgstr "" +msgstr "Bu ÅŸekilde resim doÄŸru yüklemiÅŸ gibi görünmüyor (%s), lütfen tekrar deneyin." #: perllib/FixMyStreet/App/Controller/Council.pm:97 msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again." -msgstr "" +msgstr "Bu konuma bir kurul tarafından ele alınacak gibi görünmüyor; belki de deniz ya da ülke dışındadır. Lütfen tekrar deneyin." #: perllib/FixMyStreet/App/Controller/Location.pm:126 msgid "That location does not appear to be in the UK; please try again." -msgstr "" +msgstr "Konum Ä°ngiltere'de görünmüyor; lütfen tekrar deneyin." #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:47 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:63 -#: perllib/FixMyStreet/Cobrand/UK.pm:71 +#: perllib/FixMyStreet/Cobrand/UK.pm:72 msgid "That postcode was not recognised, sorry." -msgstr "" +msgstr "Ãœzgünüz, bu posta kodu bulunamadı." -#: perllib/FixMyStreet/App/Controller/Admin.pm:726 +#: perllib/FixMyStreet/App/Controller/Admin.pm:724 msgid "That problem has been marked as sent." -msgstr "" +msgstr "Problem gönderildi olarak iÅŸaretlenmiÅŸtir." -#: perllib/FixMyStreet/App/Controller/Admin.pm:718 +#: perllib/FixMyStreet/App/Controller/Admin.pm:716 msgid "That problem will now be resent." -msgstr "" +msgstr "Bu problem yeniden gönderilecektir." -#: perllib/FixMyStreet/App/Controller/Report.pm:125 +#: perllib/FixMyStreet/App/Controller/Report.pm:127 msgid "That report cannot be viewed on %s." -msgstr "" +msgstr "Bu bildirim %s 'te görüntülenemiyor" -#: perllib/FixMyStreet/App/Controller/Report.pm:119 +#: perllib/FixMyStreet/App/Controller/Report.pm:121 msgid "That report has been removed from FixMyStreet." -msgstr "" +msgstr "Bu bildirim FixMyStreet'ten kaldırılmışır." #: templates/web/base/admin/body.html:144 msgid "" "The <strong>email address</strong> is the destination to which reports about this category will be sent. \n" " Other categories for this body may have the same email address." -msgstr "" +msgstr "<strong>e-posta adresi</strong> bu kategoriye hangi bildirimlerin gönderileceÄŸinin adresidir. Bu bölüm için diÄŸer kategoriler aynı e-posta adresine sahiptir." #: templates/web/base/admin/body-form.html:123 #: templates/web/base/admin/body-form.html:124 msgid "" "The <strong>endpoint</strong> is the URL of the service that FixMyStreet will connect to \n" " when sending reports to this body." -msgstr "" +msgstr "<strong>son aÅŸama</strong> FixMyStreet'in, o birime gönderilen bildirimlerin bulunduÄŸu sayfanın link'idir." #: templates/web/base/admin/body-form.html:136 #: templates/web/base/admin/body-form.html:137 @@ -3096,9 +2996,9 @@ msgstr "" msgid "" "The <strong>send method</strong> determines how problem reports will be sent to the body.\n" " If you leave this blank, <strong>send method defaults to email</strong>." -msgstr "" +msgstr "<strong>gönderme yöntemi</strong> sorunun bildiriminin birime nasıl gönderileceÄŸini belirler. EÄŸer bu alanı boÅŸ bırakırsanız, <strong>gönderme yöntemi hatası e-postanıza bildirilir</strong>." -#: templates/web/base/open311/index.html:90 +#: templates/web/base/open311/index.html:82 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 "" @@ -3107,7 +3007,7 @@ msgstr "" msgid "" "The body's <strong>name</strong> identifies the body (for example, <em>Borsetshire District Council</em>)\n" " and may be displayed publically." -msgstr "" +msgstr "Birimin <strong>adı</strong> o birimi tanımlar (örneÄŸin, <em>Borsetshire District Council</em>) ve herkese açık olarak görüntülenektir." #: templates/web/base/report/new/fill_in_details_text.html:1 #: templates/web/base/report/new/fill_in_details_text.html:3 @@ -3117,46 +3017,46 @@ msgstr "" #: templates/web/base/admin/edit-league.html:3 #: templates/web/base/admin/edit-league.html:4 msgid "The diligency prize league table shows editors' activity (who's been editing the most records)." -msgstr "" +msgstr "BaÅŸarı ödül tablosu editörün faaliyetlerini göstermektedir (kimin en fazla kayıt düzenlediÄŸi)." -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:60 -#: perllib/FixMyStreet/App/Controller/Reports.pm:79 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:61 +#: perllib/FixMyStreet/App/Controller/Reports.pm:80 msgid "The error was: %s" -msgstr "" +msgstr "Hata buydu: %s" -#: templates/web/base/open311/index.html:86 +#: templates/web/base/open311/index.html:78 msgid "The following Open311 v2 attributes are returned for each request: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code and service_name." msgstr "" #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:159 #: perllib/FixMyStreet/Geocode/OSM.pm:144 msgid "The following information about the nearest road might be inaccurate or irrelevant, if the problem is close to several roads or close to a road without a name registered in OpenStreetMap." -msgstr "" +msgstr "EÄŸer problem farklı yollarla ilgili veya OpenStreetMap'te kayıtlı olmayan bir isim ise, En yakın yol ile ilgili ÅŸu bilgi yanlış ya da alakasız olabilir." #: db/alert_types.pl:19 db/alert_types.pl:23 db/alert_types.pl:27 #: db/alert_types.pl:31 msgid "The latest local problems reported by users" -msgstr "" +msgstr "Kullanıcı tarafından bildirilen en son yerel problemler" #: db/alert_types.pl:35 msgid "The latest problems for {{COUNCIL}} reported by users" -msgstr "" +msgstr "Kullanıcı tarafından {{COUNCIL}} için bildirilen son raporlar" #: db/alert_types.pl:39 msgid "The latest problems for {{COUNCIL}} within {{WARD}} ward reported by users" -msgstr "" +msgstr "Kullanıcı tarafından {{COUNCIL}} için bildirilen {{WARD}}semt içindeki en son sorunlar" #: db/alert_types.pl:11 msgid "The latest problems reported by users" -msgstr "" +msgstr "Kullanıcı tarafından bildirilenen son problemler" #: db/alert_types.pl:15 msgid "The latest problems reported fixed by users" -msgstr "" +msgstr "Kullanıcı tarafından halledilen sorunlar bildirildi" #: db/alert_types.pl:43 msgid "The latest problems within {{NAME}}'s boundary reported by users" -msgstr "" +msgstr "Kullanıcı tarafından bildirilen {{NAME}} sınırları içindeki en son sorunlar" #: templates/web/base/auth/token.html:9 msgid "The link might have expired, or maybe you didn’t quite copy and paste it correctly." @@ -3164,77 +3064,75 @@ msgstr "" #: templates/web/base/admin/body-form.html:58 msgid "The list of available areas is being provided by the MapIt service at %s." -msgstr "" +msgstr "Ulaşılabilir bölgelerin listesi %s'teki Mapit hizmeti tarafından saÄŸlanmaktadır." #: templates/web/base/auth/change_password.html:12 #: templates/web/base/auth/change_password.html:16 msgid "The passwords do not match" -msgstr "" +msgstr "Åžifreler eÅŸleÅŸmiyor" -#: templates/web/base/errors/page_error_404_not_found.html:10 -#: templates/web/base/errors/page_error_404_not_found.html:12 +#: templates/web/base/errors/page_error_404_not_found.html:9 msgid "The requested URL '%s' was not found on this server" -msgstr "" +msgstr "Talep edilen URL '%s' bu sunucuda bulunamadı " #: templates/web/base/alert/_list.html:16 msgid "The simplest alert is our geographic one:" -msgstr "" +msgstr "en basit uyarı bizim coÄŸrafi olandır:" #: templates/web/base/report/new/councils_extra_text.html:1 #: templates/web/base/report/new/councils_text_some.html:10 -#: templates/web/base/report/new/fill_in_details_form.html:18 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:14 +#: templates/web/base/report/new/fill_in_details_form.html:13 msgid "The summary and description will also be made public (see our <a href=\"/privacy\">privacy policy</a>)." -msgstr "" +msgstr "Özet ve tanımlamalar kamuoyuna açıklanacak (bakınız <a href=\"/privacy\">privacy policy</a>) " -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:315 +#: perllib/FixMyStreet/Script/Reports.pm:92 msgid "The user could not locate the problem on a map, but to see the area around the location they entered" -msgstr "" +msgstr "Kullanıcı sorunu harÅŸta üzerinde konumlandıramadı ama onların girdiÄŸi bölgenin etrafındaki konumları görmek için." #: templates/web/base/admin/user-form.html:12 #: templates/web/base/admin/user-form.html:13 msgid "" "The user's <strong>name</strong> is displayed publicly on reports that have not been marked <em>anonymous</em>.\n" " Names are not necessarily unique." -msgstr "" +msgstr "Kullanıcının <strong>ismi</strong iÅŸaretlenmemiÅŸ <em> anonim</em> olan bildirimlerin arasında halka açık olarak görüntülenecektir. halka açık olması mutlaka isimlere özgü deÄŸildir." #: templates/web/base/around/on_map_list_items.html:12 #: templates/web/base/my/_problem-list.html:8 #: templates/web/base/reports/_problem-list.html:15 msgid "There are no reports to show." -msgstr "" +msgstr "Gösterilecek hiçbir rapor yok." -#: perllib/FixMyStreet/App/Controller/Reports.pm:76 +#: perllib/FixMyStreet/App/Controller/Reports.pm:77 msgid "There was a problem showing the All Reports page. Please try again later." -msgstr "" +msgstr "Tüm Bildirimlerin görüntülendiÄŸi sayfada bir sorun var. Lütfen daha sonra tekrar deneyin." #: perllib/FixMyStreet/App/Controller/Contact.pm:137 -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:59 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:60 msgid "There was a problem showing this page. Please try again later." -msgstr "" +msgstr "Bu sayfa görüntülenirken bir sorun oluÅŸtu. Lütfen daha sonra tekrar deneyin." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:769 -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:134 -#: templates/web/base/auth/general.html:26 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:764 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:138 +#: templates/web/base/auth/general.html:43 #: templates/web/zurich/auth/general.html:28 msgid "There was a problem with your email/password combination. If you cannot remember your password, or do not have one, please fill in the ‘sign in by email’ section of the form." -msgstr "" +msgstr "E-posta ve ÅŸifre uyumu sorunu vardı. eÄŸer ÅŸifrenizi hatırlamıyorsanız veya ÅŸifreniz yoksa lütfen formun email&rsquo tarafından ‘sign bölümünü doldurunuz. " #: perllib/FixMyStreet/App/Controller/Alert.pm:355 msgid "There was a problem with your email/password combination. Please try again." -msgstr "" +msgstr "E-posta / ÅŸifrenizde bir sorun oluÅŸtu. Lütfen tekrar deneyiniz." -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:272 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:336 msgid "There was a problem with your update. Please try again." -msgstr "" +msgstr "Güncelleme esnasında bir hata oluÅŸtu. Lütfen tekrar deneyiniz." #: perllib/FixMyStreet/App/Controller/Contact.pm:141 msgid "There were problems with your report. Please see below." -msgstr "" +msgstr "Bildiriminiz esnasında hata oluÅŸtu. Lütfen aÅŸağıya bakınız." -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:300 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:371 msgid "There were problems with your update. Please see below." -msgstr "" +msgstr "Güncellemede bir hata oluÅŸtu. Lütfen aÅŸağıya bakınız." #: templates/web/base/admin/body-form.html:112 #: templates/web/base/admin/body-form.html:113 @@ -3244,105 +3142,86 @@ msgid "" " For more information on Open311, see \n" " <a href='https://www.mysociety.org/2013/01/17/open311-explained/' class='admin-offsite-link'>this article</a>.\n" " " -msgstr "" +msgstr "Bu ayarlar Open311 (veya diÄŸer back-end integration) problemini kapsayan ve <br>bildirimlerin ulaÅŸacağı birimlerin kullanılması içindir. Open311 hakkında daha fazla bilgi için<a href='https://www.mysociety.org/2013/01/17/open311-explained/' class='admin-offsite-link'>bu makale</a> bakınız." -#: templates/web/base/open311/index.html:77 +#: templates/web/base/open311/index.html:69 msgid "This API implementation is work in progress and not yet stabilized. It will change without warnings in the future." -msgstr "" +msgstr "Bu API uygulaması çalıştırılma aÅŸamadındadır ve henüz stabilize edilmemiÅŸtir." #: templates/web/base/admin/body.html:44 msgid "" "This body covers no area. This means that it has no jurisdiction over problems reported <em>at any location</em>.\n" " Consequently, none of its categories will appear in the drop-down category menu when users report problems.\n" " Currently, users <strong>cannot report problems to this body</strong>." -msgstr "" +msgstr "Bu birim hiçbir bölgeyi kapsamamaktadır. Bu bildirilen <em>raporlar üzerinde hiçbir konum için</em> yetkisi olmadığı anlamı taşımaktadır. Kısaca bu kategorilerden hiçbiri kullanıcı problem bildirildiÄŸinde drop-down kategorisinde görüntülenmeyecektir." #: templates/web/base/admin/body.html:54 msgid "This body has no contacts. This means that currently problems reported to this body <strong>will not be sent</strong>." -msgstr "" +msgstr "Bu bölüm herhangi bir iletiÅŸim bilgisine sahip deÄŸil. Yani bu bölüme bildirilen problemler <strong>gönderilmeyecek</strong>." #: templates/web/base/admin/body-form.html:52 #: templates/web/base/admin/body-form.html:53 msgid "" "This body will only be sent reports for problems that are located in the <strong>area covered</strong>.\n" " A body will not receive any reports unless it covers at least one area." -msgstr "" +msgstr "Bu birime sadece <strong>alanda yer alan ve</strong> konuyu kapsayan bildirimler gönderilebilecektir. Bu birime bu iki maddeden herhangi birini kapsamayan bildirimler ulaÅŸmayacaktır." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:413 +#: perllib/FixMyStreet/Script/Reports.pm:191 msgid "This email has been sent to both councils covering the location of the problem, as the user did not categorise it; please ignore it if you're not the correct council to deal with the issue, or let us know what category of problem this is so we can add it to our system." -msgstr "" +msgstr "Kullanıcının problemi sınıflandırmama durumunda, bu e-posta problemin konumunu kapsayacak iki kurula da gönderilir. EÄŸer problemle ilgilenecek olan doÄŸru kurul deÄŸil iseniz, bu bildirimi dikkate almayınız veya problemin hangi kategoriyle olduÄŸunu bize bildirin ki biz de sistemimizde doÄŸru kurula yönlendirelim." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:416 +#: perllib/FixMyStreet/Script/Reports.pm:194 msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue." -msgstr "" +msgstr "Bu e-posta problemin konumunu kapsayan çeÅŸitli kurullara gönderilmiÅŸtir. SeçilmiÅŸ kategori kurulun yetki alanı dışındaysa, bu sorunu dikkate almayın." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:925 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:995 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:920 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:990 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:142 -#: perllib/FixMyStreet/Cobrand/UK.pm:43 +#: perllib/FixMyStreet/Cobrand/UK.pm:44 msgid "This information is required" -msgstr "" +msgstr "Bu bilgi gereklidir" #: templates/web/base/debug_header.html:3 msgid "This is a developer site; things might break at any time, and the database will be periodically deleted." -msgstr "" +msgstr "Burası geliÅŸen bir sitedir, her an çökebilir ve veritabanı belli aralıklarla silinmektedir." #: templates/web/base/reports/index.html:7 msgid "This is a summary of all reports on this site." -msgstr "" - -#: templates/web/zurich/auth/token.html:8 -msgid "This may be because the link is too old or already used, or the address was not copied correctly." -msgstr "" - -#: templates/web/base/report/banner.html:15 -msgid "This problem has been closed" -msgstr "" +msgstr "Bu, bu sitedeki bütün raporların özetidir." -#: templates/web/base/report/banner.html:12 -#: templates/web/base/report/update-form.html:48 -#: templates/web/fixmystreet/report/update-form.html:46 +#: templates/web/base/report/update/form_update.html:52 msgid "This problem has been fixed" msgstr "Bu problem çözüldü" -#: templates/web/base/report/update-form.html:43 -#: templates/web/fixmystreet/report/update-form.html:40 +#: templates/web/base/report/update/form_update.html:46 msgid "This problem has not been fixed" -msgstr "" - -#: templates/web/base/report/banner.html:19 -msgid "This problem is in progress" -msgstr "" - -#: templates/web/base/report/banner.html:9 -msgid "This problem is old and of unknown status." -msgstr "" +msgstr "Bu problem giderilemedi" #: perllib/FixMyStreet/Cobrand/Zurich.pm:168 #: perllib/FixMyStreet/Cobrand/Zurich.pm:169 #: templates/web/zurich/report/_main.html:14 msgid "This report is awaiting moderation." -msgstr "" +msgstr "Bu rapor iÅŸlenmeyi bekliyor." -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:86 +#: perllib/FixMyStreet/Script/Alerts.pm:94 msgid "This report is currently marked as closed." -msgstr "" +msgstr "Bu rapor ÅŸu an kapalı olarak iÅŸaretlenmiÅŸ." -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:84 +#: perllib/FixMyStreet/Script/Alerts.pm:92 msgid "This report is currently marked as fixed." -msgstr "" +msgstr "Bu rapor ÅŸu an onarıldı olarak iÅŸaretlenmiÅŸ." -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:88 +#: perllib/FixMyStreet/Script/Alerts.pm:96 msgid "This report is currently marked as open." -msgstr "" +msgstr "Bu rapor ÅŸu an açık olarak iÅŸaretlenmiÅŸ." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:326 +#: perllib/FixMyStreet/Script/Reports.pm:105 msgid "This report was submitted anonymously" msgstr "Bu bildirim anonim olarak " -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:308 +#: perllib/FixMyStreet/Script/Reports.pm:85 msgid "This web page also contains a photo of the problem, provided by the user." -msgstr "" +msgstr "Bu internet sitesine problemin fotoÄŸrafı da kullanıcı tarafından eklenmiÅŸtir. " #: templates/web/zurich/admin/report_edit-sdm.html:123 #: templates/web/zurich/admin/report_edit-sdm.html:76 @@ -3351,10 +3230,10 @@ msgstr "" msgid "Time spent (in minutes):" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1278 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1287 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" -msgstr "" +msgstr "Zaman çizelgesi" #: templates/web/base/admin/flagged.html:15 #: templates/web/base/admin/reports.html:12 @@ -3363,9 +3242,8 @@ msgid "Title" msgstr "BaÅŸlık" #: templates/web/zurich/admin/template_edit.html:20 -#, fuzzy msgid "Title:" -msgstr "BaÅŸlık" +msgstr "" #: templates/web/base/alert/index.html:25 msgid "To find out what local alerts we have for you, please enter your %s postcode or street name and area:" @@ -3373,13 +3251,13 @@ msgstr "" #: templates/web/base/alert/index.html:27 msgid "To find out what local alerts we have for you, please enter your postcode or street name and area" -msgstr "" +msgstr "senin için hazırladığımız yerel uyarıları bulmak için lütfen posta kodu veya cadde adı ve bölgeyi giriniz" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:314 +#: perllib/FixMyStreet/Script/Reports.pm:91 msgid "To view a map of the precise location of this issue" -msgstr "" +msgstr "Bu konudaki kesin lokasyonu haritasını göstermek için" -#: templates/web/base/admin/index.html:61 +#: templates/web/base/admin/index.html:54 #: templates/web/base/admin/questionnaire.html:24 #: templates/web/base/admin/stats.html:24 #: templates/web/base/admin/stats.html:43 @@ -3393,16 +3271,14 @@ msgstr "Tekrar dene" #: templates/web/base/contact/submit.html:14 msgid "Try emailing us directly:" -msgstr "" +msgstr "Direkt olarak e-posta gönderin:" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:12 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:33 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:31 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:37 msgid "Unable to fix" -msgstr "" +msgstr "Onarımı mümkün deÄŸil" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:19 @@ -3411,52 +3287,51 @@ msgstr "" #: templates/web/zurich/admin/report_edit.html:92 #: templates/web/zurich/admin/update_edit.html:18 msgid "Unconfirmed" -msgstr "" +msgstr "Onaylanmamış" -#: templates/web/fixmystreet/report/banner.html:9 +#: templates/web/base/report/banner.html:9 msgid "Unknown" msgstr "Bilinmeyen" #: perllib/FixMyStreet/App/Controller/Rss.pm:173 msgid "Unknown alert type" -msgstr "" +msgstr "Bilinmeyen uyarı tipi" +#: perllib/FixMyStreet/App/Controller/Photo.pm:110 #: templates/web/base/js/translation_strings.html:39 msgid "Unknown error" msgstr "Bilinmeyen hata" -#: perllib/FixMyStreet/App/Controller/Report.pm:103 -#: perllib/FixMyStreet/App/Controller/Report.pm:109 -#: perllib/FixMyStreet/App/Controller/Report.pm:112 +#: perllib/FixMyStreet/App/Controller/Report.pm:105 +#: perllib/FixMyStreet/App/Controller/Report.pm:111 +#: perllib/FixMyStreet/App/Controller/Report.pm:114 msgid "Unknown problem ID" -msgstr "" +msgstr "Bilinmeyen ID problemi" -#: templates/web/fixmystreet/report/update-form.html:19 +#: templates/web/base/report/update/form_update.html:25 msgid "Update" msgstr "Güncelleme" #: templates/web/base/admin/timeline.html:33 msgid "Update %s created for problem %d; by %s" -msgstr "" +msgstr " %d problem için %s tarafından oluÅŸturulmuÅŸ %s güncelle" -#: templates/web/base/contact/index.html:21 -#: templates/web/fixmystreet/contact/index.html:36 +#: templates/web/base/contact/index.html:28 msgid "Update below added anonymously at %s" -msgstr "" +msgstr "AÅŸağıdaki anonim olarak %s 'e ekleneni güncelle" -#: templates/web/base/contact/index.html:23 -#: templates/web/fixmystreet/contact/index.html:38 +#: templates/web/base/contact/index.html:30 msgid "Update below added by %s at %s" -msgstr "" +msgstr "AÅŸağıda %s tarafıdan %s 'e ekleneni güncelle" #: templates/web/base/admin/body-form.html:240 #: templates/web/zurich/admin/body-form.html:52 msgid "Update body" -msgstr "" +msgstr "Bölümü güncelle" -#: templates/web/base/admin/index.html:55 +#: templates/web/base/admin/index.html:48 msgid "Update breakdown by state" -msgstr "" +msgstr "Arızayı birim tarafından güncelle" #: db/alert_types.pl:7 msgid "Update by {{name}}" @@ -3465,23 +3340,19 @@ msgstr "{{name}} göre güncelleme" #: templates/web/base/admin/update_edit.html:42 #: templates/web/zurich/admin/update_edit.html:25 msgid "Update changed problem state to %s" -msgstr "" +msgstr "DeÄŸiÅŸtirilen problemin durumunu %s olarak güncelle" #: templates/web/base/admin/update_edit.html:44 msgid "Update marked problem as fixed" -msgstr "" +msgstr "Ä°ÅŸaretlenmiÅŸ problemi onarıldı olarak güncelle" #: templates/web/base/admin/update_edit.html:46 msgid "Update reopened problem" -msgstr "" +msgstr "Tekrardan deÄŸerlendirilen problemi güncelle" #: templates/web/base/admin/body.html:101 msgid "Update statuses" -msgstr "" - -#: templates/web/base/report/update-form.html:22 -msgid "Update:" -msgstr "Güncelleme:" +msgstr "Güncelleme durumu" #: templates/web/zurich/admin/index-dm.html:23 #: templates/web/zurich/admin/index-sdm.html:21 @@ -3489,10 +3360,10 @@ msgstr "Güncelleme:" msgid "Updated" msgstr "Güncellendi" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1045 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1103 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1147 -#: perllib/FixMyStreet/App/Controller/Admin.pm:822 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1048 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1108 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1156 +#: perllib/FixMyStreet/App/Controller/Admin.pm:821 #: perllib/FixMyStreet/Cobrand/Zurich.pm:771 #: perllib/FixMyStreet/Cobrand/Zurich.pm:796 #: perllib/FixMyStreet/Cobrand/Zurich.pm:866 @@ -3500,52 +3371,47 @@ msgid "Updated!" msgstr "Güncellendi!" #: templates/web/base/admin/list_updates.html:2 -#: templates/web/base/report/update.html:3 -#: templates/web/fixmystreet/report/update.html:5 +#: templates/web/base/report/update.html:5 #: templates/web/zurich/report/updates.html:2 msgid "Updates" msgstr "Güncellemeler" -#: perllib/FixMyStreet/DB/Result/Comment.pm:132 +#: perllib/FixMyStreet/DB/Result/Comment.pm:131 msgid "Updates are limited to %s characters in length. Please shorten your update" -msgstr "" +msgstr "Güncellemeler %s uzunluÄŸunda karakter ile sınırlıdır. Lütfen güncellemenizi kısaltın." #: db/alert_types.pl:5 db/alert_types.pl:6 msgid "Updates on {{title}}" -msgstr "" +msgstr "{{title}} daki güncellemeler" #. ("%s is the site name") #: templates/web/base/report/display.html:0 -#: templates/web/base/report/display.html:5 -#: templates/web/fixmystreet/report/display.html:0 -#: templates/web/fixmystreet/report/display.html:9 -#, fuzzy +#: templates/web/base/report/display.html:9 msgid "Updates to this problem, %s" -msgstr "%s Problemlerin güncellemelerini yap" +msgstr "" #: templates/web/base/admin/body.html:182 msgid "Use the <strong>note</strong> to record details that are only displayed in the admin. Notes are not shown publicly, and are not sent to the body." -msgstr "" +msgstr "Detayları kaydetmek için sadece adminin ekranında görünen <strong>notu</strong> kullanın. Bilgiler kuruma gönderilmeyecek ve kimse tarafından görünmeyecektir." #: templates/web/zurich/admin/report_edit-sdm.html:48 #: templates/web/zurich/admin/report_edit.html:67 -#, fuzzy msgid "Used map" -msgstr "kullanılan harita" +msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1452 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1461 msgid "User flag removed" msgstr "Kullanıcı etiketi kaldırıldı" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1424 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1433 msgid "User flagged" msgstr "Kullanıcı etiketlendi" #: templates/web/base/admin/users.html:5 msgid "User search finds matches in users' names and email addresses." -msgstr "" +msgstr "Arama sonuçları kullanıcı adı ve e-posta adresi ile uyumludur." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1280 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1289 #: perllib/FixMyStreet/Cobrand/Zurich.pm:399 #: templates/web/base/admin/flagged.html:29 #: templates/web/zurich/header.html:69 @@ -3556,7 +3422,7 @@ msgstr "Kullanıcılar" #: perllib/FixMyStreet/App/Controller/Admin.pm:412 #: perllib/FixMyStreet/App/Controller/Admin.pm:429 msgid "Values updated" -msgstr "" +msgstr "DeÄŸerler güncellendi" #: templates/web/base/admin/report_edit.html:18 #: templates/web/base/admin/update_edit.html:18 @@ -3564,52 +3430,50 @@ msgstr "" #: templates/web/zurich/admin/report_edit.html:22 #: templates/web/zurich/admin/update_edit.html:10 msgid "View report on site" -msgstr "" +msgstr "Raporun sitede görüntülemek" #: templates/web/base/reports/body.html:14 msgid "View reports by ward" -msgstr "" +msgstr "Semte göre bildirimleri görüntüle" #: templates/web/base/around/display_location.html:0 #: templates/web/base/around/display_location.html:35 msgid "Viewing a location" -msgstr "" +msgstr "Bir konum görüntülemek" #: templates/web/base/report/display.html:0 -#: templates/web/fixmystreet/report/display.html:0 msgid "Viewing a problem" -msgstr "" +msgstr "Bir problemi görüntülemek" #: templates/web/base/reports/body.html:16 msgid "Wards of this council" -msgstr "" +msgstr "Bu kurulun ilgilendiÄŸi bölge" #: templates/web/base/alert/choose.html:6 #: templates/web/base/around/_error_multiple.html:6 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/zurich/auth/token.html:7 -msgid "We have not been able to confirm your account - sorry." -msgstr "" +msgstr "O bölgede birden fazla iÅŸaretlenmiÅŸ yer mevcut. On tane iÅŸaretlenmiÅŸ yer gösterilebilmektedir. EÄŸer sizinki bunlar arasında deÄŸilse, farklı ÅŸekilde arayın." -#: templates/web/zurich/auth/token.html:17 -msgid "We have sent you an email containing a link to confirm your account." -msgstr "" +#: templates/web/base/auth/general.html:6 +#: templates/web/base/report/display.html:27 +#: templates/web/base/report/new/oauth_email_form.html:5 +#, fuzzy +msgid "We need your email address, please give it below." +msgstr "Telefon numaranızı ve e-posta adresinizi gizli tutulacaktır" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:2 -#: templates/web/fixmystreet/report/update-form.html:77 +#: templates/web/base/report/new/form_user_loggedout_email.html:2 +#: templates/web/base/report/update/form_user_loggedout_email.html:2 msgid "We never show your email" msgstr "E-posta adresiniz gizli tutulacaktır" -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:31 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:65 +#: templates/web/base/report/new/form_user_loggedin.html:31 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:28 msgid "We never show your email address or phone number." msgstr "Telefon numaranızı ve e-posta adresinizi gizli tutulacaktır" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:422 +#: perllib/FixMyStreet/Script/Reports.pm:200 msgid "We realise this problem might be the responsibility of %s; however, we don't currently have any contact details for them. If you know of an appropriate contact address, please do get in touch." -msgstr "" +msgstr "Bu problemin %s sorumluluÄŸunda olduÄŸunun farkındayız; ancak, ÅŸu anda irtibat bilgilerine sahip deÄŸiliz. EÄŸer uygun irtibat adresini biliyorsanız, bizimle iletiÅŸime geçin." #: templates/web/base/index-steps.html:31 msgid "We send it to the council on your behalf" @@ -3622,11 +3486,7 @@ msgstr "KiÅŸisel bilgileriniz sadece bizim <a href=\"/privacy\">gizlilik politik #: templates/web/base/questionnaire/completed-open.html:2 msgid "We’re sorry to hear the problem’s not fixed. Why not try writing to your local representatives?" -msgstr "" - -#: templates/web/base/contact/blurb.html:8 -msgid "We'd love to hear what you think about this site. Just fill in the form, or send an email to <a href='mailto:%s'>%s</a>:" -msgstr "" +msgstr "We’re problemin çözülemediÄŸi için üzgünüz. Yerel temsilcilere baÅŸvurmaya ne dersiniz?" #: templates/web/base/contact/submit.html:7 msgid "We’ll get back to you as soon as we can." @@ -3636,7 +3496,7 @@ msgstr "Mümkün olan en kısa sürede size dönüş yapacağız." msgid "What was your experience of getting the problem fixed?" msgstr "" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:49 +#: templates/web/base/report/new/form_report.html:19 msgid "What’s the issue, and where is it?" msgstr "Konu ne ve nerede?" @@ -3649,13 +3509,17 @@ msgstr "Yayınlandığında" msgid "When sent" msgstr "GönderildiÄŸinde" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:640 +#: templates/web/base/js/translation_strings.html:50 +msgid "Whoa there Testino! Three photos are enough." +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Report/New.pm:635 msgid "Whole block of empty flats" msgstr "Bütün boÅŸ daireler" #: templates/web/base/tokens/confirm_alert.html:7 msgid "Why stop there? <a href=\"/alert\">Set up more alerts</a> for free." -msgstr "" +msgstr "Neden devam etmiyorsun? <a href=\"/alert\">Ãœcretsiz olarak</a> daha fazla uyarı ekle." #: perllib/FixMyStreet/Cobrand/Zurich.pm:192 #: perllib/FixMyStreet/Cobrand/Zurich.pm:932 @@ -3664,24 +3528,23 @@ msgstr "" msgid "Wish" msgstr "" -#: templates/web/base/open311/index.html:92 +#: templates/web/base/open311/index.html:84 msgid "With request searches, it is also possible to search for agency_responsible to limit the requests to those sent to a single administration. The search term is the administration ID provided by <a href=\"%s\">MaPit</a>." -msgstr "" +msgstr "kurum_sorumluluÄŸunun birime gelen talepleri sınırlandırması mümkündür. Arama sözcüğü yönetim ID'si <a href=\"%s\">MaPit</a> tarafından saÄŸlanmaktadır." #: templates/web/base/front/footer-marketing.html:17 msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"http://fixmystreet.org\">available at fixmystreet.org</a>." -msgstr "" +msgstr "FixMyStreet'e katkıda bulunmak ister misin? Åžifremiz herkese açıktır ve <a href=\"http://fixmystreet.org\"> burdan ulaşılabilir fixmystreet.org</a>." -#: templates/web/base/questionnaire/index.html:87 +#: templates/web/base/questionnaire/index.html:96 msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?" msgstr "Durumunu kontrol etmek için 4 hafta sonra bir anket yolu ile hatırlatma ister misiniz?" #: templates/web/base/report/new/notes.html:7 msgid "Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation." -msgstr "" +msgstr "GönderdiÄŸin bildiriminin kalıp halinde ve eksik noktalama iÅŸaretleri ile olması, okumayı zorlaÅŸtırıyor." #: templates/web/base/report/new/fill_in_details_form.html:4 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:5 msgid "Wrong location? Just click again on the map." msgstr "Yanlış konum mu? Harita üzerine tekrardan tıklayın." @@ -3704,29 +3567,26 @@ msgstr "Yıl" #: templates/web/base/admin/users.html:31 #: templates/web/base/questionnaire/creator_fixed.html:14 #: templates/web/base/questionnaire/index.html:51 -#: templates/web/base/questionnaire/index.html:90 +#: templates/web/base/questionnaire/index.html:99 msgid "Yes" msgstr "Evet" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:17 -#: templates/web/fixmystreet/report/update-form.html:91 +#: templates/web/base/report/new/form_user_loggedout_password.html:5 +#: templates/web/base/report/update/form_user_loggedout_password.html:4 msgid "Yes I have a password" msgstr "Evet ÅŸifrem var" -#: templates/web/base/contact/index.html:39 -#: templates/web/fixmystreet/contact/index.html:54 +#: templates/web/base/contact/index.html:46 msgid "You are complaining that this problem report was unnecessarily moderated:" -msgstr "" +msgstr "Bu problem bildirimini gereksiz bir ÅŸekilde yönetildiÄŸi için ÅŸikayet ediyorsun:" -#: templates/web/base/contact/index.html:41 -#: templates/web/fixmystreet/contact/index.html:56 +#: templates/web/base/contact/index.html:48 msgid "You are reporting the following problem report for being abusive, containing personal information, or similar:" -msgstr "" +msgstr "AÅŸağıdaki kiÅŸisel bilgi veya benzeri kötü niyetli raporları içeren sorunları bildiriyorsun: " -#: templates/web/base/contact/index.html:15 -#: templates/web/fixmystreet/contact/index.html:30 +#: templates/web/base/contact/index.html:22 msgid "You are reporting the following update for being abusive, containing personal information, or similar:" -msgstr "" +msgstr "AÅŸağıdaki kiÅŸisel bilgi veya benzeri kötü niyetli raporları içeren güncellemeleri bildiriyorsun: " #: templates/web/zurich/tokens/confirm_problem.html:5 #: templates/web/zurich/tokens/confirm_problem.html:8 @@ -3737,7 +3597,7 @@ msgstr "Problemi <a href=\"%s%s\">bu site üzerinde görüntüleyebilir siniz</a msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create." msgstr "Kötü niyetli bir kullanıcının e-postasını otomatik olarak gizlenen (ve asla gönderilmeyen) raporların bulunduÄŸu kara listeye ekleyebilirsiniz." -#: templates/web/fixmystreet/contact/index.html:121 +#: templates/web/base/contact/index.html:113 msgid "You can contact technical support on <a href='mailto:%s'>%s</a>" msgstr "Teknik destek için <a href='mailto:%s'>%s</a> iletiÅŸime geçebilirsiniz." @@ -3747,9 +3607,11 @@ msgid "" " For example, this can useful if you want to keep an eye on a user who has posted inappropriate\n" " reports in the past." msgstr "" +"Herhangi bir rapor veya kullanıcıyı düzenleyerek etiketleyebilirsin, ve onlar bu sayfada listelenmiÅŸtir. \n" +"ÖrneÄŸin, uygunsuz postaları gönderen kullanıcıya göz atmak istersen bu yararlı olabilir." -#: templates/web/base/report/new/councils_text_none.html:10 -#: templates/web/base/report/new/councils_text_none.html:2 +#: templates/web/base/report/new/councils_text_none.html:12 +#: templates/web/base/report/new/councils_text_none.html:14 #: templates/web/base/report/new/councils_text_some.html:19 #: templates/web/base/report/new/councils_text_some.html:21 msgid "You can help us by finding a contact email address for local problems for %s and emailing it to us at <a href='mailto:%s'>%s</a>." @@ -3765,23 +3627,18 @@ msgstr "Kabul etmediniz; lütfen yukardaki kutuyu doldurun" #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:38 msgid "You have already answered this questionnaire. If you have a question, please <a href='%s'>get in touch</a>, or <a href='%s'>view your problem</a>.\n" -msgstr "" - -#: templates/web/base/questionnaire/index.html:77 -#: templates/web/base/report/new/fill_in_details_form.html:75 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:73 -msgid "You have already attached a photo to this report, attaching another one will replace it." -msgstr "Bu rapor için daha önce bir fotoÄŸraf eklediniz, eklediÄŸiniz diÄŸer fotoÄŸraf onun yerine geçecektir." - -#: templates/web/base/report/update-form.html:59 -#: templates/web/fixmystreet/report/update-form.html:56 -msgid "You have already attached a photo to this update, attaching another one will replace it." -msgstr "Bu güncelleme için daha önce bir fotoÄŸraf eklediniz, eklediÄŸiniz diÄŸer fotoÄŸraf onun yerine geçecektir." +msgstr "Bu anketi doldurdunuz. EÄŸer bir sorunuz var ise, lütfen <a href='%s'>iletiÅŸime geçin</a>, veya <a href='%s'>problemini sun</a>.\n" -#: templates/web/zurich/report/new/fill_in_details_form.html:61 +#: templates/web/base/report/new/form_report.html:32 +#: templates/web/zurich/report/new/fill_in_details_form.html:55 msgid "You have already attached photos to this report. Note that you can attach a maximum of 3 to this report (if you try to upload more, the oldest will be removed)." msgstr "" +#: templates/web/base/questionnaire/index.html:83 +#: templates/web/base/report/update/form_update.html:14 +msgid "You have already attached photos to this update. Note that you can attach a maximum of 3 to this update (if you try to upload more, the oldest will be removed)." +msgstr "" + #: templates/web/base/auth/sign_out.html:4 #: templates/web/zurich/auth/sign_out.html:3 msgid "You have been signed out" @@ -3796,9 +3653,8 @@ msgstr "Sorunun olduÄŸu yeri harita üzerinde yeÅŸil bir imge ile iÅŸaretlediniz msgid "You have successfully confirmed your email address." msgstr "E-posta adresiniz baÅŸarıyla onaylandı." -#: templates/web/base/report/display.html:20 -#: templates/web/base/report/new/fill_in_details.html:37 -#: templates/web/fixmystreet/report/display.html:17 +#: templates/web/base/report/display.html:17 +#: templates/web/base/report/new/login_success_form.html:3 msgid "You have successfully signed in; please check and confirm your details are accurate:" msgstr "BaÅŸarılı bir ÅŸekilde giriÅŸ yaptınız; lütfen bilgilerinizi kontrol edin ve onaylayın" @@ -3827,53 +3683,42 @@ msgid "Your Reports" msgstr "Bildirimlerin" #: templates/web/base/alert/_list.html:89 +#: templates/web/base/contact/index.html:83 +#: templates/web/base/report/display_tools.html:38 +#: templates/web/base/report/display_tools.html:40 +#: templates/web/base/report/new/form_user_loggedin.html:3 +#: templates/web/base/report/new/form_user_loggedout_email.html:1 +#: templates/web/base/report/update/form_user_loggedout_email.html:1 #: templates/web/fixmystreet/alert/updates.html:19 #: templates/web/fixmystreet/alert/updates.html:22 -#: templates/web/fixmystreet/contact/index.html:91 -#: templates/web/fixmystreet/report/display.html:62 -#: templates/web/fixmystreet/report/display.html:64 -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:3 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:1 -#: templates/web/fixmystreet/report/update-form.html:76 #: templates/web/zurich/report/new/fill_in_details_form.html:76 msgid "Your email" msgstr "E-posta adresiniz" -#: templates/web/base/auth/general.html:28 -#: templates/web/fixmystreet/report/update-form.html:82 +#: templates/web/base/auth/general.html:45 +#: templates/web/base/report/update/form_user_loggedout_email.html:7 #: templates/web/zurich/auth/general.html:30 #: templates/web/zurich/auth/general.html:58 msgid "Your email address" msgstr "E-posta adresin" -#: templates/web/base/report/new/fill_in_details_form.html:106 -#: templates/web/base/report/update-form.html:81 -msgid "Your email:" -msgstr "E-posta adresiniz:" - -#: templates/web/fixmystreet/report/updates-sidebar-notes.html:7 +#: templates/web/base/report/updates-sidebar-notes.html:3 msgid "Your information will only be used in accordance with our <a href=\"/privacy\">privacy policy</a>" msgstr "Bilgileriniz sadece bizim <a href=\"/privacy\">gizlilik politikası</a> uyumluluÄŸu çerçevesinde kullanılacaktır" -#: templates/web/base/auth/general.html:51 -#: templates/web/fixmystreet/contact/index.html:84 -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:18 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:54 -#: templates/web/fixmystreet/report/update-form.html:142 +#: templates/web/base/auth/general.html:90 +#: templates/web/base/contact/index.html:76 +#: templates/web/base/report/new/form_user_loggedin.html:18 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:17 +#: templates/web/base/report/update/form_name.html:11 #: templates/web/zurich/auth/general.html:61 #: templates/web/zurich/report/new/fill_in_details_form.html:86 msgid "Your name" msgstr "Adınız" -#: templates/web/base/contact/index.html:73 -#: templates/web/base/report/new/fill_in_details_form.html:186 -#: templates/web/base/report/update-form.html:152 -msgid "Your name:" -msgstr "Adınız:" - -#: templates/web/base/auth/general.html:39 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:22 -#: templates/web/fixmystreet/report/update-form.html:96 +#: templates/web/base/auth/general.html:75 +#: templates/web/base/report/new/form_user_loggedout_password.html:10 +#: templates/web/base/report/update/form_user_loggedout_password.html:9 #: templates/web/zurich/auth/general.html:34 msgid "Your password" msgstr "Åžifreniz" @@ -3882,15 +3727,16 @@ msgstr "Åžifreniz" msgid "Your password has been changed" msgstr "Åžifren deÄŸiÅŸtirildi" -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:27 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:63 +#: templates/web/base/report/new/form_user_loggedin.html:27 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:26 #: templates/web/zurich/report/new/fill_in_details_form.html:92 msgid "Your phone number" msgstr "Telefon numaran" #: templates/web/base/questionnaire/index.html:14 +#, fuzzy msgid "Your report" -msgstr "Bildirimin" +msgstr "Bildirimlerin" #: templates/web/base/footer.html:9 templates/web/fixmystreet/footer.html:29 msgid "Your reports" @@ -3900,23 +3746,17 @@ msgstr "Bildirimlerin" msgid "Your updates" msgstr "Güncellemelerin" -#: templates/web/base/contact/index.html:81 -msgid "Your email:" -msgstr "Sizin e-posta:" - #: templates/web/base/reports/_list-filters.html:3 -#, fuzzy msgid "all reports" -msgstr "Tüm bildirimler" +msgstr "" #: templates/web/base/admin/timeline.html:4 msgid "by %s" msgstr "%s tarafından" #: templates/web/base/reports/_list-filters.html:5 -#, fuzzy msgid "closed reports" -msgstr "Tamamlanmış raporlar" +msgstr "" #: templates/web/base/reports/body.html:6 #: templates/web/base/reports/body.html:7 @@ -3938,17 +3778,16 @@ msgid "edit user" msgstr "kullanıcı düzenle" #: templates/web/base/reports/_list-filters.html:6 -#, fuzzy msgid "fixed reports" -msgstr "Çözülmüş bildirimler" +msgstr "" -#: templates/web/base/admin/index.html:33 +#: templates/web/base/status/stats.html:20 #: templates/web/zurich/admin/index.html:5 msgid "from %s different users" -msgstr " %d farklı kullanıcılardan" +msgstr " %s farklı kullanıcılardan" -#: templates/web/base/report/_item.html:17 -#: templates/web/zurich/report/_item.html:16 +#: templates/web/base/report/_item.html:15 +#: templates/web/zurich/report/_item.html:14 msgid "last updated %s" msgstr "son güncelleme %s" @@ -4040,10 +3879,8 @@ msgstr "yeniden açıldı" msgid "sign out" msgstr "çıkış yap" -#: templates/web/base/report/new/fill_in_details_form.html:12 -#: templates/web/base/report/new/fill_in_details_form.html:15 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:10 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:12 +#: templates/web/base/report/new/fill_in_details_form.html:11 +#: templates/web/base/report/new/fill_in_details_form.html:9 msgid "the local council" msgstr "ilgili yerel kurul " @@ -4052,7 +3889,7 @@ msgstr "ilgili yerel kurul " msgid "there is no pin shown as the user did not use the map" msgstr "Kullanıcı haritayı kullanmadığından herhangi bir iÅŸaret görünmüyor" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:398 +#: perllib/FixMyStreet/Script/Reports.pm:176 msgid "this type of local problem" msgstr "bu tip lokal problem" @@ -4061,9 +3898,8 @@ msgid "today" msgstr "bugün" #: templates/web/base/reports/_list-filters.html:4 -#, fuzzy msgid "unfixed reports" -msgstr "Çözülmüş bildirimler" +msgstr "" #: templates/web/base/admin/report_edit.html:32 msgid "used map" @@ -4082,7 +3918,7 @@ msgstr "kullanıcı problemin sahibi" msgid "ward" msgstr "bölge" -#: templates/web/base/front/stats.html:17 +#: templates/web/base/front/stats.html:13 #, perl-format msgid "<big>%s</big> report recently" msgid_plural "<big>%s</big> reports recently" @@ -4106,7 +3942,7 @@ msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d dakika" -#: templates/web/base/front/stats.html:29 +#: templates/web/base/front/stats.html:25 #, perl-format msgid "<big>%s</big> update on reports" msgid_plural "<big>%s</big> updates on reports" @@ -4124,13 +3960,13 @@ msgid "%d week" msgid_plural "%d weeks" msgstr[0] "%d hafta" -#: templates/web/base/front/stats.html:12 +#: templates/web/base/front/stats.html:8 #, perl-format msgid "<big>%s</big> report in past week" msgid_plural "<big>%s</big> reports in past week" msgstr[0] "<big>%s</big> geçen haftaki bildirimler" -#: templates/web/base/front/stats.html:23 +#: templates/web/base/front/stats.html:19 #, perl-format msgid "<big>%s</big> fixed in past month" msgid_plural "<big>%s</big> fixed in past month" @@ -4148,64 +3984,80 @@ msgid "We do <strong>not</strong> yet have details for the other council that co msgid_plural "We do <strong>not</strong> yet have details for the other councils that cover this location." msgstr[0] "BahsettiÄŸiniz alanı kapsayan ilgili diÄŸer kurullar hakkında henüz detaylı bilgimiz <strong>yok</strong>" -#~ msgid "(Don't worry — we'll hang on to your alert while you're checking your email.)" -#~ msgstr "" -#~ "(Merak etmeyin — e-postalarınızı kontrol ederken \n" -#~ "sizin bildirinizi askıda tutacagız." +#~ msgid "(we never show your email address or phone number)" +#~ msgstr "(e-posta adresiniz veya telefon numaranız gizli tutulacaktır)" + +#~ msgid "(we never show your email)" +#~ msgstr "(e-posta adresiniz gizli tutulacaktır)" + +#~ msgid "<strong>No</strong>, let me confirm my report by email:" +#~ msgstr "<strong>Hayır</strong>, bildirimleri e-posta yoluyla onaylamaya izin ver" + +#~ msgid "<strong>No</strong>, let me confirm my update by email:" +#~ msgstr "<strong>Hayır</strong>, güncellemelerimi e-posta yoluyla onaylamama izin ver" + +#~ msgid "Email me updates" +#~ msgstr "Güncellemeleri bana e-posta yolu ile bildir" + +#~ msgid "Enter a new password:" +#~ msgstr "Yeni bir ÅŸifre gir:" + +#~ msgid "Message:" +#~ msgstr "Ä°leti:" -#~ msgid "(Don't worry — we'll hang on to your problem report while you're checking your email.)" -#~ msgstr "(Merak etmeyin — e-postalarınızı kontrol ederken sizin sorun raporunuzu askıda tutacağız) " +#~ msgid "More problems nearby" +#~ msgstr "Yakındaki diÄŸer problemler" -#~ msgid "(Don't worry — we'll hang on to your update while you're checking your email.)" -#~ msgstr "(Merak etmeyin — e-postalarınızı kontrol ederken sizin güncellemelerinizi askıda tutacagız)" +#~ msgid "Nearly Done! Now check your email..." +#~ msgstr "Yeni halledildi! Åžimdi e-postanızı kontrol edin..." -#~ msgid "<small>If you cannot see the map, <a href='%s' rel='nofollow'>skip this step</a>.</small>" -#~ msgstr "<small>Haritayı göremiyosanız, <a href='%s' rel='nofollow'>bu adımı atlayın</a>.</small>" +#~ msgid "Offensive? Unsuitable? Tell us" +#~ msgstr "Saldırgan? Uygunsuz? Lütfen bilirin" -#~ msgid "<strong>No</strong>, I do not, let me sign in by email:" -#~ msgstr "<strong>Hayır</strong>, yok, e-posta yoluyla giriÅŸ yapmama izin ver:" +#~ msgid "Photo:" +#~ msgstr "FotoÄŸraf:" -#~ msgid "Are you a <strong>developer</strong>? Would you like to contribute to FixMyStreet?" -#~ msgstr "Sen bir<strong>geliÅŸtirici misin</strong>? FixMyStreet'e katkıda bulunmak ister misiniz? " +#~ msgid "Please check your email" +#~ msgstr "E-posta adresinizi kontrol ediniz" -#~ msgid "Closest nearby problems <small>(within %skm)</small>" -#~ msgstr "Çevredeki en yakın sorunlar <small>(within %skm)</small>" +#~ msgid "Please note that updates are not sent to the council. If you leave your name it will be public. Your information will only be used in accordance with our <a href=\"/faq#privacy\">privacy policy</a>" +#~ msgstr "Güncellemeler kurula gönderilmemiÅŸtir. Ä°sminizi belirttiÄŸiniz takdirde halka açık olacaktır. Bilgileriniz sadece bizim <a href=\"/faq#privacy\">gizlilik politikalarımıza uygun olarak kullanılacaktır</a>" -#~ msgid "Contact FixMyStreet" -#~ msgstr "FixMyStreet'e ulaşın" +#~ msgid "This may be because the link is too old or already used, or the address was not copied correctly." +#~ msgstr "Muhtemelen linkin çok eski veya adresin doÄŸru kopyalanmamış olmasından kaynaklıdır." -#~ msgid "Do you have a FixMyBarangay password?" -#~ msgstr "FixMyBarangay ÅŸifreniz var mıdır?" +#~ msgid "This problem has been closed" +#~ msgstr "Bu problem kapatıldı." -#~ msgid "FixMyStreet admin:" -#~ msgstr "FixMyStreet yönetimi:" +#~ msgid "This problem is in progress" +#~ msgstr "Bu problemin çözümüne iliÅŸkin süreç devam ediyor" -#~ msgid "If you do not, your alert will not be activated." -#~ msgstr "Bunu yapmazsanız, alarm aktif olmayacaktır." +#~ msgid "This problem is old and of unknown status." +#~ msgstr "Bu problem eski ve durumu bilinmemektedir." -#~ msgid "If you do not, your problem will not be posted." -#~ msgstr "Bunu yapmazsanız, sorun iletilmeyecektir." +#~ msgid "Update:" +#~ msgstr "Güncelleme:" -#~ msgid "If you do not, your update will not be posted." -#~ msgstr "Bunu yapmazsanız, güncellemeleriniz iletilmeyecektir." +#~ msgid "We have not been able to confirm your account - sorry." +#~ msgstr "Ãœzgünüz, hesabınızın onayı henüz mümkün olmadı ." -#~ msgid "New update:" -#~ msgstr "Yeni güncelleme:" +#~ msgid "We have sent you an email containing a link to confirm your account." +#~ msgstr "Hesabınızı onaylamak için size ilgili linkin olduÄŸu bir e-posta gönderdik." -#~ msgid "No problems found." -#~ msgstr "Sorun bulunamadı." +#~ msgid "We'd love to hear what you think about this site. Just fill in the form, or send an email to <a href='mailto:%s'>%s</a>:" +#~ msgstr "Bu site hakkında neler düşündüğünü merak ediyoruz. Formu doldur, veya buraya e-posta gönder <a href='mailto:%s'>%s</a>:" -#~ msgid "Sign in by email" -#~ msgstr "Email ile giriÅŸ yap" +#~ msgid "You have already attached a photo to this report, attaching another one will replace it." +#~ msgstr "Bu rapor için daha önce bir fotoÄŸraf eklediniz, eklediÄŸiniz diÄŸer fotoÄŸraf onun yerine geçecektir." -#~ msgid "Signed in as %s" -#~ msgstr "%s olarak giriÅŸ yapın" +#~ msgid "You have already attached a photo to this update, attaching another one will replace it." +#~ msgstr "Bu güncelleme için daha önce bir fotoÄŸraf eklediniz, eklediÄŸiniz diÄŸer fotoÄŸraf onun yerine geçecektir." -#~ msgid "User" -#~ msgstr "Kullanıcı" +#~ msgid "Your email:" +#~ msgstr "E-posta adresiniz:" -#~ msgid "You must now click the link in the email we've just sent you." -#~ msgstr "E-posta yoluyla size gönderdiÄŸimiz linki tıklamalısınız" +#~ msgid "Your name:" +#~ msgstr "Adınız:" -#~ msgid "Your email address:" -#~ msgstr "E-posta adresin:" +#~ msgid "Your email:" +#~ msgstr "Sizin e-posta:" diff --git a/locale/uk_UA.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/uk_UA.UTF-8/LC_MESSAGES/FixMyStreet.po index e30353c7a..a7e2d97c2 100644 --- a/locale/uk_UA.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/uk_UA.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: fixmystreet\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2015-10-23 16:51+0100\n" -"PO-Revision-Date: 2015-07-31 16:31+0000\n" +"POT-Creation-Date: 2016-03-02 13:09+0000\n" +"PO-Revision-Date: 2015-10-23 16:37+0000\n" "Last-Translator: mySociety <transifex@mysociety.org>\n" "Language-Team: Ukrainian (Ukraine) (http://www.transifex.com/mysociety/fixmystreet/language/uk_UA/)\n" "Language: uk_UA\n" @@ -20,45 +20,24 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:628 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:411 +#: perllib/FixMyStreet/DB/Result/Problem.pm:616 +#: perllib/FixMyStreet/Script/Reports.pm:189 msgid " and " msgstr "Ñ–" #: templates/web/base/report/new/councils_text_all.html:2 -#: templates/web/base/report/new/councils_text_none.html:11 -#: templates/web/base/report/new/councils_text_none.html:2 +#: templates/web/base/report/new/councils_text_none.html:12 +#: templates/web/base/report/new/councils_text_none.html:15 #: templates/web/base/report/new/councils_text_some.html:19 #: templates/web/base/report/new/councils_text_some.html:22 #: templates/web/base/report/new/councils_text_some.html:5 msgid " or " msgstr "або" -#: templates/web/base/admin/index.html:35 -#: templates/web/base/status/index.html:13 -msgid "%s confirmed alerts, %s unconfirmed" -msgstr "%d підтверджених Ñповіщень, %d непідтверджених" - -#: templates/web/base/admin/index.html:37 -#: templates/web/base/status/index.html:16 -#: templates/web/zurich/admin/index.html:6 -msgid "%s council contacts – %s confirmed, %s unconfirmed" -msgstr "%d контактів рад – %d підтверджених, %d непідтверджених" - #: templates/web/base/admin/edit-league.html:12 msgid "%d edits by %s" msgstr "%d редагувань від %s" -#: templates/web/base/admin/index.html:34 -#: templates/web/base/status/index.html:12 -msgid "%s live updates" -msgstr "%d оперативних Ñповіщень" - -#: templates/web/base/admin/index.html:36 -#: templates/web/base/status/index.html:14 -msgid "%s questionnaires sent – %s answered (%s%%)" -msgstr "%d опитувань надіÑлано – на %d відповіли (%s%%)" - #: templates/web/base/pagination.html:10 msgid "%d to %d of %d" msgstr "%d до %d з %d" @@ -73,6 +52,20 @@ msgstr "%s - підÑумкових звітів" msgid "%s admin:" msgstr "" +#: templates/web/base/status/stats.html:26 +#, fuzzy +msgid "%s bodies" +msgstr "Органи" + +#: templates/web/base/status/stats.html:24 +msgid "%s confirmed alerts, %s unconfirmed" +msgstr "%s підтверджених Ñповіщень, %s непідтверджених" + +#: templates/web/base/status/stats.html:27 +#: templates/web/zurich/admin/index.html:6 +msgid "%s council contacts – %s confirmed, %s unconfirmed" +msgstr "%s контактів рад – %s підтверджених, %s непідтверджених" + #. ("%s is the site name") #: templates/web/base/alert/index.html:7 msgid "" @@ -89,7 +82,15 @@ msgid "" "within a certain distance of a particular location." msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:695 +#: templates/web/base/status/stats.html:23 +msgid "%s live updates" +msgstr "%s оперативних Ñповіщень" + +#: templates/web/base/status/stats.html:25 +msgid "%s questionnaires sent – %s answered (%s%%)" +msgstr "%s опитувань надіÑлано – на %s відповіли (%s%%)" + +#: perllib/FixMyStreet/DB/Result/Problem.pm:683 msgid "%s ref: %s" msgstr "%s поÑиланнÑ: %s" @@ -104,15 +105,15 @@ msgid "" "for the county council." msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:255 perllib/FixMyStreet/Cobrand/UK.pm:267 +#: perllib/FixMyStreet/Cobrand/UK.pm:256 perllib/FixMyStreet/Cobrand/UK.pm:268 msgid "%s ward, %s" msgstr "%s район, %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:564 +#: perllib/FixMyStreet/DB/Result/Problem.pm:552 msgid "%s, reported at %s" msgstr "%s, Ñповіщено о %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:282 perllib/FixMyStreet/Cobrand/UK.pm:294 +#: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295 msgid "%s, within %s ward" msgstr "%s, в межах %s району" @@ -120,7 +121,7 @@ msgstr "%s, в межах %s району" msgid "© <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors" msgstr "" -#: templates/web/zurich/report/new/fill_in_details_form.html:53 +#: templates/web/zurich/report/new/fill_in_details_form.html:46 msgid "(Defect & location of defect)" msgstr "" @@ -131,15 +132,13 @@ msgstr "(поштова Ñкринька в чорному ÑпиÑку)" #: templates/web/zurich/admin/report_edit-sdm.html:60 #: templates/web/zurich/admin/report_edit.html:88 -#, fuzzy msgid "(No name)" -msgstr "Ваше ім'Ñ" +msgstr "" #: templates/web/zurich/admin/report_edit-sdm.html:67 #: templates/web/zurich/admin/report_edit.html:95 -#, fuzzy msgid "(No phone number)" -msgstr "Ваш телефон" +msgstr "" #: templates/web/base/alert/_list.html:24 msgid "(a default distance which covers roughly 200,000 people)" @@ -147,17 +146,16 @@ msgstr "(відÑтань по-замовчуванню, що покриває Ð #. ("%s is a list of distance links, e.g. [2km] / [5km] / [10km] / [20km]") #: templates/web/base/alert/_list.html:29 -#, fuzzy msgid "(alternatively the RSS feed can be customised, within %s)" -msgstr "(alternatively the RSS feed can be customised, within" +msgstr "" -#: templates/web/base/report/_item.html:27 -#: templates/web/zurich/report/_item.html:21 +#: templates/web/base/report/_item.html:25 +#: templates/web/zurich/report/_item.html:19 msgid "(closed)" msgstr "(закрито)" -#: templates/web/base/report/_item.html:25 -#: templates/web/zurich/report/_item.html:19 +#: templates/web/base/report/_item.html:23 +#: templates/web/zurich/report/_item.html:17 msgid "(fixed)" msgstr "(полагоджено)" @@ -165,37 +163,28 @@ msgstr "(полагоджено)" msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)" msgstr "(графіті, ÑміттÑ, крива бруківка, проблеми з вуличним оÑвітленнÑм тощо)" -#: templates/web/base/report/_item.html:21 +#: templates/web/base/report/_item.html:19 msgid "(not sent to council)" msgstr "(не відправлено муніципалітету)" -#: templates/web/base/report/new/fill_in_details_form.html:200 #: templates/web/zurich/report/new/fill_in_details_form.html:82 msgid "(optional)" msgstr "(вибірково)" -#: templates/web/fixmystreet/report/public_label.html:1 +#: templates/web/base/report/public_label.html:1 msgid "(public)" msgstr "" -#: templates/web/base/report/_item.html:20 +#: templates/web/base/report/_item.html:18 msgid "(sent to both)" msgstr "(відправлено обидвом)" -#: templates/web/base/report/new/fill_in_details_form.html:194 -msgid "(we never show your email address or phone number)" -msgstr "(ми не публікуєм вашу електронну адреÑу Ñ– номер телефону)" - -#: templates/web/base/report/update-form.html:159 -msgid "(we never show your email)" -msgstr "(ми не публікуєм вашу поштову адреÑу)" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:673 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 #: perllib/FixMyStreet/DB/Result/Problem.pm:410 msgid "-- Pick a category --" msgstr "-- Оберіть категорію --" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:637 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:632 #: perllib/FixMyStreet/DB/Result/Problem.pm:416 msgid "-- Pick a property type --" msgstr "-- Оберіть тип майна --" @@ -217,52 +206,39 @@ msgstr "" msgid "<label>Show %s</label> <label>about %s</label>" msgstr "" -#: templates/web/base/admin/index.html:32 -#: templates/web/base/status/index.html:11 +#: templates/web/base/status/stats.html:18 #: templates/web/zurich/admin/index.html:4 msgid "<strong>%s</strong> live problems" -msgstr "<strong>%d</strong> актуальні проблеми" +msgstr "<strong>%s</strong> актуальні проблеми" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:39 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:2 msgid "<strong>No</strong> Let me confirm my report by email" msgstr "<strong>ÐÑ–</strong> Я підтверджу ÑÐ¿Ð¾Ð²Ñ–Ñ‰ÐµÐ½Ð½Ñ Ðµ-поштою" -#: templates/web/fixmystreet/report/update-form.html:112 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:2 msgid "<strong>No</strong> Let me confirm my update by email" msgstr "<strong>ÐÑ–</strong> Я підтверджу Ð¿Ð¾Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ðµ-поштою" -#: templates/web/base/auth/general.html:48 +#: templates/web/base/auth/general.html:87 #: templates/web/zurich/auth/general.html:51 msgid "<strong>No</strong> let me sign in by email" msgstr "<strong>ÐÑ–</strong> Ñ Ð·Ð°Ð»Ð¾Ð³Ñ–Ð½ÑŽÑÑŒ через е-пошту" -#: templates/web/base/report/new/fill_in_details_form.html:145 -msgid "<strong>No</strong>, let me confirm my report by email:" -msgstr "<strong>ÐÑ–</strong>, Ñ Ð¿Ñ–Ð´Ñ‚Ð²ÐµÑ€Ð´Ð¶Ñƒ ÑÐ¿Ð¾Ð²Ñ–Ñ‰ÐµÐ½Ð½Ñ Ðµ-поштою" - -#: templates/web/base/report/update-form.html:118 -msgid "<strong>No</strong>, let me confirm my update by email:" -msgstr "<strong>ÐÑ–</strong>, Я підтверджу Ð¿Ð¾Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ðµ-поштою:" - -#: templates/web/base/auth/general.html:34 -#: templates/web/base/report/new/fill_in_details_form.html:123 -#: templates/web/base/report/update-form.html:96 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:15 -#: templates/web/fixmystreet/report/update-form.html:89 +#: templates/web/base/auth/general.html:70 +#: templates/web/base/report/new/form_user_loggedout_password.html:3 +#: templates/web/base/report/update/form_user_loggedout_password.html:2 msgid "<strong>Yes</strong> I have a password" msgstr "<strong>Так</strong> Ð’ мене Ñ” пароль" -#: templates/web/base/static/about-en-gb.html:1 -#: templates/web/base/static/about-en-gb.html:3 +#: templates/web/base/about/about-en-gb.html:1 +#: templates/web/base/about/about-en-gb.html:3 msgid "About us" msgstr "Про наÑ" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:8 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:31 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:29 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:35 msgid "Action Scheduled" msgstr "Запланована діÑ" @@ -293,14 +269,13 @@ msgstr "Додати нову категорію" msgid "Add user" msgstr "Додати кориÑтувача" -#: templates/web/base/my/my.html:52 +#: templates/web/base/my/my.html:56 msgid "Added %s" msgstr "Додано %s" #: templates/web/base/report/new/category_extras.html:9 -#, fuzzy msgid "Additional Information" -msgstr "Очікує перевірки модератором" +msgstr "" #: templates/web/base/auth/change_password.html:29 msgid "Again:" @@ -314,8 +289,7 @@ msgstr "Ð¡Ð¿Ð¾Ð²Ñ–Ñ‰ÐµÐ½Ð½Ñ %d Ñтворено Ð´Ð»Ñ %s, type %s, парамРmsgid "Alert %d disabled (created %s)" msgstr "Ð¡Ð¿Ð¾Ð²Ñ–Ñ‰ÐµÐ½Ð½Ñ %d відключено (Ñтворено %s)" -#: templates/web/base/report/update-form.html:164 -#: templates/web/fixmystreet/report/update-form.html:150 +#: templates/web/base/report/update/form_name.html:20 msgid "Alert me to future updates" msgstr "ПовідомлÑти мене про оновленнÑ" @@ -325,9 +299,8 @@ msgid "All Reports" msgstr "Ð’ÑÑ– звіти" #: templates/web/zurich/admin/stats.html:5 -#, fuzzy msgid "All Reports as CSV" -msgstr "Ð’ÑÑ– звіти" +msgstr "" #: templates/web/base/footer.html:11 templates/web/fixmystreet/footer.html:32 #: templates/web/zurich/admin/index-dm.html:12 @@ -348,10 +321,8 @@ msgstr "Ð’ÑÑŽ надану інформацію буде надіÑлано дР#: templates/web/base/report/new/councils_text_all.html:2 #: templates/web/base/report/new/councils_text_all.html:4 -#: templates/web/base/report/new/fill_in_details_form.html:12 -#: templates/web/base/report/new/fill_in_details_form.html:14 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:10 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:11 +#: templates/web/base/report/new/fill_in_details_form.html:10 +#: templates/web/base/report/new/fill_in_details_form.html:9 msgid "All the information you provide here will be sent to <strong>%s</strong>." msgstr "Ð’ÑÑŽ надану інформацію буде надіÑлано до <strong>%s</strong>." @@ -373,6 +344,10 @@ msgstr "Ðнонім:" msgid "Are you a developer?" msgstr "Ви розробник?" +#: templates/web/base/js/translation_strings.html:52 +msgid "Are you sure you want to cancel this upload?" +msgstr "" + #: templates/web/base/admin/body-form.html:69 #: templates/web/base/admin/body.html:16 #: templates/web/zurich/admin/body-form.html:24 @@ -385,9 +360,8 @@ msgid "As this is a staging site and %s is false, reports made on this site will msgstr "" #: templates/web/zurich/admin/report_edit.html:213 -#, fuzzy msgid "Assign to competent body:" -msgstr "Ðазначити зовнішньому відділу:" +msgstr "" #: templates/web/zurich/admin/report_edit.html:173 #: templates/web/zurich/admin/stats.html:36 @@ -406,16 +380,16 @@ msgstr "Ðазначити підрозділу:" msgid "Assigned to %s" msgstr "Ðазначити %s" -#: templates/web/base/open311/index.html:84 +#: templates/web/base/open311/index.html:76 msgid "At most %d requests are returned in each query. The returned requests are ordered by requested_datetime, so to get all requests, do several searches with rolling start_date and end_date." msgstr "At most %d requests are returned in each query. The returned requests are ordered by requested_datetime, so to get all requests, do several searches with rolling start_date and end_date." -#: templates/web/base/open311/index.html:76 +#: templates/web/base/open311/index.html:68 msgid "At the moment only searching for and looking at reports work." msgstr "Ðаразі лише роздивлÑÑŽÑÑŒ Ñк працюють звіти" #: perllib/FixMyStreet/DB/Result/Problem.pm:373 -#: templates/web/zurich/report/_item.html:11 +#: templates/web/zurich/report/_item.html:9 msgid "Awaiting moderation" msgstr "Очікує перевірки модератором" @@ -427,7 +401,7 @@ msgstr "Ðазад" msgid "Ban email address" msgstr "Забанити адреÑу" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1276 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1285 #: perllib/FixMyStreet/Cobrand/Zurich.pm:392 #: templates/web/base/admin/bodies.html:1 templates/web/zurich/header.html:64 msgid "Bodies" @@ -457,7 +431,7 @@ msgid "Can't see the map? <em>Skip this step</em>" msgstr "Ðе бачите мапу? <em>ПропуÑÑ‚Ñ–Ñ‚ÑŒ цей крок</em>" #: templates/web/base/admin/body.html:68 -#: templates/web/base/admin/index.html:61 +#: templates/web/base/admin/index.html:54 #: templates/web/base/report/new/category.html:10 #: templates/web/base/report/new/category_wrapper.html:3 #: templates/web/zurich/admin/body.html:14 @@ -468,8 +442,8 @@ msgstr "Ðе бачите мапу? <em>ПропуÑÑ‚Ñ–Ñ‚ÑŒ цей крок</em msgid "Category" msgstr "КатегоріÑ" -#: templates/web/base/admin/index.html:59 -#: templates/web/base/admin/index.html:67 +#: templates/web/base/admin/index.html:52 +#: templates/web/base/admin/index.html:60 msgid "Category fix rate for problems > 4 weeks old" msgstr "Ð’ цій категорії проблеми не вирішуютьÑÑ > 4 тижнів" @@ -482,7 +456,7 @@ msgstr "Ð’ цій категорії проблеми не вирішуютьÑÑ msgid "Category:" msgstr "КатегоріÑ:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:402 +#: perllib/FixMyStreet/Script/Reports.pm:180 msgid "Category: %s" msgstr "КатегоріÑ: %s" @@ -534,7 +508,7 @@ msgid "Click here or enter as dd/mm/yyyy" msgstr "ÐатиÑніть тут або введіть в форматі дд/мм/рррр" #: templates/web/base/around/_report_banner.html:2 -#: templates/web/base/js/translation_strings.html:50 +#: templates/web/base/js/translation_strings.html:55 msgid "Click map to report a problem" msgstr "ÐатиÑніть на точку на мапі щоб прозвітувати проблему" @@ -561,7 +535,7 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:25 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:144 -#: templates/web/fixmystreet/report/banner.html:15 +#: templates/web/base/report/banner.html:15 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:10 #: templates/web/zurich/admin/header.html:16 @@ -569,7 +543,7 @@ msgstr "" msgid "Closed" msgstr "Закрито" -#: perllib/FixMyStreet/DB/Result/Problem.pm:794 +#: perllib/FixMyStreet/DB/Result/Problem.pm:779 msgid "Closed by council" msgstr "Закрито муніципалітетом" @@ -595,7 +569,7 @@ msgstr "Cobrand data:" msgid "Cobrand:" msgstr "Cobrand:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1283 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1292 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "КонфігураціÑ" @@ -608,13 +582,14 @@ msgstr "Ðалаштувати ендпойнт" msgid "Confirm" msgstr "Підтвердити" -#: templates/web/base/auth/token.html:1 templates/web/zurich/auth/token.html:1 +#: templates/web/base/auth/token.html:1 msgid "Confirm account" msgstr "Підтвердити запиÑ" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:33 -#: templates/web/fixmystreet/report/update-form.html:107 -msgid "Confirm by email below, providing a new password at that point. When you confirm, your password will be updated." +#: templates/web/base/report/new/form_user_loggedout_password.html:21 +#: templates/web/base/report/update/form_user_loggedout_password.html:20 +#, fuzzy +msgid "Confirm by email instead, providing a new password at that point. When you confirm, your password will be updated." msgstr "Підтвердіть е-адреÑу, ввівши новий пароль на цей раз. ПіÑÐ»Ñ Ð¿Ñ–Ð´Ñ‚Ð²ÐµÑ€Ð´Ð¶ÐµÐ½Ð½Ñ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ буде змінено." #: templates/web/base/questionnaire/creator_fixed.html:1 @@ -644,35 +619,27 @@ msgid "Confirmed:" msgstr "Підтверджені:" #. ("%s is the site name") -#: templates/web/base/faq/faq-en-gb.html:8 templates/web/base/footer.html:24 -#: templates/web/base/open311/index.html:8 -#: templates/web/base/static/privacy.html:10 -#: templates/web/fixmystreet/contact/index.html:12 -#, fuzzy +#: templates/web/base/about/_sidebar.html:6 templates/web/base/footer.html:24 msgid "Contact %s" -msgstr "Зворотній звÑзок" +msgstr "" #: templates/web/base/contact/index.html:1 #: templates/web/base/contact/index.html:2 #: templates/web/base/contact/submit.html:1 -#: templates/web/fixmystreet/contact/index.html:1 -#: templates/web/fixmystreet/contact/index.html:2 msgid "Contact Us" msgstr "Зворотній звÑзок" -#: templates/web/base/contact/index.html:6 -#: templates/web/fixmystreet/contact/index.html:20 +#: templates/web/base/contact/index.html:12 msgid "Contact the team" msgstr "ЗвернутиÑÑŒ до команди" #: templates/web/zurich/admin/report_edit-sdm.html:40 #: templates/web/zurich/admin/report_edit.html:59 -#, fuzzy msgid "Coordinates:" -msgstr "Погоджувачы:" +msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1420 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1448 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1429 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1457 msgid "Could not find user" msgstr "Ðе вдалоÑÑŒ знайти кориÑтувача" @@ -690,7 +657,7 @@ msgstr "Рада" msgid "Council contacts for %s" msgstr "Контакти ради Ð´Ð»Ñ %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:693 +#: perllib/FixMyStreet/DB/Result/Problem.pm:681 msgid "Council ref: %s" msgstr "рада ref: %s" @@ -705,7 +672,7 @@ msgstr "Рада:" msgid "Count" msgstr "ЧиÑло" -#: templates/web/base/email_sent.html:1 templates/web/zurich/email_sent.html:1 +#: templates/web/base/email_sent.html:1 msgid "Create a report" msgstr "Створити ÑповіщеннÑ" @@ -715,9 +682,8 @@ msgid "Create category" msgstr "Створити категорію" #: templates/web/zurich/admin/template_edit.html:29 -#, fuzzy msgid "Create template" -msgstr "Створити ÑповіщеннÑ" +msgstr "" #: templates/web/base/admin/problem_row.html:34 #: templates/web/zurich/admin/templates.html:10 @@ -754,7 +720,7 @@ msgstr "Дашборд" msgid "Dealt with by subdivision within 5 working days" msgstr "Dealt with by subdivision within 5 working days" -#: perllib/FixMyStreet/App/Controller/Admin.pm:878 +#: perllib/FixMyStreet/App/Controller/Admin.pm:877 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "" @@ -767,7 +733,7 @@ msgstr "" msgid "Deleted" msgstr "Видалено" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:51 +#: templates/web/base/report/new/form_report.html:45 #: templates/web/zurich/admin/index-dm.html:22 #: templates/web/zurich/admin/index-sdm.html:20 #: templates/web/zurich/admin/reports.html:12 @@ -775,12 +741,11 @@ msgid "Description" msgstr "ОпиÑ" #: templates/web/base/js/translation_strings.html:34 -#: templates/web/zurich/report/new/fill_in_details_form.html:42 +#: templates/web/zurich/report/new/fill_in_details_form.html:68 msgid "Details" msgstr "Подробиці" #: templates/web/base/admin/report_edit.html:20 -#: templates/web/base/report/new/fill_in_details_form.html:62 #: templates/web/zurich/admin/report_edit-sdm.html:27 #: templates/web/zurich/admin/report_edit.html:29 #: templates/web/zurich/admin/report_edit.html:43 @@ -793,38 +758,38 @@ msgstr "Передано" #: templates/web/zurich/admin/report_edit-sdm.html:50 #: templates/web/zurich/admin/report_edit.html:69 -#, fuzzy msgid "Didn't use map" -msgstr "не викориÑтовував карту" +msgstr "" #: templates/web/base/admin/edit-league.html:8 msgid "Diligency prize league table" msgstr "Ð¢Ð°Ð±Ð»Ð¸Ñ†Ñ Ð½Ð°Ð¹Ñтаранніших призерів" #. ("%s is the site name") -#: templates/web/base/auth/general.html:31 -#: templates/web/base/report/new/fill_in_details_form.html:114 -#: templates/web/base/report/update-form.html:87 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:11 -#: templates/web/fixmystreet/report/update-form.html:86 -#, fuzzy +#: templates/web/base/auth/general.html:48 +#: templates/web/base/report/new/form_user_loggedout.html:18 +#: templates/web/base/report/new/oauth_email_form.html:18 +#: templates/web/base/report/update-form.html:29 +#: templates/web/base/report/update/form_user_loggedout.html:17 msgid "Do you have a %s password?" -msgstr "Ви маєте пароль до FixMyStreet?" +msgstr "" #: templates/web/base/questionnaire/index.html:55 msgid "Don’t know" msgstr "Ðе знаю" -#: templates/web/fixmystreet/contact/index.html:118 +#: templates/web/base/contact/index.html:110 msgid "Don't like forms?" msgstr "Ðе любите форми?" +#: templates/web/base/js/translation_strings.html:51 +msgid "Drag and drop photos here or <u>click to upload</u>" +msgstr "" + #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:14 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:32 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:30 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:36 msgid "Duplicate" msgstr "Дубль" @@ -874,7 +839,7 @@ msgstr "Редактор" #: templates/web/base/admin/category_edit.html:91 #: templates/web/base/admin/flagged.html:38 #: templates/web/base/admin/users.html:16 -#: templates/web/base/auth/general.html:22 +#: templates/web/base/auth/general.html:39 #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:24 @@ -882,7 +847,7 @@ msgstr "Редактор" msgid "Email" msgstr "Е-пошта" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1396 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1405 msgid "Email added to abuse list" msgstr "Пошта занеÑена в чорний ÑпиÑок" @@ -898,7 +863,7 @@ msgstr "" msgid "Email alert deleted" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1393 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1402 msgid "Email already in abuse list" msgstr "ÐдреÑа вже в чорному ÑпиÑку" @@ -906,41 +871,36 @@ msgstr "ÐдреÑа вже в чорному ÑпиÑку" msgid "Email me new local problems" msgstr "ПовідомлÑйте мене про локальні проблеми лиÑтом" -#: templates/web/base/report/display.html:38 -msgid "Email me updates" -msgstr "ÐадÑилайте мені новини" - #: templates/web/base/admin/category_edit.html:31 #: templates/web/base/admin/report_edit.html:62 #: templates/web/base/admin/update_edit.html:33 #: templates/web/base/admin/user-form.html:20 #: templates/web/base/alert/updates.html:13 -#: templates/web/base/report/display.html:42 #: templates/web/zurich/admin/body.html:47 msgid "Email:" msgstr "Е-пошта:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:329 +#: perllib/FixMyStreet/Script/Reports.pm:108 msgid "Email: %s" msgstr "Е-пошта: %s" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:639 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:634 msgid "Empty flat or maisonette" msgstr "ÐŸÐ¾Ñ€Ð¾Ð¶Ð½Ñ ÐºÐ²Ð°Ñ€Ñ‚Ð¸Ñ€Ð° або дворівнева" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:638 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:633 msgid "Empty house or bungalow" msgstr "Порожній будинок або бунгало" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:641 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:636 msgid "Empty office or other commercial" msgstr "Порожній Ð¾Ñ„Ñ–Ñ Ð°Ð±Ð¾ інше комерційне приміщеннÑ" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:642 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:637 msgid "Empty pub or bar" msgstr "Порожній паб або бар" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:643 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:638 msgid "Empty public building - school, hospital, etc." msgstr "ÐŸÐ¾Ñ€Ð¾Ð¶Ð½Ñ Ð³Ñ€Ð¾Ð¼Ð°Ð´Ñька Ð±ÑƒÐ´Ñ–Ð²Ð»Ñ - школа, Ð»Ñ–ÐºÐ°Ñ€Ð½Ñ Ñ‚Ð° ін." @@ -973,7 +933,7 @@ msgstr "Кінцева точка" msgid "Enter a Zürich street name" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:13 +#: perllib/FixMyStreet/Cobrand/UK.pm:14 msgid "Enter a nearby UK postcode, or street name and area" msgstr "Вкажіть поштовий код UK або назву вулиці та міÑцÑ" @@ -991,14 +951,9 @@ msgstr "Введіть назву вулиці чи району поблизу" msgid "Enter a nearby street name and area, postal code or district in Delhi" msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:152 -#: templates/web/base/report/update-form.html:125 -msgid "Enter a new password:" -msgstr "Введіть новий пароль:" - -#: templates/web/base/auth/general.html:60 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:75 -#: templates/web/fixmystreet/report/update-form.html:123 +#: templates/web/base/auth/general.html:99 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:38 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:13 #: templates/web/zurich/auth/general.html:65 msgid "Enter a password" msgstr "Введіть пароль" @@ -1008,11 +963,11 @@ msgid "Enter details of the problem" msgstr "Введіть подробиці проблеми" #: templates/web/base/errors/generic.html:1 -#: templates/web/base/errors/generic.html:3 +#: templates/web/base/errors/generic.html:4 #: templates/web/base/tokens/abuse.html:1 #: templates/web/base/tokens/abuse.html:3 #: templates/web/base/tokens/error.html:1 -#: templates/web/base/tokens/error.html:3 +#: templates/web/base/tokens/error.html:5 msgid "Error" msgstr "Помилка" @@ -1025,11 +980,11 @@ msgstr "" msgid "Example postcode %s" msgstr "Зразок поштового коду %s" -#: templates/web/base/open311/index.html:94 +#: templates/web/base/open311/index.html:86 msgid "Examples:" msgstr "Приклади:" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:55 +#: templates/web/base/report/new/form_report.html:49 msgid "Explain what’s wrong, exactly where it is, and how long it’s been there…" msgstr "" @@ -1070,17 +1025,15 @@ msgstr "Полагодіть це вибравши <strong>зону покрит msgid "FixMyStreet" msgstr "FixMyStreet" -#: templates/web/base/admin/index.html:61 +#: templates/web/base/admin/index.html:54 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:24 #: templates/web/base/admin/report_blocks.html:9 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:144 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:34 -#: templates/web/fixmystreet/report/banner.html:12 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:32 +#: templates/web/base/report/banner.html:12 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:38 msgid "Fixed" msgstr "Вирішено" @@ -1107,7 +1060,7 @@ msgstr "Відмітьте Ñк видалене" msgid "Flag user" msgstr "Відмітьте кориÑтувача" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1281 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1290 #: templates/web/base/admin/users.html:19 msgid "Flagged" msgstr "Відмічено" @@ -1138,36 +1091,31 @@ msgstr "ПроÑлійте за поÑиланнÑм на район щоб ба msgid "For more information, see <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>." msgstr "For more information, see <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>." -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:32 -#: templates/web/fixmystreet/report/update-form.html:106 +#: templates/web/base/report/new/form_user_loggedout_password.html:20 +#: templates/web/base/report/update/form_user_loggedout_password.html:19 msgid "Forgotten your password?" msgstr "Забули пароль?" #: perllib/FixMyStreet/Cobrand/Zurich.pm:752 -#, fuzzy msgid "Forwarded to external body" -msgstr "Ðазначити зовнішньому відділу:" +msgstr "" #: perllib/FixMyStreet/Cobrand/Zurich.pm:753 -#, fuzzy msgid "Forwarded wish to external body" -msgstr "Ðазначити зовнішньому відділу:" +msgstr "" -#: templates/web/base/faq/faq-en-gb.html:1 -#: templates/web/base/faq/faq-en-gb.html:13 -#: templates/web/base/faq/faq-en-gb.html:6 -#: templates/web/base/open311/index.html:6 -#: templates/web/base/static/privacy.html:8 -#: templates/web/fixmystreet/contact/index.html:10 +#: templates/web/base/about/_sidebar.html:4 +#: templates/web/base/about/faq-en-gb.html:1 +#: templates/web/base/about/faq-en-gb.html:5 msgid "Frequently Asked Questions" msgstr "ЧаÑто задавані питаннÑ" -#: templates/web/base/open311/index.html:136 +#: templates/web/base/open311/index.html:128 msgid "GeoRSS on Google Maps" msgstr "" +#: templates/web/base/report/display_tools.html:11 #: templates/web/fixmystreet/around/_updates.html:3 -#: templates/web/fixmystreet/report/display.html:35 msgid "Get updates" msgstr "Отримувати оновленнÑ" @@ -1200,7 +1148,7 @@ msgstr "Вперед" msgid "Going to send questionnaire?" msgstr "ЗбираєтеÑÑŒ відправити опитувальник?" -#: templates/web/base/admin/index.html:42 +#: templates/web/base/admin/index.html:35 msgid "Graph of problem creation by status over time" msgstr "Графік ÑÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ð¿Ñ€Ð¾Ð±Ð»ÐµÐ¼ з чаÑом" @@ -1217,7 +1165,7 @@ msgid "Have you ever reported a problem to a council before, or is this your fir msgstr "Ви вже Ñповіщали про проблеми раніше, чи це вперше?" #: templates/web/base/footer.html:15 templates/web/fixmystreet/footer.html:38 -#: templates/web/zurich/faq/faq-de-ch.html:1 +#: templates/web/zurich/about/faq-de-ch.html:1 #: templates/web/zurich/footer.html:22 #: templates/web/zurich/nav_over_content.html:8 msgid "Help" @@ -1268,7 +1216,7 @@ msgstr "Як ÑповіÑтити про проблему" msgid "How to send successful reports" msgstr "Як надіÑлати ÑкіÑне ÑповіщеннÑ" -#: perllib/FixMyStreet/App/Controller/Admin.pm:754 +#: perllib/FixMyStreet/App/Controller/Admin.pm:752 msgid "I am afraid you cannot confirm unconfirmed reports." msgstr "Ðажаль ви не можете підтвердити непідтверджені ÑповіщеннÑ" @@ -1286,10 +1234,6 @@ msgstr "" msgid "I'm afraid we couldn't locate your problem in the database.\n" msgstr "Ðажаль ми не можем знайти вашу проблему в базі даних.\n" -#: perllib/FixMyStreet/App/Controller/Tokens.pm:327 -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 "Ðажаль ми не можем валідувати цей токен. Якщо ви зкопіювали поÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð· е-пошти, перевірте чи воно Ñкопійовано вірно.\n" - #: templates/web/base/admin/flagged.html:14 #: templates/web/base/admin/list_updates.html:6 #: templates/web/base/admin/reports.html:11 @@ -1322,22 +1266,16 @@ msgstr "" msgid "If you get some more information about the status of your problem, please come back to the site and leave an update." msgstr "" -#: templates/web/base/report/new/councils_text_none.html:2 -#: templates/web/base/report/new/councils_text_none.html:8 +#: templates/web/base/report/new/councils_text_none.html:10 +#: templates/web/base/report/new/councils_text_none.html:9 msgid "If you submit a problem here the subject and details of the problem will be public, but the problem will <strong>not</strong> be reported to the council." msgstr "Якщо ви відправите проблему тут, то тема Ñ– подробиці проблеми будуть публічними, але проблема <strong>не буде</strong> відправлена департаментам." -#: templates/web/zurich/auth/token.html:19 -#: templates/web/zurich/email_sent.html:7 -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 "Якщо ви кориÑтуєтеÑÑŒ онлайн-поштовиком або маєте Ñпам-фільтр, перевірте папку Ñпам: інколи наші Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð¿Ð¾Ñ‚Ñ€Ð°Ð¿Ð»ÑÑŽÑ‚ÑŒ в цю категорію." - #: templates/web/base/questionnaire/index.html:68 -#, fuzzy msgid "" "If you wish to leave a public update on the problem, please enter it here\n" "(please note it will not be sent to the council)." -msgstr "Якщо ви хочете додати ÑкуÑÑŒ публічну інформацію про проблему, введіть Ñ—Ñ— тут (зауважте, що Ñ†Ñ Ñ–Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ñ–Ñ Ð½Ðµ буде надіÑлана департаментам). Ðаприклад, розкажіть Ñки кроками була вирішена проблема." +msgstr "" #: templates/web/base/admin/body.html:149 msgid "If you're using <strong>a send method that is not email</strong>, enter the service ID (Open311) or equivalent identifier here." @@ -1376,10 +1314,8 @@ msgstr "Ðевірний вибір завантаженнÑ" #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:144 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:32 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:30 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:36 msgid "In Progress" msgstr "Ð’ процеÑÑ–" @@ -1387,7 +1323,7 @@ msgstr "Ð’ процеÑÑ–" msgid "In abuse table?" msgstr "Ð’ чорний ÑпиÑок?" -#: templates/web/base/open311/index.html:88 +#: templates/web/base/open311/index.html:80 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 "" @@ -1395,7 +1331,7 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/Zurich.pm:963 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:7 -#: templates/web/fixmystreet/report/banner.html:19 +#: templates/web/base/report/banner.html:19 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:8 msgid "In progress" @@ -1430,7 +1366,7 @@ msgstr "Внутрішнє поÑиланнÑ" msgid "Invalid agency_responsible value %s" msgstr "Ðевірне Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ agency_responsible %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1201 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1210 msgid "Invalid end date" msgstr "Ðевірна кінцева дата" @@ -1438,7 +1374,7 @@ msgstr "Ðевірна кінцева дата" msgid "Invalid format %s specified." msgstr "Ðевірний формат %s ." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1206 msgid "Invalid start date" msgstr "Ðевірна початкова дата" @@ -1446,14 +1382,12 @@ msgstr "Ðевірна початкова дата" #: templates/web/base/admin/report_blocks.html:5 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:143 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:31 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:29 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:35 msgid "Investigating" msgstr "ДоÑлідженнÑ" -#: templates/web/fixmystreet/contact/blurb.html:8 +#: templates/web/base/contact/blurb.html:8 msgid "It's often quickest to <a href=\"%s\">check our FAQs</a> and see if the answer is there." msgstr "" @@ -1471,11 +1405,9 @@ msgstr "" msgid "Jurisdiction unknown" msgstr "" -#: templates/web/base/auth/general.html:44 -#: templates/web/base/report/new/fill_in_details_form.html:132 -#: templates/web/base/report/update-form.html:105 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:28 -#: templates/web/fixmystreet/report/update-form.html:102 +#: templates/web/base/auth/general.html:80 +#: templates/web/base/report/new/form_user_loggedout_password.html:16 +#: templates/web/base/report/update/form_user_loggedout_password.html:15 #: templates/web/zurich/auth/general.html:40 msgid "Keep me signed in on this computer" msgstr "Запам'Ñтати мене на цьому комп'ютері" @@ -1533,6 +1465,7 @@ msgid "MAP" msgstr "Мапа" #: templates/web/base/js/translation_strings.html:45 +#: templates/web/base/maps/google-ol.html:13 msgid "Map" msgstr "" @@ -1552,23 +1485,17 @@ msgstr "" msgid "Marked fixed/closed more than eight weeks ago" msgstr "" -#: templates/web/fixmystreet/contact/index.html:106 +#: templates/web/base/contact/index.html:98 msgid "Message" msgstr "ПовідомленнÑ" #: templates/web/zurich/admin/report_edit.html:284 -#, fuzzy msgid "Message to competent body:" -msgstr "Ðазначити зовнішньому відділу:" +msgstr "" #: templates/web/zurich/admin/report_edit.html:282 -#, fuzzy msgid "Message to external body:" -msgstr "Ðазначити зовнішньому відділу:" - -#: templates/web/base/contact/index.html:97 -msgid "Message:" -msgstr "ПовідомленнÑ:" +msgstr "" #: perllib/FixMyStreet/App/Controller/Open311.pm:445 msgid "Missing jurisdiction_id" @@ -1582,10 +1509,6 @@ msgstr "МодеруєтьÑÑ Ð¿Ñ–Ð´Ñ€Ð¾Ð·Ð´Ñ–Ð»Ð¾Ð¼ на протÑзі роб msgid "Month" msgstr "МіÑÑць" -#: templates/web/base/report/display.html:34 -msgid "More problems nearby" -msgstr "Ще проблеми поблизу" - #: templates/web/base/admin/bodies.html:21 #: templates/web/base/admin/body-form.html:18 #: templates/web/base/admin/flagged.html:16 @@ -1593,11 +1516,11 @@ msgstr "Ще проблеми поблизу" #: templates/web/base/admin/list_updates.html:7 #: templates/web/base/admin/reports.html:13 #: templates/web/base/admin/users.html:15 -#: templates/web/base/auth/general.html:50 +#: templates/web/base/auth/general.html:89 +#: templates/web/base/report/new/form_user_loggedin.html:9 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:7 +#: templates/web/base/report/update/form_name.html:4 #: templates/web/base/reports/index.html:20 -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:9 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:44 -#: templates/web/fixmystreet/report/update-form.html:138 #: templates/web/zurich/admin/body-form.html:4 #: templates/web/zurich/auth/general.html:60 #: templates/web/zurich/report/new/fill_in_details_form.html:82 @@ -1611,7 +1534,7 @@ msgstr "Ім'Ñ" msgid "Name:" msgstr "Ім'Ñ:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:328 +#: perllib/FixMyStreet/Script/Reports.pm:107 msgid "Name: %s" msgstr "Ім'Ñ: %s" @@ -1620,16 +1543,16 @@ msgstr "Ім'Ñ: %s" msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s" msgstr "Ðайближча дорога до шпильки на карті (автоматично згенеровано через OpenStreetMap): %s%s" -#: perllib/FixMyStreet/Cobrand/UK.pm:127 +#: perllib/FixMyStreet/Cobrand/UK.pm:128 msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" msgstr "Ðайближчий поштовий Ñ–Ð½Ð´ÐµÐºÑ Ð´Ð¾ шпильки на карті (автоматично згенеровано): %s (відÑтань: %sм)" -#: perllib/FixMyStreet/Cobrand/Default.pm:434 -#: perllib/FixMyStreet/Cobrand/Default.pm:474 +#: perllib/FixMyStreet/Cobrand/Default.pm:455 +#: perllib/FixMyStreet/Cobrand/Default.pm:495 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "Ðайближча дорога до шпильки на карті (автоматично згенеровано через Bing карти): %s%s" -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:267 +#: perllib/FixMyStreet/Script/Alerts.pm:290 msgid "" "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n" "\n" @@ -1637,14 +1560,9 @@ msgstr "" "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n" "\n" -#: templates/web/zurich/email_sent.html:5 -msgid "Nearly Done! Now check your email..." -msgstr "Майже закінчили! Тепер перевірте вашу е-пошту..." - #: templates/web/base/auth/token.html:17 templates/web/base/email_sent.html:5 -#, fuzzy msgid "Nearly done! Now check your email…" -msgstr "Майже закінчили! Тепер перевірте вашу е-пошту..." +msgstr "" #: templates/web/base/reports/index.html:21 msgid "New <br>problems" @@ -1668,9 +1586,8 @@ msgid "New local problems on FixMyStreet" msgstr "Ðові міÑцеві проблеми" #: templates/web/zurich/admin/report_edit-sdm.html:117 -#, fuzzy msgid "New note to DM:" -msgstr "Ðовий внутрішній нотаток:" +msgstr "" #: db/alert_types.pl:38 msgid "New problems for {{COUNCIL}} within {{WARD}} ward on FixMyStreet" @@ -1702,9 +1619,8 @@ msgstr "Ðовий Ñтан" #: templates/web/zurich/admin/template_edit.html:9 #: templates/web/zurich/admin/templates.html:26 -#, fuzzy msgid "New template" -msgstr "Ðовий Ñтан" +msgstr "" #: templates/web/base/pagination.html:13 msgid "Next" @@ -1721,8 +1637,8 @@ msgstr "Далі" #: templates/web/base/admin/report_edit.html:75 #: templates/web/base/admin/update_edit.html:25 #: templates/web/base/questionnaire/creator_fixed.html:16 +#: templates/web/base/questionnaire/index.html:101 #: templates/web/base/questionnaire/index.html:53 -#: templates/web/base/questionnaire/index.html:92 msgid "No" msgstr "ÐÑ–" @@ -1786,10 +1702,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:13 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:33 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:31 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:37 msgid "Not Responsible" msgstr "Ðе відповідальний" @@ -1797,9 +1711,8 @@ msgstr "Ðе відповідальний" #: perllib/FixMyStreet/Cobrand/Zurich.pm:937 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:13 -#, fuzzy msgid "Not contactable" -msgstr "Ðе відповідальний" +msgstr "" #: templates/web/zurich/admin/report_edit-sdm.html:108 msgid "Not for my subdivision" @@ -1829,7 +1742,7 @@ msgstr "Зауважте, коли включаєм непідтвердженн msgid "Note:" msgstr "Ðотатка:" -#: templates/web/base/open311/index.html:73 +#: templates/web/base/open311/index.html:65 msgid "Note: <strong>%s</strong>" msgstr "Ðотатка: <strong>%s</strong>" @@ -1837,13 +1750,15 @@ msgstr "Ðотатка: <strong>%s</strong>" msgid "Notes from SDM to DM" msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:113 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:10 +#: templates/web/base/report/new/form_user_loggedout.html:14 +#: templates/web/base/report/new/form_user_loggedout.html:2 +#: templates/web/base/report/new/oauth_email_form.html:17 msgid "Now to submit your report…" msgstr "Тепер відправити ваше ÑÐ¿Ð¾Ð²Ñ–Ñ‰ÐµÐ½Ð½Ñ …" -#: templates/web/base/report/update-form.html:86 -#: templates/web/fixmystreet/report/update-form.html:85 +#: templates/web/base/report/update-form.html:28 +#: templates/web/base/report/update/form_user_loggedout.html:13 +#: templates/web/base/report/update/form_user_loggedout.html:2 msgid "Now to submit your update…" msgstr "Тепер щоб відправити ваше поновленнх" @@ -1851,11 +1766,6 @@ msgstr "Тепер щоб відправити ваше поновленнÑ&hel msgid "OK" msgstr "Гаразд" -#: templates/web/base/report/display.html:28 -#: templates/web/base/report/update.html:17 -msgid "Offensive? Unsuitable? Tell us" -msgstr "Образливо? ÐедопуÑтимо? Розкажіть нам" - #: templates/web/base/reports/index.html:23 msgid "Old / unknown <br>problems" msgstr "ЗаÑтарілі / невизначені <br>проблеми" @@ -1872,7 +1782,7 @@ msgstr "Раніше <br>виправлено" msgid "Older <br>problems" msgstr "Старіші <br>проблеми" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:45 +#: templates/web/base/report/new/form_report.html:15 msgid "One-line summary" msgstr "" @@ -1883,8 +1793,7 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:4 #: templates/web/base/admin/update_edit.html:28 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/report/update-form.html:30 -#: templates/web/fixmystreet/report/update-form.html:28 +#: templates/web/base/report/update/form_update.html:34 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:7 #: templates/web/zurich/admin/update_edit.html:18 @@ -1899,15 +1808,15 @@ msgstr "" msgid "Open, but not had any update in eight weeks" msgstr "" -#: templates/web/base/open311/index.html:70 +#: templates/web/base/open311/index.html:62 msgid "Open311 API for the mySociety FixMyStreet server" msgstr "" -#: templates/web/base/open311/index.html:80 +#: templates/web/base/open311/index.html:72 msgid "Open311 initiative web page" msgstr "" -#: templates/web/base/open311/index.html:81 +#: templates/web/base/open311/index.html:73 msgid "Open311 specification" msgstr "" @@ -1919,15 +1828,15 @@ msgstr "Ðбо проблеми прозвітовані до:" msgid "Or you can subscribe to an alert based upon what ward or council you’re in:" msgstr "Ðбо ви можете підпиÑатиÑÑŒ на алÑрми відноÑно вашого району чи департаменту:" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1084 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:673 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:674 -#: perllib/FixMyStreet/DB/Result/Problem.pm:570 -#: perllib/FixMyStreet/DB/Result/Problem.pm:580 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1055 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:669 +#: perllib/FixMyStreet/DB/Result/Problem.pm:558 +#: perllib/FixMyStreet/DB/Result/Problem.pm:568 +#: perllib/FixMyStreet/DB/Result/Problem.pm:578 #: perllib/FixMyStreet/DB/Result/Problem.pm:590 -#: perllib/FixMyStreet/DB/Result/Problem.pm:602 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:397 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:412 +#: perllib/FixMyStreet/Script/Reports.pm:175 +#: perllib/FixMyStreet/Script/Reports.pm:190 msgid "Other" msgstr "Інше" @@ -1936,7 +1845,7 @@ msgid "Owner" msgstr "ВлаÑник" #: templates/web/base/errors/page_error_404_not_found.html:1 -#: templates/web/base/errors/page_error_404_not_found.html:3 +#: templates/web/base/errors/page_error_404_not_found.html:4 msgid "Page Not Found" msgstr "Сторінку не знайдено" @@ -1950,16 +1859,16 @@ msgstr "Предок" msgid "Partial" msgstr "ЧаÑтково" -#: templates/web/base/auth/general.html:53 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:68 -#: templates/web/fixmystreet/report/update-form.html:116 +#: templates/web/base/auth/general.html:92 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:31 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:6 #: templates/web/zurich/auth/general.html:32 #: templates/web/zurich/auth/general.html:63 msgid "Password (optional)" msgstr "Пароль (опціонально)" #: templates/web/base/auth/change_password.html:25 -#: templates/web/base/auth/general.html:36 +#: templates/web/base/auth/general.html:72 msgid "Password:" msgstr "Пароль:" @@ -1971,45 +1880,37 @@ msgstr "ПоÑтійне поÑиланнÑ" msgid "Phone number" msgstr "Ðомер телефону" -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:26 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:62 +#: templates/web/base/report/new/form_user_loggedin.html:26 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:25 msgid "Phone number (optional)" msgstr "Ðомер телефону (опціонально)" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:306 +#: perllib/FixMyStreet/Script/Reports.pm:83 #: templates/web/base/admin/report_edit.html:63 -#: templates/web/base/report/new/fill_in_details_form.html:198 #: templates/web/zurich/admin/stats.html:39 msgid "Phone:" msgstr "Телефон:" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:66 -#: templates/web/fixmystreet/report/update-form.html:59 +#: templates/web/base/questionnaire/index.html:75 +#: templates/web/base/report/new/form_report.html:23 +#: templates/web/base/report/update/form_update.html:6 #: templates/web/zurich/admin/index-dm.html:29 #: templates/web/zurich/admin/index-sdm.html:24 #: templates/web/zurich/admin/reports.html:16 #: templates/web/zurich/admin/stats.html:37 -#: templates/web/zurich/report/new/fill_in_details_form.html:52 +#: templates/web/zurich/report/new/fill_in_details_form.html:45 msgid "Photo" msgstr "Фото" -#: perllib/FixMyStreet/App/Controller/Photo.pm:221 -#, fuzzy +#: perllib/FixMyStreet/App/Controller/Photo.pm:187 msgid "Photo is required." -msgstr "Ð¦Ñ Ñ–Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ñ–Ñ Ð¾Ð±Ð¾Ð²'Ñзкова" +msgstr "" #: templates/web/base/admin/category_edit.html:48 -#, fuzzy msgid "Photo required" -msgstr "Ð¦Ñ Ñ–Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ñ–Ñ Ð¾Ð±Ð¾Ð²'Ñзкова" - -#: templates/web/base/questionnaire/index.html:80 -#: templates/web/base/report/new/fill_in_details_form.html:84 -#: templates/web/base/report/update-form.html:62 -msgid "Photo:" -msgstr "Фото:" +msgstr "" -#: templates/web/base/alert/list.html:26 +#: templates/web/base/alert/list.html:23 msgid "Photos of recent nearby reports" msgstr "Фотографії найближчих Ñповіщень" @@ -2038,20 +1939,16 @@ msgstr "Будь лаÑка будьте ввічливим, виразним Ñ– msgid "Please check the passwords and try again" msgstr "Будь лаÑка перевірте пароль Ñ– Ñпробуйте ще раз" -#: templates/web/zurich/auth/token.html:16 -msgid "Please check your email" -msgstr "Будь лаÑка перевірте вашу пошту" - -#: templates/web/base/auth/general.html:10 -#: templates/web/base/auth/general.html:16 +#: templates/web/base/auth/general.html:27 +#: templates/web/base/auth/general.html:33 #: templates/web/zurich/auth/general.html:3 #: templates/web/zurich/auth/general.html:9 msgid "Please check your email address is correct" msgstr "Будь лаÑка перевірте чи ваша адреÑа е-пошти вірна" #: perllib/FixMyStreet/App/Controller/Admin.pm:343 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:883 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:948 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:878 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:943 #: perllib/FixMyStreet/DB/Result/Problem.pm:412 #: templates/web/base/js/translation_strings.html:9 msgid "Please choose a category" @@ -2065,8 +1962,7 @@ msgstr "Будь лаÑка оберіть тип майна" msgid "Please correct the errors below" msgstr "" -#: templates/web/base/contact/blurb.html:2 -#: templates/web/fixmystreet/contact/blurb.html:12 +#: templates/web/base/contact/blurb.html:12 msgid "" "Please do <strong>not</strong> report problems through this form; messages go to\n" "the team behind this site, not a council. To report a problem,\n" @@ -2078,11 +1974,17 @@ msgid "Please do not be abusive — abusing your council devalues the s msgstr "Будь лаÑка не викориÑтовуйте образи — ображаючи департамент ві підриваєте цінніÑÑ‚ÑŒ ÑервіÑу Ð´Ð»Ñ Ð²ÑÑ–Ñ… кориÑтувачів" #: perllib/FixMyStreet/App/Controller/Admin.pm:346 -#: perllib/FixMyStreet/DB/Result/Comment.pm:126 +#: perllib/FixMyStreet/DB/Result/Comment.pm:125 #: templates/web/base/js/translation_strings.html:2 msgid "Please enter a message" msgstr "Будь лаÑка введіть повідомленнÑ" +#: perllib/FixMyStreet/App/Controller/Admin.pm:1091 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1146 +#, fuzzy +msgid "Please enter a name" +msgstr "Будь лаÑка введіть ім'Ñ" + #: templates/web/base/auth/change_password.html:12 #: templates/web/base/auth/change_password.html:15 #: templates/web/base/js/translation_strings.html:19 @@ -2095,10 +1997,10 @@ msgstr "Будь лаÑка введіть пароль" msgid "Please enter a subject" msgstr "Будь лаÑка вкажіть тему" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1084 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1137 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1087 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1142 #: perllib/FixMyStreet/App/Controller/Admin.pm:345 -#: perllib/FixMyStreet/DB/Result/User.pm:127 +#: perllib/FixMyStreet/DB/Result/User.pm:133 #: templates/web/base/js/translation_strings.html:12 #: templates/web/base/js/translation_strings.html:16 msgid "Please enter a valid email" @@ -2115,9 +2017,9 @@ msgid "Please enter some details" msgstr "Будь лаÑка додайте трохи подробиць" #: perllib/FixMyStreet/App/Controller/Contact.pm:113 -#: perllib/FixMyStreet/DB/Result/User.pm:124 -#: templates/web/base/auth/general.html:10 -#: templates/web/base/auth/general.html:15 +#: perllib/FixMyStreet/DB/Result/User.pm:130 +#: templates/web/base/auth/general.html:27 +#: templates/web/base/auth/general.html:32 #: templates/web/base/js/translation_strings.html:11 #: templates/web/base/js/translation_strings.html:15 #: templates/web/zurich/auth/general.html:3 @@ -2125,7 +2027,7 @@ msgstr "Будь лаÑка додайте трохи подробиць" msgid "Please enter your email" msgstr "Будь лаÑка вкажіть е-пошту" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:7 +#: templates/web/base/report/new/form_user_loggedout_email.html:7 #: templates/web/zurich/report/new/fill_in_details_form.html:80 msgid "Please enter your email address" msgstr "Будь лаÑка вкажіть адреÑу е-пошти" @@ -2134,15 +2036,15 @@ msgstr "Будь лаÑка вкажіть адреÑу е-пошти" msgid "Please enter your first name" msgstr "Будь лаÑка введіть ім'Ñ" -#: perllib/FixMyStreet/Cobrand/UK.pm:318 +#: perllib/FixMyStreet/Cobrand/UK.pm:319 #: templates/web/base/js/translation_strings.html:7 msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below" msgstr "Будь лаÑка введіть ім'Ñ Ñ‚Ð° прізвище - департаментам потрібні ці дані. Якщо не хочете Ñ—Ñ… показувати - не Ñтавте галочку внизу." #: perllib/FixMyStreet/App/Controller/Contact.pm:112 -#: perllib/FixMyStreet/DB/Result/Comment.pm:123 +#: perllib/FixMyStreet/DB/Result/Comment.pm:122 #: perllib/FixMyStreet/DB/Result/Problem.pm:406 -#: perllib/FixMyStreet/DB/Result/User.pm:120 +#: perllib/FixMyStreet/DB/Result/User.pm:126 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter your name" msgstr "Будь лаÑка введіть ім'Ñ" @@ -2169,12 +2071,11 @@ msgstr "Ви можете <a href=\"%s\">увійти знов</a>, або поРmsgid "Please fill in details of the problem below." msgstr "Будь лаÑка додайте подробиці про проблему нижче." -#: templates/web/zurich/report/new/fill_in_details_form.html:46 +#: templates/web/zurich/report/new/fill_in_details_form.html:72 msgid "Please fill in details of the problem." msgstr "Будь лаÑка опишіть проблему детально" -#: templates/web/base/report/new/fill_in_details_form.html:28 -#: templates/web/fixmystreet/report/new/sidebar.html:7 +#: templates/web/base/report/new/sidebar.html:7 #: templates/web/zurich/report/new/fill_in_details_form.html:20 msgid "Please fill in the form below with details of the problem, and describe the location as precisely as possible in the details box." msgstr "Будь лаÑка заповніть форму нижче подробицÑми проблеми, Ñ– опишіть міÑÑ†ÐµÐ·Ð½Ð°Ñ…Ð¾Ð´Ð¶ÐµÐ½Ð½Ñ Ñкомога точніше в полі подробиць." @@ -2183,20 +2084,24 @@ msgstr "Будь лаÑка заповніть форму нижче подроРmsgid "Please indicate whether you'd like to receive another questionnaire" msgstr "Будь лаÑка вкажіть чи ви хочете отримати інші опитуваннÑ." -#: templates/web/fixmystreet/report/updates-sidebar-notes.html:4 +#: templates/web/base/report/updates-sidebar-notes.html:2 msgid "Please note that updates are not sent to the council." msgstr "Будь лаÑка зауважте що Ð¾Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð½Ðµ надÑилаютьÑÑ Ð´ÐµÐ¿Ð°Ñ€Ñ‚Ð°Ð¼ÐµÐ½Ñ‚Ñƒ." -#: templates/web/base/report/update-form.html:7 -msgid "Please note that updates are not sent to the council. If you leave your name it will be public. Your information will only be used in accordance with our <a href=\"/faq#privacy\">privacy policy</a>" -msgstr "Будь лаÑка зауважте що Ð¾Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð½Ðµ надÑилаютьÑÑ Ð´ÐµÐ¿Ð°Ñ€Ñ‚Ð°Ð¼ÐµÐ½Ñ‚Ñƒ. Якщо залишите ім'Ñ Ð²Ð¾Ð½Ð¸ Ñтануть публічними. Ваша Ñ–Ð½Ñ„Ð¾Ñ€Ð¼Ñ†Ñ–Ñ Ð±ÑƒÐ´Ðµ викориÑтана згідно з нашою <a href=\"/faq#privacy\">політикою конфіденційноÑÑ‚Ñ–</a>" +#: templates/web/base/report/new/oauth_email_form.html:4 +#, fuzzy +msgid "Please note your report has <strong>not yet been sent</strong>." +msgstr "Будь лаÑка заауважте, що ÑÐ¿Ð¾Ð²Ñ–Ñ‰ÐµÐ½Ð½Ñ <strong>ще не було надіÑлано</strong>. Оберіть категорію та іншу інформацію нижче, Ñ– надішліть." -#: templates/web/base/report/new/fill_in_details_form.html:8 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:21 +#: templates/web/base/report/new/fill_in_details_form.html:20 #: templates/web/zurich/report/new/fill_in_details_form.html:11 msgid "Please note your report has <strong>not yet been sent</strong>. Choose a category and add further information below, then submit." msgstr "Будь лаÑка заауважте, що ÑÐ¿Ð¾Ð²Ñ–Ñ‰ÐµÐ½Ð½Ñ <strong>ще не було надіÑлано</strong>. Оберіть категорію та іншу інформацію нижче, Ñ– надішліть." +#: templates/web/base/report/display.html:26 +msgid "Please note your update has <strong>not yet been posted</strong>." +msgstr "" + #: templates/web/base/report/new/notes.html:1 #: templates/web/zurich/report/new/notes.html:1 msgid "Please note:" @@ -2216,9 +2121,8 @@ msgid "Please say whether you've ever reported a problem to your council before" msgstr "Будь лаÑка розкажіть чи ви відправлÑли ÑÐ¿Ð¾Ð²Ñ–Ñ‰ÐµÐ½Ð½Ñ Ð´ÐµÐ¿Ð°Ñ€Ñ‚Ð°Ð¼ÐµÐ½Ñ‚Ñƒ раніше" #: templates/web/zurich/admin/report_edit.html:208 -#, fuzzy msgid "Please select a body." -msgstr "Оберіть орган" +msgstr "" #: perllib/FixMyStreet/App/Controller/Alert.pm:80 msgid "Please select the feed you want" @@ -2235,6 +2139,7 @@ msgstr "Будь лаÑка вкажіть чи була вирішена про #: perllib/FixMyStreet/App/Model/PhotoSet.pm:117 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:145 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:147 +#: templates/web/base/js/translation_strings.html:53 msgid "Please upload a JPEG image only" msgstr "Будь лаÑка завантажуйте тільки JPEG зображеннÑ" @@ -2242,18 +2147,14 @@ msgstr "Будь лаÑка завантажуйте тільки JPEG зобрРmsgid "Please write a message" msgstr "Будь лаÑка напишіть повідомленнÑ" -#: templates/web/fixmystreet/report/update-form.html:23 +#: templates/web/base/report/update/form_update.html:29 msgid "Please write your update here" msgstr "Будь лаÑка напишіть поновленнÑ" -#: templates/web/base/contact/index.html:100 -#: templates/web/base/report/update-form.html:110 -#: templates/web/base/report/update-form.html:132 -#: templates/web/base/report/update-form.html:72 -#: templates/web/fixmystreet/contact/index.html:113 -#: templates/web/fixmystreet/report/update-form.html:124 -#: templates/web/fixmystreet/report/update-form.html:71 -#: templates/web/fixmystreet/report/update-form.html:97 +#: templates/web/base/contact/index.html:105 +#: templates/web/base/report/update-form.html:24 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:14 +#: templates/web/base/report/update/form_user_loggedout_password.html:10 msgid "Post" msgstr "ДопиÑ" @@ -2281,12 +2182,9 @@ msgstr "Попередній" msgid "Privacy" msgstr "" -#: templates/web/base/faq/faq-en-gb.html:7 -#: templates/web/base/open311/index.html:7 -#: templates/web/base/static/privacy.html:1 -#: templates/web/base/static/privacy.html:2 -#: templates/web/base/static/privacy.html:9 -#: templates/web/fixmystreet/contact/index.html:11 +#: templates/web/base/about/_sidebar.html:5 +#: templates/web/base/about/privacy.html:1 +#: templates/web/base/about/privacy.html:2 msgid "Privacy and cookies" msgstr "" @@ -2314,12 +2212,12 @@ msgstr "Проблема %s підтверджена" msgid "Problem %s sent to council %s" msgstr "Проблему %s надіÑлано департаменту %s" -#: templates/web/base/admin/index.html:46 +#: templates/web/base/admin/index.html:39 #: templates/web/zurich/admin/index.html:9 msgid "Problem breakdown by state" msgstr "Розбивка проблем по Ñтану" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1055 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1058 msgid "Problem marked as open." msgstr "Проблема маркована відкритою." @@ -2335,11 +2233,11 @@ msgstr "Проблеми" msgid "Problems in this area" msgstr "Проблеми в цьому районі" -#: templates/web/fixmystreet/report/display.html:43 +#: templates/web/base/report/display_tools.html:19 msgid "Problems nearby" msgstr "Проблеми поблизу" -#: templates/web/fixmystreet/report/display.html:41 +#: templates/web/base/report/display_tools.html:17 msgid "Problems on the map" msgstr "Проблеми на мапі" @@ -2351,24 +2249,23 @@ msgstr "Ðещодавно вирішені проблеми" msgid "Problems within %.1fkm of this location" msgstr "Проблеми в радіуÑÑ– %.1fkm від цієї точки" -#: perllib/FixMyStreet/Cobrand/Default.pm:642 +#: perllib/FixMyStreet/Cobrand/Default.pm:663 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:120 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:139 -#: perllib/FixMyStreet/Cobrand/UK.pm:207 +#: perllib/FixMyStreet/Cobrand/UK.pm:208 msgid "Problems within %s" msgstr "Проблеми в межах %s" #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:128 -#: perllib/FixMyStreet/Cobrand/UK.pm:221 +#: perllib/FixMyStreet/Cobrand/UK.pm:222 msgid "Problems within %s ward" msgstr "Проблеми в межах %s району" #. ("First %s is the body name, second %s the site name") #: templates/web/base/reports/body.html:0 #: templates/web/base/reports/body.html:24 -#, fuzzy msgid "Problems within %s, %s" -msgstr "Проблеми в межах %s" +msgstr "" #: templates/web/base/alert/_list.html:42 msgid "Problems within the boundary of:" @@ -2382,19 +2279,16 @@ msgstr "ÐдреÑа майна:" msgid "Property type:" msgstr "Тип майна:" -#: templates/web/base/report/update-form.html:3 -#: templates/web/fixmystreet/report/update-form.html:4 +#: templates/web/base/report/update-form.html:6 msgid "Provide an update" msgstr "Ðадішліть оновленнÑ" -#: templates/web/base/auth/general.html:56 +#: templates/web/base/auth/general.html:95 msgid "Providing a name and password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." msgstr "Ð’ÐºÐ°Ð·Ð°Ð½Ð½Ñ Ñ–Ð¼ÐµÐ½Ñ– Ñ– паролю не обов'Ñзкове, проте це дозволить вам більш легко Ñповіщати про проблеми, залишати Ð¿Ð¾Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ñ‚Ð° керувати вашими ÑповіщеннÑми" -#: templates/web/base/report/new/fill_in_details_form.html:156 -#: templates/web/base/report/update-form.html:129 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:71 -#: templates/web/fixmystreet/report/update-form.html:119 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:34 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:9 msgid "Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." msgstr "Ð’ÐºÐ°Ð·Ð°Ð½Ð½Ñ Ð¿Ð°Ñ€Ð¾Ð»ÑŽ не обов'Ñзкове, проте це дозволить вам більш легко Ñповіщати про проблеми, залишати Ð¿Ð¾Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ñ‚Ð° керувати вашими ÑповіщеннÑми" @@ -2430,18 +2324,17 @@ msgstr "Ðнкета заповнена автором ÑповіщеннÑ" #: templates/web/base/alert/_list.html:22 #: templates/web/base/around/display_location.html:1 #: templates/web/base/around/display_location.html:3 -#: templates/web/base/report/display.html:50 +#: templates/web/base/report/display_tools.html:34 #: templates/web/base/reports/_rss.html:1 #: templates/web/fixmystreet/alert/updates.html:9 -#: templates/web/fixmystreet/report/display.html:58 msgid "RSS feed" msgstr "RSS потік" -#: perllib/FixMyStreet/Cobrand/UK.pm:250 perllib/FixMyStreet/Cobrand/UK.pm:262 +#: perllib/FixMyStreet/Cobrand/UK.pm:251 perllib/FixMyStreet/Cobrand/UK.pm:263 msgid "RSS feed for %s" msgstr "RSS потік Ð´Ð»Ñ %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:256 perllib/FixMyStreet/Cobrand/UK.pm:268 +#: perllib/FixMyStreet/Cobrand/UK.pm:257 perllib/FixMyStreet/Cobrand/UK.pm:269 msgid "RSS feed for %s ward, %s" msgstr "RSS потік Ð´Ð»Ñ %s району, %s" @@ -2449,11 +2342,11 @@ msgstr "RSS потік Ð´Ð»Ñ %s району, %s" #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:163 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:173 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:181 -#: perllib/FixMyStreet/Cobrand/UK.pm:276 perllib/FixMyStreet/Cobrand/UK.pm:288 +#: perllib/FixMyStreet/Cobrand/UK.pm:277 perllib/FixMyStreet/Cobrand/UK.pm:289 msgid "RSS feed of %s" msgstr "RSS потік з %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:281 perllib/FixMyStreet/Cobrand/UK.pm:293 +#: perllib/FixMyStreet/Cobrand/UK.pm:282 perllib/FixMyStreet/Cobrand/UK.pm:294 msgid "RSS feed of %s, within %s ward" msgstr "" @@ -2465,15 +2358,15 @@ msgstr "" msgid "RSS feed of problems in this %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:643 +#: perllib/FixMyStreet/Cobrand/Default.pm:664 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:121 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:138 -#: perllib/FixMyStreet/Cobrand/UK.pm:214 +#: perllib/FixMyStreet/Cobrand/UK.pm:215 msgid "RSS feed of problems within %s" msgstr "" #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:127 -#: perllib/FixMyStreet/Cobrand/UK.pm:220 +#: perllib/FixMyStreet/Cobrand/UK.pm:221 msgid "RSS feed of problems within %s ward" msgstr "" @@ -2482,25 +2375,22 @@ msgstr "" msgid "RSS feed of recent local problems" msgstr "RSS Ñтрічка недавніх локальних проблем" -#: templates/web/base/report/display.html:50 +#: templates/web/base/report/display_tools.html:34 #: templates/web/fixmystreet/alert/updates.html:9 -#: templates/web/fixmystreet/report/display.html:58 msgid "RSS feed of updates to this problem" msgstr "RSS Ñтрічка з оновленнÑми по цій проблемі" #: templates/web/base/alert/updates.html:9 -#: templates/web/base/report/display.html:41 +#: templates/web/base/report/display_tools.html:36 #: templates/web/fixmystreet/alert/updates.html:14 -#: templates/web/fixmystreet/report/display.html:60 msgid "Receive email when updates are left on this problem." msgstr "Отримувати лиÑта коли Ñ–Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ñ–Ñ Ð¿Ð¾ проблемі буде оновлена" #. ("%s is the site name") #: templates/web/base/around/display_location.html:0 #: templates/web/base/around/display_location.html:33 -#, fuzzy msgid "Recent local problems, %s" -msgstr "Ðещодавні міÑцеві проблеми, FixMyStreet" +msgstr "" #: templates/web/base/reports/index.html:24 msgid "Recently <br>fixed" @@ -2518,16 +2408,15 @@ msgstr "" msgid "Remove flag" msgstr "ЗнÑти прапорець" -#: templates/web/base/admin/report_edit.html:92 -#: templates/web/base/admin/update_edit.html:62 +#: templates/web/base/admin/report_edit.html:93 +#: templates/web/base/admin/update_edit.html:67 #: templates/web/zurich/admin/update_edit.html:35 msgid "Remove photo (can't be undone!)" msgstr "Видалити фото (це Ð½ÐµÐ·Ð²Ð¾Ñ€Ð¾Ñ‚Ð½Ñ Ð¾Ð¿ÐµÑ€Ð°Ñ†Ñ–Ñ!)" #: templates/web/zurich/admin/report_edit.html:243 -#, fuzzy msgid "Reply to user:" -msgstr "редагувати кориÑтувача" +msgstr "" #: templates/web/fixmystreet/header_logo.html:2 msgid "Report" @@ -2540,7 +2429,7 @@ msgstr "" msgid "Report a problem" msgstr "СповіÑтити про проблему" -#: templates/web/fixmystreet/report/display.html:32 +#: templates/web/base/report/display_tools.html:8 msgid "Report abuse" msgstr "ПоÑкаржитиÑÑŒ" @@ -2549,7 +2438,8 @@ msgid "Report on %s" msgstr "Звіт по %s" #: templates/web/base/report/new/fill_in_details_form.html:1 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:2 +#: templates/web/base/report/new/login_success_form.html:1 +#: templates/web/base/report/new/oauth_email_form.html:1 msgid "Report your problem" msgstr "" @@ -2558,9 +2448,8 @@ msgstr "" msgid "Report, view, or discuss local problems" msgstr "Сповіщайте, переглÑдайте, або обговорюйте міÑцеві проблеми" -#: perllib/FixMyStreet/DB/Result/Problem.pm:585 -#: templates/web/base/contact/index.html:50 -#: templates/web/fixmystreet/contact/index.html:65 +#: perllib/FixMyStreet/DB/Result/Problem.pm:573 +#: templates/web/base/contact/index.html:57 msgid "Reported anonymously at %s" msgstr "Сповіщено анонімно по %s" @@ -2569,43 +2458,41 @@ msgstr "Сповіщено анонімно по %s" msgid "Reported before" msgstr "Сповіщено раніше" -#: perllib/FixMyStreet/DB/Result/Problem.pm:608 -#: templates/web/base/contact/index.html:52 -#: templates/web/fixmystreet/contact/index.html:67 +#: perllib/FixMyStreet/DB/Result/Problem.pm:596 +#: templates/web/base/contact/index.html:59 msgid "Reported by %s at %s" msgstr "Перевідкрито %s о %s" #: templates/web/zurich/admin/report_edit-sdm.html:58 #: templates/web/zurich/admin/report_edit.html:86 -#, fuzzy msgid "Reported by:" -msgstr "Сповіщено %s" +msgstr "" #: templates/web/zurich/report/_main.html:2 msgid "Reported in the %s category" msgstr "Сповіщено в категорії %s " -#: perllib/FixMyStreet/DB/Result/Problem.pm:581 +#: perllib/FixMyStreet/DB/Result/Problem.pm:569 msgid "Reported in the %s category anonymously at %s" msgstr "Сповіщено в категорії %s анонімно о %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:603 +#: perllib/FixMyStreet/DB/Result/Problem.pm:591 msgid "Reported in the %s category by %s at %s" msgstr "Сповіщено в категорію %s %s о %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:577 +#: perllib/FixMyStreet/DB/Result/Problem.pm:565 msgid "Reported via %s anonymously at %s" msgstr "Сповіщено %s анонімно о %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:599 +#: perllib/FixMyStreet/DB/Result/Problem.pm:587 msgid "Reported via %s by %s at %s" msgstr "Сповіщено через %s %s о %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:573 +#: perllib/FixMyStreet/DB/Result/Problem.pm:561 msgid "Reported via %s in the %s category anonymously at %s" msgstr "Сповіщено через %s в категорію %s анонімно о %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:593 +#: perllib/FixMyStreet/DB/Result/Problem.pm:581 msgid "Reported via %s in the %s category by %s at %s" msgstr "Сповіщено через %s в категорію %s %s о %s" @@ -2615,9 +2502,8 @@ msgstr "" #: templates/web/zurich/admin/report_edit-sdm.html:36 #: templates/web/zurich/admin/report_edit.html:55 -#, fuzzy msgid "Reported:" -msgstr "Сповіщено %s" +msgstr "" #: templates/web/base/around/index.html:2 #: templates/web/base/js/translation_strings.html:41 @@ -2627,13 +2513,13 @@ msgstr "Сповіщено %s" msgid "Reporting a problem" msgstr "СповіÑтити про проблему" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1277 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1286 #: perllib/FixMyStreet/Cobrand/Zurich.pm:384 #: templates/web/zurich/header.html:60 msgid "Reports" msgstr "СповіщеннÑ" -#: perllib/FixMyStreet/Cobrand/UK.pm:327 perllib/FixMyStreet/Cobrand/UK.pm:331 +#: perllib/FixMyStreet/Cobrand/UK.pm:328 perllib/FixMyStreet/Cobrand/UK.pm:332 msgid "Reports are limited to %s characters in length. Please shorten your report" msgstr "Ð¡Ð¿Ð¾Ð²Ñ–Ñ‰ÐµÐ½Ð½Ñ Ð¾Ð±Ð¼ÐµÐ¶ÐµÐ½Ñ– %s Ñимволами. Буль лаÑка Ñкоротіть ÑповіщеннÑ." @@ -2670,15 +2556,17 @@ msgstr "ОбÑлуговувач цієї дороги (отримано з до msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "ОбÑлуговувач цієї дороги (з OpenStreetMap): %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1495 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1500 -#: templates/web/base/admin/report_edit.html:88 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1508 +#: templates/web/base/admin/report_edit.html:90 +#: templates/web/base/admin/update_edit.html:64 #: templates/web/zurich/admin/report_edit.html:116 msgid "Rotate Left" msgstr "Повернули вліво" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1495 -#: templates/web/base/admin/report_edit.html:89 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 +#: templates/web/base/admin/report_edit.html:91 +#: templates/web/base/admin/update_edit.html:65 #: templates/web/zurich/admin/report_edit.html:117 msgid "Rotate Right" msgstr "Повернути вправо" @@ -2688,7 +2576,6 @@ msgid "Rotating this photo will discard unsaved changes to the report." msgstr "" #: templates/web/base/js/translation_strings.html:46 -#: templates/web/base/maps/google-ol.html:13 msgid "Satellite" msgstr "" @@ -2741,16 +2628,14 @@ msgid "Select an area" msgstr "Оберіть район" #: templates/web/base/alert/_list.html:10 -#, fuzzy msgid "Select which type of alert you’d like and click the button for an RSS feed, or enter your email address to subscribe to an email alert." -msgstr "Оберіть вподобаний тип алÑрму Ñ– натиÑніть кнопку Ð´Ð»Ñ RSS фіду, або введіть поштову адреÑу щоб підпиÑатиÑÑŒ на алÑрми поштою." +msgstr "" #: perllib/FixMyStreet/Cobrand/Zurich.pm:835 -#, fuzzy msgid "Sent report back" -msgstr "Відкрити ÑповіщеннÑ" +msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:708 +#: perllib/FixMyStreet/DB/Result/Problem.pm:696 msgid "Sent to %s %s later" msgstr "Відправити %s %s пізніше" @@ -2763,15 +2648,13 @@ msgstr "ÐадіÑлано:" msgid "Service:" msgstr "СервіÑ:" -#: templates/web/fixmystreet/report/display.html:38 +#: templates/web/base/report/display_tools.html:14 msgid "Share" msgstr "Поширити" -#: templates/web/base/report/new/fill_in_details_form.html:193 -#: templates/web/base/report/update-form.html:158 -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:23 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:59 -#: templates/web/fixmystreet/report/update-form.html:146 +#: templates/web/base/report/new/form_user_loggedin.html:23 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:22 +#: templates/web/base/report/update/form_name.html:15 msgid "Show my name publicly" msgstr "Показувати моє ім'Ñ Ð¿ÑƒÐ±Ð»Ñ–Ñ‡Ð½Ð¾" @@ -2783,9 +2666,9 @@ msgstr "Показувати Ñтарі" msgid "Show pins" msgstr "Показувати шпильки" +#: templates/web/base/auth/general.html:100 #: templates/web/base/auth/general.html:3 -#: templates/web/base/auth/general.html:40 -#: templates/web/base/auth/general.html:61 +#: templates/web/base/auth/general.html:76 #: templates/web/zurich/auth/general.html:18 #: templates/web/zurich/auth/general.html:35 msgid "Sign in" @@ -2812,7 +2695,7 @@ msgid "" " sent from your FixMyStreet installation." msgstr "" -#: templates/web/base/alert/index.html:42 +#: templates/web/base/alert/index.html:40 msgid "Some photos of recent reports" msgstr "ДеÑкі фото нещодавніх проблем" @@ -2822,7 +2705,7 @@ msgstr "ДеÑкі фото нещодавніх проблем" msgid "Some text to localize" msgstr "Певний текÑÑ‚ Ð´Ð»Ñ Ð»Ð¾ÐºÐ°Ð»Ñ–Ð·Ð°Ñ†Ñ–Ñ—" -#: perllib/FixMyStreet/Cobrand/UK.pm:78 +#: perllib/FixMyStreet/Cobrand/UK.pm:79 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover." msgstr "" @@ -2834,23 +2717,34 @@ msgstr "" msgid "Sorry, there has been an error confirming your problem." msgstr "Вибачте, ÑталаÑÑ Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ°" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:221 -#: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:37 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:216 +#: perllib/FixMyStreet/Geocode.pm:38 perllib/FixMyStreet/Geocode/Bing.pm:38 #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:56 #: perllib/FixMyStreet/Geocode/OSM.pm:48 msgid "Sorry, we could not find that location." msgstr "Вибачте, ми не знайшли це міÑце" -#: perllib/FixMyStreet/Geocode/Bing.pm:34 +#: templates/web/base/auth/general.html:9 +#: templates/web/base/report/display.html:21 +#: templates/web/base/report/new/fill_in_details_form.html:23 +#, fuzzy +msgid "Sorry, we could not log you in. Please fill in the form below." +msgstr "Вибачте, ми не можем розпізнати це міÑце. Спробуйте пізніше." + +#: perllib/FixMyStreet/Geocode/Bing.pm:35 #: perllib/FixMyStreet/Geocode/Google.pm:45 #: perllib/FixMyStreet/Geocode/Zurich.pm:88 msgid "Sorry, we could not parse that location. Please try again." msgstr "Вибачте, ми не можем розпізнати це міÑце. Спробуйте пізніше." #: perllib/FixMyStreet/App/Model/PhotoSet.pm:134 -#, fuzzy msgid "Sorry, we couldn't save your image(s), please try again." -msgstr "Вибачте, ми не можем розпізнати це міÑце. Спробуйте пізніше." +msgstr "" + +#: perllib/FixMyStreet/App/Controller/AuthSS.pm:301 +#, fuzzy +msgid "Sorry, you can not log in with Facebook. Please try again later." +msgstr "СталаÑÑŒ помилка при Ñпробі показати Ñторінку. Будь лаÑка Ñпробуйте пізніше." #: templates/web/base/admin/stats.html:64 msgid "Start Date:" @@ -2860,13 +2754,12 @@ msgstr "Початкова дата:" #: templates/web/base/admin/flagged.html:18 #: templates/web/base/admin/list_updates.html:11 #: templates/web/base/admin/reports.html:15 -#: templates/web/fixmystreet/report/update-form.html:26 +#: templates/web/base/report/update/form_update.html:32 msgid "State" msgstr "Стан" #: templates/web/base/admin/report_edit.html:47 #: templates/web/base/admin/update_edit.html:27 -#: templates/web/base/report/update-form.html:28 #: templates/web/zurich/admin/report_edit-sdm.html:73 #: templates/web/zurich/admin/report_edit.html:101 #: templates/web/zurich/admin/report_edit.html:155 @@ -2874,7 +2767,7 @@ msgstr "Стан" msgid "State:" msgstr "Стан:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1282 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1291 #: perllib/FixMyStreet/Cobrand/Zurich.pm:387 #: templates/web/base/admin/stats.html:1 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:73 @@ -2896,7 +2789,7 @@ msgstr "Ð’Ñе ще відкрито, через анкету, %s" msgid "Street View" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:406 +#: perllib/FixMyStreet/Script/Reports.pm:184 msgid "Subcategory: %s" msgstr "ПідкатегоріÑ: %s" @@ -2904,30 +2797,25 @@ msgstr "ПідкатегоріÑ: %s" msgid "Subdivision/Body" msgstr "Підрозділ/Орган" -#: templates/web/fixmystreet/contact/index.html:98 +#: templates/web/base/contact/index.html:90 msgid "Subject" msgstr "Тема" #: templates/web/base/admin/report_edit.html:19 -#: templates/web/base/contact/index.html:88 -#: templates/web/base/report/new/fill_in_details_form.html:53 #: templates/web/zurich/admin/report_edit.html:39 msgid "Subject:" msgstr "Тема:" #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/fill_in_details_form.html:137 -#: templates/web/base/report/new/fill_in_details_form.html:159 -#: templates/web/base/report/new/fill_in_details_form.html:96 -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:36 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:23 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:76 +#: templates/web/base/report/new/form_user_loggedin.html:36 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:39 +#: templates/web/base/report/new/form_user_loggedout_password.html:11 #: templates/web/zurich/report/new/fill_in_details_form.html:96 msgid "Submit" msgstr "Підтвердити" -#: templates/web/base/admin/report_edit.html:95 -#: templates/web/base/admin/update_edit.html:65 +#: templates/web/base/admin/report_edit.html:101 +#: templates/web/base/admin/update_edit.html:75 #: templates/web/base/admin/user-form.html:56 #: templates/web/zurich/admin/report_edit-sdm.html:137 #: templates/web/zurich/admin/report_edit.html:268 @@ -2935,7 +2823,7 @@ msgstr "Підтвердити" msgid "Submit changes" msgstr "Підтвердити зміни" -#: templates/web/base/questionnaire/index.html:97 +#: templates/web/base/questionnaire/index.html:106 msgid "Submit questionnaire" msgstr "Підтвердити анкету" @@ -2951,9 +2839,8 @@ msgid "Submitted" msgstr "Підтверджено" #: templates/web/base/alert/updates.html:17 -#: templates/web/base/report/display.html:46 +#: templates/web/base/report/display_tools.html:41 #: templates/web/fixmystreet/alert/updates.html:23 -#: templates/web/fixmystreet/report/display.html:65 msgid "Subscribe" msgstr "ПідпиÑатиÑÑŒ" @@ -2961,7 +2848,7 @@ msgstr "ПідпиÑатиÑÑŒ" msgid "Subscribe me to an email alert" msgstr "Підпишіть мене на поштові алÑрми" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1275 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1284 #: perllib/FixMyStreet/Cobrand/Zurich.pm:383 #: templates/web/base/admin/bodies.html:25 #: templates/web/base/admin/index.html:1 @@ -2980,7 +2867,7 @@ msgstr "Резюме" msgid "Summary reports" msgstr "Сумарні ÑповіщеннÑ" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1279 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1288 msgid "Survey" msgstr "ОпитуваннÑ" @@ -2994,9 +2881,8 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/Zurich.pm:394 #: templates/web/zurich/header.html:77 -#, fuzzy msgid "Templates" -msgstr "ПоновленнÑ" +msgstr "" #: templates/web/base/admin/list_updates.html:12 #: templates/web/zurich/admin/templates.html:9 @@ -3017,7 +2903,7 @@ msgstr "ТекÑÑ‚:" msgid "Thank you for reporting this issue!" msgstr "" -#: templates/web/base/tokens/error.html:7 +#: templates/web/base/tokens/error.html:6 msgid "Thank you for trying to confirm your update or problem. We seem to have an error ourselves though, so <a href=\"%s\">please let us know what went on</a> and we'll look into it." msgstr "ДÑкуємо за Ñпробу підтвердити Ð´Ð¾Ð¿Ð¾Ð²Ð½ÐµÐ½Ð½Ñ Ð¿Ñ€Ð¾Ð±Ð»ÐµÐ¼Ð¸. У Ð½Ð°Ñ Ñ‚ÑƒÑ‚ помилка, тому <a href=\"%s\">будь лаÑка розкажіть що ÑталоÑÑŒ</a> Ñ– ми до того подивимоÑÑŒ." @@ -3052,23 +2938,23 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:47 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:63 -#: perllib/FixMyStreet/Cobrand/UK.pm:71 +#: perllib/FixMyStreet/Cobrand/UK.pm:72 msgid "That postcode was not recognised, sorry." msgstr "Поштовий код не розпізнано, вибачте." -#: perllib/FixMyStreet/App/Controller/Admin.pm:726 +#: perllib/FixMyStreet/App/Controller/Admin.pm:724 msgid "That problem has been marked as sent." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:718 +#: perllib/FixMyStreet/App/Controller/Admin.pm:716 msgid "That problem will now be resent." msgstr "Цю проблему зараз перезвітують." -#: perllib/FixMyStreet/App/Controller/Report.pm:125 +#: perllib/FixMyStreet/App/Controller/Report.pm:127 msgid "That report cannot be viewed on %s." msgstr "Цей ÑÐ¿Ð¾Ð²Ñ–Ñ‰ÐµÐ½Ð½Ñ Ð½ÐµÐ¼Ð¾Ð¶Ð»Ð¸Ð²Ð¾ показати на %s." -#: perllib/FixMyStreet/App/Controller/Report.pm:119 +#: perllib/FixMyStreet/App/Controller/Report.pm:121 msgid "That report has been removed from FixMyStreet." msgstr "Це ÑÐ¿Ð¾Ð²Ñ–Ñ‰ÐµÐ½Ð½Ñ Ð±ÑƒÐ»Ð¾ видалено." @@ -3103,7 +2989,7 @@ msgid "" " If you leave this blank, <strong>send method defaults to email</strong>." msgstr "" -#: templates/web/base/open311/index.html:90 +#: templates/web/base/open311/index.html:82 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 "" @@ -3124,12 +3010,12 @@ msgstr "Департамент не зможе допомгти доки інфРmsgid "The diligency prize league table shows editors' activity (who's been editing the most records)." msgstr "" -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:60 -#: perllib/FixMyStreet/App/Controller/Reports.pm:79 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:61 +#: perllib/FixMyStreet/App/Controller/Reports.pm:80 msgid "The error was: %s" msgstr "ТрапилаÑÑŒ помилка: %s" -#: templates/web/base/open311/index.html:86 +#: templates/web/base/open311/index.html:78 msgid "The following Open311 v2 attributes are returned for each request: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code and service_name." msgstr "" @@ -3176,8 +3062,7 @@ msgstr "" msgid "The passwords do not match" msgstr "Паролі не Ñпівпадають" -#: templates/web/base/errors/page_error_404_not_found.html:10 -#: templates/web/base/errors/page_error_404_not_found.html:12 +#: templates/web/base/errors/page_error_404_not_found.html:9 msgid "The requested URL '%s' was not found on this server" msgstr "ÐдреÑа '%s' не знайдена на Ñервері" @@ -3187,12 +3072,11 @@ msgstr "ÐайпроÑтіший алÑрм - географічний:" #: templates/web/base/report/new/councils_extra_text.html:1 #: templates/web/base/report/new/councils_text_some.html:10 -#: templates/web/base/report/new/fill_in_details_form.html:18 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:14 +#: templates/web/base/report/new/fill_in_details_form.html:13 msgid "The summary and description will also be made public (see our <a href=\"/privacy\">privacy policy</a>)." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:315 +#: perllib/FixMyStreet/Script/Reports.pm:92 msgid "The user could not locate the problem on a map, but to see the area around the location they entered" msgstr "КориÑтувач не зміг позначити проблему на карті, тільки введену зону" @@ -3211,18 +3095,18 @@ msgstr "" msgid "There are no reports to show." msgstr "" -#: perllib/FixMyStreet/App/Controller/Reports.pm:76 +#: perllib/FixMyStreet/App/Controller/Reports.pm:77 msgid "There was a problem showing the All Reports page. Please try again later." msgstr "СталаÑÑŒ проблема з відображеннÑм Ñторінки вÑÑ–Ñ… Ñповіщень. Спробуйте пізніше." #: perllib/FixMyStreet/App/Controller/Contact.pm:137 -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:59 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:60 msgid "There was a problem showing this page. Please try again later." msgstr "СталаÑÑŒ помилка при Ñпробі показати Ñторінку. Будь лаÑка Ñпробуйте пізніше." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:769 -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:134 -#: templates/web/base/auth/general.html:26 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:764 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:138 +#: templates/web/base/auth/general.html:43 #: templates/web/zurich/auth/general.html:28 msgid "There was a problem with your email/password combination. If you cannot remember your password, or do not have one, please fill in the ‘sign in by email’ section of the form." msgstr "З комбінацією поштової адреÑи Ñ– паролю щоÑÑŒ не так. Якщо ви не в змозі пригадати пароль або у Ð²Ð°Ñ Ð¹Ð¾Ð³Ð¾ немає, заповніть Ñекцію ‘увійти поштою’" @@ -3231,7 +3115,7 @@ msgstr "З комбінацією поштової адреÑи Ñ– паролю msgid "There was a problem with your email/password combination. Please try again." msgstr "СталаÑÑŒ проблема з вашою комбінацією адреÑи пошти Ñ– паролю. Будь лаÑка Ñпробуйте пізніше." -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:272 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:336 msgid "There was a problem with your update. Please try again." msgstr "СталаÑÑŒ проблема з поновленнÑм. Будь лаÑка Ñпробуйте ще раз." @@ -3239,7 +3123,7 @@ msgstr "СталаÑÑŒ проблема з поновленнÑм. Будь ла msgid "There were problems with your report. Please see below." msgstr "Зі ÑповіщеннÑм Ñ” негаразди. ГлÑньте нижче." -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:300 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:371 msgid "There were problems with your update. Please see below." msgstr "З поновленнÑм щоÑÑŒ негаразд. ГлÑньте нижче." @@ -3253,7 +3137,7 @@ msgid "" " " msgstr "" -#: templates/web/base/open311/index.html:77 +#: templates/web/base/open311/index.html:69 msgid "This API implementation is work in progress and not yet stabilized. It will change without warnings in the future." msgstr "" @@ -3275,18 +3159,18 @@ msgid "" " A body will not receive any reports unless it covers at least one area." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:413 +#: perllib/FixMyStreet/Script/Reports.pm:191 msgid "This email has been sent to both councils covering the location of the problem, as the user did not categorise it; please ignore it if you're not the correct council to deal with the issue, or let us know what category of problem this is so we can add it to our system." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:416 +#: perllib/FixMyStreet/Script/Reports.pm:194 msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:925 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:995 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:920 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:990 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:142 -#: perllib/FixMyStreet/Cobrand/UK.pm:43 +#: perllib/FixMyStreet/Cobrand/UK.pm:44 msgid "This information is required" msgstr "Ð¦Ñ Ñ–Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ñ–Ñ Ð¾Ð±Ð¾Ð²'Ñзкова" @@ -3298,56 +3182,37 @@ msgstr "" msgid "This is a summary of all reports on this site." msgstr "" -#: templates/web/zurich/auth/token.html:8 -msgid "This may be because the link is too old or already used, or the address was not copied correctly." -msgstr "" - -#: templates/web/base/report/banner.html:15 -msgid "This problem has been closed" -msgstr "Цю проблему закрито" - -#: templates/web/base/report/banner.html:12 -#: templates/web/base/report/update-form.html:48 -#: templates/web/fixmystreet/report/update-form.html:46 +#: templates/web/base/report/update/form_update.html:52 msgid "This problem has been fixed" msgstr "Цю проблему вирішено" -#: templates/web/base/report/update-form.html:43 -#: templates/web/fixmystreet/report/update-form.html:40 +#: templates/web/base/report/update/form_update.html:46 msgid "This problem has not been fixed" msgstr "Цю проблему не вирішено" -#: templates/web/base/report/banner.html:19 -msgid "This problem is in progress" -msgstr "Ð¦Ñ Ð¿Ñ€Ð¾Ð±Ð»ÐµÐ¼Ð° в процеÑÑ–" - -#: templates/web/base/report/banner.html:9 -msgid "This problem is old and of unknown status." -msgstr "Ð¦Ñ Ð¿Ñ€Ð¾Ð±Ð»ÐµÐ¼Ð° заÑтаріла Ñ– Ñ—Ñ— ÑÑ‚Ð°Ñ‚ÑƒÑ Ð½ÐµÐ²Ñ–Ð´Ð¾Ð¼Ð¸Ð¹." - #: perllib/FixMyStreet/Cobrand/Zurich.pm:168 #: perllib/FixMyStreet/Cobrand/Zurich.pm:169 #: templates/web/zurich/report/_main.html:14 msgid "This report is awaiting moderation." msgstr "Це ÑÐ¿Ð¾Ð²Ñ–Ñ‰ÐµÐ½Ð½Ñ Ð¾Ñ‡Ñ–ÐºÑƒÑ” модерації." -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:86 +#: perllib/FixMyStreet/Script/Alerts.pm:94 msgid "This report is currently marked as closed." msgstr "Це ÑÐ¿Ð¾Ð²Ñ–Ñ‰ÐµÐ½Ð½Ñ Ð½Ð°Ñ€Ð°Ð·Ñ– відмічено закритим." -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:84 +#: perllib/FixMyStreet/Script/Alerts.pm:92 msgid "This report is currently marked as fixed." msgstr "Це ÑÐ¿Ð¾Ð²Ñ–Ñ‰ÐµÐ½Ð½Ñ Ð½Ð°Ñ€Ð°Ð·Ñ– відмічено вирішеним." -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:88 +#: perllib/FixMyStreet/Script/Alerts.pm:96 msgid "This report is currently marked as open." msgstr "Це ÑÐ¿Ð¾Ð²Ñ–Ñ‰ÐµÐ½Ð½Ñ Ð²Ñ–Ð´Ð¼Ñ–Ñ‡ÐµÐ½Ð¾ відкритим." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:326 +#: perllib/FixMyStreet/Script/Reports.pm:105 msgid "This report was submitted anonymously" msgstr "Це ÑÐ¿Ð¾Ð²Ñ–Ñ‰ÐµÐ½Ð½Ñ Ð½Ð°Ð´Ñ–Ñлано анонімно" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:308 +#: perllib/FixMyStreet/Script/Reports.pm:85 msgid "This web page also contains a photo of the problem, provided by the user." msgstr "Ð¦Ñ Ð²ÐµÐ±-Ñторінка також міÑтить фото проблеми, Ñкі надав кориÑтувач." @@ -3358,7 +3223,7 @@ msgstr "Ð¦Ñ Ð²ÐµÐ±-Ñторінка також міÑтить фото проб msgid "Time spent (in minutes):" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1278 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1287 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "ХронологіÑ" @@ -3370,24 +3235,22 @@ msgid "Title" msgstr "Заголовок" #: templates/web/zurich/admin/template_edit.html:20 -#, fuzzy msgid "Title:" -msgstr "Заголовок" +msgstr "" #: templates/web/base/alert/index.html:25 -#, fuzzy msgid "To find out what local alerts we have for you, please enter your %s postcode or street name and area:" -msgstr "Щоб дізнатиÑÑŒ Ñкі локальні алÑрми ми маєм Ð´Ð»Ñ Ð²Ð°Ñ, введіть ваш поштовий код, назву вулиці та район" +msgstr "" #: templates/web/base/alert/index.html:27 msgid "To find out what local alerts we have for you, please enter your postcode or street name and area" msgstr "Щоб дізнатиÑÑŒ Ñкі локальні алÑрми ми маєм Ð´Ð»Ñ Ð²Ð°Ñ, введіть ваш поштовий код, назву вулиці та район" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:314 +#: perllib/FixMyStreet/Script/Reports.pm:91 msgid "To view a map of the precise location of this issue" msgstr "До переглÑду точного міÑÑ†ÐµÐ·Ð½Ð°Ñ…Ð¾Ð´Ð¶ÐµÐ½Ð½Ñ Ð¿Ñ€Ð¾Ð±Ð»ÐµÐ¼Ð¸ на карті" -#: templates/web/base/admin/index.html:61 +#: templates/web/base/admin/index.html:54 #: templates/web/base/admin/questionnaire.html:24 #: templates/web/base/admin/stats.html:24 #: templates/web/base/admin/stats.html:43 @@ -3405,10 +3268,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:12 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:33 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:31 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:37 msgid "Unable to fix" msgstr "Ðеможливо виправити" @@ -3421,7 +3282,7 @@ msgstr "Ðеможливо виправити" msgid "Unconfirmed" msgstr "Ðе підтверджено" -#: templates/web/fixmystreet/report/banner.html:9 +#: templates/web/base/report/banner.html:9 msgid "Unknown" msgstr "Ðевідомо" @@ -3429,17 +3290,18 @@ msgstr "Ðевідомо" msgid "Unknown alert type" msgstr "Ðевідомий тип алÑрму" +#: perllib/FixMyStreet/App/Controller/Photo.pm:110 #: templates/web/base/js/translation_strings.html:39 msgid "Unknown error" msgstr "Ðевідома помилка" -#: perllib/FixMyStreet/App/Controller/Report.pm:103 -#: perllib/FixMyStreet/App/Controller/Report.pm:109 -#: perllib/FixMyStreet/App/Controller/Report.pm:112 +#: perllib/FixMyStreet/App/Controller/Report.pm:105 +#: perllib/FixMyStreet/App/Controller/Report.pm:111 +#: perllib/FixMyStreet/App/Controller/Report.pm:114 msgid "Unknown problem ID" msgstr "Ðевідомий ідентифікатор проблеми" -#: templates/web/fixmystreet/report/update-form.html:19 +#: templates/web/base/report/update/form_update.html:25 msgid "Update" msgstr "ПоновленнÑ" @@ -3447,13 +3309,11 @@ msgstr "ПоновленнÑ" msgid "Update %s created for problem %d; by %s" msgstr "ÐŸÐ¾Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ %s Ñтворено Ð´Ð»Ñ Ð¿Ñ€Ð¾Ð±Ð»ÐµÐ¼Ð¸ %d; від %s" -#: templates/web/base/contact/index.html:21 -#: templates/web/fixmystreet/contact/index.html:36 +#: templates/web/base/contact/index.html:28 msgid "Update below added anonymously at %s" msgstr "ÐŸÐ¾Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð´Ð¾Ð´Ð°Ð½Ð¾ анонімно о %s" -#: templates/web/base/contact/index.html:23 -#: templates/web/fixmystreet/contact/index.html:38 +#: templates/web/base/contact/index.html:30 msgid "Update below added by %s at %s" msgstr "ÐŸÐ¾Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð½Ð¸Ð¶Ñ‡Ðµ додано %s о %s" @@ -3462,7 +3322,7 @@ msgstr "ÐŸÐ¾Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð½Ð¸Ð¶Ñ‡Ðµ додано %s о %s" msgid "Update body" msgstr "Поновити орган" -#: templates/web/base/admin/index.html:55 +#: templates/web/base/admin/index.html:48 msgid "Update breakdown by state" msgstr "Оновити розбивку за Ñтаном" @@ -3487,20 +3347,16 @@ msgstr "ÐŸÐ¾Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð¿ÐµÑ€ÐµÐ²Ñ–Ð´ÐºÑ€Ð¸Ð»Ð¾ проблему" msgid "Update statuses" msgstr "Поновити ÑтатуÑи" -#: templates/web/base/report/update-form.html:22 -msgid "Update:" -msgstr "ПоновленнÑ:" - #: templates/web/zurich/admin/index-dm.html:23 #: templates/web/zurich/admin/index-sdm.html:21 #: templates/web/zurich/admin/reports.html:13 msgid "Updated" msgstr "Поновлено" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1045 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1103 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1147 -#: perllib/FixMyStreet/App/Controller/Admin.pm:822 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1048 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1108 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1156 +#: perllib/FixMyStreet/App/Controller/Admin.pm:821 #: perllib/FixMyStreet/Cobrand/Zurich.pm:771 #: perllib/FixMyStreet/Cobrand/Zurich.pm:796 #: perllib/FixMyStreet/Cobrand/Zurich.pm:866 @@ -3508,13 +3364,12 @@ msgid "Updated!" msgstr "Поновлено!" #: templates/web/base/admin/list_updates.html:2 -#: templates/web/base/report/update.html:3 -#: templates/web/fixmystreet/report/update.html:5 +#: templates/web/base/report/update.html:5 #: templates/web/zurich/report/updates.html:2 msgid "Updates" msgstr "ПоновленнÑ" -#: perllib/FixMyStreet/DB/Result/Comment.pm:132 +#: perllib/FixMyStreet/DB/Result/Comment.pm:131 msgid "Updates are limited to %s characters in length. Please shorten your update" msgstr "ÐŸÐ¾Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð¾Ð±Ð¼ÐµÐ¶ÐµÐ½Ñ– кількіÑÑ‚ÑŽ в %s Ñимволів. Будь лаÑка Ñкоротіть текÑÑ‚." @@ -3524,12 +3379,9 @@ msgstr "ÐŸÐ¾Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ ÑтоÑовно {{title}}" #. ("%s is the site name") #: templates/web/base/report/display.html:0 -#: templates/web/base/report/display.html:5 -#: templates/web/fixmystreet/report/display.html:0 -#: templates/web/fixmystreet/report/display.html:9 -#, fuzzy +#: templates/web/base/report/display.html:9 msgid "Updates to this problem, %s" -msgstr "ÐžÐ½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð¿Ð¾ цій проблемі, FixMyStreet" +msgstr "" #: templates/web/base/admin/body.html:182 msgid "Use the <strong>note</strong> to record details that are only displayed in the admin. Notes are not shown publicly, and are not sent to the body." @@ -3537,15 +3389,14 @@ msgstr "" #: templates/web/zurich/admin/report_edit-sdm.html:48 #: templates/web/zurich/admin/report_edit.html:67 -#, fuzzy msgid "Used map" -msgstr "викроиÑтана мапа" +msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1452 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1461 msgid "User flag removed" msgstr "КориÑтувацький прапорець видалено" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1424 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1433 msgid "User flagged" msgstr "КориÑтувач відмічений" @@ -3553,7 +3404,7 @@ msgstr "КориÑтувач відмічений" msgid "User search finds matches in users' names and email addresses." msgstr "Пошук кориÑтувачів знайшов ÑÐ¿Ñ–Ð²Ð¿Ð°Ð´Ñ–Ð½Ð½Ñ Ð² іменах та поштових адреÑах" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1280 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1289 #: perllib/FixMyStreet/Cobrand/Zurich.pm:399 #: templates/web/base/admin/flagged.html:29 #: templates/web/zurich/header.html:69 @@ -3584,7 +3435,6 @@ msgid "Viewing a location" msgstr "ПереглÑдаєм локацію" #: templates/web/base/report/display.html:0 -#: templates/web/fixmystreet/report/display.html:0 msgid "Viewing a problem" msgstr "ПереглÑдаєм проблему" @@ -3597,25 +3447,24 @@ 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/zurich/auth/token.html:7 -msgid "We have not been able to confirm your account - sorry." -msgstr "Ðам не вдалоÑÑŒ підтвердити ваш обліковий запиÑ. Вибачте." - -#: templates/web/zurich/auth/token.html:17 -msgid "We have sent you an email containing a link to confirm your account." -msgstr "Ми відправили вам лиÑта з поÑиланнÑм на Ð¿Ñ–Ð´Ñ‚Ð²ÐµÑ€Ð´Ð¶ÐµÐ½Ð½Ñ Ð¾Ð±Ð»Ñ–ÐºÐ¾Ð²Ð¾Ð³Ð¾ запиÑу." +#: templates/web/base/auth/general.html:6 +#: templates/web/base/report/display.html:27 +#: templates/web/base/report/new/oauth_email_form.html:5 +#, fuzzy +msgid "We need your email address, please give it below." +msgstr "Ми ніколи не публікуємо вашу поштову адреÑу чи номер телефону." -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:2 -#: templates/web/fixmystreet/report/update-form.html:77 +#: templates/web/base/report/new/form_user_loggedout_email.html:2 +#: templates/web/base/report/update/form_user_loggedout_email.html:2 msgid "We never show your email" msgstr "Ми ніколи не публікуєм вашу поштову адреÑу" -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:31 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:65 +#: templates/web/base/report/new/form_user_loggedin.html:31 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:28 msgid "We never show your email address or phone number." msgstr "Ми ніколи не публікуємо вашу поштову адреÑу чи номер телефону." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:422 +#: perllib/FixMyStreet/Script/Reports.pm:200 msgid "We realise this problem might be the responsibility of %s; however, we don't currently have any contact details for them. If you know of an appropriate contact address, please do get in touch." msgstr "Ми розумієм, що проблема може лежати у відповідальноÑÑ‚Ñ– %s; нажаль, наразі у Ð½Ð°Ñ Ð½ÐµÐ¼Ð°Ñ” Ñ—Ñ… контактних даних. Якщо ви знаєте точну адреÑу, будь лаÑка залишайтеÑÑŒ на зв'Ñзку." @@ -3632,10 +3481,6 @@ msgstr "Ми будем викориÑтовувати ваші перÑонал msgid "We’re sorry to hear the problem’s not fixed. Why not try writing to your local representatives?" msgstr "" -#: templates/web/base/contact/blurb.html:8 -msgid "We'd love to hear what you think about this site. Just fill in the form, or send an email to <a href='mailto:%s'>%s</a>:" -msgstr "" - #: templates/web/base/contact/submit.html:7 msgid "We’ll get back to you as soon as we can." msgstr "" @@ -3644,7 +3489,7 @@ msgstr "" msgid "What was your experience of getting the problem fixed?" msgstr "" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:49 +#: templates/web/base/report/new/form_report.html:19 msgid "What’s the issue, and where is it?" msgstr "" @@ -3657,7 +3502,11 @@ msgstr "Коли відредаговано" msgid "When sent" msgstr "Коли відправлено" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:640 +#: templates/web/base/js/translation_strings.html:50 +msgid "Whoa there Testino! Three photos are enough." +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Report/New.pm:635 msgid "Whole block of empty flats" msgstr "Whole block of empty flats" @@ -3672,7 +3521,7 @@ msgstr "" msgid "Wish" msgstr "" -#: templates/web/base/open311/index.html:92 +#: templates/web/base/open311/index.html:84 msgid "With request searches, it is also possible to search for agency_responsible to limit the requests to those sent to a single administration. The search term is the administration ID provided by <a href=\"%s\">MaPit</a>." msgstr "" @@ -3680,7 +3529,7 @@ msgstr "" msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"http://fixmystreet.org\">available at fixmystreet.org</a>." msgstr "" -#: templates/web/base/questionnaire/index.html:87 +#: templates/web/base/questionnaire/index.html:96 msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?" msgstr "Хочете отримати ще іншу анкету за 4 тижні, нагадуючу вам про перевірку ÑтатуÑу?" @@ -3689,7 +3538,6 @@ msgid "Writing your message entirely in block capitals makes it hard to read, as msgstr "ПовідомленнÑ, напиÑане Ñуцільними великими літерами, робить його важким Ð´Ð»Ñ ÑприйнÑÑ‚Ñ‚Ñ. ÐедоÑконала Ð¿ÑƒÐ½ÐºÑ‚ÑƒÐ°Ñ†Ñ–Ñ Ñ‚Ð°Ðº Ñамо." #: templates/web/base/report/new/fill_in_details_form.html:4 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:5 msgid "Wrong location? Just click again on the map." msgstr "" @@ -3712,27 +3560,24 @@ msgstr "Рік" #: templates/web/base/admin/users.html:31 #: templates/web/base/questionnaire/creator_fixed.html:14 #: templates/web/base/questionnaire/index.html:51 -#: templates/web/base/questionnaire/index.html:90 +#: templates/web/base/questionnaire/index.html:99 msgid "Yes" msgstr "Так" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:17 -#: templates/web/fixmystreet/report/update-form.html:91 +#: templates/web/base/report/new/form_user_loggedout_password.html:5 +#: templates/web/base/report/update/form_user_loggedout_password.html:4 msgid "Yes I have a password" msgstr "Так, в мене Ñ” пароль" -#: templates/web/base/contact/index.html:39 -#: templates/web/fixmystreet/contact/index.html:54 +#: templates/web/base/contact/index.html:46 msgid "You are complaining that this problem report was unnecessarily moderated:" msgstr "" -#: templates/web/base/contact/index.html:41 -#: templates/web/fixmystreet/contact/index.html:56 +#: templates/web/base/contact/index.html:48 msgid "You are reporting the following problem report for being abusive, containing personal information, or similar:" msgstr "You are reporting the following problem report for being abusive, containing personal information, or similar:" -#: templates/web/base/contact/index.html:15 -#: templates/web/fixmystreet/contact/index.html:30 +#: templates/web/base/contact/index.html:22 msgid "You are reporting the following update for being abusive, containing personal information, or similar:" msgstr "You are reporting the following update for being abusive, containing personal information, or similar:" @@ -3745,7 +3590,7 @@ msgstr "Ви можете <a href=\"%s%s\">переглÑнути проблем msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create." msgstr "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create." -#: templates/web/fixmystreet/contact/index.html:121 +#: templates/web/base/contact/index.html:113 msgid "You can contact technical support on <a href='mailto:%s'>%s</a>" msgstr "Технічна підтримка доÑтупна за адреÑою <a href='mailto:%s'>%s</a>" @@ -3756,8 +3601,8 @@ msgid "" " reports in the past." msgstr "" -#: templates/web/base/report/new/councils_text_none.html:10 -#: templates/web/base/report/new/councils_text_none.html:2 +#: templates/web/base/report/new/councils_text_none.html:12 +#: templates/web/base/report/new/councils_text_none.html:14 #: templates/web/base/report/new/councils_text_some.html:19 #: templates/web/base/report/new/councils_text_some.html:21 msgid "You can help us by finding a contact email address for local problems for %s and emailing it to us at <a href='mailto:%s'>%s</a>." @@ -3775,21 +3620,16 @@ msgstr "Ви відхилили. Будь лаÑка заповніть форм msgid "You have already answered this questionnaire. If you have a question, please <a href='%s'>get in touch</a>, or <a href='%s'>view your problem</a>.\n" msgstr "You have already answered this questionnaire. If you have a question, please <a href='%s'>get in touch</a>, or <a href='%s'>view your problem</a>.\n" -#: templates/web/base/questionnaire/index.html:77 -#: templates/web/base/report/new/fill_in_details_form.html:75 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:73 -msgid "You have already attached a photo to this report, attaching another one will replace it." -msgstr "Ви вже додали фото до цього ÑповіщеннÑ, Ð´Ð¾Ð´Ð°Ð²Ð°Ð½Ð½Ñ Ð½Ð¾Ð²Ð¾Ð³Ð¾ фото видалить попереднє." - -#: templates/web/base/report/update-form.html:59 -#: templates/web/fixmystreet/report/update-form.html:56 -msgid "You have already attached a photo to this update, attaching another one will replace it." -msgstr "Ви вже додали фото до цього поновленнÑ, Ð´Ð¾Ð´Ð°Ð²Ð°Ð½Ð½Ñ Ð½Ð¾Ð²Ð¾Ð³Ð¾ фото видалить попереднє." - -#: templates/web/zurich/report/new/fill_in_details_form.html:61 +#: templates/web/base/report/new/form_report.html:32 +#: templates/web/zurich/report/new/fill_in_details_form.html:55 msgid "You have already attached photos to this report. Note that you can attach a maximum of 3 to this report (if you try to upload more, the oldest will be removed)." msgstr "" +#: templates/web/base/questionnaire/index.html:83 +#: templates/web/base/report/update/form_update.html:14 +msgid "You have already attached photos to this update. Note that you can attach a maximum of 3 to this update (if you try to upload more, the oldest will be removed)." +msgstr "" + #: templates/web/base/auth/sign_out.html:4 #: templates/web/zurich/auth/sign_out.html:3 msgid "You have been signed out" @@ -3804,9 +3644,8 @@ msgstr "Ви позначили проблему зеленою шпилькою msgid "You have successfully confirmed your email address." msgstr "Ви уÑпішно підтвердили поштову адреÑу." -#: templates/web/base/report/display.html:20 -#: templates/web/base/report/new/fill_in_details.html:37 -#: templates/web/fixmystreet/report/display.html:17 +#: templates/web/base/report/display.html:17 +#: templates/web/base/report/new/login_success_form.html:3 msgid "You have successfully signed in; please check and confirm your details are accurate:" msgstr "Ви уÑпішно увійшли; будь лаÑка перевірте чи деталі вірні:" @@ -3838,53 +3677,42 @@ msgid "Your Reports" msgstr "Ваші ÑповіщеннÑ" #: templates/web/base/alert/_list.html:89 +#: templates/web/base/contact/index.html:83 +#: templates/web/base/report/display_tools.html:38 +#: templates/web/base/report/display_tools.html:40 +#: templates/web/base/report/new/form_user_loggedin.html:3 +#: templates/web/base/report/new/form_user_loggedout_email.html:1 +#: templates/web/base/report/update/form_user_loggedout_email.html:1 #: templates/web/fixmystreet/alert/updates.html:19 #: templates/web/fixmystreet/alert/updates.html:22 -#: templates/web/fixmystreet/contact/index.html:91 -#: templates/web/fixmystreet/report/display.html:62 -#: templates/web/fixmystreet/report/display.html:64 -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:3 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:1 -#: templates/web/fixmystreet/report/update-form.html:76 #: templates/web/zurich/report/new/fill_in_details_form.html:76 msgid "Your email" msgstr "Ваша пошта" -#: templates/web/base/auth/general.html:28 -#: templates/web/fixmystreet/report/update-form.html:82 +#: templates/web/base/auth/general.html:45 +#: templates/web/base/report/update/form_user_loggedout_email.html:7 #: templates/web/zurich/auth/general.html:30 #: templates/web/zurich/auth/general.html:58 msgid "Your email address" msgstr "Ваша адреÑа е-пошти" -#: templates/web/base/report/new/fill_in_details_form.html:106 -#: templates/web/base/report/update-form.html:81 -msgid "Your email:" -msgstr "Ваша е-пошта:" - -#: templates/web/fixmystreet/report/updates-sidebar-notes.html:7 +#: templates/web/base/report/updates-sidebar-notes.html:3 msgid "Your information will only be used in accordance with our <a href=\"/privacy\">privacy policy</a>" msgstr "Ваша Ñ–Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ñ–Ñ Ð±ÑƒÐ´Ðµ викориÑтана згідно <a href=\"/privacy\">політики конфіденційноÑÑ‚Ñ–</a>" -#: templates/web/base/auth/general.html:51 -#: templates/web/fixmystreet/contact/index.html:84 -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:18 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:54 -#: templates/web/fixmystreet/report/update-form.html:142 +#: templates/web/base/auth/general.html:90 +#: templates/web/base/contact/index.html:76 +#: templates/web/base/report/new/form_user_loggedin.html:18 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:17 +#: templates/web/base/report/update/form_name.html:11 #: templates/web/zurich/auth/general.html:61 #: templates/web/zurich/report/new/fill_in_details_form.html:86 msgid "Your name" msgstr "Ваше ім'Ñ" -#: templates/web/base/contact/index.html:73 -#: templates/web/base/report/new/fill_in_details_form.html:186 -#: templates/web/base/report/update-form.html:152 -msgid "Your name:" -msgstr "Ваше ім'Ñ:" - -#: templates/web/base/auth/general.html:39 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:22 -#: templates/web/fixmystreet/report/update-form.html:96 +#: templates/web/base/auth/general.html:75 +#: templates/web/base/report/new/form_user_loggedout_password.html:10 +#: templates/web/base/report/update/form_user_loggedout_password.html:9 #: templates/web/zurich/auth/general.html:34 msgid "Your password" msgstr "Ваш пароль" @@ -3893,15 +3721,16 @@ msgstr "Ваш пароль" msgid "Your password has been changed" msgstr "Ваш пароль було змінено" -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:27 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:63 +#: templates/web/base/report/new/form_user_loggedin.html:27 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:26 #: templates/web/zurich/report/new/fill_in_details_form.html:92 msgid "Your phone number" msgstr "Ваш телефон" #: templates/web/base/questionnaire/index.html:14 +#, fuzzy msgid "Your report" -msgstr "Ваше ÑповіщеннÑ" +msgstr "Ваші ÑповіщеннÑ" #: templates/web/base/footer.html:9 templates/web/fixmystreet/footer.html:29 msgid "Your reports" @@ -3911,23 +3740,17 @@ msgstr "Ваші ÑповіщеннÑ" msgid "Your updates" msgstr "Ваші поновленнÑ" -#: templates/web/base/contact/index.html:81 -msgid "Your email:" -msgstr "Ваша е-пошта:" - #: templates/web/base/reports/_list-filters.html:3 -#, fuzzy msgid "all reports" -msgstr "Ð’ÑÑ– звіти" +msgstr "" #: templates/web/base/admin/timeline.html:4 msgid "by %s" msgstr "від %s" #: templates/web/base/reports/_list-filters.html:5 -#, fuzzy msgid "closed reports" -msgstr "Закриті звіти" +msgstr "" #: templates/web/base/reports/body.html:6 #: templates/web/base/reports/body.html:7 @@ -3949,17 +3772,16 @@ msgid "edit user" msgstr "редагувати кориÑтувача" #: templates/web/base/reports/_list-filters.html:6 -#, fuzzy msgid "fixed reports" -msgstr "Звіти про вирішені проблеми" +msgstr "" -#: templates/web/base/admin/index.html:33 +#: templates/web/base/status/stats.html:20 #: templates/web/zurich/admin/index.html:5 msgid "from %s different users" -msgstr "від %d різних кориÑтувачів" +msgstr "від %s різних кориÑтувачів" -#: templates/web/base/report/_item.html:17 -#: templates/web/zurich/report/_item.html:16 +#: templates/web/base/report/_item.html:15 +#: templates/web/zurich/report/_item.html:14 msgid "last updated %s" msgstr "оÑтаннє Ð¿Ð¾Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ %s" @@ -4051,10 +3873,8 @@ msgstr "перевідкрито" msgid "sign out" msgstr "вийти" -#: templates/web/base/report/new/fill_in_details_form.html:12 -#: templates/web/base/report/new/fill_in_details_form.html:15 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:10 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:12 +#: templates/web/base/report/new/fill_in_details_form.html:11 +#: templates/web/base/report/new/fill_in_details_form.html:9 msgid "the local council" msgstr "міÑцевий орган" @@ -4063,7 +3883,7 @@ msgstr "міÑцевий орган" msgid "there is no pin shown as the user did not use the map" msgstr "шпильки немає так Ñк кориÑтувач не викориÑтав мапу" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:398 +#: perllib/FixMyStreet/Script/Reports.pm:176 msgid "this type of local problem" msgstr "цей тип локальної проблеми" @@ -4072,9 +3892,8 @@ msgid "today" msgstr "Ñьогодні" #: templates/web/base/reports/_list-filters.html:4 -#, fuzzy msgid "unfixed reports" -msgstr "Звіти про вирішені проблеми" +msgstr "" #: templates/web/base/admin/report_edit.html:32 msgid "used map" @@ -4093,7 +3912,7 @@ msgstr "кориÑтувач Ñ” влаÑником проблеми" msgid "ward" msgstr "двір" -#: templates/web/base/front/stats.html:17 +#: templates/web/base/front/stats.html:13 #, perl-format msgid "<big>%s</big> report recently" msgid_plural "<big>%s</big> reports recently" @@ -4125,7 +3944,7 @@ msgstr[0] "%d хвилина" msgstr[1] "%d хвилин" msgstr[2] "%d хвилин" -#: templates/web/base/front/stats.html:29 +#: templates/web/base/front/stats.html:25 #, perl-format msgid "<big>%s</big> update on reports" msgid_plural "<big>%s</big> updates on reports" @@ -4149,7 +3968,7 @@ msgstr[0] "%d тиждень" msgstr[1] "%d тижднів" msgstr[2] "%d тижднів" -#: templates/web/base/front/stats.html:12 +#: templates/web/base/front/stats.html:8 #, perl-format msgid "<big>%s</big> report in past week" msgid_plural "<big>%s</big> reports in past week" @@ -4157,7 +3976,7 @@ msgstr[0] "<big>%s</big> звіт за минувший тиждень" msgstr[1] "<big>%s</big> звітів за минувший тиждень" msgstr[2] "<big>%s</big> звітів за минувший тиждень" -#: templates/web/base/front/stats.html:23 +#: templates/web/base/front/stats.html:19 #, perl-format msgid "<big>%s</big> fixed in past month" msgid_plural "<big>%s</big> fixed in past month" @@ -4181,107 +4000,80 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#~ msgid "(Don't worry — we'll hang on to your alert while you're checking your email.)" -#~ msgstr "(Don't worry — we'll hang on to your alert while you're checking your email.)" +#~ msgid "(we never show your email address or phone number)" +#~ msgstr "(ми не публікуєм вашу електронну адреÑу Ñ– номер телефону)" -#~ msgid "(Don't worry — we'll hang on to your problem report while you're checking your email.)" -#~ msgstr "(Don't worry — we'll hang on to your problem report while you're checking your email.)" +#~ msgid "(we never show your email)" +#~ msgstr "(ми не публікуєм вашу поштову адреÑу)" -#~ msgid "(Don't worry — we'll hang on to your update while you're checking your email.)" -#~ msgstr "(Don't worry — we'll hang on to your update while you're checking your email.)" +#~ msgid "<strong>No</strong>, let me confirm my report by email:" +#~ msgstr "<strong>ÐÑ–</strong>, Ñ Ð¿Ñ–Ð´Ñ‚Ð²ÐµÑ€Ð´Ð¶Ñƒ ÑÐ¿Ð¾Ð²Ñ–Ñ‰ÐµÐ½Ð½Ñ Ðµ-поштою" -#~ msgid "<small>If you cannot see the map, <a href='%s' rel='nofollow'>skip this step</a>.</small>" -#~ msgstr "<small>Якщо ви не бачите мапу, <a href='%s' rel='nofollow'>пропуÑÑ‚Ñ–Ñ‚ÑŒ цей крок</a>.</small>" +#~ msgid "<strong>No</strong>, let me confirm my update by email:" +#~ msgstr "<strong>ÐÑ–</strong>, Я підтверджу Ð¿Ð¾Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ðµ-поштою:" -#~ msgid "<strong>No</strong>, I do not, let me sign in by email:" -#~ msgstr "<strong>ÐÑ–</strong>, Ñ Ð·Ð°Ð»Ð¾Ð³Ñ–Ð½ÑŽÑÑŒ через е-пошту" +#~ msgid "Email me updates" +#~ msgstr "ÐадÑилайте мені новини" -#~ msgid "Are you a <strong>developer</strong>? Would you like to contribute to FixMyStreet?" -#~ msgstr "Ви <strong>розробник</strong>? Хочете долучитиÑÑŒ до проекту?" +#~ msgid "Enter a new password:" +#~ msgstr "Введіть новий пароль:" -#~ msgid "Closest nearby problems <small>(within %skm)</small>" -#~ msgstr "Ðайближчі проблеми <small>(в межах %sкм)</small>" +#~ 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 "Ðажаль ми не можем валідувати цей токен. Якщо ви зкопіювали поÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð· е-пошти, перевірте чи воно Ñкопійовано вірно.\n" -#~ msgid "Contact FixMyStreet" -#~ msgstr "ЗвернутиÑÑŒ до FixMyStreet" +#~ 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 "Якщо ви кориÑтуєтеÑÑŒ онлайн-поштовиком або маєте Ñпам-фільтр, перевірте папку Ñпам: інколи наші Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð¿Ð¾Ñ‚Ñ€Ð°Ð¿Ð»ÑÑŽÑ‚ÑŒ в цю категорію." -#~ msgid "Do you have a FixMyBarangay password?" -#~ msgstr "Ви маєте пароль до FixMyBarangay?" +#~ msgid "Message:" +#~ msgstr "ПовідомленнÑ:" -#~ msgid "FixMyStreet admin:" -#~ msgstr "FixMyStreet admin:" +#~ msgid "More problems nearby" +#~ msgstr "Ще проблеми поблизу" -#~ msgid "If you do not, your alert will not be activated." -#~ msgstr "Якщо ні, ваше ÑÐ¿Ð¾Ð²Ñ–Ñ‰ÐµÐ½Ð½Ñ Ð½Ðµ буде активовано." - -#~ msgid "If you do not, your problem will not be posted." -#~ msgstr "Якщо ні, ваша проблема не буде прозвітована." - -#~ msgid "If you do not, your update will not be posted." -#~ msgstr "Якщо ні, ваше Ð¾Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð½Ðµ буде опубліковано." - -#~ msgid "New update:" -#~ msgstr "ПоновленнÑ:" +#~ msgid "Nearly Done! Now check your email..." +#~ msgstr "Майже закінчили! Тепер перевірте вашу е-пошту..." -#~ msgid "No problems found." -#~ msgstr "Проблем не знайдено" +#~ msgid "Offensive? Unsuitable? Tell us" +#~ msgstr "Образливо? ÐедопуÑтимо? Розкажіть нам" -#~ msgid "No problems have been reported yet." -#~ msgstr "Про проблеми ще не ÑповіÑтили." +#~ msgid "Photo:" +#~ msgstr "Фото:" -#~ msgid "Now to submit your report… do you have a FixMyStreet password?" -#~ msgstr "Тепер щоб відправити ваше Ñповіщеннх у Ð²Ð°Ñ Ñ” пароль?" +#~ msgid "Please check your email" +#~ msgstr "Будь лаÑка перевірте вашу пошту" -#~ msgid "Now to submit your update… do you have a FixMyStreet password?" -#~ msgstr "Тепер щоб відправити ваше поновленнх у Ð²Ð°Ñ Ñ” пароль?" +#~ msgid "Please note that updates are not sent to the council. If you leave your name it will be public. Your information will only be used in accordance with our <a href=\"/faq#privacy\">privacy policy</a>" +#~ msgstr "Будь лаÑка зауважте що Ð¾Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð½Ðµ надÑилаютьÑÑ Ð´ÐµÐ¿Ð°Ñ€Ñ‚Ð°Ð¼ÐµÐ½Ñ‚Ñƒ. Якщо залишите ім'Ñ Ð²Ð¾Ð½Ð¸ Ñтануть публічними. Ваша Ñ–Ð½Ñ„Ð¾Ñ€Ð¼Ñ†Ñ–Ñ Ð±ÑƒÐ´Ðµ викориÑтана згідно з нашою <a href=\"/faq#privacy\">політикою конфіденційноÑÑ‚Ñ–</a>" -#~ msgid "Our code is open source and <a href=\"http://github.com/mysociety/fixmystreet\">available on GitHub</a>." -#~ msgstr "Our code is open source and <a href=\"http://github.com/mysociety/fixmystreet\">available on GitHub</a>." +#~ msgid "This problem has been closed" +#~ msgstr "Цю проблему закрито" -#~ msgid "Please <a class=\"tab_link\" href=\"#report\">take a look</a> at the updates that have been left." -#~ msgstr "Будь лаÑка <a class=\"tab_link\" href=\"#report\">переглÑньте</a> поновленнÑ, Ñкі залишилиÑÑŒ" +#~ msgid "This problem is in progress" +#~ msgstr "Ð¦Ñ Ð¿Ñ€Ð¾Ð±Ð»ÐµÐ¼Ð° в процеÑÑ–" -#~ msgid "Please take a look at the updates that have been left." -#~ msgstr "Будь лаÑка переглÑньте Ð¿Ð¾Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ñкі залишилиÑÑŒ" +#~ msgid "This problem is old and of unknown status." +#~ msgstr "Ð¦Ñ Ð¿Ñ€Ð¾Ð±Ð»ÐµÐ¼Ð° заÑтаріла Ñ– Ñ—Ñ— ÑÑ‚Ð°Ñ‚ÑƒÑ Ð½ÐµÐ²Ñ–Ð´Ð¾Ð¼Ð¸Ð¹." -#~ msgid "Problems within %s, FixMyStreet" -#~ msgstr "Проблеми в межах %s, FixMyStreet" - -#~ msgid "Publish the response" -#~ msgstr "Опублікувати відповідь" - -#~ msgid "Reported %s, to %s" -#~ msgstr "Сповіщено %s, до %s" - -#~ msgid "Reports on and around the map" -#~ msgstr "Ð¡Ð¿Ð¾Ð²Ñ–Ñ‰ÐµÐ½Ð½Ñ Ð½Ð° мапі" - -#~ msgid "Sign in by email" -#~ msgstr "Увійти через е-пошту" - -#~ msgid "Signed in as %s" -#~ msgstr "Увійшли Ñк %s" - -#~ msgid "The confirmation email <strong>may</strong> take a few minutes to arrive — <em>please</em> be patient." -#~ msgstr "ЛиÑÑ‚ з підтвердженнÑм <strong>може</strong> надійти через кілька хвилин — <em>будь лаÑка</em> будьте терплÑчими." +#~ msgid "Update:" +#~ msgstr "ПоновленнÑ:" -#~ msgid "The details of your problem are available from the other tab above." -#~ msgstr "Подробиці вашої проблеми доÑтупні в іншій вкладці вище." +#~ msgid "We have not been able to confirm your account - sorry." +#~ msgstr "Ðам не вдалоÑÑŒ підтвердити ваш обліковий запиÑ. Вибачте." -#~ msgid "The details of your problem are available on the right hand side of this page." -#~ msgstr "Подробиці вашої проблеми доÑтупні в правій чаÑтині Ñторінки" +#~ msgid "We have sent you an email containing a link to confirm your account." +#~ msgstr "Ми відправили вам лиÑта з поÑиланнÑм на Ð¿Ñ–Ð´Ñ‚Ð²ÐµÑ€Ð´Ð¶ÐµÐ½Ð½Ñ Ð¾Ð±Ð»Ñ–ÐºÐ¾Ð²Ð¾Ð³Ð¾ запиÑу." -#~ msgid "The latest local reports reported by users" -#~ msgstr "ОÑтанні локальні ÑÐ¿Ð¾Ð²Ñ–Ñ‰ÐµÐ½Ð½Ñ Ð²Ñ–Ð´ кориÑтувачів" +#~ msgid "You have already attached a photo to this report, attaching another one will replace it." +#~ msgstr "Ви вже додали фото до цього ÑповіщеннÑ, Ð´Ð¾Ð´Ð°Ð²Ð°Ð½Ð½Ñ Ð½Ð¾Ð²Ð¾Ð³Ð¾ фото видалить попереднє." -#~ msgid "To <strong>report a problem</strong>, click on the map at the correct location." -#~ msgstr "Щоб <strong>ÑповіÑтити про проблему</strong>, натиÑніть на мапу у відповідній локації." +#~ msgid "You have already attached a photo to this update, attaching another one will replace it." +#~ msgstr "Ви вже додали фото до цього поновленнÑ, Ð´Ð¾Ð´Ð°Ð²Ð°Ð½Ð½Ñ Ð½Ð¾Ð²Ð¾Ð³Ð¾ фото видалить попереднє." -#~ msgid "User" -#~ msgstr "КориÑтувач" +#~ msgid "Your email:" +#~ msgstr "Ваша е-пошта:" -#~ msgid "You must now click the link in the email we've just sent you." -#~ msgstr "Тепер вам необіхдно натиÑнути на поÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð² лиÑÑ‚Ñ–, Ñкий ми щойно надіÑлали." +#~ msgid "Your name:" +#~ msgstr "Ваше ім'Ñ:" -#~ msgid "Your email address:" -#~ msgstr "Ваша адреÑа е-пошти:" +#~ msgid "Your email:" +#~ msgstr "Ваша е-пошта:" diff --git a/locale/zh.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/zh.UTF-8/LC_MESSAGES/FixMyStreet.po index 70868e989..7e07ae9ec 100644 --- a/locale/zh.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/zh.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -4,14 +4,14 @@ # Matthew Somerville <matthew@mysociety.org>, 2011-06-03. # # Translators: -# Chi-Hsun Tsai <chihsun.tsai@gmail.com>, 2015 +# Chi-Hsun Tsai <chihsun.tsai@gmail.com>, 2015-2016 msgid "" msgstr "" "Project-Id-Version: fixmystreet\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2015-10-23 16:51+0100\n" -"PO-Revision-Date: 2015-07-31 16:31+0000\n" -"Last-Translator: mySociety <transifex@mysociety.org>\n" +"POT-Creation-Date: 2016-03-02 13:09+0000\n" +"PO-Revision-Date: 2016-01-29 02:52+0000\n" +"Last-Translator: Chi-Hsun Tsai <chihsun.tsai@gmail.com>\n" "Language-Team: Chinese (http://www.transifex.com/mysociety/fixmystreet/language/zh/)\n" "Language: zh\n" "MIME-Version: 1.0\n" @@ -19,45 +19,24 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:628 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:411 +#: perllib/FixMyStreet/DB/Result/Problem.pm:616 +#: perllib/FixMyStreet/Script/Reports.pm:189 msgid " and " msgstr "與" #: templates/web/base/report/new/councils_text_all.html:2 -#: templates/web/base/report/new/councils_text_none.html:11 -#: templates/web/base/report/new/councils_text_none.html:2 +#: templates/web/base/report/new/councils_text_none.html:12 +#: templates/web/base/report/new/councils_text_none.html:15 #: templates/web/base/report/new/councils_text_some.html:19 #: templates/web/base/report/new/councils_text_some.html:22 #: templates/web/base/report/new/councils_text_some.html:5 msgid " or " msgstr "或" -#: templates/web/base/admin/index.html:35 -#: templates/web/base/status/index.html:13 -msgid "%s confirmed alerts, %s unconfirmed" -msgstr "%d 已確èªé€šçŸ¥, %d 未確èªã€€" - -#: templates/web/base/admin/index.html:37 -#: templates/web/base/status/index.html:16 -#: templates/web/zurich/admin/index.html:6 -msgid "%s council contacts – %s confirmed, %s unconfirmed" -msgstr "%d 地方政府承辦人員 – %d ç¢ºèª %d 尚未確èª" - #: templates/web/base/admin/edit-league.html:12 msgid "%d edits by %s" msgstr " ç”± %d 編輯 %d" -#: templates/web/base/admin/index.html:34 -#: templates/web/base/status/index.html:12 -msgid "%s live updates" -msgstr "%d ç¾å ´æ›´æ–°" - -#: templates/web/base/admin/index.html:36 -#: templates/web/base/status/index.html:14 -msgid "%s questionnaires sent – %s answered (%s%%)" -msgstr "%d å•å·é€å‡º – % 回覆(%s%%)" - #: templates/web/base/pagination.html:10 msgid "%d to %d of %d" msgstr "%d 到 %d çš„ %d " @@ -70,39 +49,58 @@ msgstr "%s -ç”³å ±ç¸½çµ" #. ("%s here is the site name") #: templates/web/base/admin/header.html:10 msgid "%s admin:" -msgstr "" +msgstr "%s 管ç†:" + +#: templates/web/base/status/stats.html:26 +#, fuzzy +msgid "%s bodies" +msgstr "有關單ä½" + +#: templates/web/base/status/stats.html:24 +msgid "%s confirmed alerts, %s unconfirmed" +msgstr "%s 已確èªé€šçŸ¥, %s 未確èªã€€" + +#: templates/web/base/status/stats.html:27 +#: templates/web/zurich/admin/index.html:6 +msgid "%s council contacts – %s confirmed, %s unconfirmed" +msgstr "%s 地方政府承辦人員 – %s ç¢ºèª %s 尚未確èª" #. ("%s is the site name") #: templates/web/base/alert/index.html:7 -#, fuzzy msgid "" "%s has a variety of RSS feeds and email alerts for local\n" "problems, including alerts for all problems within a particular ward, or all\n" "problems within a certain distance of a particular location." msgstr "" -"FixMyStreeé‡å°åœ¨åœ°å•é¡Œï¼Œæä¾›å„種 RSS 訂閱與電å郵件通知信，包括\n" +"%sé‡å°åœ¨åœ°å•é¡Œï¼Œæä¾›å„種 RSS 訂閱與電å郵件通知信，包括\n" "æŸæŒ‡å®šå€åŸŸæˆ–政府部門內å„é¡žå•é¡Œçš„通知\n" "或是æŸä¸€ç¯„åœå…§å„é¡žå•é¡Œçš„通知" #. ("%s is the site name") #: templates/web/base/alert/index.html:11 -#, fuzzy msgid "" "%s has a variety of RSS feeds and email alerts for local problems, including\n" "alerts for all problems within a particular ward or council, or all problems\n" "within a certain distance of a particular location." msgstr "" -"FixMyStreeé‡å°åœ¨åœ°å•é¡Œï¼Œæä¾›å„種 RSS 訂閱與電å郵件通知信，包括\n" +"%sé‡å°åœ¨åœ°å•é¡Œï¼Œæä¾›å„種 RSS 訂閱與電å郵件通知信，包括\n" "æŸæŒ‡å®šå€åŸŸæˆ–政府部門內å„é¡žå•é¡Œçš„通知\n" "或是æŸä¸€ç¯„åœå…§å„é¡žå•é¡Œçš„通知" -#: perllib/FixMyStreet/DB/Result/Problem.pm:695 +#: templates/web/base/status/stats.html:23 +msgid "%s live updates" +msgstr "%s ç¾å ´æ›´æ–°" + +#: templates/web/base/status/stats.html:25 +msgid "%s questionnaires sent – %s answered (%s%%)" +msgstr "%s å•å·é€å‡º – % 回覆(%s%%)" + +#: perllib/FixMyStreet/DB/Result/Problem.pm:683 msgid "%s ref: %s" msgstr "%s æµæ°´è™Ÿ: %s " #. ("%s is the site name") #: templates/web/base/alert/_list.html:73 -#, fuzzy msgid "" "%s sends different categories of problem\n" "to the appropriate council, so problems within the boundary of a particular council\n" @@ -111,21 +109,21 @@ msgid "" "council’s alerts, but will only appear in the \"Within the boundary\" alert\n" "for the county council." msgstr "" -"FixMyStreet é€å‡ºä¸åŒé¡žåˆ¥çš„å•é¡Œç”³å ±çµ¦\n" +"%sé€å‡ºä¸åŒé¡žåˆ¥çš„å•é¡Œç”³å ±çµ¦\n" "é©å®œçš„地方政府機關，如果å•é¡Œç™¼ç”Ÿåœ¨æŸæ”¿åºœçš„轄å€å…§\n" "這樣處ç†æˆ–許的確é©ç•¶ã€‚例如，塗鴉å•é¡Œå°‡\n" "ç”³å ±çµ¦é‡Œ/å€æ©Ÿæ§‹ï¼Œæ‰€ä»¥æœƒåœ¨é‡Œ/å€æ©Ÿé—œçš„通告上\n" "而在地方政府的公告版上åªæœƒå‡ºç¾åœ¨è½„內通知上" -#: perllib/FixMyStreet/Cobrand/UK.pm:255 perllib/FixMyStreet/Cobrand/UK.pm:267 +#: perllib/FixMyStreet/Cobrand/UK.pm:256 perllib/FixMyStreet/Cobrand/UK.pm:268 msgid "%s ward, %s" msgstr "%s 里/å€, %s " -#: perllib/FixMyStreet/DB/Result/Problem.pm:564 +#: perllib/FixMyStreet/DB/Result/Problem.pm:552 msgid "%s, reported at %s" msgstr "%s 在 %s è™•ä¹‹ç”³å ± " -#: perllib/FixMyStreet/Cobrand/UK.pm:282 perllib/FixMyStreet/Cobrand/UK.pm:294 +#: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295 msgid "%s, within %s ward" msgstr "%s, 在%s 里/å€" @@ -133,9 +131,9 @@ msgstr "%s, 在%s 里/å€" msgid "© <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors" msgstr "版本; <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap開放街é“地圖</a> è²¢ç»è€…" -#: templates/web/zurich/report/new/fill_in_details_form.html:53 +#: templates/web/zurich/report/new/fill_in_details_form.html:46 msgid "(Defect & location of defect)" -msgstr "" +msgstr "(缺陷 & 缺陷地點)" #: templates/web/base/admin/report_blocks.html:41 #: templates/web/base/admin/users.html:31 @@ -144,15 +142,13 @@ msgstr "電郵為濫發信件" #: templates/web/zurich/admin/report_edit-sdm.html:60 #: templates/web/zurich/admin/report_edit.html:88 -#, fuzzy msgid "(No name)" -msgstr "姓å" +msgstr "(沒有姓å)" #: templates/web/zurich/admin/report_edit-sdm.html:67 #: templates/web/zurich/admin/report_edit.html:95 -#, fuzzy msgid "(No phone number)" -msgstr "電話號碼" +msgstr "(沒有電話號碼)" #: templates/web/base/alert/_list.html:24 msgid "(a default distance which covers roughly 200,000 people)" @@ -160,17 +156,16 @@ msgstr "é è¨è·é›¢ç´„涵蓋20è¬äººå£" #. ("%s is a list of distance links, e.g. [2km] / [5km] / [10km] / [20km]") #: templates/web/base/alert/_list.html:29 -#, fuzzy msgid "(alternatively the RSS feed can be customised, within %s)" -msgstr "或å¯ä¿®æ”¹RSS訂閱" +msgstr "或å¯åœ¨ %så¦å¤–修改自定RSS訂閱" -#: templates/web/base/report/_item.html:27 -#: templates/web/zurich/report/_item.html:21 +#: templates/web/base/report/_item.html:25 +#: templates/web/zurich/report/_item.html:19 msgid "(closed)" msgstr "(çµæŸ)" -#: templates/web/base/report/_item.html:25 -#: templates/web/zurich/report/_item.html:19 +#: templates/web/base/report/_item.html:23 +#: templates/web/zurich/report/_item.html:17 msgid "(fixed)" msgstr "(己處ç†)" @@ -178,37 +173,28 @@ msgstr "(己處ç†)" msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)" msgstr "(例如塗鴉, 文宣張貼, 人行é“鋪æ¿æˆ–街燈æ壤, )" -#: templates/web/base/report/_item.html:21 +#: templates/web/base/report/_item.html:19 msgid "(not sent to council)" msgstr "ä¸è¦å‘地方政府é€å‡º" -#: templates/web/base/report/new/fill_in_details_form.html:200 #: templates/web/zurich/report/new/fill_in_details_form.html:82 msgid "(optional)" msgstr "(ä»»é¸)" -#: templates/web/fixmystreet/report/public_label.html:1 +#: templates/web/base/report/public_label.html:1 msgid "(public)" msgstr "(公開)" -#: templates/web/base/report/_item.html:20 +#: templates/web/base/report/_item.html:18 msgid "(sent to both)" msgstr "兩個都é€å‡º" -#: templates/web/base/report/new/fill_in_details_form.html:194 -msgid "(we never show your email address or phone number)" -msgstr "(我們ä¸æœƒé€éœ²æ‚¨çš„電話或電郵)" - -#: templates/web/base/report/update-form.html:159 -msgid "(we never show your email)" -msgstr "(我們ä¸æœƒå…¬é–‹æ‚¨çš„é›»å郵件)" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:673 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 #: perllib/FixMyStreet/DB/Result/Problem.pm:410 msgid "-- Pick a category --" msgstr "é¸æ“‡åˆ†é¡ž" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:637 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:632 #: perllib/FixMyStreet/DB/Result/Problem.pm:416 msgid "-- Pick a property type --" msgstr "é¸æ“‡å…¬ç‰©ç¨®é¡ž" @@ -230,54 +216,41 @@ msgstr "" #. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories") #: templates/web/base/reports/_list-filters.html:27 msgid "<label>Show %s</label> <label>about %s</label>" -msgstr "" +msgstr "<label>颢示 %s</label> <label>關於 %s</label>" -#: templates/web/base/admin/index.html:32 -#: templates/web/base/status/index.html:11 +#: templates/web/base/status/stats.html:18 #: templates/web/zurich/admin/index.html:4 msgid "<strong>%s</strong> live problems" -msgstr "<strong>%d</strong> ç¾å ´å•é¡Œ" +msgstr "<strong>%s</strong> ç¾å ´å•é¡Œ" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:39 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:2 msgid "<strong>No</strong> Let me confirm my report by email" msgstr "<strong>ä¸</strong> 我è¦åˆ©ç”¨é›»å郵件確èªæˆ‘çš„ç”³å ± " -#: templates/web/fixmystreet/report/update-form.html:112 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:2 msgid "<strong>No</strong> Let me confirm my update by email" msgstr "<strong>ä¸</strong> 我è¦ç”¨é›»å郵件收到更新通知" -#: templates/web/base/auth/general.html:48 +#: templates/web/base/auth/general.html:87 #: templates/web/zurich/auth/general.html:51 msgid "<strong>No</strong> let me sign in by email" msgstr "<strong>ä¸</strong> 我è¦ç”¨é›»å郵件登入" -#: templates/web/base/report/new/fill_in_details_form.html:145 -msgid "<strong>No</strong>, let me confirm my report by email:" -msgstr "<strong>ä¸</strong>, 我想用電å郵件確èªæˆ‘çš„ç”³å ±l:" - -#: templates/web/base/report/update-form.html:118 -msgid "<strong>No</strong>, let me confirm my update by email:" -msgstr "<strong>ä¸</strong>, 我è¦åˆ©ç”¨é›»å郵件收å–更新通知:" - -#: templates/web/base/auth/general.html:34 -#: templates/web/base/report/new/fill_in_details_form.html:123 -#: templates/web/base/report/update-form.html:96 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:15 -#: templates/web/fixmystreet/report/update-form.html:89 +#: templates/web/base/auth/general.html:70 +#: templates/web/base/report/new/form_user_loggedout_password.html:3 +#: templates/web/base/report/update/form_user_loggedout_password.html:2 msgid "<strong>Yes</strong> I have a password" msgstr "<strong>是</strong> 我有密碼" -#: templates/web/base/static/about-en-gb.html:1 -#: templates/web/base/static/about-en-gb.html:3 +#: templates/web/base/about/about-en-gb.html:1 +#: templates/web/base/about/about-en-gb.html:3 msgid "About us" msgstr "關於我們" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:8 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:31 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:29 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:35 msgid "Action Scheduled" msgstr "行動排程 " @@ -312,14 +285,13 @@ msgstr "新增種類" msgid "Add user" msgstr "新增使用者" -#: templates/web/base/my/my.html:52 +#: templates/web/base/my/my.html:56 msgid "Added %s" msgstr "新增 %s" #: templates/web/base/report/new/category_extras.html:9 -#, fuzzy msgid "Additional Information" -msgstr "å¾…æ ¸å¯" +msgstr "其餘資訊" #: templates/web/base/auth/change_password.html:29 msgid "Again:" @@ -333,8 +305,7 @@ msgstr "%s創建之 %d通知,　種類 %s, åƒæ•¸ %s / %s" msgid "Alert %d disabled (created %s)" msgstr "%d 關閉通知 " -#: templates/web/base/report/update-form.html:164 -#: templates/web/fixmystreet/report/update-form.html:150 +#: templates/web/base/report/update/form_name.html:20 msgid "Alert me to future updates" msgstr "通知我æ¤äº‹å¾ŒçºŒ" @@ -344,9 +315,8 @@ msgid "All Reports" msgstr "æ‰€æœ‰äº‹ä»¶ç”³å ±" #: templates/web/zurich/admin/stats.html:5 -#, fuzzy msgid "All Reports as CSV" -msgstr "æ‰€æœ‰äº‹ä»¶ç”³å ±" +msgstr "æ‰€æœ‰äº‹ä»¶ç”³å ±å˜æˆCSVæ ¼å¼" #: templates/web/base/footer.html:11 templates/web/fixmystreet/footer.html:32 #: templates/web/zurich/admin/index-dm.html:12 @@ -367,10 +337,8 @@ msgstr "ä½ æ‰€æ供的資訊å³å°‡é€å‡º" #: templates/web/base/report/new/councils_text_all.html:2 #: templates/web/base/report/new/councils_text_all.html:4 -#: templates/web/base/report/new/fill_in_details_form.html:12 -#: templates/web/base/report/new/fill_in_details_form.html:14 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:10 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:11 +#: templates/web/base/report/new/fill_in_details_form.html:10 +#: templates/web/base/report/new/fill_in_details_form.html:9 msgid "All the information you provide here will be sent to <strong>%s</strong>." msgstr "所有您æ供的资訊將é€å‡ºçµ¦<strong>%s</strong>." @@ -392,6 +360,10 @@ msgstr "匿å:" msgid "Are you a developer?" msgstr "ä½ æ˜¯ç¨‹å¼é–‹ç™¼è€…å—Ž?" +#: templates/web/base/js/translation_strings.html:52 +msgid "Are you sure you want to cancel this upload?" +msgstr "" + #: templates/web/base/admin/body-form.html:69 #: templates/web/base/admin/body.html:16 #: templates/web/zurich/admin/body-form.html:24 @@ -404,9 +376,8 @@ msgid "As this is a staging site and %s is false, reports made on this site will msgstr "作為一個支æ´å¹³å°ã€€%så‡ºéŒ¯ï¼Œæœ¬ç«™æ‰€ä½œçš„ç”³å ±å°‡é€é”çµ¦ç”³å ±è€…ï¼Œè€Œä¸æ˜¯ç”³å ±é¡žåˆ¥ä¸‹æ供的承辦人員。　　" #: templates/web/zurich/admin/report_edit.html:213 -#, fuzzy msgid "Assign to competent body:" -msgstr "分派給外部機：" +msgstr "分派給é©ä»»çš„機關　" #: templates/web/zurich/admin/report_edit.html:173 #: templates/web/zurich/admin/stats.html:36 @@ -425,16 +396,16 @@ msgstr "交派給下級單ä½ï¼š" msgid "Assigned to %s" msgstr "派給　%s" -#: templates/web/base/open311/index.html:84 +#: templates/web/base/open311/index.html:76 msgid "At most %d requests are returned in each query. The returned requests are ordered by requested_datetime, so to get all requests, do several searches with rolling start_date and end_date." msgstr "æ¯ä¸€å‰‡è©¢å•çš„ç”³å ±å¹¾ä¹Žé” %d地回覆了。所有的è¦æ±‚，ä¾å…¶æ™‚間排列，故æœå°‹æ™‚è«‹è¨å®šå•Ÿå§‹èˆ‡çµæŸæ—¥æœŸã€‚" -#: templates/web/base/open311/index.html:76 +#: templates/web/base/open311/index.html:68 msgid "At the moment only searching for and looking at reports work." msgstr "ç›®å‰åƒ…æ供部份查詢與查閱" #: perllib/FixMyStreet/DB/Result/Problem.pm:373 -#: templates/web/zurich/report/_item.html:11 +#: templates/web/zurich/report/_item.html:9 msgid "Awaiting moderation" msgstr "å¾…æ ¸å¯" @@ -446,7 +417,7 @@ msgstr "回上層" msgid "Ban email address" msgstr "ç¦æ¢ä¹‹é›»å郵件" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1276 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1285 #: perllib/FixMyStreet/Cobrand/Zurich.pm:392 #: templates/web/base/admin/bodies.html:1 templates/web/zurich/header.html:64 msgid "Bodies" @@ -469,14 +440,14 @@ msgstr "日期" #: templates/web/base/auth/token.html:21 templates/web/base/email_sent.html:18 msgid "Can’t find our email? Check your spam folder – that’s the solution 99% of the time." -msgstr "" +msgstr "ä½ çš„ä¿¡ç®±ä¸æ‰¾ä¸åˆ°æˆ‘們的來信嗎？先檢查看看垃圾回收桶，通常99%çš„å•é¡Œå¯ç²è§£æ±º" #: templates/web/base/around/_report_banner.html:5 msgid "Can't see the map? <em>Skip this step</em>" msgstr "無法顯示地圖？ <em>ç•¥éŽæœ¬æ¥é©Ÿ</em>" #: templates/web/base/admin/body.html:68 -#: templates/web/base/admin/index.html:61 +#: templates/web/base/admin/index.html:54 #: templates/web/base/report/new/category.html:10 #: templates/web/base/report/new/category_wrapper.html:3 #: templates/web/zurich/admin/body.html:14 @@ -487,8 +458,8 @@ msgstr "無法顯示地圖？ <em>ç•¥éŽæœ¬æ¥é©Ÿ</em>" msgid "Category" msgstr "類別" -#: templates/web/base/admin/index.html:59 -#: templates/web/base/admin/index.html:67 +#: templates/web/base/admin/index.html:52 +#: templates/web/base/admin/index.html:60 msgid "Category fix rate for problems > 4 weeks old" msgstr "4週å‰å·±ä¿®å¾©å•é¡Œä¹‹é¡žåˆ¥" @@ -501,7 +472,7 @@ msgstr "4週å‰å·±ä¿®å¾©å•é¡Œä¹‹é¡žåˆ¥" msgid "Category:" msgstr "類別:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:402 +#: perllib/FixMyStreet/Script/Reports.pm:180 msgid "Category: %s" msgstr "類別: %s" @@ -553,7 +524,7 @@ msgstr "é¸æ“‡æ°‘眾å¯ç†è§£çš„<strong>類別</strong> (例如., \"è·¯é¢å‘æ´ #: templates/web/zurich/admin/response_templates_select.html:6 msgid "Choose a template" -msgstr "" +msgstr "é¸æ“‡æ¨¡ç‰ˆ" #: templates/web/base/admin/stats.html:65 #: templates/web/base/admin/stats.html:71 @@ -561,25 +532,25 @@ msgid "Click here or enter as dd/mm/yyyy" msgstr "點é¸æ¤è™•æˆ–輸入日期/月份/年份" #: templates/web/base/around/_report_banner.html:2 -#: templates/web/base/js/translation_strings.html:50 +#: templates/web/base/js/translation_strings.html:55 msgid "Click map to report a problem" msgstr "é»žæ“Šåœ°åœ–ä»¥ç”³å ±å•é¡Œ " #: templates/web/base/email_sent.html:13 msgid "Click the link in our confirmation email to activate your alert." -msgstr "" +msgstr "é¸æ“‡ç¢ºèªé›»å郵件上的連çµä»¥å•Ÿå‹•ä½ 的通知" #: templates/web/base/email_sent.html:9 msgid "Click the link in our confirmation email to publish your problem." -msgstr "" +msgstr "é¸æ“‡ç¢ºèªé›»å郵件上的連çµä»¥ç™¼ä½ˆä½ çš„å•é¡Œã€€" #: templates/web/base/email_sent.html:11 msgid "Click the link in our confirmation email to publish your update." -msgstr "" +msgstr "é¸æ“‡ç¢ºèªé›»å郵件上的連çµä»¥ç™¼ä½ˆä½ çš„æ›´æ–°" #: templates/web/base/auth/token.html:18 msgid "Click the link in our confirmation email to sign in." -msgstr "" +msgstr "é¸æ“‡ç¢ºèªé›»å郵件上的連çµä»¥ä½œç™»å…¥" #: perllib/FixMyStreet/Cobrand/Zurich.pm:196 #: perllib/FixMyStreet/Cobrand/Zurich.pm:969 @@ -588,7 +559,7 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:25 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:144 -#: templates/web/fixmystreet/report/banner.html:15 +#: templates/web/base/report/banner.html:15 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:10 #: templates/web/zurich/admin/header.html:16 @@ -596,7 +567,7 @@ msgstr "" msgid "Closed" msgstr "關閉" -#: perllib/FixMyStreet/DB/Result/Problem.pm:794 +#: perllib/FixMyStreet/DB/Result/Problem.pm:779 msgid "Closed by council" msgstr "由地方政府關閉" @@ -622,7 +593,7 @@ msgstr "è¯åˆå“牌資料:" msgid "Cobrand:" msgstr "è¯åˆå“牌:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1283 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1292 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "è¨å®š" @@ -635,13 +606,14 @@ msgstr "組態端 點" msgid "Confirm" msgstr "確èª" -#: templates/web/base/auth/token.html:1 templates/web/zurich/auth/token.html:1 +#: templates/web/base/auth/token.html:1 msgid "Confirm account" msgstr "確èªå¸³æˆ¶" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:33 -#: templates/web/fixmystreet/report/update-form.html:107 -msgid "Confirm by email below, providing a new password at that point. When you confirm, your password will be updated." +#: templates/web/base/report/new/form_user_loggedout_password.html:21 +#: templates/web/base/report/update/form_user_loggedout_password.html:20 +#, fuzzy +msgid "Confirm by email instead, providing a new password at that point. When you confirm, your password will be updated." msgstr "確èªä¸‹æ–¹é›»å郵件，輸入新密碼，按確èªéµå¾Œï¼Œæ‚¨çš„密碼å³åˆ»æ›´æ–°ã€‚" #: templates/web/base/questionnaire/creator_fixed.html:1 @@ -671,35 +643,27 @@ msgid "Confirmed:" msgstr "已確èªï¼š" #. ("%s is the site name") -#: templates/web/base/faq/faq-en-gb.html:8 templates/web/base/footer.html:24 -#: templates/web/base/open311/index.html:8 -#: templates/web/base/static/privacy.html:10 -#: templates/web/fixmystreet/contact/index.html:12 -#, fuzzy +#: templates/web/base/about/_sidebar.html:6 templates/web/base/footer.html:24 msgid "Contact %s" -msgstr "連絡我們" +msgstr "è¯çµ¡ %s" #: templates/web/base/contact/index.html:1 #: templates/web/base/contact/index.html:2 #: templates/web/base/contact/submit.html:1 -#: templates/web/fixmystreet/contact/index.html:1 -#: templates/web/fixmystreet/contact/index.html:2 msgid "Contact Us" msgstr "連絡我們" -#: templates/web/base/contact/index.html:6 -#: templates/web/fixmystreet/contact/index.html:20 +#: templates/web/base/contact/index.html:12 msgid "Contact the team" msgstr "連çµæœ¬åœ˜éšŠ" #: templates/web/zurich/admin/report_edit-sdm.html:40 #: templates/web/zurich/admin/report_edit.html:59 -#, fuzzy msgid "Coordinates:" msgstr "å”åŒå–®ä½:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1420 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1448 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1429 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1457 msgid "Could not find user" msgstr "找ä¸åˆ°è©²æˆ¶ç”¨" @@ -717,7 +681,7 @@ msgstr "地方政府" msgid "Council contacts for %s" msgstr "è¯ç¹‹åœ°æ–¹æ”¿åºœ %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:693 +#: perllib/FixMyStreet/DB/Result/Problem.pm:681 msgid "Council ref: %s" msgstr "地方政府æµæ°´è™Ÿã€€ref: %s" @@ -732,7 +696,7 @@ msgstr "地方政府" msgid "Count" msgstr "數é‡" -#: templates/web/base/email_sent.html:1 templates/web/zurich/email_sent.html:1 +#: templates/web/base/email_sent.html:1 msgid "Create a report" msgstr "å‰µå»ºç”³å ±" @@ -742,9 +706,8 @@ msgid "Create category" msgstr "創建類別" #: templates/web/zurich/admin/template_edit.html:29 -#, fuzzy msgid "Create template" -msgstr "å‰µå»ºç”³å ±" +msgstr "創建模版" #: templates/web/base/admin/problem_row.html:34 #: templates/web/zurich/admin/templates.html:10 @@ -770,7 +733,7 @@ msgstr "ç›®å‰æœªå‰µå»ºå…§æ–‡" #: perllib/FixMyStreet/Cobrand/Zurich.pm:834 #: templates/web/zurich/admin/report_edit-sdm.html:109 msgid "Customer not contactable" -msgstr "" +msgstr "無法è¨çµ¡ä¸Šçš„客戶" #: templates/web/base/dashboard/index.html:5 #: templates/web/base/dashboard/index.html:7 @@ -781,10 +744,10 @@ msgstr "控制å°" msgid "Dealt with by subdivision within 5 working days" msgstr "下屬單ä½5個工作天內處ç†ã€‚" -#: perllib/FixMyStreet/App/Controller/Admin.pm:878 +#: perllib/FixMyStreet/App/Controller/Admin.pm:877 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" -msgstr "" +msgstr "刪除模版" #: templates/web/base/admin/bodies.html:27 #: templates/web/base/admin/body.html:177 @@ -794,7 +757,7 @@ msgstr "" msgid "Deleted" msgstr "刪除" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:51 +#: templates/web/base/report/new/form_report.html:45 #: templates/web/zurich/admin/index-dm.html:22 #: templates/web/zurich/admin/index-sdm.html:20 #: templates/web/zurich/admin/reports.html:12 @@ -802,12 +765,11 @@ msgid "Description" msgstr "æè¿°" #: templates/web/base/js/translation_strings.html:34 -#: templates/web/zurich/report/new/fill_in_details_form.html:42 +#: templates/web/zurich/report/new/fill_in_details_form.html:68 msgid "Details" msgstr "細節" #: templates/web/base/admin/report_edit.html:20 -#: templates/web/base/report/new/fill_in_details_form.html:62 #: templates/web/zurich/admin/report_edit-sdm.html:27 #: templates/web/zurich/admin/report_edit.html:29 #: templates/web/zurich/admin/report_edit.html:43 @@ -820,7 +782,6 @@ msgstr "下放" #: templates/web/zurich/admin/report_edit-sdm.html:50 #: templates/web/zurich/admin/report_edit.html:69 -#, fuzzy msgid "Didn't use map" msgstr "ä¸ä½¿ç”¨åœ°åœ–" @@ -829,29 +790,30 @@ msgid "Diligency prize league table" msgstr "勤奮表ç¾åå–®" #. ("%s is the site name") -#: templates/web/base/auth/general.html:31 -#: templates/web/base/report/new/fill_in_details_form.html:114 -#: templates/web/base/report/update-form.html:87 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:11 -#: templates/web/fixmystreet/report/update-form.html:86 -#, fuzzy +#: templates/web/base/auth/general.html:48 +#: templates/web/base/report/new/form_user_loggedout.html:18 +#: templates/web/base/report/new/oauth_email_form.html:18 +#: templates/web/base/report/update-form.html:29 +#: templates/web/base/report/update/form_user_loggedout.html:17 msgid "Do you have a %s password?" -msgstr "您是å¦æœ‰ FixMyStreet 密碼？ " +msgstr "您是å¦æœ‰ %s密碼？ " #: templates/web/base/questionnaire/index.html:55 msgid "Don’t know" msgstr "ä¸çŸ¥é“" -#: templates/web/fixmystreet/contact/index.html:118 +#: templates/web/base/contact/index.html:110 msgid "Don't like forms?" msgstr "ä¸å–œæ¡æ¤è¡¨å–®ï¼Ÿ" +#: templates/web/base/js/translation_strings.html:51 +msgid "Drag and drop photos here or <u>click to upload</u>" +msgstr "" + #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:14 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:32 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:30 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:36 msgid "Duplicate" msgstr "複製 " @@ -904,7 +866,7 @@ msgstr "編輯器" #: templates/web/base/admin/category_edit.html:91 #: templates/web/base/admin/flagged.html:38 #: templates/web/base/admin/users.html:16 -#: templates/web/base/auth/general.html:22 +#: templates/web/base/auth/general.html:39 #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:24 @@ -912,7 +874,7 @@ msgstr "編輯器" msgid "Email" msgstr "é›»å郵件" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1396 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1405 msgid "Email added to abuse list" msgstr "é›»å郵件列入濫發åå–®" @@ -928,7 +890,7 @@ msgstr "建立電郵通知" msgid "Email alert deleted" msgstr "å–消電郵通知" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1393 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1402 msgid "Email already in abuse list" msgstr "é›»å郵件己在濫發åå–®" @@ -936,41 +898,36 @@ msgstr "é›»å郵件己在濫發åå–®" msgid "Email me new local problems" msgstr "以電郵通知其它å•é¡Œ" -#: templates/web/base/report/display.html:38 -msgid "Email me updates" -msgstr "以電郵通知更新" - #: templates/web/base/admin/category_edit.html:31 #: templates/web/base/admin/report_edit.html:62 #: templates/web/base/admin/update_edit.html:33 #: templates/web/base/admin/user-form.html:20 #: templates/web/base/alert/updates.html:13 -#: templates/web/base/report/display.html:42 #: templates/web/zurich/admin/body.html:47 msgid "Email:" msgstr "é›»å郵件:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:329 +#: perllib/FixMyStreet/Script/Reports.pm:108 msgid "Email: %s" msgstr "é›»å郵件: %s" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:639 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:634 msgid "Empty flat or maisonette" msgstr "閒置的公寓或大樓" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:638 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:633 msgid "Empty house or bungalow" msgstr "閒置的房èˆ" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:641 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:636 msgid "Empty office or other commercial" msgstr "閒置的辦公室或其它商æ¥ç©ºé–“" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:642 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:637 msgid "Empty pub or bar" msgstr "閒置的酒館或咖啡廳" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:643 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:638 msgid "Empty public building - school, hospital, etc." msgstr "閒置的公共建築物，如å¸æ ¡,醫院ç‰" @@ -1008,7 +965,7 @@ msgstr "çµæŸé»ž" msgid "Enter a Zürich street name" msgstr "輸入街é“å稱　" -#: perllib/FixMyStreet/Cobrand/UK.pm:13 +#: perllib/FixMyStreet/Cobrand/UK.pm:14 msgid "Enter a nearby UK postcode, or street name and area" msgstr "輸入本å€çš„郵編，街å或å€åŸŸã€‚" @@ -1026,14 +983,9 @@ msgstr "輸入最近的街å或地å€" msgid "Enter a nearby street name and area, postal code or district in Delhi" msgstr "輸入最近的街å，地å€æˆ–郵編號碼" -#: templates/web/base/report/new/fill_in_details_form.html:152 -#: templates/web/base/report/update-form.html:125 -msgid "Enter a new password:" -msgstr "請輸入新密碼" - -#: templates/web/base/auth/general.html:60 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:75 -#: templates/web/fixmystreet/report/update-form.html:123 +#: templates/web/base/auth/general.html:99 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:38 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:13 #: templates/web/zurich/auth/general.html:65 msgid "Enter a password" msgstr "請輸入密碼" @@ -1043,28 +995,28 @@ msgid "Enter details of the problem" msgstr "請在æ¤å¡«å¯«å•é¡Œçš„細節" #: templates/web/base/errors/generic.html:1 -#: templates/web/base/errors/generic.html:3 +#: templates/web/base/errors/generic.html:4 #: templates/web/base/tokens/abuse.html:1 #: templates/web/base/tokens/abuse.html:3 #: templates/web/base/tokens/error.html:1 -#: templates/web/base/tokens/error.html:3 +#: templates/web/base/tokens/error.html:5 msgid "Error" msgstr "錯誤" #: templates/web/base/reports/_list-filters.html:12 msgid "Everything" -msgstr "" +msgstr "一切" #: templates/web/base/admin/body.html:14 #: templates/web/base/admin/category_edit.html:18 msgid "Example postcode %s" msgstr "郵éžå€è™Ÿç¯„例 %s" -#: templates/web/base/open311/index.html:94 +#: templates/web/base/open311/index.html:86 msgid "Examples:" msgstr "範例：" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:55 +#: templates/web/base/report/new/form_report.html:49 msgid "Explain what’s wrong, exactly where it is, and how long it’s been there…" msgstr "說明什麼壞掉故障了，確切的地點以åŠå®ƒç½®æ–¼æ¤è™•æœ‰å¤šä¹…了" @@ -1073,11 +1025,11 @@ msgstr "說明什麼壞掉故障了，確切的地點以åŠå®ƒç½®æ–¼æ¤è™•æœ‰å¤š #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:12 msgid "Extern" -msgstr "" +msgstr "外åœ" #: templates/web/base/admin/body-form.html:81 msgid "External URL" -msgstr "" +msgstr "外部網å€" #: templates/web/base/admin/category_edit.html:27 #: templates/web/base/admin/report_edit.html:74 @@ -1105,17 +1057,15 @@ msgstr "é¸æ“‡<strong>涵蓋的å€åŸŸ</strong> <em>編輯有關單ä½</em> è¡¨å– msgid "FixMyStreet" msgstr "FixMyStreet" -#: templates/web/base/admin/index.html:61 +#: templates/web/base/admin/index.html:54 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:24 #: templates/web/base/admin/report_blocks.html:9 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:144 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:34 -#: templates/web/fixmystreet/report/banner.html:12 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:32 +#: templates/web/base/report/banner.html:12 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:38 msgid "Fixed" msgstr "已處ç†" @@ -1142,7 +1092,7 @@ msgstr "標記è¦å‘Šç‚ºåˆªé™¤ã€€" msgid "Flag user" msgstr "標記è¦å‘Šç”¨æˆ¶" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1281 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1290 #: templates/web/base/admin/users.html:19 msgid "Flagged" msgstr "標記è¦å‘Š" @@ -1173,36 +1123,31 @@ msgstr "追踪里/å€é€£çµï¼Œä»¥æª¢è¦–該å€å…§ä¹‹ç”³å ±" msgid "For more information, see <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>." msgstr "更多資訊，請詳見<a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>如何使用 FixMyStreet 地圖標記</a>（英文）" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:32 -#: templates/web/fixmystreet/report/update-form.html:106 +#: templates/web/base/report/new/form_user_loggedout_password.html:20 +#: templates/web/base/report/update/form_user_loggedout_password.html:19 msgid "Forgotten your password?" msgstr "忘記您的密碼?" #: perllib/FixMyStreet/Cobrand/Zurich.pm:752 -#, fuzzy msgid "Forwarded to external body" -msgstr "分派給外部機：" +msgstr "轉寄給外部機構" #: perllib/FixMyStreet/Cobrand/Zurich.pm:753 -#, fuzzy msgid "Forwarded wish to external body" -msgstr "分派給外部機：" +msgstr "轉寄願望給外部機構" -#: templates/web/base/faq/faq-en-gb.html:1 -#: templates/web/base/faq/faq-en-gb.html:13 -#: templates/web/base/faq/faq-en-gb.html:6 -#: templates/web/base/open311/index.html:6 -#: templates/web/base/static/privacy.html:8 -#: templates/web/fixmystreet/contact/index.html:10 +#: templates/web/base/about/_sidebar.html:4 +#: templates/web/base/about/faq-en-gb.html:1 +#: templates/web/base/about/faq-en-gb.html:5 msgid "Frequently Asked Questions" msgstr "常見å•é¡Œå›žè¦†ã€€" -#: templates/web/base/open311/index.html:136 +#: templates/web/base/open311/index.html:128 msgid "GeoRSS on Google Maps" msgstr "google 地圖上的地ç†RSS" +#: templates/web/base/report/display_tools.html:11 #: templates/web/fixmystreet/around/_updates.html:3 -#: templates/web/fixmystreet/report/display.html:35 msgid "Get updates" msgstr "å–å¾—æ›´æ–°" @@ -1235,7 +1180,7 @@ msgstr "èµ°" msgid "Going to send questionnaire?" msgstr "å³å°‡é€å‡ºå•å·ï¼Ÿ" -#: templates/web/base/admin/index.html:42 +#: templates/web/base/admin/index.html:35 msgid "Graph of problem creation by status over time" msgstr "隨時間産生的å•é¡Œåœ–片" @@ -1252,7 +1197,7 @@ msgid "Have you ever reported a problem to a council before, or is this your fir msgstr "您之å‰æ˜¯å¦æ›¾å‘åœ°æ–¹æ”¿åºœç”³å ±éŽå•é¡Œï¼Ÿæˆ–者æ¤ç‚ºæ‚¨çš„é¦–æ¬¡ç”³å ±ï¼Ÿã€€" #: templates/web/base/footer.html:15 templates/web/fixmystreet/footer.html:38 -#: templates/web/zurich/faq/faq-de-ch.html:1 +#: templates/web/zurich/about/faq-de-ch.html:1 #: templates/web/zurich/footer.html:22 #: templates/web/zurich/nav_over_content.html:8 msgid "Help" @@ -1303,7 +1248,7 @@ msgstr "å¦‚ä½•ç”³å ±å•é¡Œ " msgid "How to send successful reports" msgstr "如何æˆåŠŸåœ°é€å‡ºç”³å ±" -#: perllib/FixMyStreet/App/Controller/Admin.pm:754 +#: perllib/FixMyStreet/App/Controller/Admin.pm:752 msgid "I am afraid you cannot confirm unconfirmed reports." msgstr "您ä¸èƒ½ç¢ºèªæ¤å°šæœªç¢ºèªä¹‹ç”³å ±ã€€" @@ -1321,10 +1266,6 @@ msgstr "我利用@fixmystreet ç”³å ±äº†ä¸€å€‹å•é¡Œ " msgid "I'm afraid we couldn't locate your problem in the database.\n" msgstr " 我們無法在資料庫ä¸æ‰¾åˆ°æ‚¨çš„å•é¡Œã€‚\n" -#: perllib/FixMyStreet/App/Controller/Tokens.pm:327 -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 "們無法驗è‰æ¤ä»£è™Ÿï¼Œå¦‚果您從電å郵件ä¸è¤‡è£½äº†è¶…連çµç¶²å€ï¼Œè«‹æª¢æŸ¥æ‚¨è¤‡è£½æ˜¯å¦æ£ç¢ºã€‚\n" - #: templates/web/base/admin/flagged.html:14 #: templates/web/base/admin/list_updates.html:6 #: templates/web/base/admin/reports.html:11 @@ -1358,25 +1299,18 @@ msgstr "" msgid "If you get some more information about the status of your problem, please come back to the site and leave an update." msgstr "å¦‚æžœä½ å°ç”³å ±ä¹‹å•é¡Œæœ‰é€²ä¸€æ¥ç‹€æ³ï¼Œæ¡è¿Žå›žåˆ°æœ¬ç«™ç•™è¨€æ›´æ–°" -#: templates/web/base/report/new/councils_text_none.html:2 -#: templates/web/base/report/new/councils_text_none.html:8 +#: templates/web/base/report/new/councils_text_none.html:10 +#: templates/web/base/report/new/councils_text_none.html:9 msgid "If you submit a problem here the subject and details of the problem will be public, but the problem will <strong>not</strong> be reported to the council." msgstr "您在æ¤äº¤ä»˜æŠ•è¨´å•é¡Œçš„主旨與細節都將在æ¤å…¬é–‹, 但æ¤å•é¡Œ <strong>n並ä¸æœƒ</strong> 被呈éžçµ¦åœ°æ–¹æ”¿åºœã€‚" -#: templates/web/zurich/auth/token.html:19 -#: templates/web/zurich/email_sent.html:7 -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 "如果您使用網é é›»å郵件或開啟垃圾信件éŽæ¿¾ï¼Œæ‚¨æœ€å¥½æª¢æŸ¥ä¸€ä¸‹æ‚¨çš„垃圾信匧，本站郵件å¯èƒ½è¢«æ¸åˆ°è©²åˆ†é¡žä¸‹ã€‚" - #: templates/web/base/questionnaire/index.html:68 -#, fuzzy msgid "" "If you wish to leave a public update on the problem, please enter it here\n" "(please note it will not be sent to the council)." msgstr "" "如果您希望公開留言該å•é¡Œä¹‹æ›´æ–°ï¼Œè«‹åœ¨æ¤è¼¸å…¥\n" -"(請注æ„它ä¸æœƒè‡ªå‹•é€åˆ°åœ°æ–¹æ”¿åºœ)例如\n" -"您å°æ–¼åŽŸå•é¡Œå·²ç²è§£æ±ºçš„體驗　" +"(請注æ„它ä¸æœƒè‡ªå‹•é€åˆ°åœ°æ–¹æ”¿åºœ)" #: templates/web/base/admin/body.html:149 msgid "If you're using <strong>a send method that is not email</strong>, enter the service ID (Open311) or equivalent identifier here." @@ -1426,10 +1360,8 @@ msgstr "無效的訂閱é¸é …" #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:144 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:32 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:30 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:36 msgid "In Progress" msgstr "處ç†ä¸" @@ -1437,7 +1369,7 @@ msgstr "處ç†ä¸" msgid "In abuse table?" msgstr "æ¿«ç”¨è¡¨æ ¼ï¼Ÿ" -#: templates/web/base/open311/index.html:88 +#: templates/web/base/open311/index.html:80 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 "æ¤å¤–，下列ç†ç”±ä¸¦éžç‚ºOpen311 v2更新特定部份回覆傳é€: agency_sent_datetime, 主旨(部份回覆之æ•è¿°), interface_used, comment_count, requestor_name (åªæœ‰åœ¨åŒæ„姓å公開下æ‰æœƒå‘ˆç¾)." @@ -1445,7 +1377,7 @@ msgstr "æ¤å¤–，下列ç†ç”±ä¸¦éžç‚ºOpen311 v2更新特定部份回覆傳é€: #: perllib/FixMyStreet/Cobrand/Zurich.pm:963 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:7 -#: templates/web/fixmystreet/report/banner.html:19 +#: templates/web/base/report/banner.html:19 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:8 msgid "In progress" @@ -1480,7 +1412,7 @@ msgstr "內部推薦" msgid "Invalid agency_responsible value %s" msgstr "無效的權責單ä½æ•¸å€¼ %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1201 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1210 msgid "Invalid end date" msgstr "無效的çµæŸæ—¥æœŸ" @@ -1488,7 +1420,7 @@ msgstr "無效的çµæŸæ—¥æœŸ" msgid "Invalid format %s specified." msgstr "無效的%s ç‰¹å®šæ ¼å¼" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1206 msgid "Invalid start date" msgstr "無效的開始日期" @@ -1496,14 +1428,12 @@ msgstr "無效的開始日期" #: templates/web/base/admin/report_blocks.html:5 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:143 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:31 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:29 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:35 msgid "Investigating" msgstr "調查ä¸" -#: templates/web/fixmystreet/contact/blurb.html:8 +#: templates/web/base/contact/blurb.html:8 msgid "It's often quickest to <a href=\"%s\">check our FAQs</a> and see if the answer is there." msgstr "最快方å¼æ˜¯ <a href=\"%s\">先查看å•ç”集</a> ，看看ç”案是å¦åœ¨æ¤" @@ -1513,19 +1443,17 @@ msgstr "æ£å‘ˆé€çµ¦åœ°æ–¹æ”¿åºœä¸" #: perllib/FixMyStreet/Cobrand/Zurich.pm:184 msgid "Jurisdiction Unknown" -msgstr "" +msgstr "未知的管轄機關" #: perllib/FixMyStreet/Cobrand/Zurich.pm:927 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:15 msgid "Jurisdiction unknown" -msgstr "" +msgstr "未知的管轄機關" -#: templates/web/base/auth/general.html:44 -#: templates/web/base/report/new/fill_in_details_form.html:132 -#: templates/web/base/report/update-form.html:105 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:28 -#: templates/web/fixmystreet/report/update-form.html:102 +#: templates/web/base/auth/general.html:80 +#: templates/web/base/report/new/form_user_loggedout_password.html:16 +#: templates/web/base/report/update/form_user_loggedout_password.html:15 #: templates/web/zurich/auth/general.html:40 msgid "Keep me signed in on this computer" msgstr "新增類別承辦人" @@ -1583,12 +1511,13 @@ msgid "MAP" msgstr "地圖" #: templates/web/base/js/translation_strings.html:45 +#: templates/web/base/maps/google-ol.html:13 msgid "Map" msgstr "地圖" #: templates/web/base/admin/report_edit.html:68 msgid "Mark as sent" -msgstr "" +msgstr "標註為關閉" #: templates/web/base/admin/user-form.html:44 msgid "Mark users whose behaviour you want to keep a check on as <strong>flagged</strong>." @@ -1596,29 +1525,23 @@ msgstr "標註用戶哪些行為您將è¦çµ¦äºˆ<strong>è¦å‘Šæ¨™è¨˜</strong>." #: templates/web/base/reports/index.html:24 msgid "Marked fixed/closed in the past eight weeks" -msgstr "" +msgstr "éŽåŽ»å…«é€±å…§æ¨™è¨˜ç‚ºå·²ä¿®å¾©/çµæ¡ˆæƒ…æ³" #: templates/web/base/reports/index.html:25 msgid "Marked fixed/closed more than eight weeks ago" -msgstr "" +msgstr "八週å‰æ›¾ç¶“標記為已修復/çµæ¡ˆ" -#: templates/web/fixmystreet/contact/index.html:106 +#: templates/web/base/contact/index.html:98 msgid "Message" msgstr "留言" #: templates/web/zurich/admin/report_edit.html:284 -#, fuzzy msgid "Message to competent body:" -msgstr "分派給外部機：" +msgstr "給é©ä»»å–®ä½çš„訊æ¯" #: templates/web/zurich/admin/report_edit.html:282 -#, fuzzy msgid "Message to external body:" -msgstr "分派給外部機：" - -#: templates/web/base/contact/index.html:97 -msgid "Message:" -msgstr "留言" +msgstr "給外部機構的訊æ¯" #: perllib/FixMyStreet/App/Controller/Open311.pm:445 msgid "Missing jurisdiction_id" @@ -1632,10 +1555,6 @@ msgstr "一個工作天內å”調出部門" msgid "Month" msgstr "月份" -#: templates/web/base/report/display.html:34 -msgid "More problems nearby" -msgstr "更多鄰近的å•é¡Œã€€" - #: templates/web/base/admin/bodies.html:21 #: templates/web/base/admin/body-form.html:18 #: templates/web/base/admin/flagged.html:16 @@ -1643,11 +1562,11 @@ msgstr "更多鄰近的å•é¡Œã€€" #: templates/web/base/admin/list_updates.html:7 #: templates/web/base/admin/reports.html:13 #: templates/web/base/admin/users.html:15 -#: templates/web/base/auth/general.html:50 +#: templates/web/base/auth/general.html:89 +#: templates/web/base/report/new/form_user_loggedin.html:9 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:7 +#: templates/web/base/report/update/form_name.html:4 #: templates/web/base/reports/index.html:20 -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:9 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:44 -#: templates/web/fixmystreet/report/update-form.html:138 #: templates/web/zurich/admin/body-form.html:4 #: templates/web/zurich/auth/general.html:60 #: templates/web/zurich/report/new/fill_in_details_form.html:82 @@ -1661,7 +1580,7 @@ msgstr "åå—" msgid "Name:" msgstr "åå—：" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:328 +#: perllib/FixMyStreet/Script/Reports.pm:107 msgid "Name: %s" msgstr "åå—： %s" @@ -1670,16 +1589,16 @@ msgstr "åå—： %s" msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s" msgstr "找出地圖標記上最近的街é“å稱(利用 OpenStreetMap自動産生): %s%s" -#: perllib/FixMyStreet/Cobrand/UK.pm:127 +#: perllib/FixMyStreet/Cobrand/UK.pm:128 msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" msgstr "找出地圖標記上最近的郵éžå€è™Ÿ(自動産生): %s(%sm away)" -#: perllib/FixMyStreet/Cobrand/Default.pm:434 -#: perllib/FixMyStreet/Cobrand/Default.pm:474 +#: perllib/FixMyStreet/Cobrand/Default.pm:455 +#: perllib/FixMyStreet/Cobrand/Default.pm:495 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "找出地圖標記上最近的街é“(利用 Bing Maps自動産生): %s" -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:267 +#: perllib/FixMyStreet/Script/Alerts.pm:290 msgid "" "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n" "\n" @@ -1687,12 +1606,7 @@ msgstr "" "找出地圖標記上最近的街é“(利用 Bing Maps自動産生): %s\n" "\n" -#: templates/web/zurich/email_sent.html:5 -msgid "Nearly Done! Now check your email..." -msgstr "å·®ä¸å¤šå¿«å®Œæˆäº†ï¼Œç¾åœ¨æª¢æŸ¥æ‚¨çš„é›»åä¿¡ç®±" - #: templates/web/base/auth/token.html:17 templates/web/base/email_sent.html:5 -#, fuzzy msgid "Nearly done! Now check your email…" msgstr "å·®ä¸å¤šå¿«å®Œæˆäº†ï¼Œç¾åœ¨æª¢æŸ¥æ‚¨çš„é›»åä¿¡ç®±" @@ -1718,9 +1632,8 @@ msgid "New local problems on FixMyStreet" msgstr "FixMyStreet之新近當地å•é¡Œã€€" #: templates/web/zurich/admin/report_edit-sdm.html:117 -#, fuzzy msgid "New note to DM:" -msgstr "新內部ç†è¨˜" +msgstr "" #: db/alert_types.pl:38 msgid "New problems for {{COUNCIL}} within {{WARD}} ward on FixMyStreet" @@ -1752,9 +1665,8 @@ msgstr "新陳述" #: templates/web/zurich/admin/template_edit.html:9 #: templates/web/zurich/admin/templates.html:26 -#, fuzzy msgid "New template" -msgstr "新陳述" +msgstr "新模版" #: templates/web/base/pagination.html:13 msgid "Next" @@ -1771,8 +1683,8 @@ msgstr "下一æ¥" #: templates/web/base/admin/report_edit.html:75 #: templates/web/base/admin/update_edit.html:25 #: templates/web/base/questionnaire/creator_fixed.html:16 +#: templates/web/base/questionnaire/index.html:101 #: templates/web/base/questionnaire/index.html:53 -#: templates/web/base/questionnaire/index.html:92 msgid "No" msgstr "ç„¡" @@ -1842,10 +1754,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:13 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:33 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:31 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:37 msgid "Not Responsible" msgstr "無責任æ¸å±¬" @@ -1853,9 +1763,8 @@ msgstr "無責任æ¸å±¬" #: perllib/FixMyStreet/Cobrand/Zurich.pm:937 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:13 -#, fuzzy msgid "Not contactable" -msgstr "無責任æ¸å±¬" +msgstr "無法è¨çµ¡" #: templates/web/zurich/admin/report_edit-sdm.html:108 msgid "Not for my subdivision" @@ -1885,7 +1794,7 @@ msgstr "請注æ„這è£åŒ…括了本月份總çµæ’°å¯«å‰ï¼Œå°šæœªç¢ºèªçš„ç”³å ± msgid "Note:" msgstr "註記:" -#: templates/web/base/open311/index.html:73 +#: templates/web/base/open311/index.html:65 msgid "Note: <strong>%s</strong>" msgstr "ç†è¨˜: <strong>%s</strong>" @@ -1893,13 +1802,15 @@ msgstr "ç†è¨˜: <strong>%s</strong>" msgid "Notes from SDM to DM" msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:113 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:10 +#: templates/web/base/report/new/form_user_loggedout.html:14 +#: templates/web/base/report/new/form_user_loggedout.html:2 +#: templates/web/base/report/new/oauth_email_form.html:17 msgid "Now to submit your report…" msgstr "ç¾åœ¨é€å‡ºæ‚¨çš„ç”³å ± …" -#: templates/web/base/report/update-form.html:86 -#: templates/web/fixmystreet/report/update-form.html:85 +#: templates/web/base/report/update-form.html:28 +#: templates/web/base/report/update/form_user_loggedout.html:13 +#: templates/web/base/report/update/form_user_loggedout.html:2 msgid "Now to submit your update…" msgstr "ç¾åœ¨é€å‡ºæ‚¨æ›´æ–°çš„ç”³å ± … 您是å¦æœ‰æœ¬ç«™å¸³å¯†ï¼Ÿ" @@ -1907,11 +1818,6 @@ msgstr "ç¾åœ¨é€å‡ºæ‚¨æ›´æ–°çš„ç”³å ± … 您是å¦æœ‰æœ¬ç«™å¸³å¯†ï¼Ÿ" msgid "OK" msgstr "好了" -#: templates/web/base/report/display.html:28 -#: templates/web/base/report/update.html:17 -msgid "Offensive? Unsuitable? Tell us" -msgstr "å—到羞辱？ä¸é©ç•¶ï¼Ÿè«‹ 告訴我們" - #: templates/web/base/reports/index.html:23 msgid "Old / unknown <br>problems" msgstr "è€/ 未知 <br>å•é¡Œ " @@ -1928,7 +1834,7 @@ msgstr "己解決之舊å•é¡Œã€€" msgid "Older <br>problems" msgstr "舊å•é¡Œã€€" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:45 +#: templates/web/base/report/new/form_report.html:15 msgid "One-line summary" msgstr "一å¥ç¸½çµ" @@ -1939,8 +1845,7 @@ msgstr "一å¥ç¸½çµ" #: templates/web/base/admin/report_blocks.html:4 #: templates/web/base/admin/update_edit.html:28 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/report/update-form.html:30 -#: templates/web/fixmystreet/report/update-form.html:28 +#: templates/web/base/report/update/form_update.html:34 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:7 #: templates/web/zurich/admin/update_edit.html:18 @@ -1949,21 +1854,21 @@ msgstr "開放" #: templates/web/base/reports/index.html:22 msgid "Open for more than four weeks, with an update within the past eight weeks" -msgstr "" +msgstr "開放已超éŽå››é€±ï¼Œæœ€è¿‘八週內有更新éŽã€‚" #: templates/web/base/reports/index.html:23 msgid "Open, but not had any update in eight weeks" -msgstr "" +msgstr "開放，但éŽåŽ»å…«é€±å…§æœªæœ‰ä»»ä½•æ›´æ–°" -#: templates/web/base/open311/index.html:70 +#: templates/web/base/open311/index.html:62 msgid "Open311 API for the mySociety FixMyStreet server" msgstr "Open311 API for the mySociety FixMyStreet server" -#: templates/web/base/open311/index.html:80 +#: templates/web/base/open311/index.html:72 msgid "Open311 initiative web page" msgstr "Open311 啟動網é " -#: templates/web/base/open311/index.html:81 +#: templates/web/base/open311/index.html:73 msgid "Open311 specification" msgstr "Open311 è¦ç¯„　" @@ -1975,15 +1880,15 @@ msgstr "或將æ¤å•é¡Œ ç”³å ±çµ¦:" msgid "Or you can subscribe to an alert based upon what ward or council you’re in:" msgstr "您å¯ä»¥è¨‚閱　里/å€å…§çš„更新通知" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1084 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:673 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:674 -#: perllib/FixMyStreet/DB/Result/Problem.pm:570 -#: perllib/FixMyStreet/DB/Result/Problem.pm:580 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1055 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:669 +#: perllib/FixMyStreet/DB/Result/Problem.pm:558 +#: perllib/FixMyStreet/DB/Result/Problem.pm:568 +#: perllib/FixMyStreet/DB/Result/Problem.pm:578 #: perllib/FixMyStreet/DB/Result/Problem.pm:590 -#: perllib/FixMyStreet/DB/Result/Problem.pm:602 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:397 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:412 +#: perllib/FixMyStreet/Script/Reports.pm:175 +#: perllib/FixMyStreet/Script/Reports.pm:190 msgid "Other" msgstr "其它" @@ -1992,7 +1897,7 @@ msgid "Owner" msgstr "物主" #: templates/web/base/errors/page_error_404_not_found.html:1 -#: templates/web/base/errors/page_error_404_not_found.html:3 +#: templates/web/base/errors/page_error_404_not_found.html:4 msgid "Page Not Found" msgstr "找無æ¤é " @@ -2006,16 +1911,16 @@ msgstr "上級 " msgid "Partial" msgstr "部份" -#: templates/web/base/auth/general.html:53 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:68 -#: templates/web/fixmystreet/report/update-form.html:116 +#: templates/web/base/auth/general.html:92 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:31 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:6 #: templates/web/zurich/auth/general.html:32 #: templates/web/zurich/auth/general.html:63 msgid "Password (optional)" msgstr "密碼(ä»»é¸):" #: templates/web/base/auth/change_password.html:25 -#: templates/web/base/auth/general.html:36 +#: templates/web/base/auth/general.html:72 msgid "Password:" msgstr "密碼:" @@ -2027,45 +1932,37 @@ msgstr "永久連çµ" msgid "Phone number" msgstr "電話號碼" -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:26 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:62 +#: templates/web/base/report/new/form_user_loggedin.html:26 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:25 msgid "Phone number (optional)" msgstr "電話號碼(éžå¿…å¡«)" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:306 +#: perllib/FixMyStreet/Script/Reports.pm:83 #: templates/web/base/admin/report_edit.html:63 -#: templates/web/base/report/new/fill_in_details_form.html:198 #: templates/web/zurich/admin/stats.html:39 msgid "Phone:" msgstr "電話" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:66 -#: templates/web/fixmystreet/report/update-form.html:59 +#: templates/web/base/questionnaire/index.html:75 +#: templates/web/base/report/new/form_report.html:23 +#: templates/web/base/report/update/form_update.html:6 #: templates/web/zurich/admin/index-dm.html:29 #: templates/web/zurich/admin/index-sdm.html:24 #: templates/web/zurich/admin/reports.html:16 #: templates/web/zurich/admin/stats.html:37 -#: templates/web/zurich/report/new/fill_in_details_form.html:52 +#: templates/web/zurich/report/new/fill_in_details_form.html:45 msgid "Photo" msgstr "照片" -#: perllib/FixMyStreet/App/Controller/Photo.pm:221 -#, fuzzy +#: perllib/FixMyStreet/App/Controller/Photo.pm:187 msgid "Photo is required." -msgstr "æœ¬é …è³‡è¨Šå¿…å¡«" +msgstr "è¦æ±‚æ供照片" #: templates/web/base/admin/category_edit.html:48 -#, fuzzy msgid "Photo required" -msgstr "æœ¬é …è³‡è¨Šå¿…å¡«" +msgstr "è¦æ±‚æ供照片" -#: templates/web/base/questionnaire/index.html:80 -#: templates/web/base/report/new/fill_in_details_form.html:84 -#: templates/web/base/report/update-form.html:62 -msgid "Photo:" -msgstr "照片:" - -#: templates/web/base/alert/list.html:26 +#: templates/web/base/alert/list.html:23 msgid "Photos of recent nearby reports" msgstr "æœ€è¿‘ç”³å ±ä¹‹ç…§ç‰‡" @@ -2094,20 +1991,16 @@ msgstr "用語請éµå®ˆç¦®ç¯€ï¼Œæ˜Žç¢ºè§£é‡‹å•é¡Œ " msgid "Please check the passwords and try again" msgstr "è«‹å†æ¬¡ç¢ºèªæ‚¨çš„密碼" -#: templates/web/zurich/auth/token.html:16 -msgid "Please check your email" -msgstr "請檢查您的電å郵件" - -#: templates/web/base/auth/general.html:10 -#: templates/web/base/auth/general.html:16 +#: templates/web/base/auth/general.html:27 +#: templates/web/base/auth/general.html:33 #: templates/web/zurich/auth/general.html:3 #: templates/web/zurich/auth/general.html:9 msgid "Please check your email address is correct" msgstr "請確èªæ‚¨é›»éƒµåœ°å€ç„¡èª¤" #: perllib/FixMyStreet/App/Controller/Admin.pm:343 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:883 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:948 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:878 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:943 #: perllib/FixMyStreet/DB/Result/Problem.pm:412 #: templates/web/base/js/translation_strings.html:9 msgid "Please choose a category" @@ -2121,9 +2014,7 @@ msgstr "é¸æ“‡å…¬ç‰©ç¨®é¡ž" msgid "Please correct the errors below" msgstr "è«‹æ›´æ£ä¸‹æ–¹ä¹‹éŒ¯èª¤" -#: templates/web/base/contact/blurb.html:2 -#: templates/web/fixmystreet/contact/blurb.html:12 -#, fuzzy +#: templates/web/base/contact/blurb.html:12 msgid "" "Please do <strong>not</strong> report problems through this form; messages go to\n" "the team behind this site, not a council. To report a problem,\n" @@ -2138,11 +2029,17 @@ msgid "Please do not be abusive — abusing your council devalues the s msgstr "請勿濫用本æœå‹™ï¼Œæ¿«ç”¨å°‡é€ æˆæ‚¨çš„政府輕視其它使用者之æ„見　" #: perllib/FixMyStreet/App/Controller/Admin.pm:346 -#: perllib/FixMyStreet/DB/Result/Comment.pm:126 +#: perllib/FixMyStreet/DB/Result/Comment.pm:125 #: templates/web/base/js/translation_strings.html:2 msgid "Please enter a message" msgstr "請寫下您的留言" +#: perllib/FixMyStreet/App/Controller/Admin.pm:1091 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1146 +#, fuzzy +msgid "Please enter a name" +msgstr "請輸入您的姓æ°" + #: templates/web/base/auth/change_password.html:12 #: templates/web/base/auth/change_password.html:15 #: templates/web/base/js/translation_strings.html:19 @@ -2155,10 +2052,10 @@ msgstr "請輸入密碼" msgid "Please enter a subject" msgstr "請填下主旨" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1084 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1137 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1087 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1142 #: perllib/FixMyStreet/App/Controller/Admin.pm:345 -#: perllib/FixMyStreet/DB/Result/User.pm:127 +#: perllib/FixMyStreet/DB/Result/User.pm:133 #: templates/web/base/js/translation_strings.html:12 #: templates/web/base/js/translation_strings.html:16 msgid "Please enter a valid email" @@ -2175,9 +2072,9 @@ msgid "Please enter some details" msgstr "請填寫進一æ¥ç´°ç¯€" #: perllib/FixMyStreet/App/Controller/Contact.pm:113 -#: perllib/FixMyStreet/DB/Result/User.pm:124 -#: templates/web/base/auth/general.html:10 -#: templates/web/base/auth/general.html:15 +#: perllib/FixMyStreet/DB/Result/User.pm:130 +#: templates/web/base/auth/general.html:27 +#: templates/web/base/auth/general.html:32 #: templates/web/base/js/translation_strings.html:11 #: templates/web/base/js/translation_strings.html:15 #: templates/web/zurich/auth/general.html:3 @@ -2185,7 +2082,7 @@ msgstr "請填寫進一æ¥ç´°ç¯€" msgid "Please enter your email" msgstr "請輸入您的電å郵件" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:7 +#: templates/web/base/report/new/form_user_loggedout_email.html:7 #: templates/web/zurich/report/new/fill_in_details_form.html:80 msgid "Please enter your email address" msgstr "請輸入您的電å郵件" @@ -2194,15 +2091,15 @@ msgstr "請輸入您的電å郵件" msgid "Please enter your first name" msgstr "請輸入您的大å" -#: perllib/FixMyStreet/Cobrand/UK.pm:318 +#: perllib/FixMyStreet/Cobrand/UK.pm:319 #: templates/web/base/js/translation_strings.html:7 msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below" msgstr "請輸入您的全å，地方政府需è¦æ¤è³‡æ–™ – 如果您ä¸å¸Œæœ›åå—公開在網站上，請在下é¢æ–¹æ ¼ä¸åŠƒæŽ‰å‹¾é¸ã€‚" #: perllib/FixMyStreet/App/Controller/Contact.pm:112 -#: perllib/FixMyStreet/DB/Result/Comment.pm:123 +#: perllib/FixMyStreet/DB/Result/Comment.pm:122 #: perllib/FixMyStreet/DB/Result/Problem.pm:406 -#: perllib/FixMyStreet/DB/Result/User.pm:120 +#: perllib/FixMyStreet/DB/Result/User.pm:126 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter your name" msgstr "請輸入您的姓æ°" @@ -2229,12 +2126,11 @@ msgstr "æ¡è¿Ž<a href=\"%s\">å†æ¬¡ç™»å…¥</a>, 或是å†æ¬¡å…‰è‡¨ <a href=\"/\"> msgid "Please fill in details of the problem below." msgstr "請在下方輸入å•é¡Œçš„細節" -#: templates/web/zurich/report/new/fill_in_details_form.html:46 +#: templates/web/zurich/report/new/fill_in_details_form.html:72 msgid "Please fill in details of the problem." msgstr "請在æ¤å¡«å¯«å•é¡Œçš„細節" -#: templates/web/base/report/new/fill_in_details_form.html:28 -#: templates/web/fixmystreet/report/new/sidebar.html:7 +#: templates/web/base/report/new/sidebar.html:7 #: templates/web/zurich/report/new/fill_in_details_form.html:20 msgid "Please fill in the form below with details of the problem, and describe the location as precisely as possible in the details box." msgstr "請利用下方表單填寫å•é¡Œç´°ç¯€ï¼Œåœ¨ç´°ç¯€é …請儘é‡è¿°æ˜Žæº–確的ä½ç½®ã€‚　" @@ -2243,20 +2139,24 @@ msgstr "請利用下方表單填寫å•é¡Œç´°ç¯€ï¼Œåœ¨ç´°ç¯€é …請儘é‡è¿°æ˜Žæº– msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "è«‹é¸æ“‡æ‚¨æ˜¯å¦é¡˜æ„收到其它å•å·" -#: templates/web/fixmystreet/report/updates-sidebar-notes.html:4 +#: templates/web/base/report/updates-sidebar-notes.html:2 msgid "Please note that updates are not sent to the council." msgstr "請注æ„這個更新ä¸æœƒé€åˆ°åœ°æ–¹æ”¿åºœ" -#: templates/web/base/report/update-form.html:7 -msgid "Please note that updates are not sent to the council. If you leave your name it will be public. Your information will only be used in accordance with our <a href=\"/faq#privacy\">privacy policy</a>" -msgstr "è«‹ç•™æ„這個å•é¡Œçš„æ›´æ–°ä¸æœƒé€é”給地方政府，如果您留下姓å，它將會ä¾ç…§æœ¬ç¶²ç«™çš„éš±ç§æ¬Šæ”¿ç–作處ç†ä½¿ç”¨" +#: templates/web/base/report/new/oauth_email_form.html:4 +#, fuzzy +msgid "Please note your report has <strong>not yet been sent</strong>." +msgstr "請注æ„æ‚¨çš„ç”³å ±é‚„<strong>未é€å‡º</strong>. é¸æ“‡åˆé©é¡žåˆ¥åŠé€²ä¸€æ¥è³‡è¨Šï¼Œå†äºˆé€å‡ºã€‚" -#: templates/web/base/report/new/fill_in_details_form.html:8 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:21 +#: templates/web/base/report/new/fill_in_details_form.html:20 #: templates/web/zurich/report/new/fill_in_details_form.html:11 msgid "Please note your report has <strong>not yet been sent</strong>. Choose a category and add further information below, then submit." msgstr "請注æ„æ‚¨çš„ç”³å ±é‚„<strong>未é€å‡º</strong>. é¸æ“‡åˆé©é¡žåˆ¥åŠé€²ä¸€æ¥è³‡è¨Šï¼Œå†äºˆé€å‡ºã€‚" +#: templates/web/base/report/display.html:26 +msgid "Please note your update has <strong>not yet been posted</strong>." +msgstr "" + #: templates/web/base/report/new/notes.html:1 #: templates/web/zurich/report/new/notes.html:1 msgid "Please note:" @@ -2276,9 +2176,8 @@ msgid "Please say whether you've ever reported a problem to your council before" msgstr "è«‹æ•æ˜Žæ‚¨æ˜¯å¦æ›¾å‘åœ°æ–¹æ”¿åºœç”³å ±éŽå•é¡Œï¼Ÿã€€" #: templates/web/zurich/admin/report_edit.html:208 -#, fuzzy msgid "Please select a body." -msgstr "é¸æ“‡å–®ä½" +msgstr "è«‹é¸æ“‡å–®ä½" #: perllib/FixMyStreet/App/Controller/Alert.pm:80 msgid "Please select the feed you want" @@ -2295,6 +2194,7 @@ msgstr "è«‹æ•æ˜Žè©²å•é¡Œæ˜¯å¦å·²è§£æ±º" #: perllib/FixMyStreet/App/Model/PhotoSet.pm:117 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:145 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:147 +#: templates/web/base/js/translation_strings.html:53 msgid "Please upload a JPEG image only" msgstr "請上傳JPEGæ ¼å¼ç…§ç‰‡" @@ -2302,18 +2202,14 @@ msgstr "請上傳JPEGæ ¼å¼ç…§ç‰‡" msgid "Please write a message" msgstr "諘寫下您的留言" -#: templates/web/fixmystreet/report/update-form.html:23 +#: templates/web/base/report/update/form_update.html:29 msgid "Please write your update here" msgstr "請寫下您的更新" -#: templates/web/base/contact/index.html:100 -#: templates/web/base/report/update-form.html:110 -#: templates/web/base/report/update-form.html:132 -#: templates/web/base/report/update-form.html:72 -#: templates/web/fixmystreet/contact/index.html:113 -#: templates/web/fixmystreet/report/update-form.html:124 -#: templates/web/fixmystreet/report/update-form.html:71 -#: templates/web/fixmystreet/report/update-form.html:97 +#: templates/web/base/contact/index.html:105 +#: templates/web/base/report/update-form.html:24 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:14 +#: templates/web/base/report/update/form_user_loggedout_password.html:10 msgid "Post" msgstr "張貼" @@ -2331,7 +2227,7 @@ msgstr "ç”± %s 在 %s 張貼" #: templates/web/base/front/footer-marketing.html:12 msgid "Powered by <a class=\"platform-logo\" href=\"http://fixmystreet.org/\">FixMyStreet Platform</a>" -msgstr "" +msgstr "Powered by <a class=\"platform-logo\" href=\"http://fixmystreet.org/\">FixMyStreet Platform</a>" #: templates/web/base/pagination.html:7 msgid "Previous" @@ -2341,14 +2237,11 @@ msgstr "之å‰" msgid "Privacy" msgstr "éš±ç§" -#: templates/web/base/faq/faq-en-gb.html:7 -#: templates/web/base/open311/index.html:7 -#: templates/web/base/static/privacy.html:1 -#: templates/web/base/static/privacy.html:2 -#: templates/web/base/static/privacy.html:9 -#: templates/web/fixmystreet/contact/index.html:11 +#: templates/web/base/about/_sidebar.html:5 +#: templates/web/base/about/privacy.html:1 +#: templates/web/base/about/privacy.html:2 msgid "Privacy and cookies" -msgstr "" +msgstr "éš±ç§èˆ‡cookies" #: templates/web/base/admin/body.html:202 #: templates/web/base/admin/body.html:85 @@ -2374,12 +2267,12 @@ msgstr "%s　å•é¡Œå·²è¢«ç¢ºèªã€€" msgid "Problem %s sent to council %s" msgstr "%s　å•é¡Œå·²é€é”到地方政府　%s　" -#: templates/web/base/admin/index.html:46 +#: templates/web/base/admin/index.html:39 #: templates/web/zurich/admin/index.html:9 msgid "Problem breakdown by state" msgstr "本站出ç¾æ•…éšœå•é¡Œã€€" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1055 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1058 msgid "Problem marked as open." msgstr "å•é¡Œæ¨™è¨»ç‚ºé–‹æ”¾" @@ -2395,11 +2288,11 @@ msgstr "å•é¡Œ" msgid "Problems in this area" msgstr "本å€åŸŸå…§çš„å•é¡Œ" -#: templates/web/fixmystreet/report/display.html:43 +#: templates/web/base/report/display_tools.html:19 msgid "Problems nearby" msgstr "é„°è¿‘çš„å•é¡Œ" -#: templates/web/fixmystreet/report/display.html:41 +#: templates/web/base/report/display_tools.html:17 msgid "Problems on the map" msgstr "地圖上的å•é¡Œ" @@ -2411,24 +2304,23 @@ msgstr "FixMyStreetã€€æœ€è¿‘å›žå ±çš„å·²ä¿®å¾©å•é¡Œã€€" msgid "Problems within %.1fkm of this location" msgstr "該地點　%.1f公里內的å•é¡Œã€€" -#: perllib/FixMyStreet/Cobrand/Default.pm:642 +#: perllib/FixMyStreet/Cobrand/Default.pm:663 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:120 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:139 -#: perllib/FixMyStreet/Cobrand/UK.pm:207 +#: perllib/FixMyStreet/Cobrand/UK.pm:208 msgid "Problems within %s" msgstr "在 %s 內的å•é¡Œ" #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:128 -#: perllib/FixMyStreet/Cobrand/UK.pm:221 +#: perllib/FixMyStreet/Cobrand/UK.pm:222 msgid "Problems within %s ward" msgstr "在 %s 里/å€çš„å•é¡Œ" #. ("First %s is the body name, second %s the site name") #: templates/web/base/reports/body.html:0 #: templates/web/base/reports/body.html:24 -#, fuzzy msgid "Problems within %s, %s" -msgstr "在 %s 內的å•é¡Œ" +msgstr "在 %s, %sçš„å•é¡Œã€€" #: templates/web/base/alert/_list.html:42 msgid "Problems within the boundary of:" @@ -2442,19 +2334,16 @@ msgstr "公物地å€ï¼š" msgid "Property type:" msgstr "公物種類" -#: templates/web/base/report/update-form.html:3 -#: templates/web/fixmystreet/report/update-form.html:4 +#: templates/web/base/report/update-form.html:6 msgid "Provide an update" msgstr "æ供更新資訊" -#: templates/web/base/auth/general.html:56 +#: templates/web/base/auth/general.html:95 msgid "Providing a name and password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." msgstr "æä¾›å稱與密碼éžç‚ºå¿…è¦ï¼Œä½†å…¶å¯ä»¥è®“æ‚¨æ›´ä¾¿æ–¼ç”³å ±å•é¡Œï¼Œæ供更新與管ç†æ‚¨çš„ç”³å ±ã€‚ã€€ã€€" -#: templates/web/base/report/new/fill_in_details_form.html:156 -#: templates/web/base/report/update-form.html:129 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:71 -#: templates/web/fixmystreet/report/update-form.html:119 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:34 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:9 msgid "Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." msgstr "æä¾›å稱與密碼éžç‚ºå¿…è¦ï¼Œä½†å…¶å¯ä»¥è®“æ‚¨æ›´ä¾¿æ–¼ç”³å ±å•é¡Œï¼Œæ供更新與管ç†æ‚¨çš„ç”³å ±ã€‚" @@ -2490,18 +2379,17 @@ msgstr "ç”±å•é¡Œç”³å ±è€…所填之å•å·" #: templates/web/base/alert/_list.html:22 #: templates/web/base/around/display_location.html:1 #: templates/web/base/around/display_location.html:3 -#: templates/web/base/report/display.html:50 +#: templates/web/base/report/display_tools.html:34 #: templates/web/base/reports/_rss.html:1 #: templates/web/fixmystreet/alert/updates.html:9 -#: templates/web/fixmystreet/report/display.html:58 msgid "RSS feed" msgstr "RSS訂閱" -#: perllib/FixMyStreet/Cobrand/UK.pm:250 perllib/FixMyStreet/Cobrand/UK.pm:262 +#: perllib/FixMyStreet/Cobrand/UK.pm:251 perllib/FixMyStreet/Cobrand/UK.pm:263 msgid "RSS feed for %s" msgstr "%s RSS訂閱" -#: perllib/FixMyStreet/Cobrand/UK.pm:256 perllib/FixMyStreet/Cobrand/UK.pm:268 +#: perllib/FixMyStreet/Cobrand/UK.pm:257 perllib/FixMyStreet/Cobrand/UK.pm:269 msgid "RSS feed for %s ward, %s" msgstr "%s里/å€ RSS訂閱" @@ -2509,11 +2397,11 @@ msgstr "%s里/å€ RSS訂閱" #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:163 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:173 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:181 -#: perllib/FixMyStreet/Cobrand/UK.pm:276 perllib/FixMyStreet/Cobrand/UK.pm:288 +#: perllib/FixMyStreet/Cobrand/UK.pm:277 perllib/FixMyStreet/Cobrand/UK.pm:289 msgid "RSS feed of %s" msgstr "%s RSS訂閱" -#: perllib/FixMyStreet/Cobrand/UK.pm:281 perllib/FixMyStreet/Cobrand/UK.pm:293 +#: perllib/FixMyStreet/Cobrand/UK.pm:282 perllib/FixMyStreet/Cobrand/UK.pm:294 msgid "RSS feed of %s, within %s ward" msgstr "%s, 在%s 里/å€" @@ -2525,15 +2413,15 @@ msgstr " RSS訂閱 %så€åŸŸå•é¡Œ" msgid "RSS feed of problems in this %s" msgstr "æ¤ %s å•é¡Œä¹‹RSS 訂閱" -#: perllib/FixMyStreet/Cobrand/Default.pm:643 +#: perllib/FixMyStreet/Cobrand/Default.pm:664 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:121 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:138 -#: perllib/FixMyStreet/Cobrand/UK.pm:214 +#: perllib/FixMyStreet/Cobrand/UK.pm:215 msgid "RSS feed of problems within %s" msgstr "在 %s 內之å•é¡ŒRSS 訂閱" #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:127 -#: perllib/FixMyStreet/Cobrand/UK.pm:220 +#: perllib/FixMyStreet/Cobrand/UK.pm:221 msgid "RSS feed of problems within %s ward" msgstr "在 %s 里/å€å•é¡Œçš„RSS 訂閱" @@ -2542,25 +2430,22 @@ msgstr "在 %s 里/å€å•é¡Œçš„RSS 訂閱" msgid "RSS feed of recent local problems" msgstr "最近當地å•é¡Œçš„RSS訂閱" -#: templates/web/base/report/display.html:50 +#: templates/web/base/report/display_tools.html:34 #: templates/web/fixmystreet/alert/updates.html:9 -#: templates/web/fixmystreet/report/display.html:58 msgid "RSS feed of updates to this problem" msgstr "最近當地å•é¡Œæ›´æ–°çš„RSS訂閱" #: templates/web/base/alert/updates.html:9 -#: templates/web/base/report/display.html:41 +#: templates/web/base/report/display_tools.html:36 #: templates/web/fixmystreet/alert/updates.html:14 -#: templates/web/fixmystreet/report/display.html:60 msgid "Receive email when updates are left on this problem." msgstr "é€éŽé›»å郵件收å–該å•é¡Œä¹‹æ›´æ–°æ¶ˆæ¯" #. ("%s is the site name") #: templates/web/base/around/display_location.html:0 #: templates/web/base/around/display_location.html:33 -#, fuzzy msgid "Recent local problems, %s" -msgstr "FixMyStreet　近期的當地å•é¡Œã€€" +msgstr "近期的當地å•é¡Œ%s　" #: templates/web/base/reports/index.html:24 msgid "Recently <br>fixed" @@ -2578,20 +2463,19 @@ msgstr "è¨˜ä½ FixMyStreet主è¦ç‚ºç”³å ±å¯ä¿®å¾©ä¹‹ç‰©ç†æ€§å•é¡Œã€‚如果您 msgid "Remove flag" msgstr "移除標記" -#: templates/web/base/admin/report_edit.html:92 -#: templates/web/base/admin/update_edit.html:62 +#: templates/web/base/admin/report_edit.html:93 +#: templates/web/base/admin/update_edit.html:67 #: templates/web/zurich/admin/update_edit.html:35 msgid "Remove photo (can't be undone!)" msgstr "移陯照片(無法回復)" #: templates/web/zurich/admin/report_edit.html:243 -#, fuzzy msgid "Reply to user:" -msgstr "用戶編輯" +msgstr "給用戶的回應" #: templates/web/fixmystreet/header_logo.html:2 msgid "Report" -msgstr "" +msgstr "æå ±ã€€" #: templates/web/base/footer.html:7 templates/web/fixmystreet/footer.html:26 #: templates/web/fixmystreet/header_logo.html:2 @@ -2600,7 +2484,7 @@ msgstr "" msgid "Report a problem" msgstr "ç”³å ±å•é¡Œ" -#: templates/web/fixmystreet/report/display.html:32 +#: templates/web/base/report/display_tools.html:8 msgid "Report abuse" msgstr "ç”³å ±æ¿«ç”¨" @@ -2609,7 +2493,8 @@ msgid "Report on %s" msgstr "在%sã€€ç”³å ±ã€€" #: templates/web/base/report/new/fill_in_details_form.html:1 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:2 +#: templates/web/base/report/new/login_success_form.html:1 +#: templates/web/base/report/new/oauth_email_form.html:1 msgid "Report your problem" msgstr "ç”³å ±ä½ çš„å•é¡Œ" @@ -2618,9 +2503,8 @@ msgstr "ç”³å ±ä½ çš„å•é¡Œ" msgid "Report, view, or discuss local problems" msgstr "ç”³å ±ï¼Œæª¢è¦–ï¼Œæˆ–è¨Žè«–åœ¨åœ°å•é¡Œ" -#: perllib/FixMyStreet/DB/Result/Problem.pm:585 -#: templates/web/base/contact/index.html:50 -#: templates/web/fixmystreet/contact/index.html:65 +#: perllib/FixMyStreet/DB/Result/Problem.pm:573 +#: templates/web/base/contact/index.html:57 msgid "Reported anonymously at %s" msgstr "在%s 匿åç”³å ± " @@ -2629,53 +2513,50 @@ msgstr "在%s 匿åç”³å ± " msgid "Reported before" msgstr "之å‰çš„ç”³å ±" -#: perllib/FixMyStreet/DB/Result/Problem.pm:608 -#: templates/web/base/contact/index.html:52 -#: templates/web/fixmystreet/contact/index.html:67 +#: perllib/FixMyStreet/DB/Result/Problem.pm:596 +#: templates/web/base/contact/index.html:59 msgid "Reported by %s at %s" msgstr "ç”±%s çš„ %s ç”³å ±" #: templates/web/zurich/admin/report_edit-sdm.html:58 #: templates/web/zurich/admin/report_edit.html:86 -#, fuzzy msgid "Reported by:" -msgstr "å·²ç”³å ± %s" +msgstr "ç”±ã€€ã€€ç”³å ±" #: templates/web/zurich/report/_main.html:2 msgid "Reported in the %s category" msgstr "%s ç¨®é¡žä¹‹ç”³å ±" -#: perllib/FixMyStreet/DB/Result/Problem.pm:581 +#: perllib/FixMyStreet/DB/Result/Problem.pm:569 msgid "Reported in the %s category anonymously at %s" msgstr "%s 種類下的匿åç”³å ±" -#: perllib/FixMyStreet/DB/Result/Problem.pm:603 +#: perllib/FixMyStreet/DB/Result/Problem.pm:591 msgid "Reported in the %s category by %s at %s" msgstr "%s 在 %s　%sé¡žåˆ¥çš„ç”³å ±ã€€" -#: perllib/FixMyStreet/DB/Result/Problem.pm:577 +#: perllib/FixMyStreet/DB/Result/Problem.pm:565 msgid "Reported via %s anonymously at %s" msgstr "在%s 匿åç”³å ± " -#: perllib/FixMyStreet/DB/Result/Problem.pm:599 +#: perllib/FixMyStreet/DB/Result/Problem.pm:587 msgid "Reported via %s by %s at %s" msgstr "%s　é€éŽ %s　在　%sé¡žåˆ¥çš„ç”³å ±" -#: perllib/FixMyStreet/DB/Result/Problem.pm:573 +#: perllib/FixMyStreet/DB/Result/Problem.pm:561 msgid "Reported via %s in the %s category anonymously at %s" msgstr "é€éŽ %s　在　%s類別的匿åç”³å ±" -#: perllib/FixMyStreet/DB/Result/Problem.pm:593 +#: perllib/FixMyStreet/DB/Result/Problem.pm:581 msgid "Reported via %s in the %s category by %s at %s" msgstr "%s 在 %s　%sé¡žåˆ¥çš„ç”³å ±ã€€" #: templates/web/base/reports/index.html:21 msgid "Reported within the last four weeks" -msgstr "" +msgstr "æœ€è¿‘å››é€±å…§çš„ç”³å ±" #: templates/web/zurich/admin/report_edit-sdm.html:36 #: templates/web/zurich/admin/report_edit.html:55 -#, fuzzy msgid "Reported:" msgstr "å·²ç”³å ± %s" @@ -2687,13 +2568,13 @@ msgstr "å·²ç”³å ± %s" msgid "Reporting a problem" msgstr "ç”³å ±å•é¡Œ" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1277 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1286 #: perllib/FixMyStreet/Cobrand/Zurich.pm:384 #: templates/web/zurich/header.html:60 msgid "Reports" msgstr "ç”³å ±" -#: perllib/FixMyStreet/Cobrand/UK.pm:327 perllib/FixMyStreet/Cobrand/UK.pm:331 +#: perllib/FixMyStreet/Cobrand/UK.pm:328 perllib/FixMyStreet/Cobrand/UK.pm:332 msgid "Reports are limited to %s characters in length. Please shorten your report" msgstr "申請內容有　%s å—數é™åˆ¶ï¼Œè«‹ç°¡åŒ–æ‚¨çš„ç”³å ±ã€‚" @@ -2714,7 +2595,7 @@ msgstr "é‡æ–°é€å‡ºç”³å ±" #: templates/web/zurich/admin/templates.html:1 #: templates/web/zurich/admin/templates.html:3 msgid "Response Templates for %s" -msgstr "" +msgstr "%s的回應模版" #: templates/web/base/js/translation_strings.html:28 msgid "Right place?" @@ -2730,25 +2611,26 @@ msgstr "æ¤æŒ‡å®šè¡—é“之é“路營é‹è€…(å–自é“è·¯åƒç…§ç¢¼èˆ‡ç¨®é¡ž): %s" msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "æ¤æŒ‡å®šè¡—é“之é“路營é‹è€…(來自OpenStreetMap): %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1495 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1500 -#: templates/web/base/admin/report_edit.html:88 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1508 +#: templates/web/base/admin/report_edit.html:90 +#: templates/web/base/admin/update_edit.html:64 #: templates/web/zurich/admin/report_edit.html:116 msgid "Rotate Left" msgstr "左轉　" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1495 -#: templates/web/base/admin/report_edit.html:89 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 +#: templates/web/base/admin/report_edit.html:91 +#: templates/web/base/admin/update_edit.html:65 #: templates/web/zurich/admin/report_edit.html:117 msgid "Rotate Right" msgstr "å³è½‰ã€€" #: templates/web/zurich/admin/report_edit.html:388 msgid "Rotating this photo will discard unsaved changes to the report." -msgstr "" +msgstr "æ—‹è½‰é€™å¼µç…§ç‰‡å°‡æœƒå°Žè‡´ç”³å ±ä¸æœªå˜æª”的照片更動消失" #: templates/web/base/js/translation_strings.html:46 -#: templates/web/base/maps/google-ol.html:13 msgid "Satellite" msgstr "衛星" @@ -2801,16 +2683,14 @@ msgid "Select an area" msgstr "é¸æ“‡å€åŸŸ" #: templates/web/base/alert/_list.html:10 -#, fuzzy msgid "Select which type of alert you’d like and click the button for an RSS feed, or enter your email address to subscribe to an email alert." msgstr "é¸æ“‡æ‚¨è¦æƒ³çš„通知方å¼æˆ–點é¸RSS訂閱按鈕，或者輸入您的電å郵件以收å—通知。" #: perllib/FixMyStreet/Cobrand/Zurich.pm:835 -#, fuzzy msgid "Sent report back" -msgstr "é–‹å•Ÿç”³å ±ã€€" +msgstr "é€å›žç”³å ±" -#: perllib/FixMyStreet/DB/Result/Problem.pm:708 +#: perllib/FixMyStreet/DB/Result/Problem.pm:696 msgid "Sent to %s %s later" msgstr "%s ç¨å¾Œé€çµ¦%s" @@ -2823,15 +2703,13 @@ msgstr "é€å‡º" msgid "Service:" msgstr "æœå‹™" -#: templates/web/fixmystreet/report/display.html:38 +#: templates/web/base/report/display_tools.html:14 msgid "Share" msgstr "分享" -#: templates/web/base/report/new/fill_in_details_form.html:193 -#: templates/web/base/report/update-form.html:158 -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:23 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:59 -#: templates/web/fixmystreet/report/update-form.html:146 +#: templates/web/base/report/new/form_user_loggedin.html:23 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:22 +#: templates/web/base/report/update/form_name.html:15 msgid "Show my name publicly" msgstr "公開我的姓å" @@ -2843,9 +2721,9 @@ msgstr "顯示舊文" msgid "Show pins" msgstr "顯示地圖標示" +#: templates/web/base/auth/general.html:100 #: templates/web/base/auth/general.html:3 -#: templates/web/base/auth/general.html:40 -#: templates/web/base/auth/general.html:61 +#: templates/web/base/auth/general.html:76 #: templates/web/zurich/auth/general.html:18 #: templates/web/zurich/auth/general.html:35 msgid "Sign in" @@ -2875,7 +2753,7 @@ msgstr "" "被é€å‡ºè‡³åœ°æ–¹æ”¿åºœ\n" "." -#: templates/web/base/alert/index.html:42 +#: templates/web/base/alert/index.html:40 msgid "Some photos of recent reports" msgstr "æœ€è¿‘ç”³å ±ä¹‹ç…§ç‰‡" @@ -2885,35 +2763,46 @@ msgstr "æœ€è¿‘ç”³å ±ä¹‹ç…§ç‰‡" msgid "Some text to localize" msgstr "有些文å—需在地化" -#: perllib/FixMyStreet/Cobrand/UK.pm:78 +#: perllib/FixMyStreet/Cobrand/UK.pm:79 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover." msgstr "抱æ‰ï¼Œè©²éƒµå€è™Ÿç¢¼æˆ‘們尚未支æ´" #: templates/web/base/auth/token.html:8 msgid "Sorry, that wasn’t a valid link" -msgstr "" +msgstr "抱æ‰é€™å€‹wasn’t 為有效的網å€é€£çµ" #: templates/web/base/tokens/abuse.html:5 msgid "Sorry, there has been an error confirming your problem." msgstr "抱æ‰ç„¡æ³•ç¢ºèªä½ çš„å•é¡Œ" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:221 -#: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:37 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:216 +#: perllib/FixMyStreet/Geocode.pm:38 perllib/FixMyStreet/Geocode/Bing.pm:38 #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:56 #: perllib/FixMyStreet/Geocode/OSM.pm:48 msgid "Sorry, we could not find that location." msgstr "抱æ‰ï¼Œæˆ‘們無法找到æ¤ä½ç½®" -#: perllib/FixMyStreet/Geocode/Bing.pm:34 +#: templates/web/base/auth/general.html:9 +#: templates/web/base/report/display.html:21 +#: templates/web/base/report/new/fill_in_details_form.html:23 +#, fuzzy +msgid "Sorry, we could not log you in. Please fill in the form below." +msgstr "抱æ‰ï¼Œæˆ‘們無法解æžæ¤åœ°é»žï¼Œè«‹é‡è©¦ä¸€æ¬¡" + +#: perllib/FixMyStreet/Geocode/Bing.pm:35 #: perllib/FixMyStreet/Geocode/Google.pm:45 #: perllib/FixMyStreet/Geocode/Zurich.pm:88 msgid "Sorry, we could not parse that location. Please try again." msgstr "抱æ‰ï¼Œæˆ‘們無法解æžæ¤åœ°é»žï¼Œè«‹é‡è©¦ä¸€æ¬¡" #: perllib/FixMyStreet/App/Model/PhotoSet.pm:134 -#, fuzzy msgid "Sorry, we couldn't save your image(s), please try again." -msgstr "抱æ‰ï¼Œæˆ‘們無法解æžæ¤åœ°é»žï¼Œè«‹é‡è©¦ä¸€æ¬¡" +msgstr "抱æ‰ï¼Œæˆ‘們無法儲å˜ä½ 的照片，請é‡è©¦ä¸€æ¬¡" + +#: perllib/FixMyStreet/App/Controller/AuthSS.pm:301 +#, fuzzy +msgid "Sorry, you can not log in with Facebook. Please try again later." +msgstr "本é 出ç¾éŒ¯èª¤ï¼Œè«‹å†è©¦ä¸€æ¬¡" #: templates/web/base/admin/stats.html:64 msgid "Start Date:" @@ -2923,13 +2812,12 @@ msgstr "å•å§‹æ—¥ï¼š" #: templates/web/base/admin/flagged.html:18 #: templates/web/base/admin/list_updates.html:11 #: templates/web/base/admin/reports.html:15 -#: templates/web/fixmystreet/report/update-form.html:26 +#: templates/web/base/report/update/form_update.html:32 msgid "State" msgstr "陳述" #: templates/web/base/admin/report_edit.html:47 #: templates/web/base/admin/update_edit.html:27 -#: templates/web/base/report/update-form.html:28 #: templates/web/zurich/admin/report_edit-sdm.html:73 #: templates/web/zurich/admin/report_edit.html:101 #: templates/web/zurich/admin/report_edit.html:155 @@ -2937,7 +2825,7 @@ msgstr "陳述" msgid "State:" msgstr "陳述:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1282 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1291 #: perllib/FixMyStreet/Cobrand/Zurich.pm:387 #: templates/web/base/admin/stats.html:1 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:73 @@ -2957,9 +2845,9 @@ msgstr " %så•å·ä»é–‹æ”¾ä¸" #: templates/web/zurich/admin/report_edit-sdm.html:25 #: templates/web/zurich/admin/report_edit.html:26 msgid "Street View" -msgstr "" +msgstr "街景圖" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:406 +#: perllib/FixMyStreet/Script/Reports.pm:184 msgid "Subcategory: %s" msgstr "å類別：%s" @@ -2967,30 +2855,25 @@ msgstr "å類別：%s" msgid "Subdivision/Body" msgstr "下屬單ä½/æ©Ÿé—œ" -#: templates/web/fixmystreet/contact/index.html:98 +#: templates/web/base/contact/index.html:90 msgid "Subject" msgstr "主旨" #: templates/web/base/admin/report_edit.html:19 -#: templates/web/base/contact/index.html:88 -#: templates/web/base/report/new/fill_in_details_form.html:53 #: templates/web/zurich/admin/report_edit.html:39 msgid "Subject:" msgstr "主旨:" #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/fill_in_details_form.html:137 -#: templates/web/base/report/new/fill_in_details_form.html:159 -#: templates/web/base/report/new/fill_in_details_form.html:96 -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:36 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:23 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:76 +#: templates/web/base/report/new/form_user_loggedin.html:36 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:39 +#: templates/web/base/report/new/form_user_loggedout_password.html:11 #: templates/web/zurich/report/new/fill_in_details_form.html:96 msgid "Submit" msgstr "é€å‡º" -#: templates/web/base/admin/report_edit.html:95 -#: templates/web/base/admin/update_edit.html:65 +#: templates/web/base/admin/report_edit.html:101 +#: templates/web/base/admin/update_edit.html:75 #: templates/web/base/admin/user-form.html:56 #: templates/web/zurich/admin/report_edit-sdm.html:137 #: templates/web/zurich/admin/report_edit.html:268 @@ -2998,7 +2881,7 @@ msgstr "é€å‡º" msgid "Submit changes" msgstr "é€å‡ºæ›´æ–°" -#: templates/web/base/questionnaire/index.html:97 +#: templates/web/base/questionnaire/index.html:106 msgid "Submit questionnaire" msgstr "é€å‡ºå•å·" @@ -3014,9 +2897,8 @@ msgid "Submitted" msgstr "å·²é€å‡º" #: templates/web/base/alert/updates.html:17 -#: templates/web/base/report/display.html:46 +#: templates/web/base/report/display_tools.html:41 #: templates/web/fixmystreet/alert/updates.html:23 -#: templates/web/fixmystreet/report/display.html:65 msgid "Subscribe" msgstr "訂閱" @@ -3024,7 +2906,7 @@ msgstr "訂閱" msgid "Subscribe me to an email alert" msgstr "åŠ å…¥é€šçŸ¥ä¿¡ä»¶" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1275 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1284 #: perllib/FixMyStreet/Cobrand/Zurich.pm:383 #: templates/web/base/admin/bodies.html:25 #: templates/web/base/admin/index.html:1 @@ -3043,7 +2925,7 @@ msgstr "摘è¦" msgid "Summary reports" msgstr "ç”³å ±æ‘˜è¦" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1279 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1288 msgid "Survey" msgstr "調查" @@ -3053,13 +2935,12 @@ msgstr "調查çµæžœ" #: templates/web/zurich/admin/template_edit.html:7 msgid "Template «%s»" -msgstr "" +msgstr "模版 «%s»" #: perllib/FixMyStreet/Cobrand/Zurich.pm:394 #: templates/web/zurich/header.html:77 -#, fuzzy msgid "Templates" -msgstr "æ›´æ–°" +msgstr "模版" #: templates/web/base/admin/list_updates.html:12 #: templates/web/zurich/admin/templates.html:9 @@ -3080,7 +2961,7 @@ msgstr "內文:" msgid "Thank you for reporting this issue!" msgstr "æ„Ÿè¬æ‚¨ç”³å ±æ¤å•é¡Œ" -#: templates/web/base/tokens/error.html:7 +#: templates/web/base/tokens/error.html:6 msgid "Thank you for trying to confirm your update or problem. We seem to have an error ourselves though, so <a href=\"%s\">please let us know what went on</a> and we'll look into it." msgstr "æ„Ÿè¬æ‚¨è©¦è‘—確 èªæœ¬å•é¡Œçš„更新。目å‰ç¶²ç«™ä¼¼ä¹Žé‡ä¸Šä¸€é»žå•é¡Œï¼Œ<a href=\"%s\">è«‹å›žå ±çµ¦æˆ‘å€‘</a> 以通知工程人員查看狀æ³ã€‚ " @@ -3115,23 +2996,23 @@ msgstr "這地點似乎ä¸åœ¨å°ç£; è«‹å†è©¦ 一次。" #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:47 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:63 -#: perllib/FixMyStreet/Cobrand/UK.pm:71 +#: perllib/FixMyStreet/Cobrand/UK.pm:72 msgid "That postcode was not recognised, sorry." msgstr "抱æ‰æ¤éƒµéžå€è™Ÿç„¡æ³•è¾¨è˜" -#: perllib/FixMyStreet/App/Controller/Admin.pm:726 +#: perllib/FixMyStreet/App/Controller/Admin.pm:724 msgid "That problem has been marked as sent." -msgstr "" +msgstr "å•é¡Œè¢«æ¨™è¨»ç‚ºé€å‡º" -#: perllib/FixMyStreet/App/Controller/Admin.pm:718 +#: perllib/FixMyStreet/App/Controller/Admin.pm:716 msgid "That problem will now be resent." msgstr "æ¤å•é¡Œå°‡é‡æ–°é€å‡º" -#: perllib/FixMyStreet/App/Controller/Report.pm:125 +#: perllib/FixMyStreet/App/Controller/Report.pm:127 msgid "That report cannot be viewed on %s." msgstr "æ¤ç”³å ±ç„¡æ³•åœ¨ %s上檢視　" -#: perllib/FixMyStreet/App/Controller/Report.pm:119 +#: perllib/FixMyStreet/App/Controller/Report.pm:121 msgid "That report has been removed from FixMyStreet." msgstr "è©²ç”³å ±å·²éFixMyStreet 移除　" @@ -3170,7 +3051,7 @@ msgstr "" "<strong>é€å‡ºæ–¹å¼</strong> 決定了å•é¡Œç”³å ±å¦‚何é€çµ¦ç›¸é—œå–®ä½\n" "如果æ¤è™•æœªä½œé¸æ“‡<strong>系統é è¨çš„é€å‡ºæ–¹å¼ç‚ºé›»å郵件</strong>." -#: templates/web/base/open311/index.html:90 +#: templates/web/base/open311/index.html:82 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 " Open311 v2 的權責單ä½é©ç”¨æ–¼å°æŽ¥æ”¶å•é¡Œç”³å ±æ©Ÿé—œï¼Œä½†ä¸å—é™æ–¼Open311 v2 è¦ç¯„定義。" @@ -3193,12 +3074,12 @@ msgstr "地方政府å¯èƒ½ç„¡æ³•å”助，除éžæ‚¨ç•™ä¸‹å•é¡Œçš„詳細細節。 msgid "The diligency prize league table shows editors' activity (who's been editing the most records)." msgstr "這個勤奮表單顯示用戶的活動(誰åšäº†åšå¤šçš„修改編輯活動)" -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:60 -#: perllib/FixMyStreet/App/Controller/Reports.pm:79 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:61 +#: perllib/FixMyStreet/App/Controller/Reports.pm:80 msgid "The error was: %s" msgstr "顯示錯誤為: %s" -#: templates/web/base/open311/index.html:86 +#: templates/web/base/open311/index.html:78 msgid "The following Open311 v2 attributes are returned for each request: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code and service_name." msgstr "下列 Open311 v2 屬性視è¦æ±‚之回覆而定: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code and service_name." @@ -3234,7 +3115,7 @@ msgstr "ç”¨æˆ¶ç”³å ±{{NAME}}地å€å…§åœ°çš„最新å•é¡Œ" #: templates/web/base/auth/token.html:9 msgid "The link might have expired, or maybe you didn’t quite copy and paste it correctly." -msgstr "" +msgstr "這連çµå¯èƒ½å¤±æ•ˆäº†æˆ–è€…ä½ ä¸¦æœªæ£ç¢ºåœ°è¤‡åˆ¶è²¼ä¸Šå®ƒ" #: templates/web/base/admin/body-form.html:58 msgid "The list of available areas is being provided by the MapIt service at %s." @@ -3245,8 +3126,7 @@ msgstr "%s å€åŸŸä¸ï¼ŒMapItæœå‹™æ¶µè“‹çš„範åœæ¸…å–®" msgid "The passwords do not match" msgstr "密碼ä¸ç¬¦" -#: templates/web/base/errors/page_error_404_not_found.html:10 -#: templates/web/base/errors/page_error_404_not_found.html:12 +#: templates/web/base/errors/page_error_404_not_found.html:9 msgid "The requested URL '%s' was not found on this server" msgstr "找ä¸åˆ°æ‚¨æ‰€è¦æ±‚的網é 連çµã€‚" @@ -3256,12 +3136,11 @@ msgstr "您的更新出錯，請å†è©¦ä¸€æ¬¡ã€‚" #: templates/web/base/report/new/councils_extra_text.html:1 #: templates/web/base/report/new/councils_text_some.html:10 -#: templates/web/base/report/new/fill_in_details_form.html:18 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:14 +#: templates/web/base/report/new/fill_in_details_form.html:13 msgid "The summary and description will also be made public (see our <a href=\"/privacy\">privacy policy</a>)." msgstr "總çµèˆ‡æ述將會公開(請見我們的 <a href=\"/privacy\">éš±ç§æ¬Šæ”¿ç–</a>)." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:315 +#: perllib/FixMyStreet/Script/Reports.pm:92 msgid "The user could not locate the problem on a map, but to see the area around the location they entered" msgstr "用戶無法在地點上標示å•é¡Œï¼Œä½†å¯ä»¥çœ‹åˆ°ä»–們輸入的地點" @@ -3278,20 +3157,20 @@ msgstr "" #: templates/web/base/my/_problem-list.html:8 #: templates/web/base/reports/_problem-list.html:15 msgid "There are no reports to show." -msgstr "" +msgstr "æ²’æœ‰ç”³å ±å¯é¡¯ç¤º" -#: perllib/FixMyStreet/App/Controller/Reports.pm:76 +#: perllib/FixMyStreet/App/Controller/Reports.pm:77 msgid "There was a problem showing the All Reports page. Please try again later." msgstr "本é ç¾åœ¨ç„¡æ³•é¡˜ç¾æ‰€è¦æ±‚çš„ç”³å ±è³‡æ–™ï¼Œè«‹ç¨å€™å†è©¦ã€‚" #: perllib/FixMyStreet/App/Controller/Contact.pm:137 -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:59 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:60 msgid "There was a problem showing this page. Please try again later." msgstr "本é 出ç¾éŒ¯èª¤ï¼Œè«‹å†è©¦ä¸€æ¬¡" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:769 -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:134 -#: templates/web/base/auth/general.html:26 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:764 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:138 +#: templates/web/base/auth/general.html:43 #: templates/web/zurich/auth/general.html:28 msgid "There was a problem with your email/password combination. If you cannot remember your password, or do not have one, please fill in the ‘sign in by email’ section of the form." msgstr "您的電å郵件與密碼ä¸ç›¸ç¬¦ï¼Œå¦‚果您éºå¿˜å¯†ç¢¼æˆ–尚未註冊，請在申請表單上填入電å郵件" @@ -3300,7 +3179,7 @@ msgstr "您的電å郵件與密碼ä¸ç›¸ç¬¦ï¼Œå¦‚果您éºå¿˜å¯†ç¢¼æˆ–尚未註 msgid "There was a problem with your email/password combination. Please try again." msgstr "您的電å郵件/密碼ä¸ç¬¦ï¼Œè«‹é‡è©¦ä¸€æ¬¡" -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:272 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:336 msgid "There was a problem with your update. Please try again." msgstr "æ‚¨çš„ç”³å ±æœ‰å•é¡Œï¼Œè«‹é‡è©¦ä¸€æ¬¡" @@ -3308,7 +3187,7 @@ msgstr "æ‚¨çš„ç”³å ±æœ‰å•é¡Œï¼Œè«‹é‡è©¦ä¸€æ¬¡" msgid "There were problems with your report. Please see below." msgstr "æ‚¨çš„ç”³å ±æœ‰å•é¡Œï¼Œè«‹è¦‹ä¸‹æ–¹èªªæ˜Ž" -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:300 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:371 msgid "There were problems with your update. Please see below." msgstr "您的更新有å•é¡Œï¼Œè«‹è¦‹ä¸‹æ–¹èªªæ˜Ž" @@ -3326,7 +3205,7 @@ msgstr "" "有關Open311的更多資訊請見\n" "<a href='https://www.mysociety.org/2013/01/17/open311-explained/' class='admin-offsite-link'>本文</a>" -#: templates/web/base/open311/index.html:77 +#: templates/web/base/open311/index.html:69 msgid "This API implementation is work in progress and not yet stabilized. It will change without warnings in the future." msgstr "æ¤API執行æ£åœ¨å®‰è£ä¸å°šæœªå®Œå…¨ï¼Œæœªä¾†å°‡ä½œç„¡é è¦çš„æ›´å‹•" @@ -3354,18 +3233,18 @@ msgstr "" "æ¤å–®ä½åªæ¶µè“‹ <strong>è² è²¬å€åŸŸ</strong>çš„ç”³å ±å•é¡Œè™•ç†ã€‚　\n" "除éžå…¶æ¶µè“‹è‡³å°‘一個å€åŸŸï¼Œå¦å‰‡æ”¿åºœå–®ä½ä¸æœƒæŽ¥æ”¶åˆ°å•é¡Œç”³å ±ã€€" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:413 +#: perllib/FixMyStreet/Script/Reports.pm:191 msgid "This email has been sent to both councils covering the location of the problem, as the user did not categorise it; please ignore it if you're not the correct council to deal with the issue, or let us know what category of problem this is so we can add it to our system." msgstr "當用戶沒有é¸æ“‡é¡žåˆ¥æ™‚，電å郵件將é€åˆ°è² 責該å€åŸŸçš„å„地方政府。如果您ä¸æ˜¯è©²å•é¡Œçš„å—ç†æ©Ÿé—œï¼Œè«‹ç•¥éŽï¼Œæˆ–讓我們知é“該å•é¡Œçš„類別以在系統作修æ£ã€‚" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:416 +#: perllib/FixMyStreet/Script/Reports.pm:194 msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue." msgstr "é›»å郵件將é€åˆ°è² 責該å€åŸŸçš„å¤šå€‹åœ°æ–¹æ”¿åºœï¼Œå› é¸æ“‡çš„類別æ供這些å°è±¡ã€‚如果您ä¸æ˜¯è² 責å—ç†æ©Ÿé—œï¼Œè«‹ç•¥éŽã€‚" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:925 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:995 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:920 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:990 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:142 -#: perllib/FixMyStreet/Cobrand/UK.pm:43 +#: perllib/FixMyStreet/Cobrand/UK.pm:44 msgid "This information is required" msgstr "æœ¬é …è³‡è¨Šå¿…å¡«" @@ -3377,56 +3256,37 @@ msgstr "本站為開發試用，å¯èƒ½éš¨æ™‚故障，資料庫也會定期刪除 msgid "This is a summary of all reports on this site." msgstr "æœ¬ç«™æ‰€æœ‰ç”³å ±ç¸½çµ" -#: templates/web/zurich/auth/token.html:8 -msgid "This may be because the link is too old or already used, or the address was not copied correctly." -msgstr "å¯èƒ½ç‚ºé€£çµå¤±æ•ˆæˆ–已被使用éŽï¼Œæˆ–是連çµç¶²å€æœªæ£ç¢ºè¤‡è£½ã€‚" - -#: templates/web/base/report/banner.html:15 -msgid "This problem has been closed" -msgstr "æ¤å•é¡Œå·±çµæ¡ˆ" - -#: templates/web/base/report/banner.html:12 -#: templates/web/base/report/update-form.html:48 -#: templates/web/fixmystreet/report/update-form.html:46 +#: templates/web/base/report/update/form_update.html:52 msgid "This problem has been fixed" msgstr "å•é¡Œå·±è™•ç†å®Œç•¢" -#: templates/web/base/report/update-form.html:43 -#: templates/web/fixmystreet/report/update-form.html:40 +#: templates/web/base/report/update/form_update.html:46 msgid "This problem has not been fixed" msgstr "å•é¡Œå°šæœªè§£æ±º" -#: templates/web/base/report/banner.html:19 -msgid "This problem is in progress" -msgstr "å•é¡Œæ£åœ¨è™•ç†ä¸" - -#: templates/web/base/report/banner.html:9 -msgid "This problem is old and of unknown status." -msgstr "æ¤å•é¡Œå·²å¤±æ™‚效，目å‰ç‹€æ³ä¸æ˜Ž" - #: perllib/FixMyStreet/Cobrand/Zurich.pm:168 #: perllib/FixMyStreet/Cobrand/Zurich.pm:169 #: templates/web/zurich/report/_main.html:14 msgid "This report is awaiting moderation." msgstr "æ¤å•é¡Œå°šå¾…å¯©æ ¸" -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:86 +#: perllib/FixMyStreet/Script/Alerts.pm:94 msgid "This report is currently marked as closed." msgstr "è©²ç”³å ±ç›®å‰æ³¨è¨˜ç‚ºçµæ¡ˆç‹€æ…‹" -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:84 +#: perllib/FixMyStreet/Script/Alerts.pm:92 msgid "This report is currently marked as fixed." msgstr "è©²ç”³å ±ç›®å‰æ³¨è¨˜ç‚ºè§£æ±ºç‹€æ…‹" -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:88 +#: perllib/FixMyStreet/Script/Alerts.pm:96 msgid "This report is currently marked as open." msgstr "è©²ç”³å ±ç›®å‰æ³¨è¨˜ç‚ºé–‹æ”¾ç‹€æ…‹" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:326 +#: perllib/FixMyStreet/Script/Reports.pm:105 msgid "This report was submitted anonymously" msgstr "æ¤ç‚ºåŒ¿åç”³å ±" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:308 +#: perllib/FixMyStreet/Script/Reports.pm:85 msgid "This web page also contains a photo of the problem, provided by the user." msgstr "本é 包括由用戶æä¾›å應å•é¡Œçš„照片　" @@ -3435,9 +3295,9 @@ msgstr "本é 包括由用戶æä¾›å應å•é¡Œçš„照片　" #: templates/web/zurich/admin/report_edit.html:104 #: templates/web/zurich/admin/report_edit.html:148 msgid "Time spent (in minutes):" -msgstr "" +msgstr "花費時間(以分é˜è¨ˆ):" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1278 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1287 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "時間軸" @@ -3449,12 +3309,10 @@ msgid "Title" msgstr "標題" #: templates/web/zurich/admin/template_edit.html:20 -#, fuzzy msgid "Title:" msgstr "標題" #: templates/web/base/alert/index.html:25 -#, fuzzy msgid "To find out what local alerts we have for you, please enter your %s postcode or street name and area:" msgstr "找出é©åˆæ‚¨çš„在地通知，請輸入您的郵編或街åå€åŸŸ" @@ -3462,11 +3320,11 @@ msgstr "找出é©åˆæ‚¨çš„在地通知，請輸入您的郵編或街åå€åŸŸ" msgid "To find out what local alerts we have for you, please enter your postcode or street name and area" msgstr "找出é©åˆæ‚¨çš„在地通知，請輸入您的郵編或街åå€åŸŸ" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:314 +#: perllib/FixMyStreet/Script/Reports.pm:91 msgid "To view a map of the precise location of this issue" msgstr "檢視地圖上å•é¡Œä¹‹ç¢ºåˆ‡ä½ç½®" -#: templates/web/base/admin/index.html:61 +#: templates/web/base/admin/index.html:54 #: templates/web/base/admin/questionnaire.html:24 #: templates/web/base/admin/stats.html:24 #: templates/web/base/admin/stats.html:43 @@ -3484,10 +3342,8 @@ msgstr "何ä¸ç›´æŽ¥ç™¼ä¿¡çµ¦æˆ‘們:" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:12 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:33 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:31 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:37 msgid "Unable to fix" msgstr "無法修復" @@ -3500,7 +3356,7 @@ msgstr "無法修復" msgid "Unconfirmed" msgstr "未確èªçš„" -#: templates/web/fixmystreet/report/banner.html:9 +#: templates/web/base/report/banner.html:9 msgid "Unknown" msgstr "未知的" @@ -3508,17 +3364,18 @@ msgstr "未知的" msgid "Unknown alert type" msgstr "未知的通知類別" +#: perllib/FixMyStreet/App/Controller/Photo.pm:110 #: templates/web/base/js/translation_strings.html:39 msgid "Unknown error" msgstr "未知的錯誤" -#: perllib/FixMyStreet/App/Controller/Report.pm:103 -#: perllib/FixMyStreet/App/Controller/Report.pm:109 -#: perllib/FixMyStreet/App/Controller/Report.pm:112 +#: perllib/FixMyStreet/App/Controller/Report.pm:105 +#: perllib/FixMyStreet/App/Controller/Report.pm:111 +#: perllib/FixMyStreet/App/Controller/Report.pm:114 msgid "Unknown problem ID" msgstr "未知的å•é¡Œç·¨è™Ÿã€€ã€€" -#: templates/web/fixmystreet/report/update-form.html:19 +#: templates/web/base/report/update/form_update.html:25 msgid "Update" msgstr "æ›´æ–°" @@ -3526,13 +3383,11 @@ msgstr "æ›´æ–°" msgid "Update %s created for problem %d; by %s" msgstr "ç”±%s æ›´æ–°%s ç”³å ±ä¹‹å•é¡Œ%s 　" -#: templates/web/base/contact/index.html:21 -#: templates/web/fixmystreet/contact/index.html:36 +#: templates/web/base/contact/index.html:28 msgid "Update below added anonymously at %s" msgstr "下方更新 為匿åæä¾›%s" -#: templates/web/base/contact/index.html:23 -#: templates/web/fixmystreet/contact/index.html:38 +#: templates/web/base/contact/index.html:30 msgid "Update below added by %s at %s" msgstr "ç”±%d 在 %s　所æ供的更新" @@ -3541,7 +3396,7 @@ msgstr "ç”±%d 在 %s　所æ供的更新" msgid "Update body" msgstr "更新內文" -#: templates/web/base/admin/index.html:55 +#: templates/web/base/admin/index.html:48 msgid "Update breakdown by state" msgstr "陳述目å‰çš„故障　" @@ -3566,20 +3421,16 @@ msgstr "æ›´æ–°é‡ç”³å ±ä¹‹å•é¡Œã€€" msgid "Update statuses" msgstr "更新之狀態" -#: templates/web/base/report/update-form.html:22 -msgid "Update:" -msgstr "æ›´æ–°:" - #: templates/web/zurich/admin/index-dm.html:23 #: templates/web/zurich/admin/index-sdm.html:21 #: templates/web/zurich/admin/reports.html:13 msgid "Updated" msgstr "已更新" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1045 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1103 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1147 -#: perllib/FixMyStreet/App/Controller/Admin.pm:822 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1048 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1108 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1156 +#: perllib/FixMyStreet/App/Controller/Admin.pm:821 #: perllib/FixMyStreet/Cobrand/Zurich.pm:771 #: perllib/FixMyStreet/Cobrand/Zurich.pm:796 #: perllib/FixMyStreet/Cobrand/Zurich.pm:866 @@ -3587,13 +3438,12 @@ msgid "Updated!" msgstr "已更新ï¼" #: templates/web/base/admin/list_updates.html:2 -#: templates/web/base/report/update.html:3 -#: templates/web/fixmystreet/report/update.html:5 +#: templates/web/base/report/update.html:5 #: templates/web/zurich/report/updates.html:2 msgid "Updates" msgstr "æ›´æ–°" -#: perllib/FixMyStreet/DB/Result/Comment.pm:132 +#: perllib/FixMyStreet/DB/Result/Comment.pm:131 msgid "Updates are limited to %s characters in length. Please shorten your update" msgstr "更新內容有　%s å—數é™åˆ¶ï¼Œè«‹ç°¡åŒ–您的更新。" @@ -3603,12 +3453,9 @@ msgstr "ç”±{{title}}æ›´æ–°" #. ("%s is the site name") #: templates/web/base/report/display.html:0 -#: templates/web/base/report/display.html:5 -#: templates/web/fixmystreet/report/display.html:0 -#: templates/web/fixmystreet/report/display.html:9 -#, fuzzy +#: templates/web/base/report/display.html:9 msgid "Updates to this problem, %s" -msgstr "å‘FixMyStreetå›žå ±æ¤å•é¡Œã€€" +msgstr "æ›´æ–°å•é¡Œ, %s" #: templates/web/base/admin/body.html:182 msgid "Use the <strong>note</strong> to record details that are only displayed in the admin. Notes are not shown publicly, and are not sent to the body." @@ -3616,15 +3463,14 @@ msgstr "使用<strong>記事本</strong> 來記錄給管ç†å“¡å¯çœ‹åˆ°çš„細節 #: templates/web/zurich/admin/report_edit-sdm.html:48 #: templates/web/zurich/admin/report_edit.html:67 -#, fuzzy msgid "Used map" msgstr "已用éŽä¹‹åœ°åœ–" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1452 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1461 msgid "User flag removed" msgstr "移除用戶的標記è¦å‘Š" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1424 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1433 msgid "User flagged" msgstr "給用戶標記è¦å‘Š" @@ -3632,7 +3478,7 @@ msgstr "給用戶標記è¦å‘Š" msgid "User search finds matches in users' names and email addresses." msgstr "用戶找到相符的å稱與電å郵件" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1280 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1289 #: perllib/FixMyStreet/Cobrand/Zurich.pm:399 #: templates/web/base/admin/flagged.html:29 #: templates/web/zurich/header.html:69 @@ -3663,7 +3509,6 @@ msgid "Viewing a location" msgstr "檢視地å€" #: templates/web/base/report/display.html:0 -#: templates/web/fixmystreet/report/display.html:0 msgid "Viewing a problem" msgstr "檢視å•é¡Œã€€" @@ -3676,25 +3521,24 @@ 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/zurich/auth/token.html:7 -msgid "We have not been able to confirm your account - sorry." -msgstr "抱æ‰ï¼Œæˆ‘們無法確èªæ‚¨çš„帳戶。" - -#: templates/web/zurich/auth/token.html:17 -msgid "We have sent you an email containing a link to confirm your account." -msgstr "我們剛寄給您一å°å…§æœ‰é€£çµç¢ºèªçš„é›»å郵件。" +#: templates/web/base/auth/general.html:6 +#: templates/web/base/report/display.html:27 +#: templates/web/base/report/new/oauth_email_form.html:5 +#, fuzzy +msgid "We need your email address, please give it below." +msgstr "我們ä¸æœƒå…¬é–‹æ‚¨çš„é›»å郵件或是電話號碼" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:2 -#: templates/web/fixmystreet/report/update-form.html:77 +#: templates/web/base/report/new/form_user_loggedout_email.html:2 +#: templates/web/base/report/update/form_user_loggedout_email.html:2 msgid "We never show your email" msgstr "我們ä¸æœƒå…¬é–‹æ‚¨çš„é›»å郵件" -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:31 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:65 +#: templates/web/base/report/new/form_user_loggedin.html:31 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:28 msgid "We never show your email address or phone number." msgstr "我們ä¸æœƒå…¬é–‹æ‚¨çš„é›»å郵件或是電話號碼" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:422 +#: perllib/FixMyStreet/Script/Reports.pm:200 msgid "We realise this problem might be the responsibility of %s; however, we don't currently have any contact details for them. If you know of an appropriate contact address, please do get in touch." msgstr "我們ç†è§£æ¤å•é¡Œå¯èƒ½æ˜¯%s之責任，然而目å‰æˆ‘們並無他們的è¯çµ¡è³‡è¨Šã€‚如果您知é“é©ç•¶çš„è¯çµ¡äººè³‡è¨Šï¼Œè«‹å‘Šè¨´æˆ‘們。" @@ -3711,19 +3555,15 @@ msgstr "您的個人資料，將會ä¾ç…§<a href=\"/privacy\">本站隱ç§æ¬Šæ”¿ msgid "We’re sorry to hear the problem’s not fixed. Why not try writing to your local representatives?" msgstr "很éºæ†¾è©²å•é¡Œä»æœªä¿®å¾©ã€‚何ä¸è©¦è©¦è¯çµ¡ç•¶åœ°è°å“¡æ°‘代å應æ¤ç‹€æ³ï¼Ÿ" -#: templates/web/base/contact/blurb.html:8 -msgid "We'd love to hear what you think about this site. Just fill in the form, or send an email to <a href='mailto:%s'>%s</a>:" -msgstr "我們想知é“您å°æœ¬ç«™çš„建è°ã€‚è«‹å¡«æ¤è¡¨å–®ï¼Œæˆ–發é€é›»å郵件到<a href='mailto:%s'>%s</a>:" - #: templates/web/base/contact/submit.html:7 msgid "We’ll get back to you as soon as we can." msgstr "我們會儘快回覆您" #: templates/web/base/questionnaire/index.html:71 msgid "What was your experience of getting the problem fixed?" -msgstr "" +msgstr "ä½ çš„ç”³å ±ä½¿ç”¨é«”é©—æ„Ÿæƒ³ç‚ºï¼Ÿã€€" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:49 +#: templates/web/base/report/new/form_report.html:19 msgid "What’s the issue, and where is it?" msgstr "什麼樣的å•é¡Œï¼Œåœ°é»žæ˜¯åœ¨?" @@ -3736,7 +3576,11 @@ msgstr "何時編輯　" msgid "When sent" msgstr "何時é€å‡º" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:640 +#: templates/web/base/js/translation_strings.html:50 +msgid "Whoa there Testino! Three photos are enough." +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Report/New.pm:635 msgid "Whole block of empty flats" msgstr "æ•´å€ç‚ºé–’置廢棄空間" @@ -3749,9 +3593,9 @@ msgstr "為何在æ¤å¡ä½ï¼Ÿå…è²»<a href=\"/alert\">è¨å®šæ›´å¤šè¨Šæ¯é€šçŸ¥</ #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:14 msgid "Wish" -msgstr "" +msgstr "願望" -#: templates/web/base/open311/index.html:92 +#: templates/web/base/open311/index.html:84 msgid "With request searches, it is also possible to search for agency_responsible to limit the requests to those sent to a single administration. The search term is the administration ID provided by <a href=\"%s\">MaPit</a>." msgstr "æœå°‹è¦æ±‚，也å¯èƒ½é™åˆ¶å–®ä¸€æ©Ÿæ§‹ä¸æœå°‹ç›¸é—œæ¬Šè²¬å–®ä½ã€‚å…¶æœå°‹å—眼為 <a href=\"%s\">MaPit</a>æ供的主管ID." @@ -3759,7 +3603,7 @@ msgstr "æœå°‹è¦æ±‚，也å¯èƒ½é™åˆ¶å–®ä¸€æ©Ÿæ§‹ä¸æœå°‹ç›¸é—œæ¬Šè²¬å–®ä½ã€‚ msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"http://fixmystreet.org\">available at fixmystreet.org</a>." msgstr "您願為FixMyStreetè²¢ç»å—Ž?這個一個開放原始碼，å¯å¾ž <a href=\"http://fixmystreet.org\">fixmystreet.org</a>官網進一æ¥äº†è§£ã€€" -#: templates/web/base/questionnaire/index.html:87 +#: templates/web/base/questionnaire/index.html:96 msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?" msgstr "您是å¦é¡˜æ„4週後å†æ”¶åˆ°å¦ä¸€ä»½å•å·ï¼Ÿä»¥æ醒您確èªæœ€æ–°çš„ç‹€æ³" @@ -3768,7 +3612,6 @@ msgid "Writing your message entirely in block capitals makes it hard to read, as msgstr "請注æ„ç•™è¨€å…§å®¹ï¼Œå‹¿ç”¨æ³¨éŸ³æ–‡ä¸¦æ‡‰åŠ ä¸Šæ¨™é»žç¬¦è™Ÿä»¥åˆ©é–±è®€ã€‚" #: templates/web/base/report/new/fill_in_details_form.html:4 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:5 msgid "Wrong location? Just click again on the map." msgstr "錯誤的地? è«‹å†æ¬¡é»žæ“Šæ¤åœ°åœ–" @@ -3791,27 +3634,24 @@ msgstr "年份" #: templates/web/base/admin/users.html:31 #: templates/web/base/questionnaire/creator_fixed.html:14 #: templates/web/base/questionnaire/index.html:51 -#: templates/web/base/questionnaire/index.html:90 +#: templates/web/base/questionnaire/index.html:99 msgid "Yes" msgstr "是" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:17 -#: templates/web/fixmystreet/report/update-form.html:91 +#: templates/web/base/report/new/form_user_loggedout_password.html:5 +#: templates/web/base/report/update/form_user_loggedout_password.html:4 msgid "Yes I have a password" msgstr "我有密碼" -#: templates/web/base/contact/index.html:39 -#: templates/web/fixmystreet/contact/index.html:54 +#: templates/web/base/contact/index.html:46 msgid "You are complaining that this problem report was unnecessarily moderated:" msgstr "ä½ ç”³è¨´æ¤å•é¡Œéä¸å¿…è¦ä¹‹å’Œè«§ã€€" -#: templates/web/base/contact/index.html:41 -#: templates/web/fixmystreet/contact/index.html:56 +#: templates/web/base/contact/index.html:48 msgid "You are reporting the following problem report for being abusive, containing personal information, or similar:" msgstr "您檢舉下列å•é¡Œçš„ç”³å ±é到濫用，包å«å€‹äººè³‡æ–™æˆ–相關å•é¡Œã€€" -#: templates/web/base/contact/index.html:15 -#: templates/web/fixmystreet/contact/index.html:30 +#: templates/web/base/contact/index.html:22 msgid "You are reporting the following update for being abusive, containing personal information, or similar:" msgstr "您檢舉下列å•é¡Œä¹‹æ›´ç‚ºæ¿«ç”¨ï¼ŒåŒ…括個人資料或相似" @@ -3824,7 +3664,7 @@ msgstr "您å¯<a href=\"%s%s\">在本站上檢視å•é¡Œ</a>." msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create." msgstr "您å¯ä»¥æ–°å¢žæŸä½ç”¨æˆ¶åˆ°æ¿«ç”¨è€…å單，它會自動隱è—(ä¸æœƒé€å‡º)該å用戶所æäº¤çš„ç”³å ±ã€€" -#: templates/web/fixmystreet/contact/index.html:121 +#: templates/web/base/contact/index.html:113 msgid "You can contact technical support on <a href='mailto:%s'>%s</a>" msgstr "您å¯å¯«ä¿¡çµ¦<a href='mailto:%s'>%s</a>詢求技術支æ´ã€‚" @@ -3838,8 +3678,8 @@ msgstr "" "如果æŸä¸€ç”¨æˆ¶éŽå¾€æœ‰ä¸ç•¶ä½¿ç”¨è¨˜éŒ„，您想特別留æ„它的活動\n" "這會很有用。" -#: templates/web/base/report/new/councils_text_none.html:10 -#: templates/web/base/report/new/councils_text_none.html:2 +#: templates/web/base/report/new/councils_text_none.html:12 +#: templates/web/base/report/new/councils_text_none.html:14 #: templates/web/base/report/new/councils_text_some.html:19 #: templates/web/base/report/new/councils_text_some.html:21 msgid "You can help us by finding a contact email address for local problems for %s and emailing it to us at <a href='mailto:%s'>%s</a>." @@ -3857,20 +3697,16 @@ msgstr "您å—åˆ°æ‹’çµ•ï¼Œè«‹å¡«å¯«ä¸Šæ–¹è¡¨æ ¼ã€‚" msgid "You have already answered this questionnaire. If you have a question, please <a href='%s'>get in touch</a>, or <a href='%s'>view your problem</a>.\n" msgstr "您已回覆éŽæœ¬å•å·ã€‚如果您有å•é¡Œï¼Œè«‹<href='%s'>ä¿æŒè¯çµ¡</a>, 或是<a href='%s'>æª¢è¦–ã€€æ‚¨ä½œçš„ç”³å ±</a>\n" -#: templates/web/base/questionnaire/index.html:77 -#: templates/web/base/report/new/fill_in_details_form.html:75 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:73 -msgid "You have already attached a photo to this report, attaching another one will replace it." -msgstr "æ‚¨å·²åœ¨æœ¬ç”³å ±ä¸é™„åŠ ä¸€å¼µç…§ç‰‡ï¼Œç”¨å¦ä¸€å¼µç…§ç‰‡å°‡å–代原照片。" - -#: templates/web/base/report/update-form.html:59 -#: templates/web/fixmystreet/report/update-form.html:56 -msgid "You have already attached a photo to this update, attaching another one will replace it." -msgstr "æ‚¨å·²åœ¨æœ¬ç”³å ±æ›´æ–°ä¸é™„åŠ ä¸€å¼µç…§ç‰‡ï¼Œç”¨å¦ä¸€å¼µç…§ç‰‡å°‡å–代原照片。" - -#: templates/web/zurich/report/new/fill_in_details_form.html:61 +#: templates/web/base/report/new/form_report.html:32 +#: templates/web/zurich/report/new/fill_in_details_form.html:55 msgid "You have already attached photos to this report. Note that you can attach a maximum of 3 to this report (if you try to upload more, the oldest will be removed)." -msgstr "" +msgstr "在æ¤ç”³å ±ä¸ä½ å·²ç¶“é™„åŠ äº†ç…§ç‰‡(注æ„ä½ æœ€å¤šå¯é™„3張照片,å¦‚æžœä½ é‚„æƒ³ä¸Šå‚³æ›´å¤šå¼µ,原先的照片會被移除)" + +#: templates/web/base/questionnaire/index.html:83 +#: templates/web/base/report/update/form_update.html:14 +#, fuzzy +msgid "You have already attached photos to this update. Note that you can attach a maximum of 3 to this update (if you try to upload more, the oldest will be removed)." +msgstr "在æ¤ç”³å ±ä¸ä½ å·²ç¶“é™„åŠ äº†ç…§ç‰‡(注æ„ä½ æœ€å¤šå¯é™„3張照片,å¦‚æžœä½ é‚„æƒ³ä¸Šå‚³æ›´å¤šå¼µ,原先的照片會被移除)" #: templates/web/base/auth/sign_out.html:4 #: templates/web/zurich/auth/sign_out.html:3 @@ -3886,9 +3722,8 @@ msgstr "æ‚¨åœ¨åœ°åœ–ä¸Šç”¨ç¶ è‰²æ¨™è¨»å•é¡Œä¹‹åœ°é»žã€‚如果æ¤ä¸æ˜¯æ£ç¢ºåœ° msgid "You have successfully confirmed your email address." msgstr "您已æˆåŠŸåœ°ç¢ºèªé›»å郵件" -#: templates/web/base/report/display.html:20 -#: templates/web/base/report/new/fill_in_details.html:37 -#: templates/web/fixmystreet/report/display.html:17 +#: templates/web/base/report/display.html:17 +#: templates/web/base/report/new/login_success_form.html:3 msgid "You have successfully signed in; please check and confirm your details are accurate:" msgstr "您已æˆåŠŸç™»å…¥ï¼Œè«‹æª¢æŸ¥æ‚¨çš„個人資訊是å¦æ£ç¢º:" @@ -3920,53 +3755,42 @@ msgid "Your Reports" msgstr "æ‚¨çš„ç”³å ±ã€€" #: templates/web/base/alert/_list.html:89 +#: templates/web/base/contact/index.html:83 +#: templates/web/base/report/display_tools.html:38 +#: templates/web/base/report/display_tools.html:40 +#: templates/web/base/report/new/form_user_loggedin.html:3 +#: templates/web/base/report/new/form_user_loggedout_email.html:1 +#: templates/web/base/report/update/form_user_loggedout_email.html:1 #: templates/web/fixmystreet/alert/updates.html:19 #: templates/web/fixmystreet/alert/updates.html:22 -#: templates/web/fixmystreet/contact/index.html:91 -#: templates/web/fixmystreet/report/display.html:62 -#: templates/web/fixmystreet/report/display.html:64 -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:3 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:1 -#: templates/web/fixmystreet/report/update-form.html:76 #: templates/web/zurich/report/new/fill_in_details_form.html:76 msgid "Your email" msgstr "您的電å郵件" -#: templates/web/base/auth/general.html:28 -#: templates/web/fixmystreet/report/update-form.html:82 +#: templates/web/base/auth/general.html:45 +#: templates/web/base/report/update/form_user_loggedout_email.html:7 #: templates/web/zurich/auth/general.html:30 #: templates/web/zurich/auth/general.html:58 msgid "Your email address" msgstr "您的電å郵件" -#: templates/web/base/report/new/fill_in_details_form.html:106 -#: templates/web/base/report/update-form.html:81 -msgid "Your email:" -msgstr "ä½ çš„é›»å郵件:" - -#: templates/web/fixmystreet/report/updates-sidebar-notes.html:7 +#: templates/web/base/report/updates-sidebar-notes.html:3 msgid "Your information will only be used in accordance with our <a href=\"/privacy\">privacy policy</a>" msgstr "您的個人資料，將會ä¾ç…§<a href=\"/privacy\">本站隱ç§æ¬Šæ”¿ç–</a>作處ç†ä½¿ç”¨" -#: templates/web/base/auth/general.html:51 -#: templates/web/fixmystreet/contact/index.html:84 -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:18 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:54 -#: templates/web/fixmystreet/report/update-form.html:142 +#: templates/web/base/auth/general.html:90 +#: templates/web/base/contact/index.html:76 +#: templates/web/base/report/new/form_user_loggedin.html:18 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:17 +#: templates/web/base/report/update/form_name.html:11 #: templates/web/zurich/auth/general.html:61 #: templates/web/zurich/report/new/fill_in_details_form.html:86 msgid "Your name" msgstr "姓å" -#: templates/web/base/contact/index.html:73 -#: templates/web/base/report/new/fill_in_details_form.html:186 -#: templates/web/base/report/update-form.html:152 -msgid "Your name:" -msgstr "姓å:" - -#: templates/web/base/auth/general.html:39 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:22 -#: templates/web/fixmystreet/report/update-form.html:96 +#: templates/web/base/auth/general.html:75 +#: templates/web/base/report/new/form_user_loggedout_password.html:10 +#: templates/web/base/report/update/form_user_loggedout_password.html:9 #: templates/web/zurich/auth/general.html:34 msgid "Your password" msgstr "密碼" @@ -3975,15 +3799,16 @@ msgstr "密碼" msgid "Your password has been changed" msgstr "密碼已更新" -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:27 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:63 +#: templates/web/base/report/new/form_user_loggedin.html:27 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:26 #: templates/web/zurich/report/new/fill_in_details_form.html:92 msgid "Your phone number" msgstr "電話號碼" #: templates/web/base/questionnaire/index.html:14 +#, fuzzy msgid "Your report" -msgstr "ç”³å ±" +msgstr "ä½ ä½œçš„ç”³å ±" #: templates/web/base/footer.html:9 templates/web/fixmystreet/footer.html:29 msgid "Your reports" @@ -3993,12 +3818,7 @@ msgstr "ä½ ä½œçš„ç”³å ±" msgid "Your updates" msgstr "æ›´æ–°" -#: templates/web/base/contact/index.html:81 -msgid "Your email:" -msgstr "您的電å郵件:" - #: templates/web/base/reports/_list-filters.html:3 -#, fuzzy msgid "all reports" msgstr "æ‰€æœ‰äº‹ä»¶ç”³å ±" @@ -4007,7 +3827,6 @@ msgid "by %s" msgstr "ç”± %s" #: templates/web/base/reports/_list-filters.html:5 -#, fuzzy msgid "closed reports" msgstr "完çµä¹‹ç”³å ± " @@ -4031,17 +3850,16 @@ msgid "edit user" msgstr "用戶編輯" #: templates/web/base/reports/_list-filters.html:6 -#, fuzzy msgid "fixed reports" msgstr "已處ç†ä¹‹ç”³å ±ã€€" -#: templates/web/base/admin/index.html:33 +#: templates/web/base/status/stats.html:20 #: templates/web/zurich/admin/index.html:5 msgid "from %s different users" -msgstr "從ä¸åŒçš„用戶%d " +msgstr "從ä¸åŒçš„用戶%s " -#: templates/web/base/report/_item.html:17 -#: templates/web/zurich/report/_item.html:16 +#: templates/web/base/report/_item.html:15 +#: templates/web/zurich/report/_item.html:14 msgid "last updated %s" msgstr "%s上回更新:" @@ -4133,10 +3951,8 @@ msgstr "é‡å•Ÿç”³å ±" msgid "sign out" msgstr "登出" -#: templates/web/base/report/new/fill_in_details_form.html:12 -#: templates/web/base/report/new/fill_in_details_form.html:15 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:10 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:12 +#: templates/web/base/report/new/fill_in_details_form.html:11 +#: templates/web/base/report/new/fill_in_details_form.html:9 msgid "the local council" msgstr "當地地府" @@ -4145,7 +3961,7 @@ msgstr "當地地府" msgid "there is no pin shown as the user did not use the map" msgstr "地圖上無標記，用戶未使用地圖" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:398 +#: perllib/FixMyStreet/Script/Reports.pm:176 msgid "this type of local problem" msgstr "æ¤é¡žåœ¨åœ°å•é¡Œ" @@ -4154,9 +3970,8 @@ msgid "today" msgstr "今天" #: templates/web/base/reports/_list-filters.html:4 -#, fuzzy msgid "unfixed reports" -msgstr "已處ç†ä¹‹ç”³å ±ã€€" +msgstr "未處ç†ä¹‹ç”³å ±ã€€" #: templates/web/base/admin/report_edit.html:32 msgid "used map" @@ -4175,7 +3990,7 @@ msgstr "%d 天數" msgid "ward" msgstr "路檔" -#: templates/web/base/front/stats.html:17 +#: templates/web/base/front/stats.html:13 #, perl-format msgid "<big>%s</big> report recently" msgid_plural "<big>%s</big> reports recently" @@ -4199,7 +4014,7 @@ msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d 分é˜æ•¸" -#: templates/web/base/front/stats.html:29 +#: templates/web/base/front/stats.html:25 #, perl-format msgid "<big>%s</big> update on reports" msgid_plural "<big>%s</big> updates on reports" @@ -4217,13 +4032,13 @@ msgid "%d week" msgid_plural "%d weeks" msgstr[0] "%d 週數" -#: templates/web/base/front/stats.html:12 +#: templates/web/base/front/stats.html:8 #, perl-format msgid "<big>%s</big> report in past week" msgid_plural "<big>%s</big> reports in past week" msgstr[0] "<big>%s</big> ä¸Šä¸€é€±çš„ç”³å ± " -#: templates/web/base/front/stats.html:23 +#: templates/web/base/front/stats.html:19 #, perl-format msgid "<big>%s</big> fixed in past month" msgid_plural "<big>%s</big> fixed in past month" @@ -4241,140 +4056,86 @@ msgid "We do <strong>not</strong> yet have details for the other council that co msgid_plural "We do <strong>not</strong> yet have details for the other councils that cover this location." msgstr[0] "我們<strong>尚未<strong>有該å€åŸŸå…¶å®ƒå–®ä½ä¹‹ç´°ç¯€ã€€" -#~ msgid "(Don't worry — we'll hang on to your alert while you're checking your email.)" -#~ msgstr "(別擔心 — 在您檢查email這段時間，我們會ä¿ç•™ä½ 的通知。)" - -#~ msgid "(Don't worry — we'll hang on to your problem report while you're checking your email.)" -#~ msgstr "(別擔心 — 在您檢查email這段時間，我們會ä¿ç•™ä½ çš„ç”³å ±ã€‚)" - -#~ msgid "(Don't worry — we'll hang on to your update while you're checking your email.)" -#~ msgstr "(別擔心 — 在您檢查email這段時間，我們會ä¿ç•™ä½ 的更新。)" - -#~ msgid "<small>If you cannot see the map, <a href='%s' rel='nofollow'>skip this step</a>.</small>" -#~ msgstr "<small>如果無法檢視æ¤åœ°åœ–, <a href='%s' rel='nofollow'>ç•¥éŽæ¤æ¥é©Ÿ</a>.</small>" - -#~ msgid "<strong>No</strong>, I do not, let me sign in by email:" -#~ msgstr "<strong>ä¸</strong>, ä¸ç”¨, 我è¦ç”¨é›»å郵件登入:" - -#~ msgid "Are you a <strong>developer</strong>? Would you like to contribute to FixMyStreet?" -#~ msgstr "您是å¦ç‚º<strong>程å¼é–‹ç™¼å“¡</strong>?您願æ„為一起本軟體開發作貢ç»å—Žã€€ " - -#~ msgid "Closest nearby problems <small>(within %skm)</small>" -#~ msgstr "最鄰近å•é¡Œ<small>( %s公里之內)</small>" - -#~ msgid "Contact FixMyStreet" -#~ msgstr "連絡「FixMyStreetã€" - -#~ msgid "Do you have a FixMyBarangay password?" -#~ msgstr "您是å¦æœ‰FixMyBarangay 之密碼？" - -#~ msgid "FixMyStreet admin:" -#~ msgstr "FixMyStreet 管ç†å“¡:" - -#~ msgid "If you do not, your alert will not be activated." -#~ msgstr "如果您é¸ä¸ï¼Œæ‚¨çš„通知將ä¸æœƒç”Ÿæ•ˆ" - -#~ msgid "If you do not, your problem will not be posted." -#~ msgstr "如果您é¸æ“‡ä¸ï¼Œæ‚¨çš„å•é¡Œå°‡ä¸æœƒè¢«è²¼å‡º" - -#~ msgid "If you do not, your update will not be posted." -#~ msgstr "如果您é¸æ“‡ä¸ï¼Œæ‚¨çš„æ›´æ–°å°‡ä¸æœƒé¡¯ç¤º" - -#~ msgid "New local reports on reportemptyhomes.com" -#~ msgstr "reportemptyhomes.comã€€ä¸Šä¹‹æ–°è¿‘ç”³å ±ã€€" - -#~ msgid "New reports for {{COUNCIL}} within {{WARD}} ward on reportemptyhomes.com" -#~ msgstr "reportemptyhomes.com{{里/å€}}{{地方政府}} 之新近å•é¡Œ" - -#~ msgid "New reports on reportemptyhomes.com" -#~ msgstr "reportemptyhomes.comæ–°è¿‘å•é¡Œã€€" - -#~ msgid "New reports on reportemptyhomes.com near {{POSTCODE}}" -#~ msgstr "reportemptyhomes.com上{{郵éžå€è™Ÿ}} 之新近å•é¡Œã€€" - -#~ msgid "New reports to {{COUNCIL}} on reportemptyhomes.com" -#~ msgstr "reportemptyhomes.com上給{{地方政府}} 之新近å•é¡Œã€€" - -#~ msgid "New reports within {{NAME}}'s boundary on reportemptyhomes.com" -#~ msgstr "reportemptyhomes.com{{Name}} ç¯„åœ ä¹‹æ–°è¿‘å•é¡Œã€€" +#~ msgid "(we never show your email address or phone number)" +#~ msgstr "(我們ä¸æœƒé€éœ²æ‚¨çš„電話或電郵)" -#~ msgid "New update:" -#~ msgstr "好" +#~ msgid "(we never show your email)" +#~ msgstr "(我們ä¸æœƒå…¬é–‹æ‚¨çš„é›»å郵件)" -#~ msgid "No problems found." -#~ msgstr "找無å•é¡Œ" +#~ msgid "<strong>No</strong>, let me confirm my report by email:" +#~ msgstr "<strong>ä¸</strong>, 我想用電å郵件確èªæˆ‘çš„ç”³å ±l:" -#~ msgid "No problems have been reported yet." -#~ msgstr "å°šç„¡å•é¡Œç”³å ±" +#~ msgid "<strong>No</strong>, let me confirm my update by email:" +#~ msgstr "<strong>ä¸</strong>, 我è¦åˆ©ç”¨é›»å郵件收å–更新通知:" -#~ msgid "Now to submit your report… do you have a FixMyStreet password?" -#~ msgstr "ç¾åœ¨é€å‡ºæ‚¨çš„ç”³å ± … 您是å¦æœ‰æœ¬ç«™å¸³å¯†ï¼Ÿ" +#~ msgid "Email me updates" +#~ msgstr "以電郵通知更新" -#~ msgid "Now to submit your update… do you have a FixMyStreet password?" -#~ msgstr "ç¾åœ¨é€å‡ºæ‚¨æ›´æ–°çš„ç”³å ± …" +#~ msgid "Enter a new password:" +#~ msgstr "請輸入新密碼" -#~ msgid "Our code is open source and <a href=\"http://github.com/mysociety/fixmystreet\">available on GitHub</a>." -#~ msgstr "我們的原始碼å¯åœ¨ <a href=\"http://github.com/mysociety/fixmystreet\">GitHub</a>å–å¾—" +#~ 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 "們無法驗è‰æ¤ä»£è™Ÿï¼Œå¦‚果您從電å郵件ä¸è¤‡è£½äº†è¶…連çµç¶²å€ï¼Œè«‹æª¢æŸ¥æ‚¨è¤‡è£½æ˜¯å¦æ£ç¢ºã€‚\n" -#~ msgid "Please <a class=\"tab_link\" href=\"#report\">take a look</a> at the updates that have been left." -#~ msgstr "è«‹<a class=\"tab_link\" href=\"#report\">按æ¤æŸ¥çœ‹</a> 最近更新" +#~ 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 "如果您使用網é é›»å郵件或開啟垃圾信件éŽæ¿¾ï¼Œæ‚¨æœ€å¥½æª¢æŸ¥ä¸€ä¸‹æ‚¨çš„垃圾信匧，本站郵件å¯èƒ½è¢«æ¸åˆ°è©²åˆ†é¡žä¸‹ã€‚" -#~ msgid "Please take a look at the updates that have been left." -#~ msgstr "請看看目å‰çš„最新狀æ³" +#~ msgid "Message:" +#~ msgstr "留言" -#~ msgid "Problems within %s, FixMyStreet" -#~ msgstr "在 %s çš„å•é¡Œ, FixMyStreet" +#~ msgid "More problems nearby" +#~ msgstr "更多鄰近的å•é¡Œã€€" -#~ msgid "Properties recently reported as put back to use on reportemptyhomes.com" -#~ msgstr "reportemptyhomes.com近期é€å›žè™•ç†ä¹‹å…¬ç‰©ã€€" +#~ msgid "Nearly Done! Now check your email..." +#~ msgstr "å·®ä¸å¤šå¿«å®Œæˆäº†ï¼Œç¾åœ¨æª¢æŸ¥æ‚¨çš„é›»åä¿¡ç®±" -#~ msgid "Publish the response" -#~ msgstr "公開æ¤å›žæ‡‰" +#~ msgid "Offensive? Unsuitable? Tell us" +#~ msgstr "å—到羞辱？ä¸é©ç•¶ï¼Ÿè«‹ 告訴我們" -#~ msgid "Reported %s, to %s" -#~ msgstr "ç”³å ± %s 給 %s" +#~ msgid "Photo:" +#~ msgstr "照片:" -#~ msgid "Reports on and around the map" -#~ msgstr "åœ°åœ–é™„è¿‘çš„ç”³å ±" +#~ msgid "Please check your email" +#~ msgstr "請檢查您的電å郵件" -#~ msgid "Sign in by email" -#~ msgstr "é€éŽé›»å郵件登入" +#~ msgid "Please note that updates are not sent to the council. If you leave your name it will be public. Your information will only be used in accordance with our <a href=\"/faq#privacy\">privacy policy</a>" +#~ msgstr "è«‹ç•™æ„這個å•é¡Œçš„æ›´æ–°ä¸æœƒé€é”給地方政府，如果您留下姓å，它將會ä¾ç…§æœ¬ç¶²ç«™çš„éš±ç§æ¬Šæ”¿ç–作處ç†ä½¿ç”¨" -#~ msgid "Signed in as %s" -#~ msgstr "以　%s身份登入" +#~ msgid "This may be because the link is too old or already used, or the address was not copied correctly." +#~ msgstr "å¯èƒ½ç‚ºé€£çµå¤±æ•ˆæˆ–已被使用éŽï¼Œæˆ–是連çµç¶²å€æœªæ£ç¢ºè¤‡è£½ã€‚" -#~ msgid "The confirmation email <strong>may</strong> take a few minutes to arrive — <em>please</em> be patient." -#~ msgstr "確èªçš„é›»å郵件<strong>å¯èƒ½æœƒ</strong> 晚幾分é˜æ”¶åˆ°<em>è«‹</em>è€å¿ƒç‰å¾…。" +#~ msgid "This problem has been closed" +#~ msgstr "æ¤å•é¡Œå·±çµæ¡ˆ" -#~ msgid "The details of your problem are available from the other tab above." -#~ msgstr "您å•é¡Œçš„細節å¯ä»¥å…¶å®ƒåˆ†é ä¸æ‰¾åˆ°" +#~ msgid "This problem is in progress" +#~ msgstr "å•é¡Œæ£åœ¨è™•ç†ä¸" -#~ msgid "The details of your problem are available on the right hand side of this page." -#~ msgstr "您å•é¡Œçš„細節å¯ä»¥åœ¨æœ¬é å³é‚Šæ¬„找到" +#~ msgid "This problem is old and of unknown status." +#~ msgstr "æ¤å•é¡Œå·²å¤±æ™‚效，目å‰ç‹€æ³ä¸æ˜Ž" -#~ msgid "The latest local reports reported by users" -#~ msgstr "用戶æä¾›çš„æœ¬åœ°æœ€æ–°ç”³å ±ã€€" +#~ msgid "Update:" +#~ msgstr "æ›´æ–°:" -#~ msgid "The latest properties reported back to use by users" -#~ msgstr "ç”¨æˆ¶å›žå ±çš„æœ¬åœ°å…¬ç‰©çš„æœ€æ–°ä½¿ç”¨ç‹€æ³ã€€" +#~ msgid "We have not been able to confirm your account - sorry." +#~ msgstr "抱æ‰ï¼Œæˆ‘們無法確èªæ‚¨çš„帳戶。" -#~ msgid "The latest reports for {{COUNCIL}} reported by users" -#~ msgstr "ç”¨æˆ¶ç”³å ±çµ¦{{COUNCIL}} 的本地最新å•é¡Œã€€" +#~ msgid "We have sent you an email containing a link to confirm your account." +#~ msgstr "我們剛寄給您一å°å…§æœ‰é€£çµç¢ºèªçš„é›»å郵件。" -#~ msgid "The latest reports for {{COUNCIL}} within {{WARD}} ward reported by users" -#~ msgstr "ç”¨æˆ¶ç”³å ±çµ¦{{COUNCIL}} 在{{WARD}} 里/å€çš„最新å•é¡Œ" +#~ msgid "We'd love to hear what you think about this site. Just fill in the form, or send an email to <a href='mailto:%s'>%s</a>:" +#~ msgstr "我們想知é“您å°æœ¬ç«™çš„建è°ã€‚è«‹å¡«æ¤è¡¨å–®ï¼Œæˆ–發é€é›»å郵件到<a href='mailto:%s'>%s</a>:" -#~ msgid "The latest reports within {{NAME}}'s boundary reported by users" -#~ msgstr "ç”¨æˆ¶ç”³å ±{{NAME}}地å€å…§åœ°çš„最新å•é¡Œ" +#~ msgid "You have already attached a photo to this report, attaching another one will replace it." +#~ msgstr "æ‚¨å·²åœ¨æœ¬ç”³å ±ä¸é™„åŠ ä¸€å¼µç…§ç‰‡ï¼Œç”¨å¦ä¸€å¼µç…§ç‰‡å°‡å–代原照片。" -#~ msgid "To <strong>report a problem</strong>, click on the map at the correct location." -#~ msgstr "è¦<strong>ç”³å ±å•é¡Œ</strong>, 點擊下方地圖ä¸æ£ç¢ºä¹‹ä½ç½®ã€‚" +#~ msgid "You have already attached a photo to this update, attaching another one will replace it." +#~ msgstr "æ‚¨å·²åœ¨æœ¬ç”³å ±æ›´æ–°ä¸é™„åŠ ä¸€å¼µç…§ç‰‡ï¼Œç”¨å¦ä¸€å¼µç…§ç‰‡å°‡å–代原照片。" -#~ msgid "User" -#~ msgstr "用戶" +#~ msgid "Your email:" +#~ msgstr "ä½ çš„é›»å郵件:" -#~ msgid "You must now click the link in the email we've just sent you." -#~ msgstr "æ‚¨å¿…é ˆæ‰“é–‹æˆ‘å€‘é€å‡ºçš„é›»å確èªä¿¡ä»¶ä¸Šçš„連çµç¶²å€ã€€" +#~ msgid "Your name:" +#~ msgstr "姓å:" -#~ msgid "Your email address:" -#~ msgstr "您的電å郵件" +#~ msgid "Your email:" +#~ msgstr "您的電å郵件:" diff --git a/templates/web/base/report/update/form_user_loggedout_password.html b/templates/web/base/report/update/form_user_loggedout_password.html index cd4433c47..103df1098 100644 --- a/templates/web/base/report/update/form_user_loggedout_password.html +++ b/templates/web/base/report/update/form_user_loggedout_password.html @@ -17,7 +17,7 @@ <div class="general-notes"> <p><strong>[% loc('Forgotten your password?') %]</strong> - [% loc('Confirm by email below, providing a new password at that point. When you confirm, your password will be updated.') %]</p> + [% loc('Confirm by email instead, providing a new password at that point. When you confirm, your password will be updated.') %]</p> </div> </div> diff --git a/templates/web/zurich/admin/index.html b/templates/web/zurich/admin/index.html index a51c7f6fe..275f50183 100644 --- a/templates/web/zurich/admin/index.html +++ b/templates/web/zurich/admin/index.html @@ -1,9 +1,9 @@ [% PROCESS 'admin/header.html' title=loc('Summary') -%] <ul> - <li>[% tprintf( loc('<strong>%d</strong> live problems'), total_problems_live ) %]; - [% tprintf( loc('from %d different users'), total_problems_users ) %]</li> - <li>[% tprintf( loc('%d council contacts – %d confirmed, %d unconfirmed'), contacts.total, contacts.1, contacts.0) %]</li> + <li>[% tprintf( loc('<strong>%s</strong> live problems'), total_problems_live ) %]; + [% tprintf( loc('from %s different users'), total_problems_users ) %]</li> + <li>[% tprintf( loc('%s council contacts – %s confirmed, %s unconfirmed'), contacts.total, contacts.1, contacts.0) %]</li> </ul> <h2>[% loc('Problem breakdown by state') %]</h2> |